##// END OF EJS Templates
version: add formatter support...
Yuya Nishihara -
r29840:4435d4c9 default
parent child Browse files
Show More
@@ -1,7282 +1,7295 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 extsource = extmod.__file__
2397 extsource = extmod.__file__
2398 exttestedwith = getattr(extmod, 'testedwith', '').split()
2398 exttestedwith = getattr(extmod, 'testedwith', '').split()
2399 extbuglink = getattr(extmod, 'buglink', None)
2399 extbuglink = getattr(extmod, 'buglink', None)
2400
2400
2401 fm.startitem()
2401 fm.startitem()
2402
2402
2403 if ui.quiet or ui.verbose:
2403 if ui.quiet or ui.verbose:
2404 fm.write('name', '%s\n', extname)
2404 fm.write('name', '%s\n', extname)
2405 else:
2405 else:
2406 fm.write('name', '%s', extname)
2406 fm.write('name', '%s', extname)
2407 if not exttestedwith:
2407 if not exttestedwith:
2408 fm.plain(_(' (untested!)\n'))
2408 fm.plain(_(' (untested!)\n'))
2409 elif exttestedwith == ['internal'] or hgver in exttestedwith:
2409 elif exttestedwith == ['internal'] or hgver in exttestedwith:
2410 fm.plain('\n')
2410 fm.plain('\n')
2411 else:
2411 else:
2412 lasttestedversion = exttestedwith[-1]
2412 lasttestedversion = exttestedwith[-1]
2413 fm.plain(' (%s!)\n' % lasttestedversion)
2413 fm.plain(' (%s!)\n' % lasttestedversion)
2414
2414
2415 fm.condwrite(ui.verbose and extsource, 'source',
2415 fm.condwrite(ui.verbose and extsource, 'source',
2416 _(' location: %s\n'), extsource or "")
2416 _(' location: %s\n'), extsource or "")
2417
2417
2418 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
2418 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
2419 _(' tested with: %s\n'),
2419 _(' tested with: %s\n'),
2420 fm.formatlist(exttestedwith, name='ver'))
2420 fm.formatlist(exttestedwith, name='ver'))
2421
2421
2422 fm.condwrite(ui.verbose and extbuglink, 'buglink',
2422 fm.condwrite(ui.verbose and extbuglink, 'buglink',
2423 _(' bug reporting: %s\n'), extbuglink or "")
2423 _(' bug reporting: %s\n'), extbuglink or "")
2424
2424
2425 fm.end()
2425 fm.end()
2426
2426
2427 @command('debugfileset',
2427 @command('debugfileset',
2428 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2428 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2429 _('[-r REV] FILESPEC'))
2429 _('[-r REV] FILESPEC'))
2430 def debugfileset(ui, repo, expr, **opts):
2430 def debugfileset(ui, repo, expr, **opts):
2431 '''parse and apply a fileset specification'''
2431 '''parse and apply a fileset specification'''
2432 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2432 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2433 if ui.verbose:
2433 if ui.verbose:
2434 tree = fileset.parse(expr)
2434 tree = fileset.parse(expr)
2435 ui.note(fileset.prettyformat(tree), "\n")
2435 ui.note(fileset.prettyformat(tree), "\n")
2436
2436
2437 for f in ctx.getfileset(expr):
2437 for f in ctx.getfileset(expr):
2438 ui.write("%s\n" % f)
2438 ui.write("%s\n" % f)
2439
2439
2440 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2440 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2441 def debugfsinfo(ui, path="."):
2441 def debugfsinfo(ui, path="."):
2442 """show information detected about current filesystem"""
2442 """show information detected about current filesystem"""
2443 util.writefile('.debugfsinfo', '')
2443 util.writefile('.debugfsinfo', '')
2444 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2444 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2445 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2445 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2446 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2446 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2447 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
2447 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
2448 and 'yes' or 'no'))
2448 and 'yes' or 'no'))
2449 os.unlink('.debugfsinfo')
2449 os.unlink('.debugfsinfo')
2450
2450
2451 @command('debuggetbundle',
2451 @command('debuggetbundle',
2452 [('H', 'head', [], _('id of head node'), _('ID')),
2452 [('H', 'head', [], _('id of head node'), _('ID')),
2453 ('C', 'common', [], _('id of common node'), _('ID')),
2453 ('C', 'common', [], _('id of common node'), _('ID')),
2454 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2454 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2455 _('REPO FILE [-H|-C ID]...'),
2455 _('REPO FILE [-H|-C ID]...'),
2456 norepo=True)
2456 norepo=True)
2457 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2457 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2458 """retrieves a bundle from a repo
2458 """retrieves a bundle from a repo
2459
2459
2460 Every ID must be a full-length hex node id string. Saves the bundle to the
2460 Every ID must be a full-length hex node id string. Saves the bundle to the
2461 given file.
2461 given file.
2462 """
2462 """
2463 repo = hg.peer(ui, opts, repopath)
2463 repo = hg.peer(ui, opts, repopath)
2464 if not repo.capable('getbundle'):
2464 if not repo.capable('getbundle'):
2465 raise error.Abort("getbundle() not supported by target repository")
2465 raise error.Abort("getbundle() not supported by target repository")
2466 args = {}
2466 args = {}
2467 if common:
2467 if common:
2468 args['common'] = [bin(s) for s in common]
2468 args['common'] = [bin(s) for s in common]
2469 if head:
2469 if head:
2470 args['heads'] = [bin(s) for s in head]
2470 args['heads'] = [bin(s) for s in head]
2471 # TODO: get desired bundlecaps from command line.
2471 # TODO: get desired bundlecaps from command line.
2472 args['bundlecaps'] = None
2472 args['bundlecaps'] = None
2473 bundle = repo.getbundle('debug', **args)
2473 bundle = repo.getbundle('debug', **args)
2474
2474
2475 bundletype = opts.get('type', 'bzip2').lower()
2475 bundletype = opts.get('type', 'bzip2').lower()
2476 btypes = {'none': 'HG10UN',
2476 btypes = {'none': 'HG10UN',
2477 'bzip2': 'HG10BZ',
2477 'bzip2': 'HG10BZ',
2478 'gzip': 'HG10GZ',
2478 'gzip': 'HG10GZ',
2479 'bundle2': 'HG20'}
2479 'bundle2': 'HG20'}
2480 bundletype = btypes.get(bundletype)
2480 bundletype = btypes.get(bundletype)
2481 if bundletype not in bundle2.bundletypes:
2481 if bundletype not in bundle2.bundletypes:
2482 raise error.Abort(_('unknown bundle type specified with --type'))
2482 raise error.Abort(_('unknown bundle type specified with --type'))
2483 bundle2.writebundle(ui, bundle, bundlepath, bundletype)
2483 bundle2.writebundle(ui, bundle, bundlepath, bundletype)
2484
2484
2485 @command('debugignore', [], '[FILE]')
2485 @command('debugignore', [], '[FILE]')
2486 def debugignore(ui, repo, *files, **opts):
2486 def debugignore(ui, repo, *files, **opts):
2487 """display the combined ignore pattern and information about ignored files
2487 """display the combined ignore pattern and information about ignored files
2488
2488
2489 With no argument display the combined ignore pattern.
2489 With no argument display the combined ignore pattern.
2490
2490
2491 Given space separated file names, shows if the given file is ignored and
2491 Given space separated file names, shows if the given file is ignored and
2492 if so, show the ignore rule (file and line number) that matched it.
2492 if so, show the ignore rule (file and line number) that matched it.
2493 """
2493 """
2494 ignore = repo.dirstate._ignore
2494 ignore = repo.dirstate._ignore
2495 if not files:
2495 if not files:
2496 # Show all the patterns
2496 # Show all the patterns
2497 includepat = getattr(ignore, 'includepat', None)
2497 includepat = getattr(ignore, 'includepat', None)
2498 if includepat is not None:
2498 if includepat is not None:
2499 ui.write("%s\n" % includepat)
2499 ui.write("%s\n" % includepat)
2500 else:
2500 else:
2501 raise error.Abort(_("no ignore patterns found"))
2501 raise error.Abort(_("no ignore patterns found"))
2502 else:
2502 else:
2503 for f in files:
2503 for f in files:
2504 nf = util.normpath(f)
2504 nf = util.normpath(f)
2505 ignored = None
2505 ignored = None
2506 ignoredata = None
2506 ignoredata = None
2507 if nf != '.':
2507 if nf != '.':
2508 if ignore(nf):
2508 if ignore(nf):
2509 ignored = nf
2509 ignored = nf
2510 ignoredata = repo.dirstate._ignorefileandline(nf)
2510 ignoredata = repo.dirstate._ignorefileandline(nf)
2511 else:
2511 else:
2512 for p in util.finddirs(nf):
2512 for p in util.finddirs(nf):
2513 if ignore(p):
2513 if ignore(p):
2514 ignored = p
2514 ignored = p
2515 ignoredata = repo.dirstate._ignorefileandline(p)
2515 ignoredata = repo.dirstate._ignorefileandline(p)
2516 break
2516 break
2517 if ignored:
2517 if ignored:
2518 if ignored == nf:
2518 if ignored == nf:
2519 ui.write(_("%s is ignored\n") % f)
2519 ui.write(_("%s is ignored\n") % f)
2520 else:
2520 else:
2521 ui.write(_("%s is ignored because of "
2521 ui.write(_("%s is ignored because of "
2522 "containing folder %s\n")
2522 "containing folder %s\n")
2523 % (f, ignored))
2523 % (f, ignored))
2524 ignorefile, lineno, line = ignoredata
2524 ignorefile, lineno, line = ignoredata
2525 ui.write(_("(ignore rule in %s, line %d: '%s')\n")
2525 ui.write(_("(ignore rule in %s, line %d: '%s')\n")
2526 % (ignorefile, lineno, line))
2526 % (ignorefile, lineno, line))
2527 else:
2527 else:
2528 ui.write(_("%s is not ignored\n") % f)
2528 ui.write(_("%s is not ignored\n") % f)
2529
2529
2530 @command('debugindex', debugrevlogopts +
2530 @command('debugindex', debugrevlogopts +
2531 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2531 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2532 _('[-f FORMAT] -c|-m|FILE'),
2532 _('[-f FORMAT] -c|-m|FILE'),
2533 optionalrepo=True)
2533 optionalrepo=True)
2534 def debugindex(ui, repo, file_=None, **opts):
2534 def debugindex(ui, repo, file_=None, **opts):
2535 """dump the contents of an index file"""
2535 """dump the contents of an index file"""
2536 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2536 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2537 format = opts.get('format', 0)
2537 format = opts.get('format', 0)
2538 if format not in (0, 1):
2538 if format not in (0, 1):
2539 raise error.Abort(_("unknown format %d") % format)
2539 raise error.Abort(_("unknown format %d") % format)
2540
2540
2541 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2541 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2542 if generaldelta:
2542 if generaldelta:
2543 basehdr = ' delta'
2543 basehdr = ' delta'
2544 else:
2544 else:
2545 basehdr = ' base'
2545 basehdr = ' base'
2546
2546
2547 if ui.debugflag:
2547 if ui.debugflag:
2548 shortfn = hex
2548 shortfn = hex
2549 else:
2549 else:
2550 shortfn = short
2550 shortfn = short
2551
2551
2552 # There might not be anything in r, so have a sane default
2552 # There might not be anything in r, so have a sane default
2553 idlen = 12
2553 idlen = 12
2554 for i in r:
2554 for i in r:
2555 idlen = len(shortfn(r.node(i)))
2555 idlen = len(shortfn(r.node(i)))
2556 break
2556 break
2557
2557
2558 if format == 0:
2558 if format == 0:
2559 ui.write((" rev offset length " + basehdr + " linkrev"
2559 ui.write((" rev offset length " + basehdr + " linkrev"
2560 " %s %s p2\n") % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2560 " %s %s p2\n") % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2561 elif format == 1:
2561 elif format == 1:
2562 ui.write((" rev flag offset length"
2562 ui.write((" rev flag offset length"
2563 " size " + basehdr + " link p1 p2"
2563 " size " + basehdr + " link p1 p2"
2564 " %s\n") % "nodeid".rjust(idlen))
2564 " %s\n") % "nodeid".rjust(idlen))
2565
2565
2566 for i in r:
2566 for i in r:
2567 node = r.node(i)
2567 node = r.node(i)
2568 if generaldelta:
2568 if generaldelta:
2569 base = r.deltaparent(i)
2569 base = r.deltaparent(i)
2570 else:
2570 else:
2571 base = r.chainbase(i)
2571 base = r.chainbase(i)
2572 if format == 0:
2572 if format == 0:
2573 try:
2573 try:
2574 pp = r.parents(node)
2574 pp = r.parents(node)
2575 except Exception:
2575 except Exception:
2576 pp = [nullid, nullid]
2576 pp = [nullid, nullid]
2577 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2577 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2578 i, r.start(i), r.length(i), base, r.linkrev(i),
2578 i, r.start(i), r.length(i), base, r.linkrev(i),
2579 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2579 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2580 elif format == 1:
2580 elif format == 1:
2581 pr = r.parentrevs(i)
2581 pr = r.parentrevs(i)
2582 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2582 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2583 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2583 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2584 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2584 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2585
2585
2586 @command('debugindexdot', debugrevlogopts,
2586 @command('debugindexdot', debugrevlogopts,
2587 _('-c|-m|FILE'), optionalrepo=True)
2587 _('-c|-m|FILE'), optionalrepo=True)
2588 def debugindexdot(ui, repo, file_=None, **opts):
2588 def debugindexdot(ui, repo, file_=None, **opts):
2589 """dump an index DAG as a graphviz dot file"""
2589 """dump an index DAG as a graphviz dot file"""
2590 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
2590 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
2591 ui.write(("digraph G {\n"))
2591 ui.write(("digraph G {\n"))
2592 for i in r:
2592 for i in r:
2593 node = r.node(i)
2593 node = r.node(i)
2594 pp = r.parents(node)
2594 pp = r.parents(node)
2595 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2595 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2596 if pp[1] != nullid:
2596 if pp[1] != nullid:
2597 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2597 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2598 ui.write("}\n")
2598 ui.write("}\n")
2599
2599
2600 @command('debugdeltachain',
2600 @command('debugdeltachain',
2601 debugrevlogopts + formatteropts,
2601 debugrevlogopts + formatteropts,
2602 _('-c|-m|FILE'),
2602 _('-c|-m|FILE'),
2603 optionalrepo=True)
2603 optionalrepo=True)
2604 def debugdeltachain(ui, repo, file_=None, **opts):
2604 def debugdeltachain(ui, repo, file_=None, **opts):
2605 """dump information about delta chains in a revlog
2605 """dump information about delta chains in a revlog
2606
2606
2607 Output can be templatized. Available template keywords are:
2607 Output can be templatized. Available template keywords are:
2608
2608
2609 :``rev``: revision number
2609 :``rev``: revision number
2610 :``chainid``: delta chain identifier (numbered by unique base)
2610 :``chainid``: delta chain identifier (numbered by unique base)
2611 :``chainlen``: delta chain length to this revision
2611 :``chainlen``: delta chain length to this revision
2612 :``prevrev``: previous revision in delta chain
2612 :``prevrev``: previous revision in delta chain
2613 :``deltatype``: role of delta / how it was computed
2613 :``deltatype``: role of delta / how it was computed
2614 :``compsize``: compressed size of revision
2614 :``compsize``: compressed size of revision
2615 :``uncompsize``: uncompressed size of revision
2615 :``uncompsize``: uncompressed size of revision
2616 :``chainsize``: total size of compressed revisions in chain
2616 :``chainsize``: total size of compressed revisions in chain
2617 :``chainratio``: total chain size divided by uncompressed revision size
2617 :``chainratio``: total chain size divided by uncompressed revision size
2618 (new delta chains typically start at ratio 2.00)
2618 (new delta chains typically start at ratio 2.00)
2619 :``lindist``: linear distance from base revision in delta chain to end
2619 :``lindist``: linear distance from base revision in delta chain to end
2620 of this revision
2620 of this revision
2621 :``extradist``: total size of revisions not part of this delta chain from
2621 :``extradist``: total size of revisions not part of this delta chain from
2622 base of delta chain to end of this revision; a measurement
2622 base of delta chain to end of this revision; a measurement
2623 of how much extra data we need to read/seek across to read
2623 of how much extra data we need to read/seek across to read
2624 the delta chain for this revision
2624 the delta chain for this revision
2625 :``extraratio``: extradist divided by chainsize; another representation of
2625 :``extraratio``: extradist divided by chainsize; another representation of
2626 how much unrelated data is needed to load this delta chain
2626 how much unrelated data is needed to load this delta chain
2627 """
2627 """
2628 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
2628 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
2629 index = r.index
2629 index = r.index
2630 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2630 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2631
2631
2632 def revinfo(rev):
2632 def revinfo(rev):
2633 e = index[rev]
2633 e = index[rev]
2634 compsize = e[1]
2634 compsize = e[1]
2635 uncompsize = e[2]
2635 uncompsize = e[2]
2636 chainsize = 0
2636 chainsize = 0
2637
2637
2638 if generaldelta:
2638 if generaldelta:
2639 if e[3] == e[5]:
2639 if e[3] == e[5]:
2640 deltatype = 'p1'
2640 deltatype = 'p1'
2641 elif e[3] == e[6]:
2641 elif e[3] == e[6]:
2642 deltatype = 'p2'
2642 deltatype = 'p2'
2643 elif e[3] == rev - 1:
2643 elif e[3] == rev - 1:
2644 deltatype = 'prev'
2644 deltatype = 'prev'
2645 elif e[3] == rev:
2645 elif e[3] == rev:
2646 deltatype = 'base'
2646 deltatype = 'base'
2647 else:
2647 else:
2648 deltatype = 'other'
2648 deltatype = 'other'
2649 else:
2649 else:
2650 if e[3] == rev:
2650 if e[3] == rev:
2651 deltatype = 'base'
2651 deltatype = 'base'
2652 else:
2652 else:
2653 deltatype = 'prev'
2653 deltatype = 'prev'
2654
2654
2655 chain = r._deltachain(rev)[0]
2655 chain = r._deltachain(rev)[0]
2656 for iterrev in chain:
2656 for iterrev in chain:
2657 e = index[iterrev]
2657 e = index[iterrev]
2658 chainsize += e[1]
2658 chainsize += e[1]
2659
2659
2660 return compsize, uncompsize, deltatype, chain, chainsize
2660 return compsize, uncompsize, deltatype, chain, chainsize
2661
2661
2662 fm = ui.formatter('debugdeltachain', opts)
2662 fm = ui.formatter('debugdeltachain', opts)
2663
2663
2664 fm.plain(' rev chain# chainlen prev delta '
2664 fm.plain(' rev chain# chainlen prev delta '
2665 'size rawsize chainsize ratio lindist extradist '
2665 'size rawsize chainsize ratio lindist extradist '
2666 'extraratio\n')
2666 'extraratio\n')
2667
2667
2668 chainbases = {}
2668 chainbases = {}
2669 for rev in r:
2669 for rev in r:
2670 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
2670 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
2671 chainbase = chain[0]
2671 chainbase = chain[0]
2672 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
2672 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
2673 basestart = r.start(chainbase)
2673 basestart = r.start(chainbase)
2674 revstart = r.start(rev)
2674 revstart = r.start(rev)
2675 lineardist = revstart + comp - basestart
2675 lineardist = revstart + comp - basestart
2676 extradist = lineardist - chainsize
2676 extradist = lineardist - chainsize
2677 try:
2677 try:
2678 prevrev = chain[-2]
2678 prevrev = chain[-2]
2679 except IndexError:
2679 except IndexError:
2680 prevrev = -1
2680 prevrev = -1
2681
2681
2682 chainratio = float(chainsize) / float(uncomp)
2682 chainratio = float(chainsize) / float(uncomp)
2683 extraratio = float(extradist) / float(chainsize)
2683 extraratio = float(extradist) / float(chainsize)
2684
2684
2685 fm.startitem()
2685 fm.startitem()
2686 fm.write('rev chainid chainlen prevrev deltatype compsize '
2686 fm.write('rev chainid chainlen prevrev deltatype compsize '
2687 'uncompsize chainsize chainratio lindist extradist '
2687 'uncompsize chainsize chainratio lindist extradist '
2688 'extraratio',
2688 'extraratio',
2689 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f\n',
2689 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f\n',
2690 rev, chainid, len(chain), prevrev, deltatype, comp,
2690 rev, chainid, len(chain), prevrev, deltatype, comp,
2691 uncomp, chainsize, chainratio, lineardist, extradist,
2691 uncomp, chainsize, chainratio, lineardist, extradist,
2692 extraratio,
2692 extraratio,
2693 rev=rev, chainid=chainid, chainlen=len(chain),
2693 rev=rev, chainid=chainid, chainlen=len(chain),
2694 prevrev=prevrev, deltatype=deltatype, compsize=comp,
2694 prevrev=prevrev, deltatype=deltatype, compsize=comp,
2695 uncompsize=uncomp, chainsize=chainsize,
2695 uncompsize=uncomp, chainsize=chainsize,
2696 chainratio=chainratio, lindist=lineardist,
2696 chainratio=chainratio, lindist=lineardist,
2697 extradist=extradist, extraratio=extraratio)
2697 extradist=extradist, extraratio=extraratio)
2698
2698
2699 fm.end()
2699 fm.end()
2700
2700
2701 @command('debuginstall', [] + formatteropts, '', norepo=True)
2701 @command('debuginstall', [] + formatteropts, '', norepo=True)
2702 def debuginstall(ui, **opts):
2702 def debuginstall(ui, **opts):
2703 '''test Mercurial installation
2703 '''test Mercurial installation
2704
2704
2705 Returns 0 on success.
2705 Returns 0 on success.
2706 '''
2706 '''
2707
2707
2708 def writetemp(contents):
2708 def writetemp(contents):
2709 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2709 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2710 f = os.fdopen(fd, "wb")
2710 f = os.fdopen(fd, "wb")
2711 f.write(contents)
2711 f.write(contents)
2712 f.close()
2712 f.close()
2713 return name
2713 return name
2714
2714
2715 problems = 0
2715 problems = 0
2716
2716
2717 fm = ui.formatter('debuginstall', opts)
2717 fm = ui.formatter('debuginstall', opts)
2718 fm.startitem()
2718 fm.startitem()
2719
2719
2720 # encoding
2720 # encoding
2721 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
2721 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
2722 err = None
2722 err = None
2723 try:
2723 try:
2724 encoding.fromlocal("test")
2724 encoding.fromlocal("test")
2725 except error.Abort as inst:
2725 except error.Abort as inst:
2726 err = inst
2726 err = inst
2727 problems += 1
2727 problems += 1
2728 fm.condwrite(err, 'encodingerror', _(" %s\n"
2728 fm.condwrite(err, 'encodingerror', _(" %s\n"
2729 " (check that your locale is properly set)\n"), err)
2729 " (check that your locale is properly set)\n"), err)
2730
2730
2731 # Python
2731 # Python
2732 fm.write('pythonexe', _("checking Python executable (%s)\n"),
2732 fm.write('pythonexe', _("checking Python executable (%s)\n"),
2733 sys.executable)
2733 sys.executable)
2734 fm.write('pythonver', _("checking Python version (%s)\n"),
2734 fm.write('pythonver', _("checking Python version (%s)\n"),
2735 ("%s.%s.%s" % sys.version_info[:3]))
2735 ("%s.%s.%s" % sys.version_info[:3]))
2736 fm.write('pythonlib', _("checking Python lib (%s)...\n"),
2736 fm.write('pythonlib', _("checking Python lib (%s)...\n"),
2737 os.path.dirname(os.__file__))
2737 os.path.dirname(os.__file__))
2738
2738
2739 # hg version
2739 # hg version
2740 hgver = util.version()
2740 hgver = util.version()
2741 fm.write('hgver', _("checking Mercurial version (%s)\n"),
2741 fm.write('hgver', _("checking Mercurial version (%s)\n"),
2742 hgver.split('+')[0])
2742 hgver.split('+')[0])
2743 fm.write('hgverextra', _("checking Mercurial custom build (%s)\n"),
2743 fm.write('hgverextra', _("checking Mercurial custom build (%s)\n"),
2744 '+'.join(hgver.split('+')[1:]))
2744 '+'.join(hgver.split('+')[1:]))
2745
2745
2746 # compiled modules
2746 # compiled modules
2747 fm.write('hgmodulepolicy', _("checking module policy (%s)\n"),
2747 fm.write('hgmodulepolicy', _("checking module policy (%s)\n"),
2748 policy.policy)
2748 policy.policy)
2749 fm.write('hgmodules', _("checking installed modules (%s)...\n"),
2749 fm.write('hgmodules', _("checking installed modules (%s)...\n"),
2750 os.path.dirname(__file__))
2750 os.path.dirname(__file__))
2751
2751
2752 err = None
2752 err = None
2753 try:
2753 try:
2754 from . import (
2754 from . import (
2755 base85,
2755 base85,
2756 bdiff,
2756 bdiff,
2757 mpatch,
2757 mpatch,
2758 osutil,
2758 osutil,
2759 )
2759 )
2760 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2760 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2761 except Exception as inst:
2761 except Exception as inst:
2762 err = inst
2762 err = inst
2763 problems += 1
2763 problems += 1
2764 fm.condwrite(err, 'extensionserror', " %s\n", err)
2764 fm.condwrite(err, 'extensionserror', " %s\n", err)
2765
2765
2766 # templates
2766 # templates
2767 p = templater.templatepaths()
2767 p = templater.templatepaths()
2768 fm.write('templatedirs', 'checking templates (%s)...\n', ' '.join(p))
2768 fm.write('templatedirs', 'checking templates (%s)...\n', ' '.join(p))
2769 fm.condwrite(not p, '', _(" no template directories found\n"))
2769 fm.condwrite(not p, '', _(" no template directories found\n"))
2770 if p:
2770 if p:
2771 m = templater.templatepath("map-cmdline.default")
2771 m = templater.templatepath("map-cmdline.default")
2772 if m:
2772 if m:
2773 # template found, check if it is working
2773 # template found, check if it is working
2774 err = None
2774 err = None
2775 try:
2775 try:
2776 templater.templater.frommapfile(m)
2776 templater.templater.frommapfile(m)
2777 except Exception as inst:
2777 except Exception as inst:
2778 err = inst
2778 err = inst
2779 p = None
2779 p = None
2780 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err)
2780 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err)
2781 else:
2781 else:
2782 p = None
2782 p = None
2783 fm.condwrite(p, 'defaulttemplate',
2783 fm.condwrite(p, 'defaulttemplate',
2784 _("checking default template (%s)\n"), m)
2784 _("checking default template (%s)\n"), m)
2785 fm.condwrite(not m, 'defaulttemplatenotfound',
2785 fm.condwrite(not m, 'defaulttemplatenotfound',
2786 _(" template '%s' not found\n"), "default")
2786 _(" template '%s' not found\n"), "default")
2787 if not p:
2787 if not p:
2788 problems += 1
2788 problems += 1
2789 fm.condwrite(not p, '',
2789 fm.condwrite(not p, '',
2790 _(" (templates seem to have been installed incorrectly)\n"))
2790 _(" (templates seem to have been installed incorrectly)\n"))
2791
2791
2792 # editor
2792 # editor
2793 editor = ui.geteditor()
2793 editor = ui.geteditor()
2794 editor = util.expandpath(editor)
2794 editor = util.expandpath(editor)
2795 fm.write('editor', _("checking commit editor... (%s)\n"), editor)
2795 fm.write('editor', _("checking commit editor... (%s)\n"), editor)
2796 cmdpath = util.findexe(shlex.split(editor)[0])
2796 cmdpath = util.findexe(shlex.split(editor)[0])
2797 fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
2797 fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
2798 _(" No commit editor set and can't find %s in PATH\n"
2798 _(" No commit editor set and can't find %s in PATH\n"
2799 " (specify a commit editor in your configuration"
2799 " (specify a commit editor in your configuration"
2800 " file)\n"), not cmdpath and editor == 'vi' and editor)
2800 " file)\n"), not cmdpath and editor == 'vi' and editor)
2801 fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
2801 fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
2802 _(" Can't find editor '%s' in PATH\n"
2802 _(" Can't find editor '%s' in PATH\n"
2803 " (specify a commit editor in your configuration"
2803 " (specify a commit editor in your configuration"
2804 " file)\n"), not cmdpath and editor)
2804 " file)\n"), not cmdpath and editor)
2805 if not cmdpath and editor != 'vi':
2805 if not cmdpath and editor != 'vi':
2806 problems += 1
2806 problems += 1
2807
2807
2808 # check username
2808 # check username
2809 username = None
2809 username = None
2810 err = None
2810 err = None
2811 try:
2811 try:
2812 username = ui.username()
2812 username = ui.username()
2813 except error.Abort as e:
2813 except error.Abort as e:
2814 err = e
2814 err = e
2815 problems += 1
2815 problems += 1
2816
2816
2817 fm.condwrite(username, 'username', _("checking username (%s)\n"), username)
2817 fm.condwrite(username, 'username', _("checking username (%s)\n"), username)
2818 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n"
2818 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n"
2819 " (specify a username in your configuration file)\n"), err)
2819 " (specify a username in your configuration file)\n"), err)
2820
2820
2821 fm.condwrite(not problems, '',
2821 fm.condwrite(not problems, '',
2822 _("no problems detected\n"))
2822 _("no problems detected\n"))
2823 if not problems:
2823 if not problems:
2824 fm.data(problems=problems)
2824 fm.data(problems=problems)
2825 fm.condwrite(problems, 'problems',
2825 fm.condwrite(problems, 'problems',
2826 _("%s problems detected,"
2826 _("%s problems detected,"
2827 " please check your install!\n"), problems)
2827 " please check your install!\n"), problems)
2828 fm.end()
2828 fm.end()
2829
2829
2830 return problems
2830 return problems
2831
2831
2832 @command('debugknown', [], _('REPO ID...'), norepo=True)
2832 @command('debugknown', [], _('REPO ID...'), norepo=True)
2833 def debugknown(ui, repopath, *ids, **opts):
2833 def debugknown(ui, repopath, *ids, **opts):
2834 """test whether node ids are known to a repo
2834 """test whether node ids are known to a repo
2835
2835
2836 Every ID must be a full-length hex node id string. Returns a list of 0s
2836 Every ID must be a full-length hex node id string. Returns a list of 0s
2837 and 1s indicating unknown/known.
2837 and 1s indicating unknown/known.
2838 """
2838 """
2839 repo = hg.peer(ui, opts, repopath)
2839 repo = hg.peer(ui, opts, repopath)
2840 if not repo.capable('known'):
2840 if not repo.capable('known'):
2841 raise error.Abort("known() not supported by target repository")
2841 raise error.Abort("known() not supported by target repository")
2842 flags = repo.known([bin(s) for s in ids])
2842 flags = repo.known([bin(s) for s in ids])
2843 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2843 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2844
2844
2845 @command('debuglabelcomplete', [], _('LABEL...'))
2845 @command('debuglabelcomplete', [], _('LABEL...'))
2846 def debuglabelcomplete(ui, repo, *args):
2846 def debuglabelcomplete(ui, repo, *args):
2847 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2847 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2848 debugnamecomplete(ui, repo, *args)
2848 debugnamecomplete(ui, repo, *args)
2849
2849
2850 @command('debugmergestate', [], '')
2850 @command('debugmergestate', [], '')
2851 def debugmergestate(ui, repo, *args):
2851 def debugmergestate(ui, repo, *args):
2852 """print merge state
2852 """print merge state
2853
2853
2854 Use --verbose to print out information about whether v1 or v2 merge state
2854 Use --verbose to print out information about whether v1 or v2 merge state
2855 was chosen."""
2855 was chosen."""
2856 def _hashornull(h):
2856 def _hashornull(h):
2857 if h == nullhex:
2857 if h == nullhex:
2858 return 'null'
2858 return 'null'
2859 else:
2859 else:
2860 return h
2860 return h
2861
2861
2862 def printrecords(version):
2862 def printrecords(version):
2863 ui.write(('* version %s records\n') % version)
2863 ui.write(('* version %s records\n') % version)
2864 if version == 1:
2864 if version == 1:
2865 records = v1records
2865 records = v1records
2866 else:
2866 else:
2867 records = v2records
2867 records = v2records
2868
2868
2869 for rtype, record in records:
2869 for rtype, record in records:
2870 # pretty print some record types
2870 # pretty print some record types
2871 if rtype == 'L':
2871 if rtype == 'L':
2872 ui.write(('local: %s\n') % record)
2872 ui.write(('local: %s\n') % record)
2873 elif rtype == 'O':
2873 elif rtype == 'O':
2874 ui.write(('other: %s\n') % record)
2874 ui.write(('other: %s\n') % record)
2875 elif rtype == 'm':
2875 elif rtype == 'm':
2876 driver, mdstate = record.split('\0', 1)
2876 driver, mdstate = record.split('\0', 1)
2877 ui.write(('merge driver: %s (state "%s")\n')
2877 ui.write(('merge driver: %s (state "%s")\n')
2878 % (driver, mdstate))
2878 % (driver, mdstate))
2879 elif rtype in 'FDC':
2879 elif rtype in 'FDC':
2880 r = record.split('\0')
2880 r = record.split('\0')
2881 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2881 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2882 if version == 1:
2882 if version == 1:
2883 onode = 'not stored in v1 format'
2883 onode = 'not stored in v1 format'
2884 flags = r[7]
2884 flags = r[7]
2885 else:
2885 else:
2886 onode, flags = r[7:9]
2886 onode, flags = r[7:9]
2887 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2887 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2888 % (f, rtype, state, _hashornull(hash)))
2888 % (f, rtype, state, _hashornull(hash)))
2889 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2889 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2890 ui.write((' ancestor path: %s (node %s)\n')
2890 ui.write((' ancestor path: %s (node %s)\n')
2891 % (afile, _hashornull(anode)))
2891 % (afile, _hashornull(anode)))
2892 ui.write((' other path: %s (node %s)\n')
2892 ui.write((' other path: %s (node %s)\n')
2893 % (ofile, _hashornull(onode)))
2893 % (ofile, _hashornull(onode)))
2894 elif rtype == 'f':
2894 elif rtype == 'f':
2895 filename, rawextras = record.split('\0', 1)
2895 filename, rawextras = record.split('\0', 1)
2896 extras = rawextras.split('\0')
2896 extras = rawextras.split('\0')
2897 i = 0
2897 i = 0
2898 extrastrings = []
2898 extrastrings = []
2899 while i < len(extras):
2899 while i < len(extras):
2900 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
2900 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
2901 i += 2
2901 i += 2
2902
2902
2903 ui.write(('file extras: %s (%s)\n')
2903 ui.write(('file extras: %s (%s)\n')
2904 % (filename, ', '.join(extrastrings)))
2904 % (filename, ', '.join(extrastrings)))
2905 elif rtype == 'l':
2905 elif rtype == 'l':
2906 labels = record.split('\0', 2)
2906 labels = record.split('\0', 2)
2907 labels = [l for l in labels if len(l) > 0]
2907 labels = [l for l in labels if len(l) > 0]
2908 ui.write(('labels:\n'))
2908 ui.write(('labels:\n'))
2909 ui.write((' local: %s\n' % labels[0]))
2909 ui.write((' local: %s\n' % labels[0]))
2910 ui.write((' other: %s\n' % labels[1]))
2910 ui.write((' other: %s\n' % labels[1]))
2911 if len(labels) > 2:
2911 if len(labels) > 2:
2912 ui.write((' base: %s\n' % labels[2]))
2912 ui.write((' base: %s\n' % labels[2]))
2913 else:
2913 else:
2914 ui.write(('unrecognized entry: %s\t%s\n')
2914 ui.write(('unrecognized entry: %s\t%s\n')
2915 % (rtype, record.replace('\0', '\t')))
2915 % (rtype, record.replace('\0', '\t')))
2916
2916
2917 # Avoid mergestate.read() since it may raise an exception for unsupported
2917 # Avoid mergestate.read() since it may raise an exception for unsupported
2918 # merge state records. We shouldn't be doing this, but this is OK since this
2918 # merge state records. We shouldn't be doing this, but this is OK since this
2919 # command is pretty low-level.
2919 # command is pretty low-level.
2920 ms = mergemod.mergestate(repo)
2920 ms = mergemod.mergestate(repo)
2921
2921
2922 # sort so that reasonable information is on top
2922 # sort so that reasonable information is on top
2923 v1records = ms._readrecordsv1()
2923 v1records = ms._readrecordsv1()
2924 v2records = ms._readrecordsv2()
2924 v2records = ms._readrecordsv2()
2925 order = 'LOml'
2925 order = 'LOml'
2926 def key(r):
2926 def key(r):
2927 idx = order.find(r[0])
2927 idx = order.find(r[0])
2928 if idx == -1:
2928 if idx == -1:
2929 return (1, r[1])
2929 return (1, r[1])
2930 else:
2930 else:
2931 return (0, idx)
2931 return (0, idx)
2932 v1records.sort(key=key)
2932 v1records.sort(key=key)
2933 v2records.sort(key=key)
2933 v2records.sort(key=key)
2934
2934
2935 if not v1records and not v2records:
2935 if not v1records and not v2records:
2936 ui.write(('no merge state found\n'))
2936 ui.write(('no merge state found\n'))
2937 elif not v2records:
2937 elif not v2records:
2938 ui.note(('no version 2 merge state\n'))
2938 ui.note(('no version 2 merge state\n'))
2939 printrecords(1)
2939 printrecords(1)
2940 elif ms._v1v2match(v1records, v2records):
2940 elif ms._v1v2match(v1records, v2records):
2941 ui.note(('v1 and v2 states match: using v2\n'))
2941 ui.note(('v1 and v2 states match: using v2\n'))
2942 printrecords(2)
2942 printrecords(2)
2943 else:
2943 else:
2944 ui.note(('v1 and v2 states mismatch: using v1\n'))
2944 ui.note(('v1 and v2 states mismatch: using v1\n'))
2945 printrecords(1)
2945 printrecords(1)
2946 if ui.verbose:
2946 if ui.verbose:
2947 printrecords(2)
2947 printrecords(2)
2948
2948
2949 @command('debugnamecomplete', [], _('NAME...'))
2949 @command('debugnamecomplete', [], _('NAME...'))
2950 def debugnamecomplete(ui, repo, *args):
2950 def debugnamecomplete(ui, repo, *args):
2951 '''complete "names" - tags, open branch names, bookmark names'''
2951 '''complete "names" - tags, open branch names, bookmark names'''
2952
2952
2953 names = set()
2953 names = set()
2954 # since we previously only listed open branches, we will handle that
2954 # since we previously only listed open branches, we will handle that
2955 # specially (after this for loop)
2955 # specially (after this for loop)
2956 for name, ns in repo.names.iteritems():
2956 for name, ns in repo.names.iteritems():
2957 if name != 'branches':
2957 if name != 'branches':
2958 names.update(ns.listnames(repo))
2958 names.update(ns.listnames(repo))
2959 names.update(tag for (tag, heads, tip, closed)
2959 names.update(tag for (tag, heads, tip, closed)
2960 in repo.branchmap().iterbranches() if not closed)
2960 in repo.branchmap().iterbranches() if not closed)
2961 completions = set()
2961 completions = set()
2962 if not args:
2962 if not args:
2963 args = ['']
2963 args = ['']
2964 for a in args:
2964 for a in args:
2965 completions.update(n for n in names if n.startswith(a))
2965 completions.update(n for n in names if n.startswith(a))
2966 ui.write('\n'.join(sorted(completions)))
2966 ui.write('\n'.join(sorted(completions)))
2967 ui.write('\n')
2967 ui.write('\n')
2968
2968
2969 @command('debuglocks',
2969 @command('debuglocks',
2970 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2970 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2971 ('W', 'force-wlock', None,
2971 ('W', 'force-wlock', None,
2972 _('free the working state lock (DANGEROUS)'))],
2972 _('free the working state lock (DANGEROUS)'))],
2973 _('[OPTION]...'))
2973 _('[OPTION]...'))
2974 def debuglocks(ui, repo, **opts):
2974 def debuglocks(ui, repo, **opts):
2975 """show or modify state of locks
2975 """show or modify state of locks
2976
2976
2977 By default, this command will show which locks are held. This
2977 By default, this command will show which locks are held. This
2978 includes the user and process holding the lock, the amount of time
2978 includes the user and process holding the lock, the amount of time
2979 the lock has been held, and the machine name where the process is
2979 the lock has been held, and the machine name where the process is
2980 running if it's not local.
2980 running if it's not local.
2981
2981
2982 Locks protect the integrity of Mercurial's data, so should be
2982 Locks protect the integrity of Mercurial's data, so should be
2983 treated with care. System crashes or other interruptions may cause
2983 treated with care. System crashes or other interruptions may cause
2984 locks to not be properly released, though Mercurial will usually
2984 locks to not be properly released, though Mercurial will usually
2985 detect and remove such stale locks automatically.
2985 detect and remove such stale locks automatically.
2986
2986
2987 However, detecting stale locks may not always be possible (for
2987 However, detecting stale locks may not always be possible (for
2988 instance, on a shared filesystem). Removing locks may also be
2988 instance, on a shared filesystem). Removing locks may also be
2989 blocked by filesystem permissions.
2989 blocked by filesystem permissions.
2990
2990
2991 Returns 0 if no locks are held.
2991 Returns 0 if no locks are held.
2992
2992
2993 """
2993 """
2994
2994
2995 if opts.get('force_lock'):
2995 if opts.get('force_lock'):
2996 repo.svfs.unlink('lock')
2996 repo.svfs.unlink('lock')
2997 if opts.get('force_wlock'):
2997 if opts.get('force_wlock'):
2998 repo.vfs.unlink('wlock')
2998 repo.vfs.unlink('wlock')
2999 if opts.get('force_lock') or opts.get('force_lock'):
2999 if opts.get('force_lock') or opts.get('force_lock'):
3000 return 0
3000 return 0
3001
3001
3002 now = time.time()
3002 now = time.time()
3003 held = 0
3003 held = 0
3004
3004
3005 def report(vfs, name, method):
3005 def report(vfs, name, method):
3006 # this causes stale locks to get reaped for more accurate reporting
3006 # this causes stale locks to get reaped for more accurate reporting
3007 try:
3007 try:
3008 l = method(False)
3008 l = method(False)
3009 except error.LockHeld:
3009 except error.LockHeld:
3010 l = None
3010 l = None
3011
3011
3012 if l:
3012 if l:
3013 l.release()
3013 l.release()
3014 else:
3014 else:
3015 try:
3015 try:
3016 stat = vfs.lstat(name)
3016 stat = vfs.lstat(name)
3017 age = now - stat.st_mtime
3017 age = now - stat.st_mtime
3018 user = util.username(stat.st_uid)
3018 user = util.username(stat.st_uid)
3019 locker = vfs.readlock(name)
3019 locker = vfs.readlock(name)
3020 if ":" in locker:
3020 if ":" in locker:
3021 host, pid = locker.split(':')
3021 host, pid = locker.split(':')
3022 if host == socket.gethostname():
3022 if host == socket.gethostname():
3023 locker = 'user %s, process %s' % (user, pid)
3023 locker = 'user %s, process %s' % (user, pid)
3024 else:
3024 else:
3025 locker = 'user %s, process %s, host %s' \
3025 locker = 'user %s, process %s, host %s' \
3026 % (user, pid, host)
3026 % (user, pid, host)
3027 ui.write(("%-6s %s (%ds)\n") % (name + ":", locker, age))
3027 ui.write(("%-6s %s (%ds)\n") % (name + ":", locker, age))
3028 return 1
3028 return 1
3029 except OSError as e:
3029 except OSError as e:
3030 if e.errno != errno.ENOENT:
3030 if e.errno != errno.ENOENT:
3031 raise
3031 raise
3032
3032
3033 ui.write(("%-6s free\n") % (name + ":"))
3033 ui.write(("%-6s free\n") % (name + ":"))
3034 return 0
3034 return 0
3035
3035
3036 held += report(repo.svfs, "lock", repo.lock)
3036 held += report(repo.svfs, "lock", repo.lock)
3037 held += report(repo.vfs, "wlock", repo.wlock)
3037 held += report(repo.vfs, "wlock", repo.wlock)
3038
3038
3039 return held
3039 return held
3040
3040
3041 @command('debugobsolete',
3041 @command('debugobsolete',
3042 [('', 'flags', 0, _('markers flag')),
3042 [('', 'flags', 0, _('markers flag')),
3043 ('', 'record-parents', False,
3043 ('', 'record-parents', False,
3044 _('record parent information for the precursor')),
3044 _('record parent information for the precursor')),
3045 ('r', 'rev', [], _('display markers relevant to REV')),
3045 ('r', 'rev', [], _('display markers relevant to REV')),
3046 ('', 'index', False, _('display index of the marker')),
3046 ('', 'index', False, _('display index of the marker')),
3047 ('', 'delete', [], _('delete markers specified by indices')),
3047 ('', 'delete', [], _('delete markers specified by indices')),
3048 ] + commitopts2 + formatteropts,
3048 ] + commitopts2 + formatteropts,
3049 _('[OBSOLETED [REPLACEMENT ...]]'))
3049 _('[OBSOLETED [REPLACEMENT ...]]'))
3050 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
3050 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
3051 """create arbitrary obsolete marker
3051 """create arbitrary obsolete marker
3052
3052
3053 With no arguments, displays the list of obsolescence markers."""
3053 With no arguments, displays the list of obsolescence markers."""
3054
3054
3055 def parsenodeid(s):
3055 def parsenodeid(s):
3056 try:
3056 try:
3057 # We do not use revsingle/revrange functions here to accept
3057 # We do not use revsingle/revrange functions here to accept
3058 # arbitrary node identifiers, possibly not present in the
3058 # arbitrary node identifiers, possibly not present in the
3059 # local repository.
3059 # local repository.
3060 n = bin(s)
3060 n = bin(s)
3061 if len(n) != len(nullid):
3061 if len(n) != len(nullid):
3062 raise TypeError()
3062 raise TypeError()
3063 return n
3063 return n
3064 except TypeError:
3064 except TypeError:
3065 raise error.Abort('changeset references must be full hexadecimal '
3065 raise error.Abort('changeset references must be full hexadecimal '
3066 'node identifiers')
3066 'node identifiers')
3067
3067
3068 if opts.get('delete'):
3068 if opts.get('delete'):
3069 indices = []
3069 indices = []
3070 for v in opts.get('delete'):
3070 for v in opts.get('delete'):
3071 try:
3071 try:
3072 indices.append(int(v))
3072 indices.append(int(v))
3073 except ValueError:
3073 except ValueError:
3074 raise error.Abort(_('invalid index value: %r') % v,
3074 raise error.Abort(_('invalid index value: %r') % v,
3075 hint=_('use integers for indices'))
3075 hint=_('use integers for indices'))
3076
3076
3077 if repo.currenttransaction():
3077 if repo.currenttransaction():
3078 raise error.Abort(_('cannot delete obsmarkers in the middle '
3078 raise error.Abort(_('cannot delete obsmarkers in the middle '
3079 'of transaction.'))
3079 'of transaction.'))
3080
3080
3081 with repo.lock():
3081 with repo.lock():
3082 n = repair.deleteobsmarkers(repo.obsstore, indices)
3082 n = repair.deleteobsmarkers(repo.obsstore, indices)
3083 ui.write(_('deleted %i obsolescense markers\n') % n)
3083 ui.write(_('deleted %i obsolescense markers\n') % n)
3084
3084
3085 return
3085 return
3086
3086
3087 if precursor is not None:
3087 if precursor is not None:
3088 if opts['rev']:
3088 if opts['rev']:
3089 raise error.Abort('cannot select revision when creating marker')
3089 raise error.Abort('cannot select revision when creating marker')
3090 metadata = {}
3090 metadata = {}
3091 metadata['user'] = opts['user'] or ui.username()
3091 metadata['user'] = opts['user'] or ui.username()
3092 succs = tuple(parsenodeid(succ) for succ in successors)
3092 succs = tuple(parsenodeid(succ) for succ in successors)
3093 l = repo.lock()
3093 l = repo.lock()
3094 try:
3094 try:
3095 tr = repo.transaction('debugobsolete')
3095 tr = repo.transaction('debugobsolete')
3096 try:
3096 try:
3097 date = opts.get('date')
3097 date = opts.get('date')
3098 if date:
3098 if date:
3099 date = util.parsedate(date)
3099 date = util.parsedate(date)
3100 else:
3100 else:
3101 date = None
3101 date = None
3102 prec = parsenodeid(precursor)
3102 prec = parsenodeid(precursor)
3103 parents = None
3103 parents = None
3104 if opts['record_parents']:
3104 if opts['record_parents']:
3105 if prec not in repo.unfiltered():
3105 if prec not in repo.unfiltered():
3106 raise error.Abort('cannot used --record-parents on '
3106 raise error.Abort('cannot used --record-parents on '
3107 'unknown changesets')
3107 'unknown changesets')
3108 parents = repo.unfiltered()[prec].parents()
3108 parents = repo.unfiltered()[prec].parents()
3109 parents = tuple(p.node() for p in parents)
3109 parents = tuple(p.node() for p in parents)
3110 repo.obsstore.create(tr, prec, succs, opts['flags'],
3110 repo.obsstore.create(tr, prec, succs, opts['flags'],
3111 parents=parents, date=date,
3111 parents=parents, date=date,
3112 metadata=metadata)
3112 metadata=metadata)
3113 tr.close()
3113 tr.close()
3114 except ValueError as exc:
3114 except ValueError as exc:
3115 raise error.Abort(_('bad obsmarker input: %s') % exc)
3115 raise error.Abort(_('bad obsmarker input: %s') % exc)
3116 finally:
3116 finally:
3117 tr.release()
3117 tr.release()
3118 finally:
3118 finally:
3119 l.release()
3119 l.release()
3120 else:
3120 else:
3121 if opts['rev']:
3121 if opts['rev']:
3122 revs = scmutil.revrange(repo, opts['rev'])
3122 revs = scmutil.revrange(repo, opts['rev'])
3123 nodes = [repo[r].node() for r in revs]
3123 nodes = [repo[r].node() for r in revs]
3124 markers = list(obsolete.getmarkers(repo, nodes=nodes))
3124 markers = list(obsolete.getmarkers(repo, nodes=nodes))
3125 markers.sort(key=lambda x: x._data)
3125 markers.sort(key=lambda x: x._data)
3126 else:
3126 else:
3127 markers = obsolete.getmarkers(repo)
3127 markers = obsolete.getmarkers(repo)
3128
3128
3129 markerstoiter = markers
3129 markerstoiter = markers
3130 isrelevant = lambda m: True
3130 isrelevant = lambda m: True
3131 if opts.get('rev') and opts.get('index'):
3131 if opts.get('rev') and opts.get('index'):
3132 markerstoiter = obsolete.getmarkers(repo)
3132 markerstoiter = obsolete.getmarkers(repo)
3133 markerset = set(markers)
3133 markerset = set(markers)
3134 isrelevant = lambda m: m in markerset
3134 isrelevant = lambda m: m in markerset
3135
3135
3136 fm = ui.formatter('debugobsolete', opts)
3136 fm = ui.formatter('debugobsolete', opts)
3137 for i, m in enumerate(markerstoiter):
3137 for i, m in enumerate(markerstoiter):
3138 if not isrelevant(m):
3138 if not isrelevant(m):
3139 # marker can be irrelevant when we're iterating over a set
3139 # marker can be irrelevant when we're iterating over a set
3140 # of markers (markerstoiter) which is bigger than the set
3140 # of markers (markerstoiter) which is bigger than the set
3141 # of markers we want to display (markers)
3141 # of markers we want to display (markers)
3142 # this can happen if both --index and --rev options are
3142 # this can happen if both --index and --rev options are
3143 # provided and thus we need to iterate over all of the markers
3143 # provided and thus we need to iterate over all of the markers
3144 # to get the correct indices, but only display the ones that
3144 # to get the correct indices, but only display the ones that
3145 # are relevant to --rev value
3145 # are relevant to --rev value
3146 continue
3146 continue
3147 fm.startitem()
3147 fm.startitem()
3148 ind = i if opts.get('index') else None
3148 ind = i if opts.get('index') else None
3149 cmdutil.showmarker(fm, m, index=ind)
3149 cmdutil.showmarker(fm, m, index=ind)
3150 fm.end()
3150 fm.end()
3151
3151
3152 @command('debugpathcomplete',
3152 @command('debugpathcomplete',
3153 [('f', 'full', None, _('complete an entire path')),
3153 [('f', 'full', None, _('complete an entire path')),
3154 ('n', 'normal', None, _('show only normal files')),
3154 ('n', 'normal', None, _('show only normal files')),
3155 ('a', 'added', None, _('show only added files')),
3155 ('a', 'added', None, _('show only added files')),
3156 ('r', 'removed', None, _('show only removed files'))],
3156 ('r', 'removed', None, _('show only removed files'))],
3157 _('FILESPEC...'))
3157 _('FILESPEC...'))
3158 def debugpathcomplete(ui, repo, *specs, **opts):
3158 def debugpathcomplete(ui, repo, *specs, **opts):
3159 '''complete part or all of a tracked path
3159 '''complete part or all of a tracked path
3160
3160
3161 This command supports shells that offer path name completion. It
3161 This command supports shells that offer path name completion. It
3162 currently completes only files already known to the dirstate.
3162 currently completes only files already known to the dirstate.
3163
3163
3164 Completion extends only to the next path segment unless
3164 Completion extends only to the next path segment unless
3165 --full is specified, in which case entire paths are used.'''
3165 --full is specified, in which case entire paths are used.'''
3166
3166
3167 def complete(path, acceptable):
3167 def complete(path, acceptable):
3168 dirstate = repo.dirstate
3168 dirstate = repo.dirstate
3169 spec = os.path.normpath(os.path.join(os.getcwd(), path))
3169 spec = os.path.normpath(os.path.join(os.getcwd(), path))
3170 rootdir = repo.root + os.sep
3170 rootdir = repo.root + os.sep
3171 if spec != repo.root and not spec.startswith(rootdir):
3171 if spec != repo.root and not spec.startswith(rootdir):
3172 return [], []
3172 return [], []
3173 if os.path.isdir(spec):
3173 if os.path.isdir(spec):
3174 spec += '/'
3174 spec += '/'
3175 spec = spec[len(rootdir):]
3175 spec = spec[len(rootdir):]
3176 fixpaths = os.sep != '/'
3176 fixpaths = os.sep != '/'
3177 if fixpaths:
3177 if fixpaths:
3178 spec = spec.replace(os.sep, '/')
3178 spec = spec.replace(os.sep, '/')
3179 speclen = len(spec)
3179 speclen = len(spec)
3180 fullpaths = opts['full']
3180 fullpaths = opts['full']
3181 files, dirs = set(), set()
3181 files, dirs = set(), set()
3182 adddir, addfile = dirs.add, files.add
3182 adddir, addfile = dirs.add, files.add
3183 for f, st in dirstate.iteritems():
3183 for f, st in dirstate.iteritems():
3184 if f.startswith(spec) and st[0] in acceptable:
3184 if f.startswith(spec) and st[0] in acceptable:
3185 if fixpaths:
3185 if fixpaths:
3186 f = f.replace('/', os.sep)
3186 f = f.replace('/', os.sep)
3187 if fullpaths:
3187 if fullpaths:
3188 addfile(f)
3188 addfile(f)
3189 continue
3189 continue
3190 s = f.find(os.sep, speclen)
3190 s = f.find(os.sep, speclen)
3191 if s >= 0:
3191 if s >= 0:
3192 adddir(f[:s])
3192 adddir(f[:s])
3193 else:
3193 else:
3194 addfile(f)
3194 addfile(f)
3195 return files, dirs
3195 return files, dirs
3196
3196
3197 acceptable = ''
3197 acceptable = ''
3198 if opts['normal']:
3198 if opts['normal']:
3199 acceptable += 'nm'
3199 acceptable += 'nm'
3200 if opts['added']:
3200 if opts['added']:
3201 acceptable += 'a'
3201 acceptable += 'a'
3202 if opts['removed']:
3202 if opts['removed']:
3203 acceptable += 'r'
3203 acceptable += 'r'
3204 cwd = repo.getcwd()
3204 cwd = repo.getcwd()
3205 if not specs:
3205 if not specs:
3206 specs = ['.']
3206 specs = ['.']
3207
3207
3208 files, dirs = set(), set()
3208 files, dirs = set(), set()
3209 for spec in specs:
3209 for spec in specs:
3210 f, d = complete(spec, acceptable or 'nmar')
3210 f, d = complete(spec, acceptable or 'nmar')
3211 files.update(f)
3211 files.update(f)
3212 dirs.update(d)
3212 dirs.update(d)
3213 files.update(dirs)
3213 files.update(dirs)
3214 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3214 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3215 ui.write('\n')
3215 ui.write('\n')
3216
3216
3217 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3217 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3218 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3218 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3219 '''access the pushkey key/value protocol
3219 '''access the pushkey key/value protocol
3220
3220
3221 With two args, list the keys in the given namespace.
3221 With two args, list the keys in the given namespace.
3222
3222
3223 With five args, set a key to new if it currently is set to old.
3223 With five args, set a key to new if it currently is set to old.
3224 Reports success or failure.
3224 Reports success or failure.
3225 '''
3225 '''
3226
3226
3227 target = hg.peer(ui, {}, repopath)
3227 target = hg.peer(ui, {}, repopath)
3228 if keyinfo:
3228 if keyinfo:
3229 key, old, new = keyinfo
3229 key, old, new = keyinfo
3230 r = target.pushkey(namespace, key, old, new)
3230 r = target.pushkey(namespace, key, old, new)
3231 ui.status(str(r) + '\n')
3231 ui.status(str(r) + '\n')
3232 return not r
3232 return not r
3233 else:
3233 else:
3234 for k, v in sorted(target.listkeys(namespace).iteritems()):
3234 for k, v in sorted(target.listkeys(namespace).iteritems()):
3235 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3235 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3236 v.encode('string-escape')))
3236 v.encode('string-escape')))
3237
3237
3238 @command('debugpvec', [], _('A B'))
3238 @command('debugpvec', [], _('A B'))
3239 def debugpvec(ui, repo, a, b=None):
3239 def debugpvec(ui, repo, a, b=None):
3240 ca = scmutil.revsingle(repo, a)
3240 ca = scmutil.revsingle(repo, a)
3241 cb = scmutil.revsingle(repo, b)
3241 cb = scmutil.revsingle(repo, b)
3242 pa = pvec.ctxpvec(ca)
3242 pa = pvec.ctxpvec(ca)
3243 pb = pvec.ctxpvec(cb)
3243 pb = pvec.ctxpvec(cb)
3244 if pa == pb:
3244 if pa == pb:
3245 rel = "="
3245 rel = "="
3246 elif pa > pb:
3246 elif pa > pb:
3247 rel = ">"
3247 rel = ">"
3248 elif pa < pb:
3248 elif pa < pb:
3249 rel = "<"
3249 rel = "<"
3250 elif pa | pb:
3250 elif pa | pb:
3251 rel = "|"
3251 rel = "|"
3252 ui.write(_("a: %s\n") % pa)
3252 ui.write(_("a: %s\n") % pa)
3253 ui.write(_("b: %s\n") % pb)
3253 ui.write(_("b: %s\n") % pb)
3254 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3254 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3255 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3255 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3256 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3256 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3257 pa.distance(pb), rel))
3257 pa.distance(pb), rel))
3258
3258
3259 @command('debugrebuilddirstate|debugrebuildstate',
3259 @command('debugrebuilddirstate|debugrebuildstate',
3260 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3260 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3261 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3261 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3262 'the working copy parent')),
3262 'the working copy parent')),
3263 ],
3263 ],
3264 _('[-r REV]'))
3264 _('[-r REV]'))
3265 def debugrebuilddirstate(ui, repo, rev, **opts):
3265 def debugrebuilddirstate(ui, repo, rev, **opts):
3266 """rebuild the dirstate as it would look like for the given revision
3266 """rebuild the dirstate as it would look like for the given revision
3267
3267
3268 If no revision is specified the first current parent will be used.
3268 If no revision is specified the first current parent will be used.
3269
3269
3270 The dirstate will be set to the files of the given revision.
3270 The dirstate will be set to the files of the given revision.
3271 The actual working directory content or existing dirstate
3271 The actual working directory content or existing dirstate
3272 information such as adds or removes is not considered.
3272 information such as adds or removes is not considered.
3273
3273
3274 ``minimal`` will only rebuild the dirstate status for files that claim to be
3274 ``minimal`` will only rebuild the dirstate status for files that claim to be
3275 tracked but are not in the parent manifest, or that exist in the parent
3275 tracked but are not in the parent manifest, or that exist in the parent
3276 manifest but are not in the dirstate. It will not change adds, removes, or
3276 manifest but are not in the dirstate. It will not change adds, removes, or
3277 modified files that are in the working copy parent.
3277 modified files that are in the working copy parent.
3278
3278
3279 One use of this command is to make the next :hg:`status` invocation
3279 One use of this command is to make the next :hg:`status` invocation
3280 check the actual file content.
3280 check the actual file content.
3281 """
3281 """
3282 ctx = scmutil.revsingle(repo, rev)
3282 ctx = scmutil.revsingle(repo, rev)
3283 with repo.wlock():
3283 with repo.wlock():
3284 dirstate = repo.dirstate
3284 dirstate = repo.dirstate
3285 changedfiles = None
3285 changedfiles = None
3286 # See command doc for what minimal does.
3286 # See command doc for what minimal does.
3287 if opts.get('minimal'):
3287 if opts.get('minimal'):
3288 manifestfiles = set(ctx.manifest().keys())
3288 manifestfiles = set(ctx.manifest().keys())
3289 dirstatefiles = set(dirstate)
3289 dirstatefiles = set(dirstate)
3290 manifestonly = manifestfiles - dirstatefiles
3290 manifestonly = manifestfiles - dirstatefiles
3291 dsonly = dirstatefiles - manifestfiles
3291 dsonly = dirstatefiles - manifestfiles
3292 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3292 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3293 changedfiles = manifestonly | dsnotadded
3293 changedfiles = manifestonly | dsnotadded
3294
3294
3295 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3295 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3296
3296
3297 @command('debugrebuildfncache', [], '')
3297 @command('debugrebuildfncache', [], '')
3298 def debugrebuildfncache(ui, repo):
3298 def debugrebuildfncache(ui, repo):
3299 """rebuild the fncache file"""
3299 """rebuild the fncache file"""
3300 repair.rebuildfncache(ui, repo)
3300 repair.rebuildfncache(ui, repo)
3301
3301
3302 @command('debugrename',
3302 @command('debugrename',
3303 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3303 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3304 _('[-r REV] FILE'))
3304 _('[-r REV] FILE'))
3305 def debugrename(ui, repo, file1, *pats, **opts):
3305 def debugrename(ui, repo, file1, *pats, **opts):
3306 """dump rename information"""
3306 """dump rename information"""
3307
3307
3308 ctx = scmutil.revsingle(repo, opts.get('rev'))
3308 ctx = scmutil.revsingle(repo, opts.get('rev'))
3309 m = scmutil.match(ctx, (file1,) + pats, opts)
3309 m = scmutil.match(ctx, (file1,) + pats, opts)
3310 for abs in ctx.walk(m):
3310 for abs in ctx.walk(m):
3311 fctx = ctx[abs]
3311 fctx = ctx[abs]
3312 o = fctx.filelog().renamed(fctx.filenode())
3312 o = fctx.filelog().renamed(fctx.filenode())
3313 rel = m.rel(abs)
3313 rel = m.rel(abs)
3314 if o:
3314 if o:
3315 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3315 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3316 else:
3316 else:
3317 ui.write(_("%s not renamed\n") % rel)
3317 ui.write(_("%s not renamed\n") % rel)
3318
3318
3319 @command('debugrevlog', debugrevlogopts +
3319 @command('debugrevlog', debugrevlogopts +
3320 [('d', 'dump', False, _('dump index data'))],
3320 [('d', 'dump', False, _('dump index data'))],
3321 _('-c|-m|FILE'),
3321 _('-c|-m|FILE'),
3322 optionalrepo=True)
3322 optionalrepo=True)
3323 def debugrevlog(ui, repo, file_=None, **opts):
3323 def debugrevlog(ui, repo, file_=None, **opts):
3324 """show data and statistics about a revlog"""
3324 """show data and statistics about a revlog"""
3325 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3325 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3326
3326
3327 if opts.get("dump"):
3327 if opts.get("dump"):
3328 numrevs = len(r)
3328 numrevs = len(r)
3329 ui.write(("# rev p1rev p2rev start end deltastart base p1 p2"
3329 ui.write(("# rev p1rev p2rev start end deltastart base p1 p2"
3330 " rawsize totalsize compression heads chainlen\n"))
3330 " rawsize totalsize compression heads chainlen\n"))
3331 ts = 0
3331 ts = 0
3332 heads = set()
3332 heads = set()
3333
3333
3334 for rev in xrange(numrevs):
3334 for rev in xrange(numrevs):
3335 dbase = r.deltaparent(rev)
3335 dbase = r.deltaparent(rev)
3336 if dbase == -1:
3336 if dbase == -1:
3337 dbase = rev
3337 dbase = rev
3338 cbase = r.chainbase(rev)
3338 cbase = r.chainbase(rev)
3339 clen = r.chainlen(rev)
3339 clen = r.chainlen(rev)
3340 p1, p2 = r.parentrevs(rev)
3340 p1, p2 = r.parentrevs(rev)
3341 rs = r.rawsize(rev)
3341 rs = r.rawsize(rev)
3342 ts = ts + rs
3342 ts = ts + rs
3343 heads -= set(r.parentrevs(rev))
3343 heads -= set(r.parentrevs(rev))
3344 heads.add(rev)
3344 heads.add(rev)
3345 try:
3345 try:
3346 compression = ts / r.end(rev)
3346 compression = ts / r.end(rev)
3347 except ZeroDivisionError:
3347 except ZeroDivisionError:
3348 compression = 0
3348 compression = 0
3349 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3349 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3350 "%11d %5d %8d\n" %
3350 "%11d %5d %8d\n" %
3351 (rev, p1, p2, r.start(rev), r.end(rev),
3351 (rev, p1, p2, r.start(rev), r.end(rev),
3352 r.start(dbase), r.start(cbase),
3352 r.start(dbase), r.start(cbase),
3353 r.start(p1), r.start(p2),
3353 r.start(p1), r.start(p2),
3354 rs, ts, compression, len(heads), clen))
3354 rs, ts, compression, len(heads), clen))
3355 return 0
3355 return 0
3356
3356
3357 v = r.version
3357 v = r.version
3358 format = v & 0xFFFF
3358 format = v & 0xFFFF
3359 flags = []
3359 flags = []
3360 gdelta = False
3360 gdelta = False
3361 if v & revlog.REVLOGNGINLINEDATA:
3361 if v & revlog.REVLOGNGINLINEDATA:
3362 flags.append('inline')
3362 flags.append('inline')
3363 if v & revlog.REVLOGGENERALDELTA:
3363 if v & revlog.REVLOGGENERALDELTA:
3364 gdelta = True
3364 gdelta = True
3365 flags.append('generaldelta')
3365 flags.append('generaldelta')
3366 if not flags:
3366 if not flags:
3367 flags = ['(none)']
3367 flags = ['(none)']
3368
3368
3369 nummerges = 0
3369 nummerges = 0
3370 numfull = 0
3370 numfull = 0
3371 numprev = 0
3371 numprev = 0
3372 nump1 = 0
3372 nump1 = 0
3373 nump2 = 0
3373 nump2 = 0
3374 numother = 0
3374 numother = 0
3375 nump1prev = 0
3375 nump1prev = 0
3376 nump2prev = 0
3376 nump2prev = 0
3377 chainlengths = []
3377 chainlengths = []
3378
3378
3379 datasize = [None, 0, 0L]
3379 datasize = [None, 0, 0L]
3380 fullsize = [None, 0, 0L]
3380 fullsize = [None, 0, 0L]
3381 deltasize = [None, 0, 0L]
3381 deltasize = [None, 0, 0L]
3382
3382
3383 def addsize(size, l):
3383 def addsize(size, l):
3384 if l[0] is None or size < l[0]:
3384 if l[0] is None or size < l[0]:
3385 l[0] = size
3385 l[0] = size
3386 if size > l[1]:
3386 if size > l[1]:
3387 l[1] = size
3387 l[1] = size
3388 l[2] += size
3388 l[2] += size
3389
3389
3390 numrevs = len(r)
3390 numrevs = len(r)
3391 for rev in xrange(numrevs):
3391 for rev in xrange(numrevs):
3392 p1, p2 = r.parentrevs(rev)
3392 p1, p2 = r.parentrevs(rev)
3393 delta = r.deltaparent(rev)
3393 delta = r.deltaparent(rev)
3394 if format > 0:
3394 if format > 0:
3395 addsize(r.rawsize(rev), datasize)
3395 addsize(r.rawsize(rev), datasize)
3396 if p2 != nullrev:
3396 if p2 != nullrev:
3397 nummerges += 1
3397 nummerges += 1
3398 size = r.length(rev)
3398 size = r.length(rev)
3399 if delta == nullrev:
3399 if delta == nullrev:
3400 chainlengths.append(0)
3400 chainlengths.append(0)
3401 numfull += 1
3401 numfull += 1
3402 addsize(size, fullsize)
3402 addsize(size, fullsize)
3403 else:
3403 else:
3404 chainlengths.append(chainlengths[delta] + 1)
3404 chainlengths.append(chainlengths[delta] + 1)
3405 addsize(size, deltasize)
3405 addsize(size, deltasize)
3406 if delta == rev - 1:
3406 if delta == rev - 1:
3407 numprev += 1
3407 numprev += 1
3408 if delta == p1:
3408 if delta == p1:
3409 nump1prev += 1
3409 nump1prev += 1
3410 elif delta == p2:
3410 elif delta == p2:
3411 nump2prev += 1
3411 nump2prev += 1
3412 elif delta == p1:
3412 elif delta == p1:
3413 nump1 += 1
3413 nump1 += 1
3414 elif delta == p2:
3414 elif delta == p2:
3415 nump2 += 1
3415 nump2 += 1
3416 elif delta != nullrev:
3416 elif delta != nullrev:
3417 numother += 1
3417 numother += 1
3418
3418
3419 # Adjust size min value for empty cases
3419 # Adjust size min value for empty cases
3420 for size in (datasize, fullsize, deltasize):
3420 for size in (datasize, fullsize, deltasize):
3421 if size[0] is None:
3421 if size[0] is None:
3422 size[0] = 0
3422 size[0] = 0
3423
3423
3424 numdeltas = numrevs - numfull
3424 numdeltas = numrevs - numfull
3425 numoprev = numprev - nump1prev - nump2prev
3425 numoprev = numprev - nump1prev - nump2prev
3426 totalrawsize = datasize[2]
3426 totalrawsize = datasize[2]
3427 datasize[2] /= numrevs
3427 datasize[2] /= numrevs
3428 fulltotal = fullsize[2]
3428 fulltotal = fullsize[2]
3429 fullsize[2] /= numfull
3429 fullsize[2] /= numfull
3430 deltatotal = deltasize[2]
3430 deltatotal = deltasize[2]
3431 if numrevs - numfull > 0:
3431 if numrevs - numfull > 0:
3432 deltasize[2] /= numrevs - numfull
3432 deltasize[2] /= numrevs - numfull
3433 totalsize = fulltotal + deltatotal
3433 totalsize = fulltotal + deltatotal
3434 avgchainlen = sum(chainlengths) / numrevs
3434 avgchainlen = sum(chainlengths) / numrevs
3435 maxchainlen = max(chainlengths)
3435 maxchainlen = max(chainlengths)
3436 compratio = 1
3436 compratio = 1
3437 if totalsize:
3437 if totalsize:
3438 compratio = totalrawsize / totalsize
3438 compratio = totalrawsize / totalsize
3439
3439
3440 basedfmtstr = '%%%dd\n'
3440 basedfmtstr = '%%%dd\n'
3441 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3441 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3442
3442
3443 def dfmtstr(max):
3443 def dfmtstr(max):
3444 return basedfmtstr % len(str(max))
3444 return basedfmtstr % len(str(max))
3445 def pcfmtstr(max, padding=0):
3445 def pcfmtstr(max, padding=0):
3446 return basepcfmtstr % (len(str(max)), ' ' * padding)
3446 return basepcfmtstr % (len(str(max)), ' ' * padding)
3447
3447
3448 def pcfmt(value, total):
3448 def pcfmt(value, total):
3449 if total:
3449 if total:
3450 return (value, 100 * float(value) / total)
3450 return (value, 100 * float(value) / total)
3451 else:
3451 else:
3452 return value, 100.0
3452 return value, 100.0
3453
3453
3454 ui.write(('format : %d\n') % format)
3454 ui.write(('format : %d\n') % format)
3455 ui.write(('flags : %s\n') % ', '.join(flags))
3455 ui.write(('flags : %s\n') % ', '.join(flags))
3456
3456
3457 ui.write('\n')
3457 ui.write('\n')
3458 fmt = pcfmtstr(totalsize)
3458 fmt = pcfmtstr(totalsize)
3459 fmt2 = dfmtstr(totalsize)
3459 fmt2 = dfmtstr(totalsize)
3460 ui.write(('revisions : ') + fmt2 % numrevs)
3460 ui.write(('revisions : ') + fmt2 % numrevs)
3461 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3461 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3462 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3462 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3463 ui.write(('revisions : ') + fmt2 % numrevs)
3463 ui.write(('revisions : ') + fmt2 % numrevs)
3464 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3464 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3465 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3465 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3466 ui.write(('revision size : ') + fmt2 % totalsize)
3466 ui.write(('revision size : ') + fmt2 % totalsize)
3467 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3467 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3468 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3468 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3469
3469
3470 ui.write('\n')
3470 ui.write('\n')
3471 fmt = dfmtstr(max(avgchainlen, compratio))
3471 fmt = dfmtstr(max(avgchainlen, compratio))
3472 ui.write(('avg chain length : ') + fmt % avgchainlen)
3472 ui.write(('avg chain length : ') + fmt % avgchainlen)
3473 ui.write(('max chain length : ') + fmt % maxchainlen)
3473 ui.write(('max chain length : ') + fmt % maxchainlen)
3474 ui.write(('compression ratio : ') + fmt % compratio)
3474 ui.write(('compression ratio : ') + fmt % compratio)
3475
3475
3476 if format > 0:
3476 if format > 0:
3477 ui.write('\n')
3477 ui.write('\n')
3478 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3478 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3479 % tuple(datasize))
3479 % tuple(datasize))
3480 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3480 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3481 % tuple(fullsize))
3481 % tuple(fullsize))
3482 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3482 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3483 % tuple(deltasize))
3483 % tuple(deltasize))
3484
3484
3485 if numdeltas > 0:
3485 if numdeltas > 0:
3486 ui.write('\n')
3486 ui.write('\n')
3487 fmt = pcfmtstr(numdeltas)
3487 fmt = pcfmtstr(numdeltas)
3488 fmt2 = pcfmtstr(numdeltas, 4)
3488 fmt2 = pcfmtstr(numdeltas, 4)
3489 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3489 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3490 if numprev > 0:
3490 if numprev > 0:
3491 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3491 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3492 numprev))
3492 numprev))
3493 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3493 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3494 numprev))
3494 numprev))
3495 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3495 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3496 numprev))
3496 numprev))
3497 if gdelta:
3497 if gdelta:
3498 ui.write(('deltas against p1 : ')
3498 ui.write(('deltas against p1 : ')
3499 + fmt % pcfmt(nump1, numdeltas))
3499 + fmt % pcfmt(nump1, numdeltas))
3500 ui.write(('deltas against p2 : ')
3500 ui.write(('deltas against p2 : ')
3501 + fmt % pcfmt(nump2, numdeltas))
3501 + fmt % pcfmt(nump2, numdeltas))
3502 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3502 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3503 numdeltas))
3503 numdeltas))
3504
3504
3505 @command('debugrevspec',
3505 @command('debugrevspec',
3506 [('', 'optimize', None, _('print parsed tree after optimizing'))],
3506 [('', 'optimize', None, _('print parsed tree after optimizing'))],
3507 ('REVSPEC'))
3507 ('REVSPEC'))
3508 def debugrevspec(ui, repo, expr, **opts):
3508 def debugrevspec(ui, repo, expr, **opts):
3509 """parse and apply a revision specification
3509 """parse and apply a revision specification
3510
3510
3511 Use --verbose to print the parsed tree before and after aliases
3511 Use --verbose to print the parsed tree before and after aliases
3512 expansion.
3512 expansion.
3513 """
3513 """
3514 if ui.verbose:
3514 if ui.verbose:
3515 tree = revset.parse(expr, lookup=repo.__contains__)
3515 tree = revset.parse(expr, lookup=repo.__contains__)
3516 ui.note(revset.prettyformat(tree), "\n")
3516 ui.note(revset.prettyformat(tree), "\n")
3517 newtree = revset.expandaliases(ui, tree)
3517 newtree = revset.expandaliases(ui, tree)
3518 if newtree != tree:
3518 if newtree != tree:
3519 ui.note(("* expanded:\n"), revset.prettyformat(newtree), "\n")
3519 ui.note(("* expanded:\n"), revset.prettyformat(newtree), "\n")
3520 tree = newtree
3520 tree = newtree
3521 newtree = revset.foldconcat(tree)
3521 newtree = revset.foldconcat(tree)
3522 if newtree != tree:
3522 if newtree != tree:
3523 ui.note(("* concatenated:\n"), revset.prettyformat(newtree), "\n")
3523 ui.note(("* concatenated:\n"), revset.prettyformat(newtree), "\n")
3524 if opts["optimize"]:
3524 if opts["optimize"]:
3525 optimizedtree = revset.optimize(newtree)
3525 optimizedtree = revset.optimize(newtree)
3526 ui.note(("* optimized:\n"),
3526 ui.note(("* optimized:\n"),
3527 revset.prettyformat(optimizedtree), "\n")
3527 revset.prettyformat(optimizedtree), "\n")
3528 func = revset.match(ui, expr, repo)
3528 func = revset.match(ui, expr, repo)
3529 revs = func(repo)
3529 revs = func(repo)
3530 if ui.verbose:
3530 if ui.verbose:
3531 ui.note(("* set:\n"), revset.prettyformatset(revs), "\n")
3531 ui.note(("* set:\n"), revset.prettyformatset(revs), "\n")
3532 for c in revs:
3532 for c in revs:
3533 ui.write("%s\n" % c)
3533 ui.write("%s\n" % c)
3534
3534
3535 @command('debugsetparents', [], _('REV1 [REV2]'))
3535 @command('debugsetparents', [], _('REV1 [REV2]'))
3536 def debugsetparents(ui, repo, rev1, rev2=None):
3536 def debugsetparents(ui, repo, rev1, rev2=None):
3537 """manually set the parents of the current working directory
3537 """manually set the parents of the current working directory
3538
3538
3539 This is useful for writing repository conversion tools, but should
3539 This is useful for writing repository conversion tools, but should
3540 be used with care. For example, neither the working directory nor the
3540 be used with care. For example, neither the working directory nor the
3541 dirstate is updated, so file status may be incorrect after running this
3541 dirstate is updated, so file status may be incorrect after running this
3542 command.
3542 command.
3543
3543
3544 Returns 0 on success.
3544 Returns 0 on success.
3545 """
3545 """
3546
3546
3547 r1 = scmutil.revsingle(repo, rev1).node()
3547 r1 = scmutil.revsingle(repo, rev1).node()
3548 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3548 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3549
3549
3550 with repo.wlock():
3550 with repo.wlock():
3551 repo.setparents(r1, r2)
3551 repo.setparents(r1, r2)
3552
3552
3553 @command('debugdirstate|debugstate',
3553 @command('debugdirstate|debugstate',
3554 [('', 'nodates', None, _('do not display the saved mtime')),
3554 [('', 'nodates', None, _('do not display the saved mtime')),
3555 ('', 'datesort', None, _('sort by saved mtime'))],
3555 ('', 'datesort', None, _('sort by saved mtime'))],
3556 _('[OPTION]...'))
3556 _('[OPTION]...'))
3557 def debugstate(ui, repo, **opts):
3557 def debugstate(ui, repo, **opts):
3558 """show the contents of the current dirstate"""
3558 """show the contents of the current dirstate"""
3559
3559
3560 nodates = opts.get('nodates')
3560 nodates = opts.get('nodates')
3561 datesort = opts.get('datesort')
3561 datesort = opts.get('datesort')
3562
3562
3563 timestr = ""
3563 timestr = ""
3564 if datesort:
3564 if datesort:
3565 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3565 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3566 else:
3566 else:
3567 keyfunc = None # sort by filename
3567 keyfunc = None # sort by filename
3568 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3568 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3569 if ent[3] == -1:
3569 if ent[3] == -1:
3570 timestr = 'unset '
3570 timestr = 'unset '
3571 elif nodates:
3571 elif nodates:
3572 timestr = 'set '
3572 timestr = 'set '
3573 else:
3573 else:
3574 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3574 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3575 time.localtime(ent[3]))
3575 time.localtime(ent[3]))
3576 if ent[1] & 0o20000:
3576 if ent[1] & 0o20000:
3577 mode = 'lnk'
3577 mode = 'lnk'
3578 else:
3578 else:
3579 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3579 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3580 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3580 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3581 for f in repo.dirstate.copies():
3581 for f in repo.dirstate.copies():
3582 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3582 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3583
3583
3584 @command('debugsub',
3584 @command('debugsub',
3585 [('r', 'rev', '',
3585 [('r', 'rev', '',
3586 _('revision to check'), _('REV'))],
3586 _('revision to check'), _('REV'))],
3587 _('[-r REV] [REV]'))
3587 _('[-r REV] [REV]'))
3588 def debugsub(ui, repo, rev=None):
3588 def debugsub(ui, repo, rev=None):
3589 ctx = scmutil.revsingle(repo, rev, None)
3589 ctx = scmutil.revsingle(repo, rev, None)
3590 for k, v in sorted(ctx.substate.items()):
3590 for k, v in sorted(ctx.substate.items()):
3591 ui.write(('path %s\n') % k)
3591 ui.write(('path %s\n') % k)
3592 ui.write((' source %s\n') % v[0])
3592 ui.write((' source %s\n') % v[0])
3593 ui.write((' revision %s\n') % v[1])
3593 ui.write((' revision %s\n') % v[1])
3594
3594
3595 @command('debugsuccessorssets',
3595 @command('debugsuccessorssets',
3596 [],
3596 [],
3597 _('[REV]'))
3597 _('[REV]'))
3598 def debugsuccessorssets(ui, repo, *revs):
3598 def debugsuccessorssets(ui, repo, *revs):
3599 """show set of successors for revision
3599 """show set of successors for revision
3600
3600
3601 A successors set of changeset A is a consistent group of revisions that
3601 A successors set of changeset A is a consistent group of revisions that
3602 succeed A. It contains non-obsolete changesets only.
3602 succeed A. It contains non-obsolete changesets only.
3603
3603
3604 In most cases a changeset A has a single successors set containing a single
3604 In most cases a changeset A has a single successors set containing a single
3605 successor (changeset A replaced by A').
3605 successor (changeset A replaced by A').
3606
3606
3607 A changeset that is made obsolete with no successors are called "pruned".
3607 A changeset that is made obsolete with no successors are called "pruned".
3608 Such changesets have no successors sets at all.
3608 Such changesets have no successors sets at all.
3609
3609
3610 A changeset that has been "split" will have a successors set containing
3610 A changeset that has been "split" will have a successors set containing
3611 more than one successor.
3611 more than one successor.
3612
3612
3613 A changeset that has been rewritten in multiple different ways is called
3613 A changeset that has been rewritten in multiple different ways is called
3614 "divergent". Such changesets have multiple successor sets (each of which
3614 "divergent". Such changesets have multiple successor sets (each of which
3615 may also be split, i.e. have multiple successors).
3615 may also be split, i.e. have multiple successors).
3616
3616
3617 Results are displayed as follows::
3617 Results are displayed as follows::
3618
3618
3619 <rev1>
3619 <rev1>
3620 <successors-1A>
3620 <successors-1A>
3621 <rev2>
3621 <rev2>
3622 <successors-2A>
3622 <successors-2A>
3623 <successors-2B1> <successors-2B2> <successors-2B3>
3623 <successors-2B1> <successors-2B2> <successors-2B3>
3624
3624
3625 Here rev2 has two possible (i.e. divergent) successors sets. The first
3625 Here rev2 has two possible (i.e. divergent) successors sets. The first
3626 holds one element, whereas the second holds three (i.e. the changeset has
3626 holds one element, whereas the second holds three (i.e. the changeset has
3627 been split).
3627 been split).
3628 """
3628 """
3629 # passed to successorssets caching computation from one call to another
3629 # passed to successorssets caching computation from one call to another
3630 cache = {}
3630 cache = {}
3631 ctx2str = str
3631 ctx2str = str
3632 node2str = short
3632 node2str = short
3633 if ui.debug():
3633 if ui.debug():
3634 def ctx2str(ctx):
3634 def ctx2str(ctx):
3635 return ctx.hex()
3635 return ctx.hex()
3636 node2str = hex
3636 node2str = hex
3637 for rev in scmutil.revrange(repo, revs):
3637 for rev in scmutil.revrange(repo, revs):
3638 ctx = repo[rev]
3638 ctx = repo[rev]
3639 ui.write('%s\n'% ctx2str(ctx))
3639 ui.write('%s\n'% ctx2str(ctx))
3640 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3640 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3641 if succsset:
3641 if succsset:
3642 ui.write(' ')
3642 ui.write(' ')
3643 ui.write(node2str(succsset[0]))
3643 ui.write(node2str(succsset[0]))
3644 for node in succsset[1:]:
3644 for node in succsset[1:]:
3645 ui.write(' ')
3645 ui.write(' ')
3646 ui.write(node2str(node))
3646 ui.write(node2str(node))
3647 ui.write('\n')
3647 ui.write('\n')
3648
3648
3649 @command('debugtemplate',
3649 @command('debugtemplate',
3650 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
3650 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
3651 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
3651 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
3652 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
3652 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
3653 optionalrepo=True)
3653 optionalrepo=True)
3654 def debugtemplate(ui, repo, tmpl, **opts):
3654 def debugtemplate(ui, repo, tmpl, **opts):
3655 """parse and apply a template
3655 """parse and apply a template
3656
3656
3657 If -r/--rev is given, the template is processed as a log template and
3657 If -r/--rev is given, the template is processed as a log template and
3658 applied to the given changesets. Otherwise, it is processed as a generic
3658 applied to the given changesets. Otherwise, it is processed as a generic
3659 template.
3659 template.
3660
3660
3661 Use --verbose to print the parsed tree.
3661 Use --verbose to print the parsed tree.
3662 """
3662 """
3663 revs = None
3663 revs = None
3664 if opts['rev']:
3664 if opts['rev']:
3665 if repo is None:
3665 if repo is None:
3666 raise error.RepoError(_('there is no Mercurial repository here '
3666 raise error.RepoError(_('there is no Mercurial repository here '
3667 '(.hg not found)'))
3667 '(.hg not found)'))
3668 revs = scmutil.revrange(repo, opts['rev'])
3668 revs = scmutil.revrange(repo, opts['rev'])
3669
3669
3670 props = {}
3670 props = {}
3671 for d in opts['define']:
3671 for d in opts['define']:
3672 try:
3672 try:
3673 k, v = (e.strip() for e in d.split('=', 1))
3673 k, v = (e.strip() for e in d.split('=', 1))
3674 if not k:
3674 if not k:
3675 raise ValueError
3675 raise ValueError
3676 props[k] = v
3676 props[k] = v
3677 except ValueError:
3677 except ValueError:
3678 raise error.Abort(_('malformed keyword definition: %s') % d)
3678 raise error.Abort(_('malformed keyword definition: %s') % d)
3679
3679
3680 if ui.verbose:
3680 if ui.verbose:
3681 aliases = ui.configitems('templatealias')
3681 aliases = ui.configitems('templatealias')
3682 tree = templater.parse(tmpl)
3682 tree = templater.parse(tmpl)
3683 ui.note(templater.prettyformat(tree), '\n')
3683 ui.note(templater.prettyformat(tree), '\n')
3684 newtree = templater.expandaliases(tree, aliases)
3684 newtree = templater.expandaliases(tree, aliases)
3685 if newtree != tree:
3685 if newtree != tree:
3686 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n')
3686 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n')
3687
3687
3688 mapfile = None
3688 mapfile = None
3689 if revs is None:
3689 if revs is None:
3690 k = 'debugtemplate'
3690 k = 'debugtemplate'
3691 t = formatter.maketemplater(ui, k, tmpl)
3691 t = formatter.maketemplater(ui, k, tmpl)
3692 ui.write(templater.stringify(t(k, **props)))
3692 ui.write(templater.stringify(t(k, **props)))
3693 else:
3693 else:
3694 displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl,
3694 displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl,
3695 mapfile, buffered=False)
3695 mapfile, buffered=False)
3696 for r in revs:
3696 for r in revs:
3697 displayer.show(repo[r], **props)
3697 displayer.show(repo[r], **props)
3698 displayer.close()
3698 displayer.close()
3699
3699
3700 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3700 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3701 def debugwalk(ui, repo, *pats, **opts):
3701 def debugwalk(ui, repo, *pats, **opts):
3702 """show how files match on given patterns"""
3702 """show how files match on given patterns"""
3703 m = scmutil.match(repo[None], pats, opts)
3703 m = scmutil.match(repo[None], pats, opts)
3704 items = list(repo.walk(m))
3704 items = list(repo.walk(m))
3705 if not items:
3705 if not items:
3706 return
3706 return
3707 f = lambda fn: fn
3707 f = lambda fn: fn
3708 if ui.configbool('ui', 'slash') and os.sep != '/':
3708 if ui.configbool('ui', 'slash') and os.sep != '/':
3709 f = lambda fn: util.normpath(fn)
3709 f = lambda fn: util.normpath(fn)
3710 fmt = 'f %%-%ds %%-%ds %%s' % (
3710 fmt = 'f %%-%ds %%-%ds %%s' % (
3711 max([len(abs) for abs in items]),
3711 max([len(abs) for abs in items]),
3712 max([len(m.rel(abs)) for abs in items]))
3712 max([len(m.rel(abs)) for abs in items]))
3713 for abs in items:
3713 for abs in items:
3714 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3714 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3715 ui.write("%s\n" % line.rstrip())
3715 ui.write("%s\n" % line.rstrip())
3716
3716
3717 @command('debugwireargs',
3717 @command('debugwireargs',
3718 [('', 'three', '', 'three'),
3718 [('', 'three', '', 'three'),
3719 ('', 'four', '', 'four'),
3719 ('', 'four', '', 'four'),
3720 ('', 'five', '', 'five'),
3720 ('', 'five', '', 'five'),
3721 ] + remoteopts,
3721 ] + remoteopts,
3722 _('REPO [OPTIONS]... [ONE [TWO]]'),
3722 _('REPO [OPTIONS]... [ONE [TWO]]'),
3723 norepo=True)
3723 norepo=True)
3724 def debugwireargs(ui, repopath, *vals, **opts):
3724 def debugwireargs(ui, repopath, *vals, **opts):
3725 repo = hg.peer(ui, opts, repopath)
3725 repo = hg.peer(ui, opts, repopath)
3726 for opt in remoteopts:
3726 for opt in remoteopts:
3727 del opts[opt[1]]
3727 del opts[opt[1]]
3728 args = {}
3728 args = {}
3729 for k, v in opts.iteritems():
3729 for k, v in opts.iteritems():
3730 if v:
3730 if v:
3731 args[k] = v
3731 args[k] = v
3732 # run twice to check that we don't mess up the stream for the next command
3732 # run twice to check that we don't mess up the stream for the next command
3733 res1 = repo.debugwireargs(*vals, **args)
3733 res1 = repo.debugwireargs(*vals, **args)
3734 res2 = repo.debugwireargs(*vals, **args)
3734 res2 = repo.debugwireargs(*vals, **args)
3735 ui.write("%s\n" % res1)
3735 ui.write("%s\n" % res1)
3736 if res1 != res2:
3736 if res1 != res2:
3737 ui.warn("%s\n" % res2)
3737 ui.warn("%s\n" % res2)
3738
3738
3739 @command('^diff',
3739 @command('^diff',
3740 [('r', 'rev', [], _('revision'), _('REV')),
3740 [('r', 'rev', [], _('revision'), _('REV')),
3741 ('c', 'change', '', _('change made by revision'), _('REV'))
3741 ('c', 'change', '', _('change made by revision'), _('REV'))
3742 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3742 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3743 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3743 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3744 inferrepo=True)
3744 inferrepo=True)
3745 def diff(ui, repo, *pats, **opts):
3745 def diff(ui, repo, *pats, **opts):
3746 """diff repository (or selected files)
3746 """diff repository (or selected files)
3747
3747
3748 Show differences between revisions for the specified files.
3748 Show differences between revisions for the specified files.
3749
3749
3750 Differences between files are shown using the unified diff format.
3750 Differences between files are shown using the unified diff format.
3751
3751
3752 .. note::
3752 .. note::
3753
3753
3754 :hg:`diff` may generate unexpected results for merges, as it will
3754 :hg:`diff` may generate unexpected results for merges, as it will
3755 default to comparing against the working directory's first
3755 default to comparing against the working directory's first
3756 parent changeset if no revisions are specified.
3756 parent changeset if no revisions are specified.
3757
3757
3758 When two revision arguments are given, then changes are shown
3758 When two revision arguments are given, then changes are shown
3759 between those revisions. If only one revision is specified then
3759 between those revisions. If only one revision is specified then
3760 that revision is compared to the working directory, and, when no
3760 that revision is compared to the working directory, and, when no
3761 revisions are specified, the working directory files are compared
3761 revisions are specified, the working directory files are compared
3762 to its first parent.
3762 to its first parent.
3763
3763
3764 Alternatively you can specify -c/--change with a revision to see
3764 Alternatively you can specify -c/--change with a revision to see
3765 the changes in that changeset relative to its first parent.
3765 the changes in that changeset relative to its first parent.
3766
3766
3767 Without the -a/--text option, diff will avoid generating diffs of
3767 Without the -a/--text option, diff will avoid generating diffs of
3768 files it detects as binary. With -a, diff will generate a diff
3768 files it detects as binary. With -a, diff will generate a diff
3769 anyway, probably with undesirable results.
3769 anyway, probably with undesirable results.
3770
3770
3771 Use the -g/--git option to generate diffs in the git extended diff
3771 Use the -g/--git option to generate diffs in the git extended diff
3772 format. For more information, read :hg:`help diffs`.
3772 format. For more information, read :hg:`help diffs`.
3773
3773
3774 .. container:: verbose
3774 .. container:: verbose
3775
3775
3776 Examples:
3776 Examples:
3777
3777
3778 - compare a file in the current working directory to its parent::
3778 - compare a file in the current working directory to its parent::
3779
3779
3780 hg diff foo.c
3780 hg diff foo.c
3781
3781
3782 - compare two historical versions of a directory, with rename info::
3782 - compare two historical versions of a directory, with rename info::
3783
3783
3784 hg diff --git -r 1.0:1.2 lib/
3784 hg diff --git -r 1.0:1.2 lib/
3785
3785
3786 - get change stats relative to the last change on some date::
3786 - get change stats relative to the last change on some date::
3787
3787
3788 hg diff --stat -r "date('may 2')"
3788 hg diff --stat -r "date('may 2')"
3789
3789
3790 - diff all newly-added files that contain a keyword::
3790 - diff all newly-added files that contain a keyword::
3791
3791
3792 hg diff "set:added() and grep(GNU)"
3792 hg diff "set:added() and grep(GNU)"
3793
3793
3794 - compare a revision and its parents::
3794 - compare a revision and its parents::
3795
3795
3796 hg diff -c 9353 # compare against first parent
3796 hg diff -c 9353 # compare against first parent
3797 hg diff -r 9353^:9353 # same using revset syntax
3797 hg diff -r 9353^:9353 # same using revset syntax
3798 hg diff -r 9353^2:9353 # compare against the second parent
3798 hg diff -r 9353^2:9353 # compare against the second parent
3799
3799
3800 Returns 0 on success.
3800 Returns 0 on success.
3801 """
3801 """
3802
3802
3803 revs = opts.get('rev')
3803 revs = opts.get('rev')
3804 change = opts.get('change')
3804 change = opts.get('change')
3805 stat = opts.get('stat')
3805 stat = opts.get('stat')
3806 reverse = opts.get('reverse')
3806 reverse = opts.get('reverse')
3807
3807
3808 if revs and change:
3808 if revs and change:
3809 msg = _('cannot specify --rev and --change at the same time')
3809 msg = _('cannot specify --rev and --change at the same time')
3810 raise error.Abort(msg)
3810 raise error.Abort(msg)
3811 elif change:
3811 elif change:
3812 node2 = scmutil.revsingle(repo, change, None).node()
3812 node2 = scmutil.revsingle(repo, change, None).node()
3813 node1 = repo[node2].p1().node()
3813 node1 = repo[node2].p1().node()
3814 else:
3814 else:
3815 node1, node2 = scmutil.revpair(repo, revs)
3815 node1, node2 = scmutil.revpair(repo, revs)
3816
3816
3817 if reverse:
3817 if reverse:
3818 node1, node2 = node2, node1
3818 node1, node2 = node2, node1
3819
3819
3820 diffopts = patch.diffallopts(ui, opts)
3820 diffopts = patch.diffallopts(ui, opts)
3821 m = scmutil.match(repo[node2], pats, opts)
3821 m = scmutil.match(repo[node2], pats, opts)
3822 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3822 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3823 listsubrepos=opts.get('subrepos'),
3823 listsubrepos=opts.get('subrepos'),
3824 root=opts.get('root'))
3824 root=opts.get('root'))
3825
3825
3826 @command('^export',
3826 @command('^export',
3827 [('o', 'output', '',
3827 [('o', 'output', '',
3828 _('print output to file with formatted name'), _('FORMAT')),
3828 _('print output to file with formatted name'), _('FORMAT')),
3829 ('', 'switch-parent', None, _('diff against the second parent')),
3829 ('', 'switch-parent', None, _('diff against the second parent')),
3830 ('r', 'rev', [], _('revisions to export'), _('REV')),
3830 ('r', 'rev', [], _('revisions to export'), _('REV')),
3831 ] + diffopts,
3831 ] + diffopts,
3832 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3832 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3833 def export(ui, repo, *changesets, **opts):
3833 def export(ui, repo, *changesets, **opts):
3834 """dump the header and diffs for one or more changesets
3834 """dump the header and diffs for one or more changesets
3835
3835
3836 Print the changeset header and diffs for one or more revisions.
3836 Print the changeset header and diffs for one or more revisions.
3837 If no revision is given, the parent of the working directory is used.
3837 If no revision is given, the parent of the working directory is used.
3838
3838
3839 The information shown in the changeset header is: author, date,
3839 The information shown in the changeset header is: author, date,
3840 branch name (if non-default), changeset hash, parent(s) and commit
3840 branch name (if non-default), changeset hash, parent(s) and commit
3841 comment.
3841 comment.
3842
3842
3843 .. note::
3843 .. note::
3844
3844
3845 :hg:`export` may generate unexpected diff output for merge
3845 :hg:`export` may generate unexpected diff output for merge
3846 changesets, as it will compare the merge changeset against its
3846 changesets, as it will compare the merge changeset against its
3847 first parent only.
3847 first parent only.
3848
3848
3849 Output may be to a file, in which case the name of the file is
3849 Output may be to a file, in which case the name of the file is
3850 given using a format string. The formatting rules are as follows:
3850 given using a format string. The formatting rules are as follows:
3851
3851
3852 :``%%``: literal "%" character
3852 :``%%``: literal "%" character
3853 :``%H``: changeset hash (40 hexadecimal digits)
3853 :``%H``: changeset hash (40 hexadecimal digits)
3854 :``%N``: number of patches being generated
3854 :``%N``: number of patches being generated
3855 :``%R``: changeset revision number
3855 :``%R``: changeset revision number
3856 :``%b``: basename of the exporting repository
3856 :``%b``: basename of the exporting repository
3857 :``%h``: short-form changeset hash (12 hexadecimal digits)
3857 :``%h``: short-form changeset hash (12 hexadecimal digits)
3858 :``%m``: first line of the commit message (only alphanumeric characters)
3858 :``%m``: first line of the commit message (only alphanumeric characters)
3859 :``%n``: zero-padded sequence number, starting at 1
3859 :``%n``: zero-padded sequence number, starting at 1
3860 :``%r``: zero-padded changeset revision number
3860 :``%r``: zero-padded changeset revision number
3861
3861
3862 Without the -a/--text option, export will avoid generating diffs
3862 Without the -a/--text option, export will avoid generating diffs
3863 of files it detects as binary. With -a, export will generate a
3863 of files it detects as binary. With -a, export will generate a
3864 diff anyway, probably with undesirable results.
3864 diff anyway, probably with undesirable results.
3865
3865
3866 Use the -g/--git option to generate diffs in the git extended diff
3866 Use the -g/--git option to generate diffs in the git extended diff
3867 format. See :hg:`help diffs` for more information.
3867 format. See :hg:`help diffs` for more information.
3868
3868
3869 With the --switch-parent option, the diff will be against the
3869 With the --switch-parent option, the diff will be against the
3870 second parent. It can be useful to review a merge.
3870 second parent. It can be useful to review a merge.
3871
3871
3872 .. container:: verbose
3872 .. container:: verbose
3873
3873
3874 Examples:
3874 Examples:
3875
3875
3876 - use export and import to transplant a bugfix to the current
3876 - use export and import to transplant a bugfix to the current
3877 branch::
3877 branch::
3878
3878
3879 hg export -r 9353 | hg import -
3879 hg export -r 9353 | hg import -
3880
3880
3881 - export all the changesets between two revisions to a file with
3881 - export all the changesets between two revisions to a file with
3882 rename information::
3882 rename information::
3883
3883
3884 hg export --git -r 123:150 > changes.txt
3884 hg export --git -r 123:150 > changes.txt
3885
3885
3886 - split outgoing changes into a series of patches with
3886 - split outgoing changes into a series of patches with
3887 descriptive names::
3887 descriptive names::
3888
3888
3889 hg export -r "outgoing()" -o "%n-%m.patch"
3889 hg export -r "outgoing()" -o "%n-%m.patch"
3890
3890
3891 Returns 0 on success.
3891 Returns 0 on success.
3892 """
3892 """
3893 changesets += tuple(opts.get('rev', []))
3893 changesets += tuple(opts.get('rev', []))
3894 if not changesets:
3894 if not changesets:
3895 changesets = ['.']
3895 changesets = ['.']
3896 revs = scmutil.revrange(repo, changesets)
3896 revs = scmutil.revrange(repo, changesets)
3897 if not revs:
3897 if not revs:
3898 raise error.Abort(_("export requires at least one changeset"))
3898 raise error.Abort(_("export requires at least one changeset"))
3899 if len(revs) > 1:
3899 if len(revs) > 1:
3900 ui.note(_('exporting patches:\n'))
3900 ui.note(_('exporting patches:\n'))
3901 else:
3901 else:
3902 ui.note(_('exporting patch:\n'))
3902 ui.note(_('exporting patch:\n'))
3903 cmdutil.export(repo, revs, template=opts.get('output'),
3903 cmdutil.export(repo, revs, template=opts.get('output'),
3904 switch_parent=opts.get('switch_parent'),
3904 switch_parent=opts.get('switch_parent'),
3905 opts=patch.diffallopts(ui, opts))
3905 opts=patch.diffallopts(ui, opts))
3906
3906
3907 @command('files',
3907 @command('files',
3908 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3908 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3909 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3909 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3910 ] + walkopts + formatteropts + subrepoopts,
3910 ] + walkopts + formatteropts + subrepoopts,
3911 _('[OPTION]... [PATTERN]...'))
3911 _('[OPTION]... [PATTERN]...'))
3912 def files(ui, repo, *pats, **opts):
3912 def files(ui, repo, *pats, **opts):
3913 """list tracked files
3913 """list tracked files
3914
3914
3915 Print files under Mercurial control in the working directory or
3915 Print files under Mercurial control in the working directory or
3916 specified revision whose names match the given patterns (excluding
3916 specified revision whose names match the given patterns (excluding
3917 removed files).
3917 removed files).
3918
3918
3919 If no patterns are given to match, this command prints the names
3919 If no patterns are given to match, this command prints the names
3920 of all files under Mercurial control in the working directory.
3920 of all files under Mercurial control in the working directory.
3921
3921
3922 .. container:: verbose
3922 .. container:: verbose
3923
3923
3924 Examples:
3924 Examples:
3925
3925
3926 - list all files under the current directory::
3926 - list all files under the current directory::
3927
3927
3928 hg files .
3928 hg files .
3929
3929
3930 - shows sizes and flags for current revision::
3930 - shows sizes and flags for current revision::
3931
3931
3932 hg files -vr .
3932 hg files -vr .
3933
3933
3934 - list all files named README::
3934 - list all files named README::
3935
3935
3936 hg files -I "**/README"
3936 hg files -I "**/README"
3937
3937
3938 - list all binary files::
3938 - list all binary files::
3939
3939
3940 hg files "set:binary()"
3940 hg files "set:binary()"
3941
3941
3942 - find files containing a regular expression::
3942 - find files containing a regular expression::
3943
3943
3944 hg files "set:grep('bob')"
3944 hg files "set:grep('bob')"
3945
3945
3946 - search tracked file contents with xargs and grep::
3946 - search tracked file contents with xargs and grep::
3947
3947
3948 hg files -0 | xargs -0 grep foo
3948 hg files -0 | xargs -0 grep foo
3949
3949
3950 See :hg:`help patterns` and :hg:`help filesets` for more information
3950 See :hg:`help patterns` and :hg:`help filesets` for more information
3951 on specifying file patterns.
3951 on specifying file patterns.
3952
3952
3953 Returns 0 if a match is found, 1 otherwise.
3953 Returns 0 if a match is found, 1 otherwise.
3954
3954
3955 """
3955 """
3956 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3956 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3957
3957
3958 end = '\n'
3958 end = '\n'
3959 if opts.get('print0'):
3959 if opts.get('print0'):
3960 end = '\0'
3960 end = '\0'
3961 fm = ui.formatter('files', opts)
3961 fm = ui.formatter('files', opts)
3962 fmt = '%s' + end
3962 fmt = '%s' + end
3963
3963
3964 m = scmutil.match(ctx, pats, opts)
3964 m = scmutil.match(ctx, pats, opts)
3965 ret = cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3965 ret = cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3966
3966
3967 fm.end()
3967 fm.end()
3968
3968
3969 return ret
3969 return ret
3970
3970
3971 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3971 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3972 def forget(ui, repo, *pats, **opts):
3972 def forget(ui, repo, *pats, **opts):
3973 """forget the specified files on the next commit
3973 """forget the specified files on the next commit
3974
3974
3975 Mark the specified files so they will no longer be tracked
3975 Mark the specified files so they will no longer be tracked
3976 after the next commit.
3976 after the next commit.
3977
3977
3978 This only removes files from the current branch, not from the
3978 This only removes files from the current branch, not from the
3979 entire project history, and it does not delete them from the
3979 entire project history, and it does not delete them from the
3980 working directory.
3980 working directory.
3981
3981
3982 To delete the file from the working directory, see :hg:`remove`.
3982 To delete the file from the working directory, see :hg:`remove`.
3983
3983
3984 To undo a forget before the next commit, see :hg:`add`.
3984 To undo a forget before the next commit, see :hg:`add`.
3985
3985
3986 .. container:: verbose
3986 .. container:: verbose
3987
3987
3988 Examples:
3988 Examples:
3989
3989
3990 - forget newly-added binary files::
3990 - forget newly-added binary files::
3991
3991
3992 hg forget "set:added() and binary()"
3992 hg forget "set:added() and binary()"
3993
3993
3994 - forget files that would be excluded by .hgignore::
3994 - forget files that would be excluded by .hgignore::
3995
3995
3996 hg forget "set:hgignore()"
3996 hg forget "set:hgignore()"
3997
3997
3998 Returns 0 on success.
3998 Returns 0 on success.
3999 """
3999 """
4000
4000
4001 if not pats:
4001 if not pats:
4002 raise error.Abort(_('no files specified'))
4002 raise error.Abort(_('no files specified'))
4003
4003
4004 m = scmutil.match(repo[None], pats, opts)
4004 m = scmutil.match(repo[None], pats, opts)
4005 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
4005 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
4006 return rejected and 1 or 0
4006 return rejected and 1 or 0
4007
4007
4008 @command(
4008 @command(
4009 'graft',
4009 'graft',
4010 [('r', 'rev', [], _('revisions to graft'), _('REV')),
4010 [('r', 'rev', [], _('revisions to graft'), _('REV')),
4011 ('c', 'continue', False, _('resume interrupted graft')),
4011 ('c', 'continue', False, _('resume interrupted graft')),
4012 ('e', 'edit', False, _('invoke editor on commit messages')),
4012 ('e', 'edit', False, _('invoke editor on commit messages')),
4013 ('', 'log', None, _('append graft info to log message')),
4013 ('', 'log', None, _('append graft info to log message')),
4014 ('f', 'force', False, _('force graft')),
4014 ('f', 'force', False, _('force graft')),
4015 ('D', 'currentdate', False,
4015 ('D', 'currentdate', False,
4016 _('record the current date as commit date')),
4016 _('record the current date as commit date')),
4017 ('U', 'currentuser', False,
4017 ('U', 'currentuser', False,
4018 _('record the current user as committer'), _('DATE'))]
4018 _('record the current user as committer'), _('DATE'))]
4019 + commitopts2 + mergetoolopts + dryrunopts,
4019 + commitopts2 + mergetoolopts + dryrunopts,
4020 _('[OPTION]... [-r REV]... REV...'))
4020 _('[OPTION]... [-r REV]... REV...'))
4021 def graft(ui, repo, *revs, **opts):
4021 def graft(ui, repo, *revs, **opts):
4022 '''copy changes from other branches onto the current branch
4022 '''copy changes from other branches onto the current branch
4023
4023
4024 This command uses Mercurial's merge logic to copy individual
4024 This command uses Mercurial's merge logic to copy individual
4025 changes from other branches without merging branches in the
4025 changes from other branches without merging branches in the
4026 history graph. This is sometimes known as 'backporting' or
4026 history graph. This is sometimes known as 'backporting' or
4027 'cherry-picking'. By default, graft will copy user, date, and
4027 'cherry-picking'. By default, graft will copy user, date, and
4028 description from the source changesets.
4028 description from the source changesets.
4029
4029
4030 Changesets that are ancestors of the current revision, that have
4030 Changesets that are ancestors of the current revision, that have
4031 already been grafted, or that are merges will be skipped.
4031 already been grafted, or that are merges will be skipped.
4032
4032
4033 If --log is specified, log messages will have a comment appended
4033 If --log is specified, log messages will have a comment appended
4034 of the form::
4034 of the form::
4035
4035
4036 (grafted from CHANGESETHASH)
4036 (grafted from CHANGESETHASH)
4037
4037
4038 If --force is specified, revisions will be grafted even if they
4038 If --force is specified, revisions will be grafted even if they
4039 are already ancestors of or have been grafted to the destination.
4039 are already ancestors of or have been grafted to the destination.
4040 This is useful when the revisions have since been backed out.
4040 This is useful when the revisions have since been backed out.
4041
4041
4042 If a graft merge results in conflicts, the graft process is
4042 If a graft merge results in conflicts, the graft process is
4043 interrupted so that the current merge can be manually resolved.
4043 interrupted so that the current merge can be manually resolved.
4044 Once all conflicts are addressed, the graft process can be
4044 Once all conflicts are addressed, the graft process can be
4045 continued with the -c/--continue option.
4045 continued with the -c/--continue option.
4046
4046
4047 .. note::
4047 .. note::
4048
4048
4049 The -c/--continue option does not reapply earlier options, except
4049 The -c/--continue option does not reapply earlier options, except
4050 for --force.
4050 for --force.
4051
4051
4052 .. container:: verbose
4052 .. container:: verbose
4053
4053
4054 Examples:
4054 Examples:
4055
4055
4056 - copy a single change to the stable branch and edit its description::
4056 - copy a single change to the stable branch and edit its description::
4057
4057
4058 hg update stable
4058 hg update stable
4059 hg graft --edit 9393
4059 hg graft --edit 9393
4060
4060
4061 - graft a range of changesets with one exception, updating dates::
4061 - graft a range of changesets with one exception, updating dates::
4062
4062
4063 hg graft -D "2085::2093 and not 2091"
4063 hg graft -D "2085::2093 and not 2091"
4064
4064
4065 - continue a graft after resolving conflicts::
4065 - continue a graft after resolving conflicts::
4066
4066
4067 hg graft -c
4067 hg graft -c
4068
4068
4069 - show the source of a grafted changeset::
4069 - show the source of a grafted changeset::
4070
4070
4071 hg log --debug -r .
4071 hg log --debug -r .
4072
4072
4073 - show revisions sorted by date::
4073 - show revisions sorted by date::
4074
4074
4075 hg log -r "sort(all(), date)"
4075 hg log -r "sort(all(), date)"
4076
4076
4077 See :hg:`help revisions` and :hg:`help revsets` for more about
4077 See :hg:`help revisions` and :hg:`help revsets` for more about
4078 specifying revisions.
4078 specifying revisions.
4079
4079
4080 Returns 0 on successful completion.
4080 Returns 0 on successful completion.
4081 '''
4081 '''
4082 with repo.wlock():
4082 with repo.wlock():
4083 return _dograft(ui, repo, *revs, **opts)
4083 return _dograft(ui, repo, *revs, **opts)
4084
4084
4085 def _dograft(ui, repo, *revs, **opts):
4085 def _dograft(ui, repo, *revs, **opts):
4086 if revs and opts.get('rev'):
4086 if revs and opts.get('rev'):
4087 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
4087 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
4088 'revision ordering!\n'))
4088 'revision ordering!\n'))
4089
4089
4090 revs = list(revs)
4090 revs = list(revs)
4091 revs.extend(opts.get('rev'))
4091 revs.extend(opts.get('rev'))
4092
4092
4093 if not opts.get('user') and opts.get('currentuser'):
4093 if not opts.get('user') and opts.get('currentuser'):
4094 opts['user'] = ui.username()
4094 opts['user'] = ui.username()
4095 if not opts.get('date') and opts.get('currentdate'):
4095 if not opts.get('date') and opts.get('currentdate'):
4096 opts['date'] = "%d %d" % util.makedate()
4096 opts['date'] = "%d %d" % util.makedate()
4097
4097
4098 editor = cmdutil.getcommiteditor(editform='graft', **opts)
4098 editor = cmdutil.getcommiteditor(editform='graft', **opts)
4099
4099
4100 cont = False
4100 cont = False
4101 if opts.get('continue'):
4101 if opts.get('continue'):
4102 cont = True
4102 cont = True
4103 if revs:
4103 if revs:
4104 raise error.Abort(_("can't specify --continue and revisions"))
4104 raise error.Abort(_("can't specify --continue and revisions"))
4105 # read in unfinished revisions
4105 # read in unfinished revisions
4106 try:
4106 try:
4107 nodes = repo.vfs.read('graftstate').splitlines()
4107 nodes = repo.vfs.read('graftstate').splitlines()
4108 revs = [repo[node].rev() for node in nodes]
4108 revs = [repo[node].rev() for node in nodes]
4109 except IOError as inst:
4109 except IOError as inst:
4110 if inst.errno != errno.ENOENT:
4110 if inst.errno != errno.ENOENT:
4111 raise
4111 raise
4112 cmdutil.wrongtooltocontinue(repo, _('graft'))
4112 cmdutil.wrongtooltocontinue(repo, _('graft'))
4113 else:
4113 else:
4114 cmdutil.checkunfinished(repo)
4114 cmdutil.checkunfinished(repo)
4115 cmdutil.bailifchanged(repo)
4115 cmdutil.bailifchanged(repo)
4116 if not revs:
4116 if not revs:
4117 raise error.Abort(_('no revisions specified'))
4117 raise error.Abort(_('no revisions specified'))
4118 revs = scmutil.revrange(repo, revs)
4118 revs = scmutil.revrange(repo, revs)
4119
4119
4120 skipped = set()
4120 skipped = set()
4121 # check for merges
4121 # check for merges
4122 for rev in repo.revs('%ld and merge()', revs):
4122 for rev in repo.revs('%ld and merge()', revs):
4123 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
4123 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
4124 skipped.add(rev)
4124 skipped.add(rev)
4125 revs = [r for r in revs if r not in skipped]
4125 revs = [r for r in revs if r not in skipped]
4126 if not revs:
4126 if not revs:
4127 return -1
4127 return -1
4128
4128
4129 # Don't check in the --continue case, in effect retaining --force across
4129 # Don't check in the --continue case, in effect retaining --force across
4130 # --continues. That's because without --force, any revisions we decided to
4130 # --continues. That's because without --force, any revisions we decided to
4131 # skip would have been filtered out here, so they wouldn't have made their
4131 # skip would have been filtered out here, so they wouldn't have made their
4132 # way to the graftstate. With --force, any revisions we would have otherwise
4132 # way to the graftstate. With --force, any revisions we would have otherwise
4133 # skipped would not have been filtered out, and if they hadn't been applied
4133 # skipped would not have been filtered out, and if they hadn't been applied
4134 # already, they'd have been in the graftstate.
4134 # already, they'd have been in the graftstate.
4135 if not (cont or opts.get('force')):
4135 if not (cont or opts.get('force')):
4136 # check for ancestors of dest branch
4136 # check for ancestors of dest branch
4137 crev = repo['.'].rev()
4137 crev = repo['.'].rev()
4138 ancestors = repo.changelog.ancestors([crev], inclusive=True)
4138 ancestors = repo.changelog.ancestors([crev], inclusive=True)
4139 # Cannot use x.remove(y) on smart set, this has to be a list.
4139 # Cannot use x.remove(y) on smart set, this has to be a list.
4140 # XXX make this lazy in the future
4140 # XXX make this lazy in the future
4141 revs = list(revs)
4141 revs = list(revs)
4142 # don't mutate while iterating, create a copy
4142 # don't mutate while iterating, create a copy
4143 for rev in list(revs):
4143 for rev in list(revs):
4144 if rev in ancestors:
4144 if rev in ancestors:
4145 ui.warn(_('skipping ancestor revision %d:%s\n') %
4145 ui.warn(_('skipping ancestor revision %d:%s\n') %
4146 (rev, repo[rev]))
4146 (rev, repo[rev]))
4147 # XXX remove on list is slow
4147 # XXX remove on list is slow
4148 revs.remove(rev)
4148 revs.remove(rev)
4149 if not revs:
4149 if not revs:
4150 return -1
4150 return -1
4151
4151
4152 # analyze revs for earlier grafts
4152 # analyze revs for earlier grafts
4153 ids = {}
4153 ids = {}
4154 for ctx in repo.set("%ld", revs):
4154 for ctx in repo.set("%ld", revs):
4155 ids[ctx.hex()] = ctx.rev()
4155 ids[ctx.hex()] = ctx.rev()
4156 n = ctx.extra().get('source')
4156 n = ctx.extra().get('source')
4157 if n:
4157 if n:
4158 ids[n] = ctx.rev()
4158 ids[n] = ctx.rev()
4159
4159
4160 # check ancestors for earlier grafts
4160 # check ancestors for earlier grafts
4161 ui.debug('scanning for duplicate grafts\n')
4161 ui.debug('scanning for duplicate grafts\n')
4162
4162
4163 for rev in repo.changelog.findmissingrevs(revs, [crev]):
4163 for rev in repo.changelog.findmissingrevs(revs, [crev]):
4164 ctx = repo[rev]
4164 ctx = repo[rev]
4165 n = ctx.extra().get('source')
4165 n = ctx.extra().get('source')
4166 if n in ids:
4166 if n in ids:
4167 try:
4167 try:
4168 r = repo[n].rev()
4168 r = repo[n].rev()
4169 except error.RepoLookupError:
4169 except error.RepoLookupError:
4170 r = None
4170 r = None
4171 if r in revs:
4171 if r in revs:
4172 ui.warn(_('skipping revision %d:%s '
4172 ui.warn(_('skipping revision %d:%s '
4173 '(already grafted to %d:%s)\n')
4173 '(already grafted to %d:%s)\n')
4174 % (r, repo[r], rev, ctx))
4174 % (r, repo[r], rev, ctx))
4175 revs.remove(r)
4175 revs.remove(r)
4176 elif ids[n] in revs:
4176 elif ids[n] in revs:
4177 if r is None:
4177 if r is None:
4178 ui.warn(_('skipping already grafted revision %d:%s '
4178 ui.warn(_('skipping already grafted revision %d:%s '
4179 '(%d:%s also has unknown origin %s)\n')
4179 '(%d:%s also has unknown origin %s)\n')
4180 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
4180 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
4181 else:
4181 else:
4182 ui.warn(_('skipping already grafted revision %d:%s '
4182 ui.warn(_('skipping already grafted revision %d:%s '
4183 '(%d:%s also has origin %d:%s)\n')
4183 '(%d:%s also has origin %d:%s)\n')
4184 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
4184 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
4185 revs.remove(ids[n])
4185 revs.remove(ids[n])
4186 elif ctx.hex() in ids:
4186 elif ctx.hex() in ids:
4187 r = ids[ctx.hex()]
4187 r = ids[ctx.hex()]
4188 ui.warn(_('skipping already grafted revision %d:%s '
4188 ui.warn(_('skipping already grafted revision %d:%s '
4189 '(was grafted from %d:%s)\n') %
4189 '(was grafted from %d:%s)\n') %
4190 (r, repo[r], rev, ctx))
4190 (r, repo[r], rev, ctx))
4191 revs.remove(r)
4191 revs.remove(r)
4192 if not revs:
4192 if not revs:
4193 return -1
4193 return -1
4194
4194
4195 for pos, ctx in enumerate(repo.set("%ld", revs)):
4195 for pos, ctx in enumerate(repo.set("%ld", revs)):
4196 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
4196 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
4197 ctx.description().split('\n', 1)[0])
4197 ctx.description().split('\n', 1)[0])
4198 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
4198 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
4199 if names:
4199 if names:
4200 desc += ' (%s)' % ' '.join(names)
4200 desc += ' (%s)' % ' '.join(names)
4201 ui.status(_('grafting %s\n') % desc)
4201 ui.status(_('grafting %s\n') % desc)
4202 if opts.get('dry_run'):
4202 if opts.get('dry_run'):
4203 continue
4203 continue
4204
4204
4205 source = ctx.extra().get('source')
4205 source = ctx.extra().get('source')
4206 extra = {}
4206 extra = {}
4207 if source:
4207 if source:
4208 extra['source'] = source
4208 extra['source'] = source
4209 extra['intermediate-source'] = ctx.hex()
4209 extra['intermediate-source'] = ctx.hex()
4210 else:
4210 else:
4211 extra['source'] = ctx.hex()
4211 extra['source'] = ctx.hex()
4212 user = ctx.user()
4212 user = ctx.user()
4213 if opts.get('user'):
4213 if opts.get('user'):
4214 user = opts['user']
4214 user = opts['user']
4215 date = ctx.date()
4215 date = ctx.date()
4216 if opts.get('date'):
4216 if opts.get('date'):
4217 date = opts['date']
4217 date = opts['date']
4218 message = ctx.description()
4218 message = ctx.description()
4219 if opts.get('log'):
4219 if opts.get('log'):
4220 message += '\n(grafted from %s)' % ctx.hex()
4220 message += '\n(grafted from %s)' % ctx.hex()
4221
4221
4222 # we don't merge the first commit when continuing
4222 # we don't merge the first commit when continuing
4223 if not cont:
4223 if not cont:
4224 # perform the graft merge with p1(rev) as 'ancestor'
4224 # perform the graft merge with p1(rev) as 'ancestor'
4225 try:
4225 try:
4226 # ui.forcemerge is an internal variable, do not document
4226 # ui.forcemerge is an internal variable, do not document
4227 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4227 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4228 'graft')
4228 'graft')
4229 stats = mergemod.graft(repo, ctx, ctx.p1(),
4229 stats = mergemod.graft(repo, ctx, ctx.p1(),
4230 ['local', 'graft'])
4230 ['local', 'graft'])
4231 finally:
4231 finally:
4232 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4232 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4233 # report any conflicts
4233 # report any conflicts
4234 if stats and stats[3] > 0:
4234 if stats and stats[3] > 0:
4235 # write out state for --continue
4235 # write out state for --continue
4236 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4236 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4237 repo.vfs.write('graftstate', ''.join(nodelines))
4237 repo.vfs.write('graftstate', ''.join(nodelines))
4238 extra = ''
4238 extra = ''
4239 if opts.get('user'):
4239 if opts.get('user'):
4240 extra += ' --user %s' % util.shellquote(opts['user'])
4240 extra += ' --user %s' % util.shellquote(opts['user'])
4241 if opts.get('date'):
4241 if opts.get('date'):
4242 extra += ' --date %s' % util.shellquote(opts['date'])
4242 extra += ' --date %s' % util.shellquote(opts['date'])
4243 if opts.get('log'):
4243 if opts.get('log'):
4244 extra += ' --log'
4244 extra += ' --log'
4245 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
4245 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
4246 raise error.Abort(
4246 raise error.Abort(
4247 _("unresolved conflicts, can't continue"),
4247 _("unresolved conflicts, can't continue"),
4248 hint=hint)
4248 hint=hint)
4249 else:
4249 else:
4250 cont = False
4250 cont = False
4251
4251
4252 # commit
4252 # commit
4253 node = repo.commit(text=message, user=user,
4253 node = repo.commit(text=message, user=user,
4254 date=date, extra=extra, editor=editor)
4254 date=date, extra=extra, editor=editor)
4255 if node is None:
4255 if node is None:
4256 ui.warn(
4256 ui.warn(
4257 _('note: graft of %d:%s created no changes to commit\n') %
4257 _('note: graft of %d:%s created no changes to commit\n') %
4258 (ctx.rev(), ctx))
4258 (ctx.rev(), ctx))
4259
4259
4260 # remove state when we complete successfully
4260 # remove state when we complete successfully
4261 if not opts.get('dry_run'):
4261 if not opts.get('dry_run'):
4262 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4262 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4263
4263
4264 return 0
4264 return 0
4265
4265
4266 @command('grep',
4266 @command('grep',
4267 [('0', 'print0', None, _('end fields with NUL')),
4267 [('0', 'print0', None, _('end fields with NUL')),
4268 ('', 'all', None, _('print all revisions that match')),
4268 ('', 'all', None, _('print all revisions that match')),
4269 ('a', 'text', None, _('treat all files as text')),
4269 ('a', 'text', None, _('treat all files as text')),
4270 ('f', 'follow', None,
4270 ('f', 'follow', None,
4271 _('follow changeset history,'
4271 _('follow changeset history,'
4272 ' or file history across copies and renames')),
4272 ' or file history across copies and renames')),
4273 ('i', 'ignore-case', None, _('ignore case when matching')),
4273 ('i', 'ignore-case', None, _('ignore case when matching')),
4274 ('l', 'files-with-matches', None,
4274 ('l', 'files-with-matches', None,
4275 _('print only filenames and revisions that match')),
4275 _('print only filenames and revisions that match')),
4276 ('n', 'line-number', None, _('print matching line numbers')),
4276 ('n', 'line-number', None, _('print matching line numbers')),
4277 ('r', 'rev', [],
4277 ('r', 'rev', [],
4278 _('only search files changed within revision range'), _('REV')),
4278 _('only search files changed within revision range'), _('REV')),
4279 ('u', 'user', None, _('list the author (long with -v)')),
4279 ('u', 'user', None, _('list the author (long with -v)')),
4280 ('d', 'date', None, _('list the date (short with -q)')),
4280 ('d', 'date', None, _('list the date (short with -q)')),
4281 ] + walkopts,
4281 ] + walkopts,
4282 _('[OPTION]... PATTERN [FILE]...'),
4282 _('[OPTION]... PATTERN [FILE]...'),
4283 inferrepo=True)
4283 inferrepo=True)
4284 def grep(ui, repo, pattern, *pats, **opts):
4284 def grep(ui, repo, pattern, *pats, **opts):
4285 """search for a pattern in specified files and revisions
4285 """search for a pattern in specified files and revisions
4286
4286
4287 Search revisions of files for a regular expression.
4287 Search revisions of files for a regular expression.
4288
4288
4289 This command behaves differently than Unix grep. It only accepts
4289 This command behaves differently than Unix grep. It only accepts
4290 Python/Perl regexps. It searches repository history, not the
4290 Python/Perl regexps. It searches repository history, not the
4291 working directory. It always prints the revision number in which a
4291 working directory. It always prints the revision number in which a
4292 match appears.
4292 match appears.
4293
4293
4294 By default, grep only prints output for the first revision of a
4294 By default, grep only prints output for the first revision of a
4295 file in which it finds a match. To get it to print every revision
4295 file in which it finds a match. To get it to print every revision
4296 that contains a change in match status ("-" for a match that
4296 that contains a change in match status ("-" for a match that
4297 becomes a non-match, or "+" for a non-match that becomes a match),
4297 becomes a non-match, or "+" for a non-match that becomes a match),
4298 use the --all flag.
4298 use the --all flag.
4299
4299
4300 Returns 0 if a match is found, 1 otherwise.
4300 Returns 0 if a match is found, 1 otherwise.
4301 """
4301 """
4302 reflags = re.M
4302 reflags = re.M
4303 if opts.get('ignore_case'):
4303 if opts.get('ignore_case'):
4304 reflags |= re.I
4304 reflags |= re.I
4305 try:
4305 try:
4306 regexp = util.re.compile(pattern, reflags)
4306 regexp = util.re.compile(pattern, reflags)
4307 except re.error as inst:
4307 except re.error as inst:
4308 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4308 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4309 return 1
4309 return 1
4310 sep, eol = ':', '\n'
4310 sep, eol = ':', '\n'
4311 if opts.get('print0'):
4311 if opts.get('print0'):
4312 sep = eol = '\0'
4312 sep = eol = '\0'
4313
4313
4314 getfile = util.lrucachefunc(repo.file)
4314 getfile = util.lrucachefunc(repo.file)
4315
4315
4316 def matchlines(body):
4316 def matchlines(body):
4317 begin = 0
4317 begin = 0
4318 linenum = 0
4318 linenum = 0
4319 while begin < len(body):
4319 while begin < len(body):
4320 match = regexp.search(body, begin)
4320 match = regexp.search(body, begin)
4321 if not match:
4321 if not match:
4322 break
4322 break
4323 mstart, mend = match.span()
4323 mstart, mend = match.span()
4324 linenum += body.count('\n', begin, mstart) + 1
4324 linenum += body.count('\n', begin, mstart) + 1
4325 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4325 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4326 begin = body.find('\n', mend) + 1 or len(body) + 1
4326 begin = body.find('\n', mend) + 1 or len(body) + 1
4327 lend = begin - 1
4327 lend = begin - 1
4328 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4328 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4329
4329
4330 class linestate(object):
4330 class linestate(object):
4331 def __init__(self, line, linenum, colstart, colend):
4331 def __init__(self, line, linenum, colstart, colend):
4332 self.line = line
4332 self.line = line
4333 self.linenum = linenum
4333 self.linenum = linenum
4334 self.colstart = colstart
4334 self.colstart = colstart
4335 self.colend = colend
4335 self.colend = colend
4336
4336
4337 def __hash__(self):
4337 def __hash__(self):
4338 return hash((self.linenum, self.line))
4338 return hash((self.linenum, self.line))
4339
4339
4340 def __eq__(self, other):
4340 def __eq__(self, other):
4341 return self.line == other.line
4341 return self.line == other.line
4342
4342
4343 def __iter__(self):
4343 def __iter__(self):
4344 yield (self.line[:self.colstart], '')
4344 yield (self.line[:self.colstart], '')
4345 yield (self.line[self.colstart:self.colend], 'grep.match')
4345 yield (self.line[self.colstart:self.colend], 'grep.match')
4346 rest = self.line[self.colend:]
4346 rest = self.line[self.colend:]
4347 while rest != '':
4347 while rest != '':
4348 match = regexp.search(rest)
4348 match = regexp.search(rest)
4349 if not match:
4349 if not match:
4350 yield (rest, '')
4350 yield (rest, '')
4351 break
4351 break
4352 mstart, mend = match.span()
4352 mstart, mend = match.span()
4353 yield (rest[:mstart], '')
4353 yield (rest[:mstart], '')
4354 yield (rest[mstart:mend], 'grep.match')
4354 yield (rest[mstart:mend], 'grep.match')
4355 rest = rest[mend:]
4355 rest = rest[mend:]
4356
4356
4357 matches = {}
4357 matches = {}
4358 copies = {}
4358 copies = {}
4359 def grepbody(fn, rev, body):
4359 def grepbody(fn, rev, body):
4360 matches[rev].setdefault(fn, [])
4360 matches[rev].setdefault(fn, [])
4361 m = matches[rev][fn]
4361 m = matches[rev][fn]
4362 for lnum, cstart, cend, line in matchlines(body):
4362 for lnum, cstart, cend, line in matchlines(body):
4363 s = linestate(line, lnum, cstart, cend)
4363 s = linestate(line, lnum, cstart, cend)
4364 m.append(s)
4364 m.append(s)
4365
4365
4366 def difflinestates(a, b):
4366 def difflinestates(a, b):
4367 sm = difflib.SequenceMatcher(None, a, b)
4367 sm = difflib.SequenceMatcher(None, a, b)
4368 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4368 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4369 if tag == 'insert':
4369 if tag == 'insert':
4370 for i in xrange(blo, bhi):
4370 for i in xrange(blo, bhi):
4371 yield ('+', b[i])
4371 yield ('+', b[i])
4372 elif tag == 'delete':
4372 elif tag == 'delete':
4373 for i in xrange(alo, ahi):
4373 for i in xrange(alo, ahi):
4374 yield ('-', a[i])
4374 yield ('-', a[i])
4375 elif tag == 'replace':
4375 elif tag == 'replace':
4376 for i in xrange(alo, ahi):
4376 for i in xrange(alo, ahi):
4377 yield ('-', a[i])
4377 yield ('-', a[i])
4378 for i in xrange(blo, bhi):
4378 for i in xrange(blo, bhi):
4379 yield ('+', b[i])
4379 yield ('+', b[i])
4380
4380
4381 def display(fn, ctx, pstates, states):
4381 def display(fn, ctx, pstates, states):
4382 rev = ctx.rev()
4382 rev = ctx.rev()
4383 if ui.quiet:
4383 if ui.quiet:
4384 datefunc = util.shortdate
4384 datefunc = util.shortdate
4385 else:
4385 else:
4386 datefunc = util.datestr
4386 datefunc = util.datestr
4387 found = False
4387 found = False
4388 @util.cachefunc
4388 @util.cachefunc
4389 def binary():
4389 def binary():
4390 flog = getfile(fn)
4390 flog = getfile(fn)
4391 return util.binary(flog.read(ctx.filenode(fn)))
4391 return util.binary(flog.read(ctx.filenode(fn)))
4392
4392
4393 if opts.get('all'):
4393 if opts.get('all'):
4394 iter = difflinestates(pstates, states)
4394 iter = difflinestates(pstates, states)
4395 else:
4395 else:
4396 iter = [('', l) for l in states]
4396 iter = [('', l) for l in states]
4397 for change, l in iter:
4397 for change, l in iter:
4398 cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
4398 cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
4399
4399
4400 if opts.get('line_number'):
4400 if opts.get('line_number'):
4401 cols.append((str(l.linenum), 'grep.linenumber'))
4401 cols.append((str(l.linenum), 'grep.linenumber'))
4402 if opts.get('all'):
4402 if opts.get('all'):
4403 cols.append((change, 'grep.change'))
4403 cols.append((change, 'grep.change'))
4404 if opts.get('user'):
4404 if opts.get('user'):
4405 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
4405 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
4406 if opts.get('date'):
4406 if opts.get('date'):
4407 cols.append((datefunc(ctx.date()), 'grep.date'))
4407 cols.append((datefunc(ctx.date()), 'grep.date'))
4408 for col, label in cols[:-1]:
4408 for col, label in cols[:-1]:
4409 ui.write(col, label=label)
4409 ui.write(col, label=label)
4410 ui.write(sep, label='grep.sep')
4410 ui.write(sep, label='grep.sep')
4411 ui.write(cols[-1][0], label=cols[-1][1])
4411 ui.write(cols[-1][0], label=cols[-1][1])
4412 if not opts.get('files_with_matches'):
4412 if not opts.get('files_with_matches'):
4413 ui.write(sep, label='grep.sep')
4413 ui.write(sep, label='grep.sep')
4414 if not opts.get('text') and binary():
4414 if not opts.get('text') and binary():
4415 ui.write(_(" Binary file matches"))
4415 ui.write(_(" Binary file matches"))
4416 else:
4416 else:
4417 for s, label in l:
4417 for s, label in l:
4418 ui.write(s, label=label)
4418 ui.write(s, label=label)
4419 ui.write(eol)
4419 ui.write(eol)
4420 found = True
4420 found = True
4421 if opts.get('files_with_matches'):
4421 if opts.get('files_with_matches'):
4422 break
4422 break
4423 return found
4423 return found
4424
4424
4425 skip = {}
4425 skip = {}
4426 revfiles = {}
4426 revfiles = {}
4427 matchfn = scmutil.match(repo[None], pats, opts)
4427 matchfn = scmutil.match(repo[None], pats, opts)
4428 found = False
4428 found = False
4429 follow = opts.get('follow')
4429 follow = opts.get('follow')
4430
4430
4431 def prep(ctx, fns):
4431 def prep(ctx, fns):
4432 rev = ctx.rev()
4432 rev = ctx.rev()
4433 pctx = ctx.p1()
4433 pctx = ctx.p1()
4434 parent = pctx.rev()
4434 parent = pctx.rev()
4435 matches.setdefault(rev, {})
4435 matches.setdefault(rev, {})
4436 matches.setdefault(parent, {})
4436 matches.setdefault(parent, {})
4437 files = revfiles.setdefault(rev, [])
4437 files = revfiles.setdefault(rev, [])
4438 for fn in fns:
4438 for fn in fns:
4439 flog = getfile(fn)
4439 flog = getfile(fn)
4440 try:
4440 try:
4441 fnode = ctx.filenode(fn)
4441 fnode = ctx.filenode(fn)
4442 except error.LookupError:
4442 except error.LookupError:
4443 continue
4443 continue
4444
4444
4445 copied = flog.renamed(fnode)
4445 copied = flog.renamed(fnode)
4446 copy = follow and copied and copied[0]
4446 copy = follow and copied and copied[0]
4447 if copy:
4447 if copy:
4448 copies.setdefault(rev, {})[fn] = copy
4448 copies.setdefault(rev, {})[fn] = copy
4449 if fn in skip:
4449 if fn in skip:
4450 if copy:
4450 if copy:
4451 skip[copy] = True
4451 skip[copy] = True
4452 continue
4452 continue
4453 files.append(fn)
4453 files.append(fn)
4454
4454
4455 if fn not in matches[rev]:
4455 if fn not in matches[rev]:
4456 grepbody(fn, rev, flog.read(fnode))
4456 grepbody(fn, rev, flog.read(fnode))
4457
4457
4458 pfn = copy or fn
4458 pfn = copy or fn
4459 if pfn not in matches[parent]:
4459 if pfn not in matches[parent]:
4460 try:
4460 try:
4461 fnode = pctx.filenode(pfn)
4461 fnode = pctx.filenode(pfn)
4462 grepbody(pfn, parent, flog.read(fnode))
4462 grepbody(pfn, parent, flog.read(fnode))
4463 except error.LookupError:
4463 except error.LookupError:
4464 pass
4464 pass
4465
4465
4466 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4466 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4467 rev = ctx.rev()
4467 rev = ctx.rev()
4468 parent = ctx.p1().rev()
4468 parent = ctx.p1().rev()
4469 for fn in sorted(revfiles.get(rev, [])):
4469 for fn in sorted(revfiles.get(rev, [])):
4470 states = matches[rev][fn]
4470 states = matches[rev][fn]
4471 copy = copies.get(rev, {}).get(fn)
4471 copy = copies.get(rev, {}).get(fn)
4472 if fn in skip:
4472 if fn in skip:
4473 if copy:
4473 if copy:
4474 skip[copy] = True
4474 skip[copy] = True
4475 continue
4475 continue
4476 pstates = matches.get(parent, {}).get(copy or fn, [])
4476 pstates = matches.get(parent, {}).get(copy or fn, [])
4477 if pstates or states:
4477 if pstates or states:
4478 r = display(fn, ctx, pstates, states)
4478 r = display(fn, ctx, pstates, states)
4479 found = found or r
4479 found = found or r
4480 if r and not opts.get('all'):
4480 if r and not opts.get('all'):
4481 skip[fn] = True
4481 skip[fn] = True
4482 if copy:
4482 if copy:
4483 skip[copy] = True
4483 skip[copy] = True
4484 del matches[rev]
4484 del matches[rev]
4485 del revfiles[rev]
4485 del revfiles[rev]
4486
4486
4487 return not found
4487 return not found
4488
4488
4489 @command('heads',
4489 @command('heads',
4490 [('r', 'rev', '',
4490 [('r', 'rev', '',
4491 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4491 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4492 ('t', 'topo', False, _('show topological heads only')),
4492 ('t', 'topo', False, _('show topological heads only')),
4493 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4493 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4494 ('c', 'closed', False, _('show normal and closed branch heads')),
4494 ('c', 'closed', False, _('show normal and closed branch heads')),
4495 ] + templateopts,
4495 ] + templateopts,
4496 _('[-ct] [-r STARTREV] [REV]...'))
4496 _('[-ct] [-r STARTREV] [REV]...'))
4497 def heads(ui, repo, *branchrevs, **opts):
4497 def heads(ui, repo, *branchrevs, **opts):
4498 """show branch heads
4498 """show branch heads
4499
4499
4500 With no arguments, show all open branch heads in the repository.
4500 With no arguments, show all open branch heads in the repository.
4501 Branch heads are changesets that have no descendants on the
4501 Branch heads are changesets that have no descendants on the
4502 same branch. They are where development generally takes place and
4502 same branch. They are where development generally takes place and
4503 are the usual targets for update and merge operations.
4503 are the usual targets for update and merge operations.
4504
4504
4505 If one or more REVs are given, only open branch heads on the
4505 If one or more REVs are given, only open branch heads on the
4506 branches associated with the specified changesets are shown. This
4506 branches associated with the specified changesets are shown. This
4507 means that you can use :hg:`heads .` to see the heads on the
4507 means that you can use :hg:`heads .` to see the heads on the
4508 currently checked-out branch.
4508 currently checked-out branch.
4509
4509
4510 If -c/--closed is specified, also show branch heads marked closed
4510 If -c/--closed is specified, also show branch heads marked closed
4511 (see :hg:`commit --close-branch`).
4511 (see :hg:`commit --close-branch`).
4512
4512
4513 If STARTREV is specified, only those heads that are descendants of
4513 If STARTREV is specified, only those heads that are descendants of
4514 STARTREV will be displayed.
4514 STARTREV will be displayed.
4515
4515
4516 If -t/--topo is specified, named branch mechanics will be ignored and only
4516 If -t/--topo is specified, named branch mechanics will be ignored and only
4517 topological heads (changesets with no children) will be shown.
4517 topological heads (changesets with no children) will be shown.
4518
4518
4519 Returns 0 if matching heads are found, 1 if not.
4519 Returns 0 if matching heads are found, 1 if not.
4520 """
4520 """
4521
4521
4522 start = None
4522 start = None
4523 if 'rev' in opts:
4523 if 'rev' in opts:
4524 start = scmutil.revsingle(repo, opts['rev'], None).node()
4524 start = scmutil.revsingle(repo, opts['rev'], None).node()
4525
4525
4526 if opts.get('topo'):
4526 if opts.get('topo'):
4527 heads = [repo[h] for h in repo.heads(start)]
4527 heads = [repo[h] for h in repo.heads(start)]
4528 else:
4528 else:
4529 heads = []
4529 heads = []
4530 for branch in repo.branchmap():
4530 for branch in repo.branchmap():
4531 heads += repo.branchheads(branch, start, opts.get('closed'))
4531 heads += repo.branchheads(branch, start, opts.get('closed'))
4532 heads = [repo[h] for h in heads]
4532 heads = [repo[h] for h in heads]
4533
4533
4534 if branchrevs:
4534 if branchrevs:
4535 branches = set(repo[br].branch() for br in branchrevs)
4535 branches = set(repo[br].branch() for br in branchrevs)
4536 heads = [h for h in heads if h.branch() in branches]
4536 heads = [h for h in heads if h.branch() in branches]
4537
4537
4538 if opts.get('active') and branchrevs:
4538 if opts.get('active') and branchrevs:
4539 dagheads = repo.heads(start)
4539 dagheads = repo.heads(start)
4540 heads = [h for h in heads if h.node() in dagheads]
4540 heads = [h for h in heads if h.node() in dagheads]
4541
4541
4542 if branchrevs:
4542 if branchrevs:
4543 haveheads = set(h.branch() for h in heads)
4543 haveheads = set(h.branch() for h in heads)
4544 if branches - haveheads:
4544 if branches - haveheads:
4545 headless = ', '.join(b for b in branches - haveheads)
4545 headless = ', '.join(b for b in branches - haveheads)
4546 msg = _('no open branch heads found on branches %s')
4546 msg = _('no open branch heads found on branches %s')
4547 if opts.get('rev'):
4547 if opts.get('rev'):
4548 msg += _(' (started at %s)') % opts['rev']
4548 msg += _(' (started at %s)') % opts['rev']
4549 ui.warn((msg + '\n') % headless)
4549 ui.warn((msg + '\n') % headless)
4550
4550
4551 if not heads:
4551 if not heads:
4552 return 1
4552 return 1
4553
4553
4554 heads = sorted(heads, key=lambda x: -x.rev())
4554 heads = sorted(heads, key=lambda x: -x.rev())
4555 displayer = cmdutil.show_changeset(ui, repo, opts)
4555 displayer = cmdutil.show_changeset(ui, repo, opts)
4556 for ctx in heads:
4556 for ctx in heads:
4557 displayer.show(ctx)
4557 displayer.show(ctx)
4558 displayer.close()
4558 displayer.close()
4559
4559
4560 @command('help',
4560 @command('help',
4561 [('e', 'extension', None, _('show only help for extensions')),
4561 [('e', 'extension', None, _('show only help for extensions')),
4562 ('c', 'command', None, _('show only help for commands')),
4562 ('c', 'command', None, _('show only help for commands')),
4563 ('k', 'keyword', None, _('show topics matching keyword')),
4563 ('k', 'keyword', None, _('show topics matching keyword')),
4564 ('s', 'system', [], _('show help for specific platform(s)')),
4564 ('s', 'system', [], _('show help for specific platform(s)')),
4565 ],
4565 ],
4566 _('[-ecks] [TOPIC]'),
4566 _('[-ecks] [TOPIC]'),
4567 norepo=True)
4567 norepo=True)
4568 def help_(ui, name=None, **opts):
4568 def help_(ui, name=None, **opts):
4569 """show help for a given topic or a help overview
4569 """show help for a given topic or a help overview
4570
4570
4571 With no arguments, print a list of commands with short help messages.
4571 With no arguments, print a list of commands with short help messages.
4572
4572
4573 Given a topic, extension, or command name, print help for that
4573 Given a topic, extension, or command name, print help for that
4574 topic.
4574 topic.
4575
4575
4576 Returns 0 if successful.
4576 Returns 0 if successful.
4577 """
4577 """
4578
4578
4579 textwidth = ui.configint('ui', 'textwidth', 78)
4579 textwidth = ui.configint('ui', 'textwidth', 78)
4580 termwidth = ui.termwidth() - 2
4580 termwidth = ui.termwidth() - 2
4581 if textwidth <= 0 or termwidth < textwidth:
4581 if textwidth <= 0 or termwidth < textwidth:
4582 textwidth = termwidth
4582 textwidth = termwidth
4583
4583
4584 keep = opts.get('system') or []
4584 keep = opts.get('system') or []
4585 if len(keep) == 0:
4585 if len(keep) == 0:
4586 if sys.platform.startswith('win'):
4586 if sys.platform.startswith('win'):
4587 keep.append('windows')
4587 keep.append('windows')
4588 elif sys.platform == 'OpenVMS':
4588 elif sys.platform == 'OpenVMS':
4589 keep.append('vms')
4589 keep.append('vms')
4590 elif sys.platform == 'plan9':
4590 elif sys.platform == 'plan9':
4591 keep.append('plan9')
4591 keep.append('plan9')
4592 else:
4592 else:
4593 keep.append('unix')
4593 keep.append('unix')
4594 keep.append(sys.platform.lower())
4594 keep.append(sys.platform.lower())
4595 if ui.verbose:
4595 if ui.verbose:
4596 keep.append('verbose')
4596 keep.append('verbose')
4597
4597
4598 section = None
4598 section = None
4599 subtopic = None
4599 subtopic = None
4600 if name and '.' in name:
4600 if name and '.' in name:
4601 name, remaining = name.split('.', 1)
4601 name, remaining = name.split('.', 1)
4602 remaining = encoding.lower(remaining)
4602 remaining = encoding.lower(remaining)
4603 if '.' in remaining:
4603 if '.' in remaining:
4604 subtopic, section = remaining.split('.', 1)
4604 subtopic, section = remaining.split('.', 1)
4605 else:
4605 else:
4606 if name in help.subtopics:
4606 if name in help.subtopics:
4607 subtopic = remaining
4607 subtopic = remaining
4608 else:
4608 else:
4609 section = remaining
4609 section = remaining
4610
4610
4611 text = help.help_(ui, name, subtopic=subtopic, **opts)
4611 text = help.help_(ui, name, subtopic=subtopic, **opts)
4612
4612
4613 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4613 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4614 section=section)
4614 section=section)
4615
4615
4616 # We could have been given a weird ".foo" section without a name
4616 # We could have been given a weird ".foo" section without a name
4617 # to look for, or we could have simply failed to found "foo.bar"
4617 # to look for, or we could have simply failed to found "foo.bar"
4618 # because bar isn't a section of foo
4618 # because bar isn't a section of foo
4619 if section and not (formatted and name):
4619 if section and not (formatted and name):
4620 raise error.Abort(_("help section not found"))
4620 raise error.Abort(_("help section not found"))
4621
4621
4622 if 'verbose' in pruned:
4622 if 'verbose' in pruned:
4623 keep.append('omitted')
4623 keep.append('omitted')
4624 else:
4624 else:
4625 keep.append('notomitted')
4625 keep.append('notomitted')
4626 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4626 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4627 section=section)
4627 section=section)
4628 ui.write(formatted)
4628 ui.write(formatted)
4629
4629
4630
4630
4631 @command('identify|id',
4631 @command('identify|id',
4632 [('r', 'rev', '',
4632 [('r', 'rev', '',
4633 _('identify the specified revision'), _('REV')),
4633 _('identify the specified revision'), _('REV')),
4634 ('n', 'num', None, _('show local revision number')),
4634 ('n', 'num', None, _('show local revision number')),
4635 ('i', 'id', None, _('show global revision id')),
4635 ('i', 'id', None, _('show global revision id')),
4636 ('b', 'branch', None, _('show branch')),
4636 ('b', 'branch', None, _('show branch')),
4637 ('t', 'tags', None, _('show tags')),
4637 ('t', 'tags', None, _('show tags')),
4638 ('B', 'bookmarks', None, _('show bookmarks')),
4638 ('B', 'bookmarks', None, _('show bookmarks')),
4639 ] + remoteopts,
4639 ] + remoteopts,
4640 _('[-nibtB] [-r REV] [SOURCE]'),
4640 _('[-nibtB] [-r REV] [SOURCE]'),
4641 optionalrepo=True)
4641 optionalrepo=True)
4642 def identify(ui, repo, source=None, rev=None,
4642 def identify(ui, repo, source=None, rev=None,
4643 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4643 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4644 """identify the working directory or specified revision
4644 """identify the working directory or specified revision
4645
4645
4646 Print a summary identifying the repository state at REV using one or
4646 Print a summary identifying the repository state at REV using one or
4647 two parent hash identifiers, followed by a "+" if the working
4647 two parent hash identifiers, followed by a "+" if the working
4648 directory has uncommitted changes, the branch name (if not default),
4648 directory has uncommitted changes, the branch name (if not default),
4649 a list of tags, and a list of bookmarks.
4649 a list of tags, and a list of bookmarks.
4650
4650
4651 When REV is not given, print a summary of the current state of the
4651 When REV is not given, print a summary of the current state of the
4652 repository.
4652 repository.
4653
4653
4654 Specifying a path to a repository root or Mercurial bundle will
4654 Specifying a path to a repository root or Mercurial bundle will
4655 cause lookup to operate on that repository/bundle.
4655 cause lookup to operate on that repository/bundle.
4656
4656
4657 .. container:: verbose
4657 .. container:: verbose
4658
4658
4659 Examples:
4659 Examples:
4660
4660
4661 - generate a build identifier for the working directory::
4661 - generate a build identifier for the working directory::
4662
4662
4663 hg id --id > build-id.dat
4663 hg id --id > build-id.dat
4664
4664
4665 - find the revision corresponding to a tag::
4665 - find the revision corresponding to a tag::
4666
4666
4667 hg id -n -r 1.3
4667 hg id -n -r 1.3
4668
4668
4669 - check the most recent revision of a remote repository::
4669 - check the most recent revision of a remote repository::
4670
4670
4671 hg id -r tip http://selenic.com/hg/
4671 hg id -r tip http://selenic.com/hg/
4672
4672
4673 See :hg:`log` for generating more information about specific revisions,
4673 See :hg:`log` for generating more information about specific revisions,
4674 including full hash identifiers.
4674 including full hash identifiers.
4675
4675
4676 Returns 0 if successful.
4676 Returns 0 if successful.
4677 """
4677 """
4678
4678
4679 if not repo and not source:
4679 if not repo and not source:
4680 raise error.Abort(_("there is no Mercurial repository here "
4680 raise error.Abort(_("there is no Mercurial repository here "
4681 "(.hg not found)"))
4681 "(.hg not found)"))
4682
4682
4683 if ui.debugflag:
4683 if ui.debugflag:
4684 hexfunc = hex
4684 hexfunc = hex
4685 else:
4685 else:
4686 hexfunc = short
4686 hexfunc = short
4687 default = not (num or id or branch or tags or bookmarks)
4687 default = not (num or id or branch or tags or bookmarks)
4688 output = []
4688 output = []
4689 revs = []
4689 revs = []
4690
4690
4691 if source:
4691 if source:
4692 source, branches = hg.parseurl(ui.expandpath(source))
4692 source, branches = hg.parseurl(ui.expandpath(source))
4693 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4693 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4694 repo = peer.local()
4694 repo = peer.local()
4695 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4695 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4696
4696
4697 if not repo:
4697 if not repo:
4698 if num or branch or tags:
4698 if num or branch or tags:
4699 raise error.Abort(
4699 raise error.Abort(
4700 _("can't query remote revision number, branch, or tags"))
4700 _("can't query remote revision number, branch, or tags"))
4701 if not rev and revs:
4701 if not rev and revs:
4702 rev = revs[0]
4702 rev = revs[0]
4703 if not rev:
4703 if not rev:
4704 rev = "tip"
4704 rev = "tip"
4705
4705
4706 remoterev = peer.lookup(rev)
4706 remoterev = peer.lookup(rev)
4707 if default or id:
4707 if default or id:
4708 output = [hexfunc(remoterev)]
4708 output = [hexfunc(remoterev)]
4709
4709
4710 def getbms():
4710 def getbms():
4711 bms = []
4711 bms = []
4712
4712
4713 if 'bookmarks' in peer.listkeys('namespaces'):
4713 if 'bookmarks' in peer.listkeys('namespaces'):
4714 hexremoterev = hex(remoterev)
4714 hexremoterev = hex(remoterev)
4715 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4715 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4716 if bmr == hexremoterev]
4716 if bmr == hexremoterev]
4717
4717
4718 return sorted(bms)
4718 return sorted(bms)
4719
4719
4720 if bookmarks:
4720 if bookmarks:
4721 output.extend(getbms())
4721 output.extend(getbms())
4722 elif default and not ui.quiet:
4722 elif default and not ui.quiet:
4723 # multiple bookmarks for a single parent separated by '/'
4723 # multiple bookmarks for a single parent separated by '/'
4724 bm = '/'.join(getbms())
4724 bm = '/'.join(getbms())
4725 if bm:
4725 if bm:
4726 output.append(bm)
4726 output.append(bm)
4727 else:
4727 else:
4728 ctx = scmutil.revsingle(repo, rev, None)
4728 ctx = scmutil.revsingle(repo, rev, None)
4729
4729
4730 if ctx.rev() is None:
4730 if ctx.rev() is None:
4731 ctx = repo[None]
4731 ctx = repo[None]
4732 parents = ctx.parents()
4732 parents = ctx.parents()
4733 taglist = []
4733 taglist = []
4734 for p in parents:
4734 for p in parents:
4735 taglist.extend(p.tags())
4735 taglist.extend(p.tags())
4736
4736
4737 changed = ""
4737 changed = ""
4738 if default or id or num:
4738 if default or id or num:
4739 if (any(repo.status())
4739 if (any(repo.status())
4740 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4740 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4741 changed = '+'
4741 changed = '+'
4742 if default or id:
4742 if default or id:
4743 output = ["%s%s" %
4743 output = ["%s%s" %
4744 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4744 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4745 if num:
4745 if num:
4746 output.append("%s%s" %
4746 output.append("%s%s" %
4747 ('+'.join([str(p.rev()) for p in parents]), changed))
4747 ('+'.join([str(p.rev()) for p in parents]), changed))
4748 else:
4748 else:
4749 if default or id:
4749 if default or id:
4750 output = [hexfunc(ctx.node())]
4750 output = [hexfunc(ctx.node())]
4751 if num:
4751 if num:
4752 output.append(str(ctx.rev()))
4752 output.append(str(ctx.rev()))
4753 taglist = ctx.tags()
4753 taglist = ctx.tags()
4754
4754
4755 if default and not ui.quiet:
4755 if default and not ui.quiet:
4756 b = ctx.branch()
4756 b = ctx.branch()
4757 if b != 'default':
4757 if b != 'default':
4758 output.append("(%s)" % b)
4758 output.append("(%s)" % b)
4759
4759
4760 # multiple tags for a single parent separated by '/'
4760 # multiple tags for a single parent separated by '/'
4761 t = '/'.join(taglist)
4761 t = '/'.join(taglist)
4762 if t:
4762 if t:
4763 output.append(t)
4763 output.append(t)
4764
4764
4765 # multiple bookmarks for a single parent separated by '/'
4765 # multiple bookmarks for a single parent separated by '/'
4766 bm = '/'.join(ctx.bookmarks())
4766 bm = '/'.join(ctx.bookmarks())
4767 if bm:
4767 if bm:
4768 output.append(bm)
4768 output.append(bm)
4769 else:
4769 else:
4770 if branch:
4770 if branch:
4771 output.append(ctx.branch())
4771 output.append(ctx.branch())
4772
4772
4773 if tags:
4773 if tags:
4774 output.extend(taglist)
4774 output.extend(taglist)
4775
4775
4776 if bookmarks:
4776 if bookmarks:
4777 output.extend(ctx.bookmarks())
4777 output.extend(ctx.bookmarks())
4778
4778
4779 ui.write("%s\n" % ' '.join(output))
4779 ui.write("%s\n" % ' '.join(output))
4780
4780
4781 @command('import|patch',
4781 @command('import|patch',
4782 [('p', 'strip', 1,
4782 [('p', 'strip', 1,
4783 _('directory strip option for patch. This has the same '
4783 _('directory strip option for patch. This has the same '
4784 'meaning as the corresponding patch option'), _('NUM')),
4784 'meaning as the corresponding patch option'), _('NUM')),
4785 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4785 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4786 ('e', 'edit', False, _('invoke editor on commit messages')),
4786 ('e', 'edit', False, _('invoke editor on commit messages')),
4787 ('f', 'force', None,
4787 ('f', 'force', None,
4788 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4788 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4789 ('', 'no-commit', None,
4789 ('', 'no-commit', None,
4790 _("don't commit, just update the working directory")),
4790 _("don't commit, just update the working directory")),
4791 ('', 'bypass', None,
4791 ('', 'bypass', None,
4792 _("apply patch without touching the working directory")),
4792 _("apply patch without touching the working directory")),
4793 ('', 'partial', None,
4793 ('', 'partial', None,
4794 _('commit even if some hunks fail')),
4794 _('commit even if some hunks fail')),
4795 ('', 'exact', None,
4795 ('', 'exact', None,
4796 _('abort if patch would apply lossily')),
4796 _('abort if patch would apply lossily')),
4797 ('', 'prefix', '',
4797 ('', 'prefix', '',
4798 _('apply patch to subdirectory'), _('DIR')),
4798 _('apply patch to subdirectory'), _('DIR')),
4799 ('', 'import-branch', None,
4799 ('', 'import-branch', None,
4800 _('use any branch information in patch (implied by --exact)'))] +
4800 _('use any branch information in patch (implied by --exact)'))] +
4801 commitopts + commitopts2 + similarityopts,
4801 commitopts + commitopts2 + similarityopts,
4802 _('[OPTION]... PATCH...'))
4802 _('[OPTION]... PATCH...'))
4803 def import_(ui, repo, patch1=None, *patches, **opts):
4803 def import_(ui, repo, patch1=None, *patches, **opts):
4804 """import an ordered set of patches
4804 """import an ordered set of patches
4805
4805
4806 Import a list of patches and commit them individually (unless
4806 Import a list of patches and commit them individually (unless
4807 --no-commit is specified).
4807 --no-commit is specified).
4808
4808
4809 To read a patch from standard input, use "-" as the patch name. If
4809 To read a patch from standard input, use "-" as the patch name. If
4810 a URL is specified, the patch will be downloaded from there.
4810 a URL is specified, the patch will be downloaded from there.
4811
4811
4812 Import first applies changes to the working directory (unless
4812 Import first applies changes to the working directory (unless
4813 --bypass is specified), import will abort if there are outstanding
4813 --bypass is specified), import will abort if there are outstanding
4814 changes.
4814 changes.
4815
4815
4816 Use --bypass to apply and commit patches directly to the
4816 Use --bypass to apply and commit patches directly to the
4817 repository, without affecting the working directory. Without
4817 repository, without affecting the working directory. Without
4818 --exact, patches will be applied on top of the working directory
4818 --exact, patches will be applied on top of the working directory
4819 parent revision.
4819 parent revision.
4820
4820
4821 You can import a patch straight from a mail message. Even patches
4821 You can import a patch straight from a mail message. Even patches
4822 as attachments work (to use the body part, it must have type
4822 as attachments work (to use the body part, it must have type
4823 text/plain or text/x-patch). From and Subject headers of email
4823 text/plain or text/x-patch). From and Subject headers of email
4824 message are used as default committer and commit message. All
4824 message are used as default committer and commit message. All
4825 text/plain body parts before first diff are added to the commit
4825 text/plain body parts before first diff are added to the commit
4826 message.
4826 message.
4827
4827
4828 If the imported patch was generated by :hg:`export`, user and
4828 If the imported patch was generated by :hg:`export`, user and
4829 description from patch override values from message headers and
4829 description from patch override values from message headers and
4830 body. Values given on command line with -m/--message and -u/--user
4830 body. Values given on command line with -m/--message and -u/--user
4831 override these.
4831 override these.
4832
4832
4833 If --exact is specified, import will set the working directory to
4833 If --exact is specified, import will set the working directory to
4834 the parent of each patch before applying it, and will abort if the
4834 the parent of each patch before applying it, and will abort if the
4835 resulting changeset has a different ID than the one recorded in
4835 resulting changeset has a different ID than the one recorded in
4836 the patch. This will guard against various ways that portable
4836 the patch. This will guard against various ways that portable
4837 patch formats and mail systems might fail to transfer Mercurial
4837 patch formats and mail systems might fail to transfer Mercurial
4838 data or metadata. See :hg:`bundle` for lossless transmission.
4838 data or metadata. See :hg:`bundle` for lossless transmission.
4839
4839
4840 Use --partial to ensure a changeset will be created from the patch
4840 Use --partial to ensure a changeset will be created from the patch
4841 even if some hunks fail to apply. Hunks that fail to apply will be
4841 even if some hunks fail to apply. Hunks that fail to apply will be
4842 written to a <target-file>.rej file. Conflicts can then be resolved
4842 written to a <target-file>.rej file. Conflicts can then be resolved
4843 by hand before :hg:`commit --amend` is run to update the created
4843 by hand before :hg:`commit --amend` is run to update the created
4844 changeset. This flag exists to let people import patches that
4844 changeset. This flag exists to let people import patches that
4845 partially apply without losing the associated metadata (author,
4845 partially apply without losing the associated metadata (author,
4846 date, description, ...).
4846 date, description, ...).
4847
4847
4848 .. note::
4848 .. note::
4849
4849
4850 When no hunks apply cleanly, :hg:`import --partial` will create
4850 When no hunks apply cleanly, :hg:`import --partial` will create
4851 an empty changeset, importing only the patch metadata.
4851 an empty changeset, importing only the patch metadata.
4852
4852
4853 With -s/--similarity, hg will attempt to discover renames and
4853 With -s/--similarity, hg will attempt to discover renames and
4854 copies in the patch in the same way as :hg:`addremove`.
4854 copies in the patch in the same way as :hg:`addremove`.
4855
4855
4856 It is possible to use external patch programs to perform the patch
4856 It is possible to use external patch programs to perform the patch
4857 by setting the ``ui.patch`` configuration option. For the default
4857 by setting the ``ui.patch`` configuration option. For the default
4858 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4858 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4859 See :hg:`help config` for more information about configuration
4859 See :hg:`help config` for more information about configuration
4860 files and how to use these options.
4860 files and how to use these options.
4861
4861
4862 See :hg:`help dates` for a list of formats valid for -d/--date.
4862 See :hg:`help dates` for a list of formats valid for -d/--date.
4863
4863
4864 .. container:: verbose
4864 .. container:: verbose
4865
4865
4866 Examples:
4866 Examples:
4867
4867
4868 - import a traditional patch from a website and detect renames::
4868 - import a traditional patch from a website and detect renames::
4869
4869
4870 hg import -s 80 http://example.com/bugfix.patch
4870 hg import -s 80 http://example.com/bugfix.patch
4871
4871
4872 - import a changeset from an hgweb server::
4872 - import a changeset from an hgweb server::
4873
4873
4874 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4874 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4875
4875
4876 - import all the patches in an Unix-style mbox::
4876 - import all the patches in an Unix-style mbox::
4877
4877
4878 hg import incoming-patches.mbox
4878 hg import incoming-patches.mbox
4879
4879
4880 - attempt to exactly restore an exported changeset (not always
4880 - attempt to exactly restore an exported changeset (not always
4881 possible)::
4881 possible)::
4882
4882
4883 hg import --exact proposed-fix.patch
4883 hg import --exact proposed-fix.patch
4884
4884
4885 - use an external tool to apply a patch which is too fuzzy for
4885 - use an external tool to apply a patch which is too fuzzy for
4886 the default internal tool.
4886 the default internal tool.
4887
4887
4888 hg import --config ui.patch="patch --merge" fuzzy.patch
4888 hg import --config ui.patch="patch --merge" fuzzy.patch
4889
4889
4890 - change the default fuzzing from 2 to a less strict 7
4890 - change the default fuzzing from 2 to a less strict 7
4891
4891
4892 hg import --config ui.fuzz=7 fuzz.patch
4892 hg import --config ui.fuzz=7 fuzz.patch
4893
4893
4894 Returns 0 on success, 1 on partial success (see --partial).
4894 Returns 0 on success, 1 on partial success (see --partial).
4895 """
4895 """
4896
4896
4897 if not patch1:
4897 if not patch1:
4898 raise error.Abort(_('need at least one patch to import'))
4898 raise error.Abort(_('need at least one patch to import'))
4899
4899
4900 patches = (patch1,) + patches
4900 patches = (patch1,) + patches
4901
4901
4902 date = opts.get('date')
4902 date = opts.get('date')
4903 if date:
4903 if date:
4904 opts['date'] = util.parsedate(date)
4904 opts['date'] = util.parsedate(date)
4905
4905
4906 exact = opts.get('exact')
4906 exact = opts.get('exact')
4907 update = not opts.get('bypass')
4907 update = not opts.get('bypass')
4908 if not update and opts.get('no_commit'):
4908 if not update and opts.get('no_commit'):
4909 raise error.Abort(_('cannot use --no-commit with --bypass'))
4909 raise error.Abort(_('cannot use --no-commit with --bypass'))
4910 try:
4910 try:
4911 sim = float(opts.get('similarity') or 0)
4911 sim = float(opts.get('similarity') or 0)
4912 except ValueError:
4912 except ValueError:
4913 raise error.Abort(_('similarity must be a number'))
4913 raise error.Abort(_('similarity must be a number'))
4914 if sim < 0 or sim > 100:
4914 if sim < 0 or sim > 100:
4915 raise error.Abort(_('similarity must be between 0 and 100'))
4915 raise error.Abort(_('similarity must be between 0 and 100'))
4916 if sim and not update:
4916 if sim and not update:
4917 raise error.Abort(_('cannot use --similarity with --bypass'))
4917 raise error.Abort(_('cannot use --similarity with --bypass'))
4918 if exact:
4918 if exact:
4919 if opts.get('edit'):
4919 if opts.get('edit'):
4920 raise error.Abort(_('cannot use --exact with --edit'))
4920 raise error.Abort(_('cannot use --exact with --edit'))
4921 if opts.get('prefix'):
4921 if opts.get('prefix'):
4922 raise error.Abort(_('cannot use --exact with --prefix'))
4922 raise error.Abort(_('cannot use --exact with --prefix'))
4923
4923
4924 base = opts["base"]
4924 base = opts["base"]
4925 wlock = dsguard = lock = tr = None
4925 wlock = dsguard = lock = tr = None
4926 msgs = []
4926 msgs = []
4927 ret = 0
4927 ret = 0
4928
4928
4929
4929
4930 try:
4930 try:
4931 wlock = repo.wlock()
4931 wlock = repo.wlock()
4932
4932
4933 if update:
4933 if update:
4934 cmdutil.checkunfinished(repo)
4934 cmdutil.checkunfinished(repo)
4935 if (exact or not opts.get('force')):
4935 if (exact or not opts.get('force')):
4936 cmdutil.bailifchanged(repo)
4936 cmdutil.bailifchanged(repo)
4937
4937
4938 if not opts.get('no_commit'):
4938 if not opts.get('no_commit'):
4939 lock = repo.lock()
4939 lock = repo.lock()
4940 tr = repo.transaction('import')
4940 tr = repo.transaction('import')
4941 else:
4941 else:
4942 dsguard = cmdutil.dirstateguard(repo, 'import')
4942 dsguard = cmdutil.dirstateguard(repo, 'import')
4943 parents = repo[None].parents()
4943 parents = repo[None].parents()
4944 for patchurl in patches:
4944 for patchurl in patches:
4945 if patchurl == '-':
4945 if patchurl == '-':
4946 ui.status(_('applying patch from stdin\n'))
4946 ui.status(_('applying patch from stdin\n'))
4947 patchfile = ui.fin
4947 patchfile = ui.fin
4948 patchurl = 'stdin' # for error message
4948 patchurl = 'stdin' # for error message
4949 else:
4949 else:
4950 patchurl = os.path.join(base, patchurl)
4950 patchurl = os.path.join(base, patchurl)
4951 ui.status(_('applying %s\n') % patchurl)
4951 ui.status(_('applying %s\n') % patchurl)
4952 patchfile = hg.openpath(ui, patchurl)
4952 patchfile = hg.openpath(ui, patchurl)
4953
4953
4954 haspatch = False
4954 haspatch = False
4955 for hunk in patch.split(patchfile):
4955 for hunk in patch.split(patchfile):
4956 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4956 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4957 parents, opts,
4957 parents, opts,
4958 msgs, hg.clean)
4958 msgs, hg.clean)
4959 if msg:
4959 if msg:
4960 haspatch = True
4960 haspatch = True
4961 ui.note(msg + '\n')
4961 ui.note(msg + '\n')
4962 if update or exact:
4962 if update or exact:
4963 parents = repo[None].parents()
4963 parents = repo[None].parents()
4964 else:
4964 else:
4965 parents = [repo[node]]
4965 parents = [repo[node]]
4966 if rej:
4966 if rej:
4967 ui.write_err(_("patch applied partially\n"))
4967 ui.write_err(_("patch applied partially\n"))
4968 ui.write_err(_("(fix the .rej files and run "
4968 ui.write_err(_("(fix the .rej files and run "
4969 "`hg commit --amend`)\n"))
4969 "`hg commit --amend`)\n"))
4970 ret = 1
4970 ret = 1
4971 break
4971 break
4972
4972
4973 if not haspatch:
4973 if not haspatch:
4974 raise error.Abort(_('%s: no diffs found') % patchurl)
4974 raise error.Abort(_('%s: no diffs found') % patchurl)
4975
4975
4976 if tr:
4976 if tr:
4977 tr.close()
4977 tr.close()
4978 if msgs:
4978 if msgs:
4979 repo.savecommitmessage('\n* * *\n'.join(msgs))
4979 repo.savecommitmessage('\n* * *\n'.join(msgs))
4980 if dsguard:
4980 if dsguard:
4981 dsguard.close()
4981 dsguard.close()
4982 return ret
4982 return ret
4983 finally:
4983 finally:
4984 if tr:
4984 if tr:
4985 tr.release()
4985 tr.release()
4986 release(lock, dsguard, wlock)
4986 release(lock, dsguard, wlock)
4987
4987
4988 @command('incoming|in',
4988 @command('incoming|in',
4989 [('f', 'force', None,
4989 [('f', 'force', None,
4990 _('run even if remote repository is unrelated')),
4990 _('run even if remote repository is unrelated')),
4991 ('n', 'newest-first', None, _('show newest record first')),
4991 ('n', 'newest-first', None, _('show newest record first')),
4992 ('', 'bundle', '',
4992 ('', 'bundle', '',
4993 _('file to store the bundles into'), _('FILE')),
4993 _('file to store the bundles into'), _('FILE')),
4994 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4994 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4995 ('B', 'bookmarks', False, _("compare bookmarks")),
4995 ('B', 'bookmarks', False, _("compare bookmarks")),
4996 ('b', 'branch', [],
4996 ('b', 'branch', [],
4997 _('a specific branch you would like to pull'), _('BRANCH')),
4997 _('a specific branch you would like to pull'), _('BRANCH')),
4998 ] + logopts + remoteopts + subrepoopts,
4998 ] + logopts + remoteopts + subrepoopts,
4999 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
4999 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
5000 def incoming(ui, repo, source="default", **opts):
5000 def incoming(ui, repo, source="default", **opts):
5001 """show new changesets found in source
5001 """show new changesets found in source
5002
5002
5003 Show new changesets found in the specified path/URL or the default
5003 Show new changesets found in the specified path/URL or the default
5004 pull location. These are the changesets that would have been pulled
5004 pull location. These are the changesets that would have been pulled
5005 if a pull at the time you issued this command.
5005 if a pull at the time you issued this command.
5006
5006
5007 See pull for valid source format details.
5007 See pull for valid source format details.
5008
5008
5009 .. container:: verbose
5009 .. container:: verbose
5010
5010
5011 With -B/--bookmarks, the result of bookmark comparison between
5011 With -B/--bookmarks, the result of bookmark comparison between
5012 local and remote repositories is displayed. With -v/--verbose,
5012 local and remote repositories is displayed. With -v/--verbose,
5013 status is also displayed for each bookmark like below::
5013 status is also displayed for each bookmark like below::
5014
5014
5015 BM1 01234567890a added
5015 BM1 01234567890a added
5016 BM2 1234567890ab advanced
5016 BM2 1234567890ab advanced
5017 BM3 234567890abc diverged
5017 BM3 234567890abc diverged
5018 BM4 34567890abcd changed
5018 BM4 34567890abcd changed
5019
5019
5020 The action taken locally when pulling depends on the
5020 The action taken locally when pulling depends on the
5021 status of each bookmark:
5021 status of each bookmark:
5022
5022
5023 :``added``: pull will create it
5023 :``added``: pull will create it
5024 :``advanced``: pull will update it
5024 :``advanced``: pull will update it
5025 :``diverged``: pull will create a divergent bookmark
5025 :``diverged``: pull will create a divergent bookmark
5026 :``changed``: result depends on remote changesets
5026 :``changed``: result depends on remote changesets
5027
5027
5028 From the point of view of pulling behavior, bookmark
5028 From the point of view of pulling behavior, bookmark
5029 existing only in the remote repository are treated as ``added``,
5029 existing only in the remote repository are treated as ``added``,
5030 even if it is in fact locally deleted.
5030 even if it is in fact locally deleted.
5031
5031
5032 .. container:: verbose
5032 .. container:: verbose
5033
5033
5034 For remote repository, using --bundle avoids downloading the
5034 For remote repository, using --bundle avoids downloading the
5035 changesets twice if the incoming is followed by a pull.
5035 changesets twice if the incoming is followed by a pull.
5036
5036
5037 Examples:
5037 Examples:
5038
5038
5039 - show incoming changes with patches and full description::
5039 - show incoming changes with patches and full description::
5040
5040
5041 hg incoming -vp
5041 hg incoming -vp
5042
5042
5043 - show incoming changes excluding merges, store a bundle::
5043 - show incoming changes excluding merges, store a bundle::
5044
5044
5045 hg in -vpM --bundle incoming.hg
5045 hg in -vpM --bundle incoming.hg
5046 hg pull incoming.hg
5046 hg pull incoming.hg
5047
5047
5048 - briefly list changes inside a bundle::
5048 - briefly list changes inside a bundle::
5049
5049
5050 hg in changes.hg -T "{desc|firstline}\\n"
5050 hg in changes.hg -T "{desc|firstline}\\n"
5051
5051
5052 Returns 0 if there are incoming changes, 1 otherwise.
5052 Returns 0 if there are incoming changes, 1 otherwise.
5053 """
5053 """
5054 if opts.get('graph'):
5054 if opts.get('graph'):
5055 cmdutil.checkunsupportedgraphflags([], opts)
5055 cmdutil.checkunsupportedgraphflags([], opts)
5056 def display(other, chlist, displayer):
5056 def display(other, chlist, displayer):
5057 revdag = cmdutil.graphrevs(other, chlist, opts)
5057 revdag = cmdutil.graphrevs(other, chlist, opts)
5058 cmdutil.displaygraph(ui, repo, revdag, displayer,
5058 cmdutil.displaygraph(ui, repo, revdag, displayer,
5059 graphmod.asciiedges)
5059 graphmod.asciiedges)
5060
5060
5061 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
5061 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
5062 return 0
5062 return 0
5063
5063
5064 if opts.get('bundle') and opts.get('subrepos'):
5064 if opts.get('bundle') and opts.get('subrepos'):
5065 raise error.Abort(_('cannot combine --bundle and --subrepos'))
5065 raise error.Abort(_('cannot combine --bundle and --subrepos'))
5066
5066
5067 if opts.get('bookmarks'):
5067 if opts.get('bookmarks'):
5068 source, branches = hg.parseurl(ui.expandpath(source),
5068 source, branches = hg.parseurl(ui.expandpath(source),
5069 opts.get('branch'))
5069 opts.get('branch'))
5070 other = hg.peer(repo, opts, source)
5070 other = hg.peer(repo, opts, source)
5071 if 'bookmarks' not in other.listkeys('namespaces'):
5071 if 'bookmarks' not in other.listkeys('namespaces'):
5072 ui.warn(_("remote doesn't support bookmarks\n"))
5072 ui.warn(_("remote doesn't support bookmarks\n"))
5073 return 0
5073 return 0
5074 ui.status(_('comparing with %s\n') % util.hidepassword(source))
5074 ui.status(_('comparing with %s\n') % util.hidepassword(source))
5075 return bookmarks.incoming(ui, repo, other)
5075 return bookmarks.incoming(ui, repo, other)
5076
5076
5077 repo._subtoppath = ui.expandpath(source)
5077 repo._subtoppath = ui.expandpath(source)
5078 try:
5078 try:
5079 return hg.incoming(ui, repo, source, opts)
5079 return hg.incoming(ui, repo, source, opts)
5080 finally:
5080 finally:
5081 del repo._subtoppath
5081 del repo._subtoppath
5082
5082
5083
5083
5084 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
5084 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
5085 norepo=True)
5085 norepo=True)
5086 def init(ui, dest=".", **opts):
5086 def init(ui, dest=".", **opts):
5087 """create a new repository in the given directory
5087 """create a new repository in the given directory
5088
5088
5089 Initialize a new repository in the given directory. If the given
5089 Initialize a new repository in the given directory. If the given
5090 directory does not exist, it will be created.
5090 directory does not exist, it will be created.
5091
5091
5092 If no directory is given, the current directory is used.
5092 If no directory is given, the current directory is used.
5093
5093
5094 It is possible to specify an ``ssh://`` URL as the destination.
5094 It is possible to specify an ``ssh://`` URL as the destination.
5095 See :hg:`help urls` for more information.
5095 See :hg:`help urls` for more information.
5096
5096
5097 Returns 0 on success.
5097 Returns 0 on success.
5098 """
5098 """
5099 hg.peer(ui, opts, ui.expandpath(dest), create=True)
5099 hg.peer(ui, opts, ui.expandpath(dest), create=True)
5100
5100
5101 @command('locate',
5101 @command('locate',
5102 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
5102 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
5103 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5103 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5104 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
5104 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
5105 ] + walkopts,
5105 ] + walkopts,
5106 _('[OPTION]... [PATTERN]...'))
5106 _('[OPTION]... [PATTERN]...'))
5107 def locate(ui, repo, *pats, **opts):
5107 def locate(ui, repo, *pats, **opts):
5108 """locate files matching specific patterns (DEPRECATED)
5108 """locate files matching specific patterns (DEPRECATED)
5109
5109
5110 Print files under Mercurial control in the working directory whose
5110 Print files under Mercurial control in the working directory whose
5111 names match the given patterns.
5111 names match the given patterns.
5112
5112
5113 By default, this command searches all directories in the working
5113 By default, this command searches all directories in the working
5114 directory. To search just the current directory and its
5114 directory. To search just the current directory and its
5115 subdirectories, use "--include .".
5115 subdirectories, use "--include .".
5116
5116
5117 If no patterns are given to match, this command prints the names
5117 If no patterns are given to match, this command prints the names
5118 of all files under Mercurial control in the working directory.
5118 of all files under Mercurial control in the working directory.
5119
5119
5120 If you want to feed the output of this command into the "xargs"
5120 If you want to feed the output of this command into the "xargs"
5121 command, use the -0 option to both this command and "xargs". This
5121 command, use the -0 option to both this command and "xargs". This
5122 will avoid the problem of "xargs" treating single filenames that
5122 will avoid the problem of "xargs" treating single filenames that
5123 contain whitespace as multiple filenames.
5123 contain whitespace as multiple filenames.
5124
5124
5125 See :hg:`help files` for a more versatile command.
5125 See :hg:`help files` for a more versatile command.
5126
5126
5127 Returns 0 if a match is found, 1 otherwise.
5127 Returns 0 if a match is found, 1 otherwise.
5128 """
5128 """
5129 if opts.get('print0'):
5129 if opts.get('print0'):
5130 end = '\0'
5130 end = '\0'
5131 else:
5131 else:
5132 end = '\n'
5132 end = '\n'
5133 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
5133 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
5134
5134
5135 ret = 1
5135 ret = 1
5136 ctx = repo[rev]
5136 ctx = repo[rev]
5137 m = scmutil.match(ctx, pats, opts, default='relglob',
5137 m = scmutil.match(ctx, pats, opts, default='relglob',
5138 badfn=lambda x, y: False)
5138 badfn=lambda x, y: False)
5139
5139
5140 for abs in ctx.matches(m):
5140 for abs in ctx.matches(m):
5141 if opts.get('fullpath'):
5141 if opts.get('fullpath'):
5142 ui.write(repo.wjoin(abs), end)
5142 ui.write(repo.wjoin(abs), end)
5143 else:
5143 else:
5144 ui.write(((pats and m.rel(abs)) or abs), end)
5144 ui.write(((pats and m.rel(abs)) or abs), end)
5145 ret = 0
5145 ret = 0
5146
5146
5147 return ret
5147 return ret
5148
5148
5149 @command('^log|history',
5149 @command('^log|history',
5150 [('f', 'follow', None,
5150 [('f', 'follow', None,
5151 _('follow changeset history, or file history across copies and renames')),
5151 _('follow changeset history, or file history across copies and renames')),
5152 ('', 'follow-first', None,
5152 ('', 'follow-first', None,
5153 _('only follow the first parent of merge changesets (DEPRECATED)')),
5153 _('only follow the first parent of merge changesets (DEPRECATED)')),
5154 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
5154 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
5155 ('C', 'copies', None, _('show copied files')),
5155 ('C', 'copies', None, _('show copied files')),
5156 ('k', 'keyword', [],
5156 ('k', 'keyword', [],
5157 _('do case-insensitive search for a given text'), _('TEXT')),
5157 _('do case-insensitive search for a given text'), _('TEXT')),
5158 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
5158 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
5159 ('', 'removed', None, _('include revisions where files were removed')),
5159 ('', 'removed', None, _('include revisions where files were removed')),
5160 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
5160 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
5161 ('u', 'user', [], _('revisions committed by user'), _('USER')),
5161 ('u', 'user', [], _('revisions committed by user'), _('USER')),
5162 ('', 'only-branch', [],
5162 ('', 'only-branch', [],
5163 _('show only changesets within the given named branch (DEPRECATED)'),
5163 _('show only changesets within the given named branch (DEPRECATED)'),
5164 _('BRANCH')),
5164 _('BRANCH')),
5165 ('b', 'branch', [],
5165 ('b', 'branch', [],
5166 _('show changesets within the given named branch'), _('BRANCH')),
5166 _('show changesets within the given named branch'), _('BRANCH')),
5167 ('P', 'prune', [],
5167 ('P', 'prune', [],
5168 _('do not display revision or any of its ancestors'), _('REV')),
5168 _('do not display revision or any of its ancestors'), _('REV')),
5169 ] + logopts + walkopts,
5169 ] + logopts + walkopts,
5170 _('[OPTION]... [FILE]'),
5170 _('[OPTION]... [FILE]'),
5171 inferrepo=True)
5171 inferrepo=True)
5172 def log(ui, repo, *pats, **opts):
5172 def log(ui, repo, *pats, **opts):
5173 """show revision history of entire repository or files
5173 """show revision history of entire repository or files
5174
5174
5175 Print the revision history of the specified files or the entire
5175 Print the revision history of the specified files or the entire
5176 project.
5176 project.
5177
5177
5178 If no revision range is specified, the default is ``tip:0`` unless
5178 If no revision range is specified, the default is ``tip:0`` unless
5179 --follow is set, in which case the working directory parent is
5179 --follow is set, in which case the working directory parent is
5180 used as the starting revision.
5180 used as the starting revision.
5181
5181
5182 File history is shown without following rename or copy history of
5182 File history is shown without following rename or copy history of
5183 files. Use -f/--follow with a filename to follow history across
5183 files. Use -f/--follow with a filename to follow history across
5184 renames and copies. --follow without a filename will only show
5184 renames and copies. --follow without a filename will only show
5185 ancestors or descendants of the starting revision.
5185 ancestors or descendants of the starting revision.
5186
5186
5187 By default this command prints revision number and changeset id,
5187 By default this command prints revision number and changeset id,
5188 tags, non-trivial parents, user, date and time, and a summary for
5188 tags, non-trivial parents, user, date and time, and a summary for
5189 each commit. When the -v/--verbose switch is used, the list of
5189 each commit. When the -v/--verbose switch is used, the list of
5190 changed files and full commit message are shown.
5190 changed files and full commit message are shown.
5191
5191
5192 With --graph the revisions are shown as an ASCII art DAG with the most
5192 With --graph the revisions are shown as an ASCII art DAG with the most
5193 recent changeset at the top.
5193 recent changeset at the top.
5194 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
5194 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
5195 and '+' represents a fork where the changeset from the lines below is a
5195 and '+' represents a fork where the changeset from the lines below is a
5196 parent of the 'o' merge on the same line.
5196 parent of the 'o' merge on the same line.
5197
5197
5198 .. note::
5198 .. note::
5199
5199
5200 :hg:`log --patch` may generate unexpected diff output for merge
5200 :hg:`log --patch` may generate unexpected diff output for merge
5201 changesets, as it will only compare the merge changeset against
5201 changesets, as it will only compare the merge changeset against
5202 its first parent. Also, only files different from BOTH parents
5202 its first parent. Also, only files different from BOTH parents
5203 will appear in files:.
5203 will appear in files:.
5204
5204
5205 .. note::
5205 .. note::
5206
5206
5207 For performance reasons, :hg:`log FILE` may omit duplicate changes
5207 For performance reasons, :hg:`log FILE` may omit duplicate changes
5208 made on branches and will not show removals or mode changes. To
5208 made on branches and will not show removals or mode changes. To
5209 see all such changes, use the --removed switch.
5209 see all such changes, use the --removed switch.
5210
5210
5211 .. container:: verbose
5211 .. container:: verbose
5212
5212
5213 Some examples:
5213 Some examples:
5214
5214
5215 - changesets with full descriptions and file lists::
5215 - changesets with full descriptions and file lists::
5216
5216
5217 hg log -v
5217 hg log -v
5218
5218
5219 - changesets ancestral to the working directory::
5219 - changesets ancestral to the working directory::
5220
5220
5221 hg log -f
5221 hg log -f
5222
5222
5223 - last 10 commits on the current branch::
5223 - last 10 commits on the current branch::
5224
5224
5225 hg log -l 10 -b .
5225 hg log -l 10 -b .
5226
5226
5227 - changesets showing all modifications of a file, including removals::
5227 - changesets showing all modifications of a file, including removals::
5228
5228
5229 hg log --removed file.c
5229 hg log --removed file.c
5230
5230
5231 - all changesets that touch a directory, with diffs, excluding merges::
5231 - all changesets that touch a directory, with diffs, excluding merges::
5232
5232
5233 hg log -Mp lib/
5233 hg log -Mp lib/
5234
5234
5235 - all revision numbers that match a keyword::
5235 - all revision numbers that match a keyword::
5236
5236
5237 hg log -k bug --template "{rev}\\n"
5237 hg log -k bug --template "{rev}\\n"
5238
5238
5239 - the full hash identifier of the working directory parent::
5239 - the full hash identifier of the working directory parent::
5240
5240
5241 hg log -r . --template "{node}\\n"
5241 hg log -r . --template "{node}\\n"
5242
5242
5243 - list available log templates::
5243 - list available log templates::
5244
5244
5245 hg log -T list
5245 hg log -T list
5246
5246
5247 - check if a given changeset is included in a tagged release::
5247 - check if a given changeset is included in a tagged release::
5248
5248
5249 hg log -r "a21ccf and ancestor(1.9)"
5249 hg log -r "a21ccf and ancestor(1.9)"
5250
5250
5251 - find all changesets by some user in a date range::
5251 - find all changesets by some user in a date range::
5252
5252
5253 hg log -k alice -d "may 2008 to jul 2008"
5253 hg log -k alice -d "may 2008 to jul 2008"
5254
5254
5255 - summary of all changesets after the last tag::
5255 - summary of all changesets after the last tag::
5256
5256
5257 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5257 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5258
5258
5259 See :hg:`help dates` for a list of formats valid for -d/--date.
5259 See :hg:`help dates` for a list of formats valid for -d/--date.
5260
5260
5261 See :hg:`help revisions` and :hg:`help revsets` for more about
5261 See :hg:`help revisions` and :hg:`help revsets` for more about
5262 specifying and ordering revisions.
5262 specifying and ordering revisions.
5263
5263
5264 See :hg:`help templates` for more about pre-packaged styles and
5264 See :hg:`help templates` for more about pre-packaged styles and
5265 specifying custom templates.
5265 specifying custom templates.
5266
5266
5267 Returns 0 on success.
5267 Returns 0 on success.
5268
5268
5269 """
5269 """
5270 if opts.get('follow') and opts.get('rev'):
5270 if opts.get('follow') and opts.get('rev'):
5271 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5271 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5272 del opts['follow']
5272 del opts['follow']
5273
5273
5274 if opts.get('graph'):
5274 if opts.get('graph'):
5275 return cmdutil.graphlog(ui, repo, *pats, **opts)
5275 return cmdutil.graphlog(ui, repo, *pats, **opts)
5276
5276
5277 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5277 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5278 limit = cmdutil.loglimit(opts)
5278 limit = cmdutil.loglimit(opts)
5279 count = 0
5279 count = 0
5280
5280
5281 getrenamed = None
5281 getrenamed = None
5282 if opts.get('copies'):
5282 if opts.get('copies'):
5283 endrev = None
5283 endrev = None
5284 if opts.get('rev'):
5284 if opts.get('rev'):
5285 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5285 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5286 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5286 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5287
5287
5288 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5288 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5289 for rev in revs:
5289 for rev in revs:
5290 if count == limit:
5290 if count == limit:
5291 break
5291 break
5292 ctx = repo[rev]
5292 ctx = repo[rev]
5293 copies = None
5293 copies = None
5294 if getrenamed is not None and rev:
5294 if getrenamed is not None and rev:
5295 copies = []
5295 copies = []
5296 for fn in ctx.files():
5296 for fn in ctx.files():
5297 rename = getrenamed(fn, rev)
5297 rename = getrenamed(fn, rev)
5298 if rename:
5298 if rename:
5299 copies.append((fn, rename[0]))
5299 copies.append((fn, rename[0]))
5300 if filematcher:
5300 if filematcher:
5301 revmatchfn = filematcher(ctx.rev())
5301 revmatchfn = filematcher(ctx.rev())
5302 else:
5302 else:
5303 revmatchfn = None
5303 revmatchfn = None
5304 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5304 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5305 if displayer.flush(ctx):
5305 if displayer.flush(ctx):
5306 count += 1
5306 count += 1
5307
5307
5308 displayer.close()
5308 displayer.close()
5309
5309
5310 @command('manifest',
5310 @command('manifest',
5311 [('r', 'rev', '', _('revision to display'), _('REV')),
5311 [('r', 'rev', '', _('revision to display'), _('REV')),
5312 ('', 'all', False, _("list files from all revisions"))]
5312 ('', 'all', False, _("list files from all revisions"))]
5313 + formatteropts,
5313 + formatteropts,
5314 _('[-r REV]'))
5314 _('[-r REV]'))
5315 def manifest(ui, repo, node=None, rev=None, **opts):
5315 def manifest(ui, repo, node=None, rev=None, **opts):
5316 """output the current or given revision of the project manifest
5316 """output the current or given revision of the project manifest
5317
5317
5318 Print a list of version controlled files for the given revision.
5318 Print a list of version controlled files for the given revision.
5319 If no revision is given, the first parent of the working directory
5319 If no revision is given, the first parent of the working directory
5320 is used, or the null revision if no revision is checked out.
5320 is used, or the null revision if no revision is checked out.
5321
5321
5322 With -v, print file permissions, symlink and executable bits.
5322 With -v, print file permissions, symlink and executable bits.
5323 With --debug, print file revision hashes.
5323 With --debug, print file revision hashes.
5324
5324
5325 If option --all is specified, the list of all files from all revisions
5325 If option --all is specified, the list of all files from all revisions
5326 is printed. This includes deleted and renamed files.
5326 is printed. This includes deleted and renamed files.
5327
5327
5328 Returns 0 on success.
5328 Returns 0 on success.
5329 """
5329 """
5330
5330
5331 fm = ui.formatter('manifest', opts)
5331 fm = ui.formatter('manifest', opts)
5332
5332
5333 if opts.get('all'):
5333 if opts.get('all'):
5334 if rev or node:
5334 if rev or node:
5335 raise error.Abort(_("can't specify a revision with --all"))
5335 raise error.Abort(_("can't specify a revision with --all"))
5336
5336
5337 res = []
5337 res = []
5338 prefix = "data/"
5338 prefix = "data/"
5339 suffix = ".i"
5339 suffix = ".i"
5340 plen = len(prefix)
5340 plen = len(prefix)
5341 slen = len(suffix)
5341 slen = len(suffix)
5342 with repo.lock():
5342 with repo.lock():
5343 for fn, b, size in repo.store.datafiles():
5343 for fn, b, size in repo.store.datafiles():
5344 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5344 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5345 res.append(fn[plen:-slen])
5345 res.append(fn[plen:-slen])
5346 for f in res:
5346 for f in res:
5347 fm.startitem()
5347 fm.startitem()
5348 fm.write("path", '%s\n', f)
5348 fm.write("path", '%s\n', f)
5349 fm.end()
5349 fm.end()
5350 return
5350 return
5351
5351
5352 if rev and node:
5352 if rev and node:
5353 raise error.Abort(_("please specify just one revision"))
5353 raise error.Abort(_("please specify just one revision"))
5354
5354
5355 if not node:
5355 if not node:
5356 node = rev
5356 node = rev
5357
5357
5358 char = {'l': '@', 'x': '*', '': ''}
5358 char = {'l': '@', 'x': '*', '': ''}
5359 mode = {'l': '644', 'x': '755', '': '644'}
5359 mode = {'l': '644', 'x': '755', '': '644'}
5360 ctx = scmutil.revsingle(repo, node)
5360 ctx = scmutil.revsingle(repo, node)
5361 mf = ctx.manifest()
5361 mf = ctx.manifest()
5362 for f in ctx:
5362 for f in ctx:
5363 fm.startitem()
5363 fm.startitem()
5364 fl = ctx[f].flags()
5364 fl = ctx[f].flags()
5365 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5365 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5366 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5366 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5367 fm.write('path', '%s\n', f)
5367 fm.write('path', '%s\n', f)
5368 fm.end()
5368 fm.end()
5369
5369
5370 @command('^merge',
5370 @command('^merge',
5371 [('f', 'force', None,
5371 [('f', 'force', None,
5372 _('force a merge including outstanding changes (DEPRECATED)')),
5372 _('force a merge including outstanding changes (DEPRECATED)')),
5373 ('r', 'rev', '', _('revision to merge'), _('REV')),
5373 ('r', 'rev', '', _('revision to merge'), _('REV')),
5374 ('P', 'preview', None,
5374 ('P', 'preview', None,
5375 _('review revisions to merge (no merge is performed)'))
5375 _('review revisions to merge (no merge is performed)'))
5376 ] + mergetoolopts,
5376 ] + mergetoolopts,
5377 _('[-P] [[-r] REV]'))
5377 _('[-P] [[-r] REV]'))
5378 def merge(ui, repo, node=None, **opts):
5378 def merge(ui, repo, node=None, **opts):
5379 """merge another revision into working directory
5379 """merge another revision into working directory
5380
5380
5381 The current working directory is updated with all changes made in
5381 The current working directory is updated with all changes made in
5382 the requested revision since the last common predecessor revision.
5382 the requested revision since the last common predecessor revision.
5383
5383
5384 Files that changed between either parent are marked as changed for
5384 Files that changed between either parent are marked as changed for
5385 the next commit and a commit must be performed before any further
5385 the next commit and a commit must be performed before any further
5386 updates to the repository are allowed. The next commit will have
5386 updates to the repository are allowed. The next commit will have
5387 two parents.
5387 two parents.
5388
5388
5389 ``--tool`` can be used to specify the merge tool used for file
5389 ``--tool`` can be used to specify the merge tool used for file
5390 merges. It overrides the HGMERGE environment variable and your
5390 merges. It overrides the HGMERGE environment variable and your
5391 configuration files. See :hg:`help merge-tools` for options.
5391 configuration files. See :hg:`help merge-tools` for options.
5392
5392
5393 If no revision is specified, the working directory's parent is a
5393 If no revision is specified, the working directory's parent is a
5394 head revision, and the current branch contains exactly one other
5394 head revision, and the current branch contains exactly one other
5395 head, the other head is merged with by default. Otherwise, an
5395 head, the other head is merged with by default. Otherwise, an
5396 explicit revision with which to merge with must be provided.
5396 explicit revision with which to merge with must be provided.
5397
5397
5398 See :hg:`help resolve` for information on handling file conflicts.
5398 See :hg:`help resolve` for information on handling file conflicts.
5399
5399
5400 To undo an uncommitted merge, use :hg:`update --clean .` which
5400 To undo an uncommitted merge, use :hg:`update --clean .` which
5401 will check out a clean copy of the original merge parent, losing
5401 will check out a clean copy of the original merge parent, losing
5402 all changes.
5402 all changes.
5403
5403
5404 Returns 0 on success, 1 if there are unresolved files.
5404 Returns 0 on success, 1 if there are unresolved files.
5405 """
5405 """
5406
5406
5407 if opts.get('rev') and node:
5407 if opts.get('rev') and node:
5408 raise error.Abort(_("please specify just one revision"))
5408 raise error.Abort(_("please specify just one revision"))
5409 if not node:
5409 if not node:
5410 node = opts.get('rev')
5410 node = opts.get('rev')
5411
5411
5412 if node:
5412 if node:
5413 node = scmutil.revsingle(repo, node).node()
5413 node = scmutil.revsingle(repo, node).node()
5414
5414
5415 if not node:
5415 if not node:
5416 node = repo[destutil.destmerge(repo)].node()
5416 node = repo[destutil.destmerge(repo)].node()
5417
5417
5418 if opts.get('preview'):
5418 if opts.get('preview'):
5419 # find nodes that are ancestors of p2 but not of p1
5419 # find nodes that are ancestors of p2 but not of p1
5420 p1 = repo.lookup('.')
5420 p1 = repo.lookup('.')
5421 p2 = repo.lookup(node)
5421 p2 = repo.lookup(node)
5422 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5422 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5423
5423
5424 displayer = cmdutil.show_changeset(ui, repo, opts)
5424 displayer = cmdutil.show_changeset(ui, repo, opts)
5425 for node in nodes:
5425 for node in nodes:
5426 displayer.show(repo[node])
5426 displayer.show(repo[node])
5427 displayer.close()
5427 displayer.close()
5428 return 0
5428 return 0
5429
5429
5430 try:
5430 try:
5431 # ui.forcemerge is an internal variable, do not document
5431 # ui.forcemerge is an internal variable, do not document
5432 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5432 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5433 force = opts.get('force')
5433 force = opts.get('force')
5434 return hg.merge(repo, node, force=force, mergeforce=force)
5434 return hg.merge(repo, node, force=force, mergeforce=force)
5435 finally:
5435 finally:
5436 ui.setconfig('ui', 'forcemerge', '', 'merge')
5436 ui.setconfig('ui', 'forcemerge', '', 'merge')
5437
5437
5438 @command('outgoing|out',
5438 @command('outgoing|out',
5439 [('f', 'force', None, _('run even when the destination is unrelated')),
5439 [('f', 'force', None, _('run even when the destination is unrelated')),
5440 ('r', 'rev', [],
5440 ('r', 'rev', [],
5441 _('a changeset intended to be included in the destination'), _('REV')),
5441 _('a changeset intended to be included in the destination'), _('REV')),
5442 ('n', 'newest-first', None, _('show newest record first')),
5442 ('n', 'newest-first', None, _('show newest record first')),
5443 ('B', 'bookmarks', False, _('compare bookmarks')),
5443 ('B', 'bookmarks', False, _('compare bookmarks')),
5444 ('b', 'branch', [], _('a specific branch you would like to push'),
5444 ('b', 'branch', [], _('a specific branch you would like to push'),
5445 _('BRANCH')),
5445 _('BRANCH')),
5446 ] + logopts + remoteopts + subrepoopts,
5446 ] + logopts + remoteopts + subrepoopts,
5447 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5447 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5448 def outgoing(ui, repo, dest=None, **opts):
5448 def outgoing(ui, repo, dest=None, **opts):
5449 """show changesets not found in the destination
5449 """show changesets not found in the destination
5450
5450
5451 Show changesets not found in the specified destination repository
5451 Show changesets not found in the specified destination repository
5452 or the default push location. These are the changesets that would
5452 or the default push location. These are the changesets that would
5453 be pushed if a push was requested.
5453 be pushed if a push was requested.
5454
5454
5455 See pull for details of valid destination formats.
5455 See pull for details of valid destination formats.
5456
5456
5457 .. container:: verbose
5457 .. container:: verbose
5458
5458
5459 With -B/--bookmarks, the result of bookmark comparison between
5459 With -B/--bookmarks, the result of bookmark comparison between
5460 local and remote repositories is displayed. With -v/--verbose,
5460 local and remote repositories is displayed. With -v/--verbose,
5461 status is also displayed for each bookmark like below::
5461 status is also displayed for each bookmark like below::
5462
5462
5463 BM1 01234567890a added
5463 BM1 01234567890a added
5464 BM2 deleted
5464 BM2 deleted
5465 BM3 234567890abc advanced
5465 BM3 234567890abc advanced
5466 BM4 34567890abcd diverged
5466 BM4 34567890abcd diverged
5467 BM5 4567890abcde changed
5467 BM5 4567890abcde changed
5468
5468
5469 The action taken when pushing depends on the
5469 The action taken when pushing depends on the
5470 status of each bookmark:
5470 status of each bookmark:
5471
5471
5472 :``added``: push with ``-B`` will create it
5472 :``added``: push with ``-B`` will create it
5473 :``deleted``: push with ``-B`` will delete it
5473 :``deleted``: push with ``-B`` will delete it
5474 :``advanced``: push will update it
5474 :``advanced``: push will update it
5475 :``diverged``: push with ``-B`` will update it
5475 :``diverged``: push with ``-B`` will update it
5476 :``changed``: push with ``-B`` will update it
5476 :``changed``: push with ``-B`` will update it
5477
5477
5478 From the point of view of pushing behavior, bookmarks
5478 From the point of view of pushing behavior, bookmarks
5479 existing only in the remote repository are treated as
5479 existing only in the remote repository are treated as
5480 ``deleted``, even if it is in fact added remotely.
5480 ``deleted``, even if it is in fact added remotely.
5481
5481
5482 Returns 0 if there are outgoing changes, 1 otherwise.
5482 Returns 0 if there are outgoing changes, 1 otherwise.
5483 """
5483 """
5484 if opts.get('graph'):
5484 if opts.get('graph'):
5485 cmdutil.checkunsupportedgraphflags([], opts)
5485 cmdutil.checkunsupportedgraphflags([], opts)
5486 o, other = hg._outgoing(ui, repo, dest, opts)
5486 o, other = hg._outgoing(ui, repo, dest, opts)
5487 if not o:
5487 if not o:
5488 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5488 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5489 return
5489 return
5490
5490
5491 revdag = cmdutil.graphrevs(repo, o, opts)
5491 revdag = cmdutil.graphrevs(repo, o, opts)
5492 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5492 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5493 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5493 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5494 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5494 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5495 return 0
5495 return 0
5496
5496
5497 if opts.get('bookmarks'):
5497 if opts.get('bookmarks'):
5498 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5498 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5499 dest, branches = hg.parseurl(dest, opts.get('branch'))
5499 dest, branches = hg.parseurl(dest, opts.get('branch'))
5500 other = hg.peer(repo, opts, dest)
5500 other = hg.peer(repo, opts, dest)
5501 if 'bookmarks' not in other.listkeys('namespaces'):
5501 if 'bookmarks' not in other.listkeys('namespaces'):
5502 ui.warn(_("remote doesn't support bookmarks\n"))
5502 ui.warn(_("remote doesn't support bookmarks\n"))
5503 return 0
5503 return 0
5504 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5504 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5505 return bookmarks.outgoing(ui, repo, other)
5505 return bookmarks.outgoing(ui, repo, other)
5506
5506
5507 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5507 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5508 try:
5508 try:
5509 return hg.outgoing(ui, repo, dest, opts)
5509 return hg.outgoing(ui, repo, dest, opts)
5510 finally:
5510 finally:
5511 del repo._subtoppath
5511 del repo._subtoppath
5512
5512
5513 @command('parents',
5513 @command('parents',
5514 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5514 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5515 ] + templateopts,
5515 ] + templateopts,
5516 _('[-r REV] [FILE]'),
5516 _('[-r REV] [FILE]'),
5517 inferrepo=True)
5517 inferrepo=True)
5518 def parents(ui, repo, file_=None, **opts):
5518 def parents(ui, repo, file_=None, **opts):
5519 """show the parents of the working directory or revision (DEPRECATED)
5519 """show the parents of the working directory or revision (DEPRECATED)
5520
5520
5521 Print the working directory's parent revisions. If a revision is
5521 Print the working directory's parent revisions. If a revision is
5522 given via -r/--rev, the parent of that revision will be printed.
5522 given via -r/--rev, the parent of that revision will be printed.
5523 If a file argument is given, the revision in which the file was
5523 If a file argument is given, the revision in which the file was
5524 last changed (before the working directory revision or the
5524 last changed (before the working directory revision or the
5525 argument to --rev if given) is printed.
5525 argument to --rev if given) is printed.
5526
5526
5527 This command is equivalent to::
5527 This command is equivalent to::
5528
5528
5529 hg log -r "p1()+p2()" or
5529 hg log -r "p1()+p2()" or
5530 hg log -r "p1(REV)+p2(REV)" or
5530 hg log -r "p1(REV)+p2(REV)" or
5531 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5531 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5532 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5532 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5533
5533
5534 See :hg:`summary` and :hg:`help revsets` for related information.
5534 See :hg:`summary` and :hg:`help revsets` for related information.
5535
5535
5536 Returns 0 on success.
5536 Returns 0 on success.
5537 """
5537 """
5538
5538
5539 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5539 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5540
5540
5541 if file_:
5541 if file_:
5542 m = scmutil.match(ctx, (file_,), opts)
5542 m = scmutil.match(ctx, (file_,), opts)
5543 if m.anypats() or len(m.files()) != 1:
5543 if m.anypats() or len(m.files()) != 1:
5544 raise error.Abort(_('can only specify an explicit filename'))
5544 raise error.Abort(_('can only specify an explicit filename'))
5545 file_ = m.files()[0]
5545 file_ = m.files()[0]
5546 filenodes = []
5546 filenodes = []
5547 for cp in ctx.parents():
5547 for cp in ctx.parents():
5548 if not cp:
5548 if not cp:
5549 continue
5549 continue
5550 try:
5550 try:
5551 filenodes.append(cp.filenode(file_))
5551 filenodes.append(cp.filenode(file_))
5552 except error.LookupError:
5552 except error.LookupError:
5553 pass
5553 pass
5554 if not filenodes:
5554 if not filenodes:
5555 raise error.Abort(_("'%s' not found in manifest!") % file_)
5555 raise error.Abort(_("'%s' not found in manifest!") % file_)
5556 p = []
5556 p = []
5557 for fn in filenodes:
5557 for fn in filenodes:
5558 fctx = repo.filectx(file_, fileid=fn)
5558 fctx = repo.filectx(file_, fileid=fn)
5559 p.append(fctx.node())
5559 p.append(fctx.node())
5560 else:
5560 else:
5561 p = [cp.node() for cp in ctx.parents()]
5561 p = [cp.node() for cp in ctx.parents()]
5562
5562
5563 displayer = cmdutil.show_changeset(ui, repo, opts)
5563 displayer = cmdutil.show_changeset(ui, repo, opts)
5564 for n in p:
5564 for n in p:
5565 if n != nullid:
5565 if n != nullid:
5566 displayer.show(repo[n])
5566 displayer.show(repo[n])
5567 displayer.close()
5567 displayer.close()
5568
5568
5569 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
5569 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
5570 def paths(ui, repo, search=None, **opts):
5570 def paths(ui, repo, search=None, **opts):
5571 """show aliases for remote repositories
5571 """show aliases for remote repositories
5572
5572
5573 Show definition of symbolic path name NAME. If no name is given,
5573 Show definition of symbolic path name NAME. If no name is given,
5574 show definition of all available names.
5574 show definition of all available names.
5575
5575
5576 Option -q/--quiet suppresses all output when searching for NAME
5576 Option -q/--quiet suppresses all output when searching for NAME
5577 and shows only the path names when listing all definitions.
5577 and shows only the path names when listing all definitions.
5578
5578
5579 Path names are defined in the [paths] section of your
5579 Path names are defined in the [paths] section of your
5580 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5580 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5581 repository, ``.hg/hgrc`` is used, too.
5581 repository, ``.hg/hgrc`` is used, too.
5582
5582
5583 The path names ``default`` and ``default-push`` have a special
5583 The path names ``default`` and ``default-push`` have a special
5584 meaning. When performing a push or pull operation, they are used
5584 meaning. When performing a push or pull operation, they are used
5585 as fallbacks if no location is specified on the command-line.
5585 as fallbacks if no location is specified on the command-line.
5586 When ``default-push`` is set, it will be used for push and
5586 When ``default-push`` is set, it will be used for push and
5587 ``default`` will be used for pull; otherwise ``default`` is used
5587 ``default`` will be used for pull; otherwise ``default`` is used
5588 as the fallback for both. When cloning a repository, the clone
5588 as the fallback for both. When cloning a repository, the clone
5589 source is written as ``default`` in ``.hg/hgrc``.
5589 source is written as ``default`` in ``.hg/hgrc``.
5590
5590
5591 .. note::
5591 .. note::
5592
5592
5593 ``default`` and ``default-push`` apply to all inbound (e.g.
5593 ``default`` and ``default-push`` apply to all inbound (e.g.
5594 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5594 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5595 and :hg:`bundle`) operations.
5595 and :hg:`bundle`) operations.
5596
5596
5597 See :hg:`help urls` for more information.
5597 See :hg:`help urls` for more information.
5598
5598
5599 Returns 0 on success.
5599 Returns 0 on success.
5600 """
5600 """
5601 if search:
5601 if search:
5602 pathitems = [(name, path) for name, path in ui.paths.iteritems()
5602 pathitems = [(name, path) for name, path in ui.paths.iteritems()
5603 if name == search]
5603 if name == search]
5604 else:
5604 else:
5605 pathitems = sorted(ui.paths.iteritems())
5605 pathitems = sorted(ui.paths.iteritems())
5606
5606
5607 fm = ui.formatter('paths', opts)
5607 fm = ui.formatter('paths', opts)
5608 if fm:
5608 if fm:
5609 hidepassword = str
5609 hidepassword = str
5610 else:
5610 else:
5611 hidepassword = util.hidepassword
5611 hidepassword = util.hidepassword
5612 if ui.quiet:
5612 if ui.quiet:
5613 namefmt = '%s\n'
5613 namefmt = '%s\n'
5614 else:
5614 else:
5615 namefmt = '%s = '
5615 namefmt = '%s = '
5616 showsubopts = not search and not ui.quiet
5616 showsubopts = not search and not ui.quiet
5617
5617
5618 for name, path in pathitems:
5618 for name, path in pathitems:
5619 fm.startitem()
5619 fm.startitem()
5620 fm.condwrite(not search, 'name', namefmt, name)
5620 fm.condwrite(not search, 'name', namefmt, name)
5621 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
5621 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
5622 for subopt, value in sorted(path.suboptions.items()):
5622 for subopt, value in sorted(path.suboptions.items()):
5623 assert subopt not in ('name', 'url')
5623 assert subopt not in ('name', 'url')
5624 if showsubopts:
5624 if showsubopts:
5625 fm.plain('%s:%s = ' % (name, subopt))
5625 fm.plain('%s:%s = ' % (name, subopt))
5626 fm.condwrite(showsubopts, subopt, '%s\n', value)
5626 fm.condwrite(showsubopts, subopt, '%s\n', value)
5627
5627
5628 fm.end()
5628 fm.end()
5629
5629
5630 if search and not pathitems:
5630 if search and not pathitems:
5631 if not ui.quiet:
5631 if not ui.quiet:
5632 ui.warn(_("not found!\n"))
5632 ui.warn(_("not found!\n"))
5633 return 1
5633 return 1
5634 else:
5634 else:
5635 return 0
5635 return 0
5636
5636
5637 @command('phase',
5637 @command('phase',
5638 [('p', 'public', False, _('set changeset phase to public')),
5638 [('p', 'public', False, _('set changeset phase to public')),
5639 ('d', 'draft', False, _('set changeset phase to draft')),
5639 ('d', 'draft', False, _('set changeset phase to draft')),
5640 ('s', 'secret', False, _('set changeset phase to secret')),
5640 ('s', 'secret', False, _('set changeset phase to secret')),
5641 ('f', 'force', False, _('allow to move boundary backward')),
5641 ('f', 'force', False, _('allow to move boundary backward')),
5642 ('r', 'rev', [], _('target revision'), _('REV')),
5642 ('r', 'rev', [], _('target revision'), _('REV')),
5643 ],
5643 ],
5644 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5644 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5645 def phase(ui, repo, *revs, **opts):
5645 def phase(ui, repo, *revs, **opts):
5646 """set or show the current phase name
5646 """set or show the current phase name
5647
5647
5648 With no argument, show the phase name of the current revision(s).
5648 With no argument, show the phase name of the current revision(s).
5649
5649
5650 With one of -p/--public, -d/--draft or -s/--secret, change the
5650 With one of -p/--public, -d/--draft or -s/--secret, change the
5651 phase value of the specified revisions.
5651 phase value of the specified revisions.
5652
5652
5653 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5653 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5654 lower phase to an higher phase. Phases are ordered as follows::
5654 lower phase to an higher phase. Phases are ordered as follows::
5655
5655
5656 public < draft < secret
5656 public < draft < secret
5657
5657
5658 Returns 0 on success, 1 if some phases could not be changed.
5658 Returns 0 on success, 1 if some phases could not be changed.
5659
5659
5660 (For more information about the phases concept, see :hg:`help phases`.)
5660 (For more information about the phases concept, see :hg:`help phases`.)
5661 """
5661 """
5662 # search for a unique phase argument
5662 # search for a unique phase argument
5663 targetphase = None
5663 targetphase = None
5664 for idx, name in enumerate(phases.phasenames):
5664 for idx, name in enumerate(phases.phasenames):
5665 if opts[name]:
5665 if opts[name]:
5666 if targetphase is not None:
5666 if targetphase is not None:
5667 raise error.Abort(_('only one phase can be specified'))
5667 raise error.Abort(_('only one phase can be specified'))
5668 targetphase = idx
5668 targetphase = idx
5669
5669
5670 # look for specified revision
5670 # look for specified revision
5671 revs = list(revs)
5671 revs = list(revs)
5672 revs.extend(opts['rev'])
5672 revs.extend(opts['rev'])
5673 if not revs:
5673 if not revs:
5674 # display both parents as the second parent phase can influence
5674 # display both parents as the second parent phase can influence
5675 # the phase of a merge commit
5675 # the phase of a merge commit
5676 revs = [c.rev() for c in repo[None].parents()]
5676 revs = [c.rev() for c in repo[None].parents()]
5677
5677
5678 revs = scmutil.revrange(repo, revs)
5678 revs = scmutil.revrange(repo, revs)
5679
5679
5680 lock = None
5680 lock = None
5681 ret = 0
5681 ret = 0
5682 if targetphase is None:
5682 if targetphase is None:
5683 # display
5683 # display
5684 for r in revs:
5684 for r in revs:
5685 ctx = repo[r]
5685 ctx = repo[r]
5686 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5686 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5687 else:
5687 else:
5688 tr = None
5688 tr = None
5689 lock = repo.lock()
5689 lock = repo.lock()
5690 try:
5690 try:
5691 tr = repo.transaction("phase")
5691 tr = repo.transaction("phase")
5692 # set phase
5692 # set phase
5693 if not revs:
5693 if not revs:
5694 raise error.Abort(_('empty revision set'))
5694 raise error.Abort(_('empty revision set'))
5695 nodes = [repo[r].node() for r in revs]
5695 nodes = [repo[r].node() for r in revs]
5696 # moving revision from public to draft may hide them
5696 # moving revision from public to draft may hide them
5697 # We have to check result on an unfiltered repository
5697 # We have to check result on an unfiltered repository
5698 unfi = repo.unfiltered()
5698 unfi = repo.unfiltered()
5699 getphase = unfi._phasecache.phase
5699 getphase = unfi._phasecache.phase
5700 olddata = [getphase(unfi, r) for r in unfi]
5700 olddata = [getphase(unfi, r) for r in unfi]
5701 phases.advanceboundary(repo, tr, targetphase, nodes)
5701 phases.advanceboundary(repo, tr, targetphase, nodes)
5702 if opts['force']:
5702 if opts['force']:
5703 phases.retractboundary(repo, tr, targetphase, nodes)
5703 phases.retractboundary(repo, tr, targetphase, nodes)
5704 tr.close()
5704 tr.close()
5705 finally:
5705 finally:
5706 if tr is not None:
5706 if tr is not None:
5707 tr.release()
5707 tr.release()
5708 lock.release()
5708 lock.release()
5709 getphase = unfi._phasecache.phase
5709 getphase = unfi._phasecache.phase
5710 newdata = [getphase(unfi, r) for r in unfi]
5710 newdata = [getphase(unfi, r) for r in unfi]
5711 changes = sum(newdata[r] != olddata[r] for r in unfi)
5711 changes = sum(newdata[r] != olddata[r] for r in unfi)
5712 cl = unfi.changelog
5712 cl = unfi.changelog
5713 rejected = [n for n in nodes
5713 rejected = [n for n in nodes
5714 if newdata[cl.rev(n)] < targetphase]
5714 if newdata[cl.rev(n)] < targetphase]
5715 if rejected:
5715 if rejected:
5716 ui.warn(_('cannot move %i changesets to a higher '
5716 ui.warn(_('cannot move %i changesets to a higher '
5717 'phase, use --force\n') % len(rejected))
5717 'phase, use --force\n') % len(rejected))
5718 ret = 1
5718 ret = 1
5719 if changes:
5719 if changes:
5720 msg = _('phase changed for %i changesets\n') % changes
5720 msg = _('phase changed for %i changesets\n') % changes
5721 if ret:
5721 if ret:
5722 ui.status(msg)
5722 ui.status(msg)
5723 else:
5723 else:
5724 ui.note(msg)
5724 ui.note(msg)
5725 else:
5725 else:
5726 ui.warn(_('no phases changed\n'))
5726 ui.warn(_('no phases changed\n'))
5727 return ret
5727 return ret
5728
5728
5729 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5729 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5730 """Run after a changegroup has been added via pull/unbundle
5730 """Run after a changegroup has been added via pull/unbundle
5731
5731
5732 This takes arguments below:
5732 This takes arguments below:
5733
5733
5734 :modheads: change of heads by pull/unbundle
5734 :modheads: change of heads by pull/unbundle
5735 :optupdate: updating working directory is needed or not
5735 :optupdate: updating working directory is needed or not
5736 :checkout: update destination revision (or None to default destination)
5736 :checkout: update destination revision (or None to default destination)
5737 :brev: a name, which might be a bookmark to be activated after updating
5737 :brev: a name, which might be a bookmark to be activated after updating
5738 """
5738 """
5739 if modheads == 0:
5739 if modheads == 0:
5740 return
5740 return
5741 if optupdate:
5741 if optupdate:
5742 try:
5742 try:
5743 return hg.updatetotally(ui, repo, checkout, brev)
5743 return hg.updatetotally(ui, repo, checkout, brev)
5744 except error.UpdateAbort as inst:
5744 except error.UpdateAbort as inst:
5745 msg = _("not updating: %s") % str(inst)
5745 msg = _("not updating: %s") % str(inst)
5746 hint = inst.hint
5746 hint = inst.hint
5747 raise error.UpdateAbort(msg, hint=hint)
5747 raise error.UpdateAbort(msg, hint=hint)
5748 if modheads > 1:
5748 if modheads > 1:
5749 currentbranchheads = len(repo.branchheads())
5749 currentbranchheads = len(repo.branchheads())
5750 if currentbranchheads == modheads:
5750 if currentbranchheads == modheads:
5751 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5751 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5752 elif currentbranchheads > 1:
5752 elif currentbranchheads > 1:
5753 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5753 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5754 "merge)\n"))
5754 "merge)\n"))
5755 else:
5755 else:
5756 ui.status(_("(run 'hg heads' to see heads)\n"))
5756 ui.status(_("(run 'hg heads' to see heads)\n"))
5757 else:
5757 else:
5758 ui.status(_("(run 'hg update' to get a working copy)\n"))
5758 ui.status(_("(run 'hg update' to get a working copy)\n"))
5759
5759
5760 @command('^pull',
5760 @command('^pull',
5761 [('u', 'update', None,
5761 [('u', 'update', None,
5762 _('update to new branch head if changesets were pulled')),
5762 _('update to new branch head if changesets were pulled')),
5763 ('f', 'force', None, _('run even when remote repository is unrelated')),
5763 ('f', 'force', None, _('run even when remote repository is unrelated')),
5764 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5764 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5765 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5765 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5766 ('b', 'branch', [], _('a specific branch you would like to pull'),
5766 ('b', 'branch', [], _('a specific branch you would like to pull'),
5767 _('BRANCH')),
5767 _('BRANCH')),
5768 ] + remoteopts,
5768 ] + remoteopts,
5769 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5769 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5770 def pull(ui, repo, source="default", **opts):
5770 def pull(ui, repo, source="default", **opts):
5771 """pull changes from the specified source
5771 """pull changes from the specified source
5772
5772
5773 Pull changes from a remote repository to a local one.
5773 Pull changes from a remote repository to a local one.
5774
5774
5775 This finds all changes from the repository at the specified path
5775 This finds all changes from the repository at the specified path
5776 or URL and adds them to a local repository (the current one unless
5776 or URL and adds them to a local repository (the current one unless
5777 -R is specified). By default, this does not update the copy of the
5777 -R is specified). By default, this does not update the copy of the
5778 project in the working directory.
5778 project in the working directory.
5779
5779
5780 Use :hg:`incoming` if you want to see what would have been added
5780 Use :hg:`incoming` if you want to see what would have been added
5781 by a pull at the time you issued this command. If you then decide
5781 by a pull at the time you issued this command. If you then decide
5782 to add those changes to the repository, you should use :hg:`pull
5782 to add those changes to the repository, you should use :hg:`pull
5783 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5783 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5784
5784
5785 If SOURCE is omitted, the 'default' path will be used.
5785 If SOURCE is omitted, the 'default' path will be used.
5786 See :hg:`help urls` for more information.
5786 See :hg:`help urls` for more information.
5787
5787
5788 Specifying bookmark as ``.`` is equivalent to specifying the active
5788 Specifying bookmark as ``.`` is equivalent to specifying the active
5789 bookmark's name.
5789 bookmark's name.
5790
5790
5791 Returns 0 on success, 1 if an update had unresolved files.
5791 Returns 0 on success, 1 if an update had unresolved files.
5792 """
5792 """
5793 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5793 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5794 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5794 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5795 other = hg.peer(repo, opts, source)
5795 other = hg.peer(repo, opts, source)
5796 try:
5796 try:
5797 revs, checkout = hg.addbranchrevs(repo, other, branches,
5797 revs, checkout = hg.addbranchrevs(repo, other, branches,
5798 opts.get('rev'))
5798 opts.get('rev'))
5799
5799
5800
5800
5801 pullopargs = {}
5801 pullopargs = {}
5802 if opts.get('bookmark'):
5802 if opts.get('bookmark'):
5803 if not revs:
5803 if not revs:
5804 revs = []
5804 revs = []
5805 # The list of bookmark used here is not the one used to actually
5805 # The list of bookmark used here is not the one used to actually
5806 # update the bookmark name. This can result in the revision pulled
5806 # update the bookmark name. This can result in the revision pulled
5807 # not ending up with the name of the bookmark because of a race
5807 # not ending up with the name of the bookmark because of a race
5808 # condition on the server. (See issue 4689 for details)
5808 # condition on the server. (See issue 4689 for details)
5809 remotebookmarks = other.listkeys('bookmarks')
5809 remotebookmarks = other.listkeys('bookmarks')
5810 pullopargs['remotebookmarks'] = remotebookmarks
5810 pullopargs['remotebookmarks'] = remotebookmarks
5811 for b in opts['bookmark']:
5811 for b in opts['bookmark']:
5812 b = repo._bookmarks.expandname(b)
5812 b = repo._bookmarks.expandname(b)
5813 if b not in remotebookmarks:
5813 if b not in remotebookmarks:
5814 raise error.Abort(_('remote bookmark %s not found!') % b)
5814 raise error.Abort(_('remote bookmark %s not found!') % b)
5815 revs.append(remotebookmarks[b])
5815 revs.append(remotebookmarks[b])
5816
5816
5817 if revs:
5817 if revs:
5818 try:
5818 try:
5819 # When 'rev' is a bookmark name, we cannot guarantee that it
5819 # When 'rev' is a bookmark name, we cannot guarantee that it
5820 # will be updated with that name because of a race condition
5820 # will be updated with that name because of a race condition
5821 # server side. (See issue 4689 for details)
5821 # server side. (See issue 4689 for details)
5822 oldrevs = revs
5822 oldrevs = revs
5823 revs = [] # actually, nodes
5823 revs = [] # actually, nodes
5824 for r in oldrevs:
5824 for r in oldrevs:
5825 node = other.lookup(r)
5825 node = other.lookup(r)
5826 revs.append(node)
5826 revs.append(node)
5827 if r == checkout:
5827 if r == checkout:
5828 checkout = node
5828 checkout = node
5829 except error.CapabilityError:
5829 except error.CapabilityError:
5830 err = _("other repository doesn't support revision lookup, "
5830 err = _("other repository doesn't support revision lookup, "
5831 "so a rev cannot be specified.")
5831 "so a rev cannot be specified.")
5832 raise error.Abort(err)
5832 raise error.Abort(err)
5833
5833
5834 pullopargs.update(opts.get('opargs', {}))
5834 pullopargs.update(opts.get('opargs', {}))
5835 modheads = exchange.pull(repo, other, heads=revs,
5835 modheads = exchange.pull(repo, other, heads=revs,
5836 force=opts.get('force'),
5836 force=opts.get('force'),
5837 bookmarks=opts.get('bookmark', ()),
5837 bookmarks=opts.get('bookmark', ()),
5838 opargs=pullopargs).cgresult
5838 opargs=pullopargs).cgresult
5839
5839
5840 # brev is a name, which might be a bookmark to be activated at
5840 # brev is a name, which might be a bookmark to be activated at
5841 # the end of the update. In other words, it is an explicit
5841 # the end of the update. In other words, it is an explicit
5842 # destination of the update
5842 # destination of the update
5843 brev = None
5843 brev = None
5844
5844
5845 if checkout:
5845 if checkout:
5846 checkout = str(repo.changelog.rev(checkout))
5846 checkout = str(repo.changelog.rev(checkout))
5847
5847
5848 # order below depends on implementation of
5848 # order below depends on implementation of
5849 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5849 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5850 # because 'checkout' is determined without it.
5850 # because 'checkout' is determined without it.
5851 if opts.get('rev'):
5851 if opts.get('rev'):
5852 brev = opts['rev'][0]
5852 brev = opts['rev'][0]
5853 elif opts.get('branch'):
5853 elif opts.get('branch'):
5854 brev = opts['branch'][0]
5854 brev = opts['branch'][0]
5855 else:
5855 else:
5856 brev = branches[0]
5856 brev = branches[0]
5857 repo._subtoppath = source
5857 repo._subtoppath = source
5858 try:
5858 try:
5859 ret = postincoming(ui, repo, modheads, opts.get('update'),
5859 ret = postincoming(ui, repo, modheads, opts.get('update'),
5860 checkout, brev)
5860 checkout, brev)
5861
5861
5862 finally:
5862 finally:
5863 del repo._subtoppath
5863 del repo._subtoppath
5864
5864
5865 finally:
5865 finally:
5866 other.close()
5866 other.close()
5867 return ret
5867 return ret
5868
5868
5869 @command('^push',
5869 @command('^push',
5870 [('f', 'force', None, _('force push')),
5870 [('f', 'force', None, _('force push')),
5871 ('r', 'rev', [],
5871 ('r', 'rev', [],
5872 _('a changeset intended to be included in the destination'),
5872 _('a changeset intended to be included in the destination'),
5873 _('REV')),
5873 _('REV')),
5874 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5874 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5875 ('b', 'branch', [],
5875 ('b', 'branch', [],
5876 _('a specific branch you would like to push'), _('BRANCH')),
5876 _('a specific branch you would like to push'), _('BRANCH')),
5877 ('', 'new-branch', False, _('allow pushing a new branch')),
5877 ('', 'new-branch', False, _('allow pushing a new branch')),
5878 ] + remoteopts,
5878 ] + remoteopts,
5879 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5879 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5880 def push(ui, repo, dest=None, **opts):
5880 def push(ui, repo, dest=None, **opts):
5881 """push changes to the specified destination
5881 """push changes to the specified destination
5882
5882
5883 Push changesets from the local repository to the specified
5883 Push changesets from the local repository to the specified
5884 destination.
5884 destination.
5885
5885
5886 This operation is symmetrical to pull: it is identical to a pull
5886 This operation is symmetrical to pull: it is identical to a pull
5887 in the destination repository from the current one.
5887 in the destination repository from the current one.
5888
5888
5889 By default, push will not allow creation of new heads at the
5889 By default, push will not allow creation of new heads at the
5890 destination, since multiple heads would make it unclear which head
5890 destination, since multiple heads would make it unclear which head
5891 to use. In this situation, it is recommended to pull and merge
5891 to use. In this situation, it is recommended to pull and merge
5892 before pushing.
5892 before pushing.
5893
5893
5894 Use --new-branch if you want to allow push to create a new named
5894 Use --new-branch if you want to allow push to create a new named
5895 branch that is not present at the destination. This allows you to
5895 branch that is not present at the destination. This allows you to
5896 only create a new branch without forcing other changes.
5896 only create a new branch without forcing other changes.
5897
5897
5898 .. note::
5898 .. note::
5899
5899
5900 Extra care should be taken with the -f/--force option,
5900 Extra care should be taken with the -f/--force option,
5901 which will push all new heads on all branches, an action which will
5901 which will push all new heads on all branches, an action which will
5902 almost always cause confusion for collaborators.
5902 almost always cause confusion for collaborators.
5903
5903
5904 If -r/--rev is used, the specified revision and all its ancestors
5904 If -r/--rev is used, the specified revision and all its ancestors
5905 will be pushed to the remote repository.
5905 will be pushed to the remote repository.
5906
5906
5907 If -B/--bookmark is used, the specified bookmarked revision, its
5907 If -B/--bookmark is used, the specified bookmarked revision, its
5908 ancestors, and the bookmark will be pushed to the remote
5908 ancestors, and the bookmark will be pushed to the remote
5909 repository. Specifying ``.`` is equivalent to specifying the active
5909 repository. Specifying ``.`` is equivalent to specifying the active
5910 bookmark's name.
5910 bookmark's name.
5911
5911
5912 Please see :hg:`help urls` for important details about ``ssh://``
5912 Please see :hg:`help urls` for important details about ``ssh://``
5913 URLs. If DESTINATION is omitted, a default path will be used.
5913 URLs. If DESTINATION is omitted, a default path will be used.
5914
5914
5915 Returns 0 if push was successful, 1 if nothing to push.
5915 Returns 0 if push was successful, 1 if nothing to push.
5916 """
5916 """
5917
5917
5918 if opts.get('bookmark'):
5918 if opts.get('bookmark'):
5919 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5919 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5920 for b in opts['bookmark']:
5920 for b in opts['bookmark']:
5921 # translate -B options to -r so changesets get pushed
5921 # translate -B options to -r so changesets get pushed
5922 b = repo._bookmarks.expandname(b)
5922 b = repo._bookmarks.expandname(b)
5923 if b in repo._bookmarks:
5923 if b in repo._bookmarks:
5924 opts.setdefault('rev', []).append(b)
5924 opts.setdefault('rev', []).append(b)
5925 else:
5925 else:
5926 # if we try to push a deleted bookmark, translate it to null
5926 # if we try to push a deleted bookmark, translate it to null
5927 # this lets simultaneous -r, -b options continue working
5927 # this lets simultaneous -r, -b options continue working
5928 opts.setdefault('rev', []).append("null")
5928 opts.setdefault('rev', []).append("null")
5929
5929
5930 path = ui.paths.getpath(dest, default=('default-push', 'default'))
5930 path = ui.paths.getpath(dest, default=('default-push', 'default'))
5931 if not path:
5931 if not path:
5932 raise error.Abort(_('default repository not configured!'),
5932 raise error.Abort(_('default repository not configured!'),
5933 hint=_('see the "path" section in "hg help config"'))
5933 hint=_('see the "path" section in "hg help config"'))
5934 dest = path.pushloc or path.loc
5934 dest = path.pushloc or path.loc
5935 branches = (path.branch, opts.get('branch') or [])
5935 branches = (path.branch, opts.get('branch') or [])
5936 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5936 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5937 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5937 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5938 other = hg.peer(repo, opts, dest)
5938 other = hg.peer(repo, opts, dest)
5939
5939
5940 if revs:
5940 if revs:
5941 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5941 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5942 if not revs:
5942 if not revs:
5943 raise error.Abort(_("specified revisions evaluate to an empty set"),
5943 raise error.Abort(_("specified revisions evaluate to an empty set"),
5944 hint=_("use different revision arguments"))
5944 hint=_("use different revision arguments"))
5945 elif path.pushrev:
5945 elif path.pushrev:
5946 # It doesn't make any sense to specify ancestor revisions. So limit
5946 # It doesn't make any sense to specify ancestor revisions. So limit
5947 # to DAG heads to make discovery simpler.
5947 # to DAG heads to make discovery simpler.
5948 expr = revset.formatspec('heads(%r)', path.pushrev)
5948 expr = revset.formatspec('heads(%r)', path.pushrev)
5949 revs = scmutil.revrange(repo, [expr])
5949 revs = scmutil.revrange(repo, [expr])
5950 revs = [repo[rev].node() for rev in revs]
5950 revs = [repo[rev].node() for rev in revs]
5951 if not revs:
5951 if not revs:
5952 raise error.Abort(_('default push revset for path evaluates to an '
5952 raise error.Abort(_('default push revset for path evaluates to an '
5953 'empty set'))
5953 'empty set'))
5954
5954
5955 repo._subtoppath = dest
5955 repo._subtoppath = dest
5956 try:
5956 try:
5957 # push subrepos depth-first for coherent ordering
5957 # push subrepos depth-first for coherent ordering
5958 c = repo['']
5958 c = repo['']
5959 subs = c.substate # only repos that are committed
5959 subs = c.substate # only repos that are committed
5960 for s in sorted(subs):
5960 for s in sorted(subs):
5961 result = c.sub(s).push(opts)
5961 result = c.sub(s).push(opts)
5962 if result == 0:
5962 if result == 0:
5963 return not result
5963 return not result
5964 finally:
5964 finally:
5965 del repo._subtoppath
5965 del repo._subtoppath
5966 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5966 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5967 newbranch=opts.get('new_branch'),
5967 newbranch=opts.get('new_branch'),
5968 bookmarks=opts.get('bookmark', ()),
5968 bookmarks=opts.get('bookmark', ()),
5969 opargs=opts.get('opargs'))
5969 opargs=opts.get('opargs'))
5970
5970
5971 result = not pushop.cgresult
5971 result = not pushop.cgresult
5972
5972
5973 if pushop.bkresult is not None:
5973 if pushop.bkresult is not None:
5974 if pushop.bkresult == 2:
5974 if pushop.bkresult == 2:
5975 result = 2
5975 result = 2
5976 elif not result and pushop.bkresult:
5976 elif not result and pushop.bkresult:
5977 result = 2
5977 result = 2
5978
5978
5979 return result
5979 return result
5980
5980
5981 @command('recover', [])
5981 @command('recover', [])
5982 def recover(ui, repo):
5982 def recover(ui, repo):
5983 """roll back an interrupted transaction
5983 """roll back an interrupted transaction
5984
5984
5985 Recover from an interrupted commit or pull.
5985 Recover from an interrupted commit or pull.
5986
5986
5987 This command tries to fix the repository status after an
5987 This command tries to fix the repository status after an
5988 interrupted operation. It should only be necessary when Mercurial
5988 interrupted operation. It should only be necessary when Mercurial
5989 suggests it.
5989 suggests it.
5990
5990
5991 Returns 0 if successful, 1 if nothing to recover or verify fails.
5991 Returns 0 if successful, 1 if nothing to recover or verify fails.
5992 """
5992 """
5993 if repo.recover():
5993 if repo.recover():
5994 return hg.verify(repo)
5994 return hg.verify(repo)
5995 return 1
5995 return 1
5996
5996
5997 @command('^remove|rm',
5997 @command('^remove|rm',
5998 [('A', 'after', None, _('record delete for missing files')),
5998 [('A', 'after', None, _('record delete for missing files')),
5999 ('f', 'force', None,
5999 ('f', 'force', None,
6000 _('forget added files, delete modified files')),
6000 _('forget added files, delete modified files')),
6001 ] + subrepoopts + walkopts,
6001 ] + subrepoopts + walkopts,
6002 _('[OPTION]... FILE...'),
6002 _('[OPTION]... FILE...'),
6003 inferrepo=True)
6003 inferrepo=True)
6004 def remove(ui, repo, *pats, **opts):
6004 def remove(ui, repo, *pats, **opts):
6005 """remove the specified files on the next commit
6005 """remove the specified files on the next commit
6006
6006
6007 Schedule the indicated files for removal from the current branch.
6007 Schedule the indicated files for removal from the current branch.
6008
6008
6009 This command schedules the files to be removed at the next commit.
6009 This command schedules the files to be removed at the next commit.
6010 To undo a remove before that, see :hg:`revert`. To undo added
6010 To undo a remove before that, see :hg:`revert`. To undo added
6011 files, see :hg:`forget`.
6011 files, see :hg:`forget`.
6012
6012
6013 .. container:: verbose
6013 .. container:: verbose
6014
6014
6015 -A/--after can be used to remove only files that have already
6015 -A/--after can be used to remove only files that have already
6016 been deleted, -f/--force can be used to force deletion, and -Af
6016 been deleted, -f/--force can be used to force deletion, and -Af
6017 can be used to remove files from the next revision without
6017 can be used to remove files from the next revision without
6018 deleting them from the working directory.
6018 deleting them from the working directory.
6019
6019
6020 The following table details the behavior of remove for different
6020 The following table details the behavior of remove for different
6021 file states (columns) and option combinations (rows). The file
6021 file states (columns) and option combinations (rows). The file
6022 states are Added [A], Clean [C], Modified [M] and Missing [!]
6022 states are Added [A], Clean [C], Modified [M] and Missing [!]
6023 (as reported by :hg:`status`). The actions are Warn, Remove
6023 (as reported by :hg:`status`). The actions are Warn, Remove
6024 (from branch) and Delete (from disk):
6024 (from branch) and Delete (from disk):
6025
6025
6026 ========= == == == ==
6026 ========= == == == ==
6027 opt/state A C M !
6027 opt/state A C M !
6028 ========= == == == ==
6028 ========= == == == ==
6029 none W RD W R
6029 none W RD W R
6030 -f R RD RD R
6030 -f R RD RD R
6031 -A W W W R
6031 -A W W W R
6032 -Af R R R R
6032 -Af R R R R
6033 ========= == == == ==
6033 ========= == == == ==
6034
6034
6035 .. note::
6035 .. note::
6036
6036
6037 :hg:`remove` never deletes files in Added [A] state from the
6037 :hg:`remove` never deletes files in Added [A] state from the
6038 working directory, not even if ``--force`` is specified.
6038 working directory, not even if ``--force`` is specified.
6039
6039
6040 Returns 0 on success, 1 if any warnings encountered.
6040 Returns 0 on success, 1 if any warnings encountered.
6041 """
6041 """
6042
6042
6043 after, force = opts.get('after'), opts.get('force')
6043 after, force = opts.get('after'), opts.get('force')
6044 if not pats and not after:
6044 if not pats and not after:
6045 raise error.Abort(_('no files specified'))
6045 raise error.Abort(_('no files specified'))
6046
6046
6047 m = scmutil.match(repo[None], pats, opts)
6047 m = scmutil.match(repo[None], pats, opts)
6048 subrepos = opts.get('subrepos')
6048 subrepos = opts.get('subrepos')
6049 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
6049 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
6050
6050
6051 @command('rename|move|mv',
6051 @command('rename|move|mv',
6052 [('A', 'after', None, _('record a rename that has already occurred')),
6052 [('A', 'after', None, _('record a rename that has already occurred')),
6053 ('f', 'force', None, _('forcibly copy over an existing managed file')),
6053 ('f', 'force', None, _('forcibly copy over an existing managed file')),
6054 ] + walkopts + dryrunopts,
6054 ] + walkopts + dryrunopts,
6055 _('[OPTION]... SOURCE... DEST'))
6055 _('[OPTION]... SOURCE... DEST'))
6056 def rename(ui, repo, *pats, **opts):
6056 def rename(ui, repo, *pats, **opts):
6057 """rename files; equivalent of copy + remove
6057 """rename files; equivalent of copy + remove
6058
6058
6059 Mark dest as copies of sources; mark sources for deletion. If dest
6059 Mark dest as copies of sources; mark sources for deletion. If dest
6060 is a directory, copies are put in that directory. If dest is a
6060 is a directory, copies are put in that directory. If dest is a
6061 file, there can only be one source.
6061 file, there can only be one source.
6062
6062
6063 By default, this command copies the contents of files as they
6063 By default, this command copies the contents of files as they
6064 exist in the working directory. If invoked with -A/--after, the
6064 exist in the working directory. If invoked with -A/--after, the
6065 operation is recorded, but no copying is performed.
6065 operation is recorded, but no copying is performed.
6066
6066
6067 This command takes effect at the next commit. To undo a rename
6067 This command takes effect at the next commit. To undo a rename
6068 before that, see :hg:`revert`.
6068 before that, see :hg:`revert`.
6069
6069
6070 Returns 0 on success, 1 if errors are encountered.
6070 Returns 0 on success, 1 if errors are encountered.
6071 """
6071 """
6072 with repo.wlock(False):
6072 with repo.wlock(False):
6073 return cmdutil.copy(ui, repo, pats, opts, rename=True)
6073 return cmdutil.copy(ui, repo, pats, opts, rename=True)
6074
6074
6075 @command('resolve',
6075 @command('resolve',
6076 [('a', 'all', None, _('select all unresolved files')),
6076 [('a', 'all', None, _('select all unresolved files')),
6077 ('l', 'list', None, _('list state of files needing merge')),
6077 ('l', 'list', None, _('list state of files needing merge')),
6078 ('m', 'mark', None, _('mark files as resolved')),
6078 ('m', 'mark', None, _('mark files as resolved')),
6079 ('u', 'unmark', None, _('mark files as unresolved')),
6079 ('u', 'unmark', None, _('mark files as unresolved')),
6080 ('n', 'no-status', None, _('hide status prefix'))]
6080 ('n', 'no-status', None, _('hide status prefix'))]
6081 + mergetoolopts + walkopts + formatteropts,
6081 + mergetoolopts + walkopts + formatteropts,
6082 _('[OPTION]... [FILE]...'),
6082 _('[OPTION]... [FILE]...'),
6083 inferrepo=True)
6083 inferrepo=True)
6084 def resolve(ui, repo, *pats, **opts):
6084 def resolve(ui, repo, *pats, **opts):
6085 """redo merges or set/view the merge status of files
6085 """redo merges or set/view the merge status of files
6086
6086
6087 Merges with unresolved conflicts are often the result of
6087 Merges with unresolved conflicts are often the result of
6088 non-interactive merging using the ``internal:merge`` configuration
6088 non-interactive merging using the ``internal:merge`` configuration
6089 setting, or a command-line merge tool like ``diff3``. The resolve
6089 setting, or a command-line merge tool like ``diff3``. The resolve
6090 command is used to manage the files involved in a merge, after
6090 command is used to manage the files involved in a merge, after
6091 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
6091 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
6092 working directory must have two parents). See :hg:`help
6092 working directory must have two parents). See :hg:`help
6093 merge-tools` for information on configuring merge tools.
6093 merge-tools` for information on configuring merge tools.
6094
6094
6095 The resolve command can be used in the following ways:
6095 The resolve command can be used in the following ways:
6096
6096
6097 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
6097 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
6098 files, discarding any previous merge attempts. Re-merging is not
6098 files, discarding any previous merge attempts. Re-merging is not
6099 performed for files already marked as resolved. Use ``--all/-a``
6099 performed for files already marked as resolved. Use ``--all/-a``
6100 to select all unresolved files. ``--tool`` can be used to specify
6100 to select all unresolved files. ``--tool`` can be used to specify
6101 the merge tool used for the given files. It overrides the HGMERGE
6101 the merge tool used for the given files. It overrides the HGMERGE
6102 environment variable and your configuration files. Previous file
6102 environment variable and your configuration files. Previous file
6103 contents are saved with a ``.orig`` suffix.
6103 contents are saved with a ``.orig`` suffix.
6104
6104
6105 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
6105 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
6106 (e.g. after having manually fixed-up the files). The default is
6106 (e.g. after having manually fixed-up the files). The default is
6107 to mark all unresolved files.
6107 to mark all unresolved files.
6108
6108
6109 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6109 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6110 default is to mark all resolved files.
6110 default is to mark all resolved files.
6111
6111
6112 - :hg:`resolve -l`: list files which had or still have conflicts.
6112 - :hg:`resolve -l`: list files which had or still have conflicts.
6113 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6113 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6114
6114
6115 .. note::
6115 .. note::
6116
6116
6117 Mercurial will not let you commit files with unresolved merge
6117 Mercurial will not let you commit files with unresolved merge
6118 conflicts. You must use :hg:`resolve -m ...` before you can
6118 conflicts. You must use :hg:`resolve -m ...` before you can
6119 commit after a conflicting merge.
6119 commit after a conflicting merge.
6120
6120
6121 Returns 0 on success, 1 if any files fail a resolve attempt.
6121 Returns 0 on success, 1 if any files fail a resolve attempt.
6122 """
6122 """
6123
6123
6124 flaglist = 'all mark unmark list no_status'.split()
6124 flaglist = 'all mark unmark list no_status'.split()
6125 all, mark, unmark, show, nostatus = \
6125 all, mark, unmark, show, nostatus = \
6126 [opts.get(o) for o in flaglist]
6126 [opts.get(o) for o in flaglist]
6127
6127
6128 if (show and (mark or unmark)) or (mark and unmark):
6128 if (show and (mark or unmark)) or (mark and unmark):
6129 raise error.Abort(_("too many options specified"))
6129 raise error.Abort(_("too many options specified"))
6130 if pats and all:
6130 if pats and all:
6131 raise error.Abort(_("can't specify --all and patterns"))
6131 raise error.Abort(_("can't specify --all and patterns"))
6132 if not (all or pats or show or mark or unmark):
6132 if not (all or pats or show or mark or unmark):
6133 raise error.Abort(_('no files or directories specified'),
6133 raise error.Abort(_('no files or directories specified'),
6134 hint=('use --all to re-merge all unresolved files'))
6134 hint=('use --all to re-merge all unresolved files'))
6135
6135
6136 if show:
6136 if show:
6137 fm = ui.formatter('resolve', opts)
6137 fm = ui.formatter('resolve', opts)
6138 ms = mergemod.mergestate.read(repo)
6138 ms = mergemod.mergestate.read(repo)
6139 m = scmutil.match(repo[None], pats, opts)
6139 m = scmutil.match(repo[None], pats, opts)
6140 for f in ms:
6140 for f in ms:
6141 if not m(f):
6141 if not m(f):
6142 continue
6142 continue
6143 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
6143 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
6144 'd': 'driverresolved'}[ms[f]]
6144 'd': 'driverresolved'}[ms[f]]
6145 fm.startitem()
6145 fm.startitem()
6146 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
6146 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
6147 fm.write('path', '%s\n', f, label=l)
6147 fm.write('path', '%s\n', f, label=l)
6148 fm.end()
6148 fm.end()
6149 return 0
6149 return 0
6150
6150
6151 with repo.wlock():
6151 with repo.wlock():
6152 ms = mergemod.mergestate.read(repo)
6152 ms = mergemod.mergestate.read(repo)
6153
6153
6154 if not (ms.active() or repo.dirstate.p2() != nullid):
6154 if not (ms.active() or repo.dirstate.p2() != nullid):
6155 raise error.Abort(
6155 raise error.Abort(
6156 _('resolve command not applicable when not merging'))
6156 _('resolve command not applicable when not merging'))
6157
6157
6158 wctx = repo[None]
6158 wctx = repo[None]
6159
6159
6160 if ms.mergedriver and ms.mdstate() == 'u':
6160 if ms.mergedriver and ms.mdstate() == 'u':
6161 proceed = mergemod.driverpreprocess(repo, ms, wctx)
6161 proceed = mergemod.driverpreprocess(repo, ms, wctx)
6162 ms.commit()
6162 ms.commit()
6163 # allow mark and unmark to go through
6163 # allow mark and unmark to go through
6164 if not mark and not unmark and not proceed:
6164 if not mark and not unmark and not proceed:
6165 return 1
6165 return 1
6166
6166
6167 m = scmutil.match(wctx, pats, opts)
6167 m = scmutil.match(wctx, pats, opts)
6168 ret = 0
6168 ret = 0
6169 didwork = False
6169 didwork = False
6170 runconclude = False
6170 runconclude = False
6171
6171
6172 tocomplete = []
6172 tocomplete = []
6173 for f in ms:
6173 for f in ms:
6174 if not m(f):
6174 if not m(f):
6175 continue
6175 continue
6176
6176
6177 didwork = True
6177 didwork = True
6178
6178
6179 # don't let driver-resolved files be marked, and run the conclude
6179 # don't let driver-resolved files be marked, and run the conclude
6180 # step if asked to resolve
6180 # step if asked to resolve
6181 if ms[f] == "d":
6181 if ms[f] == "d":
6182 exact = m.exact(f)
6182 exact = m.exact(f)
6183 if mark:
6183 if mark:
6184 if exact:
6184 if exact:
6185 ui.warn(_('not marking %s as it is driver-resolved\n')
6185 ui.warn(_('not marking %s as it is driver-resolved\n')
6186 % f)
6186 % f)
6187 elif unmark:
6187 elif unmark:
6188 if exact:
6188 if exact:
6189 ui.warn(_('not unmarking %s as it is driver-resolved\n')
6189 ui.warn(_('not unmarking %s as it is driver-resolved\n')
6190 % f)
6190 % f)
6191 else:
6191 else:
6192 runconclude = True
6192 runconclude = True
6193 continue
6193 continue
6194
6194
6195 if mark:
6195 if mark:
6196 ms.mark(f, "r")
6196 ms.mark(f, "r")
6197 elif unmark:
6197 elif unmark:
6198 ms.mark(f, "u")
6198 ms.mark(f, "u")
6199 else:
6199 else:
6200 # backup pre-resolve (merge uses .orig for its own purposes)
6200 # backup pre-resolve (merge uses .orig for its own purposes)
6201 a = repo.wjoin(f)
6201 a = repo.wjoin(f)
6202 try:
6202 try:
6203 util.copyfile(a, a + ".resolve")
6203 util.copyfile(a, a + ".resolve")
6204 except (IOError, OSError) as inst:
6204 except (IOError, OSError) as inst:
6205 if inst.errno != errno.ENOENT:
6205 if inst.errno != errno.ENOENT:
6206 raise
6206 raise
6207
6207
6208 try:
6208 try:
6209 # preresolve file
6209 # preresolve file
6210 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6210 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6211 'resolve')
6211 'resolve')
6212 complete, r = ms.preresolve(f, wctx)
6212 complete, r = ms.preresolve(f, wctx)
6213 if not complete:
6213 if not complete:
6214 tocomplete.append(f)
6214 tocomplete.append(f)
6215 elif r:
6215 elif r:
6216 ret = 1
6216 ret = 1
6217 finally:
6217 finally:
6218 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6218 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6219 ms.commit()
6219 ms.commit()
6220
6220
6221 # replace filemerge's .orig file with our resolve file, but only
6221 # replace filemerge's .orig file with our resolve file, but only
6222 # for merges that are complete
6222 # for merges that are complete
6223 if complete:
6223 if complete:
6224 try:
6224 try:
6225 util.rename(a + ".resolve",
6225 util.rename(a + ".resolve",
6226 scmutil.origpath(ui, repo, a))
6226 scmutil.origpath(ui, repo, a))
6227 except OSError as inst:
6227 except OSError as inst:
6228 if inst.errno != errno.ENOENT:
6228 if inst.errno != errno.ENOENT:
6229 raise
6229 raise
6230
6230
6231 for f in tocomplete:
6231 for f in tocomplete:
6232 try:
6232 try:
6233 # resolve file
6233 # resolve file
6234 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6234 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6235 'resolve')
6235 'resolve')
6236 r = ms.resolve(f, wctx)
6236 r = ms.resolve(f, wctx)
6237 if r:
6237 if r:
6238 ret = 1
6238 ret = 1
6239 finally:
6239 finally:
6240 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6240 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6241 ms.commit()
6241 ms.commit()
6242
6242
6243 # replace filemerge's .orig file with our resolve file
6243 # replace filemerge's .orig file with our resolve file
6244 a = repo.wjoin(f)
6244 a = repo.wjoin(f)
6245 try:
6245 try:
6246 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
6246 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
6247 except OSError as inst:
6247 except OSError as inst:
6248 if inst.errno != errno.ENOENT:
6248 if inst.errno != errno.ENOENT:
6249 raise
6249 raise
6250
6250
6251 ms.commit()
6251 ms.commit()
6252 ms.recordactions()
6252 ms.recordactions()
6253
6253
6254 if not didwork and pats:
6254 if not didwork and pats:
6255 hint = None
6255 hint = None
6256 if not any([p for p in pats if p.find(':') >= 0]):
6256 if not any([p for p in pats if p.find(':') >= 0]):
6257 pats = ['path:%s' % p for p in pats]
6257 pats = ['path:%s' % p for p in pats]
6258 m = scmutil.match(wctx, pats, opts)
6258 m = scmutil.match(wctx, pats, opts)
6259 for f in ms:
6259 for f in ms:
6260 if not m(f):
6260 if not m(f):
6261 continue
6261 continue
6262 flags = ''.join(['-%s ' % o[0] for o in flaglist
6262 flags = ''.join(['-%s ' % o[0] for o in flaglist
6263 if opts.get(o)])
6263 if opts.get(o)])
6264 hint = _("(try: hg resolve %s%s)\n") % (
6264 hint = _("(try: hg resolve %s%s)\n") % (
6265 flags,
6265 flags,
6266 ' '.join(pats))
6266 ' '.join(pats))
6267 break
6267 break
6268 ui.warn(_("arguments do not match paths that need resolving\n"))
6268 ui.warn(_("arguments do not match paths that need resolving\n"))
6269 if hint:
6269 if hint:
6270 ui.warn(hint)
6270 ui.warn(hint)
6271 elif ms.mergedriver and ms.mdstate() != 's':
6271 elif ms.mergedriver and ms.mdstate() != 's':
6272 # run conclude step when either a driver-resolved file is requested
6272 # run conclude step when either a driver-resolved file is requested
6273 # or there are no driver-resolved files
6273 # or there are no driver-resolved files
6274 # we can't use 'ret' to determine whether any files are unresolved
6274 # we can't use 'ret' to determine whether any files are unresolved
6275 # because we might not have tried to resolve some
6275 # because we might not have tried to resolve some
6276 if ((runconclude or not list(ms.driverresolved()))
6276 if ((runconclude or not list(ms.driverresolved()))
6277 and not list(ms.unresolved())):
6277 and not list(ms.unresolved())):
6278 proceed = mergemod.driverconclude(repo, ms, wctx)
6278 proceed = mergemod.driverconclude(repo, ms, wctx)
6279 ms.commit()
6279 ms.commit()
6280 if not proceed:
6280 if not proceed:
6281 return 1
6281 return 1
6282
6282
6283 # Nudge users into finishing an unfinished operation
6283 # Nudge users into finishing an unfinished operation
6284 unresolvedf = list(ms.unresolved())
6284 unresolvedf = list(ms.unresolved())
6285 driverresolvedf = list(ms.driverresolved())
6285 driverresolvedf = list(ms.driverresolved())
6286 if not unresolvedf and not driverresolvedf:
6286 if not unresolvedf and not driverresolvedf:
6287 ui.status(_('(no more unresolved files)\n'))
6287 ui.status(_('(no more unresolved files)\n'))
6288 cmdutil.checkafterresolved(repo)
6288 cmdutil.checkafterresolved(repo)
6289 elif not unresolvedf:
6289 elif not unresolvedf:
6290 ui.status(_('(no more unresolved files -- '
6290 ui.status(_('(no more unresolved files -- '
6291 'run "hg resolve --all" to conclude)\n'))
6291 'run "hg resolve --all" to conclude)\n'))
6292
6292
6293 return ret
6293 return ret
6294
6294
6295 @command('revert',
6295 @command('revert',
6296 [('a', 'all', None, _('revert all changes when no arguments given')),
6296 [('a', 'all', None, _('revert all changes when no arguments given')),
6297 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6297 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6298 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6298 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6299 ('C', 'no-backup', None, _('do not save backup copies of files')),
6299 ('C', 'no-backup', None, _('do not save backup copies of files')),
6300 ('i', 'interactive', None,
6300 ('i', 'interactive', None,
6301 _('interactively select the changes (EXPERIMENTAL)')),
6301 _('interactively select the changes (EXPERIMENTAL)')),
6302 ] + walkopts + dryrunopts,
6302 ] + walkopts + dryrunopts,
6303 _('[OPTION]... [-r REV] [NAME]...'))
6303 _('[OPTION]... [-r REV] [NAME]...'))
6304 def revert(ui, repo, *pats, **opts):
6304 def revert(ui, repo, *pats, **opts):
6305 """restore files to their checkout state
6305 """restore files to their checkout state
6306
6306
6307 .. note::
6307 .. note::
6308
6308
6309 To check out earlier revisions, you should use :hg:`update REV`.
6309 To check out earlier revisions, you should use :hg:`update REV`.
6310 To cancel an uncommitted merge (and lose your changes),
6310 To cancel an uncommitted merge (and lose your changes),
6311 use :hg:`update --clean .`.
6311 use :hg:`update --clean .`.
6312
6312
6313 With no revision specified, revert the specified files or directories
6313 With no revision specified, revert the specified files or directories
6314 to the contents they had in the parent of the working directory.
6314 to the contents they had in the parent of the working directory.
6315 This restores the contents of files to an unmodified
6315 This restores the contents of files to an unmodified
6316 state and unschedules adds, removes, copies, and renames. If the
6316 state and unschedules adds, removes, copies, and renames. If the
6317 working directory has two parents, you must explicitly specify a
6317 working directory has two parents, you must explicitly specify a
6318 revision.
6318 revision.
6319
6319
6320 Using the -r/--rev or -d/--date options, revert the given files or
6320 Using the -r/--rev or -d/--date options, revert the given files or
6321 directories to their states as of a specific revision. Because
6321 directories to their states as of a specific revision. Because
6322 revert does not change the working directory parents, this will
6322 revert does not change the working directory parents, this will
6323 cause these files to appear modified. This can be helpful to "back
6323 cause these files to appear modified. This can be helpful to "back
6324 out" some or all of an earlier change. See :hg:`backout` for a
6324 out" some or all of an earlier change. See :hg:`backout` for a
6325 related method.
6325 related method.
6326
6326
6327 Modified files are saved with a .orig suffix before reverting.
6327 Modified files are saved with a .orig suffix before reverting.
6328 To disable these backups, use --no-backup. It is possible to store
6328 To disable these backups, use --no-backup. It is possible to store
6329 the backup files in a custom directory relative to the root of the
6329 the backup files in a custom directory relative to the root of the
6330 repository by setting the ``ui.origbackuppath`` configuration
6330 repository by setting the ``ui.origbackuppath`` configuration
6331 option.
6331 option.
6332
6332
6333 See :hg:`help dates` for a list of formats valid for -d/--date.
6333 See :hg:`help dates` for a list of formats valid for -d/--date.
6334
6334
6335 See :hg:`help backout` for a way to reverse the effect of an
6335 See :hg:`help backout` for a way to reverse the effect of an
6336 earlier changeset.
6336 earlier changeset.
6337
6337
6338 Returns 0 on success.
6338 Returns 0 on success.
6339 """
6339 """
6340
6340
6341 if opts.get("date"):
6341 if opts.get("date"):
6342 if opts.get("rev"):
6342 if opts.get("rev"):
6343 raise error.Abort(_("you can't specify a revision and a date"))
6343 raise error.Abort(_("you can't specify a revision and a date"))
6344 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6344 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6345
6345
6346 parent, p2 = repo.dirstate.parents()
6346 parent, p2 = repo.dirstate.parents()
6347 if not opts.get('rev') and p2 != nullid:
6347 if not opts.get('rev') and p2 != nullid:
6348 # revert after merge is a trap for new users (issue2915)
6348 # revert after merge is a trap for new users (issue2915)
6349 raise error.Abort(_('uncommitted merge with no revision specified'),
6349 raise error.Abort(_('uncommitted merge with no revision specified'),
6350 hint=_("use 'hg update' or see 'hg help revert'"))
6350 hint=_("use 'hg update' or see 'hg help revert'"))
6351
6351
6352 ctx = scmutil.revsingle(repo, opts.get('rev'))
6352 ctx = scmutil.revsingle(repo, opts.get('rev'))
6353
6353
6354 if (not (pats or opts.get('include') or opts.get('exclude') or
6354 if (not (pats or opts.get('include') or opts.get('exclude') or
6355 opts.get('all') or opts.get('interactive'))):
6355 opts.get('all') or opts.get('interactive'))):
6356 msg = _("no files or directories specified")
6356 msg = _("no files or directories specified")
6357 if p2 != nullid:
6357 if p2 != nullid:
6358 hint = _("uncommitted merge, use --all to discard all changes,"
6358 hint = _("uncommitted merge, use --all to discard all changes,"
6359 " or 'hg update -C .' to abort the merge")
6359 " or 'hg update -C .' to abort the merge")
6360 raise error.Abort(msg, hint=hint)
6360 raise error.Abort(msg, hint=hint)
6361 dirty = any(repo.status())
6361 dirty = any(repo.status())
6362 node = ctx.node()
6362 node = ctx.node()
6363 if node != parent:
6363 if node != parent:
6364 if dirty:
6364 if dirty:
6365 hint = _("uncommitted changes, use --all to discard all"
6365 hint = _("uncommitted changes, use --all to discard all"
6366 " changes, or 'hg update %s' to update") % ctx.rev()
6366 " changes, or 'hg update %s' to update") % ctx.rev()
6367 else:
6367 else:
6368 hint = _("use --all to revert all files,"
6368 hint = _("use --all to revert all files,"
6369 " or 'hg update %s' to update") % ctx.rev()
6369 " or 'hg update %s' to update") % ctx.rev()
6370 elif dirty:
6370 elif dirty:
6371 hint = _("uncommitted changes, use --all to discard all changes")
6371 hint = _("uncommitted changes, use --all to discard all changes")
6372 else:
6372 else:
6373 hint = _("use --all to revert all files")
6373 hint = _("use --all to revert all files")
6374 raise error.Abort(msg, hint=hint)
6374 raise error.Abort(msg, hint=hint)
6375
6375
6376 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6376 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6377
6377
6378 @command('rollback', dryrunopts +
6378 @command('rollback', dryrunopts +
6379 [('f', 'force', False, _('ignore safety measures'))])
6379 [('f', 'force', False, _('ignore safety measures'))])
6380 def rollback(ui, repo, **opts):
6380 def rollback(ui, repo, **opts):
6381 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6381 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6382
6382
6383 Please use :hg:`commit --amend` instead of rollback to correct
6383 Please use :hg:`commit --amend` instead of rollback to correct
6384 mistakes in the last commit.
6384 mistakes in the last commit.
6385
6385
6386 This command should be used with care. There is only one level of
6386 This command should be used with care. There is only one level of
6387 rollback, and there is no way to undo a rollback. It will also
6387 rollback, and there is no way to undo a rollback. It will also
6388 restore the dirstate at the time of the last transaction, losing
6388 restore the dirstate at the time of the last transaction, losing
6389 any dirstate changes since that time. This command does not alter
6389 any dirstate changes since that time. This command does not alter
6390 the working directory.
6390 the working directory.
6391
6391
6392 Transactions are used to encapsulate the effects of all commands
6392 Transactions are used to encapsulate the effects of all commands
6393 that create new changesets or propagate existing changesets into a
6393 that create new changesets or propagate existing changesets into a
6394 repository.
6394 repository.
6395
6395
6396 .. container:: verbose
6396 .. container:: verbose
6397
6397
6398 For example, the following commands are transactional, and their
6398 For example, the following commands are transactional, and their
6399 effects can be rolled back:
6399 effects can be rolled back:
6400
6400
6401 - commit
6401 - commit
6402 - import
6402 - import
6403 - pull
6403 - pull
6404 - push (with this repository as the destination)
6404 - push (with this repository as the destination)
6405 - unbundle
6405 - unbundle
6406
6406
6407 To avoid permanent data loss, rollback will refuse to rollback a
6407 To avoid permanent data loss, rollback will refuse to rollback a
6408 commit transaction if it isn't checked out. Use --force to
6408 commit transaction if it isn't checked out. Use --force to
6409 override this protection.
6409 override this protection.
6410
6410
6411 The rollback command can be entirely disabled by setting the
6411 The rollback command can be entirely disabled by setting the
6412 ``ui.rollback`` configuration setting to false. If you're here
6412 ``ui.rollback`` configuration setting to false. If you're here
6413 because you want to use rollback and it's disabled, you can
6413 because you want to use rollback and it's disabled, you can
6414 re-enable the command by setting ``ui.rollback`` to true.
6414 re-enable the command by setting ``ui.rollback`` to true.
6415
6415
6416 This command is not intended for use on public repositories. Once
6416 This command is not intended for use on public repositories. Once
6417 changes are visible for pull by other users, rolling a transaction
6417 changes are visible for pull by other users, rolling a transaction
6418 back locally is ineffective (someone else may already have pulled
6418 back locally is ineffective (someone else may already have pulled
6419 the changes). Furthermore, a race is possible with readers of the
6419 the changes). Furthermore, a race is possible with readers of the
6420 repository; for example an in-progress pull from the repository
6420 repository; for example an in-progress pull from the repository
6421 may fail if a rollback is performed.
6421 may fail if a rollback is performed.
6422
6422
6423 Returns 0 on success, 1 if no rollback data is available.
6423 Returns 0 on success, 1 if no rollback data is available.
6424 """
6424 """
6425 if not ui.configbool('ui', 'rollback', True):
6425 if not ui.configbool('ui', 'rollback', True):
6426 raise error.Abort(_('rollback is disabled because it is unsafe'),
6426 raise error.Abort(_('rollback is disabled because it is unsafe'),
6427 hint=('see `hg help -v rollback` for information'))
6427 hint=('see `hg help -v rollback` for information'))
6428 return repo.rollback(dryrun=opts.get('dry_run'),
6428 return repo.rollback(dryrun=opts.get('dry_run'),
6429 force=opts.get('force'))
6429 force=opts.get('force'))
6430
6430
6431 @command('root', [])
6431 @command('root', [])
6432 def root(ui, repo):
6432 def root(ui, repo):
6433 """print the root (top) of the current working directory
6433 """print the root (top) of the current working directory
6434
6434
6435 Print the root directory of the current repository.
6435 Print the root directory of the current repository.
6436
6436
6437 Returns 0 on success.
6437 Returns 0 on success.
6438 """
6438 """
6439 ui.write(repo.root + "\n")
6439 ui.write(repo.root + "\n")
6440
6440
6441 @command('^serve',
6441 @command('^serve',
6442 [('A', 'accesslog', '', _('name of access log file to write to'),
6442 [('A', 'accesslog', '', _('name of access log file to write to'),
6443 _('FILE')),
6443 _('FILE')),
6444 ('d', 'daemon', None, _('run server in background')),
6444 ('d', 'daemon', None, _('run server in background')),
6445 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
6445 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
6446 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6446 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6447 # use string type, then we can check if something was passed
6447 # use string type, then we can check if something was passed
6448 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6448 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6449 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6449 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6450 _('ADDR')),
6450 _('ADDR')),
6451 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6451 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6452 _('PREFIX')),
6452 _('PREFIX')),
6453 ('n', 'name', '',
6453 ('n', 'name', '',
6454 _('name to show in web pages (default: working directory)'), _('NAME')),
6454 _('name to show in web pages (default: working directory)'), _('NAME')),
6455 ('', 'web-conf', '',
6455 ('', 'web-conf', '',
6456 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6456 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6457 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6457 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6458 _('FILE')),
6458 _('FILE')),
6459 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6459 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6460 ('', 'stdio', None, _('for remote clients')),
6460 ('', 'stdio', None, _('for remote clients')),
6461 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6461 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6462 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6462 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6463 ('', 'style', '', _('template style to use'), _('STYLE')),
6463 ('', 'style', '', _('template style to use'), _('STYLE')),
6464 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6464 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6465 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6465 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6466 _('[OPTION]...'),
6466 _('[OPTION]...'),
6467 optionalrepo=True)
6467 optionalrepo=True)
6468 def serve(ui, repo, **opts):
6468 def serve(ui, repo, **opts):
6469 """start stand-alone webserver
6469 """start stand-alone webserver
6470
6470
6471 Start a local HTTP repository browser and pull server. You can use
6471 Start a local HTTP repository browser and pull server. You can use
6472 this for ad-hoc sharing and browsing of repositories. It is
6472 this for ad-hoc sharing and browsing of repositories. It is
6473 recommended to use a real web server to serve a repository for
6473 recommended to use a real web server to serve a repository for
6474 longer periods of time.
6474 longer periods of time.
6475
6475
6476 Please note that the server does not implement access control.
6476 Please note that the server does not implement access control.
6477 This means that, by default, anybody can read from the server and
6477 This means that, by default, anybody can read from the server and
6478 nobody can write to it by default. Set the ``web.allow_push``
6478 nobody can write to it by default. Set the ``web.allow_push``
6479 option to ``*`` to allow everybody to push to the server. You
6479 option to ``*`` to allow everybody to push to the server. You
6480 should use a real web server if you need to authenticate users.
6480 should use a real web server if you need to authenticate users.
6481
6481
6482 By default, the server logs accesses to stdout and errors to
6482 By default, the server logs accesses to stdout and errors to
6483 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6483 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6484 files.
6484 files.
6485
6485
6486 To have the server choose a free port number to listen on, specify
6486 To have the server choose a free port number to listen on, specify
6487 a port number of 0; in this case, the server will print the port
6487 a port number of 0; in this case, the server will print the port
6488 number it uses.
6488 number it uses.
6489
6489
6490 Returns 0 on success.
6490 Returns 0 on success.
6491 """
6491 """
6492
6492
6493 if opts["stdio"] and opts["cmdserver"]:
6493 if opts["stdio"] and opts["cmdserver"]:
6494 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6494 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6495
6495
6496 if opts["stdio"]:
6496 if opts["stdio"]:
6497 if repo is None:
6497 if repo is None:
6498 raise error.RepoError(_("there is no Mercurial repository here"
6498 raise error.RepoError(_("there is no Mercurial repository here"
6499 " (.hg not found)"))
6499 " (.hg not found)"))
6500 s = sshserver.sshserver(ui, repo)
6500 s = sshserver.sshserver(ui, repo)
6501 s.serve_forever()
6501 s.serve_forever()
6502
6502
6503 if opts["cmdserver"]:
6503 if opts["cmdserver"]:
6504 service = commandserver.createservice(ui, repo, opts)
6504 service = commandserver.createservice(ui, repo, opts)
6505 else:
6505 else:
6506 service = hgweb.createservice(ui, repo, opts)
6506 service = hgweb.createservice(ui, repo, opts)
6507 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6507 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6508
6508
6509 @command('^status|st',
6509 @command('^status|st',
6510 [('A', 'all', None, _('show status of all files')),
6510 [('A', 'all', None, _('show status of all files')),
6511 ('m', 'modified', None, _('show only modified files')),
6511 ('m', 'modified', None, _('show only modified files')),
6512 ('a', 'added', None, _('show only added files')),
6512 ('a', 'added', None, _('show only added files')),
6513 ('r', 'removed', None, _('show only removed files')),
6513 ('r', 'removed', None, _('show only removed files')),
6514 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6514 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6515 ('c', 'clean', None, _('show only files without changes')),
6515 ('c', 'clean', None, _('show only files without changes')),
6516 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6516 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6517 ('i', 'ignored', None, _('show only ignored files')),
6517 ('i', 'ignored', None, _('show only ignored files')),
6518 ('n', 'no-status', None, _('hide status prefix')),
6518 ('n', 'no-status', None, _('hide status prefix')),
6519 ('C', 'copies', None, _('show source of copied files')),
6519 ('C', 'copies', None, _('show source of copied files')),
6520 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6520 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6521 ('', 'rev', [], _('show difference from revision'), _('REV')),
6521 ('', 'rev', [], _('show difference from revision'), _('REV')),
6522 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6522 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6523 ] + walkopts + subrepoopts + formatteropts,
6523 ] + walkopts + subrepoopts + formatteropts,
6524 _('[OPTION]... [FILE]...'),
6524 _('[OPTION]... [FILE]...'),
6525 inferrepo=True)
6525 inferrepo=True)
6526 def status(ui, repo, *pats, **opts):
6526 def status(ui, repo, *pats, **opts):
6527 """show changed files in the working directory
6527 """show changed files in the working directory
6528
6528
6529 Show status of files in the repository. If names are given, only
6529 Show status of files in the repository. If names are given, only
6530 files that match are shown. Files that are clean or ignored or
6530 files that match are shown. Files that are clean or ignored or
6531 the source of a copy/move operation, are not listed unless
6531 the source of a copy/move operation, are not listed unless
6532 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6532 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6533 Unless options described with "show only ..." are given, the
6533 Unless options described with "show only ..." are given, the
6534 options -mardu are used.
6534 options -mardu are used.
6535
6535
6536 Option -q/--quiet hides untracked (unknown and ignored) files
6536 Option -q/--quiet hides untracked (unknown and ignored) files
6537 unless explicitly requested with -u/--unknown or -i/--ignored.
6537 unless explicitly requested with -u/--unknown or -i/--ignored.
6538
6538
6539 .. note::
6539 .. note::
6540
6540
6541 :hg:`status` may appear to disagree with diff if permissions have
6541 :hg:`status` may appear to disagree with diff if permissions have
6542 changed or a merge has occurred. The standard diff format does
6542 changed or a merge has occurred. The standard diff format does
6543 not report permission changes and diff only reports changes
6543 not report permission changes and diff only reports changes
6544 relative to one merge parent.
6544 relative to one merge parent.
6545
6545
6546 If one revision is given, it is used as the base revision.
6546 If one revision is given, it is used as the base revision.
6547 If two revisions are given, the differences between them are
6547 If two revisions are given, the differences between them are
6548 shown. The --change option can also be used as a shortcut to list
6548 shown. The --change option can also be used as a shortcut to list
6549 the changed files of a revision from its first parent.
6549 the changed files of a revision from its first parent.
6550
6550
6551 The codes used to show the status of files are::
6551 The codes used to show the status of files are::
6552
6552
6553 M = modified
6553 M = modified
6554 A = added
6554 A = added
6555 R = removed
6555 R = removed
6556 C = clean
6556 C = clean
6557 ! = missing (deleted by non-hg command, but still tracked)
6557 ! = missing (deleted by non-hg command, but still tracked)
6558 ? = not tracked
6558 ? = not tracked
6559 I = ignored
6559 I = ignored
6560 = origin of the previous file (with --copies)
6560 = origin of the previous file (with --copies)
6561
6561
6562 .. container:: verbose
6562 .. container:: verbose
6563
6563
6564 Examples:
6564 Examples:
6565
6565
6566 - show changes in the working directory relative to a
6566 - show changes in the working directory relative to a
6567 changeset::
6567 changeset::
6568
6568
6569 hg status --rev 9353
6569 hg status --rev 9353
6570
6570
6571 - show changes in the working directory relative to the
6571 - show changes in the working directory relative to the
6572 current directory (see :hg:`help patterns` for more information)::
6572 current directory (see :hg:`help patterns` for more information)::
6573
6573
6574 hg status re:
6574 hg status re:
6575
6575
6576 - show all changes including copies in an existing changeset::
6576 - show all changes including copies in an existing changeset::
6577
6577
6578 hg status --copies --change 9353
6578 hg status --copies --change 9353
6579
6579
6580 - get a NUL separated list of added files, suitable for xargs::
6580 - get a NUL separated list of added files, suitable for xargs::
6581
6581
6582 hg status -an0
6582 hg status -an0
6583
6583
6584 Returns 0 on success.
6584 Returns 0 on success.
6585 """
6585 """
6586
6586
6587 revs = opts.get('rev')
6587 revs = opts.get('rev')
6588 change = opts.get('change')
6588 change = opts.get('change')
6589
6589
6590 if revs and change:
6590 if revs and change:
6591 msg = _('cannot specify --rev and --change at the same time')
6591 msg = _('cannot specify --rev and --change at the same time')
6592 raise error.Abort(msg)
6592 raise error.Abort(msg)
6593 elif change:
6593 elif change:
6594 node2 = scmutil.revsingle(repo, change, None).node()
6594 node2 = scmutil.revsingle(repo, change, None).node()
6595 node1 = repo[node2].p1().node()
6595 node1 = repo[node2].p1().node()
6596 else:
6596 else:
6597 node1, node2 = scmutil.revpair(repo, revs)
6597 node1, node2 = scmutil.revpair(repo, revs)
6598
6598
6599 if pats:
6599 if pats:
6600 cwd = repo.getcwd()
6600 cwd = repo.getcwd()
6601 else:
6601 else:
6602 cwd = ''
6602 cwd = ''
6603
6603
6604 if opts.get('print0'):
6604 if opts.get('print0'):
6605 end = '\0'
6605 end = '\0'
6606 else:
6606 else:
6607 end = '\n'
6607 end = '\n'
6608 copy = {}
6608 copy = {}
6609 states = 'modified added removed deleted unknown ignored clean'.split()
6609 states = 'modified added removed deleted unknown ignored clean'.split()
6610 show = [k for k in states if opts.get(k)]
6610 show = [k for k in states if opts.get(k)]
6611 if opts.get('all'):
6611 if opts.get('all'):
6612 show += ui.quiet and (states[:4] + ['clean']) or states
6612 show += ui.quiet and (states[:4] + ['clean']) or states
6613 if not show:
6613 if not show:
6614 if ui.quiet:
6614 if ui.quiet:
6615 show = states[:4]
6615 show = states[:4]
6616 else:
6616 else:
6617 show = states[:5]
6617 show = states[:5]
6618
6618
6619 m = scmutil.match(repo[node2], pats, opts)
6619 m = scmutil.match(repo[node2], pats, opts)
6620 stat = repo.status(node1, node2, m,
6620 stat = repo.status(node1, node2, m,
6621 'ignored' in show, 'clean' in show, 'unknown' in show,
6621 'ignored' in show, 'clean' in show, 'unknown' in show,
6622 opts.get('subrepos'))
6622 opts.get('subrepos'))
6623 changestates = zip(states, 'MAR!?IC', stat)
6623 changestates = zip(states, 'MAR!?IC', stat)
6624
6624
6625 if (opts.get('all') or opts.get('copies')
6625 if (opts.get('all') or opts.get('copies')
6626 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6626 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6627 copy = copies.pathcopies(repo[node1], repo[node2], m)
6627 copy = copies.pathcopies(repo[node1], repo[node2], m)
6628
6628
6629 fm = ui.formatter('status', opts)
6629 fm = ui.formatter('status', opts)
6630 fmt = '%s' + end
6630 fmt = '%s' + end
6631 showchar = not opts.get('no_status')
6631 showchar = not opts.get('no_status')
6632
6632
6633 for state, char, files in changestates:
6633 for state, char, files in changestates:
6634 if state in show:
6634 if state in show:
6635 label = 'status.' + state
6635 label = 'status.' + state
6636 for f in files:
6636 for f in files:
6637 fm.startitem()
6637 fm.startitem()
6638 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6638 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6639 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6639 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6640 if f in copy:
6640 if f in copy:
6641 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6641 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6642 label='status.copied')
6642 label='status.copied')
6643 fm.end()
6643 fm.end()
6644
6644
6645 @command('^summary|sum',
6645 @command('^summary|sum',
6646 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6646 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6647 def summary(ui, repo, **opts):
6647 def summary(ui, repo, **opts):
6648 """summarize working directory state
6648 """summarize working directory state
6649
6649
6650 This generates a brief summary of the working directory state,
6650 This generates a brief summary of the working directory state,
6651 including parents, branch, commit status, phase and available updates.
6651 including parents, branch, commit status, phase and available updates.
6652
6652
6653 With the --remote option, this will check the default paths for
6653 With the --remote option, this will check the default paths for
6654 incoming and outgoing changes. This can be time-consuming.
6654 incoming and outgoing changes. This can be time-consuming.
6655
6655
6656 Returns 0 on success.
6656 Returns 0 on success.
6657 """
6657 """
6658
6658
6659 ctx = repo[None]
6659 ctx = repo[None]
6660 parents = ctx.parents()
6660 parents = ctx.parents()
6661 pnode = parents[0].node()
6661 pnode = parents[0].node()
6662 marks = []
6662 marks = []
6663
6663
6664 ms = None
6664 ms = None
6665 try:
6665 try:
6666 ms = mergemod.mergestate.read(repo)
6666 ms = mergemod.mergestate.read(repo)
6667 except error.UnsupportedMergeRecords as e:
6667 except error.UnsupportedMergeRecords as e:
6668 s = ' '.join(e.recordtypes)
6668 s = ' '.join(e.recordtypes)
6669 ui.warn(
6669 ui.warn(
6670 _('warning: merge state has unsupported record types: %s\n') % s)
6670 _('warning: merge state has unsupported record types: %s\n') % s)
6671 unresolved = 0
6671 unresolved = 0
6672 else:
6672 else:
6673 unresolved = [f for f in ms if ms[f] == 'u']
6673 unresolved = [f for f in ms if ms[f] == 'u']
6674
6674
6675 for p in parents:
6675 for p in parents:
6676 # label with log.changeset (instead of log.parent) since this
6676 # label with log.changeset (instead of log.parent) since this
6677 # shows a working directory parent *changeset*:
6677 # shows a working directory parent *changeset*:
6678 # i18n: column positioning for "hg summary"
6678 # i18n: column positioning for "hg summary"
6679 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6679 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6680 label='log.changeset changeset.%s' % p.phasestr())
6680 label='log.changeset changeset.%s' % p.phasestr())
6681 ui.write(' '.join(p.tags()), label='log.tag')
6681 ui.write(' '.join(p.tags()), label='log.tag')
6682 if p.bookmarks():
6682 if p.bookmarks():
6683 marks.extend(p.bookmarks())
6683 marks.extend(p.bookmarks())
6684 if p.rev() == -1:
6684 if p.rev() == -1:
6685 if not len(repo):
6685 if not len(repo):
6686 ui.write(_(' (empty repository)'))
6686 ui.write(_(' (empty repository)'))
6687 else:
6687 else:
6688 ui.write(_(' (no revision checked out)'))
6688 ui.write(_(' (no revision checked out)'))
6689 ui.write('\n')
6689 ui.write('\n')
6690 if p.description():
6690 if p.description():
6691 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6691 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6692 label='log.summary')
6692 label='log.summary')
6693
6693
6694 branch = ctx.branch()
6694 branch = ctx.branch()
6695 bheads = repo.branchheads(branch)
6695 bheads = repo.branchheads(branch)
6696 # i18n: column positioning for "hg summary"
6696 # i18n: column positioning for "hg summary"
6697 m = _('branch: %s\n') % branch
6697 m = _('branch: %s\n') % branch
6698 if branch != 'default':
6698 if branch != 'default':
6699 ui.write(m, label='log.branch')
6699 ui.write(m, label='log.branch')
6700 else:
6700 else:
6701 ui.status(m, label='log.branch')
6701 ui.status(m, label='log.branch')
6702
6702
6703 if marks:
6703 if marks:
6704 active = repo._activebookmark
6704 active = repo._activebookmark
6705 # i18n: column positioning for "hg summary"
6705 # i18n: column positioning for "hg summary"
6706 ui.write(_('bookmarks:'), label='log.bookmark')
6706 ui.write(_('bookmarks:'), label='log.bookmark')
6707 if active is not None:
6707 if active is not None:
6708 if active in marks:
6708 if active in marks:
6709 ui.write(' *' + active, label=activebookmarklabel)
6709 ui.write(' *' + active, label=activebookmarklabel)
6710 marks.remove(active)
6710 marks.remove(active)
6711 else:
6711 else:
6712 ui.write(' [%s]' % active, label=activebookmarklabel)
6712 ui.write(' [%s]' % active, label=activebookmarklabel)
6713 for m in marks:
6713 for m in marks:
6714 ui.write(' ' + m, label='log.bookmark')
6714 ui.write(' ' + m, label='log.bookmark')
6715 ui.write('\n', label='log.bookmark')
6715 ui.write('\n', label='log.bookmark')
6716
6716
6717 status = repo.status(unknown=True)
6717 status = repo.status(unknown=True)
6718
6718
6719 c = repo.dirstate.copies()
6719 c = repo.dirstate.copies()
6720 copied, renamed = [], []
6720 copied, renamed = [], []
6721 for d, s in c.iteritems():
6721 for d, s in c.iteritems():
6722 if s in status.removed:
6722 if s in status.removed:
6723 status.removed.remove(s)
6723 status.removed.remove(s)
6724 renamed.append(d)
6724 renamed.append(d)
6725 else:
6725 else:
6726 copied.append(d)
6726 copied.append(d)
6727 if d in status.added:
6727 if d in status.added:
6728 status.added.remove(d)
6728 status.added.remove(d)
6729
6729
6730 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6730 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6731
6731
6732 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6732 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6733 (ui.label(_('%d added'), 'status.added'), status.added),
6733 (ui.label(_('%d added'), 'status.added'), status.added),
6734 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6734 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6735 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6735 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6736 (ui.label(_('%d copied'), 'status.copied'), copied),
6736 (ui.label(_('%d copied'), 'status.copied'), copied),
6737 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6737 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6738 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6738 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6739 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6739 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6740 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6740 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6741 t = []
6741 t = []
6742 for l, s in labels:
6742 for l, s in labels:
6743 if s:
6743 if s:
6744 t.append(l % len(s))
6744 t.append(l % len(s))
6745
6745
6746 t = ', '.join(t)
6746 t = ', '.join(t)
6747 cleanworkdir = False
6747 cleanworkdir = False
6748
6748
6749 if repo.vfs.exists('graftstate'):
6749 if repo.vfs.exists('graftstate'):
6750 t += _(' (graft in progress)')
6750 t += _(' (graft in progress)')
6751 if repo.vfs.exists('updatestate'):
6751 if repo.vfs.exists('updatestate'):
6752 t += _(' (interrupted update)')
6752 t += _(' (interrupted update)')
6753 elif len(parents) > 1:
6753 elif len(parents) > 1:
6754 t += _(' (merge)')
6754 t += _(' (merge)')
6755 elif branch != parents[0].branch():
6755 elif branch != parents[0].branch():
6756 t += _(' (new branch)')
6756 t += _(' (new branch)')
6757 elif (parents[0].closesbranch() and
6757 elif (parents[0].closesbranch() and
6758 pnode in repo.branchheads(branch, closed=True)):
6758 pnode in repo.branchheads(branch, closed=True)):
6759 t += _(' (head closed)')
6759 t += _(' (head closed)')
6760 elif not (status.modified or status.added or status.removed or renamed or
6760 elif not (status.modified or status.added or status.removed or renamed or
6761 copied or subs):
6761 copied or subs):
6762 t += _(' (clean)')
6762 t += _(' (clean)')
6763 cleanworkdir = True
6763 cleanworkdir = True
6764 elif pnode not in bheads:
6764 elif pnode not in bheads:
6765 t += _(' (new branch head)')
6765 t += _(' (new branch head)')
6766
6766
6767 if parents:
6767 if parents:
6768 pendingphase = max(p.phase() for p in parents)
6768 pendingphase = max(p.phase() for p in parents)
6769 else:
6769 else:
6770 pendingphase = phases.public
6770 pendingphase = phases.public
6771
6771
6772 if pendingphase > phases.newcommitphase(ui):
6772 if pendingphase > phases.newcommitphase(ui):
6773 t += ' (%s)' % phases.phasenames[pendingphase]
6773 t += ' (%s)' % phases.phasenames[pendingphase]
6774
6774
6775 if cleanworkdir:
6775 if cleanworkdir:
6776 # i18n: column positioning for "hg summary"
6776 # i18n: column positioning for "hg summary"
6777 ui.status(_('commit: %s\n') % t.strip())
6777 ui.status(_('commit: %s\n') % t.strip())
6778 else:
6778 else:
6779 # i18n: column positioning for "hg summary"
6779 # i18n: column positioning for "hg summary"
6780 ui.write(_('commit: %s\n') % t.strip())
6780 ui.write(_('commit: %s\n') % t.strip())
6781
6781
6782 # all ancestors of branch heads - all ancestors of parent = new csets
6782 # all ancestors of branch heads - all ancestors of parent = new csets
6783 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6783 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6784 bheads))
6784 bheads))
6785
6785
6786 if new == 0:
6786 if new == 0:
6787 # i18n: column positioning for "hg summary"
6787 # i18n: column positioning for "hg summary"
6788 ui.status(_('update: (current)\n'))
6788 ui.status(_('update: (current)\n'))
6789 elif pnode not in bheads:
6789 elif pnode not in bheads:
6790 # i18n: column positioning for "hg summary"
6790 # i18n: column positioning for "hg summary"
6791 ui.write(_('update: %d new changesets (update)\n') % new)
6791 ui.write(_('update: %d new changesets (update)\n') % new)
6792 else:
6792 else:
6793 # i18n: column positioning for "hg summary"
6793 # i18n: column positioning for "hg summary"
6794 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6794 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6795 (new, len(bheads)))
6795 (new, len(bheads)))
6796
6796
6797 t = []
6797 t = []
6798 draft = len(repo.revs('draft()'))
6798 draft = len(repo.revs('draft()'))
6799 if draft:
6799 if draft:
6800 t.append(_('%d draft') % draft)
6800 t.append(_('%d draft') % draft)
6801 secret = len(repo.revs('secret()'))
6801 secret = len(repo.revs('secret()'))
6802 if secret:
6802 if secret:
6803 t.append(_('%d secret') % secret)
6803 t.append(_('%d secret') % secret)
6804
6804
6805 if draft or secret:
6805 if draft or secret:
6806 ui.status(_('phases: %s\n') % ', '.join(t))
6806 ui.status(_('phases: %s\n') % ', '.join(t))
6807
6807
6808 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6808 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6809 for trouble in ("unstable", "divergent", "bumped"):
6809 for trouble in ("unstable", "divergent", "bumped"):
6810 numtrouble = len(repo.revs(trouble + "()"))
6810 numtrouble = len(repo.revs(trouble + "()"))
6811 # We write all the possibilities to ease translation
6811 # We write all the possibilities to ease translation
6812 troublemsg = {
6812 troublemsg = {
6813 "unstable": _("unstable: %d changesets"),
6813 "unstable": _("unstable: %d changesets"),
6814 "divergent": _("divergent: %d changesets"),
6814 "divergent": _("divergent: %d changesets"),
6815 "bumped": _("bumped: %d changesets"),
6815 "bumped": _("bumped: %d changesets"),
6816 }
6816 }
6817 if numtrouble > 0:
6817 if numtrouble > 0:
6818 ui.status(troublemsg[trouble] % numtrouble + "\n")
6818 ui.status(troublemsg[trouble] % numtrouble + "\n")
6819
6819
6820 cmdutil.summaryhooks(ui, repo)
6820 cmdutil.summaryhooks(ui, repo)
6821
6821
6822 if opts.get('remote'):
6822 if opts.get('remote'):
6823 needsincoming, needsoutgoing = True, True
6823 needsincoming, needsoutgoing = True, True
6824 else:
6824 else:
6825 needsincoming, needsoutgoing = False, False
6825 needsincoming, needsoutgoing = False, False
6826 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6826 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6827 if i:
6827 if i:
6828 needsincoming = True
6828 needsincoming = True
6829 if o:
6829 if o:
6830 needsoutgoing = True
6830 needsoutgoing = True
6831 if not needsincoming and not needsoutgoing:
6831 if not needsincoming and not needsoutgoing:
6832 return
6832 return
6833
6833
6834 def getincoming():
6834 def getincoming():
6835 source, branches = hg.parseurl(ui.expandpath('default'))
6835 source, branches = hg.parseurl(ui.expandpath('default'))
6836 sbranch = branches[0]
6836 sbranch = branches[0]
6837 try:
6837 try:
6838 other = hg.peer(repo, {}, source)
6838 other = hg.peer(repo, {}, source)
6839 except error.RepoError:
6839 except error.RepoError:
6840 if opts.get('remote'):
6840 if opts.get('remote'):
6841 raise
6841 raise
6842 return source, sbranch, None, None, None
6842 return source, sbranch, None, None, None
6843 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6843 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6844 if revs:
6844 if revs:
6845 revs = [other.lookup(rev) for rev in revs]
6845 revs = [other.lookup(rev) for rev in revs]
6846 ui.debug('comparing with %s\n' % util.hidepassword(source))
6846 ui.debug('comparing with %s\n' % util.hidepassword(source))
6847 repo.ui.pushbuffer()
6847 repo.ui.pushbuffer()
6848 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6848 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6849 repo.ui.popbuffer()
6849 repo.ui.popbuffer()
6850 return source, sbranch, other, commoninc, commoninc[1]
6850 return source, sbranch, other, commoninc, commoninc[1]
6851
6851
6852 if needsincoming:
6852 if needsincoming:
6853 source, sbranch, sother, commoninc, incoming = getincoming()
6853 source, sbranch, sother, commoninc, incoming = getincoming()
6854 else:
6854 else:
6855 source = sbranch = sother = commoninc = incoming = None
6855 source = sbranch = sother = commoninc = incoming = None
6856
6856
6857 def getoutgoing():
6857 def getoutgoing():
6858 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6858 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6859 dbranch = branches[0]
6859 dbranch = branches[0]
6860 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6860 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6861 if source != dest:
6861 if source != dest:
6862 try:
6862 try:
6863 dother = hg.peer(repo, {}, dest)
6863 dother = hg.peer(repo, {}, dest)
6864 except error.RepoError:
6864 except error.RepoError:
6865 if opts.get('remote'):
6865 if opts.get('remote'):
6866 raise
6866 raise
6867 return dest, dbranch, None, None
6867 return dest, dbranch, None, None
6868 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6868 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6869 elif sother is None:
6869 elif sother is None:
6870 # there is no explicit destination peer, but source one is invalid
6870 # there is no explicit destination peer, but source one is invalid
6871 return dest, dbranch, None, None
6871 return dest, dbranch, None, None
6872 else:
6872 else:
6873 dother = sother
6873 dother = sother
6874 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6874 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6875 common = None
6875 common = None
6876 else:
6876 else:
6877 common = commoninc
6877 common = commoninc
6878 if revs:
6878 if revs:
6879 revs = [repo.lookup(rev) for rev in revs]
6879 revs = [repo.lookup(rev) for rev in revs]
6880 repo.ui.pushbuffer()
6880 repo.ui.pushbuffer()
6881 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6881 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6882 commoninc=common)
6882 commoninc=common)
6883 repo.ui.popbuffer()
6883 repo.ui.popbuffer()
6884 return dest, dbranch, dother, outgoing
6884 return dest, dbranch, dother, outgoing
6885
6885
6886 if needsoutgoing:
6886 if needsoutgoing:
6887 dest, dbranch, dother, outgoing = getoutgoing()
6887 dest, dbranch, dother, outgoing = getoutgoing()
6888 else:
6888 else:
6889 dest = dbranch = dother = outgoing = None
6889 dest = dbranch = dother = outgoing = None
6890
6890
6891 if opts.get('remote'):
6891 if opts.get('remote'):
6892 t = []
6892 t = []
6893 if incoming:
6893 if incoming:
6894 t.append(_('1 or more incoming'))
6894 t.append(_('1 or more incoming'))
6895 o = outgoing.missing
6895 o = outgoing.missing
6896 if o:
6896 if o:
6897 t.append(_('%d outgoing') % len(o))
6897 t.append(_('%d outgoing') % len(o))
6898 other = dother or sother
6898 other = dother or sother
6899 if 'bookmarks' in other.listkeys('namespaces'):
6899 if 'bookmarks' in other.listkeys('namespaces'):
6900 counts = bookmarks.summary(repo, other)
6900 counts = bookmarks.summary(repo, other)
6901 if counts[0] > 0:
6901 if counts[0] > 0:
6902 t.append(_('%d incoming bookmarks') % counts[0])
6902 t.append(_('%d incoming bookmarks') % counts[0])
6903 if counts[1] > 0:
6903 if counts[1] > 0:
6904 t.append(_('%d outgoing bookmarks') % counts[1])
6904 t.append(_('%d outgoing bookmarks') % counts[1])
6905
6905
6906 if t:
6906 if t:
6907 # i18n: column positioning for "hg summary"
6907 # i18n: column positioning for "hg summary"
6908 ui.write(_('remote: %s\n') % (', '.join(t)))
6908 ui.write(_('remote: %s\n') % (', '.join(t)))
6909 else:
6909 else:
6910 # i18n: column positioning for "hg summary"
6910 # i18n: column positioning for "hg summary"
6911 ui.status(_('remote: (synced)\n'))
6911 ui.status(_('remote: (synced)\n'))
6912
6912
6913 cmdutil.summaryremotehooks(ui, repo, opts,
6913 cmdutil.summaryremotehooks(ui, repo, opts,
6914 ((source, sbranch, sother, commoninc),
6914 ((source, sbranch, sother, commoninc),
6915 (dest, dbranch, dother, outgoing)))
6915 (dest, dbranch, dother, outgoing)))
6916
6916
6917 @command('tag',
6917 @command('tag',
6918 [('f', 'force', None, _('force tag')),
6918 [('f', 'force', None, _('force tag')),
6919 ('l', 'local', None, _('make the tag local')),
6919 ('l', 'local', None, _('make the tag local')),
6920 ('r', 'rev', '', _('revision to tag'), _('REV')),
6920 ('r', 'rev', '', _('revision to tag'), _('REV')),
6921 ('', 'remove', None, _('remove a tag')),
6921 ('', 'remove', None, _('remove a tag')),
6922 # -l/--local is already there, commitopts cannot be used
6922 # -l/--local is already there, commitopts cannot be used
6923 ('e', 'edit', None, _('invoke editor on commit messages')),
6923 ('e', 'edit', None, _('invoke editor on commit messages')),
6924 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6924 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6925 ] + commitopts2,
6925 ] + commitopts2,
6926 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6926 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6927 def tag(ui, repo, name1, *names, **opts):
6927 def tag(ui, repo, name1, *names, **opts):
6928 """add one or more tags for the current or given revision
6928 """add one or more tags for the current or given revision
6929
6929
6930 Name a particular revision using <name>.
6930 Name a particular revision using <name>.
6931
6931
6932 Tags are used to name particular revisions of the repository and are
6932 Tags are used to name particular revisions of the repository and are
6933 very useful to compare different revisions, to go back to significant
6933 very useful to compare different revisions, to go back to significant
6934 earlier versions or to mark branch points as releases, etc. Changing
6934 earlier versions or to mark branch points as releases, etc. Changing
6935 an existing tag is normally disallowed; use -f/--force to override.
6935 an existing tag is normally disallowed; use -f/--force to override.
6936
6936
6937 If no revision is given, the parent of the working directory is
6937 If no revision is given, the parent of the working directory is
6938 used.
6938 used.
6939
6939
6940 To facilitate version control, distribution, and merging of tags,
6940 To facilitate version control, distribution, and merging of tags,
6941 they are stored as a file named ".hgtags" which is managed similarly
6941 they are stored as a file named ".hgtags" which is managed similarly
6942 to other project files and can be hand-edited if necessary. This
6942 to other project files and can be hand-edited if necessary. This
6943 also means that tagging creates a new commit. The file
6943 also means that tagging creates a new commit. The file
6944 ".hg/localtags" is used for local tags (not shared among
6944 ".hg/localtags" is used for local tags (not shared among
6945 repositories).
6945 repositories).
6946
6946
6947 Tag commits are usually made at the head of a branch. If the parent
6947 Tag commits are usually made at the head of a branch. If the parent
6948 of the working directory is not a branch head, :hg:`tag` aborts; use
6948 of the working directory is not a branch head, :hg:`tag` aborts; use
6949 -f/--force to force the tag commit to be based on a non-head
6949 -f/--force to force the tag commit to be based on a non-head
6950 changeset.
6950 changeset.
6951
6951
6952 See :hg:`help dates` for a list of formats valid for -d/--date.
6952 See :hg:`help dates` for a list of formats valid for -d/--date.
6953
6953
6954 Since tag names have priority over branch names during revision
6954 Since tag names have priority over branch names during revision
6955 lookup, using an existing branch name as a tag name is discouraged.
6955 lookup, using an existing branch name as a tag name is discouraged.
6956
6956
6957 Returns 0 on success.
6957 Returns 0 on success.
6958 """
6958 """
6959 wlock = lock = None
6959 wlock = lock = None
6960 try:
6960 try:
6961 wlock = repo.wlock()
6961 wlock = repo.wlock()
6962 lock = repo.lock()
6962 lock = repo.lock()
6963 rev_ = "."
6963 rev_ = "."
6964 names = [t.strip() for t in (name1,) + names]
6964 names = [t.strip() for t in (name1,) + names]
6965 if len(names) != len(set(names)):
6965 if len(names) != len(set(names)):
6966 raise error.Abort(_('tag names must be unique'))
6966 raise error.Abort(_('tag names must be unique'))
6967 for n in names:
6967 for n in names:
6968 scmutil.checknewlabel(repo, n, 'tag')
6968 scmutil.checknewlabel(repo, n, 'tag')
6969 if not n:
6969 if not n:
6970 raise error.Abort(_('tag names cannot consist entirely of '
6970 raise error.Abort(_('tag names cannot consist entirely of '
6971 'whitespace'))
6971 'whitespace'))
6972 if opts.get('rev') and opts.get('remove'):
6972 if opts.get('rev') and opts.get('remove'):
6973 raise error.Abort(_("--rev and --remove are incompatible"))
6973 raise error.Abort(_("--rev and --remove are incompatible"))
6974 if opts.get('rev'):
6974 if opts.get('rev'):
6975 rev_ = opts['rev']
6975 rev_ = opts['rev']
6976 message = opts.get('message')
6976 message = opts.get('message')
6977 if opts.get('remove'):
6977 if opts.get('remove'):
6978 if opts.get('local'):
6978 if opts.get('local'):
6979 expectedtype = 'local'
6979 expectedtype = 'local'
6980 else:
6980 else:
6981 expectedtype = 'global'
6981 expectedtype = 'global'
6982
6982
6983 for n in names:
6983 for n in names:
6984 if not repo.tagtype(n):
6984 if not repo.tagtype(n):
6985 raise error.Abort(_("tag '%s' does not exist") % n)
6985 raise error.Abort(_("tag '%s' does not exist") % n)
6986 if repo.tagtype(n) != expectedtype:
6986 if repo.tagtype(n) != expectedtype:
6987 if expectedtype == 'global':
6987 if expectedtype == 'global':
6988 raise error.Abort(_("tag '%s' is not a global tag") % n)
6988 raise error.Abort(_("tag '%s' is not a global tag") % n)
6989 else:
6989 else:
6990 raise error.Abort(_("tag '%s' is not a local tag") % n)
6990 raise error.Abort(_("tag '%s' is not a local tag") % n)
6991 rev_ = 'null'
6991 rev_ = 'null'
6992 if not message:
6992 if not message:
6993 # we don't translate commit messages
6993 # we don't translate commit messages
6994 message = 'Removed tag %s' % ', '.join(names)
6994 message = 'Removed tag %s' % ', '.join(names)
6995 elif not opts.get('force'):
6995 elif not opts.get('force'):
6996 for n in names:
6996 for n in names:
6997 if n in repo.tags():
6997 if n in repo.tags():
6998 raise error.Abort(_("tag '%s' already exists "
6998 raise error.Abort(_("tag '%s' already exists "
6999 "(use -f to force)") % n)
6999 "(use -f to force)") % n)
7000 if not opts.get('local'):
7000 if not opts.get('local'):
7001 p1, p2 = repo.dirstate.parents()
7001 p1, p2 = repo.dirstate.parents()
7002 if p2 != nullid:
7002 if p2 != nullid:
7003 raise error.Abort(_('uncommitted merge'))
7003 raise error.Abort(_('uncommitted merge'))
7004 bheads = repo.branchheads()
7004 bheads = repo.branchheads()
7005 if not opts.get('force') and bheads and p1 not in bheads:
7005 if not opts.get('force') and bheads and p1 not in bheads:
7006 raise error.Abort(_('not at a branch head (use -f to force)'))
7006 raise error.Abort(_('not at a branch head (use -f to force)'))
7007 r = scmutil.revsingle(repo, rev_).node()
7007 r = scmutil.revsingle(repo, rev_).node()
7008
7008
7009 if not message:
7009 if not message:
7010 # we don't translate commit messages
7010 # we don't translate commit messages
7011 message = ('Added tag %s for changeset %s' %
7011 message = ('Added tag %s for changeset %s' %
7012 (', '.join(names), short(r)))
7012 (', '.join(names), short(r)))
7013
7013
7014 date = opts.get('date')
7014 date = opts.get('date')
7015 if date:
7015 if date:
7016 date = util.parsedate(date)
7016 date = util.parsedate(date)
7017
7017
7018 if opts.get('remove'):
7018 if opts.get('remove'):
7019 editform = 'tag.remove'
7019 editform = 'tag.remove'
7020 else:
7020 else:
7021 editform = 'tag.add'
7021 editform = 'tag.add'
7022 editor = cmdutil.getcommiteditor(editform=editform, **opts)
7022 editor = cmdutil.getcommiteditor(editform=editform, **opts)
7023
7023
7024 # don't allow tagging the null rev
7024 # don't allow tagging the null rev
7025 if (not opts.get('remove') and
7025 if (not opts.get('remove') and
7026 scmutil.revsingle(repo, rev_).rev() == nullrev):
7026 scmutil.revsingle(repo, rev_).rev() == nullrev):
7027 raise error.Abort(_("cannot tag null revision"))
7027 raise error.Abort(_("cannot tag null revision"))
7028
7028
7029 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
7029 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
7030 editor=editor)
7030 editor=editor)
7031 finally:
7031 finally:
7032 release(lock, wlock)
7032 release(lock, wlock)
7033
7033
7034 @command('tags', formatteropts, '')
7034 @command('tags', formatteropts, '')
7035 def tags(ui, repo, **opts):
7035 def tags(ui, repo, **opts):
7036 """list repository tags
7036 """list repository tags
7037
7037
7038 This lists both regular and local tags. When the -v/--verbose
7038 This lists both regular and local tags. When the -v/--verbose
7039 switch is used, a third column "local" is printed for local tags.
7039 switch is used, a third column "local" is printed for local tags.
7040 When the -q/--quiet switch is used, only the tag name is printed.
7040 When the -q/--quiet switch is used, only the tag name is printed.
7041
7041
7042 Returns 0 on success.
7042 Returns 0 on success.
7043 """
7043 """
7044
7044
7045 fm = ui.formatter('tags', opts)
7045 fm = ui.formatter('tags', opts)
7046 hexfunc = fm.hexfunc
7046 hexfunc = fm.hexfunc
7047 tagtype = ""
7047 tagtype = ""
7048
7048
7049 for t, n in reversed(repo.tagslist()):
7049 for t, n in reversed(repo.tagslist()):
7050 hn = hexfunc(n)
7050 hn = hexfunc(n)
7051 label = 'tags.normal'
7051 label = 'tags.normal'
7052 tagtype = ''
7052 tagtype = ''
7053 if repo.tagtype(t) == 'local':
7053 if repo.tagtype(t) == 'local':
7054 label = 'tags.local'
7054 label = 'tags.local'
7055 tagtype = 'local'
7055 tagtype = 'local'
7056
7056
7057 fm.startitem()
7057 fm.startitem()
7058 fm.write('tag', '%s', t, label=label)
7058 fm.write('tag', '%s', t, label=label)
7059 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
7059 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
7060 fm.condwrite(not ui.quiet, 'rev node', fmt,
7060 fm.condwrite(not ui.quiet, 'rev node', fmt,
7061 repo.changelog.rev(n), hn, label=label)
7061 repo.changelog.rev(n), hn, label=label)
7062 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
7062 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
7063 tagtype, label=label)
7063 tagtype, label=label)
7064 fm.plain('\n')
7064 fm.plain('\n')
7065 fm.end()
7065 fm.end()
7066
7066
7067 @command('tip',
7067 @command('tip',
7068 [('p', 'patch', None, _('show patch')),
7068 [('p', 'patch', None, _('show patch')),
7069 ('g', 'git', None, _('use git extended diff format')),
7069 ('g', 'git', None, _('use git extended diff format')),
7070 ] + templateopts,
7070 ] + templateopts,
7071 _('[-p] [-g]'))
7071 _('[-p] [-g]'))
7072 def tip(ui, repo, **opts):
7072 def tip(ui, repo, **opts):
7073 """show the tip revision (DEPRECATED)
7073 """show the tip revision (DEPRECATED)
7074
7074
7075 The tip revision (usually just called the tip) is the changeset
7075 The tip revision (usually just called the tip) is the changeset
7076 most recently added to the repository (and therefore the most
7076 most recently added to the repository (and therefore the most
7077 recently changed head).
7077 recently changed head).
7078
7078
7079 If you have just made a commit, that commit will be the tip. If
7079 If you have just made a commit, that commit will be the tip. If
7080 you have just pulled changes from another repository, the tip of
7080 you have just pulled changes from another repository, the tip of
7081 that repository becomes the current tip. The "tip" tag is special
7081 that repository becomes the current tip. The "tip" tag is special
7082 and cannot be renamed or assigned to a different changeset.
7082 and cannot be renamed or assigned to a different changeset.
7083
7083
7084 This command is deprecated, please use :hg:`heads` instead.
7084 This command is deprecated, please use :hg:`heads` instead.
7085
7085
7086 Returns 0 on success.
7086 Returns 0 on success.
7087 """
7087 """
7088 displayer = cmdutil.show_changeset(ui, repo, opts)
7088 displayer = cmdutil.show_changeset(ui, repo, opts)
7089 displayer.show(repo['tip'])
7089 displayer.show(repo['tip'])
7090 displayer.close()
7090 displayer.close()
7091
7091
7092 @command('unbundle',
7092 @command('unbundle',
7093 [('u', 'update', None,
7093 [('u', 'update', None,
7094 _('update to new branch head if changesets were unbundled'))],
7094 _('update to new branch head if changesets were unbundled'))],
7095 _('[-u] FILE...'))
7095 _('[-u] FILE...'))
7096 def unbundle(ui, repo, fname1, *fnames, **opts):
7096 def unbundle(ui, repo, fname1, *fnames, **opts):
7097 """apply one or more changegroup files
7097 """apply one or more changegroup files
7098
7098
7099 Apply one or more compressed changegroup files generated by the
7099 Apply one or more compressed changegroup files generated by the
7100 bundle command.
7100 bundle command.
7101
7101
7102 Returns 0 on success, 1 if an update has unresolved files.
7102 Returns 0 on success, 1 if an update has unresolved files.
7103 """
7103 """
7104 fnames = (fname1,) + fnames
7104 fnames = (fname1,) + fnames
7105
7105
7106 with repo.lock():
7106 with repo.lock():
7107 for fname in fnames:
7107 for fname in fnames:
7108 f = hg.openpath(ui, fname)
7108 f = hg.openpath(ui, fname)
7109 gen = exchange.readbundle(ui, f, fname)
7109 gen = exchange.readbundle(ui, f, fname)
7110 if isinstance(gen, bundle2.unbundle20):
7110 if isinstance(gen, bundle2.unbundle20):
7111 tr = repo.transaction('unbundle')
7111 tr = repo.transaction('unbundle')
7112 try:
7112 try:
7113 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
7113 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
7114 url='bundle:' + fname)
7114 url='bundle:' + fname)
7115 tr.close()
7115 tr.close()
7116 except error.BundleUnknownFeatureError as exc:
7116 except error.BundleUnknownFeatureError as exc:
7117 raise error.Abort(_('%s: unknown bundle feature, %s')
7117 raise error.Abort(_('%s: unknown bundle feature, %s')
7118 % (fname, exc),
7118 % (fname, exc),
7119 hint=_("see https://mercurial-scm.org/"
7119 hint=_("see https://mercurial-scm.org/"
7120 "wiki/BundleFeature for more "
7120 "wiki/BundleFeature for more "
7121 "information"))
7121 "information"))
7122 finally:
7122 finally:
7123 if tr:
7123 if tr:
7124 tr.release()
7124 tr.release()
7125 changes = [r.get('return', 0)
7125 changes = [r.get('return', 0)
7126 for r in op.records['changegroup']]
7126 for r in op.records['changegroup']]
7127 modheads = changegroup.combineresults(changes)
7127 modheads = changegroup.combineresults(changes)
7128 elif isinstance(gen, streamclone.streamcloneapplier):
7128 elif isinstance(gen, streamclone.streamcloneapplier):
7129 raise error.Abort(
7129 raise error.Abort(
7130 _('packed bundles cannot be applied with '
7130 _('packed bundles cannot be applied with '
7131 '"hg unbundle"'),
7131 '"hg unbundle"'),
7132 hint=_('use "hg debugapplystreamclonebundle"'))
7132 hint=_('use "hg debugapplystreamclonebundle"'))
7133 else:
7133 else:
7134 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
7134 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
7135
7135
7136 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7136 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7137
7137
7138 @command('^update|up|checkout|co',
7138 @command('^update|up|checkout|co',
7139 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
7139 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
7140 ('c', 'check', None, _('require clean working directory')),
7140 ('c', 'check', None, _('require clean working directory')),
7141 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
7141 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
7142 ('r', 'rev', '', _('revision'), _('REV'))
7142 ('r', 'rev', '', _('revision'), _('REV'))
7143 ] + mergetoolopts,
7143 ] + mergetoolopts,
7144 _('[-c] [-C] [-d DATE] [[-r] REV]'))
7144 _('[-c] [-C] [-d DATE] [[-r] REV]'))
7145 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
7145 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
7146 tool=None):
7146 tool=None):
7147 """update working directory (or switch revisions)
7147 """update working directory (or switch revisions)
7148
7148
7149 Update the repository's working directory to the specified
7149 Update the repository's working directory to the specified
7150 changeset. If no changeset is specified, update to the tip of the
7150 changeset. If no changeset is specified, update to the tip of the
7151 current named branch and move the active bookmark (see :hg:`help
7151 current named branch and move the active bookmark (see :hg:`help
7152 bookmarks`).
7152 bookmarks`).
7153
7153
7154 Update sets the working directory's parent revision to the specified
7154 Update sets the working directory's parent revision to the specified
7155 changeset (see :hg:`help parents`).
7155 changeset (see :hg:`help parents`).
7156
7156
7157 If the changeset is not a descendant or ancestor of the working
7157 If the changeset is not a descendant or ancestor of the working
7158 directory's parent, the update is aborted. With the -c/--check
7158 directory's parent, the update is aborted. With the -c/--check
7159 option, the working directory is checked for uncommitted changes; if
7159 option, the working directory is checked for uncommitted changes; if
7160 none are found, the working directory is updated to the specified
7160 none are found, the working directory is updated to the specified
7161 changeset.
7161 changeset.
7162
7162
7163 .. container:: verbose
7163 .. container:: verbose
7164
7164
7165 The following rules apply when the working directory contains
7165 The following rules apply when the working directory contains
7166 uncommitted changes:
7166 uncommitted changes:
7167
7167
7168 1. If neither -c/--check nor -C/--clean is specified, and if
7168 1. If neither -c/--check nor -C/--clean is specified, and if
7169 the requested changeset is an ancestor or descendant of
7169 the requested changeset is an ancestor or descendant of
7170 the working directory's parent, the uncommitted changes
7170 the working directory's parent, the uncommitted changes
7171 are merged into the requested changeset and the merged
7171 are merged into the requested changeset and the merged
7172 result is left uncommitted. If the requested changeset is
7172 result is left uncommitted. If the requested changeset is
7173 not an ancestor or descendant (that is, it is on another
7173 not an ancestor or descendant (that is, it is on another
7174 branch), the update is aborted and the uncommitted changes
7174 branch), the update is aborted and the uncommitted changes
7175 are preserved.
7175 are preserved.
7176
7176
7177 2. With the -c/--check option, the update is aborted and the
7177 2. With the -c/--check option, the update is aborted and the
7178 uncommitted changes are preserved.
7178 uncommitted changes are preserved.
7179
7179
7180 3. With the -C/--clean option, uncommitted changes are discarded and
7180 3. With the -C/--clean option, uncommitted changes are discarded and
7181 the working directory is updated to the requested changeset.
7181 the working directory is updated to the requested changeset.
7182
7182
7183 To cancel an uncommitted merge (and lose your changes), use
7183 To cancel an uncommitted merge (and lose your changes), use
7184 :hg:`update --clean .`.
7184 :hg:`update --clean .`.
7185
7185
7186 Use null as the changeset to remove the working directory (like
7186 Use null as the changeset to remove the working directory (like
7187 :hg:`clone -U`).
7187 :hg:`clone -U`).
7188
7188
7189 If you want to revert just one file to an older revision, use
7189 If you want to revert just one file to an older revision, use
7190 :hg:`revert [-r REV] NAME`.
7190 :hg:`revert [-r REV] NAME`.
7191
7191
7192 See :hg:`help dates` for a list of formats valid for -d/--date.
7192 See :hg:`help dates` for a list of formats valid for -d/--date.
7193
7193
7194 Returns 0 on success, 1 if there are unresolved files.
7194 Returns 0 on success, 1 if there are unresolved files.
7195 """
7195 """
7196 if rev and node:
7196 if rev and node:
7197 raise error.Abort(_("please specify just one revision"))
7197 raise error.Abort(_("please specify just one revision"))
7198
7198
7199 if rev is None or rev == '':
7199 if rev is None or rev == '':
7200 rev = node
7200 rev = node
7201
7201
7202 if date and rev is not None:
7202 if date and rev is not None:
7203 raise error.Abort(_("you can't specify a revision and a date"))
7203 raise error.Abort(_("you can't specify a revision and a date"))
7204
7204
7205 if check and clean:
7205 if check and clean:
7206 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
7206 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
7207
7207
7208 with repo.wlock():
7208 with repo.wlock():
7209 cmdutil.clearunfinished(repo)
7209 cmdutil.clearunfinished(repo)
7210
7210
7211 if date:
7211 if date:
7212 rev = cmdutil.finddate(ui, repo, date)
7212 rev = cmdutil.finddate(ui, repo, date)
7213
7213
7214 # if we defined a bookmark, we have to remember the original name
7214 # if we defined a bookmark, we have to remember the original name
7215 brev = rev
7215 brev = rev
7216 rev = scmutil.revsingle(repo, rev, rev).rev()
7216 rev = scmutil.revsingle(repo, rev, rev).rev()
7217
7217
7218 if check:
7218 if check:
7219 cmdutil.bailifchanged(repo, merge=False)
7219 cmdutil.bailifchanged(repo, merge=False)
7220
7220
7221 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
7221 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
7222
7222
7223 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
7223 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
7224
7224
7225 @command('verify', [])
7225 @command('verify', [])
7226 def verify(ui, repo):
7226 def verify(ui, repo):
7227 """verify the integrity of the repository
7227 """verify the integrity of the repository
7228
7228
7229 Verify the integrity of the current repository.
7229 Verify the integrity of the current repository.
7230
7230
7231 This will perform an extensive check of the repository's
7231 This will perform an extensive check of the repository's
7232 integrity, validating the hashes and checksums of each entry in
7232 integrity, validating the hashes and checksums of each entry in
7233 the changelog, manifest, and tracked files, as well as the
7233 the changelog, manifest, and tracked files, as well as the
7234 integrity of their crosslinks and indices.
7234 integrity of their crosslinks and indices.
7235
7235
7236 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7236 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7237 for more information about recovery from corruption of the
7237 for more information about recovery from corruption of the
7238 repository.
7238 repository.
7239
7239
7240 Returns 0 on success, 1 if errors are encountered.
7240 Returns 0 on success, 1 if errors are encountered.
7241 """
7241 """
7242 return hg.verify(repo)
7242 return hg.verify(repo)
7243
7243
7244 @command('version', [], norepo=True)
7244 @command('version', [] + formatteropts, norepo=True)
7245 def version_(ui):
7245 def version_(ui, **opts):
7246 """output version and copyright information"""
7246 """output version and copyright information"""
7247 ui.write(_("Mercurial Distributed SCM (version %s)\n")
7247 fm = ui.formatter("version", opts)
7248 % util.version())
7248 fm.startitem()
7249 ui.status(_(
7249 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
7250 util.version())
7251 license = _(
7250 "(see https://mercurial-scm.org for more information)\n"
7252 "(see https://mercurial-scm.org for more information)\n"
7251 "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
7253 "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
7252 "This is free software; see the source for copying conditions. "
7254 "This is free software; see the source for copying conditions. "
7253 "There is NO\nwarranty; "
7255 "There is NO\nwarranty; "
7254 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7256 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7255 ))
7257 )
7256
7258 if not ui.quiet:
7257 ui.note(_("\nEnabled extensions:\n\n"))
7259 fm.plain(license)
7260
7261 if ui.verbose:
7262 fm.plain(_("\nEnabled extensions:\n\n"))
7258 # format names and versions into columns
7263 # format names and versions into columns
7259 names = []
7264 names = []
7260 vers = []
7265 vers = []
7261 isinternals = []
7266 isinternals = []
7262 for name, module in extensions.extensions():
7267 for name, module in extensions.extensions():
7263 names.append(name)
7268 names.append(name)
7264 vers.append(extensions.moduleversion(module))
7269 vers.append(extensions.moduleversion(module) or None)
7265 isinternals.append(extensions.ismoduleinternal(module))
7270 isinternals.append(extensions.ismoduleinternal(module))
7271 fn = fm.nested("extensions")
7266 if names:
7272 if names:
7267 maxnamelen = max(len(n) for n in names)
7273 namefmt = " %%-%ds " % max(len(n) for n in names)
7268 places = [_("external"), _("internal")]
7274 if fn:
7269 for i, name in enumerate(names):
7275 places = ["external", "internal"]
7270 p = isinternals[i]
7276 else:
7277 places = [_("external"), _("internal")]
7278 for n, v, p in zip(names, vers, isinternals):
7279 fn.startitem()
7280 fn.condwrite(ui.verbose, "name", namefmt, n)
7281 fn.condwrite(ui.verbose, "place", "%s ", places[p])
7282 fn.condwrite(ui.verbose and v, "ver", "%s", v)
7271 if ui.verbose:
7283 if ui.verbose:
7272 ui.write(" %-*s %s %s\n" %
7284 fn.plain("\n")
7273 (maxnamelen, name, places[p], vers[i]))
7285 fn.end()
7286 fm.end()
7274
7287
7275 def loadcmdtable(ui, name, cmdtable):
7288 def loadcmdtable(ui, name, cmdtable):
7276 """Load command functions from specified cmdtable
7289 """Load command functions from specified cmdtable
7277 """
7290 """
7278 overrides = [cmd for cmd in cmdtable if cmd in table]
7291 overrides = [cmd for cmd in cmdtable if cmd in table]
7279 if overrides:
7292 if overrides:
7280 ui.warn(_("extension '%s' overrides commands: %s\n")
7293 ui.warn(_("extension '%s' overrides commands: %s\n")
7281 % (name, " ".join(overrides)))
7294 % (name, " ".join(overrides)))
7282 table.update(cmdtable)
7295 table.update(cmdtable)
@@ -1,352 +1,352 b''
1 Show all commands except debug commands
1 Show all commands except debug commands
2 $ hg debugcomplete
2 $ hg debugcomplete
3 add
3 add
4 addremove
4 addremove
5 annotate
5 annotate
6 archive
6 archive
7 backout
7 backout
8 bisect
8 bisect
9 bookmarks
9 bookmarks
10 branch
10 branch
11 branches
11 branches
12 bundle
12 bundle
13 cat
13 cat
14 clone
14 clone
15 commit
15 commit
16 config
16 config
17 copy
17 copy
18 diff
18 diff
19 export
19 export
20 files
20 files
21 forget
21 forget
22 graft
22 graft
23 grep
23 grep
24 heads
24 heads
25 help
25 help
26 identify
26 identify
27 import
27 import
28 incoming
28 incoming
29 init
29 init
30 locate
30 locate
31 log
31 log
32 manifest
32 manifest
33 merge
33 merge
34 outgoing
34 outgoing
35 parents
35 parents
36 paths
36 paths
37 phase
37 phase
38 pull
38 pull
39 push
39 push
40 recover
40 recover
41 remove
41 remove
42 rename
42 rename
43 resolve
43 resolve
44 revert
44 revert
45 rollback
45 rollback
46 root
46 root
47 serve
47 serve
48 status
48 status
49 summary
49 summary
50 tag
50 tag
51 tags
51 tags
52 tip
52 tip
53 unbundle
53 unbundle
54 update
54 update
55 verify
55 verify
56 version
56 version
57
57
58 Show all commands that start with "a"
58 Show all commands that start with "a"
59 $ hg debugcomplete a
59 $ hg debugcomplete a
60 add
60 add
61 addremove
61 addremove
62 annotate
62 annotate
63 archive
63 archive
64
64
65 Do not show debug commands if there are other candidates
65 Do not show debug commands if there are other candidates
66 $ hg debugcomplete d
66 $ hg debugcomplete d
67 diff
67 diff
68
68
69 Show debug commands if there are no other candidates
69 Show debug commands if there are no other candidates
70 $ hg debugcomplete debug
70 $ hg debugcomplete debug
71 debugancestor
71 debugancestor
72 debugapplystreamclonebundle
72 debugapplystreamclonebundle
73 debugbuilddag
73 debugbuilddag
74 debugbundle
74 debugbundle
75 debugcheckstate
75 debugcheckstate
76 debugcommands
76 debugcommands
77 debugcomplete
77 debugcomplete
78 debugconfig
78 debugconfig
79 debugcreatestreamclonebundle
79 debugcreatestreamclonebundle
80 debugdag
80 debugdag
81 debugdata
81 debugdata
82 debugdate
82 debugdate
83 debugdeltachain
83 debugdeltachain
84 debugdirstate
84 debugdirstate
85 debugdiscovery
85 debugdiscovery
86 debugextensions
86 debugextensions
87 debugfileset
87 debugfileset
88 debugfsinfo
88 debugfsinfo
89 debuggetbundle
89 debuggetbundle
90 debugignore
90 debugignore
91 debugindex
91 debugindex
92 debugindexdot
92 debugindexdot
93 debuginstall
93 debuginstall
94 debugknown
94 debugknown
95 debuglabelcomplete
95 debuglabelcomplete
96 debuglocks
96 debuglocks
97 debugmergestate
97 debugmergestate
98 debugnamecomplete
98 debugnamecomplete
99 debugobsolete
99 debugobsolete
100 debugpathcomplete
100 debugpathcomplete
101 debugpushkey
101 debugpushkey
102 debugpvec
102 debugpvec
103 debugrebuilddirstate
103 debugrebuilddirstate
104 debugrebuildfncache
104 debugrebuildfncache
105 debugrename
105 debugrename
106 debugrevlog
106 debugrevlog
107 debugrevspec
107 debugrevspec
108 debugsetparents
108 debugsetparents
109 debugsub
109 debugsub
110 debugsuccessorssets
110 debugsuccessorssets
111 debugtemplate
111 debugtemplate
112 debugwalk
112 debugwalk
113 debugwireargs
113 debugwireargs
114
114
115 Do not show the alias of a debug command if there are other candidates
115 Do not show the alias of a debug command if there are other candidates
116 (this should hide rawcommit)
116 (this should hide rawcommit)
117 $ hg debugcomplete r
117 $ hg debugcomplete r
118 recover
118 recover
119 remove
119 remove
120 rename
120 rename
121 resolve
121 resolve
122 revert
122 revert
123 rollback
123 rollback
124 root
124 root
125 Show the alias of a debug command if there are no other candidates
125 Show the alias of a debug command if there are no other candidates
126 $ hg debugcomplete rawc
126 $ hg debugcomplete rawc
127
127
128
128
129 Show the global options
129 Show the global options
130 $ hg debugcomplete --options | sort
130 $ hg debugcomplete --options | sort
131 --config
131 --config
132 --cwd
132 --cwd
133 --debug
133 --debug
134 --debugger
134 --debugger
135 --encoding
135 --encoding
136 --encodingmode
136 --encodingmode
137 --help
137 --help
138 --hidden
138 --hidden
139 --noninteractive
139 --noninteractive
140 --profile
140 --profile
141 --quiet
141 --quiet
142 --repository
142 --repository
143 --time
143 --time
144 --traceback
144 --traceback
145 --verbose
145 --verbose
146 --version
146 --version
147 -R
147 -R
148 -h
148 -h
149 -q
149 -q
150 -v
150 -v
151 -y
151 -y
152
152
153 Show the options for the "serve" command
153 Show the options for the "serve" command
154 $ hg debugcomplete --options serve | sort
154 $ hg debugcomplete --options serve | sort
155 --accesslog
155 --accesslog
156 --address
156 --address
157 --certificate
157 --certificate
158 --cmdserver
158 --cmdserver
159 --config
159 --config
160 --cwd
160 --cwd
161 --daemon
161 --daemon
162 --daemon-postexec
162 --daemon-postexec
163 --debug
163 --debug
164 --debugger
164 --debugger
165 --encoding
165 --encoding
166 --encodingmode
166 --encodingmode
167 --errorlog
167 --errorlog
168 --help
168 --help
169 --hidden
169 --hidden
170 --ipv6
170 --ipv6
171 --name
171 --name
172 --noninteractive
172 --noninteractive
173 --pid-file
173 --pid-file
174 --port
174 --port
175 --prefix
175 --prefix
176 --profile
176 --profile
177 --quiet
177 --quiet
178 --repository
178 --repository
179 --stdio
179 --stdio
180 --style
180 --style
181 --templates
181 --templates
182 --time
182 --time
183 --traceback
183 --traceback
184 --verbose
184 --verbose
185 --version
185 --version
186 --web-conf
186 --web-conf
187 -6
187 -6
188 -A
188 -A
189 -E
189 -E
190 -R
190 -R
191 -a
191 -a
192 -d
192 -d
193 -h
193 -h
194 -n
194 -n
195 -p
195 -p
196 -q
196 -q
197 -t
197 -t
198 -v
198 -v
199 -y
199 -y
200
200
201 Show an error if we use --options with an ambiguous abbreviation
201 Show an error if we use --options with an ambiguous abbreviation
202 $ hg debugcomplete --options s
202 $ hg debugcomplete --options s
203 hg: command 's' is ambiguous:
203 hg: command 's' is ambiguous:
204 serve showconfig status summary
204 serve showconfig status summary
205 [255]
205 [255]
206
206
207 Show all commands + options
207 Show all commands + options
208 $ hg debugcommands
208 $ hg debugcommands
209 add: include, exclude, subrepos, dry-run
209 add: include, exclude, subrepos, dry-run
210 annotate: rev, follow, no-follow, text, user, file, date, number, changeset, line-number, ignore-all-space, ignore-space-change, ignore-blank-lines, include, exclude, template
210 annotate: rev, follow, no-follow, text, user, file, date, number, changeset, line-number, ignore-all-space, ignore-space-change, ignore-blank-lines, include, exclude, template
211 clone: noupdate, updaterev, rev, branch, pull, uncompressed, ssh, remotecmd, insecure
211 clone: noupdate, updaterev, rev, branch, pull, uncompressed, ssh, remotecmd, insecure
212 commit: addremove, close-branch, amend, secret, edit, interactive, include, exclude, message, logfile, date, user, subrepos
212 commit: addremove, close-branch, amend, secret, edit, interactive, include, exclude, message, logfile, date, user, subrepos
213 diff: rev, change, text, git, nodates, noprefix, show-function, reverse, ignore-all-space, ignore-space-change, ignore-blank-lines, unified, stat, root, include, exclude, subrepos
213 diff: rev, change, text, git, nodates, noprefix, show-function, reverse, ignore-all-space, ignore-space-change, ignore-blank-lines, unified, stat, root, include, exclude, subrepos
214 export: output, switch-parent, rev, text, git, nodates
214 export: output, switch-parent, rev, text, git, nodates
215 forget: include, exclude
215 forget: include, exclude
216 init: ssh, remotecmd, insecure
216 init: ssh, remotecmd, insecure
217 log: follow, follow-first, date, copies, keyword, rev, removed, only-merges, user, only-branch, branch, prune, patch, git, limit, no-merges, stat, graph, style, template, include, exclude
217 log: follow, follow-first, date, copies, keyword, rev, removed, only-merges, user, only-branch, branch, prune, patch, git, limit, no-merges, stat, graph, style, template, include, exclude
218 merge: force, rev, preview, tool
218 merge: force, rev, preview, tool
219 pull: update, force, rev, bookmark, branch, ssh, remotecmd, insecure
219 pull: update, force, rev, bookmark, branch, ssh, remotecmd, insecure
220 push: force, rev, bookmark, branch, new-branch, ssh, remotecmd, insecure
220 push: force, rev, bookmark, branch, new-branch, ssh, remotecmd, insecure
221 remove: after, force, subrepos, include, exclude
221 remove: after, force, subrepos, include, exclude
222 serve: accesslog, daemon, daemon-postexec, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate
222 serve: accesslog, daemon, daemon-postexec, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate
223 status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, copies, print0, rev, change, include, exclude, subrepos, template
223 status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, copies, print0, rev, change, include, exclude, subrepos, template
224 summary: remote
224 summary: remote
225 update: clean, check, date, rev, tool
225 update: clean, check, date, rev, tool
226 addremove: similarity, subrepos, include, exclude, dry-run
226 addremove: similarity, subrepos, include, exclude, dry-run
227 archive: no-decode, prefix, rev, type, subrepos, include, exclude
227 archive: no-decode, prefix, rev, type, subrepos, include, exclude
228 backout: merge, commit, no-commit, parent, rev, edit, tool, include, exclude, message, logfile, date, user
228 backout: merge, commit, no-commit, parent, rev, edit, tool, include, exclude, message, logfile, date, user
229 bisect: reset, good, bad, skip, extend, command, noupdate
229 bisect: reset, good, bad, skip, extend, command, noupdate
230 bookmarks: force, rev, delete, rename, inactive, template
230 bookmarks: force, rev, delete, rename, inactive, template
231 branch: force, clean
231 branch: force, clean
232 branches: active, closed, template
232 branches: active, closed, template
233 bundle: force, rev, branch, base, all, type, ssh, remotecmd, insecure
233 bundle: force, rev, branch, base, all, type, ssh, remotecmd, insecure
234 cat: output, rev, decode, include, exclude
234 cat: output, rev, decode, include, exclude
235 config: untrusted, edit, local, global
235 config: untrusted, edit, local, global
236 copy: after, force, include, exclude, dry-run
236 copy: after, force, include, exclude, dry-run
237 debugancestor:
237 debugancestor:
238 debugapplystreamclonebundle:
238 debugapplystreamclonebundle:
239 debugbuilddag: mergeable-file, overwritten-file, new-file
239 debugbuilddag: mergeable-file, overwritten-file, new-file
240 debugbundle: all, spec
240 debugbundle: all, spec
241 debugcheckstate:
241 debugcheckstate:
242 debugcommands:
242 debugcommands:
243 debugcomplete: options
243 debugcomplete: options
244 debugcreatestreamclonebundle:
244 debugcreatestreamclonebundle:
245 debugdag: tags, branches, dots, spaces
245 debugdag: tags, branches, dots, spaces
246 debugdata: changelog, manifest, dir
246 debugdata: changelog, manifest, dir
247 debugdate: extended
247 debugdate: extended
248 debugdeltachain: changelog, manifest, dir, template
248 debugdeltachain: changelog, manifest, dir, template
249 debugdirstate: nodates, datesort
249 debugdirstate: nodates, datesort
250 debugdiscovery: old, nonheads, ssh, remotecmd, insecure
250 debugdiscovery: old, nonheads, ssh, remotecmd, insecure
251 debugextensions: template
251 debugextensions: template
252 debugfileset: rev
252 debugfileset: rev
253 debugfsinfo:
253 debugfsinfo:
254 debuggetbundle: head, common, type
254 debuggetbundle: head, common, type
255 debugignore:
255 debugignore:
256 debugindex: changelog, manifest, dir, format
256 debugindex: changelog, manifest, dir, format
257 debugindexdot: changelog, manifest, dir
257 debugindexdot: changelog, manifest, dir
258 debuginstall: template
258 debuginstall: template
259 debugknown:
259 debugknown:
260 debuglabelcomplete:
260 debuglabelcomplete:
261 debuglocks: force-lock, force-wlock
261 debuglocks: force-lock, force-wlock
262 debugmergestate:
262 debugmergestate:
263 debugnamecomplete:
263 debugnamecomplete:
264 debugobsolete: flags, record-parents, rev, index, delete, date, user, template
264 debugobsolete: flags, record-parents, rev, index, delete, date, user, template
265 debugpathcomplete: full, normal, added, removed
265 debugpathcomplete: full, normal, added, removed
266 debugpushkey:
266 debugpushkey:
267 debugpvec:
267 debugpvec:
268 debugrebuilddirstate: rev, minimal
268 debugrebuilddirstate: rev, minimal
269 debugrebuildfncache:
269 debugrebuildfncache:
270 debugrename: rev
270 debugrename: rev
271 debugrevlog: changelog, manifest, dir, dump
271 debugrevlog: changelog, manifest, dir, dump
272 debugrevspec: optimize
272 debugrevspec: optimize
273 debugsetparents:
273 debugsetparents:
274 debugsub: rev
274 debugsub: rev
275 debugsuccessorssets:
275 debugsuccessorssets:
276 debugtemplate: rev, define
276 debugtemplate: rev, define
277 debugwalk: include, exclude
277 debugwalk: include, exclude
278 debugwireargs: three, four, five, ssh, remotecmd, insecure
278 debugwireargs: three, four, five, ssh, remotecmd, insecure
279 files: rev, print0, include, exclude, template, subrepos
279 files: rev, print0, include, exclude, template, subrepos
280 graft: rev, continue, edit, log, force, currentdate, currentuser, date, user, tool, dry-run
280 graft: rev, continue, edit, log, force, currentdate, currentuser, date, user, tool, dry-run
281 grep: print0, all, text, follow, ignore-case, files-with-matches, line-number, rev, user, date, include, exclude
281 grep: print0, all, text, follow, ignore-case, files-with-matches, line-number, rev, user, date, include, exclude
282 heads: rev, topo, active, closed, style, template
282 heads: rev, topo, active, closed, style, template
283 help: extension, command, keyword, system
283 help: extension, command, keyword, system
284 identify: rev, num, id, branch, tags, bookmarks, ssh, remotecmd, insecure
284 identify: rev, num, id, branch, tags, bookmarks, ssh, remotecmd, insecure
285 import: strip, base, edit, force, no-commit, bypass, partial, exact, prefix, import-branch, message, logfile, date, user, similarity
285 import: strip, base, edit, force, no-commit, bypass, partial, exact, prefix, import-branch, message, logfile, date, user, similarity
286 incoming: force, newest-first, bundle, rev, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos
286 incoming: force, newest-first, bundle, rev, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos
287 locate: rev, print0, fullpath, include, exclude
287 locate: rev, print0, fullpath, include, exclude
288 manifest: rev, all, template
288 manifest: rev, all, template
289 outgoing: force, rev, newest-first, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos
289 outgoing: force, rev, newest-first, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos
290 parents: rev, style, template
290 parents: rev, style, template
291 paths: template
291 paths: template
292 phase: public, draft, secret, force, rev
292 phase: public, draft, secret, force, rev
293 recover:
293 recover:
294 rename: after, force, include, exclude, dry-run
294 rename: after, force, include, exclude, dry-run
295 resolve: all, list, mark, unmark, no-status, tool, include, exclude, template
295 resolve: all, list, mark, unmark, no-status, tool, include, exclude, template
296 revert: all, date, rev, no-backup, interactive, include, exclude, dry-run
296 revert: all, date, rev, no-backup, interactive, include, exclude, dry-run
297 rollback: dry-run, force
297 rollback: dry-run, force
298 root:
298 root:
299 tag: force, local, rev, remove, edit, message, date, user
299 tag: force, local, rev, remove, edit, message, date, user
300 tags: template
300 tags: template
301 tip: patch, git, style, template
301 tip: patch, git, style, template
302 unbundle: update
302 unbundle: update
303 verify:
303 verify:
304 version:
304 version: template
305
305
306 $ hg init a
306 $ hg init a
307 $ cd a
307 $ cd a
308 $ echo fee > fee
308 $ echo fee > fee
309 $ hg ci -q -Amfee
309 $ hg ci -q -Amfee
310 $ hg tag fee
310 $ hg tag fee
311 $ mkdir fie
311 $ mkdir fie
312 $ echo dead > fie/dead
312 $ echo dead > fie/dead
313 $ echo live > fie/live
313 $ echo live > fie/live
314 $ hg bookmark fo
314 $ hg bookmark fo
315 $ hg branch -q fie
315 $ hg branch -q fie
316 $ hg ci -q -Amfie
316 $ hg ci -q -Amfie
317 $ echo fo > fo
317 $ echo fo > fo
318 $ hg branch -qf default
318 $ hg branch -qf default
319 $ hg ci -q -Amfo
319 $ hg ci -q -Amfo
320 $ echo Fum > Fum
320 $ echo Fum > Fum
321 $ hg ci -q -AmFum
321 $ hg ci -q -AmFum
322 $ hg bookmark Fum
322 $ hg bookmark Fum
323
323
324 Test debugpathcomplete
324 Test debugpathcomplete
325
325
326 $ hg debugpathcomplete f
326 $ hg debugpathcomplete f
327 fee
327 fee
328 fie
328 fie
329 fo
329 fo
330 $ hg debugpathcomplete -f f
330 $ hg debugpathcomplete -f f
331 fee
331 fee
332 fie/dead
332 fie/dead
333 fie/live
333 fie/live
334 fo
334 fo
335
335
336 $ hg rm Fum
336 $ hg rm Fum
337 $ hg debugpathcomplete -r F
337 $ hg debugpathcomplete -r F
338 Fum
338 Fum
339
339
340 Test debugnamecomplete
340 Test debugnamecomplete
341
341
342 $ hg debugnamecomplete
342 $ hg debugnamecomplete
343 Fum
343 Fum
344 default
344 default
345 fee
345 fee
346 fie
346 fie
347 fo
347 fo
348 tip
348 tip
349 $ hg debugnamecomplete f
349 $ hg debugnamecomplete f
350 fee
350 fee
351 fie
351 fie
352 fo
352 fo
@@ -1,1489 +1,1522 b''
1 Test basic extension support
1 Test basic extension support
2
2
3 $ cat > foobar.py <<EOF
3 $ cat > foobar.py <<EOF
4 > import os
4 > import os
5 > from mercurial import cmdutil, commands
5 > from mercurial import cmdutil, commands
6 > cmdtable = {}
6 > cmdtable = {}
7 > command = cmdutil.command(cmdtable)
7 > command = cmdutil.command(cmdtable)
8 > def uisetup(ui):
8 > def uisetup(ui):
9 > ui.write("uisetup called\\n")
9 > ui.write("uisetup called\\n")
10 > ui.flush()
10 > ui.flush()
11 > def reposetup(ui, repo):
11 > def reposetup(ui, repo):
12 > ui.write("reposetup called for %s\\n" % os.path.basename(repo.root))
12 > ui.write("reposetup called for %s\\n" % os.path.basename(repo.root))
13 > ui.write("ui %s= repo.ui\\n" % (ui == repo.ui and "=" or "!"))
13 > ui.write("ui %s= repo.ui\\n" % (ui == repo.ui and "=" or "!"))
14 > ui.flush()
14 > ui.flush()
15 > @command('foo', [], 'hg foo')
15 > @command('foo', [], 'hg foo')
16 > def foo(ui, *args, **kwargs):
16 > def foo(ui, *args, **kwargs):
17 > ui.write("Foo\\n")
17 > ui.write("Foo\\n")
18 > @command('bar', [], 'hg bar', norepo=True)
18 > @command('bar', [], 'hg bar', norepo=True)
19 > def bar(ui, *args, **kwargs):
19 > def bar(ui, *args, **kwargs):
20 > ui.write("Bar\\n")
20 > ui.write("Bar\\n")
21 > EOF
21 > EOF
22 $ abspath=`pwd`/foobar.py
22 $ abspath=`pwd`/foobar.py
23
23
24 $ mkdir barfoo
24 $ mkdir barfoo
25 $ cp foobar.py barfoo/__init__.py
25 $ cp foobar.py barfoo/__init__.py
26 $ barfoopath=`pwd`/barfoo
26 $ barfoopath=`pwd`/barfoo
27
27
28 $ hg init a
28 $ hg init a
29 $ cd a
29 $ cd a
30 $ echo foo > file
30 $ echo foo > file
31 $ hg add file
31 $ hg add file
32 $ hg commit -m 'add file'
32 $ hg commit -m 'add file'
33
33
34 $ echo '[extensions]' >> $HGRCPATH
34 $ echo '[extensions]' >> $HGRCPATH
35 $ echo "foobar = $abspath" >> $HGRCPATH
35 $ echo "foobar = $abspath" >> $HGRCPATH
36 $ hg foo
36 $ hg foo
37 uisetup called
37 uisetup called
38 reposetup called for a
38 reposetup called for a
39 ui == repo.ui
39 ui == repo.ui
40 Foo
40 Foo
41
41
42 $ cd ..
42 $ cd ..
43 $ hg clone a b
43 $ hg clone a b
44 uisetup called
44 uisetup called
45 reposetup called for a
45 reposetup called for a
46 ui == repo.ui
46 ui == repo.ui
47 reposetup called for b
47 reposetup called for b
48 ui == repo.ui
48 ui == repo.ui
49 updating to branch default
49 updating to branch default
50 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
50 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
51
51
52 $ hg bar
52 $ hg bar
53 uisetup called
53 uisetup called
54 Bar
54 Bar
55 $ echo 'foobar = !' >> $HGRCPATH
55 $ echo 'foobar = !' >> $HGRCPATH
56
56
57 module/__init__.py-style
57 module/__init__.py-style
58
58
59 $ echo "barfoo = $barfoopath" >> $HGRCPATH
59 $ echo "barfoo = $barfoopath" >> $HGRCPATH
60 $ cd a
60 $ cd a
61 $ hg foo
61 $ hg foo
62 uisetup called
62 uisetup called
63 reposetup called for a
63 reposetup called for a
64 ui == repo.ui
64 ui == repo.ui
65 Foo
65 Foo
66 $ echo 'barfoo = !' >> $HGRCPATH
66 $ echo 'barfoo = !' >> $HGRCPATH
67
67
68 Check that extensions are loaded in phases:
68 Check that extensions are loaded in phases:
69
69
70 $ cat > foo.py <<EOF
70 $ cat > foo.py <<EOF
71 > import os
71 > import os
72 > name = os.path.basename(__file__).rsplit('.', 1)[0]
72 > name = os.path.basename(__file__).rsplit('.', 1)[0]
73 > print "1) %s imported" % name
73 > print "1) %s imported" % name
74 > def uisetup(ui):
74 > def uisetup(ui):
75 > print "2) %s uisetup" % name
75 > print "2) %s uisetup" % name
76 > def extsetup():
76 > def extsetup():
77 > print "3) %s extsetup" % name
77 > print "3) %s extsetup" % name
78 > def reposetup(ui, repo):
78 > def reposetup(ui, repo):
79 > print "4) %s reposetup" % name
79 > print "4) %s reposetup" % name
80 > EOF
80 > EOF
81
81
82 $ cp foo.py bar.py
82 $ cp foo.py bar.py
83 $ echo 'foo = foo.py' >> $HGRCPATH
83 $ echo 'foo = foo.py' >> $HGRCPATH
84 $ echo 'bar = bar.py' >> $HGRCPATH
84 $ echo 'bar = bar.py' >> $HGRCPATH
85
85
86 Command with no output, we just want to see the extensions loaded:
86 Command with no output, we just want to see the extensions loaded:
87
87
88 $ hg paths
88 $ hg paths
89 1) foo imported
89 1) foo imported
90 1) bar imported
90 1) bar imported
91 2) foo uisetup
91 2) foo uisetup
92 2) bar uisetup
92 2) bar uisetup
93 3) foo extsetup
93 3) foo extsetup
94 3) bar extsetup
94 3) bar extsetup
95 4) foo reposetup
95 4) foo reposetup
96 4) bar reposetup
96 4) bar reposetup
97
97
98 Check hgweb's load order:
98 Check hgweb's load order:
99
99
100 $ cat > hgweb.cgi <<EOF
100 $ cat > hgweb.cgi <<EOF
101 > #!/usr/bin/env python
101 > #!/usr/bin/env python
102 > from mercurial import demandimport; demandimport.enable()
102 > from mercurial import demandimport; demandimport.enable()
103 > from mercurial.hgweb import hgweb
103 > from mercurial.hgweb import hgweb
104 > from mercurial.hgweb import wsgicgi
104 > from mercurial.hgweb import wsgicgi
105 > application = hgweb('.', 'test repo')
105 > application = hgweb('.', 'test repo')
106 > wsgicgi.launch(application)
106 > wsgicgi.launch(application)
107 > EOF
107 > EOF
108
108
109 $ REQUEST_METHOD='GET' PATH_INFO='/' SCRIPT_NAME='' QUERY_STRING='' \
109 $ REQUEST_METHOD='GET' PATH_INFO='/' SCRIPT_NAME='' QUERY_STRING='' \
110 > SERVER_PORT='80' SERVER_NAME='localhost' python hgweb.cgi \
110 > SERVER_PORT='80' SERVER_NAME='localhost' python hgweb.cgi \
111 > | grep '^[0-9]) ' # ignores HTML output
111 > | grep '^[0-9]) ' # ignores HTML output
112 1) foo imported
112 1) foo imported
113 1) bar imported
113 1) bar imported
114 2) foo uisetup
114 2) foo uisetup
115 2) bar uisetup
115 2) bar uisetup
116 3) foo extsetup
116 3) foo extsetup
117 3) bar extsetup
117 3) bar extsetup
118 4) foo reposetup
118 4) foo reposetup
119 4) bar reposetup
119 4) bar reposetup
120
120
121 $ echo 'foo = !' >> $HGRCPATH
121 $ echo 'foo = !' >> $HGRCPATH
122 $ echo 'bar = !' >> $HGRCPATH
122 $ echo 'bar = !' >> $HGRCPATH
123
123
124 Check "from __future__ import absolute_import" support for external libraries
124 Check "from __future__ import absolute_import" support for external libraries
125
125
126 #if windows
126 #if windows
127 $ PATHSEP=";"
127 $ PATHSEP=";"
128 #else
128 #else
129 $ PATHSEP=":"
129 $ PATHSEP=":"
130 #endif
130 #endif
131 $ export PATHSEP
131 $ export PATHSEP
132
132
133 $ mkdir $TESTTMP/libroot
133 $ mkdir $TESTTMP/libroot
134 $ echo "s = 'libroot/ambig.py'" > $TESTTMP/libroot/ambig.py
134 $ echo "s = 'libroot/ambig.py'" > $TESTTMP/libroot/ambig.py
135 $ mkdir $TESTTMP/libroot/mod
135 $ mkdir $TESTTMP/libroot/mod
136 $ touch $TESTTMP/libroot/mod/__init__.py
136 $ touch $TESTTMP/libroot/mod/__init__.py
137 $ echo "s = 'libroot/mod/ambig.py'" > $TESTTMP/libroot/mod/ambig.py
137 $ echo "s = 'libroot/mod/ambig.py'" > $TESTTMP/libroot/mod/ambig.py
138
138
139 #if absimport
139 #if absimport
140 $ cat > $TESTTMP/libroot/mod/ambigabs.py <<EOF
140 $ cat > $TESTTMP/libroot/mod/ambigabs.py <<EOF
141 > from __future__ import absolute_import
141 > from __future__ import absolute_import
142 > import ambig # should load "libroot/ambig.py"
142 > import ambig # should load "libroot/ambig.py"
143 > s = ambig.s
143 > s = ambig.s
144 > EOF
144 > EOF
145 $ cat > loadabs.py <<EOF
145 $ cat > loadabs.py <<EOF
146 > import mod.ambigabs as ambigabs
146 > import mod.ambigabs as ambigabs
147 > def extsetup():
147 > def extsetup():
148 > print 'ambigabs.s=%s' % ambigabs.s
148 > print 'ambigabs.s=%s' % ambigabs.s
149 > EOF
149 > EOF
150 $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}/libroot; hg --config extensions.loadabs=loadabs.py root)
150 $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}/libroot; hg --config extensions.loadabs=loadabs.py root)
151 ambigabs.s=libroot/ambig.py
151 ambigabs.s=libroot/ambig.py
152 $TESTTMP/a (glob)
152 $TESTTMP/a (glob)
153 #endif
153 #endif
154
154
155 #if no-py3k
155 #if no-py3k
156 $ cat > $TESTTMP/libroot/mod/ambigrel.py <<EOF
156 $ cat > $TESTTMP/libroot/mod/ambigrel.py <<EOF
157 > import ambig # should load "libroot/mod/ambig.py"
157 > import ambig # should load "libroot/mod/ambig.py"
158 > s = ambig.s
158 > s = ambig.s
159 > EOF
159 > EOF
160 $ cat > loadrel.py <<EOF
160 $ cat > loadrel.py <<EOF
161 > import mod.ambigrel as ambigrel
161 > import mod.ambigrel as ambigrel
162 > def extsetup():
162 > def extsetup():
163 > print 'ambigrel.s=%s' % ambigrel.s
163 > print 'ambigrel.s=%s' % ambigrel.s
164 > EOF
164 > EOF
165 $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}/libroot; hg --config extensions.loadrel=loadrel.py root)
165 $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}/libroot; hg --config extensions.loadrel=loadrel.py root)
166 ambigrel.s=libroot/mod/ambig.py
166 ambigrel.s=libroot/mod/ambig.py
167 $TESTTMP/a (glob)
167 $TESTTMP/a (glob)
168 #endif
168 #endif
169
169
170 Check absolute/relative import of extension specific modules
170 Check absolute/relative import of extension specific modules
171
171
172 $ mkdir $TESTTMP/extroot
172 $ mkdir $TESTTMP/extroot
173 $ cat > $TESTTMP/extroot/bar.py <<EOF
173 $ cat > $TESTTMP/extroot/bar.py <<EOF
174 > s = 'this is extroot.bar'
174 > s = 'this is extroot.bar'
175 > EOF
175 > EOF
176 $ mkdir $TESTTMP/extroot/sub1
176 $ mkdir $TESTTMP/extroot/sub1
177 $ cat > $TESTTMP/extroot/sub1/__init__.py <<EOF
177 $ cat > $TESTTMP/extroot/sub1/__init__.py <<EOF
178 > s = 'this is extroot.sub1.__init__'
178 > s = 'this is extroot.sub1.__init__'
179 > EOF
179 > EOF
180 $ cat > $TESTTMP/extroot/sub1/baz.py <<EOF
180 $ cat > $TESTTMP/extroot/sub1/baz.py <<EOF
181 > s = 'this is extroot.sub1.baz'
181 > s = 'this is extroot.sub1.baz'
182 > EOF
182 > EOF
183 $ cat > $TESTTMP/extroot/__init__.py <<EOF
183 $ cat > $TESTTMP/extroot/__init__.py <<EOF
184 > s = 'this is extroot.__init__'
184 > s = 'this is extroot.__init__'
185 > import foo
185 > import foo
186 > def extsetup(ui):
186 > def extsetup(ui):
187 > ui.write('(extroot) ', foo.func(), '\n')
187 > ui.write('(extroot) ', foo.func(), '\n')
188 > ui.flush()
188 > ui.flush()
189 > EOF
189 > EOF
190
190
191 $ cat > $TESTTMP/extroot/foo.py <<EOF
191 $ cat > $TESTTMP/extroot/foo.py <<EOF
192 > # test absolute import
192 > # test absolute import
193 > buf = []
193 > buf = []
194 > def func():
194 > def func():
195 > # "not locals" case
195 > # "not locals" case
196 > import extroot.bar
196 > import extroot.bar
197 > buf.append('import extroot.bar in func(): %s' % extroot.bar.s)
197 > buf.append('import extroot.bar in func(): %s' % extroot.bar.s)
198 > return '\n(extroot) '.join(buf)
198 > return '\n(extroot) '.join(buf)
199 > # "fromlist == ('*',)" case
199 > # "fromlist == ('*',)" case
200 > from extroot.bar import *
200 > from extroot.bar import *
201 > buf.append('from extroot.bar import *: %s' % s)
201 > buf.append('from extroot.bar import *: %s' % s)
202 > # "not fromlist" and "if '.' in name" case
202 > # "not fromlist" and "if '.' in name" case
203 > import extroot.sub1.baz
203 > import extroot.sub1.baz
204 > buf.append('import extroot.sub1.baz: %s' % extroot.sub1.baz.s)
204 > buf.append('import extroot.sub1.baz: %s' % extroot.sub1.baz.s)
205 > # "not fromlist" and NOT "if '.' in name" case
205 > # "not fromlist" and NOT "if '.' in name" case
206 > import extroot
206 > import extroot
207 > buf.append('import extroot: %s' % extroot.s)
207 > buf.append('import extroot: %s' % extroot.s)
208 > # NOT "not fromlist" and NOT "level != -1" case
208 > # NOT "not fromlist" and NOT "level != -1" case
209 > from extroot.bar import s
209 > from extroot.bar import s
210 > buf.append('from extroot.bar import s: %s' % s)
210 > buf.append('from extroot.bar import s: %s' % s)
211 > EOF
211 > EOF
212 $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}; hg --config extensions.extroot=$TESTTMP/extroot root)
212 $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}; hg --config extensions.extroot=$TESTTMP/extroot root)
213 (extroot) from extroot.bar import *: this is extroot.bar
213 (extroot) from extroot.bar import *: this is extroot.bar
214 (extroot) import extroot.sub1.baz: this is extroot.sub1.baz
214 (extroot) import extroot.sub1.baz: this is extroot.sub1.baz
215 (extroot) import extroot: this is extroot.__init__
215 (extroot) import extroot: this is extroot.__init__
216 (extroot) from extroot.bar import s: this is extroot.bar
216 (extroot) from extroot.bar import s: this is extroot.bar
217 (extroot) import extroot.bar in func(): this is extroot.bar
217 (extroot) import extroot.bar in func(): this is extroot.bar
218 $TESTTMP/a (glob)
218 $TESTTMP/a (glob)
219
219
220 #if no-py3k
220 #if no-py3k
221 $ rm "$TESTTMP"/extroot/foo.*
221 $ rm "$TESTTMP"/extroot/foo.*
222 $ cat > $TESTTMP/extroot/foo.py <<EOF
222 $ cat > $TESTTMP/extroot/foo.py <<EOF
223 > # test relative import
223 > # test relative import
224 > buf = []
224 > buf = []
225 > def func():
225 > def func():
226 > # "not locals" case
226 > # "not locals" case
227 > import bar
227 > import bar
228 > buf.append('import bar in func(): %s' % bar.s)
228 > buf.append('import bar in func(): %s' % bar.s)
229 > return '\n(extroot) '.join(buf)
229 > return '\n(extroot) '.join(buf)
230 > # "fromlist == ('*',)" case
230 > # "fromlist == ('*',)" case
231 > from bar import *
231 > from bar import *
232 > buf.append('from bar import *: %s' % s)
232 > buf.append('from bar import *: %s' % s)
233 > # "not fromlist" and "if '.' in name" case
233 > # "not fromlist" and "if '.' in name" case
234 > import sub1.baz
234 > import sub1.baz
235 > buf.append('import sub1.baz: %s' % sub1.baz.s)
235 > buf.append('import sub1.baz: %s' % sub1.baz.s)
236 > # "not fromlist" and NOT "if '.' in name" case
236 > # "not fromlist" and NOT "if '.' in name" case
237 > import sub1
237 > import sub1
238 > buf.append('import sub1: %s' % sub1.s)
238 > buf.append('import sub1: %s' % sub1.s)
239 > # NOT "not fromlist" and NOT "level != -1" case
239 > # NOT "not fromlist" and NOT "level != -1" case
240 > from bar import s
240 > from bar import s
241 > buf.append('from bar import s: %s' % s)
241 > buf.append('from bar import s: %s' % s)
242 > EOF
242 > EOF
243 $ hg --config extensions.extroot=$TESTTMP/extroot root
243 $ hg --config extensions.extroot=$TESTTMP/extroot root
244 (extroot) from bar import *: this is extroot.bar
244 (extroot) from bar import *: this is extroot.bar
245 (extroot) import sub1.baz: this is extroot.sub1.baz
245 (extroot) import sub1.baz: this is extroot.sub1.baz
246 (extroot) import sub1: this is extroot.sub1.__init__
246 (extroot) import sub1: this is extroot.sub1.__init__
247 (extroot) from bar import s: this is extroot.bar
247 (extroot) from bar import s: this is extroot.bar
248 (extroot) import bar in func(): this is extroot.bar
248 (extroot) import bar in func(): this is extroot.bar
249 $TESTTMP/a (glob)
249 $TESTTMP/a (glob)
250 #endif
250 #endif
251
251
252 #if absimport
252 #if absimport
253
253
254 Examine whether module loading is delayed until actual refering, even
254 Examine whether module loading is delayed until actual refering, even
255 though module is imported with "absolute_import" feature.
255 though module is imported with "absolute_import" feature.
256
256
257 Files below in each packages are used for descirbed purpose:
257 Files below in each packages are used for descirbed purpose:
258
258
259 - "called": examine whether "from MODULE import ATTR" works correctly
259 - "called": examine whether "from MODULE import ATTR" works correctly
260 - "unused": examine whether loading is delayed correctly
260 - "unused": examine whether loading is delayed correctly
261 - "used": examine whether "from PACKAGE import MODULE" works correctly
261 - "used": examine whether "from PACKAGE import MODULE" works correctly
262
262
263 Package hierarchy is needed to examine whether demand importing works
263 Package hierarchy is needed to examine whether demand importing works
264 as expected for "from SUB.PACK.AGE import MODULE".
264 as expected for "from SUB.PACK.AGE import MODULE".
265
265
266 Setup "external library" to be imported with "absolute_import"
266 Setup "external library" to be imported with "absolute_import"
267 feature.
267 feature.
268
268
269 $ mkdir -p $TESTTMP/extlibroot/lsub1/lsub2
269 $ mkdir -p $TESTTMP/extlibroot/lsub1/lsub2
270 $ touch $TESTTMP/extlibroot/__init__.py
270 $ touch $TESTTMP/extlibroot/__init__.py
271 $ touch $TESTTMP/extlibroot/lsub1/__init__.py
271 $ touch $TESTTMP/extlibroot/lsub1/__init__.py
272 $ touch $TESTTMP/extlibroot/lsub1/lsub2/__init__.py
272 $ touch $TESTTMP/extlibroot/lsub1/lsub2/__init__.py
273
273
274 $ cat > $TESTTMP/extlibroot/lsub1/lsub2/called.py <<EOF
274 $ cat > $TESTTMP/extlibroot/lsub1/lsub2/called.py <<EOF
275 > def func():
275 > def func():
276 > return "this is extlibroot.lsub1.lsub2.called.func()"
276 > return "this is extlibroot.lsub1.lsub2.called.func()"
277 > EOF
277 > EOF
278 $ cat > $TESTTMP/extlibroot/lsub1/lsub2/unused.py <<EOF
278 $ cat > $TESTTMP/extlibroot/lsub1/lsub2/unused.py <<EOF
279 > raise Exception("extlibroot.lsub1.lsub2.unused is loaded unintentionally")
279 > raise Exception("extlibroot.lsub1.lsub2.unused is loaded unintentionally")
280 > EOF
280 > EOF
281 $ cat > $TESTTMP/extlibroot/lsub1/lsub2/used.py <<EOF
281 $ cat > $TESTTMP/extlibroot/lsub1/lsub2/used.py <<EOF
282 > detail = "this is extlibroot.lsub1.lsub2.used"
282 > detail = "this is extlibroot.lsub1.lsub2.used"
283 > EOF
283 > EOF
284
284
285 Setup sub-package of "external library", which causes instantiation of
285 Setup sub-package of "external library", which causes instantiation of
286 demandmod in "recurse down the module chain" code path. Relative
286 demandmod in "recurse down the module chain" code path. Relative
287 importing with "absolute_import" feature isn't tested, because "level
287 importing with "absolute_import" feature isn't tested, because "level
288 >=1 " doesn't cause instantiation of demandmod.
288 >=1 " doesn't cause instantiation of demandmod.
289
289
290 $ mkdir -p $TESTTMP/extlibroot/recursedown/abs
290 $ mkdir -p $TESTTMP/extlibroot/recursedown/abs
291 $ cat > $TESTTMP/extlibroot/recursedown/abs/used.py <<EOF
291 $ cat > $TESTTMP/extlibroot/recursedown/abs/used.py <<EOF
292 > detail = "this is extlibroot.recursedown.abs.used"
292 > detail = "this is extlibroot.recursedown.abs.used"
293 > EOF
293 > EOF
294 $ cat > $TESTTMP/extlibroot/recursedown/abs/__init__.py <<EOF
294 $ cat > $TESTTMP/extlibroot/recursedown/abs/__init__.py <<EOF
295 > from __future__ import absolute_import
295 > from __future__ import absolute_import
296 > from extlibroot.recursedown.abs.used import detail
296 > from extlibroot.recursedown.abs.used import detail
297 > EOF
297 > EOF
298
298
299 $ mkdir -p $TESTTMP/extlibroot/recursedown/legacy
299 $ mkdir -p $TESTTMP/extlibroot/recursedown/legacy
300 $ cat > $TESTTMP/extlibroot/recursedown/legacy/used.py <<EOF
300 $ cat > $TESTTMP/extlibroot/recursedown/legacy/used.py <<EOF
301 > detail = "this is extlibroot.recursedown.legacy.used"
301 > detail = "this is extlibroot.recursedown.legacy.used"
302 > EOF
302 > EOF
303 $ cat > $TESTTMP/extlibroot/recursedown/legacy/__init__.py <<EOF
303 $ cat > $TESTTMP/extlibroot/recursedown/legacy/__init__.py <<EOF
304 > # legacy style (level == -1) import
304 > # legacy style (level == -1) import
305 > from extlibroot.recursedown.legacy.used import detail
305 > from extlibroot.recursedown.legacy.used import detail
306 > EOF
306 > EOF
307
307
308 $ cat > $TESTTMP/extlibroot/recursedown/__init__.py <<EOF
308 $ cat > $TESTTMP/extlibroot/recursedown/__init__.py <<EOF
309 > from __future__ import absolute_import
309 > from __future__ import absolute_import
310 > from extlibroot.recursedown.abs import detail as absdetail
310 > from extlibroot.recursedown.abs import detail as absdetail
311 > from .legacy import detail as legacydetail
311 > from .legacy import detail as legacydetail
312 > EOF
312 > EOF
313
313
314 Setup extension local modules to be imported with "absolute_import"
314 Setup extension local modules to be imported with "absolute_import"
315 feature.
315 feature.
316
316
317 $ mkdir -p $TESTTMP/absextroot/xsub1/xsub2
317 $ mkdir -p $TESTTMP/absextroot/xsub1/xsub2
318 $ touch $TESTTMP/absextroot/xsub1/__init__.py
318 $ touch $TESTTMP/absextroot/xsub1/__init__.py
319 $ touch $TESTTMP/absextroot/xsub1/xsub2/__init__.py
319 $ touch $TESTTMP/absextroot/xsub1/xsub2/__init__.py
320
320
321 $ cat > $TESTTMP/absextroot/xsub1/xsub2/called.py <<EOF
321 $ cat > $TESTTMP/absextroot/xsub1/xsub2/called.py <<EOF
322 > def func():
322 > def func():
323 > return "this is absextroot.xsub1.xsub2.called.func()"
323 > return "this is absextroot.xsub1.xsub2.called.func()"
324 > EOF
324 > EOF
325 $ cat > $TESTTMP/absextroot/xsub1/xsub2/unused.py <<EOF
325 $ cat > $TESTTMP/absextroot/xsub1/xsub2/unused.py <<EOF
326 > raise Exception("absextroot.xsub1.xsub2.unused is loaded unintentionally")
326 > raise Exception("absextroot.xsub1.xsub2.unused is loaded unintentionally")
327 > EOF
327 > EOF
328 $ cat > $TESTTMP/absextroot/xsub1/xsub2/used.py <<EOF
328 $ cat > $TESTTMP/absextroot/xsub1/xsub2/used.py <<EOF
329 > detail = "this is absextroot.xsub1.xsub2.used"
329 > detail = "this is absextroot.xsub1.xsub2.used"
330 > EOF
330 > EOF
331
331
332 Setup extension local modules to examine whether demand importing
332 Setup extension local modules to examine whether demand importing
333 works as expected in "level > 1" case.
333 works as expected in "level > 1" case.
334
334
335 $ cat > $TESTTMP/absextroot/relimportee.py <<EOF
335 $ cat > $TESTTMP/absextroot/relimportee.py <<EOF
336 > detail = "this is absextroot.relimportee"
336 > detail = "this is absextroot.relimportee"
337 > EOF
337 > EOF
338 $ cat > $TESTTMP/absextroot/xsub1/xsub2/relimporter.py <<EOF
338 $ cat > $TESTTMP/absextroot/xsub1/xsub2/relimporter.py <<EOF
339 > from __future__ import absolute_import
339 > from __future__ import absolute_import
340 > from ... import relimportee
340 > from ... import relimportee
341 > detail = "this relimporter imports %r" % (relimportee.detail)
341 > detail = "this relimporter imports %r" % (relimportee.detail)
342 > EOF
342 > EOF
343
343
344 Setup modules, which actually import extension local modules at
344 Setup modules, which actually import extension local modules at
345 runtime.
345 runtime.
346
346
347 $ cat > $TESTTMP/absextroot/absolute.py << EOF
347 $ cat > $TESTTMP/absextroot/absolute.py << EOF
348 > from __future__ import absolute_import
348 > from __future__ import absolute_import
349 >
349 >
350 > # import extension local modules absolutely (level = 0)
350 > # import extension local modules absolutely (level = 0)
351 > from absextroot.xsub1.xsub2 import used, unused
351 > from absextroot.xsub1.xsub2 import used, unused
352 > from absextroot.xsub1.xsub2.called import func
352 > from absextroot.xsub1.xsub2.called import func
353 >
353 >
354 > def getresult():
354 > def getresult():
355 > result = []
355 > result = []
356 > result.append(used.detail)
356 > result.append(used.detail)
357 > result.append(func())
357 > result.append(func())
358 > return result
358 > return result
359 > EOF
359 > EOF
360
360
361 $ cat > $TESTTMP/absextroot/relative.py << EOF
361 $ cat > $TESTTMP/absextroot/relative.py << EOF
362 > from __future__ import absolute_import
362 > from __future__ import absolute_import
363 >
363 >
364 > # import extension local modules relatively (level == 1)
364 > # import extension local modules relatively (level == 1)
365 > from .xsub1.xsub2 import used, unused
365 > from .xsub1.xsub2 import used, unused
366 > from .xsub1.xsub2.called import func
366 > from .xsub1.xsub2.called import func
367 >
367 >
368 > # import a module, which implies "importing with level > 1"
368 > # import a module, which implies "importing with level > 1"
369 > from .xsub1.xsub2 import relimporter
369 > from .xsub1.xsub2 import relimporter
370 >
370 >
371 > def getresult():
371 > def getresult():
372 > result = []
372 > result = []
373 > result.append(used.detail)
373 > result.append(used.detail)
374 > result.append(func())
374 > result.append(func())
375 > result.append(relimporter.detail)
375 > result.append(relimporter.detail)
376 > return result
376 > return result
377 > EOF
377 > EOF
378
378
379 Setup main procedure of extension.
379 Setup main procedure of extension.
380
380
381 $ cat > $TESTTMP/absextroot/__init__.py <<EOF
381 $ cat > $TESTTMP/absextroot/__init__.py <<EOF
382 > from __future__ import absolute_import
382 > from __future__ import absolute_import
383 > from mercurial import cmdutil
383 > from mercurial import cmdutil
384 > cmdtable = {}
384 > cmdtable = {}
385 > command = cmdutil.command(cmdtable)
385 > command = cmdutil.command(cmdtable)
386 >
386 >
387 > # "absolute" and "relative" shouldn't be imported before actual
387 > # "absolute" and "relative" shouldn't be imported before actual
388 > # command execution, because (1) they import same modules, and (2)
388 > # command execution, because (1) they import same modules, and (2)
389 > # preceding import (= instantiate "demandmod" object instead of
389 > # preceding import (= instantiate "demandmod" object instead of
390 > # real "module" object) might hide problem of succeeding import.
390 > # real "module" object) might hide problem of succeeding import.
391 >
391 >
392 > @command('showabsolute', [], norepo=True)
392 > @command('showabsolute', [], norepo=True)
393 > def showabsolute(ui, *args, **opts):
393 > def showabsolute(ui, *args, **opts):
394 > from absextroot import absolute
394 > from absextroot import absolute
395 > ui.write('ABS: %s\n' % '\nABS: '.join(absolute.getresult()))
395 > ui.write('ABS: %s\n' % '\nABS: '.join(absolute.getresult()))
396 >
396 >
397 > @command('showrelative', [], norepo=True)
397 > @command('showrelative', [], norepo=True)
398 > def showrelative(ui, *args, **opts):
398 > def showrelative(ui, *args, **opts):
399 > from . import relative
399 > from . import relative
400 > ui.write('REL: %s\n' % '\nREL: '.join(relative.getresult()))
400 > ui.write('REL: %s\n' % '\nREL: '.join(relative.getresult()))
401 >
401 >
402 > # import modules from external library
402 > # import modules from external library
403 > from extlibroot.lsub1.lsub2 import used as lused, unused as lunused
403 > from extlibroot.lsub1.lsub2 import used as lused, unused as lunused
404 > from extlibroot.lsub1.lsub2.called import func as lfunc
404 > from extlibroot.lsub1.lsub2.called import func as lfunc
405 > from extlibroot.recursedown import absdetail, legacydetail
405 > from extlibroot.recursedown import absdetail, legacydetail
406 >
406 >
407 > def uisetup(ui):
407 > def uisetup(ui):
408 > result = []
408 > result = []
409 > result.append(lused.detail)
409 > result.append(lused.detail)
410 > result.append(lfunc())
410 > result.append(lfunc())
411 > result.append(absdetail)
411 > result.append(absdetail)
412 > result.append(legacydetail)
412 > result.append(legacydetail)
413 > ui.write('LIB: %s\n' % '\nLIB: '.join(result))
413 > ui.write('LIB: %s\n' % '\nLIB: '.join(result))
414 > EOF
414 > EOF
415
415
416 Examine module importing.
416 Examine module importing.
417
417
418 $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}; hg --config extensions.absextroot=$TESTTMP/absextroot showabsolute)
418 $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}; hg --config extensions.absextroot=$TESTTMP/absextroot showabsolute)
419 LIB: this is extlibroot.lsub1.lsub2.used
419 LIB: this is extlibroot.lsub1.lsub2.used
420 LIB: this is extlibroot.lsub1.lsub2.called.func()
420 LIB: this is extlibroot.lsub1.lsub2.called.func()
421 LIB: this is extlibroot.recursedown.abs.used
421 LIB: this is extlibroot.recursedown.abs.used
422 LIB: this is extlibroot.recursedown.legacy.used
422 LIB: this is extlibroot.recursedown.legacy.used
423 ABS: this is absextroot.xsub1.xsub2.used
423 ABS: this is absextroot.xsub1.xsub2.used
424 ABS: this is absextroot.xsub1.xsub2.called.func()
424 ABS: this is absextroot.xsub1.xsub2.called.func()
425
425
426 $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}; hg --config extensions.absextroot=$TESTTMP/absextroot showrelative)
426 $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}; hg --config extensions.absextroot=$TESTTMP/absextroot showrelative)
427 LIB: this is extlibroot.lsub1.lsub2.used
427 LIB: this is extlibroot.lsub1.lsub2.used
428 LIB: this is extlibroot.lsub1.lsub2.called.func()
428 LIB: this is extlibroot.lsub1.lsub2.called.func()
429 LIB: this is extlibroot.recursedown.abs.used
429 LIB: this is extlibroot.recursedown.abs.used
430 LIB: this is extlibroot.recursedown.legacy.used
430 LIB: this is extlibroot.recursedown.legacy.used
431 REL: this is absextroot.xsub1.xsub2.used
431 REL: this is absextroot.xsub1.xsub2.used
432 REL: this is absextroot.xsub1.xsub2.called.func()
432 REL: this is absextroot.xsub1.xsub2.called.func()
433 REL: this relimporter imports 'this is absextroot.relimportee'
433 REL: this relimporter imports 'this is absextroot.relimportee'
434
434
435 Examine whether sub-module is imported relatively as expected.
435 Examine whether sub-module is imported relatively as expected.
436
436
437 See also issue5208 for detail about example case on Python 3.x.
437 See also issue5208 for detail about example case on Python 3.x.
438
438
439 $ f -q $TESTTMP/extlibroot/lsub1/lsub2/notexist.py
439 $ f -q $TESTTMP/extlibroot/lsub1/lsub2/notexist.py
440 $TESTTMP/extlibroot/lsub1/lsub2/notexist.py: file not found
440 $TESTTMP/extlibroot/lsub1/lsub2/notexist.py: file not found
441
441
442 $ cat > $TESTTMP/notexist.py <<EOF
442 $ cat > $TESTTMP/notexist.py <<EOF
443 > text = 'notexist.py at root is loaded unintentionally\n'
443 > text = 'notexist.py at root is loaded unintentionally\n'
444 > EOF
444 > EOF
445
445
446 $ cat > $TESTTMP/checkrelativity.py <<EOF
446 $ cat > $TESTTMP/checkrelativity.py <<EOF
447 > from mercurial import cmdutil
447 > from mercurial import cmdutil
448 > cmdtable = {}
448 > cmdtable = {}
449 > command = cmdutil.command(cmdtable)
449 > command = cmdutil.command(cmdtable)
450 >
450 >
451 > # demand import avoids failure of importing notexist here
451 > # demand import avoids failure of importing notexist here
452 > import extlibroot.lsub1.lsub2.notexist
452 > import extlibroot.lsub1.lsub2.notexist
453 >
453 >
454 > @command('checkrelativity', [], norepo=True)
454 > @command('checkrelativity', [], norepo=True)
455 > def checkrelativity(ui, *args, **opts):
455 > def checkrelativity(ui, *args, **opts):
456 > try:
456 > try:
457 > ui.write(extlibroot.lsub1.lsub2.notexist.text)
457 > ui.write(extlibroot.lsub1.lsub2.notexist.text)
458 > return 1 # unintentional success
458 > return 1 # unintentional success
459 > except ImportError:
459 > except ImportError:
460 > pass # intentional failure
460 > pass # intentional failure
461 > EOF
461 > EOF
462
462
463 $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}; hg --config extensions.checkrelativity=$TESTTMP/checkrelativity.py checkrelativity)
463 $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}; hg --config extensions.checkrelativity=$TESTTMP/checkrelativity.py checkrelativity)
464
464
465 #endif
465 #endif
466
466
467 $ cd ..
467 $ cd ..
468
468
469 hide outer repo
469 hide outer repo
470 $ hg init
470 $ hg init
471
471
472 $ cat > empty.py <<EOF
472 $ cat > empty.py <<EOF
473 > '''empty cmdtable
473 > '''empty cmdtable
474 > '''
474 > '''
475 > cmdtable = {}
475 > cmdtable = {}
476 > EOF
476 > EOF
477 $ emptypath=`pwd`/empty.py
477 $ emptypath=`pwd`/empty.py
478 $ echo "empty = $emptypath" >> $HGRCPATH
478 $ echo "empty = $emptypath" >> $HGRCPATH
479 $ hg help empty
479 $ hg help empty
480 empty extension - empty cmdtable
480 empty extension - empty cmdtable
481
481
482 no commands defined
482 no commands defined
483
483
484
484
485 $ echo 'empty = !' >> $HGRCPATH
485 $ echo 'empty = !' >> $HGRCPATH
486
486
487 $ cat > debugextension.py <<EOF
487 $ cat > debugextension.py <<EOF
488 > '''only debugcommands
488 > '''only debugcommands
489 > '''
489 > '''
490 > from mercurial import cmdutil
490 > from mercurial import cmdutil
491 > cmdtable = {}
491 > cmdtable = {}
492 > command = cmdutil.command(cmdtable)
492 > command = cmdutil.command(cmdtable)
493 > @command('debugfoobar', [], 'hg debugfoobar')
493 > @command('debugfoobar', [], 'hg debugfoobar')
494 > def debugfoobar(ui, repo, *args, **opts):
494 > def debugfoobar(ui, repo, *args, **opts):
495 > "yet another debug command"
495 > "yet another debug command"
496 > pass
496 > pass
497 > @command('foo', [], 'hg foo')
497 > @command('foo', [], 'hg foo')
498 > def foo(ui, repo, *args, **opts):
498 > def foo(ui, repo, *args, **opts):
499 > """yet another foo command
499 > """yet another foo command
500 > This command has been DEPRECATED since forever.
500 > This command has been DEPRECATED since forever.
501 > """
501 > """
502 > pass
502 > pass
503 > EOF
503 > EOF
504 $ debugpath=`pwd`/debugextension.py
504 $ debugpath=`pwd`/debugextension.py
505 $ echo "debugextension = $debugpath" >> $HGRCPATH
505 $ echo "debugextension = $debugpath" >> $HGRCPATH
506
506
507 $ hg help debugextension
507 $ hg help debugextension
508 hg debugextensions
508 hg debugextensions
509
509
510 show information about active extensions
510 show information about active extensions
511
511
512 options:
512 options:
513
513
514 (some details hidden, use --verbose to show complete help)
514 (some details hidden, use --verbose to show complete help)
515
515
516
516
517 $ hg --verbose help debugextension
517 $ hg --verbose help debugextension
518 hg debugextensions
518 hg debugextensions
519
519
520 show information about active extensions
520 show information about active extensions
521
521
522 options:
522 options:
523
523
524 -T --template TEMPLATE display with template (EXPERIMENTAL)
524 -T --template TEMPLATE display with template (EXPERIMENTAL)
525
525
526 global options ([+] can be repeated):
526 global options ([+] can be repeated):
527
527
528 -R --repository REPO repository root directory or name of overlay bundle
528 -R --repository REPO repository root directory or name of overlay bundle
529 file
529 file
530 --cwd DIR change working directory
530 --cwd DIR change working directory
531 -y --noninteractive do not prompt, automatically pick the first choice for
531 -y --noninteractive do not prompt, automatically pick the first choice for
532 all prompts
532 all prompts
533 -q --quiet suppress output
533 -q --quiet suppress output
534 -v --verbose enable additional output
534 -v --verbose enable additional output
535 --config CONFIG [+] set/override config option (use 'section.name=value')
535 --config CONFIG [+] set/override config option (use 'section.name=value')
536 --debug enable debugging output
536 --debug enable debugging output
537 --debugger start debugger
537 --debugger start debugger
538 --encoding ENCODE set the charset encoding (default: ascii)
538 --encoding ENCODE set the charset encoding (default: ascii)
539 --encodingmode MODE set the charset encoding mode (default: strict)
539 --encodingmode MODE set the charset encoding mode (default: strict)
540 --traceback always print a traceback on exception
540 --traceback always print a traceback on exception
541 --time time how long the command takes
541 --time time how long the command takes
542 --profile print command execution profile
542 --profile print command execution profile
543 --version output version information and exit
543 --version output version information and exit
544 -h --help display help and exit
544 -h --help display help and exit
545 --hidden consider hidden changesets
545 --hidden consider hidden changesets
546
546
547
547
548
548
549
549
550
550
551
551
552 $ hg --debug help debugextension
552 $ hg --debug help debugextension
553 hg debugextensions
553 hg debugextensions
554
554
555 show information about active extensions
555 show information about active extensions
556
556
557 options:
557 options:
558
558
559 -T --template TEMPLATE display with template (EXPERIMENTAL)
559 -T --template TEMPLATE display with template (EXPERIMENTAL)
560
560
561 global options ([+] can be repeated):
561 global options ([+] can be repeated):
562
562
563 -R --repository REPO repository root directory or name of overlay bundle
563 -R --repository REPO repository root directory or name of overlay bundle
564 file
564 file
565 --cwd DIR change working directory
565 --cwd DIR change working directory
566 -y --noninteractive do not prompt, automatically pick the first choice for
566 -y --noninteractive do not prompt, automatically pick the first choice for
567 all prompts
567 all prompts
568 -q --quiet suppress output
568 -q --quiet suppress output
569 -v --verbose enable additional output
569 -v --verbose enable additional output
570 --config CONFIG [+] set/override config option (use 'section.name=value')
570 --config CONFIG [+] set/override config option (use 'section.name=value')
571 --debug enable debugging output
571 --debug enable debugging output
572 --debugger start debugger
572 --debugger start debugger
573 --encoding ENCODE set the charset encoding (default: ascii)
573 --encoding ENCODE set the charset encoding (default: ascii)
574 --encodingmode MODE set the charset encoding mode (default: strict)
574 --encodingmode MODE set the charset encoding mode (default: strict)
575 --traceback always print a traceback on exception
575 --traceback always print a traceback on exception
576 --time time how long the command takes
576 --time time how long the command takes
577 --profile print command execution profile
577 --profile print command execution profile
578 --version output version information and exit
578 --version output version information and exit
579 -h --help display help and exit
579 -h --help display help and exit
580 --hidden consider hidden changesets
580 --hidden consider hidden changesets
581
581
582
582
583
583
584
584
585
585
586 $ echo 'debugextension = !' >> $HGRCPATH
586 $ echo 'debugextension = !' >> $HGRCPATH
587
587
588 Asking for help about a deprecated extension should do something useful:
588 Asking for help about a deprecated extension should do something useful:
589
589
590 $ hg help glog
590 $ hg help glog
591 'glog' is provided by the following extension:
591 'glog' is provided by the following extension:
592
592
593 graphlog command to view revision graphs from a shell (DEPRECATED)
593 graphlog command to view revision graphs from a shell (DEPRECATED)
594
594
595 (use "hg help extensions" for information on enabling extensions)
595 (use "hg help extensions" for information on enabling extensions)
596
596
597 Extension module help vs command help:
597 Extension module help vs command help:
598
598
599 $ echo 'extdiff =' >> $HGRCPATH
599 $ echo 'extdiff =' >> $HGRCPATH
600 $ hg help extdiff
600 $ hg help extdiff
601 hg extdiff [OPT]... [FILE]...
601 hg extdiff [OPT]... [FILE]...
602
602
603 use external program to diff repository (or selected files)
603 use external program to diff repository (or selected files)
604
604
605 Show differences between revisions for the specified files, using an
605 Show differences between revisions for the specified files, using an
606 external program. The default program used is diff, with default options
606 external program. The default program used is diff, with default options
607 "-Npru".
607 "-Npru".
608
608
609 To select a different program, use the -p/--program option. The program
609 To select a different program, use the -p/--program option. The program
610 will be passed the names of two directories to compare. To pass additional
610 will be passed the names of two directories to compare. To pass additional
611 options to the program, use -o/--option. These will be passed before the
611 options to the program, use -o/--option. These will be passed before the
612 names of the directories to compare.
612 names of the directories to compare.
613
613
614 When two revision arguments are given, then changes are shown between
614 When two revision arguments are given, then changes are shown between
615 those revisions. If only one revision is specified then that revision is
615 those revisions. If only one revision is specified then that revision is
616 compared to the working directory, and, when no revisions are specified,
616 compared to the working directory, and, when no revisions are specified,
617 the working directory files are compared to its parent.
617 the working directory files are compared to its parent.
618
618
619 (use "hg help -e extdiff" to show help for the extdiff extension)
619 (use "hg help -e extdiff" to show help for the extdiff extension)
620
620
621 options ([+] can be repeated):
621 options ([+] can be repeated):
622
622
623 -p --program CMD comparison program to run
623 -p --program CMD comparison program to run
624 -o --option OPT [+] pass option to comparison program
624 -o --option OPT [+] pass option to comparison program
625 -r --rev REV [+] revision
625 -r --rev REV [+] revision
626 -c --change REV change made by revision
626 -c --change REV change made by revision
627 --patch compare patches for two revisions
627 --patch compare patches for two revisions
628 -I --include PATTERN [+] include names matching the given patterns
628 -I --include PATTERN [+] include names matching the given patterns
629 -X --exclude PATTERN [+] exclude names matching the given patterns
629 -X --exclude PATTERN [+] exclude names matching the given patterns
630 -S --subrepos recurse into subrepositories
630 -S --subrepos recurse into subrepositories
631
631
632 (some details hidden, use --verbose to show complete help)
632 (some details hidden, use --verbose to show complete help)
633
633
634
634
635
635
636
636
637
637
638
638
639
639
640
640
641
641
642
642
643 $ hg help --extension extdiff
643 $ hg help --extension extdiff
644 extdiff extension - command to allow external programs to compare revisions
644 extdiff extension - command to allow external programs to compare revisions
645
645
646 The extdiff Mercurial extension allows you to use external programs to compare
646 The extdiff Mercurial extension allows you to use external programs to compare
647 revisions, or revision with working directory. The external diff programs are
647 revisions, or revision with working directory. The external diff programs are
648 called with a configurable set of options and two non-option arguments: paths
648 called with a configurable set of options and two non-option arguments: paths
649 to directories containing snapshots of files to compare.
649 to directories containing snapshots of files to compare.
650
650
651 The extdiff extension also allows you to configure new diff commands, so you
651 The extdiff extension also allows you to configure new diff commands, so you
652 do not need to type 'hg extdiff -p kdiff3' always.
652 do not need to type 'hg extdiff -p kdiff3' always.
653
653
654 [extdiff]
654 [extdiff]
655 # add new command that runs GNU diff(1) in 'context diff' mode
655 # add new command that runs GNU diff(1) in 'context diff' mode
656 cdiff = gdiff -Nprc5
656 cdiff = gdiff -Nprc5
657 ## or the old way:
657 ## or the old way:
658 #cmd.cdiff = gdiff
658 #cmd.cdiff = gdiff
659 #opts.cdiff = -Nprc5
659 #opts.cdiff = -Nprc5
660
660
661 # add new command called meld, runs meld (no need to name twice). If
661 # add new command called meld, runs meld (no need to name twice). If
662 # the meld executable is not available, the meld tool in [merge-tools]
662 # the meld executable is not available, the meld tool in [merge-tools]
663 # will be used, if available
663 # will be used, if available
664 meld =
664 meld =
665
665
666 # add new command called vimdiff, runs gvimdiff with DirDiff plugin
666 # add new command called vimdiff, runs gvimdiff with DirDiff plugin
667 # (see http://www.vim.org/scripts/script.php?script_id=102) Non
667 # (see http://www.vim.org/scripts/script.php?script_id=102) Non
668 # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
668 # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
669 # your .vimrc
669 # your .vimrc
670 vimdiff = gvim -f "+next" \
670 vimdiff = gvim -f "+next" \
671 "+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))"
671 "+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))"
672
672
673 Tool arguments can include variables that are expanded at runtime:
673 Tool arguments can include variables that are expanded at runtime:
674
674
675 $parent1, $plabel1 - filename, descriptive label of first parent
675 $parent1, $plabel1 - filename, descriptive label of first parent
676 $child, $clabel - filename, descriptive label of child revision
676 $child, $clabel - filename, descriptive label of child revision
677 $parent2, $plabel2 - filename, descriptive label of second parent
677 $parent2, $plabel2 - filename, descriptive label of second parent
678 $root - repository root
678 $root - repository root
679 $parent is an alias for $parent1.
679 $parent is an alias for $parent1.
680
680
681 The extdiff extension will look in your [diff-tools] and [merge-tools]
681 The extdiff extension will look in your [diff-tools] and [merge-tools]
682 sections for diff tool arguments, when none are specified in [extdiff].
682 sections for diff tool arguments, when none are specified in [extdiff].
683
683
684 [extdiff]
684 [extdiff]
685 kdiff3 =
685 kdiff3 =
686
686
687 [diff-tools]
687 [diff-tools]
688 kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child
688 kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child
689
689
690 You can use -I/-X and list of file or directory names like normal 'hg diff'
690 You can use -I/-X and list of file or directory names like normal 'hg diff'
691 command. The extdiff extension makes snapshots of only needed files, so
691 command. The extdiff extension makes snapshots of only needed files, so
692 running the external diff program will actually be pretty fast (at least
692 running the external diff program will actually be pretty fast (at least
693 faster than having to compare the entire tree).
693 faster than having to compare the entire tree).
694
694
695 list of commands:
695 list of commands:
696
696
697 extdiff use external program to diff repository (or selected files)
697 extdiff use external program to diff repository (or selected files)
698
698
699 (use "hg help -v -e extdiff" to show built-in aliases and global options)
699 (use "hg help -v -e extdiff" to show built-in aliases and global options)
700
700
701
701
702
702
703
703
704
704
705
705
706
706
707
707
708
708
709
709
710
710
711
711
712
712
713
713
714
714
715
715
716 $ echo 'extdiff = !' >> $HGRCPATH
716 $ echo 'extdiff = !' >> $HGRCPATH
717
717
718 Test help topic with same name as extension
718 Test help topic with same name as extension
719
719
720 $ cat > multirevs.py <<EOF
720 $ cat > multirevs.py <<EOF
721 > from mercurial import cmdutil, commands
721 > from mercurial import cmdutil, commands
722 > cmdtable = {}
722 > cmdtable = {}
723 > command = cmdutil.command(cmdtable)
723 > command = cmdutil.command(cmdtable)
724 > """multirevs extension
724 > """multirevs extension
725 > Big multi-line module docstring."""
725 > Big multi-line module docstring."""
726 > @command('multirevs', [], 'ARG', norepo=True)
726 > @command('multirevs', [], 'ARG', norepo=True)
727 > def multirevs(ui, repo, arg, *args, **opts):
727 > def multirevs(ui, repo, arg, *args, **opts):
728 > """multirevs command"""
728 > """multirevs command"""
729 > pass
729 > pass
730 > EOF
730 > EOF
731 $ echo "multirevs = multirevs.py" >> $HGRCPATH
731 $ echo "multirevs = multirevs.py" >> $HGRCPATH
732
732
733 $ hg help multirevs
733 $ hg help multirevs
734 Specifying Multiple Revisions
734 Specifying Multiple Revisions
735 """""""""""""""""""""""""""""
735 """""""""""""""""""""""""""""
736
736
737 When Mercurial accepts more than one revision, they may be specified
737 When Mercurial accepts more than one revision, they may be specified
738 individually, or provided as a topologically continuous range, separated
738 individually, or provided as a topologically continuous range, separated
739 by the ":" character.
739 by the ":" character.
740
740
741 The syntax of range notation is [BEGIN]:[END], where BEGIN and END are
741 The syntax of range notation is [BEGIN]:[END], where BEGIN and END are
742 revision identifiers. Both BEGIN and END are optional. If BEGIN is not
742 revision identifiers. Both BEGIN and END are optional. If BEGIN is not
743 specified, it defaults to revision number 0. If END is not specified, it
743 specified, it defaults to revision number 0. If END is not specified, it
744 defaults to the tip. The range ":" thus means "all revisions".
744 defaults to the tip. The range ":" thus means "all revisions".
745
745
746 If BEGIN is greater than END, revisions are treated in reverse order.
746 If BEGIN is greater than END, revisions are treated in reverse order.
747
747
748 A range acts as a closed interval. This means that a range of 3:5 gives 3,
748 A range acts as a closed interval. This means that a range of 3:5 gives 3,
749 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.
749 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.
750
750
751 use "hg help -c multirevs" to see help for the multirevs command
751 use "hg help -c multirevs" to see help for the multirevs command
752
752
753
753
754
754
755
755
756
756
757
757
758 $ hg help -c multirevs
758 $ hg help -c multirevs
759 hg multirevs ARG
759 hg multirevs ARG
760
760
761 multirevs command
761 multirevs command
762
762
763 (some details hidden, use --verbose to show complete help)
763 (some details hidden, use --verbose to show complete help)
764
764
765
765
766
766
767 $ hg multirevs
767 $ hg multirevs
768 hg multirevs: invalid arguments
768 hg multirevs: invalid arguments
769 hg multirevs ARG
769 hg multirevs ARG
770
770
771 multirevs command
771 multirevs command
772
772
773 (use "hg multirevs -h" to show more help)
773 (use "hg multirevs -h" to show more help)
774 [255]
774 [255]
775
775
776
776
777
777
778 $ echo "multirevs = !" >> $HGRCPATH
778 $ echo "multirevs = !" >> $HGRCPATH
779
779
780 Issue811: Problem loading extensions twice (by site and by user)
780 Issue811: Problem loading extensions twice (by site and by user)
781
781
782 $ cat <<EOF >> $HGRCPATH
782 $ cat <<EOF >> $HGRCPATH
783 > mq =
783 > mq =
784 > strip =
784 > strip =
785 > hgext.mq =
785 > hgext.mq =
786 > hgext/mq =
786 > hgext/mq =
787 > EOF
787 > EOF
788
788
789 Show extensions:
789 Show extensions:
790 (note that mq force load strip, also checking it's not loaded twice)
790 (note that mq force load strip, also checking it's not loaded twice)
791
791
792 $ hg debugextensions
792 $ hg debugextensions
793 mq
793 mq
794 strip
794 strip
795
795
796 For extensions, which name matches one of its commands, help
796 For extensions, which name matches one of its commands, help
797 message should ask '-v -e' to get list of built-in aliases
797 message should ask '-v -e' to get list of built-in aliases
798 along with extension help itself
798 along with extension help itself
799
799
800 $ mkdir $TESTTMP/d
800 $ mkdir $TESTTMP/d
801 $ cat > $TESTTMP/d/dodo.py <<EOF
801 $ cat > $TESTTMP/d/dodo.py <<EOF
802 > """
802 > """
803 > This is an awesome 'dodo' extension. It does nothing and
803 > This is an awesome 'dodo' extension. It does nothing and
804 > writes 'Foo foo'
804 > writes 'Foo foo'
805 > """
805 > """
806 > from mercurial import cmdutil, commands
806 > from mercurial import cmdutil, commands
807 > cmdtable = {}
807 > cmdtable = {}
808 > command = cmdutil.command(cmdtable)
808 > command = cmdutil.command(cmdtable)
809 > @command('dodo', [], 'hg dodo')
809 > @command('dodo', [], 'hg dodo')
810 > def dodo(ui, *args, **kwargs):
810 > def dodo(ui, *args, **kwargs):
811 > """Does nothing"""
811 > """Does nothing"""
812 > ui.write("I do nothing. Yay\\n")
812 > ui.write("I do nothing. Yay\\n")
813 > @command('foofoo', [], 'hg foofoo')
813 > @command('foofoo', [], 'hg foofoo')
814 > def foofoo(ui, *args, **kwargs):
814 > def foofoo(ui, *args, **kwargs):
815 > """Writes 'Foo foo'"""
815 > """Writes 'Foo foo'"""
816 > ui.write("Foo foo\\n")
816 > ui.write("Foo foo\\n")
817 > EOF
817 > EOF
818 $ dodopath=$TESTTMP/d/dodo.py
818 $ dodopath=$TESTTMP/d/dodo.py
819
819
820 $ echo "dodo = $dodopath" >> $HGRCPATH
820 $ echo "dodo = $dodopath" >> $HGRCPATH
821
821
822 Make sure that user is asked to enter '-v -e' to get list of built-in aliases
822 Make sure that user is asked to enter '-v -e' to get list of built-in aliases
823 $ hg help -e dodo
823 $ hg help -e dodo
824 dodo extension -
824 dodo extension -
825
825
826 This is an awesome 'dodo' extension. It does nothing and writes 'Foo foo'
826 This is an awesome 'dodo' extension. It does nothing and writes 'Foo foo'
827
827
828 list of commands:
828 list of commands:
829
829
830 dodo Does nothing
830 dodo Does nothing
831 foofoo Writes 'Foo foo'
831 foofoo Writes 'Foo foo'
832
832
833 (use "hg help -v -e dodo" to show built-in aliases and global options)
833 (use "hg help -v -e dodo" to show built-in aliases and global options)
834
834
835 Make sure that '-v -e' prints list of built-in aliases along with
835 Make sure that '-v -e' prints list of built-in aliases along with
836 extension help itself
836 extension help itself
837 $ hg help -v -e dodo
837 $ hg help -v -e dodo
838 dodo extension -
838 dodo extension -
839
839
840 This is an awesome 'dodo' extension. It does nothing and writes 'Foo foo'
840 This is an awesome 'dodo' extension. It does nothing and writes 'Foo foo'
841
841
842 list of commands:
842 list of commands:
843
843
844 dodo Does nothing
844 dodo Does nothing
845 foofoo Writes 'Foo foo'
845 foofoo Writes 'Foo foo'
846
846
847 global options ([+] can be repeated):
847 global options ([+] can be repeated):
848
848
849 -R --repository REPO repository root directory or name of overlay bundle
849 -R --repository REPO repository root directory or name of overlay bundle
850 file
850 file
851 --cwd DIR change working directory
851 --cwd DIR change working directory
852 -y --noninteractive do not prompt, automatically pick the first choice for
852 -y --noninteractive do not prompt, automatically pick the first choice for
853 all prompts
853 all prompts
854 -q --quiet suppress output
854 -q --quiet suppress output
855 -v --verbose enable additional output
855 -v --verbose enable additional output
856 --config CONFIG [+] set/override config option (use 'section.name=value')
856 --config CONFIG [+] set/override config option (use 'section.name=value')
857 --debug enable debugging output
857 --debug enable debugging output
858 --debugger start debugger
858 --debugger start debugger
859 --encoding ENCODE set the charset encoding (default: ascii)
859 --encoding ENCODE set the charset encoding (default: ascii)
860 --encodingmode MODE set the charset encoding mode (default: strict)
860 --encodingmode MODE set the charset encoding mode (default: strict)
861 --traceback always print a traceback on exception
861 --traceback always print a traceback on exception
862 --time time how long the command takes
862 --time time how long the command takes
863 --profile print command execution profile
863 --profile print command execution profile
864 --version output version information and exit
864 --version output version information and exit
865 -h --help display help and exit
865 -h --help display help and exit
866 --hidden consider hidden changesets
866 --hidden consider hidden changesets
867
867
868 Make sure that single '-v' option shows help and built-ins only for 'dodo' command
868 Make sure that single '-v' option shows help and built-ins only for 'dodo' command
869 $ hg help -v dodo
869 $ hg help -v dodo
870 hg dodo
870 hg dodo
871
871
872 Does nothing
872 Does nothing
873
873
874 (use "hg help -e dodo" to show help for the dodo extension)
874 (use "hg help -e dodo" to show help for the dodo extension)
875
875
876 options:
876 options:
877
877
878 --mq operate on patch repository
878 --mq operate on patch repository
879
879
880 global options ([+] can be repeated):
880 global options ([+] can be repeated):
881
881
882 -R --repository REPO repository root directory or name of overlay bundle
882 -R --repository REPO repository root directory or name of overlay bundle
883 file
883 file
884 --cwd DIR change working directory
884 --cwd DIR change working directory
885 -y --noninteractive do not prompt, automatically pick the first choice for
885 -y --noninteractive do not prompt, automatically pick the first choice for
886 all prompts
886 all prompts
887 -q --quiet suppress output
887 -q --quiet suppress output
888 -v --verbose enable additional output
888 -v --verbose enable additional output
889 --config CONFIG [+] set/override config option (use 'section.name=value')
889 --config CONFIG [+] set/override config option (use 'section.name=value')
890 --debug enable debugging output
890 --debug enable debugging output
891 --debugger start debugger
891 --debugger start debugger
892 --encoding ENCODE set the charset encoding (default: ascii)
892 --encoding ENCODE set the charset encoding (default: ascii)
893 --encodingmode MODE set the charset encoding mode (default: strict)
893 --encodingmode MODE set the charset encoding mode (default: strict)
894 --traceback always print a traceback on exception
894 --traceback always print a traceback on exception
895 --time time how long the command takes
895 --time time how long the command takes
896 --profile print command execution profile
896 --profile print command execution profile
897 --version output version information and exit
897 --version output version information and exit
898 -h --help display help and exit
898 -h --help display help and exit
899 --hidden consider hidden changesets
899 --hidden consider hidden changesets
900
900
901 In case when extension name doesn't match any of its commands,
901 In case when extension name doesn't match any of its commands,
902 help message should ask for '-v' to get list of built-in aliases
902 help message should ask for '-v' to get list of built-in aliases
903 along with extension help
903 along with extension help
904 $ cat > $TESTTMP/d/dudu.py <<EOF
904 $ cat > $TESTTMP/d/dudu.py <<EOF
905 > """
905 > """
906 > This is an awesome 'dudu' extension. It does something and
906 > This is an awesome 'dudu' extension. It does something and
907 > also writes 'Beep beep'
907 > also writes 'Beep beep'
908 > """
908 > """
909 > from mercurial import cmdutil, commands
909 > from mercurial import cmdutil, commands
910 > cmdtable = {}
910 > cmdtable = {}
911 > command = cmdutil.command(cmdtable)
911 > command = cmdutil.command(cmdtable)
912 > @command('something', [], 'hg something')
912 > @command('something', [], 'hg something')
913 > def something(ui, *args, **kwargs):
913 > def something(ui, *args, **kwargs):
914 > """Does something"""
914 > """Does something"""
915 > ui.write("I do something. Yaaay\\n")
915 > ui.write("I do something. Yaaay\\n")
916 > @command('beep', [], 'hg beep')
916 > @command('beep', [], 'hg beep')
917 > def beep(ui, *args, **kwargs):
917 > def beep(ui, *args, **kwargs):
918 > """Writes 'Beep beep'"""
918 > """Writes 'Beep beep'"""
919 > ui.write("Beep beep\\n")
919 > ui.write("Beep beep\\n")
920 > EOF
920 > EOF
921 $ dudupath=$TESTTMP/d/dudu.py
921 $ dudupath=$TESTTMP/d/dudu.py
922
922
923 $ echo "dudu = $dudupath" >> $HGRCPATH
923 $ echo "dudu = $dudupath" >> $HGRCPATH
924
924
925 $ hg help -e dudu
925 $ hg help -e dudu
926 dudu extension -
926 dudu extension -
927
927
928 This is an awesome 'dudu' extension. It does something and also writes 'Beep
928 This is an awesome 'dudu' extension. It does something and also writes 'Beep
929 beep'
929 beep'
930
930
931 list of commands:
931 list of commands:
932
932
933 beep Writes 'Beep beep'
933 beep Writes 'Beep beep'
934 something Does something
934 something Does something
935
935
936 (use "hg help -v dudu" to show built-in aliases and global options)
936 (use "hg help -v dudu" to show built-in aliases and global options)
937
937
938 In case when extension name doesn't match any of its commands,
938 In case when extension name doesn't match any of its commands,
939 help options '-v' and '-v -e' should be equivalent
939 help options '-v' and '-v -e' should be equivalent
940 $ hg help -v dudu
940 $ hg help -v dudu
941 dudu extension -
941 dudu extension -
942
942
943 This is an awesome 'dudu' extension. It does something and also writes 'Beep
943 This is an awesome 'dudu' extension. It does something and also writes 'Beep
944 beep'
944 beep'
945
945
946 list of commands:
946 list of commands:
947
947
948 beep Writes 'Beep beep'
948 beep Writes 'Beep beep'
949 something Does something
949 something Does something
950
950
951 global options ([+] can be repeated):
951 global options ([+] can be repeated):
952
952
953 -R --repository REPO repository root directory or name of overlay bundle
953 -R --repository REPO repository root directory or name of overlay bundle
954 file
954 file
955 --cwd DIR change working directory
955 --cwd DIR change working directory
956 -y --noninteractive do not prompt, automatically pick the first choice for
956 -y --noninteractive do not prompt, automatically pick the first choice for
957 all prompts
957 all prompts
958 -q --quiet suppress output
958 -q --quiet suppress output
959 -v --verbose enable additional output
959 -v --verbose enable additional output
960 --config CONFIG [+] set/override config option (use 'section.name=value')
960 --config CONFIG [+] set/override config option (use 'section.name=value')
961 --debug enable debugging output
961 --debug enable debugging output
962 --debugger start debugger
962 --debugger start debugger
963 --encoding ENCODE set the charset encoding (default: ascii)
963 --encoding ENCODE set the charset encoding (default: ascii)
964 --encodingmode MODE set the charset encoding mode (default: strict)
964 --encodingmode MODE set the charset encoding mode (default: strict)
965 --traceback always print a traceback on exception
965 --traceback always print a traceback on exception
966 --time time how long the command takes
966 --time time how long the command takes
967 --profile print command execution profile
967 --profile print command execution profile
968 --version output version information and exit
968 --version output version information and exit
969 -h --help display help and exit
969 -h --help display help and exit
970 --hidden consider hidden changesets
970 --hidden consider hidden changesets
971
971
972 $ hg help -v -e dudu
972 $ hg help -v -e dudu
973 dudu extension -
973 dudu extension -
974
974
975 This is an awesome 'dudu' extension. It does something and also writes 'Beep
975 This is an awesome 'dudu' extension. It does something and also writes 'Beep
976 beep'
976 beep'
977
977
978 list of commands:
978 list of commands:
979
979
980 beep Writes 'Beep beep'
980 beep Writes 'Beep beep'
981 something Does something
981 something Does something
982
982
983 global options ([+] can be repeated):
983 global options ([+] can be repeated):
984
984
985 -R --repository REPO repository root directory or name of overlay bundle
985 -R --repository REPO repository root directory or name of overlay bundle
986 file
986 file
987 --cwd DIR change working directory
987 --cwd DIR change working directory
988 -y --noninteractive do not prompt, automatically pick the first choice for
988 -y --noninteractive do not prompt, automatically pick the first choice for
989 all prompts
989 all prompts
990 -q --quiet suppress output
990 -q --quiet suppress output
991 -v --verbose enable additional output
991 -v --verbose enable additional output
992 --config CONFIG [+] set/override config option (use 'section.name=value')
992 --config CONFIG [+] set/override config option (use 'section.name=value')
993 --debug enable debugging output
993 --debug enable debugging output
994 --debugger start debugger
994 --debugger start debugger
995 --encoding ENCODE set the charset encoding (default: ascii)
995 --encoding ENCODE set the charset encoding (default: ascii)
996 --encodingmode MODE set the charset encoding mode (default: strict)
996 --encodingmode MODE set the charset encoding mode (default: strict)
997 --traceback always print a traceback on exception
997 --traceback always print a traceback on exception
998 --time time how long the command takes
998 --time time how long the command takes
999 --profile print command execution profile
999 --profile print command execution profile
1000 --version output version information and exit
1000 --version output version information and exit
1001 -h --help display help and exit
1001 -h --help display help and exit
1002 --hidden consider hidden changesets
1002 --hidden consider hidden changesets
1003
1003
1004 Disabled extension commands:
1004 Disabled extension commands:
1005
1005
1006 $ ORGHGRCPATH=$HGRCPATH
1006 $ ORGHGRCPATH=$HGRCPATH
1007 $ HGRCPATH=
1007 $ HGRCPATH=
1008 $ export HGRCPATH
1008 $ export HGRCPATH
1009 $ hg help email
1009 $ hg help email
1010 'email' is provided by the following extension:
1010 'email' is provided by the following extension:
1011
1011
1012 patchbomb command to send changesets as (a series of) patch emails
1012 patchbomb command to send changesets as (a series of) patch emails
1013
1013
1014 (use "hg help extensions" for information on enabling extensions)
1014 (use "hg help extensions" for information on enabling extensions)
1015
1015
1016
1016
1017 $ hg qdel
1017 $ hg qdel
1018 hg: unknown command 'qdel'
1018 hg: unknown command 'qdel'
1019 'qdelete' is provided by the following extension:
1019 'qdelete' is provided by the following extension:
1020
1020
1021 mq manage a stack of patches
1021 mq manage a stack of patches
1022
1022
1023 (use "hg help extensions" for information on enabling extensions)
1023 (use "hg help extensions" for information on enabling extensions)
1024 [255]
1024 [255]
1025
1025
1026
1026
1027 $ hg churn
1027 $ hg churn
1028 hg: unknown command 'churn'
1028 hg: unknown command 'churn'
1029 'churn' is provided by the following extension:
1029 'churn' is provided by the following extension:
1030
1030
1031 churn command to display statistics about repository history
1031 churn command to display statistics about repository history
1032
1032
1033 (use "hg help extensions" for information on enabling extensions)
1033 (use "hg help extensions" for information on enabling extensions)
1034 [255]
1034 [255]
1035
1035
1036
1036
1037
1037
1038 Disabled extensions:
1038 Disabled extensions:
1039
1039
1040 $ hg help churn
1040 $ hg help churn
1041 churn extension - command to display statistics about repository history
1041 churn extension - command to display statistics about repository history
1042
1042
1043 (use "hg help extensions" for information on enabling extensions)
1043 (use "hg help extensions" for information on enabling extensions)
1044
1044
1045 $ hg help patchbomb
1045 $ hg help patchbomb
1046 patchbomb extension - command to send changesets as (a series of) patch emails
1046 patchbomb extension - command to send changesets as (a series of) patch emails
1047
1047
1048 (use "hg help extensions" for information on enabling extensions)
1048 (use "hg help extensions" for information on enabling extensions)
1049
1049
1050
1050
1051 Broken disabled extension and command:
1051 Broken disabled extension and command:
1052
1052
1053 $ mkdir hgext
1053 $ mkdir hgext
1054 $ echo > hgext/__init__.py
1054 $ echo > hgext/__init__.py
1055 $ cat > hgext/broken.py <<EOF
1055 $ cat > hgext/broken.py <<EOF
1056 > "broken extension'
1056 > "broken extension'
1057 > EOF
1057 > EOF
1058 $ cat > path.py <<EOF
1058 $ cat > path.py <<EOF
1059 > import os, sys
1059 > import os, sys
1060 > sys.path.insert(0, os.environ['HGEXTPATH'])
1060 > sys.path.insert(0, os.environ['HGEXTPATH'])
1061 > EOF
1061 > EOF
1062 $ HGEXTPATH=`pwd`
1062 $ HGEXTPATH=`pwd`
1063 $ export HGEXTPATH
1063 $ export HGEXTPATH
1064
1064
1065 $ hg --config extensions.path=./path.py help broken
1065 $ hg --config extensions.path=./path.py help broken
1066 broken extension - (no help text available)
1066 broken extension - (no help text available)
1067
1067
1068 (use "hg help extensions" for information on enabling extensions)
1068 (use "hg help extensions" for information on enabling extensions)
1069
1069
1070
1070
1071 $ cat > hgext/forest.py <<EOF
1071 $ cat > hgext/forest.py <<EOF
1072 > cmdtable = None
1072 > cmdtable = None
1073 > EOF
1073 > EOF
1074 $ hg --config extensions.path=./path.py help foo > /dev/null
1074 $ hg --config extensions.path=./path.py help foo > /dev/null
1075 warning: error finding commands in $TESTTMP/hgext/forest.py (glob)
1075 warning: error finding commands in $TESTTMP/hgext/forest.py (glob)
1076 abort: no such help topic: foo
1076 abort: no such help topic: foo
1077 (try "hg help --keyword foo")
1077 (try "hg help --keyword foo")
1078 [255]
1078 [255]
1079
1079
1080 $ cat > throw.py <<EOF
1080 $ cat > throw.py <<EOF
1081 > from mercurial import cmdutil, commands, util
1081 > from mercurial import cmdutil, commands, util
1082 > cmdtable = {}
1082 > cmdtable = {}
1083 > command = cmdutil.command(cmdtable)
1083 > command = cmdutil.command(cmdtable)
1084 > class Bogon(Exception): pass
1084 > class Bogon(Exception): pass
1085 > @command('throw', [], 'hg throw', norepo=True)
1085 > @command('throw', [], 'hg throw', norepo=True)
1086 > def throw(ui, **opts):
1086 > def throw(ui, **opts):
1087 > """throws an exception"""
1087 > """throws an exception"""
1088 > raise Bogon()
1088 > raise Bogon()
1089 > EOF
1089 > EOF
1090
1090
1091 No declared supported version, extension complains:
1091 No declared supported version, extension complains:
1092 $ hg --config extensions.throw=throw.py throw 2>&1 | egrep '^\*\*'
1092 $ hg --config extensions.throw=throw.py throw 2>&1 | egrep '^\*\*'
1093 ** Unknown exception encountered with possibly-broken third-party extension throw
1093 ** Unknown exception encountered with possibly-broken third-party extension throw
1094 ** which supports versions unknown of Mercurial.
1094 ** which supports versions unknown of Mercurial.
1095 ** Please disable throw and try your action again.
1095 ** Please disable throw and try your action again.
1096 ** If that fixes the bug please report it to the extension author.
1096 ** If that fixes the bug please report it to the extension author.
1097 ** Python * (glob)
1097 ** Python * (glob)
1098 ** Mercurial Distributed SCM * (glob)
1098 ** Mercurial Distributed SCM * (glob)
1099 ** Extensions loaded: throw
1099 ** Extensions loaded: throw
1100
1100
1101 empty declaration of supported version, extension complains:
1101 empty declaration of supported version, extension complains:
1102 $ echo "testedwith = ''" >> throw.py
1102 $ echo "testedwith = ''" >> throw.py
1103 $ hg --config extensions.throw=throw.py throw 2>&1 | egrep '^\*\*'
1103 $ hg --config extensions.throw=throw.py throw 2>&1 | egrep '^\*\*'
1104 ** Unknown exception encountered with possibly-broken third-party extension throw
1104 ** Unknown exception encountered with possibly-broken third-party extension throw
1105 ** which supports versions unknown of Mercurial.
1105 ** which supports versions unknown of Mercurial.
1106 ** Please disable throw and try your action again.
1106 ** Please disable throw and try your action again.
1107 ** If that fixes the bug please report it to the extension author.
1107 ** If that fixes the bug please report it to the extension author.
1108 ** Python * (glob)
1108 ** Python * (glob)
1109 ** Mercurial Distributed SCM (*) (glob)
1109 ** Mercurial Distributed SCM (*) (glob)
1110 ** Extensions loaded: throw
1110 ** Extensions loaded: throw
1111
1111
1112 If the extension specifies a buglink, show that:
1112 If the extension specifies a buglink, show that:
1113 $ echo 'buglink = "http://example.com/bts"' >> throw.py
1113 $ echo 'buglink = "http://example.com/bts"' >> throw.py
1114 $ rm -f throw.pyc throw.pyo
1114 $ rm -f throw.pyc throw.pyo
1115 $ hg --config extensions.throw=throw.py throw 2>&1 | egrep '^\*\*'
1115 $ hg --config extensions.throw=throw.py throw 2>&1 | egrep '^\*\*'
1116 ** Unknown exception encountered with possibly-broken third-party extension throw
1116 ** Unknown exception encountered with possibly-broken third-party extension throw
1117 ** which supports versions unknown of Mercurial.
1117 ** which supports versions unknown of Mercurial.
1118 ** Please disable throw and try your action again.
1118 ** Please disable throw and try your action again.
1119 ** If that fixes the bug please report it to http://example.com/bts
1119 ** If that fixes the bug please report it to http://example.com/bts
1120 ** Python * (glob)
1120 ** Python * (glob)
1121 ** Mercurial Distributed SCM (*) (glob)
1121 ** Mercurial Distributed SCM (*) (glob)
1122 ** Extensions loaded: throw
1122 ** Extensions loaded: throw
1123
1123
1124 If the extensions declare outdated versions, accuse the older extension first:
1124 If the extensions declare outdated versions, accuse the older extension first:
1125 $ echo "from mercurial import util" >> older.py
1125 $ echo "from mercurial import util" >> older.py
1126 $ echo "util.version = lambda:'2.2'" >> older.py
1126 $ echo "util.version = lambda:'2.2'" >> older.py
1127 $ echo "testedwith = '1.9.3'" >> older.py
1127 $ echo "testedwith = '1.9.3'" >> older.py
1128 $ echo "testedwith = '2.1.1'" >> throw.py
1128 $ echo "testedwith = '2.1.1'" >> throw.py
1129 $ rm -f throw.pyc throw.pyo
1129 $ rm -f throw.pyc throw.pyo
1130 $ hg --config extensions.throw=throw.py --config extensions.older=older.py \
1130 $ hg --config extensions.throw=throw.py --config extensions.older=older.py \
1131 > throw 2>&1 | egrep '^\*\*'
1131 > throw 2>&1 | egrep '^\*\*'
1132 ** Unknown exception encountered with possibly-broken third-party extension older
1132 ** Unknown exception encountered with possibly-broken third-party extension older
1133 ** which supports versions 1.9 of Mercurial.
1133 ** which supports versions 1.9 of Mercurial.
1134 ** Please disable older and try your action again.
1134 ** Please disable older and try your action again.
1135 ** If that fixes the bug please report it to the extension author.
1135 ** If that fixes the bug please report it to the extension author.
1136 ** Python * (glob)
1136 ** Python * (glob)
1137 ** Mercurial Distributed SCM (version 2.2)
1137 ** Mercurial Distributed SCM (version 2.2)
1138 ** Extensions loaded: throw, older
1138 ** Extensions loaded: throw, older
1139
1139
1140 One extension only tested with older, one only with newer versions:
1140 One extension only tested with older, one only with newer versions:
1141 $ echo "util.version = lambda:'2.1'" >> older.py
1141 $ echo "util.version = lambda:'2.1'" >> older.py
1142 $ rm -f older.pyc older.pyo
1142 $ rm -f older.pyc older.pyo
1143 $ hg --config extensions.throw=throw.py --config extensions.older=older.py \
1143 $ hg --config extensions.throw=throw.py --config extensions.older=older.py \
1144 > throw 2>&1 | egrep '^\*\*'
1144 > throw 2>&1 | egrep '^\*\*'
1145 ** Unknown exception encountered with possibly-broken third-party extension older
1145 ** Unknown exception encountered with possibly-broken third-party extension older
1146 ** which supports versions 1.9 of Mercurial.
1146 ** which supports versions 1.9 of Mercurial.
1147 ** Please disable older and try your action again.
1147 ** Please disable older and try your action again.
1148 ** If that fixes the bug please report it to the extension author.
1148 ** If that fixes the bug please report it to the extension author.
1149 ** Python * (glob)
1149 ** Python * (glob)
1150 ** Mercurial Distributed SCM (version 2.1)
1150 ** Mercurial Distributed SCM (version 2.1)
1151 ** Extensions loaded: throw, older
1151 ** Extensions loaded: throw, older
1152
1152
1153 Older extension is tested with current version, the other only with newer:
1153 Older extension is tested with current version, the other only with newer:
1154 $ echo "util.version = lambda:'1.9.3'" >> older.py
1154 $ echo "util.version = lambda:'1.9.3'" >> older.py
1155 $ rm -f older.pyc older.pyo
1155 $ rm -f older.pyc older.pyo
1156 $ hg --config extensions.throw=throw.py --config extensions.older=older.py \
1156 $ hg --config extensions.throw=throw.py --config extensions.older=older.py \
1157 > throw 2>&1 | egrep '^\*\*'
1157 > throw 2>&1 | egrep '^\*\*'
1158 ** Unknown exception encountered with possibly-broken third-party extension throw
1158 ** Unknown exception encountered with possibly-broken third-party extension throw
1159 ** which supports versions 2.1 of Mercurial.
1159 ** which supports versions 2.1 of Mercurial.
1160 ** Please disable throw and try your action again.
1160 ** Please disable throw and try your action again.
1161 ** If that fixes the bug please report it to http://example.com/bts
1161 ** If that fixes the bug please report it to http://example.com/bts
1162 ** Python * (glob)
1162 ** Python * (glob)
1163 ** Mercurial Distributed SCM (version 1.9.3)
1163 ** Mercurial Distributed SCM (version 1.9.3)
1164 ** Extensions loaded: throw, older
1164 ** Extensions loaded: throw, older
1165
1165
1166 Ability to point to a different point
1166 Ability to point to a different point
1167 $ hg --config extensions.throw=throw.py --config extensions.older=older.py \
1167 $ hg --config extensions.throw=throw.py --config extensions.older=older.py \
1168 > --config ui.supportcontact='Your Local Goat Lenders' throw 2>&1 | egrep '^\*\*'
1168 > --config ui.supportcontact='Your Local Goat Lenders' throw 2>&1 | egrep '^\*\*'
1169 ** unknown exception encountered, please report by visiting
1169 ** unknown exception encountered, please report by visiting
1170 ** Your Local Goat Lenders
1170 ** Your Local Goat Lenders
1171 ** Python * (glob)
1171 ** Python * (glob)
1172 ** Mercurial Distributed SCM (*) (glob)
1172 ** Mercurial Distributed SCM (*) (glob)
1173 ** Extensions loaded: throw, older
1173 ** Extensions loaded: throw, older
1174
1174
1175 Declare the version as supporting this hg version, show regular bts link:
1175 Declare the version as supporting this hg version, show regular bts link:
1176 $ hgver=`hg debuginstall -T '{hgver}'`
1176 $ hgver=`hg debuginstall -T '{hgver}'`
1177 $ echo 'testedwith = """'"$hgver"'"""' >> throw.py
1177 $ echo 'testedwith = """'"$hgver"'"""' >> throw.py
1178 $ if [ -z "$hgver" ]; then
1178 $ if [ -z "$hgver" ]; then
1179 > echo "unable to fetch a mercurial version. Make sure __version__ is correct";
1179 > echo "unable to fetch a mercurial version. Make sure __version__ is correct";
1180 > fi
1180 > fi
1181 $ rm -f throw.pyc throw.pyo
1181 $ rm -f throw.pyc throw.pyo
1182 $ hg --config extensions.throw=throw.py throw 2>&1 | egrep '^\*\*'
1182 $ hg --config extensions.throw=throw.py throw 2>&1 | egrep '^\*\*'
1183 ** unknown exception encountered, please report by visiting
1183 ** unknown exception encountered, please report by visiting
1184 ** https://mercurial-scm.org/wiki/BugTracker
1184 ** https://mercurial-scm.org/wiki/BugTracker
1185 ** Python * (glob)
1185 ** Python * (glob)
1186 ** Mercurial Distributed SCM (*) (glob)
1186 ** Mercurial Distributed SCM (*) (glob)
1187 ** Extensions loaded: throw
1187 ** Extensions loaded: throw
1188
1188
1189 Patch version is ignored during compatibility check
1189 Patch version is ignored during compatibility check
1190 $ echo "testedwith = '3.2'" >> throw.py
1190 $ echo "testedwith = '3.2'" >> throw.py
1191 $ echo "util.version = lambda:'3.2.2'" >> throw.py
1191 $ echo "util.version = lambda:'3.2.2'" >> throw.py
1192 $ rm -f throw.pyc throw.pyo
1192 $ rm -f throw.pyc throw.pyo
1193 $ hg --config extensions.throw=throw.py throw 2>&1 | egrep '^\*\*'
1193 $ hg --config extensions.throw=throw.py throw 2>&1 | egrep '^\*\*'
1194 ** unknown exception encountered, please report by visiting
1194 ** unknown exception encountered, please report by visiting
1195 ** https://mercurial-scm.org/wiki/BugTracker
1195 ** https://mercurial-scm.org/wiki/BugTracker
1196 ** Python * (glob)
1196 ** Python * (glob)
1197 ** Mercurial Distributed SCM (*) (glob)
1197 ** Mercurial Distributed SCM (*) (glob)
1198 ** Extensions loaded: throw
1198 ** Extensions loaded: throw
1199
1199
1200 Test version number support in 'hg version':
1200 Test version number support in 'hg version':
1201 $ echo '__version__ = (1, 2, 3)' >> throw.py
1201 $ echo '__version__ = (1, 2, 3)' >> throw.py
1202 $ rm -f throw.pyc throw.pyo
1202 $ rm -f throw.pyc throw.pyo
1203 $ hg version -v
1203 $ hg version -v
1204 Mercurial Distributed SCM (version *) (glob)
1204 Mercurial Distributed SCM (version *) (glob)
1205 (see https://mercurial-scm.org for more information)
1205 (see https://mercurial-scm.org for more information)
1206
1206
1207 Copyright (C) 2005-* Matt Mackall and others (glob)
1207 Copyright (C) 2005-* Matt Mackall and others (glob)
1208 This is free software; see the source for copying conditions. There is NO
1208 This is free software; see the source for copying conditions. There is NO
1209 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1209 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1210
1210
1211 Enabled extensions:
1211 Enabled extensions:
1212
1212
1213
1213
1214 $ hg version -v --config extensions.throw=throw.py
1214 $ hg version -v --config extensions.throw=throw.py
1215 Mercurial Distributed SCM (version *) (glob)
1215 Mercurial Distributed SCM (version *) (glob)
1216 (see https://mercurial-scm.org for more information)
1216 (see https://mercurial-scm.org for more information)
1217
1217
1218 Copyright (C) 2005-* Matt Mackall and others (glob)
1218 Copyright (C) 2005-* Matt Mackall and others (glob)
1219 This is free software; see the source for copying conditions. There is NO
1219 This is free software; see the source for copying conditions. There is NO
1220 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1220 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1221
1221
1222 Enabled extensions:
1222 Enabled extensions:
1223
1223
1224 throw external 1.2.3
1224 throw external 1.2.3
1225 $ echo 'getversion = lambda: "1.twentythree"' >> throw.py
1225 $ echo 'getversion = lambda: "1.twentythree"' >> throw.py
1226 $ rm -f throw.pyc throw.pyo
1226 $ rm -f throw.pyc throw.pyo
1227 $ hg version -v --config extensions.throw=throw.py --config extensions.strip=
1227 $ hg version -v --config extensions.throw=throw.py --config extensions.strip=
1228 Mercurial Distributed SCM (version *) (glob)
1228 Mercurial Distributed SCM (version *) (glob)
1229 (see https://mercurial-scm.org for more information)
1229 (see https://mercurial-scm.org for more information)
1230
1230
1231 Copyright (C) 2005-* Matt Mackall and others (glob)
1231 Copyright (C) 2005-* Matt Mackall and others (glob)
1232 This is free software; see the source for copying conditions. There is NO
1232 This is free software; see the source for copying conditions. There is NO
1233 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1233 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1234
1234
1235 Enabled extensions:
1235 Enabled extensions:
1236
1236
1237 throw external 1.twentythree
1237 throw external 1.twentythree
1238 strip internal
1238 strip internal
1239
1239
1240 $ hg version -q --config extensions.throw=throw.py
1240 $ hg version -q --config extensions.throw=throw.py
1241 Mercurial Distributed SCM (version *) (glob)
1241 Mercurial Distributed SCM (version *) (glob)
1242
1242
1243 Test JSON output of version:
1244
1245 $ hg version -Tjson
1246 [
1247 {
1248 "extensions": [],
1249 "ver": "*" (glob)
1250 }
1251 ]
1252
1253 $ hg version --config extensions.throw=throw.py -Tjson
1254 [
1255 {
1256 "extensions": [{"name": "throw", "place": "external", "ver": "1.twentythree"}],
1257 "ver": "3.2.2"
1258 }
1259 ]
1260
1261 $ LANGUAGE= LC_ALL=ja_JP.UTF-8 hg version --config extensions.strip= -Tjson
1262 [
1263 {
1264 "extensions": [{"name": "strip", "place": "internal", "ver": null}],
1265 "ver": "*" (glob)
1266 }
1267 ]
1268
1269 Test template output of version:
1270
1271 $ hg version --config extensions.throw=throw.py --config extensions.strip= \
1272 > -T'{extensions % "{name} {pad(ver, 16)} ({place})\n"}'
1273 throw 1.twentythree (external)
1274 strip (internal)
1275
1243 Refuse to load extensions with minimum version requirements
1276 Refuse to load extensions with minimum version requirements
1244
1277
1245 $ cat > minversion1.py << EOF
1278 $ cat > minversion1.py << EOF
1246 > from mercurial import util
1279 > from mercurial import util
1247 > util.version = lambda: '3.5.2'
1280 > util.version = lambda: '3.5.2'
1248 > minimumhgversion = '3.6'
1281 > minimumhgversion = '3.6'
1249 > EOF
1282 > EOF
1250 $ hg --config extensions.minversion=minversion1.py version
1283 $ hg --config extensions.minversion=minversion1.py version
1251 (third party extension minversion requires version 3.6 or newer of Mercurial; disabling)
1284 (third party extension minversion requires version 3.6 or newer of Mercurial; disabling)
1252 Mercurial Distributed SCM (version 3.5.2)
1285 Mercurial Distributed SCM (version 3.5.2)
1253 (see https://mercurial-scm.org for more information)
1286 (see https://mercurial-scm.org for more information)
1254
1287
1255 Copyright (C) 2005-* Matt Mackall and others (glob)
1288 Copyright (C) 2005-* Matt Mackall and others (glob)
1256 This is free software; see the source for copying conditions. There is NO
1289 This is free software; see the source for copying conditions. There is NO
1257 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1290 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1258
1291
1259 $ cat > minversion2.py << EOF
1292 $ cat > minversion2.py << EOF
1260 > from mercurial import util
1293 > from mercurial import util
1261 > util.version = lambda: '3.6'
1294 > util.version = lambda: '3.6'
1262 > minimumhgversion = '3.7'
1295 > minimumhgversion = '3.7'
1263 > EOF
1296 > EOF
1264 $ hg --config extensions.minversion=minversion2.py version 2>&1 | egrep '\(third'
1297 $ hg --config extensions.minversion=minversion2.py version 2>&1 | egrep '\(third'
1265 (third party extension minversion requires version 3.7 or newer of Mercurial; disabling)
1298 (third party extension minversion requires version 3.7 or newer of Mercurial; disabling)
1266
1299
1267 Can load version that is only off by point release
1300 Can load version that is only off by point release
1268
1301
1269 $ cat > minversion2.py << EOF
1302 $ cat > minversion2.py << EOF
1270 > from mercurial import util
1303 > from mercurial import util
1271 > util.version = lambda: '3.6.1'
1304 > util.version = lambda: '3.6.1'
1272 > minimumhgversion = '3.6'
1305 > minimumhgversion = '3.6'
1273 > EOF
1306 > EOF
1274 $ hg --config extensions.minversion=minversion3.py version 2>&1 | egrep '\(third'
1307 $ hg --config extensions.minversion=minversion3.py version 2>&1 | egrep '\(third'
1275 [1]
1308 [1]
1276
1309
1277 Can load minimum version identical to current
1310 Can load minimum version identical to current
1278
1311
1279 $ cat > minversion3.py << EOF
1312 $ cat > minversion3.py << EOF
1280 > from mercurial import util
1313 > from mercurial import util
1281 > util.version = lambda: '3.5'
1314 > util.version = lambda: '3.5'
1282 > minimumhgversion = '3.5'
1315 > minimumhgversion = '3.5'
1283 > EOF
1316 > EOF
1284 $ hg --config extensions.minversion=minversion3.py version 2>&1 | egrep '\(third'
1317 $ hg --config extensions.minversion=minversion3.py version 2>&1 | egrep '\(third'
1285 [1]
1318 [1]
1286
1319
1287 Restore HGRCPATH
1320 Restore HGRCPATH
1288
1321
1289 $ HGRCPATH=$ORGHGRCPATH
1322 $ HGRCPATH=$ORGHGRCPATH
1290 $ export HGRCPATH
1323 $ export HGRCPATH
1291
1324
1292 Commands handling multiple repositories at a time should invoke only
1325 Commands handling multiple repositories at a time should invoke only
1293 "reposetup()" of extensions enabling in the target repository.
1326 "reposetup()" of extensions enabling in the target repository.
1294
1327
1295 $ mkdir reposetup-test
1328 $ mkdir reposetup-test
1296 $ cd reposetup-test
1329 $ cd reposetup-test
1297
1330
1298 $ cat > $TESTTMP/reposetuptest.py <<EOF
1331 $ cat > $TESTTMP/reposetuptest.py <<EOF
1299 > from mercurial import extensions
1332 > from mercurial import extensions
1300 > def reposetup(ui, repo):
1333 > def reposetup(ui, repo):
1301 > ui.write('reposetup() for %s\n' % (repo.root))
1334 > ui.write('reposetup() for %s\n' % (repo.root))
1302 > ui.flush()
1335 > ui.flush()
1303 > EOF
1336 > EOF
1304 $ hg init src
1337 $ hg init src
1305 $ echo a > src/a
1338 $ echo a > src/a
1306 $ hg -R src commit -Am '#0 at src/a'
1339 $ hg -R src commit -Am '#0 at src/a'
1307 adding a
1340 adding a
1308 $ echo '[extensions]' >> src/.hg/hgrc
1341 $ echo '[extensions]' >> src/.hg/hgrc
1309 $ echo '# enable extension locally' >> src/.hg/hgrc
1342 $ echo '# enable extension locally' >> src/.hg/hgrc
1310 $ echo "reposetuptest = $TESTTMP/reposetuptest.py" >> src/.hg/hgrc
1343 $ echo "reposetuptest = $TESTTMP/reposetuptest.py" >> src/.hg/hgrc
1311 $ hg -R src status
1344 $ hg -R src status
1312 reposetup() for $TESTTMP/reposetup-test/src (glob)
1345 reposetup() for $TESTTMP/reposetup-test/src (glob)
1313
1346
1314 $ hg clone -U src clone-dst1
1347 $ hg clone -U src clone-dst1
1315 reposetup() for $TESTTMP/reposetup-test/src (glob)
1348 reposetup() for $TESTTMP/reposetup-test/src (glob)
1316 $ hg init push-dst1
1349 $ hg init push-dst1
1317 $ hg -q -R src push push-dst1
1350 $ hg -q -R src push push-dst1
1318 reposetup() for $TESTTMP/reposetup-test/src (glob)
1351 reposetup() for $TESTTMP/reposetup-test/src (glob)
1319 $ hg init pull-src1
1352 $ hg init pull-src1
1320 $ hg -q -R pull-src1 pull src
1353 $ hg -q -R pull-src1 pull src
1321 reposetup() for $TESTTMP/reposetup-test/src (glob)
1354 reposetup() for $TESTTMP/reposetup-test/src (glob)
1322
1355
1323 $ cat <<EOF >> $HGRCPATH
1356 $ cat <<EOF >> $HGRCPATH
1324 > [extensions]
1357 > [extensions]
1325 > # disable extension globally and explicitly
1358 > # disable extension globally and explicitly
1326 > reposetuptest = !
1359 > reposetuptest = !
1327 > EOF
1360 > EOF
1328 $ hg clone -U src clone-dst2
1361 $ hg clone -U src clone-dst2
1329 reposetup() for $TESTTMP/reposetup-test/src (glob)
1362 reposetup() for $TESTTMP/reposetup-test/src (glob)
1330 $ hg init push-dst2
1363 $ hg init push-dst2
1331 $ hg -q -R src push push-dst2
1364 $ hg -q -R src push push-dst2
1332 reposetup() for $TESTTMP/reposetup-test/src (glob)
1365 reposetup() for $TESTTMP/reposetup-test/src (glob)
1333 $ hg init pull-src2
1366 $ hg init pull-src2
1334 $ hg -q -R pull-src2 pull src
1367 $ hg -q -R pull-src2 pull src
1335 reposetup() for $TESTTMP/reposetup-test/src (glob)
1368 reposetup() for $TESTTMP/reposetup-test/src (glob)
1336
1369
1337 $ cat <<EOF >> $HGRCPATH
1370 $ cat <<EOF >> $HGRCPATH
1338 > [extensions]
1371 > [extensions]
1339 > # enable extension globally
1372 > # enable extension globally
1340 > reposetuptest = $TESTTMP/reposetuptest.py
1373 > reposetuptest = $TESTTMP/reposetuptest.py
1341 > EOF
1374 > EOF
1342 $ hg clone -U src clone-dst3
1375 $ hg clone -U src clone-dst3
1343 reposetup() for $TESTTMP/reposetup-test/src (glob)
1376 reposetup() for $TESTTMP/reposetup-test/src (glob)
1344 reposetup() for $TESTTMP/reposetup-test/clone-dst3 (glob)
1377 reposetup() for $TESTTMP/reposetup-test/clone-dst3 (glob)
1345 $ hg init push-dst3
1378 $ hg init push-dst3
1346 reposetup() for $TESTTMP/reposetup-test/push-dst3 (glob)
1379 reposetup() for $TESTTMP/reposetup-test/push-dst3 (glob)
1347 $ hg -q -R src push push-dst3
1380 $ hg -q -R src push push-dst3
1348 reposetup() for $TESTTMP/reposetup-test/src (glob)
1381 reposetup() for $TESTTMP/reposetup-test/src (glob)
1349 reposetup() for $TESTTMP/reposetup-test/push-dst3 (glob)
1382 reposetup() for $TESTTMP/reposetup-test/push-dst3 (glob)
1350 $ hg init pull-src3
1383 $ hg init pull-src3
1351 reposetup() for $TESTTMP/reposetup-test/pull-src3 (glob)
1384 reposetup() for $TESTTMP/reposetup-test/pull-src3 (glob)
1352 $ hg -q -R pull-src3 pull src
1385 $ hg -q -R pull-src3 pull src
1353 reposetup() for $TESTTMP/reposetup-test/pull-src3 (glob)
1386 reposetup() for $TESTTMP/reposetup-test/pull-src3 (glob)
1354 reposetup() for $TESTTMP/reposetup-test/src (glob)
1387 reposetup() for $TESTTMP/reposetup-test/src (glob)
1355
1388
1356 $ echo '[extensions]' >> src/.hg/hgrc
1389 $ echo '[extensions]' >> src/.hg/hgrc
1357 $ echo '# disable extension locally' >> src/.hg/hgrc
1390 $ echo '# disable extension locally' >> src/.hg/hgrc
1358 $ echo 'reposetuptest = !' >> src/.hg/hgrc
1391 $ echo 'reposetuptest = !' >> src/.hg/hgrc
1359 $ hg clone -U src clone-dst4
1392 $ hg clone -U src clone-dst4
1360 reposetup() for $TESTTMP/reposetup-test/clone-dst4 (glob)
1393 reposetup() for $TESTTMP/reposetup-test/clone-dst4 (glob)
1361 $ hg init push-dst4
1394 $ hg init push-dst4
1362 reposetup() for $TESTTMP/reposetup-test/push-dst4 (glob)
1395 reposetup() for $TESTTMP/reposetup-test/push-dst4 (glob)
1363 $ hg -q -R src push push-dst4
1396 $ hg -q -R src push push-dst4
1364 reposetup() for $TESTTMP/reposetup-test/push-dst4 (glob)
1397 reposetup() for $TESTTMP/reposetup-test/push-dst4 (glob)
1365 $ hg init pull-src4
1398 $ hg init pull-src4
1366 reposetup() for $TESTTMP/reposetup-test/pull-src4 (glob)
1399 reposetup() for $TESTTMP/reposetup-test/pull-src4 (glob)
1367 $ hg -q -R pull-src4 pull src
1400 $ hg -q -R pull-src4 pull src
1368 reposetup() for $TESTTMP/reposetup-test/pull-src4 (glob)
1401 reposetup() for $TESTTMP/reposetup-test/pull-src4 (glob)
1369
1402
1370 disabling in command line overlays with all configuration
1403 disabling in command line overlays with all configuration
1371 $ hg --config extensions.reposetuptest=! clone -U src clone-dst5
1404 $ hg --config extensions.reposetuptest=! clone -U src clone-dst5
1372 $ hg --config extensions.reposetuptest=! init push-dst5
1405 $ hg --config extensions.reposetuptest=! init push-dst5
1373 $ hg --config extensions.reposetuptest=! -q -R src push push-dst5
1406 $ hg --config extensions.reposetuptest=! -q -R src push push-dst5
1374 $ hg --config extensions.reposetuptest=! init pull-src5
1407 $ hg --config extensions.reposetuptest=! init pull-src5
1375 $ hg --config extensions.reposetuptest=! -q -R pull-src5 pull src
1408 $ hg --config extensions.reposetuptest=! -q -R pull-src5 pull src
1376
1409
1377 $ cat <<EOF >> $HGRCPATH
1410 $ cat <<EOF >> $HGRCPATH
1378 > [extensions]
1411 > [extensions]
1379 > # disable extension globally and explicitly
1412 > # disable extension globally and explicitly
1380 > reposetuptest = !
1413 > reposetuptest = !
1381 > EOF
1414 > EOF
1382 $ hg init parent
1415 $ hg init parent
1383 $ hg init parent/sub1
1416 $ hg init parent/sub1
1384 $ echo 1 > parent/sub1/1
1417 $ echo 1 > parent/sub1/1
1385 $ hg -R parent/sub1 commit -Am '#0 at parent/sub1'
1418 $ hg -R parent/sub1 commit -Am '#0 at parent/sub1'
1386 adding 1
1419 adding 1
1387 $ hg init parent/sub2
1420 $ hg init parent/sub2
1388 $ hg init parent/sub2/sub21
1421 $ hg init parent/sub2/sub21
1389 $ echo 21 > parent/sub2/sub21/21
1422 $ echo 21 > parent/sub2/sub21/21
1390 $ hg -R parent/sub2/sub21 commit -Am '#0 at parent/sub2/sub21'
1423 $ hg -R parent/sub2/sub21 commit -Am '#0 at parent/sub2/sub21'
1391 adding 21
1424 adding 21
1392 $ cat > parent/sub2/.hgsub <<EOF
1425 $ cat > parent/sub2/.hgsub <<EOF
1393 > sub21 = sub21
1426 > sub21 = sub21
1394 > EOF
1427 > EOF
1395 $ hg -R parent/sub2 commit -Am '#0 at parent/sub2'
1428 $ hg -R parent/sub2 commit -Am '#0 at parent/sub2'
1396 adding .hgsub
1429 adding .hgsub
1397 $ hg init parent/sub3
1430 $ hg init parent/sub3
1398 $ echo 3 > parent/sub3/3
1431 $ echo 3 > parent/sub3/3
1399 $ hg -R parent/sub3 commit -Am '#0 at parent/sub3'
1432 $ hg -R parent/sub3 commit -Am '#0 at parent/sub3'
1400 adding 3
1433 adding 3
1401 $ cat > parent/.hgsub <<EOF
1434 $ cat > parent/.hgsub <<EOF
1402 > sub1 = sub1
1435 > sub1 = sub1
1403 > sub2 = sub2
1436 > sub2 = sub2
1404 > sub3 = sub3
1437 > sub3 = sub3
1405 > EOF
1438 > EOF
1406 $ hg -R parent commit -Am '#0 at parent'
1439 $ hg -R parent commit -Am '#0 at parent'
1407 adding .hgsub
1440 adding .hgsub
1408 $ echo '[extensions]' >> parent/.hg/hgrc
1441 $ echo '[extensions]' >> parent/.hg/hgrc
1409 $ echo '# enable extension locally' >> parent/.hg/hgrc
1442 $ echo '# enable extension locally' >> parent/.hg/hgrc
1410 $ echo "reposetuptest = $TESTTMP/reposetuptest.py" >> parent/.hg/hgrc
1443 $ echo "reposetuptest = $TESTTMP/reposetuptest.py" >> parent/.hg/hgrc
1411 $ cp parent/.hg/hgrc parent/sub2/.hg/hgrc
1444 $ cp parent/.hg/hgrc parent/sub2/.hg/hgrc
1412 $ hg -R parent status -S -A
1445 $ hg -R parent status -S -A
1413 reposetup() for $TESTTMP/reposetup-test/parent (glob)
1446 reposetup() for $TESTTMP/reposetup-test/parent (glob)
1414 reposetup() for $TESTTMP/reposetup-test/parent/sub2 (glob)
1447 reposetup() for $TESTTMP/reposetup-test/parent/sub2 (glob)
1415 C .hgsub
1448 C .hgsub
1416 C .hgsubstate
1449 C .hgsubstate
1417 C sub1/1
1450 C sub1/1
1418 C sub2/.hgsub
1451 C sub2/.hgsub
1419 C sub2/.hgsubstate
1452 C sub2/.hgsubstate
1420 C sub2/sub21/21
1453 C sub2/sub21/21
1421 C sub3/3
1454 C sub3/3
1422
1455
1423 $ cd ..
1456 $ cd ..
1424
1457
1425 Test compatibility with extension commands that don't use @command (issue5137)
1458 Test compatibility with extension commands that don't use @command (issue5137)
1426
1459
1427 $ hg init deprecated
1460 $ hg init deprecated
1428 $ cd deprecated
1461 $ cd deprecated
1429
1462
1430 $ cat <<EOF > deprecatedcmd.py
1463 $ cat <<EOF > deprecatedcmd.py
1431 > def deprecatedcmd(repo, ui):
1464 > def deprecatedcmd(repo, ui):
1432 > pass
1465 > pass
1433 > cmdtable = {
1466 > cmdtable = {
1434 > 'deprecatedcmd': (deprecatedcmd, [], ''),
1467 > 'deprecatedcmd': (deprecatedcmd, [], ''),
1435 > }
1468 > }
1436 > EOF
1469 > EOF
1437 $ cat <<EOF > .hg/hgrc
1470 $ cat <<EOF > .hg/hgrc
1438 > [extensions]
1471 > [extensions]
1439 > deprecatedcmd = `pwd`/deprecatedcmd.py
1472 > deprecatedcmd = `pwd`/deprecatedcmd.py
1440 > mq = !
1473 > mq = !
1441 > hgext.mq = !
1474 > hgext.mq = !
1442 > hgext/mq = !
1475 > hgext/mq = !
1443 > [alias]
1476 > [alias]
1444 > deprecatedalias = deprecatedcmd
1477 > deprecatedalias = deprecatedcmd
1445 > EOF
1478 > EOF
1446
1479
1447 $ hg deprecatedcmd
1480 $ hg deprecatedcmd
1448 devel-warn: missing attribute 'norepo', use @command decorator to register 'deprecatedcmd'
1481 devel-warn: missing attribute 'norepo', use @command decorator to register 'deprecatedcmd'
1449 (compatibility will be dropped after Mercurial-3.8, update your code.) at: * (glob)
1482 (compatibility will be dropped after Mercurial-3.8, update your code.) at: * (glob)
1450
1483
1451 $ hg deprecatedalias
1484 $ hg deprecatedalias
1452 devel-warn: missing attribute 'norepo', use @command decorator to register 'deprecatedalias'
1485 devel-warn: missing attribute 'norepo', use @command decorator to register 'deprecatedalias'
1453 (compatibility will be dropped after Mercurial-3.8, update your code.) at: * (glob)
1486 (compatibility will be dropped after Mercurial-3.8, update your code.) at: * (glob)
1454
1487
1455 no warning unless command is executed:
1488 no warning unless command is executed:
1456
1489
1457 $ hg paths
1490 $ hg paths
1458
1491
1459 but mq iterates over command table:
1492 but mq iterates over command table:
1460
1493
1461 $ hg --config extensions.mq= paths
1494 $ hg --config extensions.mq= paths
1462 devel-warn: missing attribute 'norepo', use @command decorator to register 'deprecatedcmd'
1495 devel-warn: missing attribute 'norepo', use @command decorator to register 'deprecatedcmd'
1463 (compatibility will be dropped after Mercurial-3.8, update your code.) at: * (glob)
1496 (compatibility will be dropped after Mercurial-3.8, update your code.) at: * (glob)
1464
1497
1465 $ cd ..
1498 $ cd ..
1466
1499
1467 Test synopsis and docstring extending
1500 Test synopsis and docstring extending
1468
1501
1469 $ hg init exthelp
1502 $ hg init exthelp
1470 $ cat > exthelp.py <<EOF
1503 $ cat > exthelp.py <<EOF
1471 > from mercurial import commands, extensions
1504 > from mercurial import commands, extensions
1472 > def exbookmarks(orig, *args, **opts):
1505 > def exbookmarks(orig, *args, **opts):
1473 > return orig(*args, **opts)
1506 > return orig(*args, **opts)
1474 > def uisetup(ui):
1507 > def uisetup(ui):
1475 > synopsis = ' GREPME [--foo] [-x]'
1508 > synopsis = ' GREPME [--foo] [-x]'
1476 > docstring = '''
1509 > docstring = '''
1477 > GREPME make sure that this is in the help!
1510 > GREPME make sure that this is in the help!
1478 > '''
1511 > '''
1479 > extensions.wrapcommand(commands.table, 'bookmarks', exbookmarks,
1512 > extensions.wrapcommand(commands.table, 'bookmarks', exbookmarks,
1480 > synopsis, docstring)
1513 > synopsis, docstring)
1481 > EOF
1514 > EOF
1482 $ abspath=`pwd`/exthelp.py
1515 $ abspath=`pwd`/exthelp.py
1483 $ echo '[extensions]' >> $HGRCPATH
1516 $ echo '[extensions]' >> $HGRCPATH
1484 $ echo "exthelp = $abspath" >> $HGRCPATH
1517 $ echo "exthelp = $abspath" >> $HGRCPATH
1485 $ cd exthelp
1518 $ cd exthelp
1486 $ hg help bookmarks | grep GREPME
1519 $ hg help bookmarks | grep GREPME
1487 hg bookmarks [OPTIONS]... [NAME]... GREPME [--foo] [-x]
1520 hg bookmarks [OPTIONS]... [NAME]... GREPME [--foo] [-x]
1488 GREPME make sure that this is in the help!
1521 GREPME make sure that this is in the help!
1489
1522
General Comments 0
You need to be logged in to leave comments. Login now