##// END OF EJS Templates
help: replace selenic.com by mercurial-scm.org in command examples...
FUJIWARA Katsunori -
r30243:7b7bd704 stable
parent child Browse files
Show More
@@ -1,7368 +1,7368
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 sslutil,
71 sslutil,
72 streamclone,
72 streamclone,
73 templatekw,
73 templatekw,
74 templater,
74 templater,
75 treediscovery,
75 treediscovery,
76 ui as uimod,
76 ui as uimod,
77 util,
77 util,
78 )
78 )
79
79
80 release = lockmod.release
80 release = lockmod.release
81
81
82 table = {}
82 table = {}
83
83
84 command = cmdutil.command(table)
84 command = cmdutil.command(table)
85
85
86 # label constants
86 # label constants
87 # until 3.5, bookmarks.current was the advertised name, not
87 # until 3.5, bookmarks.current was the advertised name, not
88 # bookmarks.active, so we must use both to avoid breaking old
88 # bookmarks.active, so we must use both to avoid breaking old
89 # custom styles
89 # custom styles
90 activebookmarklabel = 'bookmarks.active bookmarks.current'
90 activebookmarklabel = 'bookmarks.active bookmarks.current'
91
91
92 # common command options
92 # common command options
93
93
94 globalopts = [
94 globalopts = [
95 ('R', 'repository', '',
95 ('R', 'repository', '',
96 _('repository root directory or name of overlay bundle file'),
96 _('repository root directory or name of overlay bundle file'),
97 _('REPO')),
97 _('REPO')),
98 ('', 'cwd', '',
98 ('', 'cwd', '',
99 _('change working directory'), _('DIR')),
99 _('change working directory'), _('DIR')),
100 ('y', 'noninteractive', None,
100 ('y', 'noninteractive', None,
101 _('do not prompt, automatically pick the first choice for all prompts')),
101 _('do not prompt, automatically pick the first choice for all prompts')),
102 ('q', 'quiet', None, _('suppress output')),
102 ('q', 'quiet', None, _('suppress output')),
103 ('v', 'verbose', None, _('enable additional output')),
103 ('v', 'verbose', None, _('enable additional output')),
104 ('', 'config', [],
104 ('', 'config', [],
105 _('set/override config option (use \'section.name=value\')'),
105 _('set/override config option (use \'section.name=value\')'),
106 _('CONFIG')),
106 _('CONFIG')),
107 ('', 'debug', None, _('enable debugging output')),
107 ('', 'debug', None, _('enable debugging output')),
108 ('', 'debugger', None, _('start debugger')),
108 ('', 'debugger', None, _('start debugger')),
109 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
109 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
110 _('ENCODE')),
110 _('ENCODE')),
111 ('', 'encodingmode', encoding.encodingmode,
111 ('', 'encodingmode', encoding.encodingmode,
112 _('set the charset encoding mode'), _('MODE')),
112 _('set the charset encoding mode'), _('MODE')),
113 ('', 'traceback', None, _('always print a traceback on exception')),
113 ('', 'traceback', None, _('always print a traceback on exception')),
114 ('', 'time', None, _('time how long the command takes')),
114 ('', 'time', None, _('time how long the command takes')),
115 ('', 'profile', None, _('print command execution profile')),
115 ('', 'profile', None, _('print command execution profile')),
116 ('', 'version', None, _('output version information and exit')),
116 ('', 'version', None, _('output version information and exit')),
117 ('h', 'help', None, _('display help and exit')),
117 ('h', 'help', None, _('display help and exit')),
118 ('', 'hidden', False, _('consider hidden changesets')),
118 ('', 'hidden', False, _('consider hidden changesets')),
119 ]
119 ]
120
120
121 dryrunopts = [('n', 'dry-run', None,
121 dryrunopts = [('n', 'dry-run', None,
122 _('do not perform actions, just print output'))]
122 _('do not perform actions, just print output'))]
123
123
124 remoteopts = [
124 remoteopts = [
125 ('e', 'ssh', '',
125 ('e', 'ssh', '',
126 _('specify ssh command to use'), _('CMD')),
126 _('specify ssh command to use'), _('CMD')),
127 ('', 'remotecmd', '',
127 ('', 'remotecmd', '',
128 _('specify hg command to run on the remote side'), _('CMD')),
128 _('specify hg command to run on the remote side'), _('CMD')),
129 ('', 'insecure', None,
129 ('', 'insecure', None,
130 _('do not verify server certificate (ignoring web.cacerts config)')),
130 _('do not verify server certificate (ignoring web.cacerts config)')),
131 ]
131 ]
132
132
133 walkopts = [
133 walkopts = [
134 ('I', 'include', [],
134 ('I', 'include', [],
135 _('include names matching the given patterns'), _('PATTERN')),
135 _('include names matching the given patterns'), _('PATTERN')),
136 ('X', 'exclude', [],
136 ('X', 'exclude', [],
137 _('exclude names matching the given patterns'), _('PATTERN')),
137 _('exclude names matching the given patterns'), _('PATTERN')),
138 ]
138 ]
139
139
140 commitopts = [
140 commitopts = [
141 ('m', 'message', '',
141 ('m', 'message', '',
142 _('use text as commit message'), _('TEXT')),
142 _('use text as commit message'), _('TEXT')),
143 ('l', 'logfile', '',
143 ('l', 'logfile', '',
144 _('read commit message from file'), _('FILE')),
144 _('read commit message from file'), _('FILE')),
145 ]
145 ]
146
146
147 commitopts2 = [
147 commitopts2 = [
148 ('d', 'date', '',
148 ('d', 'date', '',
149 _('record the specified date as commit date'), _('DATE')),
149 _('record the specified date as commit date'), _('DATE')),
150 ('u', 'user', '',
150 ('u', 'user', '',
151 _('record the specified user as committer'), _('USER')),
151 _('record the specified user as committer'), _('USER')),
152 ]
152 ]
153
153
154 # hidden for now
154 # hidden for now
155 formatteropts = [
155 formatteropts = [
156 ('T', 'template', '',
156 ('T', 'template', '',
157 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
157 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
158 ]
158 ]
159
159
160 templateopts = [
160 templateopts = [
161 ('', 'style', '',
161 ('', 'style', '',
162 _('display using template map file (DEPRECATED)'), _('STYLE')),
162 _('display using template map file (DEPRECATED)'), _('STYLE')),
163 ('T', 'template', '',
163 ('T', 'template', '',
164 _('display with template'), _('TEMPLATE')),
164 _('display with template'), _('TEMPLATE')),
165 ]
165 ]
166
166
167 logopts = [
167 logopts = [
168 ('p', 'patch', None, _('show patch')),
168 ('p', 'patch', None, _('show patch')),
169 ('g', 'git', None, _('use git extended diff format')),
169 ('g', 'git', None, _('use git extended diff format')),
170 ('l', 'limit', '',
170 ('l', 'limit', '',
171 _('limit number of changes displayed'), _('NUM')),
171 _('limit number of changes displayed'), _('NUM')),
172 ('M', 'no-merges', None, _('do not show merges')),
172 ('M', 'no-merges', None, _('do not show merges')),
173 ('', 'stat', None, _('output diffstat-style summary of changes')),
173 ('', 'stat', None, _('output diffstat-style summary of changes')),
174 ('G', 'graph', None, _("show the revision DAG")),
174 ('G', 'graph', None, _("show the revision DAG")),
175 ] + templateopts
175 ] + templateopts
176
176
177 diffopts = [
177 diffopts = [
178 ('a', 'text', None, _('treat all files as text')),
178 ('a', 'text', None, _('treat all files as text')),
179 ('g', 'git', None, _('use git extended diff format')),
179 ('g', 'git', None, _('use git extended diff format')),
180 ('', 'nodates', None, _('omit dates from diff headers'))
180 ('', 'nodates', None, _('omit dates from diff headers'))
181 ]
181 ]
182
182
183 diffwsopts = [
183 diffwsopts = [
184 ('w', 'ignore-all-space', None,
184 ('w', 'ignore-all-space', None,
185 _('ignore white space when comparing lines')),
185 _('ignore white space when comparing lines')),
186 ('b', 'ignore-space-change', None,
186 ('b', 'ignore-space-change', None,
187 _('ignore changes in the amount of white space')),
187 _('ignore changes in the amount of white space')),
188 ('B', 'ignore-blank-lines', None,
188 ('B', 'ignore-blank-lines', None,
189 _('ignore changes whose lines are all blank')),
189 _('ignore changes whose lines are all blank')),
190 ]
190 ]
191
191
192 diffopts2 = [
192 diffopts2 = [
193 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
193 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
194 ('p', 'show-function', None, _('show which function each change is in')),
194 ('p', 'show-function', None, _('show which function each change is in')),
195 ('', 'reverse', None, _('produce a diff that undoes the changes')),
195 ('', 'reverse', None, _('produce a diff that undoes the changes')),
196 ] + diffwsopts + [
196 ] + diffwsopts + [
197 ('U', 'unified', '',
197 ('U', 'unified', '',
198 _('number of lines of context to show'), _('NUM')),
198 _('number of lines of context to show'), _('NUM')),
199 ('', 'stat', None, _('output diffstat-style summary of changes')),
199 ('', 'stat', None, _('output diffstat-style summary of changes')),
200 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
200 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
201 ]
201 ]
202
202
203 mergetoolopts = [
203 mergetoolopts = [
204 ('t', 'tool', '', _('specify merge tool')),
204 ('t', 'tool', '', _('specify merge tool')),
205 ]
205 ]
206
206
207 similarityopts = [
207 similarityopts = [
208 ('s', 'similarity', '',
208 ('s', 'similarity', '',
209 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
209 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
210 ]
210 ]
211
211
212 subrepoopts = [
212 subrepoopts = [
213 ('S', 'subrepos', None,
213 ('S', 'subrepos', None,
214 _('recurse into subrepositories'))
214 _('recurse into subrepositories'))
215 ]
215 ]
216
216
217 debugrevlogopts = [
217 debugrevlogopts = [
218 ('c', 'changelog', False, _('open changelog')),
218 ('c', 'changelog', False, _('open changelog')),
219 ('m', 'manifest', False, _('open manifest')),
219 ('m', 'manifest', False, _('open manifest')),
220 ('', 'dir', '', _('open directory manifest')),
220 ('', 'dir', '', _('open directory manifest')),
221 ]
221 ]
222
222
223 # Commands start here, listed alphabetically
223 # Commands start here, listed alphabetically
224
224
225 @command('^add',
225 @command('^add',
226 walkopts + subrepoopts + dryrunopts,
226 walkopts + subrepoopts + dryrunopts,
227 _('[OPTION]... [FILE]...'),
227 _('[OPTION]... [FILE]...'),
228 inferrepo=True)
228 inferrepo=True)
229 def add(ui, repo, *pats, **opts):
229 def add(ui, repo, *pats, **opts):
230 """add the specified files on the next commit
230 """add the specified files on the next commit
231
231
232 Schedule files to be version controlled and added to the
232 Schedule files to be version controlled and added to the
233 repository.
233 repository.
234
234
235 The files will be added to the repository at the next commit. To
235 The files will be added to the repository at the next commit. To
236 undo an add before that, see :hg:`forget`.
236 undo an add before that, see :hg:`forget`.
237
237
238 If no names are given, add all files to the repository (except
238 If no names are given, add all files to the repository (except
239 files matching ``.hgignore``).
239 files matching ``.hgignore``).
240
240
241 .. container:: verbose
241 .. container:: verbose
242
242
243 Examples:
243 Examples:
244
244
245 - New (unknown) files are added
245 - New (unknown) files are added
246 automatically by :hg:`add`::
246 automatically by :hg:`add`::
247
247
248 $ ls
248 $ ls
249 foo.c
249 foo.c
250 $ hg status
250 $ hg status
251 ? foo.c
251 ? foo.c
252 $ hg add
252 $ hg add
253 adding foo.c
253 adding foo.c
254 $ hg status
254 $ hg status
255 A foo.c
255 A foo.c
256
256
257 - Specific files to be added can be specified::
257 - Specific files to be added can be specified::
258
258
259 $ ls
259 $ ls
260 bar.c foo.c
260 bar.c foo.c
261 $ hg status
261 $ hg status
262 ? bar.c
262 ? bar.c
263 ? foo.c
263 ? foo.c
264 $ hg add bar.c
264 $ hg add bar.c
265 $ hg status
265 $ hg status
266 A bar.c
266 A bar.c
267 ? foo.c
267 ? foo.c
268
268
269 Returns 0 if all files are successfully added.
269 Returns 0 if all files are successfully added.
270 """
270 """
271
271
272 m = scmutil.match(repo[None], pats, opts)
272 m = scmutil.match(repo[None], pats, opts)
273 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
273 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
274 return rejected and 1 or 0
274 return rejected and 1 or 0
275
275
276 @command('addremove',
276 @command('addremove',
277 similarityopts + subrepoopts + walkopts + dryrunopts,
277 similarityopts + subrepoopts + walkopts + dryrunopts,
278 _('[OPTION]... [FILE]...'),
278 _('[OPTION]... [FILE]...'),
279 inferrepo=True)
279 inferrepo=True)
280 def addremove(ui, repo, *pats, **opts):
280 def addremove(ui, repo, *pats, **opts):
281 """add all new files, delete all missing files
281 """add all new files, delete all missing files
282
282
283 Add all new files and remove all missing files from the
283 Add all new files and remove all missing files from the
284 repository.
284 repository.
285
285
286 Unless names are given, new files are ignored if they match any of
286 Unless names are given, new files are ignored if they match any of
287 the patterns in ``.hgignore``. As with add, these changes take
287 the patterns in ``.hgignore``. As with add, these changes take
288 effect at the next commit.
288 effect at the next commit.
289
289
290 Use the -s/--similarity option to detect renamed files. This
290 Use the -s/--similarity option to detect renamed files. This
291 option takes a percentage between 0 (disabled) and 100 (files must
291 option takes a percentage between 0 (disabled) and 100 (files must
292 be identical) as its parameter. With a parameter greater than 0,
292 be identical) as its parameter. With a parameter greater than 0,
293 this compares every removed file with every added file and records
293 this compares every removed file with every added file and records
294 those similar enough as renames. Detecting renamed files this way
294 those similar enough as renames. Detecting renamed files this way
295 can be expensive. After using this option, :hg:`status -C` can be
295 can be expensive. After using this option, :hg:`status -C` can be
296 used to check which files were identified as moved or renamed. If
296 used to check which files were identified as moved or renamed. If
297 not specified, -s/--similarity defaults to 100 and only renames of
297 not specified, -s/--similarity defaults to 100 and only renames of
298 identical files are detected.
298 identical files are detected.
299
299
300 .. container:: verbose
300 .. container:: verbose
301
301
302 Examples:
302 Examples:
303
303
304 - A number of files (bar.c and foo.c) are new,
304 - A number of files (bar.c and foo.c) are new,
305 while foobar.c has been removed (without using :hg:`remove`)
305 while foobar.c has been removed (without using :hg:`remove`)
306 from the repository::
306 from the repository::
307
307
308 $ ls
308 $ ls
309 bar.c foo.c
309 bar.c foo.c
310 $ hg status
310 $ hg status
311 ! foobar.c
311 ! foobar.c
312 ? bar.c
312 ? bar.c
313 ? foo.c
313 ? foo.c
314 $ hg addremove
314 $ hg addremove
315 adding bar.c
315 adding bar.c
316 adding foo.c
316 adding foo.c
317 removing foobar.c
317 removing foobar.c
318 $ hg status
318 $ hg status
319 A bar.c
319 A bar.c
320 A foo.c
320 A foo.c
321 R foobar.c
321 R foobar.c
322
322
323 - A file foobar.c was moved to foo.c without using :hg:`rename`.
323 - A file foobar.c was moved to foo.c without using :hg:`rename`.
324 Afterwards, it was edited slightly::
324 Afterwards, it was edited slightly::
325
325
326 $ ls
326 $ ls
327 foo.c
327 foo.c
328 $ hg status
328 $ hg status
329 ! foobar.c
329 ! foobar.c
330 ? foo.c
330 ? foo.c
331 $ hg addremove --similarity 90
331 $ hg addremove --similarity 90
332 removing foobar.c
332 removing foobar.c
333 adding foo.c
333 adding foo.c
334 recording removal of foobar.c as rename to foo.c (94% similar)
334 recording removal of foobar.c as rename to foo.c (94% similar)
335 $ hg status -C
335 $ hg status -C
336 A foo.c
336 A foo.c
337 foobar.c
337 foobar.c
338 R foobar.c
338 R foobar.c
339
339
340 Returns 0 if all files are successfully added.
340 Returns 0 if all files are successfully added.
341 """
341 """
342 try:
342 try:
343 sim = float(opts.get('similarity') or 100)
343 sim = float(opts.get('similarity') or 100)
344 except ValueError:
344 except ValueError:
345 raise error.Abort(_('similarity must be a number'))
345 raise error.Abort(_('similarity must be a number'))
346 if sim < 0 or sim > 100:
346 if sim < 0 or sim > 100:
347 raise error.Abort(_('similarity must be between 0 and 100'))
347 raise error.Abort(_('similarity must be between 0 and 100'))
348 matcher = scmutil.match(repo[None], pats, opts)
348 matcher = scmutil.match(repo[None], pats, opts)
349 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
349 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
350
350
351 @command('^annotate|blame',
351 @command('^annotate|blame',
352 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
352 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
353 ('', 'follow', None,
353 ('', 'follow', None,
354 _('follow copies/renames and list the filename (DEPRECATED)')),
354 _('follow copies/renames and list the filename (DEPRECATED)')),
355 ('', 'no-follow', None, _("don't follow copies and renames")),
355 ('', 'no-follow', None, _("don't follow copies and renames")),
356 ('a', 'text', None, _('treat all files as text')),
356 ('a', 'text', None, _('treat all files as text')),
357 ('u', 'user', None, _('list the author (long with -v)')),
357 ('u', 'user', None, _('list the author (long with -v)')),
358 ('f', 'file', None, _('list the filename')),
358 ('f', 'file', None, _('list the filename')),
359 ('d', 'date', None, _('list the date (short with -q)')),
359 ('d', 'date', None, _('list the date (short with -q)')),
360 ('n', 'number', None, _('list the revision number (default)')),
360 ('n', 'number', None, _('list the revision number (default)')),
361 ('c', 'changeset', None, _('list the changeset')),
361 ('c', 'changeset', None, _('list the changeset')),
362 ('l', 'line-number', None, _('show line number at the first appearance'))
362 ('l', 'line-number', None, _('show line number at the first appearance'))
363 ] + diffwsopts + walkopts + formatteropts,
363 ] + diffwsopts + walkopts + formatteropts,
364 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
364 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
365 inferrepo=True)
365 inferrepo=True)
366 def annotate(ui, repo, *pats, **opts):
366 def annotate(ui, repo, *pats, **opts):
367 """show changeset information by line for each file
367 """show changeset information by line for each file
368
368
369 List changes in files, showing the revision id responsible for
369 List changes in files, showing the revision id responsible for
370 each line.
370 each line.
371
371
372 This command is useful for discovering when a change was made and
372 This command is useful for discovering when a change was made and
373 by whom.
373 by whom.
374
374
375 If you include --file, --user, or --date, the revision number is
375 If you include --file, --user, or --date, the revision number is
376 suppressed unless you also include --number.
376 suppressed unless you also include --number.
377
377
378 Without the -a/--text option, annotate will avoid processing files
378 Without the -a/--text option, annotate will avoid processing files
379 it detects as binary. With -a, annotate will annotate the file
379 it detects as binary. With -a, annotate will annotate the file
380 anyway, although the results will probably be neither useful
380 anyway, although the results will probably be neither useful
381 nor desirable.
381 nor desirable.
382
382
383 Returns 0 on success.
383 Returns 0 on success.
384 """
384 """
385 if not pats:
385 if not pats:
386 raise error.Abort(_('at least one filename or pattern is required'))
386 raise error.Abort(_('at least one filename or pattern is required'))
387
387
388 if opts.get('follow'):
388 if opts.get('follow'):
389 # --follow is deprecated and now just an alias for -f/--file
389 # --follow is deprecated and now just an alias for -f/--file
390 # to mimic the behavior of Mercurial before version 1.5
390 # to mimic the behavior of Mercurial before version 1.5
391 opts['file'] = True
391 opts['file'] = True
392
392
393 ctx = scmutil.revsingle(repo, opts.get('rev'))
393 ctx = scmutil.revsingle(repo, opts.get('rev'))
394
394
395 fm = ui.formatter('annotate', opts)
395 fm = ui.formatter('annotate', opts)
396 if ui.quiet:
396 if ui.quiet:
397 datefunc = util.shortdate
397 datefunc = util.shortdate
398 else:
398 else:
399 datefunc = util.datestr
399 datefunc = util.datestr
400 if ctx.rev() is None:
400 if ctx.rev() is None:
401 def hexfn(node):
401 def hexfn(node):
402 if node is None:
402 if node is None:
403 return None
403 return None
404 else:
404 else:
405 return fm.hexfunc(node)
405 return fm.hexfunc(node)
406 if opts.get('changeset'):
406 if opts.get('changeset'):
407 # omit "+" suffix which is appended to node hex
407 # omit "+" suffix which is appended to node hex
408 def formatrev(rev):
408 def formatrev(rev):
409 if rev is None:
409 if rev is None:
410 return '%d' % ctx.p1().rev()
410 return '%d' % ctx.p1().rev()
411 else:
411 else:
412 return '%d' % rev
412 return '%d' % rev
413 else:
413 else:
414 def formatrev(rev):
414 def formatrev(rev):
415 if rev is None:
415 if rev is None:
416 return '%d+' % ctx.p1().rev()
416 return '%d+' % ctx.p1().rev()
417 else:
417 else:
418 return '%d ' % rev
418 return '%d ' % rev
419 def formathex(hex):
419 def formathex(hex):
420 if hex is None:
420 if hex is None:
421 return '%s+' % fm.hexfunc(ctx.p1().node())
421 return '%s+' % fm.hexfunc(ctx.p1().node())
422 else:
422 else:
423 return '%s ' % hex
423 return '%s ' % hex
424 else:
424 else:
425 hexfn = fm.hexfunc
425 hexfn = fm.hexfunc
426 formatrev = formathex = str
426 formatrev = formathex = str
427
427
428 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
428 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
429 ('number', ' ', lambda x: x[0].rev(), formatrev),
429 ('number', ' ', lambda x: x[0].rev(), formatrev),
430 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
430 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
431 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
431 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
432 ('file', ' ', lambda x: x[0].path(), str),
432 ('file', ' ', lambda x: x[0].path(), str),
433 ('line_number', ':', lambda x: x[1], str),
433 ('line_number', ':', lambda x: x[1], str),
434 ]
434 ]
435 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
435 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
436
436
437 if (not opts.get('user') and not opts.get('changeset')
437 if (not opts.get('user') and not opts.get('changeset')
438 and not opts.get('date') and not opts.get('file')):
438 and not opts.get('date') and not opts.get('file')):
439 opts['number'] = True
439 opts['number'] = True
440
440
441 linenumber = opts.get('line_number') is not None
441 linenumber = opts.get('line_number') is not None
442 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
442 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
443 raise error.Abort(_('at least one of -n/-c is required for -l'))
443 raise error.Abort(_('at least one of -n/-c is required for -l'))
444
444
445 if fm.isplain():
445 if fm.isplain():
446 def makefunc(get, fmt):
446 def makefunc(get, fmt):
447 return lambda x: fmt(get(x))
447 return lambda x: fmt(get(x))
448 else:
448 else:
449 def makefunc(get, fmt):
449 def makefunc(get, fmt):
450 return get
450 return get
451 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
451 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
452 if opts.get(op)]
452 if opts.get(op)]
453 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
453 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
454 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
454 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
455 if opts.get(op))
455 if opts.get(op))
456
456
457 def bad(x, y):
457 def bad(x, y):
458 raise error.Abort("%s: %s" % (x, y))
458 raise error.Abort("%s: %s" % (x, y))
459
459
460 m = scmutil.match(ctx, pats, opts, badfn=bad)
460 m = scmutil.match(ctx, pats, opts, badfn=bad)
461
461
462 follow = not opts.get('no_follow')
462 follow = not opts.get('no_follow')
463 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
463 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
464 whitespace=True)
464 whitespace=True)
465 for abs in ctx.walk(m):
465 for abs in ctx.walk(m):
466 fctx = ctx[abs]
466 fctx = ctx[abs]
467 if not opts.get('text') and util.binary(fctx.data()):
467 if not opts.get('text') and util.binary(fctx.data()):
468 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
468 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
469 continue
469 continue
470
470
471 lines = fctx.annotate(follow=follow, linenumber=linenumber,
471 lines = fctx.annotate(follow=follow, linenumber=linenumber,
472 diffopts=diffopts)
472 diffopts=diffopts)
473 if not lines:
473 if not lines:
474 continue
474 continue
475 formats = []
475 formats = []
476 pieces = []
476 pieces = []
477
477
478 for f, sep in funcmap:
478 for f, sep in funcmap:
479 l = [f(n) for n, dummy in lines]
479 l = [f(n) for n, dummy in lines]
480 if fm.isplain():
480 if fm.isplain():
481 sizes = [encoding.colwidth(x) for x in l]
481 sizes = [encoding.colwidth(x) for x in l]
482 ml = max(sizes)
482 ml = max(sizes)
483 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
483 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
484 else:
484 else:
485 formats.append(['%s' for x in l])
485 formats.append(['%s' for x in l])
486 pieces.append(l)
486 pieces.append(l)
487
487
488 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
488 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
489 fm.startitem()
489 fm.startitem()
490 fm.write(fields, "".join(f), *p)
490 fm.write(fields, "".join(f), *p)
491 fm.write('line', ": %s", l[1])
491 fm.write('line', ": %s", l[1])
492
492
493 if not lines[-1][1].endswith('\n'):
493 if not lines[-1][1].endswith('\n'):
494 fm.plain('\n')
494 fm.plain('\n')
495
495
496 fm.end()
496 fm.end()
497
497
498 @command('archive',
498 @command('archive',
499 [('', 'no-decode', None, _('do not pass files through decoders')),
499 [('', 'no-decode', None, _('do not pass files through decoders')),
500 ('p', 'prefix', '', _('directory prefix for files in archive'),
500 ('p', 'prefix', '', _('directory prefix for files in archive'),
501 _('PREFIX')),
501 _('PREFIX')),
502 ('r', 'rev', '', _('revision to distribute'), _('REV')),
502 ('r', 'rev', '', _('revision to distribute'), _('REV')),
503 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
503 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
504 ] + subrepoopts + walkopts,
504 ] + subrepoopts + walkopts,
505 _('[OPTION]... DEST'))
505 _('[OPTION]... DEST'))
506 def archive(ui, repo, dest, **opts):
506 def archive(ui, repo, dest, **opts):
507 '''create an unversioned archive of a repository revision
507 '''create an unversioned archive of a repository revision
508
508
509 By default, the revision used is the parent of the working
509 By default, the revision used is the parent of the working
510 directory; use -r/--rev to specify a different revision.
510 directory; use -r/--rev to specify a different revision.
511
511
512 The archive type is automatically detected based on file
512 The archive type is automatically detected based on file
513 extension (to override, use -t/--type).
513 extension (to override, use -t/--type).
514
514
515 .. container:: verbose
515 .. container:: verbose
516
516
517 Examples:
517 Examples:
518
518
519 - create a zip file containing the 1.0 release::
519 - create a zip file containing the 1.0 release::
520
520
521 hg archive -r 1.0 project-1.0.zip
521 hg archive -r 1.0 project-1.0.zip
522
522
523 - create a tarball excluding .hg files::
523 - create a tarball excluding .hg files::
524
524
525 hg archive project.tar.gz -X ".hg*"
525 hg archive project.tar.gz -X ".hg*"
526
526
527 Valid types are:
527 Valid types are:
528
528
529 :``files``: a directory full of files (default)
529 :``files``: a directory full of files (default)
530 :``tar``: tar archive, uncompressed
530 :``tar``: tar archive, uncompressed
531 :``tbz2``: tar archive, compressed using bzip2
531 :``tbz2``: tar archive, compressed using bzip2
532 :``tgz``: tar archive, compressed using gzip
532 :``tgz``: tar archive, compressed using gzip
533 :``uzip``: zip archive, uncompressed
533 :``uzip``: zip archive, uncompressed
534 :``zip``: zip archive, compressed using deflate
534 :``zip``: zip archive, compressed using deflate
535
535
536 The exact name of the destination archive or directory is given
536 The exact name of the destination archive or directory is given
537 using a format string; see :hg:`help export` for details.
537 using a format string; see :hg:`help export` for details.
538
538
539 Each member added to an archive file has a directory prefix
539 Each member added to an archive file has a directory prefix
540 prepended. Use -p/--prefix to specify a format string for the
540 prepended. Use -p/--prefix to specify a format string for the
541 prefix. The default is the basename of the archive, with suffixes
541 prefix. The default is the basename of the archive, with suffixes
542 removed.
542 removed.
543
543
544 Returns 0 on success.
544 Returns 0 on success.
545 '''
545 '''
546
546
547 ctx = scmutil.revsingle(repo, opts.get('rev'))
547 ctx = scmutil.revsingle(repo, opts.get('rev'))
548 if not ctx:
548 if not ctx:
549 raise error.Abort(_('no working directory: please specify a revision'))
549 raise error.Abort(_('no working directory: please specify a revision'))
550 node = ctx.node()
550 node = ctx.node()
551 dest = cmdutil.makefilename(repo, dest, node)
551 dest = cmdutil.makefilename(repo, dest, node)
552 if os.path.realpath(dest) == repo.root:
552 if os.path.realpath(dest) == repo.root:
553 raise error.Abort(_('repository root cannot be destination'))
553 raise error.Abort(_('repository root cannot be destination'))
554
554
555 kind = opts.get('type') or archival.guesskind(dest) or 'files'
555 kind = opts.get('type') or archival.guesskind(dest) or 'files'
556 prefix = opts.get('prefix')
556 prefix = opts.get('prefix')
557
557
558 if dest == '-':
558 if dest == '-':
559 if kind == 'files':
559 if kind == 'files':
560 raise error.Abort(_('cannot archive plain files to stdout'))
560 raise error.Abort(_('cannot archive plain files to stdout'))
561 dest = cmdutil.makefileobj(repo, dest)
561 dest = cmdutil.makefileobj(repo, dest)
562 if not prefix:
562 if not prefix:
563 prefix = os.path.basename(repo.root) + '-%h'
563 prefix = os.path.basename(repo.root) + '-%h'
564
564
565 prefix = cmdutil.makefilename(repo, prefix, node)
565 prefix = cmdutil.makefilename(repo, prefix, node)
566 matchfn = scmutil.match(ctx, [], opts)
566 matchfn = scmutil.match(ctx, [], opts)
567 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
567 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
568 matchfn, prefix, subrepos=opts.get('subrepos'))
568 matchfn, prefix, subrepos=opts.get('subrepos'))
569
569
570 @command('backout',
570 @command('backout',
571 [('', 'merge', None, _('merge with old dirstate parent after backout')),
571 [('', 'merge', None, _('merge with old dirstate parent after backout')),
572 ('', 'commit', None,
572 ('', 'commit', None,
573 _('commit if no conflicts were encountered (DEPRECATED)')),
573 _('commit if no conflicts were encountered (DEPRECATED)')),
574 ('', 'no-commit', None, _('do not commit')),
574 ('', 'no-commit', None, _('do not commit')),
575 ('', 'parent', '',
575 ('', 'parent', '',
576 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
576 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
577 ('r', 'rev', '', _('revision to backout'), _('REV')),
577 ('r', 'rev', '', _('revision to backout'), _('REV')),
578 ('e', 'edit', False, _('invoke editor on commit messages')),
578 ('e', 'edit', False, _('invoke editor on commit messages')),
579 ] + mergetoolopts + walkopts + commitopts + commitopts2,
579 ] + mergetoolopts + walkopts + commitopts + commitopts2,
580 _('[OPTION]... [-r] REV'))
580 _('[OPTION]... [-r] REV'))
581 def backout(ui, repo, node=None, rev=None, **opts):
581 def backout(ui, repo, node=None, rev=None, **opts):
582 '''reverse effect of earlier changeset
582 '''reverse effect of earlier changeset
583
583
584 Prepare a new changeset with the effect of REV undone in the
584 Prepare a new changeset with the effect of REV undone in the
585 current working directory. If no conflicts were encountered,
585 current working directory. If no conflicts were encountered,
586 it will be committed immediately.
586 it will be committed immediately.
587
587
588 If REV is the parent of the working directory, then this new changeset
588 If REV is the parent of the working directory, then this new changeset
589 is committed automatically (unless --no-commit is specified).
589 is committed automatically (unless --no-commit is specified).
590
590
591 .. note::
591 .. note::
592
592
593 :hg:`backout` cannot be used to fix either an unwanted or
593 :hg:`backout` cannot be used to fix either an unwanted or
594 incorrect merge.
594 incorrect merge.
595
595
596 .. container:: verbose
596 .. container:: verbose
597
597
598 Examples:
598 Examples:
599
599
600 - Reverse the effect of the parent of the working directory.
600 - Reverse the effect of the parent of the working directory.
601 This backout will be committed immediately::
601 This backout will be committed immediately::
602
602
603 hg backout -r .
603 hg backout -r .
604
604
605 - Reverse the effect of previous bad revision 23::
605 - Reverse the effect of previous bad revision 23::
606
606
607 hg backout -r 23
607 hg backout -r 23
608
608
609 - Reverse the effect of previous bad revision 23 and
609 - Reverse the effect of previous bad revision 23 and
610 leave changes uncommitted::
610 leave changes uncommitted::
611
611
612 hg backout -r 23 --no-commit
612 hg backout -r 23 --no-commit
613 hg commit -m "Backout revision 23"
613 hg commit -m "Backout revision 23"
614
614
615 By default, the pending changeset will have one parent,
615 By default, the pending changeset will have one parent,
616 maintaining a linear history. With --merge, the pending
616 maintaining a linear history. With --merge, the pending
617 changeset will instead have two parents: the old parent of the
617 changeset will instead have two parents: the old parent of the
618 working directory and a new child of REV that simply undoes REV.
618 working directory and a new child of REV that simply undoes REV.
619
619
620 Before version 1.7, the behavior without --merge was equivalent
620 Before version 1.7, the behavior without --merge was equivalent
621 to specifying --merge followed by :hg:`update --clean .` to
621 to specifying --merge followed by :hg:`update --clean .` to
622 cancel the merge and leave the child of REV as a head to be
622 cancel the merge and leave the child of REV as a head to be
623 merged separately.
623 merged separately.
624
624
625 See :hg:`help dates` for a list of formats valid for -d/--date.
625 See :hg:`help dates` for a list of formats valid for -d/--date.
626
626
627 See :hg:`help revert` for a way to restore files to the state
627 See :hg:`help revert` for a way to restore files to the state
628 of another revision.
628 of another revision.
629
629
630 Returns 0 on success, 1 if nothing to backout or there are unresolved
630 Returns 0 on success, 1 if nothing to backout or there are unresolved
631 files.
631 files.
632 '''
632 '''
633 wlock = lock = None
633 wlock = lock = None
634 try:
634 try:
635 wlock = repo.wlock()
635 wlock = repo.wlock()
636 lock = repo.lock()
636 lock = repo.lock()
637 return _dobackout(ui, repo, node, rev, **opts)
637 return _dobackout(ui, repo, node, rev, **opts)
638 finally:
638 finally:
639 release(lock, wlock)
639 release(lock, wlock)
640
640
641 def _dobackout(ui, repo, node=None, rev=None, **opts):
641 def _dobackout(ui, repo, node=None, rev=None, **opts):
642 if opts.get('commit') and opts.get('no_commit'):
642 if opts.get('commit') and opts.get('no_commit'):
643 raise error.Abort(_("cannot use --commit with --no-commit"))
643 raise error.Abort(_("cannot use --commit with --no-commit"))
644 if opts.get('merge') and opts.get('no_commit'):
644 if opts.get('merge') and opts.get('no_commit'):
645 raise error.Abort(_("cannot use --merge with --no-commit"))
645 raise error.Abort(_("cannot use --merge with --no-commit"))
646
646
647 if rev and node:
647 if rev and node:
648 raise error.Abort(_("please specify just one revision"))
648 raise error.Abort(_("please specify just one revision"))
649
649
650 if not rev:
650 if not rev:
651 rev = node
651 rev = node
652
652
653 if not rev:
653 if not rev:
654 raise error.Abort(_("please specify a revision to backout"))
654 raise error.Abort(_("please specify a revision to backout"))
655
655
656 date = opts.get('date')
656 date = opts.get('date')
657 if date:
657 if date:
658 opts['date'] = util.parsedate(date)
658 opts['date'] = util.parsedate(date)
659
659
660 cmdutil.checkunfinished(repo)
660 cmdutil.checkunfinished(repo)
661 cmdutil.bailifchanged(repo)
661 cmdutil.bailifchanged(repo)
662 node = scmutil.revsingle(repo, rev).node()
662 node = scmutil.revsingle(repo, rev).node()
663
663
664 op1, op2 = repo.dirstate.parents()
664 op1, op2 = repo.dirstate.parents()
665 if not repo.changelog.isancestor(node, op1):
665 if not repo.changelog.isancestor(node, op1):
666 raise error.Abort(_('cannot backout change that is not an ancestor'))
666 raise error.Abort(_('cannot backout change that is not an ancestor'))
667
667
668 p1, p2 = repo.changelog.parents(node)
668 p1, p2 = repo.changelog.parents(node)
669 if p1 == nullid:
669 if p1 == nullid:
670 raise error.Abort(_('cannot backout a change with no parents'))
670 raise error.Abort(_('cannot backout a change with no parents'))
671 if p2 != nullid:
671 if p2 != nullid:
672 if not opts.get('parent'):
672 if not opts.get('parent'):
673 raise error.Abort(_('cannot backout a merge changeset'))
673 raise error.Abort(_('cannot backout a merge changeset'))
674 p = repo.lookup(opts['parent'])
674 p = repo.lookup(opts['parent'])
675 if p not in (p1, p2):
675 if p not in (p1, p2):
676 raise error.Abort(_('%s is not a parent of %s') %
676 raise error.Abort(_('%s is not a parent of %s') %
677 (short(p), short(node)))
677 (short(p), short(node)))
678 parent = p
678 parent = p
679 else:
679 else:
680 if opts.get('parent'):
680 if opts.get('parent'):
681 raise error.Abort(_('cannot use --parent on non-merge changeset'))
681 raise error.Abort(_('cannot use --parent on non-merge changeset'))
682 parent = p1
682 parent = p1
683
683
684 # the backout should appear on the same branch
684 # the backout should appear on the same branch
685 branch = repo.dirstate.branch()
685 branch = repo.dirstate.branch()
686 bheads = repo.branchheads(branch)
686 bheads = repo.branchheads(branch)
687 rctx = scmutil.revsingle(repo, hex(parent))
687 rctx = scmutil.revsingle(repo, hex(parent))
688 if not opts.get('merge') and op1 != node:
688 if not opts.get('merge') and op1 != node:
689 dsguard = cmdutil.dirstateguard(repo, 'backout')
689 dsguard = cmdutil.dirstateguard(repo, 'backout')
690 try:
690 try:
691 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
691 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
692 'backout')
692 'backout')
693 stats = mergemod.update(repo, parent, True, True, node, False)
693 stats = mergemod.update(repo, parent, True, True, node, False)
694 repo.setparents(op1, op2)
694 repo.setparents(op1, op2)
695 dsguard.close()
695 dsguard.close()
696 hg._showstats(repo, stats)
696 hg._showstats(repo, stats)
697 if stats[3]:
697 if stats[3]:
698 repo.ui.status(_("use 'hg resolve' to retry unresolved "
698 repo.ui.status(_("use 'hg resolve' to retry unresolved "
699 "file merges\n"))
699 "file merges\n"))
700 return 1
700 return 1
701 finally:
701 finally:
702 ui.setconfig('ui', 'forcemerge', '', '')
702 ui.setconfig('ui', 'forcemerge', '', '')
703 lockmod.release(dsguard)
703 lockmod.release(dsguard)
704 else:
704 else:
705 hg.clean(repo, node, show_stats=False)
705 hg.clean(repo, node, show_stats=False)
706 repo.dirstate.setbranch(branch)
706 repo.dirstate.setbranch(branch)
707 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
707 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
708
708
709 if opts.get('no_commit'):
709 if opts.get('no_commit'):
710 msg = _("changeset %s backed out, "
710 msg = _("changeset %s backed out, "
711 "don't forget to commit.\n")
711 "don't forget to commit.\n")
712 ui.status(msg % short(node))
712 ui.status(msg % short(node))
713 return 0
713 return 0
714
714
715 def commitfunc(ui, repo, message, match, opts):
715 def commitfunc(ui, repo, message, match, opts):
716 editform = 'backout'
716 editform = 'backout'
717 e = cmdutil.getcommiteditor(editform=editform, **opts)
717 e = cmdutil.getcommiteditor(editform=editform, **opts)
718 if not message:
718 if not message:
719 # we don't translate commit messages
719 # we don't translate commit messages
720 message = "Backed out changeset %s" % short(node)
720 message = "Backed out changeset %s" % short(node)
721 e = cmdutil.getcommiteditor(edit=True, editform=editform)
721 e = cmdutil.getcommiteditor(edit=True, editform=editform)
722 return repo.commit(message, opts.get('user'), opts.get('date'),
722 return repo.commit(message, opts.get('user'), opts.get('date'),
723 match, editor=e)
723 match, editor=e)
724 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
724 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
725 if not newnode:
725 if not newnode:
726 ui.status(_("nothing changed\n"))
726 ui.status(_("nothing changed\n"))
727 return 1
727 return 1
728 cmdutil.commitstatus(repo, newnode, branch, bheads)
728 cmdutil.commitstatus(repo, newnode, branch, bheads)
729
729
730 def nice(node):
730 def nice(node):
731 return '%d:%s' % (repo.changelog.rev(node), short(node))
731 return '%d:%s' % (repo.changelog.rev(node), short(node))
732 ui.status(_('changeset %s backs out changeset %s\n') %
732 ui.status(_('changeset %s backs out changeset %s\n') %
733 (nice(repo.changelog.tip()), nice(node)))
733 (nice(repo.changelog.tip()), nice(node)))
734 if opts.get('merge') and op1 != node:
734 if opts.get('merge') and op1 != node:
735 hg.clean(repo, op1, show_stats=False)
735 hg.clean(repo, op1, show_stats=False)
736 ui.status(_('merging with changeset %s\n')
736 ui.status(_('merging with changeset %s\n')
737 % nice(repo.changelog.tip()))
737 % nice(repo.changelog.tip()))
738 try:
738 try:
739 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
739 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
740 'backout')
740 'backout')
741 return hg.merge(repo, hex(repo.changelog.tip()))
741 return hg.merge(repo, hex(repo.changelog.tip()))
742 finally:
742 finally:
743 ui.setconfig('ui', 'forcemerge', '', '')
743 ui.setconfig('ui', 'forcemerge', '', '')
744 return 0
744 return 0
745
745
746 @command('bisect',
746 @command('bisect',
747 [('r', 'reset', False, _('reset bisect state')),
747 [('r', 'reset', False, _('reset bisect state')),
748 ('g', 'good', False, _('mark changeset good')),
748 ('g', 'good', False, _('mark changeset good')),
749 ('b', 'bad', False, _('mark changeset bad')),
749 ('b', 'bad', False, _('mark changeset bad')),
750 ('s', 'skip', False, _('skip testing changeset')),
750 ('s', 'skip', False, _('skip testing changeset')),
751 ('e', 'extend', False, _('extend the bisect range')),
751 ('e', 'extend', False, _('extend the bisect range')),
752 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
752 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
753 ('U', 'noupdate', False, _('do not update to target'))],
753 ('U', 'noupdate', False, _('do not update to target'))],
754 _("[-gbsr] [-U] [-c CMD] [REV]"))
754 _("[-gbsr] [-U] [-c CMD] [REV]"))
755 def bisect(ui, repo, rev=None, extra=None, command=None,
755 def bisect(ui, repo, rev=None, extra=None, command=None,
756 reset=None, good=None, bad=None, skip=None, extend=None,
756 reset=None, good=None, bad=None, skip=None, extend=None,
757 noupdate=None):
757 noupdate=None):
758 """subdivision search of changesets
758 """subdivision search of changesets
759
759
760 This command helps to find changesets which introduce problems. To
760 This command helps to find changesets which introduce problems. To
761 use, mark the earliest changeset you know exhibits the problem as
761 use, mark the earliest changeset you know exhibits the problem as
762 bad, then mark the latest changeset which is free from the problem
762 bad, then mark the latest changeset which is free from the problem
763 as good. Bisect will update your working directory to a revision
763 as good. Bisect will update your working directory to a revision
764 for testing (unless the -U/--noupdate option is specified). Once
764 for testing (unless the -U/--noupdate option is specified). Once
765 you have performed tests, mark the working directory as good or
765 you have performed tests, mark the working directory as good or
766 bad, and bisect will either update to another candidate changeset
766 bad, and bisect will either update to another candidate changeset
767 or announce that it has found the bad revision.
767 or announce that it has found the bad revision.
768
768
769 As a shortcut, you can also use the revision argument to mark a
769 As a shortcut, you can also use the revision argument to mark a
770 revision as good or bad without checking it out first.
770 revision as good or bad without checking it out first.
771
771
772 If you supply a command, it will be used for automatic bisection.
772 If you supply a command, it will be used for automatic bisection.
773 The environment variable HG_NODE will contain the ID of the
773 The environment variable HG_NODE will contain the ID of the
774 changeset being tested. The exit status of the command will be
774 changeset being tested. The exit status of the command will be
775 used to mark revisions as good or bad: status 0 means good, 125
775 used to mark revisions as good or bad: status 0 means good, 125
776 means to skip the revision, 127 (command not found) will abort the
776 means to skip the revision, 127 (command not found) will abort the
777 bisection, and any other non-zero exit status means the revision
777 bisection, and any other non-zero exit status means the revision
778 is bad.
778 is bad.
779
779
780 .. container:: verbose
780 .. container:: verbose
781
781
782 Some examples:
782 Some examples:
783
783
784 - start a bisection with known bad revision 34, and good revision 12::
784 - start a bisection with known bad revision 34, and good revision 12::
785
785
786 hg bisect --bad 34
786 hg bisect --bad 34
787 hg bisect --good 12
787 hg bisect --good 12
788
788
789 - advance the current bisection by marking current revision as good or
789 - advance the current bisection by marking current revision as good or
790 bad::
790 bad::
791
791
792 hg bisect --good
792 hg bisect --good
793 hg bisect --bad
793 hg bisect --bad
794
794
795 - mark the current revision, or a known revision, to be skipped (e.g. if
795 - mark the current revision, or a known revision, to be skipped (e.g. if
796 that revision is not usable because of another issue)::
796 that revision is not usable because of another issue)::
797
797
798 hg bisect --skip
798 hg bisect --skip
799 hg bisect --skip 23
799 hg bisect --skip 23
800
800
801 - skip all revisions that do not touch directories ``foo`` or ``bar``::
801 - skip all revisions that do not touch directories ``foo`` or ``bar``::
802
802
803 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
803 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
804
804
805 - forget the current bisection::
805 - forget the current bisection::
806
806
807 hg bisect --reset
807 hg bisect --reset
808
808
809 - use 'make && make tests' to automatically find the first broken
809 - use 'make && make tests' to automatically find the first broken
810 revision::
810 revision::
811
811
812 hg bisect --reset
812 hg bisect --reset
813 hg bisect --bad 34
813 hg bisect --bad 34
814 hg bisect --good 12
814 hg bisect --good 12
815 hg bisect --command "make && make tests"
815 hg bisect --command "make && make tests"
816
816
817 - see all changesets whose states are already known in the current
817 - see all changesets whose states are already known in the current
818 bisection::
818 bisection::
819
819
820 hg log -r "bisect(pruned)"
820 hg log -r "bisect(pruned)"
821
821
822 - see the changeset currently being bisected (especially useful
822 - see the changeset currently being bisected (especially useful
823 if running with -U/--noupdate)::
823 if running with -U/--noupdate)::
824
824
825 hg log -r "bisect(current)"
825 hg log -r "bisect(current)"
826
826
827 - see all changesets that took part in the current bisection::
827 - see all changesets that took part in the current bisection::
828
828
829 hg log -r "bisect(range)"
829 hg log -r "bisect(range)"
830
830
831 - you can even get a nice graph::
831 - you can even get a nice graph::
832
832
833 hg log --graph -r "bisect(range)"
833 hg log --graph -r "bisect(range)"
834
834
835 See :hg:`help revsets` for more about the `bisect()` keyword.
835 See :hg:`help revsets` for more about the `bisect()` keyword.
836
836
837 Returns 0 on success.
837 Returns 0 on success.
838 """
838 """
839 # backward compatibility
839 # backward compatibility
840 if rev in "good bad reset init".split():
840 if rev in "good bad reset init".split():
841 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
841 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
842 cmd, rev, extra = rev, extra, None
842 cmd, rev, extra = rev, extra, None
843 if cmd == "good":
843 if cmd == "good":
844 good = True
844 good = True
845 elif cmd == "bad":
845 elif cmd == "bad":
846 bad = True
846 bad = True
847 else:
847 else:
848 reset = True
848 reset = True
849 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
849 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
850 raise error.Abort(_('incompatible arguments'))
850 raise error.Abort(_('incompatible arguments'))
851
851
852 cmdutil.checkunfinished(repo)
852 cmdutil.checkunfinished(repo)
853
853
854 if reset:
854 if reset:
855 hbisect.resetstate(repo)
855 hbisect.resetstate(repo)
856 return
856 return
857
857
858 state = hbisect.load_state(repo)
858 state = hbisect.load_state(repo)
859
859
860 # update state
860 # update state
861 if good or bad or skip:
861 if good or bad or skip:
862 if rev:
862 if rev:
863 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
863 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
864 else:
864 else:
865 nodes = [repo.lookup('.')]
865 nodes = [repo.lookup('.')]
866 if good:
866 if good:
867 state['good'] += nodes
867 state['good'] += nodes
868 elif bad:
868 elif bad:
869 state['bad'] += nodes
869 state['bad'] += nodes
870 elif skip:
870 elif skip:
871 state['skip'] += nodes
871 state['skip'] += nodes
872 hbisect.save_state(repo, state)
872 hbisect.save_state(repo, state)
873 if not (state['good'] and state['bad']):
873 if not (state['good'] and state['bad']):
874 return
874 return
875
875
876 def mayupdate(repo, node, show_stats=True):
876 def mayupdate(repo, node, show_stats=True):
877 """common used update sequence"""
877 """common used update sequence"""
878 if noupdate:
878 if noupdate:
879 return
879 return
880 cmdutil.bailifchanged(repo)
880 cmdutil.bailifchanged(repo)
881 return hg.clean(repo, node, show_stats=show_stats)
881 return hg.clean(repo, node, show_stats=show_stats)
882
882
883 displayer = cmdutil.show_changeset(ui, repo, {})
883 displayer = cmdutil.show_changeset(ui, repo, {})
884
884
885 if command:
885 if command:
886 changesets = 1
886 changesets = 1
887 if noupdate:
887 if noupdate:
888 try:
888 try:
889 node = state['current'][0]
889 node = state['current'][0]
890 except LookupError:
890 except LookupError:
891 raise error.Abort(_('current bisect revision is unknown - '
891 raise error.Abort(_('current bisect revision is unknown - '
892 'start a new bisect to fix'))
892 'start a new bisect to fix'))
893 else:
893 else:
894 node, p2 = repo.dirstate.parents()
894 node, p2 = repo.dirstate.parents()
895 if p2 != nullid:
895 if p2 != nullid:
896 raise error.Abort(_('current bisect revision is a merge'))
896 raise error.Abort(_('current bisect revision is a merge'))
897 if rev:
897 if rev:
898 node = repo[scmutil.revsingle(repo, rev, node)].node()
898 node = repo[scmutil.revsingle(repo, rev, node)].node()
899 try:
899 try:
900 while changesets:
900 while changesets:
901 # update state
901 # update state
902 state['current'] = [node]
902 state['current'] = [node]
903 hbisect.save_state(repo, state)
903 hbisect.save_state(repo, state)
904 status = ui.system(command, environ={'HG_NODE': hex(node)})
904 status = ui.system(command, environ={'HG_NODE': hex(node)})
905 if status == 125:
905 if status == 125:
906 transition = "skip"
906 transition = "skip"
907 elif status == 0:
907 elif status == 0:
908 transition = "good"
908 transition = "good"
909 # status < 0 means process was killed
909 # status < 0 means process was killed
910 elif status == 127:
910 elif status == 127:
911 raise error.Abort(_("failed to execute %s") % command)
911 raise error.Abort(_("failed to execute %s") % command)
912 elif status < 0:
912 elif status < 0:
913 raise error.Abort(_("%s killed") % command)
913 raise error.Abort(_("%s killed") % command)
914 else:
914 else:
915 transition = "bad"
915 transition = "bad"
916 state[transition].append(node)
916 state[transition].append(node)
917 ctx = repo[node]
917 ctx = repo[node]
918 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
918 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
919 hbisect.checkstate(state)
919 hbisect.checkstate(state)
920 # bisect
920 # bisect
921 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
921 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
922 # update to next check
922 # update to next check
923 node = nodes[0]
923 node = nodes[0]
924 mayupdate(repo, node, show_stats=False)
924 mayupdate(repo, node, show_stats=False)
925 finally:
925 finally:
926 state['current'] = [node]
926 state['current'] = [node]
927 hbisect.save_state(repo, state)
927 hbisect.save_state(repo, state)
928 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
928 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
929 return
929 return
930
930
931 hbisect.checkstate(state)
931 hbisect.checkstate(state)
932
932
933 # actually bisect
933 # actually bisect
934 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
934 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
935 if extend:
935 if extend:
936 if not changesets:
936 if not changesets:
937 extendnode = hbisect.extendrange(repo, state, nodes, good)
937 extendnode = hbisect.extendrange(repo, state, nodes, good)
938 if extendnode is not None:
938 if extendnode is not None:
939 ui.write(_("Extending search to changeset %d:%s\n")
939 ui.write(_("Extending search to changeset %d:%s\n")
940 % (extendnode.rev(), extendnode))
940 % (extendnode.rev(), extendnode))
941 state['current'] = [extendnode.node()]
941 state['current'] = [extendnode.node()]
942 hbisect.save_state(repo, state)
942 hbisect.save_state(repo, state)
943 return mayupdate(repo, extendnode.node())
943 return mayupdate(repo, extendnode.node())
944 raise error.Abort(_("nothing to extend"))
944 raise error.Abort(_("nothing to extend"))
945
945
946 if changesets == 0:
946 if changesets == 0:
947 hbisect.printresult(ui, repo, state, displayer, nodes, good)
947 hbisect.printresult(ui, repo, state, displayer, nodes, good)
948 else:
948 else:
949 assert len(nodes) == 1 # only a single node can be tested next
949 assert len(nodes) == 1 # only a single node can be tested next
950 node = nodes[0]
950 node = nodes[0]
951 # compute the approximate number of remaining tests
951 # compute the approximate number of remaining tests
952 tests, size = 0, 2
952 tests, size = 0, 2
953 while size <= changesets:
953 while size <= changesets:
954 tests, size = tests + 1, size * 2
954 tests, size = tests + 1, size * 2
955 rev = repo.changelog.rev(node)
955 rev = repo.changelog.rev(node)
956 ui.write(_("Testing changeset %d:%s "
956 ui.write(_("Testing changeset %d:%s "
957 "(%d changesets remaining, ~%d tests)\n")
957 "(%d changesets remaining, ~%d tests)\n")
958 % (rev, short(node), changesets, tests))
958 % (rev, short(node), changesets, tests))
959 state['current'] = [node]
959 state['current'] = [node]
960 hbisect.save_state(repo, state)
960 hbisect.save_state(repo, state)
961 return mayupdate(repo, node)
961 return mayupdate(repo, node)
962
962
963 @command('bookmarks|bookmark',
963 @command('bookmarks|bookmark',
964 [('f', 'force', False, _('force')),
964 [('f', 'force', False, _('force')),
965 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
965 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
966 ('d', 'delete', False, _('delete a given bookmark')),
966 ('d', 'delete', False, _('delete a given bookmark')),
967 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
967 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
968 ('i', 'inactive', False, _('mark a bookmark inactive')),
968 ('i', 'inactive', False, _('mark a bookmark inactive')),
969 ] + formatteropts,
969 ] + formatteropts,
970 _('hg bookmarks [OPTIONS]... [NAME]...'))
970 _('hg bookmarks [OPTIONS]... [NAME]...'))
971 def bookmark(ui, repo, *names, **opts):
971 def bookmark(ui, repo, *names, **opts):
972 '''create a new bookmark or list existing bookmarks
972 '''create a new bookmark or list existing bookmarks
973
973
974 Bookmarks are labels on changesets to help track lines of development.
974 Bookmarks are labels on changesets to help track lines of development.
975 Bookmarks are unversioned and can be moved, renamed and deleted.
975 Bookmarks are unversioned and can be moved, renamed and deleted.
976 Deleting or moving a bookmark has no effect on the associated changesets.
976 Deleting or moving a bookmark has no effect on the associated changesets.
977
977
978 Creating or updating to a bookmark causes it to be marked as 'active'.
978 Creating or updating to a bookmark causes it to be marked as 'active'.
979 The active bookmark is indicated with a '*'.
979 The active bookmark is indicated with a '*'.
980 When a commit is made, the active bookmark will advance to the new commit.
980 When a commit is made, the active bookmark will advance to the new commit.
981 A plain :hg:`update` will also advance an active bookmark, if possible.
981 A plain :hg:`update` will also advance an active bookmark, if possible.
982 Updating away from a bookmark will cause it to be deactivated.
982 Updating away from a bookmark will cause it to be deactivated.
983
983
984 Bookmarks can be pushed and pulled between repositories (see
984 Bookmarks can be pushed and pulled between repositories (see
985 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
985 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
986 diverged, a new 'divergent bookmark' of the form 'name@path' will
986 diverged, a new 'divergent bookmark' of the form 'name@path' will
987 be created. Using :hg:`merge` will resolve the divergence.
987 be created. Using :hg:`merge` will resolve the divergence.
988
988
989 A bookmark named '@' has the special property that :hg:`clone` will
989 A bookmark named '@' has the special property that :hg:`clone` will
990 check it out by default if it exists.
990 check it out by default if it exists.
991
991
992 .. container:: verbose
992 .. container:: verbose
993
993
994 Examples:
994 Examples:
995
995
996 - create an active bookmark for a new line of development::
996 - create an active bookmark for a new line of development::
997
997
998 hg book new-feature
998 hg book new-feature
999
999
1000 - create an inactive bookmark as a place marker::
1000 - create an inactive bookmark as a place marker::
1001
1001
1002 hg book -i reviewed
1002 hg book -i reviewed
1003
1003
1004 - create an inactive bookmark on another changeset::
1004 - create an inactive bookmark on another changeset::
1005
1005
1006 hg book -r .^ tested
1006 hg book -r .^ tested
1007
1007
1008 - rename bookmark turkey to dinner::
1008 - rename bookmark turkey to dinner::
1009
1009
1010 hg book -m turkey dinner
1010 hg book -m turkey dinner
1011
1011
1012 - move the '@' bookmark from another branch::
1012 - move the '@' bookmark from another branch::
1013
1013
1014 hg book -f @
1014 hg book -f @
1015 '''
1015 '''
1016 force = opts.get('force')
1016 force = opts.get('force')
1017 rev = opts.get('rev')
1017 rev = opts.get('rev')
1018 delete = opts.get('delete')
1018 delete = opts.get('delete')
1019 rename = opts.get('rename')
1019 rename = opts.get('rename')
1020 inactive = opts.get('inactive')
1020 inactive = opts.get('inactive')
1021
1021
1022 def checkformat(mark):
1022 def checkformat(mark):
1023 mark = mark.strip()
1023 mark = mark.strip()
1024 if not mark:
1024 if not mark:
1025 raise error.Abort(_("bookmark names cannot consist entirely of "
1025 raise error.Abort(_("bookmark names cannot consist entirely of "
1026 "whitespace"))
1026 "whitespace"))
1027 scmutil.checknewlabel(repo, mark, 'bookmark')
1027 scmutil.checknewlabel(repo, mark, 'bookmark')
1028 return mark
1028 return mark
1029
1029
1030 def checkconflict(repo, mark, cur, force=False, target=None):
1030 def checkconflict(repo, mark, cur, force=False, target=None):
1031 if mark in marks and not force:
1031 if mark in marks and not force:
1032 if target:
1032 if target:
1033 if marks[mark] == target and target == cur:
1033 if marks[mark] == target and target == cur:
1034 # re-activating a bookmark
1034 # re-activating a bookmark
1035 return
1035 return
1036 anc = repo.changelog.ancestors([repo[target].rev()])
1036 anc = repo.changelog.ancestors([repo[target].rev()])
1037 bmctx = repo[marks[mark]]
1037 bmctx = repo[marks[mark]]
1038 divs = [repo[b].node() for b in marks
1038 divs = [repo[b].node() for b in marks
1039 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1039 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1040
1040
1041 # allow resolving a single divergent bookmark even if moving
1041 # allow resolving a single divergent bookmark even if moving
1042 # the bookmark across branches when a revision is specified
1042 # the bookmark across branches when a revision is specified
1043 # that contains a divergent bookmark
1043 # that contains a divergent bookmark
1044 if bmctx.rev() not in anc and target in divs:
1044 if bmctx.rev() not in anc and target in divs:
1045 bookmarks.deletedivergent(repo, [target], mark)
1045 bookmarks.deletedivergent(repo, [target], mark)
1046 return
1046 return
1047
1047
1048 deletefrom = [b for b in divs
1048 deletefrom = [b for b in divs
1049 if repo[b].rev() in anc or b == target]
1049 if repo[b].rev() in anc or b == target]
1050 bookmarks.deletedivergent(repo, deletefrom, mark)
1050 bookmarks.deletedivergent(repo, deletefrom, mark)
1051 if bookmarks.validdest(repo, bmctx, repo[target]):
1051 if bookmarks.validdest(repo, bmctx, repo[target]):
1052 ui.status(_("moving bookmark '%s' forward from %s\n") %
1052 ui.status(_("moving bookmark '%s' forward from %s\n") %
1053 (mark, short(bmctx.node())))
1053 (mark, short(bmctx.node())))
1054 return
1054 return
1055 raise error.Abort(_("bookmark '%s' already exists "
1055 raise error.Abort(_("bookmark '%s' already exists "
1056 "(use -f to force)") % mark)
1056 "(use -f to force)") % mark)
1057 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1057 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1058 and not force):
1058 and not force):
1059 raise error.Abort(
1059 raise error.Abort(
1060 _("a bookmark cannot have the name of an existing branch"))
1060 _("a bookmark cannot have the name of an existing branch"))
1061
1061
1062 if delete and rename:
1062 if delete and rename:
1063 raise error.Abort(_("--delete and --rename are incompatible"))
1063 raise error.Abort(_("--delete and --rename are incompatible"))
1064 if delete and rev:
1064 if delete and rev:
1065 raise error.Abort(_("--rev is incompatible with --delete"))
1065 raise error.Abort(_("--rev is incompatible with --delete"))
1066 if rename and rev:
1066 if rename and rev:
1067 raise error.Abort(_("--rev is incompatible with --rename"))
1067 raise error.Abort(_("--rev is incompatible with --rename"))
1068 if not names and (delete or rev):
1068 if not names and (delete or rev):
1069 raise error.Abort(_("bookmark name required"))
1069 raise error.Abort(_("bookmark name required"))
1070
1070
1071 if delete or rename or names or inactive:
1071 if delete or rename or names or inactive:
1072 wlock = lock = tr = None
1072 wlock = lock = tr = None
1073 try:
1073 try:
1074 wlock = repo.wlock()
1074 wlock = repo.wlock()
1075 lock = repo.lock()
1075 lock = repo.lock()
1076 cur = repo.changectx('.').node()
1076 cur = repo.changectx('.').node()
1077 marks = repo._bookmarks
1077 marks = repo._bookmarks
1078 if delete:
1078 if delete:
1079 tr = repo.transaction('bookmark')
1079 tr = repo.transaction('bookmark')
1080 for mark in names:
1080 for mark in names:
1081 if mark not in marks:
1081 if mark not in marks:
1082 raise error.Abort(_("bookmark '%s' does not exist") %
1082 raise error.Abort(_("bookmark '%s' does not exist") %
1083 mark)
1083 mark)
1084 if mark == repo._activebookmark:
1084 if mark == repo._activebookmark:
1085 bookmarks.deactivate(repo)
1085 bookmarks.deactivate(repo)
1086 del marks[mark]
1086 del marks[mark]
1087
1087
1088 elif rename:
1088 elif rename:
1089 tr = repo.transaction('bookmark')
1089 tr = repo.transaction('bookmark')
1090 if not names:
1090 if not names:
1091 raise error.Abort(_("new bookmark name required"))
1091 raise error.Abort(_("new bookmark name required"))
1092 elif len(names) > 1:
1092 elif len(names) > 1:
1093 raise error.Abort(_("only one new bookmark name allowed"))
1093 raise error.Abort(_("only one new bookmark name allowed"))
1094 mark = checkformat(names[0])
1094 mark = checkformat(names[0])
1095 if rename not in marks:
1095 if rename not in marks:
1096 raise error.Abort(_("bookmark '%s' does not exist")
1096 raise error.Abort(_("bookmark '%s' does not exist")
1097 % rename)
1097 % rename)
1098 checkconflict(repo, mark, cur, force)
1098 checkconflict(repo, mark, cur, force)
1099 marks[mark] = marks[rename]
1099 marks[mark] = marks[rename]
1100 if repo._activebookmark == rename and not inactive:
1100 if repo._activebookmark == rename and not inactive:
1101 bookmarks.activate(repo, mark)
1101 bookmarks.activate(repo, mark)
1102 del marks[rename]
1102 del marks[rename]
1103 elif names:
1103 elif names:
1104 tr = repo.transaction('bookmark')
1104 tr = repo.transaction('bookmark')
1105 newact = None
1105 newact = None
1106 for mark in names:
1106 for mark in names:
1107 mark = checkformat(mark)
1107 mark = checkformat(mark)
1108 if newact is None:
1108 if newact is None:
1109 newact = mark
1109 newact = mark
1110 if inactive and mark == repo._activebookmark:
1110 if inactive and mark == repo._activebookmark:
1111 bookmarks.deactivate(repo)
1111 bookmarks.deactivate(repo)
1112 return
1112 return
1113 tgt = cur
1113 tgt = cur
1114 if rev:
1114 if rev:
1115 tgt = scmutil.revsingle(repo, rev).node()
1115 tgt = scmutil.revsingle(repo, rev).node()
1116 checkconflict(repo, mark, cur, force, tgt)
1116 checkconflict(repo, mark, cur, force, tgt)
1117 marks[mark] = tgt
1117 marks[mark] = tgt
1118 if not inactive and cur == marks[newact] and not rev:
1118 if not inactive and cur == marks[newact] and not rev:
1119 bookmarks.activate(repo, newact)
1119 bookmarks.activate(repo, newact)
1120 elif cur != tgt and newact == repo._activebookmark:
1120 elif cur != tgt and newact == repo._activebookmark:
1121 bookmarks.deactivate(repo)
1121 bookmarks.deactivate(repo)
1122 elif inactive:
1122 elif inactive:
1123 if len(marks) == 0:
1123 if len(marks) == 0:
1124 ui.status(_("no bookmarks set\n"))
1124 ui.status(_("no bookmarks set\n"))
1125 elif not repo._activebookmark:
1125 elif not repo._activebookmark:
1126 ui.status(_("no active bookmark\n"))
1126 ui.status(_("no active bookmark\n"))
1127 else:
1127 else:
1128 bookmarks.deactivate(repo)
1128 bookmarks.deactivate(repo)
1129 if tr is not None:
1129 if tr is not None:
1130 marks.recordchange(tr)
1130 marks.recordchange(tr)
1131 tr.close()
1131 tr.close()
1132 finally:
1132 finally:
1133 lockmod.release(tr, lock, wlock)
1133 lockmod.release(tr, lock, wlock)
1134 else: # show bookmarks
1134 else: # show bookmarks
1135 fm = ui.formatter('bookmarks', opts)
1135 fm = ui.formatter('bookmarks', opts)
1136 hexfn = fm.hexfunc
1136 hexfn = fm.hexfunc
1137 marks = repo._bookmarks
1137 marks = repo._bookmarks
1138 if len(marks) == 0 and fm.isplain():
1138 if len(marks) == 0 and fm.isplain():
1139 ui.status(_("no bookmarks set\n"))
1139 ui.status(_("no bookmarks set\n"))
1140 for bmark, n in sorted(marks.iteritems()):
1140 for bmark, n in sorted(marks.iteritems()):
1141 active = repo._activebookmark
1141 active = repo._activebookmark
1142 if bmark == active:
1142 if bmark == active:
1143 prefix, label = '*', activebookmarklabel
1143 prefix, label = '*', activebookmarklabel
1144 else:
1144 else:
1145 prefix, label = ' ', ''
1145 prefix, label = ' ', ''
1146
1146
1147 fm.startitem()
1147 fm.startitem()
1148 if not ui.quiet:
1148 if not ui.quiet:
1149 fm.plain(' %s ' % prefix, label=label)
1149 fm.plain(' %s ' % prefix, label=label)
1150 fm.write('bookmark', '%s', bmark, label=label)
1150 fm.write('bookmark', '%s', bmark, label=label)
1151 pad = " " * (25 - encoding.colwidth(bmark))
1151 pad = " " * (25 - encoding.colwidth(bmark))
1152 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1152 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1153 repo.changelog.rev(n), hexfn(n), label=label)
1153 repo.changelog.rev(n), hexfn(n), label=label)
1154 fm.data(active=(bmark == active))
1154 fm.data(active=(bmark == active))
1155 fm.plain('\n')
1155 fm.plain('\n')
1156 fm.end()
1156 fm.end()
1157
1157
1158 @command('branch',
1158 @command('branch',
1159 [('f', 'force', None,
1159 [('f', 'force', None,
1160 _('set branch name even if it shadows an existing branch')),
1160 _('set branch name even if it shadows an existing branch')),
1161 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1161 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1162 _('[-fC] [NAME]'))
1162 _('[-fC] [NAME]'))
1163 def branch(ui, repo, label=None, **opts):
1163 def branch(ui, repo, label=None, **opts):
1164 """set or show the current branch name
1164 """set or show the current branch name
1165
1165
1166 .. note::
1166 .. note::
1167
1167
1168 Branch names are permanent and global. Use :hg:`bookmark` to create a
1168 Branch names are permanent and global. Use :hg:`bookmark` to create a
1169 light-weight bookmark instead. See :hg:`help glossary` for more
1169 light-weight bookmark instead. See :hg:`help glossary` for more
1170 information about named branches and bookmarks.
1170 information about named branches and bookmarks.
1171
1171
1172 With no argument, show the current branch name. With one argument,
1172 With no argument, show the current branch name. With one argument,
1173 set the working directory branch name (the branch will not exist
1173 set the working directory branch name (the branch will not exist
1174 in the repository until the next commit). Standard practice
1174 in the repository until the next commit). Standard practice
1175 recommends that primary development take place on the 'default'
1175 recommends that primary development take place on the 'default'
1176 branch.
1176 branch.
1177
1177
1178 Unless -f/--force is specified, branch will not let you set a
1178 Unless -f/--force is specified, branch will not let you set a
1179 branch name that already exists.
1179 branch name that already exists.
1180
1180
1181 Use -C/--clean to reset the working directory branch to that of
1181 Use -C/--clean to reset the working directory branch to that of
1182 the parent of the working directory, negating a previous branch
1182 the parent of the working directory, negating a previous branch
1183 change.
1183 change.
1184
1184
1185 Use the command :hg:`update` to switch to an existing branch. Use
1185 Use the command :hg:`update` to switch to an existing branch. Use
1186 :hg:`commit --close-branch` to mark this branch head as closed.
1186 :hg:`commit --close-branch` to mark this branch head as closed.
1187 When all heads of a branch are closed, the branch will be
1187 When all heads of a branch are closed, the branch will be
1188 considered closed.
1188 considered closed.
1189
1189
1190 Returns 0 on success.
1190 Returns 0 on success.
1191 """
1191 """
1192 if label:
1192 if label:
1193 label = label.strip()
1193 label = label.strip()
1194
1194
1195 if not opts.get('clean') and not label:
1195 if not opts.get('clean') and not label:
1196 ui.write("%s\n" % repo.dirstate.branch())
1196 ui.write("%s\n" % repo.dirstate.branch())
1197 return
1197 return
1198
1198
1199 with repo.wlock():
1199 with repo.wlock():
1200 if opts.get('clean'):
1200 if opts.get('clean'):
1201 label = repo[None].p1().branch()
1201 label = repo[None].p1().branch()
1202 repo.dirstate.setbranch(label)
1202 repo.dirstate.setbranch(label)
1203 ui.status(_('reset working directory to branch %s\n') % label)
1203 ui.status(_('reset working directory to branch %s\n') % label)
1204 elif label:
1204 elif label:
1205 if not opts.get('force') and label in repo.branchmap():
1205 if not opts.get('force') and label in repo.branchmap():
1206 if label not in [p.branch() for p in repo[None].parents()]:
1206 if label not in [p.branch() for p in repo[None].parents()]:
1207 raise error.Abort(_('a branch of the same name already'
1207 raise error.Abort(_('a branch of the same name already'
1208 ' exists'),
1208 ' exists'),
1209 # i18n: "it" refers to an existing branch
1209 # i18n: "it" refers to an existing branch
1210 hint=_("use 'hg update' to switch to it"))
1210 hint=_("use 'hg update' to switch to it"))
1211 scmutil.checknewlabel(repo, label, 'branch')
1211 scmutil.checknewlabel(repo, label, 'branch')
1212 repo.dirstate.setbranch(label)
1212 repo.dirstate.setbranch(label)
1213 ui.status(_('marked working directory as branch %s\n') % label)
1213 ui.status(_('marked working directory as branch %s\n') % label)
1214
1214
1215 # find any open named branches aside from default
1215 # find any open named branches aside from default
1216 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1216 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1217 if n != "default" and not c]
1217 if n != "default" and not c]
1218 if not others:
1218 if not others:
1219 ui.status(_('(branches are permanent and global, '
1219 ui.status(_('(branches are permanent and global, '
1220 'did you want a bookmark?)\n'))
1220 'did you want a bookmark?)\n'))
1221
1221
1222 @command('branches',
1222 @command('branches',
1223 [('a', 'active', False,
1223 [('a', 'active', False,
1224 _('show only branches that have unmerged heads (DEPRECATED)')),
1224 _('show only branches that have unmerged heads (DEPRECATED)')),
1225 ('c', 'closed', False, _('show normal and closed branches')),
1225 ('c', 'closed', False, _('show normal and closed branches')),
1226 ] + formatteropts,
1226 ] + formatteropts,
1227 _('[-c]'))
1227 _('[-c]'))
1228 def branches(ui, repo, active=False, closed=False, **opts):
1228 def branches(ui, repo, active=False, closed=False, **opts):
1229 """list repository named branches
1229 """list repository named branches
1230
1230
1231 List the repository's named branches, indicating which ones are
1231 List the repository's named branches, indicating which ones are
1232 inactive. If -c/--closed is specified, also list branches which have
1232 inactive. If -c/--closed is specified, also list branches which have
1233 been marked closed (see :hg:`commit --close-branch`).
1233 been marked closed (see :hg:`commit --close-branch`).
1234
1234
1235 Use the command :hg:`update` to switch to an existing branch.
1235 Use the command :hg:`update` to switch to an existing branch.
1236
1236
1237 Returns 0.
1237 Returns 0.
1238 """
1238 """
1239
1239
1240 fm = ui.formatter('branches', opts)
1240 fm = ui.formatter('branches', opts)
1241 hexfunc = fm.hexfunc
1241 hexfunc = fm.hexfunc
1242
1242
1243 allheads = set(repo.heads())
1243 allheads = set(repo.heads())
1244 branches = []
1244 branches = []
1245 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1245 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1246 isactive = not isclosed and bool(set(heads) & allheads)
1246 isactive = not isclosed and bool(set(heads) & allheads)
1247 branches.append((tag, repo[tip], isactive, not isclosed))
1247 branches.append((tag, repo[tip], isactive, not isclosed))
1248 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1248 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1249 reverse=True)
1249 reverse=True)
1250
1250
1251 for tag, ctx, isactive, isopen in branches:
1251 for tag, ctx, isactive, isopen in branches:
1252 if active and not isactive:
1252 if active and not isactive:
1253 continue
1253 continue
1254 if isactive:
1254 if isactive:
1255 label = 'branches.active'
1255 label = 'branches.active'
1256 notice = ''
1256 notice = ''
1257 elif not isopen:
1257 elif not isopen:
1258 if not closed:
1258 if not closed:
1259 continue
1259 continue
1260 label = 'branches.closed'
1260 label = 'branches.closed'
1261 notice = _(' (closed)')
1261 notice = _(' (closed)')
1262 else:
1262 else:
1263 label = 'branches.inactive'
1263 label = 'branches.inactive'
1264 notice = _(' (inactive)')
1264 notice = _(' (inactive)')
1265 current = (tag == repo.dirstate.branch())
1265 current = (tag == repo.dirstate.branch())
1266 if current:
1266 if current:
1267 label = 'branches.current'
1267 label = 'branches.current'
1268
1268
1269 fm.startitem()
1269 fm.startitem()
1270 fm.write('branch', '%s', tag, label=label)
1270 fm.write('branch', '%s', tag, label=label)
1271 rev = ctx.rev()
1271 rev = ctx.rev()
1272 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1272 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1273 fmt = ' ' * padsize + ' %d:%s'
1273 fmt = ' ' * padsize + ' %d:%s'
1274 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1274 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1275 label='log.changeset changeset.%s' % ctx.phasestr())
1275 label='log.changeset changeset.%s' % ctx.phasestr())
1276 fm.data(active=isactive, closed=not isopen, current=current)
1276 fm.data(active=isactive, closed=not isopen, current=current)
1277 if not ui.quiet:
1277 if not ui.quiet:
1278 fm.plain(notice)
1278 fm.plain(notice)
1279 fm.plain('\n')
1279 fm.plain('\n')
1280 fm.end()
1280 fm.end()
1281
1281
1282 @command('bundle',
1282 @command('bundle',
1283 [('f', 'force', None, _('run even when the destination is unrelated')),
1283 [('f', 'force', None, _('run even when the destination is unrelated')),
1284 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1284 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1285 _('REV')),
1285 _('REV')),
1286 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1286 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1287 _('BRANCH')),
1287 _('BRANCH')),
1288 ('', 'base', [],
1288 ('', 'base', [],
1289 _('a base changeset assumed to be available at the destination'),
1289 _('a base changeset assumed to be available at the destination'),
1290 _('REV')),
1290 _('REV')),
1291 ('a', 'all', None, _('bundle all changesets in the repository')),
1291 ('a', 'all', None, _('bundle all changesets in the repository')),
1292 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1292 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1293 ] + remoteopts,
1293 ] + remoteopts,
1294 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1294 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1295 def bundle(ui, repo, fname, dest=None, **opts):
1295 def bundle(ui, repo, fname, dest=None, **opts):
1296 """create a changegroup file
1296 """create a changegroup file
1297
1297
1298 Generate a changegroup file collecting changesets to be added
1298 Generate a changegroup file collecting changesets to be added
1299 to a repository.
1299 to a repository.
1300
1300
1301 To create a bundle containing all changesets, use -a/--all
1301 To create a bundle containing all changesets, use -a/--all
1302 (or --base null). Otherwise, hg assumes the destination will have
1302 (or --base null). Otherwise, hg assumes the destination will have
1303 all the nodes you specify with --base parameters. Otherwise, hg
1303 all the nodes you specify with --base parameters. Otherwise, hg
1304 will assume the repository has all the nodes in destination, or
1304 will assume the repository has all the nodes in destination, or
1305 default-push/default if no destination is specified.
1305 default-push/default if no destination is specified.
1306
1306
1307 You can change bundle format with the -t/--type option. You can
1307 You can change bundle format with the -t/--type option. You can
1308 specify a compression, a bundle version or both using a dash
1308 specify a compression, a bundle version or both using a dash
1309 (comp-version). The available compression methods are: none, bzip2,
1309 (comp-version). The available compression methods are: none, bzip2,
1310 and gzip (by default, bundles are compressed using bzip2). The
1310 and gzip (by default, bundles are compressed using bzip2). The
1311 available formats are: v1, v2 (default to most suitable).
1311 available formats are: v1, v2 (default to most suitable).
1312
1312
1313 The bundle file can then be transferred using conventional means
1313 The bundle file can then be transferred using conventional means
1314 and applied to another repository with the unbundle or pull
1314 and applied to another repository with the unbundle or pull
1315 command. This is useful when direct push and pull are not
1315 command. This is useful when direct push and pull are not
1316 available or when exporting an entire repository is undesirable.
1316 available or when exporting an entire repository is undesirable.
1317
1317
1318 Applying bundles preserves all changeset contents including
1318 Applying bundles preserves all changeset contents including
1319 permissions, copy/rename information, and revision history.
1319 permissions, copy/rename information, and revision history.
1320
1320
1321 Returns 0 on success, 1 if no changes found.
1321 Returns 0 on success, 1 if no changes found.
1322 """
1322 """
1323 revs = None
1323 revs = None
1324 if 'rev' in opts:
1324 if 'rev' in opts:
1325 revstrings = opts['rev']
1325 revstrings = opts['rev']
1326 revs = scmutil.revrange(repo, revstrings)
1326 revs = scmutil.revrange(repo, revstrings)
1327 if revstrings and not revs:
1327 if revstrings and not revs:
1328 raise error.Abort(_('no commits to bundle'))
1328 raise error.Abort(_('no commits to bundle'))
1329
1329
1330 bundletype = opts.get('type', 'bzip2').lower()
1330 bundletype = opts.get('type', 'bzip2').lower()
1331 try:
1331 try:
1332 bcompression, cgversion, params = exchange.parsebundlespec(
1332 bcompression, cgversion, params = exchange.parsebundlespec(
1333 repo, bundletype, strict=False)
1333 repo, bundletype, strict=False)
1334 except error.UnsupportedBundleSpecification as e:
1334 except error.UnsupportedBundleSpecification as e:
1335 raise error.Abort(str(e),
1335 raise error.Abort(str(e),
1336 hint=_("see 'hg help bundle' for supported "
1336 hint=_("see 'hg help bundle' for supported "
1337 "values for --type"))
1337 "values for --type"))
1338
1338
1339 # Packed bundles are a pseudo bundle format for now.
1339 # Packed bundles are a pseudo bundle format for now.
1340 if cgversion == 's1':
1340 if cgversion == 's1':
1341 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1341 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1342 hint=_("use 'hg debugcreatestreamclonebundle'"))
1342 hint=_("use 'hg debugcreatestreamclonebundle'"))
1343
1343
1344 if opts.get('all'):
1344 if opts.get('all'):
1345 if dest:
1345 if dest:
1346 raise error.Abort(_("--all is incompatible with specifying "
1346 raise error.Abort(_("--all is incompatible with specifying "
1347 "a destination"))
1347 "a destination"))
1348 if opts.get('base'):
1348 if opts.get('base'):
1349 ui.warn(_("ignoring --base because --all was specified\n"))
1349 ui.warn(_("ignoring --base because --all was specified\n"))
1350 base = ['null']
1350 base = ['null']
1351 else:
1351 else:
1352 base = scmutil.revrange(repo, opts.get('base'))
1352 base = scmutil.revrange(repo, opts.get('base'))
1353 # TODO: get desired bundlecaps from command line.
1353 # TODO: get desired bundlecaps from command line.
1354 bundlecaps = None
1354 bundlecaps = None
1355 if cgversion not in changegroup.supportedoutgoingversions(repo):
1355 if cgversion not in changegroup.supportedoutgoingversions(repo):
1356 raise error.Abort(_("repository does not support bundle version %s") %
1356 raise error.Abort(_("repository does not support bundle version %s") %
1357 cgversion)
1357 cgversion)
1358
1358
1359 if base:
1359 if base:
1360 if dest:
1360 if dest:
1361 raise error.Abort(_("--base is incompatible with specifying "
1361 raise error.Abort(_("--base is incompatible with specifying "
1362 "a destination"))
1362 "a destination"))
1363 common = [repo.lookup(rev) for rev in base]
1363 common = [repo.lookup(rev) for rev in base]
1364 heads = revs and map(repo.lookup, revs) or None
1364 heads = revs and map(repo.lookup, revs) or None
1365 outgoing = discovery.outgoing(repo, common, heads)
1365 outgoing = discovery.outgoing(repo, common, heads)
1366 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1366 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1367 bundlecaps=bundlecaps,
1367 bundlecaps=bundlecaps,
1368 version=cgversion)
1368 version=cgversion)
1369 outgoing = None
1369 outgoing = None
1370 else:
1370 else:
1371 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1371 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1372 dest, branches = hg.parseurl(dest, opts.get('branch'))
1372 dest, branches = hg.parseurl(dest, opts.get('branch'))
1373 other = hg.peer(repo, opts, dest)
1373 other = hg.peer(repo, opts, dest)
1374 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1374 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1375 heads = revs and map(repo.lookup, revs) or revs
1375 heads = revs and map(repo.lookup, revs) or revs
1376 outgoing = discovery.findcommonoutgoing(repo, other,
1376 outgoing = discovery.findcommonoutgoing(repo, other,
1377 onlyheads=heads,
1377 onlyheads=heads,
1378 force=opts.get('force'),
1378 force=opts.get('force'),
1379 portable=True)
1379 portable=True)
1380 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1380 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1381 bundlecaps, version=cgversion)
1381 bundlecaps, version=cgversion)
1382 if not cg:
1382 if not cg:
1383 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1383 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1384 return 1
1384 return 1
1385
1385
1386 if cgversion == '01': #bundle1
1386 if cgversion == '01': #bundle1
1387 if bcompression is None:
1387 if bcompression is None:
1388 bcompression = 'UN'
1388 bcompression = 'UN'
1389 bversion = 'HG10' + bcompression
1389 bversion = 'HG10' + bcompression
1390 bcompression = None
1390 bcompression = None
1391 else:
1391 else:
1392 assert cgversion == '02'
1392 assert cgversion == '02'
1393 bversion = 'HG20'
1393 bversion = 'HG20'
1394
1394
1395 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression)
1395 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression)
1396
1396
1397 @command('cat',
1397 @command('cat',
1398 [('o', 'output', '',
1398 [('o', 'output', '',
1399 _('print output to file with formatted name'), _('FORMAT')),
1399 _('print output to file with formatted name'), _('FORMAT')),
1400 ('r', 'rev', '', _('print the given revision'), _('REV')),
1400 ('r', 'rev', '', _('print the given revision'), _('REV')),
1401 ('', 'decode', None, _('apply any matching decode filter')),
1401 ('', 'decode', None, _('apply any matching decode filter')),
1402 ] + walkopts,
1402 ] + walkopts,
1403 _('[OPTION]... FILE...'),
1403 _('[OPTION]... FILE...'),
1404 inferrepo=True)
1404 inferrepo=True)
1405 def cat(ui, repo, file1, *pats, **opts):
1405 def cat(ui, repo, file1, *pats, **opts):
1406 """output the current or given revision of files
1406 """output the current or given revision of files
1407
1407
1408 Print the specified files as they were at the given revision. If
1408 Print the specified files as they were at the given revision. If
1409 no revision is given, the parent of the working directory is used.
1409 no revision is given, the parent of the working directory is used.
1410
1410
1411 Output may be to a file, in which case the name of the file is
1411 Output may be to a file, in which case the name of the file is
1412 given using a format string. The formatting rules as follows:
1412 given using a format string. The formatting rules as follows:
1413
1413
1414 :``%%``: literal "%" character
1414 :``%%``: literal "%" character
1415 :``%s``: basename of file being printed
1415 :``%s``: basename of file being printed
1416 :``%d``: dirname of file being printed, or '.' if in repository root
1416 :``%d``: dirname of file being printed, or '.' if in repository root
1417 :``%p``: root-relative path name of file being printed
1417 :``%p``: root-relative path name of file being printed
1418 :``%H``: changeset hash (40 hexadecimal digits)
1418 :``%H``: changeset hash (40 hexadecimal digits)
1419 :``%R``: changeset revision number
1419 :``%R``: changeset revision number
1420 :``%h``: short-form changeset hash (12 hexadecimal digits)
1420 :``%h``: short-form changeset hash (12 hexadecimal digits)
1421 :``%r``: zero-padded changeset revision number
1421 :``%r``: zero-padded changeset revision number
1422 :``%b``: basename of the exporting repository
1422 :``%b``: basename of the exporting repository
1423
1423
1424 Returns 0 on success.
1424 Returns 0 on success.
1425 """
1425 """
1426 ctx = scmutil.revsingle(repo, opts.get('rev'))
1426 ctx = scmutil.revsingle(repo, opts.get('rev'))
1427 m = scmutil.match(ctx, (file1,) + pats, opts)
1427 m = scmutil.match(ctx, (file1,) + pats, opts)
1428
1428
1429 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1429 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1430
1430
1431 @command('^clone',
1431 @command('^clone',
1432 [('U', 'noupdate', None, _('the clone will include an empty working '
1432 [('U', 'noupdate', None, _('the clone will include an empty working '
1433 'directory (only a repository)')),
1433 'directory (only a repository)')),
1434 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1434 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1435 _('REV')),
1435 _('REV')),
1436 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1436 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1437 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1437 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1438 ('', 'pull', None, _('use pull protocol to copy metadata')),
1438 ('', 'pull', None, _('use pull protocol to copy metadata')),
1439 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1439 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1440 ] + remoteopts,
1440 ] + remoteopts,
1441 _('[OPTION]... SOURCE [DEST]'),
1441 _('[OPTION]... SOURCE [DEST]'),
1442 norepo=True)
1442 norepo=True)
1443 def clone(ui, source, dest=None, **opts):
1443 def clone(ui, source, dest=None, **opts):
1444 """make a copy of an existing repository
1444 """make a copy of an existing repository
1445
1445
1446 Create a copy of an existing repository in a new directory.
1446 Create a copy of an existing repository in a new directory.
1447
1447
1448 If no destination directory name is specified, it defaults to the
1448 If no destination directory name is specified, it defaults to the
1449 basename of the source.
1449 basename of the source.
1450
1450
1451 The location of the source is added to the new repository's
1451 The location of the source is added to the new repository's
1452 ``.hg/hgrc`` file, as the default to be used for future pulls.
1452 ``.hg/hgrc`` file, as the default to be used for future pulls.
1453
1453
1454 Only local paths and ``ssh://`` URLs are supported as
1454 Only local paths and ``ssh://`` URLs are supported as
1455 destinations. For ``ssh://`` destinations, no working directory or
1455 destinations. For ``ssh://`` destinations, no working directory or
1456 ``.hg/hgrc`` will be created on the remote side.
1456 ``.hg/hgrc`` will be created on the remote side.
1457
1457
1458 If the source repository has a bookmark called '@' set, that
1458 If the source repository has a bookmark called '@' set, that
1459 revision will be checked out in the new repository by default.
1459 revision will be checked out in the new repository by default.
1460
1460
1461 To check out a particular version, use -u/--update, or
1461 To check out a particular version, use -u/--update, or
1462 -U/--noupdate to create a clone with no working directory.
1462 -U/--noupdate to create a clone with no working directory.
1463
1463
1464 To pull only a subset of changesets, specify one or more revisions
1464 To pull only a subset of changesets, specify one or more revisions
1465 identifiers with -r/--rev or branches with -b/--branch. The
1465 identifiers with -r/--rev or branches with -b/--branch. The
1466 resulting clone will contain only the specified changesets and
1466 resulting clone will contain only the specified changesets and
1467 their ancestors. These options (or 'clone src#rev dest') imply
1467 their ancestors. These options (or 'clone src#rev dest') imply
1468 --pull, even for local source repositories.
1468 --pull, even for local source repositories.
1469
1469
1470 .. note::
1470 .. note::
1471
1471
1472 Specifying a tag will include the tagged changeset but not the
1472 Specifying a tag will include the tagged changeset but not the
1473 changeset containing the tag.
1473 changeset containing the tag.
1474
1474
1475 .. container:: verbose
1475 .. container:: verbose
1476
1476
1477 For efficiency, hardlinks are used for cloning whenever the
1477 For efficiency, hardlinks are used for cloning whenever the
1478 source and destination are on the same filesystem (note this
1478 source and destination are on the same filesystem (note this
1479 applies only to the repository data, not to the working
1479 applies only to the repository data, not to the working
1480 directory). Some filesystems, such as AFS, implement hardlinking
1480 directory). Some filesystems, such as AFS, implement hardlinking
1481 incorrectly, but do not report errors. In these cases, use the
1481 incorrectly, but do not report errors. In these cases, use the
1482 --pull option to avoid hardlinking.
1482 --pull option to avoid hardlinking.
1483
1483
1484 In some cases, you can clone repositories and the working
1484 In some cases, you can clone repositories and the working
1485 directory using full hardlinks with ::
1485 directory using full hardlinks with ::
1486
1486
1487 $ cp -al REPO REPOCLONE
1487 $ cp -al REPO REPOCLONE
1488
1488
1489 This is the fastest way to clone, but it is not always safe. The
1489 This is the fastest way to clone, but it is not always safe. The
1490 operation is not atomic (making sure REPO is not modified during
1490 operation is not atomic (making sure REPO is not modified during
1491 the operation is up to you) and you have to make sure your
1491 the operation is up to you) and you have to make sure your
1492 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1492 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1493 so). Also, this is not compatible with certain extensions that
1493 so). Also, this is not compatible with certain extensions that
1494 place their metadata under the .hg directory, such as mq.
1494 place their metadata under the .hg directory, such as mq.
1495
1495
1496 Mercurial will update the working directory to the first applicable
1496 Mercurial will update the working directory to the first applicable
1497 revision from this list:
1497 revision from this list:
1498
1498
1499 a) null if -U or the source repository has no changesets
1499 a) null if -U or the source repository has no changesets
1500 b) if -u . and the source repository is local, the first parent of
1500 b) if -u . and the source repository is local, the first parent of
1501 the source repository's working directory
1501 the source repository's working directory
1502 c) the changeset specified with -u (if a branch name, this means the
1502 c) the changeset specified with -u (if a branch name, this means the
1503 latest head of that branch)
1503 latest head of that branch)
1504 d) the changeset specified with -r
1504 d) the changeset specified with -r
1505 e) the tipmost head specified with -b
1505 e) the tipmost head specified with -b
1506 f) the tipmost head specified with the url#branch source syntax
1506 f) the tipmost head specified with the url#branch source syntax
1507 g) the revision marked with the '@' bookmark, if present
1507 g) the revision marked with the '@' bookmark, if present
1508 h) the tipmost head of the default branch
1508 h) the tipmost head of the default branch
1509 i) tip
1509 i) tip
1510
1510
1511 When cloning from servers that support it, Mercurial may fetch
1511 When cloning from servers that support it, Mercurial may fetch
1512 pre-generated data from a server-advertised URL. When this is done,
1512 pre-generated data from a server-advertised URL. When this is done,
1513 hooks operating on incoming changesets and changegroups may fire twice,
1513 hooks operating on incoming changesets and changegroups may fire twice,
1514 once for the bundle fetched from the URL and another for any additional
1514 once for the bundle fetched from the URL and another for any additional
1515 data not fetched from this URL. In addition, if an error occurs, the
1515 data not fetched from this URL. In addition, if an error occurs, the
1516 repository may be rolled back to a partial clone. This behavior may
1516 repository may be rolled back to a partial clone. This behavior may
1517 change in future releases. See :hg:`help -e clonebundles` for more.
1517 change in future releases. See :hg:`help -e clonebundles` for more.
1518
1518
1519 Examples:
1519 Examples:
1520
1520
1521 - clone a remote repository to a new directory named hg/::
1521 - clone a remote repository to a new directory named hg/::
1522
1522
1523 hg clone http://selenic.com/hg
1523 hg clone https://www.mercurial-scm.org/repo/hg/
1524
1524
1525 - create a lightweight local clone::
1525 - create a lightweight local clone::
1526
1526
1527 hg clone project/ project-feature/
1527 hg clone project/ project-feature/
1528
1528
1529 - clone from an absolute path on an ssh server (note double-slash)::
1529 - clone from an absolute path on an ssh server (note double-slash)::
1530
1530
1531 hg clone ssh://user@server//home/projects/alpha/
1531 hg clone ssh://user@server//home/projects/alpha/
1532
1532
1533 - do a high-speed clone over a LAN while checking out a
1533 - do a high-speed clone over a LAN while checking out a
1534 specified version::
1534 specified version::
1535
1535
1536 hg clone --uncompressed http://server/repo -u 1.5
1536 hg clone --uncompressed http://server/repo -u 1.5
1537
1537
1538 - create a repository without changesets after a particular revision::
1538 - create a repository without changesets after a particular revision::
1539
1539
1540 hg clone -r 04e544 experimental/ good/
1540 hg clone -r 04e544 experimental/ good/
1541
1541
1542 - clone (and track) a particular named branch::
1542 - clone (and track) a particular named branch::
1543
1543
1544 hg clone http://selenic.com/hg#stable
1544 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1545
1545
1546 See :hg:`help urls` for details on specifying URLs.
1546 See :hg:`help urls` for details on specifying URLs.
1547
1547
1548 Returns 0 on success.
1548 Returns 0 on success.
1549 """
1549 """
1550 if opts.get('noupdate') and opts.get('updaterev'):
1550 if opts.get('noupdate') and opts.get('updaterev'):
1551 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1551 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1552
1552
1553 r = hg.clone(ui, opts, source, dest,
1553 r = hg.clone(ui, opts, source, dest,
1554 pull=opts.get('pull'),
1554 pull=opts.get('pull'),
1555 stream=opts.get('uncompressed'),
1555 stream=opts.get('uncompressed'),
1556 rev=opts.get('rev'),
1556 rev=opts.get('rev'),
1557 update=opts.get('updaterev') or not opts.get('noupdate'),
1557 update=opts.get('updaterev') or not opts.get('noupdate'),
1558 branch=opts.get('branch'),
1558 branch=opts.get('branch'),
1559 shareopts=opts.get('shareopts'))
1559 shareopts=opts.get('shareopts'))
1560
1560
1561 return r is None
1561 return r is None
1562
1562
1563 @command('^commit|ci',
1563 @command('^commit|ci',
1564 [('A', 'addremove', None,
1564 [('A', 'addremove', None,
1565 _('mark new/missing files as added/removed before committing')),
1565 _('mark new/missing files as added/removed before committing')),
1566 ('', 'close-branch', None,
1566 ('', 'close-branch', None,
1567 _('mark a branch head as closed')),
1567 _('mark a branch head as closed')),
1568 ('', 'amend', None, _('amend the parent of the working directory')),
1568 ('', 'amend', None, _('amend the parent of the working directory')),
1569 ('s', 'secret', None, _('use the secret phase for committing')),
1569 ('s', 'secret', None, _('use the secret phase for committing')),
1570 ('e', 'edit', None, _('invoke editor on commit messages')),
1570 ('e', 'edit', None, _('invoke editor on commit messages')),
1571 ('i', 'interactive', None, _('use interactive mode')),
1571 ('i', 'interactive', None, _('use interactive mode')),
1572 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1572 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1573 _('[OPTION]... [FILE]...'),
1573 _('[OPTION]... [FILE]...'),
1574 inferrepo=True)
1574 inferrepo=True)
1575 def commit(ui, repo, *pats, **opts):
1575 def commit(ui, repo, *pats, **opts):
1576 """commit the specified files or all outstanding changes
1576 """commit the specified files or all outstanding changes
1577
1577
1578 Commit changes to the given files into the repository. Unlike a
1578 Commit changes to the given files into the repository. Unlike a
1579 centralized SCM, this operation is a local operation. See
1579 centralized SCM, this operation is a local operation. See
1580 :hg:`push` for a way to actively distribute your changes.
1580 :hg:`push` for a way to actively distribute your changes.
1581
1581
1582 If a list of files is omitted, all changes reported by :hg:`status`
1582 If a list of files is omitted, all changes reported by :hg:`status`
1583 will be committed.
1583 will be committed.
1584
1584
1585 If you are committing the result of a merge, do not provide any
1585 If you are committing the result of a merge, do not provide any
1586 filenames or -I/-X filters.
1586 filenames or -I/-X filters.
1587
1587
1588 If no commit message is specified, Mercurial starts your
1588 If no commit message is specified, Mercurial starts your
1589 configured editor where you can enter a message. In case your
1589 configured editor where you can enter a message. In case your
1590 commit fails, you will find a backup of your message in
1590 commit fails, you will find a backup of your message in
1591 ``.hg/last-message.txt``.
1591 ``.hg/last-message.txt``.
1592
1592
1593 The --close-branch flag can be used to mark the current branch
1593 The --close-branch flag can be used to mark the current branch
1594 head closed. When all heads of a branch are closed, the branch
1594 head closed. When all heads of a branch are closed, the branch
1595 will be considered closed and no longer listed.
1595 will be considered closed and no longer listed.
1596
1596
1597 The --amend flag can be used to amend the parent of the
1597 The --amend flag can be used to amend the parent of the
1598 working directory with a new commit that contains the changes
1598 working directory with a new commit that contains the changes
1599 in the parent in addition to those currently reported by :hg:`status`,
1599 in the parent in addition to those currently reported by :hg:`status`,
1600 if there are any. The old commit is stored in a backup bundle in
1600 if there are any. The old commit is stored in a backup bundle in
1601 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1601 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1602 on how to restore it).
1602 on how to restore it).
1603
1603
1604 Message, user and date are taken from the amended commit unless
1604 Message, user and date are taken from the amended commit unless
1605 specified. When a message isn't specified on the command line,
1605 specified. When a message isn't specified on the command line,
1606 the editor will open with the message of the amended commit.
1606 the editor will open with the message of the amended commit.
1607
1607
1608 It is not possible to amend public changesets (see :hg:`help phases`)
1608 It is not possible to amend public changesets (see :hg:`help phases`)
1609 or changesets that have children.
1609 or changesets that have children.
1610
1610
1611 See :hg:`help dates` for a list of formats valid for -d/--date.
1611 See :hg:`help dates` for a list of formats valid for -d/--date.
1612
1612
1613 Returns 0 on success, 1 if nothing changed.
1613 Returns 0 on success, 1 if nothing changed.
1614
1614
1615 .. container:: verbose
1615 .. container:: verbose
1616
1616
1617 Examples:
1617 Examples:
1618
1618
1619 - commit all files ending in .py::
1619 - commit all files ending in .py::
1620
1620
1621 hg commit --include "set:**.py"
1621 hg commit --include "set:**.py"
1622
1622
1623 - commit all non-binary files::
1623 - commit all non-binary files::
1624
1624
1625 hg commit --exclude "set:binary()"
1625 hg commit --exclude "set:binary()"
1626
1626
1627 - amend the current commit and set the date to now::
1627 - amend the current commit and set the date to now::
1628
1628
1629 hg commit --amend --date now
1629 hg commit --amend --date now
1630 """
1630 """
1631 wlock = lock = None
1631 wlock = lock = None
1632 try:
1632 try:
1633 wlock = repo.wlock()
1633 wlock = repo.wlock()
1634 lock = repo.lock()
1634 lock = repo.lock()
1635 return _docommit(ui, repo, *pats, **opts)
1635 return _docommit(ui, repo, *pats, **opts)
1636 finally:
1636 finally:
1637 release(lock, wlock)
1637 release(lock, wlock)
1638
1638
1639 def _docommit(ui, repo, *pats, **opts):
1639 def _docommit(ui, repo, *pats, **opts):
1640 if opts.get('interactive'):
1640 if opts.get('interactive'):
1641 opts.pop('interactive')
1641 opts.pop('interactive')
1642 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1642 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1643 cmdutil.recordfilter, *pats, **opts)
1643 cmdutil.recordfilter, *pats, **opts)
1644 # ret can be 0 (no changes to record) or the value returned by
1644 # ret can be 0 (no changes to record) or the value returned by
1645 # commit(), 1 if nothing changed or None on success.
1645 # commit(), 1 if nothing changed or None on success.
1646 return 1 if ret == 0 else ret
1646 return 1 if ret == 0 else ret
1647
1647
1648 if opts.get('subrepos'):
1648 if opts.get('subrepos'):
1649 if opts.get('amend'):
1649 if opts.get('amend'):
1650 raise error.Abort(_('cannot amend with --subrepos'))
1650 raise error.Abort(_('cannot amend with --subrepos'))
1651 # Let --subrepos on the command line override config setting.
1651 # Let --subrepos on the command line override config setting.
1652 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1652 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1653
1653
1654 cmdutil.checkunfinished(repo, commit=True)
1654 cmdutil.checkunfinished(repo, commit=True)
1655
1655
1656 branch = repo[None].branch()
1656 branch = repo[None].branch()
1657 bheads = repo.branchheads(branch)
1657 bheads = repo.branchheads(branch)
1658
1658
1659 extra = {}
1659 extra = {}
1660 if opts.get('close_branch'):
1660 if opts.get('close_branch'):
1661 extra['close'] = 1
1661 extra['close'] = 1
1662
1662
1663 if not bheads:
1663 if not bheads:
1664 raise error.Abort(_('can only close branch heads'))
1664 raise error.Abort(_('can only close branch heads'))
1665 elif opts.get('amend'):
1665 elif opts.get('amend'):
1666 if repo[None].parents()[0].p1().branch() != branch and \
1666 if repo[None].parents()[0].p1().branch() != branch and \
1667 repo[None].parents()[0].p2().branch() != branch:
1667 repo[None].parents()[0].p2().branch() != branch:
1668 raise error.Abort(_('can only close branch heads'))
1668 raise error.Abort(_('can only close branch heads'))
1669
1669
1670 if opts.get('amend'):
1670 if opts.get('amend'):
1671 if ui.configbool('ui', 'commitsubrepos'):
1671 if ui.configbool('ui', 'commitsubrepos'):
1672 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1672 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1673
1673
1674 old = repo['.']
1674 old = repo['.']
1675 if not old.mutable():
1675 if not old.mutable():
1676 raise error.Abort(_('cannot amend public changesets'))
1676 raise error.Abort(_('cannot amend public changesets'))
1677 if len(repo[None].parents()) > 1:
1677 if len(repo[None].parents()) > 1:
1678 raise error.Abort(_('cannot amend while merging'))
1678 raise error.Abort(_('cannot amend while merging'))
1679 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1679 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1680 if not allowunstable and old.children():
1680 if not allowunstable and old.children():
1681 raise error.Abort(_('cannot amend changeset with children'))
1681 raise error.Abort(_('cannot amend changeset with children'))
1682
1682
1683 # Currently histedit gets confused if an amend happens while histedit
1683 # Currently histedit gets confused if an amend happens while histedit
1684 # is in progress. Since we have a checkunfinished command, we are
1684 # is in progress. Since we have a checkunfinished command, we are
1685 # temporarily honoring it.
1685 # temporarily honoring it.
1686 #
1686 #
1687 # Note: eventually this guard will be removed. Please do not expect
1687 # Note: eventually this guard will be removed. Please do not expect
1688 # this behavior to remain.
1688 # this behavior to remain.
1689 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1689 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1690 cmdutil.checkunfinished(repo)
1690 cmdutil.checkunfinished(repo)
1691
1691
1692 # commitfunc is used only for temporary amend commit by cmdutil.amend
1692 # commitfunc is used only for temporary amend commit by cmdutil.amend
1693 def commitfunc(ui, repo, message, match, opts):
1693 def commitfunc(ui, repo, message, match, opts):
1694 return repo.commit(message,
1694 return repo.commit(message,
1695 opts.get('user') or old.user(),
1695 opts.get('user') or old.user(),
1696 opts.get('date') or old.date(),
1696 opts.get('date') or old.date(),
1697 match,
1697 match,
1698 extra=extra)
1698 extra=extra)
1699
1699
1700 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1700 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1701 if node == old.node():
1701 if node == old.node():
1702 ui.status(_("nothing changed\n"))
1702 ui.status(_("nothing changed\n"))
1703 return 1
1703 return 1
1704 else:
1704 else:
1705 def commitfunc(ui, repo, message, match, opts):
1705 def commitfunc(ui, repo, message, match, opts):
1706 backup = ui.backupconfig('phases', 'new-commit')
1706 backup = ui.backupconfig('phases', 'new-commit')
1707 baseui = repo.baseui
1707 baseui = repo.baseui
1708 basebackup = baseui.backupconfig('phases', 'new-commit')
1708 basebackup = baseui.backupconfig('phases', 'new-commit')
1709 try:
1709 try:
1710 if opts.get('secret'):
1710 if opts.get('secret'):
1711 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1711 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1712 # Propagate to subrepos
1712 # Propagate to subrepos
1713 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1713 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1714
1714
1715 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1715 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1716 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1716 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1717 return repo.commit(message, opts.get('user'), opts.get('date'),
1717 return repo.commit(message, opts.get('user'), opts.get('date'),
1718 match,
1718 match,
1719 editor=editor,
1719 editor=editor,
1720 extra=extra)
1720 extra=extra)
1721 finally:
1721 finally:
1722 ui.restoreconfig(backup)
1722 ui.restoreconfig(backup)
1723 repo.baseui.restoreconfig(basebackup)
1723 repo.baseui.restoreconfig(basebackup)
1724
1724
1725
1725
1726 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1726 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1727
1727
1728 if not node:
1728 if not node:
1729 stat = cmdutil.postcommitstatus(repo, pats, opts)
1729 stat = cmdutil.postcommitstatus(repo, pats, opts)
1730 if stat[3]:
1730 if stat[3]:
1731 ui.status(_("nothing changed (%d missing files, see "
1731 ui.status(_("nothing changed (%d missing files, see "
1732 "'hg status')\n") % len(stat[3]))
1732 "'hg status')\n") % len(stat[3]))
1733 else:
1733 else:
1734 ui.status(_("nothing changed\n"))
1734 ui.status(_("nothing changed\n"))
1735 return 1
1735 return 1
1736
1736
1737 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1737 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1738
1738
1739 @command('config|showconfig|debugconfig',
1739 @command('config|showconfig|debugconfig',
1740 [('u', 'untrusted', None, _('show untrusted configuration options')),
1740 [('u', 'untrusted', None, _('show untrusted configuration options')),
1741 ('e', 'edit', None, _('edit user config')),
1741 ('e', 'edit', None, _('edit user config')),
1742 ('l', 'local', None, _('edit repository config')),
1742 ('l', 'local', None, _('edit repository config')),
1743 ('g', 'global', None, _('edit global config'))] + formatteropts,
1743 ('g', 'global', None, _('edit global config'))] + formatteropts,
1744 _('[-u] [NAME]...'),
1744 _('[-u] [NAME]...'),
1745 optionalrepo=True)
1745 optionalrepo=True)
1746 def config(ui, repo, *values, **opts):
1746 def config(ui, repo, *values, **opts):
1747 """show combined config settings from all hgrc files
1747 """show combined config settings from all hgrc files
1748
1748
1749 With no arguments, print names and values of all config items.
1749 With no arguments, print names and values of all config items.
1750
1750
1751 With one argument of the form section.name, print just the value
1751 With one argument of the form section.name, print just the value
1752 of that config item.
1752 of that config item.
1753
1753
1754 With multiple arguments, print names and values of all config
1754 With multiple arguments, print names and values of all config
1755 items with matching section names.
1755 items with matching section names.
1756
1756
1757 With --edit, start an editor on the user-level config file. With
1757 With --edit, start an editor on the user-level config file. With
1758 --global, edit the system-wide config file. With --local, edit the
1758 --global, edit the system-wide config file. With --local, edit the
1759 repository-level config file.
1759 repository-level config file.
1760
1760
1761 With --debug, the source (filename and line number) is printed
1761 With --debug, the source (filename and line number) is printed
1762 for each config item.
1762 for each config item.
1763
1763
1764 See :hg:`help config` for more information about config files.
1764 See :hg:`help config` for more information about config files.
1765
1765
1766 Returns 0 on success, 1 if NAME does not exist.
1766 Returns 0 on success, 1 if NAME does not exist.
1767
1767
1768 """
1768 """
1769
1769
1770 if opts.get('edit') or opts.get('local') or opts.get('global'):
1770 if opts.get('edit') or opts.get('local') or opts.get('global'):
1771 if opts.get('local') and opts.get('global'):
1771 if opts.get('local') and opts.get('global'):
1772 raise error.Abort(_("can't use --local and --global together"))
1772 raise error.Abort(_("can't use --local and --global together"))
1773
1773
1774 if opts.get('local'):
1774 if opts.get('local'):
1775 if not repo:
1775 if not repo:
1776 raise error.Abort(_("can't use --local outside a repository"))
1776 raise error.Abort(_("can't use --local outside a repository"))
1777 paths = [repo.join('hgrc')]
1777 paths = [repo.join('hgrc')]
1778 elif opts.get('global'):
1778 elif opts.get('global'):
1779 paths = scmutil.systemrcpath()
1779 paths = scmutil.systemrcpath()
1780 else:
1780 else:
1781 paths = scmutil.userrcpath()
1781 paths = scmutil.userrcpath()
1782
1782
1783 for f in paths:
1783 for f in paths:
1784 if os.path.exists(f):
1784 if os.path.exists(f):
1785 break
1785 break
1786 else:
1786 else:
1787 if opts.get('global'):
1787 if opts.get('global'):
1788 samplehgrc = uimod.samplehgrcs['global']
1788 samplehgrc = uimod.samplehgrcs['global']
1789 elif opts.get('local'):
1789 elif opts.get('local'):
1790 samplehgrc = uimod.samplehgrcs['local']
1790 samplehgrc = uimod.samplehgrcs['local']
1791 else:
1791 else:
1792 samplehgrc = uimod.samplehgrcs['user']
1792 samplehgrc = uimod.samplehgrcs['user']
1793
1793
1794 f = paths[0]
1794 f = paths[0]
1795 fp = open(f, "w")
1795 fp = open(f, "w")
1796 fp.write(samplehgrc)
1796 fp.write(samplehgrc)
1797 fp.close()
1797 fp.close()
1798
1798
1799 editor = ui.geteditor()
1799 editor = ui.geteditor()
1800 ui.system("%s \"%s\"" % (editor, f),
1800 ui.system("%s \"%s\"" % (editor, f),
1801 onerr=error.Abort, errprefix=_("edit failed"))
1801 onerr=error.Abort, errprefix=_("edit failed"))
1802 return
1802 return
1803
1803
1804 fm = ui.formatter('config', opts)
1804 fm = ui.formatter('config', opts)
1805 for f in scmutil.rcpath():
1805 for f in scmutil.rcpath():
1806 ui.debug('read config from: %s\n' % f)
1806 ui.debug('read config from: %s\n' % f)
1807 untrusted = bool(opts.get('untrusted'))
1807 untrusted = bool(opts.get('untrusted'))
1808 if values:
1808 if values:
1809 sections = [v for v in values if '.' not in v]
1809 sections = [v for v in values if '.' not in v]
1810 items = [v for v in values if '.' in v]
1810 items = [v for v in values if '.' in v]
1811 if len(items) > 1 or items and sections:
1811 if len(items) > 1 or items and sections:
1812 raise error.Abort(_('only one config item permitted'))
1812 raise error.Abort(_('only one config item permitted'))
1813 matched = False
1813 matched = False
1814 for section, name, value in ui.walkconfig(untrusted=untrusted):
1814 for section, name, value in ui.walkconfig(untrusted=untrusted):
1815 value = str(value)
1815 value = str(value)
1816 if fm.isplain():
1816 if fm.isplain():
1817 value = value.replace('\n', '\\n')
1817 value = value.replace('\n', '\\n')
1818 entryname = section + '.' + name
1818 entryname = section + '.' + name
1819 if values:
1819 if values:
1820 for v in values:
1820 for v in values:
1821 if v == section:
1821 if v == section:
1822 fm.startitem()
1822 fm.startitem()
1823 fm.condwrite(ui.debugflag, 'source', '%s: ',
1823 fm.condwrite(ui.debugflag, 'source', '%s: ',
1824 ui.configsource(section, name, untrusted))
1824 ui.configsource(section, name, untrusted))
1825 fm.write('name value', '%s=%s\n', entryname, value)
1825 fm.write('name value', '%s=%s\n', entryname, value)
1826 matched = True
1826 matched = True
1827 elif v == entryname:
1827 elif v == entryname:
1828 fm.startitem()
1828 fm.startitem()
1829 fm.condwrite(ui.debugflag, 'source', '%s: ',
1829 fm.condwrite(ui.debugflag, 'source', '%s: ',
1830 ui.configsource(section, name, untrusted))
1830 ui.configsource(section, name, untrusted))
1831 fm.write('value', '%s\n', value)
1831 fm.write('value', '%s\n', value)
1832 fm.data(name=entryname)
1832 fm.data(name=entryname)
1833 matched = True
1833 matched = True
1834 else:
1834 else:
1835 fm.startitem()
1835 fm.startitem()
1836 fm.condwrite(ui.debugflag, 'source', '%s: ',
1836 fm.condwrite(ui.debugflag, 'source', '%s: ',
1837 ui.configsource(section, name, untrusted))
1837 ui.configsource(section, name, untrusted))
1838 fm.write('name value', '%s=%s\n', entryname, value)
1838 fm.write('name value', '%s=%s\n', entryname, value)
1839 matched = True
1839 matched = True
1840 fm.end()
1840 fm.end()
1841 if matched:
1841 if matched:
1842 return 0
1842 return 0
1843 return 1
1843 return 1
1844
1844
1845 @command('copy|cp',
1845 @command('copy|cp',
1846 [('A', 'after', None, _('record a copy that has already occurred')),
1846 [('A', 'after', None, _('record a copy that has already occurred')),
1847 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1847 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1848 ] + walkopts + dryrunopts,
1848 ] + walkopts + dryrunopts,
1849 _('[OPTION]... [SOURCE]... DEST'))
1849 _('[OPTION]... [SOURCE]... DEST'))
1850 def copy(ui, repo, *pats, **opts):
1850 def copy(ui, repo, *pats, **opts):
1851 """mark files as copied for the next commit
1851 """mark files as copied for the next commit
1852
1852
1853 Mark dest as having copies of source files. If dest is a
1853 Mark dest as having copies of source files. If dest is a
1854 directory, copies are put in that directory. If dest is a file,
1854 directory, copies are put in that directory. If dest is a file,
1855 the source must be a single file.
1855 the source must be a single file.
1856
1856
1857 By default, this command copies the contents of files as they
1857 By default, this command copies the contents of files as they
1858 exist in the working directory. If invoked with -A/--after, the
1858 exist in the working directory. If invoked with -A/--after, the
1859 operation is recorded, but no copying is performed.
1859 operation is recorded, but no copying is performed.
1860
1860
1861 This command takes effect with the next commit. To undo a copy
1861 This command takes effect with the next commit. To undo a copy
1862 before that, see :hg:`revert`.
1862 before that, see :hg:`revert`.
1863
1863
1864 Returns 0 on success, 1 if errors are encountered.
1864 Returns 0 on success, 1 if errors are encountered.
1865 """
1865 """
1866 with repo.wlock(False):
1866 with repo.wlock(False):
1867 return cmdutil.copy(ui, repo, pats, opts)
1867 return cmdutil.copy(ui, repo, pats, opts)
1868
1868
1869 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1869 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1870 def debugancestor(ui, repo, *args):
1870 def debugancestor(ui, repo, *args):
1871 """find the ancestor revision of two revisions in a given index"""
1871 """find the ancestor revision of two revisions in a given index"""
1872 if len(args) == 3:
1872 if len(args) == 3:
1873 index, rev1, rev2 = args
1873 index, rev1, rev2 = args
1874 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1874 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1875 lookup = r.lookup
1875 lookup = r.lookup
1876 elif len(args) == 2:
1876 elif len(args) == 2:
1877 if not repo:
1877 if not repo:
1878 raise error.Abort(_("there is no Mercurial repository here "
1878 raise error.Abort(_("there is no Mercurial repository here "
1879 "(.hg not found)"))
1879 "(.hg not found)"))
1880 rev1, rev2 = args
1880 rev1, rev2 = args
1881 r = repo.changelog
1881 r = repo.changelog
1882 lookup = repo.lookup
1882 lookup = repo.lookup
1883 else:
1883 else:
1884 raise error.Abort(_('either two or three arguments required'))
1884 raise error.Abort(_('either two or three arguments required'))
1885 a = r.ancestor(lookup(rev1), lookup(rev2))
1885 a = r.ancestor(lookup(rev1), lookup(rev2))
1886 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1886 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1887
1887
1888 @command('debugbuilddag',
1888 @command('debugbuilddag',
1889 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1889 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1890 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1890 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1891 ('n', 'new-file', None, _('add new file at each rev'))],
1891 ('n', 'new-file', None, _('add new file at each rev'))],
1892 _('[OPTION]... [TEXT]'))
1892 _('[OPTION]... [TEXT]'))
1893 def debugbuilddag(ui, repo, text=None,
1893 def debugbuilddag(ui, repo, text=None,
1894 mergeable_file=False,
1894 mergeable_file=False,
1895 overwritten_file=False,
1895 overwritten_file=False,
1896 new_file=False):
1896 new_file=False):
1897 """builds a repo with a given DAG from scratch in the current empty repo
1897 """builds a repo with a given DAG from scratch in the current empty repo
1898
1898
1899 The description of the DAG is read from stdin if not given on the
1899 The description of the DAG is read from stdin if not given on the
1900 command line.
1900 command line.
1901
1901
1902 Elements:
1902 Elements:
1903
1903
1904 - "+n" is a linear run of n nodes based on the current default parent
1904 - "+n" is a linear run of n nodes based on the current default parent
1905 - "." is a single node based on the current default parent
1905 - "." is a single node based on the current default parent
1906 - "$" resets the default parent to null (implied at the start);
1906 - "$" resets the default parent to null (implied at the start);
1907 otherwise the default parent is always the last node created
1907 otherwise the default parent is always the last node created
1908 - "<p" sets the default parent to the backref p
1908 - "<p" sets the default parent to the backref p
1909 - "*p" is a fork at parent p, which is a backref
1909 - "*p" is a fork at parent p, which is a backref
1910 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1910 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1911 - "/p2" is a merge of the preceding node and p2
1911 - "/p2" is a merge of the preceding node and p2
1912 - ":tag" defines a local tag for the preceding node
1912 - ":tag" defines a local tag for the preceding node
1913 - "@branch" sets the named branch for subsequent nodes
1913 - "@branch" sets the named branch for subsequent nodes
1914 - "#...\\n" is a comment up to the end of the line
1914 - "#...\\n" is a comment up to the end of the line
1915
1915
1916 Whitespace between the above elements is ignored.
1916 Whitespace between the above elements is ignored.
1917
1917
1918 A backref is either
1918 A backref is either
1919
1919
1920 - a number n, which references the node curr-n, where curr is the current
1920 - a number n, which references the node curr-n, where curr is the current
1921 node, or
1921 node, or
1922 - the name of a local tag you placed earlier using ":tag", or
1922 - the name of a local tag you placed earlier using ":tag", or
1923 - empty to denote the default parent.
1923 - empty to denote the default parent.
1924
1924
1925 All string valued-elements are either strictly alphanumeric, or must
1925 All string valued-elements are either strictly alphanumeric, or must
1926 be enclosed in double quotes ("..."), with "\\" as escape character.
1926 be enclosed in double quotes ("..."), with "\\" as escape character.
1927 """
1927 """
1928
1928
1929 if text is None:
1929 if text is None:
1930 ui.status(_("reading DAG from stdin\n"))
1930 ui.status(_("reading DAG from stdin\n"))
1931 text = ui.fin.read()
1931 text = ui.fin.read()
1932
1932
1933 cl = repo.changelog
1933 cl = repo.changelog
1934 if len(cl) > 0:
1934 if len(cl) > 0:
1935 raise error.Abort(_('repository is not empty'))
1935 raise error.Abort(_('repository is not empty'))
1936
1936
1937 # determine number of revs in DAG
1937 # determine number of revs in DAG
1938 total = 0
1938 total = 0
1939 for type, data in dagparser.parsedag(text):
1939 for type, data in dagparser.parsedag(text):
1940 if type == 'n':
1940 if type == 'n':
1941 total += 1
1941 total += 1
1942
1942
1943 if mergeable_file:
1943 if mergeable_file:
1944 linesperrev = 2
1944 linesperrev = 2
1945 # make a file with k lines per rev
1945 # make a file with k lines per rev
1946 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1946 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1947 initialmergedlines.append("")
1947 initialmergedlines.append("")
1948
1948
1949 tags = []
1949 tags = []
1950
1950
1951 wlock = lock = tr = None
1951 wlock = lock = tr = None
1952 try:
1952 try:
1953 wlock = repo.wlock()
1953 wlock = repo.wlock()
1954 lock = repo.lock()
1954 lock = repo.lock()
1955 tr = repo.transaction("builddag")
1955 tr = repo.transaction("builddag")
1956
1956
1957 at = -1
1957 at = -1
1958 atbranch = 'default'
1958 atbranch = 'default'
1959 nodeids = []
1959 nodeids = []
1960 id = 0
1960 id = 0
1961 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1961 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1962 for type, data in dagparser.parsedag(text):
1962 for type, data in dagparser.parsedag(text):
1963 if type == 'n':
1963 if type == 'n':
1964 ui.note(('node %s\n' % str(data)))
1964 ui.note(('node %s\n' % str(data)))
1965 id, ps = data
1965 id, ps = data
1966
1966
1967 files = []
1967 files = []
1968 fctxs = {}
1968 fctxs = {}
1969
1969
1970 p2 = None
1970 p2 = None
1971 if mergeable_file:
1971 if mergeable_file:
1972 fn = "mf"
1972 fn = "mf"
1973 p1 = repo[ps[0]]
1973 p1 = repo[ps[0]]
1974 if len(ps) > 1:
1974 if len(ps) > 1:
1975 p2 = repo[ps[1]]
1975 p2 = repo[ps[1]]
1976 pa = p1.ancestor(p2)
1976 pa = p1.ancestor(p2)
1977 base, local, other = [x[fn].data() for x in (pa, p1,
1977 base, local, other = [x[fn].data() for x in (pa, p1,
1978 p2)]
1978 p2)]
1979 m3 = simplemerge.Merge3Text(base, local, other)
1979 m3 = simplemerge.Merge3Text(base, local, other)
1980 ml = [l.strip() for l in m3.merge_lines()]
1980 ml = [l.strip() for l in m3.merge_lines()]
1981 ml.append("")
1981 ml.append("")
1982 elif at > 0:
1982 elif at > 0:
1983 ml = p1[fn].data().split("\n")
1983 ml = p1[fn].data().split("\n")
1984 else:
1984 else:
1985 ml = initialmergedlines
1985 ml = initialmergedlines
1986 ml[id * linesperrev] += " r%i" % id
1986 ml[id * linesperrev] += " r%i" % id
1987 mergedtext = "\n".join(ml)
1987 mergedtext = "\n".join(ml)
1988 files.append(fn)
1988 files.append(fn)
1989 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
1989 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
1990
1990
1991 if overwritten_file:
1991 if overwritten_file:
1992 fn = "of"
1992 fn = "of"
1993 files.append(fn)
1993 files.append(fn)
1994 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1994 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1995
1995
1996 if new_file:
1996 if new_file:
1997 fn = "nf%i" % id
1997 fn = "nf%i" % id
1998 files.append(fn)
1998 files.append(fn)
1999 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1999 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
2000 if len(ps) > 1:
2000 if len(ps) > 1:
2001 if not p2:
2001 if not p2:
2002 p2 = repo[ps[1]]
2002 p2 = repo[ps[1]]
2003 for fn in p2:
2003 for fn in p2:
2004 if fn.startswith("nf"):
2004 if fn.startswith("nf"):
2005 files.append(fn)
2005 files.append(fn)
2006 fctxs[fn] = p2[fn]
2006 fctxs[fn] = p2[fn]
2007
2007
2008 def fctxfn(repo, cx, path):
2008 def fctxfn(repo, cx, path):
2009 return fctxs.get(path)
2009 return fctxs.get(path)
2010
2010
2011 if len(ps) == 0 or ps[0] < 0:
2011 if len(ps) == 0 or ps[0] < 0:
2012 pars = [None, None]
2012 pars = [None, None]
2013 elif len(ps) == 1:
2013 elif len(ps) == 1:
2014 pars = [nodeids[ps[0]], None]
2014 pars = [nodeids[ps[0]], None]
2015 else:
2015 else:
2016 pars = [nodeids[p] for p in ps]
2016 pars = [nodeids[p] for p in ps]
2017 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
2017 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
2018 date=(id, 0),
2018 date=(id, 0),
2019 user="debugbuilddag",
2019 user="debugbuilddag",
2020 extra={'branch': atbranch})
2020 extra={'branch': atbranch})
2021 nodeid = repo.commitctx(cx)
2021 nodeid = repo.commitctx(cx)
2022 nodeids.append(nodeid)
2022 nodeids.append(nodeid)
2023 at = id
2023 at = id
2024 elif type == 'l':
2024 elif type == 'l':
2025 id, name = data
2025 id, name = data
2026 ui.note(('tag %s\n' % name))
2026 ui.note(('tag %s\n' % name))
2027 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
2027 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
2028 elif type == 'a':
2028 elif type == 'a':
2029 ui.note(('branch %s\n' % data))
2029 ui.note(('branch %s\n' % data))
2030 atbranch = data
2030 atbranch = data
2031 ui.progress(_('building'), id, unit=_('revisions'), total=total)
2031 ui.progress(_('building'), id, unit=_('revisions'), total=total)
2032 tr.close()
2032 tr.close()
2033
2033
2034 if tags:
2034 if tags:
2035 repo.vfs.write("localtags", "".join(tags))
2035 repo.vfs.write("localtags", "".join(tags))
2036 finally:
2036 finally:
2037 ui.progress(_('building'), None)
2037 ui.progress(_('building'), None)
2038 release(tr, lock, wlock)
2038 release(tr, lock, wlock)
2039
2039
2040 @command('debugbundle',
2040 @command('debugbundle',
2041 [('a', 'all', None, _('show all details')),
2041 [('a', 'all', None, _('show all details')),
2042 ('', 'spec', None, _('print the bundlespec of the bundle'))],
2042 ('', 'spec', None, _('print the bundlespec of the bundle'))],
2043 _('FILE'),
2043 _('FILE'),
2044 norepo=True)
2044 norepo=True)
2045 def debugbundle(ui, bundlepath, all=None, spec=None, **opts):
2045 def debugbundle(ui, bundlepath, all=None, spec=None, **opts):
2046 """lists the contents of a bundle"""
2046 """lists the contents of a bundle"""
2047 with hg.openpath(ui, bundlepath) as f:
2047 with hg.openpath(ui, bundlepath) as f:
2048 if spec:
2048 if spec:
2049 spec = exchange.getbundlespec(ui, f)
2049 spec = exchange.getbundlespec(ui, f)
2050 ui.write('%s\n' % spec)
2050 ui.write('%s\n' % spec)
2051 return
2051 return
2052
2052
2053 gen = exchange.readbundle(ui, f, bundlepath)
2053 gen = exchange.readbundle(ui, f, bundlepath)
2054 if isinstance(gen, bundle2.unbundle20):
2054 if isinstance(gen, bundle2.unbundle20):
2055 return _debugbundle2(ui, gen, all=all, **opts)
2055 return _debugbundle2(ui, gen, all=all, **opts)
2056 _debugchangegroup(ui, gen, all=all, **opts)
2056 _debugchangegroup(ui, gen, all=all, **opts)
2057
2057
2058 def _debugchangegroup(ui, gen, all=None, indent=0, **opts):
2058 def _debugchangegroup(ui, gen, all=None, indent=0, **opts):
2059 indent_string = ' ' * indent
2059 indent_string = ' ' * indent
2060 if all:
2060 if all:
2061 ui.write(("%sformat: id, p1, p2, cset, delta base, len(delta)\n")
2061 ui.write(("%sformat: id, p1, p2, cset, delta base, len(delta)\n")
2062 % indent_string)
2062 % indent_string)
2063
2063
2064 def showchunks(named):
2064 def showchunks(named):
2065 ui.write("\n%s%s\n" % (indent_string, named))
2065 ui.write("\n%s%s\n" % (indent_string, named))
2066 chain = None
2066 chain = None
2067 for chunkdata in iter(lambda: gen.deltachunk(chain), {}):
2067 for chunkdata in iter(lambda: gen.deltachunk(chain), {}):
2068 node = chunkdata['node']
2068 node = chunkdata['node']
2069 p1 = chunkdata['p1']
2069 p1 = chunkdata['p1']
2070 p2 = chunkdata['p2']
2070 p2 = chunkdata['p2']
2071 cs = chunkdata['cs']
2071 cs = chunkdata['cs']
2072 deltabase = chunkdata['deltabase']
2072 deltabase = chunkdata['deltabase']
2073 delta = chunkdata['delta']
2073 delta = chunkdata['delta']
2074 ui.write("%s%s %s %s %s %s %s\n" %
2074 ui.write("%s%s %s %s %s %s %s\n" %
2075 (indent_string, hex(node), hex(p1), hex(p2),
2075 (indent_string, hex(node), hex(p1), hex(p2),
2076 hex(cs), hex(deltabase), len(delta)))
2076 hex(cs), hex(deltabase), len(delta)))
2077 chain = node
2077 chain = node
2078
2078
2079 chunkdata = gen.changelogheader()
2079 chunkdata = gen.changelogheader()
2080 showchunks("changelog")
2080 showchunks("changelog")
2081 chunkdata = gen.manifestheader()
2081 chunkdata = gen.manifestheader()
2082 showchunks("manifest")
2082 showchunks("manifest")
2083 for chunkdata in iter(gen.filelogheader, {}):
2083 for chunkdata in iter(gen.filelogheader, {}):
2084 fname = chunkdata['filename']
2084 fname = chunkdata['filename']
2085 showchunks(fname)
2085 showchunks(fname)
2086 else:
2086 else:
2087 if isinstance(gen, bundle2.unbundle20):
2087 if isinstance(gen, bundle2.unbundle20):
2088 raise error.Abort(_('use debugbundle2 for this file'))
2088 raise error.Abort(_('use debugbundle2 for this file'))
2089 chunkdata = gen.changelogheader()
2089 chunkdata = gen.changelogheader()
2090 chain = None
2090 chain = None
2091 for chunkdata in iter(lambda: gen.deltachunk(chain), {}):
2091 for chunkdata in iter(lambda: gen.deltachunk(chain), {}):
2092 node = chunkdata['node']
2092 node = chunkdata['node']
2093 ui.write("%s%s\n" % (indent_string, hex(node)))
2093 ui.write("%s%s\n" % (indent_string, hex(node)))
2094 chain = node
2094 chain = node
2095
2095
2096 def _debugbundle2(ui, gen, all=None, **opts):
2096 def _debugbundle2(ui, gen, all=None, **opts):
2097 """lists the contents of a bundle2"""
2097 """lists the contents of a bundle2"""
2098 if not isinstance(gen, bundle2.unbundle20):
2098 if not isinstance(gen, bundle2.unbundle20):
2099 raise error.Abort(_('not a bundle2 file'))
2099 raise error.Abort(_('not a bundle2 file'))
2100 ui.write(('Stream params: %s\n' % repr(gen.params)))
2100 ui.write(('Stream params: %s\n' % repr(gen.params)))
2101 for part in gen.iterparts():
2101 for part in gen.iterparts():
2102 ui.write('%s -- %r\n' % (part.type, repr(part.params)))
2102 ui.write('%s -- %r\n' % (part.type, repr(part.params)))
2103 if part.type == 'changegroup':
2103 if part.type == 'changegroup':
2104 version = part.params.get('version', '01')
2104 version = part.params.get('version', '01')
2105 cg = changegroup.getunbundler(version, part, 'UN')
2105 cg = changegroup.getunbundler(version, part, 'UN')
2106 _debugchangegroup(ui, cg, all=all, indent=4, **opts)
2106 _debugchangegroup(ui, cg, all=all, indent=4, **opts)
2107
2107
2108 @command('debugcreatestreamclonebundle', [], 'FILE')
2108 @command('debugcreatestreamclonebundle', [], 'FILE')
2109 def debugcreatestreamclonebundle(ui, repo, fname):
2109 def debugcreatestreamclonebundle(ui, repo, fname):
2110 """create a stream clone bundle file
2110 """create a stream clone bundle file
2111
2111
2112 Stream bundles are special bundles that are essentially archives of
2112 Stream bundles are special bundles that are essentially archives of
2113 revlog files. They are commonly used for cloning very quickly.
2113 revlog files. They are commonly used for cloning very quickly.
2114 """
2114 """
2115 requirements, gen = streamclone.generatebundlev1(repo)
2115 requirements, gen = streamclone.generatebundlev1(repo)
2116 changegroup.writechunks(ui, gen, fname)
2116 changegroup.writechunks(ui, gen, fname)
2117
2117
2118 ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements)))
2118 ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements)))
2119
2119
2120 @command('debugapplystreamclonebundle', [], 'FILE')
2120 @command('debugapplystreamclonebundle', [], 'FILE')
2121 def debugapplystreamclonebundle(ui, repo, fname):
2121 def debugapplystreamclonebundle(ui, repo, fname):
2122 """apply a stream clone bundle file"""
2122 """apply a stream clone bundle file"""
2123 f = hg.openpath(ui, fname)
2123 f = hg.openpath(ui, fname)
2124 gen = exchange.readbundle(ui, f, fname)
2124 gen = exchange.readbundle(ui, f, fname)
2125 gen.apply(repo)
2125 gen.apply(repo)
2126
2126
2127 @command('debugcheckstate', [], '')
2127 @command('debugcheckstate', [], '')
2128 def debugcheckstate(ui, repo):
2128 def debugcheckstate(ui, repo):
2129 """validate the correctness of the current dirstate"""
2129 """validate the correctness of the current dirstate"""
2130 parent1, parent2 = repo.dirstate.parents()
2130 parent1, parent2 = repo.dirstate.parents()
2131 m1 = repo[parent1].manifest()
2131 m1 = repo[parent1].manifest()
2132 m2 = repo[parent2].manifest()
2132 m2 = repo[parent2].manifest()
2133 errors = 0
2133 errors = 0
2134 for f in repo.dirstate:
2134 for f in repo.dirstate:
2135 state = repo.dirstate[f]
2135 state = repo.dirstate[f]
2136 if state in "nr" and f not in m1:
2136 if state in "nr" and f not in m1:
2137 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
2137 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
2138 errors += 1
2138 errors += 1
2139 if state in "a" and f in m1:
2139 if state in "a" and f in m1:
2140 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
2140 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
2141 errors += 1
2141 errors += 1
2142 if state in "m" and f not in m1 and f not in m2:
2142 if state in "m" and f not in m1 and f not in m2:
2143 ui.warn(_("%s in state %s, but not in either manifest\n") %
2143 ui.warn(_("%s in state %s, but not in either manifest\n") %
2144 (f, state))
2144 (f, state))
2145 errors += 1
2145 errors += 1
2146 for f in m1:
2146 for f in m1:
2147 state = repo.dirstate[f]
2147 state = repo.dirstate[f]
2148 if state not in "nrm":
2148 if state not in "nrm":
2149 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
2149 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
2150 errors += 1
2150 errors += 1
2151 if errors:
2151 if errors:
2152 error = _(".hg/dirstate inconsistent with current parent's manifest")
2152 error = _(".hg/dirstate inconsistent with current parent's manifest")
2153 raise error.Abort(error)
2153 raise error.Abort(error)
2154
2154
2155 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
2155 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
2156 def debugcommands(ui, cmd='', *args):
2156 def debugcommands(ui, cmd='', *args):
2157 """list all available commands and options"""
2157 """list all available commands and options"""
2158 for cmd, vals in sorted(table.iteritems()):
2158 for cmd, vals in sorted(table.iteritems()):
2159 cmd = cmd.split('|')[0].strip('^')
2159 cmd = cmd.split('|')[0].strip('^')
2160 opts = ', '.join([i[1] for i in vals[1]])
2160 opts = ', '.join([i[1] for i in vals[1]])
2161 ui.write('%s: %s\n' % (cmd, opts))
2161 ui.write('%s: %s\n' % (cmd, opts))
2162
2162
2163 @command('debugcomplete',
2163 @command('debugcomplete',
2164 [('o', 'options', None, _('show the command options'))],
2164 [('o', 'options', None, _('show the command options'))],
2165 _('[-o] CMD'),
2165 _('[-o] CMD'),
2166 norepo=True)
2166 norepo=True)
2167 def debugcomplete(ui, cmd='', **opts):
2167 def debugcomplete(ui, cmd='', **opts):
2168 """returns the completion list associated with the given command"""
2168 """returns the completion list associated with the given command"""
2169
2169
2170 if opts.get('options'):
2170 if opts.get('options'):
2171 options = []
2171 options = []
2172 otables = [globalopts]
2172 otables = [globalopts]
2173 if cmd:
2173 if cmd:
2174 aliases, entry = cmdutil.findcmd(cmd, table, False)
2174 aliases, entry = cmdutil.findcmd(cmd, table, False)
2175 otables.append(entry[1])
2175 otables.append(entry[1])
2176 for t in otables:
2176 for t in otables:
2177 for o in t:
2177 for o in t:
2178 if "(DEPRECATED)" in o[3]:
2178 if "(DEPRECATED)" in o[3]:
2179 continue
2179 continue
2180 if o[0]:
2180 if o[0]:
2181 options.append('-%s' % o[0])
2181 options.append('-%s' % o[0])
2182 options.append('--%s' % o[1])
2182 options.append('--%s' % o[1])
2183 ui.write("%s\n" % "\n".join(options))
2183 ui.write("%s\n" % "\n".join(options))
2184 return
2184 return
2185
2185
2186 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2186 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2187 if ui.verbose:
2187 if ui.verbose:
2188 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
2188 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
2189 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
2189 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
2190
2190
2191 @command('debugdag',
2191 @command('debugdag',
2192 [('t', 'tags', None, _('use tags as labels')),
2192 [('t', 'tags', None, _('use tags as labels')),
2193 ('b', 'branches', None, _('annotate with branch names')),
2193 ('b', 'branches', None, _('annotate with branch names')),
2194 ('', 'dots', None, _('use dots for runs')),
2194 ('', 'dots', None, _('use dots for runs')),
2195 ('s', 'spaces', None, _('separate elements by spaces'))],
2195 ('s', 'spaces', None, _('separate elements by spaces'))],
2196 _('[OPTION]... [FILE [REV]...]'),
2196 _('[OPTION]... [FILE [REV]...]'),
2197 optionalrepo=True)
2197 optionalrepo=True)
2198 def debugdag(ui, repo, file_=None, *revs, **opts):
2198 def debugdag(ui, repo, file_=None, *revs, **opts):
2199 """format the changelog or an index DAG as a concise textual description
2199 """format the changelog or an index DAG as a concise textual description
2200
2200
2201 If you pass a revlog index, the revlog's DAG is emitted. If you list
2201 If you pass a revlog index, the revlog's DAG is emitted. If you list
2202 revision numbers, they get labeled in the output as rN.
2202 revision numbers, they get labeled in the output as rN.
2203
2203
2204 Otherwise, the changelog DAG of the current repo is emitted.
2204 Otherwise, the changelog DAG of the current repo is emitted.
2205 """
2205 """
2206 spaces = opts.get('spaces')
2206 spaces = opts.get('spaces')
2207 dots = opts.get('dots')
2207 dots = opts.get('dots')
2208 if file_:
2208 if file_:
2209 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2209 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2210 revs = set((int(r) for r in revs))
2210 revs = set((int(r) for r in revs))
2211 def events():
2211 def events():
2212 for r in rlog:
2212 for r in rlog:
2213 yield 'n', (r, list(p for p in rlog.parentrevs(r)
2213 yield 'n', (r, list(p for p in rlog.parentrevs(r)
2214 if p != -1))
2214 if p != -1))
2215 if r in revs:
2215 if r in revs:
2216 yield 'l', (r, "r%i" % r)
2216 yield 'l', (r, "r%i" % r)
2217 elif repo:
2217 elif repo:
2218 cl = repo.changelog
2218 cl = repo.changelog
2219 tags = opts.get('tags')
2219 tags = opts.get('tags')
2220 branches = opts.get('branches')
2220 branches = opts.get('branches')
2221 if tags:
2221 if tags:
2222 labels = {}
2222 labels = {}
2223 for l, n in repo.tags().items():
2223 for l, n in repo.tags().items():
2224 labels.setdefault(cl.rev(n), []).append(l)
2224 labels.setdefault(cl.rev(n), []).append(l)
2225 def events():
2225 def events():
2226 b = "default"
2226 b = "default"
2227 for r in cl:
2227 for r in cl:
2228 if branches:
2228 if branches:
2229 newb = cl.read(cl.node(r))[5]['branch']
2229 newb = cl.read(cl.node(r))[5]['branch']
2230 if newb != b:
2230 if newb != b:
2231 yield 'a', newb
2231 yield 'a', newb
2232 b = newb
2232 b = newb
2233 yield 'n', (r, list(p for p in cl.parentrevs(r)
2233 yield 'n', (r, list(p for p in cl.parentrevs(r)
2234 if p != -1))
2234 if p != -1))
2235 if tags:
2235 if tags:
2236 ls = labels.get(r)
2236 ls = labels.get(r)
2237 if ls:
2237 if ls:
2238 for l in ls:
2238 for l in ls:
2239 yield 'l', (r, l)
2239 yield 'l', (r, l)
2240 else:
2240 else:
2241 raise error.Abort(_('need repo for changelog dag'))
2241 raise error.Abort(_('need repo for changelog dag'))
2242
2242
2243 for line in dagparser.dagtextlines(events(),
2243 for line in dagparser.dagtextlines(events(),
2244 addspaces=spaces,
2244 addspaces=spaces,
2245 wraplabels=True,
2245 wraplabels=True,
2246 wrapannotations=True,
2246 wrapannotations=True,
2247 wrapnonlinear=dots,
2247 wrapnonlinear=dots,
2248 usedots=dots,
2248 usedots=dots,
2249 maxlinewidth=70):
2249 maxlinewidth=70):
2250 ui.write(line)
2250 ui.write(line)
2251 ui.write("\n")
2251 ui.write("\n")
2252
2252
2253 @command('debugdata', debugrevlogopts, _('-c|-m|FILE REV'))
2253 @command('debugdata', debugrevlogopts, _('-c|-m|FILE REV'))
2254 def debugdata(ui, repo, file_, rev=None, **opts):
2254 def debugdata(ui, repo, file_, rev=None, **opts):
2255 """dump the contents of a data file revision"""
2255 """dump the contents of a data file revision"""
2256 if opts.get('changelog') or opts.get('manifest') or opts.get('dir'):
2256 if opts.get('changelog') or opts.get('manifest') or opts.get('dir'):
2257 if rev is not None:
2257 if rev is not None:
2258 raise error.CommandError('debugdata', _('invalid arguments'))
2258 raise error.CommandError('debugdata', _('invalid arguments'))
2259 file_, rev = None, file_
2259 file_, rev = None, file_
2260 elif rev is None:
2260 elif rev is None:
2261 raise error.CommandError('debugdata', _('invalid arguments'))
2261 raise error.CommandError('debugdata', _('invalid arguments'))
2262 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
2262 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
2263 try:
2263 try:
2264 ui.write(r.revision(r.lookup(rev)))
2264 ui.write(r.revision(r.lookup(rev)))
2265 except KeyError:
2265 except KeyError:
2266 raise error.Abort(_('invalid revision identifier %s') % rev)
2266 raise error.Abort(_('invalid revision identifier %s') % rev)
2267
2267
2268 @command('debugdate',
2268 @command('debugdate',
2269 [('e', 'extended', None, _('try extended date formats'))],
2269 [('e', 'extended', None, _('try extended date formats'))],
2270 _('[-e] DATE [RANGE]'),
2270 _('[-e] DATE [RANGE]'),
2271 norepo=True, optionalrepo=True)
2271 norepo=True, optionalrepo=True)
2272 def debugdate(ui, date, range=None, **opts):
2272 def debugdate(ui, date, range=None, **opts):
2273 """parse and display a date"""
2273 """parse and display a date"""
2274 if opts["extended"]:
2274 if opts["extended"]:
2275 d = util.parsedate(date, util.extendeddateformats)
2275 d = util.parsedate(date, util.extendeddateformats)
2276 else:
2276 else:
2277 d = util.parsedate(date)
2277 d = util.parsedate(date)
2278 ui.write(("internal: %s %s\n") % d)
2278 ui.write(("internal: %s %s\n") % d)
2279 ui.write(("standard: %s\n") % util.datestr(d))
2279 ui.write(("standard: %s\n") % util.datestr(d))
2280 if range:
2280 if range:
2281 m = util.matchdate(range)
2281 m = util.matchdate(range)
2282 ui.write(("match: %s\n") % m(d[0]))
2282 ui.write(("match: %s\n") % m(d[0]))
2283
2283
2284 @command('debugdiscovery',
2284 @command('debugdiscovery',
2285 [('', 'old', None, _('use old-style discovery')),
2285 [('', 'old', None, _('use old-style discovery')),
2286 ('', 'nonheads', None,
2286 ('', 'nonheads', None,
2287 _('use old-style discovery with non-heads included')),
2287 _('use old-style discovery with non-heads included')),
2288 ] + remoteopts,
2288 ] + remoteopts,
2289 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2289 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2290 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2290 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2291 """runs the changeset discovery protocol in isolation"""
2291 """runs the changeset discovery protocol in isolation"""
2292 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2292 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2293 opts.get('branch'))
2293 opts.get('branch'))
2294 remote = hg.peer(repo, opts, remoteurl)
2294 remote = hg.peer(repo, opts, remoteurl)
2295 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2295 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2296
2296
2297 # make sure tests are repeatable
2297 # make sure tests are repeatable
2298 random.seed(12323)
2298 random.seed(12323)
2299
2299
2300 def doit(localheads, remoteheads, remote=remote):
2300 def doit(localheads, remoteheads, remote=remote):
2301 if opts.get('old'):
2301 if opts.get('old'):
2302 if localheads:
2302 if localheads:
2303 raise error.Abort('cannot use localheads with old style '
2303 raise error.Abort('cannot use localheads with old style '
2304 'discovery')
2304 'discovery')
2305 if not util.safehasattr(remote, 'branches'):
2305 if not util.safehasattr(remote, 'branches'):
2306 # enable in-client legacy support
2306 # enable in-client legacy support
2307 remote = localrepo.locallegacypeer(remote.local())
2307 remote = localrepo.locallegacypeer(remote.local())
2308 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2308 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2309 force=True)
2309 force=True)
2310 common = set(common)
2310 common = set(common)
2311 if not opts.get('nonheads'):
2311 if not opts.get('nonheads'):
2312 ui.write(("unpruned common: %s\n") %
2312 ui.write(("unpruned common: %s\n") %
2313 " ".join(sorted(short(n) for n in common)))
2313 " ".join(sorted(short(n) for n in common)))
2314 dag = dagutil.revlogdag(repo.changelog)
2314 dag = dagutil.revlogdag(repo.changelog)
2315 all = dag.ancestorset(dag.internalizeall(common))
2315 all = dag.ancestorset(dag.internalizeall(common))
2316 common = dag.externalizeall(dag.headsetofconnecteds(all))
2316 common = dag.externalizeall(dag.headsetofconnecteds(all))
2317 else:
2317 else:
2318 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2318 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2319 common = set(common)
2319 common = set(common)
2320 rheads = set(hds)
2320 rheads = set(hds)
2321 lheads = set(repo.heads())
2321 lheads = set(repo.heads())
2322 ui.write(("common heads: %s\n") %
2322 ui.write(("common heads: %s\n") %
2323 " ".join(sorted(short(n) for n in common)))
2323 " ".join(sorted(short(n) for n in common)))
2324 if lheads <= common:
2324 if lheads <= common:
2325 ui.write(("local is subset\n"))
2325 ui.write(("local is subset\n"))
2326 elif rheads <= common:
2326 elif rheads <= common:
2327 ui.write(("remote is subset\n"))
2327 ui.write(("remote is subset\n"))
2328
2328
2329 serverlogs = opts.get('serverlog')
2329 serverlogs = opts.get('serverlog')
2330 if serverlogs:
2330 if serverlogs:
2331 for filename in serverlogs:
2331 for filename in serverlogs:
2332 with open(filename, 'r') as logfile:
2332 with open(filename, 'r') as logfile:
2333 line = logfile.readline()
2333 line = logfile.readline()
2334 while line:
2334 while line:
2335 parts = line.strip().split(';')
2335 parts = line.strip().split(';')
2336 op = parts[1]
2336 op = parts[1]
2337 if op == 'cg':
2337 if op == 'cg':
2338 pass
2338 pass
2339 elif op == 'cgss':
2339 elif op == 'cgss':
2340 doit(parts[2].split(' '), parts[3].split(' '))
2340 doit(parts[2].split(' '), parts[3].split(' '))
2341 elif op == 'unb':
2341 elif op == 'unb':
2342 doit(parts[3].split(' '), parts[2].split(' '))
2342 doit(parts[3].split(' '), parts[2].split(' '))
2343 line = logfile.readline()
2343 line = logfile.readline()
2344 else:
2344 else:
2345 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2345 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2346 opts.get('remote_head'))
2346 opts.get('remote_head'))
2347 localrevs = opts.get('local_head')
2347 localrevs = opts.get('local_head')
2348 doit(localrevs, remoterevs)
2348 doit(localrevs, remoterevs)
2349
2349
2350 @command('debugextensions', formatteropts, [], norepo=True)
2350 @command('debugextensions', formatteropts, [], norepo=True)
2351 def debugextensions(ui, **opts):
2351 def debugextensions(ui, **opts):
2352 '''show information about active extensions'''
2352 '''show information about active extensions'''
2353 exts = extensions.extensions(ui)
2353 exts = extensions.extensions(ui)
2354 hgver = util.version()
2354 hgver = util.version()
2355 fm = ui.formatter('debugextensions', opts)
2355 fm = ui.formatter('debugextensions', opts)
2356 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
2356 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
2357 isinternal = extensions.ismoduleinternal(extmod)
2357 isinternal = extensions.ismoduleinternal(extmod)
2358 extsource = extmod.__file__
2358 extsource = extmod.__file__
2359 if isinternal:
2359 if isinternal:
2360 exttestedwith = [] # never expose magic string to users
2360 exttestedwith = [] # never expose magic string to users
2361 else:
2361 else:
2362 exttestedwith = getattr(extmod, 'testedwith', '').split()
2362 exttestedwith = getattr(extmod, 'testedwith', '').split()
2363 extbuglink = getattr(extmod, 'buglink', None)
2363 extbuglink = getattr(extmod, 'buglink', None)
2364
2364
2365 fm.startitem()
2365 fm.startitem()
2366
2366
2367 if ui.quiet or ui.verbose:
2367 if ui.quiet or ui.verbose:
2368 fm.write('name', '%s\n', extname)
2368 fm.write('name', '%s\n', extname)
2369 else:
2369 else:
2370 fm.write('name', '%s', extname)
2370 fm.write('name', '%s', extname)
2371 if isinternal or hgver in exttestedwith:
2371 if isinternal or hgver in exttestedwith:
2372 fm.plain('\n')
2372 fm.plain('\n')
2373 elif not exttestedwith:
2373 elif not exttestedwith:
2374 fm.plain(_(' (untested!)\n'))
2374 fm.plain(_(' (untested!)\n'))
2375 else:
2375 else:
2376 lasttestedversion = exttestedwith[-1]
2376 lasttestedversion = exttestedwith[-1]
2377 fm.plain(' (%s!)\n' % lasttestedversion)
2377 fm.plain(' (%s!)\n' % lasttestedversion)
2378
2378
2379 fm.condwrite(ui.verbose and extsource, 'source',
2379 fm.condwrite(ui.verbose and extsource, 'source',
2380 _(' location: %s\n'), extsource or "")
2380 _(' location: %s\n'), extsource or "")
2381
2381
2382 if ui.verbose:
2382 if ui.verbose:
2383 fm.plain(_(' bundled: %s\n') % ['no', 'yes'][isinternal])
2383 fm.plain(_(' bundled: %s\n') % ['no', 'yes'][isinternal])
2384 fm.data(bundled=isinternal)
2384 fm.data(bundled=isinternal)
2385
2385
2386 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
2386 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
2387 _(' tested with: %s\n'),
2387 _(' tested with: %s\n'),
2388 fm.formatlist(exttestedwith, name='ver'))
2388 fm.formatlist(exttestedwith, name='ver'))
2389
2389
2390 fm.condwrite(ui.verbose and extbuglink, 'buglink',
2390 fm.condwrite(ui.verbose and extbuglink, 'buglink',
2391 _(' bug reporting: %s\n'), extbuglink or "")
2391 _(' bug reporting: %s\n'), extbuglink or "")
2392
2392
2393 fm.end()
2393 fm.end()
2394
2394
2395 @command('debugfileset',
2395 @command('debugfileset',
2396 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2396 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2397 _('[-r REV] FILESPEC'))
2397 _('[-r REV] FILESPEC'))
2398 def debugfileset(ui, repo, expr, **opts):
2398 def debugfileset(ui, repo, expr, **opts):
2399 '''parse and apply a fileset specification'''
2399 '''parse and apply a fileset specification'''
2400 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2400 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2401 if ui.verbose:
2401 if ui.verbose:
2402 tree = fileset.parse(expr)
2402 tree = fileset.parse(expr)
2403 ui.note(fileset.prettyformat(tree), "\n")
2403 ui.note(fileset.prettyformat(tree), "\n")
2404
2404
2405 for f in ctx.getfileset(expr):
2405 for f in ctx.getfileset(expr):
2406 ui.write("%s\n" % f)
2406 ui.write("%s\n" % f)
2407
2407
2408 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2408 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2409 def debugfsinfo(ui, path="."):
2409 def debugfsinfo(ui, path="."):
2410 """show information detected about current filesystem"""
2410 """show information detected about current filesystem"""
2411 util.writefile('.debugfsinfo', '')
2411 util.writefile('.debugfsinfo', '')
2412 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2412 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2413 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2413 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2414 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2414 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2415 ui.write(('case-sensitive: %s\n') % (util.fscasesensitive('.debugfsinfo')
2415 ui.write(('case-sensitive: %s\n') % (util.fscasesensitive('.debugfsinfo')
2416 and 'yes' or 'no'))
2416 and 'yes' or 'no'))
2417 os.unlink('.debugfsinfo')
2417 os.unlink('.debugfsinfo')
2418
2418
2419 @command('debuggetbundle',
2419 @command('debuggetbundle',
2420 [('H', 'head', [], _('id of head node'), _('ID')),
2420 [('H', 'head', [], _('id of head node'), _('ID')),
2421 ('C', 'common', [], _('id of common node'), _('ID')),
2421 ('C', 'common', [], _('id of common node'), _('ID')),
2422 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2422 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2423 _('REPO FILE [-H|-C ID]...'),
2423 _('REPO FILE [-H|-C ID]...'),
2424 norepo=True)
2424 norepo=True)
2425 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2425 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2426 """retrieves a bundle from a repo
2426 """retrieves a bundle from a repo
2427
2427
2428 Every ID must be a full-length hex node id string. Saves the bundle to the
2428 Every ID must be a full-length hex node id string. Saves the bundle to the
2429 given file.
2429 given file.
2430 """
2430 """
2431 repo = hg.peer(ui, opts, repopath)
2431 repo = hg.peer(ui, opts, repopath)
2432 if not repo.capable('getbundle'):
2432 if not repo.capable('getbundle'):
2433 raise error.Abort("getbundle() not supported by target repository")
2433 raise error.Abort("getbundle() not supported by target repository")
2434 args = {}
2434 args = {}
2435 if common:
2435 if common:
2436 args['common'] = [bin(s) for s in common]
2436 args['common'] = [bin(s) for s in common]
2437 if head:
2437 if head:
2438 args['heads'] = [bin(s) for s in head]
2438 args['heads'] = [bin(s) for s in head]
2439 # TODO: get desired bundlecaps from command line.
2439 # TODO: get desired bundlecaps from command line.
2440 args['bundlecaps'] = None
2440 args['bundlecaps'] = None
2441 bundle = repo.getbundle('debug', **args)
2441 bundle = repo.getbundle('debug', **args)
2442
2442
2443 bundletype = opts.get('type', 'bzip2').lower()
2443 bundletype = opts.get('type', 'bzip2').lower()
2444 btypes = {'none': 'HG10UN',
2444 btypes = {'none': 'HG10UN',
2445 'bzip2': 'HG10BZ',
2445 'bzip2': 'HG10BZ',
2446 'gzip': 'HG10GZ',
2446 'gzip': 'HG10GZ',
2447 'bundle2': 'HG20'}
2447 'bundle2': 'HG20'}
2448 bundletype = btypes.get(bundletype)
2448 bundletype = btypes.get(bundletype)
2449 if bundletype not in bundle2.bundletypes:
2449 if bundletype not in bundle2.bundletypes:
2450 raise error.Abort(_('unknown bundle type specified with --type'))
2450 raise error.Abort(_('unknown bundle type specified with --type'))
2451 bundle2.writebundle(ui, bundle, bundlepath, bundletype)
2451 bundle2.writebundle(ui, bundle, bundlepath, bundletype)
2452
2452
2453 @command('debugignore', [], '[FILE]')
2453 @command('debugignore', [], '[FILE]')
2454 def debugignore(ui, repo, *files, **opts):
2454 def debugignore(ui, repo, *files, **opts):
2455 """display the combined ignore pattern and information about ignored files
2455 """display the combined ignore pattern and information about ignored files
2456
2456
2457 With no argument display the combined ignore pattern.
2457 With no argument display the combined ignore pattern.
2458
2458
2459 Given space separated file names, shows if the given file is ignored and
2459 Given space separated file names, shows if the given file is ignored and
2460 if so, show the ignore rule (file and line number) that matched it.
2460 if so, show the ignore rule (file and line number) that matched it.
2461 """
2461 """
2462 ignore = repo.dirstate._ignore
2462 ignore = repo.dirstate._ignore
2463 if not files:
2463 if not files:
2464 # Show all the patterns
2464 # Show all the patterns
2465 includepat = getattr(ignore, 'includepat', None)
2465 includepat = getattr(ignore, 'includepat', None)
2466 if includepat is not None:
2466 if includepat is not None:
2467 ui.write("%s\n" % includepat)
2467 ui.write("%s\n" % includepat)
2468 else:
2468 else:
2469 raise error.Abort(_("no ignore patterns found"))
2469 raise error.Abort(_("no ignore patterns found"))
2470 else:
2470 else:
2471 for f in files:
2471 for f in files:
2472 nf = util.normpath(f)
2472 nf = util.normpath(f)
2473 ignored = None
2473 ignored = None
2474 ignoredata = None
2474 ignoredata = None
2475 if nf != '.':
2475 if nf != '.':
2476 if ignore(nf):
2476 if ignore(nf):
2477 ignored = nf
2477 ignored = nf
2478 ignoredata = repo.dirstate._ignorefileandline(nf)
2478 ignoredata = repo.dirstate._ignorefileandline(nf)
2479 else:
2479 else:
2480 for p in util.finddirs(nf):
2480 for p in util.finddirs(nf):
2481 if ignore(p):
2481 if ignore(p):
2482 ignored = p
2482 ignored = p
2483 ignoredata = repo.dirstate._ignorefileandline(p)
2483 ignoredata = repo.dirstate._ignorefileandline(p)
2484 break
2484 break
2485 if ignored:
2485 if ignored:
2486 if ignored == nf:
2486 if ignored == nf:
2487 ui.write(_("%s is ignored\n") % f)
2487 ui.write(_("%s is ignored\n") % f)
2488 else:
2488 else:
2489 ui.write(_("%s is ignored because of "
2489 ui.write(_("%s is ignored because of "
2490 "containing folder %s\n")
2490 "containing folder %s\n")
2491 % (f, ignored))
2491 % (f, ignored))
2492 ignorefile, lineno, line = ignoredata
2492 ignorefile, lineno, line = ignoredata
2493 ui.write(_("(ignore rule in %s, line %d: '%s')\n")
2493 ui.write(_("(ignore rule in %s, line %d: '%s')\n")
2494 % (ignorefile, lineno, line))
2494 % (ignorefile, lineno, line))
2495 else:
2495 else:
2496 ui.write(_("%s is not ignored\n") % f)
2496 ui.write(_("%s is not ignored\n") % f)
2497
2497
2498 @command('debugindex', debugrevlogopts +
2498 @command('debugindex', debugrevlogopts +
2499 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2499 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2500 _('[-f FORMAT] -c|-m|FILE'),
2500 _('[-f FORMAT] -c|-m|FILE'),
2501 optionalrepo=True)
2501 optionalrepo=True)
2502 def debugindex(ui, repo, file_=None, **opts):
2502 def debugindex(ui, repo, file_=None, **opts):
2503 """dump the contents of an index file"""
2503 """dump the contents of an index file"""
2504 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2504 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2505 format = opts.get('format', 0)
2505 format = opts.get('format', 0)
2506 if format not in (0, 1):
2506 if format not in (0, 1):
2507 raise error.Abort(_("unknown format %d") % format)
2507 raise error.Abort(_("unknown format %d") % format)
2508
2508
2509 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2509 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2510 if generaldelta:
2510 if generaldelta:
2511 basehdr = ' delta'
2511 basehdr = ' delta'
2512 else:
2512 else:
2513 basehdr = ' base'
2513 basehdr = ' base'
2514
2514
2515 if ui.debugflag:
2515 if ui.debugflag:
2516 shortfn = hex
2516 shortfn = hex
2517 else:
2517 else:
2518 shortfn = short
2518 shortfn = short
2519
2519
2520 # There might not be anything in r, so have a sane default
2520 # There might not be anything in r, so have a sane default
2521 idlen = 12
2521 idlen = 12
2522 for i in r:
2522 for i in r:
2523 idlen = len(shortfn(r.node(i)))
2523 idlen = len(shortfn(r.node(i)))
2524 break
2524 break
2525
2525
2526 if format == 0:
2526 if format == 0:
2527 ui.write((" rev offset length " + basehdr + " linkrev"
2527 ui.write((" rev offset length " + basehdr + " linkrev"
2528 " %s %s p2\n") % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2528 " %s %s p2\n") % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2529 elif format == 1:
2529 elif format == 1:
2530 ui.write((" rev flag offset length"
2530 ui.write((" rev flag offset length"
2531 " size " + basehdr + " link p1 p2"
2531 " size " + basehdr + " link p1 p2"
2532 " %s\n") % "nodeid".rjust(idlen))
2532 " %s\n") % "nodeid".rjust(idlen))
2533
2533
2534 for i in r:
2534 for i in r:
2535 node = r.node(i)
2535 node = r.node(i)
2536 if generaldelta:
2536 if generaldelta:
2537 base = r.deltaparent(i)
2537 base = r.deltaparent(i)
2538 else:
2538 else:
2539 base = r.chainbase(i)
2539 base = r.chainbase(i)
2540 if format == 0:
2540 if format == 0:
2541 try:
2541 try:
2542 pp = r.parents(node)
2542 pp = r.parents(node)
2543 except Exception:
2543 except Exception:
2544 pp = [nullid, nullid]
2544 pp = [nullid, nullid]
2545 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2545 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2546 i, r.start(i), r.length(i), base, r.linkrev(i),
2546 i, r.start(i), r.length(i), base, r.linkrev(i),
2547 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2547 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2548 elif format == 1:
2548 elif format == 1:
2549 pr = r.parentrevs(i)
2549 pr = r.parentrevs(i)
2550 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2550 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2551 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2551 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2552 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2552 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2553
2553
2554 @command('debugindexdot', debugrevlogopts,
2554 @command('debugindexdot', debugrevlogopts,
2555 _('-c|-m|FILE'), optionalrepo=True)
2555 _('-c|-m|FILE'), optionalrepo=True)
2556 def debugindexdot(ui, repo, file_=None, **opts):
2556 def debugindexdot(ui, repo, file_=None, **opts):
2557 """dump an index DAG as a graphviz dot file"""
2557 """dump an index DAG as a graphviz dot file"""
2558 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
2558 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
2559 ui.write(("digraph G {\n"))
2559 ui.write(("digraph G {\n"))
2560 for i in r:
2560 for i in r:
2561 node = r.node(i)
2561 node = r.node(i)
2562 pp = r.parents(node)
2562 pp = r.parents(node)
2563 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2563 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2564 if pp[1] != nullid:
2564 if pp[1] != nullid:
2565 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2565 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2566 ui.write("}\n")
2566 ui.write("}\n")
2567
2567
2568 @command('debugdeltachain',
2568 @command('debugdeltachain',
2569 debugrevlogopts + formatteropts,
2569 debugrevlogopts + formatteropts,
2570 _('-c|-m|FILE'),
2570 _('-c|-m|FILE'),
2571 optionalrepo=True)
2571 optionalrepo=True)
2572 def debugdeltachain(ui, repo, file_=None, **opts):
2572 def debugdeltachain(ui, repo, file_=None, **opts):
2573 """dump information about delta chains in a revlog
2573 """dump information about delta chains in a revlog
2574
2574
2575 Output can be templatized. Available template keywords are:
2575 Output can be templatized. Available template keywords are:
2576
2576
2577 :``rev``: revision number
2577 :``rev``: revision number
2578 :``chainid``: delta chain identifier (numbered by unique base)
2578 :``chainid``: delta chain identifier (numbered by unique base)
2579 :``chainlen``: delta chain length to this revision
2579 :``chainlen``: delta chain length to this revision
2580 :``prevrev``: previous revision in delta chain
2580 :``prevrev``: previous revision in delta chain
2581 :``deltatype``: role of delta / how it was computed
2581 :``deltatype``: role of delta / how it was computed
2582 :``compsize``: compressed size of revision
2582 :``compsize``: compressed size of revision
2583 :``uncompsize``: uncompressed size of revision
2583 :``uncompsize``: uncompressed size of revision
2584 :``chainsize``: total size of compressed revisions in chain
2584 :``chainsize``: total size of compressed revisions in chain
2585 :``chainratio``: total chain size divided by uncompressed revision size
2585 :``chainratio``: total chain size divided by uncompressed revision size
2586 (new delta chains typically start at ratio 2.00)
2586 (new delta chains typically start at ratio 2.00)
2587 :``lindist``: linear distance from base revision in delta chain to end
2587 :``lindist``: linear distance from base revision in delta chain to end
2588 of this revision
2588 of this revision
2589 :``extradist``: total size of revisions not part of this delta chain from
2589 :``extradist``: total size of revisions not part of this delta chain from
2590 base of delta chain to end of this revision; a measurement
2590 base of delta chain to end of this revision; a measurement
2591 of how much extra data we need to read/seek across to read
2591 of how much extra data we need to read/seek across to read
2592 the delta chain for this revision
2592 the delta chain for this revision
2593 :``extraratio``: extradist divided by chainsize; another representation of
2593 :``extraratio``: extradist divided by chainsize; another representation of
2594 how much unrelated data is needed to load this delta chain
2594 how much unrelated data is needed to load this delta chain
2595 """
2595 """
2596 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
2596 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
2597 index = r.index
2597 index = r.index
2598 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2598 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2599
2599
2600 def revinfo(rev):
2600 def revinfo(rev):
2601 e = index[rev]
2601 e = index[rev]
2602 compsize = e[1]
2602 compsize = e[1]
2603 uncompsize = e[2]
2603 uncompsize = e[2]
2604 chainsize = 0
2604 chainsize = 0
2605
2605
2606 if generaldelta:
2606 if generaldelta:
2607 if e[3] == e[5]:
2607 if e[3] == e[5]:
2608 deltatype = 'p1'
2608 deltatype = 'p1'
2609 elif e[3] == e[6]:
2609 elif e[3] == e[6]:
2610 deltatype = 'p2'
2610 deltatype = 'p2'
2611 elif e[3] == rev - 1:
2611 elif e[3] == rev - 1:
2612 deltatype = 'prev'
2612 deltatype = 'prev'
2613 elif e[3] == rev:
2613 elif e[3] == rev:
2614 deltatype = 'base'
2614 deltatype = 'base'
2615 else:
2615 else:
2616 deltatype = 'other'
2616 deltatype = 'other'
2617 else:
2617 else:
2618 if e[3] == rev:
2618 if e[3] == rev:
2619 deltatype = 'base'
2619 deltatype = 'base'
2620 else:
2620 else:
2621 deltatype = 'prev'
2621 deltatype = 'prev'
2622
2622
2623 chain = r._deltachain(rev)[0]
2623 chain = r._deltachain(rev)[0]
2624 for iterrev in chain:
2624 for iterrev in chain:
2625 e = index[iterrev]
2625 e = index[iterrev]
2626 chainsize += e[1]
2626 chainsize += e[1]
2627
2627
2628 return compsize, uncompsize, deltatype, chain, chainsize
2628 return compsize, uncompsize, deltatype, chain, chainsize
2629
2629
2630 fm = ui.formatter('debugdeltachain', opts)
2630 fm = ui.formatter('debugdeltachain', opts)
2631
2631
2632 fm.plain(' rev chain# chainlen prev delta '
2632 fm.plain(' rev chain# chainlen prev delta '
2633 'size rawsize chainsize ratio lindist extradist '
2633 'size rawsize chainsize ratio lindist extradist '
2634 'extraratio\n')
2634 'extraratio\n')
2635
2635
2636 chainbases = {}
2636 chainbases = {}
2637 for rev in r:
2637 for rev in r:
2638 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
2638 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
2639 chainbase = chain[0]
2639 chainbase = chain[0]
2640 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
2640 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
2641 basestart = r.start(chainbase)
2641 basestart = r.start(chainbase)
2642 revstart = r.start(rev)
2642 revstart = r.start(rev)
2643 lineardist = revstart + comp - basestart
2643 lineardist = revstart + comp - basestart
2644 extradist = lineardist - chainsize
2644 extradist = lineardist - chainsize
2645 try:
2645 try:
2646 prevrev = chain[-2]
2646 prevrev = chain[-2]
2647 except IndexError:
2647 except IndexError:
2648 prevrev = -1
2648 prevrev = -1
2649
2649
2650 chainratio = float(chainsize) / float(uncomp)
2650 chainratio = float(chainsize) / float(uncomp)
2651 extraratio = float(extradist) / float(chainsize)
2651 extraratio = float(extradist) / float(chainsize)
2652
2652
2653 fm.startitem()
2653 fm.startitem()
2654 fm.write('rev chainid chainlen prevrev deltatype compsize '
2654 fm.write('rev chainid chainlen prevrev deltatype compsize '
2655 'uncompsize chainsize chainratio lindist extradist '
2655 'uncompsize chainsize chainratio lindist extradist '
2656 'extraratio',
2656 'extraratio',
2657 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f\n',
2657 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f\n',
2658 rev, chainid, len(chain), prevrev, deltatype, comp,
2658 rev, chainid, len(chain), prevrev, deltatype, comp,
2659 uncomp, chainsize, chainratio, lineardist, extradist,
2659 uncomp, chainsize, chainratio, lineardist, extradist,
2660 extraratio,
2660 extraratio,
2661 rev=rev, chainid=chainid, chainlen=len(chain),
2661 rev=rev, chainid=chainid, chainlen=len(chain),
2662 prevrev=prevrev, deltatype=deltatype, compsize=comp,
2662 prevrev=prevrev, deltatype=deltatype, compsize=comp,
2663 uncompsize=uncomp, chainsize=chainsize,
2663 uncompsize=uncomp, chainsize=chainsize,
2664 chainratio=chainratio, lindist=lineardist,
2664 chainratio=chainratio, lindist=lineardist,
2665 extradist=extradist, extraratio=extraratio)
2665 extradist=extradist, extraratio=extraratio)
2666
2666
2667 fm.end()
2667 fm.end()
2668
2668
2669 @command('debuginstall', [] + formatteropts, '', norepo=True)
2669 @command('debuginstall', [] + formatteropts, '', norepo=True)
2670 def debuginstall(ui, **opts):
2670 def debuginstall(ui, **opts):
2671 '''test Mercurial installation
2671 '''test Mercurial installation
2672
2672
2673 Returns 0 on success.
2673 Returns 0 on success.
2674 '''
2674 '''
2675
2675
2676 def writetemp(contents):
2676 def writetemp(contents):
2677 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2677 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2678 f = os.fdopen(fd, "wb")
2678 f = os.fdopen(fd, "wb")
2679 f.write(contents)
2679 f.write(contents)
2680 f.close()
2680 f.close()
2681 return name
2681 return name
2682
2682
2683 problems = 0
2683 problems = 0
2684
2684
2685 fm = ui.formatter('debuginstall', opts)
2685 fm = ui.formatter('debuginstall', opts)
2686 fm.startitem()
2686 fm.startitem()
2687
2687
2688 # encoding
2688 # encoding
2689 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
2689 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
2690 err = None
2690 err = None
2691 try:
2691 try:
2692 encoding.fromlocal("test")
2692 encoding.fromlocal("test")
2693 except error.Abort as inst:
2693 except error.Abort as inst:
2694 err = inst
2694 err = inst
2695 problems += 1
2695 problems += 1
2696 fm.condwrite(err, 'encodingerror', _(" %s\n"
2696 fm.condwrite(err, 'encodingerror', _(" %s\n"
2697 " (check that your locale is properly set)\n"), err)
2697 " (check that your locale is properly set)\n"), err)
2698
2698
2699 # Python
2699 # Python
2700 fm.write('pythonexe', _("checking Python executable (%s)\n"),
2700 fm.write('pythonexe', _("checking Python executable (%s)\n"),
2701 sys.executable)
2701 sys.executable)
2702 fm.write('pythonver', _("checking Python version (%s)\n"),
2702 fm.write('pythonver', _("checking Python version (%s)\n"),
2703 ("%s.%s.%s" % sys.version_info[:3]))
2703 ("%s.%s.%s" % sys.version_info[:3]))
2704 fm.write('pythonlib', _("checking Python lib (%s)...\n"),
2704 fm.write('pythonlib', _("checking Python lib (%s)...\n"),
2705 os.path.dirname(os.__file__))
2705 os.path.dirname(os.__file__))
2706
2706
2707 security = set(sslutil.supportedprotocols)
2707 security = set(sslutil.supportedprotocols)
2708 if sslutil.hassni:
2708 if sslutil.hassni:
2709 security.add('sni')
2709 security.add('sni')
2710
2710
2711 fm.write('pythonsecurity', _("checking Python security support (%s)\n"),
2711 fm.write('pythonsecurity', _("checking Python security support (%s)\n"),
2712 fm.formatlist(sorted(security), name='protocol',
2712 fm.formatlist(sorted(security), name='protocol',
2713 fmt='%s', sep=','))
2713 fmt='%s', sep=','))
2714
2714
2715 # These are warnings, not errors. So don't increment problem count. This
2715 # These are warnings, not errors. So don't increment problem count. This
2716 # may change in the future.
2716 # may change in the future.
2717 if 'tls1.2' not in security:
2717 if 'tls1.2' not in security:
2718 fm.plain(_(' TLS 1.2 not supported by Python install; '
2718 fm.plain(_(' TLS 1.2 not supported by Python install; '
2719 'network connections lack modern security\n'))
2719 'network connections lack modern security\n'))
2720 if 'sni' not in security:
2720 if 'sni' not in security:
2721 fm.plain(_(' SNI not supported by Python install; may have '
2721 fm.plain(_(' SNI not supported by Python install; may have '
2722 'connectivity issues with some servers\n'))
2722 'connectivity issues with some servers\n'))
2723
2723
2724 # TODO print CA cert info
2724 # TODO print CA cert info
2725
2725
2726 # hg version
2726 # hg version
2727 hgver = util.version()
2727 hgver = util.version()
2728 fm.write('hgver', _("checking Mercurial version (%s)\n"),
2728 fm.write('hgver', _("checking Mercurial version (%s)\n"),
2729 hgver.split('+')[0])
2729 hgver.split('+')[0])
2730 fm.write('hgverextra', _("checking Mercurial custom build (%s)\n"),
2730 fm.write('hgverextra', _("checking Mercurial custom build (%s)\n"),
2731 '+'.join(hgver.split('+')[1:]))
2731 '+'.join(hgver.split('+')[1:]))
2732
2732
2733 # compiled modules
2733 # compiled modules
2734 fm.write('hgmodulepolicy', _("checking module policy (%s)\n"),
2734 fm.write('hgmodulepolicy', _("checking module policy (%s)\n"),
2735 policy.policy)
2735 policy.policy)
2736 fm.write('hgmodules', _("checking installed modules (%s)...\n"),
2736 fm.write('hgmodules', _("checking installed modules (%s)...\n"),
2737 os.path.dirname(__file__))
2737 os.path.dirname(__file__))
2738
2738
2739 err = None
2739 err = None
2740 try:
2740 try:
2741 from . import (
2741 from . import (
2742 base85,
2742 base85,
2743 bdiff,
2743 bdiff,
2744 mpatch,
2744 mpatch,
2745 osutil,
2745 osutil,
2746 )
2746 )
2747 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2747 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2748 except Exception as inst:
2748 except Exception as inst:
2749 err = inst
2749 err = inst
2750 problems += 1
2750 problems += 1
2751 fm.condwrite(err, 'extensionserror', " %s\n", err)
2751 fm.condwrite(err, 'extensionserror', " %s\n", err)
2752
2752
2753 # templates
2753 # templates
2754 p = templater.templatepaths()
2754 p = templater.templatepaths()
2755 fm.write('templatedirs', 'checking templates (%s)...\n', ' '.join(p))
2755 fm.write('templatedirs', 'checking templates (%s)...\n', ' '.join(p))
2756 fm.condwrite(not p, '', _(" no template directories found\n"))
2756 fm.condwrite(not p, '', _(" no template directories found\n"))
2757 if p:
2757 if p:
2758 m = templater.templatepath("map-cmdline.default")
2758 m = templater.templatepath("map-cmdline.default")
2759 if m:
2759 if m:
2760 # template found, check if it is working
2760 # template found, check if it is working
2761 err = None
2761 err = None
2762 try:
2762 try:
2763 templater.templater.frommapfile(m)
2763 templater.templater.frommapfile(m)
2764 except Exception as inst:
2764 except Exception as inst:
2765 err = inst
2765 err = inst
2766 p = None
2766 p = None
2767 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err)
2767 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err)
2768 else:
2768 else:
2769 p = None
2769 p = None
2770 fm.condwrite(p, 'defaulttemplate',
2770 fm.condwrite(p, 'defaulttemplate',
2771 _("checking default template (%s)\n"), m)
2771 _("checking default template (%s)\n"), m)
2772 fm.condwrite(not m, 'defaulttemplatenotfound',
2772 fm.condwrite(not m, 'defaulttemplatenotfound',
2773 _(" template '%s' not found\n"), "default")
2773 _(" template '%s' not found\n"), "default")
2774 if not p:
2774 if not p:
2775 problems += 1
2775 problems += 1
2776 fm.condwrite(not p, '',
2776 fm.condwrite(not p, '',
2777 _(" (templates seem to have been installed incorrectly)\n"))
2777 _(" (templates seem to have been installed incorrectly)\n"))
2778
2778
2779 # editor
2779 # editor
2780 editor = ui.geteditor()
2780 editor = ui.geteditor()
2781 editor = util.expandpath(editor)
2781 editor = util.expandpath(editor)
2782 fm.write('editor', _("checking commit editor... (%s)\n"), editor)
2782 fm.write('editor', _("checking commit editor... (%s)\n"), editor)
2783 cmdpath = util.findexe(shlex.split(editor)[0])
2783 cmdpath = util.findexe(shlex.split(editor)[0])
2784 fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
2784 fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
2785 _(" No commit editor set and can't find %s in PATH\n"
2785 _(" No commit editor set and can't find %s in PATH\n"
2786 " (specify a commit editor in your configuration"
2786 " (specify a commit editor in your configuration"
2787 " file)\n"), not cmdpath and editor == 'vi' and editor)
2787 " file)\n"), not cmdpath and editor == 'vi' and editor)
2788 fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
2788 fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
2789 _(" Can't find editor '%s' in PATH\n"
2789 _(" Can't find editor '%s' in PATH\n"
2790 " (specify a commit editor in your configuration"
2790 " (specify a commit editor in your configuration"
2791 " file)\n"), not cmdpath and editor)
2791 " file)\n"), not cmdpath and editor)
2792 if not cmdpath and editor != 'vi':
2792 if not cmdpath and editor != 'vi':
2793 problems += 1
2793 problems += 1
2794
2794
2795 # check username
2795 # check username
2796 username = None
2796 username = None
2797 err = None
2797 err = None
2798 try:
2798 try:
2799 username = ui.username()
2799 username = ui.username()
2800 except error.Abort as e:
2800 except error.Abort as e:
2801 err = e
2801 err = e
2802 problems += 1
2802 problems += 1
2803
2803
2804 fm.condwrite(username, 'username', _("checking username (%s)\n"), username)
2804 fm.condwrite(username, 'username', _("checking username (%s)\n"), username)
2805 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n"
2805 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n"
2806 " (specify a username in your configuration file)\n"), err)
2806 " (specify a username in your configuration file)\n"), err)
2807
2807
2808 fm.condwrite(not problems, '',
2808 fm.condwrite(not problems, '',
2809 _("no problems detected\n"))
2809 _("no problems detected\n"))
2810 if not problems:
2810 if not problems:
2811 fm.data(problems=problems)
2811 fm.data(problems=problems)
2812 fm.condwrite(problems, 'problems',
2812 fm.condwrite(problems, 'problems',
2813 _("%d problems detected,"
2813 _("%d problems detected,"
2814 " please check your install!\n"), problems)
2814 " please check your install!\n"), problems)
2815 fm.end()
2815 fm.end()
2816
2816
2817 return problems
2817 return problems
2818
2818
2819 @command('debugknown', [], _('REPO ID...'), norepo=True)
2819 @command('debugknown', [], _('REPO ID...'), norepo=True)
2820 def debugknown(ui, repopath, *ids, **opts):
2820 def debugknown(ui, repopath, *ids, **opts):
2821 """test whether node ids are known to a repo
2821 """test whether node ids are known to a repo
2822
2822
2823 Every ID must be a full-length hex node id string. Returns a list of 0s
2823 Every ID must be a full-length hex node id string. Returns a list of 0s
2824 and 1s indicating unknown/known.
2824 and 1s indicating unknown/known.
2825 """
2825 """
2826 repo = hg.peer(ui, opts, repopath)
2826 repo = hg.peer(ui, opts, repopath)
2827 if not repo.capable('known'):
2827 if not repo.capable('known'):
2828 raise error.Abort("known() not supported by target repository")
2828 raise error.Abort("known() not supported by target repository")
2829 flags = repo.known([bin(s) for s in ids])
2829 flags = repo.known([bin(s) for s in ids])
2830 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2830 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2831
2831
2832 @command('debuglabelcomplete', [], _('LABEL...'))
2832 @command('debuglabelcomplete', [], _('LABEL...'))
2833 def debuglabelcomplete(ui, repo, *args):
2833 def debuglabelcomplete(ui, repo, *args):
2834 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2834 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2835 debugnamecomplete(ui, repo, *args)
2835 debugnamecomplete(ui, repo, *args)
2836
2836
2837 @command('debugmergestate', [], '')
2837 @command('debugmergestate', [], '')
2838 def debugmergestate(ui, repo, *args):
2838 def debugmergestate(ui, repo, *args):
2839 """print merge state
2839 """print merge state
2840
2840
2841 Use --verbose to print out information about whether v1 or v2 merge state
2841 Use --verbose to print out information about whether v1 or v2 merge state
2842 was chosen."""
2842 was chosen."""
2843 def _hashornull(h):
2843 def _hashornull(h):
2844 if h == nullhex:
2844 if h == nullhex:
2845 return 'null'
2845 return 'null'
2846 else:
2846 else:
2847 return h
2847 return h
2848
2848
2849 def printrecords(version):
2849 def printrecords(version):
2850 ui.write(('* version %s records\n') % version)
2850 ui.write(('* version %s records\n') % version)
2851 if version == 1:
2851 if version == 1:
2852 records = v1records
2852 records = v1records
2853 else:
2853 else:
2854 records = v2records
2854 records = v2records
2855
2855
2856 for rtype, record in records:
2856 for rtype, record in records:
2857 # pretty print some record types
2857 # pretty print some record types
2858 if rtype == 'L':
2858 if rtype == 'L':
2859 ui.write(('local: %s\n') % record)
2859 ui.write(('local: %s\n') % record)
2860 elif rtype == 'O':
2860 elif rtype == 'O':
2861 ui.write(('other: %s\n') % record)
2861 ui.write(('other: %s\n') % record)
2862 elif rtype == 'm':
2862 elif rtype == 'm':
2863 driver, mdstate = record.split('\0', 1)
2863 driver, mdstate = record.split('\0', 1)
2864 ui.write(('merge driver: %s (state "%s")\n')
2864 ui.write(('merge driver: %s (state "%s")\n')
2865 % (driver, mdstate))
2865 % (driver, mdstate))
2866 elif rtype in 'FDC':
2866 elif rtype in 'FDC':
2867 r = record.split('\0')
2867 r = record.split('\0')
2868 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2868 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2869 if version == 1:
2869 if version == 1:
2870 onode = 'not stored in v1 format'
2870 onode = 'not stored in v1 format'
2871 flags = r[7]
2871 flags = r[7]
2872 else:
2872 else:
2873 onode, flags = r[7:9]
2873 onode, flags = r[7:9]
2874 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2874 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2875 % (f, rtype, state, _hashornull(hash)))
2875 % (f, rtype, state, _hashornull(hash)))
2876 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2876 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2877 ui.write((' ancestor path: %s (node %s)\n')
2877 ui.write((' ancestor path: %s (node %s)\n')
2878 % (afile, _hashornull(anode)))
2878 % (afile, _hashornull(anode)))
2879 ui.write((' other path: %s (node %s)\n')
2879 ui.write((' other path: %s (node %s)\n')
2880 % (ofile, _hashornull(onode)))
2880 % (ofile, _hashornull(onode)))
2881 elif rtype == 'f':
2881 elif rtype == 'f':
2882 filename, rawextras = record.split('\0', 1)
2882 filename, rawextras = record.split('\0', 1)
2883 extras = rawextras.split('\0')
2883 extras = rawextras.split('\0')
2884 i = 0
2884 i = 0
2885 extrastrings = []
2885 extrastrings = []
2886 while i < len(extras):
2886 while i < len(extras):
2887 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
2887 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
2888 i += 2
2888 i += 2
2889
2889
2890 ui.write(('file extras: %s (%s)\n')
2890 ui.write(('file extras: %s (%s)\n')
2891 % (filename, ', '.join(extrastrings)))
2891 % (filename, ', '.join(extrastrings)))
2892 elif rtype == 'l':
2892 elif rtype == 'l':
2893 labels = record.split('\0', 2)
2893 labels = record.split('\0', 2)
2894 labels = [l for l in labels if len(l) > 0]
2894 labels = [l for l in labels if len(l) > 0]
2895 ui.write(('labels:\n'))
2895 ui.write(('labels:\n'))
2896 ui.write((' local: %s\n' % labels[0]))
2896 ui.write((' local: %s\n' % labels[0]))
2897 ui.write((' other: %s\n' % labels[1]))
2897 ui.write((' other: %s\n' % labels[1]))
2898 if len(labels) > 2:
2898 if len(labels) > 2:
2899 ui.write((' base: %s\n' % labels[2]))
2899 ui.write((' base: %s\n' % labels[2]))
2900 else:
2900 else:
2901 ui.write(('unrecognized entry: %s\t%s\n')
2901 ui.write(('unrecognized entry: %s\t%s\n')
2902 % (rtype, record.replace('\0', '\t')))
2902 % (rtype, record.replace('\0', '\t')))
2903
2903
2904 # Avoid mergestate.read() since it may raise an exception for unsupported
2904 # Avoid mergestate.read() since it may raise an exception for unsupported
2905 # merge state records. We shouldn't be doing this, but this is OK since this
2905 # merge state records. We shouldn't be doing this, but this is OK since this
2906 # command is pretty low-level.
2906 # command is pretty low-level.
2907 ms = mergemod.mergestate(repo)
2907 ms = mergemod.mergestate(repo)
2908
2908
2909 # sort so that reasonable information is on top
2909 # sort so that reasonable information is on top
2910 v1records = ms._readrecordsv1()
2910 v1records = ms._readrecordsv1()
2911 v2records = ms._readrecordsv2()
2911 v2records = ms._readrecordsv2()
2912 order = 'LOml'
2912 order = 'LOml'
2913 def key(r):
2913 def key(r):
2914 idx = order.find(r[0])
2914 idx = order.find(r[0])
2915 if idx == -1:
2915 if idx == -1:
2916 return (1, r[1])
2916 return (1, r[1])
2917 else:
2917 else:
2918 return (0, idx)
2918 return (0, idx)
2919 v1records.sort(key=key)
2919 v1records.sort(key=key)
2920 v2records.sort(key=key)
2920 v2records.sort(key=key)
2921
2921
2922 if not v1records and not v2records:
2922 if not v1records and not v2records:
2923 ui.write(('no merge state found\n'))
2923 ui.write(('no merge state found\n'))
2924 elif not v2records:
2924 elif not v2records:
2925 ui.note(('no version 2 merge state\n'))
2925 ui.note(('no version 2 merge state\n'))
2926 printrecords(1)
2926 printrecords(1)
2927 elif ms._v1v2match(v1records, v2records):
2927 elif ms._v1v2match(v1records, v2records):
2928 ui.note(('v1 and v2 states match: using v2\n'))
2928 ui.note(('v1 and v2 states match: using v2\n'))
2929 printrecords(2)
2929 printrecords(2)
2930 else:
2930 else:
2931 ui.note(('v1 and v2 states mismatch: using v1\n'))
2931 ui.note(('v1 and v2 states mismatch: using v1\n'))
2932 printrecords(1)
2932 printrecords(1)
2933 if ui.verbose:
2933 if ui.verbose:
2934 printrecords(2)
2934 printrecords(2)
2935
2935
2936 @command('debugnamecomplete', [], _('NAME...'))
2936 @command('debugnamecomplete', [], _('NAME...'))
2937 def debugnamecomplete(ui, repo, *args):
2937 def debugnamecomplete(ui, repo, *args):
2938 '''complete "names" - tags, open branch names, bookmark names'''
2938 '''complete "names" - tags, open branch names, bookmark names'''
2939
2939
2940 names = set()
2940 names = set()
2941 # since we previously only listed open branches, we will handle that
2941 # since we previously only listed open branches, we will handle that
2942 # specially (after this for loop)
2942 # specially (after this for loop)
2943 for name, ns in repo.names.iteritems():
2943 for name, ns in repo.names.iteritems():
2944 if name != 'branches':
2944 if name != 'branches':
2945 names.update(ns.listnames(repo))
2945 names.update(ns.listnames(repo))
2946 names.update(tag for (tag, heads, tip, closed)
2946 names.update(tag for (tag, heads, tip, closed)
2947 in repo.branchmap().iterbranches() if not closed)
2947 in repo.branchmap().iterbranches() if not closed)
2948 completions = set()
2948 completions = set()
2949 if not args:
2949 if not args:
2950 args = ['']
2950 args = ['']
2951 for a in args:
2951 for a in args:
2952 completions.update(n for n in names if n.startswith(a))
2952 completions.update(n for n in names if n.startswith(a))
2953 ui.write('\n'.join(sorted(completions)))
2953 ui.write('\n'.join(sorted(completions)))
2954 ui.write('\n')
2954 ui.write('\n')
2955
2955
2956 @command('debuglocks',
2956 @command('debuglocks',
2957 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2957 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2958 ('W', 'force-wlock', None,
2958 ('W', 'force-wlock', None,
2959 _('free the working state lock (DANGEROUS)'))],
2959 _('free the working state lock (DANGEROUS)'))],
2960 _('[OPTION]...'))
2960 _('[OPTION]...'))
2961 def debuglocks(ui, repo, **opts):
2961 def debuglocks(ui, repo, **opts):
2962 """show or modify state of locks
2962 """show or modify state of locks
2963
2963
2964 By default, this command will show which locks are held. This
2964 By default, this command will show which locks are held. This
2965 includes the user and process holding the lock, the amount of time
2965 includes the user and process holding the lock, the amount of time
2966 the lock has been held, and the machine name where the process is
2966 the lock has been held, and the machine name where the process is
2967 running if it's not local.
2967 running if it's not local.
2968
2968
2969 Locks protect the integrity of Mercurial's data, so should be
2969 Locks protect the integrity of Mercurial's data, so should be
2970 treated with care. System crashes or other interruptions may cause
2970 treated with care. System crashes or other interruptions may cause
2971 locks to not be properly released, though Mercurial will usually
2971 locks to not be properly released, though Mercurial will usually
2972 detect and remove such stale locks automatically.
2972 detect and remove such stale locks automatically.
2973
2973
2974 However, detecting stale locks may not always be possible (for
2974 However, detecting stale locks may not always be possible (for
2975 instance, on a shared filesystem). Removing locks may also be
2975 instance, on a shared filesystem). Removing locks may also be
2976 blocked by filesystem permissions.
2976 blocked by filesystem permissions.
2977
2977
2978 Returns 0 if no locks are held.
2978 Returns 0 if no locks are held.
2979
2979
2980 """
2980 """
2981
2981
2982 if opts.get('force_lock'):
2982 if opts.get('force_lock'):
2983 repo.svfs.unlink('lock')
2983 repo.svfs.unlink('lock')
2984 if opts.get('force_wlock'):
2984 if opts.get('force_wlock'):
2985 repo.vfs.unlink('wlock')
2985 repo.vfs.unlink('wlock')
2986 if opts.get('force_lock') or opts.get('force_lock'):
2986 if opts.get('force_lock') or opts.get('force_lock'):
2987 return 0
2987 return 0
2988
2988
2989 now = time.time()
2989 now = time.time()
2990 held = 0
2990 held = 0
2991
2991
2992 def report(vfs, name, method):
2992 def report(vfs, name, method):
2993 # this causes stale locks to get reaped for more accurate reporting
2993 # this causes stale locks to get reaped for more accurate reporting
2994 try:
2994 try:
2995 l = method(False)
2995 l = method(False)
2996 except error.LockHeld:
2996 except error.LockHeld:
2997 l = None
2997 l = None
2998
2998
2999 if l:
2999 if l:
3000 l.release()
3000 l.release()
3001 else:
3001 else:
3002 try:
3002 try:
3003 stat = vfs.lstat(name)
3003 stat = vfs.lstat(name)
3004 age = now - stat.st_mtime
3004 age = now - stat.st_mtime
3005 user = util.username(stat.st_uid)
3005 user = util.username(stat.st_uid)
3006 locker = vfs.readlock(name)
3006 locker = vfs.readlock(name)
3007 if ":" in locker:
3007 if ":" in locker:
3008 host, pid = locker.split(':')
3008 host, pid = locker.split(':')
3009 if host == socket.gethostname():
3009 if host == socket.gethostname():
3010 locker = 'user %s, process %s' % (user, pid)
3010 locker = 'user %s, process %s' % (user, pid)
3011 else:
3011 else:
3012 locker = 'user %s, process %s, host %s' \
3012 locker = 'user %s, process %s, host %s' \
3013 % (user, pid, host)
3013 % (user, pid, host)
3014 ui.write(("%-6s %s (%ds)\n") % (name + ":", locker, age))
3014 ui.write(("%-6s %s (%ds)\n") % (name + ":", locker, age))
3015 return 1
3015 return 1
3016 except OSError as e:
3016 except OSError as e:
3017 if e.errno != errno.ENOENT:
3017 if e.errno != errno.ENOENT:
3018 raise
3018 raise
3019
3019
3020 ui.write(("%-6s free\n") % (name + ":"))
3020 ui.write(("%-6s free\n") % (name + ":"))
3021 return 0
3021 return 0
3022
3022
3023 held += report(repo.svfs, "lock", repo.lock)
3023 held += report(repo.svfs, "lock", repo.lock)
3024 held += report(repo.vfs, "wlock", repo.wlock)
3024 held += report(repo.vfs, "wlock", repo.wlock)
3025
3025
3026 return held
3026 return held
3027
3027
3028 @command('debugobsolete',
3028 @command('debugobsolete',
3029 [('', 'flags', 0, _('markers flag')),
3029 [('', 'flags', 0, _('markers flag')),
3030 ('', 'record-parents', False,
3030 ('', 'record-parents', False,
3031 _('record parent information for the precursor')),
3031 _('record parent information for the precursor')),
3032 ('r', 'rev', [], _('display markers relevant to REV')),
3032 ('r', 'rev', [], _('display markers relevant to REV')),
3033 ('', 'index', False, _('display index of the marker')),
3033 ('', 'index', False, _('display index of the marker')),
3034 ('', 'delete', [], _('delete markers specified by indices')),
3034 ('', 'delete', [], _('delete markers specified by indices')),
3035 ] + commitopts2 + formatteropts,
3035 ] + commitopts2 + formatteropts,
3036 _('[OBSOLETED [REPLACEMENT ...]]'))
3036 _('[OBSOLETED [REPLACEMENT ...]]'))
3037 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
3037 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
3038 """create arbitrary obsolete marker
3038 """create arbitrary obsolete marker
3039
3039
3040 With no arguments, displays the list of obsolescence markers."""
3040 With no arguments, displays the list of obsolescence markers."""
3041
3041
3042 def parsenodeid(s):
3042 def parsenodeid(s):
3043 try:
3043 try:
3044 # We do not use revsingle/revrange functions here to accept
3044 # We do not use revsingle/revrange functions here to accept
3045 # arbitrary node identifiers, possibly not present in the
3045 # arbitrary node identifiers, possibly not present in the
3046 # local repository.
3046 # local repository.
3047 n = bin(s)
3047 n = bin(s)
3048 if len(n) != len(nullid):
3048 if len(n) != len(nullid):
3049 raise TypeError()
3049 raise TypeError()
3050 return n
3050 return n
3051 except TypeError:
3051 except TypeError:
3052 raise error.Abort('changeset references must be full hexadecimal '
3052 raise error.Abort('changeset references must be full hexadecimal '
3053 'node identifiers')
3053 'node identifiers')
3054
3054
3055 if opts.get('delete'):
3055 if opts.get('delete'):
3056 indices = []
3056 indices = []
3057 for v in opts.get('delete'):
3057 for v in opts.get('delete'):
3058 try:
3058 try:
3059 indices.append(int(v))
3059 indices.append(int(v))
3060 except ValueError:
3060 except ValueError:
3061 raise error.Abort(_('invalid index value: %r') % v,
3061 raise error.Abort(_('invalid index value: %r') % v,
3062 hint=_('use integers for indices'))
3062 hint=_('use integers for indices'))
3063
3063
3064 if repo.currenttransaction():
3064 if repo.currenttransaction():
3065 raise error.Abort(_('cannot delete obsmarkers in the middle '
3065 raise error.Abort(_('cannot delete obsmarkers in the middle '
3066 'of transaction.'))
3066 'of transaction.'))
3067
3067
3068 with repo.lock():
3068 with repo.lock():
3069 n = repair.deleteobsmarkers(repo.obsstore, indices)
3069 n = repair.deleteobsmarkers(repo.obsstore, indices)
3070 ui.write(_('deleted %i obsolescense markers\n') % n)
3070 ui.write(_('deleted %i obsolescense markers\n') % n)
3071
3071
3072 return
3072 return
3073
3073
3074 if precursor is not None:
3074 if precursor is not None:
3075 if opts['rev']:
3075 if opts['rev']:
3076 raise error.Abort('cannot select revision when creating marker')
3076 raise error.Abort('cannot select revision when creating marker')
3077 metadata = {}
3077 metadata = {}
3078 metadata['user'] = opts['user'] or ui.username()
3078 metadata['user'] = opts['user'] or ui.username()
3079 succs = tuple(parsenodeid(succ) for succ in successors)
3079 succs = tuple(parsenodeid(succ) for succ in successors)
3080 l = repo.lock()
3080 l = repo.lock()
3081 try:
3081 try:
3082 tr = repo.transaction('debugobsolete')
3082 tr = repo.transaction('debugobsolete')
3083 try:
3083 try:
3084 date = opts.get('date')
3084 date = opts.get('date')
3085 if date:
3085 if date:
3086 date = util.parsedate(date)
3086 date = util.parsedate(date)
3087 else:
3087 else:
3088 date = None
3088 date = None
3089 prec = parsenodeid(precursor)
3089 prec = parsenodeid(precursor)
3090 parents = None
3090 parents = None
3091 if opts['record_parents']:
3091 if opts['record_parents']:
3092 if prec not in repo.unfiltered():
3092 if prec not in repo.unfiltered():
3093 raise error.Abort('cannot used --record-parents on '
3093 raise error.Abort('cannot used --record-parents on '
3094 'unknown changesets')
3094 'unknown changesets')
3095 parents = repo.unfiltered()[prec].parents()
3095 parents = repo.unfiltered()[prec].parents()
3096 parents = tuple(p.node() for p in parents)
3096 parents = tuple(p.node() for p in parents)
3097 repo.obsstore.create(tr, prec, succs, opts['flags'],
3097 repo.obsstore.create(tr, prec, succs, opts['flags'],
3098 parents=parents, date=date,
3098 parents=parents, date=date,
3099 metadata=metadata)
3099 metadata=metadata)
3100 tr.close()
3100 tr.close()
3101 except ValueError as exc:
3101 except ValueError as exc:
3102 raise error.Abort(_('bad obsmarker input: %s') % exc)
3102 raise error.Abort(_('bad obsmarker input: %s') % exc)
3103 finally:
3103 finally:
3104 tr.release()
3104 tr.release()
3105 finally:
3105 finally:
3106 l.release()
3106 l.release()
3107 else:
3107 else:
3108 if opts['rev']:
3108 if opts['rev']:
3109 revs = scmutil.revrange(repo, opts['rev'])
3109 revs = scmutil.revrange(repo, opts['rev'])
3110 nodes = [repo[r].node() for r in revs]
3110 nodes = [repo[r].node() for r in revs]
3111 markers = list(obsolete.getmarkers(repo, nodes=nodes))
3111 markers = list(obsolete.getmarkers(repo, nodes=nodes))
3112 markers.sort(key=lambda x: x._data)
3112 markers.sort(key=lambda x: x._data)
3113 else:
3113 else:
3114 markers = obsolete.getmarkers(repo)
3114 markers = obsolete.getmarkers(repo)
3115
3115
3116 markerstoiter = markers
3116 markerstoiter = markers
3117 isrelevant = lambda m: True
3117 isrelevant = lambda m: True
3118 if opts.get('rev') and opts.get('index'):
3118 if opts.get('rev') and opts.get('index'):
3119 markerstoiter = obsolete.getmarkers(repo)
3119 markerstoiter = obsolete.getmarkers(repo)
3120 markerset = set(markers)
3120 markerset = set(markers)
3121 isrelevant = lambda m: m in markerset
3121 isrelevant = lambda m: m in markerset
3122
3122
3123 fm = ui.formatter('debugobsolete', opts)
3123 fm = ui.formatter('debugobsolete', opts)
3124 for i, m in enumerate(markerstoiter):
3124 for i, m in enumerate(markerstoiter):
3125 if not isrelevant(m):
3125 if not isrelevant(m):
3126 # marker can be irrelevant when we're iterating over a set
3126 # marker can be irrelevant when we're iterating over a set
3127 # of markers (markerstoiter) which is bigger than the set
3127 # of markers (markerstoiter) which is bigger than the set
3128 # of markers we want to display (markers)
3128 # of markers we want to display (markers)
3129 # this can happen if both --index and --rev options are
3129 # this can happen if both --index and --rev options are
3130 # provided and thus we need to iterate over all of the markers
3130 # provided and thus we need to iterate over all of the markers
3131 # to get the correct indices, but only display the ones that
3131 # to get the correct indices, but only display the ones that
3132 # are relevant to --rev value
3132 # are relevant to --rev value
3133 continue
3133 continue
3134 fm.startitem()
3134 fm.startitem()
3135 ind = i if opts.get('index') else None
3135 ind = i if opts.get('index') else None
3136 cmdutil.showmarker(fm, m, index=ind)
3136 cmdutil.showmarker(fm, m, index=ind)
3137 fm.end()
3137 fm.end()
3138
3138
3139 @command('debugpathcomplete',
3139 @command('debugpathcomplete',
3140 [('f', 'full', None, _('complete an entire path')),
3140 [('f', 'full', None, _('complete an entire path')),
3141 ('n', 'normal', None, _('show only normal files')),
3141 ('n', 'normal', None, _('show only normal files')),
3142 ('a', 'added', None, _('show only added files')),
3142 ('a', 'added', None, _('show only added files')),
3143 ('r', 'removed', None, _('show only removed files'))],
3143 ('r', 'removed', None, _('show only removed files'))],
3144 _('FILESPEC...'))
3144 _('FILESPEC...'))
3145 def debugpathcomplete(ui, repo, *specs, **opts):
3145 def debugpathcomplete(ui, repo, *specs, **opts):
3146 '''complete part or all of a tracked path
3146 '''complete part or all of a tracked path
3147
3147
3148 This command supports shells that offer path name completion. It
3148 This command supports shells that offer path name completion. It
3149 currently completes only files already known to the dirstate.
3149 currently completes only files already known to the dirstate.
3150
3150
3151 Completion extends only to the next path segment unless
3151 Completion extends only to the next path segment unless
3152 --full is specified, in which case entire paths are used.'''
3152 --full is specified, in which case entire paths are used.'''
3153
3153
3154 def complete(path, acceptable):
3154 def complete(path, acceptable):
3155 dirstate = repo.dirstate
3155 dirstate = repo.dirstate
3156 spec = os.path.normpath(os.path.join(os.getcwd(), path))
3156 spec = os.path.normpath(os.path.join(os.getcwd(), path))
3157 rootdir = repo.root + os.sep
3157 rootdir = repo.root + os.sep
3158 if spec != repo.root and not spec.startswith(rootdir):
3158 if spec != repo.root and not spec.startswith(rootdir):
3159 return [], []
3159 return [], []
3160 if os.path.isdir(spec):
3160 if os.path.isdir(spec):
3161 spec += '/'
3161 spec += '/'
3162 spec = spec[len(rootdir):]
3162 spec = spec[len(rootdir):]
3163 fixpaths = os.sep != '/'
3163 fixpaths = os.sep != '/'
3164 if fixpaths:
3164 if fixpaths:
3165 spec = spec.replace(os.sep, '/')
3165 spec = spec.replace(os.sep, '/')
3166 speclen = len(spec)
3166 speclen = len(spec)
3167 fullpaths = opts['full']
3167 fullpaths = opts['full']
3168 files, dirs = set(), set()
3168 files, dirs = set(), set()
3169 adddir, addfile = dirs.add, files.add
3169 adddir, addfile = dirs.add, files.add
3170 for f, st in dirstate.iteritems():
3170 for f, st in dirstate.iteritems():
3171 if f.startswith(spec) and st[0] in acceptable:
3171 if f.startswith(spec) and st[0] in acceptable:
3172 if fixpaths:
3172 if fixpaths:
3173 f = f.replace('/', os.sep)
3173 f = f.replace('/', os.sep)
3174 if fullpaths:
3174 if fullpaths:
3175 addfile(f)
3175 addfile(f)
3176 continue
3176 continue
3177 s = f.find(os.sep, speclen)
3177 s = f.find(os.sep, speclen)
3178 if s >= 0:
3178 if s >= 0:
3179 adddir(f[:s])
3179 adddir(f[:s])
3180 else:
3180 else:
3181 addfile(f)
3181 addfile(f)
3182 return files, dirs
3182 return files, dirs
3183
3183
3184 acceptable = ''
3184 acceptable = ''
3185 if opts['normal']:
3185 if opts['normal']:
3186 acceptable += 'nm'
3186 acceptable += 'nm'
3187 if opts['added']:
3187 if opts['added']:
3188 acceptable += 'a'
3188 acceptable += 'a'
3189 if opts['removed']:
3189 if opts['removed']:
3190 acceptable += 'r'
3190 acceptable += 'r'
3191 cwd = repo.getcwd()
3191 cwd = repo.getcwd()
3192 if not specs:
3192 if not specs:
3193 specs = ['.']
3193 specs = ['.']
3194
3194
3195 files, dirs = set(), set()
3195 files, dirs = set(), set()
3196 for spec in specs:
3196 for spec in specs:
3197 f, d = complete(spec, acceptable or 'nmar')
3197 f, d = complete(spec, acceptable or 'nmar')
3198 files.update(f)
3198 files.update(f)
3199 dirs.update(d)
3199 dirs.update(d)
3200 files.update(dirs)
3200 files.update(dirs)
3201 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3201 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3202 ui.write('\n')
3202 ui.write('\n')
3203
3203
3204 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3204 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3205 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3205 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3206 '''access the pushkey key/value protocol
3206 '''access the pushkey key/value protocol
3207
3207
3208 With two args, list the keys in the given namespace.
3208 With two args, list the keys in the given namespace.
3209
3209
3210 With five args, set a key to new if it currently is set to old.
3210 With five args, set a key to new if it currently is set to old.
3211 Reports success or failure.
3211 Reports success or failure.
3212 '''
3212 '''
3213
3213
3214 target = hg.peer(ui, {}, repopath)
3214 target = hg.peer(ui, {}, repopath)
3215 if keyinfo:
3215 if keyinfo:
3216 key, old, new = keyinfo
3216 key, old, new = keyinfo
3217 r = target.pushkey(namespace, key, old, new)
3217 r = target.pushkey(namespace, key, old, new)
3218 ui.status(str(r) + '\n')
3218 ui.status(str(r) + '\n')
3219 return not r
3219 return not r
3220 else:
3220 else:
3221 for k, v in sorted(target.listkeys(namespace).iteritems()):
3221 for k, v in sorted(target.listkeys(namespace).iteritems()):
3222 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3222 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3223 v.encode('string-escape')))
3223 v.encode('string-escape')))
3224
3224
3225 @command('debugpvec', [], _('A B'))
3225 @command('debugpvec', [], _('A B'))
3226 def debugpvec(ui, repo, a, b=None):
3226 def debugpvec(ui, repo, a, b=None):
3227 ca = scmutil.revsingle(repo, a)
3227 ca = scmutil.revsingle(repo, a)
3228 cb = scmutil.revsingle(repo, b)
3228 cb = scmutil.revsingle(repo, b)
3229 pa = pvec.ctxpvec(ca)
3229 pa = pvec.ctxpvec(ca)
3230 pb = pvec.ctxpvec(cb)
3230 pb = pvec.ctxpvec(cb)
3231 if pa == pb:
3231 if pa == pb:
3232 rel = "="
3232 rel = "="
3233 elif pa > pb:
3233 elif pa > pb:
3234 rel = ">"
3234 rel = ">"
3235 elif pa < pb:
3235 elif pa < pb:
3236 rel = "<"
3236 rel = "<"
3237 elif pa | pb:
3237 elif pa | pb:
3238 rel = "|"
3238 rel = "|"
3239 ui.write(_("a: %s\n") % pa)
3239 ui.write(_("a: %s\n") % pa)
3240 ui.write(_("b: %s\n") % pb)
3240 ui.write(_("b: %s\n") % pb)
3241 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3241 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3242 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3242 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3243 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3243 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3244 pa.distance(pb), rel))
3244 pa.distance(pb), rel))
3245
3245
3246 @command('debugrebuilddirstate|debugrebuildstate',
3246 @command('debugrebuilddirstate|debugrebuildstate',
3247 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3247 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3248 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3248 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3249 'the working copy parent')),
3249 'the working copy parent')),
3250 ],
3250 ],
3251 _('[-r REV]'))
3251 _('[-r REV]'))
3252 def debugrebuilddirstate(ui, repo, rev, **opts):
3252 def debugrebuilddirstate(ui, repo, rev, **opts):
3253 """rebuild the dirstate as it would look like for the given revision
3253 """rebuild the dirstate as it would look like for the given revision
3254
3254
3255 If no revision is specified the first current parent will be used.
3255 If no revision is specified the first current parent will be used.
3256
3256
3257 The dirstate will be set to the files of the given revision.
3257 The dirstate will be set to the files of the given revision.
3258 The actual working directory content or existing dirstate
3258 The actual working directory content or existing dirstate
3259 information such as adds or removes is not considered.
3259 information such as adds or removes is not considered.
3260
3260
3261 ``minimal`` will only rebuild the dirstate status for files that claim to be
3261 ``minimal`` will only rebuild the dirstate status for files that claim to be
3262 tracked but are not in the parent manifest, or that exist in the parent
3262 tracked but are not in the parent manifest, or that exist in the parent
3263 manifest but are not in the dirstate. It will not change adds, removes, or
3263 manifest but are not in the dirstate. It will not change adds, removes, or
3264 modified files that are in the working copy parent.
3264 modified files that are in the working copy parent.
3265
3265
3266 One use of this command is to make the next :hg:`status` invocation
3266 One use of this command is to make the next :hg:`status` invocation
3267 check the actual file content.
3267 check the actual file content.
3268 """
3268 """
3269 ctx = scmutil.revsingle(repo, rev)
3269 ctx = scmutil.revsingle(repo, rev)
3270 with repo.wlock():
3270 with repo.wlock():
3271 dirstate = repo.dirstate
3271 dirstate = repo.dirstate
3272 changedfiles = None
3272 changedfiles = None
3273 # See command doc for what minimal does.
3273 # See command doc for what minimal does.
3274 if opts.get('minimal'):
3274 if opts.get('minimal'):
3275 manifestfiles = set(ctx.manifest().keys())
3275 manifestfiles = set(ctx.manifest().keys())
3276 dirstatefiles = set(dirstate)
3276 dirstatefiles = set(dirstate)
3277 manifestonly = manifestfiles - dirstatefiles
3277 manifestonly = manifestfiles - dirstatefiles
3278 dsonly = dirstatefiles - manifestfiles
3278 dsonly = dirstatefiles - manifestfiles
3279 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3279 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3280 changedfiles = manifestonly | dsnotadded
3280 changedfiles = manifestonly | dsnotadded
3281
3281
3282 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3282 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3283
3283
3284 @command('debugrebuildfncache', [], '')
3284 @command('debugrebuildfncache', [], '')
3285 def debugrebuildfncache(ui, repo):
3285 def debugrebuildfncache(ui, repo):
3286 """rebuild the fncache file"""
3286 """rebuild the fncache file"""
3287 repair.rebuildfncache(ui, repo)
3287 repair.rebuildfncache(ui, repo)
3288
3288
3289 @command('debugrename',
3289 @command('debugrename',
3290 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3290 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3291 _('[-r REV] FILE'))
3291 _('[-r REV] FILE'))
3292 def debugrename(ui, repo, file1, *pats, **opts):
3292 def debugrename(ui, repo, file1, *pats, **opts):
3293 """dump rename information"""
3293 """dump rename information"""
3294
3294
3295 ctx = scmutil.revsingle(repo, opts.get('rev'))
3295 ctx = scmutil.revsingle(repo, opts.get('rev'))
3296 m = scmutil.match(ctx, (file1,) + pats, opts)
3296 m = scmutil.match(ctx, (file1,) + pats, opts)
3297 for abs in ctx.walk(m):
3297 for abs in ctx.walk(m):
3298 fctx = ctx[abs]
3298 fctx = ctx[abs]
3299 o = fctx.filelog().renamed(fctx.filenode())
3299 o = fctx.filelog().renamed(fctx.filenode())
3300 rel = m.rel(abs)
3300 rel = m.rel(abs)
3301 if o:
3301 if o:
3302 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3302 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3303 else:
3303 else:
3304 ui.write(_("%s not renamed\n") % rel)
3304 ui.write(_("%s not renamed\n") % rel)
3305
3305
3306 @command('debugrevlog', debugrevlogopts +
3306 @command('debugrevlog', debugrevlogopts +
3307 [('d', 'dump', False, _('dump index data'))],
3307 [('d', 'dump', False, _('dump index data'))],
3308 _('-c|-m|FILE'),
3308 _('-c|-m|FILE'),
3309 optionalrepo=True)
3309 optionalrepo=True)
3310 def debugrevlog(ui, repo, file_=None, **opts):
3310 def debugrevlog(ui, repo, file_=None, **opts):
3311 """show data and statistics about a revlog"""
3311 """show data and statistics about a revlog"""
3312 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3312 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3313
3313
3314 if opts.get("dump"):
3314 if opts.get("dump"):
3315 numrevs = len(r)
3315 numrevs = len(r)
3316 ui.write(("# rev p1rev p2rev start end deltastart base p1 p2"
3316 ui.write(("# rev p1rev p2rev start end deltastart base p1 p2"
3317 " rawsize totalsize compression heads chainlen\n"))
3317 " rawsize totalsize compression heads chainlen\n"))
3318 ts = 0
3318 ts = 0
3319 heads = set()
3319 heads = set()
3320
3320
3321 for rev in xrange(numrevs):
3321 for rev in xrange(numrevs):
3322 dbase = r.deltaparent(rev)
3322 dbase = r.deltaparent(rev)
3323 if dbase == -1:
3323 if dbase == -1:
3324 dbase = rev
3324 dbase = rev
3325 cbase = r.chainbase(rev)
3325 cbase = r.chainbase(rev)
3326 clen = r.chainlen(rev)
3326 clen = r.chainlen(rev)
3327 p1, p2 = r.parentrevs(rev)
3327 p1, p2 = r.parentrevs(rev)
3328 rs = r.rawsize(rev)
3328 rs = r.rawsize(rev)
3329 ts = ts + rs
3329 ts = ts + rs
3330 heads -= set(r.parentrevs(rev))
3330 heads -= set(r.parentrevs(rev))
3331 heads.add(rev)
3331 heads.add(rev)
3332 try:
3332 try:
3333 compression = ts / r.end(rev)
3333 compression = ts / r.end(rev)
3334 except ZeroDivisionError:
3334 except ZeroDivisionError:
3335 compression = 0
3335 compression = 0
3336 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3336 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3337 "%11d %5d %8d\n" %
3337 "%11d %5d %8d\n" %
3338 (rev, p1, p2, r.start(rev), r.end(rev),
3338 (rev, p1, p2, r.start(rev), r.end(rev),
3339 r.start(dbase), r.start(cbase),
3339 r.start(dbase), r.start(cbase),
3340 r.start(p1), r.start(p2),
3340 r.start(p1), r.start(p2),
3341 rs, ts, compression, len(heads), clen))
3341 rs, ts, compression, len(heads), clen))
3342 return 0
3342 return 0
3343
3343
3344 v = r.version
3344 v = r.version
3345 format = v & 0xFFFF
3345 format = v & 0xFFFF
3346 flags = []
3346 flags = []
3347 gdelta = False
3347 gdelta = False
3348 if v & revlog.REVLOGNGINLINEDATA:
3348 if v & revlog.REVLOGNGINLINEDATA:
3349 flags.append('inline')
3349 flags.append('inline')
3350 if v & revlog.REVLOGGENERALDELTA:
3350 if v & revlog.REVLOGGENERALDELTA:
3351 gdelta = True
3351 gdelta = True
3352 flags.append('generaldelta')
3352 flags.append('generaldelta')
3353 if not flags:
3353 if not flags:
3354 flags = ['(none)']
3354 flags = ['(none)']
3355
3355
3356 nummerges = 0
3356 nummerges = 0
3357 numfull = 0
3357 numfull = 0
3358 numprev = 0
3358 numprev = 0
3359 nump1 = 0
3359 nump1 = 0
3360 nump2 = 0
3360 nump2 = 0
3361 numother = 0
3361 numother = 0
3362 nump1prev = 0
3362 nump1prev = 0
3363 nump2prev = 0
3363 nump2prev = 0
3364 chainlengths = []
3364 chainlengths = []
3365
3365
3366 datasize = [None, 0, 0]
3366 datasize = [None, 0, 0]
3367 fullsize = [None, 0, 0]
3367 fullsize = [None, 0, 0]
3368 deltasize = [None, 0, 0]
3368 deltasize = [None, 0, 0]
3369
3369
3370 def addsize(size, l):
3370 def addsize(size, l):
3371 if l[0] is None or size < l[0]:
3371 if l[0] is None or size < l[0]:
3372 l[0] = size
3372 l[0] = size
3373 if size > l[1]:
3373 if size > l[1]:
3374 l[1] = size
3374 l[1] = size
3375 l[2] += size
3375 l[2] += size
3376
3376
3377 numrevs = len(r)
3377 numrevs = len(r)
3378 for rev in xrange(numrevs):
3378 for rev in xrange(numrevs):
3379 p1, p2 = r.parentrevs(rev)
3379 p1, p2 = r.parentrevs(rev)
3380 delta = r.deltaparent(rev)
3380 delta = r.deltaparent(rev)
3381 if format > 0:
3381 if format > 0:
3382 addsize(r.rawsize(rev), datasize)
3382 addsize(r.rawsize(rev), datasize)
3383 if p2 != nullrev:
3383 if p2 != nullrev:
3384 nummerges += 1
3384 nummerges += 1
3385 size = r.length(rev)
3385 size = r.length(rev)
3386 if delta == nullrev:
3386 if delta == nullrev:
3387 chainlengths.append(0)
3387 chainlengths.append(0)
3388 numfull += 1
3388 numfull += 1
3389 addsize(size, fullsize)
3389 addsize(size, fullsize)
3390 else:
3390 else:
3391 chainlengths.append(chainlengths[delta] + 1)
3391 chainlengths.append(chainlengths[delta] + 1)
3392 addsize(size, deltasize)
3392 addsize(size, deltasize)
3393 if delta == rev - 1:
3393 if delta == rev - 1:
3394 numprev += 1
3394 numprev += 1
3395 if delta == p1:
3395 if delta == p1:
3396 nump1prev += 1
3396 nump1prev += 1
3397 elif delta == p2:
3397 elif delta == p2:
3398 nump2prev += 1
3398 nump2prev += 1
3399 elif delta == p1:
3399 elif delta == p1:
3400 nump1 += 1
3400 nump1 += 1
3401 elif delta == p2:
3401 elif delta == p2:
3402 nump2 += 1
3402 nump2 += 1
3403 elif delta != nullrev:
3403 elif delta != nullrev:
3404 numother += 1
3404 numother += 1
3405
3405
3406 # Adjust size min value for empty cases
3406 # Adjust size min value for empty cases
3407 for size in (datasize, fullsize, deltasize):
3407 for size in (datasize, fullsize, deltasize):
3408 if size[0] is None:
3408 if size[0] is None:
3409 size[0] = 0
3409 size[0] = 0
3410
3410
3411 numdeltas = numrevs - numfull
3411 numdeltas = numrevs - numfull
3412 numoprev = numprev - nump1prev - nump2prev
3412 numoprev = numprev - nump1prev - nump2prev
3413 totalrawsize = datasize[2]
3413 totalrawsize = datasize[2]
3414 datasize[2] /= numrevs
3414 datasize[2] /= numrevs
3415 fulltotal = fullsize[2]
3415 fulltotal = fullsize[2]
3416 fullsize[2] /= numfull
3416 fullsize[2] /= numfull
3417 deltatotal = deltasize[2]
3417 deltatotal = deltasize[2]
3418 if numrevs - numfull > 0:
3418 if numrevs - numfull > 0:
3419 deltasize[2] /= numrevs - numfull
3419 deltasize[2] /= numrevs - numfull
3420 totalsize = fulltotal + deltatotal
3420 totalsize = fulltotal + deltatotal
3421 avgchainlen = sum(chainlengths) / numrevs
3421 avgchainlen = sum(chainlengths) / numrevs
3422 maxchainlen = max(chainlengths)
3422 maxchainlen = max(chainlengths)
3423 compratio = 1
3423 compratio = 1
3424 if totalsize:
3424 if totalsize:
3425 compratio = totalrawsize / totalsize
3425 compratio = totalrawsize / totalsize
3426
3426
3427 basedfmtstr = '%%%dd\n'
3427 basedfmtstr = '%%%dd\n'
3428 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3428 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3429
3429
3430 def dfmtstr(max):
3430 def dfmtstr(max):
3431 return basedfmtstr % len(str(max))
3431 return basedfmtstr % len(str(max))
3432 def pcfmtstr(max, padding=0):
3432 def pcfmtstr(max, padding=0):
3433 return basepcfmtstr % (len(str(max)), ' ' * padding)
3433 return basepcfmtstr % (len(str(max)), ' ' * padding)
3434
3434
3435 def pcfmt(value, total):
3435 def pcfmt(value, total):
3436 if total:
3436 if total:
3437 return (value, 100 * float(value) / total)
3437 return (value, 100 * float(value) / total)
3438 else:
3438 else:
3439 return value, 100.0
3439 return value, 100.0
3440
3440
3441 ui.write(('format : %d\n') % format)
3441 ui.write(('format : %d\n') % format)
3442 ui.write(('flags : %s\n') % ', '.join(flags))
3442 ui.write(('flags : %s\n') % ', '.join(flags))
3443
3443
3444 ui.write('\n')
3444 ui.write('\n')
3445 fmt = pcfmtstr(totalsize)
3445 fmt = pcfmtstr(totalsize)
3446 fmt2 = dfmtstr(totalsize)
3446 fmt2 = dfmtstr(totalsize)
3447 ui.write(('revisions : ') + fmt2 % numrevs)
3447 ui.write(('revisions : ') + fmt2 % numrevs)
3448 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3448 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3449 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3449 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3450 ui.write(('revisions : ') + fmt2 % numrevs)
3450 ui.write(('revisions : ') + fmt2 % numrevs)
3451 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3451 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3452 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3452 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3453 ui.write(('revision size : ') + fmt2 % totalsize)
3453 ui.write(('revision size : ') + fmt2 % totalsize)
3454 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3454 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3455 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3455 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3456
3456
3457 ui.write('\n')
3457 ui.write('\n')
3458 fmt = dfmtstr(max(avgchainlen, compratio))
3458 fmt = dfmtstr(max(avgchainlen, compratio))
3459 ui.write(('avg chain length : ') + fmt % avgchainlen)
3459 ui.write(('avg chain length : ') + fmt % avgchainlen)
3460 ui.write(('max chain length : ') + fmt % maxchainlen)
3460 ui.write(('max chain length : ') + fmt % maxchainlen)
3461 ui.write(('compression ratio : ') + fmt % compratio)
3461 ui.write(('compression ratio : ') + fmt % compratio)
3462
3462
3463 if format > 0:
3463 if format > 0:
3464 ui.write('\n')
3464 ui.write('\n')
3465 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3465 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3466 % tuple(datasize))
3466 % tuple(datasize))
3467 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3467 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3468 % tuple(fullsize))
3468 % tuple(fullsize))
3469 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3469 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3470 % tuple(deltasize))
3470 % tuple(deltasize))
3471
3471
3472 if numdeltas > 0:
3472 if numdeltas > 0:
3473 ui.write('\n')
3473 ui.write('\n')
3474 fmt = pcfmtstr(numdeltas)
3474 fmt = pcfmtstr(numdeltas)
3475 fmt2 = pcfmtstr(numdeltas, 4)
3475 fmt2 = pcfmtstr(numdeltas, 4)
3476 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3476 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3477 if numprev > 0:
3477 if numprev > 0:
3478 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3478 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3479 numprev))
3479 numprev))
3480 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3480 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3481 numprev))
3481 numprev))
3482 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3482 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3483 numprev))
3483 numprev))
3484 if gdelta:
3484 if gdelta:
3485 ui.write(('deltas against p1 : ')
3485 ui.write(('deltas against p1 : ')
3486 + fmt % pcfmt(nump1, numdeltas))
3486 + fmt % pcfmt(nump1, numdeltas))
3487 ui.write(('deltas against p2 : ')
3487 ui.write(('deltas against p2 : ')
3488 + fmt % pcfmt(nump2, numdeltas))
3488 + fmt % pcfmt(nump2, numdeltas))
3489 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3489 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3490 numdeltas))
3490 numdeltas))
3491
3491
3492 @command('debugrevspec',
3492 @command('debugrevspec',
3493 [('', 'optimize', None,
3493 [('', 'optimize', None,
3494 _('print parsed tree after optimizing (DEPRECATED)')),
3494 _('print parsed tree after optimizing (DEPRECATED)')),
3495 ('p', 'show-stage', [],
3495 ('p', 'show-stage', [],
3496 _('print parsed tree at the given stage'), _('NAME')),
3496 _('print parsed tree at the given stage'), _('NAME')),
3497 ('', 'no-optimized', False, _('evaluate tree without optimization')),
3497 ('', 'no-optimized', False, _('evaluate tree without optimization')),
3498 ('', 'verify-optimized', False, _('verify optimized result')),
3498 ('', 'verify-optimized', False, _('verify optimized result')),
3499 ],
3499 ],
3500 ('REVSPEC'))
3500 ('REVSPEC'))
3501 def debugrevspec(ui, repo, expr, **opts):
3501 def debugrevspec(ui, repo, expr, **opts):
3502 """parse and apply a revision specification
3502 """parse and apply a revision specification
3503
3503
3504 Use -p/--show-stage option to print the parsed tree at the given stages.
3504 Use -p/--show-stage option to print the parsed tree at the given stages.
3505 Use -p all to print tree at every stage.
3505 Use -p all to print tree at every stage.
3506
3506
3507 Use --verify-optimized to compare the optimized result with the unoptimized
3507 Use --verify-optimized to compare the optimized result with the unoptimized
3508 one. Returns 1 if the optimized result differs.
3508 one. Returns 1 if the optimized result differs.
3509 """
3509 """
3510 stages = [
3510 stages = [
3511 ('parsed', lambda tree: tree),
3511 ('parsed', lambda tree: tree),
3512 ('expanded', lambda tree: revset.expandaliases(ui, tree)),
3512 ('expanded', lambda tree: revset.expandaliases(ui, tree)),
3513 ('concatenated', revset.foldconcat),
3513 ('concatenated', revset.foldconcat),
3514 ('analyzed', revset.analyze),
3514 ('analyzed', revset.analyze),
3515 ('optimized', revset.optimize),
3515 ('optimized', revset.optimize),
3516 ]
3516 ]
3517 if opts['no_optimized']:
3517 if opts['no_optimized']:
3518 stages = stages[:-1]
3518 stages = stages[:-1]
3519 if opts['verify_optimized'] and opts['no_optimized']:
3519 if opts['verify_optimized'] and opts['no_optimized']:
3520 raise error.Abort(_('cannot use --verify-optimized with '
3520 raise error.Abort(_('cannot use --verify-optimized with '
3521 '--no-optimized'))
3521 '--no-optimized'))
3522 stagenames = set(n for n, f in stages)
3522 stagenames = set(n for n, f in stages)
3523
3523
3524 showalways = set()
3524 showalways = set()
3525 showchanged = set()
3525 showchanged = set()
3526 if ui.verbose and not opts['show_stage']:
3526 if ui.verbose and not opts['show_stage']:
3527 # show parsed tree by --verbose (deprecated)
3527 # show parsed tree by --verbose (deprecated)
3528 showalways.add('parsed')
3528 showalways.add('parsed')
3529 showchanged.update(['expanded', 'concatenated'])
3529 showchanged.update(['expanded', 'concatenated'])
3530 if opts['optimize']:
3530 if opts['optimize']:
3531 showalways.add('optimized')
3531 showalways.add('optimized')
3532 if opts['show_stage'] and opts['optimize']:
3532 if opts['show_stage'] and opts['optimize']:
3533 raise error.Abort(_('cannot use --optimize with --show-stage'))
3533 raise error.Abort(_('cannot use --optimize with --show-stage'))
3534 if opts['show_stage'] == ['all']:
3534 if opts['show_stage'] == ['all']:
3535 showalways.update(stagenames)
3535 showalways.update(stagenames)
3536 else:
3536 else:
3537 for n in opts['show_stage']:
3537 for n in opts['show_stage']:
3538 if n not in stagenames:
3538 if n not in stagenames:
3539 raise error.Abort(_('invalid stage name: %s') % n)
3539 raise error.Abort(_('invalid stage name: %s') % n)
3540 showalways.update(opts['show_stage'])
3540 showalways.update(opts['show_stage'])
3541
3541
3542 treebystage = {}
3542 treebystage = {}
3543 printedtree = None
3543 printedtree = None
3544 tree = revset.parse(expr, lookup=repo.__contains__)
3544 tree = revset.parse(expr, lookup=repo.__contains__)
3545 for n, f in stages:
3545 for n, f in stages:
3546 treebystage[n] = tree = f(tree)
3546 treebystage[n] = tree = f(tree)
3547 if n in showalways or (n in showchanged and tree != printedtree):
3547 if n in showalways or (n in showchanged and tree != printedtree):
3548 if opts['show_stage'] or n != 'parsed':
3548 if opts['show_stage'] or n != 'parsed':
3549 ui.write(("* %s:\n") % n)
3549 ui.write(("* %s:\n") % n)
3550 ui.write(revset.prettyformat(tree), "\n")
3550 ui.write(revset.prettyformat(tree), "\n")
3551 printedtree = tree
3551 printedtree = tree
3552
3552
3553 if opts['verify_optimized']:
3553 if opts['verify_optimized']:
3554 arevs = revset.makematcher(treebystage['analyzed'])(repo)
3554 arevs = revset.makematcher(treebystage['analyzed'])(repo)
3555 brevs = revset.makematcher(treebystage['optimized'])(repo)
3555 brevs = revset.makematcher(treebystage['optimized'])(repo)
3556 if ui.verbose:
3556 if ui.verbose:
3557 ui.note(("* analyzed set:\n"), revset.prettyformatset(arevs), "\n")
3557 ui.note(("* analyzed set:\n"), revset.prettyformatset(arevs), "\n")
3558 ui.note(("* optimized set:\n"), revset.prettyformatset(brevs), "\n")
3558 ui.note(("* optimized set:\n"), revset.prettyformatset(brevs), "\n")
3559 arevs = list(arevs)
3559 arevs = list(arevs)
3560 brevs = list(brevs)
3560 brevs = list(brevs)
3561 if arevs == brevs:
3561 if arevs == brevs:
3562 return 0
3562 return 0
3563 ui.write(('--- analyzed\n'), label='diff.file_a')
3563 ui.write(('--- analyzed\n'), label='diff.file_a')
3564 ui.write(('+++ optimized\n'), label='diff.file_b')
3564 ui.write(('+++ optimized\n'), label='diff.file_b')
3565 sm = difflib.SequenceMatcher(None, arevs, brevs)
3565 sm = difflib.SequenceMatcher(None, arevs, brevs)
3566 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3566 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3567 if tag in ('delete', 'replace'):
3567 if tag in ('delete', 'replace'):
3568 for c in arevs[alo:ahi]:
3568 for c in arevs[alo:ahi]:
3569 ui.write('-%s\n' % c, label='diff.deleted')
3569 ui.write('-%s\n' % c, label='diff.deleted')
3570 if tag in ('insert', 'replace'):
3570 if tag in ('insert', 'replace'):
3571 for c in brevs[blo:bhi]:
3571 for c in brevs[blo:bhi]:
3572 ui.write('+%s\n' % c, label='diff.inserted')
3572 ui.write('+%s\n' % c, label='diff.inserted')
3573 if tag == 'equal':
3573 if tag == 'equal':
3574 for c in arevs[alo:ahi]:
3574 for c in arevs[alo:ahi]:
3575 ui.write(' %s\n' % c)
3575 ui.write(' %s\n' % c)
3576 return 1
3576 return 1
3577
3577
3578 func = revset.makematcher(tree)
3578 func = revset.makematcher(tree)
3579 revs = func(repo)
3579 revs = func(repo)
3580 if ui.verbose:
3580 if ui.verbose:
3581 ui.note(("* set:\n"), revset.prettyformatset(revs), "\n")
3581 ui.note(("* set:\n"), revset.prettyformatset(revs), "\n")
3582 for c in revs:
3582 for c in revs:
3583 ui.write("%s\n" % c)
3583 ui.write("%s\n" % c)
3584
3584
3585 @command('debugsetparents', [], _('REV1 [REV2]'))
3585 @command('debugsetparents', [], _('REV1 [REV2]'))
3586 def debugsetparents(ui, repo, rev1, rev2=None):
3586 def debugsetparents(ui, repo, rev1, rev2=None):
3587 """manually set the parents of the current working directory
3587 """manually set the parents of the current working directory
3588
3588
3589 This is useful for writing repository conversion tools, but should
3589 This is useful for writing repository conversion tools, but should
3590 be used with care. For example, neither the working directory nor the
3590 be used with care. For example, neither the working directory nor the
3591 dirstate is updated, so file status may be incorrect after running this
3591 dirstate is updated, so file status may be incorrect after running this
3592 command.
3592 command.
3593
3593
3594 Returns 0 on success.
3594 Returns 0 on success.
3595 """
3595 """
3596
3596
3597 r1 = scmutil.revsingle(repo, rev1).node()
3597 r1 = scmutil.revsingle(repo, rev1).node()
3598 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3598 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3599
3599
3600 with repo.wlock():
3600 with repo.wlock():
3601 repo.setparents(r1, r2)
3601 repo.setparents(r1, r2)
3602
3602
3603 @command('debugdirstate|debugstate',
3603 @command('debugdirstate|debugstate',
3604 [('', 'nodates', None, _('do not display the saved mtime')),
3604 [('', 'nodates', None, _('do not display the saved mtime')),
3605 ('', 'datesort', None, _('sort by saved mtime'))],
3605 ('', 'datesort', None, _('sort by saved mtime'))],
3606 _('[OPTION]...'))
3606 _('[OPTION]...'))
3607 def debugstate(ui, repo, **opts):
3607 def debugstate(ui, repo, **opts):
3608 """show the contents of the current dirstate"""
3608 """show the contents of the current dirstate"""
3609
3609
3610 nodates = opts.get('nodates')
3610 nodates = opts.get('nodates')
3611 datesort = opts.get('datesort')
3611 datesort = opts.get('datesort')
3612
3612
3613 timestr = ""
3613 timestr = ""
3614 if datesort:
3614 if datesort:
3615 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3615 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3616 else:
3616 else:
3617 keyfunc = None # sort by filename
3617 keyfunc = None # sort by filename
3618 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3618 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3619 if ent[3] == -1:
3619 if ent[3] == -1:
3620 timestr = 'unset '
3620 timestr = 'unset '
3621 elif nodates:
3621 elif nodates:
3622 timestr = 'set '
3622 timestr = 'set '
3623 else:
3623 else:
3624 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3624 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3625 time.localtime(ent[3]))
3625 time.localtime(ent[3]))
3626 if ent[1] & 0o20000:
3626 if ent[1] & 0o20000:
3627 mode = 'lnk'
3627 mode = 'lnk'
3628 else:
3628 else:
3629 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3629 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3630 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3630 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3631 for f in repo.dirstate.copies():
3631 for f in repo.dirstate.copies():
3632 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3632 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3633
3633
3634 @command('debugsub',
3634 @command('debugsub',
3635 [('r', 'rev', '',
3635 [('r', 'rev', '',
3636 _('revision to check'), _('REV'))],
3636 _('revision to check'), _('REV'))],
3637 _('[-r REV] [REV]'))
3637 _('[-r REV] [REV]'))
3638 def debugsub(ui, repo, rev=None):
3638 def debugsub(ui, repo, rev=None):
3639 ctx = scmutil.revsingle(repo, rev, None)
3639 ctx = scmutil.revsingle(repo, rev, None)
3640 for k, v in sorted(ctx.substate.items()):
3640 for k, v in sorted(ctx.substate.items()):
3641 ui.write(('path %s\n') % k)
3641 ui.write(('path %s\n') % k)
3642 ui.write((' source %s\n') % v[0])
3642 ui.write((' source %s\n') % v[0])
3643 ui.write((' revision %s\n') % v[1])
3643 ui.write((' revision %s\n') % v[1])
3644
3644
3645 @command('debugsuccessorssets',
3645 @command('debugsuccessorssets',
3646 [],
3646 [],
3647 _('[REV]'))
3647 _('[REV]'))
3648 def debugsuccessorssets(ui, repo, *revs):
3648 def debugsuccessorssets(ui, repo, *revs):
3649 """show set of successors for revision
3649 """show set of successors for revision
3650
3650
3651 A successors set of changeset A is a consistent group of revisions that
3651 A successors set of changeset A is a consistent group of revisions that
3652 succeed A. It contains non-obsolete changesets only.
3652 succeed A. It contains non-obsolete changesets only.
3653
3653
3654 In most cases a changeset A has a single successors set containing a single
3654 In most cases a changeset A has a single successors set containing a single
3655 successor (changeset A replaced by A').
3655 successor (changeset A replaced by A').
3656
3656
3657 A changeset that is made obsolete with no successors are called "pruned".
3657 A changeset that is made obsolete with no successors are called "pruned".
3658 Such changesets have no successors sets at all.
3658 Such changesets have no successors sets at all.
3659
3659
3660 A changeset that has been "split" will have a successors set containing
3660 A changeset that has been "split" will have a successors set containing
3661 more than one successor.
3661 more than one successor.
3662
3662
3663 A changeset that has been rewritten in multiple different ways is called
3663 A changeset that has been rewritten in multiple different ways is called
3664 "divergent". Such changesets have multiple successor sets (each of which
3664 "divergent". Such changesets have multiple successor sets (each of which
3665 may also be split, i.e. have multiple successors).
3665 may also be split, i.e. have multiple successors).
3666
3666
3667 Results are displayed as follows::
3667 Results are displayed as follows::
3668
3668
3669 <rev1>
3669 <rev1>
3670 <successors-1A>
3670 <successors-1A>
3671 <rev2>
3671 <rev2>
3672 <successors-2A>
3672 <successors-2A>
3673 <successors-2B1> <successors-2B2> <successors-2B3>
3673 <successors-2B1> <successors-2B2> <successors-2B3>
3674
3674
3675 Here rev2 has two possible (i.e. divergent) successors sets. The first
3675 Here rev2 has two possible (i.e. divergent) successors sets. The first
3676 holds one element, whereas the second holds three (i.e. the changeset has
3676 holds one element, whereas the second holds three (i.e. the changeset has
3677 been split).
3677 been split).
3678 """
3678 """
3679 # passed to successorssets caching computation from one call to another
3679 # passed to successorssets caching computation from one call to another
3680 cache = {}
3680 cache = {}
3681 ctx2str = str
3681 ctx2str = str
3682 node2str = short
3682 node2str = short
3683 if ui.debug():
3683 if ui.debug():
3684 def ctx2str(ctx):
3684 def ctx2str(ctx):
3685 return ctx.hex()
3685 return ctx.hex()
3686 node2str = hex
3686 node2str = hex
3687 for rev in scmutil.revrange(repo, revs):
3687 for rev in scmutil.revrange(repo, revs):
3688 ctx = repo[rev]
3688 ctx = repo[rev]
3689 ui.write('%s\n'% ctx2str(ctx))
3689 ui.write('%s\n'% ctx2str(ctx))
3690 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3690 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3691 if succsset:
3691 if succsset:
3692 ui.write(' ')
3692 ui.write(' ')
3693 ui.write(node2str(succsset[0]))
3693 ui.write(node2str(succsset[0]))
3694 for node in succsset[1:]:
3694 for node in succsset[1:]:
3695 ui.write(' ')
3695 ui.write(' ')
3696 ui.write(node2str(node))
3696 ui.write(node2str(node))
3697 ui.write('\n')
3697 ui.write('\n')
3698
3698
3699 @command('debugtemplate',
3699 @command('debugtemplate',
3700 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
3700 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
3701 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
3701 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
3702 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
3702 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
3703 optionalrepo=True)
3703 optionalrepo=True)
3704 def debugtemplate(ui, repo, tmpl, **opts):
3704 def debugtemplate(ui, repo, tmpl, **opts):
3705 """parse and apply a template
3705 """parse and apply a template
3706
3706
3707 If -r/--rev is given, the template is processed as a log template and
3707 If -r/--rev is given, the template is processed as a log template and
3708 applied to the given changesets. Otherwise, it is processed as a generic
3708 applied to the given changesets. Otherwise, it is processed as a generic
3709 template.
3709 template.
3710
3710
3711 Use --verbose to print the parsed tree.
3711 Use --verbose to print the parsed tree.
3712 """
3712 """
3713 revs = None
3713 revs = None
3714 if opts['rev']:
3714 if opts['rev']:
3715 if repo is None:
3715 if repo is None:
3716 raise error.RepoError(_('there is no Mercurial repository here '
3716 raise error.RepoError(_('there is no Mercurial repository here '
3717 '(.hg not found)'))
3717 '(.hg not found)'))
3718 revs = scmutil.revrange(repo, opts['rev'])
3718 revs = scmutil.revrange(repo, opts['rev'])
3719
3719
3720 props = {}
3720 props = {}
3721 for d in opts['define']:
3721 for d in opts['define']:
3722 try:
3722 try:
3723 k, v = (e.strip() for e in d.split('=', 1))
3723 k, v = (e.strip() for e in d.split('=', 1))
3724 if not k:
3724 if not k:
3725 raise ValueError
3725 raise ValueError
3726 props[k] = v
3726 props[k] = v
3727 except ValueError:
3727 except ValueError:
3728 raise error.Abort(_('malformed keyword definition: %s') % d)
3728 raise error.Abort(_('malformed keyword definition: %s') % d)
3729
3729
3730 if ui.verbose:
3730 if ui.verbose:
3731 aliases = ui.configitems('templatealias')
3731 aliases = ui.configitems('templatealias')
3732 tree = templater.parse(tmpl)
3732 tree = templater.parse(tmpl)
3733 ui.note(templater.prettyformat(tree), '\n')
3733 ui.note(templater.prettyformat(tree), '\n')
3734 newtree = templater.expandaliases(tree, aliases)
3734 newtree = templater.expandaliases(tree, aliases)
3735 if newtree != tree:
3735 if newtree != tree:
3736 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n')
3736 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n')
3737
3737
3738 mapfile = None
3738 mapfile = None
3739 if revs is None:
3739 if revs is None:
3740 k = 'debugtemplate'
3740 k = 'debugtemplate'
3741 t = formatter.maketemplater(ui, k, tmpl)
3741 t = formatter.maketemplater(ui, k, tmpl)
3742 ui.write(templater.stringify(t(k, **props)))
3742 ui.write(templater.stringify(t(k, **props)))
3743 else:
3743 else:
3744 displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl,
3744 displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl,
3745 mapfile, buffered=False)
3745 mapfile, buffered=False)
3746 for r in revs:
3746 for r in revs:
3747 displayer.show(repo[r], **props)
3747 displayer.show(repo[r], **props)
3748 displayer.close()
3748 displayer.close()
3749
3749
3750 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3750 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3751 def debugwalk(ui, repo, *pats, **opts):
3751 def debugwalk(ui, repo, *pats, **opts):
3752 """show how files match on given patterns"""
3752 """show how files match on given patterns"""
3753 m = scmutil.match(repo[None], pats, opts)
3753 m = scmutil.match(repo[None], pats, opts)
3754 items = list(repo.walk(m))
3754 items = list(repo.walk(m))
3755 if not items:
3755 if not items:
3756 return
3756 return
3757 f = lambda fn: fn
3757 f = lambda fn: fn
3758 if ui.configbool('ui', 'slash') and os.sep != '/':
3758 if ui.configbool('ui', 'slash') and os.sep != '/':
3759 f = lambda fn: util.normpath(fn)
3759 f = lambda fn: util.normpath(fn)
3760 fmt = 'f %%-%ds %%-%ds %%s' % (
3760 fmt = 'f %%-%ds %%-%ds %%s' % (
3761 max([len(abs) for abs in items]),
3761 max([len(abs) for abs in items]),
3762 max([len(m.rel(abs)) for abs in items]))
3762 max([len(m.rel(abs)) for abs in items]))
3763 for abs in items:
3763 for abs in items:
3764 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3764 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3765 ui.write("%s\n" % line.rstrip())
3765 ui.write("%s\n" % line.rstrip())
3766
3766
3767 @command('debugwireargs',
3767 @command('debugwireargs',
3768 [('', 'three', '', 'three'),
3768 [('', 'three', '', 'three'),
3769 ('', 'four', '', 'four'),
3769 ('', 'four', '', 'four'),
3770 ('', 'five', '', 'five'),
3770 ('', 'five', '', 'five'),
3771 ] + remoteopts,
3771 ] + remoteopts,
3772 _('REPO [OPTIONS]... [ONE [TWO]]'),
3772 _('REPO [OPTIONS]... [ONE [TWO]]'),
3773 norepo=True)
3773 norepo=True)
3774 def debugwireargs(ui, repopath, *vals, **opts):
3774 def debugwireargs(ui, repopath, *vals, **opts):
3775 repo = hg.peer(ui, opts, repopath)
3775 repo = hg.peer(ui, opts, repopath)
3776 for opt in remoteopts:
3776 for opt in remoteopts:
3777 del opts[opt[1]]
3777 del opts[opt[1]]
3778 args = {}
3778 args = {}
3779 for k, v in opts.iteritems():
3779 for k, v in opts.iteritems():
3780 if v:
3780 if v:
3781 args[k] = v
3781 args[k] = v
3782 # run twice to check that we don't mess up the stream for the next command
3782 # run twice to check that we don't mess up the stream for the next command
3783 res1 = repo.debugwireargs(*vals, **args)
3783 res1 = repo.debugwireargs(*vals, **args)
3784 res2 = repo.debugwireargs(*vals, **args)
3784 res2 = repo.debugwireargs(*vals, **args)
3785 ui.write("%s\n" % res1)
3785 ui.write("%s\n" % res1)
3786 if res1 != res2:
3786 if res1 != res2:
3787 ui.warn("%s\n" % res2)
3787 ui.warn("%s\n" % res2)
3788
3788
3789 @command('^diff',
3789 @command('^diff',
3790 [('r', 'rev', [], _('revision'), _('REV')),
3790 [('r', 'rev', [], _('revision'), _('REV')),
3791 ('c', 'change', '', _('change made by revision'), _('REV'))
3791 ('c', 'change', '', _('change made by revision'), _('REV'))
3792 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3792 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3793 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3793 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3794 inferrepo=True)
3794 inferrepo=True)
3795 def diff(ui, repo, *pats, **opts):
3795 def diff(ui, repo, *pats, **opts):
3796 """diff repository (or selected files)
3796 """diff repository (or selected files)
3797
3797
3798 Show differences between revisions for the specified files.
3798 Show differences between revisions for the specified files.
3799
3799
3800 Differences between files are shown using the unified diff format.
3800 Differences between files are shown using the unified diff format.
3801
3801
3802 .. note::
3802 .. note::
3803
3803
3804 :hg:`diff` may generate unexpected results for merges, as it will
3804 :hg:`diff` may generate unexpected results for merges, as it will
3805 default to comparing against the working directory's first
3805 default to comparing against the working directory's first
3806 parent changeset if no revisions are specified.
3806 parent changeset if no revisions are specified.
3807
3807
3808 When two revision arguments are given, then changes are shown
3808 When two revision arguments are given, then changes are shown
3809 between those revisions. If only one revision is specified then
3809 between those revisions. If only one revision is specified then
3810 that revision is compared to the working directory, and, when no
3810 that revision is compared to the working directory, and, when no
3811 revisions are specified, the working directory files are compared
3811 revisions are specified, the working directory files are compared
3812 to its first parent.
3812 to its first parent.
3813
3813
3814 Alternatively you can specify -c/--change with a revision to see
3814 Alternatively you can specify -c/--change with a revision to see
3815 the changes in that changeset relative to its first parent.
3815 the changes in that changeset relative to its first parent.
3816
3816
3817 Without the -a/--text option, diff will avoid generating diffs of
3817 Without the -a/--text option, diff will avoid generating diffs of
3818 files it detects as binary. With -a, diff will generate a diff
3818 files it detects as binary. With -a, diff will generate a diff
3819 anyway, probably with undesirable results.
3819 anyway, probably with undesirable results.
3820
3820
3821 Use the -g/--git option to generate diffs in the git extended diff
3821 Use the -g/--git option to generate diffs in the git extended diff
3822 format. For more information, read :hg:`help diffs`.
3822 format. For more information, read :hg:`help diffs`.
3823
3823
3824 .. container:: verbose
3824 .. container:: verbose
3825
3825
3826 Examples:
3826 Examples:
3827
3827
3828 - compare a file in the current working directory to its parent::
3828 - compare a file in the current working directory to its parent::
3829
3829
3830 hg diff foo.c
3830 hg diff foo.c
3831
3831
3832 - compare two historical versions of a directory, with rename info::
3832 - compare two historical versions of a directory, with rename info::
3833
3833
3834 hg diff --git -r 1.0:1.2 lib/
3834 hg diff --git -r 1.0:1.2 lib/
3835
3835
3836 - get change stats relative to the last change on some date::
3836 - get change stats relative to the last change on some date::
3837
3837
3838 hg diff --stat -r "date('may 2')"
3838 hg diff --stat -r "date('may 2')"
3839
3839
3840 - diff all newly-added files that contain a keyword::
3840 - diff all newly-added files that contain a keyword::
3841
3841
3842 hg diff "set:added() and grep(GNU)"
3842 hg diff "set:added() and grep(GNU)"
3843
3843
3844 - compare a revision and its parents::
3844 - compare a revision and its parents::
3845
3845
3846 hg diff -c 9353 # compare against first parent
3846 hg diff -c 9353 # compare against first parent
3847 hg diff -r 9353^:9353 # same using revset syntax
3847 hg diff -r 9353^:9353 # same using revset syntax
3848 hg diff -r 9353^2:9353 # compare against the second parent
3848 hg diff -r 9353^2:9353 # compare against the second parent
3849
3849
3850 Returns 0 on success.
3850 Returns 0 on success.
3851 """
3851 """
3852
3852
3853 revs = opts.get('rev')
3853 revs = opts.get('rev')
3854 change = opts.get('change')
3854 change = opts.get('change')
3855 stat = opts.get('stat')
3855 stat = opts.get('stat')
3856 reverse = opts.get('reverse')
3856 reverse = opts.get('reverse')
3857
3857
3858 if revs and change:
3858 if revs and change:
3859 msg = _('cannot specify --rev and --change at the same time')
3859 msg = _('cannot specify --rev and --change at the same time')
3860 raise error.Abort(msg)
3860 raise error.Abort(msg)
3861 elif change:
3861 elif change:
3862 node2 = scmutil.revsingle(repo, change, None).node()
3862 node2 = scmutil.revsingle(repo, change, None).node()
3863 node1 = repo[node2].p1().node()
3863 node1 = repo[node2].p1().node()
3864 else:
3864 else:
3865 node1, node2 = scmutil.revpair(repo, revs)
3865 node1, node2 = scmutil.revpair(repo, revs)
3866
3866
3867 if reverse:
3867 if reverse:
3868 node1, node2 = node2, node1
3868 node1, node2 = node2, node1
3869
3869
3870 diffopts = patch.diffallopts(ui, opts)
3870 diffopts = patch.diffallopts(ui, opts)
3871 m = scmutil.match(repo[node2], pats, opts)
3871 m = scmutil.match(repo[node2], pats, opts)
3872 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3872 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3873 listsubrepos=opts.get('subrepos'),
3873 listsubrepos=opts.get('subrepos'),
3874 root=opts.get('root'))
3874 root=opts.get('root'))
3875
3875
3876 @command('^export',
3876 @command('^export',
3877 [('o', 'output', '',
3877 [('o', 'output', '',
3878 _('print output to file with formatted name'), _('FORMAT')),
3878 _('print output to file with formatted name'), _('FORMAT')),
3879 ('', 'switch-parent', None, _('diff against the second parent')),
3879 ('', 'switch-parent', None, _('diff against the second parent')),
3880 ('r', 'rev', [], _('revisions to export'), _('REV')),
3880 ('r', 'rev', [], _('revisions to export'), _('REV')),
3881 ] + diffopts,
3881 ] + diffopts,
3882 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3882 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3883 def export(ui, repo, *changesets, **opts):
3883 def export(ui, repo, *changesets, **opts):
3884 """dump the header and diffs for one or more changesets
3884 """dump the header and diffs for one or more changesets
3885
3885
3886 Print the changeset header and diffs for one or more revisions.
3886 Print the changeset header and diffs for one or more revisions.
3887 If no revision is given, the parent of the working directory is used.
3887 If no revision is given, the parent of the working directory is used.
3888
3888
3889 The information shown in the changeset header is: author, date,
3889 The information shown in the changeset header is: author, date,
3890 branch name (if non-default), changeset hash, parent(s) and commit
3890 branch name (if non-default), changeset hash, parent(s) and commit
3891 comment.
3891 comment.
3892
3892
3893 .. note::
3893 .. note::
3894
3894
3895 :hg:`export` may generate unexpected diff output for merge
3895 :hg:`export` may generate unexpected diff output for merge
3896 changesets, as it will compare the merge changeset against its
3896 changesets, as it will compare the merge changeset against its
3897 first parent only.
3897 first parent only.
3898
3898
3899 Output may be to a file, in which case the name of the file is
3899 Output may be to a file, in which case the name of the file is
3900 given using a format string. The formatting rules are as follows:
3900 given using a format string. The formatting rules are as follows:
3901
3901
3902 :``%%``: literal "%" character
3902 :``%%``: literal "%" character
3903 :``%H``: changeset hash (40 hexadecimal digits)
3903 :``%H``: changeset hash (40 hexadecimal digits)
3904 :``%N``: number of patches being generated
3904 :``%N``: number of patches being generated
3905 :``%R``: changeset revision number
3905 :``%R``: changeset revision number
3906 :``%b``: basename of the exporting repository
3906 :``%b``: basename of the exporting repository
3907 :``%h``: short-form changeset hash (12 hexadecimal digits)
3907 :``%h``: short-form changeset hash (12 hexadecimal digits)
3908 :``%m``: first line of the commit message (only alphanumeric characters)
3908 :``%m``: first line of the commit message (only alphanumeric characters)
3909 :``%n``: zero-padded sequence number, starting at 1
3909 :``%n``: zero-padded sequence number, starting at 1
3910 :``%r``: zero-padded changeset revision number
3910 :``%r``: zero-padded changeset revision number
3911
3911
3912 Without the -a/--text option, export will avoid generating diffs
3912 Without the -a/--text option, export will avoid generating diffs
3913 of files it detects as binary. With -a, export will generate a
3913 of files it detects as binary. With -a, export will generate a
3914 diff anyway, probably with undesirable results.
3914 diff anyway, probably with undesirable results.
3915
3915
3916 Use the -g/--git option to generate diffs in the git extended diff
3916 Use the -g/--git option to generate diffs in the git extended diff
3917 format. See :hg:`help diffs` for more information.
3917 format. See :hg:`help diffs` for more information.
3918
3918
3919 With the --switch-parent option, the diff will be against the
3919 With the --switch-parent option, the diff will be against the
3920 second parent. It can be useful to review a merge.
3920 second parent. It can be useful to review a merge.
3921
3921
3922 .. container:: verbose
3922 .. container:: verbose
3923
3923
3924 Examples:
3924 Examples:
3925
3925
3926 - use export and import to transplant a bugfix to the current
3926 - use export and import to transplant a bugfix to the current
3927 branch::
3927 branch::
3928
3928
3929 hg export -r 9353 | hg import -
3929 hg export -r 9353 | hg import -
3930
3930
3931 - export all the changesets between two revisions to a file with
3931 - export all the changesets between two revisions to a file with
3932 rename information::
3932 rename information::
3933
3933
3934 hg export --git -r 123:150 > changes.txt
3934 hg export --git -r 123:150 > changes.txt
3935
3935
3936 - split outgoing changes into a series of patches with
3936 - split outgoing changes into a series of patches with
3937 descriptive names::
3937 descriptive names::
3938
3938
3939 hg export -r "outgoing()" -o "%n-%m.patch"
3939 hg export -r "outgoing()" -o "%n-%m.patch"
3940
3940
3941 Returns 0 on success.
3941 Returns 0 on success.
3942 """
3942 """
3943 changesets += tuple(opts.get('rev', []))
3943 changesets += tuple(opts.get('rev', []))
3944 if not changesets:
3944 if not changesets:
3945 changesets = ['.']
3945 changesets = ['.']
3946 revs = scmutil.revrange(repo, changesets)
3946 revs = scmutil.revrange(repo, changesets)
3947 if not revs:
3947 if not revs:
3948 raise error.Abort(_("export requires at least one changeset"))
3948 raise error.Abort(_("export requires at least one changeset"))
3949 if len(revs) > 1:
3949 if len(revs) > 1:
3950 ui.note(_('exporting patches:\n'))
3950 ui.note(_('exporting patches:\n'))
3951 else:
3951 else:
3952 ui.note(_('exporting patch:\n'))
3952 ui.note(_('exporting patch:\n'))
3953 cmdutil.export(repo, revs, template=opts.get('output'),
3953 cmdutil.export(repo, revs, template=opts.get('output'),
3954 switch_parent=opts.get('switch_parent'),
3954 switch_parent=opts.get('switch_parent'),
3955 opts=patch.diffallopts(ui, opts))
3955 opts=patch.diffallopts(ui, opts))
3956
3956
3957 @command('files',
3957 @command('files',
3958 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3958 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3959 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3959 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3960 ] + walkopts + formatteropts + subrepoopts,
3960 ] + walkopts + formatteropts + subrepoopts,
3961 _('[OPTION]... [FILE]...'))
3961 _('[OPTION]... [FILE]...'))
3962 def files(ui, repo, *pats, **opts):
3962 def files(ui, repo, *pats, **opts):
3963 """list tracked files
3963 """list tracked files
3964
3964
3965 Print files under Mercurial control in the working directory or
3965 Print files under Mercurial control in the working directory or
3966 specified revision for given files (excluding removed files).
3966 specified revision for given files (excluding removed files).
3967 Files can be specified as filenames or filesets.
3967 Files can be specified as filenames or filesets.
3968
3968
3969 If no files are given to match, this command prints the names
3969 If no files are given to match, this command prints the names
3970 of all files under Mercurial control.
3970 of all files under Mercurial control.
3971
3971
3972 .. container:: verbose
3972 .. container:: verbose
3973
3973
3974 Examples:
3974 Examples:
3975
3975
3976 - list all files under the current directory::
3976 - list all files under the current directory::
3977
3977
3978 hg files .
3978 hg files .
3979
3979
3980 - shows sizes and flags for current revision::
3980 - shows sizes and flags for current revision::
3981
3981
3982 hg files -vr .
3982 hg files -vr .
3983
3983
3984 - list all files named README::
3984 - list all files named README::
3985
3985
3986 hg files -I "**/README"
3986 hg files -I "**/README"
3987
3987
3988 - list all binary files::
3988 - list all binary files::
3989
3989
3990 hg files "set:binary()"
3990 hg files "set:binary()"
3991
3991
3992 - find files containing a regular expression::
3992 - find files containing a regular expression::
3993
3993
3994 hg files "set:grep('bob')"
3994 hg files "set:grep('bob')"
3995
3995
3996 - search tracked file contents with xargs and grep::
3996 - search tracked file contents with xargs and grep::
3997
3997
3998 hg files -0 | xargs -0 grep foo
3998 hg files -0 | xargs -0 grep foo
3999
3999
4000 See :hg:`help patterns` and :hg:`help filesets` for more information
4000 See :hg:`help patterns` and :hg:`help filesets` for more information
4001 on specifying file patterns.
4001 on specifying file patterns.
4002
4002
4003 Returns 0 if a match is found, 1 otherwise.
4003 Returns 0 if a match is found, 1 otherwise.
4004
4004
4005 """
4005 """
4006 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4006 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4007
4007
4008 end = '\n'
4008 end = '\n'
4009 if opts.get('print0'):
4009 if opts.get('print0'):
4010 end = '\0'
4010 end = '\0'
4011 fmt = '%s' + end
4011 fmt = '%s' + end
4012
4012
4013 m = scmutil.match(ctx, pats, opts)
4013 m = scmutil.match(ctx, pats, opts)
4014 with ui.formatter('files', opts) as fm:
4014 with ui.formatter('files', opts) as fm:
4015 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
4015 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
4016
4016
4017 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
4017 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
4018 def forget(ui, repo, *pats, **opts):
4018 def forget(ui, repo, *pats, **opts):
4019 """forget the specified files on the next commit
4019 """forget the specified files on the next commit
4020
4020
4021 Mark the specified files so they will no longer be tracked
4021 Mark the specified files so they will no longer be tracked
4022 after the next commit.
4022 after the next commit.
4023
4023
4024 This only removes files from the current branch, not from the
4024 This only removes files from the current branch, not from the
4025 entire project history, and it does not delete them from the
4025 entire project history, and it does not delete them from the
4026 working directory.
4026 working directory.
4027
4027
4028 To delete the file from the working directory, see :hg:`remove`.
4028 To delete the file from the working directory, see :hg:`remove`.
4029
4029
4030 To undo a forget before the next commit, see :hg:`add`.
4030 To undo a forget before the next commit, see :hg:`add`.
4031
4031
4032 .. container:: verbose
4032 .. container:: verbose
4033
4033
4034 Examples:
4034 Examples:
4035
4035
4036 - forget newly-added binary files::
4036 - forget newly-added binary files::
4037
4037
4038 hg forget "set:added() and binary()"
4038 hg forget "set:added() and binary()"
4039
4039
4040 - forget files that would be excluded by .hgignore::
4040 - forget files that would be excluded by .hgignore::
4041
4041
4042 hg forget "set:hgignore()"
4042 hg forget "set:hgignore()"
4043
4043
4044 Returns 0 on success.
4044 Returns 0 on success.
4045 """
4045 """
4046
4046
4047 if not pats:
4047 if not pats:
4048 raise error.Abort(_('no files specified'))
4048 raise error.Abort(_('no files specified'))
4049
4049
4050 m = scmutil.match(repo[None], pats, opts)
4050 m = scmutil.match(repo[None], pats, opts)
4051 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
4051 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
4052 return rejected and 1 or 0
4052 return rejected and 1 or 0
4053
4053
4054 @command(
4054 @command(
4055 'graft',
4055 'graft',
4056 [('r', 'rev', [], _('revisions to graft'), _('REV')),
4056 [('r', 'rev', [], _('revisions to graft'), _('REV')),
4057 ('c', 'continue', False, _('resume interrupted graft')),
4057 ('c', 'continue', False, _('resume interrupted graft')),
4058 ('e', 'edit', False, _('invoke editor on commit messages')),
4058 ('e', 'edit', False, _('invoke editor on commit messages')),
4059 ('', 'log', None, _('append graft info to log message')),
4059 ('', 'log', None, _('append graft info to log message')),
4060 ('f', 'force', False, _('force graft')),
4060 ('f', 'force', False, _('force graft')),
4061 ('D', 'currentdate', False,
4061 ('D', 'currentdate', False,
4062 _('record the current date as commit date')),
4062 _('record the current date as commit date')),
4063 ('U', 'currentuser', False,
4063 ('U', 'currentuser', False,
4064 _('record the current user as committer'), _('DATE'))]
4064 _('record the current user as committer'), _('DATE'))]
4065 + commitopts2 + mergetoolopts + dryrunopts,
4065 + commitopts2 + mergetoolopts + dryrunopts,
4066 _('[OPTION]... [-r REV]... REV...'))
4066 _('[OPTION]... [-r REV]... REV...'))
4067 def graft(ui, repo, *revs, **opts):
4067 def graft(ui, repo, *revs, **opts):
4068 '''copy changes from other branches onto the current branch
4068 '''copy changes from other branches onto the current branch
4069
4069
4070 This command uses Mercurial's merge logic to copy individual
4070 This command uses Mercurial's merge logic to copy individual
4071 changes from other branches without merging branches in the
4071 changes from other branches without merging branches in the
4072 history graph. This is sometimes known as 'backporting' or
4072 history graph. This is sometimes known as 'backporting' or
4073 'cherry-picking'. By default, graft will copy user, date, and
4073 'cherry-picking'. By default, graft will copy user, date, and
4074 description from the source changesets.
4074 description from the source changesets.
4075
4075
4076 Changesets that are ancestors of the current revision, that have
4076 Changesets that are ancestors of the current revision, that have
4077 already been grafted, or that are merges will be skipped.
4077 already been grafted, or that are merges will be skipped.
4078
4078
4079 If --log is specified, log messages will have a comment appended
4079 If --log is specified, log messages will have a comment appended
4080 of the form::
4080 of the form::
4081
4081
4082 (grafted from CHANGESETHASH)
4082 (grafted from CHANGESETHASH)
4083
4083
4084 If --force is specified, revisions will be grafted even if they
4084 If --force is specified, revisions will be grafted even if they
4085 are already ancestors of or have been grafted to the destination.
4085 are already ancestors of or have been grafted to the destination.
4086 This is useful when the revisions have since been backed out.
4086 This is useful when the revisions have since been backed out.
4087
4087
4088 If a graft merge results in conflicts, the graft process is
4088 If a graft merge results in conflicts, the graft process is
4089 interrupted so that the current merge can be manually resolved.
4089 interrupted so that the current merge can be manually resolved.
4090 Once all conflicts are addressed, the graft process can be
4090 Once all conflicts are addressed, the graft process can be
4091 continued with the -c/--continue option.
4091 continued with the -c/--continue option.
4092
4092
4093 .. note::
4093 .. note::
4094
4094
4095 The -c/--continue option does not reapply earlier options, except
4095 The -c/--continue option does not reapply earlier options, except
4096 for --force.
4096 for --force.
4097
4097
4098 .. container:: verbose
4098 .. container:: verbose
4099
4099
4100 Examples:
4100 Examples:
4101
4101
4102 - copy a single change to the stable branch and edit its description::
4102 - copy a single change to the stable branch and edit its description::
4103
4103
4104 hg update stable
4104 hg update stable
4105 hg graft --edit 9393
4105 hg graft --edit 9393
4106
4106
4107 - graft a range of changesets with one exception, updating dates::
4107 - graft a range of changesets with one exception, updating dates::
4108
4108
4109 hg graft -D "2085::2093 and not 2091"
4109 hg graft -D "2085::2093 and not 2091"
4110
4110
4111 - continue a graft after resolving conflicts::
4111 - continue a graft after resolving conflicts::
4112
4112
4113 hg graft -c
4113 hg graft -c
4114
4114
4115 - show the source of a grafted changeset::
4115 - show the source of a grafted changeset::
4116
4116
4117 hg log --debug -r .
4117 hg log --debug -r .
4118
4118
4119 - show revisions sorted by date::
4119 - show revisions sorted by date::
4120
4120
4121 hg log -r "sort(all(), date)"
4121 hg log -r "sort(all(), date)"
4122
4122
4123 See :hg:`help revisions` and :hg:`help revsets` for more about
4123 See :hg:`help revisions` and :hg:`help revsets` for more about
4124 specifying revisions.
4124 specifying revisions.
4125
4125
4126 Returns 0 on successful completion.
4126 Returns 0 on successful completion.
4127 '''
4127 '''
4128 with repo.wlock():
4128 with repo.wlock():
4129 return _dograft(ui, repo, *revs, **opts)
4129 return _dograft(ui, repo, *revs, **opts)
4130
4130
4131 def _dograft(ui, repo, *revs, **opts):
4131 def _dograft(ui, repo, *revs, **opts):
4132 if revs and opts.get('rev'):
4132 if revs and opts.get('rev'):
4133 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
4133 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
4134 'revision ordering!\n'))
4134 'revision ordering!\n'))
4135
4135
4136 revs = list(revs)
4136 revs = list(revs)
4137 revs.extend(opts.get('rev'))
4137 revs.extend(opts.get('rev'))
4138
4138
4139 if not opts.get('user') and opts.get('currentuser'):
4139 if not opts.get('user') and opts.get('currentuser'):
4140 opts['user'] = ui.username()
4140 opts['user'] = ui.username()
4141 if not opts.get('date') and opts.get('currentdate'):
4141 if not opts.get('date') and opts.get('currentdate'):
4142 opts['date'] = "%d %d" % util.makedate()
4142 opts['date'] = "%d %d" % util.makedate()
4143
4143
4144 editor = cmdutil.getcommiteditor(editform='graft', **opts)
4144 editor = cmdutil.getcommiteditor(editform='graft', **opts)
4145
4145
4146 cont = False
4146 cont = False
4147 if opts.get('continue'):
4147 if opts.get('continue'):
4148 cont = True
4148 cont = True
4149 if revs:
4149 if revs:
4150 raise error.Abort(_("can't specify --continue and revisions"))
4150 raise error.Abort(_("can't specify --continue and revisions"))
4151 # read in unfinished revisions
4151 # read in unfinished revisions
4152 try:
4152 try:
4153 nodes = repo.vfs.read('graftstate').splitlines()
4153 nodes = repo.vfs.read('graftstate').splitlines()
4154 revs = [repo[node].rev() for node in nodes]
4154 revs = [repo[node].rev() for node in nodes]
4155 except IOError as inst:
4155 except IOError as inst:
4156 if inst.errno != errno.ENOENT:
4156 if inst.errno != errno.ENOENT:
4157 raise
4157 raise
4158 cmdutil.wrongtooltocontinue(repo, _('graft'))
4158 cmdutil.wrongtooltocontinue(repo, _('graft'))
4159 else:
4159 else:
4160 cmdutil.checkunfinished(repo)
4160 cmdutil.checkunfinished(repo)
4161 cmdutil.bailifchanged(repo)
4161 cmdutil.bailifchanged(repo)
4162 if not revs:
4162 if not revs:
4163 raise error.Abort(_('no revisions specified'))
4163 raise error.Abort(_('no revisions specified'))
4164 revs = scmutil.revrange(repo, revs)
4164 revs = scmutil.revrange(repo, revs)
4165
4165
4166 skipped = set()
4166 skipped = set()
4167 # check for merges
4167 # check for merges
4168 for rev in repo.revs('%ld and merge()', revs):
4168 for rev in repo.revs('%ld and merge()', revs):
4169 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
4169 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
4170 skipped.add(rev)
4170 skipped.add(rev)
4171 revs = [r for r in revs if r not in skipped]
4171 revs = [r for r in revs if r not in skipped]
4172 if not revs:
4172 if not revs:
4173 return -1
4173 return -1
4174
4174
4175 # Don't check in the --continue case, in effect retaining --force across
4175 # Don't check in the --continue case, in effect retaining --force across
4176 # --continues. That's because without --force, any revisions we decided to
4176 # --continues. That's because without --force, any revisions we decided to
4177 # skip would have been filtered out here, so they wouldn't have made their
4177 # skip would have been filtered out here, so they wouldn't have made their
4178 # way to the graftstate. With --force, any revisions we would have otherwise
4178 # way to the graftstate. With --force, any revisions we would have otherwise
4179 # skipped would not have been filtered out, and if they hadn't been applied
4179 # skipped would not have been filtered out, and if they hadn't been applied
4180 # already, they'd have been in the graftstate.
4180 # already, they'd have been in the graftstate.
4181 if not (cont or opts.get('force')):
4181 if not (cont or opts.get('force')):
4182 # check for ancestors of dest branch
4182 # check for ancestors of dest branch
4183 crev = repo['.'].rev()
4183 crev = repo['.'].rev()
4184 ancestors = repo.changelog.ancestors([crev], inclusive=True)
4184 ancestors = repo.changelog.ancestors([crev], inclusive=True)
4185 # XXX make this lazy in the future
4185 # XXX make this lazy in the future
4186 # don't mutate while iterating, create a copy
4186 # don't mutate while iterating, create a copy
4187 for rev in list(revs):
4187 for rev in list(revs):
4188 if rev in ancestors:
4188 if rev in ancestors:
4189 ui.warn(_('skipping ancestor revision %d:%s\n') %
4189 ui.warn(_('skipping ancestor revision %d:%s\n') %
4190 (rev, repo[rev]))
4190 (rev, repo[rev]))
4191 # XXX remove on list is slow
4191 # XXX remove on list is slow
4192 revs.remove(rev)
4192 revs.remove(rev)
4193 if not revs:
4193 if not revs:
4194 return -1
4194 return -1
4195
4195
4196 # analyze revs for earlier grafts
4196 # analyze revs for earlier grafts
4197 ids = {}
4197 ids = {}
4198 for ctx in repo.set("%ld", revs):
4198 for ctx in repo.set("%ld", revs):
4199 ids[ctx.hex()] = ctx.rev()
4199 ids[ctx.hex()] = ctx.rev()
4200 n = ctx.extra().get('source')
4200 n = ctx.extra().get('source')
4201 if n:
4201 if n:
4202 ids[n] = ctx.rev()
4202 ids[n] = ctx.rev()
4203
4203
4204 # check ancestors for earlier grafts
4204 # check ancestors for earlier grafts
4205 ui.debug('scanning for duplicate grafts\n')
4205 ui.debug('scanning for duplicate grafts\n')
4206
4206
4207 for rev in repo.changelog.findmissingrevs(revs, [crev]):
4207 for rev in repo.changelog.findmissingrevs(revs, [crev]):
4208 ctx = repo[rev]
4208 ctx = repo[rev]
4209 n = ctx.extra().get('source')
4209 n = ctx.extra().get('source')
4210 if n in ids:
4210 if n in ids:
4211 try:
4211 try:
4212 r = repo[n].rev()
4212 r = repo[n].rev()
4213 except error.RepoLookupError:
4213 except error.RepoLookupError:
4214 r = None
4214 r = None
4215 if r in revs:
4215 if r in revs:
4216 ui.warn(_('skipping revision %d:%s '
4216 ui.warn(_('skipping revision %d:%s '
4217 '(already grafted to %d:%s)\n')
4217 '(already grafted to %d:%s)\n')
4218 % (r, repo[r], rev, ctx))
4218 % (r, repo[r], rev, ctx))
4219 revs.remove(r)
4219 revs.remove(r)
4220 elif ids[n] in revs:
4220 elif ids[n] in revs:
4221 if r is None:
4221 if r is None:
4222 ui.warn(_('skipping already grafted revision %d:%s '
4222 ui.warn(_('skipping already grafted revision %d:%s '
4223 '(%d:%s also has unknown origin %s)\n')
4223 '(%d:%s also has unknown origin %s)\n')
4224 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
4224 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
4225 else:
4225 else:
4226 ui.warn(_('skipping already grafted revision %d:%s '
4226 ui.warn(_('skipping already grafted revision %d:%s '
4227 '(%d:%s also has origin %d:%s)\n')
4227 '(%d:%s also has origin %d:%s)\n')
4228 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
4228 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
4229 revs.remove(ids[n])
4229 revs.remove(ids[n])
4230 elif ctx.hex() in ids:
4230 elif ctx.hex() in ids:
4231 r = ids[ctx.hex()]
4231 r = ids[ctx.hex()]
4232 ui.warn(_('skipping already grafted revision %d:%s '
4232 ui.warn(_('skipping already grafted revision %d:%s '
4233 '(was grafted from %d:%s)\n') %
4233 '(was grafted from %d:%s)\n') %
4234 (r, repo[r], rev, ctx))
4234 (r, repo[r], rev, ctx))
4235 revs.remove(r)
4235 revs.remove(r)
4236 if not revs:
4236 if not revs:
4237 return -1
4237 return -1
4238
4238
4239 for pos, ctx in enumerate(repo.set("%ld", revs)):
4239 for pos, ctx in enumerate(repo.set("%ld", revs)):
4240 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
4240 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
4241 ctx.description().split('\n', 1)[0])
4241 ctx.description().split('\n', 1)[0])
4242 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
4242 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
4243 if names:
4243 if names:
4244 desc += ' (%s)' % ' '.join(names)
4244 desc += ' (%s)' % ' '.join(names)
4245 ui.status(_('grafting %s\n') % desc)
4245 ui.status(_('grafting %s\n') % desc)
4246 if opts.get('dry_run'):
4246 if opts.get('dry_run'):
4247 continue
4247 continue
4248
4248
4249 source = ctx.extra().get('source')
4249 source = ctx.extra().get('source')
4250 extra = {}
4250 extra = {}
4251 if source:
4251 if source:
4252 extra['source'] = source
4252 extra['source'] = source
4253 extra['intermediate-source'] = ctx.hex()
4253 extra['intermediate-source'] = ctx.hex()
4254 else:
4254 else:
4255 extra['source'] = ctx.hex()
4255 extra['source'] = ctx.hex()
4256 user = ctx.user()
4256 user = ctx.user()
4257 if opts.get('user'):
4257 if opts.get('user'):
4258 user = opts['user']
4258 user = opts['user']
4259 date = ctx.date()
4259 date = ctx.date()
4260 if opts.get('date'):
4260 if opts.get('date'):
4261 date = opts['date']
4261 date = opts['date']
4262 message = ctx.description()
4262 message = ctx.description()
4263 if opts.get('log'):
4263 if opts.get('log'):
4264 message += '\n(grafted from %s)' % ctx.hex()
4264 message += '\n(grafted from %s)' % ctx.hex()
4265
4265
4266 # we don't merge the first commit when continuing
4266 # we don't merge the first commit when continuing
4267 if not cont:
4267 if not cont:
4268 # perform the graft merge with p1(rev) as 'ancestor'
4268 # perform the graft merge with p1(rev) as 'ancestor'
4269 try:
4269 try:
4270 # ui.forcemerge is an internal variable, do not document
4270 # ui.forcemerge is an internal variable, do not document
4271 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4271 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4272 'graft')
4272 'graft')
4273 stats = mergemod.graft(repo, ctx, ctx.p1(),
4273 stats = mergemod.graft(repo, ctx, ctx.p1(),
4274 ['local', 'graft'])
4274 ['local', 'graft'])
4275 finally:
4275 finally:
4276 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4276 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4277 # report any conflicts
4277 # report any conflicts
4278 if stats and stats[3] > 0:
4278 if stats and stats[3] > 0:
4279 # write out state for --continue
4279 # write out state for --continue
4280 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4280 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4281 repo.vfs.write('graftstate', ''.join(nodelines))
4281 repo.vfs.write('graftstate', ''.join(nodelines))
4282 extra = ''
4282 extra = ''
4283 if opts.get('user'):
4283 if opts.get('user'):
4284 extra += ' --user %s' % util.shellquote(opts['user'])
4284 extra += ' --user %s' % util.shellquote(opts['user'])
4285 if opts.get('date'):
4285 if opts.get('date'):
4286 extra += ' --date %s' % util.shellquote(opts['date'])
4286 extra += ' --date %s' % util.shellquote(opts['date'])
4287 if opts.get('log'):
4287 if opts.get('log'):
4288 extra += ' --log'
4288 extra += ' --log'
4289 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
4289 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
4290 raise error.Abort(
4290 raise error.Abort(
4291 _("unresolved conflicts, can't continue"),
4291 _("unresolved conflicts, can't continue"),
4292 hint=hint)
4292 hint=hint)
4293 else:
4293 else:
4294 cont = False
4294 cont = False
4295
4295
4296 # commit
4296 # commit
4297 node = repo.commit(text=message, user=user,
4297 node = repo.commit(text=message, user=user,
4298 date=date, extra=extra, editor=editor)
4298 date=date, extra=extra, editor=editor)
4299 if node is None:
4299 if node is None:
4300 ui.warn(
4300 ui.warn(
4301 _('note: graft of %d:%s created no changes to commit\n') %
4301 _('note: graft of %d:%s created no changes to commit\n') %
4302 (ctx.rev(), ctx))
4302 (ctx.rev(), ctx))
4303
4303
4304 # remove state when we complete successfully
4304 # remove state when we complete successfully
4305 if not opts.get('dry_run'):
4305 if not opts.get('dry_run'):
4306 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4306 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4307
4307
4308 return 0
4308 return 0
4309
4309
4310 @command('grep',
4310 @command('grep',
4311 [('0', 'print0', None, _('end fields with NUL')),
4311 [('0', 'print0', None, _('end fields with NUL')),
4312 ('', 'all', None, _('print all revisions that match')),
4312 ('', 'all', None, _('print all revisions that match')),
4313 ('a', 'text', None, _('treat all files as text')),
4313 ('a', 'text', None, _('treat all files as text')),
4314 ('f', 'follow', None,
4314 ('f', 'follow', None,
4315 _('follow changeset history,'
4315 _('follow changeset history,'
4316 ' or file history across copies and renames')),
4316 ' or file history across copies and renames')),
4317 ('i', 'ignore-case', None, _('ignore case when matching')),
4317 ('i', 'ignore-case', None, _('ignore case when matching')),
4318 ('l', 'files-with-matches', None,
4318 ('l', 'files-with-matches', None,
4319 _('print only filenames and revisions that match')),
4319 _('print only filenames and revisions that match')),
4320 ('n', 'line-number', None, _('print matching line numbers')),
4320 ('n', 'line-number', None, _('print matching line numbers')),
4321 ('r', 'rev', [],
4321 ('r', 'rev', [],
4322 _('only search files changed within revision range'), _('REV')),
4322 _('only search files changed within revision range'), _('REV')),
4323 ('u', 'user', None, _('list the author (long with -v)')),
4323 ('u', 'user', None, _('list the author (long with -v)')),
4324 ('d', 'date', None, _('list the date (short with -q)')),
4324 ('d', 'date', None, _('list the date (short with -q)')),
4325 ] + formatteropts + walkopts,
4325 ] + formatteropts + walkopts,
4326 _('[OPTION]... PATTERN [FILE]...'),
4326 _('[OPTION]... PATTERN [FILE]...'),
4327 inferrepo=True)
4327 inferrepo=True)
4328 def grep(ui, repo, pattern, *pats, **opts):
4328 def grep(ui, repo, pattern, *pats, **opts):
4329 """search revision history for a pattern in specified files
4329 """search revision history for a pattern in specified files
4330
4330
4331 Search revision history for a regular expression in the specified
4331 Search revision history for a regular expression in the specified
4332 files or the entire project.
4332 files or the entire project.
4333
4333
4334 By default, grep prints the most recent revision number for each
4334 By default, grep prints the most recent revision number for each
4335 file in which it finds a match. To get it to print every revision
4335 file in which it finds a match. To get it to print every revision
4336 that contains a change in match status ("-" for a match that becomes
4336 that contains a change in match status ("-" for a match that becomes
4337 a non-match, or "+" for a non-match that becomes a match), use the
4337 a non-match, or "+" for a non-match that becomes a match), use the
4338 --all flag.
4338 --all flag.
4339
4339
4340 PATTERN can be any Python (roughly Perl-compatible) regular
4340 PATTERN can be any Python (roughly Perl-compatible) regular
4341 expression.
4341 expression.
4342
4342
4343 If no FILEs are specified (and -f/--follow isn't set), all files in
4343 If no FILEs are specified (and -f/--follow isn't set), all files in
4344 the repository are searched, including those that don't exist in the
4344 the repository are searched, including those that don't exist in the
4345 current branch or have been deleted in a prior changeset.
4345 current branch or have been deleted in a prior changeset.
4346
4346
4347 Returns 0 if a match is found, 1 otherwise.
4347 Returns 0 if a match is found, 1 otherwise.
4348 """
4348 """
4349 reflags = re.M
4349 reflags = re.M
4350 if opts.get('ignore_case'):
4350 if opts.get('ignore_case'):
4351 reflags |= re.I
4351 reflags |= re.I
4352 try:
4352 try:
4353 regexp = util.re.compile(pattern, reflags)
4353 regexp = util.re.compile(pattern, reflags)
4354 except re.error as inst:
4354 except re.error as inst:
4355 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4355 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4356 return 1
4356 return 1
4357 sep, eol = ':', '\n'
4357 sep, eol = ':', '\n'
4358 if opts.get('print0'):
4358 if opts.get('print0'):
4359 sep = eol = '\0'
4359 sep = eol = '\0'
4360
4360
4361 getfile = util.lrucachefunc(repo.file)
4361 getfile = util.lrucachefunc(repo.file)
4362
4362
4363 def matchlines(body):
4363 def matchlines(body):
4364 begin = 0
4364 begin = 0
4365 linenum = 0
4365 linenum = 0
4366 while begin < len(body):
4366 while begin < len(body):
4367 match = regexp.search(body, begin)
4367 match = regexp.search(body, begin)
4368 if not match:
4368 if not match:
4369 break
4369 break
4370 mstart, mend = match.span()
4370 mstart, mend = match.span()
4371 linenum += body.count('\n', begin, mstart) + 1
4371 linenum += body.count('\n', begin, mstart) + 1
4372 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4372 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4373 begin = body.find('\n', mend) + 1 or len(body) + 1
4373 begin = body.find('\n', mend) + 1 or len(body) + 1
4374 lend = begin - 1
4374 lend = begin - 1
4375 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4375 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4376
4376
4377 class linestate(object):
4377 class linestate(object):
4378 def __init__(self, line, linenum, colstart, colend):
4378 def __init__(self, line, linenum, colstart, colend):
4379 self.line = line
4379 self.line = line
4380 self.linenum = linenum
4380 self.linenum = linenum
4381 self.colstart = colstart
4381 self.colstart = colstart
4382 self.colend = colend
4382 self.colend = colend
4383
4383
4384 def __hash__(self):
4384 def __hash__(self):
4385 return hash((self.linenum, self.line))
4385 return hash((self.linenum, self.line))
4386
4386
4387 def __eq__(self, other):
4387 def __eq__(self, other):
4388 return self.line == other.line
4388 return self.line == other.line
4389
4389
4390 def findpos(self):
4390 def findpos(self):
4391 """Iterate all (start, end) indices of matches"""
4391 """Iterate all (start, end) indices of matches"""
4392 yield self.colstart, self.colend
4392 yield self.colstart, self.colend
4393 p = self.colend
4393 p = self.colend
4394 while p < len(self.line):
4394 while p < len(self.line):
4395 m = regexp.search(self.line, p)
4395 m = regexp.search(self.line, p)
4396 if not m:
4396 if not m:
4397 break
4397 break
4398 yield m.span()
4398 yield m.span()
4399 p = m.end()
4399 p = m.end()
4400
4400
4401 matches = {}
4401 matches = {}
4402 copies = {}
4402 copies = {}
4403 def grepbody(fn, rev, body):
4403 def grepbody(fn, rev, body):
4404 matches[rev].setdefault(fn, [])
4404 matches[rev].setdefault(fn, [])
4405 m = matches[rev][fn]
4405 m = matches[rev][fn]
4406 for lnum, cstart, cend, line in matchlines(body):
4406 for lnum, cstart, cend, line in matchlines(body):
4407 s = linestate(line, lnum, cstart, cend)
4407 s = linestate(line, lnum, cstart, cend)
4408 m.append(s)
4408 m.append(s)
4409
4409
4410 def difflinestates(a, b):
4410 def difflinestates(a, b):
4411 sm = difflib.SequenceMatcher(None, a, b)
4411 sm = difflib.SequenceMatcher(None, a, b)
4412 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4412 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4413 if tag == 'insert':
4413 if tag == 'insert':
4414 for i in xrange(blo, bhi):
4414 for i in xrange(blo, bhi):
4415 yield ('+', b[i])
4415 yield ('+', b[i])
4416 elif tag == 'delete':
4416 elif tag == 'delete':
4417 for i in xrange(alo, ahi):
4417 for i in xrange(alo, ahi):
4418 yield ('-', a[i])
4418 yield ('-', a[i])
4419 elif tag == 'replace':
4419 elif tag == 'replace':
4420 for i in xrange(alo, ahi):
4420 for i in xrange(alo, ahi):
4421 yield ('-', a[i])
4421 yield ('-', a[i])
4422 for i in xrange(blo, bhi):
4422 for i in xrange(blo, bhi):
4423 yield ('+', b[i])
4423 yield ('+', b[i])
4424
4424
4425 def display(fm, fn, ctx, pstates, states):
4425 def display(fm, fn, ctx, pstates, states):
4426 rev = ctx.rev()
4426 rev = ctx.rev()
4427 if fm.isplain():
4427 if fm.isplain():
4428 formatuser = ui.shortuser
4428 formatuser = ui.shortuser
4429 else:
4429 else:
4430 formatuser = str
4430 formatuser = str
4431 if ui.quiet:
4431 if ui.quiet:
4432 datefmt = '%Y-%m-%d'
4432 datefmt = '%Y-%m-%d'
4433 else:
4433 else:
4434 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
4434 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
4435 found = False
4435 found = False
4436 @util.cachefunc
4436 @util.cachefunc
4437 def binary():
4437 def binary():
4438 flog = getfile(fn)
4438 flog = getfile(fn)
4439 return util.binary(flog.read(ctx.filenode(fn)))
4439 return util.binary(flog.read(ctx.filenode(fn)))
4440
4440
4441 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
4441 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
4442 if opts.get('all'):
4442 if opts.get('all'):
4443 iter = difflinestates(pstates, states)
4443 iter = difflinestates(pstates, states)
4444 else:
4444 else:
4445 iter = [('', l) for l in states]
4445 iter = [('', l) for l in states]
4446 for change, l in iter:
4446 for change, l in iter:
4447 fm.startitem()
4447 fm.startitem()
4448 fm.data(node=fm.hexfunc(ctx.node()))
4448 fm.data(node=fm.hexfunc(ctx.node()))
4449 cols = [
4449 cols = [
4450 ('filename', fn, True),
4450 ('filename', fn, True),
4451 ('rev', rev, True),
4451 ('rev', rev, True),
4452 ('linenumber', l.linenum, opts.get('line_number')),
4452 ('linenumber', l.linenum, opts.get('line_number')),
4453 ]
4453 ]
4454 if opts.get('all'):
4454 if opts.get('all'):
4455 cols.append(('change', change, True))
4455 cols.append(('change', change, True))
4456 cols.extend([
4456 cols.extend([
4457 ('user', formatuser(ctx.user()), opts.get('user')),
4457 ('user', formatuser(ctx.user()), opts.get('user')),
4458 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
4458 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
4459 ])
4459 ])
4460 lastcol = next(name for name, data, cond in reversed(cols) if cond)
4460 lastcol = next(name for name, data, cond in reversed(cols) if cond)
4461 for name, data, cond in cols:
4461 for name, data, cond in cols:
4462 field = fieldnamemap.get(name, name)
4462 field = fieldnamemap.get(name, name)
4463 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
4463 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
4464 if cond and name != lastcol:
4464 if cond and name != lastcol:
4465 fm.plain(sep, label='grep.sep')
4465 fm.plain(sep, label='grep.sep')
4466 if not opts.get('files_with_matches'):
4466 if not opts.get('files_with_matches'):
4467 fm.plain(sep, label='grep.sep')
4467 fm.plain(sep, label='grep.sep')
4468 if not opts.get('text') and binary():
4468 if not opts.get('text') and binary():
4469 fm.plain(_(" Binary file matches"))
4469 fm.plain(_(" Binary file matches"))
4470 else:
4470 else:
4471 displaymatches(fm.nested('texts'), l)
4471 displaymatches(fm.nested('texts'), l)
4472 fm.plain(eol)
4472 fm.plain(eol)
4473 found = True
4473 found = True
4474 if opts.get('files_with_matches'):
4474 if opts.get('files_with_matches'):
4475 break
4475 break
4476 return found
4476 return found
4477
4477
4478 def displaymatches(fm, l):
4478 def displaymatches(fm, l):
4479 p = 0
4479 p = 0
4480 for s, e in l.findpos():
4480 for s, e in l.findpos():
4481 if p < s:
4481 if p < s:
4482 fm.startitem()
4482 fm.startitem()
4483 fm.write('text', '%s', l.line[p:s])
4483 fm.write('text', '%s', l.line[p:s])
4484 fm.data(matched=False)
4484 fm.data(matched=False)
4485 fm.startitem()
4485 fm.startitem()
4486 fm.write('text', '%s', l.line[s:e], label='grep.match')
4486 fm.write('text', '%s', l.line[s:e], label='grep.match')
4487 fm.data(matched=True)
4487 fm.data(matched=True)
4488 p = e
4488 p = e
4489 if p < len(l.line):
4489 if p < len(l.line):
4490 fm.startitem()
4490 fm.startitem()
4491 fm.write('text', '%s', l.line[p:])
4491 fm.write('text', '%s', l.line[p:])
4492 fm.data(matched=False)
4492 fm.data(matched=False)
4493 fm.end()
4493 fm.end()
4494
4494
4495 skip = {}
4495 skip = {}
4496 revfiles = {}
4496 revfiles = {}
4497 matchfn = scmutil.match(repo[None], pats, opts)
4497 matchfn = scmutil.match(repo[None], pats, opts)
4498 found = False
4498 found = False
4499 follow = opts.get('follow')
4499 follow = opts.get('follow')
4500
4500
4501 def prep(ctx, fns):
4501 def prep(ctx, fns):
4502 rev = ctx.rev()
4502 rev = ctx.rev()
4503 pctx = ctx.p1()
4503 pctx = ctx.p1()
4504 parent = pctx.rev()
4504 parent = pctx.rev()
4505 matches.setdefault(rev, {})
4505 matches.setdefault(rev, {})
4506 matches.setdefault(parent, {})
4506 matches.setdefault(parent, {})
4507 files = revfiles.setdefault(rev, [])
4507 files = revfiles.setdefault(rev, [])
4508 for fn in fns:
4508 for fn in fns:
4509 flog = getfile(fn)
4509 flog = getfile(fn)
4510 try:
4510 try:
4511 fnode = ctx.filenode(fn)
4511 fnode = ctx.filenode(fn)
4512 except error.LookupError:
4512 except error.LookupError:
4513 continue
4513 continue
4514
4514
4515 copied = flog.renamed(fnode)
4515 copied = flog.renamed(fnode)
4516 copy = follow and copied and copied[0]
4516 copy = follow and copied and copied[0]
4517 if copy:
4517 if copy:
4518 copies.setdefault(rev, {})[fn] = copy
4518 copies.setdefault(rev, {})[fn] = copy
4519 if fn in skip:
4519 if fn in skip:
4520 if copy:
4520 if copy:
4521 skip[copy] = True
4521 skip[copy] = True
4522 continue
4522 continue
4523 files.append(fn)
4523 files.append(fn)
4524
4524
4525 if fn not in matches[rev]:
4525 if fn not in matches[rev]:
4526 grepbody(fn, rev, flog.read(fnode))
4526 grepbody(fn, rev, flog.read(fnode))
4527
4527
4528 pfn = copy or fn
4528 pfn = copy or fn
4529 if pfn not in matches[parent]:
4529 if pfn not in matches[parent]:
4530 try:
4530 try:
4531 fnode = pctx.filenode(pfn)
4531 fnode = pctx.filenode(pfn)
4532 grepbody(pfn, parent, flog.read(fnode))
4532 grepbody(pfn, parent, flog.read(fnode))
4533 except error.LookupError:
4533 except error.LookupError:
4534 pass
4534 pass
4535
4535
4536 fm = ui.formatter('grep', opts)
4536 fm = ui.formatter('grep', opts)
4537 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4537 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4538 rev = ctx.rev()
4538 rev = ctx.rev()
4539 parent = ctx.p1().rev()
4539 parent = ctx.p1().rev()
4540 for fn in sorted(revfiles.get(rev, [])):
4540 for fn in sorted(revfiles.get(rev, [])):
4541 states = matches[rev][fn]
4541 states = matches[rev][fn]
4542 copy = copies.get(rev, {}).get(fn)
4542 copy = copies.get(rev, {}).get(fn)
4543 if fn in skip:
4543 if fn in skip:
4544 if copy:
4544 if copy:
4545 skip[copy] = True
4545 skip[copy] = True
4546 continue
4546 continue
4547 pstates = matches.get(parent, {}).get(copy or fn, [])
4547 pstates = matches.get(parent, {}).get(copy or fn, [])
4548 if pstates or states:
4548 if pstates or states:
4549 r = display(fm, fn, ctx, pstates, states)
4549 r = display(fm, fn, ctx, pstates, states)
4550 found = found or r
4550 found = found or r
4551 if r and not opts.get('all'):
4551 if r and not opts.get('all'):
4552 skip[fn] = True
4552 skip[fn] = True
4553 if copy:
4553 if copy:
4554 skip[copy] = True
4554 skip[copy] = True
4555 del matches[rev]
4555 del matches[rev]
4556 del revfiles[rev]
4556 del revfiles[rev]
4557 fm.end()
4557 fm.end()
4558
4558
4559 return not found
4559 return not found
4560
4560
4561 @command('heads',
4561 @command('heads',
4562 [('r', 'rev', '',
4562 [('r', 'rev', '',
4563 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4563 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4564 ('t', 'topo', False, _('show topological heads only')),
4564 ('t', 'topo', False, _('show topological heads only')),
4565 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4565 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4566 ('c', 'closed', False, _('show normal and closed branch heads')),
4566 ('c', 'closed', False, _('show normal and closed branch heads')),
4567 ] + templateopts,
4567 ] + templateopts,
4568 _('[-ct] [-r STARTREV] [REV]...'))
4568 _('[-ct] [-r STARTREV] [REV]...'))
4569 def heads(ui, repo, *branchrevs, **opts):
4569 def heads(ui, repo, *branchrevs, **opts):
4570 """show branch heads
4570 """show branch heads
4571
4571
4572 With no arguments, show all open branch heads in the repository.
4572 With no arguments, show all open branch heads in the repository.
4573 Branch heads are changesets that have no descendants on the
4573 Branch heads are changesets that have no descendants on the
4574 same branch. They are where development generally takes place and
4574 same branch. They are where development generally takes place and
4575 are the usual targets for update and merge operations.
4575 are the usual targets for update and merge operations.
4576
4576
4577 If one or more REVs are given, only open branch heads on the
4577 If one or more REVs are given, only open branch heads on the
4578 branches associated with the specified changesets are shown. This
4578 branches associated with the specified changesets are shown. This
4579 means that you can use :hg:`heads .` to see the heads on the
4579 means that you can use :hg:`heads .` to see the heads on the
4580 currently checked-out branch.
4580 currently checked-out branch.
4581
4581
4582 If -c/--closed is specified, also show branch heads marked closed
4582 If -c/--closed is specified, also show branch heads marked closed
4583 (see :hg:`commit --close-branch`).
4583 (see :hg:`commit --close-branch`).
4584
4584
4585 If STARTREV is specified, only those heads that are descendants of
4585 If STARTREV is specified, only those heads that are descendants of
4586 STARTREV will be displayed.
4586 STARTREV will be displayed.
4587
4587
4588 If -t/--topo is specified, named branch mechanics will be ignored and only
4588 If -t/--topo is specified, named branch mechanics will be ignored and only
4589 topological heads (changesets with no children) will be shown.
4589 topological heads (changesets with no children) will be shown.
4590
4590
4591 Returns 0 if matching heads are found, 1 if not.
4591 Returns 0 if matching heads are found, 1 if not.
4592 """
4592 """
4593
4593
4594 start = None
4594 start = None
4595 if 'rev' in opts:
4595 if 'rev' in opts:
4596 start = scmutil.revsingle(repo, opts['rev'], None).node()
4596 start = scmutil.revsingle(repo, opts['rev'], None).node()
4597
4597
4598 if opts.get('topo'):
4598 if opts.get('topo'):
4599 heads = [repo[h] for h in repo.heads(start)]
4599 heads = [repo[h] for h in repo.heads(start)]
4600 else:
4600 else:
4601 heads = []
4601 heads = []
4602 for branch in repo.branchmap():
4602 for branch in repo.branchmap():
4603 heads += repo.branchheads(branch, start, opts.get('closed'))
4603 heads += repo.branchheads(branch, start, opts.get('closed'))
4604 heads = [repo[h] for h in heads]
4604 heads = [repo[h] for h in heads]
4605
4605
4606 if branchrevs:
4606 if branchrevs:
4607 branches = set(repo[br].branch() for br in branchrevs)
4607 branches = set(repo[br].branch() for br in branchrevs)
4608 heads = [h for h in heads if h.branch() in branches]
4608 heads = [h for h in heads if h.branch() in branches]
4609
4609
4610 if opts.get('active') and branchrevs:
4610 if opts.get('active') and branchrevs:
4611 dagheads = repo.heads(start)
4611 dagheads = repo.heads(start)
4612 heads = [h for h in heads if h.node() in dagheads]
4612 heads = [h for h in heads if h.node() in dagheads]
4613
4613
4614 if branchrevs:
4614 if branchrevs:
4615 haveheads = set(h.branch() for h in heads)
4615 haveheads = set(h.branch() for h in heads)
4616 if branches - haveheads:
4616 if branches - haveheads:
4617 headless = ', '.join(b for b in branches - haveheads)
4617 headless = ', '.join(b for b in branches - haveheads)
4618 msg = _('no open branch heads found on branches %s')
4618 msg = _('no open branch heads found on branches %s')
4619 if opts.get('rev'):
4619 if opts.get('rev'):
4620 msg += _(' (started at %s)') % opts['rev']
4620 msg += _(' (started at %s)') % opts['rev']
4621 ui.warn((msg + '\n') % headless)
4621 ui.warn((msg + '\n') % headless)
4622
4622
4623 if not heads:
4623 if not heads:
4624 return 1
4624 return 1
4625
4625
4626 heads = sorted(heads, key=lambda x: -x.rev())
4626 heads = sorted(heads, key=lambda x: -x.rev())
4627 displayer = cmdutil.show_changeset(ui, repo, opts)
4627 displayer = cmdutil.show_changeset(ui, repo, opts)
4628 for ctx in heads:
4628 for ctx in heads:
4629 displayer.show(ctx)
4629 displayer.show(ctx)
4630 displayer.close()
4630 displayer.close()
4631
4631
4632 @command('help',
4632 @command('help',
4633 [('e', 'extension', None, _('show only help for extensions')),
4633 [('e', 'extension', None, _('show only help for extensions')),
4634 ('c', 'command', None, _('show only help for commands')),
4634 ('c', 'command', None, _('show only help for commands')),
4635 ('k', 'keyword', None, _('show topics matching keyword')),
4635 ('k', 'keyword', None, _('show topics matching keyword')),
4636 ('s', 'system', [], _('show help for specific platform(s)')),
4636 ('s', 'system', [], _('show help for specific platform(s)')),
4637 ],
4637 ],
4638 _('[-ecks] [TOPIC]'),
4638 _('[-ecks] [TOPIC]'),
4639 norepo=True)
4639 norepo=True)
4640 def help_(ui, name=None, **opts):
4640 def help_(ui, name=None, **opts):
4641 """show help for a given topic or a help overview
4641 """show help for a given topic or a help overview
4642
4642
4643 With no arguments, print a list of commands with short help messages.
4643 With no arguments, print a list of commands with short help messages.
4644
4644
4645 Given a topic, extension, or command name, print help for that
4645 Given a topic, extension, or command name, print help for that
4646 topic.
4646 topic.
4647
4647
4648 Returns 0 if successful.
4648 Returns 0 if successful.
4649 """
4649 """
4650
4650
4651 textwidth = ui.configint('ui', 'textwidth', 78)
4651 textwidth = ui.configint('ui', 'textwidth', 78)
4652 termwidth = ui.termwidth() - 2
4652 termwidth = ui.termwidth() - 2
4653 if textwidth <= 0 or termwidth < textwidth:
4653 if textwidth <= 0 or termwidth < textwidth:
4654 textwidth = termwidth
4654 textwidth = termwidth
4655
4655
4656 keep = opts.get('system') or []
4656 keep = opts.get('system') or []
4657 if len(keep) == 0:
4657 if len(keep) == 0:
4658 if sys.platform.startswith('win'):
4658 if sys.platform.startswith('win'):
4659 keep.append('windows')
4659 keep.append('windows')
4660 elif sys.platform == 'OpenVMS':
4660 elif sys.platform == 'OpenVMS':
4661 keep.append('vms')
4661 keep.append('vms')
4662 elif sys.platform == 'plan9':
4662 elif sys.platform == 'plan9':
4663 keep.append('plan9')
4663 keep.append('plan9')
4664 else:
4664 else:
4665 keep.append('unix')
4665 keep.append('unix')
4666 keep.append(sys.platform.lower())
4666 keep.append(sys.platform.lower())
4667 if ui.verbose:
4667 if ui.verbose:
4668 keep.append('verbose')
4668 keep.append('verbose')
4669
4669
4670 section = None
4670 section = None
4671 subtopic = None
4671 subtopic = None
4672 if name and '.' in name:
4672 if name and '.' in name:
4673 name, remaining = name.split('.', 1)
4673 name, remaining = name.split('.', 1)
4674 remaining = encoding.lower(remaining)
4674 remaining = encoding.lower(remaining)
4675 if '.' in remaining:
4675 if '.' in remaining:
4676 subtopic, section = remaining.split('.', 1)
4676 subtopic, section = remaining.split('.', 1)
4677 else:
4677 else:
4678 if name in help.subtopics:
4678 if name in help.subtopics:
4679 subtopic = remaining
4679 subtopic = remaining
4680 else:
4680 else:
4681 section = remaining
4681 section = remaining
4682
4682
4683 text = help.help_(ui, name, subtopic=subtopic, **opts)
4683 text = help.help_(ui, name, subtopic=subtopic, **opts)
4684
4684
4685 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4685 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4686 section=section)
4686 section=section)
4687
4687
4688 # We could have been given a weird ".foo" section without a name
4688 # We could have been given a weird ".foo" section without a name
4689 # to look for, or we could have simply failed to found "foo.bar"
4689 # to look for, or we could have simply failed to found "foo.bar"
4690 # because bar isn't a section of foo
4690 # because bar isn't a section of foo
4691 if section and not (formatted and name):
4691 if section and not (formatted and name):
4692 raise error.Abort(_("help section not found"))
4692 raise error.Abort(_("help section not found"))
4693
4693
4694 if 'verbose' in pruned:
4694 if 'verbose' in pruned:
4695 keep.append('omitted')
4695 keep.append('omitted')
4696 else:
4696 else:
4697 keep.append('notomitted')
4697 keep.append('notomitted')
4698 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4698 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4699 section=section)
4699 section=section)
4700 ui.write(formatted)
4700 ui.write(formatted)
4701
4701
4702
4702
4703 @command('identify|id',
4703 @command('identify|id',
4704 [('r', 'rev', '',
4704 [('r', 'rev', '',
4705 _('identify the specified revision'), _('REV')),
4705 _('identify the specified revision'), _('REV')),
4706 ('n', 'num', None, _('show local revision number')),
4706 ('n', 'num', None, _('show local revision number')),
4707 ('i', 'id', None, _('show global revision id')),
4707 ('i', 'id', None, _('show global revision id')),
4708 ('b', 'branch', None, _('show branch')),
4708 ('b', 'branch', None, _('show branch')),
4709 ('t', 'tags', None, _('show tags')),
4709 ('t', 'tags', None, _('show tags')),
4710 ('B', 'bookmarks', None, _('show bookmarks')),
4710 ('B', 'bookmarks', None, _('show bookmarks')),
4711 ] + remoteopts,
4711 ] + remoteopts,
4712 _('[-nibtB] [-r REV] [SOURCE]'),
4712 _('[-nibtB] [-r REV] [SOURCE]'),
4713 optionalrepo=True)
4713 optionalrepo=True)
4714 def identify(ui, repo, source=None, rev=None,
4714 def identify(ui, repo, source=None, rev=None,
4715 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4715 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4716 """identify the working directory or specified revision
4716 """identify the working directory or specified revision
4717
4717
4718 Print a summary identifying the repository state at REV using one or
4718 Print a summary identifying the repository state at REV using one or
4719 two parent hash identifiers, followed by a "+" if the working
4719 two parent hash identifiers, followed by a "+" if the working
4720 directory has uncommitted changes, the branch name (if not default),
4720 directory has uncommitted changes, the branch name (if not default),
4721 a list of tags, and a list of bookmarks.
4721 a list of tags, and a list of bookmarks.
4722
4722
4723 When REV is not given, print a summary of the current state of the
4723 When REV is not given, print a summary of the current state of the
4724 repository.
4724 repository.
4725
4725
4726 Specifying a path to a repository root or Mercurial bundle will
4726 Specifying a path to a repository root or Mercurial bundle will
4727 cause lookup to operate on that repository/bundle.
4727 cause lookup to operate on that repository/bundle.
4728
4728
4729 .. container:: verbose
4729 .. container:: verbose
4730
4730
4731 Examples:
4731 Examples:
4732
4732
4733 - generate a build identifier for the working directory::
4733 - generate a build identifier for the working directory::
4734
4734
4735 hg id --id > build-id.dat
4735 hg id --id > build-id.dat
4736
4736
4737 - find the revision corresponding to a tag::
4737 - find the revision corresponding to a tag::
4738
4738
4739 hg id -n -r 1.3
4739 hg id -n -r 1.3
4740
4740
4741 - check the most recent revision of a remote repository::
4741 - check the most recent revision of a remote repository::
4742
4742
4743 hg id -r tip http://selenic.com/hg/
4743 hg id -r tip https://www.mercurial-scm.org/repo/hg/
4744
4744
4745 See :hg:`log` for generating more information about specific revisions,
4745 See :hg:`log` for generating more information about specific revisions,
4746 including full hash identifiers.
4746 including full hash identifiers.
4747
4747
4748 Returns 0 if successful.
4748 Returns 0 if successful.
4749 """
4749 """
4750
4750
4751 if not repo and not source:
4751 if not repo and not source:
4752 raise error.Abort(_("there is no Mercurial repository here "
4752 raise error.Abort(_("there is no Mercurial repository here "
4753 "(.hg not found)"))
4753 "(.hg not found)"))
4754
4754
4755 if ui.debugflag:
4755 if ui.debugflag:
4756 hexfunc = hex
4756 hexfunc = hex
4757 else:
4757 else:
4758 hexfunc = short
4758 hexfunc = short
4759 default = not (num or id or branch or tags or bookmarks)
4759 default = not (num or id or branch or tags or bookmarks)
4760 output = []
4760 output = []
4761 revs = []
4761 revs = []
4762
4762
4763 if source:
4763 if source:
4764 source, branches = hg.parseurl(ui.expandpath(source))
4764 source, branches = hg.parseurl(ui.expandpath(source))
4765 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4765 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4766 repo = peer.local()
4766 repo = peer.local()
4767 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4767 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4768
4768
4769 if not repo:
4769 if not repo:
4770 if num or branch or tags:
4770 if num or branch or tags:
4771 raise error.Abort(
4771 raise error.Abort(
4772 _("can't query remote revision number, branch, or tags"))
4772 _("can't query remote revision number, branch, or tags"))
4773 if not rev and revs:
4773 if not rev and revs:
4774 rev = revs[0]
4774 rev = revs[0]
4775 if not rev:
4775 if not rev:
4776 rev = "tip"
4776 rev = "tip"
4777
4777
4778 remoterev = peer.lookup(rev)
4778 remoterev = peer.lookup(rev)
4779 if default or id:
4779 if default or id:
4780 output = [hexfunc(remoterev)]
4780 output = [hexfunc(remoterev)]
4781
4781
4782 def getbms():
4782 def getbms():
4783 bms = []
4783 bms = []
4784
4784
4785 if 'bookmarks' in peer.listkeys('namespaces'):
4785 if 'bookmarks' in peer.listkeys('namespaces'):
4786 hexremoterev = hex(remoterev)
4786 hexremoterev = hex(remoterev)
4787 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4787 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4788 if bmr == hexremoterev]
4788 if bmr == hexremoterev]
4789
4789
4790 return sorted(bms)
4790 return sorted(bms)
4791
4791
4792 if bookmarks:
4792 if bookmarks:
4793 output.extend(getbms())
4793 output.extend(getbms())
4794 elif default and not ui.quiet:
4794 elif default and not ui.quiet:
4795 # multiple bookmarks for a single parent separated by '/'
4795 # multiple bookmarks for a single parent separated by '/'
4796 bm = '/'.join(getbms())
4796 bm = '/'.join(getbms())
4797 if bm:
4797 if bm:
4798 output.append(bm)
4798 output.append(bm)
4799 else:
4799 else:
4800 ctx = scmutil.revsingle(repo, rev, None)
4800 ctx = scmutil.revsingle(repo, rev, None)
4801
4801
4802 if ctx.rev() is None:
4802 if ctx.rev() is None:
4803 ctx = repo[None]
4803 ctx = repo[None]
4804 parents = ctx.parents()
4804 parents = ctx.parents()
4805 taglist = []
4805 taglist = []
4806 for p in parents:
4806 for p in parents:
4807 taglist.extend(p.tags())
4807 taglist.extend(p.tags())
4808
4808
4809 changed = ""
4809 changed = ""
4810 if default or id or num:
4810 if default or id or num:
4811 if (any(repo.status())
4811 if (any(repo.status())
4812 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4812 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4813 changed = '+'
4813 changed = '+'
4814 if default or id:
4814 if default or id:
4815 output = ["%s%s" %
4815 output = ["%s%s" %
4816 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4816 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4817 if num:
4817 if num:
4818 output.append("%s%s" %
4818 output.append("%s%s" %
4819 ('+'.join([str(p.rev()) for p in parents]), changed))
4819 ('+'.join([str(p.rev()) for p in parents]), changed))
4820 else:
4820 else:
4821 if default or id:
4821 if default or id:
4822 output = [hexfunc(ctx.node())]
4822 output = [hexfunc(ctx.node())]
4823 if num:
4823 if num:
4824 output.append(str(ctx.rev()))
4824 output.append(str(ctx.rev()))
4825 taglist = ctx.tags()
4825 taglist = ctx.tags()
4826
4826
4827 if default and not ui.quiet:
4827 if default and not ui.quiet:
4828 b = ctx.branch()
4828 b = ctx.branch()
4829 if b != 'default':
4829 if b != 'default':
4830 output.append("(%s)" % b)
4830 output.append("(%s)" % b)
4831
4831
4832 # multiple tags for a single parent separated by '/'
4832 # multiple tags for a single parent separated by '/'
4833 t = '/'.join(taglist)
4833 t = '/'.join(taglist)
4834 if t:
4834 if t:
4835 output.append(t)
4835 output.append(t)
4836
4836
4837 # multiple bookmarks for a single parent separated by '/'
4837 # multiple bookmarks for a single parent separated by '/'
4838 bm = '/'.join(ctx.bookmarks())
4838 bm = '/'.join(ctx.bookmarks())
4839 if bm:
4839 if bm:
4840 output.append(bm)
4840 output.append(bm)
4841 else:
4841 else:
4842 if branch:
4842 if branch:
4843 output.append(ctx.branch())
4843 output.append(ctx.branch())
4844
4844
4845 if tags:
4845 if tags:
4846 output.extend(taglist)
4846 output.extend(taglist)
4847
4847
4848 if bookmarks:
4848 if bookmarks:
4849 output.extend(ctx.bookmarks())
4849 output.extend(ctx.bookmarks())
4850
4850
4851 ui.write("%s\n" % ' '.join(output))
4851 ui.write("%s\n" % ' '.join(output))
4852
4852
4853 @command('import|patch',
4853 @command('import|patch',
4854 [('p', 'strip', 1,
4854 [('p', 'strip', 1,
4855 _('directory strip option for patch. This has the same '
4855 _('directory strip option for patch. This has the same '
4856 'meaning as the corresponding patch option'), _('NUM')),
4856 'meaning as the corresponding patch option'), _('NUM')),
4857 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4857 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4858 ('e', 'edit', False, _('invoke editor on commit messages')),
4858 ('e', 'edit', False, _('invoke editor on commit messages')),
4859 ('f', 'force', None,
4859 ('f', 'force', None,
4860 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4860 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4861 ('', 'no-commit', None,
4861 ('', 'no-commit', None,
4862 _("don't commit, just update the working directory")),
4862 _("don't commit, just update the working directory")),
4863 ('', 'bypass', None,
4863 ('', 'bypass', None,
4864 _("apply patch without touching the working directory")),
4864 _("apply patch without touching the working directory")),
4865 ('', 'partial', None,
4865 ('', 'partial', None,
4866 _('commit even if some hunks fail')),
4866 _('commit even if some hunks fail')),
4867 ('', 'exact', None,
4867 ('', 'exact', None,
4868 _('abort if patch would apply lossily')),
4868 _('abort if patch would apply lossily')),
4869 ('', 'prefix', '',
4869 ('', 'prefix', '',
4870 _('apply patch to subdirectory'), _('DIR')),
4870 _('apply patch to subdirectory'), _('DIR')),
4871 ('', 'import-branch', None,
4871 ('', 'import-branch', None,
4872 _('use any branch information in patch (implied by --exact)'))] +
4872 _('use any branch information in patch (implied by --exact)'))] +
4873 commitopts + commitopts2 + similarityopts,
4873 commitopts + commitopts2 + similarityopts,
4874 _('[OPTION]... PATCH...'))
4874 _('[OPTION]... PATCH...'))
4875 def import_(ui, repo, patch1=None, *patches, **opts):
4875 def import_(ui, repo, patch1=None, *patches, **opts):
4876 """import an ordered set of patches
4876 """import an ordered set of patches
4877
4877
4878 Import a list of patches and commit them individually (unless
4878 Import a list of patches and commit them individually (unless
4879 --no-commit is specified).
4879 --no-commit is specified).
4880
4880
4881 To read a patch from standard input, use "-" as the patch name. If
4881 To read a patch from standard input, use "-" as the patch name. If
4882 a URL is specified, the patch will be downloaded from there.
4882 a URL is specified, the patch will be downloaded from there.
4883
4883
4884 Import first applies changes to the working directory (unless
4884 Import first applies changes to the working directory (unless
4885 --bypass is specified), import will abort if there are outstanding
4885 --bypass is specified), import will abort if there are outstanding
4886 changes.
4886 changes.
4887
4887
4888 Use --bypass to apply and commit patches directly to the
4888 Use --bypass to apply and commit patches directly to the
4889 repository, without affecting the working directory. Without
4889 repository, without affecting the working directory. Without
4890 --exact, patches will be applied on top of the working directory
4890 --exact, patches will be applied on top of the working directory
4891 parent revision.
4891 parent revision.
4892
4892
4893 You can import a patch straight from a mail message. Even patches
4893 You can import a patch straight from a mail message. Even patches
4894 as attachments work (to use the body part, it must have type
4894 as attachments work (to use the body part, it must have type
4895 text/plain or text/x-patch). From and Subject headers of email
4895 text/plain or text/x-patch). From and Subject headers of email
4896 message are used as default committer and commit message. All
4896 message are used as default committer and commit message. All
4897 text/plain body parts before first diff are added to the commit
4897 text/plain body parts before first diff are added to the commit
4898 message.
4898 message.
4899
4899
4900 If the imported patch was generated by :hg:`export`, user and
4900 If the imported patch was generated by :hg:`export`, user and
4901 description from patch override values from message headers and
4901 description from patch override values from message headers and
4902 body. Values given on command line with -m/--message and -u/--user
4902 body. Values given on command line with -m/--message and -u/--user
4903 override these.
4903 override these.
4904
4904
4905 If --exact is specified, import will set the working directory to
4905 If --exact is specified, import will set the working directory to
4906 the parent of each patch before applying it, and will abort if the
4906 the parent of each patch before applying it, and will abort if the
4907 resulting changeset has a different ID than the one recorded in
4907 resulting changeset has a different ID than the one recorded in
4908 the patch. This will guard against various ways that portable
4908 the patch. This will guard against various ways that portable
4909 patch formats and mail systems might fail to transfer Mercurial
4909 patch formats and mail systems might fail to transfer Mercurial
4910 data or metadata. See :hg:`bundle` for lossless transmission.
4910 data or metadata. See :hg:`bundle` for lossless transmission.
4911
4911
4912 Use --partial to ensure a changeset will be created from the patch
4912 Use --partial to ensure a changeset will be created from the patch
4913 even if some hunks fail to apply. Hunks that fail to apply will be
4913 even if some hunks fail to apply. Hunks that fail to apply will be
4914 written to a <target-file>.rej file. Conflicts can then be resolved
4914 written to a <target-file>.rej file. Conflicts can then be resolved
4915 by hand before :hg:`commit --amend` is run to update the created
4915 by hand before :hg:`commit --amend` is run to update the created
4916 changeset. This flag exists to let people import patches that
4916 changeset. This flag exists to let people import patches that
4917 partially apply without losing the associated metadata (author,
4917 partially apply without losing the associated metadata (author,
4918 date, description, ...).
4918 date, description, ...).
4919
4919
4920 .. note::
4920 .. note::
4921
4921
4922 When no hunks apply cleanly, :hg:`import --partial` will create
4922 When no hunks apply cleanly, :hg:`import --partial` will create
4923 an empty changeset, importing only the patch metadata.
4923 an empty changeset, importing only the patch metadata.
4924
4924
4925 With -s/--similarity, hg will attempt to discover renames and
4925 With -s/--similarity, hg will attempt to discover renames and
4926 copies in the patch in the same way as :hg:`addremove`.
4926 copies in the patch in the same way as :hg:`addremove`.
4927
4927
4928 It is possible to use external patch programs to perform the patch
4928 It is possible to use external patch programs to perform the patch
4929 by setting the ``ui.patch`` configuration option. For the default
4929 by setting the ``ui.patch`` configuration option. For the default
4930 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4930 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4931 See :hg:`help config` for more information about configuration
4931 See :hg:`help config` for more information about configuration
4932 files and how to use these options.
4932 files and how to use these options.
4933
4933
4934 See :hg:`help dates` for a list of formats valid for -d/--date.
4934 See :hg:`help dates` for a list of formats valid for -d/--date.
4935
4935
4936 .. container:: verbose
4936 .. container:: verbose
4937
4937
4938 Examples:
4938 Examples:
4939
4939
4940 - import a traditional patch from a website and detect renames::
4940 - import a traditional patch from a website and detect renames::
4941
4941
4942 hg import -s 80 http://example.com/bugfix.patch
4942 hg import -s 80 http://example.com/bugfix.patch
4943
4943
4944 - import a changeset from an hgweb server::
4944 - import a changeset from an hgweb server::
4945
4945
4946 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4946 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4947
4947
4948 - import all the patches in an Unix-style mbox::
4948 - import all the patches in an Unix-style mbox::
4949
4949
4950 hg import incoming-patches.mbox
4950 hg import incoming-patches.mbox
4951
4951
4952 - attempt to exactly restore an exported changeset (not always
4952 - attempt to exactly restore an exported changeset (not always
4953 possible)::
4953 possible)::
4954
4954
4955 hg import --exact proposed-fix.patch
4955 hg import --exact proposed-fix.patch
4956
4956
4957 - use an external tool to apply a patch which is too fuzzy for
4957 - use an external tool to apply a patch which is too fuzzy for
4958 the default internal tool.
4958 the default internal tool.
4959
4959
4960 hg import --config ui.patch="patch --merge" fuzzy.patch
4960 hg import --config ui.patch="patch --merge" fuzzy.patch
4961
4961
4962 - change the default fuzzing from 2 to a less strict 7
4962 - change the default fuzzing from 2 to a less strict 7
4963
4963
4964 hg import --config ui.fuzz=7 fuzz.patch
4964 hg import --config ui.fuzz=7 fuzz.patch
4965
4965
4966 Returns 0 on success, 1 on partial success (see --partial).
4966 Returns 0 on success, 1 on partial success (see --partial).
4967 """
4967 """
4968
4968
4969 if not patch1:
4969 if not patch1:
4970 raise error.Abort(_('need at least one patch to import'))
4970 raise error.Abort(_('need at least one patch to import'))
4971
4971
4972 patches = (patch1,) + patches
4972 patches = (patch1,) + patches
4973
4973
4974 date = opts.get('date')
4974 date = opts.get('date')
4975 if date:
4975 if date:
4976 opts['date'] = util.parsedate(date)
4976 opts['date'] = util.parsedate(date)
4977
4977
4978 exact = opts.get('exact')
4978 exact = opts.get('exact')
4979 update = not opts.get('bypass')
4979 update = not opts.get('bypass')
4980 if not update and opts.get('no_commit'):
4980 if not update and opts.get('no_commit'):
4981 raise error.Abort(_('cannot use --no-commit with --bypass'))
4981 raise error.Abort(_('cannot use --no-commit with --bypass'))
4982 try:
4982 try:
4983 sim = float(opts.get('similarity') or 0)
4983 sim = float(opts.get('similarity') or 0)
4984 except ValueError:
4984 except ValueError:
4985 raise error.Abort(_('similarity must be a number'))
4985 raise error.Abort(_('similarity must be a number'))
4986 if sim < 0 or sim > 100:
4986 if sim < 0 or sim > 100:
4987 raise error.Abort(_('similarity must be between 0 and 100'))
4987 raise error.Abort(_('similarity must be between 0 and 100'))
4988 if sim and not update:
4988 if sim and not update:
4989 raise error.Abort(_('cannot use --similarity with --bypass'))
4989 raise error.Abort(_('cannot use --similarity with --bypass'))
4990 if exact:
4990 if exact:
4991 if opts.get('edit'):
4991 if opts.get('edit'):
4992 raise error.Abort(_('cannot use --exact with --edit'))
4992 raise error.Abort(_('cannot use --exact with --edit'))
4993 if opts.get('prefix'):
4993 if opts.get('prefix'):
4994 raise error.Abort(_('cannot use --exact with --prefix'))
4994 raise error.Abort(_('cannot use --exact with --prefix'))
4995
4995
4996 base = opts["base"]
4996 base = opts["base"]
4997 wlock = dsguard = lock = tr = None
4997 wlock = dsguard = lock = tr = None
4998 msgs = []
4998 msgs = []
4999 ret = 0
4999 ret = 0
5000
5000
5001
5001
5002 try:
5002 try:
5003 wlock = repo.wlock()
5003 wlock = repo.wlock()
5004
5004
5005 if update:
5005 if update:
5006 cmdutil.checkunfinished(repo)
5006 cmdutil.checkunfinished(repo)
5007 if (exact or not opts.get('force')):
5007 if (exact or not opts.get('force')):
5008 cmdutil.bailifchanged(repo)
5008 cmdutil.bailifchanged(repo)
5009
5009
5010 if not opts.get('no_commit'):
5010 if not opts.get('no_commit'):
5011 lock = repo.lock()
5011 lock = repo.lock()
5012 tr = repo.transaction('import')
5012 tr = repo.transaction('import')
5013 else:
5013 else:
5014 dsguard = cmdutil.dirstateguard(repo, 'import')
5014 dsguard = cmdutil.dirstateguard(repo, 'import')
5015 parents = repo[None].parents()
5015 parents = repo[None].parents()
5016 for patchurl in patches:
5016 for patchurl in patches:
5017 if patchurl == '-':
5017 if patchurl == '-':
5018 ui.status(_('applying patch from stdin\n'))
5018 ui.status(_('applying patch from stdin\n'))
5019 patchfile = ui.fin
5019 patchfile = ui.fin
5020 patchurl = 'stdin' # for error message
5020 patchurl = 'stdin' # for error message
5021 else:
5021 else:
5022 patchurl = os.path.join(base, patchurl)
5022 patchurl = os.path.join(base, patchurl)
5023 ui.status(_('applying %s\n') % patchurl)
5023 ui.status(_('applying %s\n') % patchurl)
5024 patchfile = hg.openpath(ui, patchurl)
5024 patchfile = hg.openpath(ui, patchurl)
5025
5025
5026 haspatch = False
5026 haspatch = False
5027 for hunk in patch.split(patchfile):
5027 for hunk in patch.split(patchfile):
5028 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
5028 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
5029 parents, opts,
5029 parents, opts,
5030 msgs, hg.clean)
5030 msgs, hg.clean)
5031 if msg:
5031 if msg:
5032 haspatch = True
5032 haspatch = True
5033 ui.note(msg + '\n')
5033 ui.note(msg + '\n')
5034 if update or exact:
5034 if update or exact:
5035 parents = repo[None].parents()
5035 parents = repo[None].parents()
5036 else:
5036 else:
5037 parents = [repo[node]]
5037 parents = [repo[node]]
5038 if rej:
5038 if rej:
5039 ui.write_err(_("patch applied partially\n"))
5039 ui.write_err(_("patch applied partially\n"))
5040 ui.write_err(_("(fix the .rej files and run "
5040 ui.write_err(_("(fix the .rej files and run "
5041 "`hg commit --amend`)\n"))
5041 "`hg commit --amend`)\n"))
5042 ret = 1
5042 ret = 1
5043 break
5043 break
5044
5044
5045 if not haspatch:
5045 if not haspatch:
5046 raise error.Abort(_('%s: no diffs found') % patchurl)
5046 raise error.Abort(_('%s: no diffs found') % patchurl)
5047
5047
5048 if tr:
5048 if tr:
5049 tr.close()
5049 tr.close()
5050 if msgs:
5050 if msgs:
5051 repo.savecommitmessage('\n* * *\n'.join(msgs))
5051 repo.savecommitmessage('\n* * *\n'.join(msgs))
5052 if dsguard:
5052 if dsguard:
5053 dsguard.close()
5053 dsguard.close()
5054 return ret
5054 return ret
5055 finally:
5055 finally:
5056 if tr:
5056 if tr:
5057 tr.release()
5057 tr.release()
5058 release(lock, dsguard, wlock)
5058 release(lock, dsguard, wlock)
5059
5059
5060 @command('incoming|in',
5060 @command('incoming|in',
5061 [('f', 'force', None,
5061 [('f', 'force', None,
5062 _('run even if remote repository is unrelated')),
5062 _('run even if remote repository is unrelated')),
5063 ('n', 'newest-first', None, _('show newest record first')),
5063 ('n', 'newest-first', None, _('show newest record first')),
5064 ('', 'bundle', '',
5064 ('', 'bundle', '',
5065 _('file to store the bundles into'), _('FILE')),
5065 _('file to store the bundles into'), _('FILE')),
5066 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5066 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5067 ('B', 'bookmarks', False, _("compare bookmarks")),
5067 ('B', 'bookmarks', False, _("compare bookmarks")),
5068 ('b', 'branch', [],
5068 ('b', 'branch', [],
5069 _('a specific branch you would like to pull'), _('BRANCH')),
5069 _('a specific branch you would like to pull'), _('BRANCH')),
5070 ] + logopts + remoteopts + subrepoopts,
5070 ] + logopts + remoteopts + subrepoopts,
5071 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
5071 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
5072 def incoming(ui, repo, source="default", **opts):
5072 def incoming(ui, repo, source="default", **opts):
5073 """show new changesets found in source
5073 """show new changesets found in source
5074
5074
5075 Show new changesets found in the specified path/URL or the default
5075 Show new changesets found in the specified path/URL or the default
5076 pull location. These are the changesets that would have been pulled
5076 pull location. These are the changesets that would have been pulled
5077 if a pull at the time you issued this command.
5077 if a pull at the time you issued this command.
5078
5078
5079 See pull for valid source format details.
5079 See pull for valid source format details.
5080
5080
5081 .. container:: verbose
5081 .. container:: verbose
5082
5082
5083 With -B/--bookmarks, the result of bookmark comparison between
5083 With -B/--bookmarks, the result of bookmark comparison between
5084 local and remote repositories is displayed. With -v/--verbose,
5084 local and remote repositories is displayed. With -v/--verbose,
5085 status is also displayed for each bookmark like below::
5085 status is also displayed for each bookmark like below::
5086
5086
5087 BM1 01234567890a added
5087 BM1 01234567890a added
5088 BM2 1234567890ab advanced
5088 BM2 1234567890ab advanced
5089 BM3 234567890abc diverged
5089 BM3 234567890abc diverged
5090 BM4 34567890abcd changed
5090 BM4 34567890abcd changed
5091
5091
5092 The action taken locally when pulling depends on the
5092 The action taken locally when pulling depends on the
5093 status of each bookmark:
5093 status of each bookmark:
5094
5094
5095 :``added``: pull will create it
5095 :``added``: pull will create it
5096 :``advanced``: pull will update it
5096 :``advanced``: pull will update it
5097 :``diverged``: pull will create a divergent bookmark
5097 :``diverged``: pull will create a divergent bookmark
5098 :``changed``: result depends on remote changesets
5098 :``changed``: result depends on remote changesets
5099
5099
5100 From the point of view of pulling behavior, bookmark
5100 From the point of view of pulling behavior, bookmark
5101 existing only in the remote repository are treated as ``added``,
5101 existing only in the remote repository are treated as ``added``,
5102 even if it is in fact locally deleted.
5102 even if it is in fact locally deleted.
5103
5103
5104 .. container:: verbose
5104 .. container:: verbose
5105
5105
5106 For remote repository, using --bundle avoids downloading the
5106 For remote repository, using --bundle avoids downloading the
5107 changesets twice if the incoming is followed by a pull.
5107 changesets twice if the incoming is followed by a pull.
5108
5108
5109 Examples:
5109 Examples:
5110
5110
5111 - show incoming changes with patches and full description::
5111 - show incoming changes with patches and full description::
5112
5112
5113 hg incoming -vp
5113 hg incoming -vp
5114
5114
5115 - show incoming changes excluding merges, store a bundle::
5115 - show incoming changes excluding merges, store a bundle::
5116
5116
5117 hg in -vpM --bundle incoming.hg
5117 hg in -vpM --bundle incoming.hg
5118 hg pull incoming.hg
5118 hg pull incoming.hg
5119
5119
5120 - briefly list changes inside a bundle::
5120 - briefly list changes inside a bundle::
5121
5121
5122 hg in changes.hg -T "{desc|firstline}\\n"
5122 hg in changes.hg -T "{desc|firstline}\\n"
5123
5123
5124 Returns 0 if there are incoming changes, 1 otherwise.
5124 Returns 0 if there are incoming changes, 1 otherwise.
5125 """
5125 """
5126 if opts.get('graph'):
5126 if opts.get('graph'):
5127 cmdutil.checkunsupportedgraphflags([], opts)
5127 cmdutil.checkunsupportedgraphflags([], opts)
5128 def display(other, chlist, displayer):
5128 def display(other, chlist, displayer):
5129 revdag = cmdutil.graphrevs(other, chlist, opts)
5129 revdag = cmdutil.graphrevs(other, chlist, opts)
5130 cmdutil.displaygraph(ui, repo, revdag, displayer,
5130 cmdutil.displaygraph(ui, repo, revdag, displayer,
5131 graphmod.asciiedges)
5131 graphmod.asciiedges)
5132
5132
5133 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
5133 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
5134 return 0
5134 return 0
5135
5135
5136 if opts.get('bundle') and opts.get('subrepos'):
5136 if opts.get('bundle') and opts.get('subrepos'):
5137 raise error.Abort(_('cannot combine --bundle and --subrepos'))
5137 raise error.Abort(_('cannot combine --bundle and --subrepos'))
5138
5138
5139 if opts.get('bookmarks'):
5139 if opts.get('bookmarks'):
5140 source, branches = hg.parseurl(ui.expandpath(source),
5140 source, branches = hg.parseurl(ui.expandpath(source),
5141 opts.get('branch'))
5141 opts.get('branch'))
5142 other = hg.peer(repo, opts, source)
5142 other = hg.peer(repo, opts, source)
5143 if 'bookmarks' not in other.listkeys('namespaces'):
5143 if 'bookmarks' not in other.listkeys('namespaces'):
5144 ui.warn(_("remote doesn't support bookmarks\n"))
5144 ui.warn(_("remote doesn't support bookmarks\n"))
5145 return 0
5145 return 0
5146 ui.status(_('comparing with %s\n') % util.hidepassword(source))
5146 ui.status(_('comparing with %s\n') % util.hidepassword(source))
5147 return bookmarks.incoming(ui, repo, other)
5147 return bookmarks.incoming(ui, repo, other)
5148
5148
5149 repo._subtoppath = ui.expandpath(source)
5149 repo._subtoppath = ui.expandpath(source)
5150 try:
5150 try:
5151 return hg.incoming(ui, repo, source, opts)
5151 return hg.incoming(ui, repo, source, opts)
5152 finally:
5152 finally:
5153 del repo._subtoppath
5153 del repo._subtoppath
5154
5154
5155
5155
5156 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
5156 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
5157 norepo=True)
5157 norepo=True)
5158 def init(ui, dest=".", **opts):
5158 def init(ui, dest=".", **opts):
5159 """create a new repository in the given directory
5159 """create a new repository in the given directory
5160
5160
5161 Initialize a new repository in the given directory. If the given
5161 Initialize a new repository in the given directory. If the given
5162 directory does not exist, it will be created.
5162 directory does not exist, it will be created.
5163
5163
5164 If no directory is given, the current directory is used.
5164 If no directory is given, the current directory is used.
5165
5165
5166 It is possible to specify an ``ssh://`` URL as the destination.
5166 It is possible to specify an ``ssh://`` URL as the destination.
5167 See :hg:`help urls` for more information.
5167 See :hg:`help urls` for more information.
5168
5168
5169 Returns 0 on success.
5169 Returns 0 on success.
5170 """
5170 """
5171 hg.peer(ui, opts, ui.expandpath(dest), create=True)
5171 hg.peer(ui, opts, ui.expandpath(dest), create=True)
5172
5172
5173 @command('locate',
5173 @command('locate',
5174 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
5174 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
5175 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5175 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5176 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
5176 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
5177 ] + walkopts,
5177 ] + walkopts,
5178 _('[OPTION]... [PATTERN]...'))
5178 _('[OPTION]... [PATTERN]...'))
5179 def locate(ui, repo, *pats, **opts):
5179 def locate(ui, repo, *pats, **opts):
5180 """locate files matching specific patterns (DEPRECATED)
5180 """locate files matching specific patterns (DEPRECATED)
5181
5181
5182 Print files under Mercurial control in the working directory whose
5182 Print files under Mercurial control in the working directory whose
5183 names match the given patterns.
5183 names match the given patterns.
5184
5184
5185 By default, this command searches all directories in the working
5185 By default, this command searches all directories in the working
5186 directory. To search just the current directory and its
5186 directory. To search just the current directory and its
5187 subdirectories, use "--include .".
5187 subdirectories, use "--include .".
5188
5188
5189 If no patterns are given to match, this command prints the names
5189 If no patterns are given to match, this command prints the names
5190 of all files under Mercurial control in the working directory.
5190 of all files under Mercurial control in the working directory.
5191
5191
5192 If you want to feed the output of this command into the "xargs"
5192 If you want to feed the output of this command into the "xargs"
5193 command, use the -0 option to both this command and "xargs". This
5193 command, use the -0 option to both this command and "xargs". This
5194 will avoid the problem of "xargs" treating single filenames that
5194 will avoid the problem of "xargs" treating single filenames that
5195 contain whitespace as multiple filenames.
5195 contain whitespace as multiple filenames.
5196
5196
5197 See :hg:`help files` for a more versatile command.
5197 See :hg:`help files` for a more versatile command.
5198
5198
5199 Returns 0 if a match is found, 1 otherwise.
5199 Returns 0 if a match is found, 1 otherwise.
5200 """
5200 """
5201 if opts.get('print0'):
5201 if opts.get('print0'):
5202 end = '\0'
5202 end = '\0'
5203 else:
5203 else:
5204 end = '\n'
5204 end = '\n'
5205 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
5205 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
5206
5206
5207 ret = 1
5207 ret = 1
5208 ctx = repo[rev]
5208 ctx = repo[rev]
5209 m = scmutil.match(ctx, pats, opts, default='relglob',
5209 m = scmutil.match(ctx, pats, opts, default='relglob',
5210 badfn=lambda x, y: False)
5210 badfn=lambda x, y: False)
5211
5211
5212 for abs in ctx.matches(m):
5212 for abs in ctx.matches(m):
5213 if opts.get('fullpath'):
5213 if opts.get('fullpath'):
5214 ui.write(repo.wjoin(abs), end)
5214 ui.write(repo.wjoin(abs), end)
5215 else:
5215 else:
5216 ui.write(((pats and m.rel(abs)) or abs), end)
5216 ui.write(((pats and m.rel(abs)) or abs), end)
5217 ret = 0
5217 ret = 0
5218
5218
5219 return ret
5219 return ret
5220
5220
5221 @command('^log|history',
5221 @command('^log|history',
5222 [('f', 'follow', None,
5222 [('f', 'follow', None,
5223 _('follow changeset history, or file history across copies and renames')),
5223 _('follow changeset history, or file history across copies and renames')),
5224 ('', 'follow-first', None,
5224 ('', 'follow-first', None,
5225 _('only follow the first parent of merge changesets (DEPRECATED)')),
5225 _('only follow the first parent of merge changesets (DEPRECATED)')),
5226 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
5226 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
5227 ('C', 'copies', None, _('show copied files')),
5227 ('C', 'copies', None, _('show copied files')),
5228 ('k', 'keyword', [],
5228 ('k', 'keyword', [],
5229 _('do case-insensitive search for a given text'), _('TEXT')),
5229 _('do case-insensitive search for a given text'), _('TEXT')),
5230 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
5230 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
5231 ('', 'removed', None, _('include revisions where files were removed')),
5231 ('', 'removed', None, _('include revisions where files were removed')),
5232 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
5232 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
5233 ('u', 'user', [], _('revisions committed by user'), _('USER')),
5233 ('u', 'user', [], _('revisions committed by user'), _('USER')),
5234 ('', 'only-branch', [],
5234 ('', 'only-branch', [],
5235 _('show only changesets within the given named branch (DEPRECATED)'),
5235 _('show only changesets within the given named branch (DEPRECATED)'),
5236 _('BRANCH')),
5236 _('BRANCH')),
5237 ('b', 'branch', [],
5237 ('b', 'branch', [],
5238 _('show changesets within the given named branch'), _('BRANCH')),
5238 _('show changesets within the given named branch'), _('BRANCH')),
5239 ('P', 'prune', [],
5239 ('P', 'prune', [],
5240 _('do not display revision or any of its ancestors'), _('REV')),
5240 _('do not display revision or any of its ancestors'), _('REV')),
5241 ] + logopts + walkopts,
5241 ] + logopts + walkopts,
5242 _('[OPTION]... [FILE]'),
5242 _('[OPTION]... [FILE]'),
5243 inferrepo=True)
5243 inferrepo=True)
5244 def log(ui, repo, *pats, **opts):
5244 def log(ui, repo, *pats, **opts):
5245 """show revision history of entire repository or files
5245 """show revision history of entire repository or files
5246
5246
5247 Print the revision history of the specified files or the entire
5247 Print the revision history of the specified files or the entire
5248 project.
5248 project.
5249
5249
5250 If no revision range is specified, the default is ``tip:0`` unless
5250 If no revision range is specified, the default is ``tip:0`` unless
5251 --follow is set, in which case the working directory parent is
5251 --follow is set, in which case the working directory parent is
5252 used as the starting revision.
5252 used as the starting revision.
5253
5253
5254 File history is shown without following rename or copy history of
5254 File history is shown without following rename or copy history of
5255 files. Use -f/--follow with a filename to follow history across
5255 files. Use -f/--follow with a filename to follow history across
5256 renames and copies. --follow without a filename will only show
5256 renames and copies. --follow without a filename will only show
5257 ancestors or descendants of the starting revision.
5257 ancestors or descendants of the starting revision.
5258
5258
5259 By default this command prints revision number and changeset id,
5259 By default this command prints revision number and changeset id,
5260 tags, non-trivial parents, user, date and time, and a summary for
5260 tags, non-trivial parents, user, date and time, and a summary for
5261 each commit. When the -v/--verbose switch is used, the list of
5261 each commit. When the -v/--verbose switch is used, the list of
5262 changed files and full commit message are shown.
5262 changed files and full commit message are shown.
5263
5263
5264 With --graph the revisions are shown as an ASCII art DAG with the most
5264 With --graph the revisions are shown as an ASCII art DAG with the most
5265 recent changeset at the top.
5265 recent changeset at the top.
5266 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
5266 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
5267 and '+' represents a fork where the changeset from the lines below is a
5267 and '+' represents a fork where the changeset from the lines below is a
5268 parent of the 'o' merge on the same line.
5268 parent of the 'o' merge on the same line.
5269
5269
5270 .. note::
5270 .. note::
5271
5271
5272 :hg:`log --patch` may generate unexpected diff output for merge
5272 :hg:`log --patch` may generate unexpected diff output for merge
5273 changesets, as it will only compare the merge changeset against
5273 changesets, as it will only compare the merge changeset against
5274 its first parent. Also, only files different from BOTH parents
5274 its first parent. Also, only files different from BOTH parents
5275 will appear in files:.
5275 will appear in files:.
5276
5276
5277 .. note::
5277 .. note::
5278
5278
5279 For performance reasons, :hg:`log FILE` may omit duplicate changes
5279 For performance reasons, :hg:`log FILE` may omit duplicate changes
5280 made on branches and will not show removals or mode changes. To
5280 made on branches and will not show removals or mode changes. To
5281 see all such changes, use the --removed switch.
5281 see all such changes, use the --removed switch.
5282
5282
5283 .. container:: verbose
5283 .. container:: verbose
5284
5284
5285 Some examples:
5285 Some examples:
5286
5286
5287 - changesets with full descriptions and file lists::
5287 - changesets with full descriptions and file lists::
5288
5288
5289 hg log -v
5289 hg log -v
5290
5290
5291 - changesets ancestral to the working directory::
5291 - changesets ancestral to the working directory::
5292
5292
5293 hg log -f
5293 hg log -f
5294
5294
5295 - last 10 commits on the current branch::
5295 - last 10 commits on the current branch::
5296
5296
5297 hg log -l 10 -b .
5297 hg log -l 10 -b .
5298
5298
5299 - changesets showing all modifications of a file, including removals::
5299 - changesets showing all modifications of a file, including removals::
5300
5300
5301 hg log --removed file.c
5301 hg log --removed file.c
5302
5302
5303 - all changesets that touch a directory, with diffs, excluding merges::
5303 - all changesets that touch a directory, with diffs, excluding merges::
5304
5304
5305 hg log -Mp lib/
5305 hg log -Mp lib/
5306
5306
5307 - all revision numbers that match a keyword::
5307 - all revision numbers that match a keyword::
5308
5308
5309 hg log -k bug --template "{rev}\\n"
5309 hg log -k bug --template "{rev}\\n"
5310
5310
5311 - the full hash identifier of the working directory parent::
5311 - the full hash identifier of the working directory parent::
5312
5312
5313 hg log -r . --template "{node}\\n"
5313 hg log -r . --template "{node}\\n"
5314
5314
5315 - list available log templates::
5315 - list available log templates::
5316
5316
5317 hg log -T list
5317 hg log -T list
5318
5318
5319 - check if a given changeset is included in a tagged release::
5319 - check if a given changeset is included in a tagged release::
5320
5320
5321 hg log -r "a21ccf and ancestor(1.9)"
5321 hg log -r "a21ccf and ancestor(1.9)"
5322
5322
5323 - find all changesets by some user in a date range::
5323 - find all changesets by some user in a date range::
5324
5324
5325 hg log -k alice -d "may 2008 to jul 2008"
5325 hg log -k alice -d "may 2008 to jul 2008"
5326
5326
5327 - summary of all changesets after the last tag::
5327 - summary of all changesets after the last tag::
5328
5328
5329 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5329 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5330
5330
5331 See :hg:`help dates` for a list of formats valid for -d/--date.
5331 See :hg:`help dates` for a list of formats valid for -d/--date.
5332
5332
5333 See :hg:`help revisions` and :hg:`help revsets` for more about
5333 See :hg:`help revisions` and :hg:`help revsets` for more about
5334 specifying and ordering revisions.
5334 specifying and ordering revisions.
5335
5335
5336 See :hg:`help templates` for more about pre-packaged styles and
5336 See :hg:`help templates` for more about pre-packaged styles and
5337 specifying custom templates.
5337 specifying custom templates.
5338
5338
5339 Returns 0 on success.
5339 Returns 0 on success.
5340
5340
5341 """
5341 """
5342 if opts.get('follow') and opts.get('rev'):
5342 if opts.get('follow') and opts.get('rev'):
5343 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5343 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5344 del opts['follow']
5344 del opts['follow']
5345
5345
5346 if opts.get('graph'):
5346 if opts.get('graph'):
5347 return cmdutil.graphlog(ui, repo, *pats, **opts)
5347 return cmdutil.graphlog(ui, repo, *pats, **opts)
5348
5348
5349 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5349 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5350 limit = cmdutil.loglimit(opts)
5350 limit = cmdutil.loglimit(opts)
5351 count = 0
5351 count = 0
5352
5352
5353 getrenamed = None
5353 getrenamed = None
5354 if opts.get('copies'):
5354 if opts.get('copies'):
5355 endrev = None
5355 endrev = None
5356 if opts.get('rev'):
5356 if opts.get('rev'):
5357 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5357 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5358 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5358 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5359
5359
5360 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5360 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5361 for rev in revs:
5361 for rev in revs:
5362 if count == limit:
5362 if count == limit:
5363 break
5363 break
5364 ctx = repo[rev]
5364 ctx = repo[rev]
5365 copies = None
5365 copies = None
5366 if getrenamed is not None and rev:
5366 if getrenamed is not None and rev:
5367 copies = []
5367 copies = []
5368 for fn in ctx.files():
5368 for fn in ctx.files():
5369 rename = getrenamed(fn, rev)
5369 rename = getrenamed(fn, rev)
5370 if rename:
5370 if rename:
5371 copies.append((fn, rename[0]))
5371 copies.append((fn, rename[0]))
5372 if filematcher:
5372 if filematcher:
5373 revmatchfn = filematcher(ctx.rev())
5373 revmatchfn = filematcher(ctx.rev())
5374 else:
5374 else:
5375 revmatchfn = None
5375 revmatchfn = None
5376 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5376 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5377 if displayer.flush(ctx):
5377 if displayer.flush(ctx):
5378 count += 1
5378 count += 1
5379
5379
5380 displayer.close()
5380 displayer.close()
5381
5381
5382 @command('manifest',
5382 @command('manifest',
5383 [('r', 'rev', '', _('revision to display'), _('REV')),
5383 [('r', 'rev', '', _('revision to display'), _('REV')),
5384 ('', 'all', False, _("list files from all revisions"))]
5384 ('', 'all', False, _("list files from all revisions"))]
5385 + formatteropts,
5385 + formatteropts,
5386 _('[-r REV]'))
5386 _('[-r REV]'))
5387 def manifest(ui, repo, node=None, rev=None, **opts):
5387 def manifest(ui, repo, node=None, rev=None, **opts):
5388 """output the current or given revision of the project manifest
5388 """output the current or given revision of the project manifest
5389
5389
5390 Print a list of version controlled files for the given revision.
5390 Print a list of version controlled files for the given revision.
5391 If no revision is given, the first parent of the working directory
5391 If no revision is given, the first parent of the working directory
5392 is used, or the null revision if no revision is checked out.
5392 is used, or the null revision if no revision is checked out.
5393
5393
5394 With -v, print file permissions, symlink and executable bits.
5394 With -v, print file permissions, symlink and executable bits.
5395 With --debug, print file revision hashes.
5395 With --debug, print file revision hashes.
5396
5396
5397 If option --all is specified, the list of all files from all revisions
5397 If option --all is specified, the list of all files from all revisions
5398 is printed. This includes deleted and renamed files.
5398 is printed. This includes deleted and renamed files.
5399
5399
5400 Returns 0 on success.
5400 Returns 0 on success.
5401 """
5401 """
5402
5402
5403 fm = ui.formatter('manifest', opts)
5403 fm = ui.formatter('manifest', opts)
5404
5404
5405 if opts.get('all'):
5405 if opts.get('all'):
5406 if rev or node:
5406 if rev or node:
5407 raise error.Abort(_("can't specify a revision with --all"))
5407 raise error.Abort(_("can't specify a revision with --all"))
5408
5408
5409 res = []
5409 res = []
5410 prefix = "data/"
5410 prefix = "data/"
5411 suffix = ".i"
5411 suffix = ".i"
5412 plen = len(prefix)
5412 plen = len(prefix)
5413 slen = len(suffix)
5413 slen = len(suffix)
5414 with repo.lock():
5414 with repo.lock():
5415 for fn, b, size in repo.store.datafiles():
5415 for fn, b, size in repo.store.datafiles():
5416 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5416 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5417 res.append(fn[plen:-slen])
5417 res.append(fn[plen:-slen])
5418 for f in res:
5418 for f in res:
5419 fm.startitem()
5419 fm.startitem()
5420 fm.write("path", '%s\n', f)
5420 fm.write("path", '%s\n', f)
5421 fm.end()
5421 fm.end()
5422 return
5422 return
5423
5423
5424 if rev and node:
5424 if rev and node:
5425 raise error.Abort(_("please specify just one revision"))
5425 raise error.Abort(_("please specify just one revision"))
5426
5426
5427 if not node:
5427 if not node:
5428 node = rev
5428 node = rev
5429
5429
5430 char = {'l': '@', 'x': '*', '': ''}
5430 char = {'l': '@', 'x': '*', '': ''}
5431 mode = {'l': '644', 'x': '755', '': '644'}
5431 mode = {'l': '644', 'x': '755', '': '644'}
5432 ctx = scmutil.revsingle(repo, node)
5432 ctx = scmutil.revsingle(repo, node)
5433 mf = ctx.manifest()
5433 mf = ctx.manifest()
5434 for f in ctx:
5434 for f in ctx:
5435 fm.startitem()
5435 fm.startitem()
5436 fl = ctx[f].flags()
5436 fl = ctx[f].flags()
5437 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5437 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5438 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5438 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5439 fm.write('path', '%s\n', f)
5439 fm.write('path', '%s\n', f)
5440 fm.end()
5440 fm.end()
5441
5441
5442 @command('^merge',
5442 @command('^merge',
5443 [('f', 'force', None,
5443 [('f', 'force', None,
5444 _('force a merge including outstanding changes (DEPRECATED)')),
5444 _('force a merge including outstanding changes (DEPRECATED)')),
5445 ('r', 'rev', '', _('revision to merge'), _('REV')),
5445 ('r', 'rev', '', _('revision to merge'), _('REV')),
5446 ('P', 'preview', None,
5446 ('P', 'preview', None,
5447 _('review revisions to merge (no merge is performed)'))
5447 _('review revisions to merge (no merge is performed)'))
5448 ] + mergetoolopts,
5448 ] + mergetoolopts,
5449 _('[-P] [[-r] REV]'))
5449 _('[-P] [[-r] REV]'))
5450 def merge(ui, repo, node=None, **opts):
5450 def merge(ui, repo, node=None, **opts):
5451 """merge another revision into working directory
5451 """merge another revision into working directory
5452
5452
5453 The current working directory is updated with all changes made in
5453 The current working directory is updated with all changes made in
5454 the requested revision since the last common predecessor revision.
5454 the requested revision since the last common predecessor revision.
5455
5455
5456 Files that changed between either parent are marked as changed for
5456 Files that changed between either parent are marked as changed for
5457 the next commit and a commit must be performed before any further
5457 the next commit and a commit must be performed before any further
5458 updates to the repository are allowed. The next commit will have
5458 updates to the repository are allowed. The next commit will have
5459 two parents.
5459 two parents.
5460
5460
5461 ``--tool`` can be used to specify the merge tool used for file
5461 ``--tool`` can be used to specify the merge tool used for file
5462 merges. It overrides the HGMERGE environment variable and your
5462 merges. It overrides the HGMERGE environment variable and your
5463 configuration files. See :hg:`help merge-tools` for options.
5463 configuration files. See :hg:`help merge-tools` for options.
5464
5464
5465 If no revision is specified, the working directory's parent is a
5465 If no revision is specified, the working directory's parent is a
5466 head revision, and the current branch contains exactly one other
5466 head revision, and the current branch contains exactly one other
5467 head, the other head is merged with by default. Otherwise, an
5467 head, the other head is merged with by default. Otherwise, an
5468 explicit revision with which to merge with must be provided.
5468 explicit revision with which to merge with must be provided.
5469
5469
5470 See :hg:`help resolve` for information on handling file conflicts.
5470 See :hg:`help resolve` for information on handling file conflicts.
5471
5471
5472 To undo an uncommitted merge, use :hg:`update --clean .` which
5472 To undo an uncommitted merge, use :hg:`update --clean .` which
5473 will check out a clean copy of the original merge parent, losing
5473 will check out a clean copy of the original merge parent, losing
5474 all changes.
5474 all changes.
5475
5475
5476 Returns 0 on success, 1 if there are unresolved files.
5476 Returns 0 on success, 1 if there are unresolved files.
5477 """
5477 """
5478
5478
5479 if opts.get('rev') and node:
5479 if opts.get('rev') and node:
5480 raise error.Abort(_("please specify just one revision"))
5480 raise error.Abort(_("please specify just one revision"))
5481 if not node:
5481 if not node:
5482 node = opts.get('rev')
5482 node = opts.get('rev')
5483
5483
5484 if node:
5484 if node:
5485 node = scmutil.revsingle(repo, node).node()
5485 node = scmutil.revsingle(repo, node).node()
5486
5486
5487 if not node:
5487 if not node:
5488 node = repo[destutil.destmerge(repo)].node()
5488 node = repo[destutil.destmerge(repo)].node()
5489
5489
5490 if opts.get('preview'):
5490 if opts.get('preview'):
5491 # find nodes that are ancestors of p2 but not of p1
5491 # find nodes that are ancestors of p2 but not of p1
5492 p1 = repo.lookup('.')
5492 p1 = repo.lookup('.')
5493 p2 = repo.lookup(node)
5493 p2 = repo.lookup(node)
5494 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5494 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5495
5495
5496 displayer = cmdutil.show_changeset(ui, repo, opts)
5496 displayer = cmdutil.show_changeset(ui, repo, opts)
5497 for node in nodes:
5497 for node in nodes:
5498 displayer.show(repo[node])
5498 displayer.show(repo[node])
5499 displayer.close()
5499 displayer.close()
5500 return 0
5500 return 0
5501
5501
5502 try:
5502 try:
5503 # ui.forcemerge is an internal variable, do not document
5503 # ui.forcemerge is an internal variable, do not document
5504 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5504 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5505 force = opts.get('force')
5505 force = opts.get('force')
5506 labels = ['working copy', 'merge rev']
5506 labels = ['working copy', 'merge rev']
5507 return hg.merge(repo, node, force=force, mergeforce=force,
5507 return hg.merge(repo, node, force=force, mergeforce=force,
5508 labels=labels)
5508 labels=labels)
5509 finally:
5509 finally:
5510 ui.setconfig('ui', 'forcemerge', '', 'merge')
5510 ui.setconfig('ui', 'forcemerge', '', 'merge')
5511
5511
5512 @command('outgoing|out',
5512 @command('outgoing|out',
5513 [('f', 'force', None, _('run even when the destination is unrelated')),
5513 [('f', 'force', None, _('run even when the destination is unrelated')),
5514 ('r', 'rev', [],
5514 ('r', 'rev', [],
5515 _('a changeset intended to be included in the destination'), _('REV')),
5515 _('a changeset intended to be included in the destination'), _('REV')),
5516 ('n', 'newest-first', None, _('show newest record first')),
5516 ('n', 'newest-first', None, _('show newest record first')),
5517 ('B', 'bookmarks', False, _('compare bookmarks')),
5517 ('B', 'bookmarks', False, _('compare bookmarks')),
5518 ('b', 'branch', [], _('a specific branch you would like to push'),
5518 ('b', 'branch', [], _('a specific branch you would like to push'),
5519 _('BRANCH')),
5519 _('BRANCH')),
5520 ] + logopts + remoteopts + subrepoopts,
5520 ] + logopts + remoteopts + subrepoopts,
5521 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5521 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5522 def outgoing(ui, repo, dest=None, **opts):
5522 def outgoing(ui, repo, dest=None, **opts):
5523 """show changesets not found in the destination
5523 """show changesets not found in the destination
5524
5524
5525 Show changesets not found in the specified destination repository
5525 Show changesets not found in the specified destination repository
5526 or the default push location. These are the changesets that would
5526 or the default push location. These are the changesets that would
5527 be pushed if a push was requested.
5527 be pushed if a push was requested.
5528
5528
5529 See pull for details of valid destination formats.
5529 See pull for details of valid destination formats.
5530
5530
5531 .. container:: verbose
5531 .. container:: verbose
5532
5532
5533 With -B/--bookmarks, the result of bookmark comparison between
5533 With -B/--bookmarks, the result of bookmark comparison between
5534 local and remote repositories is displayed. With -v/--verbose,
5534 local and remote repositories is displayed. With -v/--verbose,
5535 status is also displayed for each bookmark like below::
5535 status is also displayed for each bookmark like below::
5536
5536
5537 BM1 01234567890a added
5537 BM1 01234567890a added
5538 BM2 deleted
5538 BM2 deleted
5539 BM3 234567890abc advanced
5539 BM3 234567890abc advanced
5540 BM4 34567890abcd diverged
5540 BM4 34567890abcd diverged
5541 BM5 4567890abcde changed
5541 BM5 4567890abcde changed
5542
5542
5543 The action taken when pushing depends on the
5543 The action taken when pushing depends on the
5544 status of each bookmark:
5544 status of each bookmark:
5545
5545
5546 :``added``: push with ``-B`` will create it
5546 :``added``: push with ``-B`` will create it
5547 :``deleted``: push with ``-B`` will delete it
5547 :``deleted``: push with ``-B`` will delete it
5548 :``advanced``: push will update it
5548 :``advanced``: push will update it
5549 :``diverged``: push with ``-B`` will update it
5549 :``diverged``: push with ``-B`` will update it
5550 :``changed``: push with ``-B`` will update it
5550 :``changed``: push with ``-B`` will update it
5551
5551
5552 From the point of view of pushing behavior, bookmarks
5552 From the point of view of pushing behavior, bookmarks
5553 existing only in the remote repository are treated as
5553 existing only in the remote repository are treated as
5554 ``deleted``, even if it is in fact added remotely.
5554 ``deleted``, even if it is in fact added remotely.
5555
5555
5556 Returns 0 if there are outgoing changes, 1 otherwise.
5556 Returns 0 if there are outgoing changes, 1 otherwise.
5557 """
5557 """
5558 if opts.get('graph'):
5558 if opts.get('graph'):
5559 cmdutil.checkunsupportedgraphflags([], opts)
5559 cmdutil.checkunsupportedgraphflags([], opts)
5560 o, other = hg._outgoing(ui, repo, dest, opts)
5560 o, other = hg._outgoing(ui, repo, dest, opts)
5561 if not o:
5561 if not o:
5562 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5562 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5563 return
5563 return
5564
5564
5565 revdag = cmdutil.graphrevs(repo, o, opts)
5565 revdag = cmdutil.graphrevs(repo, o, opts)
5566 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5566 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5567 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5567 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5568 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5568 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5569 return 0
5569 return 0
5570
5570
5571 if opts.get('bookmarks'):
5571 if opts.get('bookmarks'):
5572 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5572 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5573 dest, branches = hg.parseurl(dest, opts.get('branch'))
5573 dest, branches = hg.parseurl(dest, opts.get('branch'))
5574 other = hg.peer(repo, opts, dest)
5574 other = hg.peer(repo, opts, dest)
5575 if 'bookmarks' not in other.listkeys('namespaces'):
5575 if 'bookmarks' not in other.listkeys('namespaces'):
5576 ui.warn(_("remote doesn't support bookmarks\n"))
5576 ui.warn(_("remote doesn't support bookmarks\n"))
5577 return 0
5577 return 0
5578 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5578 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5579 return bookmarks.outgoing(ui, repo, other)
5579 return bookmarks.outgoing(ui, repo, other)
5580
5580
5581 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5581 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5582 try:
5582 try:
5583 return hg.outgoing(ui, repo, dest, opts)
5583 return hg.outgoing(ui, repo, dest, opts)
5584 finally:
5584 finally:
5585 del repo._subtoppath
5585 del repo._subtoppath
5586
5586
5587 @command('parents',
5587 @command('parents',
5588 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5588 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5589 ] + templateopts,
5589 ] + templateopts,
5590 _('[-r REV] [FILE]'),
5590 _('[-r REV] [FILE]'),
5591 inferrepo=True)
5591 inferrepo=True)
5592 def parents(ui, repo, file_=None, **opts):
5592 def parents(ui, repo, file_=None, **opts):
5593 """show the parents of the working directory or revision (DEPRECATED)
5593 """show the parents of the working directory or revision (DEPRECATED)
5594
5594
5595 Print the working directory's parent revisions. If a revision is
5595 Print the working directory's parent revisions. If a revision is
5596 given via -r/--rev, the parent of that revision will be printed.
5596 given via -r/--rev, the parent of that revision will be printed.
5597 If a file argument is given, the revision in which the file was
5597 If a file argument is given, the revision in which the file was
5598 last changed (before the working directory revision or the
5598 last changed (before the working directory revision or the
5599 argument to --rev if given) is printed.
5599 argument to --rev if given) is printed.
5600
5600
5601 This command is equivalent to::
5601 This command is equivalent to::
5602
5602
5603 hg log -r "p1()+p2()" or
5603 hg log -r "p1()+p2()" or
5604 hg log -r "p1(REV)+p2(REV)" or
5604 hg log -r "p1(REV)+p2(REV)" or
5605 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5605 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5606 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5606 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5607
5607
5608 See :hg:`summary` and :hg:`help revsets` for related information.
5608 See :hg:`summary` and :hg:`help revsets` for related information.
5609
5609
5610 Returns 0 on success.
5610 Returns 0 on success.
5611 """
5611 """
5612
5612
5613 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5613 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5614
5614
5615 if file_:
5615 if file_:
5616 m = scmutil.match(ctx, (file_,), opts)
5616 m = scmutil.match(ctx, (file_,), opts)
5617 if m.anypats() or len(m.files()) != 1:
5617 if m.anypats() or len(m.files()) != 1:
5618 raise error.Abort(_('can only specify an explicit filename'))
5618 raise error.Abort(_('can only specify an explicit filename'))
5619 file_ = m.files()[0]
5619 file_ = m.files()[0]
5620 filenodes = []
5620 filenodes = []
5621 for cp in ctx.parents():
5621 for cp in ctx.parents():
5622 if not cp:
5622 if not cp:
5623 continue
5623 continue
5624 try:
5624 try:
5625 filenodes.append(cp.filenode(file_))
5625 filenodes.append(cp.filenode(file_))
5626 except error.LookupError:
5626 except error.LookupError:
5627 pass
5627 pass
5628 if not filenodes:
5628 if not filenodes:
5629 raise error.Abort(_("'%s' not found in manifest!") % file_)
5629 raise error.Abort(_("'%s' not found in manifest!") % file_)
5630 p = []
5630 p = []
5631 for fn in filenodes:
5631 for fn in filenodes:
5632 fctx = repo.filectx(file_, fileid=fn)
5632 fctx = repo.filectx(file_, fileid=fn)
5633 p.append(fctx.node())
5633 p.append(fctx.node())
5634 else:
5634 else:
5635 p = [cp.node() for cp in ctx.parents()]
5635 p = [cp.node() for cp in ctx.parents()]
5636
5636
5637 displayer = cmdutil.show_changeset(ui, repo, opts)
5637 displayer = cmdutil.show_changeset(ui, repo, opts)
5638 for n in p:
5638 for n in p:
5639 if n != nullid:
5639 if n != nullid:
5640 displayer.show(repo[n])
5640 displayer.show(repo[n])
5641 displayer.close()
5641 displayer.close()
5642
5642
5643 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
5643 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
5644 def paths(ui, repo, search=None, **opts):
5644 def paths(ui, repo, search=None, **opts):
5645 """show aliases for remote repositories
5645 """show aliases for remote repositories
5646
5646
5647 Show definition of symbolic path name NAME. If no name is given,
5647 Show definition of symbolic path name NAME. If no name is given,
5648 show definition of all available names.
5648 show definition of all available names.
5649
5649
5650 Option -q/--quiet suppresses all output when searching for NAME
5650 Option -q/--quiet suppresses all output when searching for NAME
5651 and shows only the path names when listing all definitions.
5651 and shows only the path names when listing all definitions.
5652
5652
5653 Path names are defined in the [paths] section of your
5653 Path names are defined in the [paths] section of your
5654 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5654 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5655 repository, ``.hg/hgrc`` is used, too.
5655 repository, ``.hg/hgrc`` is used, too.
5656
5656
5657 The path names ``default`` and ``default-push`` have a special
5657 The path names ``default`` and ``default-push`` have a special
5658 meaning. When performing a push or pull operation, they are used
5658 meaning. When performing a push or pull operation, they are used
5659 as fallbacks if no location is specified on the command-line.
5659 as fallbacks if no location is specified on the command-line.
5660 When ``default-push`` is set, it will be used for push and
5660 When ``default-push`` is set, it will be used for push and
5661 ``default`` will be used for pull; otherwise ``default`` is used
5661 ``default`` will be used for pull; otherwise ``default`` is used
5662 as the fallback for both. When cloning a repository, the clone
5662 as the fallback for both. When cloning a repository, the clone
5663 source is written as ``default`` in ``.hg/hgrc``.
5663 source is written as ``default`` in ``.hg/hgrc``.
5664
5664
5665 .. note::
5665 .. note::
5666
5666
5667 ``default`` and ``default-push`` apply to all inbound (e.g.
5667 ``default`` and ``default-push`` apply to all inbound (e.g.
5668 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5668 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5669 and :hg:`bundle`) operations.
5669 and :hg:`bundle`) operations.
5670
5670
5671 See :hg:`help urls` for more information.
5671 See :hg:`help urls` for more information.
5672
5672
5673 Returns 0 on success.
5673 Returns 0 on success.
5674 """
5674 """
5675 if search:
5675 if search:
5676 pathitems = [(name, path) for name, path in ui.paths.iteritems()
5676 pathitems = [(name, path) for name, path in ui.paths.iteritems()
5677 if name == search]
5677 if name == search]
5678 else:
5678 else:
5679 pathitems = sorted(ui.paths.iteritems())
5679 pathitems = sorted(ui.paths.iteritems())
5680
5680
5681 fm = ui.formatter('paths', opts)
5681 fm = ui.formatter('paths', opts)
5682 if fm.isplain():
5682 if fm.isplain():
5683 hidepassword = util.hidepassword
5683 hidepassword = util.hidepassword
5684 else:
5684 else:
5685 hidepassword = str
5685 hidepassword = str
5686 if ui.quiet:
5686 if ui.quiet:
5687 namefmt = '%s\n'
5687 namefmt = '%s\n'
5688 else:
5688 else:
5689 namefmt = '%s = '
5689 namefmt = '%s = '
5690 showsubopts = not search and not ui.quiet
5690 showsubopts = not search and not ui.quiet
5691
5691
5692 for name, path in pathitems:
5692 for name, path in pathitems:
5693 fm.startitem()
5693 fm.startitem()
5694 fm.condwrite(not search, 'name', namefmt, name)
5694 fm.condwrite(not search, 'name', namefmt, name)
5695 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
5695 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
5696 for subopt, value in sorted(path.suboptions.items()):
5696 for subopt, value in sorted(path.suboptions.items()):
5697 assert subopt not in ('name', 'url')
5697 assert subopt not in ('name', 'url')
5698 if showsubopts:
5698 if showsubopts:
5699 fm.plain('%s:%s = ' % (name, subopt))
5699 fm.plain('%s:%s = ' % (name, subopt))
5700 fm.condwrite(showsubopts, subopt, '%s\n', value)
5700 fm.condwrite(showsubopts, subopt, '%s\n', value)
5701
5701
5702 fm.end()
5702 fm.end()
5703
5703
5704 if search and not pathitems:
5704 if search and not pathitems:
5705 if not ui.quiet:
5705 if not ui.quiet:
5706 ui.warn(_("not found!\n"))
5706 ui.warn(_("not found!\n"))
5707 return 1
5707 return 1
5708 else:
5708 else:
5709 return 0
5709 return 0
5710
5710
5711 @command('phase',
5711 @command('phase',
5712 [('p', 'public', False, _('set changeset phase to public')),
5712 [('p', 'public', False, _('set changeset phase to public')),
5713 ('d', 'draft', False, _('set changeset phase to draft')),
5713 ('d', 'draft', False, _('set changeset phase to draft')),
5714 ('s', 'secret', False, _('set changeset phase to secret')),
5714 ('s', 'secret', False, _('set changeset phase to secret')),
5715 ('f', 'force', False, _('allow to move boundary backward')),
5715 ('f', 'force', False, _('allow to move boundary backward')),
5716 ('r', 'rev', [], _('target revision'), _('REV')),
5716 ('r', 'rev', [], _('target revision'), _('REV')),
5717 ],
5717 ],
5718 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5718 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5719 def phase(ui, repo, *revs, **opts):
5719 def phase(ui, repo, *revs, **opts):
5720 """set or show the current phase name
5720 """set or show the current phase name
5721
5721
5722 With no argument, show the phase name of the current revision(s).
5722 With no argument, show the phase name of the current revision(s).
5723
5723
5724 With one of -p/--public, -d/--draft or -s/--secret, change the
5724 With one of -p/--public, -d/--draft or -s/--secret, change the
5725 phase value of the specified revisions.
5725 phase value of the specified revisions.
5726
5726
5727 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5727 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5728 lower phase to an higher phase. Phases are ordered as follows::
5728 lower phase to an higher phase. Phases are ordered as follows::
5729
5729
5730 public < draft < secret
5730 public < draft < secret
5731
5731
5732 Returns 0 on success, 1 if some phases could not be changed.
5732 Returns 0 on success, 1 if some phases could not be changed.
5733
5733
5734 (For more information about the phases concept, see :hg:`help phases`.)
5734 (For more information about the phases concept, see :hg:`help phases`.)
5735 """
5735 """
5736 # search for a unique phase argument
5736 # search for a unique phase argument
5737 targetphase = None
5737 targetphase = None
5738 for idx, name in enumerate(phases.phasenames):
5738 for idx, name in enumerate(phases.phasenames):
5739 if opts[name]:
5739 if opts[name]:
5740 if targetphase is not None:
5740 if targetphase is not None:
5741 raise error.Abort(_('only one phase can be specified'))
5741 raise error.Abort(_('only one phase can be specified'))
5742 targetphase = idx
5742 targetphase = idx
5743
5743
5744 # look for specified revision
5744 # look for specified revision
5745 revs = list(revs)
5745 revs = list(revs)
5746 revs.extend(opts['rev'])
5746 revs.extend(opts['rev'])
5747 if not revs:
5747 if not revs:
5748 # display both parents as the second parent phase can influence
5748 # display both parents as the second parent phase can influence
5749 # the phase of a merge commit
5749 # the phase of a merge commit
5750 revs = [c.rev() for c in repo[None].parents()]
5750 revs = [c.rev() for c in repo[None].parents()]
5751
5751
5752 revs = scmutil.revrange(repo, revs)
5752 revs = scmutil.revrange(repo, revs)
5753
5753
5754 lock = None
5754 lock = None
5755 ret = 0
5755 ret = 0
5756 if targetphase is None:
5756 if targetphase is None:
5757 # display
5757 # display
5758 for r in revs:
5758 for r in revs:
5759 ctx = repo[r]
5759 ctx = repo[r]
5760 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5760 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5761 else:
5761 else:
5762 tr = None
5762 tr = None
5763 lock = repo.lock()
5763 lock = repo.lock()
5764 try:
5764 try:
5765 tr = repo.transaction("phase")
5765 tr = repo.transaction("phase")
5766 # set phase
5766 # set phase
5767 if not revs:
5767 if not revs:
5768 raise error.Abort(_('empty revision set'))
5768 raise error.Abort(_('empty revision set'))
5769 nodes = [repo[r].node() for r in revs]
5769 nodes = [repo[r].node() for r in revs]
5770 # moving revision from public to draft may hide them
5770 # moving revision from public to draft may hide them
5771 # We have to check result on an unfiltered repository
5771 # We have to check result on an unfiltered repository
5772 unfi = repo.unfiltered()
5772 unfi = repo.unfiltered()
5773 getphase = unfi._phasecache.phase
5773 getphase = unfi._phasecache.phase
5774 olddata = [getphase(unfi, r) for r in unfi]
5774 olddata = [getphase(unfi, r) for r in unfi]
5775 phases.advanceboundary(repo, tr, targetphase, nodes)
5775 phases.advanceboundary(repo, tr, targetphase, nodes)
5776 if opts['force']:
5776 if opts['force']:
5777 phases.retractboundary(repo, tr, targetphase, nodes)
5777 phases.retractboundary(repo, tr, targetphase, nodes)
5778 tr.close()
5778 tr.close()
5779 finally:
5779 finally:
5780 if tr is not None:
5780 if tr is not None:
5781 tr.release()
5781 tr.release()
5782 lock.release()
5782 lock.release()
5783 getphase = unfi._phasecache.phase
5783 getphase = unfi._phasecache.phase
5784 newdata = [getphase(unfi, r) for r in unfi]
5784 newdata = [getphase(unfi, r) for r in unfi]
5785 changes = sum(newdata[r] != olddata[r] for r in unfi)
5785 changes = sum(newdata[r] != olddata[r] for r in unfi)
5786 cl = unfi.changelog
5786 cl = unfi.changelog
5787 rejected = [n for n in nodes
5787 rejected = [n for n in nodes
5788 if newdata[cl.rev(n)] < targetphase]
5788 if newdata[cl.rev(n)] < targetphase]
5789 if rejected:
5789 if rejected:
5790 ui.warn(_('cannot move %i changesets to a higher '
5790 ui.warn(_('cannot move %i changesets to a higher '
5791 'phase, use --force\n') % len(rejected))
5791 'phase, use --force\n') % len(rejected))
5792 ret = 1
5792 ret = 1
5793 if changes:
5793 if changes:
5794 msg = _('phase changed for %i changesets\n') % changes
5794 msg = _('phase changed for %i changesets\n') % changes
5795 if ret:
5795 if ret:
5796 ui.status(msg)
5796 ui.status(msg)
5797 else:
5797 else:
5798 ui.note(msg)
5798 ui.note(msg)
5799 else:
5799 else:
5800 ui.warn(_('no phases changed\n'))
5800 ui.warn(_('no phases changed\n'))
5801 return ret
5801 return ret
5802
5802
5803 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5803 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5804 """Run after a changegroup has been added via pull/unbundle
5804 """Run after a changegroup has been added via pull/unbundle
5805
5805
5806 This takes arguments below:
5806 This takes arguments below:
5807
5807
5808 :modheads: change of heads by pull/unbundle
5808 :modheads: change of heads by pull/unbundle
5809 :optupdate: updating working directory is needed or not
5809 :optupdate: updating working directory is needed or not
5810 :checkout: update destination revision (or None to default destination)
5810 :checkout: update destination revision (or None to default destination)
5811 :brev: a name, which might be a bookmark to be activated after updating
5811 :brev: a name, which might be a bookmark to be activated after updating
5812 """
5812 """
5813 if modheads == 0:
5813 if modheads == 0:
5814 return
5814 return
5815 if optupdate:
5815 if optupdate:
5816 try:
5816 try:
5817 return hg.updatetotally(ui, repo, checkout, brev)
5817 return hg.updatetotally(ui, repo, checkout, brev)
5818 except error.UpdateAbort as inst:
5818 except error.UpdateAbort as inst:
5819 msg = _("not updating: %s") % str(inst)
5819 msg = _("not updating: %s") % str(inst)
5820 hint = inst.hint
5820 hint = inst.hint
5821 raise error.UpdateAbort(msg, hint=hint)
5821 raise error.UpdateAbort(msg, hint=hint)
5822 if modheads > 1:
5822 if modheads > 1:
5823 currentbranchheads = len(repo.branchheads())
5823 currentbranchheads = len(repo.branchheads())
5824 if currentbranchheads == modheads:
5824 if currentbranchheads == modheads:
5825 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5825 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5826 elif currentbranchheads > 1:
5826 elif currentbranchheads > 1:
5827 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5827 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5828 "merge)\n"))
5828 "merge)\n"))
5829 else:
5829 else:
5830 ui.status(_("(run 'hg heads' to see heads)\n"))
5830 ui.status(_("(run 'hg heads' to see heads)\n"))
5831 else:
5831 else:
5832 ui.status(_("(run 'hg update' to get a working copy)\n"))
5832 ui.status(_("(run 'hg update' to get a working copy)\n"))
5833
5833
5834 @command('^pull',
5834 @command('^pull',
5835 [('u', 'update', None,
5835 [('u', 'update', None,
5836 _('update to new branch head if changesets were pulled')),
5836 _('update to new branch head if changesets were pulled')),
5837 ('f', 'force', None, _('run even when remote repository is unrelated')),
5837 ('f', 'force', None, _('run even when remote repository is unrelated')),
5838 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5838 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5839 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5839 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5840 ('b', 'branch', [], _('a specific branch you would like to pull'),
5840 ('b', 'branch', [], _('a specific branch you would like to pull'),
5841 _('BRANCH')),
5841 _('BRANCH')),
5842 ] + remoteopts,
5842 ] + remoteopts,
5843 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5843 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5844 def pull(ui, repo, source="default", **opts):
5844 def pull(ui, repo, source="default", **opts):
5845 """pull changes from the specified source
5845 """pull changes from the specified source
5846
5846
5847 Pull changes from a remote repository to a local one.
5847 Pull changes from a remote repository to a local one.
5848
5848
5849 This finds all changes from the repository at the specified path
5849 This finds all changes from the repository at the specified path
5850 or URL and adds them to a local repository (the current one unless
5850 or URL and adds them to a local repository (the current one unless
5851 -R is specified). By default, this does not update the copy of the
5851 -R is specified). By default, this does not update the copy of the
5852 project in the working directory.
5852 project in the working directory.
5853
5853
5854 Use :hg:`incoming` if you want to see what would have been added
5854 Use :hg:`incoming` if you want to see what would have been added
5855 by a pull at the time you issued this command. If you then decide
5855 by a pull at the time you issued this command. If you then decide
5856 to add those changes to the repository, you should use :hg:`pull
5856 to add those changes to the repository, you should use :hg:`pull
5857 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5857 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5858
5858
5859 If SOURCE is omitted, the 'default' path will be used.
5859 If SOURCE is omitted, the 'default' path will be used.
5860 See :hg:`help urls` for more information.
5860 See :hg:`help urls` for more information.
5861
5861
5862 Specifying bookmark as ``.`` is equivalent to specifying the active
5862 Specifying bookmark as ``.`` is equivalent to specifying the active
5863 bookmark's name.
5863 bookmark's name.
5864
5864
5865 Returns 0 on success, 1 if an update had unresolved files.
5865 Returns 0 on success, 1 if an update had unresolved files.
5866 """
5866 """
5867 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5867 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5868 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5868 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5869 other = hg.peer(repo, opts, source)
5869 other = hg.peer(repo, opts, source)
5870 try:
5870 try:
5871 revs, checkout = hg.addbranchrevs(repo, other, branches,
5871 revs, checkout = hg.addbranchrevs(repo, other, branches,
5872 opts.get('rev'))
5872 opts.get('rev'))
5873
5873
5874
5874
5875 pullopargs = {}
5875 pullopargs = {}
5876 if opts.get('bookmark'):
5876 if opts.get('bookmark'):
5877 if not revs:
5877 if not revs:
5878 revs = []
5878 revs = []
5879 # The list of bookmark used here is not the one used to actually
5879 # The list of bookmark used here is not the one used to actually
5880 # update the bookmark name. This can result in the revision pulled
5880 # update the bookmark name. This can result in the revision pulled
5881 # not ending up with the name of the bookmark because of a race
5881 # not ending up with the name of the bookmark because of a race
5882 # condition on the server. (See issue 4689 for details)
5882 # condition on the server. (See issue 4689 for details)
5883 remotebookmarks = other.listkeys('bookmarks')
5883 remotebookmarks = other.listkeys('bookmarks')
5884 pullopargs['remotebookmarks'] = remotebookmarks
5884 pullopargs['remotebookmarks'] = remotebookmarks
5885 for b in opts['bookmark']:
5885 for b in opts['bookmark']:
5886 b = repo._bookmarks.expandname(b)
5886 b = repo._bookmarks.expandname(b)
5887 if b not in remotebookmarks:
5887 if b not in remotebookmarks:
5888 raise error.Abort(_('remote bookmark %s not found!') % b)
5888 raise error.Abort(_('remote bookmark %s not found!') % b)
5889 revs.append(remotebookmarks[b])
5889 revs.append(remotebookmarks[b])
5890
5890
5891 if revs:
5891 if revs:
5892 try:
5892 try:
5893 # When 'rev' is a bookmark name, we cannot guarantee that it
5893 # When 'rev' is a bookmark name, we cannot guarantee that it
5894 # will be updated with that name because of a race condition
5894 # will be updated with that name because of a race condition
5895 # server side. (See issue 4689 for details)
5895 # server side. (See issue 4689 for details)
5896 oldrevs = revs
5896 oldrevs = revs
5897 revs = [] # actually, nodes
5897 revs = [] # actually, nodes
5898 for r in oldrevs:
5898 for r in oldrevs:
5899 node = other.lookup(r)
5899 node = other.lookup(r)
5900 revs.append(node)
5900 revs.append(node)
5901 if r == checkout:
5901 if r == checkout:
5902 checkout = node
5902 checkout = node
5903 except error.CapabilityError:
5903 except error.CapabilityError:
5904 err = _("other repository doesn't support revision lookup, "
5904 err = _("other repository doesn't support revision lookup, "
5905 "so a rev cannot be specified.")
5905 "so a rev cannot be specified.")
5906 raise error.Abort(err)
5906 raise error.Abort(err)
5907
5907
5908 pullopargs.update(opts.get('opargs', {}))
5908 pullopargs.update(opts.get('opargs', {}))
5909 modheads = exchange.pull(repo, other, heads=revs,
5909 modheads = exchange.pull(repo, other, heads=revs,
5910 force=opts.get('force'),
5910 force=opts.get('force'),
5911 bookmarks=opts.get('bookmark', ()),
5911 bookmarks=opts.get('bookmark', ()),
5912 opargs=pullopargs).cgresult
5912 opargs=pullopargs).cgresult
5913
5913
5914 # brev is a name, which might be a bookmark to be activated at
5914 # brev is a name, which might be a bookmark to be activated at
5915 # the end of the update. In other words, it is an explicit
5915 # the end of the update. In other words, it is an explicit
5916 # destination of the update
5916 # destination of the update
5917 brev = None
5917 brev = None
5918
5918
5919 if checkout:
5919 if checkout:
5920 checkout = str(repo.changelog.rev(checkout))
5920 checkout = str(repo.changelog.rev(checkout))
5921
5921
5922 # order below depends on implementation of
5922 # order below depends on implementation of
5923 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5923 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5924 # because 'checkout' is determined without it.
5924 # because 'checkout' is determined without it.
5925 if opts.get('rev'):
5925 if opts.get('rev'):
5926 brev = opts['rev'][0]
5926 brev = opts['rev'][0]
5927 elif opts.get('branch'):
5927 elif opts.get('branch'):
5928 brev = opts['branch'][0]
5928 brev = opts['branch'][0]
5929 else:
5929 else:
5930 brev = branches[0]
5930 brev = branches[0]
5931 repo._subtoppath = source
5931 repo._subtoppath = source
5932 try:
5932 try:
5933 ret = postincoming(ui, repo, modheads, opts.get('update'),
5933 ret = postincoming(ui, repo, modheads, opts.get('update'),
5934 checkout, brev)
5934 checkout, brev)
5935
5935
5936 finally:
5936 finally:
5937 del repo._subtoppath
5937 del repo._subtoppath
5938
5938
5939 finally:
5939 finally:
5940 other.close()
5940 other.close()
5941 return ret
5941 return ret
5942
5942
5943 @command('^push',
5943 @command('^push',
5944 [('f', 'force', None, _('force push')),
5944 [('f', 'force', None, _('force push')),
5945 ('r', 'rev', [],
5945 ('r', 'rev', [],
5946 _('a changeset intended to be included in the destination'),
5946 _('a changeset intended to be included in the destination'),
5947 _('REV')),
5947 _('REV')),
5948 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5948 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5949 ('b', 'branch', [],
5949 ('b', 'branch', [],
5950 _('a specific branch you would like to push'), _('BRANCH')),
5950 _('a specific branch you would like to push'), _('BRANCH')),
5951 ('', 'new-branch', False, _('allow pushing a new branch')),
5951 ('', 'new-branch', False, _('allow pushing a new branch')),
5952 ] + remoteopts,
5952 ] + remoteopts,
5953 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5953 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5954 def push(ui, repo, dest=None, **opts):
5954 def push(ui, repo, dest=None, **opts):
5955 """push changes to the specified destination
5955 """push changes to the specified destination
5956
5956
5957 Push changesets from the local repository to the specified
5957 Push changesets from the local repository to the specified
5958 destination.
5958 destination.
5959
5959
5960 This operation is symmetrical to pull: it is identical to a pull
5960 This operation is symmetrical to pull: it is identical to a pull
5961 in the destination repository from the current one.
5961 in the destination repository from the current one.
5962
5962
5963 By default, push will not allow creation of new heads at the
5963 By default, push will not allow creation of new heads at the
5964 destination, since multiple heads would make it unclear which head
5964 destination, since multiple heads would make it unclear which head
5965 to use. In this situation, it is recommended to pull and merge
5965 to use. In this situation, it is recommended to pull and merge
5966 before pushing.
5966 before pushing.
5967
5967
5968 Use --new-branch if you want to allow push to create a new named
5968 Use --new-branch if you want to allow push to create a new named
5969 branch that is not present at the destination. This allows you to
5969 branch that is not present at the destination. This allows you to
5970 only create a new branch without forcing other changes.
5970 only create a new branch without forcing other changes.
5971
5971
5972 .. note::
5972 .. note::
5973
5973
5974 Extra care should be taken with the -f/--force option,
5974 Extra care should be taken with the -f/--force option,
5975 which will push all new heads on all branches, an action which will
5975 which will push all new heads on all branches, an action which will
5976 almost always cause confusion for collaborators.
5976 almost always cause confusion for collaborators.
5977
5977
5978 If -r/--rev is used, the specified revision and all its ancestors
5978 If -r/--rev is used, the specified revision and all its ancestors
5979 will be pushed to the remote repository.
5979 will be pushed to the remote repository.
5980
5980
5981 If -B/--bookmark is used, the specified bookmarked revision, its
5981 If -B/--bookmark is used, the specified bookmarked revision, its
5982 ancestors, and the bookmark will be pushed to the remote
5982 ancestors, and the bookmark will be pushed to the remote
5983 repository. Specifying ``.`` is equivalent to specifying the active
5983 repository. Specifying ``.`` is equivalent to specifying the active
5984 bookmark's name.
5984 bookmark's name.
5985
5985
5986 Please see :hg:`help urls` for important details about ``ssh://``
5986 Please see :hg:`help urls` for important details about ``ssh://``
5987 URLs. If DESTINATION is omitted, a default path will be used.
5987 URLs. If DESTINATION is omitted, a default path will be used.
5988
5988
5989 Returns 0 if push was successful, 1 if nothing to push.
5989 Returns 0 if push was successful, 1 if nothing to push.
5990 """
5990 """
5991
5991
5992 if opts.get('bookmark'):
5992 if opts.get('bookmark'):
5993 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5993 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5994 for b in opts['bookmark']:
5994 for b in opts['bookmark']:
5995 # translate -B options to -r so changesets get pushed
5995 # translate -B options to -r so changesets get pushed
5996 b = repo._bookmarks.expandname(b)
5996 b = repo._bookmarks.expandname(b)
5997 if b in repo._bookmarks:
5997 if b in repo._bookmarks:
5998 opts.setdefault('rev', []).append(b)
5998 opts.setdefault('rev', []).append(b)
5999 else:
5999 else:
6000 # if we try to push a deleted bookmark, translate it to null
6000 # if we try to push a deleted bookmark, translate it to null
6001 # this lets simultaneous -r, -b options continue working
6001 # this lets simultaneous -r, -b options continue working
6002 opts.setdefault('rev', []).append("null")
6002 opts.setdefault('rev', []).append("null")
6003
6003
6004 path = ui.paths.getpath(dest, default=('default-push', 'default'))
6004 path = ui.paths.getpath(dest, default=('default-push', 'default'))
6005 if not path:
6005 if not path:
6006 raise error.Abort(_('default repository not configured!'),
6006 raise error.Abort(_('default repository not configured!'),
6007 hint=_("see 'hg help config.paths'"))
6007 hint=_("see 'hg help config.paths'"))
6008 dest = path.pushloc or path.loc
6008 dest = path.pushloc or path.loc
6009 branches = (path.branch, opts.get('branch') or [])
6009 branches = (path.branch, opts.get('branch') or [])
6010 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
6010 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
6011 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
6011 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
6012 other = hg.peer(repo, opts, dest)
6012 other = hg.peer(repo, opts, dest)
6013
6013
6014 if revs:
6014 if revs:
6015 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
6015 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
6016 if not revs:
6016 if not revs:
6017 raise error.Abort(_("specified revisions evaluate to an empty set"),
6017 raise error.Abort(_("specified revisions evaluate to an empty set"),
6018 hint=_("use different revision arguments"))
6018 hint=_("use different revision arguments"))
6019 elif path.pushrev:
6019 elif path.pushrev:
6020 # It doesn't make any sense to specify ancestor revisions. So limit
6020 # It doesn't make any sense to specify ancestor revisions. So limit
6021 # to DAG heads to make discovery simpler.
6021 # to DAG heads to make discovery simpler.
6022 expr = revset.formatspec('heads(%r)', path.pushrev)
6022 expr = revset.formatspec('heads(%r)', path.pushrev)
6023 revs = scmutil.revrange(repo, [expr])
6023 revs = scmutil.revrange(repo, [expr])
6024 revs = [repo[rev].node() for rev in revs]
6024 revs = [repo[rev].node() for rev in revs]
6025 if not revs:
6025 if not revs:
6026 raise error.Abort(_('default push revset for path evaluates to an '
6026 raise error.Abort(_('default push revset for path evaluates to an '
6027 'empty set'))
6027 'empty set'))
6028
6028
6029 repo._subtoppath = dest
6029 repo._subtoppath = dest
6030 try:
6030 try:
6031 # push subrepos depth-first for coherent ordering
6031 # push subrepos depth-first for coherent ordering
6032 c = repo['']
6032 c = repo['']
6033 subs = c.substate # only repos that are committed
6033 subs = c.substate # only repos that are committed
6034 for s in sorted(subs):
6034 for s in sorted(subs):
6035 result = c.sub(s).push(opts)
6035 result = c.sub(s).push(opts)
6036 if result == 0:
6036 if result == 0:
6037 return not result
6037 return not result
6038 finally:
6038 finally:
6039 del repo._subtoppath
6039 del repo._subtoppath
6040 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
6040 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
6041 newbranch=opts.get('new_branch'),
6041 newbranch=opts.get('new_branch'),
6042 bookmarks=opts.get('bookmark', ()),
6042 bookmarks=opts.get('bookmark', ()),
6043 opargs=opts.get('opargs'))
6043 opargs=opts.get('opargs'))
6044
6044
6045 result = not pushop.cgresult
6045 result = not pushop.cgresult
6046
6046
6047 if pushop.bkresult is not None:
6047 if pushop.bkresult is not None:
6048 if pushop.bkresult == 2:
6048 if pushop.bkresult == 2:
6049 result = 2
6049 result = 2
6050 elif not result and pushop.bkresult:
6050 elif not result and pushop.bkresult:
6051 result = 2
6051 result = 2
6052
6052
6053 return result
6053 return result
6054
6054
6055 @command('recover', [])
6055 @command('recover', [])
6056 def recover(ui, repo):
6056 def recover(ui, repo):
6057 """roll back an interrupted transaction
6057 """roll back an interrupted transaction
6058
6058
6059 Recover from an interrupted commit or pull.
6059 Recover from an interrupted commit or pull.
6060
6060
6061 This command tries to fix the repository status after an
6061 This command tries to fix the repository status after an
6062 interrupted operation. It should only be necessary when Mercurial
6062 interrupted operation. It should only be necessary when Mercurial
6063 suggests it.
6063 suggests it.
6064
6064
6065 Returns 0 if successful, 1 if nothing to recover or verify fails.
6065 Returns 0 if successful, 1 if nothing to recover or verify fails.
6066 """
6066 """
6067 if repo.recover():
6067 if repo.recover():
6068 return hg.verify(repo)
6068 return hg.verify(repo)
6069 return 1
6069 return 1
6070
6070
6071 @command('^remove|rm',
6071 @command('^remove|rm',
6072 [('A', 'after', None, _('record delete for missing files')),
6072 [('A', 'after', None, _('record delete for missing files')),
6073 ('f', 'force', None,
6073 ('f', 'force', None,
6074 _('forget added files, delete modified files')),
6074 _('forget added files, delete modified files')),
6075 ] + subrepoopts + walkopts,
6075 ] + subrepoopts + walkopts,
6076 _('[OPTION]... FILE...'),
6076 _('[OPTION]... FILE...'),
6077 inferrepo=True)
6077 inferrepo=True)
6078 def remove(ui, repo, *pats, **opts):
6078 def remove(ui, repo, *pats, **opts):
6079 """remove the specified files on the next commit
6079 """remove the specified files on the next commit
6080
6080
6081 Schedule the indicated files for removal from the current branch.
6081 Schedule the indicated files for removal from the current branch.
6082
6082
6083 This command schedules the files to be removed at the next commit.
6083 This command schedules the files to be removed at the next commit.
6084 To undo a remove before that, see :hg:`revert`. To undo added
6084 To undo a remove before that, see :hg:`revert`. To undo added
6085 files, see :hg:`forget`.
6085 files, see :hg:`forget`.
6086
6086
6087 .. container:: verbose
6087 .. container:: verbose
6088
6088
6089 -A/--after can be used to remove only files that have already
6089 -A/--after can be used to remove only files that have already
6090 been deleted, -f/--force can be used to force deletion, and -Af
6090 been deleted, -f/--force can be used to force deletion, and -Af
6091 can be used to remove files from the next revision without
6091 can be used to remove files from the next revision without
6092 deleting them from the working directory.
6092 deleting them from the working directory.
6093
6093
6094 The following table details the behavior of remove for different
6094 The following table details the behavior of remove for different
6095 file states (columns) and option combinations (rows). The file
6095 file states (columns) and option combinations (rows). The file
6096 states are Added [A], Clean [C], Modified [M] and Missing [!]
6096 states are Added [A], Clean [C], Modified [M] and Missing [!]
6097 (as reported by :hg:`status`). The actions are Warn, Remove
6097 (as reported by :hg:`status`). The actions are Warn, Remove
6098 (from branch) and Delete (from disk):
6098 (from branch) and Delete (from disk):
6099
6099
6100 ========= == == == ==
6100 ========= == == == ==
6101 opt/state A C M !
6101 opt/state A C M !
6102 ========= == == == ==
6102 ========= == == == ==
6103 none W RD W R
6103 none W RD W R
6104 -f R RD RD R
6104 -f R RD RD R
6105 -A W W W R
6105 -A W W W R
6106 -Af R R R R
6106 -Af R R R R
6107 ========= == == == ==
6107 ========= == == == ==
6108
6108
6109 .. note::
6109 .. note::
6110
6110
6111 :hg:`remove` never deletes files in Added [A] state from the
6111 :hg:`remove` never deletes files in Added [A] state from the
6112 working directory, not even if ``--force`` is specified.
6112 working directory, not even if ``--force`` is specified.
6113
6113
6114 Returns 0 on success, 1 if any warnings encountered.
6114 Returns 0 on success, 1 if any warnings encountered.
6115 """
6115 """
6116
6116
6117 after, force = opts.get('after'), opts.get('force')
6117 after, force = opts.get('after'), opts.get('force')
6118 if not pats and not after:
6118 if not pats and not after:
6119 raise error.Abort(_('no files specified'))
6119 raise error.Abort(_('no files specified'))
6120
6120
6121 m = scmutil.match(repo[None], pats, opts)
6121 m = scmutil.match(repo[None], pats, opts)
6122 subrepos = opts.get('subrepos')
6122 subrepos = opts.get('subrepos')
6123 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
6123 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
6124
6124
6125 @command('rename|move|mv',
6125 @command('rename|move|mv',
6126 [('A', 'after', None, _('record a rename that has already occurred')),
6126 [('A', 'after', None, _('record a rename that has already occurred')),
6127 ('f', 'force', None, _('forcibly copy over an existing managed file')),
6127 ('f', 'force', None, _('forcibly copy over an existing managed file')),
6128 ] + walkopts + dryrunopts,
6128 ] + walkopts + dryrunopts,
6129 _('[OPTION]... SOURCE... DEST'))
6129 _('[OPTION]... SOURCE... DEST'))
6130 def rename(ui, repo, *pats, **opts):
6130 def rename(ui, repo, *pats, **opts):
6131 """rename files; equivalent of copy + remove
6131 """rename files; equivalent of copy + remove
6132
6132
6133 Mark dest as copies of sources; mark sources for deletion. If dest
6133 Mark dest as copies of sources; mark sources for deletion. If dest
6134 is a directory, copies are put in that directory. If dest is a
6134 is a directory, copies are put in that directory. If dest is a
6135 file, there can only be one source.
6135 file, there can only be one source.
6136
6136
6137 By default, this command copies the contents of files as they
6137 By default, this command copies the contents of files as they
6138 exist in the working directory. If invoked with -A/--after, the
6138 exist in the working directory. If invoked with -A/--after, the
6139 operation is recorded, but no copying is performed.
6139 operation is recorded, but no copying is performed.
6140
6140
6141 This command takes effect at the next commit. To undo a rename
6141 This command takes effect at the next commit. To undo a rename
6142 before that, see :hg:`revert`.
6142 before that, see :hg:`revert`.
6143
6143
6144 Returns 0 on success, 1 if errors are encountered.
6144 Returns 0 on success, 1 if errors are encountered.
6145 """
6145 """
6146 with repo.wlock(False):
6146 with repo.wlock(False):
6147 return cmdutil.copy(ui, repo, pats, opts, rename=True)
6147 return cmdutil.copy(ui, repo, pats, opts, rename=True)
6148
6148
6149 @command('resolve',
6149 @command('resolve',
6150 [('a', 'all', None, _('select all unresolved files')),
6150 [('a', 'all', None, _('select all unresolved files')),
6151 ('l', 'list', None, _('list state of files needing merge')),
6151 ('l', 'list', None, _('list state of files needing merge')),
6152 ('m', 'mark', None, _('mark files as resolved')),
6152 ('m', 'mark', None, _('mark files as resolved')),
6153 ('u', 'unmark', None, _('mark files as unresolved')),
6153 ('u', 'unmark', None, _('mark files as unresolved')),
6154 ('n', 'no-status', None, _('hide status prefix'))]
6154 ('n', 'no-status', None, _('hide status prefix'))]
6155 + mergetoolopts + walkopts + formatteropts,
6155 + mergetoolopts + walkopts + formatteropts,
6156 _('[OPTION]... [FILE]...'),
6156 _('[OPTION]... [FILE]...'),
6157 inferrepo=True)
6157 inferrepo=True)
6158 def resolve(ui, repo, *pats, **opts):
6158 def resolve(ui, repo, *pats, **opts):
6159 """redo merges or set/view the merge status of files
6159 """redo merges or set/view the merge status of files
6160
6160
6161 Merges with unresolved conflicts are often the result of
6161 Merges with unresolved conflicts are often the result of
6162 non-interactive merging using the ``internal:merge`` configuration
6162 non-interactive merging using the ``internal:merge`` configuration
6163 setting, or a command-line merge tool like ``diff3``. The resolve
6163 setting, or a command-line merge tool like ``diff3``. The resolve
6164 command is used to manage the files involved in a merge, after
6164 command is used to manage the files involved in a merge, after
6165 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
6165 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
6166 working directory must have two parents). See :hg:`help
6166 working directory must have two parents). See :hg:`help
6167 merge-tools` for information on configuring merge tools.
6167 merge-tools` for information on configuring merge tools.
6168
6168
6169 The resolve command can be used in the following ways:
6169 The resolve command can be used in the following ways:
6170
6170
6171 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
6171 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
6172 files, discarding any previous merge attempts. Re-merging is not
6172 files, discarding any previous merge attempts. Re-merging is not
6173 performed for files already marked as resolved. Use ``--all/-a``
6173 performed for files already marked as resolved. Use ``--all/-a``
6174 to select all unresolved files. ``--tool`` can be used to specify
6174 to select all unresolved files. ``--tool`` can be used to specify
6175 the merge tool used for the given files. It overrides the HGMERGE
6175 the merge tool used for the given files. It overrides the HGMERGE
6176 environment variable and your configuration files. Previous file
6176 environment variable and your configuration files. Previous file
6177 contents are saved with a ``.orig`` suffix.
6177 contents are saved with a ``.orig`` suffix.
6178
6178
6179 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
6179 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
6180 (e.g. after having manually fixed-up the files). The default is
6180 (e.g. after having manually fixed-up the files). The default is
6181 to mark all unresolved files.
6181 to mark all unresolved files.
6182
6182
6183 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6183 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6184 default is to mark all resolved files.
6184 default is to mark all resolved files.
6185
6185
6186 - :hg:`resolve -l`: list files which had or still have conflicts.
6186 - :hg:`resolve -l`: list files which had or still have conflicts.
6187 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6187 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6188
6188
6189 .. note::
6189 .. note::
6190
6190
6191 Mercurial will not let you commit files with unresolved merge
6191 Mercurial will not let you commit files with unresolved merge
6192 conflicts. You must use :hg:`resolve -m ...` before you can
6192 conflicts. You must use :hg:`resolve -m ...` before you can
6193 commit after a conflicting merge.
6193 commit after a conflicting merge.
6194
6194
6195 Returns 0 on success, 1 if any files fail a resolve attempt.
6195 Returns 0 on success, 1 if any files fail a resolve attempt.
6196 """
6196 """
6197
6197
6198 flaglist = 'all mark unmark list no_status'.split()
6198 flaglist = 'all mark unmark list no_status'.split()
6199 all, mark, unmark, show, nostatus = \
6199 all, mark, unmark, show, nostatus = \
6200 [opts.get(o) for o in flaglist]
6200 [opts.get(o) for o in flaglist]
6201
6201
6202 if (show and (mark or unmark)) or (mark and unmark):
6202 if (show and (mark or unmark)) or (mark and unmark):
6203 raise error.Abort(_("too many options specified"))
6203 raise error.Abort(_("too many options specified"))
6204 if pats and all:
6204 if pats and all:
6205 raise error.Abort(_("can't specify --all and patterns"))
6205 raise error.Abort(_("can't specify --all and patterns"))
6206 if not (all or pats or show or mark or unmark):
6206 if not (all or pats or show or mark or unmark):
6207 raise error.Abort(_('no files or directories specified'),
6207 raise error.Abort(_('no files or directories specified'),
6208 hint=('use --all to re-merge all unresolved files'))
6208 hint=('use --all to re-merge all unresolved files'))
6209
6209
6210 if show:
6210 if show:
6211 fm = ui.formatter('resolve', opts)
6211 fm = ui.formatter('resolve', opts)
6212 ms = mergemod.mergestate.read(repo)
6212 ms = mergemod.mergestate.read(repo)
6213 m = scmutil.match(repo[None], pats, opts)
6213 m = scmutil.match(repo[None], pats, opts)
6214 for f in ms:
6214 for f in ms:
6215 if not m(f):
6215 if not m(f):
6216 continue
6216 continue
6217 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
6217 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
6218 'd': 'driverresolved'}[ms[f]]
6218 'd': 'driverresolved'}[ms[f]]
6219 fm.startitem()
6219 fm.startitem()
6220 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
6220 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
6221 fm.write('path', '%s\n', f, label=l)
6221 fm.write('path', '%s\n', f, label=l)
6222 fm.end()
6222 fm.end()
6223 return 0
6223 return 0
6224
6224
6225 with repo.wlock():
6225 with repo.wlock():
6226 ms = mergemod.mergestate.read(repo)
6226 ms = mergemod.mergestate.read(repo)
6227
6227
6228 if not (ms.active() or repo.dirstate.p2() != nullid):
6228 if not (ms.active() or repo.dirstate.p2() != nullid):
6229 raise error.Abort(
6229 raise error.Abort(
6230 _('resolve command not applicable when not merging'))
6230 _('resolve command not applicable when not merging'))
6231
6231
6232 wctx = repo[None]
6232 wctx = repo[None]
6233
6233
6234 if ms.mergedriver and ms.mdstate() == 'u':
6234 if ms.mergedriver and ms.mdstate() == 'u':
6235 proceed = mergemod.driverpreprocess(repo, ms, wctx)
6235 proceed = mergemod.driverpreprocess(repo, ms, wctx)
6236 ms.commit()
6236 ms.commit()
6237 # allow mark and unmark to go through
6237 # allow mark and unmark to go through
6238 if not mark and not unmark and not proceed:
6238 if not mark and not unmark and not proceed:
6239 return 1
6239 return 1
6240
6240
6241 m = scmutil.match(wctx, pats, opts)
6241 m = scmutil.match(wctx, pats, opts)
6242 ret = 0
6242 ret = 0
6243 didwork = False
6243 didwork = False
6244 runconclude = False
6244 runconclude = False
6245
6245
6246 tocomplete = []
6246 tocomplete = []
6247 for f in ms:
6247 for f in ms:
6248 if not m(f):
6248 if not m(f):
6249 continue
6249 continue
6250
6250
6251 didwork = True
6251 didwork = True
6252
6252
6253 # don't let driver-resolved files be marked, and run the conclude
6253 # don't let driver-resolved files be marked, and run the conclude
6254 # step if asked to resolve
6254 # step if asked to resolve
6255 if ms[f] == "d":
6255 if ms[f] == "d":
6256 exact = m.exact(f)
6256 exact = m.exact(f)
6257 if mark:
6257 if mark:
6258 if exact:
6258 if exact:
6259 ui.warn(_('not marking %s as it is driver-resolved\n')
6259 ui.warn(_('not marking %s as it is driver-resolved\n')
6260 % f)
6260 % f)
6261 elif unmark:
6261 elif unmark:
6262 if exact:
6262 if exact:
6263 ui.warn(_('not unmarking %s as it is driver-resolved\n')
6263 ui.warn(_('not unmarking %s as it is driver-resolved\n')
6264 % f)
6264 % f)
6265 else:
6265 else:
6266 runconclude = True
6266 runconclude = True
6267 continue
6267 continue
6268
6268
6269 if mark:
6269 if mark:
6270 ms.mark(f, "r")
6270 ms.mark(f, "r")
6271 elif unmark:
6271 elif unmark:
6272 ms.mark(f, "u")
6272 ms.mark(f, "u")
6273 else:
6273 else:
6274 # backup pre-resolve (merge uses .orig for its own purposes)
6274 # backup pre-resolve (merge uses .orig for its own purposes)
6275 a = repo.wjoin(f)
6275 a = repo.wjoin(f)
6276 try:
6276 try:
6277 util.copyfile(a, a + ".resolve")
6277 util.copyfile(a, a + ".resolve")
6278 except (IOError, OSError) as inst:
6278 except (IOError, OSError) as inst:
6279 if inst.errno != errno.ENOENT:
6279 if inst.errno != errno.ENOENT:
6280 raise
6280 raise
6281
6281
6282 try:
6282 try:
6283 # preresolve file
6283 # preresolve file
6284 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6284 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6285 'resolve')
6285 'resolve')
6286 complete, r = ms.preresolve(f, wctx)
6286 complete, r = ms.preresolve(f, wctx)
6287 if not complete:
6287 if not complete:
6288 tocomplete.append(f)
6288 tocomplete.append(f)
6289 elif r:
6289 elif r:
6290 ret = 1
6290 ret = 1
6291 finally:
6291 finally:
6292 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6292 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6293 ms.commit()
6293 ms.commit()
6294
6294
6295 # replace filemerge's .orig file with our resolve file, but only
6295 # replace filemerge's .orig file with our resolve file, but only
6296 # for merges that are complete
6296 # for merges that are complete
6297 if complete:
6297 if complete:
6298 try:
6298 try:
6299 util.rename(a + ".resolve",
6299 util.rename(a + ".resolve",
6300 scmutil.origpath(ui, repo, a))
6300 scmutil.origpath(ui, repo, a))
6301 except OSError as inst:
6301 except OSError as inst:
6302 if inst.errno != errno.ENOENT:
6302 if inst.errno != errno.ENOENT:
6303 raise
6303 raise
6304
6304
6305 for f in tocomplete:
6305 for f in tocomplete:
6306 try:
6306 try:
6307 # resolve file
6307 # resolve file
6308 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6308 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6309 'resolve')
6309 'resolve')
6310 r = ms.resolve(f, wctx)
6310 r = ms.resolve(f, wctx)
6311 if r:
6311 if r:
6312 ret = 1
6312 ret = 1
6313 finally:
6313 finally:
6314 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6314 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6315 ms.commit()
6315 ms.commit()
6316
6316
6317 # replace filemerge's .orig file with our resolve file
6317 # replace filemerge's .orig file with our resolve file
6318 a = repo.wjoin(f)
6318 a = repo.wjoin(f)
6319 try:
6319 try:
6320 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
6320 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
6321 except OSError as inst:
6321 except OSError as inst:
6322 if inst.errno != errno.ENOENT:
6322 if inst.errno != errno.ENOENT:
6323 raise
6323 raise
6324
6324
6325 ms.commit()
6325 ms.commit()
6326 ms.recordactions()
6326 ms.recordactions()
6327
6327
6328 if not didwork and pats:
6328 if not didwork and pats:
6329 hint = None
6329 hint = None
6330 if not any([p for p in pats if p.find(':') >= 0]):
6330 if not any([p for p in pats if p.find(':') >= 0]):
6331 pats = ['path:%s' % p for p in pats]
6331 pats = ['path:%s' % p for p in pats]
6332 m = scmutil.match(wctx, pats, opts)
6332 m = scmutil.match(wctx, pats, opts)
6333 for f in ms:
6333 for f in ms:
6334 if not m(f):
6334 if not m(f):
6335 continue
6335 continue
6336 flags = ''.join(['-%s ' % o[0] for o in flaglist
6336 flags = ''.join(['-%s ' % o[0] for o in flaglist
6337 if opts.get(o)])
6337 if opts.get(o)])
6338 hint = _("(try: hg resolve %s%s)\n") % (
6338 hint = _("(try: hg resolve %s%s)\n") % (
6339 flags,
6339 flags,
6340 ' '.join(pats))
6340 ' '.join(pats))
6341 break
6341 break
6342 ui.warn(_("arguments do not match paths that need resolving\n"))
6342 ui.warn(_("arguments do not match paths that need resolving\n"))
6343 if hint:
6343 if hint:
6344 ui.warn(hint)
6344 ui.warn(hint)
6345 elif ms.mergedriver and ms.mdstate() != 's':
6345 elif ms.mergedriver and ms.mdstate() != 's':
6346 # run conclude step when either a driver-resolved file is requested
6346 # run conclude step when either a driver-resolved file is requested
6347 # or there are no driver-resolved files
6347 # or there are no driver-resolved files
6348 # we can't use 'ret' to determine whether any files are unresolved
6348 # we can't use 'ret' to determine whether any files are unresolved
6349 # because we might not have tried to resolve some
6349 # because we might not have tried to resolve some
6350 if ((runconclude or not list(ms.driverresolved()))
6350 if ((runconclude or not list(ms.driverresolved()))
6351 and not list(ms.unresolved())):
6351 and not list(ms.unresolved())):
6352 proceed = mergemod.driverconclude(repo, ms, wctx)
6352 proceed = mergemod.driverconclude(repo, ms, wctx)
6353 ms.commit()
6353 ms.commit()
6354 if not proceed:
6354 if not proceed:
6355 return 1
6355 return 1
6356
6356
6357 # Nudge users into finishing an unfinished operation
6357 # Nudge users into finishing an unfinished operation
6358 unresolvedf = list(ms.unresolved())
6358 unresolvedf = list(ms.unresolved())
6359 driverresolvedf = list(ms.driverresolved())
6359 driverresolvedf = list(ms.driverresolved())
6360 if not unresolvedf and not driverresolvedf:
6360 if not unresolvedf and not driverresolvedf:
6361 ui.status(_('(no more unresolved files)\n'))
6361 ui.status(_('(no more unresolved files)\n'))
6362 cmdutil.checkafterresolved(repo)
6362 cmdutil.checkafterresolved(repo)
6363 elif not unresolvedf:
6363 elif not unresolvedf:
6364 ui.status(_('(no more unresolved files -- '
6364 ui.status(_('(no more unresolved files -- '
6365 'run "hg resolve --all" to conclude)\n'))
6365 'run "hg resolve --all" to conclude)\n'))
6366
6366
6367 return ret
6367 return ret
6368
6368
6369 @command('revert',
6369 @command('revert',
6370 [('a', 'all', None, _('revert all changes when no arguments given')),
6370 [('a', 'all', None, _('revert all changes when no arguments given')),
6371 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6371 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6372 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6372 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6373 ('C', 'no-backup', None, _('do not save backup copies of files')),
6373 ('C', 'no-backup', None, _('do not save backup copies of files')),
6374 ('i', 'interactive', None,
6374 ('i', 'interactive', None,
6375 _('interactively select the changes (EXPERIMENTAL)')),
6375 _('interactively select the changes (EXPERIMENTAL)')),
6376 ] + walkopts + dryrunopts,
6376 ] + walkopts + dryrunopts,
6377 _('[OPTION]... [-r REV] [NAME]...'))
6377 _('[OPTION]... [-r REV] [NAME]...'))
6378 def revert(ui, repo, *pats, **opts):
6378 def revert(ui, repo, *pats, **opts):
6379 """restore files to their checkout state
6379 """restore files to their checkout state
6380
6380
6381 .. note::
6381 .. note::
6382
6382
6383 To check out earlier revisions, you should use :hg:`update REV`.
6383 To check out earlier revisions, you should use :hg:`update REV`.
6384 To cancel an uncommitted merge (and lose your changes),
6384 To cancel an uncommitted merge (and lose your changes),
6385 use :hg:`update --clean .`.
6385 use :hg:`update --clean .`.
6386
6386
6387 With no revision specified, revert the specified files or directories
6387 With no revision specified, revert the specified files or directories
6388 to the contents they had in the parent of the working directory.
6388 to the contents they had in the parent of the working directory.
6389 This restores the contents of files to an unmodified
6389 This restores the contents of files to an unmodified
6390 state and unschedules adds, removes, copies, and renames. If the
6390 state and unschedules adds, removes, copies, and renames. If the
6391 working directory has two parents, you must explicitly specify a
6391 working directory has two parents, you must explicitly specify a
6392 revision.
6392 revision.
6393
6393
6394 Using the -r/--rev or -d/--date options, revert the given files or
6394 Using the -r/--rev or -d/--date options, revert the given files or
6395 directories to their states as of a specific revision. Because
6395 directories to their states as of a specific revision. Because
6396 revert does not change the working directory parents, this will
6396 revert does not change the working directory parents, this will
6397 cause these files to appear modified. This can be helpful to "back
6397 cause these files to appear modified. This can be helpful to "back
6398 out" some or all of an earlier change. See :hg:`backout` for a
6398 out" some or all of an earlier change. See :hg:`backout` for a
6399 related method.
6399 related method.
6400
6400
6401 Modified files are saved with a .orig suffix before reverting.
6401 Modified files are saved with a .orig suffix before reverting.
6402 To disable these backups, use --no-backup. It is possible to store
6402 To disable these backups, use --no-backup. It is possible to store
6403 the backup files in a custom directory relative to the root of the
6403 the backup files in a custom directory relative to the root of the
6404 repository by setting the ``ui.origbackuppath`` configuration
6404 repository by setting the ``ui.origbackuppath`` configuration
6405 option.
6405 option.
6406
6406
6407 See :hg:`help dates` for a list of formats valid for -d/--date.
6407 See :hg:`help dates` for a list of formats valid for -d/--date.
6408
6408
6409 See :hg:`help backout` for a way to reverse the effect of an
6409 See :hg:`help backout` for a way to reverse the effect of an
6410 earlier changeset.
6410 earlier changeset.
6411
6411
6412 Returns 0 on success.
6412 Returns 0 on success.
6413 """
6413 """
6414
6414
6415 if opts.get("date"):
6415 if opts.get("date"):
6416 if opts.get("rev"):
6416 if opts.get("rev"):
6417 raise error.Abort(_("you can't specify a revision and a date"))
6417 raise error.Abort(_("you can't specify a revision and a date"))
6418 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6418 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6419
6419
6420 parent, p2 = repo.dirstate.parents()
6420 parent, p2 = repo.dirstate.parents()
6421 if not opts.get('rev') and p2 != nullid:
6421 if not opts.get('rev') and p2 != nullid:
6422 # revert after merge is a trap for new users (issue2915)
6422 # revert after merge is a trap for new users (issue2915)
6423 raise error.Abort(_('uncommitted merge with no revision specified'),
6423 raise error.Abort(_('uncommitted merge with no revision specified'),
6424 hint=_("use 'hg update' or see 'hg help revert'"))
6424 hint=_("use 'hg update' or see 'hg help revert'"))
6425
6425
6426 ctx = scmutil.revsingle(repo, opts.get('rev'))
6426 ctx = scmutil.revsingle(repo, opts.get('rev'))
6427
6427
6428 if (not (pats or opts.get('include') or opts.get('exclude') or
6428 if (not (pats or opts.get('include') or opts.get('exclude') or
6429 opts.get('all') or opts.get('interactive'))):
6429 opts.get('all') or opts.get('interactive'))):
6430 msg = _("no files or directories specified")
6430 msg = _("no files or directories specified")
6431 if p2 != nullid:
6431 if p2 != nullid:
6432 hint = _("uncommitted merge, use --all to discard all changes,"
6432 hint = _("uncommitted merge, use --all to discard all changes,"
6433 " or 'hg update -C .' to abort the merge")
6433 " or 'hg update -C .' to abort the merge")
6434 raise error.Abort(msg, hint=hint)
6434 raise error.Abort(msg, hint=hint)
6435 dirty = any(repo.status())
6435 dirty = any(repo.status())
6436 node = ctx.node()
6436 node = ctx.node()
6437 if node != parent:
6437 if node != parent:
6438 if dirty:
6438 if dirty:
6439 hint = _("uncommitted changes, use --all to discard all"
6439 hint = _("uncommitted changes, use --all to discard all"
6440 " changes, or 'hg update %s' to update") % ctx.rev()
6440 " changes, or 'hg update %s' to update") % ctx.rev()
6441 else:
6441 else:
6442 hint = _("use --all to revert all files,"
6442 hint = _("use --all to revert all files,"
6443 " or 'hg update %s' to update") % ctx.rev()
6443 " or 'hg update %s' to update") % ctx.rev()
6444 elif dirty:
6444 elif dirty:
6445 hint = _("uncommitted changes, use --all to discard all changes")
6445 hint = _("uncommitted changes, use --all to discard all changes")
6446 else:
6446 else:
6447 hint = _("use --all to revert all files")
6447 hint = _("use --all to revert all files")
6448 raise error.Abort(msg, hint=hint)
6448 raise error.Abort(msg, hint=hint)
6449
6449
6450 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6450 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6451
6451
6452 @command('rollback', dryrunopts +
6452 @command('rollback', dryrunopts +
6453 [('f', 'force', False, _('ignore safety measures'))])
6453 [('f', 'force', False, _('ignore safety measures'))])
6454 def rollback(ui, repo, **opts):
6454 def rollback(ui, repo, **opts):
6455 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6455 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6456
6456
6457 Please use :hg:`commit --amend` instead of rollback to correct
6457 Please use :hg:`commit --amend` instead of rollback to correct
6458 mistakes in the last commit.
6458 mistakes in the last commit.
6459
6459
6460 This command should be used with care. There is only one level of
6460 This command should be used with care. There is only one level of
6461 rollback, and there is no way to undo a rollback. It will also
6461 rollback, and there is no way to undo a rollback. It will also
6462 restore the dirstate at the time of the last transaction, losing
6462 restore the dirstate at the time of the last transaction, losing
6463 any dirstate changes since that time. This command does not alter
6463 any dirstate changes since that time. This command does not alter
6464 the working directory.
6464 the working directory.
6465
6465
6466 Transactions are used to encapsulate the effects of all commands
6466 Transactions are used to encapsulate the effects of all commands
6467 that create new changesets or propagate existing changesets into a
6467 that create new changesets or propagate existing changesets into a
6468 repository.
6468 repository.
6469
6469
6470 .. container:: verbose
6470 .. container:: verbose
6471
6471
6472 For example, the following commands are transactional, and their
6472 For example, the following commands are transactional, and their
6473 effects can be rolled back:
6473 effects can be rolled back:
6474
6474
6475 - commit
6475 - commit
6476 - import
6476 - import
6477 - pull
6477 - pull
6478 - push (with this repository as the destination)
6478 - push (with this repository as the destination)
6479 - unbundle
6479 - unbundle
6480
6480
6481 To avoid permanent data loss, rollback will refuse to rollback a
6481 To avoid permanent data loss, rollback will refuse to rollback a
6482 commit transaction if it isn't checked out. Use --force to
6482 commit transaction if it isn't checked out. Use --force to
6483 override this protection.
6483 override this protection.
6484
6484
6485 The rollback command can be entirely disabled by setting the
6485 The rollback command can be entirely disabled by setting the
6486 ``ui.rollback`` configuration setting to false. If you're here
6486 ``ui.rollback`` configuration setting to false. If you're here
6487 because you want to use rollback and it's disabled, you can
6487 because you want to use rollback and it's disabled, you can
6488 re-enable the command by setting ``ui.rollback`` to true.
6488 re-enable the command by setting ``ui.rollback`` to true.
6489
6489
6490 This command is not intended for use on public repositories. Once
6490 This command is not intended for use on public repositories. Once
6491 changes are visible for pull by other users, rolling a transaction
6491 changes are visible for pull by other users, rolling a transaction
6492 back locally is ineffective (someone else may already have pulled
6492 back locally is ineffective (someone else may already have pulled
6493 the changes). Furthermore, a race is possible with readers of the
6493 the changes). Furthermore, a race is possible with readers of the
6494 repository; for example an in-progress pull from the repository
6494 repository; for example an in-progress pull from the repository
6495 may fail if a rollback is performed.
6495 may fail if a rollback is performed.
6496
6496
6497 Returns 0 on success, 1 if no rollback data is available.
6497 Returns 0 on success, 1 if no rollback data is available.
6498 """
6498 """
6499 if not ui.configbool('ui', 'rollback', True):
6499 if not ui.configbool('ui', 'rollback', True):
6500 raise error.Abort(_('rollback is disabled because it is unsafe'),
6500 raise error.Abort(_('rollback is disabled because it is unsafe'),
6501 hint=('see `hg help -v rollback` for information'))
6501 hint=('see `hg help -v rollback` for information'))
6502 return repo.rollback(dryrun=opts.get('dry_run'),
6502 return repo.rollback(dryrun=opts.get('dry_run'),
6503 force=opts.get('force'))
6503 force=opts.get('force'))
6504
6504
6505 @command('root', [])
6505 @command('root', [])
6506 def root(ui, repo):
6506 def root(ui, repo):
6507 """print the root (top) of the current working directory
6507 """print the root (top) of the current working directory
6508
6508
6509 Print the root directory of the current repository.
6509 Print the root directory of the current repository.
6510
6510
6511 Returns 0 on success.
6511 Returns 0 on success.
6512 """
6512 """
6513 ui.write(repo.root + "\n")
6513 ui.write(repo.root + "\n")
6514
6514
6515 @command('^serve',
6515 @command('^serve',
6516 [('A', 'accesslog', '', _('name of access log file to write to'),
6516 [('A', 'accesslog', '', _('name of access log file to write to'),
6517 _('FILE')),
6517 _('FILE')),
6518 ('d', 'daemon', None, _('run server in background')),
6518 ('d', 'daemon', None, _('run server in background')),
6519 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
6519 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
6520 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6520 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6521 # use string type, then we can check if something was passed
6521 # use string type, then we can check if something was passed
6522 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6522 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6523 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6523 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6524 _('ADDR')),
6524 _('ADDR')),
6525 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6525 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6526 _('PREFIX')),
6526 _('PREFIX')),
6527 ('n', 'name', '',
6527 ('n', 'name', '',
6528 _('name to show in web pages (default: working directory)'), _('NAME')),
6528 _('name to show in web pages (default: working directory)'), _('NAME')),
6529 ('', 'web-conf', '',
6529 ('', 'web-conf', '',
6530 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
6530 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
6531 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6531 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6532 _('FILE')),
6532 _('FILE')),
6533 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6533 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6534 ('', 'stdio', None, _('for remote clients')),
6534 ('', 'stdio', None, _('for remote clients')),
6535 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6535 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6536 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6536 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6537 ('', 'style', '', _('template style to use'), _('STYLE')),
6537 ('', 'style', '', _('template style to use'), _('STYLE')),
6538 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6538 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6539 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6539 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6540 _('[OPTION]...'),
6540 _('[OPTION]...'),
6541 optionalrepo=True)
6541 optionalrepo=True)
6542 def serve(ui, repo, **opts):
6542 def serve(ui, repo, **opts):
6543 """start stand-alone webserver
6543 """start stand-alone webserver
6544
6544
6545 Start a local HTTP repository browser and pull server. You can use
6545 Start a local HTTP repository browser and pull server. You can use
6546 this for ad-hoc sharing and browsing of repositories. It is
6546 this for ad-hoc sharing and browsing of repositories. It is
6547 recommended to use a real web server to serve a repository for
6547 recommended to use a real web server to serve a repository for
6548 longer periods of time.
6548 longer periods of time.
6549
6549
6550 Please note that the server does not implement access control.
6550 Please note that the server does not implement access control.
6551 This means that, by default, anybody can read from the server and
6551 This means that, by default, anybody can read from the server and
6552 nobody can write to it by default. Set the ``web.allow_push``
6552 nobody can write to it by default. Set the ``web.allow_push``
6553 option to ``*`` to allow everybody to push to the server. You
6553 option to ``*`` to allow everybody to push to the server. You
6554 should use a real web server if you need to authenticate users.
6554 should use a real web server if you need to authenticate users.
6555
6555
6556 By default, the server logs accesses to stdout and errors to
6556 By default, the server logs accesses to stdout and errors to
6557 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6557 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6558 files.
6558 files.
6559
6559
6560 To have the server choose a free port number to listen on, specify
6560 To have the server choose a free port number to listen on, specify
6561 a port number of 0; in this case, the server will print the port
6561 a port number of 0; in this case, the server will print the port
6562 number it uses.
6562 number it uses.
6563
6563
6564 Returns 0 on success.
6564 Returns 0 on success.
6565 """
6565 """
6566
6566
6567 if opts["stdio"] and opts["cmdserver"]:
6567 if opts["stdio"] and opts["cmdserver"]:
6568 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6568 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6569
6569
6570 if opts["stdio"]:
6570 if opts["stdio"]:
6571 if repo is None:
6571 if repo is None:
6572 raise error.RepoError(_("there is no Mercurial repository here"
6572 raise error.RepoError(_("there is no Mercurial repository here"
6573 " (.hg not found)"))
6573 " (.hg not found)"))
6574 s = sshserver.sshserver(ui, repo)
6574 s = sshserver.sshserver(ui, repo)
6575 s.serve_forever()
6575 s.serve_forever()
6576
6576
6577 if opts["cmdserver"]:
6577 if opts["cmdserver"]:
6578 service = commandserver.createservice(ui, repo, opts)
6578 service = commandserver.createservice(ui, repo, opts)
6579 else:
6579 else:
6580 service = hgweb.createservice(ui, repo, opts)
6580 service = hgweb.createservice(ui, repo, opts)
6581 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6581 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6582
6582
6583 @command('^status|st',
6583 @command('^status|st',
6584 [('A', 'all', None, _('show status of all files')),
6584 [('A', 'all', None, _('show status of all files')),
6585 ('m', 'modified', None, _('show only modified files')),
6585 ('m', 'modified', None, _('show only modified files')),
6586 ('a', 'added', None, _('show only added files')),
6586 ('a', 'added', None, _('show only added files')),
6587 ('r', 'removed', None, _('show only removed files')),
6587 ('r', 'removed', None, _('show only removed files')),
6588 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6588 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6589 ('c', 'clean', None, _('show only files without changes')),
6589 ('c', 'clean', None, _('show only files without changes')),
6590 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6590 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6591 ('i', 'ignored', None, _('show only ignored files')),
6591 ('i', 'ignored', None, _('show only ignored files')),
6592 ('n', 'no-status', None, _('hide status prefix')),
6592 ('n', 'no-status', None, _('hide status prefix')),
6593 ('C', 'copies', None, _('show source of copied files')),
6593 ('C', 'copies', None, _('show source of copied files')),
6594 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6594 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6595 ('', 'rev', [], _('show difference from revision'), _('REV')),
6595 ('', 'rev', [], _('show difference from revision'), _('REV')),
6596 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6596 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6597 ] + walkopts + subrepoopts + formatteropts,
6597 ] + walkopts + subrepoopts + formatteropts,
6598 _('[OPTION]... [FILE]...'),
6598 _('[OPTION]... [FILE]...'),
6599 inferrepo=True)
6599 inferrepo=True)
6600 def status(ui, repo, *pats, **opts):
6600 def status(ui, repo, *pats, **opts):
6601 """show changed files in the working directory
6601 """show changed files in the working directory
6602
6602
6603 Show status of files in the repository. If names are given, only
6603 Show status of files in the repository. If names are given, only
6604 files that match are shown. Files that are clean or ignored or
6604 files that match are shown. Files that are clean or ignored or
6605 the source of a copy/move operation, are not listed unless
6605 the source of a copy/move operation, are not listed unless
6606 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6606 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6607 Unless options described with "show only ..." are given, the
6607 Unless options described with "show only ..." are given, the
6608 options -mardu are used.
6608 options -mardu are used.
6609
6609
6610 Option -q/--quiet hides untracked (unknown and ignored) files
6610 Option -q/--quiet hides untracked (unknown and ignored) files
6611 unless explicitly requested with -u/--unknown or -i/--ignored.
6611 unless explicitly requested with -u/--unknown or -i/--ignored.
6612
6612
6613 .. note::
6613 .. note::
6614
6614
6615 :hg:`status` may appear to disagree with diff if permissions have
6615 :hg:`status` may appear to disagree with diff if permissions have
6616 changed or a merge has occurred. The standard diff format does
6616 changed or a merge has occurred. The standard diff format does
6617 not report permission changes and diff only reports changes
6617 not report permission changes and diff only reports changes
6618 relative to one merge parent.
6618 relative to one merge parent.
6619
6619
6620 If one revision is given, it is used as the base revision.
6620 If one revision is given, it is used as the base revision.
6621 If two revisions are given, the differences between them are
6621 If two revisions are given, the differences between them are
6622 shown. The --change option can also be used as a shortcut to list
6622 shown. The --change option can also be used as a shortcut to list
6623 the changed files of a revision from its first parent.
6623 the changed files of a revision from its first parent.
6624
6624
6625 The codes used to show the status of files are::
6625 The codes used to show the status of files are::
6626
6626
6627 M = modified
6627 M = modified
6628 A = added
6628 A = added
6629 R = removed
6629 R = removed
6630 C = clean
6630 C = clean
6631 ! = missing (deleted by non-hg command, but still tracked)
6631 ! = missing (deleted by non-hg command, but still tracked)
6632 ? = not tracked
6632 ? = not tracked
6633 I = ignored
6633 I = ignored
6634 = origin of the previous file (with --copies)
6634 = origin of the previous file (with --copies)
6635
6635
6636 .. container:: verbose
6636 .. container:: verbose
6637
6637
6638 Examples:
6638 Examples:
6639
6639
6640 - show changes in the working directory relative to a
6640 - show changes in the working directory relative to a
6641 changeset::
6641 changeset::
6642
6642
6643 hg status --rev 9353
6643 hg status --rev 9353
6644
6644
6645 - show changes in the working directory relative to the
6645 - show changes in the working directory relative to the
6646 current directory (see :hg:`help patterns` for more information)::
6646 current directory (see :hg:`help patterns` for more information)::
6647
6647
6648 hg status re:
6648 hg status re:
6649
6649
6650 - show all changes including copies in an existing changeset::
6650 - show all changes including copies in an existing changeset::
6651
6651
6652 hg status --copies --change 9353
6652 hg status --copies --change 9353
6653
6653
6654 - get a NUL separated list of added files, suitable for xargs::
6654 - get a NUL separated list of added files, suitable for xargs::
6655
6655
6656 hg status -an0
6656 hg status -an0
6657
6657
6658 Returns 0 on success.
6658 Returns 0 on success.
6659 """
6659 """
6660
6660
6661 revs = opts.get('rev')
6661 revs = opts.get('rev')
6662 change = opts.get('change')
6662 change = opts.get('change')
6663
6663
6664 if revs and change:
6664 if revs and change:
6665 msg = _('cannot specify --rev and --change at the same time')
6665 msg = _('cannot specify --rev and --change at the same time')
6666 raise error.Abort(msg)
6666 raise error.Abort(msg)
6667 elif change:
6667 elif change:
6668 node2 = scmutil.revsingle(repo, change, None).node()
6668 node2 = scmutil.revsingle(repo, change, None).node()
6669 node1 = repo[node2].p1().node()
6669 node1 = repo[node2].p1().node()
6670 else:
6670 else:
6671 node1, node2 = scmutil.revpair(repo, revs)
6671 node1, node2 = scmutil.revpair(repo, revs)
6672
6672
6673 if pats:
6673 if pats:
6674 cwd = repo.getcwd()
6674 cwd = repo.getcwd()
6675 else:
6675 else:
6676 cwd = ''
6676 cwd = ''
6677
6677
6678 if opts.get('print0'):
6678 if opts.get('print0'):
6679 end = '\0'
6679 end = '\0'
6680 else:
6680 else:
6681 end = '\n'
6681 end = '\n'
6682 copy = {}
6682 copy = {}
6683 states = 'modified added removed deleted unknown ignored clean'.split()
6683 states = 'modified added removed deleted unknown ignored clean'.split()
6684 show = [k for k in states if opts.get(k)]
6684 show = [k for k in states if opts.get(k)]
6685 if opts.get('all'):
6685 if opts.get('all'):
6686 show += ui.quiet and (states[:4] + ['clean']) or states
6686 show += ui.quiet and (states[:4] + ['clean']) or states
6687 if not show:
6687 if not show:
6688 if ui.quiet:
6688 if ui.quiet:
6689 show = states[:4]
6689 show = states[:4]
6690 else:
6690 else:
6691 show = states[:5]
6691 show = states[:5]
6692
6692
6693 m = scmutil.match(repo[node2], pats, opts)
6693 m = scmutil.match(repo[node2], pats, opts)
6694 stat = repo.status(node1, node2, m,
6694 stat = repo.status(node1, node2, m,
6695 'ignored' in show, 'clean' in show, 'unknown' in show,
6695 'ignored' in show, 'clean' in show, 'unknown' in show,
6696 opts.get('subrepos'))
6696 opts.get('subrepos'))
6697 changestates = zip(states, 'MAR!?IC', stat)
6697 changestates = zip(states, 'MAR!?IC', stat)
6698
6698
6699 if (opts.get('all') or opts.get('copies')
6699 if (opts.get('all') or opts.get('copies')
6700 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6700 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6701 copy = copies.pathcopies(repo[node1], repo[node2], m)
6701 copy = copies.pathcopies(repo[node1], repo[node2], m)
6702
6702
6703 fm = ui.formatter('status', opts)
6703 fm = ui.formatter('status', opts)
6704 fmt = '%s' + end
6704 fmt = '%s' + end
6705 showchar = not opts.get('no_status')
6705 showchar = not opts.get('no_status')
6706
6706
6707 for state, char, files in changestates:
6707 for state, char, files in changestates:
6708 if state in show:
6708 if state in show:
6709 label = 'status.' + state
6709 label = 'status.' + state
6710 for f in files:
6710 for f in files:
6711 fm.startitem()
6711 fm.startitem()
6712 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6712 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6713 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6713 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6714 if f in copy:
6714 if f in copy:
6715 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6715 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6716 label='status.copied')
6716 label='status.copied')
6717 fm.end()
6717 fm.end()
6718
6718
6719 @command('^summary|sum',
6719 @command('^summary|sum',
6720 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6720 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6721 def summary(ui, repo, **opts):
6721 def summary(ui, repo, **opts):
6722 """summarize working directory state
6722 """summarize working directory state
6723
6723
6724 This generates a brief summary of the working directory state,
6724 This generates a brief summary of the working directory state,
6725 including parents, branch, commit status, phase and available updates.
6725 including parents, branch, commit status, phase and available updates.
6726
6726
6727 With the --remote option, this will check the default paths for
6727 With the --remote option, this will check the default paths for
6728 incoming and outgoing changes. This can be time-consuming.
6728 incoming and outgoing changes. This can be time-consuming.
6729
6729
6730 Returns 0 on success.
6730 Returns 0 on success.
6731 """
6731 """
6732
6732
6733 ctx = repo[None]
6733 ctx = repo[None]
6734 parents = ctx.parents()
6734 parents = ctx.parents()
6735 pnode = parents[0].node()
6735 pnode = parents[0].node()
6736 marks = []
6736 marks = []
6737
6737
6738 ms = None
6738 ms = None
6739 try:
6739 try:
6740 ms = mergemod.mergestate.read(repo)
6740 ms = mergemod.mergestate.read(repo)
6741 except error.UnsupportedMergeRecords as e:
6741 except error.UnsupportedMergeRecords as e:
6742 s = ' '.join(e.recordtypes)
6742 s = ' '.join(e.recordtypes)
6743 ui.warn(
6743 ui.warn(
6744 _('warning: merge state has unsupported record types: %s\n') % s)
6744 _('warning: merge state has unsupported record types: %s\n') % s)
6745 unresolved = 0
6745 unresolved = 0
6746 else:
6746 else:
6747 unresolved = [f for f in ms if ms[f] == 'u']
6747 unresolved = [f for f in ms if ms[f] == 'u']
6748
6748
6749 for p in parents:
6749 for p in parents:
6750 # label with log.changeset (instead of log.parent) since this
6750 # label with log.changeset (instead of log.parent) since this
6751 # shows a working directory parent *changeset*:
6751 # shows a working directory parent *changeset*:
6752 # i18n: column positioning for "hg summary"
6752 # i18n: column positioning for "hg summary"
6753 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6753 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6754 label='log.changeset changeset.%s' % p.phasestr())
6754 label='log.changeset changeset.%s' % p.phasestr())
6755 ui.write(' '.join(p.tags()), label='log.tag')
6755 ui.write(' '.join(p.tags()), label='log.tag')
6756 if p.bookmarks():
6756 if p.bookmarks():
6757 marks.extend(p.bookmarks())
6757 marks.extend(p.bookmarks())
6758 if p.rev() == -1:
6758 if p.rev() == -1:
6759 if not len(repo):
6759 if not len(repo):
6760 ui.write(_(' (empty repository)'))
6760 ui.write(_(' (empty repository)'))
6761 else:
6761 else:
6762 ui.write(_(' (no revision checked out)'))
6762 ui.write(_(' (no revision checked out)'))
6763 ui.write('\n')
6763 ui.write('\n')
6764 if p.description():
6764 if p.description():
6765 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6765 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6766 label='log.summary')
6766 label='log.summary')
6767
6767
6768 branch = ctx.branch()
6768 branch = ctx.branch()
6769 bheads = repo.branchheads(branch)
6769 bheads = repo.branchheads(branch)
6770 # i18n: column positioning for "hg summary"
6770 # i18n: column positioning for "hg summary"
6771 m = _('branch: %s\n') % branch
6771 m = _('branch: %s\n') % branch
6772 if branch != 'default':
6772 if branch != 'default':
6773 ui.write(m, label='log.branch')
6773 ui.write(m, label='log.branch')
6774 else:
6774 else:
6775 ui.status(m, label='log.branch')
6775 ui.status(m, label='log.branch')
6776
6776
6777 if marks:
6777 if marks:
6778 active = repo._activebookmark
6778 active = repo._activebookmark
6779 # i18n: column positioning for "hg summary"
6779 # i18n: column positioning for "hg summary"
6780 ui.write(_('bookmarks:'), label='log.bookmark')
6780 ui.write(_('bookmarks:'), label='log.bookmark')
6781 if active is not None:
6781 if active is not None:
6782 if active in marks:
6782 if active in marks:
6783 ui.write(' *' + active, label=activebookmarklabel)
6783 ui.write(' *' + active, label=activebookmarklabel)
6784 marks.remove(active)
6784 marks.remove(active)
6785 else:
6785 else:
6786 ui.write(' [%s]' % active, label=activebookmarklabel)
6786 ui.write(' [%s]' % active, label=activebookmarklabel)
6787 for m in marks:
6787 for m in marks:
6788 ui.write(' ' + m, label='log.bookmark')
6788 ui.write(' ' + m, label='log.bookmark')
6789 ui.write('\n', label='log.bookmark')
6789 ui.write('\n', label='log.bookmark')
6790
6790
6791 status = repo.status(unknown=True)
6791 status = repo.status(unknown=True)
6792
6792
6793 c = repo.dirstate.copies()
6793 c = repo.dirstate.copies()
6794 copied, renamed = [], []
6794 copied, renamed = [], []
6795 for d, s in c.iteritems():
6795 for d, s in c.iteritems():
6796 if s in status.removed:
6796 if s in status.removed:
6797 status.removed.remove(s)
6797 status.removed.remove(s)
6798 renamed.append(d)
6798 renamed.append(d)
6799 else:
6799 else:
6800 copied.append(d)
6800 copied.append(d)
6801 if d in status.added:
6801 if d in status.added:
6802 status.added.remove(d)
6802 status.added.remove(d)
6803
6803
6804 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6804 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6805
6805
6806 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6806 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6807 (ui.label(_('%d added'), 'status.added'), status.added),
6807 (ui.label(_('%d added'), 'status.added'), status.added),
6808 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6808 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6809 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6809 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6810 (ui.label(_('%d copied'), 'status.copied'), copied),
6810 (ui.label(_('%d copied'), 'status.copied'), copied),
6811 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6811 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6812 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6812 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6813 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6813 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6814 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6814 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6815 t = []
6815 t = []
6816 for l, s in labels:
6816 for l, s in labels:
6817 if s:
6817 if s:
6818 t.append(l % len(s))
6818 t.append(l % len(s))
6819
6819
6820 t = ', '.join(t)
6820 t = ', '.join(t)
6821 cleanworkdir = False
6821 cleanworkdir = False
6822
6822
6823 if repo.vfs.exists('graftstate'):
6823 if repo.vfs.exists('graftstate'):
6824 t += _(' (graft in progress)')
6824 t += _(' (graft in progress)')
6825 if repo.vfs.exists('updatestate'):
6825 if repo.vfs.exists('updatestate'):
6826 t += _(' (interrupted update)')
6826 t += _(' (interrupted update)')
6827 elif len(parents) > 1:
6827 elif len(parents) > 1:
6828 t += _(' (merge)')
6828 t += _(' (merge)')
6829 elif branch != parents[0].branch():
6829 elif branch != parents[0].branch():
6830 t += _(' (new branch)')
6830 t += _(' (new branch)')
6831 elif (parents[0].closesbranch() and
6831 elif (parents[0].closesbranch() and
6832 pnode in repo.branchheads(branch, closed=True)):
6832 pnode in repo.branchheads(branch, closed=True)):
6833 t += _(' (head closed)')
6833 t += _(' (head closed)')
6834 elif not (status.modified or status.added or status.removed or renamed or
6834 elif not (status.modified or status.added or status.removed or renamed or
6835 copied or subs):
6835 copied or subs):
6836 t += _(' (clean)')
6836 t += _(' (clean)')
6837 cleanworkdir = True
6837 cleanworkdir = True
6838 elif pnode not in bheads:
6838 elif pnode not in bheads:
6839 t += _(' (new branch head)')
6839 t += _(' (new branch head)')
6840
6840
6841 if parents:
6841 if parents:
6842 pendingphase = max(p.phase() for p in parents)
6842 pendingphase = max(p.phase() for p in parents)
6843 else:
6843 else:
6844 pendingphase = phases.public
6844 pendingphase = phases.public
6845
6845
6846 if pendingphase > phases.newcommitphase(ui):
6846 if pendingphase > phases.newcommitphase(ui):
6847 t += ' (%s)' % phases.phasenames[pendingphase]
6847 t += ' (%s)' % phases.phasenames[pendingphase]
6848
6848
6849 if cleanworkdir:
6849 if cleanworkdir:
6850 # i18n: column positioning for "hg summary"
6850 # i18n: column positioning for "hg summary"
6851 ui.status(_('commit: %s\n') % t.strip())
6851 ui.status(_('commit: %s\n') % t.strip())
6852 else:
6852 else:
6853 # i18n: column positioning for "hg summary"
6853 # i18n: column positioning for "hg summary"
6854 ui.write(_('commit: %s\n') % t.strip())
6854 ui.write(_('commit: %s\n') % t.strip())
6855
6855
6856 # all ancestors of branch heads - all ancestors of parent = new csets
6856 # all ancestors of branch heads - all ancestors of parent = new csets
6857 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6857 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6858 bheads))
6858 bheads))
6859
6859
6860 if new == 0:
6860 if new == 0:
6861 # i18n: column positioning for "hg summary"
6861 # i18n: column positioning for "hg summary"
6862 ui.status(_('update: (current)\n'))
6862 ui.status(_('update: (current)\n'))
6863 elif pnode not in bheads:
6863 elif pnode not in bheads:
6864 # i18n: column positioning for "hg summary"
6864 # i18n: column positioning for "hg summary"
6865 ui.write(_('update: %d new changesets (update)\n') % new)
6865 ui.write(_('update: %d new changesets (update)\n') % new)
6866 else:
6866 else:
6867 # i18n: column positioning for "hg summary"
6867 # i18n: column positioning for "hg summary"
6868 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6868 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6869 (new, len(bheads)))
6869 (new, len(bheads)))
6870
6870
6871 t = []
6871 t = []
6872 draft = len(repo.revs('draft()'))
6872 draft = len(repo.revs('draft()'))
6873 if draft:
6873 if draft:
6874 t.append(_('%d draft') % draft)
6874 t.append(_('%d draft') % draft)
6875 secret = len(repo.revs('secret()'))
6875 secret = len(repo.revs('secret()'))
6876 if secret:
6876 if secret:
6877 t.append(_('%d secret') % secret)
6877 t.append(_('%d secret') % secret)
6878
6878
6879 if draft or secret:
6879 if draft or secret:
6880 ui.status(_('phases: %s\n') % ', '.join(t))
6880 ui.status(_('phases: %s\n') % ', '.join(t))
6881
6881
6882 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6882 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6883 for trouble in ("unstable", "divergent", "bumped"):
6883 for trouble in ("unstable", "divergent", "bumped"):
6884 numtrouble = len(repo.revs(trouble + "()"))
6884 numtrouble = len(repo.revs(trouble + "()"))
6885 # We write all the possibilities to ease translation
6885 # We write all the possibilities to ease translation
6886 troublemsg = {
6886 troublemsg = {
6887 "unstable": _("unstable: %d changesets"),
6887 "unstable": _("unstable: %d changesets"),
6888 "divergent": _("divergent: %d changesets"),
6888 "divergent": _("divergent: %d changesets"),
6889 "bumped": _("bumped: %d changesets"),
6889 "bumped": _("bumped: %d changesets"),
6890 }
6890 }
6891 if numtrouble > 0:
6891 if numtrouble > 0:
6892 ui.status(troublemsg[trouble] % numtrouble + "\n")
6892 ui.status(troublemsg[trouble] % numtrouble + "\n")
6893
6893
6894 cmdutil.summaryhooks(ui, repo)
6894 cmdutil.summaryhooks(ui, repo)
6895
6895
6896 if opts.get('remote'):
6896 if opts.get('remote'):
6897 needsincoming, needsoutgoing = True, True
6897 needsincoming, needsoutgoing = True, True
6898 else:
6898 else:
6899 needsincoming, needsoutgoing = False, False
6899 needsincoming, needsoutgoing = False, False
6900 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6900 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6901 if i:
6901 if i:
6902 needsincoming = True
6902 needsincoming = True
6903 if o:
6903 if o:
6904 needsoutgoing = True
6904 needsoutgoing = True
6905 if not needsincoming and not needsoutgoing:
6905 if not needsincoming and not needsoutgoing:
6906 return
6906 return
6907
6907
6908 def getincoming():
6908 def getincoming():
6909 source, branches = hg.parseurl(ui.expandpath('default'))
6909 source, branches = hg.parseurl(ui.expandpath('default'))
6910 sbranch = branches[0]
6910 sbranch = branches[0]
6911 try:
6911 try:
6912 other = hg.peer(repo, {}, source)
6912 other = hg.peer(repo, {}, source)
6913 except error.RepoError:
6913 except error.RepoError:
6914 if opts.get('remote'):
6914 if opts.get('remote'):
6915 raise
6915 raise
6916 return source, sbranch, None, None, None
6916 return source, sbranch, None, None, None
6917 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6917 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6918 if revs:
6918 if revs:
6919 revs = [other.lookup(rev) for rev in revs]
6919 revs = [other.lookup(rev) for rev in revs]
6920 ui.debug('comparing with %s\n' % util.hidepassword(source))
6920 ui.debug('comparing with %s\n' % util.hidepassword(source))
6921 repo.ui.pushbuffer()
6921 repo.ui.pushbuffer()
6922 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6922 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6923 repo.ui.popbuffer()
6923 repo.ui.popbuffer()
6924 return source, sbranch, other, commoninc, commoninc[1]
6924 return source, sbranch, other, commoninc, commoninc[1]
6925
6925
6926 if needsincoming:
6926 if needsincoming:
6927 source, sbranch, sother, commoninc, incoming = getincoming()
6927 source, sbranch, sother, commoninc, incoming = getincoming()
6928 else:
6928 else:
6929 source = sbranch = sother = commoninc = incoming = None
6929 source = sbranch = sother = commoninc = incoming = None
6930
6930
6931 def getoutgoing():
6931 def getoutgoing():
6932 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6932 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6933 dbranch = branches[0]
6933 dbranch = branches[0]
6934 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6934 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6935 if source != dest:
6935 if source != dest:
6936 try:
6936 try:
6937 dother = hg.peer(repo, {}, dest)
6937 dother = hg.peer(repo, {}, dest)
6938 except error.RepoError:
6938 except error.RepoError:
6939 if opts.get('remote'):
6939 if opts.get('remote'):
6940 raise
6940 raise
6941 return dest, dbranch, None, None
6941 return dest, dbranch, None, None
6942 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6942 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6943 elif sother is None:
6943 elif sother is None:
6944 # there is no explicit destination peer, but source one is invalid
6944 # there is no explicit destination peer, but source one is invalid
6945 return dest, dbranch, None, None
6945 return dest, dbranch, None, None
6946 else:
6946 else:
6947 dother = sother
6947 dother = sother
6948 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6948 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6949 common = None
6949 common = None
6950 else:
6950 else:
6951 common = commoninc
6951 common = commoninc
6952 if revs:
6952 if revs:
6953 revs = [repo.lookup(rev) for rev in revs]
6953 revs = [repo.lookup(rev) for rev in revs]
6954 repo.ui.pushbuffer()
6954 repo.ui.pushbuffer()
6955 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6955 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6956 commoninc=common)
6956 commoninc=common)
6957 repo.ui.popbuffer()
6957 repo.ui.popbuffer()
6958 return dest, dbranch, dother, outgoing
6958 return dest, dbranch, dother, outgoing
6959
6959
6960 if needsoutgoing:
6960 if needsoutgoing:
6961 dest, dbranch, dother, outgoing = getoutgoing()
6961 dest, dbranch, dother, outgoing = getoutgoing()
6962 else:
6962 else:
6963 dest = dbranch = dother = outgoing = None
6963 dest = dbranch = dother = outgoing = None
6964
6964
6965 if opts.get('remote'):
6965 if opts.get('remote'):
6966 t = []
6966 t = []
6967 if incoming:
6967 if incoming:
6968 t.append(_('1 or more incoming'))
6968 t.append(_('1 or more incoming'))
6969 o = outgoing.missing
6969 o = outgoing.missing
6970 if o:
6970 if o:
6971 t.append(_('%d outgoing') % len(o))
6971 t.append(_('%d outgoing') % len(o))
6972 other = dother or sother
6972 other = dother or sother
6973 if 'bookmarks' in other.listkeys('namespaces'):
6973 if 'bookmarks' in other.listkeys('namespaces'):
6974 counts = bookmarks.summary(repo, other)
6974 counts = bookmarks.summary(repo, other)
6975 if counts[0] > 0:
6975 if counts[0] > 0:
6976 t.append(_('%d incoming bookmarks') % counts[0])
6976 t.append(_('%d incoming bookmarks') % counts[0])
6977 if counts[1] > 0:
6977 if counts[1] > 0:
6978 t.append(_('%d outgoing bookmarks') % counts[1])
6978 t.append(_('%d outgoing bookmarks') % counts[1])
6979
6979
6980 if t:
6980 if t:
6981 # i18n: column positioning for "hg summary"
6981 # i18n: column positioning for "hg summary"
6982 ui.write(_('remote: %s\n') % (', '.join(t)))
6982 ui.write(_('remote: %s\n') % (', '.join(t)))
6983 else:
6983 else:
6984 # i18n: column positioning for "hg summary"
6984 # i18n: column positioning for "hg summary"
6985 ui.status(_('remote: (synced)\n'))
6985 ui.status(_('remote: (synced)\n'))
6986
6986
6987 cmdutil.summaryremotehooks(ui, repo, opts,
6987 cmdutil.summaryremotehooks(ui, repo, opts,
6988 ((source, sbranch, sother, commoninc),
6988 ((source, sbranch, sother, commoninc),
6989 (dest, dbranch, dother, outgoing)))
6989 (dest, dbranch, dother, outgoing)))
6990
6990
6991 @command('tag',
6991 @command('tag',
6992 [('f', 'force', None, _('force tag')),
6992 [('f', 'force', None, _('force tag')),
6993 ('l', 'local', None, _('make the tag local')),
6993 ('l', 'local', None, _('make the tag local')),
6994 ('r', 'rev', '', _('revision to tag'), _('REV')),
6994 ('r', 'rev', '', _('revision to tag'), _('REV')),
6995 ('', 'remove', None, _('remove a tag')),
6995 ('', 'remove', None, _('remove a tag')),
6996 # -l/--local is already there, commitopts cannot be used
6996 # -l/--local is already there, commitopts cannot be used
6997 ('e', 'edit', None, _('invoke editor on commit messages')),
6997 ('e', 'edit', None, _('invoke editor on commit messages')),
6998 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6998 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6999 ] + commitopts2,
6999 ] + commitopts2,
7000 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
7000 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
7001 def tag(ui, repo, name1, *names, **opts):
7001 def tag(ui, repo, name1, *names, **opts):
7002 """add one or more tags for the current or given revision
7002 """add one or more tags for the current or given revision
7003
7003
7004 Name a particular revision using <name>.
7004 Name a particular revision using <name>.
7005
7005
7006 Tags are used to name particular revisions of the repository and are
7006 Tags are used to name particular revisions of the repository and are
7007 very useful to compare different revisions, to go back to significant
7007 very useful to compare different revisions, to go back to significant
7008 earlier versions or to mark branch points as releases, etc. Changing
7008 earlier versions or to mark branch points as releases, etc. Changing
7009 an existing tag is normally disallowed; use -f/--force to override.
7009 an existing tag is normally disallowed; use -f/--force to override.
7010
7010
7011 If no revision is given, the parent of the working directory is
7011 If no revision is given, the parent of the working directory is
7012 used.
7012 used.
7013
7013
7014 To facilitate version control, distribution, and merging of tags,
7014 To facilitate version control, distribution, and merging of tags,
7015 they are stored as a file named ".hgtags" which is managed similarly
7015 they are stored as a file named ".hgtags" which is managed similarly
7016 to other project files and can be hand-edited if necessary. This
7016 to other project files and can be hand-edited if necessary. This
7017 also means that tagging creates a new commit. The file
7017 also means that tagging creates a new commit. The file
7018 ".hg/localtags" is used for local tags (not shared among
7018 ".hg/localtags" is used for local tags (not shared among
7019 repositories).
7019 repositories).
7020
7020
7021 Tag commits are usually made at the head of a branch. If the parent
7021 Tag commits are usually made at the head of a branch. If the parent
7022 of the working directory is not a branch head, :hg:`tag` aborts; use
7022 of the working directory is not a branch head, :hg:`tag` aborts; use
7023 -f/--force to force the tag commit to be based on a non-head
7023 -f/--force to force the tag commit to be based on a non-head
7024 changeset.
7024 changeset.
7025
7025
7026 See :hg:`help dates` for a list of formats valid for -d/--date.
7026 See :hg:`help dates` for a list of formats valid for -d/--date.
7027
7027
7028 Since tag names have priority over branch names during revision
7028 Since tag names have priority over branch names during revision
7029 lookup, using an existing branch name as a tag name is discouraged.
7029 lookup, using an existing branch name as a tag name is discouraged.
7030
7030
7031 Returns 0 on success.
7031 Returns 0 on success.
7032 """
7032 """
7033 wlock = lock = None
7033 wlock = lock = None
7034 try:
7034 try:
7035 wlock = repo.wlock()
7035 wlock = repo.wlock()
7036 lock = repo.lock()
7036 lock = repo.lock()
7037 rev_ = "."
7037 rev_ = "."
7038 names = [t.strip() for t in (name1,) + names]
7038 names = [t.strip() for t in (name1,) + names]
7039 if len(names) != len(set(names)):
7039 if len(names) != len(set(names)):
7040 raise error.Abort(_('tag names must be unique'))
7040 raise error.Abort(_('tag names must be unique'))
7041 for n in names:
7041 for n in names:
7042 scmutil.checknewlabel(repo, n, 'tag')
7042 scmutil.checknewlabel(repo, n, 'tag')
7043 if not n:
7043 if not n:
7044 raise error.Abort(_('tag names cannot consist entirely of '
7044 raise error.Abort(_('tag names cannot consist entirely of '
7045 'whitespace'))
7045 'whitespace'))
7046 if opts.get('rev') and opts.get('remove'):
7046 if opts.get('rev') and opts.get('remove'):
7047 raise error.Abort(_("--rev and --remove are incompatible"))
7047 raise error.Abort(_("--rev and --remove are incompatible"))
7048 if opts.get('rev'):
7048 if opts.get('rev'):
7049 rev_ = opts['rev']
7049 rev_ = opts['rev']
7050 message = opts.get('message')
7050 message = opts.get('message')
7051 if opts.get('remove'):
7051 if opts.get('remove'):
7052 if opts.get('local'):
7052 if opts.get('local'):
7053 expectedtype = 'local'
7053 expectedtype = 'local'
7054 else:
7054 else:
7055 expectedtype = 'global'
7055 expectedtype = 'global'
7056
7056
7057 for n in names:
7057 for n in names:
7058 if not repo.tagtype(n):
7058 if not repo.tagtype(n):
7059 raise error.Abort(_("tag '%s' does not exist") % n)
7059 raise error.Abort(_("tag '%s' does not exist") % n)
7060 if repo.tagtype(n) != expectedtype:
7060 if repo.tagtype(n) != expectedtype:
7061 if expectedtype == 'global':
7061 if expectedtype == 'global':
7062 raise error.Abort(_("tag '%s' is not a global tag") % n)
7062 raise error.Abort(_("tag '%s' is not a global tag") % n)
7063 else:
7063 else:
7064 raise error.Abort(_("tag '%s' is not a local tag") % n)
7064 raise error.Abort(_("tag '%s' is not a local tag") % n)
7065 rev_ = 'null'
7065 rev_ = 'null'
7066 if not message:
7066 if not message:
7067 # we don't translate commit messages
7067 # we don't translate commit messages
7068 message = 'Removed tag %s' % ', '.join(names)
7068 message = 'Removed tag %s' % ', '.join(names)
7069 elif not opts.get('force'):
7069 elif not opts.get('force'):
7070 for n in names:
7070 for n in names:
7071 if n in repo.tags():
7071 if n in repo.tags():
7072 raise error.Abort(_("tag '%s' already exists "
7072 raise error.Abort(_("tag '%s' already exists "
7073 "(use -f to force)") % n)
7073 "(use -f to force)") % n)
7074 if not opts.get('local'):
7074 if not opts.get('local'):
7075 p1, p2 = repo.dirstate.parents()
7075 p1, p2 = repo.dirstate.parents()
7076 if p2 != nullid:
7076 if p2 != nullid:
7077 raise error.Abort(_('uncommitted merge'))
7077 raise error.Abort(_('uncommitted merge'))
7078 bheads = repo.branchheads()
7078 bheads = repo.branchheads()
7079 if not opts.get('force') and bheads and p1 not in bheads:
7079 if not opts.get('force') and bheads and p1 not in bheads:
7080 raise error.Abort(_('not at a branch head (use -f to force)'))
7080 raise error.Abort(_('not at a branch head (use -f to force)'))
7081 r = scmutil.revsingle(repo, rev_).node()
7081 r = scmutil.revsingle(repo, rev_).node()
7082
7082
7083 if not message:
7083 if not message:
7084 # we don't translate commit messages
7084 # we don't translate commit messages
7085 message = ('Added tag %s for changeset %s' %
7085 message = ('Added tag %s for changeset %s' %
7086 (', '.join(names), short(r)))
7086 (', '.join(names), short(r)))
7087
7087
7088 date = opts.get('date')
7088 date = opts.get('date')
7089 if date:
7089 if date:
7090 date = util.parsedate(date)
7090 date = util.parsedate(date)
7091
7091
7092 if opts.get('remove'):
7092 if opts.get('remove'):
7093 editform = 'tag.remove'
7093 editform = 'tag.remove'
7094 else:
7094 else:
7095 editform = 'tag.add'
7095 editform = 'tag.add'
7096 editor = cmdutil.getcommiteditor(editform=editform, **opts)
7096 editor = cmdutil.getcommiteditor(editform=editform, **opts)
7097
7097
7098 # don't allow tagging the null rev
7098 # don't allow tagging the null rev
7099 if (not opts.get('remove') and
7099 if (not opts.get('remove') and
7100 scmutil.revsingle(repo, rev_).rev() == nullrev):
7100 scmutil.revsingle(repo, rev_).rev() == nullrev):
7101 raise error.Abort(_("cannot tag null revision"))
7101 raise error.Abort(_("cannot tag null revision"))
7102
7102
7103 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
7103 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
7104 editor=editor)
7104 editor=editor)
7105 finally:
7105 finally:
7106 release(lock, wlock)
7106 release(lock, wlock)
7107
7107
7108 @command('tags', formatteropts, '')
7108 @command('tags', formatteropts, '')
7109 def tags(ui, repo, **opts):
7109 def tags(ui, repo, **opts):
7110 """list repository tags
7110 """list repository tags
7111
7111
7112 This lists both regular and local tags. When the -v/--verbose
7112 This lists both regular and local tags. When the -v/--verbose
7113 switch is used, a third column "local" is printed for local tags.
7113 switch is used, a third column "local" is printed for local tags.
7114 When the -q/--quiet switch is used, only the tag name is printed.
7114 When the -q/--quiet switch is used, only the tag name is printed.
7115
7115
7116 Returns 0 on success.
7116 Returns 0 on success.
7117 """
7117 """
7118
7118
7119 fm = ui.formatter('tags', opts)
7119 fm = ui.formatter('tags', opts)
7120 hexfunc = fm.hexfunc
7120 hexfunc = fm.hexfunc
7121 tagtype = ""
7121 tagtype = ""
7122
7122
7123 for t, n in reversed(repo.tagslist()):
7123 for t, n in reversed(repo.tagslist()):
7124 hn = hexfunc(n)
7124 hn = hexfunc(n)
7125 label = 'tags.normal'
7125 label = 'tags.normal'
7126 tagtype = ''
7126 tagtype = ''
7127 if repo.tagtype(t) == 'local':
7127 if repo.tagtype(t) == 'local':
7128 label = 'tags.local'
7128 label = 'tags.local'
7129 tagtype = 'local'
7129 tagtype = 'local'
7130
7130
7131 fm.startitem()
7131 fm.startitem()
7132 fm.write('tag', '%s', t, label=label)
7132 fm.write('tag', '%s', t, label=label)
7133 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
7133 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
7134 fm.condwrite(not ui.quiet, 'rev node', fmt,
7134 fm.condwrite(not ui.quiet, 'rev node', fmt,
7135 repo.changelog.rev(n), hn, label=label)
7135 repo.changelog.rev(n), hn, label=label)
7136 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
7136 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
7137 tagtype, label=label)
7137 tagtype, label=label)
7138 fm.plain('\n')
7138 fm.plain('\n')
7139 fm.end()
7139 fm.end()
7140
7140
7141 @command('tip',
7141 @command('tip',
7142 [('p', 'patch', None, _('show patch')),
7142 [('p', 'patch', None, _('show patch')),
7143 ('g', 'git', None, _('use git extended diff format')),
7143 ('g', 'git', None, _('use git extended diff format')),
7144 ] + templateopts,
7144 ] + templateopts,
7145 _('[-p] [-g]'))
7145 _('[-p] [-g]'))
7146 def tip(ui, repo, **opts):
7146 def tip(ui, repo, **opts):
7147 """show the tip revision (DEPRECATED)
7147 """show the tip revision (DEPRECATED)
7148
7148
7149 The tip revision (usually just called the tip) is the changeset
7149 The tip revision (usually just called the tip) is the changeset
7150 most recently added to the repository (and therefore the most
7150 most recently added to the repository (and therefore the most
7151 recently changed head).
7151 recently changed head).
7152
7152
7153 If you have just made a commit, that commit will be the tip. If
7153 If you have just made a commit, that commit will be the tip. If
7154 you have just pulled changes from another repository, the tip of
7154 you have just pulled changes from another repository, the tip of
7155 that repository becomes the current tip. The "tip" tag is special
7155 that repository becomes the current tip. The "tip" tag is special
7156 and cannot be renamed or assigned to a different changeset.
7156 and cannot be renamed or assigned to a different changeset.
7157
7157
7158 This command is deprecated, please use :hg:`heads` instead.
7158 This command is deprecated, please use :hg:`heads` instead.
7159
7159
7160 Returns 0 on success.
7160 Returns 0 on success.
7161 """
7161 """
7162 displayer = cmdutil.show_changeset(ui, repo, opts)
7162 displayer = cmdutil.show_changeset(ui, repo, opts)
7163 displayer.show(repo['tip'])
7163 displayer.show(repo['tip'])
7164 displayer.close()
7164 displayer.close()
7165
7165
7166 @command('unbundle',
7166 @command('unbundle',
7167 [('u', 'update', None,
7167 [('u', 'update', None,
7168 _('update to new branch head if changesets were unbundled'))],
7168 _('update to new branch head if changesets were unbundled'))],
7169 _('[-u] FILE...'))
7169 _('[-u] FILE...'))
7170 def unbundle(ui, repo, fname1, *fnames, **opts):
7170 def unbundle(ui, repo, fname1, *fnames, **opts):
7171 """apply one or more changegroup files
7171 """apply one or more changegroup files
7172
7172
7173 Apply one or more compressed changegroup files generated by the
7173 Apply one or more compressed changegroup files generated by the
7174 bundle command.
7174 bundle command.
7175
7175
7176 Returns 0 on success, 1 if an update has unresolved files.
7176 Returns 0 on success, 1 if an update has unresolved files.
7177 """
7177 """
7178 fnames = (fname1,) + fnames
7178 fnames = (fname1,) + fnames
7179
7179
7180 with repo.lock():
7180 with repo.lock():
7181 for fname in fnames:
7181 for fname in fnames:
7182 f = hg.openpath(ui, fname)
7182 f = hg.openpath(ui, fname)
7183 gen = exchange.readbundle(ui, f, fname)
7183 gen = exchange.readbundle(ui, f, fname)
7184 if isinstance(gen, bundle2.unbundle20):
7184 if isinstance(gen, bundle2.unbundle20):
7185 tr = repo.transaction('unbundle')
7185 tr = repo.transaction('unbundle')
7186 try:
7186 try:
7187 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
7187 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
7188 url='bundle:' + fname)
7188 url='bundle:' + fname)
7189 tr.close()
7189 tr.close()
7190 except error.BundleUnknownFeatureError as exc:
7190 except error.BundleUnknownFeatureError as exc:
7191 raise error.Abort(_('%s: unknown bundle feature, %s')
7191 raise error.Abort(_('%s: unknown bundle feature, %s')
7192 % (fname, exc),
7192 % (fname, exc),
7193 hint=_("see https://mercurial-scm.org/"
7193 hint=_("see https://mercurial-scm.org/"
7194 "wiki/BundleFeature for more "
7194 "wiki/BundleFeature for more "
7195 "information"))
7195 "information"))
7196 finally:
7196 finally:
7197 if tr:
7197 if tr:
7198 tr.release()
7198 tr.release()
7199 changes = [r.get('return', 0)
7199 changes = [r.get('return', 0)
7200 for r in op.records['changegroup']]
7200 for r in op.records['changegroup']]
7201 modheads = changegroup.combineresults(changes)
7201 modheads = changegroup.combineresults(changes)
7202 elif isinstance(gen, streamclone.streamcloneapplier):
7202 elif isinstance(gen, streamclone.streamcloneapplier):
7203 raise error.Abort(
7203 raise error.Abort(
7204 _('packed bundles cannot be applied with '
7204 _('packed bundles cannot be applied with '
7205 '"hg unbundle"'),
7205 '"hg unbundle"'),
7206 hint=_('use "hg debugapplystreamclonebundle"'))
7206 hint=_('use "hg debugapplystreamclonebundle"'))
7207 else:
7207 else:
7208 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
7208 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
7209
7209
7210 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7210 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7211
7211
7212 @command('^update|up|checkout|co',
7212 @command('^update|up|checkout|co',
7213 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
7213 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
7214 ('c', 'check', None, _('require clean working directory')),
7214 ('c', 'check', None, _('require clean working directory')),
7215 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
7215 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
7216 ('r', 'rev', '', _('revision'), _('REV'))
7216 ('r', 'rev', '', _('revision'), _('REV'))
7217 ] + mergetoolopts,
7217 ] + mergetoolopts,
7218 _('[-c] [-C] [-d DATE] [[-r] REV]'))
7218 _('[-c] [-C] [-d DATE] [[-r] REV]'))
7219 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
7219 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
7220 tool=None):
7220 tool=None):
7221 """update working directory (or switch revisions)
7221 """update working directory (or switch revisions)
7222
7222
7223 Update the repository's working directory to the specified
7223 Update the repository's working directory to the specified
7224 changeset. If no changeset is specified, update to the tip of the
7224 changeset. If no changeset is specified, update to the tip of the
7225 current named branch and move the active bookmark (see :hg:`help
7225 current named branch and move the active bookmark (see :hg:`help
7226 bookmarks`).
7226 bookmarks`).
7227
7227
7228 Update sets the working directory's parent revision to the specified
7228 Update sets the working directory's parent revision to the specified
7229 changeset (see :hg:`help parents`).
7229 changeset (see :hg:`help parents`).
7230
7230
7231 If the changeset is not a descendant or ancestor of the working
7231 If the changeset is not a descendant or ancestor of the working
7232 directory's parent, the update is aborted. With the -c/--check
7232 directory's parent, the update is aborted. With the -c/--check
7233 option, the working directory is checked for uncommitted changes; if
7233 option, the working directory is checked for uncommitted changes; if
7234 none are found, the working directory is updated to the specified
7234 none are found, the working directory is updated to the specified
7235 changeset.
7235 changeset.
7236
7236
7237 .. container:: verbose
7237 .. container:: verbose
7238
7238
7239 The following rules apply when the working directory contains
7239 The following rules apply when the working directory contains
7240 uncommitted changes:
7240 uncommitted changes:
7241
7241
7242 1. If neither -c/--check nor -C/--clean is specified, and if
7242 1. If neither -c/--check nor -C/--clean is specified, and if
7243 the requested changeset is an ancestor or descendant of
7243 the requested changeset is an ancestor or descendant of
7244 the working directory's parent, the uncommitted changes
7244 the working directory's parent, the uncommitted changes
7245 are merged into the requested changeset and the merged
7245 are merged into the requested changeset and the merged
7246 result is left uncommitted. If the requested changeset is
7246 result is left uncommitted. If the requested changeset is
7247 not an ancestor or descendant (that is, it is on another
7247 not an ancestor or descendant (that is, it is on another
7248 branch), the update is aborted and the uncommitted changes
7248 branch), the update is aborted and the uncommitted changes
7249 are preserved.
7249 are preserved.
7250
7250
7251 2. With the -c/--check option, the update is aborted and the
7251 2. With the -c/--check option, the update is aborted and the
7252 uncommitted changes are preserved.
7252 uncommitted changes are preserved.
7253
7253
7254 3. With the -C/--clean option, uncommitted changes are discarded and
7254 3. With the -C/--clean option, uncommitted changes are discarded and
7255 the working directory is updated to the requested changeset.
7255 the working directory is updated to the requested changeset.
7256
7256
7257 To cancel an uncommitted merge (and lose your changes), use
7257 To cancel an uncommitted merge (and lose your changes), use
7258 :hg:`update --clean .`.
7258 :hg:`update --clean .`.
7259
7259
7260 Use null as the changeset to remove the working directory (like
7260 Use null as the changeset to remove the working directory (like
7261 :hg:`clone -U`).
7261 :hg:`clone -U`).
7262
7262
7263 If you want to revert just one file to an older revision, use
7263 If you want to revert just one file to an older revision, use
7264 :hg:`revert [-r REV] NAME`.
7264 :hg:`revert [-r REV] NAME`.
7265
7265
7266 See :hg:`help dates` for a list of formats valid for -d/--date.
7266 See :hg:`help dates` for a list of formats valid for -d/--date.
7267
7267
7268 Returns 0 on success, 1 if there are unresolved files.
7268 Returns 0 on success, 1 if there are unresolved files.
7269 """
7269 """
7270 if rev and node:
7270 if rev and node:
7271 raise error.Abort(_("please specify just one revision"))
7271 raise error.Abort(_("please specify just one revision"))
7272
7272
7273 if rev is None or rev == '':
7273 if rev is None or rev == '':
7274 rev = node
7274 rev = node
7275
7275
7276 if date and rev is not None:
7276 if date and rev is not None:
7277 raise error.Abort(_("you can't specify a revision and a date"))
7277 raise error.Abort(_("you can't specify a revision and a date"))
7278
7278
7279 if check and clean:
7279 if check and clean:
7280 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
7280 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
7281
7281
7282 with repo.wlock():
7282 with repo.wlock():
7283 cmdutil.clearunfinished(repo)
7283 cmdutil.clearunfinished(repo)
7284
7284
7285 if date:
7285 if date:
7286 rev = cmdutil.finddate(ui, repo, date)
7286 rev = cmdutil.finddate(ui, repo, date)
7287
7287
7288 # if we defined a bookmark, we have to remember the original name
7288 # if we defined a bookmark, we have to remember the original name
7289 brev = rev
7289 brev = rev
7290 rev = scmutil.revsingle(repo, rev, rev).rev()
7290 rev = scmutil.revsingle(repo, rev, rev).rev()
7291
7291
7292 if check:
7292 if check:
7293 cmdutil.bailifchanged(repo, merge=False)
7293 cmdutil.bailifchanged(repo, merge=False)
7294
7294
7295 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
7295 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
7296
7296
7297 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
7297 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
7298
7298
7299 @command('verify', [])
7299 @command('verify', [])
7300 def verify(ui, repo):
7300 def verify(ui, repo):
7301 """verify the integrity of the repository
7301 """verify the integrity of the repository
7302
7302
7303 Verify the integrity of the current repository.
7303 Verify the integrity of the current repository.
7304
7304
7305 This will perform an extensive check of the repository's
7305 This will perform an extensive check of the repository's
7306 integrity, validating the hashes and checksums of each entry in
7306 integrity, validating the hashes and checksums of each entry in
7307 the changelog, manifest, and tracked files, as well as the
7307 the changelog, manifest, and tracked files, as well as the
7308 integrity of their crosslinks and indices.
7308 integrity of their crosslinks and indices.
7309
7309
7310 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7310 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7311 for more information about recovery from corruption of the
7311 for more information about recovery from corruption of the
7312 repository.
7312 repository.
7313
7313
7314 Returns 0 on success, 1 if errors are encountered.
7314 Returns 0 on success, 1 if errors are encountered.
7315 """
7315 """
7316 return hg.verify(repo)
7316 return hg.verify(repo)
7317
7317
7318 @command('version', [] + formatteropts, norepo=True)
7318 @command('version', [] + formatteropts, norepo=True)
7319 def version_(ui, **opts):
7319 def version_(ui, **opts):
7320 """output version and copyright information"""
7320 """output version and copyright information"""
7321 fm = ui.formatter("version", opts)
7321 fm = ui.formatter("version", opts)
7322 fm.startitem()
7322 fm.startitem()
7323 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
7323 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
7324 util.version())
7324 util.version())
7325 license = _(
7325 license = _(
7326 "(see https://mercurial-scm.org for more information)\n"
7326 "(see https://mercurial-scm.org for more information)\n"
7327 "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
7327 "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
7328 "This is free software; see the source for copying conditions. "
7328 "This is free software; see the source for copying conditions. "
7329 "There is NO\nwarranty; "
7329 "There is NO\nwarranty; "
7330 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7330 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7331 )
7331 )
7332 if not ui.quiet:
7332 if not ui.quiet:
7333 fm.plain(license)
7333 fm.plain(license)
7334
7334
7335 if ui.verbose:
7335 if ui.verbose:
7336 fm.plain(_("\nEnabled extensions:\n\n"))
7336 fm.plain(_("\nEnabled extensions:\n\n"))
7337 # format names and versions into columns
7337 # format names and versions into columns
7338 names = []
7338 names = []
7339 vers = []
7339 vers = []
7340 isinternals = []
7340 isinternals = []
7341 for name, module in extensions.extensions():
7341 for name, module in extensions.extensions():
7342 names.append(name)
7342 names.append(name)
7343 vers.append(extensions.moduleversion(module) or None)
7343 vers.append(extensions.moduleversion(module) or None)
7344 isinternals.append(extensions.ismoduleinternal(module))
7344 isinternals.append(extensions.ismoduleinternal(module))
7345 fn = fm.nested("extensions")
7345 fn = fm.nested("extensions")
7346 if names:
7346 if names:
7347 namefmt = " %%-%ds " % max(len(n) for n in names)
7347 namefmt = " %%-%ds " % max(len(n) for n in names)
7348 places = [_("external"), _("internal")]
7348 places = [_("external"), _("internal")]
7349 for n, v, p in zip(names, vers, isinternals):
7349 for n, v, p in zip(names, vers, isinternals):
7350 fn.startitem()
7350 fn.startitem()
7351 fn.condwrite(ui.verbose, "name", namefmt, n)
7351 fn.condwrite(ui.verbose, "name", namefmt, n)
7352 if ui.verbose:
7352 if ui.verbose:
7353 fn.plain("%s " % places[p])
7353 fn.plain("%s " % places[p])
7354 fn.data(bundled=p)
7354 fn.data(bundled=p)
7355 fn.condwrite(ui.verbose and v, "ver", "%s", v)
7355 fn.condwrite(ui.verbose and v, "ver", "%s", v)
7356 if ui.verbose:
7356 if ui.verbose:
7357 fn.plain("\n")
7357 fn.plain("\n")
7358 fn.end()
7358 fn.end()
7359 fm.end()
7359 fm.end()
7360
7360
7361 def loadcmdtable(ui, name, cmdtable):
7361 def loadcmdtable(ui, name, cmdtable):
7362 """Load command functions from specified cmdtable
7362 """Load command functions from specified cmdtable
7363 """
7363 """
7364 overrides = [cmd for cmd in cmdtable if cmd in table]
7364 overrides = [cmd for cmd in cmdtable if cmd in table]
7365 if overrides:
7365 if overrides:
7366 ui.warn(_("extension '%s' overrides commands: %s\n")
7366 ui.warn(_("extension '%s' overrides commands: %s\n")
7367 % (name, " ".join(overrides)))
7367 % (name, " ".join(overrides)))
7368 table.update(cmdtable)
7368 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now