##// END OF EJS Templates
debugextensions: hide "ships-with-hg-core" magic string (BC)...
Yuya Nishihara -
r29893:4c28ddda default
parent child Browse files
Show More
@@ -1,7324 +1,7323 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 if isinternal:
2400 exttestedwith = [] # never expose magic string to users
2401 else:
2399 exttestedwith = getattr(extmod, 'testedwith', '').split()
2402 exttestedwith = getattr(extmod, 'testedwith', '').split()
2400 if isinternal:
2401 showtestedwith = ['internal']
2402 else:
2403 showtestedwith = exttestedwith
2404 extbuglink = getattr(extmod, 'buglink', None)
2403 extbuglink = getattr(extmod, 'buglink', None)
2405
2404
2406 fm.startitem()
2405 fm.startitem()
2407
2406
2408 if ui.quiet or ui.verbose:
2407 if ui.quiet or ui.verbose:
2409 fm.write('name', '%s\n', extname)
2408 fm.write('name', '%s\n', extname)
2410 else:
2409 else:
2411 fm.write('name', '%s', extname)
2410 fm.write('name', '%s', extname)
2412 if not exttestedwith:
2411 if isinternal or hgver in exttestedwith:
2412 fm.plain('\n')
2413 elif not exttestedwith:
2413 fm.plain(_(' (untested!)\n'))
2414 fm.plain(_(' (untested!)\n'))
2414 elif isinternal or hgver in exttestedwith:
2415 fm.plain('\n')
2416 else:
2415 else:
2417 lasttestedversion = exttestedwith[-1]
2416 lasttestedversion = exttestedwith[-1]
2418 fm.plain(' (%s!)\n' % lasttestedversion)
2417 fm.plain(' (%s!)\n' % lasttestedversion)
2419
2418
2420 fm.condwrite(ui.verbose and extsource, 'source',
2419 fm.condwrite(ui.verbose and extsource, 'source',
2421 _(' location: %s\n'), extsource or "")
2420 _(' location: %s\n'), extsource or "")
2422
2421
2423 if ui.verbose:
2422 if ui.verbose:
2424 fm.plain(_(' bundled: %s\n') % ['no', 'yes'][isinternal])
2423 fm.plain(_(' bundled: %s\n') % ['no', 'yes'][isinternal])
2425 fm.data(bundled=isinternal)
2424 fm.data(bundled=isinternal)
2426
2425
2427 fm.condwrite(ui.verbose and showtestedwith, 'testedwith',
2426 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
2428 _(' tested with: %s\n'),
2427 _(' tested with: %s\n'),
2429 fm.formatlist(showtestedwith, name='ver'))
2428 fm.formatlist(exttestedwith, name='ver'))
2430
2429
2431 fm.condwrite(ui.verbose and extbuglink, 'buglink',
2430 fm.condwrite(ui.verbose and extbuglink, 'buglink',
2432 _(' bug reporting: %s\n'), extbuglink or "")
2431 _(' bug reporting: %s\n'), extbuglink or "")
2433
2432
2434 fm.end()
2433 fm.end()
2435
2434
2436 @command('debugfileset',
2435 @command('debugfileset',
2437 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2436 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2438 _('[-r REV] FILESPEC'))
2437 _('[-r REV] FILESPEC'))
2439 def debugfileset(ui, repo, expr, **opts):
2438 def debugfileset(ui, repo, expr, **opts):
2440 '''parse and apply a fileset specification'''
2439 '''parse and apply a fileset specification'''
2441 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2440 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2442 if ui.verbose:
2441 if ui.verbose:
2443 tree = fileset.parse(expr)
2442 tree = fileset.parse(expr)
2444 ui.note(fileset.prettyformat(tree), "\n")
2443 ui.note(fileset.prettyformat(tree), "\n")
2445
2444
2446 for f in ctx.getfileset(expr):
2445 for f in ctx.getfileset(expr):
2447 ui.write("%s\n" % f)
2446 ui.write("%s\n" % f)
2448
2447
2449 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2448 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2450 def debugfsinfo(ui, path="."):
2449 def debugfsinfo(ui, path="."):
2451 """show information detected about current filesystem"""
2450 """show information detected about current filesystem"""
2452 util.writefile('.debugfsinfo', '')
2451 util.writefile('.debugfsinfo', '')
2453 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2452 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2454 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2453 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2455 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2454 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2456 ui.write(('case-sensitive: %s\n') % (util.fscasesensitive('.debugfsinfo')
2455 ui.write(('case-sensitive: %s\n') % (util.fscasesensitive('.debugfsinfo')
2457 and 'yes' or 'no'))
2456 and 'yes' or 'no'))
2458 os.unlink('.debugfsinfo')
2457 os.unlink('.debugfsinfo')
2459
2458
2460 @command('debuggetbundle',
2459 @command('debuggetbundle',
2461 [('H', 'head', [], _('id of head node'), _('ID')),
2460 [('H', 'head', [], _('id of head node'), _('ID')),
2462 ('C', 'common', [], _('id of common node'), _('ID')),
2461 ('C', 'common', [], _('id of common node'), _('ID')),
2463 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2462 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2464 _('REPO FILE [-H|-C ID]...'),
2463 _('REPO FILE [-H|-C ID]...'),
2465 norepo=True)
2464 norepo=True)
2466 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2465 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2467 """retrieves a bundle from a repo
2466 """retrieves a bundle from a repo
2468
2467
2469 Every ID must be a full-length hex node id string. Saves the bundle to the
2468 Every ID must be a full-length hex node id string. Saves the bundle to the
2470 given file.
2469 given file.
2471 """
2470 """
2472 repo = hg.peer(ui, opts, repopath)
2471 repo = hg.peer(ui, opts, repopath)
2473 if not repo.capable('getbundle'):
2472 if not repo.capable('getbundle'):
2474 raise error.Abort("getbundle() not supported by target repository")
2473 raise error.Abort("getbundle() not supported by target repository")
2475 args = {}
2474 args = {}
2476 if common:
2475 if common:
2477 args['common'] = [bin(s) for s in common]
2476 args['common'] = [bin(s) for s in common]
2478 if head:
2477 if head:
2479 args['heads'] = [bin(s) for s in head]
2478 args['heads'] = [bin(s) for s in head]
2480 # TODO: get desired bundlecaps from command line.
2479 # TODO: get desired bundlecaps from command line.
2481 args['bundlecaps'] = None
2480 args['bundlecaps'] = None
2482 bundle = repo.getbundle('debug', **args)
2481 bundle = repo.getbundle('debug', **args)
2483
2482
2484 bundletype = opts.get('type', 'bzip2').lower()
2483 bundletype = opts.get('type', 'bzip2').lower()
2485 btypes = {'none': 'HG10UN',
2484 btypes = {'none': 'HG10UN',
2486 'bzip2': 'HG10BZ',
2485 'bzip2': 'HG10BZ',
2487 'gzip': 'HG10GZ',
2486 'gzip': 'HG10GZ',
2488 'bundle2': 'HG20'}
2487 'bundle2': 'HG20'}
2489 bundletype = btypes.get(bundletype)
2488 bundletype = btypes.get(bundletype)
2490 if bundletype not in bundle2.bundletypes:
2489 if bundletype not in bundle2.bundletypes:
2491 raise error.Abort(_('unknown bundle type specified with --type'))
2490 raise error.Abort(_('unknown bundle type specified with --type'))
2492 bundle2.writebundle(ui, bundle, bundlepath, bundletype)
2491 bundle2.writebundle(ui, bundle, bundlepath, bundletype)
2493
2492
2494 @command('debugignore', [], '[FILE]')
2493 @command('debugignore', [], '[FILE]')
2495 def debugignore(ui, repo, *files, **opts):
2494 def debugignore(ui, repo, *files, **opts):
2496 """display the combined ignore pattern and information about ignored files
2495 """display the combined ignore pattern and information about ignored files
2497
2496
2498 With no argument display the combined ignore pattern.
2497 With no argument display the combined ignore pattern.
2499
2498
2500 Given space separated file names, shows if the given file is ignored and
2499 Given space separated file names, shows if the given file is ignored and
2501 if so, show the ignore rule (file and line number) that matched it.
2500 if so, show the ignore rule (file and line number) that matched it.
2502 """
2501 """
2503 ignore = repo.dirstate._ignore
2502 ignore = repo.dirstate._ignore
2504 if not files:
2503 if not files:
2505 # Show all the patterns
2504 # Show all the patterns
2506 includepat = getattr(ignore, 'includepat', None)
2505 includepat = getattr(ignore, 'includepat', None)
2507 if includepat is not None:
2506 if includepat is not None:
2508 ui.write("%s\n" % includepat)
2507 ui.write("%s\n" % includepat)
2509 else:
2508 else:
2510 raise error.Abort(_("no ignore patterns found"))
2509 raise error.Abort(_("no ignore patterns found"))
2511 else:
2510 else:
2512 for f in files:
2511 for f in files:
2513 nf = util.normpath(f)
2512 nf = util.normpath(f)
2514 ignored = None
2513 ignored = None
2515 ignoredata = None
2514 ignoredata = None
2516 if nf != '.':
2515 if nf != '.':
2517 if ignore(nf):
2516 if ignore(nf):
2518 ignored = nf
2517 ignored = nf
2519 ignoredata = repo.dirstate._ignorefileandline(nf)
2518 ignoredata = repo.dirstate._ignorefileandline(nf)
2520 else:
2519 else:
2521 for p in util.finddirs(nf):
2520 for p in util.finddirs(nf):
2522 if ignore(p):
2521 if ignore(p):
2523 ignored = p
2522 ignored = p
2524 ignoredata = repo.dirstate._ignorefileandline(p)
2523 ignoredata = repo.dirstate._ignorefileandline(p)
2525 break
2524 break
2526 if ignored:
2525 if ignored:
2527 if ignored == nf:
2526 if ignored == nf:
2528 ui.write(_("%s is ignored\n") % f)
2527 ui.write(_("%s is ignored\n") % f)
2529 else:
2528 else:
2530 ui.write(_("%s is ignored because of "
2529 ui.write(_("%s is ignored because of "
2531 "containing folder %s\n")
2530 "containing folder %s\n")
2532 % (f, ignored))
2531 % (f, ignored))
2533 ignorefile, lineno, line = ignoredata
2532 ignorefile, lineno, line = ignoredata
2534 ui.write(_("(ignore rule in %s, line %d: '%s')\n")
2533 ui.write(_("(ignore rule in %s, line %d: '%s')\n")
2535 % (ignorefile, lineno, line))
2534 % (ignorefile, lineno, line))
2536 else:
2535 else:
2537 ui.write(_("%s is not ignored\n") % f)
2536 ui.write(_("%s is not ignored\n") % f)
2538
2537
2539 @command('debugindex', debugrevlogopts +
2538 @command('debugindex', debugrevlogopts +
2540 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2539 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2541 _('[-f FORMAT] -c|-m|FILE'),
2540 _('[-f FORMAT] -c|-m|FILE'),
2542 optionalrepo=True)
2541 optionalrepo=True)
2543 def debugindex(ui, repo, file_=None, **opts):
2542 def debugindex(ui, repo, file_=None, **opts):
2544 """dump the contents of an index file"""
2543 """dump the contents of an index file"""
2545 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2544 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2546 format = opts.get('format', 0)
2545 format = opts.get('format', 0)
2547 if format not in (0, 1):
2546 if format not in (0, 1):
2548 raise error.Abort(_("unknown format %d") % format)
2547 raise error.Abort(_("unknown format %d") % format)
2549
2548
2550 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2549 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2551 if generaldelta:
2550 if generaldelta:
2552 basehdr = ' delta'
2551 basehdr = ' delta'
2553 else:
2552 else:
2554 basehdr = ' base'
2553 basehdr = ' base'
2555
2554
2556 if ui.debugflag:
2555 if ui.debugflag:
2557 shortfn = hex
2556 shortfn = hex
2558 else:
2557 else:
2559 shortfn = short
2558 shortfn = short
2560
2559
2561 # There might not be anything in r, so have a sane default
2560 # There might not be anything in r, so have a sane default
2562 idlen = 12
2561 idlen = 12
2563 for i in r:
2562 for i in r:
2564 idlen = len(shortfn(r.node(i)))
2563 idlen = len(shortfn(r.node(i)))
2565 break
2564 break
2566
2565
2567 if format == 0:
2566 if format == 0:
2568 ui.write((" rev offset length " + basehdr + " linkrev"
2567 ui.write((" rev offset length " + basehdr + " linkrev"
2569 " %s %s p2\n") % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2568 " %s %s p2\n") % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2570 elif format == 1:
2569 elif format == 1:
2571 ui.write((" rev flag offset length"
2570 ui.write((" rev flag offset length"
2572 " size " + basehdr + " link p1 p2"
2571 " size " + basehdr + " link p1 p2"
2573 " %s\n") % "nodeid".rjust(idlen))
2572 " %s\n") % "nodeid".rjust(idlen))
2574
2573
2575 for i in r:
2574 for i in r:
2576 node = r.node(i)
2575 node = r.node(i)
2577 if generaldelta:
2576 if generaldelta:
2578 base = r.deltaparent(i)
2577 base = r.deltaparent(i)
2579 else:
2578 else:
2580 base = r.chainbase(i)
2579 base = r.chainbase(i)
2581 if format == 0:
2580 if format == 0:
2582 try:
2581 try:
2583 pp = r.parents(node)
2582 pp = r.parents(node)
2584 except Exception:
2583 except Exception:
2585 pp = [nullid, nullid]
2584 pp = [nullid, nullid]
2586 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2585 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2587 i, r.start(i), r.length(i), base, r.linkrev(i),
2586 i, r.start(i), r.length(i), base, r.linkrev(i),
2588 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2587 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2589 elif format == 1:
2588 elif format == 1:
2590 pr = r.parentrevs(i)
2589 pr = r.parentrevs(i)
2591 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2590 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2592 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2591 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2593 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2592 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2594
2593
2595 @command('debugindexdot', debugrevlogopts,
2594 @command('debugindexdot', debugrevlogopts,
2596 _('-c|-m|FILE'), optionalrepo=True)
2595 _('-c|-m|FILE'), optionalrepo=True)
2597 def debugindexdot(ui, repo, file_=None, **opts):
2596 def debugindexdot(ui, repo, file_=None, **opts):
2598 """dump an index DAG as a graphviz dot file"""
2597 """dump an index DAG as a graphviz dot file"""
2599 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
2598 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
2600 ui.write(("digraph G {\n"))
2599 ui.write(("digraph G {\n"))
2601 for i in r:
2600 for i in r:
2602 node = r.node(i)
2601 node = r.node(i)
2603 pp = r.parents(node)
2602 pp = r.parents(node)
2604 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2603 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2605 if pp[1] != nullid:
2604 if pp[1] != nullid:
2606 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2605 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2607 ui.write("}\n")
2606 ui.write("}\n")
2608
2607
2609 @command('debugdeltachain',
2608 @command('debugdeltachain',
2610 debugrevlogopts + formatteropts,
2609 debugrevlogopts + formatteropts,
2611 _('-c|-m|FILE'),
2610 _('-c|-m|FILE'),
2612 optionalrepo=True)
2611 optionalrepo=True)
2613 def debugdeltachain(ui, repo, file_=None, **opts):
2612 def debugdeltachain(ui, repo, file_=None, **opts):
2614 """dump information about delta chains in a revlog
2613 """dump information about delta chains in a revlog
2615
2614
2616 Output can be templatized. Available template keywords are:
2615 Output can be templatized. Available template keywords are:
2617
2616
2618 :``rev``: revision number
2617 :``rev``: revision number
2619 :``chainid``: delta chain identifier (numbered by unique base)
2618 :``chainid``: delta chain identifier (numbered by unique base)
2620 :``chainlen``: delta chain length to this revision
2619 :``chainlen``: delta chain length to this revision
2621 :``prevrev``: previous revision in delta chain
2620 :``prevrev``: previous revision in delta chain
2622 :``deltatype``: role of delta / how it was computed
2621 :``deltatype``: role of delta / how it was computed
2623 :``compsize``: compressed size of revision
2622 :``compsize``: compressed size of revision
2624 :``uncompsize``: uncompressed size of revision
2623 :``uncompsize``: uncompressed size of revision
2625 :``chainsize``: total size of compressed revisions in chain
2624 :``chainsize``: total size of compressed revisions in chain
2626 :``chainratio``: total chain size divided by uncompressed revision size
2625 :``chainratio``: total chain size divided by uncompressed revision size
2627 (new delta chains typically start at ratio 2.00)
2626 (new delta chains typically start at ratio 2.00)
2628 :``lindist``: linear distance from base revision in delta chain to end
2627 :``lindist``: linear distance from base revision in delta chain to end
2629 of this revision
2628 of this revision
2630 :``extradist``: total size of revisions not part of this delta chain from
2629 :``extradist``: total size of revisions not part of this delta chain from
2631 base of delta chain to end of this revision; a measurement
2630 base of delta chain to end of this revision; a measurement
2632 of how much extra data we need to read/seek across to read
2631 of how much extra data we need to read/seek across to read
2633 the delta chain for this revision
2632 the delta chain for this revision
2634 :``extraratio``: extradist divided by chainsize; another representation of
2633 :``extraratio``: extradist divided by chainsize; another representation of
2635 how much unrelated data is needed to load this delta chain
2634 how much unrelated data is needed to load this delta chain
2636 """
2635 """
2637 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
2636 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
2638 index = r.index
2637 index = r.index
2639 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2638 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2640
2639
2641 def revinfo(rev):
2640 def revinfo(rev):
2642 e = index[rev]
2641 e = index[rev]
2643 compsize = e[1]
2642 compsize = e[1]
2644 uncompsize = e[2]
2643 uncompsize = e[2]
2645 chainsize = 0
2644 chainsize = 0
2646
2645
2647 if generaldelta:
2646 if generaldelta:
2648 if e[3] == e[5]:
2647 if e[3] == e[5]:
2649 deltatype = 'p1'
2648 deltatype = 'p1'
2650 elif e[3] == e[6]:
2649 elif e[3] == e[6]:
2651 deltatype = 'p2'
2650 deltatype = 'p2'
2652 elif e[3] == rev - 1:
2651 elif e[3] == rev - 1:
2653 deltatype = 'prev'
2652 deltatype = 'prev'
2654 elif e[3] == rev:
2653 elif e[3] == rev:
2655 deltatype = 'base'
2654 deltatype = 'base'
2656 else:
2655 else:
2657 deltatype = 'other'
2656 deltatype = 'other'
2658 else:
2657 else:
2659 if e[3] == rev:
2658 if e[3] == rev:
2660 deltatype = 'base'
2659 deltatype = 'base'
2661 else:
2660 else:
2662 deltatype = 'prev'
2661 deltatype = 'prev'
2663
2662
2664 chain = r._deltachain(rev)[0]
2663 chain = r._deltachain(rev)[0]
2665 for iterrev in chain:
2664 for iterrev in chain:
2666 e = index[iterrev]
2665 e = index[iterrev]
2667 chainsize += e[1]
2666 chainsize += e[1]
2668
2667
2669 return compsize, uncompsize, deltatype, chain, chainsize
2668 return compsize, uncompsize, deltatype, chain, chainsize
2670
2669
2671 fm = ui.formatter('debugdeltachain', opts)
2670 fm = ui.formatter('debugdeltachain', opts)
2672
2671
2673 fm.plain(' rev chain# chainlen prev delta '
2672 fm.plain(' rev chain# chainlen prev delta '
2674 'size rawsize chainsize ratio lindist extradist '
2673 'size rawsize chainsize ratio lindist extradist '
2675 'extraratio\n')
2674 'extraratio\n')
2676
2675
2677 chainbases = {}
2676 chainbases = {}
2678 for rev in r:
2677 for rev in r:
2679 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
2678 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
2680 chainbase = chain[0]
2679 chainbase = chain[0]
2681 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
2680 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
2682 basestart = r.start(chainbase)
2681 basestart = r.start(chainbase)
2683 revstart = r.start(rev)
2682 revstart = r.start(rev)
2684 lineardist = revstart + comp - basestart
2683 lineardist = revstart + comp - basestart
2685 extradist = lineardist - chainsize
2684 extradist = lineardist - chainsize
2686 try:
2685 try:
2687 prevrev = chain[-2]
2686 prevrev = chain[-2]
2688 except IndexError:
2687 except IndexError:
2689 prevrev = -1
2688 prevrev = -1
2690
2689
2691 chainratio = float(chainsize) / float(uncomp)
2690 chainratio = float(chainsize) / float(uncomp)
2692 extraratio = float(extradist) / float(chainsize)
2691 extraratio = float(extradist) / float(chainsize)
2693
2692
2694 fm.startitem()
2693 fm.startitem()
2695 fm.write('rev chainid chainlen prevrev deltatype compsize '
2694 fm.write('rev chainid chainlen prevrev deltatype compsize '
2696 'uncompsize chainsize chainratio lindist extradist '
2695 'uncompsize chainsize chainratio lindist extradist '
2697 'extraratio',
2696 'extraratio',
2698 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f\n',
2697 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f\n',
2699 rev, chainid, len(chain), prevrev, deltatype, comp,
2698 rev, chainid, len(chain), prevrev, deltatype, comp,
2700 uncomp, chainsize, chainratio, lineardist, extradist,
2699 uncomp, chainsize, chainratio, lineardist, extradist,
2701 extraratio,
2700 extraratio,
2702 rev=rev, chainid=chainid, chainlen=len(chain),
2701 rev=rev, chainid=chainid, chainlen=len(chain),
2703 prevrev=prevrev, deltatype=deltatype, compsize=comp,
2702 prevrev=prevrev, deltatype=deltatype, compsize=comp,
2704 uncompsize=uncomp, chainsize=chainsize,
2703 uncompsize=uncomp, chainsize=chainsize,
2705 chainratio=chainratio, lindist=lineardist,
2704 chainratio=chainratio, lindist=lineardist,
2706 extradist=extradist, extraratio=extraratio)
2705 extradist=extradist, extraratio=extraratio)
2707
2706
2708 fm.end()
2707 fm.end()
2709
2708
2710 @command('debuginstall', [] + formatteropts, '', norepo=True)
2709 @command('debuginstall', [] + formatteropts, '', norepo=True)
2711 def debuginstall(ui, **opts):
2710 def debuginstall(ui, **opts):
2712 '''test Mercurial installation
2711 '''test Mercurial installation
2713
2712
2714 Returns 0 on success.
2713 Returns 0 on success.
2715 '''
2714 '''
2716
2715
2717 def writetemp(contents):
2716 def writetemp(contents):
2718 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2717 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2719 f = os.fdopen(fd, "wb")
2718 f = os.fdopen(fd, "wb")
2720 f.write(contents)
2719 f.write(contents)
2721 f.close()
2720 f.close()
2722 return name
2721 return name
2723
2722
2724 problems = 0
2723 problems = 0
2725
2724
2726 fm = ui.formatter('debuginstall', opts)
2725 fm = ui.formatter('debuginstall', opts)
2727 fm.startitem()
2726 fm.startitem()
2728
2727
2729 # encoding
2728 # encoding
2730 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
2729 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
2731 err = None
2730 err = None
2732 try:
2731 try:
2733 encoding.fromlocal("test")
2732 encoding.fromlocal("test")
2734 except error.Abort as inst:
2733 except error.Abort as inst:
2735 err = inst
2734 err = inst
2736 problems += 1
2735 problems += 1
2737 fm.condwrite(err, 'encodingerror', _(" %s\n"
2736 fm.condwrite(err, 'encodingerror', _(" %s\n"
2738 " (check that your locale is properly set)\n"), err)
2737 " (check that your locale is properly set)\n"), err)
2739
2738
2740 # Python
2739 # Python
2741 fm.write('pythonexe', _("checking Python executable (%s)\n"),
2740 fm.write('pythonexe', _("checking Python executable (%s)\n"),
2742 sys.executable)
2741 sys.executable)
2743 fm.write('pythonver', _("checking Python version (%s)\n"),
2742 fm.write('pythonver', _("checking Python version (%s)\n"),
2744 ("%s.%s.%s" % sys.version_info[:3]))
2743 ("%s.%s.%s" % sys.version_info[:3]))
2745 fm.write('pythonlib', _("checking Python lib (%s)...\n"),
2744 fm.write('pythonlib', _("checking Python lib (%s)...\n"),
2746 os.path.dirname(os.__file__))
2745 os.path.dirname(os.__file__))
2747
2746
2748 # hg version
2747 # hg version
2749 hgver = util.version()
2748 hgver = util.version()
2750 fm.write('hgver', _("checking Mercurial version (%s)\n"),
2749 fm.write('hgver', _("checking Mercurial version (%s)\n"),
2751 hgver.split('+')[0])
2750 hgver.split('+')[0])
2752 fm.write('hgverextra', _("checking Mercurial custom build (%s)\n"),
2751 fm.write('hgverextra', _("checking Mercurial custom build (%s)\n"),
2753 '+'.join(hgver.split('+')[1:]))
2752 '+'.join(hgver.split('+')[1:]))
2754
2753
2755 # compiled modules
2754 # compiled modules
2756 fm.write('hgmodulepolicy', _("checking module policy (%s)\n"),
2755 fm.write('hgmodulepolicy', _("checking module policy (%s)\n"),
2757 policy.policy)
2756 policy.policy)
2758 fm.write('hgmodules', _("checking installed modules (%s)...\n"),
2757 fm.write('hgmodules', _("checking installed modules (%s)...\n"),
2759 os.path.dirname(__file__))
2758 os.path.dirname(__file__))
2760
2759
2761 err = None
2760 err = None
2762 try:
2761 try:
2763 from . import (
2762 from . import (
2764 base85,
2763 base85,
2765 bdiff,
2764 bdiff,
2766 mpatch,
2765 mpatch,
2767 osutil,
2766 osutil,
2768 )
2767 )
2769 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2768 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2770 except Exception as inst:
2769 except Exception as inst:
2771 err = inst
2770 err = inst
2772 problems += 1
2771 problems += 1
2773 fm.condwrite(err, 'extensionserror', " %s\n", err)
2772 fm.condwrite(err, 'extensionserror', " %s\n", err)
2774
2773
2775 # templates
2774 # templates
2776 p = templater.templatepaths()
2775 p = templater.templatepaths()
2777 fm.write('templatedirs', 'checking templates (%s)...\n', ' '.join(p))
2776 fm.write('templatedirs', 'checking templates (%s)...\n', ' '.join(p))
2778 fm.condwrite(not p, '', _(" no template directories found\n"))
2777 fm.condwrite(not p, '', _(" no template directories found\n"))
2779 if p:
2778 if p:
2780 m = templater.templatepath("map-cmdline.default")
2779 m = templater.templatepath("map-cmdline.default")
2781 if m:
2780 if m:
2782 # template found, check if it is working
2781 # template found, check if it is working
2783 err = None
2782 err = None
2784 try:
2783 try:
2785 templater.templater.frommapfile(m)
2784 templater.templater.frommapfile(m)
2786 except Exception as inst:
2785 except Exception as inst:
2787 err = inst
2786 err = inst
2788 p = None
2787 p = None
2789 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err)
2788 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err)
2790 else:
2789 else:
2791 p = None
2790 p = None
2792 fm.condwrite(p, 'defaulttemplate',
2791 fm.condwrite(p, 'defaulttemplate',
2793 _("checking default template (%s)\n"), m)
2792 _("checking default template (%s)\n"), m)
2794 fm.condwrite(not m, 'defaulttemplatenotfound',
2793 fm.condwrite(not m, 'defaulttemplatenotfound',
2795 _(" template '%s' not found\n"), "default")
2794 _(" template '%s' not found\n"), "default")
2796 if not p:
2795 if not p:
2797 problems += 1
2796 problems += 1
2798 fm.condwrite(not p, '',
2797 fm.condwrite(not p, '',
2799 _(" (templates seem to have been installed incorrectly)\n"))
2798 _(" (templates seem to have been installed incorrectly)\n"))
2800
2799
2801 # editor
2800 # editor
2802 editor = ui.geteditor()
2801 editor = ui.geteditor()
2803 editor = util.expandpath(editor)
2802 editor = util.expandpath(editor)
2804 fm.write('editor', _("checking commit editor... (%s)\n"), editor)
2803 fm.write('editor', _("checking commit editor... (%s)\n"), editor)
2805 cmdpath = util.findexe(shlex.split(editor)[0])
2804 cmdpath = util.findexe(shlex.split(editor)[0])
2806 fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
2805 fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
2807 _(" No commit editor set and can't find %s in PATH\n"
2806 _(" No commit editor set and can't find %s in PATH\n"
2808 " (specify a commit editor in your configuration"
2807 " (specify a commit editor in your configuration"
2809 " file)\n"), not cmdpath and editor == 'vi' and editor)
2808 " file)\n"), not cmdpath and editor == 'vi' and editor)
2810 fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
2809 fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
2811 _(" Can't find editor '%s' in PATH\n"
2810 _(" Can't find editor '%s' in PATH\n"
2812 " (specify a commit editor in your configuration"
2811 " (specify a commit editor in your configuration"
2813 " file)\n"), not cmdpath and editor)
2812 " file)\n"), not cmdpath and editor)
2814 if not cmdpath and editor != 'vi':
2813 if not cmdpath and editor != 'vi':
2815 problems += 1
2814 problems += 1
2816
2815
2817 # check username
2816 # check username
2818 username = None
2817 username = None
2819 err = None
2818 err = None
2820 try:
2819 try:
2821 username = ui.username()
2820 username = ui.username()
2822 except error.Abort as e:
2821 except error.Abort as e:
2823 err = e
2822 err = e
2824 problems += 1
2823 problems += 1
2825
2824
2826 fm.condwrite(username, 'username', _("checking username (%s)\n"), username)
2825 fm.condwrite(username, 'username', _("checking username (%s)\n"), username)
2827 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n"
2826 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n"
2828 " (specify a username in your configuration file)\n"), err)
2827 " (specify a username in your configuration file)\n"), err)
2829
2828
2830 fm.condwrite(not problems, '',
2829 fm.condwrite(not problems, '',
2831 _("no problems detected\n"))
2830 _("no problems detected\n"))
2832 if not problems:
2831 if not problems:
2833 fm.data(problems=problems)
2832 fm.data(problems=problems)
2834 fm.condwrite(problems, 'problems',
2833 fm.condwrite(problems, 'problems',
2835 _("%s problems detected,"
2834 _("%s problems detected,"
2836 " please check your install!\n"), problems)
2835 " please check your install!\n"), problems)
2837 fm.end()
2836 fm.end()
2838
2837
2839 return problems
2838 return problems
2840
2839
2841 @command('debugknown', [], _('REPO ID...'), norepo=True)
2840 @command('debugknown', [], _('REPO ID...'), norepo=True)
2842 def debugknown(ui, repopath, *ids, **opts):
2841 def debugknown(ui, repopath, *ids, **opts):
2843 """test whether node ids are known to a repo
2842 """test whether node ids are known to a repo
2844
2843
2845 Every ID must be a full-length hex node id string. Returns a list of 0s
2844 Every ID must be a full-length hex node id string. Returns a list of 0s
2846 and 1s indicating unknown/known.
2845 and 1s indicating unknown/known.
2847 """
2846 """
2848 repo = hg.peer(ui, opts, repopath)
2847 repo = hg.peer(ui, opts, repopath)
2849 if not repo.capable('known'):
2848 if not repo.capable('known'):
2850 raise error.Abort("known() not supported by target repository")
2849 raise error.Abort("known() not supported by target repository")
2851 flags = repo.known([bin(s) for s in ids])
2850 flags = repo.known([bin(s) for s in ids])
2852 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2851 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2853
2852
2854 @command('debuglabelcomplete', [], _('LABEL...'))
2853 @command('debuglabelcomplete', [], _('LABEL...'))
2855 def debuglabelcomplete(ui, repo, *args):
2854 def debuglabelcomplete(ui, repo, *args):
2856 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2855 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2857 debugnamecomplete(ui, repo, *args)
2856 debugnamecomplete(ui, repo, *args)
2858
2857
2859 @command('debugmergestate', [], '')
2858 @command('debugmergestate', [], '')
2860 def debugmergestate(ui, repo, *args):
2859 def debugmergestate(ui, repo, *args):
2861 """print merge state
2860 """print merge state
2862
2861
2863 Use --verbose to print out information about whether v1 or v2 merge state
2862 Use --verbose to print out information about whether v1 or v2 merge state
2864 was chosen."""
2863 was chosen."""
2865 def _hashornull(h):
2864 def _hashornull(h):
2866 if h == nullhex:
2865 if h == nullhex:
2867 return 'null'
2866 return 'null'
2868 else:
2867 else:
2869 return h
2868 return h
2870
2869
2871 def printrecords(version):
2870 def printrecords(version):
2872 ui.write(('* version %s records\n') % version)
2871 ui.write(('* version %s records\n') % version)
2873 if version == 1:
2872 if version == 1:
2874 records = v1records
2873 records = v1records
2875 else:
2874 else:
2876 records = v2records
2875 records = v2records
2877
2876
2878 for rtype, record in records:
2877 for rtype, record in records:
2879 # pretty print some record types
2878 # pretty print some record types
2880 if rtype == 'L':
2879 if rtype == 'L':
2881 ui.write(('local: %s\n') % record)
2880 ui.write(('local: %s\n') % record)
2882 elif rtype == 'O':
2881 elif rtype == 'O':
2883 ui.write(('other: %s\n') % record)
2882 ui.write(('other: %s\n') % record)
2884 elif rtype == 'm':
2883 elif rtype == 'm':
2885 driver, mdstate = record.split('\0', 1)
2884 driver, mdstate = record.split('\0', 1)
2886 ui.write(('merge driver: %s (state "%s")\n')
2885 ui.write(('merge driver: %s (state "%s")\n')
2887 % (driver, mdstate))
2886 % (driver, mdstate))
2888 elif rtype in 'FDC':
2887 elif rtype in 'FDC':
2889 r = record.split('\0')
2888 r = record.split('\0')
2890 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2889 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2891 if version == 1:
2890 if version == 1:
2892 onode = 'not stored in v1 format'
2891 onode = 'not stored in v1 format'
2893 flags = r[7]
2892 flags = r[7]
2894 else:
2893 else:
2895 onode, flags = r[7:9]
2894 onode, flags = r[7:9]
2896 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2895 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2897 % (f, rtype, state, _hashornull(hash)))
2896 % (f, rtype, state, _hashornull(hash)))
2898 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2897 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2899 ui.write((' ancestor path: %s (node %s)\n')
2898 ui.write((' ancestor path: %s (node %s)\n')
2900 % (afile, _hashornull(anode)))
2899 % (afile, _hashornull(anode)))
2901 ui.write((' other path: %s (node %s)\n')
2900 ui.write((' other path: %s (node %s)\n')
2902 % (ofile, _hashornull(onode)))
2901 % (ofile, _hashornull(onode)))
2903 elif rtype == 'f':
2902 elif rtype == 'f':
2904 filename, rawextras = record.split('\0', 1)
2903 filename, rawextras = record.split('\0', 1)
2905 extras = rawextras.split('\0')
2904 extras = rawextras.split('\0')
2906 i = 0
2905 i = 0
2907 extrastrings = []
2906 extrastrings = []
2908 while i < len(extras):
2907 while i < len(extras):
2909 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
2908 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
2910 i += 2
2909 i += 2
2911
2910
2912 ui.write(('file extras: %s (%s)\n')
2911 ui.write(('file extras: %s (%s)\n')
2913 % (filename, ', '.join(extrastrings)))
2912 % (filename, ', '.join(extrastrings)))
2914 elif rtype == 'l':
2913 elif rtype == 'l':
2915 labels = record.split('\0', 2)
2914 labels = record.split('\0', 2)
2916 labels = [l for l in labels if len(l) > 0]
2915 labels = [l for l in labels if len(l) > 0]
2917 ui.write(('labels:\n'))
2916 ui.write(('labels:\n'))
2918 ui.write((' local: %s\n' % labels[0]))
2917 ui.write((' local: %s\n' % labels[0]))
2919 ui.write((' other: %s\n' % labels[1]))
2918 ui.write((' other: %s\n' % labels[1]))
2920 if len(labels) > 2:
2919 if len(labels) > 2:
2921 ui.write((' base: %s\n' % labels[2]))
2920 ui.write((' base: %s\n' % labels[2]))
2922 else:
2921 else:
2923 ui.write(('unrecognized entry: %s\t%s\n')
2922 ui.write(('unrecognized entry: %s\t%s\n')
2924 % (rtype, record.replace('\0', '\t')))
2923 % (rtype, record.replace('\0', '\t')))
2925
2924
2926 # Avoid mergestate.read() since it may raise an exception for unsupported
2925 # Avoid mergestate.read() since it may raise an exception for unsupported
2927 # merge state records. We shouldn't be doing this, but this is OK since this
2926 # merge state records. We shouldn't be doing this, but this is OK since this
2928 # command is pretty low-level.
2927 # command is pretty low-level.
2929 ms = mergemod.mergestate(repo)
2928 ms = mergemod.mergestate(repo)
2930
2929
2931 # sort so that reasonable information is on top
2930 # sort so that reasonable information is on top
2932 v1records = ms._readrecordsv1()
2931 v1records = ms._readrecordsv1()
2933 v2records = ms._readrecordsv2()
2932 v2records = ms._readrecordsv2()
2934 order = 'LOml'
2933 order = 'LOml'
2935 def key(r):
2934 def key(r):
2936 idx = order.find(r[0])
2935 idx = order.find(r[0])
2937 if idx == -1:
2936 if idx == -1:
2938 return (1, r[1])
2937 return (1, r[1])
2939 else:
2938 else:
2940 return (0, idx)
2939 return (0, idx)
2941 v1records.sort(key=key)
2940 v1records.sort(key=key)
2942 v2records.sort(key=key)
2941 v2records.sort(key=key)
2943
2942
2944 if not v1records and not v2records:
2943 if not v1records and not v2records:
2945 ui.write(('no merge state found\n'))
2944 ui.write(('no merge state found\n'))
2946 elif not v2records:
2945 elif not v2records:
2947 ui.note(('no version 2 merge state\n'))
2946 ui.note(('no version 2 merge state\n'))
2948 printrecords(1)
2947 printrecords(1)
2949 elif ms._v1v2match(v1records, v2records):
2948 elif ms._v1v2match(v1records, v2records):
2950 ui.note(('v1 and v2 states match: using v2\n'))
2949 ui.note(('v1 and v2 states match: using v2\n'))
2951 printrecords(2)
2950 printrecords(2)
2952 else:
2951 else:
2953 ui.note(('v1 and v2 states mismatch: using v1\n'))
2952 ui.note(('v1 and v2 states mismatch: using v1\n'))
2954 printrecords(1)
2953 printrecords(1)
2955 if ui.verbose:
2954 if ui.verbose:
2956 printrecords(2)
2955 printrecords(2)
2957
2956
2958 @command('debugnamecomplete', [], _('NAME...'))
2957 @command('debugnamecomplete', [], _('NAME...'))
2959 def debugnamecomplete(ui, repo, *args):
2958 def debugnamecomplete(ui, repo, *args):
2960 '''complete "names" - tags, open branch names, bookmark names'''
2959 '''complete "names" - tags, open branch names, bookmark names'''
2961
2960
2962 names = set()
2961 names = set()
2963 # since we previously only listed open branches, we will handle that
2962 # since we previously only listed open branches, we will handle that
2964 # specially (after this for loop)
2963 # specially (after this for loop)
2965 for name, ns in repo.names.iteritems():
2964 for name, ns in repo.names.iteritems():
2966 if name != 'branches':
2965 if name != 'branches':
2967 names.update(ns.listnames(repo))
2966 names.update(ns.listnames(repo))
2968 names.update(tag for (tag, heads, tip, closed)
2967 names.update(tag for (tag, heads, tip, closed)
2969 in repo.branchmap().iterbranches() if not closed)
2968 in repo.branchmap().iterbranches() if not closed)
2970 completions = set()
2969 completions = set()
2971 if not args:
2970 if not args:
2972 args = ['']
2971 args = ['']
2973 for a in args:
2972 for a in args:
2974 completions.update(n for n in names if n.startswith(a))
2973 completions.update(n for n in names if n.startswith(a))
2975 ui.write('\n'.join(sorted(completions)))
2974 ui.write('\n'.join(sorted(completions)))
2976 ui.write('\n')
2975 ui.write('\n')
2977
2976
2978 @command('debuglocks',
2977 @command('debuglocks',
2979 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2978 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2980 ('W', 'force-wlock', None,
2979 ('W', 'force-wlock', None,
2981 _('free the working state lock (DANGEROUS)'))],
2980 _('free the working state lock (DANGEROUS)'))],
2982 _('[OPTION]...'))
2981 _('[OPTION]...'))
2983 def debuglocks(ui, repo, **opts):
2982 def debuglocks(ui, repo, **opts):
2984 """show or modify state of locks
2983 """show or modify state of locks
2985
2984
2986 By default, this command will show which locks are held. This
2985 By default, this command will show which locks are held. This
2987 includes the user and process holding the lock, the amount of time
2986 includes the user and process holding the lock, the amount of time
2988 the lock has been held, and the machine name where the process is
2987 the lock has been held, and the machine name where the process is
2989 running if it's not local.
2988 running if it's not local.
2990
2989
2991 Locks protect the integrity of Mercurial's data, so should be
2990 Locks protect the integrity of Mercurial's data, so should be
2992 treated with care. System crashes or other interruptions may cause
2991 treated with care. System crashes or other interruptions may cause
2993 locks to not be properly released, though Mercurial will usually
2992 locks to not be properly released, though Mercurial will usually
2994 detect and remove such stale locks automatically.
2993 detect and remove such stale locks automatically.
2995
2994
2996 However, detecting stale locks may not always be possible (for
2995 However, detecting stale locks may not always be possible (for
2997 instance, on a shared filesystem). Removing locks may also be
2996 instance, on a shared filesystem). Removing locks may also be
2998 blocked by filesystem permissions.
2997 blocked by filesystem permissions.
2999
2998
3000 Returns 0 if no locks are held.
2999 Returns 0 if no locks are held.
3001
3000
3002 """
3001 """
3003
3002
3004 if opts.get('force_lock'):
3003 if opts.get('force_lock'):
3005 repo.svfs.unlink('lock')
3004 repo.svfs.unlink('lock')
3006 if opts.get('force_wlock'):
3005 if opts.get('force_wlock'):
3007 repo.vfs.unlink('wlock')
3006 repo.vfs.unlink('wlock')
3008 if opts.get('force_lock') or opts.get('force_lock'):
3007 if opts.get('force_lock') or opts.get('force_lock'):
3009 return 0
3008 return 0
3010
3009
3011 now = time.time()
3010 now = time.time()
3012 held = 0
3011 held = 0
3013
3012
3014 def report(vfs, name, method):
3013 def report(vfs, name, method):
3015 # this causes stale locks to get reaped for more accurate reporting
3014 # this causes stale locks to get reaped for more accurate reporting
3016 try:
3015 try:
3017 l = method(False)
3016 l = method(False)
3018 except error.LockHeld:
3017 except error.LockHeld:
3019 l = None
3018 l = None
3020
3019
3021 if l:
3020 if l:
3022 l.release()
3021 l.release()
3023 else:
3022 else:
3024 try:
3023 try:
3025 stat = vfs.lstat(name)
3024 stat = vfs.lstat(name)
3026 age = now - stat.st_mtime
3025 age = now - stat.st_mtime
3027 user = util.username(stat.st_uid)
3026 user = util.username(stat.st_uid)
3028 locker = vfs.readlock(name)
3027 locker = vfs.readlock(name)
3029 if ":" in locker:
3028 if ":" in locker:
3030 host, pid = locker.split(':')
3029 host, pid = locker.split(':')
3031 if host == socket.gethostname():
3030 if host == socket.gethostname():
3032 locker = 'user %s, process %s' % (user, pid)
3031 locker = 'user %s, process %s' % (user, pid)
3033 else:
3032 else:
3034 locker = 'user %s, process %s, host %s' \
3033 locker = 'user %s, process %s, host %s' \
3035 % (user, pid, host)
3034 % (user, pid, host)
3036 ui.write(("%-6s %s (%ds)\n") % (name + ":", locker, age))
3035 ui.write(("%-6s %s (%ds)\n") % (name + ":", locker, age))
3037 return 1
3036 return 1
3038 except OSError as e:
3037 except OSError as e:
3039 if e.errno != errno.ENOENT:
3038 if e.errno != errno.ENOENT:
3040 raise
3039 raise
3041
3040
3042 ui.write(("%-6s free\n") % (name + ":"))
3041 ui.write(("%-6s free\n") % (name + ":"))
3043 return 0
3042 return 0
3044
3043
3045 held += report(repo.svfs, "lock", repo.lock)
3044 held += report(repo.svfs, "lock", repo.lock)
3046 held += report(repo.vfs, "wlock", repo.wlock)
3045 held += report(repo.vfs, "wlock", repo.wlock)
3047
3046
3048 return held
3047 return held
3049
3048
3050 @command('debugobsolete',
3049 @command('debugobsolete',
3051 [('', 'flags', 0, _('markers flag')),
3050 [('', 'flags', 0, _('markers flag')),
3052 ('', 'record-parents', False,
3051 ('', 'record-parents', False,
3053 _('record parent information for the precursor')),
3052 _('record parent information for the precursor')),
3054 ('r', 'rev', [], _('display markers relevant to REV')),
3053 ('r', 'rev', [], _('display markers relevant to REV')),
3055 ('', 'index', False, _('display index of the marker')),
3054 ('', 'index', False, _('display index of the marker')),
3056 ('', 'delete', [], _('delete markers specified by indices')),
3055 ('', 'delete', [], _('delete markers specified by indices')),
3057 ] + commitopts2 + formatteropts,
3056 ] + commitopts2 + formatteropts,
3058 _('[OBSOLETED [REPLACEMENT ...]]'))
3057 _('[OBSOLETED [REPLACEMENT ...]]'))
3059 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
3058 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
3060 """create arbitrary obsolete marker
3059 """create arbitrary obsolete marker
3061
3060
3062 With no arguments, displays the list of obsolescence markers."""
3061 With no arguments, displays the list of obsolescence markers."""
3063
3062
3064 def parsenodeid(s):
3063 def parsenodeid(s):
3065 try:
3064 try:
3066 # We do not use revsingle/revrange functions here to accept
3065 # We do not use revsingle/revrange functions here to accept
3067 # arbitrary node identifiers, possibly not present in the
3066 # arbitrary node identifiers, possibly not present in the
3068 # local repository.
3067 # local repository.
3069 n = bin(s)
3068 n = bin(s)
3070 if len(n) != len(nullid):
3069 if len(n) != len(nullid):
3071 raise TypeError()
3070 raise TypeError()
3072 return n
3071 return n
3073 except TypeError:
3072 except TypeError:
3074 raise error.Abort('changeset references must be full hexadecimal '
3073 raise error.Abort('changeset references must be full hexadecimal '
3075 'node identifiers')
3074 'node identifiers')
3076
3075
3077 if opts.get('delete'):
3076 if opts.get('delete'):
3078 indices = []
3077 indices = []
3079 for v in opts.get('delete'):
3078 for v in opts.get('delete'):
3080 try:
3079 try:
3081 indices.append(int(v))
3080 indices.append(int(v))
3082 except ValueError:
3081 except ValueError:
3083 raise error.Abort(_('invalid index value: %r') % v,
3082 raise error.Abort(_('invalid index value: %r') % v,
3084 hint=_('use integers for indices'))
3083 hint=_('use integers for indices'))
3085
3084
3086 if repo.currenttransaction():
3085 if repo.currenttransaction():
3087 raise error.Abort(_('cannot delete obsmarkers in the middle '
3086 raise error.Abort(_('cannot delete obsmarkers in the middle '
3088 'of transaction.'))
3087 'of transaction.'))
3089
3088
3090 with repo.lock():
3089 with repo.lock():
3091 n = repair.deleteobsmarkers(repo.obsstore, indices)
3090 n = repair.deleteobsmarkers(repo.obsstore, indices)
3092 ui.write(_('deleted %i obsolescense markers\n') % n)
3091 ui.write(_('deleted %i obsolescense markers\n') % n)
3093
3092
3094 return
3093 return
3095
3094
3096 if precursor is not None:
3095 if precursor is not None:
3097 if opts['rev']:
3096 if opts['rev']:
3098 raise error.Abort('cannot select revision when creating marker')
3097 raise error.Abort('cannot select revision when creating marker')
3099 metadata = {}
3098 metadata = {}
3100 metadata['user'] = opts['user'] or ui.username()
3099 metadata['user'] = opts['user'] or ui.username()
3101 succs = tuple(parsenodeid(succ) for succ in successors)
3100 succs = tuple(parsenodeid(succ) for succ in successors)
3102 l = repo.lock()
3101 l = repo.lock()
3103 try:
3102 try:
3104 tr = repo.transaction('debugobsolete')
3103 tr = repo.transaction('debugobsolete')
3105 try:
3104 try:
3106 date = opts.get('date')
3105 date = opts.get('date')
3107 if date:
3106 if date:
3108 date = util.parsedate(date)
3107 date = util.parsedate(date)
3109 else:
3108 else:
3110 date = None
3109 date = None
3111 prec = parsenodeid(precursor)
3110 prec = parsenodeid(precursor)
3112 parents = None
3111 parents = None
3113 if opts['record_parents']:
3112 if opts['record_parents']:
3114 if prec not in repo.unfiltered():
3113 if prec not in repo.unfiltered():
3115 raise error.Abort('cannot used --record-parents on '
3114 raise error.Abort('cannot used --record-parents on '
3116 'unknown changesets')
3115 'unknown changesets')
3117 parents = repo.unfiltered()[prec].parents()
3116 parents = repo.unfiltered()[prec].parents()
3118 parents = tuple(p.node() for p in parents)
3117 parents = tuple(p.node() for p in parents)
3119 repo.obsstore.create(tr, prec, succs, opts['flags'],
3118 repo.obsstore.create(tr, prec, succs, opts['flags'],
3120 parents=parents, date=date,
3119 parents=parents, date=date,
3121 metadata=metadata)
3120 metadata=metadata)
3122 tr.close()
3121 tr.close()
3123 except ValueError as exc:
3122 except ValueError as exc:
3124 raise error.Abort(_('bad obsmarker input: %s') % exc)
3123 raise error.Abort(_('bad obsmarker input: %s') % exc)
3125 finally:
3124 finally:
3126 tr.release()
3125 tr.release()
3127 finally:
3126 finally:
3128 l.release()
3127 l.release()
3129 else:
3128 else:
3130 if opts['rev']:
3129 if opts['rev']:
3131 revs = scmutil.revrange(repo, opts['rev'])
3130 revs = scmutil.revrange(repo, opts['rev'])
3132 nodes = [repo[r].node() for r in revs]
3131 nodes = [repo[r].node() for r in revs]
3133 markers = list(obsolete.getmarkers(repo, nodes=nodes))
3132 markers = list(obsolete.getmarkers(repo, nodes=nodes))
3134 markers.sort(key=lambda x: x._data)
3133 markers.sort(key=lambda x: x._data)
3135 else:
3134 else:
3136 markers = obsolete.getmarkers(repo)
3135 markers = obsolete.getmarkers(repo)
3137
3136
3138 markerstoiter = markers
3137 markerstoiter = markers
3139 isrelevant = lambda m: True
3138 isrelevant = lambda m: True
3140 if opts.get('rev') and opts.get('index'):
3139 if opts.get('rev') and opts.get('index'):
3141 markerstoiter = obsolete.getmarkers(repo)
3140 markerstoiter = obsolete.getmarkers(repo)
3142 markerset = set(markers)
3141 markerset = set(markers)
3143 isrelevant = lambda m: m in markerset
3142 isrelevant = lambda m: m in markerset
3144
3143
3145 fm = ui.formatter('debugobsolete', opts)
3144 fm = ui.formatter('debugobsolete', opts)
3146 for i, m in enumerate(markerstoiter):
3145 for i, m in enumerate(markerstoiter):
3147 if not isrelevant(m):
3146 if not isrelevant(m):
3148 # marker can be irrelevant when we're iterating over a set
3147 # marker can be irrelevant when we're iterating over a set
3149 # of markers (markerstoiter) which is bigger than the set
3148 # of markers (markerstoiter) which is bigger than the set
3150 # of markers we want to display (markers)
3149 # of markers we want to display (markers)
3151 # this can happen if both --index and --rev options are
3150 # this can happen if both --index and --rev options are
3152 # provided and thus we need to iterate over all of the markers
3151 # provided and thus we need to iterate over all of the markers
3153 # to get the correct indices, but only display the ones that
3152 # to get the correct indices, but only display the ones that
3154 # are relevant to --rev value
3153 # are relevant to --rev value
3155 continue
3154 continue
3156 fm.startitem()
3155 fm.startitem()
3157 ind = i if opts.get('index') else None
3156 ind = i if opts.get('index') else None
3158 cmdutil.showmarker(fm, m, index=ind)
3157 cmdutil.showmarker(fm, m, index=ind)
3159 fm.end()
3158 fm.end()
3160
3159
3161 @command('debugpathcomplete',
3160 @command('debugpathcomplete',
3162 [('f', 'full', None, _('complete an entire path')),
3161 [('f', 'full', None, _('complete an entire path')),
3163 ('n', 'normal', None, _('show only normal files')),
3162 ('n', 'normal', None, _('show only normal files')),
3164 ('a', 'added', None, _('show only added files')),
3163 ('a', 'added', None, _('show only added files')),
3165 ('r', 'removed', None, _('show only removed files'))],
3164 ('r', 'removed', None, _('show only removed files'))],
3166 _('FILESPEC...'))
3165 _('FILESPEC...'))
3167 def debugpathcomplete(ui, repo, *specs, **opts):
3166 def debugpathcomplete(ui, repo, *specs, **opts):
3168 '''complete part or all of a tracked path
3167 '''complete part or all of a tracked path
3169
3168
3170 This command supports shells that offer path name completion. It
3169 This command supports shells that offer path name completion. It
3171 currently completes only files already known to the dirstate.
3170 currently completes only files already known to the dirstate.
3172
3171
3173 Completion extends only to the next path segment unless
3172 Completion extends only to the next path segment unless
3174 --full is specified, in which case entire paths are used.'''
3173 --full is specified, in which case entire paths are used.'''
3175
3174
3176 def complete(path, acceptable):
3175 def complete(path, acceptable):
3177 dirstate = repo.dirstate
3176 dirstate = repo.dirstate
3178 spec = os.path.normpath(os.path.join(os.getcwd(), path))
3177 spec = os.path.normpath(os.path.join(os.getcwd(), path))
3179 rootdir = repo.root + os.sep
3178 rootdir = repo.root + os.sep
3180 if spec != repo.root and not spec.startswith(rootdir):
3179 if spec != repo.root and not spec.startswith(rootdir):
3181 return [], []
3180 return [], []
3182 if os.path.isdir(spec):
3181 if os.path.isdir(spec):
3183 spec += '/'
3182 spec += '/'
3184 spec = spec[len(rootdir):]
3183 spec = spec[len(rootdir):]
3185 fixpaths = os.sep != '/'
3184 fixpaths = os.sep != '/'
3186 if fixpaths:
3185 if fixpaths:
3187 spec = spec.replace(os.sep, '/')
3186 spec = spec.replace(os.sep, '/')
3188 speclen = len(spec)
3187 speclen = len(spec)
3189 fullpaths = opts['full']
3188 fullpaths = opts['full']
3190 files, dirs = set(), set()
3189 files, dirs = set(), set()
3191 adddir, addfile = dirs.add, files.add
3190 adddir, addfile = dirs.add, files.add
3192 for f, st in dirstate.iteritems():
3191 for f, st in dirstate.iteritems():
3193 if f.startswith(spec) and st[0] in acceptable:
3192 if f.startswith(spec) and st[0] in acceptable:
3194 if fixpaths:
3193 if fixpaths:
3195 f = f.replace('/', os.sep)
3194 f = f.replace('/', os.sep)
3196 if fullpaths:
3195 if fullpaths:
3197 addfile(f)
3196 addfile(f)
3198 continue
3197 continue
3199 s = f.find(os.sep, speclen)
3198 s = f.find(os.sep, speclen)
3200 if s >= 0:
3199 if s >= 0:
3201 adddir(f[:s])
3200 adddir(f[:s])
3202 else:
3201 else:
3203 addfile(f)
3202 addfile(f)
3204 return files, dirs
3203 return files, dirs
3205
3204
3206 acceptable = ''
3205 acceptable = ''
3207 if opts['normal']:
3206 if opts['normal']:
3208 acceptable += 'nm'
3207 acceptable += 'nm'
3209 if opts['added']:
3208 if opts['added']:
3210 acceptable += 'a'
3209 acceptable += 'a'
3211 if opts['removed']:
3210 if opts['removed']:
3212 acceptable += 'r'
3211 acceptable += 'r'
3213 cwd = repo.getcwd()
3212 cwd = repo.getcwd()
3214 if not specs:
3213 if not specs:
3215 specs = ['.']
3214 specs = ['.']
3216
3215
3217 files, dirs = set(), set()
3216 files, dirs = set(), set()
3218 for spec in specs:
3217 for spec in specs:
3219 f, d = complete(spec, acceptable or 'nmar')
3218 f, d = complete(spec, acceptable or 'nmar')
3220 files.update(f)
3219 files.update(f)
3221 dirs.update(d)
3220 dirs.update(d)
3222 files.update(dirs)
3221 files.update(dirs)
3223 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3222 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3224 ui.write('\n')
3223 ui.write('\n')
3225
3224
3226 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3225 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3227 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3226 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3228 '''access the pushkey key/value protocol
3227 '''access the pushkey key/value protocol
3229
3228
3230 With two args, list the keys in the given namespace.
3229 With two args, list the keys in the given namespace.
3231
3230
3232 With five args, set a key to new if it currently is set to old.
3231 With five args, set a key to new if it currently is set to old.
3233 Reports success or failure.
3232 Reports success or failure.
3234 '''
3233 '''
3235
3234
3236 target = hg.peer(ui, {}, repopath)
3235 target = hg.peer(ui, {}, repopath)
3237 if keyinfo:
3236 if keyinfo:
3238 key, old, new = keyinfo
3237 key, old, new = keyinfo
3239 r = target.pushkey(namespace, key, old, new)
3238 r = target.pushkey(namespace, key, old, new)
3240 ui.status(str(r) + '\n')
3239 ui.status(str(r) + '\n')
3241 return not r
3240 return not r
3242 else:
3241 else:
3243 for k, v in sorted(target.listkeys(namespace).iteritems()):
3242 for k, v in sorted(target.listkeys(namespace).iteritems()):
3244 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3243 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3245 v.encode('string-escape')))
3244 v.encode('string-escape')))
3246
3245
3247 @command('debugpvec', [], _('A B'))
3246 @command('debugpvec', [], _('A B'))
3248 def debugpvec(ui, repo, a, b=None):
3247 def debugpvec(ui, repo, a, b=None):
3249 ca = scmutil.revsingle(repo, a)
3248 ca = scmutil.revsingle(repo, a)
3250 cb = scmutil.revsingle(repo, b)
3249 cb = scmutil.revsingle(repo, b)
3251 pa = pvec.ctxpvec(ca)
3250 pa = pvec.ctxpvec(ca)
3252 pb = pvec.ctxpvec(cb)
3251 pb = pvec.ctxpvec(cb)
3253 if pa == pb:
3252 if pa == pb:
3254 rel = "="
3253 rel = "="
3255 elif pa > pb:
3254 elif pa > pb:
3256 rel = ">"
3255 rel = ">"
3257 elif pa < pb:
3256 elif pa < pb:
3258 rel = "<"
3257 rel = "<"
3259 elif pa | pb:
3258 elif pa | pb:
3260 rel = "|"
3259 rel = "|"
3261 ui.write(_("a: %s\n") % pa)
3260 ui.write(_("a: %s\n") % pa)
3262 ui.write(_("b: %s\n") % pb)
3261 ui.write(_("b: %s\n") % pb)
3263 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3262 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3264 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3263 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3265 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3264 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3266 pa.distance(pb), rel))
3265 pa.distance(pb), rel))
3267
3266
3268 @command('debugrebuilddirstate|debugrebuildstate',
3267 @command('debugrebuilddirstate|debugrebuildstate',
3269 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3268 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3270 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3269 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3271 'the working copy parent')),
3270 'the working copy parent')),
3272 ],
3271 ],
3273 _('[-r REV]'))
3272 _('[-r REV]'))
3274 def debugrebuilddirstate(ui, repo, rev, **opts):
3273 def debugrebuilddirstate(ui, repo, rev, **opts):
3275 """rebuild the dirstate as it would look like for the given revision
3274 """rebuild the dirstate as it would look like for the given revision
3276
3275
3277 If no revision is specified the first current parent will be used.
3276 If no revision is specified the first current parent will be used.
3278
3277
3279 The dirstate will be set to the files of the given revision.
3278 The dirstate will be set to the files of the given revision.
3280 The actual working directory content or existing dirstate
3279 The actual working directory content or existing dirstate
3281 information such as adds or removes is not considered.
3280 information such as adds or removes is not considered.
3282
3281
3283 ``minimal`` will only rebuild the dirstate status for files that claim to be
3282 ``minimal`` will only rebuild the dirstate status for files that claim to be
3284 tracked but are not in the parent manifest, or that exist in the parent
3283 tracked but are not in the parent manifest, or that exist in the parent
3285 manifest but are not in the dirstate. It will not change adds, removes, or
3284 manifest but are not in the dirstate. It will not change adds, removes, or
3286 modified files that are in the working copy parent.
3285 modified files that are in the working copy parent.
3287
3286
3288 One use of this command is to make the next :hg:`status` invocation
3287 One use of this command is to make the next :hg:`status` invocation
3289 check the actual file content.
3288 check the actual file content.
3290 """
3289 """
3291 ctx = scmutil.revsingle(repo, rev)
3290 ctx = scmutil.revsingle(repo, rev)
3292 with repo.wlock():
3291 with repo.wlock():
3293 dirstate = repo.dirstate
3292 dirstate = repo.dirstate
3294 changedfiles = None
3293 changedfiles = None
3295 # See command doc for what minimal does.
3294 # See command doc for what minimal does.
3296 if opts.get('minimal'):
3295 if opts.get('minimal'):
3297 manifestfiles = set(ctx.manifest().keys())
3296 manifestfiles = set(ctx.manifest().keys())
3298 dirstatefiles = set(dirstate)
3297 dirstatefiles = set(dirstate)
3299 manifestonly = manifestfiles - dirstatefiles
3298 manifestonly = manifestfiles - dirstatefiles
3300 dsonly = dirstatefiles - manifestfiles
3299 dsonly = dirstatefiles - manifestfiles
3301 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3300 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3302 changedfiles = manifestonly | dsnotadded
3301 changedfiles = manifestonly | dsnotadded
3303
3302
3304 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3303 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3305
3304
3306 @command('debugrebuildfncache', [], '')
3305 @command('debugrebuildfncache', [], '')
3307 def debugrebuildfncache(ui, repo):
3306 def debugrebuildfncache(ui, repo):
3308 """rebuild the fncache file"""
3307 """rebuild the fncache file"""
3309 repair.rebuildfncache(ui, repo)
3308 repair.rebuildfncache(ui, repo)
3310
3309
3311 @command('debugrename',
3310 @command('debugrename',
3312 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3311 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3313 _('[-r REV] FILE'))
3312 _('[-r REV] FILE'))
3314 def debugrename(ui, repo, file1, *pats, **opts):
3313 def debugrename(ui, repo, file1, *pats, **opts):
3315 """dump rename information"""
3314 """dump rename information"""
3316
3315
3317 ctx = scmutil.revsingle(repo, opts.get('rev'))
3316 ctx = scmutil.revsingle(repo, opts.get('rev'))
3318 m = scmutil.match(ctx, (file1,) + pats, opts)
3317 m = scmutil.match(ctx, (file1,) + pats, opts)
3319 for abs in ctx.walk(m):
3318 for abs in ctx.walk(m):
3320 fctx = ctx[abs]
3319 fctx = ctx[abs]
3321 o = fctx.filelog().renamed(fctx.filenode())
3320 o = fctx.filelog().renamed(fctx.filenode())
3322 rel = m.rel(abs)
3321 rel = m.rel(abs)
3323 if o:
3322 if o:
3324 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3323 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3325 else:
3324 else:
3326 ui.write(_("%s not renamed\n") % rel)
3325 ui.write(_("%s not renamed\n") % rel)
3327
3326
3328 @command('debugrevlog', debugrevlogopts +
3327 @command('debugrevlog', debugrevlogopts +
3329 [('d', 'dump', False, _('dump index data'))],
3328 [('d', 'dump', False, _('dump index data'))],
3330 _('-c|-m|FILE'),
3329 _('-c|-m|FILE'),
3331 optionalrepo=True)
3330 optionalrepo=True)
3332 def debugrevlog(ui, repo, file_=None, **opts):
3331 def debugrevlog(ui, repo, file_=None, **opts):
3333 """show data and statistics about a revlog"""
3332 """show data and statistics about a revlog"""
3334 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3333 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3335
3334
3336 if opts.get("dump"):
3335 if opts.get("dump"):
3337 numrevs = len(r)
3336 numrevs = len(r)
3338 ui.write(("# rev p1rev p2rev start end deltastart base p1 p2"
3337 ui.write(("# rev p1rev p2rev start end deltastart base p1 p2"
3339 " rawsize totalsize compression heads chainlen\n"))
3338 " rawsize totalsize compression heads chainlen\n"))
3340 ts = 0
3339 ts = 0
3341 heads = set()
3340 heads = set()
3342
3341
3343 for rev in xrange(numrevs):
3342 for rev in xrange(numrevs):
3344 dbase = r.deltaparent(rev)
3343 dbase = r.deltaparent(rev)
3345 if dbase == -1:
3344 if dbase == -1:
3346 dbase = rev
3345 dbase = rev
3347 cbase = r.chainbase(rev)
3346 cbase = r.chainbase(rev)
3348 clen = r.chainlen(rev)
3347 clen = r.chainlen(rev)
3349 p1, p2 = r.parentrevs(rev)
3348 p1, p2 = r.parentrevs(rev)
3350 rs = r.rawsize(rev)
3349 rs = r.rawsize(rev)
3351 ts = ts + rs
3350 ts = ts + rs
3352 heads -= set(r.parentrevs(rev))
3351 heads -= set(r.parentrevs(rev))
3353 heads.add(rev)
3352 heads.add(rev)
3354 try:
3353 try:
3355 compression = ts / r.end(rev)
3354 compression = ts / r.end(rev)
3356 except ZeroDivisionError:
3355 except ZeroDivisionError:
3357 compression = 0
3356 compression = 0
3358 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3357 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3359 "%11d %5d %8d\n" %
3358 "%11d %5d %8d\n" %
3360 (rev, p1, p2, r.start(rev), r.end(rev),
3359 (rev, p1, p2, r.start(rev), r.end(rev),
3361 r.start(dbase), r.start(cbase),
3360 r.start(dbase), r.start(cbase),
3362 r.start(p1), r.start(p2),
3361 r.start(p1), r.start(p2),
3363 rs, ts, compression, len(heads), clen))
3362 rs, ts, compression, len(heads), clen))
3364 return 0
3363 return 0
3365
3364
3366 v = r.version
3365 v = r.version
3367 format = v & 0xFFFF
3366 format = v & 0xFFFF
3368 flags = []
3367 flags = []
3369 gdelta = False
3368 gdelta = False
3370 if v & revlog.REVLOGNGINLINEDATA:
3369 if v & revlog.REVLOGNGINLINEDATA:
3371 flags.append('inline')
3370 flags.append('inline')
3372 if v & revlog.REVLOGGENERALDELTA:
3371 if v & revlog.REVLOGGENERALDELTA:
3373 gdelta = True
3372 gdelta = True
3374 flags.append('generaldelta')
3373 flags.append('generaldelta')
3375 if not flags:
3374 if not flags:
3376 flags = ['(none)']
3375 flags = ['(none)']
3377
3376
3378 nummerges = 0
3377 nummerges = 0
3379 numfull = 0
3378 numfull = 0
3380 numprev = 0
3379 numprev = 0
3381 nump1 = 0
3380 nump1 = 0
3382 nump2 = 0
3381 nump2 = 0
3383 numother = 0
3382 numother = 0
3384 nump1prev = 0
3383 nump1prev = 0
3385 nump2prev = 0
3384 nump2prev = 0
3386 chainlengths = []
3385 chainlengths = []
3387
3386
3388 datasize = [None, 0, 0]
3387 datasize = [None, 0, 0]
3389 fullsize = [None, 0, 0]
3388 fullsize = [None, 0, 0]
3390 deltasize = [None, 0, 0]
3389 deltasize = [None, 0, 0]
3391
3390
3392 def addsize(size, l):
3391 def addsize(size, l):
3393 if l[0] is None or size < l[0]:
3392 if l[0] is None or size < l[0]:
3394 l[0] = size
3393 l[0] = size
3395 if size > l[1]:
3394 if size > l[1]:
3396 l[1] = size
3395 l[1] = size
3397 l[2] += size
3396 l[2] += size
3398
3397
3399 numrevs = len(r)
3398 numrevs = len(r)
3400 for rev in xrange(numrevs):
3399 for rev in xrange(numrevs):
3401 p1, p2 = r.parentrevs(rev)
3400 p1, p2 = r.parentrevs(rev)
3402 delta = r.deltaparent(rev)
3401 delta = r.deltaparent(rev)
3403 if format > 0:
3402 if format > 0:
3404 addsize(r.rawsize(rev), datasize)
3403 addsize(r.rawsize(rev), datasize)
3405 if p2 != nullrev:
3404 if p2 != nullrev:
3406 nummerges += 1
3405 nummerges += 1
3407 size = r.length(rev)
3406 size = r.length(rev)
3408 if delta == nullrev:
3407 if delta == nullrev:
3409 chainlengths.append(0)
3408 chainlengths.append(0)
3410 numfull += 1
3409 numfull += 1
3411 addsize(size, fullsize)
3410 addsize(size, fullsize)
3412 else:
3411 else:
3413 chainlengths.append(chainlengths[delta] + 1)
3412 chainlengths.append(chainlengths[delta] + 1)
3414 addsize(size, deltasize)
3413 addsize(size, deltasize)
3415 if delta == rev - 1:
3414 if delta == rev - 1:
3416 numprev += 1
3415 numprev += 1
3417 if delta == p1:
3416 if delta == p1:
3418 nump1prev += 1
3417 nump1prev += 1
3419 elif delta == p2:
3418 elif delta == p2:
3420 nump2prev += 1
3419 nump2prev += 1
3421 elif delta == p1:
3420 elif delta == p1:
3422 nump1 += 1
3421 nump1 += 1
3423 elif delta == p2:
3422 elif delta == p2:
3424 nump2 += 1
3423 nump2 += 1
3425 elif delta != nullrev:
3424 elif delta != nullrev:
3426 numother += 1
3425 numother += 1
3427
3426
3428 # Adjust size min value for empty cases
3427 # Adjust size min value for empty cases
3429 for size in (datasize, fullsize, deltasize):
3428 for size in (datasize, fullsize, deltasize):
3430 if size[0] is None:
3429 if size[0] is None:
3431 size[0] = 0
3430 size[0] = 0
3432
3431
3433 numdeltas = numrevs - numfull
3432 numdeltas = numrevs - numfull
3434 numoprev = numprev - nump1prev - nump2prev
3433 numoprev = numprev - nump1prev - nump2prev
3435 totalrawsize = datasize[2]
3434 totalrawsize = datasize[2]
3436 datasize[2] /= numrevs
3435 datasize[2] /= numrevs
3437 fulltotal = fullsize[2]
3436 fulltotal = fullsize[2]
3438 fullsize[2] /= numfull
3437 fullsize[2] /= numfull
3439 deltatotal = deltasize[2]
3438 deltatotal = deltasize[2]
3440 if numrevs - numfull > 0:
3439 if numrevs - numfull > 0:
3441 deltasize[2] /= numrevs - numfull
3440 deltasize[2] /= numrevs - numfull
3442 totalsize = fulltotal + deltatotal
3441 totalsize = fulltotal + deltatotal
3443 avgchainlen = sum(chainlengths) / numrevs
3442 avgchainlen = sum(chainlengths) / numrevs
3444 maxchainlen = max(chainlengths)
3443 maxchainlen = max(chainlengths)
3445 compratio = 1
3444 compratio = 1
3446 if totalsize:
3445 if totalsize:
3447 compratio = totalrawsize / totalsize
3446 compratio = totalrawsize / totalsize
3448
3447
3449 basedfmtstr = '%%%dd\n'
3448 basedfmtstr = '%%%dd\n'
3450 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3449 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3451
3450
3452 def dfmtstr(max):
3451 def dfmtstr(max):
3453 return basedfmtstr % len(str(max))
3452 return basedfmtstr % len(str(max))
3454 def pcfmtstr(max, padding=0):
3453 def pcfmtstr(max, padding=0):
3455 return basepcfmtstr % (len(str(max)), ' ' * padding)
3454 return basepcfmtstr % (len(str(max)), ' ' * padding)
3456
3455
3457 def pcfmt(value, total):
3456 def pcfmt(value, total):
3458 if total:
3457 if total:
3459 return (value, 100 * float(value) / total)
3458 return (value, 100 * float(value) / total)
3460 else:
3459 else:
3461 return value, 100.0
3460 return value, 100.0
3462
3461
3463 ui.write(('format : %d\n') % format)
3462 ui.write(('format : %d\n') % format)
3464 ui.write(('flags : %s\n') % ', '.join(flags))
3463 ui.write(('flags : %s\n') % ', '.join(flags))
3465
3464
3466 ui.write('\n')
3465 ui.write('\n')
3467 fmt = pcfmtstr(totalsize)
3466 fmt = pcfmtstr(totalsize)
3468 fmt2 = dfmtstr(totalsize)
3467 fmt2 = dfmtstr(totalsize)
3469 ui.write(('revisions : ') + fmt2 % numrevs)
3468 ui.write(('revisions : ') + fmt2 % numrevs)
3470 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3469 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3471 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3470 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3472 ui.write(('revisions : ') + fmt2 % numrevs)
3471 ui.write(('revisions : ') + fmt2 % numrevs)
3473 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3472 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3474 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3473 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3475 ui.write(('revision size : ') + fmt2 % totalsize)
3474 ui.write(('revision size : ') + fmt2 % totalsize)
3476 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3475 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3477 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3476 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3478
3477
3479 ui.write('\n')
3478 ui.write('\n')
3480 fmt = dfmtstr(max(avgchainlen, compratio))
3479 fmt = dfmtstr(max(avgchainlen, compratio))
3481 ui.write(('avg chain length : ') + fmt % avgchainlen)
3480 ui.write(('avg chain length : ') + fmt % avgchainlen)
3482 ui.write(('max chain length : ') + fmt % maxchainlen)
3481 ui.write(('max chain length : ') + fmt % maxchainlen)
3483 ui.write(('compression ratio : ') + fmt % compratio)
3482 ui.write(('compression ratio : ') + fmt % compratio)
3484
3483
3485 if format > 0:
3484 if format > 0:
3486 ui.write('\n')
3485 ui.write('\n')
3487 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3486 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3488 % tuple(datasize))
3487 % tuple(datasize))
3489 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3488 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3490 % tuple(fullsize))
3489 % tuple(fullsize))
3491 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3490 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3492 % tuple(deltasize))
3491 % tuple(deltasize))
3493
3492
3494 if numdeltas > 0:
3493 if numdeltas > 0:
3495 ui.write('\n')
3494 ui.write('\n')
3496 fmt = pcfmtstr(numdeltas)
3495 fmt = pcfmtstr(numdeltas)
3497 fmt2 = pcfmtstr(numdeltas, 4)
3496 fmt2 = pcfmtstr(numdeltas, 4)
3498 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3497 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3499 if numprev > 0:
3498 if numprev > 0:
3500 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3499 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3501 numprev))
3500 numprev))
3502 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3501 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3503 numprev))
3502 numprev))
3504 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3503 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3505 numprev))
3504 numprev))
3506 if gdelta:
3505 if gdelta:
3507 ui.write(('deltas against p1 : ')
3506 ui.write(('deltas against p1 : ')
3508 + fmt % pcfmt(nump1, numdeltas))
3507 + fmt % pcfmt(nump1, numdeltas))
3509 ui.write(('deltas against p2 : ')
3508 ui.write(('deltas against p2 : ')
3510 + fmt % pcfmt(nump2, numdeltas))
3509 + fmt % pcfmt(nump2, numdeltas))
3511 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3510 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3512 numdeltas))
3511 numdeltas))
3513
3512
3514 @command('debugrevspec',
3513 @command('debugrevspec',
3515 [('', 'optimize', None, _('print parsed tree after optimizing'))],
3514 [('', 'optimize', None, _('print parsed tree after optimizing'))],
3516 ('REVSPEC'))
3515 ('REVSPEC'))
3517 def debugrevspec(ui, repo, expr, **opts):
3516 def debugrevspec(ui, repo, expr, **opts):
3518 """parse and apply a revision specification
3517 """parse and apply a revision specification
3519
3518
3520 Use --verbose to print the parsed tree before and after aliases
3519 Use --verbose to print the parsed tree before and after aliases
3521 expansion.
3520 expansion.
3522 """
3521 """
3523 if ui.verbose:
3522 if ui.verbose:
3524 tree = revset.parse(expr, lookup=repo.__contains__)
3523 tree = revset.parse(expr, lookup=repo.__contains__)
3525 ui.note(revset.prettyformat(tree), "\n")
3524 ui.note(revset.prettyformat(tree), "\n")
3526 newtree = revset.expandaliases(ui, tree)
3525 newtree = revset.expandaliases(ui, tree)
3527 if newtree != tree:
3526 if newtree != tree:
3528 ui.note(("* expanded:\n"), revset.prettyformat(newtree), "\n")
3527 ui.note(("* expanded:\n"), revset.prettyformat(newtree), "\n")
3529 tree = newtree
3528 tree = newtree
3530 newtree = revset.foldconcat(tree)
3529 newtree = revset.foldconcat(tree)
3531 if newtree != tree:
3530 if newtree != tree:
3532 ui.note(("* concatenated:\n"), revset.prettyformat(newtree), "\n")
3531 ui.note(("* concatenated:\n"), revset.prettyformat(newtree), "\n")
3533 if opts["optimize"]:
3532 if opts["optimize"]:
3534 optimizedtree = revset.optimize(newtree)
3533 optimizedtree = revset.optimize(newtree)
3535 ui.note(("* optimized:\n"),
3534 ui.note(("* optimized:\n"),
3536 revset.prettyformat(optimizedtree), "\n")
3535 revset.prettyformat(optimizedtree), "\n")
3537 func = revset.match(ui, expr, repo)
3536 func = revset.match(ui, expr, repo)
3538 revs = func(repo)
3537 revs = func(repo)
3539 if ui.verbose:
3538 if ui.verbose:
3540 ui.note(("* set:\n"), revset.prettyformatset(revs), "\n")
3539 ui.note(("* set:\n"), revset.prettyformatset(revs), "\n")
3541 for c in revs:
3540 for c in revs:
3542 ui.write("%s\n" % c)
3541 ui.write("%s\n" % c)
3543
3542
3544 @command('debugsetparents', [], _('REV1 [REV2]'))
3543 @command('debugsetparents', [], _('REV1 [REV2]'))
3545 def debugsetparents(ui, repo, rev1, rev2=None):
3544 def debugsetparents(ui, repo, rev1, rev2=None):
3546 """manually set the parents of the current working directory
3545 """manually set the parents of the current working directory
3547
3546
3548 This is useful for writing repository conversion tools, but should
3547 This is useful for writing repository conversion tools, but should
3549 be used with care. For example, neither the working directory nor the
3548 be used with care. For example, neither the working directory nor the
3550 dirstate is updated, so file status may be incorrect after running this
3549 dirstate is updated, so file status may be incorrect after running this
3551 command.
3550 command.
3552
3551
3553 Returns 0 on success.
3552 Returns 0 on success.
3554 """
3553 """
3555
3554
3556 r1 = scmutil.revsingle(repo, rev1).node()
3555 r1 = scmutil.revsingle(repo, rev1).node()
3557 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3556 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3558
3557
3559 with repo.wlock():
3558 with repo.wlock():
3560 repo.setparents(r1, r2)
3559 repo.setparents(r1, r2)
3561
3560
3562 @command('debugdirstate|debugstate',
3561 @command('debugdirstate|debugstate',
3563 [('', 'nodates', None, _('do not display the saved mtime')),
3562 [('', 'nodates', None, _('do not display the saved mtime')),
3564 ('', 'datesort', None, _('sort by saved mtime'))],
3563 ('', 'datesort', None, _('sort by saved mtime'))],
3565 _('[OPTION]...'))
3564 _('[OPTION]...'))
3566 def debugstate(ui, repo, **opts):
3565 def debugstate(ui, repo, **opts):
3567 """show the contents of the current dirstate"""
3566 """show the contents of the current dirstate"""
3568
3567
3569 nodates = opts.get('nodates')
3568 nodates = opts.get('nodates')
3570 datesort = opts.get('datesort')
3569 datesort = opts.get('datesort')
3571
3570
3572 timestr = ""
3571 timestr = ""
3573 if datesort:
3572 if datesort:
3574 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3573 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3575 else:
3574 else:
3576 keyfunc = None # sort by filename
3575 keyfunc = None # sort by filename
3577 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3576 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3578 if ent[3] == -1:
3577 if ent[3] == -1:
3579 timestr = 'unset '
3578 timestr = 'unset '
3580 elif nodates:
3579 elif nodates:
3581 timestr = 'set '
3580 timestr = 'set '
3582 else:
3581 else:
3583 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3582 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3584 time.localtime(ent[3]))
3583 time.localtime(ent[3]))
3585 if ent[1] & 0o20000:
3584 if ent[1] & 0o20000:
3586 mode = 'lnk'
3585 mode = 'lnk'
3587 else:
3586 else:
3588 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3587 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3589 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3588 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3590 for f in repo.dirstate.copies():
3589 for f in repo.dirstate.copies():
3591 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3590 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3592
3591
3593 @command('debugsub',
3592 @command('debugsub',
3594 [('r', 'rev', '',
3593 [('r', 'rev', '',
3595 _('revision to check'), _('REV'))],
3594 _('revision to check'), _('REV'))],
3596 _('[-r REV] [REV]'))
3595 _('[-r REV] [REV]'))
3597 def debugsub(ui, repo, rev=None):
3596 def debugsub(ui, repo, rev=None):
3598 ctx = scmutil.revsingle(repo, rev, None)
3597 ctx = scmutil.revsingle(repo, rev, None)
3599 for k, v in sorted(ctx.substate.items()):
3598 for k, v in sorted(ctx.substate.items()):
3600 ui.write(('path %s\n') % k)
3599 ui.write(('path %s\n') % k)
3601 ui.write((' source %s\n') % v[0])
3600 ui.write((' source %s\n') % v[0])
3602 ui.write((' revision %s\n') % v[1])
3601 ui.write((' revision %s\n') % v[1])
3603
3602
3604 @command('debugsuccessorssets',
3603 @command('debugsuccessorssets',
3605 [],
3604 [],
3606 _('[REV]'))
3605 _('[REV]'))
3607 def debugsuccessorssets(ui, repo, *revs):
3606 def debugsuccessorssets(ui, repo, *revs):
3608 """show set of successors for revision
3607 """show set of successors for revision
3609
3608
3610 A successors set of changeset A is a consistent group of revisions that
3609 A successors set of changeset A is a consistent group of revisions that
3611 succeed A. It contains non-obsolete changesets only.
3610 succeed A. It contains non-obsolete changesets only.
3612
3611
3613 In most cases a changeset A has a single successors set containing a single
3612 In most cases a changeset A has a single successors set containing a single
3614 successor (changeset A replaced by A').
3613 successor (changeset A replaced by A').
3615
3614
3616 A changeset that is made obsolete with no successors are called "pruned".
3615 A changeset that is made obsolete with no successors are called "pruned".
3617 Such changesets have no successors sets at all.
3616 Such changesets have no successors sets at all.
3618
3617
3619 A changeset that has been "split" will have a successors set containing
3618 A changeset that has been "split" will have a successors set containing
3620 more than one successor.
3619 more than one successor.
3621
3620
3622 A changeset that has been rewritten in multiple different ways is called
3621 A changeset that has been rewritten in multiple different ways is called
3623 "divergent". Such changesets have multiple successor sets (each of which
3622 "divergent". Such changesets have multiple successor sets (each of which
3624 may also be split, i.e. have multiple successors).
3623 may also be split, i.e. have multiple successors).
3625
3624
3626 Results are displayed as follows::
3625 Results are displayed as follows::
3627
3626
3628 <rev1>
3627 <rev1>
3629 <successors-1A>
3628 <successors-1A>
3630 <rev2>
3629 <rev2>
3631 <successors-2A>
3630 <successors-2A>
3632 <successors-2B1> <successors-2B2> <successors-2B3>
3631 <successors-2B1> <successors-2B2> <successors-2B3>
3633
3632
3634 Here rev2 has two possible (i.e. divergent) successors sets. The first
3633 Here rev2 has two possible (i.e. divergent) successors sets. The first
3635 holds one element, whereas the second holds three (i.e. the changeset has
3634 holds one element, whereas the second holds three (i.e. the changeset has
3636 been split).
3635 been split).
3637 """
3636 """
3638 # passed to successorssets caching computation from one call to another
3637 # passed to successorssets caching computation from one call to another
3639 cache = {}
3638 cache = {}
3640 ctx2str = str
3639 ctx2str = str
3641 node2str = short
3640 node2str = short
3642 if ui.debug():
3641 if ui.debug():
3643 def ctx2str(ctx):
3642 def ctx2str(ctx):
3644 return ctx.hex()
3643 return ctx.hex()
3645 node2str = hex
3644 node2str = hex
3646 for rev in scmutil.revrange(repo, revs):
3645 for rev in scmutil.revrange(repo, revs):
3647 ctx = repo[rev]
3646 ctx = repo[rev]
3648 ui.write('%s\n'% ctx2str(ctx))
3647 ui.write('%s\n'% ctx2str(ctx))
3649 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3648 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3650 if succsset:
3649 if succsset:
3651 ui.write(' ')
3650 ui.write(' ')
3652 ui.write(node2str(succsset[0]))
3651 ui.write(node2str(succsset[0]))
3653 for node in succsset[1:]:
3652 for node in succsset[1:]:
3654 ui.write(' ')
3653 ui.write(' ')
3655 ui.write(node2str(node))
3654 ui.write(node2str(node))
3656 ui.write('\n')
3655 ui.write('\n')
3657
3656
3658 @command('debugtemplate',
3657 @command('debugtemplate',
3659 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
3658 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
3660 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
3659 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
3661 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
3660 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
3662 optionalrepo=True)
3661 optionalrepo=True)
3663 def debugtemplate(ui, repo, tmpl, **opts):
3662 def debugtemplate(ui, repo, tmpl, **opts):
3664 """parse and apply a template
3663 """parse and apply a template
3665
3664
3666 If -r/--rev is given, the template is processed as a log template and
3665 If -r/--rev is given, the template is processed as a log template and
3667 applied to the given changesets. Otherwise, it is processed as a generic
3666 applied to the given changesets. Otherwise, it is processed as a generic
3668 template.
3667 template.
3669
3668
3670 Use --verbose to print the parsed tree.
3669 Use --verbose to print the parsed tree.
3671 """
3670 """
3672 revs = None
3671 revs = None
3673 if opts['rev']:
3672 if opts['rev']:
3674 if repo is None:
3673 if repo is None:
3675 raise error.RepoError(_('there is no Mercurial repository here '
3674 raise error.RepoError(_('there is no Mercurial repository here '
3676 '(.hg not found)'))
3675 '(.hg not found)'))
3677 revs = scmutil.revrange(repo, opts['rev'])
3676 revs = scmutil.revrange(repo, opts['rev'])
3678
3677
3679 props = {}
3678 props = {}
3680 for d in opts['define']:
3679 for d in opts['define']:
3681 try:
3680 try:
3682 k, v = (e.strip() for e in d.split('=', 1))
3681 k, v = (e.strip() for e in d.split('=', 1))
3683 if not k:
3682 if not k:
3684 raise ValueError
3683 raise ValueError
3685 props[k] = v
3684 props[k] = v
3686 except ValueError:
3685 except ValueError:
3687 raise error.Abort(_('malformed keyword definition: %s') % d)
3686 raise error.Abort(_('malformed keyword definition: %s') % d)
3688
3687
3689 if ui.verbose:
3688 if ui.verbose:
3690 aliases = ui.configitems('templatealias')
3689 aliases = ui.configitems('templatealias')
3691 tree = templater.parse(tmpl)
3690 tree = templater.parse(tmpl)
3692 ui.note(templater.prettyformat(tree), '\n')
3691 ui.note(templater.prettyformat(tree), '\n')
3693 newtree = templater.expandaliases(tree, aliases)
3692 newtree = templater.expandaliases(tree, aliases)
3694 if newtree != tree:
3693 if newtree != tree:
3695 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n')
3694 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n')
3696
3695
3697 mapfile = None
3696 mapfile = None
3698 if revs is None:
3697 if revs is None:
3699 k = 'debugtemplate'
3698 k = 'debugtemplate'
3700 t = formatter.maketemplater(ui, k, tmpl)
3699 t = formatter.maketemplater(ui, k, tmpl)
3701 ui.write(templater.stringify(t(k, **props)))
3700 ui.write(templater.stringify(t(k, **props)))
3702 else:
3701 else:
3703 displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl,
3702 displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl,
3704 mapfile, buffered=False)
3703 mapfile, buffered=False)
3705 for r in revs:
3704 for r in revs:
3706 displayer.show(repo[r], **props)
3705 displayer.show(repo[r], **props)
3707 displayer.close()
3706 displayer.close()
3708
3707
3709 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3708 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3710 def debugwalk(ui, repo, *pats, **opts):
3709 def debugwalk(ui, repo, *pats, **opts):
3711 """show how files match on given patterns"""
3710 """show how files match on given patterns"""
3712 m = scmutil.match(repo[None], pats, opts)
3711 m = scmutil.match(repo[None], pats, opts)
3713 items = list(repo.walk(m))
3712 items = list(repo.walk(m))
3714 if not items:
3713 if not items:
3715 return
3714 return
3716 f = lambda fn: fn
3715 f = lambda fn: fn
3717 if ui.configbool('ui', 'slash') and os.sep != '/':
3716 if ui.configbool('ui', 'slash') and os.sep != '/':
3718 f = lambda fn: util.normpath(fn)
3717 f = lambda fn: util.normpath(fn)
3719 fmt = 'f %%-%ds %%-%ds %%s' % (
3718 fmt = 'f %%-%ds %%-%ds %%s' % (
3720 max([len(abs) for abs in items]),
3719 max([len(abs) for abs in items]),
3721 max([len(m.rel(abs)) for abs in items]))
3720 max([len(m.rel(abs)) for abs in items]))
3722 for abs in items:
3721 for abs in items:
3723 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3722 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3724 ui.write("%s\n" % line.rstrip())
3723 ui.write("%s\n" % line.rstrip())
3725
3724
3726 @command('debugwireargs',
3725 @command('debugwireargs',
3727 [('', 'three', '', 'three'),
3726 [('', 'three', '', 'three'),
3728 ('', 'four', '', 'four'),
3727 ('', 'four', '', 'four'),
3729 ('', 'five', '', 'five'),
3728 ('', 'five', '', 'five'),
3730 ] + remoteopts,
3729 ] + remoteopts,
3731 _('REPO [OPTIONS]... [ONE [TWO]]'),
3730 _('REPO [OPTIONS]... [ONE [TWO]]'),
3732 norepo=True)
3731 norepo=True)
3733 def debugwireargs(ui, repopath, *vals, **opts):
3732 def debugwireargs(ui, repopath, *vals, **opts):
3734 repo = hg.peer(ui, opts, repopath)
3733 repo = hg.peer(ui, opts, repopath)
3735 for opt in remoteopts:
3734 for opt in remoteopts:
3736 del opts[opt[1]]
3735 del opts[opt[1]]
3737 args = {}
3736 args = {}
3738 for k, v in opts.iteritems():
3737 for k, v in opts.iteritems():
3739 if v:
3738 if v:
3740 args[k] = v
3739 args[k] = v
3741 # run twice to check that we don't mess up the stream for the next command
3740 # run twice to check that we don't mess up the stream for the next command
3742 res1 = repo.debugwireargs(*vals, **args)
3741 res1 = repo.debugwireargs(*vals, **args)
3743 res2 = repo.debugwireargs(*vals, **args)
3742 res2 = repo.debugwireargs(*vals, **args)
3744 ui.write("%s\n" % res1)
3743 ui.write("%s\n" % res1)
3745 if res1 != res2:
3744 if res1 != res2:
3746 ui.warn("%s\n" % res2)
3745 ui.warn("%s\n" % res2)
3747
3746
3748 @command('^diff',
3747 @command('^diff',
3749 [('r', 'rev', [], _('revision'), _('REV')),
3748 [('r', 'rev', [], _('revision'), _('REV')),
3750 ('c', 'change', '', _('change made by revision'), _('REV'))
3749 ('c', 'change', '', _('change made by revision'), _('REV'))
3751 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3750 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3752 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3751 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3753 inferrepo=True)
3752 inferrepo=True)
3754 def diff(ui, repo, *pats, **opts):
3753 def diff(ui, repo, *pats, **opts):
3755 """diff repository (or selected files)
3754 """diff repository (or selected files)
3756
3755
3757 Show differences between revisions for the specified files.
3756 Show differences between revisions for the specified files.
3758
3757
3759 Differences between files are shown using the unified diff format.
3758 Differences between files are shown using the unified diff format.
3760
3759
3761 .. note::
3760 .. note::
3762
3761
3763 :hg:`diff` may generate unexpected results for merges, as it will
3762 :hg:`diff` may generate unexpected results for merges, as it will
3764 default to comparing against the working directory's first
3763 default to comparing against the working directory's first
3765 parent changeset if no revisions are specified.
3764 parent changeset if no revisions are specified.
3766
3765
3767 When two revision arguments are given, then changes are shown
3766 When two revision arguments are given, then changes are shown
3768 between those revisions. If only one revision is specified then
3767 between those revisions. If only one revision is specified then
3769 that revision is compared to the working directory, and, when no
3768 that revision is compared to the working directory, and, when no
3770 revisions are specified, the working directory files are compared
3769 revisions are specified, the working directory files are compared
3771 to its first parent.
3770 to its first parent.
3772
3771
3773 Alternatively you can specify -c/--change with a revision to see
3772 Alternatively you can specify -c/--change with a revision to see
3774 the changes in that changeset relative to its first parent.
3773 the changes in that changeset relative to its first parent.
3775
3774
3776 Without the -a/--text option, diff will avoid generating diffs of
3775 Without the -a/--text option, diff will avoid generating diffs of
3777 files it detects as binary. With -a, diff will generate a diff
3776 files it detects as binary. With -a, diff will generate a diff
3778 anyway, probably with undesirable results.
3777 anyway, probably with undesirable results.
3779
3778
3780 Use the -g/--git option to generate diffs in the git extended diff
3779 Use the -g/--git option to generate diffs in the git extended diff
3781 format. For more information, read :hg:`help diffs`.
3780 format. For more information, read :hg:`help diffs`.
3782
3781
3783 .. container:: verbose
3782 .. container:: verbose
3784
3783
3785 Examples:
3784 Examples:
3786
3785
3787 - compare a file in the current working directory to its parent::
3786 - compare a file in the current working directory to its parent::
3788
3787
3789 hg diff foo.c
3788 hg diff foo.c
3790
3789
3791 - compare two historical versions of a directory, with rename info::
3790 - compare two historical versions of a directory, with rename info::
3792
3791
3793 hg diff --git -r 1.0:1.2 lib/
3792 hg diff --git -r 1.0:1.2 lib/
3794
3793
3795 - get change stats relative to the last change on some date::
3794 - get change stats relative to the last change on some date::
3796
3795
3797 hg diff --stat -r "date('may 2')"
3796 hg diff --stat -r "date('may 2')"
3798
3797
3799 - diff all newly-added files that contain a keyword::
3798 - diff all newly-added files that contain a keyword::
3800
3799
3801 hg diff "set:added() and grep(GNU)"
3800 hg diff "set:added() and grep(GNU)"
3802
3801
3803 - compare a revision and its parents::
3802 - compare a revision and its parents::
3804
3803
3805 hg diff -c 9353 # compare against first parent
3804 hg diff -c 9353 # compare against first parent
3806 hg diff -r 9353^:9353 # same using revset syntax
3805 hg diff -r 9353^:9353 # same using revset syntax
3807 hg diff -r 9353^2:9353 # compare against the second parent
3806 hg diff -r 9353^2:9353 # compare against the second parent
3808
3807
3809 Returns 0 on success.
3808 Returns 0 on success.
3810 """
3809 """
3811
3810
3812 revs = opts.get('rev')
3811 revs = opts.get('rev')
3813 change = opts.get('change')
3812 change = opts.get('change')
3814 stat = opts.get('stat')
3813 stat = opts.get('stat')
3815 reverse = opts.get('reverse')
3814 reverse = opts.get('reverse')
3816
3815
3817 if revs and change:
3816 if revs and change:
3818 msg = _('cannot specify --rev and --change at the same time')
3817 msg = _('cannot specify --rev and --change at the same time')
3819 raise error.Abort(msg)
3818 raise error.Abort(msg)
3820 elif change:
3819 elif change:
3821 node2 = scmutil.revsingle(repo, change, None).node()
3820 node2 = scmutil.revsingle(repo, change, None).node()
3822 node1 = repo[node2].p1().node()
3821 node1 = repo[node2].p1().node()
3823 else:
3822 else:
3824 node1, node2 = scmutil.revpair(repo, revs)
3823 node1, node2 = scmutil.revpair(repo, revs)
3825
3824
3826 if reverse:
3825 if reverse:
3827 node1, node2 = node2, node1
3826 node1, node2 = node2, node1
3828
3827
3829 diffopts = patch.diffallopts(ui, opts)
3828 diffopts = patch.diffallopts(ui, opts)
3830 m = scmutil.match(repo[node2], pats, opts)
3829 m = scmutil.match(repo[node2], pats, opts)
3831 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3830 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3832 listsubrepos=opts.get('subrepos'),
3831 listsubrepos=opts.get('subrepos'),
3833 root=opts.get('root'))
3832 root=opts.get('root'))
3834
3833
3835 @command('^export',
3834 @command('^export',
3836 [('o', 'output', '',
3835 [('o', 'output', '',
3837 _('print output to file with formatted name'), _('FORMAT')),
3836 _('print output to file with formatted name'), _('FORMAT')),
3838 ('', 'switch-parent', None, _('diff against the second parent')),
3837 ('', 'switch-parent', None, _('diff against the second parent')),
3839 ('r', 'rev', [], _('revisions to export'), _('REV')),
3838 ('r', 'rev', [], _('revisions to export'), _('REV')),
3840 ] + diffopts,
3839 ] + diffopts,
3841 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3840 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3842 def export(ui, repo, *changesets, **opts):
3841 def export(ui, repo, *changesets, **opts):
3843 """dump the header and diffs for one or more changesets
3842 """dump the header and diffs for one or more changesets
3844
3843
3845 Print the changeset header and diffs for one or more revisions.
3844 Print the changeset header and diffs for one or more revisions.
3846 If no revision is given, the parent of the working directory is used.
3845 If no revision is given, the parent of the working directory is used.
3847
3846
3848 The information shown in the changeset header is: author, date,
3847 The information shown in the changeset header is: author, date,
3849 branch name (if non-default), changeset hash, parent(s) and commit
3848 branch name (if non-default), changeset hash, parent(s) and commit
3850 comment.
3849 comment.
3851
3850
3852 .. note::
3851 .. note::
3853
3852
3854 :hg:`export` may generate unexpected diff output for merge
3853 :hg:`export` may generate unexpected diff output for merge
3855 changesets, as it will compare the merge changeset against its
3854 changesets, as it will compare the merge changeset against its
3856 first parent only.
3855 first parent only.
3857
3856
3858 Output may be to a file, in which case the name of the file is
3857 Output may be to a file, in which case the name of the file is
3859 given using a format string. The formatting rules are as follows:
3858 given using a format string. The formatting rules are as follows:
3860
3859
3861 :``%%``: literal "%" character
3860 :``%%``: literal "%" character
3862 :``%H``: changeset hash (40 hexadecimal digits)
3861 :``%H``: changeset hash (40 hexadecimal digits)
3863 :``%N``: number of patches being generated
3862 :``%N``: number of patches being generated
3864 :``%R``: changeset revision number
3863 :``%R``: changeset revision number
3865 :``%b``: basename of the exporting repository
3864 :``%b``: basename of the exporting repository
3866 :``%h``: short-form changeset hash (12 hexadecimal digits)
3865 :``%h``: short-form changeset hash (12 hexadecimal digits)
3867 :``%m``: first line of the commit message (only alphanumeric characters)
3866 :``%m``: first line of the commit message (only alphanumeric characters)
3868 :``%n``: zero-padded sequence number, starting at 1
3867 :``%n``: zero-padded sequence number, starting at 1
3869 :``%r``: zero-padded changeset revision number
3868 :``%r``: zero-padded changeset revision number
3870
3869
3871 Without the -a/--text option, export will avoid generating diffs
3870 Without the -a/--text option, export will avoid generating diffs
3872 of files it detects as binary. With -a, export will generate a
3871 of files it detects as binary. With -a, export will generate a
3873 diff anyway, probably with undesirable results.
3872 diff anyway, probably with undesirable results.
3874
3873
3875 Use the -g/--git option to generate diffs in the git extended diff
3874 Use the -g/--git option to generate diffs in the git extended diff
3876 format. See :hg:`help diffs` for more information.
3875 format. See :hg:`help diffs` for more information.
3877
3876
3878 With the --switch-parent option, the diff will be against the
3877 With the --switch-parent option, the diff will be against the
3879 second parent. It can be useful to review a merge.
3878 second parent. It can be useful to review a merge.
3880
3879
3881 .. container:: verbose
3880 .. container:: verbose
3882
3881
3883 Examples:
3882 Examples:
3884
3883
3885 - use export and import to transplant a bugfix to the current
3884 - use export and import to transplant a bugfix to the current
3886 branch::
3885 branch::
3887
3886
3888 hg export -r 9353 | hg import -
3887 hg export -r 9353 | hg import -
3889
3888
3890 - export all the changesets between two revisions to a file with
3889 - export all the changesets between two revisions to a file with
3891 rename information::
3890 rename information::
3892
3891
3893 hg export --git -r 123:150 > changes.txt
3892 hg export --git -r 123:150 > changes.txt
3894
3893
3895 - split outgoing changes into a series of patches with
3894 - split outgoing changes into a series of patches with
3896 descriptive names::
3895 descriptive names::
3897
3896
3898 hg export -r "outgoing()" -o "%n-%m.patch"
3897 hg export -r "outgoing()" -o "%n-%m.patch"
3899
3898
3900 Returns 0 on success.
3899 Returns 0 on success.
3901 """
3900 """
3902 changesets += tuple(opts.get('rev', []))
3901 changesets += tuple(opts.get('rev', []))
3903 if not changesets:
3902 if not changesets:
3904 changesets = ['.']
3903 changesets = ['.']
3905 revs = scmutil.revrange(repo, changesets)
3904 revs = scmutil.revrange(repo, changesets)
3906 if not revs:
3905 if not revs:
3907 raise error.Abort(_("export requires at least one changeset"))
3906 raise error.Abort(_("export requires at least one changeset"))
3908 if len(revs) > 1:
3907 if len(revs) > 1:
3909 ui.note(_('exporting patches:\n'))
3908 ui.note(_('exporting patches:\n'))
3910 else:
3909 else:
3911 ui.note(_('exporting patch:\n'))
3910 ui.note(_('exporting patch:\n'))
3912 cmdutil.export(repo, revs, template=opts.get('output'),
3911 cmdutil.export(repo, revs, template=opts.get('output'),
3913 switch_parent=opts.get('switch_parent'),
3912 switch_parent=opts.get('switch_parent'),
3914 opts=patch.diffallopts(ui, opts))
3913 opts=patch.diffallopts(ui, opts))
3915
3914
3916 @command('files',
3915 @command('files',
3917 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3916 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3918 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3917 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3919 ] + walkopts + formatteropts + subrepoopts,
3918 ] + walkopts + formatteropts + subrepoopts,
3920 _('[OPTION]... [FILE]...'))
3919 _('[OPTION]... [FILE]...'))
3921 def files(ui, repo, *pats, **opts):
3920 def files(ui, repo, *pats, **opts):
3922 """list tracked files
3921 """list tracked files
3923
3922
3924 Print files under Mercurial control in the working directory or
3923 Print files under Mercurial control in the working directory or
3925 specified revision for given files (excluding removed files).
3924 specified revision for given files (excluding removed files).
3926 Files can be specified as filenames or filesets.
3925 Files can be specified as filenames or filesets.
3927
3926
3928 If no files are given to match, this command prints the names
3927 If no files are given to match, this command prints the names
3929 of all files under Mercurial control.
3928 of all files under Mercurial control.
3930
3929
3931 .. container:: verbose
3930 .. container:: verbose
3932
3931
3933 Examples:
3932 Examples:
3934
3933
3935 - list all files under the current directory::
3934 - list all files under the current directory::
3936
3935
3937 hg files .
3936 hg files .
3938
3937
3939 - shows sizes and flags for current revision::
3938 - shows sizes and flags for current revision::
3940
3939
3941 hg files -vr .
3940 hg files -vr .
3942
3941
3943 - list all files named README::
3942 - list all files named README::
3944
3943
3945 hg files -I "**/README"
3944 hg files -I "**/README"
3946
3945
3947 - list all binary files::
3946 - list all binary files::
3948
3947
3949 hg files "set:binary()"
3948 hg files "set:binary()"
3950
3949
3951 - find files containing a regular expression::
3950 - find files containing a regular expression::
3952
3951
3953 hg files "set:grep('bob')"
3952 hg files "set:grep('bob')"
3954
3953
3955 - search tracked file contents with xargs and grep::
3954 - search tracked file contents with xargs and grep::
3956
3955
3957 hg files -0 | xargs -0 grep foo
3956 hg files -0 | xargs -0 grep foo
3958
3957
3959 See :hg:`help patterns` and :hg:`help filesets` for more information
3958 See :hg:`help patterns` and :hg:`help filesets` for more information
3960 on specifying file patterns.
3959 on specifying file patterns.
3961
3960
3962 Returns 0 if a match is found, 1 otherwise.
3961 Returns 0 if a match is found, 1 otherwise.
3963
3962
3964 """
3963 """
3965 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3964 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3966
3965
3967 end = '\n'
3966 end = '\n'
3968 if opts.get('print0'):
3967 if opts.get('print0'):
3969 end = '\0'
3968 end = '\0'
3970 fmt = '%s' + end
3969 fmt = '%s' + end
3971
3970
3972 m = scmutil.match(ctx, pats, opts)
3971 m = scmutil.match(ctx, pats, opts)
3973 with ui.formatter('files', opts) as fm:
3972 with ui.formatter('files', opts) as fm:
3974 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3973 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3975
3974
3976 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3975 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3977 def forget(ui, repo, *pats, **opts):
3976 def forget(ui, repo, *pats, **opts):
3978 """forget the specified files on the next commit
3977 """forget the specified files on the next commit
3979
3978
3980 Mark the specified files so they will no longer be tracked
3979 Mark the specified files so they will no longer be tracked
3981 after the next commit.
3980 after the next commit.
3982
3981
3983 This only removes files from the current branch, not from the
3982 This only removes files from the current branch, not from the
3984 entire project history, and it does not delete them from the
3983 entire project history, and it does not delete them from the
3985 working directory.
3984 working directory.
3986
3985
3987 To delete the file from the working directory, see :hg:`remove`.
3986 To delete the file from the working directory, see :hg:`remove`.
3988
3987
3989 To undo a forget before the next commit, see :hg:`add`.
3988 To undo a forget before the next commit, see :hg:`add`.
3990
3989
3991 .. container:: verbose
3990 .. container:: verbose
3992
3991
3993 Examples:
3992 Examples:
3994
3993
3995 - forget newly-added binary files::
3994 - forget newly-added binary files::
3996
3995
3997 hg forget "set:added() and binary()"
3996 hg forget "set:added() and binary()"
3998
3997
3999 - forget files that would be excluded by .hgignore::
3998 - forget files that would be excluded by .hgignore::
4000
3999
4001 hg forget "set:hgignore()"
4000 hg forget "set:hgignore()"
4002
4001
4003 Returns 0 on success.
4002 Returns 0 on success.
4004 """
4003 """
4005
4004
4006 if not pats:
4005 if not pats:
4007 raise error.Abort(_('no files specified'))
4006 raise error.Abort(_('no files specified'))
4008
4007
4009 m = scmutil.match(repo[None], pats, opts)
4008 m = scmutil.match(repo[None], pats, opts)
4010 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
4009 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
4011 return rejected and 1 or 0
4010 return rejected and 1 or 0
4012
4011
4013 @command(
4012 @command(
4014 'graft',
4013 'graft',
4015 [('r', 'rev', [], _('revisions to graft'), _('REV')),
4014 [('r', 'rev', [], _('revisions to graft'), _('REV')),
4016 ('c', 'continue', False, _('resume interrupted graft')),
4015 ('c', 'continue', False, _('resume interrupted graft')),
4017 ('e', 'edit', False, _('invoke editor on commit messages')),
4016 ('e', 'edit', False, _('invoke editor on commit messages')),
4018 ('', 'log', None, _('append graft info to log message')),
4017 ('', 'log', None, _('append graft info to log message')),
4019 ('f', 'force', False, _('force graft')),
4018 ('f', 'force', False, _('force graft')),
4020 ('D', 'currentdate', False,
4019 ('D', 'currentdate', False,
4021 _('record the current date as commit date')),
4020 _('record the current date as commit date')),
4022 ('U', 'currentuser', False,
4021 ('U', 'currentuser', False,
4023 _('record the current user as committer'), _('DATE'))]
4022 _('record the current user as committer'), _('DATE'))]
4024 + commitopts2 + mergetoolopts + dryrunopts,
4023 + commitopts2 + mergetoolopts + dryrunopts,
4025 _('[OPTION]... [-r REV]... REV...'))
4024 _('[OPTION]... [-r REV]... REV...'))
4026 def graft(ui, repo, *revs, **opts):
4025 def graft(ui, repo, *revs, **opts):
4027 '''copy changes from other branches onto the current branch
4026 '''copy changes from other branches onto the current branch
4028
4027
4029 This command uses Mercurial's merge logic to copy individual
4028 This command uses Mercurial's merge logic to copy individual
4030 changes from other branches without merging branches in the
4029 changes from other branches without merging branches in the
4031 history graph. This is sometimes known as 'backporting' or
4030 history graph. This is sometimes known as 'backporting' or
4032 'cherry-picking'. By default, graft will copy user, date, and
4031 'cherry-picking'. By default, graft will copy user, date, and
4033 description from the source changesets.
4032 description from the source changesets.
4034
4033
4035 Changesets that are ancestors of the current revision, that have
4034 Changesets that are ancestors of the current revision, that have
4036 already been grafted, or that are merges will be skipped.
4035 already been grafted, or that are merges will be skipped.
4037
4036
4038 If --log is specified, log messages will have a comment appended
4037 If --log is specified, log messages will have a comment appended
4039 of the form::
4038 of the form::
4040
4039
4041 (grafted from CHANGESETHASH)
4040 (grafted from CHANGESETHASH)
4042
4041
4043 If --force is specified, revisions will be grafted even if they
4042 If --force is specified, revisions will be grafted even if they
4044 are already ancestors of or have been grafted to the destination.
4043 are already ancestors of or have been grafted to the destination.
4045 This is useful when the revisions have since been backed out.
4044 This is useful when the revisions have since been backed out.
4046
4045
4047 If a graft merge results in conflicts, the graft process is
4046 If a graft merge results in conflicts, the graft process is
4048 interrupted so that the current merge can be manually resolved.
4047 interrupted so that the current merge can be manually resolved.
4049 Once all conflicts are addressed, the graft process can be
4048 Once all conflicts are addressed, the graft process can be
4050 continued with the -c/--continue option.
4049 continued with the -c/--continue option.
4051
4050
4052 .. note::
4051 .. note::
4053
4052
4054 The -c/--continue option does not reapply earlier options, except
4053 The -c/--continue option does not reapply earlier options, except
4055 for --force.
4054 for --force.
4056
4055
4057 .. container:: verbose
4056 .. container:: verbose
4058
4057
4059 Examples:
4058 Examples:
4060
4059
4061 - copy a single change to the stable branch and edit its description::
4060 - copy a single change to the stable branch and edit its description::
4062
4061
4063 hg update stable
4062 hg update stable
4064 hg graft --edit 9393
4063 hg graft --edit 9393
4065
4064
4066 - graft a range of changesets with one exception, updating dates::
4065 - graft a range of changesets with one exception, updating dates::
4067
4066
4068 hg graft -D "2085::2093 and not 2091"
4067 hg graft -D "2085::2093 and not 2091"
4069
4068
4070 - continue a graft after resolving conflicts::
4069 - continue a graft after resolving conflicts::
4071
4070
4072 hg graft -c
4071 hg graft -c
4073
4072
4074 - show the source of a grafted changeset::
4073 - show the source of a grafted changeset::
4075
4074
4076 hg log --debug -r .
4075 hg log --debug -r .
4077
4076
4078 - show revisions sorted by date::
4077 - show revisions sorted by date::
4079
4078
4080 hg log -r "sort(all(), date)"
4079 hg log -r "sort(all(), date)"
4081
4080
4082 See :hg:`help revisions` and :hg:`help revsets` for more about
4081 See :hg:`help revisions` and :hg:`help revsets` for more about
4083 specifying revisions.
4082 specifying revisions.
4084
4083
4085 Returns 0 on successful completion.
4084 Returns 0 on successful completion.
4086 '''
4085 '''
4087 with repo.wlock():
4086 with repo.wlock():
4088 return _dograft(ui, repo, *revs, **opts)
4087 return _dograft(ui, repo, *revs, **opts)
4089
4088
4090 def _dograft(ui, repo, *revs, **opts):
4089 def _dograft(ui, repo, *revs, **opts):
4091 if revs and opts.get('rev'):
4090 if revs and opts.get('rev'):
4092 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
4091 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
4093 'revision ordering!\n'))
4092 'revision ordering!\n'))
4094
4093
4095 revs = list(revs)
4094 revs = list(revs)
4096 revs.extend(opts.get('rev'))
4095 revs.extend(opts.get('rev'))
4097
4096
4098 if not opts.get('user') and opts.get('currentuser'):
4097 if not opts.get('user') and opts.get('currentuser'):
4099 opts['user'] = ui.username()
4098 opts['user'] = ui.username()
4100 if not opts.get('date') and opts.get('currentdate'):
4099 if not opts.get('date') and opts.get('currentdate'):
4101 opts['date'] = "%d %d" % util.makedate()
4100 opts['date'] = "%d %d" % util.makedate()
4102
4101
4103 editor = cmdutil.getcommiteditor(editform='graft', **opts)
4102 editor = cmdutil.getcommiteditor(editform='graft', **opts)
4104
4103
4105 cont = False
4104 cont = False
4106 if opts.get('continue'):
4105 if opts.get('continue'):
4107 cont = True
4106 cont = True
4108 if revs:
4107 if revs:
4109 raise error.Abort(_("can't specify --continue and revisions"))
4108 raise error.Abort(_("can't specify --continue and revisions"))
4110 # read in unfinished revisions
4109 # read in unfinished revisions
4111 try:
4110 try:
4112 nodes = repo.vfs.read('graftstate').splitlines()
4111 nodes = repo.vfs.read('graftstate').splitlines()
4113 revs = [repo[node].rev() for node in nodes]
4112 revs = [repo[node].rev() for node in nodes]
4114 except IOError as inst:
4113 except IOError as inst:
4115 if inst.errno != errno.ENOENT:
4114 if inst.errno != errno.ENOENT:
4116 raise
4115 raise
4117 cmdutil.wrongtooltocontinue(repo, _('graft'))
4116 cmdutil.wrongtooltocontinue(repo, _('graft'))
4118 else:
4117 else:
4119 cmdutil.checkunfinished(repo)
4118 cmdutil.checkunfinished(repo)
4120 cmdutil.bailifchanged(repo)
4119 cmdutil.bailifchanged(repo)
4121 if not revs:
4120 if not revs:
4122 raise error.Abort(_('no revisions specified'))
4121 raise error.Abort(_('no revisions specified'))
4123 revs = scmutil.revrange(repo, revs)
4122 revs = scmutil.revrange(repo, revs)
4124
4123
4125 skipped = set()
4124 skipped = set()
4126 # check for merges
4125 # check for merges
4127 for rev in repo.revs('%ld and merge()', revs):
4126 for rev in repo.revs('%ld and merge()', revs):
4128 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
4127 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
4129 skipped.add(rev)
4128 skipped.add(rev)
4130 revs = [r for r in revs if r not in skipped]
4129 revs = [r for r in revs if r not in skipped]
4131 if not revs:
4130 if not revs:
4132 return -1
4131 return -1
4133
4132
4134 # Don't check in the --continue case, in effect retaining --force across
4133 # Don't check in the --continue case, in effect retaining --force across
4135 # --continues. That's because without --force, any revisions we decided to
4134 # --continues. That's because without --force, any revisions we decided to
4136 # skip would have been filtered out here, so they wouldn't have made their
4135 # skip would have been filtered out here, so they wouldn't have made their
4137 # way to the graftstate. With --force, any revisions we would have otherwise
4136 # way to the graftstate. With --force, any revisions we would have otherwise
4138 # skipped would not have been filtered out, and if they hadn't been applied
4137 # skipped would not have been filtered out, and if they hadn't been applied
4139 # already, they'd have been in the graftstate.
4138 # already, they'd have been in the graftstate.
4140 if not (cont or opts.get('force')):
4139 if not (cont or opts.get('force')):
4141 # check for ancestors of dest branch
4140 # check for ancestors of dest branch
4142 crev = repo['.'].rev()
4141 crev = repo['.'].rev()
4143 ancestors = repo.changelog.ancestors([crev], inclusive=True)
4142 ancestors = repo.changelog.ancestors([crev], inclusive=True)
4144 # Cannot use x.remove(y) on smart set, this has to be a list.
4143 # Cannot use x.remove(y) on smart set, this has to be a list.
4145 # XXX make this lazy in the future
4144 # XXX make this lazy in the future
4146 revs = list(revs)
4145 revs = list(revs)
4147 # don't mutate while iterating, create a copy
4146 # don't mutate while iterating, create a copy
4148 for rev in list(revs):
4147 for rev in list(revs):
4149 if rev in ancestors:
4148 if rev in ancestors:
4150 ui.warn(_('skipping ancestor revision %d:%s\n') %
4149 ui.warn(_('skipping ancestor revision %d:%s\n') %
4151 (rev, repo[rev]))
4150 (rev, repo[rev]))
4152 # XXX remove on list is slow
4151 # XXX remove on list is slow
4153 revs.remove(rev)
4152 revs.remove(rev)
4154 if not revs:
4153 if not revs:
4155 return -1
4154 return -1
4156
4155
4157 # analyze revs for earlier grafts
4156 # analyze revs for earlier grafts
4158 ids = {}
4157 ids = {}
4159 for ctx in repo.set("%ld", revs):
4158 for ctx in repo.set("%ld", revs):
4160 ids[ctx.hex()] = ctx.rev()
4159 ids[ctx.hex()] = ctx.rev()
4161 n = ctx.extra().get('source')
4160 n = ctx.extra().get('source')
4162 if n:
4161 if n:
4163 ids[n] = ctx.rev()
4162 ids[n] = ctx.rev()
4164
4163
4165 # check ancestors for earlier grafts
4164 # check ancestors for earlier grafts
4166 ui.debug('scanning for duplicate grafts\n')
4165 ui.debug('scanning for duplicate grafts\n')
4167
4166
4168 for rev in repo.changelog.findmissingrevs(revs, [crev]):
4167 for rev in repo.changelog.findmissingrevs(revs, [crev]):
4169 ctx = repo[rev]
4168 ctx = repo[rev]
4170 n = ctx.extra().get('source')
4169 n = ctx.extra().get('source')
4171 if n in ids:
4170 if n in ids:
4172 try:
4171 try:
4173 r = repo[n].rev()
4172 r = repo[n].rev()
4174 except error.RepoLookupError:
4173 except error.RepoLookupError:
4175 r = None
4174 r = None
4176 if r in revs:
4175 if r in revs:
4177 ui.warn(_('skipping revision %d:%s '
4176 ui.warn(_('skipping revision %d:%s '
4178 '(already grafted to %d:%s)\n')
4177 '(already grafted to %d:%s)\n')
4179 % (r, repo[r], rev, ctx))
4178 % (r, repo[r], rev, ctx))
4180 revs.remove(r)
4179 revs.remove(r)
4181 elif ids[n] in revs:
4180 elif ids[n] in revs:
4182 if r is None:
4181 if r is None:
4183 ui.warn(_('skipping already grafted revision %d:%s '
4182 ui.warn(_('skipping already grafted revision %d:%s '
4184 '(%d:%s also has unknown origin %s)\n')
4183 '(%d:%s also has unknown origin %s)\n')
4185 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
4184 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
4186 else:
4185 else:
4187 ui.warn(_('skipping already grafted revision %d:%s '
4186 ui.warn(_('skipping already grafted revision %d:%s '
4188 '(%d:%s also has origin %d:%s)\n')
4187 '(%d:%s also has origin %d:%s)\n')
4189 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
4188 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
4190 revs.remove(ids[n])
4189 revs.remove(ids[n])
4191 elif ctx.hex() in ids:
4190 elif ctx.hex() in ids:
4192 r = ids[ctx.hex()]
4191 r = ids[ctx.hex()]
4193 ui.warn(_('skipping already grafted revision %d:%s '
4192 ui.warn(_('skipping already grafted revision %d:%s '
4194 '(was grafted from %d:%s)\n') %
4193 '(was grafted from %d:%s)\n') %
4195 (r, repo[r], rev, ctx))
4194 (r, repo[r], rev, ctx))
4196 revs.remove(r)
4195 revs.remove(r)
4197 if not revs:
4196 if not revs:
4198 return -1
4197 return -1
4199
4198
4200 for pos, ctx in enumerate(repo.set("%ld", revs)):
4199 for pos, ctx in enumerate(repo.set("%ld", revs)):
4201 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
4200 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
4202 ctx.description().split('\n', 1)[0])
4201 ctx.description().split('\n', 1)[0])
4203 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
4202 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
4204 if names:
4203 if names:
4205 desc += ' (%s)' % ' '.join(names)
4204 desc += ' (%s)' % ' '.join(names)
4206 ui.status(_('grafting %s\n') % desc)
4205 ui.status(_('grafting %s\n') % desc)
4207 if opts.get('dry_run'):
4206 if opts.get('dry_run'):
4208 continue
4207 continue
4209
4208
4210 source = ctx.extra().get('source')
4209 source = ctx.extra().get('source')
4211 extra = {}
4210 extra = {}
4212 if source:
4211 if source:
4213 extra['source'] = source
4212 extra['source'] = source
4214 extra['intermediate-source'] = ctx.hex()
4213 extra['intermediate-source'] = ctx.hex()
4215 else:
4214 else:
4216 extra['source'] = ctx.hex()
4215 extra['source'] = ctx.hex()
4217 user = ctx.user()
4216 user = ctx.user()
4218 if opts.get('user'):
4217 if opts.get('user'):
4219 user = opts['user']
4218 user = opts['user']
4220 date = ctx.date()
4219 date = ctx.date()
4221 if opts.get('date'):
4220 if opts.get('date'):
4222 date = opts['date']
4221 date = opts['date']
4223 message = ctx.description()
4222 message = ctx.description()
4224 if opts.get('log'):
4223 if opts.get('log'):
4225 message += '\n(grafted from %s)' % ctx.hex()
4224 message += '\n(grafted from %s)' % ctx.hex()
4226
4225
4227 # we don't merge the first commit when continuing
4226 # we don't merge the first commit when continuing
4228 if not cont:
4227 if not cont:
4229 # perform the graft merge with p1(rev) as 'ancestor'
4228 # perform the graft merge with p1(rev) as 'ancestor'
4230 try:
4229 try:
4231 # ui.forcemerge is an internal variable, do not document
4230 # ui.forcemerge is an internal variable, do not document
4232 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4231 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4233 'graft')
4232 'graft')
4234 stats = mergemod.graft(repo, ctx, ctx.p1(),
4233 stats = mergemod.graft(repo, ctx, ctx.p1(),
4235 ['local', 'graft'])
4234 ['local', 'graft'])
4236 finally:
4235 finally:
4237 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4236 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4238 # report any conflicts
4237 # report any conflicts
4239 if stats and stats[3] > 0:
4238 if stats and stats[3] > 0:
4240 # write out state for --continue
4239 # write out state for --continue
4241 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4240 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4242 repo.vfs.write('graftstate', ''.join(nodelines))
4241 repo.vfs.write('graftstate', ''.join(nodelines))
4243 extra = ''
4242 extra = ''
4244 if opts.get('user'):
4243 if opts.get('user'):
4245 extra += ' --user %s' % util.shellquote(opts['user'])
4244 extra += ' --user %s' % util.shellquote(opts['user'])
4246 if opts.get('date'):
4245 if opts.get('date'):
4247 extra += ' --date %s' % util.shellquote(opts['date'])
4246 extra += ' --date %s' % util.shellquote(opts['date'])
4248 if opts.get('log'):
4247 if opts.get('log'):
4249 extra += ' --log'
4248 extra += ' --log'
4250 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
4249 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
4251 raise error.Abort(
4250 raise error.Abort(
4252 _("unresolved conflicts, can't continue"),
4251 _("unresolved conflicts, can't continue"),
4253 hint=hint)
4252 hint=hint)
4254 else:
4253 else:
4255 cont = False
4254 cont = False
4256
4255
4257 # commit
4256 # commit
4258 node = repo.commit(text=message, user=user,
4257 node = repo.commit(text=message, user=user,
4259 date=date, extra=extra, editor=editor)
4258 date=date, extra=extra, editor=editor)
4260 if node is None:
4259 if node is None:
4261 ui.warn(
4260 ui.warn(
4262 _('note: graft of %d:%s created no changes to commit\n') %
4261 _('note: graft of %d:%s created no changes to commit\n') %
4263 (ctx.rev(), ctx))
4262 (ctx.rev(), ctx))
4264
4263
4265 # remove state when we complete successfully
4264 # remove state when we complete successfully
4266 if not opts.get('dry_run'):
4265 if not opts.get('dry_run'):
4267 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4266 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4268
4267
4269 return 0
4268 return 0
4270
4269
4271 @command('grep',
4270 @command('grep',
4272 [('0', 'print0', None, _('end fields with NUL')),
4271 [('0', 'print0', None, _('end fields with NUL')),
4273 ('', 'all', None, _('print all revisions that match')),
4272 ('', 'all', None, _('print all revisions that match')),
4274 ('a', 'text', None, _('treat all files as text')),
4273 ('a', 'text', None, _('treat all files as text')),
4275 ('f', 'follow', None,
4274 ('f', 'follow', None,
4276 _('follow changeset history,'
4275 _('follow changeset history,'
4277 ' or file history across copies and renames')),
4276 ' or file history across copies and renames')),
4278 ('i', 'ignore-case', None, _('ignore case when matching')),
4277 ('i', 'ignore-case', None, _('ignore case when matching')),
4279 ('l', 'files-with-matches', None,
4278 ('l', 'files-with-matches', None,
4280 _('print only filenames and revisions that match')),
4279 _('print only filenames and revisions that match')),
4281 ('n', 'line-number', None, _('print matching line numbers')),
4280 ('n', 'line-number', None, _('print matching line numbers')),
4282 ('r', 'rev', [],
4281 ('r', 'rev', [],
4283 _('only search files changed within revision range'), _('REV')),
4282 _('only search files changed within revision range'), _('REV')),
4284 ('u', 'user', None, _('list the author (long with -v)')),
4283 ('u', 'user', None, _('list the author (long with -v)')),
4285 ('d', 'date', None, _('list the date (short with -q)')),
4284 ('d', 'date', None, _('list the date (short with -q)')),
4286 ] + formatteropts + walkopts,
4285 ] + formatteropts + walkopts,
4287 _('[OPTION]... PATTERN [FILE]...'),
4286 _('[OPTION]... PATTERN [FILE]...'),
4288 inferrepo=True)
4287 inferrepo=True)
4289 def grep(ui, repo, pattern, *pats, **opts):
4288 def grep(ui, repo, pattern, *pats, **opts):
4290 """search for a pattern in specified files and revisions
4289 """search for a pattern in specified files and revisions
4291
4290
4292 Search revisions of files for a regular expression.
4291 Search revisions of files for a regular expression.
4293
4292
4294 This command behaves differently than Unix grep. It only accepts
4293 This command behaves differently than Unix grep. It only accepts
4295 Python/Perl regexps. It searches repository history, not the
4294 Python/Perl regexps. It searches repository history, not the
4296 working directory. It always prints the revision number in which a
4295 working directory. It always prints the revision number in which a
4297 match appears.
4296 match appears.
4298
4297
4299 By default, grep only prints output for the first revision of a
4298 By default, grep only prints output for the first revision of a
4300 file in which it finds a match. To get it to print every revision
4299 file in which it finds a match. To get it to print every revision
4301 that contains a change in match status ("-" for a match that
4300 that contains a change in match status ("-" for a match that
4302 becomes a non-match, or "+" for a non-match that becomes a match),
4301 becomes a non-match, or "+" for a non-match that becomes a match),
4303 use the --all flag.
4302 use the --all flag.
4304
4303
4305 Returns 0 if a match is found, 1 otherwise.
4304 Returns 0 if a match is found, 1 otherwise.
4306 """
4305 """
4307 reflags = re.M
4306 reflags = re.M
4308 if opts.get('ignore_case'):
4307 if opts.get('ignore_case'):
4309 reflags |= re.I
4308 reflags |= re.I
4310 try:
4309 try:
4311 regexp = util.re.compile(pattern, reflags)
4310 regexp = util.re.compile(pattern, reflags)
4312 except re.error as inst:
4311 except re.error as inst:
4313 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4312 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4314 return 1
4313 return 1
4315 sep, eol = ':', '\n'
4314 sep, eol = ':', '\n'
4316 if opts.get('print0'):
4315 if opts.get('print0'):
4317 sep = eol = '\0'
4316 sep = eol = '\0'
4318
4317
4319 getfile = util.lrucachefunc(repo.file)
4318 getfile = util.lrucachefunc(repo.file)
4320
4319
4321 def matchlines(body):
4320 def matchlines(body):
4322 begin = 0
4321 begin = 0
4323 linenum = 0
4322 linenum = 0
4324 while begin < len(body):
4323 while begin < len(body):
4325 match = regexp.search(body, begin)
4324 match = regexp.search(body, begin)
4326 if not match:
4325 if not match:
4327 break
4326 break
4328 mstart, mend = match.span()
4327 mstart, mend = match.span()
4329 linenum += body.count('\n', begin, mstart) + 1
4328 linenum += body.count('\n', begin, mstart) + 1
4330 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4329 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4331 begin = body.find('\n', mend) + 1 or len(body) + 1
4330 begin = body.find('\n', mend) + 1 or len(body) + 1
4332 lend = begin - 1
4331 lend = begin - 1
4333 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4332 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4334
4333
4335 class linestate(object):
4334 class linestate(object):
4336 def __init__(self, line, linenum, colstart, colend):
4335 def __init__(self, line, linenum, colstart, colend):
4337 self.line = line
4336 self.line = line
4338 self.linenum = linenum
4337 self.linenum = linenum
4339 self.colstart = colstart
4338 self.colstart = colstart
4340 self.colend = colend
4339 self.colend = colend
4341
4340
4342 def __hash__(self):
4341 def __hash__(self):
4343 return hash((self.linenum, self.line))
4342 return hash((self.linenum, self.line))
4344
4343
4345 def __eq__(self, other):
4344 def __eq__(self, other):
4346 return self.line == other.line
4345 return self.line == other.line
4347
4346
4348 def findpos(self):
4347 def findpos(self):
4349 """Iterate all (start, end) indices of matches"""
4348 """Iterate all (start, end) indices of matches"""
4350 yield self.colstart, self.colend
4349 yield self.colstart, self.colend
4351 p = self.colend
4350 p = self.colend
4352 while p < len(self.line):
4351 while p < len(self.line):
4353 m = regexp.search(self.line, p)
4352 m = regexp.search(self.line, p)
4354 if not m:
4353 if not m:
4355 break
4354 break
4356 yield m.span()
4355 yield m.span()
4357 p = m.end()
4356 p = m.end()
4358
4357
4359 matches = {}
4358 matches = {}
4360 copies = {}
4359 copies = {}
4361 def grepbody(fn, rev, body):
4360 def grepbody(fn, rev, body):
4362 matches[rev].setdefault(fn, [])
4361 matches[rev].setdefault(fn, [])
4363 m = matches[rev][fn]
4362 m = matches[rev][fn]
4364 for lnum, cstart, cend, line in matchlines(body):
4363 for lnum, cstart, cend, line in matchlines(body):
4365 s = linestate(line, lnum, cstart, cend)
4364 s = linestate(line, lnum, cstart, cend)
4366 m.append(s)
4365 m.append(s)
4367
4366
4368 def difflinestates(a, b):
4367 def difflinestates(a, b):
4369 sm = difflib.SequenceMatcher(None, a, b)
4368 sm = difflib.SequenceMatcher(None, a, b)
4370 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4369 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4371 if tag == 'insert':
4370 if tag == 'insert':
4372 for i in xrange(blo, bhi):
4371 for i in xrange(blo, bhi):
4373 yield ('+', b[i])
4372 yield ('+', b[i])
4374 elif tag == 'delete':
4373 elif tag == 'delete':
4375 for i in xrange(alo, ahi):
4374 for i in xrange(alo, ahi):
4376 yield ('-', a[i])
4375 yield ('-', a[i])
4377 elif tag == 'replace':
4376 elif tag == 'replace':
4378 for i in xrange(alo, ahi):
4377 for i in xrange(alo, ahi):
4379 yield ('-', a[i])
4378 yield ('-', a[i])
4380 for i in xrange(blo, bhi):
4379 for i in xrange(blo, bhi):
4381 yield ('+', b[i])
4380 yield ('+', b[i])
4382
4381
4383 def display(fm, fn, ctx, pstates, states):
4382 def display(fm, fn, ctx, pstates, states):
4384 rev = ctx.rev()
4383 rev = ctx.rev()
4385 if fm:
4384 if fm:
4386 formatuser = str
4385 formatuser = str
4387 else:
4386 else:
4388 formatuser = ui.shortuser
4387 formatuser = ui.shortuser
4389 if ui.quiet:
4388 if ui.quiet:
4390 datefmt = '%Y-%m-%d'
4389 datefmt = '%Y-%m-%d'
4391 else:
4390 else:
4392 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
4391 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
4393 found = False
4392 found = False
4394 @util.cachefunc
4393 @util.cachefunc
4395 def binary():
4394 def binary():
4396 flog = getfile(fn)
4395 flog = getfile(fn)
4397 return util.binary(flog.read(ctx.filenode(fn)))
4396 return util.binary(flog.read(ctx.filenode(fn)))
4398
4397
4399 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
4398 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
4400 if opts.get('all'):
4399 if opts.get('all'):
4401 iter = difflinestates(pstates, states)
4400 iter = difflinestates(pstates, states)
4402 else:
4401 else:
4403 iter = [('', l) for l in states]
4402 iter = [('', l) for l in states]
4404 for change, l in iter:
4403 for change, l in iter:
4405 fm.startitem()
4404 fm.startitem()
4406 fm.data(node=fm.hexfunc(ctx.node()))
4405 fm.data(node=fm.hexfunc(ctx.node()))
4407 cols = [
4406 cols = [
4408 ('filename', fn, True),
4407 ('filename', fn, True),
4409 ('rev', rev, True),
4408 ('rev', rev, True),
4410 ('linenumber', l.linenum, opts.get('line_number')),
4409 ('linenumber', l.linenum, opts.get('line_number')),
4411 ]
4410 ]
4412 if opts.get('all'):
4411 if opts.get('all'):
4413 cols.append(('change', change, True))
4412 cols.append(('change', change, True))
4414 cols.extend([
4413 cols.extend([
4415 ('user', formatuser(ctx.user()), opts.get('user')),
4414 ('user', formatuser(ctx.user()), opts.get('user')),
4416 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
4415 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
4417 ])
4416 ])
4418 lastcol = next(name for name, data, cond in reversed(cols) if cond)
4417 lastcol = next(name for name, data, cond in reversed(cols) if cond)
4419 for name, data, cond in cols:
4418 for name, data, cond in cols:
4420 field = fieldnamemap.get(name, name)
4419 field = fieldnamemap.get(name, name)
4421 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
4420 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
4422 if cond and name != lastcol:
4421 if cond and name != lastcol:
4423 fm.plain(sep, label='grep.sep')
4422 fm.plain(sep, label='grep.sep')
4424 if not opts.get('files_with_matches'):
4423 if not opts.get('files_with_matches'):
4425 fm.plain(sep, label='grep.sep')
4424 fm.plain(sep, label='grep.sep')
4426 if not opts.get('text') and binary():
4425 if not opts.get('text') and binary():
4427 fm.plain(_(" Binary file matches"))
4426 fm.plain(_(" Binary file matches"))
4428 else:
4427 else:
4429 displaymatches(fm.nested('texts'), l)
4428 displaymatches(fm.nested('texts'), l)
4430 fm.plain(eol)
4429 fm.plain(eol)
4431 found = True
4430 found = True
4432 if opts.get('files_with_matches'):
4431 if opts.get('files_with_matches'):
4433 break
4432 break
4434 return found
4433 return found
4435
4434
4436 def displaymatches(fm, l):
4435 def displaymatches(fm, l):
4437 p = 0
4436 p = 0
4438 for s, e in l.findpos():
4437 for s, e in l.findpos():
4439 if p < s:
4438 if p < s:
4440 fm.startitem()
4439 fm.startitem()
4441 fm.write('text', '%s', l.line[p:s])
4440 fm.write('text', '%s', l.line[p:s])
4442 fm.data(matched=False)
4441 fm.data(matched=False)
4443 fm.startitem()
4442 fm.startitem()
4444 fm.write('text', '%s', l.line[s:e], label='grep.match')
4443 fm.write('text', '%s', l.line[s:e], label='grep.match')
4445 fm.data(matched=True)
4444 fm.data(matched=True)
4446 p = e
4445 p = e
4447 if p < len(l.line):
4446 if p < len(l.line):
4448 fm.startitem()
4447 fm.startitem()
4449 fm.write('text', '%s', l.line[p:])
4448 fm.write('text', '%s', l.line[p:])
4450 fm.data(matched=False)
4449 fm.data(matched=False)
4451 fm.end()
4450 fm.end()
4452
4451
4453 skip = {}
4452 skip = {}
4454 revfiles = {}
4453 revfiles = {}
4455 matchfn = scmutil.match(repo[None], pats, opts)
4454 matchfn = scmutil.match(repo[None], pats, opts)
4456 found = False
4455 found = False
4457 follow = opts.get('follow')
4456 follow = opts.get('follow')
4458
4457
4459 def prep(ctx, fns):
4458 def prep(ctx, fns):
4460 rev = ctx.rev()
4459 rev = ctx.rev()
4461 pctx = ctx.p1()
4460 pctx = ctx.p1()
4462 parent = pctx.rev()
4461 parent = pctx.rev()
4463 matches.setdefault(rev, {})
4462 matches.setdefault(rev, {})
4464 matches.setdefault(parent, {})
4463 matches.setdefault(parent, {})
4465 files = revfiles.setdefault(rev, [])
4464 files = revfiles.setdefault(rev, [])
4466 for fn in fns:
4465 for fn in fns:
4467 flog = getfile(fn)
4466 flog = getfile(fn)
4468 try:
4467 try:
4469 fnode = ctx.filenode(fn)
4468 fnode = ctx.filenode(fn)
4470 except error.LookupError:
4469 except error.LookupError:
4471 continue
4470 continue
4472
4471
4473 copied = flog.renamed(fnode)
4472 copied = flog.renamed(fnode)
4474 copy = follow and copied and copied[0]
4473 copy = follow and copied and copied[0]
4475 if copy:
4474 if copy:
4476 copies.setdefault(rev, {})[fn] = copy
4475 copies.setdefault(rev, {})[fn] = copy
4477 if fn in skip:
4476 if fn in skip:
4478 if copy:
4477 if copy:
4479 skip[copy] = True
4478 skip[copy] = True
4480 continue
4479 continue
4481 files.append(fn)
4480 files.append(fn)
4482
4481
4483 if fn not in matches[rev]:
4482 if fn not in matches[rev]:
4484 grepbody(fn, rev, flog.read(fnode))
4483 grepbody(fn, rev, flog.read(fnode))
4485
4484
4486 pfn = copy or fn
4485 pfn = copy or fn
4487 if pfn not in matches[parent]:
4486 if pfn not in matches[parent]:
4488 try:
4487 try:
4489 fnode = pctx.filenode(pfn)
4488 fnode = pctx.filenode(pfn)
4490 grepbody(pfn, parent, flog.read(fnode))
4489 grepbody(pfn, parent, flog.read(fnode))
4491 except error.LookupError:
4490 except error.LookupError:
4492 pass
4491 pass
4493
4492
4494 fm = ui.formatter('grep', opts)
4493 fm = ui.formatter('grep', opts)
4495 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4494 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4496 rev = ctx.rev()
4495 rev = ctx.rev()
4497 parent = ctx.p1().rev()
4496 parent = ctx.p1().rev()
4498 for fn in sorted(revfiles.get(rev, [])):
4497 for fn in sorted(revfiles.get(rev, [])):
4499 states = matches[rev][fn]
4498 states = matches[rev][fn]
4500 copy = copies.get(rev, {}).get(fn)
4499 copy = copies.get(rev, {}).get(fn)
4501 if fn in skip:
4500 if fn in skip:
4502 if copy:
4501 if copy:
4503 skip[copy] = True
4502 skip[copy] = True
4504 continue
4503 continue
4505 pstates = matches.get(parent, {}).get(copy or fn, [])
4504 pstates = matches.get(parent, {}).get(copy or fn, [])
4506 if pstates or states:
4505 if pstates or states:
4507 r = display(fm, fn, ctx, pstates, states)
4506 r = display(fm, fn, ctx, pstates, states)
4508 found = found or r
4507 found = found or r
4509 if r and not opts.get('all'):
4508 if r and not opts.get('all'):
4510 skip[fn] = True
4509 skip[fn] = True
4511 if copy:
4510 if copy:
4512 skip[copy] = True
4511 skip[copy] = True
4513 del matches[rev]
4512 del matches[rev]
4514 del revfiles[rev]
4513 del revfiles[rev]
4515 fm.end()
4514 fm.end()
4516
4515
4517 return not found
4516 return not found
4518
4517
4519 @command('heads',
4518 @command('heads',
4520 [('r', 'rev', '',
4519 [('r', 'rev', '',
4521 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4520 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4522 ('t', 'topo', False, _('show topological heads only')),
4521 ('t', 'topo', False, _('show topological heads only')),
4523 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4522 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4524 ('c', 'closed', False, _('show normal and closed branch heads')),
4523 ('c', 'closed', False, _('show normal and closed branch heads')),
4525 ] + templateopts,
4524 ] + templateopts,
4526 _('[-ct] [-r STARTREV] [REV]...'))
4525 _('[-ct] [-r STARTREV] [REV]...'))
4527 def heads(ui, repo, *branchrevs, **opts):
4526 def heads(ui, repo, *branchrevs, **opts):
4528 """show branch heads
4527 """show branch heads
4529
4528
4530 With no arguments, show all open branch heads in the repository.
4529 With no arguments, show all open branch heads in the repository.
4531 Branch heads are changesets that have no descendants on the
4530 Branch heads are changesets that have no descendants on the
4532 same branch. They are where development generally takes place and
4531 same branch. They are where development generally takes place and
4533 are the usual targets for update and merge operations.
4532 are the usual targets for update and merge operations.
4534
4533
4535 If one or more REVs are given, only open branch heads on the
4534 If one or more REVs are given, only open branch heads on the
4536 branches associated with the specified changesets are shown. This
4535 branches associated with the specified changesets are shown. This
4537 means that you can use :hg:`heads .` to see the heads on the
4536 means that you can use :hg:`heads .` to see the heads on the
4538 currently checked-out branch.
4537 currently checked-out branch.
4539
4538
4540 If -c/--closed is specified, also show branch heads marked closed
4539 If -c/--closed is specified, also show branch heads marked closed
4541 (see :hg:`commit --close-branch`).
4540 (see :hg:`commit --close-branch`).
4542
4541
4543 If STARTREV is specified, only those heads that are descendants of
4542 If STARTREV is specified, only those heads that are descendants of
4544 STARTREV will be displayed.
4543 STARTREV will be displayed.
4545
4544
4546 If -t/--topo is specified, named branch mechanics will be ignored and only
4545 If -t/--topo is specified, named branch mechanics will be ignored and only
4547 topological heads (changesets with no children) will be shown.
4546 topological heads (changesets with no children) will be shown.
4548
4547
4549 Returns 0 if matching heads are found, 1 if not.
4548 Returns 0 if matching heads are found, 1 if not.
4550 """
4549 """
4551
4550
4552 start = None
4551 start = None
4553 if 'rev' in opts:
4552 if 'rev' in opts:
4554 start = scmutil.revsingle(repo, opts['rev'], None).node()
4553 start = scmutil.revsingle(repo, opts['rev'], None).node()
4555
4554
4556 if opts.get('topo'):
4555 if opts.get('topo'):
4557 heads = [repo[h] for h in repo.heads(start)]
4556 heads = [repo[h] for h in repo.heads(start)]
4558 else:
4557 else:
4559 heads = []
4558 heads = []
4560 for branch in repo.branchmap():
4559 for branch in repo.branchmap():
4561 heads += repo.branchheads(branch, start, opts.get('closed'))
4560 heads += repo.branchheads(branch, start, opts.get('closed'))
4562 heads = [repo[h] for h in heads]
4561 heads = [repo[h] for h in heads]
4563
4562
4564 if branchrevs:
4563 if branchrevs:
4565 branches = set(repo[br].branch() for br in branchrevs)
4564 branches = set(repo[br].branch() for br in branchrevs)
4566 heads = [h for h in heads if h.branch() in branches]
4565 heads = [h for h in heads if h.branch() in branches]
4567
4566
4568 if opts.get('active') and branchrevs:
4567 if opts.get('active') and branchrevs:
4569 dagheads = repo.heads(start)
4568 dagheads = repo.heads(start)
4570 heads = [h for h in heads if h.node() in dagheads]
4569 heads = [h for h in heads if h.node() in dagheads]
4571
4570
4572 if branchrevs:
4571 if branchrevs:
4573 haveheads = set(h.branch() for h in heads)
4572 haveheads = set(h.branch() for h in heads)
4574 if branches - haveheads:
4573 if branches - haveheads:
4575 headless = ', '.join(b for b in branches - haveheads)
4574 headless = ', '.join(b for b in branches - haveheads)
4576 msg = _('no open branch heads found on branches %s')
4575 msg = _('no open branch heads found on branches %s')
4577 if opts.get('rev'):
4576 if opts.get('rev'):
4578 msg += _(' (started at %s)') % opts['rev']
4577 msg += _(' (started at %s)') % opts['rev']
4579 ui.warn((msg + '\n') % headless)
4578 ui.warn((msg + '\n') % headless)
4580
4579
4581 if not heads:
4580 if not heads:
4582 return 1
4581 return 1
4583
4582
4584 heads = sorted(heads, key=lambda x: -x.rev())
4583 heads = sorted(heads, key=lambda x: -x.rev())
4585 displayer = cmdutil.show_changeset(ui, repo, opts)
4584 displayer = cmdutil.show_changeset(ui, repo, opts)
4586 for ctx in heads:
4585 for ctx in heads:
4587 displayer.show(ctx)
4586 displayer.show(ctx)
4588 displayer.close()
4587 displayer.close()
4589
4588
4590 @command('help',
4589 @command('help',
4591 [('e', 'extension', None, _('show only help for extensions')),
4590 [('e', 'extension', None, _('show only help for extensions')),
4592 ('c', 'command', None, _('show only help for commands')),
4591 ('c', 'command', None, _('show only help for commands')),
4593 ('k', 'keyword', None, _('show topics matching keyword')),
4592 ('k', 'keyword', None, _('show topics matching keyword')),
4594 ('s', 'system', [], _('show help for specific platform(s)')),
4593 ('s', 'system', [], _('show help for specific platform(s)')),
4595 ],
4594 ],
4596 _('[-ecks] [TOPIC]'),
4595 _('[-ecks] [TOPIC]'),
4597 norepo=True)
4596 norepo=True)
4598 def help_(ui, name=None, **opts):
4597 def help_(ui, name=None, **opts):
4599 """show help for a given topic or a help overview
4598 """show help for a given topic or a help overview
4600
4599
4601 With no arguments, print a list of commands with short help messages.
4600 With no arguments, print a list of commands with short help messages.
4602
4601
4603 Given a topic, extension, or command name, print help for that
4602 Given a topic, extension, or command name, print help for that
4604 topic.
4603 topic.
4605
4604
4606 Returns 0 if successful.
4605 Returns 0 if successful.
4607 """
4606 """
4608
4607
4609 textwidth = ui.configint('ui', 'textwidth', 78)
4608 textwidth = ui.configint('ui', 'textwidth', 78)
4610 termwidth = ui.termwidth() - 2
4609 termwidth = ui.termwidth() - 2
4611 if textwidth <= 0 or termwidth < textwidth:
4610 if textwidth <= 0 or termwidth < textwidth:
4612 textwidth = termwidth
4611 textwidth = termwidth
4613
4612
4614 keep = opts.get('system') or []
4613 keep = opts.get('system') or []
4615 if len(keep) == 0:
4614 if len(keep) == 0:
4616 if sys.platform.startswith('win'):
4615 if sys.platform.startswith('win'):
4617 keep.append('windows')
4616 keep.append('windows')
4618 elif sys.platform == 'OpenVMS':
4617 elif sys.platform == 'OpenVMS':
4619 keep.append('vms')
4618 keep.append('vms')
4620 elif sys.platform == 'plan9':
4619 elif sys.platform == 'plan9':
4621 keep.append('plan9')
4620 keep.append('plan9')
4622 else:
4621 else:
4623 keep.append('unix')
4622 keep.append('unix')
4624 keep.append(sys.platform.lower())
4623 keep.append(sys.platform.lower())
4625 if ui.verbose:
4624 if ui.verbose:
4626 keep.append('verbose')
4625 keep.append('verbose')
4627
4626
4628 section = None
4627 section = None
4629 subtopic = None
4628 subtopic = None
4630 if name and '.' in name:
4629 if name and '.' in name:
4631 name, remaining = name.split('.', 1)
4630 name, remaining = name.split('.', 1)
4632 remaining = encoding.lower(remaining)
4631 remaining = encoding.lower(remaining)
4633 if '.' in remaining:
4632 if '.' in remaining:
4634 subtopic, section = remaining.split('.', 1)
4633 subtopic, section = remaining.split('.', 1)
4635 else:
4634 else:
4636 if name in help.subtopics:
4635 if name in help.subtopics:
4637 subtopic = remaining
4636 subtopic = remaining
4638 else:
4637 else:
4639 section = remaining
4638 section = remaining
4640
4639
4641 text = help.help_(ui, name, subtopic=subtopic, **opts)
4640 text = help.help_(ui, name, subtopic=subtopic, **opts)
4642
4641
4643 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4642 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4644 section=section)
4643 section=section)
4645
4644
4646 # We could have been given a weird ".foo" section without a name
4645 # We could have been given a weird ".foo" section without a name
4647 # to look for, or we could have simply failed to found "foo.bar"
4646 # to look for, or we could have simply failed to found "foo.bar"
4648 # because bar isn't a section of foo
4647 # because bar isn't a section of foo
4649 if section and not (formatted and name):
4648 if section and not (formatted and name):
4650 raise error.Abort(_("help section not found"))
4649 raise error.Abort(_("help section not found"))
4651
4650
4652 if 'verbose' in pruned:
4651 if 'verbose' in pruned:
4653 keep.append('omitted')
4652 keep.append('omitted')
4654 else:
4653 else:
4655 keep.append('notomitted')
4654 keep.append('notomitted')
4656 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4655 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4657 section=section)
4656 section=section)
4658 ui.write(formatted)
4657 ui.write(formatted)
4659
4658
4660
4659
4661 @command('identify|id',
4660 @command('identify|id',
4662 [('r', 'rev', '',
4661 [('r', 'rev', '',
4663 _('identify the specified revision'), _('REV')),
4662 _('identify the specified revision'), _('REV')),
4664 ('n', 'num', None, _('show local revision number')),
4663 ('n', 'num', None, _('show local revision number')),
4665 ('i', 'id', None, _('show global revision id')),
4664 ('i', 'id', None, _('show global revision id')),
4666 ('b', 'branch', None, _('show branch')),
4665 ('b', 'branch', None, _('show branch')),
4667 ('t', 'tags', None, _('show tags')),
4666 ('t', 'tags', None, _('show tags')),
4668 ('B', 'bookmarks', None, _('show bookmarks')),
4667 ('B', 'bookmarks', None, _('show bookmarks')),
4669 ] + remoteopts,
4668 ] + remoteopts,
4670 _('[-nibtB] [-r REV] [SOURCE]'),
4669 _('[-nibtB] [-r REV] [SOURCE]'),
4671 optionalrepo=True)
4670 optionalrepo=True)
4672 def identify(ui, repo, source=None, rev=None,
4671 def identify(ui, repo, source=None, rev=None,
4673 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4672 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4674 """identify the working directory or specified revision
4673 """identify the working directory or specified revision
4675
4674
4676 Print a summary identifying the repository state at REV using one or
4675 Print a summary identifying the repository state at REV using one or
4677 two parent hash identifiers, followed by a "+" if the working
4676 two parent hash identifiers, followed by a "+" if the working
4678 directory has uncommitted changes, the branch name (if not default),
4677 directory has uncommitted changes, the branch name (if not default),
4679 a list of tags, and a list of bookmarks.
4678 a list of tags, and a list of bookmarks.
4680
4679
4681 When REV is not given, print a summary of the current state of the
4680 When REV is not given, print a summary of the current state of the
4682 repository.
4681 repository.
4683
4682
4684 Specifying a path to a repository root or Mercurial bundle will
4683 Specifying a path to a repository root or Mercurial bundle will
4685 cause lookup to operate on that repository/bundle.
4684 cause lookup to operate on that repository/bundle.
4686
4685
4687 .. container:: verbose
4686 .. container:: verbose
4688
4687
4689 Examples:
4688 Examples:
4690
4689
4691 - generate a build identifier for the working directory::
4690 - generate a build identifier for the working directory::
4692
4691
4693 hg id --id > build-id.dat
4692 hg id --id > build-id.dat
4694
4693
4695 - find the revision corresponding to a tag::
4694 - find the revision corresponding to a tag::
4696
4695
4697 hg id -n -r 1.3
4696 hg id -n -r 1.3
4698
4697
4699 - check the most recent revision of a remote repository::
4698 - check the most recent revision of a remote repository::
4700
4699
4701 hg id -r tip http://selenic.com/hg/
4700 hg id -r tip http://selenic.com/hg/
4702
4701
4703 See :hg:`log` for generating more information about specific revisions,
4702 See :hg:`log` for generating more information about specific revisions,
4704 including full hash identifiers.
4703 including full hash identifiers.
4705
4704
4706 Returns 0 if successful.
4705 Returns 0 if successful.
4707 """
4706 """
4708
4707
4709 if not repo and not source:
4708 if not repo and not source:
4710 raise error.Abort(_("there is no Mercurial repository here "
4709 raise error.Abort(_("there is no Mercurial repository here "
4711 "(.hg not found)"))
4710 "(.hg not found)"))
4712
4711
4713 if ui.debugflag:
4712 if ui.debugflag:
4714 hexfunc = hex
4713 hexfunc = hex
4715 else:
4714 else:
4716 hexfunc = short
4715 hexfunc = short
4717 default = not (num or id or branch or tags or bookmarks)
4716 default = not (num or id or branch or tags or bookmarks)
4718 output = []
4717 output = []
4719 revs = []
4718 revs = []
4720
4719
4721 if source:
4720 if source:
4722 source, branches = hg.parseurl(ui.expandpath(source))
4721 source, branches = hg.parseurl(ui.expandpath(source))
4723 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4722 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4724 repo = peer.local()
4723 repo = peer.local()
4725 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4724 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4726
4725
4727 if not repo:
4726 if not repo:
4728 if num or branch or tags:
4727 if num or branch or tags:
4729 raise error.Abort(
4728 raise error.Abort(
4730 _("can't query remote revision number, branch, or tags"))
4729 _("can't query remote revision number, branch, or tags"))
4731 if not rev and revs:
4730 if not rev and revs:
4732 rev = revs[0]
4731 rev = revs[0]
4733 if not rev:
4732 if not rev:
4734 rev = "tip"
4733 rev = "tip"
4735
4734
4736 remoterev = peer.lookup(rev)
4735 remoterev = peer.lookup(rev)
4737 if default or id:
4736 if default or id:
4738 output = [hexfunc(remoterev)]
4737 output = [hexfunc(remoterev)]
4739
4738
4740 def getbms():
4739 def getbms():
4741 bms = []
4740 bms = []
4742
4741
4743 if 'bookmarks' in peer.listkeys('namespaces'):
4742 if 'bookmarks' in peer.listkeys('namespaces'):
4744 hexremoterev = hex(remoterev)
4743 hexremoterev = hex(remoterev)
4745 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4744 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4746 if bmr == hexremoterev]
4745 if bmr == hexremoterev]
4747
4746
4748 return sorted(bms)
4747 return sorted(bms)
4749
4748
4750 if bookmarks:
4749 if bookmarks:
4751 output.extend(getbms())
4750 output.extend(getbms())
4752 elif default and not ui.quiet:
4751 elif default and not ui.quiet:
4753 # multiple bookmarks for a single parent separated by '/'
4752 # multiple bookmarks for a single parent separated by '/'
4754 bm = '/'.join(getbms())
4753 bm = '/'.join(getbms())
4755 if bm:
4754 if bm:
4756 output.append(bm)
4755 output.append(bm)
4757 else:
4756 else:
4758 ctx = scmutil.revsingle(repo, rev, None)
4757 ctx = scmutil.revsingle(repo, rev, None)
4759
4758
4760 if ctx.rev() is None:
4759 if ctx.rev() is None:
4761 ctx = repo[None]
4760 ctx = repo[None]
4762 parents = ctx.parents()
4761 parents = ctx.parents()
4763 taglist = []
4762 taglist = []
4764 for p in parents:
4763 for p in parents:
4765 taglist.extend(p.tags())
4764 taglist.extend(p.tags())
4766
4765
4767 changed = ""
4766 changed = ""
4768 if default or id or num:
4767 if default or id or num:
4769 if (any(repo.status())
4768 if (any(repo.status())
4770 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4769 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4771 changed = '+'
4770 changed = '+'
4772 if default or id:
4771 if default or id:
4773 output = ["%s%s" %
4772 output = ["%s%s" %
4774 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4773 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4775 if num:
4774 if num:
4776 output.append("%s%s" %
4775 output.append("%s%s" %
4777 ('+'.join([str(p.rev()) for p in parents]), changed))
4776 ('+'.join([str(p.rev()) for p in parents]), changed))
4778 else:
4777 else:
4779 if default or id:
4778 if default or id:
4780 output = [hexfunc(ctx.node())]
4779 output = [hexfunc(ctx.node())]
4781 if num:
4780 if num:
4782 output.append(str(ctx.rev()))
4781 output.append(str(ctx.rev()))
4783 taglist = ctx.tags()
4782 taglist = ctx.tags()
4784
4783
4785 if default and not ui.quiet:
4784 if default and not ui.quiet:
4786 b = ctx.branch()
4785 b = ctx.branch()
4787 if b != 'default':
4786 if b != 'default':
4788 output.append("(%s)" % b)
4787 output.append("(%s)" % b)
4789
4788
4790 # multiple tags for a single parent separated by '/'
4789 # multiple tags for a single parent separated by '/'
4791 t = '/'.join(taglist)
4790 t = '/'.join(taglist)
4792 if t:
4791 if t:
4793 output.append(t)
4792 output.append(t)
4794
4793
4795 # multiple bookmarks for a single parent separated by '/'
4794 # multiple bookmarks for a single parent separated by '/'
4796 bm = '/'.join(ctx.bookmarks())
4795 bm = '/'.join(ctx.bookmarks())
4797 if bm:
4796 if bm:
4798 output.append(bm)
4797 output.append(bm)
4799 else:
4798 else:
4800 if branch:
4799 if branch:
4801 output.append(ctx.branch())
4800 output.append(ctx.branch())
4802
4801
4803 if tags:
4802 if tags:
4804 output.extend(taglist)
4803 output.extend(taglist)
4805
4804
4806 if bookmarks:
4805 if bookmarks:
4807 output.extend(ctx.bookmarks())
4806 output.extend(ctx.bookmarks())
4808
4807
4809 ui.write("%s\n" % ' '.join(output))
4808 ui.write("%s\n" % ' '.join(output))
4810
4809
4811 @command('import|patch',
4810 @command('import|patch',
4812 [('p', 'strip', 1,
4811 [('p', 'strip', 1,
4813 _('directory strip option for patch. This has the same '
4812 _('directory strip option for patch. This has the same '
4814 'meaning as the corresponding patch option'), _('NUM')),
4813 'meaning as the corresponding patch option'), _('NUM')),
4815 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4814 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4816 ('e', 'edit', False, _('invoke editor on commit messages')),
4815 ('e', 'edit', False, _('invoke editor on commit messages')),
4817 ('f', 'force', None,
4816 ('f', 'force', None,
4818 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4817 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4819 ('', 'no-commit', None,
4818 ('', 'no-commit', None,
4820 _("don't commit, just update the working directory")),
4819 _("don't commit, just update the working directory")),
4821 ('', 'bypass', None,
4820 ('', 'bypass', None,
4822 _("apply patch without touching the working directory")),
4821 _("apply patch without touching the working directory")),
4823 ('', 'partial', None,
4822 ('', 'partial', None,
4824 _('commit even if some hunks fail')),
4823 _('commit even if some hunks fail')),
4825 ('', 'exact', None,
4824 ('', 'exact', None,
4826 _('abort if patch would apply lossily')),
4825 _('abort if patch would apply lossily')),
4827 ('', 'prefix', '',
4826 ('', 'prefix', '',
4828 _('apply patch to subdirectory'), _('DIR')),
4827 _('apply patch to subdirectory'), _('DIR')),
4829 ('', 'import-branch', None,
4828 ('', 'import-branch', None,
4830 _('use any branch information in patch (implied by --exact)'))] +
4829 _('use any branch information in patch (implied by --exact)'))] +
4831 commitopts + commitopts2 + similarityopts,
4830 commitopts + commitopts2 + similarityopts,
4832 _('[OPTION]... PATCH...'))
4831 _('[OPTION]... PATCH...'))
4833 def import_(ui, repo, patch1=None, *patches, **opts):
4832 def import_(ui, repo, patch1=None, *patches, **opts):
4834 """import an ordered set of patches
4833 """import an ordered set of patches
4835
4834
4836 Import a list of patches and commit them individually (unless
4835 Import a list of patches and commit them individually (unless
4837 --no-commit is specified).
4836 --no-commit is specified).
4838
4837
4839 To read a patch from standard input, use "-" as the patch name. If
4838 To read a patch from standard input, use "-" as the patch name. If
4840 a URL is specified, the patch will be downloaded from there.
4839 a URL is specified, the patch will be downloaded from there.
4841
4840
4842 Import first applies changes to the working directory (unless
4841 Import first applies changes to the working directory (unless
4843 --bypass is specified), import will abort if there are outstanding
4842 --bypass is specified), import will abort if there are outstanding
4844 changes.
4843 changes.
4845
4844
4846 Use --bypass to apply and commit patches directly to the
4845 Use --bypass to apply and commit patches directly to the
4847 repository, without affecting the working directory. Without
4846 repository, without affecting the working directory. Without
4848 --exact, patches will be applied on top of the working directory
4847 --exact, patches will be applied on top of the working directory
4849 parent revision.
4848 parent revision.
4850
4849
4851 You can import a patch straight from a mail message. Even patches
4850 You can import a patch straight from a mail message. Even patches
4852 as attachments work (to use the body part, it must have type
4851 as attachments work (to use the body part, it must have type
4853 text/plain or text/x-patch). From and Subject headers of email
4852 text/plain or text/x-patch). From and Subject headers of email
4854 message are used as default committer and commit message. All
4853 message are used as default committer and commit message. All
4855 text/plain body parts before first diff are added to the commit
4854 text/plain body parts before first diff are added to the commit
4856 message.
4855 message.
4857
4856
4858 If the imported patch was generated by :hg:`export`, user and
4857 If the imported patch was generated by :hg:`export`, user and
4859 description from patch override values from message headers and
4858 description from patch override values from message headers and
4860 body. Values given on command line with -m/--message and -u/--user
4859 body. Values given on command line with -m/--message and -u/--user
4861 override these.
4860 override these.
4862
4861
4863 If --exact is specified, import will set the working directory to
4862 If --exact is specified, import will set the working directory to
4864 the parent of each patch before applying it, and will abort if the
4863 the parent of each patch before applying it, and will abort if the
4865 resulting changeset has a different ID than the one recorded in
4864 resulting changeset has a different ID than the one recorded in
4866 the patch. This will guard against various ways that portable
4865 the patch. This will guard against various ways that portable
4867 patch formats and mail systems might fail to transfer Mercurial
4866 patch formats and mail systems might fail to transfer Mercurial
4868 data or metadata. See :hg:`bundle` for lossless transmission.
4867 data or metadata. See :hg:`bundle` for lossless transmission.
4869
4868
4870 Use --partial to ensure a changeset will be created from the patch
4869 Use --partial to ensure a changeset will be created from the patch
4871 even if some hunks fail to apply. Hunks that fail to apply will be
4870 even if some hunks fail to apply. Hunks that fail to apply will be
4872 written to a <target-file>.rej file. Conflicts can then be resolved
4871 written to a <target-file>.rej file. Conflicts can then be resolved
4873 by hand before :hg:`commit --amend` is run to update the created
4872 by hand before :hg:`commit --amend` is run to update the created
4874 changeset. This flag exists to let people import patches that
4873 changeset. This flag exists to let people import patches that
4875 partially apply without losing the associated metadata (author,
4874 partially apply without losing the associated metadata (author,
4876 date, description, ...).
4875 date, description, ...).
4877
4876
4878 .. note::
4877 .. note::
4879
4878
4880 When no hunks apply cleanly, :hg:`import --partial` will create
4879 When no hunks apply cleanly, :hg:`import --partial` will create
4881 an empty changeset, importing only the patch metadata.
4880 an empty changeset, importing only the patch metadata.
4882
4881
4883 With -s/--similarity, hg will attempt to discover renames and
4882 With -s/--similarity, hg will attempt to discover renames and
4884 copies in the patch in the same way as :hg:`addremove`.
4883 copies in the patch in the same way as :hg:`addremove`.
4885
4884
4886 It is possible to use external patch programs to perform the patch
4885 It is possible to use external patch programs to perform the patch
4887 by setting the ``ui.patch`` configuration option. For the default
4886 by setting the ``ui.patch`` configuration option. For the default
4888 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4887 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4889 See :hg:`help config` for more information about configuration
4888 See :hg:`help config` for more information about configuration
4890 files and how to use these options.
4889 files and how to use these options.
4891
4890
4892 See :hg:`help dates` for a list of formats valid for -d/--date.
4891 See :hg:`help dates` for a list of formats valid for -d/--date.
4893
4892
4894 .. container:: verbose
4893 .. container:: verbose
4895
4894
4896 Examples:
4895 Examples:
4897
4896
4898 - import a traditional patch from a website and detect renames::
4897 - import a traditional patch from a website and detect renames::
4899
4898
4900 hg import -s 80 http://example.com/bugfix.patch
4899 hg import -s 80 http://example.com/bugfix.patch
4901
4900
4902 - import a changeset from an hgweb server::
4901 - import a changeset from an hgweb server::
4903
4902
4904 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4903 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4905
4904
4906 - import all the patches in an Unix-style mbox::
4905 - import all the patches in an Unix-style mbox::
4907
4906
4908 hg import incoming-patches.mbox
4907 hg import incoming-patches.mbox
4909
4908
4910 - attempt to exactly restore an exported changeset (not always
4909 - attempt to exactly restore an exported changeset (not always
4911 possible)::
4910 possible)::
4912
4911
4913 hg import --exact proposed-fix.patch
4912 hg import --exact proposed-fix.patch
4914
4913
4915 - use an external tool to apply a patch which is too fuzzy for
4914 - use an external tool to apply a patch which is too fuzzy for
4916 the default internal tool.
4915 the default internal tool.
4917
4916
4918 hg import --config ui.patch="patch --merge" fuzzy.patch
4917 hg import --config ui.patch="patch --merge" fuzzy.patch
4919
4918
4920 - change the default fuzzing from 2 to a less strict 7
4919 - change the default fuzzing from 2 to a less strict 7
4921
4920
4922 hg import --config ui.fuzz=7 fuzz.patch
4921 hg import --config ui.fuzz=7 fuzz.patch
4923
4922
4924 Returns 0 on success, 1 on partial success (see --partial).
4923 Returns 0 on success, 1 on partial success (see --partial).
4925 """
4924 """
4926
4925
4927 if not patch1:
4926 if not patch1:
4928 raise error.Abort(_('need at least one patch to import'))
4927 raise error.Abort(_('need at least one patch to import'))
4929
4928
4930 patches = (patch1,) + patches
4929 patches = (patch1,) + patches
4931
4930
4932 date = opts.get('date')
4931 date = opts.get('date')
4933 if date:
4932 if date:
4934 opts['date'] = util.parsedate(date)
4933 opts['date'] = util.parsedate(date)
4935
4934
4936 exact = opts.get('exact')
4935 exact = opts.get('exact')
4937 update = not opts.get('bypass')
4936 update = not opts.get('bypass')
4938 if not update and opts.get('no_commit'):
4937 if not update and opts.get('no_commit'):
4939 raise error.Abort(_('cannot use --no-commit with --bypass'))
4938 raise error.Abort(_('cannot use --no-commit with --bypass'))
4940 try:
4939 try:
4941 sim = float(opts.get('similarity') or 0)
4940 sim = float(opts.get('similarity') or 0)
4942 except ValueError:
4941 except ValueError:
4943 raise error.Abort(_('similarity must be a number'))
4942 raise error.Abort(_('similarity must be a number'))
4944 if sim < 0 or sim > 100:
4943 if sim < 0 or sim > 100:
4945 raise error.Abort(_('similarity must be between 0 and 100'))
4944 raise error.Abort(_('similarity must be between 0 and 100'))
4946 if sim and not update:
4945 if sim and not update:
4947 raise error.Abort(_('cannot use --similarity with --bypass'))
4946 raise error.Abort(_('cannot use --similarity with --bypass'))
4948 if exact:
4947 if exact:
4949 if opts.get('edit'):
4948 if opts.get('edit'):
4950 raise error.Abort(_('cannot use --exact with --edit'))
4949 raise error.Abort(_('cannot use --exact with --edit'))
4951 if opts.get('prefix'):
4950 if opts.get('prefix'):
4952 raise error.Abort(_('cannot use --exact with --prefix'))
4951 raise error.Abort(_('cannot use --exact with --prefix'))
4953
4952
4954 base = opts["base"]
4953 base = opts["base"]
4955 wlock = dsguard = lock = tr = None
4954 wlock = dsguard = lock = tr = None
4956 msgs = []
4955 msgs = []
4957 ret = 0
4956 ret = 0
4958
4957
4959
4958
4960 try:
4959 try:
4961 wlock = repo.wlock()
4960 wlock = repo.wlock()
4962
4961
4963 if update:
4962 if update:
4964 cmdutil.checkunfinished(repo)
4963 cmdutil.checkunfinished(repo)
4965 if (exact or not opts.get('force')):
4964 if (exact or not opts.get('force')):
4966 cmdutil.bailifchanged(repo)
4965 cmdutil.bailifchanged(repo)
4967
4966
4968 if not opts.get('no_commit'):
4967 if not opts.get('no_commit'):
4969 lock = repo.lock()
4968 lock = repo.lock()
4970 tr = repo.transaction('import')
4969 tr = repo.transaction('import')
4971 else:
4970 else:
4972 dsguard = cmdutil.dirstateguard(repo, 'import')
4971 dsguard = cmdutil.dirstateguard(repo, 'import')
4973 parents = repo[None].parents()
4972 parents = repo[None].parents()
4974 for patchurl in patches:
4973 for patchurl in patches:
4975 if patchurl == '-':
4974 if patchurl == '-':
4976 ui.status(_('applying patch from stdin\n'))
4975 ui.status(_('applying patch from stdin\n'))
4977 patchfile = ui.fin
4976 patchfile = ui.fin
4978 patchurl = 'stdin' # for error message
4977 patchurl = 'stdin' # for error message
4979 else:
4978 else:
4980 patchurl = os.path.join(base, patchurl)
4979 patchurl = os.path.join(base, patchurl)
4981 ui.status(_('applying %s\n') % patchurl)
4980 ui.status(_('applying %s\n') % patchurl)
4982 patchfile = hg.openpath(ui, patchurl)
4981 patchfile = hg.openpath(ui, patchurl)
4983
4982
4984 haspatch = False
4983 haspatch = False
4985 for hunk in patch.split(patchfile):
4984 for hunk in patch.split(patchfile):
4986 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4985 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4987 parents, opts,
4986 parents, opts,
4988 msgs, hg.clean)
4987 msgs, hg.clean)
4989 if msg:
4988 if msg:
4990 haspatch = True
4989 haspatch = True
4991 ui.note(msg + '\n')
4990 ui.note(msg + '\n')
4992 if update or exact:
4991 if update or exact:
4993 parents = repo[None].parents()
4992 parents = repo[None].parents()
4994 else:
4993 else:
4995 parents = [repo[node]]
4994 parents = [repo[node]]
4996 if rej:
4995 if rej:
4997 ui.write_err(_("patch applied partially\n"))
4996 ui.write_err(_("patch applied partially\n"))
4998 ui.write_err(_("(fix the .rej files and run "
4997 ui.write_err(_("(fix the .rej files and run "
4999 "`hg commit --amend`)\n"))
4998 "`hg commit --amend`)\n"))
5000 ret = 1
4999 ret = 1
5001 break
5000 break
5002
5001
5003 if not haspatch:
5002 if not haspatch:
5004 raise error.Abort(_('%s: no diffs found') % patchurl)
5003 raise error.Abort(_('%s: no diffs found') % patchurl)
5005
5004
5006 if tr:
5005 if tr:
5007 tr.close()
5006 tr.close()
5008 if msgs:
5007 if msgs:
5009 repo.savecommitmessage('\n* * *\n'.join(msgs))
5008 repo.savecommitmessage('\n* * *\n'.join(msgs))
5010 if dsguard:
5009 if dsguard:
5011 dsguard.close()
5010 dsguard.close()
5012 return ret
5011 return ret
5013 finally:
5012 finally:
5014 if tr:
5013 if tr:
5015 tr.release()
5014 tr.release()
5016 release(lock, dsguard, wlock)
5015 release(lock, dsguard, wlock)
5017
5016
5018 @command('incoming|in',
5017 @command('incoming|in',
5019 [('f', 'force', None,
5018 [('f', 'force', None,
5020 _('run even if remote repository is unrelated')),
5019 _('run even if remote repository is unrelated')),
5021 ('n', 'newest-first', None, _('show newest record first')),
5020 ('n', 'newest-first', None, _('show newest record first')),
5022 ('', 'bundle', '',
5021 ('', 'bundle', '',
5023 _('file to store the bundles into'), _('FILE')),
5022 _('file to store the bundles into'), _('FILE')),
5024 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5023 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5025 ('B', 'bookmarks', False, _("compare bookmarks")),
5024 ('B', 'bookmarks', False, _("compare bookmarks")),
5026 ('b', 'branch', [],
5025 ('b', 'branch', [],
5027 _('a specific branch you would like to pull'), _('BRANCH')),
5026 _('a specific branch you would like to pull'), _('BRANCH')),
5028 ] + logopts + remoteopts + subrepoopts,
5027 ] + logopts + remoteopts + subrepoopts,
5029 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
5028 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
5030 def incoming(ui, repo, source="default", **opts):
5029 def incoming(ui, repo, source="default", **opts):
5031 """show new changesets found in source
5030 """show new changesets found in source
5032
5031
5033 Show new changesets found in the specified path/URL or the default
5032 Show new changesets found in the specified path/URL or the default
5034 pull location. These are the changesets that would have been pulled
5033 pull location. These are the changesets that would have been pulled
5035 if a pull at the time you issued this command.
5034 if a pull at the time you issued this command.
5036
5035
5037 See pull for valid source format details.
5036 See pull for valid source format details.
5038
5037
5039 .. container:: verbose
5038 .. container:: verbose
5040
5039
5041 With -B/--bookmarks, the result of bookmark comparison between
5040 With -B/--bookmarks, the result of bookmark comparison between
5042 local and remote repositories is displayed. With -v/--verbose,
5041 local and remote repositories is displayed. With -v/--verbose,
5043 status is also displayed for each bookmark like below::
5042 status is also displayed for each bookmark like below::
5044
5043
5045 BM1 01234567890a added
5044 BM1 01234567890a added
5046 BM2 1234567890ab advanced
5045 BM2 1234567890ab advanced
5047 BM3 234567890abc diverged
5046 BM3 234567890abc diverged
5048 BM4 34567890abcd changed
5047 BM4 34567890abcd changed
5049
5048
5050 The action taken locally when pulling depends on the
5049 The action taken locally when pulling depends on the
5051 status of each bookmark:
5050 status of each bookmark:
5052
5051
5053 :``added``: pull will create it
5052 :``added``: pull will create it
5054 :``advanced``: pull will update it
5053 :``advanced``: pull will update it
5055 :``diverged``: pull will create a divergent bookmark
5054 :``diverged``: pull will create a divergent bookmark
5056 :``changed``: result depends on remote changesets
5055 :``changed``: result depends on remote changesets
5057
5056
5058 From the point of view of pulling behavior, bookmark
5057 From the point of view of pulling behavior, bookmark
5059 existing only in the remote repository are treated as ``added``,
5058 existing only in the remote repository are treated as ``added``,
5060 even if it is in fact locally deleted.
5059 even if it is in fact locally deleted.
5061
5060
5062 .. container:: verbose
5061 .. container:: verbose
5063
5062
5064 For remote repository, using --bundle avoids downloading the
5063 For remote repository, using --bundle avoids downloading the
5065 changesets twice if the incoming is followed by a pull.
5064 changesets twice if the incoming is followed by a pull.
5066
5065
5067 Examples:
5066 Examples:
5068
5067
5069 - show incoming changes with patches and full description::
5068 - show incoming changes with patches and full description::
5070
5069
5071 hg incoming -vp
5070 hg incoming -vp
5072
5071
5073 - show incoming changes excluding merges, store a bundle::
5072 - show incoming changes excluding merges, store a bundle::
5074
5073
5075 hg in -vpM --bundle incoming.hg
5074 hg in -vpM --bundle incoming.hg
5076 hg pull incoming.hg
5075 hg pull incoming.hg
5077
5076
5078 - briefly list changes inside a bundle::
5077 - briefly list changes inside a bundle::
5079
5078
5080 hg in changes.hg -T "{desc|firstline}\\n"
5079 hg in changes.hg -T "{desc|firstline}\\n"
5081
5080
5082 Returns 0 if there are incoming changes, 1 otherwise.
5081 Returns 0 if there are incoming changes, 1 otherwise.
5083 """
5082 """
5084 if opts.get('graph'):
5083 if opts.get('graph'):
5085 cmdutil.checkunsupportedgraphflags([], opts)
5084 cmdutil.checkunsupportedgraphflags([], opts)
5086 def display(other, chlist, displayer):
5085 def display(other, chlist, displayer):
5087 revdag = cmdutil.graphrevs(other, chlist, opts)
5086 revdag = cmdutil.graphrevs(other, chlist, opts)
5088 cmdutil.displaygraph(ui, repo, revdag, displayer,
5087 cmdutil.displaygraph(ui, repo, revdag, displayer,
5089 graphmod.asciiedges)
5088 graphmod.asciiedges)
5090
5089
5091 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
5090 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
5092 return 0
5091 return 0
5093
5092
5094 if opts.get('bundle') and opts.get('subrepos'):
5093 if opts.get('bundle') and opts.get('subrepos'):
5095 raise error.Abort(_('cannot combine --bundle and --subrepos'))
5094 raise error.Abort(_('cannot combine --bundle and --subrepos'))
5096
5095
5097 if opts.get('bookmarks'):
5096 if opts.get('bookmarks'):
5098 source, branches = hg.parseurl(ui.expandpath(source),
5097 source, branches = hg.parseurl(ui.expandpath(source),
5099 opts.get('branch'))
5098 opts.get('branch'))
5100 other = hg.peer(repo, opts, source)
5099 other = hg.peer(repo, opts, source)
5101 if 'bookmarks' not in other.listkeys('namespaces'):
5100 if 'bookmarks' not in other.listkeys('namespaces'):
5102 ui.warn(_("remote doesn't support bookmarks\n"))
5101 ui.warn(_("remote doesn't support bookmarks\n"))
5103 return 0
5102 return 0
5104 ui.status(_('comparing with %s\n') % util.hidepassword(source))
5103 ui.status(_('comparing with %s\n') % util.hidepassword(source))
5105 return bookmarks.incoming(ui, repo, other)
5104 return bookmarks.incoming(ui, repo, other)
5106
5105
5107 repo._subtoppath = ui.expandpath(source)
5106 repo._subtoppath = ui.expandpath(source)
5108 try:
5107 try:
5109 return hg.incoming(ui, repo, source, opts)
5108 return hg.incoming(ui, repo, source, opts)
5110 finally:
5109 finally:
5111 del repo._subtoppath
5110 del repo._subtoppath
5112
5111
5113
5112
5114 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
5113 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
5115 norepo=True)
5114 norepo=True)
5116 def init(ui, dest=".", **opts):
5115 def init(ui, dest=".", **opts):
5117 """create a new repository in the given directory
5116 """create a new repository in the given directory
5118
5117
5119 Initialize a new repository in the given directory. If the given
5118 Initialize a new repository in the given directory. If the given
5120 directory does not exist, it will be created.
5119 directory does not exist, it will be created.
5121
5120
5122 If no directory is given, the current directory is used.
5121 If no directory is given, the current directory is used.
5123
5122
5124 It is possible to specify an ``ssh://`` URL as the destination.
5123 It is possible to specify an ``ssh://`` URL as the destination.
5125 See :hg:`help urls` for more information.
5124 See :hg:`help urls` for more information.
5126
5125
5127 Returns 0 on success.
5126 Returns 0 on success.
5128 """
5127 """
5129 hg.peer(ui, opts, ui.expandpath(dest), create=True)
5128 hg.peer(ui, opts, ui.expandpath(dest), create=True)
5130
5129
5131 @command('locate',
5130 @command('locate',
5132 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
5131 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
5133 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5132 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5134 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
5133 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
5135 ] + walkopts,
5134 ] + walkopts,
5136 _('[OPTION]... [PATTERN]...'))
5135 _('[OPTION]... [PATTERN]...'))
5137 def locate(ui, repo, *pats, **opts):
5136 def locate(ui, repo, *pats, **opts):
5138 """locate files matching specific patterns (DEPRECATED)
5137 """locate files matching specific patterns (DEPRECATED)
5139
5138
5140 Print files under Mercurial control in the working directory whose
5139 Print files under Mercurial control in the working directory whose
5141 names match the given patterns.
5140 names match the given patterns.
5142
5141
5143 By default, this command searches all directories in the working
5142 By default, this command searches all directories in the working
5144 directory. To search just the current directory and its
5143 directory. To search just the current directory and its
5145 subdirectories, use "--include .".
5144 subdirectories, use "--include .".
5146
5145
5147 If no patterns are given to match, this command prints the names
5146 If no patterns are given to match, this command prints the names
5148 of all files under Mercurial control in the working directory.
5147 of all files under Mercurial control in the working directory.
5149
5148
5150 If you want to feed the output of this command into the "xargs"
5149 If you want to feed the output of this command into the "xargs"
5151 command, use the -0 option to both this command and "xargs". This
5150 command, use the -0 option to both this command and "xargs". This
5152 will avoid the problem of "xargs" treating single filenames that
5151 will avoid the problem of "xargs" treating single filenames that
5153 contain whitespace as multiple filenames.
5152 contain whitespace as multiple filenames.
5154
5153
5155 See :hg:`help files` for a more versatile command.
5154 See :hg:`help files` for a more versatile command.
5156
5155
5157 Returns 0 if a match is found, 1 otherwise.
5156 Returns 0 if a match is found, 1 otherwise.
5158 """
5157 """
5159 if opts.get('print0'):
5158 if opts.get('print0'):
5160 end = '\0'
5159 end = '\0'
5161 else:
5160 else:
5162 end = '\n'
5161 end = '\n'
5163 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
5162 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
5164
5163
5165 ret = 1
5164 ret = 1
5166 ctx = repo[rev]
5165 ctx = repo[rev]
5167 m = scmutil.match(ctx, pats, opts, default='relglob',
5166 m = scmutil.match(ctx, pats, opts, default='relglob',
5168 badfn=lambda x, y: False)
5167 badfn=lambda x, y: False)
5169
5168
5170 for abs in ctx.matches(m):
5169 for abs in ctx.matches(m):
5171 if opts.get('fullpath'):
5170 if opts.get('fullpath'):
5172 ui.write(repo.wjoin(abs), end)
5171 ui.write(repo.wjoin(abs), end)
5173 else:
5172 else:
5174 ui.write(((pats and m.rel(abs)) or abs), end)
5173 ui.write(((pats and m.rel(abs)) or abs), end)
5175 ret = 0
5174 ret = 0
5176
5175
5177 return ret
5176 return ret
5178
5177
5179 @command('^log|history',
5178 @command('^log|history',
5180 [('f', 'follow', None,
5179 [('f', 'follow', None,
5181 _('follow changeset history, or file history across copies and renames')),
5180 _('follow changeset history, or file history across copies and renames')),
5182 ('', 'follow-first', None,
5181 ('', 'follow-first', None,
5183 _('only follow the first parent of merge changesets (DEPRECATED)')),
5182 _('only follow the first parent of merge changesets (DEPRECATED)')),
5184 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
5183 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
5185 ('C', 'copies', None, _('show copied files')),
5184 ('C', 'copies', None, _('show copied files')),
5186 ('k', 'keyword', [],
5185 ('k', 'keyword', [],
5187 _('do case-insensitive search for a given text'), _('TEXT')),
5186 _('do case-insensitive search for a given text'), _('TEXT')),
5188 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
5187 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
5189 ('', 'removed', None, _('include revisions where files were removed')),
5188 ('', 'removed', None, _('include revisions where files were removed')),
5190 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
5189 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
5191 ('u', 'user', [], _('revisions committed by user'), _('USER')),
5190 ('u', 'user', [], _('revisions committed by user'), _('USER')),
5192 ('', 'only-branch', [],
5191 ('', 'only-branch', [],
5193 _('show only changesets within the given named branch (DEPRECATED)'),
5192 _('show only changesets within the given named branch (DEPRECATED)'),
5194 _('BRANCH')),
5193 _('BRANCH')),
5195 ('b', 'branch', [],
5194 ('b', 'branch', [],
5196 _('show changesets within the given named branch'), _('BRANCH')),
5195 _('show changesets within the given named branch'), _('BRANCH')),
5197 ('P', 'prune', [],
5196 ('P', 'prune', [],
5198 _('do not display revision or any of its ancestors'), _('REV')),
5197 _('do not display revision or any of its ancestors'), _('REV')),
5199 ] + logopts + walkopts,
5198 ] + logopts + walkopts,
5200 _('[OPTION]... [FILE]'),
5199 _('[OPTION]... [FILE]'),
5201 inferrepo=True)
5200 inferrepo=True)
5202 def log(ui, repo, *pats, **opts):
5201 def log(ui, repo, *pats, **opts):
5203 """show revision history of entire repository or files
5202 """show revision history of entire repository or files
5204
5203
5205 Print the revision history of the specified files or the entire
5204 Print the revision history of the specified files or the entire
5206 project.
5205 project.
5207
5206
5208 If no revision range is specified, the default is ``tip:0`` unless
5207 If no revision range is specified, the default is ``tip:0`` unless
5209 --follow is set, in which case the working directory parent is
5208 --follow is set, in which case the working directory parent is
5210 used as the starting revision.
5209 used as the starting revision.
5211
5210
5212 File history is shown without following rename or copy history of
5211 File history is shown without following rename or copy history of
5213 files. Use -f/--follow with a filename to follow history across
5212 files. Use -f/--follow with a filename to follow history across
5214 renames and copies. --follow without a filename will only show
5213 renames and copies. --follow without a filename will only show
5215 ancestors or descendants of the starting revision.
5214 ancestors or descendants of the starting revision.
5216
5215
5217 By default this command prints revision number and changeset id,
5216 By default this command prints revision number and changeset id,
5218 tags, non-trivial parents, user, date and time, and a summary for
5217 tags, non-trivial parents, user, date and time, and a summary for
5219 each commit. When the -v/--verbose switch is used, the list of
5218 each commit. When the -v/--verbose switch is used, the list of
5220 changed files and full commit message are shown.
5219 changed files and full commit message are shown.
5221
5220
5222 With --graph the revisions are shown as an ASCII art DAG with the most
5221 With --graph the revisions are shown as an ASCII art DAG with the most
5223 recent changeset at the top.
5222 recent changeset at the top.
5224 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
5223 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
5225 and '+' represents a fork where the changeset from the lines below is a
5224 and '+' represents a fork where the changeset from the lines below is a
5226 parent of the 'o' merge on the same line.
5225 parent of the 'o' merge on the same line.
5227
5226
5228 .. note::
5227 .. note::
5229
5228
5230 :hg:`log --patch` may generate unexpected diff output for merge
5229 :hg:`log --patch` may generate unexpected diff output for merge
5231 changesets, as it will only compare the merge changeset against
5230 changesets, as it will only compare the merge changeset against
5232 its first parent. Also, only files different from BOTH parents
5231 its first parent. Also, only files different from BOTH parents
5233 will appear in files:.
5232 will appear in files:.
5234
5233
5235 .. note::
5234 .. note::
5236
5235
5237 For performance reasons, :hg:`log FILE` may omit duplicate changes
5236 For performance reasons, :hg:`log FILE` may omit duplicate changes
5238 made on branches and will not show removals or mode changes. To
5237 made on branches and will not show removals or mode changes. To
5239 see all such changes, use the --removed switch.
5238 see all such changes, use the --removed switch.
5240
5239
5241 .. container:: verbose
5240 .. container:: verbose
5242
5241
5243 Some examples:
5242 Some examples:
5244
5243
5245 - changesets with full descriptions and file lists::
5244 - changesets with full descriptions and file lists::
5246
5245
5247 hg log -v
5246 hg log -v
5248
5247
5249 - changesets ancestral to the working directory::
5248 - changesets ancestral to the working directory::
5250
5249
5251 hg log -f
5250 hg log -f
5252
5251
5253 - last 10 commits on the current branch::
5252 - last 10 commits on the current branch::
5254
5253
5255 hg log -l 10 -b .
5254 hg log -l 10 -b .
5256
5255
5257 - changesets showing all modifications of a file, including removals::
5256 - changesets showing all modifications of a file, including removals::
5258
5257
5259 hg log --removed file.c
5258 hg log --removed file.c
5260
5259
5261 - all changesets that touch a directory, with diffs, excluding merges::
5260 - all changesets that touch a directory, with diffs, excluding merges::
5262
5261
5263 hg log -Mp lib/
5262 hg log -Mp lib/
5264
5263
5265 - all revision numbers that match a keyword::
5264 - all revision numbers that match a keyword::
5266
5265
5267 hg log -k bug --template "{rev}\\n"
5266 hg log -k bug --template "{rev}\\n"
5268
5267
5269 - the full hash identifier of the working directory parent::
5268 - the full hash identifier of the working directory parent::
5270
5269
5271 hg log -r . --template "{node}\\n"
5270 hg log -r . --template "{node}\\n"
5272
5271
5273 - list available log templates::
5272 - list available log templates::
5274
5273
5275 hg log -T list
5274 hg log -T list
5276
5275
5277 - check if a given changeset is included in a tagged release::
5276 - check if a given changeset is included in a tagged release::
5278
5277
5279 hg log -r "a21ccf and ancestor(1.9)"
5278 hg log -r "a21ccf and ancestor(1.9)"
5280
5279
5281 - find all changesets by some user in a date range::
5280 - find all changesets by some user in a date range::
5282
5281
5283 hg log -k alice -d "may 2008 to jul 2008"
5282 hg log -k alice -d "may 2008 to jul 2008"
5284
5283
5285 - summary of all changesets after the last tag::
5284 - summary of all changesets after the last tag::
5286
5285
5287 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5286 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5288
5287
5289 See :hg:`help dates` for a list of formats valid for -d/--date.
5288 See :hg:`help dates` for a list of formats valid for -d/--date.
5290
5289
5291 See :hg:`help revisions` and :hg:`help revsets` for more about
5290 See :hg:`help revisions` and :hg:`help revsets` for more about
5292 specifying and ordering revisions.
5291 specifying and ordering revisions.
5293
5292
5294 See :hg:`help templates` for more about pre-packaged styles and
5293 See :hg:`help templates` for more about pre-packaged styles and
5295 specifying custom templates.
5294 specifying custom templates.
5296
5295
5297 Returns 0 on success.
5296 Returns 0 on success.
5298
5297
5299 """
5298 """
5300 if opts.get('follow') and opts.get('rev'):
5299 if opts.get('follow') and opts.get('rev'):
5301 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5300 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5302 del opts['follow']
5301 del opts['follow']
5303
5302
5304 if opts.get('graph'):
5303 if opts.get('graph'):
5305 return cmdutil.graphlog(ui, repo, *pats, **opts)
5304 return cmdutil.graphlog(ui, repo, *pats, **opts)
5306
5305
5307 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5306 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5308 limit = cmdutil.loglimit(opts)
5307 limit = cmdutil.loglimit(opts)
5309 count = 0
5308 count = 0
5310
5309
5311 getrenamed = None
5310 getrenamed = None
5312 if opts.get('copies'):
5311 if opts.get('copies'):
5313 endrev = None
5312 endrev = None
5314 if opts.get('rev'):
5313 if opts.get('rev'):
5315 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5314 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5316 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5315 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5317
5316
5318 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5317 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5319 for rev in revs:
5318 for rev in revs:
5320 if count == limit:
5319 if count == limit:
5321 break
5320 break
5322 ctx = repo[rev]
5321 ctx = repo[rev]
5323 copies = None
5322 copies = None
5324 if getrenamed is not None and rev:
5323 if getrenamed is not None and rev:
5325 copies = []
5324 copies = []
5326 for fn in ctx.files():
5325 for fn in ctx.files():
5327 rename = getrenamed(fn, rev)
5326 rename = getrenamed(fn, rev)
5328 if rename:
5327 if rename:
5329 copies.append((fn, rename[0]))
5328 copies.append((fn, rename[0]))
5330 if filematcher:
5329 if filematcher:
5331 revmatchfn = filematcher(ctx.rev())
5330 revmatchfn = filematcher(ctx.rev())
5332 else:
5331 else:
5333 revmatchfn = None
5332 revmatchfn = None
5334 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5333 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5335 if displayer.flush(ctx):
5334 if displayer.flush(ctx):
5336 count += 1
5335 count += 1
5337
5336
5338 displayer.close()
5337 displayer.close()
5339
5338
5340 @command('manifest',
5339 @command('manifest',
5341 [('r', 'rev', '', _('revision to display'), _('REV')),
5340 [('r', 'rev', '', _('revision to display'), _('REV')),
5342 ('', 'all', False, _("list files from all revisions"))]
5341 ('', 'all', False, _("list files from all revisions"))]
5343 + formatteropts,
5342 + formatteropts,
5344 _('[-r REV]'))
5343 _('[-r REV]'))
5345 def manifest(ui, repo, node=None, rev=None, **opts):
5344 def manifest(ui, repo, node=None, rev=None, **opts):
5346 """output the current or given revision of the project manifest
5345 """output the current or given revision of the project manifest
5347
5346
5348 Print a list of version controlled files for the given revision.
5347 Print a list of version controlled files for the given revision.
5349 If no revision is given, the first parent of the working directory
5348 If no revision is given, the first parent of the working directory
5350 is used, or the null revision if no revision is checked out.
5349 is used, or the null revision if no revision is checked out.
5351
5350
5352 With -v, print file permissions, symlink and executable bits.
5351 With -v, print file permissions, symlink and executable bits.
5353 With --debug, print file revision hashes.
5352 With --debug, print file revision hashes.
5354
5353
5355 If option --all is specified, the list of all files from all revisions
5354 If option --all is specified, the list of all files from all revisions
5356 is printed. This includes deleted and renamed files.
5355 is printed. This includes deleted and renamed files.
5357
5356
5358 Returns 0 on success.
5357 Returns 0 on success.
5359 """
5358 """
5360
5359
5361 fm = ui.formatter('manifest', opts)
5360 fm = ui.formatter('manifest', opts)
5362
5361
5363 if opts.get('all'):
5362 if opts.get('all'):
5364 if rev or node:
5363 if rev or node:
5365 raise error.Abort(_("can't specify a revision with --all"))
5364 raise error.Abort(_("can't specify a revision with --all"))
5366
5365
5367 res = []
5366 res = []
5368 prefix = "data/"
5367 prefix = "data/"
5369 suffix = ".i"
5368 suffix = ".i"
5370 plen = len(prefix)
5369 plen = len(prefix)
5371 slen = len(suffix)
5370 slen = len(suffix)
5372 with repo.lock():
5371 with repo.lock():
5373 for fn, b, size in repo.store.datafiles():
5372 for fn, b, size in repo.store.datafiles():
5374 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5373 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5375 res.append(fn[plen:-slen])
5374 res.append(fn[plen:-slen])
5376 for f in res:
5375 for f in res:
5377 fm.startitem()
5376 fm.startitem()
5378 fm.write("path", '%s\n', f)
5377 fm.write("path", '%s\n', f)
5379 fm.end()
5378 fm.end()
5380 return
5379 return
5381
5380
5382 if rev and node:
5381 if rev and node:
5383 raise error.Abort(_("please specify just one revision"))
5382 raise error.Abort(_("please specify just one revision"))
5384
5383
5385 if not node:
5384 if not node:
5386 node = rev
5385 node = rev
5387
5386
5388 char = {'l': '@', 'x': '*', '': ''}
5387 char = {'l': '@', 'x': '*', '': ''}
5389 mode = {'l': '644', 'x': '755', '': '644'}
5388 mode = {'l': '644', 'x': '755', '': '644'}
5390 ctx = scmutil.revsingle(repo, node)
5389 ctx = scmutil.revsingle(repo, node)
5391 mf = ctx.manifest()
5390 mf = ctx.manifest()
5392 for f in ctx:
5391 for f in ctx:
5393 fm.startitem()
5392 fm.startitem()
5394 fl = ctx[f].flags()
5393 fl = ctx[f].flags()
5395 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5394 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5396 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5395 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5397 fm.write('path', '%s\n', f)
5396 fm.write('path', '%s\n', f)
5398 fm.end()
5397 fm.end()
5399
5398
5400 @command('^merge',
5399 @command('^merge',
5401 [('f', 'force', None,
5400 [('f', 'force', None,
5402 _('force a merge including outstanding changes (DEPRECATED)')),
5401 _('force a merge including outstanding changes (DEPRECATED)')),
5403 ('r', 'rev', '', _('revision to merge'), _('REV')),
5402 ('r', 'rev', '', _('revision to merge'), _('REV')),
5404 ('P', 'preview', None,
5403 ('P', 'preview', None,
5405 _('review revisions to merge (no merge is performed)'))
5404 _('review revisions to merge (no merge is performed)'))
5406 ] + mergetoolopts,
5405 ] + mergetoolopts,
5407 _('[-P] [[-r] REV]'))
5406 _('[-P] [[-r] REV]'))
5408 def merge(ui, repo, node=None, **opts):
5407 def merge(ui, repo, node=None, **opts):
5409 """merge another revision into working directory
5408 """merge another revision into working directory
5410
5409
5411 The current working directory is updated with all changes made in
5410 The current working directory is updated with all changes made in
5412 the requested revision since the last common predecessor revision.
5411 the requested revision since the last common predecessor revision.
5413
5412
5414 Files that changed between either parent are marked as changed for
5413 Files that changed between either parent are marked as changed for
5415 the next commit and a commit must be performed before any further
5414 the next commit and a commit must be performed before any further
5416 updates to the repository are allowed. The next commit will have
5415 updates to the repository are allowed. The next commit will have
5417 two parents.
5416 two parents.
5418
5417
5419 ``--tool`` can be used to specify the merge tool used for file
5418 ``--tool`` can be used to specify the merge tool used for file
5420 merges. It overrides the HGMERGE environment variable and your
5419 merges. It overrides the HGMERGE environment variable and your
5421 configuration files. See :hg:`help merge-tools` for options.
5420 configuration files. See :hg:`help merge-tools` for options.
5422
5421
5423 If no revision is specified, the working directory's parent is a
5422 If no revision is specified, the working directory's parent is a
5424 head revision, and the current branch contains exactly one other
5423 head revision, and the current branch contains exactly one other
5425 head, the other head is merged with by default. Otherwise, an
5424 head, the other head is merged with by default. Otherwise, an
5426 explicit revision with which to merge with must be provided.
5425 explicit revision with which to merge with must be provided.
5427
5426
5428 See :hg:`help resolve` for information on handling file conflicts.
5427 See :hg:`help resolve` for information on handling file conflicts.
5429
5428
5430 To undo an uncommitted merge, use :hg:`update --clean .` which
5429 To undo an uncommitted merge, use :hg:`update --clean .` which
5431 will check out a clean copy of the original merge parent, losing
5430 will check out a clean copy of the original merge parent, losing
5432 all changes.
5431 all changes.
5433
5432
5434 Returns 0 on success, 1 if there are unresolved files.
5433 Returns 0 on success, 1 if there are unresolved files.
5435 """
5434 """
5436
5435
5437 if opts.get('rev') and node:
5436 if opts.get('rev') and node:
5438 raise error.Abort(_("please specify just one revision"))
5437 raise error.Abort(_("please specify just one revision"))
5439 if not node:
5438 if not node:
5440 node = opts.get('rev')
5439 node = opts.get('rev')
5441
5440
5442 if node:
5441 if node:
5443 node = scmutil.revsingle(repo, node).node()
5442 node = scmutil.revsingle(repo, node).node()
5444
5443
5445 if not node:
5444 if not node:
5446 node = repo[destutil.destmerge(repo)].node()
5445 node = repo[destutil.destmerge(repo)].node()
5447
5446
5448 if opts.get('preview'):
5447 if opts.get('preview'):
5449 # find nodes that are ancestors of p2 but not of p1
5448 # find nodes that are ancestors of p2 but not of p1
5450 p1 = repo.lookup('.')
5449 p1 = repo.lookup('.')
5451 p2 = repo.lookup(node)
5450 p2 = repo.lookup(node)
5452 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5451 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5453
5452
5454 displayer = cmdutil.show_changeset(ui, repo, opts)
5453 displayer = cmdutil.show_changeset(ui, repo, opts)
5455 for node in nodes:
5454 for node in nodes:
5456 displayer.show(repo[node])
5455 displayer.show(repo[node])
5457 displayer.close()
5456 displayer.close()
5458 return 0
5457 return 0
5459
5458
5460 try:
5459 try:
5461 # ui.forcemerge is an internal variable, do not document
5460 # ui.forcemerge is an internal variable, do not document
5462 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5461 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5463 force = opts.get('force')
5462 force = opts.get('force')
5464 return hg.merge(repo, node, force=force, mergeforce=force)
5463 return hg.merge(repo, node, force=force, mergeforce=force)
5465 finally:
5464 finally:
5466 ui.setconfig('ui', 'forcemerge', '', 'merge')
5465 ui.setconfig('ui', 'forcemerge', '', 'merge')
5467
5466
5468 @command('outgoing|out',
5467 @command('outgoing|out',
5469 [('f', 'force', None, _('run even when the destination is unrelated')),
5468 [('f', 'force', None, _('run even when the destination is unrelated')),
5470 ('r', 'rev', [],
5469 ('r', 'rev', [],
5471 _('a changeset intended to be included in the destination'), _('REV')),
5470 _('a changeset intended to be included in the destination'), _('REV')),
5472 ('n', 'newest-first', None, _('show newest record first')),
5471 ('n', 'newest-first', None, _('show newest record first')),
5473 ('B', 'bookmarks', False, _('compare bookmarks')),
5472 ('B', 'bookmarks', False, _('compare bookmarks')),
5474 ('b', 'branch', [], _('a specific branch you would like to push'),
5473 ('b', 'branch', [], _('a specific branch you would like to push'),
5475 _('BRANCH')),
5474 _('BRANCH')),
5476 ] + logopts + remoteopts + subrepoopts,
5475 ] + logopts + remoteopts + subrepoopts,
5477 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5476 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5478 def outgoing(ui, repo, dest=None, **opts):
5477 def outgoing(ui, repo, dest=None, **opts):
5479 """show changesets not found in the destination
5478 """show changesets not found in the destination
5480
5479
5481 Show changesets not found in the specified destination repository
5480 Show changesets not found in the specified destination repository
5482 or the default push location. These are the changesets that would
5481 or the default push location. These are the changesets that would
5483 be pushed if a push was requested.
5482 be pushed if a push was requested.
5484
5483
5485 See pull for details of valid destination formats.
5484 See pull for details of valid destination formats.
5486
5485
5487 .. container:: verbose
5486 .. container:: verbose
5488
5487
5489 With -B/--bookmarks, the result of bookmark comparison between
5488 With -B/--bookmarks, the result of bookmark comparison between
5490 local and remote repositories is displayed. With -v/--verbose,
5489 local and remote repositories is displayed. With -v/--verbose,
5491 status is also displayed for each bookmark like below::
5490 status is also displayed for each bookmark like below::
5492
5491
5493 BM1 01234567890a added
5492 BM1 01234567890a added
5494 BM2 deleted
5493 BM2 deleted
5495 BM3 234567890abc advanced
5494 BM3 234567890abc advanced
5496 BM4 34567890abcd diverged
5495 BM4 34567890abcd diverged
5497 BM5 4567890abcde changed
5496 BM5 4567890abcde changed
5498
5497
5499 The action taken when pushing depends on the
5498 The action taken when pushing depends on the
5500 status of each bookmark:
5499 status of each bookmark:
5501
5500
5502 :``added``: push with ``-B`` will create it
5501 :``added``: push with ``-B`` will create it
5503 :``deleted``: push with ``-B`` will delete it
5502 :``deleted``: push with ``-B`` will delete it
5504 :``advanced``: push will update it
5503 :``advanced``: push will update it
5505 :``diverged``: push with ``-B`` will update it
5504 :``diverged``: push with ``-B`` will update it
5506 :``changed``: push with ``-B`` will update it
5505 :``changed``: push with ``-B`` will update it
5507
5506
5508 From the point of view of pushing behavior, bookmarks
5507 From the point of view of pushing behavior, bookmarks
5509 existing only in the remote repository are treated as
5508 existing only in the remote repository are treated as
5510 ``deleted``, even if it is in fact added remotely.
5509 ``deleted``, even if it is in fact added remotely.
5511
5510
5512 Returns 0 if there are outgoing changes, 1 otherwise.
5511 Returns 0 if there are outgoing changes, 1 otherwise.
5513 """
5512 """
5514 if opts.get('graph'):
5513 if opts.get('graph'):
5515 cmdutil.checkunsupportedgraphflags([], opts)
5514 cmdutil.checkunsupportedgraphflags([], opts)
5516 o, other = hg._outgoing(ui, repo, dest, opts)
5515 o, other = hg._outgoing(ui, repo, dest, opts)
5517 if not o:
5516 if not o:
5518 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5517 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5519 return
5518 return
5520
5519
5521 revdag = cmdutil.graphrevs(repo, o, opts)
5520 revdag = cmdutil.graphrevs(repo, o, opts)
5522 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5521 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5523 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5522 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5524 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5523 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5525 return 0
5524 return 0
5526
5525
5527 if opts.get('bookmarks'):
5526 if opts.get('bookmarks'):
5528 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5527 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5529 dest, branches = hg.parseurl(dest, opts.get('branch'))
5528 dest, branches = hg.parseurl(dest, opts.get('branch'))
5530 other = hg.peer(repo, opts, dest)
5529 other = hg.peer(repo, opts, dest)
5531 if 'bookmarks' not in other.listkeys('namespaces'):
5530 if 'bookmarks' not in other.listkeys('namespaces'):
5532 ui.warn(_("remote doesn't support bookmarks\n"))
5531 ui.warn(_("remote doesn't support bookmarks\n"))
5533 return 0
5532 return 0
5534 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5533 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5535 return bookmarks.outgoing(ui, repo, other)
5534 return bookmarks.outgoing(ui, repo, other)
5536
5535
5537 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5536 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5538 try:
5537 try:
5539 return hg.outgoing(ui, repo, dest, opts)
5538 return hg.outgoing(ui, repo, dest, opts)
5540 finally:
5539 finally:
5541 del repo._subtoppath
5540 del repo._subtoppath
5542
5541
5543 @command('parents',
5542 @command('parents',
5544 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5543 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5545 ] + templateopts,
5544 ] + templateopts,
5546 _('[-r REV] [FILE]'),
5545 _('[-r REV] [FILE]'),
5547 inferrepo=True)
5546 inferrepo=True)
5548 def parents(ui, repo, file_=None, **opts):
5547 def parents(ui, repo, file_=None, **opts):
5549 """show the parents of the working directory or revision (DEPRECATED)
5548 """show the parents of the working directory or revision (DEPRECATED)
5550
5549
5551 Print the working directory's parent revisions. If a revision is
5550 Print the working directory's parent revisions. If a revision is
5552 given via -r/--rev, the parent of that revision will be printed.
5551 given via -r/--rev, the parent of that revision will be printed.
5553 If a file argument is given, the revision in which the file was
5552 If a file argument is given, the revision in which the file was
5554 last changed (before the working directory revision or the
5553 last changed (before the working directory revision or the
5555 argument to --rev if given) is printed.
5554 argument to --rev if given) is printed.
5556
5555
5557 This command is equivalent to::
5556 This command is equivalent to::
5558
5557
5559 hg log -r "p1()+p2()" or
5558 hg log -r "p1()+p2()" or
5560 hg log -r "p1(REV)+p2(REV)" or
5559 hg log -r "p1(REV)+p2(REV)" or
5561 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5560 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5562 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5561 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5563
5562
5564 See :hg:`summary` and :hg:`help revsets` for related information.
5563 See :hg:`summary` and :hg:`help revsets` for related information.
5565
5564
5566 Returns 0 on success.
5565 Returns 0 on success.
5567 """
5566 """
5568
5567
5569 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5568 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5570
5569
5571 if file_:
5570 if file_:
5572 m = scmutil.match(ctx, (file_,), opts)
5571 m = scmutil.match(ctx, (file_,), opts)
5573 if m.anypats() or len(m.files()) != 1:
5572 if m.anypats() or len(m.files()) != 1:
5574 raise error.Abort(_('can only specify an explicit filename'))
5573 raise error.Abort(_('can only specify an explicit filename'))
5575 file_ = m.files()[0]
5574 file_ = m.files()[0]
5576 filenodes = []
5575 filenodes = []
5577 for cp in ctx.parents():
5576 for cp in ctx.parents():
5578 if not cp:
5577 if not cp:
5579 continue
5578 continue
5580 try:
5579 try:
5581 filenodes.append(cp.filenode(file_))
5580 filenodes.append(cp.filenode(file_))
5582 except error.LookupError:
5581 except error.LookupError:
5583 pass
5582 pass
5584 if not filenodes:
5583 if not filenodes:
5585 raise error.Abort(_("'%s' not found in manifest!") % file_)
5584 raise error.Abort(_("'%s' not found in manifest!") % file_)
5586 p = []
5585 p = []
5587 for fn in filenodes:
5586 for fn in filenodes:
5588 fctx = repo.filectx(file_, fileid=fn)
5587 fctx = repo.filectx(file_, fileid=fn)
5589 p.append(fctx.node())
5588 p.append(fctx.node())
5590 else:
5589 else:
5591 p = [cp.node() for cp in ctx.parents()]
5590 p = [cp.node() for cp in ctx.parents()]
5592
5591
5593 displayer = cmdutil.show_changeset(ui, repo, opts)
5592 displayer = cmdutil.show_changeset(ui, repo, opts)
5594 for n in p:
5593 for n in p:
5595 if n != nullid:
5594 if n != nullid:
5596 displayer.show(repo[n])
5595 displayer.show(repo[n])
5597 displayer.close()
5596 displayer.close()
5598
5597
5599 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
5598 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
5600 def paths(ui, repo, search=None, **opts):
5599 def paths(ui, repo, search=None, **opts):
5601 """show aliases for remote repositories
5600 """show aliases for remote repositories
5602
5601
5603 Show definition of symbolic path name NAME. If no name is given,
5602 Show definition of symbolic path name NAME. If no name is given,
5604 show definition of all available names.
5603 show definition of all available names.
5605
5604
5606 Option -q/--quiet suppresses all output when searching for NAME
5605 Option -q/--quiet suppresses all output when searching for NAME
5607 and shows only the path names when listing all definitions.
5606 and shows only the path names when listing all definitions.
5608
5607
5609 Path names are defined in the [paths] section of your
5608 Path names are defined in the [paths] section of your
5610 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5609 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5611 repository, ``.hg/hgrc`` is used, too.
5610 repository, ``.hg/hgrc`` is used, too.
5612
5611
5613 The path names ``default`` and ``default-push`` have a special
5612 The path names ``default`` and ``default-push`` have a special
5614 meaning. When performing a push or pull operation, they are used
5613 meaning. When performing a push or pull operation, they are used
5615 as fallbacks if no location is specified on the command-line.
5614 as fallbacks if no location is specified on the command-line.
5616 When ``default-push`` is set, it will be used for push and
5615 When ``default-push`` is set, it will be used for push and
5617 ``default`` will be used for pull; otherwise ``default`` is used
5616 ``default`` will be used for pull; otherwise ``default`` is used
5618 as the fallback for both. When cloning a repository, the clone
5617 as the fallback for both. When cloning a repository, the clone
5619 source is written as ``default`` in ``.hg/hgrc``.
5618 source is written as ``default`` in ``.hg/hgrc``.
5620
5619
5621 .. note::
5620 .. note::
5622
5621
5623 ``default`` and ``default-push`` apply to all inbound (e.g.
5622 ``default`` and ``default-push`` apply to all inbound (e.g.
5624 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5623 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5625 and :hg:`bundle`) operations.
5624 and :hg:`bundle`) operations.
5626
5625
5627 See :hg:`help urls` for more information.
5626 See :hg:`help urls` for more information.
5628
5627
5629 Returns 0 on success.
5628 Returns 0 on success.
5630 """
5629 """
5631 if search:
5630 if search:
5632 pathitems = [(name, path) for name, path in ui.paths.iteritems()
5631 pathitems = [(name, path) for name, path in ui.paths.iteritems()
5633 if name == search]
5632 if name == search]
5634 else:
5633 else:
5635 pathitems = sorted(ui.paths.iteritems())
5634 pathitems = sorted(ui.paths.iteritems())
5636
5635
5637 fm = ui.formatter('paths', opts)
5636 fm = ui.formatter('paths', opts)
5638 if fm:
5637 if fm:
5639 hidepassword = str
5638 hidepassword = str
5640 else:
5639 else:
5641 hidepassword = util.hidepassword
5640 hidepassword = util.hidepassword
5642 if ui.quiet:
5641 if ui.quiet:
5643 namefmt = '%s\n'
5642 namefmt = '%s\n'
5644 else:
5643 else:
5645 namefmt = '%s = '
5644 namefmt = '%s = '
5646 showsubopts = not search and not ui.quiet
5645 showsubopts = not search and not ui.quiet
5647
5646
5648 for name, path in pathitems:
5647 for name, path in pathitems:
5649 fm.startitem()
5648 fm.startitem()
5650 fm.condwrite(not search, 'name', namefmt, name)
5649 fm.condwrite(not search, 'name', namefmt, name)
5651 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
5650 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
5652 for subopt, value in sorted(path.suboptions.items()):
5651 for subopt, value in sorted(path.suboptions.items()):
5653 assert subopt not in ('name', 'url')
5652 assert subopt not in ('name', 'url')
5654 if showsubopts:
5653 if showsubopts:
5655 fm.plain('%s:%s = ' % (name, subopt))
5654 fm.plain('%s:%s = ' % (name, subopt))
5656 fm.condwrite(showsubopts, subopt, '%s\n', value)
5655 fm.condwrite(showsubopts, subopt, '%s\n', value)
5657
5656
5658 fm.end()
5657 fm.end()
5659
5658
5660 if search and not pathitems:
5659 if search and not pathitems:
5661 if not ui.quiet:
5660 if not ui.quiet:
5662 ui.warn(_("not found!\n"))
5661 ui.warn(_("not found!\n"))
5663 return 1
5662 return 1
5664 else:
5663 else:
5665 return 0
5664 return 0
5666
5665
5667 @command('phase',
5666 @command('phase',
5668 [('p', 'public', False, _('set changeset phase to public')),
5667 [('p', 'public', False, _('set changeset phase to public')),
5669 ('d', 'draft', False, _('set changeset phase to draft')),
5668 ('d', 'draft', False, _('set changeset phase to draft')),
5670 ('s', 'secret', False, _('set changeset phase to secret')),
5669 ('s', 'secret', False, _('set changeset phase to secret')),
5671 ('f', 'force', False, _('allow to move boundary backward')),
5670 ('f', 'force', False, _('allow to move boundary backward')),
5672 ('r', 'rev', [], _('target revision'), _('REV')),
5671 ('r', 'rev', [], _('target revision'), _('REV')),
5673 ],
5672 ],
5674 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5673 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5675 def phase(ui, repo, *revs, **opts):
5674 def phase(ui, repo, *revs, **opts):
5676 """set or show the current phase name
5675 """set or show the current phase name
5677
5676
5678 With no argument, show the phase name of the current revision(s).
5677 With no argument, show the phase name of the current revision(s).
5679
5678
5680 With one of -p/--public, -d/--draft or -s/--secret, change the
5679 With one of -p/--public, -d/--draft or -s/--secret, change the
5681 phase value of the specified revisions.
5680 phase value of the specified revisions.
5682
5681
5683 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5682 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5684 lower phase to an higher phase. Phases are ordered as follows::
5683 lower phase to an higher phase. Phases are ordered as follows::
5685
5684
5686 public < draft < secret
5685 public < draft < secret
5687
5686
5688 Returns 0 on success, 1 if some phases could not be changed.
5687 Returns 0 on success, 1 if some phases could not be changed.
5689
5688
5690 (For more information about the phases concept, see :hg:`help phases`.)
5689 (For more information about the phases concept, see :hg:`help phases`.)
5691 """
5690 """
5692 # search for a unique phase argument
5691 # search for a unique phase argument
5693 targetphase = None
5692 targetphase = None
5694 for idx, name in enumerate(phases.phasenames):
5693 for idx, name in enumerate(phases.phasenames):
5695 if opts[name]:
5694 if opts[name]:
5696 if targetphase is not None:
5695 if targetphase is not None:
5697 raise error.Abort(_('only one phase can be specified'))
5696 raise error.Abort(_('only one phase can be specified'))
5698 targetphase = idx
5697 targetphase = idx
5699
5698
5700 # look for specified revision
5699 # look for specified revision
5701 revs = list(revs)
5700 revs = list(revs)
5702 revs.extend(opts['rev'])
5701 revs.extend(opts['rev'])
5703 if not revs:
5702 if not revs:
5704 # display both parents as the second parent phase can influence
5703 # display both parents as the second parent phase can influence
5705 # the phase of a merge commit
5704 # the phase of a merge commit
5706 revs = [c.rev() for c in repo[None].parents()]
5705 revs = [c.rev() for c in repo[None].parents()]
5707
5706
5708 revs = scmutil.revrange(repo, revs)
5707 revs = scmutil.revrange(repo, revs)
5709
5708
5710 lock = None
5709 lock = None
5711 ret = 0
5710 ret = 0
5712 if targetphase is None:
5711 if targetphase is None:
5713 # display
5712 # display
5714 for r in revs:
5713 for r in revs:
5715 ctx = repo[r]
5714 ctx = repo[r]
5716 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5715 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5717 else:
5716 else:
5718 tr = None
5717 tr = None
5719 lock = repo.lock()
5718 lock = repo.lock()
5720 try:
5719 try:
5721 tr = repo.transaction("phase")
5720 tr = repo.transaction("phase")
5722 # set phase
5721 # set phase
5723 if not revs:
5722 if not revs:
5724 raise error.Abort(_('empty revision set'))
5723 raise error.Abort(_('empty revision set'))
5725 nodes = [repo[r].node() for r in revs]
5724 nodes = [repo[r].node() for r in revs]
5726 # moving revision from public to draft may hide them
5725 # moving revision from public to draft may hide them
5727 # We have to check result on an unfiltered repository
5726 # We have to check result on an unfiltered repository
5728 unfi = repo.unfiltered()
5727 unfi = repo.unfiltered()
5729 getphase = unfi._phasecache.phase
5728 getphase = unfi._phasecache.phase
5730 olddata = [getphase(unfi, r) for r in unfi]
5729 olddata = [getphase(unfi, r) for r in unfi]
5731 phases.advanceboundary(repo, tr, targetphase, nodes)
5730 phases.advanceboundary(repo, tr, targetphase, nodes)
5732 if opts['force']:
5731 if opts['force']:
5733 phases.retractboundary(repo, tr, targetphase, nodes)
5732 phases.retractboundary(repo, tr, targetphase, nodes)
5734 tr.close()
5733 tr.close()
5735 finally:
5734 finally:
5736 if tr is not None:
5735 if tr is not None:
5737 tr.release()
5736 tr.release()
5738 lock.release()
5737 lock.release()
5739 getphase = unfi._phasecache.phase
5738 getphase = unfi._phasecache.phase
5740 newdata = [getphase(unfi, r) for r in unfi]
5739 newdata = [getphase(unfi, r) for r in unfi]
5741 changes = sum(newdata[r] != olddata[r] for r in unfi)
5740 changes = sum(newdata[r] != olddata[r] for r in unfi)
5742 cl = unfi.changelog
5741 cl = unfi.changelog
5743 rejected = [n for n in nodes
5742 rejected = [n for n in nodes
5744 if newdata[cl.rev(n)] < targetphase]
5743 if newdata[cl.rev(n)] < targetphase]
5745 if rejected:
5744 if rejected:
5746 ui.warn(_('cannot move %i changesets to a higher '
5745 ui.warn(_('cannot move %i changesets to a higher '
5747 'phase, use --force\n') % len(rejected))
5746 'phase, use --force\n') % len(rejected))
5748 ret = 1
5747 ret = 1
5749 if changes:
5748 if changes:
5750 msg = _('phase changed for %i changesets\n') % changes
5749 msg = _('phase changed for %i changesets\n') % changes
5751 if ret:
5750 if ret:
5752 ui.status(msg)
5751 ui.status(msg)
5753 else:
5752 else:
5754 ui.note(msg)
5753 ui.note(msg)
5755 else:
5754 else:
5756 ui.warn(_('no phases changed\n'))
5755 ui.warn(_('no phases changed\n'))
5757 return ret
5756 return ret
5758
5757
5759 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5758 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5760 """Run after a changegroup has been added via pull/unbundle
5759 """Run after a changegroup has been added via pull/unbundle
5761
5760
5762 This takes arguments below:
5761 This takes arguments below:
5763
5762
5764 :modheads: change of heads by pull/unbundle
5763 :modheads: change of heads by pull/unbundle
5765 :optupdate: updating working directory is needed or not
5764 :optupdate: updating working directory is needed or not
5766 :checkout: update destination revision (or None to default destination)
5765 :checkout: update destination revision (or None to default destination)
5767 :brev: a name, which might be a bookmark to be activated after updating
5766 :brev: a name, which might be a bookmark to be activated after updating
5768 """
5767 """
5769 if modheads == 0:
5768 if modheads == 0:
5770 return
5769 return
5771 if optupdate:
5770 if optupdate:
5772 try:
5771 try:
5773 return hg.updatetotally(ui, repo, checkout, brev)
5772 return hg.updatetotally(ui, repo, checkout, brev)
5774 except error.UpdateAbort as inst:
5773 except error.UpdateAbort as inst:
5775 msg = _("not updating: %s") % str(inst)
5774 msg = _("not updating: %s") % str(inst)
5776 hint = inst.hint
5775 hint = inst.hint
5777 raise error.UpdateAbort(msg, hint=hint)
5776 raise error.UpdateAbort(msg, hint=hint)
5778 if modheads > 1:
5777 if modheads > 1:
5779 currentbranchheads = len(repo.branchheads())
5778 currentbranchheads = len(repo.branchheads())
5780 if currentbranchheads == modheads:
5779 if currentbranchheads == modheads:
5781 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5780 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5782 elif currentbranchheads > 1:
5781 elif currentbranchheads > 1:
5783 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5782 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5784 "merge)\n"))
5783 "merge)\n"))
5785 else:
5784 else:
5786 ui.status(_("(run 'hg heads' to see heads)\n"))
5785 ui.status(_("(run 'hg heads' to see heads)\n"))
5787 else:
5786 else:
5788 ui.status(_("(run 'hg update' to get a working copy)\n"))
5787 ui.status(_("(run 'hg update' to get a working copy)\n"))
5789
5788
5790 @command('^pull',
5789 @command('^pull',
5791 [('u', 'update', None,
5790 [('u', 'update', None,
5792 _('update to new branch head if changesets were pulled')),
5791 _('update to new branch head if changesets were pulled')),
5793 ('f', 'force', None, _('run even when remote repository is unrelated')),
5792 ('f', 'force', None, _('run even when remote repository is unrelated')),
5794 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5793 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5795 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5794 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5796 ('b', 'branch', [], _('a specific branch you would like to pull'),
5795 ('b', 'branch', [], _('a specific branch you would like to pull'),
5797 _('BRANCH')),
5796 _('BRANCH')),
5798 ] + remoteopts,
5797 ] + remoteopts,
5799 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5798 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5800 def pull(ui, repo, source="default", **opts):
5799 def pull(ui, repo, source="default", **opts):
5801 """pull changes from the specified source
5800 """pull changes from the specified source
5802
5801
5803 Pull changes from a remote repository to a local one.
5802 Pull changes from a remote repository to a local one.
5804
5803
5805 This finds all changes from the repository at the specified path
5804 This finds all changes from the repository at the specified path
5806 or URL and adds them to a local repository (the current one unless
5805 or URL and adds them to a local repository (the current one unless
5807 -R is specified). By default, this does not update the copy of the
5806 -R is specified). By default, this does not update the copy of the
5808 project in the working directory.
5807 project in the working directory.
5809
5808
5810 Use :hg:`incoming` if you want to see what would have been added
5809 Use :hg:`incoming` if you want to see what would have been added
5811 by a pull at the time you issued this command. If you then decide
5810 by a pull at the time you issued this command. If you then decide
5812 to add those changes to the repository, you should use :hg:`pull
5811 to add those changes to the repository, you should use :hg:`pull
5813 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5812 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5814
5813
5815 If SOURCE is omitted, the 'default' path will be used.
5814 If SOURCE is omitted, the 'default' path will be used.
5816 See :hg:`help urls` for more information.
5815 See :hg:`help urls` for more information.
5817
5816
5818 Specifying bookmark as ``.`` is equivalent to specifying the active
5817 Specifying bookmark as ``.`` is equivalent to specifying the active
5819 bookmark's name.
5818 bookmark's name.
5820
5819
5821 Returns 0 on success, 1 if an update had unresolved files.
5820 Returns 0 on success, 1 if an update had unresolved files.
5822 """
5821 """
5823 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5822 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5824 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5823 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5825 other = hg.peer(repo, opts, source)
5824 other = hg.peer(repo, opts, source)
5826 try:
5825 try:
5827 revs, checkout = hg.addbranchrevs(repo, other, branches,
5826 revs, checkout = hg.addbranchrevs(repo, other, branches,
5828 opts.get('rev'))
5827 opts.get('rev'))
5829
5828
5830
5829
5831 pullopargs = {}
5830 pullopargs = {}
5832 if opts.get('bookmark'):
5831 if opts.get('bookmark'):
5833 if not revs:
5832 if not revs:
5834 revs = []
5833 revs = []
5835 # The list of bookmark used here is not the one used to actually
5834 # The list of bookmark used here is not the one used to actually
5836 # update the bookmark name. This can result in the revision pulled
5835 # update the bookmark name. This can result in the revision pulled
5837 # not ending up with the name of the bookmark because of a race
5836 # not ending up with the name of the bookmark because of a race
5838 # condition on the server. (See issue 4689 for details)
5837 # condition on the server. (See issue 4689 for details)
5839 remotebookmarks = other.listkeys('bookmarks')
5838 remotebookmarks = other.listkeys('bookmarks')
5840 pullopargs['remotebookmarks'] = remotebookmarks
5839 pullopargs['remotebookmarks'] = remotebookmarks
5841 for b in opts['bookmark']:
5840 for b in opts['bookmark']:
5842 b = repo._bookmarks.expandname(b)
5841 b = repo._bookmarks.expandname(b)
5843 if b not in remotebookmarks:
5842 if b not in remotebookmarks:
5844 raise error.Abort(_('remote bookmark %s not found!') % b)
5843 raise error.Abort(_('remote bookmark %s not found!') % b)
5845 revs.append(remotebookmarks[b])
5844 revs.append(remotebookmarks[b])
5846
5845
5847 if revs:
5846 if revs:
5848 try:
5847 try:
5849 # When 'rev' is a bookmark name, we cannot guarantee that it
5848 # When 'rev' is a bookmark name, we cannot guarantee that it
5850 # will be updated with that name because of a race condition
5849 # will be updated with that name because of a race condition
5851 # server side. (See issue 4689 for details)
5850 # server side. (See issue 4689 for details)
5852 oldrevs = revs
5851 oldrevs = revs
5853 revs = [] # actually, nodes
5852 revs = [] # actually, nodes
5854 for r in oldrevs:
5853 for r in oldrevs:
5855 node = other.lookup(r)
5854 node = other.lookup(r)
5856 revs.append(node)
5855 revs.append(node)
5857 if r == checkout:
5856 if r == checkout:
5858 checkout = node
5857 checkout = node
5859 except error.CapabilityError:
5858 except error.CapabilityError:
5860 err = _("other repository doesn't support revision lookup, "
5859 err = _("other repository doesn't support revision lookup, "
5861 "so a rev cannot be specified.")
5860 "so a rev cannot be specified.")
5862 raise error.Abort(err)
5861 raise error.Abort(err)
5863
5862
5864 pullopargs.update(opts.get('opargs', {}))
5863 pullopargs.update(opts.get('opargs', {}))
5865 modheads = exchange.pull(repo, other, heads=revs,
5864 modheads = exchange.pull(repo, other, heads=revs,
5866 force=opts.get('force'),
5865 force=opts.get('force'),
5867 bookmarks=opts.get('bookmark', ()),
5866 bookmarks=opts.get('bookmark', ()),
5868 opargs=pullopargs).cgresult
5867 opargs=pullopargs).cgresult
5869
5868
5870 # brev is a name, which might be a bookmark to be activated at
5869 # brev is a name, which might be a bookmark to be activated at
5871 # the end of the update. In other words, it is an explicit
5870 # the end of the update. In other words, it is an explicit
5872 # destination of the update
5871 # destination of the update
5873 brev = None
5872 brev = None
5874
5873
5875 if checkout:
5874 if checkout:
5876 checkout = str(repo.changelog.rev(checkout))
5875 checkout = str(repo.changelog.rev(checkout))
5877
5876
5878 # order below depends on implementation of
5877 # order below depends on implementation of
5879 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5878 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5880 # because 'checkout' is determined without it.
5879 # because 'checkout' is determined without it.
5881 if opts.get('rev'):
5880 if opts.get('rev'):
5882 brev = opts['rev'][0]
5881 brev = opts['rev'][0]
5883 elif opts.get('branch'):
5882 elif opts.get('branch'):
5884 brev = opts['branch'][0]
5883 brev = opts['branch'][0]
5885 else:
5884 else:
5886 brev = branches[0]
5885 brev = branches[0]
5887 repo._subtoppath = source
5886 repo._subtoppath = source
5888 try:
5887 try:
5889 ret = postincoming(ui, repo, modheads, opts.get('update'),
5888 ret = postincoming(ui, repo, modheads, opts.get('update'),
5890 checkout, brev)
5889 checkout, brev)
5891
5890
5892 finally:
5891 finally:
5893 del repo._subtoppath
5892 del repo._subtoppath
5894
5893
5895 finally:
5894 finally:
5896 other.close()
5895 other.close()
5897 return ret
5896 return ret
5898
5897
5899 @command('^push',
5898 @command('^push',
5900 [('f', 'force', None, _('force push')),
5899 [('f', 'force', None, _('force push')),
5901 ('r', 'rev', [],
5900 ('r', 'rev', [],
5902 _('a changeset intended to be included in the destination'),
5901 _('a changeset intended to be included in the destination'),
5903 _('REV')),
5902 _('REV')),
5904 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5903 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5905 ('b', 'branch', [],
5904 ('b', 'branch', [],
5906 _('a specific branch you would like to push'), _('BRANCH')),
5905 _('a specific branch you would like to push'), _('BRANCH')),
5907 ('', 'new-branch', False, _('allow pushing a new branch')),
5906 ('', 'new-branch', False, _('allow pushing a new branch')),
5908 ] + remoteopts,
5907 ] + remoteopts,
5909 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5908 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5910 def push(ui, repo, dest=None, **opts):
5909 def push(ui, repo, dest=None, **opts):
5911 """push changes to the specified destination
5910 """push changes to the specified destination
5912
5911
5913 Push changesets from the local repository to the specified
5912 Push changesets from the local repository to the specified
5914 destination.
5913 destination.
5915
5914
5916 This operation is symmetrical to pull: it is identical to a pull
5915 This operation is symmetrical to pull: it is identical to a pull
5917 in the destination repository from the current one.
5916 in the destination repository from the current one.
5918
5917
5919 By default, push will not allow creation of new heads at the
5918 By default, push will not allow creation of new heads at the
5920 destination, since multiple heads would make it unclear which head
5919 destination, since multiple heads would make it unclear which head
5921 to use. In this situation, it is recommended to pull and merge
5920 to use. In this situation, it is recommended to pull and merge
5922 before pushing.
5921 before pushing.
5923
5922
5924 Use --new-branch if you want to allow push to create a new named
5923 Use --new-branch if you want to allow push to create a new named
5925 branch that is not present at the destination. This allows you to
5924 branch that is not present at the destination. This allows you to
5926 only create a new branch without forcing other changes.
5925 only create a new branch without forcing other changes.
5927
5926
5928 .. note::
5927 .. note::
5929
5928
5930 Extra care should be taken with the -f/--force option,
5929 Extra care should be taken with the -f/--force option,
5931 which will push all new heads on all branches, an action which will
5930 which will push all new heads on all branches, an action which will
5932 almost always cause confusion for collaborators.
5931 almost always cause confusion for collaborators.
5933
5932
5934 If -r/--rev is used, the specified revision and all its ancestors
5933 If -r/--rev is used, the specified revision and all its ancestors
5935 will be pushed to the remote repository.
5934 will be pushed to the remote repository.
5936
5935
5937 If -B/--bookmark is used, the specified bookmarked revision, its
5936 If -B/--bookmark is used, the specified bookmarked revision, its
5938 ancestors, and the bookmark will be pushed to the remote
5937 ancestors, and the bookmark will be pushed to the remote
5939 repository. Specifying ``.`` is equivalent to specifying the active
5938 repository. Specifying ``.`` is equivalent to specifying the active
5940 bookmark's name.
5939 bookmark's name.
5941
5940
5942 Please see :hg:`help urls` for important details about ``ssh://``
5941 Please see :hg:`help urls` for important details about ``ssh://``
5943 URLs. If DESTINATION is omitted, a default path will be used.
5942 URLs. If DESTINATION is omitted, a default path will be used.
5944
5943
5945 Returns 0 if push was successful, 1 if nothing to push.
5944 Returns 0 if push was successful, 1 if nothing to push.
5946 """
5945 """
5947
5946
5948 if opts.get('bookmark'):
5947 if opts.get('bookmark'):
5949 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5948 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5950 for b in opts['bookmark']:
5949 for b in opts['bookmark']:
5951 # translate -B options to -r so changesets get pushed
5950 # translate -B options to -r so changesets get pushed
5952 b = repo._bookmarks.expandname(b)
5951 b = repo._bookmarks.expandname(b)
5953 if b in repo._bookmarks:
5952 if b in repo._bookmarks:
5954 opts.setdefault('rev', []).append(b)
5953 opts.setdefault('rev', []).append(b)
5955 else:
5954 else:
5956 # if we try to push a deleted bookmark, translate it to null
5955 # if we try to push a deleted bookmark, translate it to null
5957 # this lets simultaneous -r, -b options continue working
5956 # this lets simultaneous -r, -b options continue working
5958 opts.setdefault('rev', []).append("null")
5957 opts.setdefault('rev', []).append("null")
5959
5958
5960 path = ui.paths.getpath(dest, default=('default-push', 'default'))
5959 path = ui.paths.getpath(dest, default=('default-push', 'default'))
5961 if not path:
5960 if not path:
5962 raise error.Abort(_('default repository not configured!'),
5961 raise error.Abort(_('default repository not configured!'),
5963 hint=_('see the "path" section in "hg help config"'))
5962 hint=_('see the "path" section in "hg help config"'))
5964 dest = path.pushloc or path.loc
5963 dest = path.pushloc or path.loc
5965 branches = (path.branch, opts.get('branch') or [])
5964 branches = (path.branch, opts.get('branch') or [])
5966 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5965 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5967 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5966 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5968 other = hg.peer(repo, opts, dest)
5967 other = hg.peer(repo, opts, dest)
5969
5968
5970 if revs:
5969 if revs:
5971 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5970 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5972 if not revs:
5971 if not revs:
5973 raise error.Abort(_("specified revisions evaluate to an empty set"),
5972 raise error.Abort(_("specified revisions evaluate to an empty set"),
5974 hint=_("use different revision arguments"))
5973 hint=_("use different revision arguments"))
5975 elif path.pushrev:
5974 elif path.pushrev:
5976 # It doesn't make any sense to specify ancestor revisions. So limit
5975 # It doesn't make any sense to specify ancestor revisions. So limit
5977 # to DAG heads to make discovery simpler.
5976 # to DAG heads to make discovery simpler.
5978 expr = revset.formatspec('heads(%r)', path.pushrev)
5977 expr = revset.formatspec('heads(%r)', path.pushrev)
5979 revs = scmutil.revrange(repo, [expr])
5978 revs = scmutil.revrange(repo, [expr])
5980 revs = [repo[rev].node() for rev in revs]
5979 revs = [repo[rev].node() for rev in revs]
5981 if not revs:
5980 if not revs:
5982 raise error.Abort(_('default push revset for path evaluates to an '
5981 raise error.Abort(_('default push revset for path evaluates to an '
5983 'empty set'))
5982 'empty set'))
5984
5983
5985 repo._subtoppath = dest
5984 repo._subtoppath = dest
5986 try:
5985 try:
5987 # push subrepos depth-first for coherent ordering
5986 # push subrepos depth-first for coherent ordering
5988 c = repo['']
5987 c = repo['']
5989 subs = c.substate # only repos that are committed
5988 subs = c.substate # only repos that are committed
5990 for s in sorted(subs):
5989 for s in sorted(subs):
5991 result = c.sub(s).push(opts)
5990 result = c.sub(s).push(opts)
5992 if result == 0:
5991 if result == 0:
5993 return not result
5992 return not result
5994 finally:
5993 finally:
5995 del repo._subtoppath
5994 del repo._subtoppath
5996 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5995 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5997 newbranch=opts.get('new_branch'),
5996 newbranch=opts.get('new_branch'),
5998 bookmarks=opts.get('bookmark', ()),
5997 bookmarks=opts.get('bookmark', ()),
5999 opargs=opts.get('opargs'))
5998 opargs=opts.get('opargs'))
6000
5999
6001 result = not pushop.cgresult
6000 result = not pushop.cgresult
6002
6001
6003 if pushop.bkresult is not None:
6002 if pushop.bkresult is not None:
6004 if pushop.bkresult == 2:
6003 if pushop.bkresult == 2:
6005 result = 2
6004 result = 2
6006 elif not result and pushop.bkresult:
6005 elif not result and pushop.bkresult:
6007 result = 2
6006 result = 2
6008
6007
6009 return result
6008 return result
6010
6009
6011 @command('recover', [])
6010 @command('recover', [])
6012 def recover(ui, repo):
6011 def recover(ui, repo):
6013 """roll back an interrupted transaction
6012 """roll back an interrupted transaction
6014
6013
6015 Recover from an interrupted commit or pull.
6014 Recover from an interrupted commit or pull.
6016
6015
6017 This command tries to fix the repository status after an
6016 This command tries to fix the repository status after an
6018 interrupted operation. It should only be necessary when Mercurial
6017 interrupted operation. It should only be necessary when Mercurial
6019 suggests it.
6018 suggests it.
6020
6019
6021 Returns 0 if successful, 1 if nothing to recover or verify fails.
6020 Returns 0 if successful, 1 if nothing to recover or verify fails.
6022 """
6021 """
6023 if repo.recover():
6022 if repo.recover():
6024 return hg.verify(repo)
6023 return hg.verify(repo)
6025 return 1
6024 return 1
6026
6025
6027 @command('^remove|rm',
6026 @command('^remove|rm',
6028 [('A', 'after', None, _('record delete for missing files')),
6027 [('A', 'after', None, _('record delete for missing files')),
6029 ('f', 'force', None,
6028 ('f', 'force', None,
6030 _('forget added files, delete modified files')),
6029 _('forget added files, delete modified files')),
6031 ] + subrepoopts + walkopts,
6030 ] + subrepoopts + walkopts,
6032 _('[OPTION]... FILE...'),
6031 _('[OPTION]... FILE...'),
6033 inferrepo=True)
6032 inferrepo=True)
6034 def remove(ui, repo, *pats, **opts):
6033 def remove(ui, repo, *pats, **opts):
6035 """remove the specified files on the next commit
6034 """remove the specified files on the next commit
6036
6035
6037 Schedule the indicated files for removal from the current branch.
6036 Schedule the indicated files for removal from the current branch.
6038
6037
6039 This command schedules the files to be removed at the next commit.
6038 This command schedules the files to be removed at the next commit.
6040 To undo a remove before that, see :hg:`revert`. To undo added
6039 To undo a remove before that, see :hg:`revert`. To undo added
6041 files, see :hg:`forget`.
6040 files, see :hg:`forget`.
6042
6041
6043 .. container:: verbose
6042 .. container:: verbose
6044
6043
6045 -A/--after can be used to remove only files that have already
6044 -A/--after can be used to remove only files that have already
6046 been deleted, -f/--force can be used to force deletion, and -Af
6045 been deleted, -f/--force can be used to force deletion, and -Af
6047 can be used to remove files from the next revision without
6046 can be used to remove files from the next revision without
6048 deleting them from the working directory.
6047 deleting them from the working directory.
6049
6048
6050 The following table details the behavior of remove for different
6049 The following table details the behavior of remove for different
6051 file states (columns) and option combinations (rows). The file
6050 file states (columns) and option combinations (rows). The file
6052 states are Added [A], Clean [C], Modified [M] and Missing [!]
6051 states are Added [A], Clean [C], Modified [M] and Missing [!]
6053 (as reported by :hg:`status`). The actions are Warn, Remove
6052 (as reported by :hg:`status`). The actions are Warn, Remove
6054 (from branch) and Delete (from disk):
6053 (from branch) and Delete (from disk):
6055
6054
6056 ========= == == == ==
6055 ========= == == == ==
6057 opt/state A C M !
6056 opt/state A C M !
6058 ========= == == == ==
6057 ========= == == == ==
6059 none W RD W R
6058 none W RD W R
6060 -f R RD RD R
6059 -f R RD RD R
6061 -A W W W R
6060 -A W W W R
6062 -Af R R R R
6061 -Af R R R R
6063 ========= == == == ==
6062 ========= == == == ==
6064
6063
6065 .. note::
6064 .. note::
6066
6065
6067 :hg:`remove` never deletes files in Added [A] state from the
6066 :hg:`remove` never deletes files in Added [A] state from the
6068 working directory, not even if ``--force`` is specified.
6067 working directory, not even if ``--force`` is specified.
6069
6068
6070 Returns 0 on success, 1 if any warnings encountered.
6069 Returns 0 on success, 1 if any warnings encountered.
6071 """
6070 """
6072
6071
6073 after, force = opts.get('after'), opts.get('force')
6072 after, force = opts.get('after'), opts.get('force')
6074 if not pats and not after:
6073 if not pats and not after:
6075 raise error.Abort(_('no files specified'))
6074 raise error.Abort(_('no files specified'))
6076
6075
6077 m = scmutil.match(repo[None], pats, opts)
6076 m = scmutil.match(repo[None], pats, opts)
6078 subrepos = opts.get('subrepos')
6077 subrepos = opts.get('subrepos')
6079 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
6078 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
6080
6079
6081 @command('rename|move|mv',
6080 @command('rename|move|mv',
6082 [('A', 'after', None, _('record a rename that has already occurred')),
6081 [('A', 'after', None, _('record a rename that has already occurred')),
6083 ('f', 'force', None, _('forcibly copy over an existing managed file')),
6082 ('f', 'force', None, _('forcibly copy over an existing managed file')),
6084 ] + walkopts + dryrunopts,
6083 ] + walkopts + dryrunopts,
6085 _('[OPTION]... SOURCE... DEST'))
6084 _('[OPTION]... SOURCE... DEST'))
6086 def rename(ui, repo, *pats, **opts):
6085 def rename(ui, repo, *pats, **opts):
6087 """rename files; equivalent of copy + remove
6086 """rename files; equivalent of copy + remove
6088
6087
6089 Mark dest as copies of sources; mark sources for deletion. If dest
6088 Mark dest as copies of sources; mark sources for deletion. If dest
6090 is a directory, copies are put in that directory. If dest is a
6089 is a directory, copies are put in that directory. If dest is a
6091 file, there can only be one source.
6090 file, there can only be one source.
6092
6091
6093 By default, this command copies the contents of files as they
6092 By default, this command copies the contents of files as they
6094 exist in the working directory. If invoked with -A/--after, the
6093 exist in the working directory. If invoked with -A/--after, the
6095 operation is recorded, but no copying is performed.
6094 operation is recorded, but no copying is performed.
6096
6095
6097 This command takes effect at the next commit. To undo a rename
6096 This command takes effect at the next commit. To undo a rename
6098 before that, see :hg:`revert`.
6097 before that, see :hg:`revert`.
6099
6098
6100 Returns 0 on success, 1 if errors are encountered.
6099 Returns 0 on success, 1 if errors are encountered.
6101 """
6100 """
6102 with repo.wlock(False):
6101 with repo.wlock(False):
6103 return cmdutil.copy(ui, repo, pats, opts, rename=True)
6102 return cmdutil.copy(ui, repo, pats, opts, rename=True)
6104
6103
6105 @command('resolve',
6104 @command('resolve',
6106 [('a', 'all', None, _('select all unresolved files')),
6105 [('a', 'all', None, _('select all unresolved files')),
6107 ('l', 'list', None, _('list state of files needing merge')),
6106 ('l', 'list', None, _('list state of files needing merge')),
6108 ('m', 'mark', None, _('mark files as resolved')),
6107 ('m', 'mark', None, _('mark files as resolved')),
6109 ('u', 'unmark', None, _('mark files as unresolved')),
6108 ('u', 'unmark', None, _('mark files as unresolved')),
6110 ('n', 'no-status', None, _('hide status prefix'))]
6109 ('n', 'no-status', None, _('hide status prefix'))]
6111 + mergetoolopts + walkopts + formatteropts,
6110 + mergetoolopts + walkopts + formatteropts,
6112 _('[OPTION]... [FILE]...'),
6111 _('[OPTION]... [FILE]...'),
6113 inferrepo=True)
6112 inferrepo=True)
6114 def resolve(ui, repo, *pats, **opts):
6113 def resolve(ui, repo, *pats, **opts):
6115 """redo merges or set/view the merge status of files
6114 """redo merges or set/view the merge status of files
6116
6115
6117 Merges with unresolved conflicts are often the result of
6116 Merges with unresolved conflicts are often the result of
6118 non-interactive merging using the ``internal:merge`` configuration
6117 non-interactive merging using the ``internal:merge`` configuration
6119 setting, or a command-line merge tool like ``diff3``. The resolve
6118 setting, or a command-line merge tool like ``diff3``. The resolve
6120 command is used to manage the files involved in a merge, after
6119 command is used to manage the files involved in a merge, after
6121 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
6120 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
6122 working directory must have two parents). See :hg:`help
6121 working directory must have two parents). See :hg:`help
6123 merge-tools` for information on configuring merge tools.
6122 merge-tools` for information on configuring merge tools.
6124
6123
6125 The resolve command can be used in the following ways:
6124 The resolve command can be used in the following ways:
6126
6125
6127 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
6126 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
6128 files, discarding any previous merge attempts. Re-merging is not
6127 files, discarding any previous merge attempts. Re-merging is not
6129 performed for files already marked as resolved. Use ``--all/-a``
6128 performed for files already marked as resolved. Use ``--all/-a``
6130 to select all unresolved files. ``--tool`` can be used to specify
6129 to select all unresolved files. ``--tool`` can be used to specify
6131 the merge tool used for the given files. It overrides the HGMERGE
6130 the merge tool used for the given files. It overrides the HGMERGE
6132 environment variable and your configuration files. Previous file
6131 environment variable and your configuration files. Previous file
6133 contents are saved with a ``.orig`` suffix.
6132 contents are saved with a ``.orig`` suffix.
6134
6133
6135 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
6134 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
6136 (e.g. after having manually fixed-up the files). The default is
6135 (e.g. after having manually fixed-up the files). The default is
6137 to mark all unresolved files.
6136 to mark all unresolved files.
6138
6137
6139 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6138 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6140 default is to mark all resolved files.
6139 default is to mark all resolved files.
6141
6140
6142 - :hg:`resolve -l`: list files which had or still have conflicts.
6141 - :hg:`resolve -l`: list files which had or still have conflicts.
6143 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6142 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6144
6143
6145 .. note::
6144 .. note::
6146
6145
6147 Mercurial will not let you commit files with unresolved merge
6146 Mercurial will not let you commit files with unresolved merge
6148 conflicts. You must use :hg:`resolve -m ...` before you can
6147 conflicts. You must use :hg:`resolve -m ...` before you can
6149 commit after a conflicting merge.
6148 commit after a conflicting merge.
6150
6149
6151 Returns 0 on success, 1 if any files fail a resolve attempt.
6150 Returns 0 on success, 1 if any files fail a resolve attempt.
6152 """
6151 """
6153
6152
6154 flaglist = 'all mark unmark list no_status'.split()
6153 flaglist = 'all mark unmark list no_status'.split()
6155 all, mark, unmark, show, nostatus = \
6154 all, mark, unmark, show, nostatus = \
6156 [opts.get(o) for o in flaglist]
6155 [opts.get(o) for o in flaglist]
6157
6156
6158 if (show and (mark or unmark)) or (mark and unmark):
6157 if (show and (mark or unmark)) or (mark and unmark):
6159 raise error.Abort(_("too many options specified"))
6158 raise error.Abort(_("too many options specified"))
6160 if pats and all:
6159 if pats and all:
6161 raise error.Abort(_("can't specify --all and patterns"))
6160 raise error.Abort(_("can't specify --all and patterns"))
6162 if not (all or pats or show or mark or unmark):
6161 if not (all or pats or show or mark or unmark):
6163 raise error.Abort(_('no files or directories specified'),
6162 raise error.Abort(_('no files or directories specified'),
6164 hint=('use --all to re-merge all unresolved files'))
6163 hint=('use --all to re-merge all unresolved files'))
6165
6164
6166 if show:
6165 if show:
6167 fm = ui.formatter('resolve', opts)
6166 fm = ui.formatter('resolve', opts)
6168 ms = mergemod.mergestate.read(repo)
6167 ms = mergemod.mergestate.read(repo)
6169 m = scmutil.match(repo[None], pats, opts)
6168 m = scmutil.match(repo[None], pats, opts)
6170 for f in ms:
6169 for f in ms:
6171 if not m(f):
6170 if not m(f):
6172 continue
6171 continue
6173 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
6172 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
6174 'd': 'driverresolved'}[ms[f]]
6173 'd': 'driverresolved'}[ms[f]]
6175 fm.startitem()
6174 fm.startitem()
6176 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
6175 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
6177 fm.write('path', '%s\n', f, label=l)
6176 fm.write('path', '%s\n', f, label=l)
6178 fm.end()
6177 fm.end()
6179 return 0
6178 return 0
6180
6179
6181 with repo.wlock():
6180 with repo.wlock():
6182 ms = mergemod.mergestate.read(repo)
6181 ms = mergemod.mergestate.read(repo)
6183
6182
6184 if not (ms.active() or repo.dirstate.p2() != nullid):
6183 if not (ms.active() or repo.dirstate.p2() != nullid):
6185 raise error.Abort(
6184 raise error.Abort(
6186 _('resolve command not applicable when not merging'))
6185 _('resolve command not applicable when not merging'))
6187
6186
6188 wctx = repo[None]
6187 wctx = repo[None]
6189
6188
6190 if ms.mergedriver and ms.mdstate() == 'u':
6189 if ms.mergedriver and ms.mdstate() == 'u':
6191 proceed = mergemod.driverpreprocess(repo, ms, wctx)
6190 proceed = mergemod.driverpreprocess(repo, ms, wctx)
6192 ms.commit()
6191 ms.commit()
6193 # allow mark and unmark to go through
6192 # allow mark and unmark to go through
6194 if not mark and not unmark and not proceed:
6193 if not mark and not unmark and not proceed:
6195 return 1
6194 return 1
6196
6195
6197 m = scmutil.match(wctx, pats, opts)
6196 m = scmutil.match(wctx, pats, opts)
6198 ret = 0
6197 ret = 0
6199 didwork = False
6198 didwork = False
6200 runconclude = False
6199 runconclude = False
6201
6200
6202 tocomplete = []
6201 tocomplete = []
6203 for f in ms:
6202 for f in ms:
6204 if not m(f):
6203 if not m(f):
6205 continue
6204 continue
6206
6205
6207 didwork = True
6206 didwork = True
6208
6207
6209 # don't let driver-resolved files be marked, and run the conclude
6208 # don't let driver-resolved files be marked, and run the conclude
6210 # step if asked to resolve
6209 # step if asked to resolve
6211 if ms[f] == "d":
6210 if ms[f] == "d":
6212 exact = m.exact(f)
6211 exact = m.exact(f)
6213 if mark:
6212 if mark:
6214 if exact:
6213 if exact:
6215 ui.warn(_('not marking %s as it is driver-resolved\n')
6214 ui.warn(_('not marking %s as it is driver-resolved\n')
6216 % f)
6215 % f)
6217 elif unmark:
6216 elif unmark:
6218 if exact:
6217 if exact:
6219 ui.warn(_('not unmarking %s as it is driver-resolved\n')
6218 ui.warn(_('not unmarking %s as it is driver-resolved\n')
6220 % f)
6219 % f)
6221 else:
6220 else:
6222 runconclude = True
6221 runconclude = True
6223 continue
6222 continue
6224
6223
6225 if mark:
6224 if mark:
6226 ms.mark(f, "r")
6225 ms.mark(f, "r")
6227 elif unmark:
6226 elif unmark:
6228 ms.mark(f, "u")
6227 ms.mark(f, "u")
6229 else:
6228 else:
6230 # backup pre-resolve (merge uses .orig for its own purposes)
6229 # backup pre-resolve (merge uses .orig for its own purposes)
6231 a = repo.wjoin(f)
6230 a = repo.wjoin(f)
6232 try:
6231 try:
6233 util.copyfile(a, a + ".resolve")
6232 util.copyfile(a, a + ".resolve")
6234 except (IOError, OSError) as inst:
6233 except (IOError, OSError) as inst:
6235 if inst.errno != errno.ENOENT:
6234 if inst.errno != errno.ENOENT:
6236 raise
6235 raise
6237
6236
6238 try:
6237 try:
6239 # preresolve file
6238 # preresolve file
6240 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6239 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6241 'resolve')
6240 'resolve')
6242 complete, r = ms.preresolve(f, wctx)
6241 complete, r = ms.preresolve(f, wctx)
6243 if not complete:
6242 if not complete:
6244 tocomplete.append(f)
6243 tocomplete.append(f)
6245 elif r:
6244 elif r:
6246 ret = 1
6245 ret = 1
6247 finally:
6246 finally:
6248 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6247 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6249 ms.commit()
6248 ms.commit()
6250
6249
6251 # replace filemerge's .orig file with our resolve file, but only
6250 # replace filemerge's .orig file with our resolve file, but only
6252 # for merges that are complete
6251 # for merges that are complete
6253 if complete:
6252 if complete:
6254 try:
6253 try:
6255 util.rename(a + ".resolve",
6254 util.rename(a + ".resolve",
6256 scmutil.origpath(ui, repo, a))
6255 scmutil.origpath(ui, repo, a))
6257 except OSError as inst:
6256 except OSError as inst:
6258 if inst.errno != errno.ENOENT:
6257 if inst.errno != errno.ENOENT:
6259 raise
6258 raise
6260
6259
6261 for f in tocomplete:
6260 for f in tocomplete:
6262 try:
6261 try:
6263 # resolve file
6262 # resolve file
6264 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6263 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6265 'resolve')
6264 'resolve')
6266 r = ms.resolve(f, wctx)
6265 r = ms.resolve(f, wctx)
6267 if r:
6266 if r:
6268 ret = 1
6267 ret = 1
6269 finally:
6268 finally:
6270 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6269 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6271 ms.commit()
6270 ms.commit()
6272
6271
6273 # replace filemerge's .orig file with our resolve file
6272 # replace filemerge's .orig file with our resolve file
6274 a = repo.wjoin(f)
6273 a = repo.wjoin(f)
6275 try:
6274 try:
6276 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
6275 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
6277 except OSError as inst:
6276 except OSError as inst:
6278 if inst.errno != errno.ENOENT:
6277 if inst.errno != errno.ENOENT:
6279 raise
6278 raise
6280
6279
6281 ms.commit()
6280 ms.commit()
6282 ms.recordactions()
6281 ms.recordactions()
6283
6282
6284 if not didwork and pats:
6283 if not didwork and pats:
6285 hint = None
6284 hint = None
6286 if not any([p for p in pats if p.find(':') >= 0]):
6285 if not any([p for p in pats if p.find(':') >= 0]):
6287 pats = ['path:%s' % p for p in pats]
6286 pats = ['path:%s' % p for p in pats]
6288 m = scmutil.match(wctx, pats, opts)
6287 m = scmutil.match(wctx, pats, opts)
6289 for f in ms:
6288 for f in ms:
6290 if not m(f):
6289 if not m(f):
6291 continue
6290 continue
6292 flags = ''.join(['-%s ' % o[0] for o in flaglist
6291 flags = ''.join(['-%s ' % o[0] for o in flaglist
6293 if opts.get(o)])
6292 if opts.get(o)])
6294 hint = _("(try: hg resolve %s%s)\n") % (
6293 hint = _("(try: hg resolve %s%s)\n") % (
6295 flags,
6294 flags,
6296 ' '.join(pats))
6295 ' '.join(pats))
6297 break
6296 break
6298 ui.warn(_("arguments do not match paths that need resolving\n"))
6297 ui.warn(_("arguments do not match paths that need resolving\n"))
6299 if hint:
6298 if hint:
6300 ui.warn(hint)
6299 ui.warn(hint)
6301 elif ms.mergedriver and ms.mdstate() != 's':
6300 elif ms.mergedriver and ms.mdstate() != 's':
6302 # run conclude step when either a driver-resolved file is requested
6301 # run conclude step when either a driver-resolved file is requested
6303 # or there are no driver-resolved files
6302 # or there are no driver-resolved files
6304 # we can't use 'ret' to determine whether any files are unresolved
6303 # we can't use 'ret' to determine whether any files are unresolved
6305 # because we might not have tried to resolve some
6304 # because we might not have tried to resolve some
6306 if ((runconclude or not list(ms.driverresolved()))
6305 if ((runconclude or not list(ms.driverresolved()))
6307 and not list(ms.unresolved())):
6306 and not list(ms.unresolved())):
6308 proceed = mergemod.driverconclude(repo, ms, wctx)
6307 proceed = mergemod.driverconclude(repo, ms, wctx)
6309 ms.commit()
6308 ms.commit()
6310 if not proceed:
6309 if not proceed:
6311 return 1
6310 return 1
6312
6311
6313 # Nudge users into finishing an unfinished operation
6312 # Nudge users into finishing an unfinished operation
6314 unresolvedf = list(ms.unresolved())
6313 unresolvedf = list(ms.unresolved())
6315 driverresolvedf = list(ms.driverresolved())
6314 driverresolvedf = list(ms.driverresolved())
6316 if not unresolvedf and not driverresolvedf:
6315 if not unresolvedf and not driverresolvedf:
6317 ui.status(_('(no more unresolved files)\n'))
6316 ui.status(_('(no more unresolved files)\n'))
6318 cmdutil.checkafterresolved(repo)
6317 cmdutil.checkafterresolved(repo)
6319 elif not unresolvedf:
6318 elif not unresolvedf:
6320 ui.status(_('(no more unresolved files -- '
6319 ui.status(_('(no more unresolved files -- '
6321 'run "hg resolve --all" to conclude)\n'))
6320 'run "hg resolve --all" to conclude)\n'))
6322
6321
6323 return ret
6322 return ret
6324
6323
6325 @command('revert',
6324 @command('revert',
6326 [('a', 'all', None, _('revert all changes when no arguments given')),
6325 [('a', 'all', None, _('revert all changes when no arguments given')),
6327 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6326 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6328 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6327 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6329 ('C', 'no-backup', None, _('do not save backup copies of files')),
6328 ('C', 'no-backup', None, _('do not save backup copies of files')),
6330 ('i', 'interactive', None,
6329 ('i', 'interactive', None,
6331 _('interactively select the changes (EXPERIMENTAL)')),
6330 _('interactively select the changes (EXPERIMENTAL)')),
6332 ] + walkopts + dryrunopts,
6331 ] + walkopts + dryrunopts,
6333 _('[OPTION]... [-r REV] [NAME]...'))
6332 _('[OPTION]... [-r REV] [NAME]...'))
6334 def revert(ui, repo, *pats, **opts):
6333 def revert(ui, repo, *pats, **opts):
6335 """restore files to their checkout state
6334 """restore files to their checkout state
6336
6335
6337 .. note::
6336 .. note::
6338
6337
6339 To check out earlier revisions, you should use :hg:`update REV`.
6338 To check out earlier revisions, you should use :hg:`update REV`.
6340 To cancel an uncommitted merge (and lose your changes),
6339 To cancel an uncommitted merge (and lose your changes),
6341 use :hg:`update --clean .`.
6340 use :hg:`update --clean .`.
6342
6341
6343 With no revision specified, revert the specified files or directories
6342 With no revision specified, revert the specified files or directories
6344 to the contents they had in the parent of the working directory.
6343 to the contents they had in the parent of the working directory.
6345 This restores the contents of files to an unmodified
6344 This restores the contents of files to an unmodified
6346 state and unschedules adds, removes, copies, and renames. If the
6345 state and unschedules adds, removes, copies, and renames. If the
6347 working directory has two parents, you must explicitly specify a
6346 working directory has two parents, you must explicitly specify a
6348 revision.
6347 revision.
6349
6348
6350 Using the -r/--rev or -d/--date options, revert the given files or
6349 Using the -r/--rev or -d/--date options, revert the given files or
6351 directories to their states as of a specific revision. Because
6350 directories to their states as of a specific revision. Because
6352 revert does not change the working directory parents, this will
6351 revert does not change the working directory parents, this will
6353 cause these files to appear modified. This can be helpful to "back
6352 cause these files to appear modified. This can be helpful to "back
6354 out" some or all of an earlier change. See :hg:`backout` for a
6353 out" some or all of an earlier change. See :hg:`backout` for a
6355 related method.
6354 related method.
6356
6355
6357 Modified files are saved with a .orig suffix before reverting.
6356 Modified files are saved with a .orig suffix before reverting.
6358 To disable these backups, use --no-backup. It is possible to store
6357 To disable these backups, use --no-backup. It is possible to store
6359 the backup files in a custom directory relative to the root of the
6358 the backup files in a custom directory relative to the root of the
6360 repository by setting the ``ui.origbackuppath`` configuration
6359 repository by setting the ``ui.origbackuppath`` configuration
6361 option.
6360 option.
6362
6361
6363 See :hg:`help dates` for a list of formats valid for -d/--date.
6362 See :hg:`help dates` for a list of formats valid for -d/--date.
6364
6363
6365 See :hg:`help backout` for a way to reverse the effect of an
6364 See :hg:`help backout` for a way to reverse the effect of an
6366 earlier changeset.
6365 earlier changeset.
6367
6366
6368 Returns 0 on success.
6367 Returns 0 on success.
6369 """
6368 """
6370
6369
6371 if opts.get("date"):
6370 if opts.get("date"):
6372 if opts.get("rev"):
6371 if opts.get("rev"):
6373 raise error.Abort(_("you can't specify a revision and a date"))
6372 raise error.Abort(_("you can't specify a revision and a date"))
6374 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6373 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6375
6374
6376 parent, p2 = repo.dirstate.parents()
6375 parent, p2 = repo.dirstate.parents()
6377 if not opts.get('rev') and p2 != nullid:
6376 if not opts.get('rev') and p2 != nullid:
6378 # revert after merge is a trap for new users (issue2915)
6377 # revert after merge is a trap for new users (issue2915)
6379 raise error.Abort(_('uncommitted merge with no revision specified'),
6378 raise error.Abort(_('uncommitted merge with no revision specified'),
6380 hint=_("use 'hg update' or see 'hg help revert'"))
6379 hint=_("use 'hg update' or see 'hg help revert'"))
6381
6380
6382 ctx = scmutil.revsingle(repo, opts.get('rev'))
6381 ctx = scmutil.revsingle(repo, opts.get('rev'))
6383
6382
6384 if (not (pats or opts.get('include') or opts.get('exclude') or
6383 if (not (pats or opts.get('include') or opts.get('exclude') or
6385 opts.get('all') or opts.get('interactive'))):
6384 opts.get('all') or opts.get('interactive'))):
6386 msg = _("no files or directories specified")
6385 msg = _("no files or directories specified")
6387 if p2 != nullid:
6386 if p2 != nullid:
6388 hint = _("uncommitted merge, use --all to discard all changes,"
6387 hint = _("uncommitted merge, use --all to discard all changes,"
6389 " or 'hg update -C .' to abort the merge")
6388 " or 'hg update -C .' to abort the merge")
6390 raise error.Abort(msg, hint=hint)
6389 raise error.Abort(msg, hint=hint)
6391 dirty = any(repo.status())
6390 dirty = any(repo.status())
6392 node = ctx.node()
6391 node = ctx.node()
6393 if node != parent:
6392 if node != parent:
6394 if dirty:
6393 if dirty:
6395 hint = _("uncommitted changes, use --all to discard all"
6394 hint = _("uncommitted changes, use --all to discard all"
6396 " changes, or 'hg update %s' to update") % ctx.rev()
6395 " changes, or 'hg update %s' to update") % ctx.rev()
6397 else:
6396 else:
6398 hint = _("use --all to revert all files,"
6397 hint = _("use --all to revert all files,"
6399 " or 'hg update %s' to update") % ctx.rev()
6398 " or 'hg update %s' to update") % ctx.rev()
6400 elif dirty:
6399 elif dirty:
6401 hint = _("uncommitted changes, use --all to discard all changes")
6400 hint = _("uncommitted changes, use --all to discard all changes")
6402 else:
6401 else:
6403 hint = _("use --all to revert all files")
6402 hint = _("use --all to revert all files")
6404 raise error.Abort(msg, hint=hint)
6403 raise error.Abort(msg, hint=hint)
6405
6404
6406 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6405 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6407
6406
6408 @command('rollback', dryrunopts +
6407 @command('rollback', dryrunopts +
6409 [('f', 'force', False, _('ignore safety measures'))])
6408 [('f', 'force', False, _('ignore safety measures'))])
6410 def rollback(ui, repo, **opts):
6409 def rollback(ui, repo, **opts):
6411 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6410 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6412
6411
6413 Please use :hg:`commit --amend` instead of rollback to correct
6412 Please use :hg:`commit --amend` instead of rollback to correct
6414 mistakes in the last commit.
6413 mistakes in the last commit.
6415
6414
6416 This command should be used with care. There is only one level of
6415 This command should be used with care. There is only one level of
6417 rollback, and there is no way to undo a rollback. It will also
6416 rollback, and there is no way to undo a rollback. It will also
6418 restore the dirstate at the time of the last transaction, losing
6417 restore the dirstate at the time of the last transaction, losing
6419 any dirstate changes since that time. This command does not alter
6418 any dirstate changes since that time. This command does not alter
6420 the working directory.
6419 the working directory.
6421
6420
6422 Transactions are used to encapsulate the effects of all commands
6421 Transactions are used to encapsulate the effects of all commands
6423 that create new changesets or propagate existing changesets into a
6422 that create new changesets or propagate existing changesets into a
6424 repository.
6423 repository.
6425
6424
6426 .. container:: verbose
6425 .. container:: verbose
6427
6426
6428 For example, the following commands are transactional, and their
6427 For example, the following commands are transactional, and their
6429 effects can be rolled back:
6428 effects can be rolled back:
6430
6429
6431 - commit
6430 - commit
6432 - import
6431 - import
6433 - pull
6432 - pull
6434 - push (with this repository as the destination)
6433 - push (with this repository as the destination)
6435 - unbundle
6434 - unbundle
6436
6435
6437 To avoid permanent data loss, rollback will refuse to rollback a
6436 To avoid permanent data loss, rollback will refuse to rollback a
6438 commit transaction if it isn't checked out. Use --force to
6437 commit transaction if it isn't checked out. Use --force to
6439 override this protection.
6438 override this protection.
6440
6439
6441 The rollback command can be entirely disabled by setting the
6440 The rollback command can be entirely disabled by setting the
6442 ``ui.rollback`` configuration setting to false. If you're here
6441 ``ui.rollback`` configuration setting to false. If you're here
6443 because you want to use rollback and it's disabled, you can
6442 because you want to use rollback and it's disabled, you can
6444 re-enable the command by setting ``ui.rollback`` to true.
6443 re-enable the command by setting ``ui.rollback`` to true.
6445
6444
6446 This command is not intended for use on public repositories. Once
6445 This command is not intended for use on public repositories. Once
6447 changes are visible for pull by other users, rolling a transaction
6446 changes are visible for pull by other users, rolling a transaction
6448 back locally is ineffective (someone else may already have pulled
6447 back locally is ineffective (someone else may already have pulled
6449 the changes). Furthermore, a race is possible with readers of the
6448 the changes). Furthermore, a race is possible with readers of the
6450 repository; for example an in-progress pull from the repository
6449 repository; for example an in-progress pull from the repository
6451 may fail if a rollback is performed.
6450 may fail if a rollback is performed.
6452
6451
6453 Returns 0 on success, 1 if no rollback data is available.
6452 Returns 0 on success, 1 if no rollback data is available.
6454 """
6453 """
6455 if not ui.configbool('ui', 'rollback', True):
6454 if not ui.configbool('ui', 'rollback', True):
6456 raise error.Abort(_('rollback is disabled because it is unsafe'),
6455 raise error.Abort(_('rollback is disabled because it is unsafe'),
6457 hint=('see `hg help -v rollback` for information'))
6456 hint=('see `hg help -v rollback` for information'))
6458 return repo.rollback(dryrun=opts.get('dry_run'),
6457 return repo.rollback(dryrun=opts.get('dry_run'),
6459 force=opts.get('force'))
6458 force=opts.get('force'))
6460
6459
6461 @command('root', [])
6460 @command('root', [])
6462 def root(ui, repo):
6461 def root(ui, repo):
6463 """print the root (top) of the current working directory
6462 """print the root (top) of the current working directory
6464
6463
6465 Print the root directory of the current repository.
6464 Print the root directory of the current repository.
6466
6465
6467 Returns 0 on success.
6466 Returns 0 on success.
6468 """
6467 """
6469 ui.write(repo.root + "\n")
6468 ui.write(repo.root + "\n")
6470
6469
6471 @command('^serve',
6470 @command('^serve',
6472 [('A', 'accesslog', '', _('name of access log file to write to'),
6471 [('A', 'accesslog', '', _('name of access log file to write to'),
6473 _('FILE')),
6472 _('FILE')),
6474 ('d', 'daemon', None, _('run server in background')),
6473 ('d', 'daemon', None, _('run server in background')),
6475 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
6474 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
6476 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6475 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6477 # use string type, then we can check if something was passed
6476 # use string type, then we can check if something was passed
6478 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6477 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6479 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6478 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6480 _('ADDR')),
6479 _('ADDR')),
6481 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6480 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6482 _('PREFIX')),
6481 _('PREFIX')),
6483 ('n', 'name', '',
6482 ('n', 'name', '',
6484 _('name to show in web pages (default: working directory)'), _('NAME')),
6483 _('name to show in web pages (default: working directory)'), _('NAME')),
6485 ('', 'web-conf', '',
6484 ('', 'web-conf', '',
6486 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6485 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6487 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6486 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6488 _('FILE')),
6487 _('FILE')),
6489 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6488 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6490 ('', 'stdio', None, _('for remote clients')),
6489 ('', 'stdio', None, _('for remote clients')),
6491 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6490 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6492 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6491 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6493 ('', 'style', '', _('template style to use'), _('STYLE')),
6492 ('', 'style', '', _('template style to use'), _('STYLE')),
6494 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6493 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6495 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6494 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6496 _('[OPTION]...'),
6495 _('[OPTION]...'),
6497 optionalrepo=True)
6496 optionalrepo=True)
6498 def serve(ui, repo, **opts):
6497 def serve(ui, repo, **opts):
6499 """start stand-alone webserver
6498 """start stand-alone webserver
6500
6499
6501 Start a local HTTP repository browser and pull server. You can use
6500 Start a local HTTP repository browser and pull server. You can use
6502 this for ad-hoc sharing and browsing of repositories. It is
6501 this for ad-hoc sharing and browsing of repositories. It is
6503 recommended to use a real web server to serve a repository for
6502 recommended to use a real web server to serve a repository for
6504 longer periods of time.
6503 longer periods of time.
6505
6504
6506 Please note that the server does not implement access control.
6505 Please note that the server does not implement access control.
6507 This means that, by default, anybody can read from the server and
6506 This means that, by default, anybody can read from the server and
6508 nobody can write to it by default. Set the ``web.allow_push``
6507 nobody can write to it by default. Set the ``web.allow_push``
6509 option to ``*`` to allow everybody to push to the server. You
6508 option to ``*`` to allow everybody to push to the server. You
6510 should use a real web server if you need to authenticate users.
6509 should use a real web server if you need to authenticate users.
6511
6510
6512 By default, the server logs accesses to stdout and errors to
6511 By default, the server logs accesses to stdout and errors to
6513 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6512 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6514 files.
6513 files.
6515
6514
6516 To have the server choose a free port number to listen on, specify
6515 To have the server choose a free port number to listen on, specify
6517 a port number of 0; in this case, the server will print the port
6516 a port number of 0; in this case, the server will print the port
6518 number it uses.
6517 number it uses.
6519
6518
6520 Returns 0 on success.
6519 Returns 0 on success.
6521 """
6520 """
6522
6521
6523 if opts["stdio"] and opts["cmdserver"]:
6522 if opts["stdio"] and opts["cmdserver"]:
6524 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6523 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6525
6524
6526 if opts["stdio"]:
6525 if opts["stdio"]:
6527 if repo is None:
6526 if repo is None:
6528 raise error.RepoError(_("there is no Mercurial repository here"
6527 raise error.RepoError(_("there is no Mercurial repository here"
6529 " (.hg not found)"))
6528 " (.hg not found)"))
6530 s = sshserver.sshserver(ui, repo)
6529 s = sshserver.sshserver(ui, repo)
6531 s.serve_forever()
6530 s.serve_forever()
6532
6531
6533 if opts["cmdserver"]:
6532 if opts["cmdserver"]:
6534 service = commandserver.createservice(ui, repo, opts)
6533 service = commandserver.createservice(ui, repo, opts)
6535 else:
6534 else:
6536 service = hgweb.createservice(ui, repo, opts)
6535 service = hgweb.createservice(ui, repo, opts)
6537 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6536 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6538
6537
6539 @command('^status|st',
6538 @command('^status|st',
6540 [('A', 'all', None, _('show status of all files')),
6539 [('A', 'all', None, _('show status of all files')),
6541 ('m', 'modified', None, _('show only modified files')),
6540 ('m', 'modified', None, _('show only modified files')),
6542 ('a', 'added', None, _('show only added files')),
6541 ('a', 'added', None, _('show only added files')),
6543 ('r', 'removed', None, _('show only removed files')),
6542 ('r', 'removed', None, _('show only removed files')),
6544 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6543 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6545 ('c', 'clean', None, _('show only files without changes')),
6544 ('c', 'clean', None, _('show only files without changes')),
6546 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6545 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6547 ('i', 'ignored', None, _('show only ignored files')),
6546 ('i', 'ignored', None, _('show only ignored files')),
6548 ('n', 'no-status', None, _('hide status prefix')),
6547 ('n', 'no-status', None, _('hide status prefix')),
6549 ('C', 'copies', None, _('show source of copied files')),
6548 ('C', 'copies', None, _('show source of copied files')),
6550 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6549 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6551 ('', 'rev', [], _('show difference from revision'), _('REV')),
6550 ('', 'rev', [], _('show difference from revision'), _('REV')),
6552 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6551 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6553 ] + walkopts + subrepoopts + formatteropts,
6552 ] + walkopts + subrepoopts + formatteropts,
6554 _('[OPTION]... [FILE]...'),
6553 _('[OPTION]... [FILE]...'),
6555 inferrepo=True)
6554 inferrepo=True)
6556 def status(ui, repo, *pats, **opts):
6555 def status(ui, repo, *pats, **opts):
6557 """show changed files in the working directory
6556 """show changed files in the working directory
6558
6557
6559 Show status of files in the repository. If names are given, only
6558 Show status of files in the repository. If names are given, only
6560 files that match are shown. Files that are clean or ignored or
6559 files that match are shown. Files that are clean or ignored or
6561 the source of a copy/move operation, are not listed unless
6560 the source of a copy/move operation, are not listed unless
6562 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6561 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6563 Unless options described with "show only ..." are given, the
6562 Unless options described with "show only ..." are given, the
6564 options -mardu are used.
6563 options -mardu are used.
6565
6564
6566 Option -q/--quiet hides untracked (unknown and ignored) files
6565 Option -q/--quiet hides untracked (unknown and ignored) files
6567 unless explicitly requested with -u/--unknown or -i/--ignored.
6566 unless explicitly requested with -u/--unknown or -i/--ignored.
6568
6567
6569 .. note::
6568 .. note::
6570
6569
6571 :hg:`status` may appear to disagree with diff if permissions have
6570 :hg:`status` may appear to disagree with diff if permissions have
6572 changed or a merge has occurred. The standard diff format does
6571 changed or a merge has occurred. The standard diff format does
6573 not report permission changes and diff only reports changes
6572 not report permission changes and diff only reports changes
6574 relative to one merge parent.
6573 relative to one merge parent.
6575
6574
6576 If one revision is given, it is used as the base revision.
6575 If one revision is given, it is used as the base revision.
6577 If two revisions are given, the differences between them are
6576 If two revisions are given, the differences between them are
6578 shown. The --change option can also be used as a shortcut to list
6577 shown. The --change option can also be used as a shortcut to list
6579 the changed files of a revision from its first parent.
6578 the changed files of a revision from its first parent.
6580
6579
6581 The codes used to show the status of files are::
6580 The codes used to show the status of files are::
6582
6581
6583 M = modified
6582 M = modified
6584 A = added
6583 A = added
6585 R = removed
6584 R = removed
6586 C = clean
6585 C = clean
6587 ! = missing (deleted by non-hg command, but still tracked)
6586 ! = missing (deleted by non-hg command, but still tracked)
6588 ? = not tracked
6587 ? = not tracked
6589 I = ignored
6588 I = ignored
6590 = origin of the previous file (with --copies)
6589 = origin of the previous file (with --copies)
6591
6590
6592 .. container:: verbose
6591 .. container:: verbose
6593
6592
6594 Examples:
6593 Examples:
6595
6594
6596 - show changes in the working directory relative to a
6595 - show changes in the working directory relative to a
6597 changeset::
6596 changeset::
6598
6597
6599 hg status --rev 9353
6598 hg status --rev 9353
6600
6599
6601 - show changes in the working directory relative to the
6600 - show changes in the working directory relative to the
6602 current directory (see :hg:`help patterns` for more information)::
6601 current directory (see :hg:`help patterns` for more information)::
6603
6602
6604 hg status re:
6603 hg status re:
6605
6604
6606 - show all changes including copies in an existing changeset::
6605 - show all changes including copies in an existing changeset::
6607
6606
6608 hg status --copies --change 9353
6607 hg status --copies --change 9353
6609
6608
6610 - get a NUL separated list of added files, suitable for xargs::
6609 - get a NUL separated list of added files, suitable for xargs::
6611
6610
6612 hg status -an0
6611 hg status -an0
6613
6612
6614 Returns 0 on success.
6613 Returns 0 on success.
6615 """
6614 """
6616
6615
6617 revs = opts.get('rev')
6616 revs = opts.get('rev')
6618 change = opts.get('change')
6617 change = opts.get('change')
6619
6618
6620 if revs and change:
6619 if revs and change:
6621 msg = _('cannot specify --rev and --change at the same time')
6620 msg = _('cannot specify --rev and --change at the same time')
6622 raise error.Abort(msg)
6621 raise error.Abort(msg)
6623 elif change:
6622 elif change:
6624 node2 = scmutil.revsingle(repo, change, None).node()
6623 node2 = scmutil.revsingle(repo, change, None).node()
6625 node1 = repo[node2].p1().node()
6624 node1 = repo[node2].p1().node()
6626 else:
6625 else:
6627 node1, node2 = scmutil.revpair(repo, revs)
6626 node1, node2 = scmutil.revpair(repo, revs)
6628
6627
6629 if pats:
6628 if pats:
6630 cwd = repo.getcwd()
6629 cwd = repo.getcwd()
6631 else:
6630 else:
6632 cwd = ''
6631 cwd = ''
6633
6632
6634 if opts.get('print0'):
6633 if opts.get('print0'):
6635 end = '\0'
6634 end = '\0'
6636 else:
6635 else:
6637 end = '\n'
6636 end = '\n'
6638 copy = {}
6637 copy = {}
6639 states = 'modified added removed deleted unknown ignored clean'.split()
6638 states = 'modified added removed deleted unknown ignored clean'.split()
6640 show = [k for k in states if opts.get(k)]
6639 show = [k for k in states if opts.get(k)]
6641 if opts.get('all'):
6640 if opts.get('all'):
6642 show += ui.quiet and (states[:4] + ['clean']) or states
6641 show += ui.quiet and (states[:4] + ['clean']) or states
6643 if not show:
6642 if not show:
6644 if ui.quiet:
6643 if ui.quiet:
6645 show = states[:4]
6644 show = states[:4]
6646 else:
6645 else:
6647 show = states[:5]
6646 show = states[:5]
6648
6647
6649 m = scmutil.match(repo[node2], pats, opts)
6648 m = scmutil.match(repo[node2], pats, opts)
6650 stat = repo.status(node1, node2, m,
6649 stat = repo.status(node1, node2, m,
6651 'ignored' in show, 'clean' in show, 'unknown' in show,
6650 'ignored' in show, 'clean' in show, 'unknown' in show,
6652 opts.get('subrepos'))
6651 opts.get('subrepos'))
6653 changestates = zip(states, 'MAR!?IC', stat)
6652 changestates = zip(states, 'MAR!?IC', stat)
6654
6653
6655 if (opts.get('all') or opts.get('copies')
6654 if (opts.get('all') or opts.get('copies')
6656 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6655 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6657 copy = copies.pathcopies(repo[node1], repo[node2], m)
6656 copy = copies.pathcopies(repo[node1], repo[node2], m)
6658
6657
6659 fm = ui.formatter('status', opts)
6658 fm = ui.formatter('status', opts)
6660 fmt = '%s' + end
6659 fmt = '%s' + end
6661 showchar = not opts.get('no_status')
6660 showchar = not opts.get('no_status')
6662
6661
6663 for state, char, files in changestates:
6662 for state, char, files in changestates:
6664 if state in show:
6663 if state in show:
6665 label = 'status.' + state
6664 label = 'status.' + state
6666 for f in files:
6665 for f in files:
6667 fm.startitem()
6666 fm.startitem()
6668 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6667 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6669 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6668 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6670 if f in copy:
6669 if f in copy:
6671 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6670 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6672 label='status.copied')
6671 label='status.copied')
6673 fm.end()
6672 fm.end()
6674
6673
6675 @command('^summary|sum',
6674 @command('^summary|sum',
6676 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6675 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6677 def summary(ui, repo, **opts):
6676 def summary(ui, repo, **opts):
6678 """summarize working directory state
6677 """summarize working directory state
6679
6678
6680 This generates a brief summary of the working directory state,
6679 This generates a brief summary of the working directory state,
6681 including parents, branch, commit status, phase and available updates.
6680 including parents, branch, commit status, phase and available updates.
6682
6681
6683 With the --remote option, this will check the default paths for
6682 With the --remote option, this will check the default paths for
6684 incoming and outgoing changes. This can be time-consuming.
6683 incoming and outgoing changes. This can be time-consuming.
6685
6684
6686 Returns 0 on success.
6685 Returns 0 on success.
6687 """
6686 """
6688
6687
6689 ctx = repo[None]
6688 ctx = repo[None]
6690 parents = ctx.parents()
6689 parents = ctx.parents()
6691 pnode = parents[0].node()
6690 pnode = parents[0].node()
6692 marks = []
6691 marks = []
6693
6692
6694 ms = None
6693 ms = None
6695 try:
6694 try:
6696 ms = mergemod.mergestate.read(repo)
6695 ms = mergemod.mergestate.read(repo)
6697 except error.UnsupportedMergeRecords as e:
6696 except error.UnsupportedMergeRecords as e:
6698 s = ' '.join(e.recordtypes)
6697 s = ' '.join(e.recordtypes)
6699 ui.warn(
6698 ui.warn(
6700 _('warning: merge state has unsupported record types: %s\n') % s)
6699 _('warning: merge state has unsupported record types: %s\n') % s)
6701 unresolved = 0
6700 unresolved = 0
6702 else:
6701 else:
6703 unresolved = [f for f in ms if ms[f] == 'u']
6702 unresolved = [f for f in ms if ms[f] == 'u']
6704
6703
6705 for p in parents:
6704 for p in parents:
6706 # label with log.changeset (instead of log.parent) since this
6705 # label with log.changeset (instead of log.parent) since this
6707 # shows a working directory parent *changeset*:
6706 # shows a working directory parent *changeset*:
6708 # i18n: column positioning for "hg summary"
6707 # i18n: column positioning for "hg summary"
6709 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6708 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6710 label='log.changeset changeset.%s' % p.phasestr())
6709 label='log.changeset changeset.%s' % p.phasestr())
6711 ui.write(' '.join(p.tags()), label='log.tag')
6710 ui.write(' '.join(p.tags()), label='log.tag')
6712 if p.bookmarks():
6711 if p.bookmarks():
6713 marks.extend(p.bookmarks())
6712 marks.extend(p.bookmarks())
6714 if p.rev() == -1:
6713 if p.rev() == -1:
6715 if not len(repo):
6714 if not len(repo):
6716 ui.write(_(' (empty repository)'))
6715 ui.write(_(' (empty repository)'))
6717 else:
6716 else:
6718 ui.write(_(' (no revision checked out)'))
6717 ui.write(_(' (no revision checked out)'))
6719 ui.write('\n')
6718 ui.write('\n')
6720 if p.description():
6719 if p.description():
6721 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6720 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6722 label='log.summary')
6721 label='log.summary')
6723
6722
6724 branch = ctx.branch()
6723 branch = ctx.branch()
6725 bheads = repo.branchheads(branch)
6724 bheads = repo.branchheads(branch)
6726 # i18n: column positioning for "hg summary"
6725 # i18n: column positioning for "hg summary"
6727 m = _('branch: %s\n') % branch
6726 m = _('branch: %s\n') % branch
6728 if branch != 'default':
6727 if branch != 'default':
6729 ui.write(m, label='log.branch')
6728 ui.write(m, label='log.branch')
6730 else:
6729 else:
6731 ui.status(m, label='log.branch')
6730 ui.status(m, label='log.branch')
6732
6731
6733 if marks:
6732 if marks:
6734 active = repo._activebookmark
6733 active = repo._activebookmark
6735 # i18n: column positioning for "hg summary"
6734 # i18n: column positioning for "hg summary"
6736 ui.write(_('bookmarks:'), label='log.bookmark')
6735 ui.write(_('bookmarks:'), label='log.bookmark')
6737 if active is not None:
6736 if active is not None:
6738 if active in marks:
6737 if active in marks:
6739 ui.write(' *' + active, label=activebookmarklabel)
6738 ui.write(' *' + active, label=activebookmarklabel)
6740 marks.remove(active)
6739 marks.remove(active)
6741 else:
6740 else:
6742 ui.write(' [%s]' % active, label=activebookmarklabel)
6741 ui.write(' [%s]' % active, label=activebookmarklabel)
6743 for m in marks:
6742 for m in marks:
6744 ui.write(' ' + m, label='log.bookmark')
6743 ui.write(' ' + m, label='log.bookmark')
6745 ui.write('\n', label='log.bookmark')
6744 ui.write('\n', label='log.bookmark')
6746
6745
6747 status = repo.status(unknown=True)
6746 status = repo.status(unknown=True)
6748
6747
6749 c = repo.dirstate.copies()
6748 c = repo.dirstate.copies()
6750 copied, renamed = [], []
6749 copied, renamed = [], []
6751 for d, s in c.iteritems():
6750 for d, s in c.iteritems():
6752 if s in status.removed:
6751 if s in status.removed:
6753 status.removed.remove(s)
6752 status.removed.remove(s)
6754 renamed.append(d)
6753 renamed.append(d)
6755 else:
6754 else:
6756 copied.append(d)
6755 copied.append(d)
6757 if d in status.added:
6756 if d in status.added:
6758 status.added.remove(d)
6757 status.added.remove(d)
6759
6758
6760 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6759 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6761
6760
6762 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6761 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6763 (ui.label(_('%d added'), 'status.added'), status.added),
6762 (ui.label(_('%d added'), 'status.added'), status.added),
6764 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6763 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6765 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6764 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6766 (ui.label(_('%d copied'), 'status.copied'), copied),
6765 (ui.label(_('%d copied'), 'status.copied'), copied),
6767 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6766 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6768 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6767 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6769 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6768 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6770 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6769 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6771 t = []
6770 t = []
6772 for l, s in labels:
6771 for l, s in labels:
6773 if s:
6772 if s:
6774 t.append(l % len(s))
6773 t.append(l % len(s))
6775
6774
6776 t = ', '.join(t)
6775 t = ', '.join(t)
6777 cleanworkdir = False
6776 cleanworkdir = False
6778
6777
6779 if repo.vfs.exists('graftstate'):
6778 if repo.vfs.exists('graftstate'):
6780 t += _(' (graft in progress)')
6779 t += _(' (graft in progress)')
6781 if repo.vfs.exists('updatestate'):
6780 if repo.vfs.exists('updatestate'):
6782 t += _(' (interrupted update)')
6781 t += _(' (interrupted update)')
6783 elif len(parents) > 1:
6782 elif len(parents) > 1:
6784 t += _(' (merge)')
6783 t += _(' (merge)')
6785 elif branch != parents[0].branch():
6784 elif branch != parents[0].branch():
6786 t += _(' (new branch)')
6785 t += _(' (new branch)')
6787 elif (parents[0].closesbranch() and
6786 elif (parents[0].closesbranch() and
6788 pnode in repo.branchheads(branch, closed=True)):
6787 pnode in repo.branchheads(branch, closed=True)):
6789 t += _(' (head closed)')
6788 t += _(' (head closed)')
6790 elif not (status.modified or status.added or status.removed or renamed or
6789 elif not (status.modified or status.added or status.removed or renamed or
6791 copied or subs):
6790 copied or subs):
6792 t += _(' (clean)')
6791 t += _(' (clean)')
6793 cleanworkdir = True
6792 cleanworkdir = True
6794 elif pnode not in bheads:
6793 elif pnode not in bheads:
6795 t += _(' (new branch head)')
6794 t += _(' (new branch head)')
6796
6795
6797 if parents:
6796 if parents:
6798 pendingphase = max(p.phase() for p in parents)
6797 pendingphase = max(p.phase() for p in parents)
6799 else:
6798 else:
6800 pendingphase = phases.public
6799 pendingphase = phases.public
6801
6800
6802 if pendingphase > phases.newcommitphase(ui):
6801 if pendingphase > phases.newcommitphase(ui):
6803 t += ' (%s)' % phases.phasenames[pendingphase]
6802 t += ' (%s)' % phases.phasenames[pendingphase]
6804
6803
6805 if cleanworkdir:
6804 if cleanworkdir:
6806 # i18n: column positioning for "hg summary"
6805 # i18n: column positioning for "hg summary"
6807 ui.status(_('commit: %s\n') % t.strip())
6806 ui.status(_('commit: %s\n') % t.strip())
6808 else:
6807 else:
6809 # i18n: column positioning for "hg summary"
6808 # i18n: column positioning for "hg summary"
6810 ui.write(_('commit: %s\n') % t.strip())
6809 ui.write(_('commit: %s\n') % t.strip())
6811
6810
6812 # all ancestors of branch heads - all ancestors of parent = new csets
6811 # all ancestors of branch heads - all ancestors of parent = new csets
6813 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6812 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6814 bheads))
6813 bheads))
6815
6814
6816 if new == 0:
6815 if new == 0:
6817 # i18n: column positioning for "hg summary"
6816 # i18n: column positioning for "hg summary"
6818 ui.status(_('update: (current)\n'))
6817 ui.status(_('update: (current)\n'))
6819 elif pnode not in bheads:
6818 elif pnode not in bheads:
6820 # i18n: column positioning for "hg summary"
6819 # i18n: column positioning for "hg summary"
6821 ui.write(_('update: %d new changesets (update)\n') % new)
6820 ui.write(_('update: %d new changesets (update)\n') % new)
6822 else:
6821 else:
6823 # i18n: column positioning for "hg summary"
6822 # i18n: column positioning for "hg summary"
6824 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6823 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6825 (new, len(bheads)))
6824 (new, len(bheads)))
6826
6825
6827 t = []
6826 t = []
6828 draft = len(repo.revs('draft()'))
6827 draft = len(repo.revs('draft()'))
6829 if draft:
6828 if draft:
6830 t.append(_('%d draft') % draft)
6829 t.append(_('%d draft') % draft)
6831 secret = len(repo.revs('secret()'))
6830 secret = len(repo.revs('secret()'))
6832 if secret:
6831 if secret:
6833 t.append(_('%d secret') % secret)
6832 t.append(_('%d secret') % secret)
6834
6833
6835 if draft or secret:
6834 if draft or secret:
6836 ui.status(_('phases: %s\n') % ', '.join(t))
6835 ui.status(_('phases: %s\n') % ', '.join(t))
6837
6836
6838 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6837 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6839 for trouble in ("unstable", "divergent", "bumped"):
6838 for trouble in ("unstable", "divergent", "bumped"):
6840 numtrouble = len(repo.revs(trouble + "()"))
6839 numtrouble = len(repo.revs(trouble + "()"))
6841 # We write all the possibilities to ease translation
6840 # We write all the possibilities to ease translation
6842 troublemsg = {
6841 troublemsg = {
6843 "unstable": _("unstable: %d changesets"),
6842 "unstable": _("unstable: %d changesets"),
6844 "divergent": _("divergent: %d changesets"),
6843 "divergent": _("divergent: %d changesets"),
6845 "bumped": _("bumped: %d changesets"),
6844 "bumped": _("bumped: %d changesets"),
6846 }
6845 }
6847 if numtrouble > 0:
6846 if numtrouble > 0:
6848 ui.status(troublemsg[trouble] % numtrouble + "\n")
6847 ui.status(troublemsg[trouble] % numtrouble + "\n")
6849
6848
6850 cmdutil.summaryhooks(ui, repo)
6849 cmdutil.summaryhooks(ui, repo)
6851
6850
6852 if opts.get('remote'):
6851 if opts.get('remote'):
6853 needsincoming, needsoutgoing = True, True
6852 needsincoming, needsoutgoing = True, True
6854 else:
6853 else:
6855 needsincoming, needsoutgoing = False, False
6854 needsincoming, needsoutgoing = False, False
6856 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6855 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6857 if i:
6856 if i:
6858 needsincoming = True
6857 needsincoming = True
6859 if o:
6858 if o:
6860 needsoutgoing = True
6859 needsoutgoing = True
6861 if not needsincoming and not needsoutgoing:
6860 if not needsincoming and not needsoutgoing:
6862 return
6861 return
6863
6862
6864 def getincoming():
6863 def getincoming():
6865 source, branches = hg.parseurl(ui.expandpath('default'))
6864 source, branches = hg.parseurl(ui.expandpath('default'))
6866 sbranch = branches[0]
6865 sbranch = branches[0]
6867 try:
6866 try:
6868 other = hg.peer(repo, {}, source)
6867 other = hg.peer(repo, {}, source)
6869 except error.RepoError:
6868 except error.RepoError:
6870 if opts.get('remote'):
6869 if opts.get('remote'):
6871 raise
6870 raise
6872 return source, sbranch, None, None, None
6871 return source, sbranch, None, None, None
6873 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6872 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6874 if revs:
6873 if revs:
6875 revs = [other.lookup(rev) for rev in revs]
6874 revs = [other.lookup(rev) for rev in revs]
6876 ui.debug('comparing with %s\n' % util.hidepassword(source))
6875 ui.debug('comparing with %s\n' % util.hidepassword(source))
6877 repo.ui.pushbuffer()
6876 repo.ui.pushbuffer()
6878 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6877 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6879 repo.ui.popbuffer()
6878 repo.ui.popbuffer()
6880 return source, sbranch, other, commoninc, commoninc[1]
6879 return source, sbranch, other, commoninc, commoninc[1]
6881
6880
6882 if needsincoming:
6881 if needsincoming:
6883 source, sbranch, sother, commoninc, incoming = getincoming()
6882 source, sbranch, sother, commoninc, incoming = getincoming()
6884 else:
6883 else:
6885 source = sbranch = sother = commoninc = incoming = None
6884 source = sbranch = sother = commoninc = incoming = None
6886
6885
6887 def getoutgoing():
6886 def getoutgoing():
6888 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6887 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6889 dbranch = branches[0]
6888 dbranch = branches[0]
6890 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6889 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6891 if source != dest:
6890 if source != dest:
6892 try:
6891 try:
6893 dother = hg.peer(repo, {}, dest)
6892 dother = hg.peer(repo, {}, dest)
6894 except error.RepoError:
6893 except error.RepoError:
6895 if opts.get('remote'):
6894 if opts.get('remote'):
6896 raise
6895 raise
6897 return dest, dbranch, None, None
6896 return dest, dbranch, None, None
6898 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6897 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6899 elif sother is None:
6898 elif sother is None:
6900 # there is no explicit destination peer, but source one is invalid
6899 # there is no explicit destination peer, but source one is invalid
6901 return dest, dbranch, None, None
6900 return dest, dbranch, None, None
6902 else:
6901 else:
6903 dother = sother
6902 dother = sother
6904 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6903 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6905 common = None
6904 common = None
6906 else:
6905 else:
6907 common = commoninc
6906 common = commoninc
6908 if revs:
6907 if revs:
6909 revs = [repo.lookup(rev) for rev in revs]
6908 revs = [repo.lookup(rev) for rev in revs]
6910 repo.ui.pushbuffer()
6909 repo.ui.pushbuffer()
6911 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6910 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6912 commoninc=common)
6911 commoninc=common)
6913 repo.ui.popbuffer()
6912 repo.ui.popbuffer()
6914 return dest, dbranch, dother, outgoing
6913 return dest, dbranch, dother, outgoing
6915
6914
6916 if needsoutgoing:
6915 if needsoutgoing:
6917 dest, dbranch, dother, outgoing = getoutgoing()
6916 dest, dbranch, dother, outgoing = getoutgoing()
6918 else:
6917 else:
6919 dest = dbranch = dother = outgoing = None
6918 dest = dbranch = dother = outgoing = None
6920
6919
6921 if opts.get('remote'):
6920 if opts.get('remote'):
6922 t = []
6921 t = []
6923 if incoming:
6922 if incoming:
6924 t.append(_('1 or more incoming'))
6923 t.append(_('1 or more incoming'))
6925 o = outgoing.missing
6924 o = outgoing.missing
6926 if o:
6925 if o:
6927 t.append(_('%d outgoing') % len(o))
6926 t.append(_('%d outgoing') % len(o))
6928 other = dother or sother
6927 other = dother or sother
6929 if 'bookmarks' in other.listkeys('namespaces'):
6928 if 'bookmarks' in other.listkeys('namespaces'):
6930 counts = bookmarks.summary(repo, other)
6929 counts = bookmarks.summary(repo, other)
6931 if counts[0] > 0:
6930 if counts[0] > 0:
6932 t.append(_('%d incoming bookmarks') % counts[0])
6931 t.append(_('%d incoming bookmarks') % counts[0])
6933 if counts[1] > 0:
6932 if counts[1] > 0:
6934 t.append(_('%d outgoing bookmarks') % counts[1])
6933 t.append(_('%d outgoing bookmarks') % counts[1])
6935
6934
6936 if t:
6935 if t:
6937 # i18n: column positioning for "hg summary"
6936 # i18n: column positioning for "hg summary"
6938 ui.write(_('remote: %s\n') % (', '.join(t)))
6937 ui.write(_('remote: %s\n') % (', '.join(t)))
6939 else:
6938 else:
6940 # i18n: column positioning for "hg summary"
6939 # i18n: column positioning for "hg summary"
6941 ui.status(_('remote: (synced)\n'))
6940 ui.status(_('remote: (synced)\n'))
6942
6941
6943 cmdutil.summaryremotehooks(ui, repo, opts,
6942 cmdutil.summaryremotehooks(ui, repo, opts,
6944 ((source, sbranch, sother, commoninc),
6943 ((source, sbranch, sother, commoninc),
6945 (dest, dbranch, dother, outgoing)))
6944 (dest, dbranch, dother, outgoing)))
6946
6945
6947 @command('tag',
6946 @command('tag',
6948 [('f', 'force', None, _('force tag')),
6947 [('f', 'force', None, _('force tag')),
6949 ('l', 'local', None, _('make the tag local')),
6948 ('l', 'local', None, _('make the tag local')),
6950 ('r', 'rev', '', _('revision to tag'), _('REV')),
6949 ('r', 'rev', '', _('revision to tag'), _('REV')),
6951 ('', 'remove', None, _('remove a tag')),
6950 ('', 'remove', None, _('remove a tag')),
6952 # -l/--local is already there, commitopts cannot be used
6951 # -l/--local is already there, commitopts cannot be used
6953 ('e', 'edit', None, _('invoke editor on commit messages')),
6952 ('e', 'edit', None, _('invoke editor on commit messages')),
6954 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6953 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6955 ] + commitopts2,
6954 ] + commitopts2,
6956 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6955 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6957 def tag(ui, repo, name1, *names, **opts):
6956 def tag(ui, repo, name1, *names, **opts):
6958 """add one or more tags for the current or given revision
6957 """add one or more tags for the current or given revision
6959
6958
6960 Name a particular revision using <name>.
6959 Name a particular revision using <name>.
6961
6960
6962 Tags are used to name particular revisions of the repository and are
6961 Tags are used to name particular revisions of the repository and are
6963 very useful to compare different revisions, to go back to significant
6962 very useful to compare different revisions, to go back to significant
6964 earlier versions or to mark branch points as releases, etc. Changing
6963 earlier versions or to mark branch points as releases, etc. Changing
6965 an existing tag is normally disallowed; use -f/--force to override.
6964 an existing tag is normally disallowed; use -f/--force to override.
6966
6965
6967 If no revision is given, the parent of the working directory is
6966 If no revision is given, the parent of the working directory is
6968 used.
6967 used.
6969
6968
6970 To facilitate version control, distribution, and merging of tags,
6969 To facilitate version control, distribution, and merging of tags,
6971 they are stored as a file named ".hgtags" which is managed similarly
6970 they are stored as a file named ".hgtags" which is managed similarly
6972 to other project files and can be hand-edited if necessary. This
6971 to other project files and can be hand-edited if necessary. This
6973 also means that tagging creates a new commit. The file
6972 also means that tagging creates a new commit. The file
6974 ".hg/localtags" is used for local tags (not shared among
6973 ".hg/localtags" is used for local tags (not shared among
6975 repositories).
6974 repositories).
6976
6975
6977 Tag commits are usually made at the head of a branch. If the parent
6976 Tag commits are usually made at the head of a branch. If the parent
6978 of the working directory is not a branch head, :hg:`tag` aborts; use
6977 of the working directory is not a branch head, :hg:`tag` aborts; use
6979 -f/--force to force the tag commit to be based on a non-head
6978 -f/--force to force the tag commit to be based on a non-head
6980 changeset.
6979 changeset.
6981
6980
6982 See :hg:`help dates` for a list of formats valid for -d/--date.
6981 See :hg:`help dates` for a list of formats valid for -d/--date.
6983
6982
6984 Since tag names have priority over branch names during revision
6983 Since tag names have priority over branch names during revision
6985 lookup, using an existing branch name as a tag name is discouraged.
6984 lookup, using an existing branch name as a tag name is discouraged.
6986
6985
6987 Returns 0 on success.
6986 Returns 0 on success.
6988 """
6987 """
6989 wlock = lock = None
6988 wlock = lock = None
6990 try:
6989 try:
6991 wlock = repo.wlock()
6990 wlock = repo.wlock()
6992 lock = repo.lock()
6991 lock = repo.lock()
6993 rev_ = "."
6992 rev_ = "."
6994 names = [t.strip() for t in (name1,) + names]
6993 names = [t.strip() for t in (name1,) + names]
6995 if len(names) != len(set(names)):
6994 if len(names) != len(set(names)):
6996 raise error.Abort(_('tag names must be unique'))
6995 raise error.Abort(_('tag names must be unique'))
6997 for n in names:
6996 for n in names:
6998 scmutil.checknewlabel(repo, n, 'tag')
6997 scmutil.checknewlabel(repo, n, 'tag')
6999 if not n:
6998 if not n:
7000 raise error.Abort(_('tag names cannot consist entirely of '
6999 raise error.Abort(_('tag names cannot consist entirely of '
7001 'whitespace'))
7000 'whitespace'))
7002 if opts.get('rev') and opts.get('remove'):
7001 if opts.get('rev') and opts.get('remove'):
7003 raise error.Abort(_("--rev and --remove are incompatible"))
7002 raise error.Abort(_("--rev and --remove are incompatible"))
7004 if opts.get('rev'):
7003 if opts.get('rev'):
7005 rev_ = opts['rev']
7004 rev_ = opts['rev']
7006 message = opts.get('message')
7005 message = opts.get('message')
7007 if opts.get('remove'):
7006 if opts.get('remove'):
7008 if opts.get('local'):
7007 if opts.get('local'):
7009 expectedtype = 'local'
7008 expectedtype = 'local'
7010 else:
7009 else:
7011 expectedtype = 'global'
7010 expectedtype = 'global'
7012
7011
7013 for n in names:
7012 for n in names:
7014 if not repo.tagtype(n):
7013 if not repo.tagtype(n):
7015 raise error.Abort(_("tag '%s' does not exist") % n)
7014 raise error.Abort(_("tag '%s' does not exist") % n)
7016 if repo.tagtype(n) != expectedtype:
7015 if repo.tagtype(n) != expectedtype:
7017 if expectedtype == 'global':
7016 if expectedtype == 'global':
7018 raise error.Abort(_("tag '%s' is not a global tag") % n)
7017 raise error.Abort(_("tag '%s' is not a global tag") % n)
7019 else:
7018 else:
7020 raise error.Abort(_("tag '%s' is not a local tag") % n)
7019 raise error.Abort(_("tag '%s' is not a local tag") % n)
7021 rev_ = 'null'
7020 rev_ = 'null'
7022 if not message:
7021 if not message:
7023 # we don't translate commit messages
7022 # we don't translate commit messages
7024 message = 'Removed tag %s' % ', '.join(names)
7023 message = 'Removed tag %s' % ', '.join(names)
7025 elif not opts.get('force'):
7024 elif not opts.get('force'):
7026 for n in names:
7025 for n in names:
7027 if n in repo.tags():
7026 if n in repo.tags():
7028 raise error.Abort(_("tag '%s' already exists "
7027 raise error.Abort(_("tag '%s' already exists "
7029 "(use -f to force)") % n)
7028 "(use -f to force)") % n)
7030 if not opts.get('local'):
7029 if not opts.get('local'):
7031 p1, p2 = repo.dirstate.parents()
7030 p1, p2 = repo.dirstate.parents()
7032 if p2 != nullid:
7031 if p2 != nullid:
7033 raise error.Abort(_('uncommitted merge'))
7032 raise error.Abort(_('uncommitted merge'))
7034 bheads = repo.branchheads()
7033 bheads = repo.branchheads()
7035 if not opts.get('force') and bheads and p1 not in bheads:
7034 if not opts.get('force') and bheads and p1 not in bheads:
7036 raise error.Abort(_('not at a branch head (use -f to force)'))
7035 raise error.Abort(_('not at a branch head (use -f to force)'))
7037 r = scmutil.revsingle(repo, rev_).node()
7036 r = scmutil.revsingle(repo, rev_).node()
7038
7037
7039 if not message:
7038 if not message:
7040 # we don't translate commit messages
7039 # we don't translate commit messages
7041 message = ('Added tag %s for changeset %s' %
7040 message = ('Added tag %s for changeset %s' %
7042 (', '.join(names), short(r)))
7041 (', '.join(names), short(r)))
7043
7042
7044 date = opts.get('date')
7043 date = opts.get('date')
7045 if date:
7044 if date:
7046 date = util.parsedate(date)
7045 date = util.parsedate(date)
7047
7046
7048 if opts.get('remove'):
7047 if opts.get('remove'):
7049 editform = 'tag.remove'
7048 editform = 'tag.remove'
7050 else:
7049 else:
7051 editform = 'tag.add'
7050 editform = 'tag.add'
7052 editor = cmdutil.getcommiteditor(editform=editform, **opts)
7051 editor = cmdutil.getcommiteditor(editform=editform, **opts)
7053
7052
7054 # don't allow tagging the null rev
7053 # don't allow tagging the null rev
7055 if (not opts.get('remove') and
7054 if (not opts.get('remove') and
7056 scmutil.revsingle(repo, rev_).rev() == nullrev):
7055 scmutil.revsingle(repo, rev_).rev() == nullrev):
7057 raise error.Abort(_("cannot tag null revision"))
7056 raise error.Abort(_("cannot tag null revision"))
7058
7057
7059 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
7058 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
7060 editor=editor)
7059 editor=editor)
7061 finally:
7060 finally:
7062 release(lock, wlock)
7061 release(lock, wlock)
7063
7062
7064 @command('tags', formatteropts, '')
7063 @command('tags', formatteropts, '')
7065 def tags(ui, repo, **opts):
7064 def tags(ui, repo, **opts):
7066 """list repository tags
7065 """list repository tags
7067
7066
7068 This lists both regular and local tags. When the -v/--verbose
7067 This lists both regular and local tags. When the -v/--verbose
7069 switch is used, a third column "local" is printed for local tags.
7068 switch is used, a third column "local" is printed for local tags.
7070 When the -q/--quiet switch is used, only the tag name is printed.
7069 When the -q/--quiet switch is used, only the tag name is printed.
7071
7070
7072 Returns 0 on success.
7071 Returns 0 on success.
7073 """
7072 """
7074
7073
7075 fm = ui.formatter('tags', opts)
7074 fm = ui.formatter('tags', opts)
7076 hexfunc = fm.hexfunc
7075 hexfunc = fm.hexfunc
7077 tagtype = ""
7076 tagtype = ""
7078
7077
7079 for t, n in reversed(repo.tagslist()):
7078 for t, n in reversed(repo.tagslist()):
7080 hn = hexfunc(n)
7079 hn = hexfunc(n)
7081 label = 'tags.normal'
7080 label = 'tags.normal'
7082 tagtype = ''
7081 tagtype = ''
7083 if repo.tagtype(t) == 'local':
7082 if repo.tagtype(t) == 'local':
7084 label = 'tags.local'
7083 label = 'tags.local'
7085 tagtype = 'local'
7084 tagtype = 'local'
7086
7085
7087 fm.startitem()
7086 fm.startitem()
7088 fm.write('tag', '%s', t, label=label)
7087 fm.write('tag', '%s', t, label=label)
7089 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
7088 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
7090 fm.condwrite(not ui.quiet, 'rev node', fmt,
7089 fm.condwrite(not ui.quiet, 'rev node', fmt,
7091 repo.changelog.rev(n), hn, label=label)
7090 repo.changelog.rev(n), hn, label=label)
7092 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
7091 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
7093 tagtype, label=label)
7092 tagtype, label=label)
7094 fm.plain('\n')
7093 fm.plain('\n')
7095 fm.end()
7094 fm.end()
7096
7095
7097 @command('tip',
7096 @command('tip',
7098 [('p', 'patch', None, _('show patch')),
7097 [('p', 'patch', None, _('show patch')),
7099 ('g', 'git', None, _('use git extended diff format')),
7098 ('g', 'git', None, _('use git extended diff format')),
7100 ] + templateopts,
7099 ] + templateopts,
7101 _('[-p] [-g]'))
7100 _('[-p] [-g]'))
7102 def tip(ui, repo, **opts):
7101 def tip(ui, repo, **opts):
7103 """show the tip revision (DEPRECATED)
7102 """show the tip revision (DEPRECATED)
7104
7103
7105 The tip revision (usually just called the tip) is the changeset
7104 The tip revision (usually just called the tip) is the changeset
7106 most recently added to the repository (and therefore the most
7105 most recently added to the repository (and therefore the most
7107 recently changed head).
7106 recently changed head).
7108
7107
7109 If you have just made a commit, that commit will be the tip. If
7108 If you have just made a commit, that commit will be the tip. If
7110 you have just pulled changes from another repository, the tip of
7109 you have just pulled changes from another repository, the tip of
7111 that repository becomes the current tip. The "tip" tag is special
7110 that repository becomes the current tip. The "tip" tag is special
7112 and cannot be renamed or assigned to a different changeset.
7111 and cannot be renamed or assigned to a different changeset.
7113
7112
7114 This command is deprecated, please use :hg:`heads` instead.
7113 This command is deprecated, please use :hg:`heads` instead.
7115
7114
7116 Returns 0 on success.
7115 Returns 0 on success.
7117 """
7116 """
7118 displayer = cmdutil.show_changeset(ui, repo, opts)
7117 displayer = cmdutil.show_changeset(ui, repo, opts)
7119 displayer.show(repo['tip'])
7118 displayer.show(repo['tip'])
7120 displayer.close()
7119 displayer.close()
7121
7120
7122 @command('unbundle',
7121 @command('unbundle',
7123 [('u', 'update', None,
7122 [('u', 'update', None,
7124 _('update to new branch head if changesets were unbundled'))],
7123 _('update to new branch head if changesets were unbundled'))],
7125 _('[-u] FILE...'))
7124 _('[-u] FILE...'))
7126 def unbundle(ui, repo, fname1, *fnames, **opts):
7125 def unbundle(ui, repo, fname1, *fnames, **opts):
7127 """apply one or more changegroup files
7126 """apply one or more changegroup files
7128
7127
7129 Apply one or more compressed changegroup files generated by the
7128 Apply one or more compressed changegroup files generated by the
7130 bundle command.
7129 bundle command.
7131
7130
7132 Returns 0 on success, 1 if an update has unresolved files.
7131 Returns 0 on success, 1 if an update has unresolved files.
7133 """
7132 """
7134 fnames = (fname1,) + fnames
7133 fnames = (fname1,) + fnames
7135
7134
7136 with repo.lock():
7135 with repo.lock():
7137 for fname in fnames:
7136 for fname in fnames:
7138 f = hg.openpath(ui, fname)
7137 f = hg.openpath(ui, fname)
7139 gen = exchange.readbundle(ui, f, fname)
7138 gen = exchange.readbundle(ui, f, fname)
7140 if isinstance(gen, bundle2.unbundle20):
7139 if isinstance(gen, bundle2.unbundle20):
7141 tr = repo.transaction('unbundle')
7140 tr = repo.transaction('unbundle')
7142 try:
7141 try:
7143 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
7142 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
7144 url='bundle:' + fname)
7143 url='bundle:' + fname)
7145 tr.close()
7144 tr.close()
7146 except error.BundleUnknownFeatureError as exc:
7145 except error.BundleUnknownFeatureError as exc:
7147 raise error.Abort(_('%s: unknown bundle feature, %s')
7146 raise error.Abort(_('%s: unknown bundle feature, %s')
7148 % (fname, exc),
7147 % (fname, exc),
7149 hint=_("see https://mercurial-scm.org/"
7148 hint=_("see https://mercurial-scm.org/"
7150 "wiki/BundleFeature for more "
7149 "wiki/BundleFeature for more "
7151 "information"))
7150 "information"))
7152 finally:
7151 finally:
7153 if tr:
7152 if tr:
7154 tr.release()
7153 tr.release()
7155 changes = [r.get('return', 0)
7154 changes = [r.get('return', 0)
7156 for r in op.records['changegroup']]
7155 for r in op.records['changegroup']]
7157 modheads = changegroup.combineresults(changes)
7156 modheads = changegroup.combineresults(changes)
7158 elif isinstance(gen, streamclone.streamcloneapplier):
7157 elif isinstance(gen, streamclone.streamcloneapplier):
7159 raise error.Abort(
7158 raise error.Abort(
7160 _('packed bundles cannot be applied with '
7159 _('packed bundles cannot be applied with '
7161 '"hg unbundle"'),
7160 '"hg unbundle"'),
7162 hint=_('use "hg debugapplystreamclonebundle"'))
7161 hint=_('use "hg debugapplystreamclonebundle"'))
7163 else:
7162 else:
7164 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
7163 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
7165
7164
7166 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7165 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7167
7166
7168 @command('^update|up|checkout|co',
7167 @command('^update|up|checkout|co',
7169 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
7168 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
7170 ('c', 'check', None, _('require clean working directory')),
7169 ('c', 'check', None, _('require clean working directory')),
7171 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
7170 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
7172 ('r', 'rev', '', _('revision'), _('REV'))
7171 ('r', 'rev', '', _('revision'), _('REV'))
7173 ] + mergetoolopts,
7172 ] + mergetoolopts,
7174 _('[-c] [-C] [-d DATE] [[-r] REV]'))
7173 _('[-c] [-C] [-d DATE] [[-r] REV]'))
7175 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
7174 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
7176 tool=None):
7175 tool=None):
7177 """update working directory (or switch revisions)
7176 """update working directory (or switch revisions)
7178
7177
7179 Update the repository's working directory to the specified
7178 Update the repository's working directory to the specified
7180 changeset. If no changeset is specified, update to the tip of the
7179 changeset. If no changeset is specified, update to the tip of the
7181 current named branch and move the active bookmark (see :hg:`help
7180 current named branch and move the active bookmark (see :hg:`help
7182 bookmarks`).
7181 bookmarks`).
7183
7182
7184 Update sets the working directory's parent revision to the specified
7183 Update sets the working directory's parent revision to the specified
7185 changeset (see :hg:`help parents`).
7184 changeset (see :hg:`help parents`).
7186
7185
7187 If the changeset is not a descendant or ancestor of the working
7186 If the changeset is not a descendant or ancestor of the working
7188 directory's parent, the update is aborted. With the -c/--check
7187 directory's parent, the update is aborted. With the -c/--check
7189 option, the working directory is checked for uncommitted changes; if
7188 option, the working directory is checked for uncommitted changes; if
7190 none are found, the working directory is updated to the specified
7189 none are found, the working directory is updated to the specified
7191 changeset.
7190 changeset.
7192
7191
7193 .. container:: verbose
7192 .. container:: verbose
7194
7193
7195 The following rules apply when the working directory contains
7194 The following rules apply when the working directory contains
7196 uncommitted changes:
7195 uncommitted changes:
7197
7196
7198 1. If neither -c/--check nor -C/--clean is specified, and if
7197 1. If neither -c/--check nor -C/--clean is specified, and if
7199 the requested changeset is an ancestor or descendant of
7198 the requested changeset is an ancestor or descendant of
7200 the working directory's parent, the uncommitted changes
7199 the working directory's parent, the uncommitted changes
7201 are merged into the requested changeset and the merged
7200 are merged into the requested changeset and the merged
7202 result is left uncommitted. If the requested changeset is
7201 result is left uncommitted. If the requested changeset is
7203 not an ancestor or descendant (that is, it is on another
7202 not an ancestor or descendant (that is, it is on another
7204 branch), the update is aborted and the uncommitted changes
7203 branch), the update is aborted and the uncommitted changes
7205 are preserved.
7204 are preserved.
7206
7205
7207 2. With the -c/--check option, the update is aborted and the
7206 2. With the -c/--check option, the update is aborted and the
7208 uncommitted changes are preserved.
7207 uncommitted changes are preserved.
7209
7208
7210 3. With the -C/--clean option, uncommitted changes are discarded and
7209 3. With the -C/--clean option, uncommitted changes are discarded and
7211 the working directory is updated to the requested changeset.
7210 the working directory is updated to the requested changeset.
7212
7211
7213 To cancel an uncommitted merge (and lose your changes), use
7212 To cancel an uncommitted merge (and lose your changes), use
7214 :hg:`update --clean .`.
7213 :hg:`update --clean .`.
7215
7214
7216 Use null as the changeset to remove the working directory (like
7215 Use null as the changeset to remove the working directory (like
7217 :hg:`clone -U`).
7216 :hg:`clone -U`).
7218
7217
7219 If you want to revert just one file to an older revision, use
7218 If you want to revert just one file to an older revision, use
7220 :hg:`revert [-r REV] NAME`.
7219 :hg:`revert [-r REV] NAME`.
7221
7220
7222 See :hg:`help dates` for a list of formats valid for -d/--date.
7221 See :hg:`help dates` for a list of formats valid for -d/--date.
7223
7222
7224 Returns 0 on success, 1 if there are unresolved files.
7223 Returns 0 on success, 1 if there are unresolved files.
7225 """
7224 """
7226 if rev and node:
7225 if rev and node:
7227 raise error.Abort(_("please specify just one revision"))
7226 raise error.Abort(_("please specify just one revision"))
7228
7227
7229 if rev is None or rev == '':
7228 if rev is None or rev == '':
7230 rev = node
7229 rev = node
7231
7230
7232 if date and rev is not None:
7231 if date and rev is not None:
7233 raise error.Abort(_("you can't specify a revision and a date"))
7232 raise error.Abort(_("you can't specify a revision and a date"))
7234
7233
7235 if check and clean:
7234 if check and clean:
7236 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
7235 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
7237
7236
7238 with repo.wlock():
7237 with repo.wlock():
7239 cmdutil.clearunfinished(repo)
7238 cmdutil.clearunfinished(repo)
7240
7239
7241 if date:
7240 if date:
7242 rev = cmdutil.finddate(ui, repo, date)
7241 rev = cmdutil.finddate(ui, repo, date)
7243
7242
7244 # if we defined a bookmark, we have to remember the original name
7243 # if we defined a bookmark, we have to remember the original name
7245 brev = rev
7244 brev = rev
7246 rev = scmutil.revsingle(repo, rev, rev).rev()
7245 rev = scmutil.revsingle(repo, rev, rev).rev()
7247
7246
7248 if check:
7247 if check:
7249 cmdutil.bailifchanged(repo, merge=False)
7248 cmdutil.bailifchanged(repo, merge=False)
7250
7249
7251 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
7250 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
7252
7251
7253 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
7252 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
7254
7253
7255 @command('verify', [])
7254 @command('verify', [])
7256 def verify(ui, repo):
7255 def verify(ui, repo):
7257 """verify the integrity of the repository
7256 """verify the integrity of the repository
7258
7257
7259 Verify the integrity of the current repository.
7258 Verify the integrity of the current repository.
7260
7259
7261 This will perform an extensive check of the repository's
7260 This will perform an extensive check of the repository's
7262 integrity, validating the hashes and checksums of each entry in
7261 integrity, validating the hashes and checksums of each entry in
7263 the changelog, manifest, and tracked files, as well as the
7262 the changelog, manifest, and tracked files, as well as the
7264 integrity of their crosslinks and indices.
7263 integrity of their crosslinks and indices.
7265
7264
7266 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7265 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7267 for more information about recovery from corruption of the
7266 for more information about recovery from corruption of the
7268 repository.
7267 repository.
7269
7268
7270 Returns 0 on success, 1 if errors are encountered.
7269 Returns 0 on success, 1 if errors are encountered.
7271 """
7270 """
7272 return hg.verify(repo)
7271 return hg.verify(repo)
7273
7272
7274 @command('version', [] + formatteropts, norepo=True)
7273 @command('version', [] + formatteropts, norepo=True)
7275 def version_(ui, **opts):
7274 def version_(ui, **opts):
7276 """output version and copyright information"""
7275 """output version and copyright information"""
7277 fm = ui.formatter("version", opts)
7276 fm = ui.formatter("version", opts)
7278 fm.startitem()
7277 fm.startitem()
7279 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
7278 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
7280 util.version())
7279 util.version())
7281 license = _(
7280 license = _(
7282 "(see https://mercurial-scm.org for more information)\n"
7281 "(see https://mercurial-scm.org for more information)\n"
7283 "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
7282 "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
7284 "This is free software; see the source for copying conditions. "
7283 "This is free software; see the source for copying conditions. "
7285 "There is NO\nwarranty; "
7284 "There is NO\nwarranty; "
7286 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7285 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7287 )
7286 )
7288 if not ui.quiet:
7287 if not ui.quiet:
7289 fm.plain(license)
7288 fm.plain(license)
7290
7289
7291 if ui.verbose:
7290 if ui.verbose:
7292 fm.plain(_("\nEnabled extensions:\n\n"))
7291 fm.plain(_("\nEnabled extensions:\n\n"))
7293 # format names and versions into columns
7292 # format names and versions into columns
7294 names = []
7293 names = []
7295 vers = []
7294 vers = []
7296 isinternals = []
7295 isinternals = []
7297 for name, module in extensions.extensions():
7296 for name, module in extensions.extensions():
7298 names.append(name)
7297 names.append(name)
7299 vers.append(extensions.moduleversion(module) or None)
7298 vers.append(extensions.moduleversion(module) or None)
7300 isinternals.append(extensions.ismoduleinternal(module))
7299 isinternals.append(extensions.ismoduleinternal(module))
7301 fn = fm.nested("extensions")
7300 fn = fm.nested("extensions")
7302 if names:
7301 if names:
7303 namefmt = " %%-%ds " % max(len(n) for n in names)
7302 namefmt = " %%-%ds " % max(len(n) for n in names)
7304 places = [_("external"), _("internal")]
7303 places = [_("external"), _("internal")]
7305 for n, v, p in zip(names, vers, isinternals):
7304 for n, v, p in zip(names, vers, isinternals):
7306 fn.startitem()
7305 fn.startitem()
7307 fn.condwrite(ui.verbose, "name", namefmt, n)
7306 fn.condwrite(ui.verbose, "name", namefmt, n)
7308 if ui.verbose:
7307 if ui.verbose:
7309 fn.plain("%s " % places[p])
7308 fn.plain("%s " % places[p])
7310 fn.data(bundled=p)
7309 fn.data(bundled=p)
7311 fn.condwrite(ui.verbose and v, "ver", "%s", v)
7310 fn.condwrite(ui.verbose and v, "ver", "%s", v)
7312 if ui.verbose:
7311 if ui.verbose:
7313 fn.plain("\n")
7312 fn.plain("\n")
7314 fn.end()
7313 fn.end()
7315 fm.end()
7314 fm.end()
7316
7315
7317 def loadcmdtable(ui, name, cmdtable):
7316 def loadcmdtable(ui, name, cmdtable):
7318 """Load command functions from specified cmdtable
7317 """Load command functions from specified cmdtable
7319 """
7318 """
7320 overrides = [cmd for cmd in cmdtable if cmd in table]
7319 overrides = [cmd for cmd in cmdtable if cmd in table]
7321 if overrides:
7320 if overrides:
7322 ui.warn(_("extension '%s' overrides commands: %s\n")
7321 ui.warn(_("extension '%s' overrides commands: %s\n")
7323 % (name, " ".join(overrides)))
7322 % (name, " ".join(overrides)))
7324 table.update(cmdtable)
7323 table.update(cmdtable)
@@ -1,118 +1,113 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 bundled: yes
36 tested with: internal
37 ext1
36 ext1
38 location: */extwithoutinfos.py* (glob)
37 location: */extwithoutinfos.py* (glob)
39 bundled: no
38 bundled: no
40 ext2
39 ext2
41 location: */extwithinfos.py* (glob)
40 location: */extwithinfos.py* (glob)
42 bundled: no
41 bundled: no
43 tested with: 3.0 3.1 3.2.1
42 tested with: 3.0 3.1 3.2.1
44 bug reporting: https://example.org/bts
43 bug reporting: https://example.org/bts
45 histedit
44 histedit
46 location: */hgext/histedit.py* (glob)
45 location: */hgext/histedit.py* (glob)
47 bundled: yes
46 bundled: yes
48 tested with: internal
49 mq
47 mq
50 location: */hgext/mq.py* (glob)
48 location: */hgext/mq.py* (glob)
51 bundled: yes
49 bundled: yes
52 tested with: internal
53 patchbomb
50 patchbomb
54 location: */hgext/patchbomb.py* (glob)
51 location: */hgext/patchbomb.py* (glob)
55 bundled: yes
52 bundled: yes
56 tested with: internal
57 rebase
53 rebase
58 location: */hgext/rebase.py* (glob)
54 location: */hgext/rebase.py* (glob)
59 bundled: yes
55 bundled: yes
60 tested with: internal
61
56
62 $ hg debugextensions -Tjson | sed 's|\\\\|/|g'
57 $ hg debugextensions -Tjson | sed 's|\\\\|/|g'
63 [
58 [
64 {
59 {
65 "buglink": "",
60 "buglink": "",
66 "bundled": true,
61 "bundled": true,
67 "name": "color",
62 "name": "color",
68 "source": "*/hgext/color.py*", (glob)
63 "source": "*/hgext/color.py*", (glob)
69 "testedwith": ["internal"]
64 "testedwith": []
70 },
65 },
71 {
66 {
72 "buglink": "",
67 "buglink": "",
73 "bundled": false,
68 "bundled": false,
74 "name": "ext1",
69 "name": "ext1",
75 "source": "*/extwithoutinfos.py*", (glob)
70 "source": "*/extwithoutinfos.py*", (glob)
76 "testedwith": []
71 "testedwith": []
77 },
72 },
78 {
73 {
79 "buglink": "https://example.org/bts",
74 "buglink": "https://example.org/bts",
80 "bundled": false,
75 "bundled": false,
81 "name": "ext2",
76 "name": "ext2",
82 "source": "*/extwithinfos.py*", (glob)
77 "source": "*/extwithinfos.py*", (glob)
83 "testedwith": ["3.0", "3.1", "3.2.1"]
78 "testedwith": ["3.0", "3.1", "3.2.1"]
84 },
79 },
85 {
80 {
86 "buglink": "",
81 "buglink": "",
87 "bundled": true,
82 "bundled": true,
88 "name": "histedit",
83 "name": "histedit",
89 "source": "*/hgext/histedit.py*", (glob)
84 "source": "*/hgext/histedit.py*", (glob)
90 "testedwith": ["internal"]
85 "testedwith": []
91 },
86 },
92 {
87 {
93 "buglink": "",
88 "buglink": "",
94 "bundled": true,
89 "bundled": true,
95 "name": "mq",
90 "name": "mq",
96 "source": "*/hgext/mq.py*", (glob)
91 "source": "*/hgext/mq.py*", (glob)
97 "testedwith": ["internal"]
92 "testedwith": []
98 },
93 },
99 {
94 {
100 "buglink": "",
95 "buglink": "",
101 "bundled": true,
96 "bundled": true,
102 "name": "patchbomb",
97 "name": "patchbomb",
103 "source": "*/hgext/patchbomb.py*", (glob)
98 "source": "*/hgext/patchbomb.py*", (glob)
104 "testedwith": ["internal"]
99 "testedwith": []
105 },
100 },
106 {
101 {
107 "buglink": "",
102 "buglink": "",
108 "bundled": true,
103 "bundled": true,
109 "name": "rebase",
104 "name": "rebase",
110 "source": "*/hgext/rebase.py*", (glob)
105 "source": "*/hgext/rebase.py*", (glob)
111 "testedwith": ["internal"]
106 "testedwith": []
112 }
107 }
113 ]
108 ]
114
109
115 $ hg debugextensions -T '{ifcontains("3.1", testedwith, "{name}\n")}'
110 $ hg debugextensions -T '{ifcontains("3.1", testedwith, "{name}\n")}'
116 ext2
111 ext2
117 $ hg debugextensions \
112 $ hg debugextensions \
118 > -T '{ifcontains("3.2", testedwith, "no substring match: {name}\n")}'
113 > -T '{ifcontains("3.2", testedwith, "no substring match: {name}\n")}'
General Comments 0
You need to be logged in to leave comments. Login now