##// END OF EJS Templates
formatter: introduce isplain() to replace (the inverse of) __nonzero__() (API)...
Mathias De Maré -
r29949:e7cacb45 default
parent child Browse files
Show More
@@ -1,7384 +1,7384 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import difflib
10 import difflib
11 import errno
11 import errno
12 import operator
12 import operator
13 import os
13 import os
14 import random
14 import random
15 import re
15 import re
16 import shlex
16 import shlex
17 import socket
17 import socket
18 import sys
18 import sys
19 import tempfile
19 import tempfile
20 import time
20 import time
21
21
22 from .i18n import _
22 from .i18n import _
23 from .node import (
23 from .node import (
24 bin,
24 bin,
25 hex,
25 hex,
26 nullhex,
26 nullhex,
27 nullid,
27 nullid,
28 nullrev,
28 nullrev,
29 short,
29 short,
30 )
30 )
31 from . import (
31 from . import (
32 archival,
32 archival,
33 bookmarks,
33 bookmarks,
34 bundle2,
34 bundle2,
35 changegroup,
35 changegroup,
36 cmdutil,
36 cmdutil,
37 commandserver,
37 commandserver,
38 context,
38 context,
39 copies,
39 copies,
40 dagparser,
40 dagparser,
41 dagutil,
41 dagutil,
42 destutil,
42 destutil,
43 discovery,
43 discovery,
44 encoding,
44 encoding,
45 error,
45 error,
46 exchange,
46 exchange,
47 extensions,
47 extensions,
48 fileset,
48 fileset,
49 formatter,
49 formatter,
50 graphmod,
50 graphmod,
51 hbisect,
51 hbisect,
52 help,
52 help,
53 hg,
53 hg,
54 hgweb,
54 hgweb,
55 localrepo,
55 localrepo,
56 lock as lockmod,
56 lock as lockmod,
57 merge as mergemod,
57 merge as mergemod,
58 minirst,
58 minirst,
59 obsolete,
59 obsolete,
60 patch,
60 patch,
61 phases,
61 phases,
62 policy,
62 policy,
63 pvec,
63 pvec,
64 repair,
64 repair,
65 revlog,
65 revlog,
66 revset,
66 revset,
67 scmutil,
67 scmutil,
68 setdiscovery,
68 setdiscovery,
69 simplemerge,
69 simplemerge,
70 sshserver,
70 sshserver,
71 streamclone,
71 streamclone,
72 templatekw,
72 templatekw,
73 templater,
73 templater,
74 treediscovery,
74 treediscovery,
75 ui as uimod,
75 ui as uimod,
76 util,
76 util,
77 )
77 )
78
78
79 release = lockmod.release
79 release = lockmod.release
80
80
81 table = {}
81 table = {}
82
82
83 command = cmdutil.command(table)
83 command = cmdutil.command(table)
84
84
85 # label constants
85 # label constants
86 # until 3.5, bookmarks.current was the advertised name, not
86 # until 3.5, bookmarks.current was the advertised name, not
87 # bookmarks.active, so we must use both to avoid breaking old
87 # bookmarks.active, so we must use both to avoid breaking old
88 # custom styles
88 # custom styles
89 activebookmarklabel = 'bookmarks.active bookmarks.current'
89 activebookmarklabel = 'bookmarks.active bookmarks.current'
90
90
91 # common command options
91 # common command options
92
92
93 globalopts = [
93 globalopts = [
94 ('R', 'repository', '',
94 ('R', 'repository', '',
95 _('repository root directory or name of overlay bundle file'),
95 _('repository root directory or name of overlay bundle file'),
96 _('REPO')),
96 _('REPO')),
97 ('', 'cwd', '',
97 ('', 'cwd', '',
98 _('change working directory'), _('DIR')),
98 _('change working directory'), _('DIR')),
99 ('y', 'noninteractive', None,
99 ('y', 'noninteractive', None,
100 _('do not prompt, automatically pick the first choice for all prompts')),
100 _('do not prompt, automatically pick the first choice for all prompts')),
101 ('q', 'quiet', None, _('suppress output')),
101 ('q', 'quiet', None, _('suppress output')),
102 ('v', 'verbose', None, _('enable additional output')),
102 ('v', 'verbose', None, _('enable additional output')),
103 ('', 'config', [],
103 ('', 'config', [],
104 _('set/override config option (use \'section.name=value\')'),
104 _('set/override config option (use \'section.name=value\')'),
105 _('CONFIG')),
105 _('CONFIG')),
106 ('', 'debug', None, _('enable debugging output')),
106 ('', 'debug', None, _('enable debugging output')),
107 ('', 'debugger', None, _('start debugger')),
107 ('', 'debugger', None, _('start debugger')),
108 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
108 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
109 _('ENCODE')),
109 _('ENCODE')),
110 ('', 'encodingmode', encoding.encodingmode,
110 ('', 'encodingmode', encoding.encodingmode,
111 _('set the charset encoding mode'), _('MODE')),
111 _('set the charset encoding mode'), _('MODE')),
112 ('', 'traceback', None, _('always print a traceback on exception')),
112 ('', 'traceback', None, _('always print a traceback on exception')),
113 ('', 'time', None, _('time how long the command takes')),
113 ('', 'time', None, _('time how long the command takes')),
114 ('', 'profile', None, _('print command execution profile')),
114 ('', 'profile', None, _('print command execution profile')),
115 ('', 'version', None, _('output version information and exit')),
115 ('', 'version', None, _('output version information and exit')),
116 ('h', 'help', None, _('display help and exit')),
116 ('h', 'help', None, _('display help and exit')),
117 ('', 'hidden', False, _('consider hidden changesets')),
117 ('', 'hidden', False, _('consider hidden changesets')),
118 ]
118 ]
119
119
120 dryrunopts = [('n', 'dry-run', None,
120 dryrunopts = [('n', 'dry-run', None,
121 _('do not perform actions, just print output'))]
121 _('do not perform actions, just print output'))]
122
122
123 remoteopts = [
123 remoteopts = [
124 ('e', 'ssh', '',
124 ('e', 'ssh', '',
125 _('specify ssh command to use'), _('CMD')),
125 _('specify ssh command to use'), _('CMD')),
126 ('', 'remotecmd', '',
126 ('', 'remotecmd', '',
127 _('specify hg command to run on the remote side'), _('CMD')),
127 _('specify hg command to run on the remote side'), _('CMD')),
128 ('', 'insecure', None,
128 ('', 'insecure', None,
129 _('do not verify server certificate (ignoring web.cacerts config)')),
129 _('do not verify server certificate (ignoring web.cacerts config)')),
130 ]
130 ]
131
131
132 walkopts = [
132 walkopts = [
133 ('I', 'include', [],
133 ('I', 'include', [],
134 _('include names matching the given patterns'), _('PATTERN')),
134 _('include names matching the given patterns'), _('PATTERN')),
135 ('X', 'exclude', [],
135 ('X', 'exclude', [],
136 _('exclude names matching the given patterns'), _('PATTERN')),
136 _('exclude names matching the given patterns'), _('PATTERN')),
137 ]
137 ]
138
138
139 commitopts = [
139 commitopts = [
140 ('m', 'message', '',
140 ('m', 'message', '',
141 _('use text as commit message'), _('TEXT')),
141 _('use text as commit message'), _('TEXT')),
142 ('l', 'logfile', '',
142 ('l', 'logfile', '',
143 _('read commit message from file'), _('FILE')),
143 _('read commit message from file'), _('FILE')),
144 ]
144 ]
145
145
146 commitopts2 = [
146 commitopts2 = [
147 ('d', 'date', '',
147 ('d', 'date', '',
148 _('record the specified date as commit date'), _('DATE')),
148 _('record the specified date as commit date'), _('DATE')),
149 ('u', 'user', '',
149 ('u', 'user', '',
150 _('record the specified user as committer'), _('USER')),
150 _('record the specified user as committer'), _('USER')),
151 ]
151 ]
152
152
153 # hidden for now
153 # hidden for now
154 formatteropts = [
154 formatteropts = [
155 ('T', 'template', '',
155 ('T', 'template', '',
156 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
156 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
157 ]
157 ]
158
158
159 templateopts = [
159 templateopts = [
160 ('', 'style', '',
160 ('', 'style', '',
161 _('display using template map file (DEPRECATED)'), _('STYLE')),
161 _('display using template map file (DEPRECATED)'), _('STYLE')),
162 ('T', 'template', '',
162 ('T', 'template', '',
163 _('display with template'), _('TEMPLATE')),
163 _('display with template'), _('TEMPLATE')),
164 ]
164 ]
165
165
166 logopts = [
166 logopts = [
167 ('p', 'patch', None, _('show patch')),
167 ('p', 'patch', None, _('show patch')),
168 ('g', 'git', None, _('use git extended diff format')),
168 ('g', 'git', None, _('use git extended diff format')),
169 ('l', 'limit', '',
169 ('l', 'limit', '',
170 _('limit number of changes displayed'), _('NUM')),
170 _('limit number of changes displayed'), _('NUM')),
171 ('M', 'no-merges', None, _('do not show merges')),
171 ('M', 'no-merges', None, _('do not show merges')),
172 ('', 'stat', None, _('output diffstat-style summary of changes')),
172 ('', 'stat', None, _('output diffstat-style summary of changes')),
173 ('G', 'graph', None, _("show the revision DAG")),
173 ('G', 'graph', None, _("show the revision DAG")),
174 ] + templateopts
174 ] + templateopts
175
175
176 diffopts = [
176 diffopts = [
177 ('a', 'text', None, _('treat all files as text')),
177 ('a', 'text', None, _('treat all files as text')),
178 ('g', 'git', None, _('use git extended diff format')),
178 ('g', 'git', None, _('use git extended diff format')),
179 ('', 'nodates', None, _('omit dates from diff headers'))
179 ('', 'nodates', None, _('omit dates from diff headers'))
180 ]
180 ]
181
181
182 diffwsopts = [
182 diffwsopts = [
183 ('w', 'ignore-all-space', None,
183 ('w', 'ignore-all-space', None,
184 _('ignore white space when comparing lines')),
184 _('ignore white space when comparing lines')),
185 ('b', 'ignore-space-change', None,
185 ('b', 'ignore-space-change', None,
186 _('ignore changes in the amount of white space')),
186 _('ignore changes in the amount of white space')),
187 ('B', 'ignore-blank-lines', None,
187 ('B', 'ignore-blank-lines', None,
188 _('ignore changes whose lines are all blank')),
188 _('ignore changes whose lines are all blank')),
189 ]
189 ]
190
190
191 diffopts2 = [
191 diffopts2 = [
192 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
192 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
193 ('p', 'show-function', None, _('show which function each change is in')),
193 ('p', 'show-function', None, _('show which function each change is in')),
194 ('', 'reverse', None, _('produce a diff that undoes the changes')),
194 ('', 'reverse', None, _('produce a diff that undoes the changes')),
195 ] + diffwsopts + [
195 ] + diffwsopts + [
196 ('U', 'unified', '',
196 ('U', 'unified', '',
197 _('number of lines of context to show'), _('NUM')),
197 _('number of lines of context to show'), _('NUM')),
198 ('', 'stat', None, _('output diffstat-style summary of changes')),
198 ('', 'stat', None, _('output diffstat-style summary of changes')),
199 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
199 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
200 ]
200 ]
201
201
202 mergetoolopts = [
202 mergetoolopts = [
203 ('t', 'tool', '', _('specify merge tool')),
203 ('t', 'tool', '', _('specify merge tool')),
204 ]
204 ]
205
205
206 similarityopts = [
206 similarityopts = [
207 ('s', 'similarity', '',
207 ('s', 'similarity', '',
208 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
208 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
209 ]
209 ]
210
210
211 subrepoopts = [
211 subrepoopts = [
212 ('S', 'subrepos', None,
212 ('S', 'subrepos', None,
213 _('recurse into subrepositories'))
213 _('recurse into subrepositories'))
214 ]
214 ]
215
215
216 debugrevlogopts = [
216 debugrevlogopts = [
217 ('c', 'changelog', False, _('open changelog')),
217 ('c', 'changelog', False, _('open changelog')),
218 ('m', 'manifest', False, _('open manifest')),
218 ('m', 'manifest', False, _('open manifest')),
219 ('', 'dir', '', _('open directory manifest')),
219 ('', 'dir', '', _('open directory manifest')),
220 ]
220 ]
221
221
222 # Commands start here, listed alphabetically
222 # Commands start here, listed alphabetically
223
223
224 @command('^add',
224 @command('^add',
225 walkopts + subrepoopts + dryrunopts,
225 walkopts + subrepoopts + dryrunopts,
226 _('[OPTION]... [FILE]...'),
226 _('[OPTION]... [FILE]...'),
227 inferrepo=True)
227 inferrepo=True)
228 def add(ui, repo, *pats, **opts):
228 def add(ui, repo, *pats, **opts):
229 """add the specified files on the next commit
229 """add the specified files on the next commit
230
230
231 Schedule files to be version controlled and added to the
231 Schedule files to be version controlled and added to the
232 repository.
232 repository.
233
233
234 The files will be added to the repository at the next commit. To
234 The files will be added to the repository at the next commit. To
235 undo an add before that, see :hg:`forget`.
235 undo an add before that, see :hg:`forget`.
236
236
237 If no names are given, add all files to the repository (except
237 If no names are given, add all files to the repository (except
238 files matching ``.hgignore``).
238 files matching ``.hgignore``).
239
239
240 .. container:: verbose
240 .. container:: verbose
241
241
242 Examples:
242 Examples:
243
243
244 - New (unknown) files are added
244 - New (unknown) files are added
245 automatically by :hg:`add`::
245 automatically by :hg:`add`::
246
246
247 $ ls
247 $ ls
248 foo.c
248 foo.c
249 $ hg status
249 $ hg status
250 ? foo.c
250 ? foo.c
251 $ hg add
251 $ hg add
252 adding foo.c
252 adding foo.c
253 $ hg status
253 $ hg status
254 A foo.c
254 A foo.c
255
255
256 - Specific files to be added can be specified::
256 - Specific files to be added can be specified::
257
257
258 $ ls
258 $ ls
259 bar.c foo.c
259 bar.c foo.c
260 $ hg status
260 $ hg status
261 ? bar.c
261 ? bar.c
262 ? foo.c
262 ? foo.c
263 $ hg add bar.c
263 $ hg add bar.c
264 $ hg status
264 $ hg status
265 A bar.c
265 A bar.c
266 ? foo.c
266 ? foo.c
267
267
268 Returns 0 if all files are successfully added.
268 Returns 0 if all files are successfully added.
269 """
269 """
270
270
271 m = scmutil.match(repo[None], pats, opts)
271 m = scmutil.match(repo[None], pats, opts)
272 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
272 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
273 return rejected and 1 or 0
273 return rejected and 1 or 0
274
274
275 @command('addremove',
275 @command('addremove',
276 similarityopts + subrepoopts + walkopts + dryrunopts,
276 similarityopts + subrepoopts + walkopts + dryrunopts,
277 _('[OPTION]... [FILE]...'),
277 _('[OPTION]... [FILE]...'),
278 inferrepo=True)
278 inferrepo=True)
279 def addremove(ui, repo, *pats, **opts):
279 def addremove(ui, repo, *pats, **opts):
280 """add all new files, delete all missing files
280 """add all new files, delete all missing files
281
281
282 Add all new files and remove all missing files from the
282 Add all new files and remove all missing files from the
283 repository.
283 repository.
284
284
285 Unless names are given, new files are ignored if they match any of
285 Unless names are given, new files are ignored if they match any of
286 the patterns in ``.hgignore``. As with add, these changes take
286 the patterns in ``.hgignore``. As with add, these changes take
287 effect at the next commit.
287 effect at the next commit.
288
288
289 Use the -s/--similarity option to detect renamed files. This
289 Use the -s/--similarity option to detect renamed files. This
290 option takes a percentage between 0 (disabled) and 100 (files must
290 option takes a percentage between 0 (disabled) and 100 (files must
291 be identical) as its parameter. With a parameter greater than 0,
291 be identical) as its parameter. With a parameter greater than 0,
292 this compares every removed file with every added file and records
292 this compares every removed file with every added file and records
293 those similar enough as renames. Detecting renamed files this way
293 those similar enough as renames. Detecting renamed files this way
294 can be expensive. After using this option, :hg:`status -C` can be
294 can be expensive. After using this option, :hg:`status -C` can be
295 used to check which files were identified as moved or renamed. If
295 used to check which files were identified as moved or renamed. If
296 not specified, -s/--similarity defaults to 100 and only renames of
296 not specified, -s/--similarity defaults to 100 and only renames of
297 identical files are detected.
297 identical files are detected.
298
298
299 .. container:: verbose
299 .. container:: verbose
300
300
301 Examples:
301 Examples:
302
302
303 - A number of files (bar.c and foo.c) are new,
303 - A number of files (bar.c and foo.c) are new,
304 while foobar.c has been removed (without using :hg:`remove`)
304 while foobar.c has been removed (without using :hg:`remove`)
305 from the repository::
305 from the repository::
306
306
307 $ ls
307 $ ls
308 bar.c foo.c
308 bar.c foo.c
309 $ hg status
309 $ hg status
310 ! foobar.c
310 ! foobar.c
311 ? bar.c
311 ? bar.c
312 ? foo.c
312 ? foo.c
313 $ hg addremove
313 $ hg addremove
314 adding bar.c
314 adding bar.c
315 adding foo.c
315 adding foo.c
316 removing foobar.c
316 removing foobar.c
317 $ hg status
317 $ hg status
318 A bar.c
318 A bar.c
319 A foo.c
319 A foo.c
320 R foobar.c
320 R foobar.c
321
321
322 - A file foobar.c was moved to foo.c without using :hg:`rename`.
322 - A file foobar.c was moved to foo.c without using :hg:`rename`.
323 Afterwards, it was edited slightly::
323 Afterwards, it was edited slightly::
324
324
325 $ ls
325 $ ls
326 foo.c
326 foo.c
327 $ hg status
327 $ hg status
328 ! foobar.c
328 ! foobar.c
329 ? foo.c
329 ? foo.c
330 $ hg addremove --similarity 90
330 $ hg addremove --similarity 90
331 removing foobar.c
331 removing foobar.c
332 adding foo.c
332 adding foo.c
333 recording removal of foobar.c as rename to foo.c (94% similar)
333 recording removal of foobar.c as rename to foo.c (94% similar)
334 $ hg status -C
334 $ hg status -C
335 A foo.c
335 A foo.c
336 foobar.c
336 foobar.c
337 R foobar.c
337 R foobar.c
338
338
339 Returns 0 if all files are successfully added.
339 Returns 0 if all files are successfully added.
340 """
340 """
341 try:
341 try:
342 sim = float(opts.get('similarity') or 100)
342 sim = float(opts.get('similarity') or 100)
343 except ValueError:
343 except ValueError:
344 raise error.Abort(_('similarity must be a number'))
344 raise error.Abort(_('similarity must be a number'))
345 if sim < 0 or sim > 100:
345 if sim < 0 or sim > 100:
346 raise error.Abort(_('similarity must be between 0 and 100'))
346 raise error.Abort(_('similarity must be between 0 and 100'))
347 matcher = scmutil.match(repo[None], pats, opts)
347 matcher = scmutil.match(repo[None], pats, opts)
348 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
348 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
349
349
350 @command('^annotate|blame',
350 @command('^annotate|blame',
351 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
351 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
352 ('', 'follow', None,
352 ('', 'follow', None,
353 _('follow copies/renames and list the filename (DEPRECATED)')),
353 _('follow copies/renames and list the filename (DEPRECATED)')),
354 ('', 'no-follow', None, _("don't follow copies and renames")),
354 ('', 'no-follow', None, _("don't follow copies and renames")),
355 ('a', 'text', None, _('treat all files as text')),
355 ('a', 'text', None, _('treat all files as text')),
356 ('u', 'user', None, _('list the author (long with -v)')),
356 ('u', 'user', None, _('list the author (long with -v)')),
357 ('f', 'file', None, _('list the filename')),
357 ('f', 'file', None, _('list the filename')),
358 ('d', 'date', None, _('list the date (short with -q)')),
358 ('d', 'date', None, _('list the date (short with -q)')),
359 ('n', 'number', None, _('list the revision number (default)')),
359 ('n', 'number', None, _('list the revision number (default)')),
360 ('c', 'changeset', None, _('list the changeset')),
360 ('c', 'changeset', None, _('list the changeset')),
361 ('l', 'line-number', None, _('show line number at the first appearance'))
361 ('l', 'line-number', None, _('show line number at the first appearance'))
362 ] + diffwsopts + walkopts + formatteropts,
362 ] + diffwsopts + walkopts + formatteropts,
363 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
363 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
364 inferrepo=True)
364 inferrepo=True)
365 def annotate(ui, repo, *pats, **opts):
365 def annotate(ui, repo, *pats, **opts):
366 """show changeset information by line for each file
366 """show changeset information by line for each file
367
367
368 List changes in files, showing the revision id responsible for
368 List changes in files, showing the revision id responsible for
369 each line.
369 each line.
370
370
371 This command is useful for discovering when a change was made and
371 This command is useful for discovering when a change was made and
372 by whom.
372 by whom.
373
373
374 If you include --file, --user, or --date, the revision number is
374 If you include --file, --user, or --date, the revision number is
375 suppressed unless you also include --number.
375 suppressed unless you also include --number.
376
376
377 Without the -a/--text option, annotate will avoid processing files
377 Without the -a/--text option, annotate will avoid processing files
378 it detects as binary. With -a, annotate will annotate the file
378 it detects as binary. With -a, annotate will annotate the file
379 anyway, although the results will probably be neither useful
379 anyway, although the results will probably be neither useful
380 nor desirable.
380 nor desirable.
381
381
382 Returns 0 on success.
382 Returns 0 on success.
383 """
383 """
384 if not pats:
384 if not pats:
385 raise error.Abort(_('at least one filename or pattern is required'))
385 raise error.Abort(_('at least one filename or pattern is required'))
386
386
387 if opts.get('follow'):
387 if opts.get('follow'):
388 # --follow is deprecated and now just an alias for -f/--file
388 # --follow is deprecated and now just an alias for -f/--file
389 # to mimic the behavior of Mercurial before version 1.5
389 # to mimic the behavior of Mercurial before version 1.5
390 opts['file'] = True
390 opts['file'] = True
391
391
392 ctx = scmutil.revsingle(repo, opts.get('rev'))
392 ctx = scmutil.revsingle(repo, opts.get('rev'))
393
393
394 fm = ui.formatter('annotate', opts)
394 fm = ui.formatter('annotate', opts)
395 if ui.quiet:
395 if ui.quiet:
396 datefunc = util.shortdate
396 datefunc = util.shortdate
397 else:
397 else:
398 datefunc = util.datestr
398 datefunc = util.datestr
399 if ctx.rev() is None:
399 if ctx.rev() is None:
400 def hexfn(node):
400 def hexfn(node):
401 if node is None:
401 if node is None:
402 return None
402 return None
403 else:
403 else:
404 return fm.hexfunc(node)
404 return fm.hexfunc(node)
405 if opts.get('changeset'):
405 if opts.get('changeset'):
406 # omit "+" suffix which is appended to node hex
406 # omit "+" suffix which is appended to node hex
407 def formatrev(rev):
407 def formatrev(rev):
408 if rev is None:
408 if rev is None:
409 return '%d' % ctx.p1().rev()
409 return '%d' % ctx.p1().rev()
410 else:
410 else:
411 return '%d' % rev
411 return '%d' % rev
412 else:
412 else:
413 def formatrev(rev):
413 def formatrev(rev):
414 if rev is None:
414 if rev is None:
415 return '%d+' % ctx.p1().rev()
415 return '%d+' % ctx.p1().rev()
416 else:
416 else:
417 return '%d ' % rev
417 return '%d ' % rev
418 def formathex(hex):
418 def formathex(hex):
419 if hex is None:
419 if hex is None:
420 return '%s+' % fm.hexfunc(ctx.p1().node())
420 return '%s+' % fm.hexfunc(ctx.p1().node())
421 else:
421 else:
422 return '%s ' % hex
422 return '%s ' % hex
423 else:
423 else:
424 hexfn = fm.hexfunc
424 hexfn = fm.hexfunc
425 formatrev = formathex = str
425 formatrev = formathex = str
426
426
427 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
427 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
428 ('number', ' ', lambda x: x[0].rev(), formatrev),
428 ('number', ' ', lambda x: x[0].rev(), formatrev),
429 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
429 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
430 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
430 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
431 ('file', ' ', lambda x: x[0].path(), str),
431 ('file', ' ', lambda x: x[0].path(), str),
432 ('line_number', ':', lambda x: x[1], str),
432 ('line_number', ':', lambda x: x[1], str),
433 ]
433 ]
434 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
434 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
435
435
436 if (not opts.get('user') and not opts.get('changeset')
436 if (not opts.get('user') and not opts.get('changeset')
437 and not opts.get('date') and not opts.get('file')):
437 and not opts.get('date') and not opts.get('file')):
438 opts['number'] = True
438 opts['number'] = True
439
439
440 linenumber = opts.get('line_number') is not None
440 linenumber = opts.get('line_number') is not None
441 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
441 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
442 raise error.Abort(_('at least one of -n/-c is required for -l'))
442 raise error.Abort(_('at least one of -n/-c is required for -l'))
443
443
444 if fm:
444 if fm.isplain():
445 def makefunc(get, fmt):
446 return lambda x: fmt(get(x))
447 else:
445 def makefunc(get, fmt):
448 def makefunc(get, fmt):
446 return get
449 return get
447 else:
448 def makefunc(get, fmt):
449 return lambda x: fmt(get(x))
450 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
450 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
451 if opts.get(op)]
451 if opts.get(op)]
452 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
452 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
453 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
453 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
454 if opts.get(op))
454 if opts.get(op))
455
455
456 def bad(x, y):
456 def bad(x, y):
457 raise error.Abort("%s: %s" % (x, y))
457 raise error.Abort("%s: %s" % (x, y))
458
458
459 m = scmutil.match(ctx, pats, opts, badfn=bad)
459 m = scmutil.match(ctx, pats, opts, badfn=bad)
460
460
461 follow = not opts.get('no_follow')
461 follow = not opts.get('no_follow')
462 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
462 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
463 whitespace=True)
463 whitespace=True)
464 for abs in ctx.walk(m):
464 for abs in ctx.walk(m):
465 fctx = ctx[abs]
465 fctx = ctx[abs]
466 if not opts.get('text') and util.binary(fctx.data()):
466 if not opts.get('text') and util.binary(fctx.data()):
467 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
467 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
468 continue
468 continue
469
469
470 lines = fctx.annotate(follow=follow, linenumber=linenumber,
470 lines = fctx.annotate(follow=follow, linenumber=linenumber,
471 diffopts=diffopts)
471 diffopts=diffopts)
472 if not lines:
472 if not lines:
473 continue
473 continue
474 formats = []
474 formats = []
475 pieces = []
475 pieces = []
476
476
477 for f, sep in funcmap:
477 for f, sep in funcmap:
478 l = [f(n) for n, dummy in lines]
478 l = [f(n) for n, dummy in lines]
479 if fm:
479 if fm.isplain():
480 formats.append(['%s' for x in l])
481 else:
482 sizes = [encoding.colwidth(x) for x in l]
480 sizes = [encoding.colwidth(x) for x in l]
483 ml = max(sizes)
481 ml = max(sizes)
484 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
482 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
483 else:
484 formats.append(['%s' for x in l])
485 pieces.append(l)
485 pieces.append(l)
486
486
487 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
487 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
488 fm.startitem()
488 fm.startitem()
489 fm.write(fields, "".join(f), *p)
489 fm.write(fields, "".join(f), *p)
490 fm.write('line', ": %s", l[1])
490 fm.write('line', ": %s", l[1])
491
491
492 if not lines[-1][1].endswith('\n'):
492 if not lines[-1][1].endswith('\n'):
493 fm.plain('\n')
493 fm.plain('\n')
494
494
495 fm.end()
495 fm.end()
496
496
497 @command('archive',
497 @command('archive',
498 [('', 'no-decode', None, _('do not pass files through decoders')),
498 [('', 'no-decode', None, _('do not pass files through decoders')),
499 ('p', 'prefix', '', _('directory prefix for files in archive'),
499 ('p', 'prefix', '', _('directory prefix for files in archive'),
500 _('PREFIX')),
500 _('PREFIX')),
501 ('r', 'rev', '', _('revision to distribute'), _('REV')),
501 ('r', 'rev', '', _('revision to distribute'), _('REV')),
502 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
502 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
503 ] + subrepoopts + walkopts,
503 ] + subrepoopts + walkopts,
504 _('[OPTION]... DEST'))
504 _('[OPTION]... DEST'))
505 def archive(ui, repo, dest, **opts):
505 def archive(ui, repo, dest, **opts):
506 '''create an unversioned archive of a repository revision
506 '''create an unversioned archive of a repository revision
507
507
508 By default, the revision used is the parent of the working
508 By default, the revision used is the parent of the working
509 directory; use -r/--rev to specify a different revision.
509 directory; use -r/--rev to specify a different revision.
510
510
511 The archive type is automatically detected based on file
511 The archive type is automatically detected based on file
512 extension (to override, use -t/--type).
512 extension (to override, use -t/--type).
513
513
514 .. container:: verbose
514 .. container:: verbose
515
515
516 Examples:
516 Examples:
517
517
518 - create a zip file containing the 1.0 release::
518 - create a zip file containing the 1.0 release::
519
519
520 hg archive -r 1.0 project-1.0.zip
520 hg archive -r 1.0 project-1.0.zip
521
521
522 - create a tarball excluding .hg files::
522 - create a tarball excluding .hg files::
523
523
524 hg archive project.tar.gz -X ".hg*"
524 hg archive project.tar.gz -X ".hg*"
525
525
526 Valid types are:
526 Valid types are:
527
527
528 :``files``: a directory full of files (default)
528 :``files``: a directory full of files (default)
529 :``tar``: tar archive, uncompressed
529 :``tar``: tar archive, uncompressed
530 :``tbz2``: tar archive, compressed using bzip2
530 :``tbz2``: tar archive, compressed using bzip2
531 :``tgz``: tar archive, compressed using gzip
531 :``tgz``: tar archive, compressed using gzip
532 :``uzip``: zip archive, uncompressed
532 :``uzip``: zip archive, uncompressed
533 :``zip``: zip archive, compressed using deflate
533 :``zip``: zip archive, compressed using deflate
534
534
535 The exact name of the destination archive or directory is given
535 The exact name of the destination archive or directory is given
536 using a format string; see :hg:`help export` for details.
536 using a format string; see :hg:`help export` for details.
537
537
538 Each member added to an archive file has a directory prefix
538 Each member added to an archive file has a directory prefix
539 prepended. Use -p/--prefix to specify a format string for the
539 prepended. Use -p/--prefix to specify a format string for the
540 prefix. The default is the basename of the archive, with suffixes
540 prefix. The default is the basename of the archive, with suffixes
541 removed.
541 removed.
542
542
543 Returns 0 on success.
543 Returns 0 on success.
544 '''
544 '''
545
545
546 ctx = scmutil.revsingle(repo, opts.get('rev'))
546 ctx = scmutil.revsingle(repo, opts.get('rev'))
547 if not ctx:
547 if not ctx:
548 raise error.Abort(_('no working directory: please specify a revision'))
548 raise error.Abort(_('no working directory: please specify a revision'))
549 node = ctx.node()
549 node = ctx.node()
550 dest = cmdutil.makefilename(repo, dest, node)
550 dest = cmdutil.makefilename(repo, dest, node)
551 if os.path.realpath(dest) == repo.root:
551 if os.path.realpath(dest) == repo.root:
552 raise error.Abort(_('repository root cannot be destination'))
552 raise error.Abort(_('repository root cannot be destination'))
553
553
554 kind = opts.get('type') or archival.guesskind(dest) or 'files'
554 kind = opts.get('type') or archival.guesskind(dest) or 'files'
555 prefix = opts.get('prefix')
555 prefix = opts.get('prefix')
556
556
557 if dest == '-':
557 if dest == '-':
558 if kind == 'files':
558 if kind == 'files':
559 raise error.Abort(_('cannot archive plain files to stdout'))
559 raise error.Abort(_('cannot archive plain files to stdout'))
560 dest = cmdutil.makefileobj(repo, dest)
560 dest = cmdutil.makefileobj(repo, dest)
561 if not prefix:
561 if not prefix:
562 prefix = os.path.basename(repo.root) + '-%h'
562 prefix = os.path.basename(repo.root) + '-%h'
563
563
564 prefix = cmdutil.makefilename(repo, prefix, node)
564 prefix = cmdutil.makefilename(repo, prefix, node)
565 matchfn = scmutil.match(ctx, [], opts)
565 matchfn = scmutil.match(ctx, [], opts)
566 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
566 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
567 matchfn, prefix, subrepos=opts.get('subrepos'))
567 matchfn, prefix, subrepos=opts.get('subrepos'))
568
568
569 @command('backout',
569 @command('backout',
570 [('', 'merge', None, _('merge with old dirstate parent after backout')),
570 [('', 'merge', None, _('merge with old dirstate parent after backout')),
571 ('', 'commit', None,
571 ('', 'commit', None,
572 _('commit if no conflicts were encountered (DEPRECATED)')),
572 _('commit if no conflicts were encountered (DEPRECATED)')),
573 ('', 'no-commit', None, _('do not commit')),
573 ('', 'no-commit', None, _('do not commit')),
574 ('', 'parent', '',
574 ('', 'parent', '',
575 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
575 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
576 ('r', 'rev', '', _('revision to backout'), _('REV')),
576 ('r', 'rev', '', _('revision to backout'), _('REV')),
577 ('e', 'edit', False, _('invoke editor on commit messages')),
577 ('e', 'edit', False, _('invoke editor on commit messages')),
578 ] + mergetoolopts + walkopts + commitopts + commitopts2,
578 ] + mergetoolopts + walkopts + commitopts + commitopts2,
579 _('[OPTION]... [-r] REV'))
579 _('[OPTION]... [-r] REV'))
580 def backout(ui, repo, node=None, rev=None, **opts):
580 def backout(ui, repo, node=None, rev=None, **opts):
581 '''reverse effect of earlier changeset
581 '''reverse effect of earlier changeset
582
582
583 Prepare a new changeset with the effect of REV undone in the
583 Prepare a new changeset with the effect of REV undone in the
584 current working directory. If no conflicts were encountered,
584 current working directory. If no conflicts were encountered,
585 it will be committed immediately.
585 it will be committed immediately.
586
586
587 If REV is the parent of the working directory, then this new changeset
587 If REV is the parent of the working directory, then this new changeset
588 is committed automatically (unless --no-commit is specified).
588 is committed automatically (unless --no-commit is specified).
589
589
590 .. note::
590 .. note::
591
591
592 :hg:`backout` cannot be used to fix either an unwanted or
592 :hg:`backout` cannot be used to fix either an unwanted or
593 incorrect merge.
593 incorrect merge.
594
594
595 .. container:: verbose
595 .. container:: verbose
596
596
597 Examples:
597 Examples:
598
598
599 - Reverse the effect of the parent of the working directory.
599 - Reverse the effect of the parent of the working directory.
600 This backout will be committed immediately::
600 This backout will be committed immediately::
601
601
602 hg backout -r .
602 hg backout -r .
603
603
604 - Reverse the effect of previous bad revision 23::
604 - Reverse the effect of previous bad revision 23::
605
605
606 hg backout -r 23
606 hg backout -r 23
607
607
608 - Reverse the effect of previous bad revision 23 and
608 - Reverse the effect of previous bad revision 23 and
609 leave changes uncommitted::
609 leave changes uncommitted::
610
610
611 hg backout -r 23 --no-commit
611 hg backout -r 23 --no-commit
612 hg commit -m "Backout revision 23"
612 hg commit -m "Backout revision 23"
613
613
614 By default, the pending changeset will have one parent,
614 By default, the pending changeset will have one parent,
615 maintaining a linear history. With --merge, the pending
615 maintaining a linear history. With --merge, the pending
616 changeset will instead have two parents: the old parent of the
616 changeset will instead have two parents: the old parent of the
617 working directory and a new child of REV that simply undoes REV.
617 working directory and a new child of REV that simply undoes REV.
618
618
619 Before version 1.7, the behavior without --merge was equivalent
619 Before version 1.7, the behavior without --merge was equivalent
620 to specifying --merge followed by :hg:`update --clean .` to
620 to specifying --merge followed by :hg:`update --clean .` to
621 cancel the merge and leave the child of REV as a head to be
621 cancel the merge and leave the child of REV as a head to be
622 merged separately.
622 merged separately.
623
623
624 See :hg:`help dates` for a list of formats valid for -d/--date.
624 See :hg:`help dates` for a list of formats valid for -d/--date.
625
625
626 See :hg:`help revert` for a way to restore files to the state
626 See :hg:`help revert` for a way to restore files to the state
627 of another revision.
627 of another revision.
628
628
629 Returns 0 on success, 1 if nothing to backout or there are unresolved
629 Returns 0 on success, 1 if nothing to backout or there are unresolved
630 files.
630 files.
631 '''
631 '''
632 wlock = lock = None
632 wlock = lock = None
633 try:
633 try:
634 wlock = repo.wlock()
634 wlock = repo.wlock()
635 lock = repo.lock()
635 lock = repo.lock()
636 return _dobackout(ui, repo, node, rev, **opts)
636 return _dobackout(ui, repo, node, rev, **opts)
637 finally:
637 finally:
638 release(lock, wlock)
638 release(lock, wlock)
639
639
640 def _dobackout(ui, repo, node=None, rev=None, **opts):
640 def _dobackout(ui, repo, node=None, rev=None, **opts):
641 if opts.get('commit') and opts.get('no_commit'):
641 if opts.get('commit') and opts.get('no_commit'):
642 raise error.Abort(_("cannot use --commit with --no-commit"))
642 raise error.Abort(_("cannot use --commit with --no-commit"))
643 if opts.get('merge') and opts.get('no_commit'):
643 if opts.get('merge') and opts.get('no_commit'):
644 raise error.Abort(_("cannot use --merge with --no-commit"))
644 raise error.Abort(_("cannot use --merge with --no-commit"))
645
645
646 if rev and node:
646 if rev and node:
647 raise error.Abort(_("please specify just one revision"))
647 raise error.Abort(_("please specify just one revision"))
648
648
649 if not rev:
649 if not rev:
650 rev = node
650 rev = node
651
651
652 if not rev:
652 if not rev:
653 raise error.Abort(_("please specify a revision to backout"))
653 raise error.Abort(_("please specify a revision to backout"))
654
654
655 date = opts.get('date')
655 date = opts.get('date')
656 if date:
656 if date:
657 opts['date'] = util.parsedate(date)
657 opts['date'] = util.parsedate(date)
658
658
659 cmdutil.checkunfinished(repo)
659 cmdutil.checkunfinished(repo)
660 cmdutil.bailifchanged(repo)
660 cmdutil.bailifchanged(repo)
661 node = scmutil.revsingle(repo, rev).node()
661 node = scmutil.revsingle(repo, rev).node()
662
662
663 op1, op2 = repo.dirstate.parents()
663 op1, op2 = repo.dirstate.parents()
664 if not repo.changelog.isancestor(node, op1):
664 if not repo.changelog.isancestor(node, op1):
665 raise error.Abort(_('cannot backout change that is not an ancestor'))
665 raise error.Abort(_('cannot backout change that is not an ancestor'))
666
666
667 p1, p2 = repo.changelog.parents(node)
667 p1, p2 = repo.changelog.parents(node)
668 if p1 == nullid:
668 if p1 == nullid:
669 raise error.Abort(_('cannot backout a change with no parents'))
669 raise error.Abort(_('cannot backout a change with no parents'))
670 if p2 != nullid:
670 if p2 != nullid:
671 if not opts.get('parent'):
671 if not opts.get('parent'):
672 raise error.Abort(_('cannot backout a merge changeset'))
672 raise error.Abort(_('cannot backout a merge changeset'))
673 p = repo.lookup(opts['parent'])
673 p = repo.lookup(opts['parent'])
674 if p not in (p1, p2):
674 if p not in (p1, p2):
675 raise error.Abort(_('%s is not a parent of %s') %
675 raise error.Abort(_('%s is not a parent of %s') %
676 (short(p), short(node)))
676 (short(p), short(node)))
677 parent = p
677 parent = p
678 else:
678 else:
679 if opts.get('parent'):
679 if opts.get('parent'):
680 raise error.Abort(_('cannot use --parent on non-merge changeset'))
680 raise error.Abort(_('cannot use --parent on non-merge changeset'))
681 parent = p1
681 parent = p1
682
682
683 # the backout should appear on the same branch
683 # the backout should appear on the same branch
684 branch = repo.dirstate.branch()
684 branch = repo.dirstate.branch()
685 bheads = repo.branchheads(branch)
685 bheads = repo.branchheads(branch)
686 rctx = scmutil.revsingle(repo, hex(parent))
686 rctx = scmutil.revsingle(repo, hex(parent))
687 if not opts.get('merge') and op1 != node:
687 if not opts.get('merge') and op1 != node:
688 dsguard = cmdutil.dirstateguard(repo, 'backout')
688 dsguard = cmdutil.dirstateguard(repo, 'backout')
689 try:
689 try:
690 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
690 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
691 'backout')
691 'backout')
692 stats = mergemod.update(repo, parent, True, True, node, False)
692 stats = mergemod.update(repo, parent, True, True, node, False)
693 repo.setparents(op1, op2)
693 repo.setparents(op1, op2)
694 dsguard.close()
694 dsguard.close()
695 hg._showstats(repo, stats)
695 hg._showstats(repo, stats)
696 if stats[3]:
696 if stats[3]:
697 repo.ui.status(_("use 'hg resolve' to retry unresolved "
697 repo.ui.status(_("use 'hg resolve' to retry unresolved "
698 "file merges\n"))
698 "file merges\n"))
699 return 1
699 return 1
700 finally:
700 finally:
701 ui.setconfig('ui', 'forcemerge', '', '')
701 ui.setconfig('ui', 'forcemerge', '', '')
702 lockmod.release(dsguard)
702 lockmod.release(dsguard)
703 else:
703 else:
704 hg.clean(repo, node, show_stats=False)
704 hg.clean(repo, node, show_stats=False)
705 repo.dirstate.setbranch(branch)
705 repo.dirstate.setbranch(branch)
706 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
706 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
707
707
708 if opts.get('no_commit'):
708 if opts.get('no_commit'):
709 msg = _("changeset %s backed out, "
709 msg = _("changeset %s backed out, "
710 "don't forget to commit.\n")
710 "don't forget to commit.\n")
711 ui.status(msg % short(node))
711 ui.status(msg % short(node))
712 return 0
712 return 0
713
713
714 def commitfunc(ui, repo, message, match, opts):
714 def commitfunc(ui, repo, message, match, opts):
715 editform = 'backout'
715 editform = 'backout'
716 e = cmdutil.getcommiteditor(editform=editform, **opts)
716 e = cmdutil.getcommiteditor(editform=editform, **opts)
717 if not message:
717 if not message:
718 # we don't translate commit messages
718 # we don't translate commit messages
719 message = "Backed out changeset %s" % short(node)
719 message = "Backed out changeset %s" % short(node)
720 e = cmdutil.getcommiteditor(edit=True, editform=editform)
720 e = cmdutil.getcommiteditor(edit=True, editform=editform)
721 return repo.commit(message, opts.get('user'), opts.get('date'),
721 return repo.commit(message, opts.get('user'), opts.get('date'),
722 match, editor=e)
722 match, editor=e)
723 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
723 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
724 if not newnode:
724 if not newnode:
725 ui.status(_("nothing changed\n"))
725 ui.status(_("nothing changed\n"))
726 return 1
726 return 1
727 cmdutil.commitstatus(repo, newnode, branch, bheads)
727 cmdutil.commitstatus(repo, newnode, branch, bheads)
728
728
729 def nice(node):
729 def nice(node):
730 return '%d:%s' % (repo.changelog.rev(node), short(node))
730 return '%d:%s' % (repo.changelog.rev(node), short(node))
731 ui.status(_('changeset %s backs out changeset %s\n') %
731 ui.status(_('changeset %s backs out changeset %s\n') %
732 (nice(repo.changelog.tip()), nice(node)))
732 (nice(repo.changelog.tip()), nice(node)))
733 if opts.get('merge') and op1 != node:
733 if opts.get('merge') and op1 != node:
734 hg.clean(repo, op1, show_stats=False)
734 hg.clean(repo, op1, show_stats=False)
735 ui.status(_('merging with changeset %s\n')
735 ui.status(_('merging with changeset %s\n')
736 % nice(repo.changelog.tip()))
736 % nice(repo.changelog.tip()))
737 try:
737 try:
738 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
738 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
739 'backout')
739 'backout')
740 return hg.merge(repo, hex(repo.changelog.tip()))
740 return hg.merge(repo, hex(repo.changelog.tip()))
741 finally:
741 finally:
742 ui.setconfig('ui', 'forcemerge', '', '')
742 ui.setconfig('ui', 'forcemerge', '', '')
743 return 0
743 return 0
744
744
745 @command('bisect',
745 @command('bisect',
746 [('r', 'reset', False, _('reset bisect state')),
746 [('r', 'reset', False, _('reset bisect state')),
747 ('g', 'good', False, _('mark changeset good')),
747 ('g', 'good', False, _('mark changeset good')),
748 ('b', 'bad', False, _('mark changeset bad')),
748 ('b', 'bad', False, _('mark changeset bad')),
749 ('s', 'skip', False, _('skip testing changeset')),
749 ('s', 'skip', False, _('skip testing changeset')),
750 ('e', 'extend', False, _('extend the bisect range')),
750 ('e', 'extend', False, _('extend the bisect range')),
751 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
751 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
752 ('U', 'noupdate', False, _('do not update to target'))],
752 ('U', 'noupdate', False, _('do not update to target'))],
753 _("[-gbsr] [-U] [-c CMD] [REV]"))
753 _("[-gbsr] [-U] [-c CMD] [REV]"))
754 def bisect(ui, repo, rev=None, extra=None, command=None,
754 def bisect(ui, repo, rev=None, extra=None, command=None,
755 reset=None, good=None, bad=None, skip=None, extend=None,
755 reset=None, good=None, bad=None, skip=None, extend=None,
756 noupdate=None):
756 noupdate=None):
757 """subdivision search of changesets
757 """subdivision search of changesets
758
758
759 This command helps to find changesets which introduce problems. To
759 This command helps to find changesets which introduce problems. To
760 use, mark the earliest changeset you know exhibits the problem as
760 use, mark the earliest changeset you know exhibits the problem as
761 bad, then mark the latest changeset which is free from the problem
761 bad, then mark the latest changeset which is free from the problem
762 as good. Bisect will update your working directory to a revision
762 as good. Bisect will update your working directory to a revision
763 for testing (unless the -U/--noupdate option is specified). Once
763 for testing (unless the -U/--noupdate option is specified). Once
764 you have performed tests, mark the working directory as good or
764 you have performed tests, mark the working directory as good or
765 bad, and bisect will either update to another candidate changeset
765 bad, and bisect will either update to another candidate changeset
766 or announce that it has found the bad revision.
766 or announce that it has found the bad revision.
767
767
768 As a shortcut, you can also use the revision argument to mark a
768 As a shortcut, you can also use the revision argument to mark a
769 revision as good or bad without checking it out first.
769 revision as good or bad without checking it out first.
770
770
771 If you supply a command, it will be used for automatic bisection.
771 If you supply a command, it will be used for automatic bisection.
772 The environment variable HG_NODE will contain the ID of the
772 The environment variable HG_NODE will contain the ID of the
773 changeset being tested. The exit status of the command will be
773 changeset being tested. The exit status of the command will be
774 used to mark revisions as good or bad: status 0 means good, 125
774 used to mark revisions as good or bad: status 0 means good, 125
775 means to skip the revision, 127 (command not found) will abort the
775 means to skip the revision, 127 (command not found) will abort the
776 bisection, and any other non-zero exit status means the revision
776 bisection, and any other non-zero exit status means the revision
777 is bad.
777 is bad.
778
778
779 .. container:: verbose
779 .. container:: verbose
780
780
781 Some examples:
781 Some examples:
782
782
783 - start a bisection with known bad revision 34, and good revision 12::
783 - start a bisection with known bad revision 34, and good revision 12::
784
784
785 hg bisect --bad 34
785 hg bisect --bad 34
786 hg bisect --good 12
786 hg bisect --good 12
787
787
788 - advance the current bisection by marking current revision as good or
788 - advance the current bisection by marking current revision as good or
789 bad::
789 bad::
790
790
791 hg bisect --good
791 hg bisect --good
792 hg bisect --bad
792 hg bisect --bad
793
793
794 - mark the current revision, or a known revision, to be skipped (e.g. if
794 - mark the current revision, or a known revision, to be skipped (e.g. if
795 that revision is not usable because of another issue)::
795 that revision is not usable because of another issue)::
796
796
797 hg bisect --skip
797 hg bisect --skip
798 hg bisect --skip 23
798 hg bisect --skip 23
799
799
800 - skip all revisions that do not touch directories ``foo`` or ``bar``::
800 - skip all revisions that do not touch directories ``foo`` or ``bar``::
801
801
802 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
802 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
803
803
804 - forget the current bisection::
804 - forget the current bisection::
805
805
806 hg bisect --reset
806 hg bisect --reset
807
807
808 - use 'make && make tests' to automatically find the first broken
808 - use 'make && make tests' to automatically find the first broken
809 revision::
809 revision::
810
810
811 hg bisect --reset
811 hg bisect --reset
812 hg bisect --bad 34
812 hg bisect --bad 34
813 hg bisect --good 12
813 hg bisect --good 12
814 hg bisect --command "make && make tests"
814 hg bisect --command "make && make tests"
815
815
816 - see all changesets whose states are already known in the current
816 - see all changesets whose states are already known in the current
817 bisection::
817 bisection::
818
818
819 hg log -r "bisect(pruned)"
819 hg log -r "bisect(pruned)"
820
820
821 - see the changeset currently being bisected (especially useful
821 - see the changeset currently being bisected (especially useful
822 if running with -U/--noupdate)::
822 if running with -U/--noupdate)::
823
823
824 hg log -r "bisect(current)"
824 hg log -r "bisect(current)"
825
825
826 - see all changesets that took part in the current bisection::
826 - see all changesets that took part in the current bisection::
827
827
828 hg log -r "bisect(range)"
828 hg log -r "bisect(range)"
829
829
830 - you can even get a nice graph::
830 - you can even get a nice graph::
831
831
832 hg log --graph -r "bisect(range)"
832 hg log --graph -r "bisect(range)"
833
833
834 See :hg:`help revsets` for more about the `bisect()` keyword.
834 See :hg:`help revsets` for more about the `bisect()` keyword.
835
835
836 Returns 0 on success.
836 Returns 0 on success.
837 """
837 """
838 def extendbisectrange(nodes, good):
838 def extendbisectrange(nodes, good):
839 # bisect is incomplete when it ends on a merge node and
839 # bisect is incomplete when it ends on a merge node and
840 # one of the parent was not checked.
840 # one of the parent was not checked.
841 parents = repo[nodes[0]].parents()
841 parents = repo[nodes[0]].parents()
842 if len(parents) > 1:
842 if len(parents) > 1:
843 if good:
843 if good:
844 side = state['bad']
844 side = state['bad']
845 else:
845 else:
846 side = state['good']
846 side = state['good']
847 num = len(set(i.node() for i in parents) & set(side))
847 num = len(set(i.node() for i in parents) & set(side))
848 if num == 1:
848 if num == 1:
849 return parents[0].ancestor(parents[1])
849 return parents[0].ancestor(parents[1])
850 return None
850 return None
851
851
852 def print_result(nodes, good):
852 def print_result(nodes, good):
853 displayer = cmdutil.show_changeset(ui, repo, {})
853 displayer = cmdutil.show_changeset(ui, repo, {})
854 if len(nodes) == 1:
854 if len(nodes) == 1:
855 # narrowed it down to a single revision
855 # narrowed it down to a single revision
856 if good:
856 if good:
857 ui.write(_("The first good revision is:\n"))
857 ui.write(_("The first good revision is:\n"))
858 else:
858 else:
859 ui.write(_("The first bad revision is:\n"))
859 ui.write(_("The first bad revision is:\n"))
860 displayer.show(repo[nodes[0]])
860 displayer.show(repo[nodes[0]])
861 extendnode = extendbisectrange(nodes, good)
861 extendnode = extendbisectrange(nodes, good)
862 if extendnode is not None:
862 if extendnode is not None:
863 ui.write(_('Not all ancestors of this changeset have been'
863 ui.write(_('Not all ancestors of this changeset have been'
864 ' checked.\nUse bisect --extend to continue the '
864 ' checked.\nUse bisect --extend to continue the '
865 'bisection from\nthe common ancestor, %s.\n')
865 'bisection from\nthe common ancestor, %s.\n')
866 % extendnode)
866 % extendnode)
867 else:
867 else:
868 # multiple possible revisions
868 # multiple possible revisions
869 if good:
869 if good:
870 ui.write(_("Due to skipped revisions, the first "
870 ui.write(_("Due to skipped revisions, the first "
871 "good revision could be any of:\n"))
871 "good revision could be any of:\n"))
872 else:
872 else:
873 ui.write(_("Due to skipped revisions, the first "
873 ui.write(_("Due to skipped revisions, the first "
874 "bad revision could be any of:\n"))
874 "bad revision could be any of:\n"))
875 for n in nodes:
875 for n in nodes:
876 displayer.show(repo[n])
876 displayer.show(repo[n])
877 displayer.close()
877 displayer.close()
878
878
879 def check_state(state, interactive=True):
879 def check_state(state, interactive=True):
880 if not state['good'] or not state['bad']:
880 if not state['good'] or not state['bad']:
881 if (good or bad or skip or reset) and interactive:
881 if (good or bad or skip or reset) and interactive:
882 return
882 return
883 if not state['good']:
883 if not state['good']:
884 raise error.Abort(_('cannot bisect (no known good revisions)'))
884 raise error.Abort(_('cannot bisect (no known good revisions)'))
885 else:
885 else:
886 raise error.Abort(_('cannot bisect (no known bad revisions)'))
886 raise error.Abort(_('cannot bisect (no known bad revisions)'))
887 return True
887 return True
888
888
889 # backward compatibility
889 # backward compatibility
890 if rev in "good bad reset init".split():
890 if rev in "good bad reset init".split():
891 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
891 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
892 cmd, rev, extra = rev, extra, None
892 cmd, rev, extra = rev, extra, None
893 if cmd == "good":
893 if cmd == "good":
894 good = True
894 good = True
895 elif cmd == "bad":
895 elif cmd == "bad":
896 bad = True
896 bad = True
897 else:
897 else:
898 reset = True
898 reset = True
899 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
899 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
900 raise error.Abort(_('incompatible arguments'))
900 raise error.Abort(_('incompatible arguments'))
901
901
902 cmdutil.checkunfinished(repo)
902 cmdutil.checkunfinished(repo)
903
903
904 if reset:
904 if reset:
905 p = repo.join("bisect.state")
905 p = repo.join("bisect.state")
906 if os.path.exists(p):
906 if os.path.exists(p):
907 os.unlink(p)
907 os.unlink(p)
908 return
908 return
909
909
910 state = hbisect.load_state(repo)
910 state = hbisect.load_state(repo)
911
911
912 if command:
912 if command:
913 changesets = 1
913 changesets = 1
914 if noupdate:
914 if noupdate:
915 try:
915 try:
916 node = state['current'][0]
916 node = state['current'][0]
917 except LookupError:
917 except LookupError:
918 raise error.Abort(_('current bisect revision is unknown - '
918 raise error.Abort(_('current bisect revision is unknown - '
919 'start a new bisect to fix'))
919 'start a new bisect to fix'))
920 else:
920 else:
921 node, p2 = repo.dirstate.parents()
921 node, p2 = repo.dirstate.parents()
922 if p2 != nullid:
922 if p2 != nullid:
923 raise error.Abort(_('current bisect revision is a merge'))
923 raise error.Abort(_('current bisect revision is a merge'))
924 try:
924 try:
925 while changesets:
925 while changesets:
926 # update state
926 # update state
927 state['current'] = [node]
927 state['current'] = [node]
928 hbisect.save_state(repo, state)
928 hbisect.save_state(repo, state)
929 status = ui.system(command, environ={'HG_NODE': hex(node)})
929 status = ui.system(command, environ={'HG_NODE': hex(node)})
930 if status == 125:
930 if status == 125:
931 transition = "skip"
931 transition = "skip"
932 elif status == 0:
932 elif status == 0:
933 transition = "good"
933 transition = "good"
934 # status < 0 means process was killed
934 # status < 0 means process was killed
935 elif status == 127:
935 elif status == 127:
936 raise error.Abort(_("failed to execute %s") % command)
936 raise error.Abort(_("failed to execute %s") % command)
937 elif status < 0:
937 elif status < 0:
938 raise error.Abort(_("%s killed") % command)
938 raise error.Abort(_("%s killed") % command)
939 else:
939 else:
940 transition = "bad"
940 transition = "bad"
941 ctx = scmutil.revsingle(repo, rev, node)
941 ctx = scmutil.revsingle(repo, rev, node)
942 rev = None # clear for future iterations
942 rev = None # clear for future iterations
943 state[transition].append(ctx.node())
943 state[transition].append(ctx.node())
944 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
944 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
945 check_state(state, interactive=False)
945 check_state(state, interactive=False)
946 # bisect
946 # bisect
947 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
947 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
948 # update to next check
948 # update to next check
949 node = nodes[0]
949 node = nodes[0]
950 if not noupdate:
950 if not noupdate:
951 cmdutil.bailifchanged(repo)
951 cmdutil.bailifchanged(repo)
952 hg.clean(repo, node, show_stats=False)
952 hg.clean(repo, node, show_stats=False)
953 finally:
953 finally:
954 state['current'] = [node]
954 state['current'] = [node]
955 hbisect.save_state(repo, state)
955 hbisect.save_state(repo, state)
956 print_result(nodes, bgood)
956 print_result(nodes, bgood)
957 return
957 return
958
958
959 # update state
959 # update state
960
960
961 if rev:
961 if rev:
962 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
962 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
963 else:
963 else:
964 nodes = [repo.lookup('.')]
964 nodes = [repo.lookup('.')]
965
965
966 if good or bad or skip:
966 if good or bad or skip:
967 if good:
967 if good:
968 state['good'] += nodes
968 state['good'] += nodes
969 elif bad:
969 elif bad:
970 state['bad'] += nodes
970 state['bad'] += nodes
971 elif skip:
971 elif skip:
972 state['skip'] += nodes
972 state['skip'] += nodes
973 hbisect.save_state(repo, state)
973 hbisect.save_state(repo, state)
974
974
975 if not check_state(state):
975 if not check_state(state):
976 return
976 return
977
977
978 # actually bisect
978 # actually bisect
979 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
979 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
980 if extend:
980 if extend:
981 if not changesets:
981 if not changesets:
982 extendnode = extendbisectrange(nodes, good)
982 extendnode = extendbisectrange(nodes, good)
983 if extendnode is not None:
983 if extendnode is not None:
984 ui.write(_("Extending search to changeset %d:%s\n")
984 ui.write(_("Extending search to changeset %d:%s\n")
985 % (extendnode.rev(), extendnode))
985 % (extendnode.rev(), extendnode))
986 state['current'] = [extendnode.node()]
986 state['current'] = [extendnode.node()]
987 hbisect.save_state(repo, state)
987 hbisect.save_state(repo, state)
988 if noupdate:
988 if noupdate:
989 return
989 return
990 cmdutil.bailifchanged(repo)
990 cmdutil.bailifchanged(repo)
991 return hg.clean(repo, extendnode.node())
991 return hg.clean(repo, extendnode.node())
992 raise error.Abort(_("nothing to extend"))
992 raise error.Abort(_("nothing to extend"))
993
993
994 if changesets == 0:
994 if changesets == 0:
995 print_result(nodes, good)
995 print_result(nodes, good)
996 else:
996 else:
997 assert len(nodes) == 1 # only a single node can be tested next
997 assert len(nodes) == 1 # only a single node can be tested next
998 node = nodes[0]
998 node = nodes[0]
999 # compute the approximate number of remaining tests
999 # compute the approximate number of remaining tests
1000 tests, size = 0, 2
1000 tests, size = 0, 2
1001 while size <= changesets:
1001 while size <= changesets:
1002 tests, size = tests + 1, size * 2
1002 tests, size = tests + 1, size * 2
1003 rev = repo.changelog.rev(node)
1003 rev = repo.changelog.rev(node)
1004 ui.write(_("Testing changeset %d:%s "
1004 ui.write(_("Testing changeset %d:%s "
1005 "(%d changesets remaining, ~%d tests)\n")
1005 "(%d changesets remaining, ~%d tests)\n")
1006 % (rev, short(node), changesets, tests))
1006 % (rev, short(node), changesets, tests))
1007 state['current'] = [node]
1007 state['current'] = [node]
1008 hbisect.save_state(repo, state)
1008 hbisect.save_state(repo, state)
1009 if not noupdate:
1009 if not noupdate:
1010 cmdutil.bailifchanged(repo)
1010 cmdutil.bailifchanged(repo)
1011 return hg.clean(repo, node)
1011 return hg.clean(repo, node)
1012
1012
1013 @command('bookmarks|bookmark',
1013 @command('bookmarks|bookmark',
1014 [('f', 'force', False, _('force')),
1014 [('f', 'force', False, _('force')),
1015 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
1015 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
1016 ('d', 'delete', False, _('delete a given bookmark')),
1016 ('d', 'delete', False, _('delete a given bookmark')),
1017 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
1017 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
1018 ('i', 'inactive', False, _('mark a bookmark inactive')),
1018 ('i', 'inactive', False, _('mark a bookmark inactive')),
1019 ] + formatteropts,
1019 ] + formatteropts,
1020 _('hg bookmarks [OPTIONS]... [NAME]...'))
1020 _('hg bookmarks [OPTIONS]... [NAME]...'))
1021 def bookmark(ui, repo, *names, **opts):
1021 def bookmark(ui, repo, *names, **opts):
1022 '''create a new bookmark or list existing bookmarks
1022 '''create a new bookmark or list existing bookmarks
1023
1023
1024 Bookmarks are labels on changesets to help track lines of development.
1024 Bookmarks are labels on changesets to help track lines of development.
1025 Bookmarks are unversioned and can be moved, renamed and deleted.
1025 Bookmarks are unversioned and can be moved, renamed and deleted.
1026 Deleting or moving a bookmark has no effect on the associated changesets.
1026 Deleting or moving a bookmark has no effect on the associated changesets.
1027
1027
1028 Creating or updating to a bookmark causes it to be marked as 'active'.
1028 Creating or updating to a bookmark causes it to be marked as 'active'.
1029 The active bookmark is indicated with a '*'.
1029 The active bookmark is indicated with a '*'.
1030 When a commit is made, the active bookmark will advance to the new commit.
1030 When a commit is made, the active bookmark will advance to the new commit.
1031 A plain :hg:`update` will also advance an active bookmark, if possible.
1031 A plain :hg:`update` will also advance an active bookmark, if possible.
1032 Updating away from a bookmark will cause it to be deactivated.
1032 Updating away from a bookmark will cause it to be deactivated.
1033
1033
1034 Bookmarks can be pushed and pulled between repositories (see
1034 Bookmarks can be pushed and pulled between repositories (see
1035 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1035 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1036 diverged, a new 'divergent bookmark' of the form 'name@path' will
1036 diverged, a new 'divergent bookmark' of the form 'name@path' will
1037 be created. Using :hg:`merge` will resolve the divergence.
1037 be created. Using :hg:`merge` will resolve the divergence.
1038
1038
1039 A bookmark named '@' has the special property that :hg:`clone` will
1039 A bookmark named '@' has the special property that :hg:`clone` will
1040 check it out by default if it exists.
1040 check it out by default if it exists.
1041
1041
1042 .. container:: verbose
1042 .. container:: verbose
1043
1043
1044 Examples:
1044 Examples:
1045
1045
1046 - create an active bookmark for a new line of development::
1046 - create an active bookmark for a new line of development::
1047
1047
1048 hg book new-feature
1048 hg book new-feature
1049
1049
1050 - create an inactive bookmark as a place marker::
1050 - create an inactive bookmark as a place marker::
1051
1051
1052 hg book -i reviewed
1052 hg book -i reviewed
1053
1053
1054 - create an inactive bookmark on another changeset::
1054 - create an inactive bookmark on another changeset::
1055
1055
1056 hg book -r .^ tested
1056 hg book -r .^ tested
1057
1057
1058 - rename bookmark turkey to dinner::
1058 - rename bookmark turkey to dinner::
1059
1059
1060 hg book -m turkey dinner
1060 hg book -m turkey dinner
1061
1061
1062 - move the '@' bookmark from another branch::
1062 - move the '@' bookmark from another branch::
1063
1063
1064 hg book -f @
1064 hg book -f @
1065 '''
1065 '''
1066 force = opts.get('force')
1066 force = opts.get('force')
1067 rev = opts.get('rev')
1067 rev = opts.get('rev')
1068 delete = opts.get('delete')
1068 delete = opts.get('delete')
1069 rename = opts.get('rename')
1069 rename = opts.get('rename')
1070 inactive = opts.get('inactive')
1070 inactive = opts.get('inactive')
1071
1071
1072 def checkformat(mark):
1072 def checkformat(mark):
1073 mark = mark.strip()
1073 mark = mark.strip()
1074 if not mark:
1074 if not mark:
1075 raise error.Abort(_("bookmark names cannot consist entirely of "
1075 raise error.Abort(_("bookmark names cannot consist entirely of "
1076 "whitespace"))
1076 "whitespace"))
1077 scmutil.checknewlabel(repo, mark, 'bookmark')
1077 scmutil.checknewlabel(repo, mark, 'bookmark')
1078 return mark
1078 return mark
1079
1079
1080 def checkconflict(repo, mark, cur, force=False, target=None):
1080 def checkconflict(repo, mark, cur, force=False, target=None):
1081 if mark in marks and not force:
1081 if mark in marks and not force:
1082 if target:
1082 if target:
1083 if marks[mark] == target and target == cur:
1083 if marks[mark] == target and target == cur:
1084 # re-activating a bookmark
1084 # re-activating a bookmark
1085 return
1085 return
1086 anc = repo.changelog.ancestors([repo[target].rev()])
1086 anc = repo.changelog.ancestors([repo[target].rev()])
1087 bmctx = repo[marks[mark]]
1087 bmctx = repo[marks[mark]]
1088 divs = [repo[b].node() for b in marks
1088 divs = [repo[b].node() for b in marks
1089 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1089 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1090
1090
1091 # allow resolving a single divergent bookmark even if moving
1091 # allow resolving a single divergent bookmark even if moving
1092 # the bookmark across branches when a revision is specified
1092 # the bookmark across branches when a revision is specified
1093 # that contains a divergent bookmark
1093 # that contains a divergent bookmark
1094 if bmctx.rev() not in anc and target in divs:
1094 if bmctx.rev() not in anc and target in divs:
1095 bookmarks.deletedivergent(repo, [target], mark)
1095 bookmarks.deletedivergent(repo, [target], mark)
1096 return
1096 return
1097
1097
1098 deletefrom = [b for b in divs
1098 deletefrom = [b for b in divs
1099 if repo[b].rev() in anc or b == target]
1099 if repo[b].rev() in anc or b == target]
1100 bookmarks.deletedivergent(repo, deletefrom, mark)
1100 bookmarks.deletedivergent(repo, deletefrom, mark)
1101 if bookmarks.validdest(repo, bmctx, repo[target]):
1101 if bookmarks.validdest(repo, bmctx, repo[target]):
1102 ui.status(_("moving bookmark '%s' forward from %s\n") %
1102 ui.status(_("moving bookmark '%s' forward from %s\n") %
1103 (mark, short(bmctx.node())))
1103 (mark, short(bmctx.node())))
1104 return
1104 return
1105 raise error.Abort(_("bookmark '%s' already exists "
1105 raise error.Abort(_("bookmark '%s' already exists "
1106 "(use -f to force)") % mark)
1106 "(use -f to force)") % mark)
1107 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1107 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1108 and not force):
1108 and not force):
1109 raise error.Abort(
1109 raise error.Abort(
1110 _("a bookmark cannot have the name of an existing branch"))
1110 _("a bookmark cannot have the name of an existing branch"))
1111
1111
1112 if delete and rename:
1112 if delete and rename:
1113 raise error.Abort(_("--delete and --rename are incompatible"))
1113 raise error.Abort(_("--delete and --rename are incompatible"))
1114 if delete and rev:
1114 if delete and rev:
1115 raise error.Abort(_("--rev is incompatible with --delete"))
1115 raise error.Abort(_("--rev is incompatible with --delete"))
1116 if rename and rev:
1116 if rename and rev:
1117 raise error.Abort(_("--rev is incompatible with --rename"))
1117 raise error.Abort(_("--rev is incompatible with --rename"))
1118 if not names and (delete or rev):
1118 if not names and (delete or rev):
1119 raise error.Abort(_("bookmark name required"))
1119 raise error.Abort(_("bookmark name required"))
1120
1120
1121 if delete or rename or names or inactive:
1121 if delete or rename or names or inactive:
1122 wlock = lock = tr = None
1122 wlock = lock = tr = None
1123 try:
1123 try:
1124 wlock = repo.wlock()
1124 wlock = repo.wlock()
1125 lock = repo.lock()
1125 lock = repo.lock()
1126 cur = repo.changectx('.').node()
1126 cur = repo.changectx('.').node()
1127 marks = repo._bookmarks
1127 marks = repo._bookmarks
1128 if delete:
1128 if delete:
1129 tr = repo.transaction('bookmark')
1129 tr = repo.transaction('bookmark')
1130 for mark in names:
1130 for mark in names:
1131 if mark not in marks:
1131 if mark not in marks:
1132 raise error.Abort(_("bookmark '%s' does not exist") %
1132 raise error.Abort(_("bookmark '%s' does not exist") %
1133 mark)
1133 mark)
1134 if mark == repo._activebookmark:
1134 if mark == repo._activebookmark:
1135 bookmarks.deactivate(repo)
1135 bookmarks.deactivate(repo)
1136 del marks[mark]
1136 del marks[mark]
1137
1137
1138 elif rename:
1138 elif rename:
1139 tr = repo.transaction('bookmark')
1139 tr = repo.transaction('bookmark')
1140 if not names:
1140 if not names:
1141 raise error.Abort(_("new bookmark name required"))
1141 raise error.Abort(_("new bookmark name required"))
1142 elif len(names) > 1:
1142 elif len(names) > 1:
1143 raise error.Abort(_("only one new bookmark name allowed"))
1143 raise error.Abort(_("only one new bookmark name allowed"))
1144 mark = checkformat(names[0])
1144 mark = checkformat(names[0])
1145 if rename not in marks:
1145 if rename not in marks:
1146 raise error.Abort(_("bookmark '%s' does not exist")
1146 raise error.Abort(_("bookmark '%s' does not exist")
1147 % rename)
1147 % rename)
1148 checkconflict(repo, mark, cur, force)
1148 checkconflict(repo, mark, cur, force)
1149 marks[mark] = marks[rename]
1149 marks[mark] = marks[rename]
1150 if repo._activebookmark == rename and not inactive:
1150 if repo._activebookmark == rename and not inactive:
1151 bookmarks.activate(repo, mark)
1151 bookmarks.activate(repo, mark)
1152 del marks[rename]
1152 del marks[rename]
1153 elif names:
1153 elif names:
1154 tr = repo.transaction('bookmark')
1154 tr = repo.transaction('bookmark')
1155 newact = None
1155 newact = None
1156 for mark in names:
1156 for mark in names:
1157 mark = checkformat(mark)
1157 mark = checkformat(mark)
1158 if newact is None:
1158 if newact is None:
1159 newact = mark
1159 newact = mark
1160 if inactive and mark == repo._activebookmark:
1160 if inactive and mark == repo._activebookmark:
1161 bookmarks.deactivate(repo)
1161 bookmarks.deactivate(repo)
1162 return
1162 return
1163 tgt = cur
1163 tgt = cur
1164 if rev:
1164 if rev:
1165 tgt = scmutil.revsingle(repo, rev).node()
1165 tgt = scmutil.revsingle(repo, rev).node()
1166 checkconflict(repo, mark, cur, force, tgt)
1166 checkconflict(repo, mark, cur, force, tgt)
1167 marks[mark] = tgt
1167 marks[mark] = tgt
1168 if not inactive and cur == marks[newact] and not rev:
1168 if not inactive and cur == marks[newact] and not rev:
1169 bookmarks.activate(repo, newact)
1169 bookmarks.activate(repo, newact)
1170 elif cur != tgt and newact == repo._activebookmark:
1170 elif cur != tgt and newact == repo._activebookmark:
1171 bookmarks.deactivate(repo)
1171 bookmarks.deactivate(repo)
1172 elif inactive:
1172 elif inactive:
1173 if len(marks) == 0:
1173 if len(marks) == 0:
1174 ui.status(_("no bookmarks set\n"))
1174 ui.status(_("no bookmarks set\n"))
1175 elif not repo._activebookmark:
1175 elif not repo._activebookmark:
1176 ui.status(_("no active bookmark\n"))
1176 ui.status(_("no active bookmark\n"))
1177 else:
1177 else:
1178 bookmarks.deactivate(repo)
1178 bookmarks.deactivate(repo)
1179 if tr is not None:
1179 if tr is not None:
1180 marks.recordchange(tr)
1180 marks.recordchange(tr)
1181 tr.close()
1181 tr.close()
1182 finally:
1182 finally:
1183 lockmod.release(tr, lock, wlock)
1183 lockmod.release(tr, lock, wlock)
1184 else: # show bookmarks
1184 else: # show bookmarks
1185 fm = ui.formatter('bookmarks', opts)
1185 fm = ui.formatter('bookmarks', opts)
1186 hexfn = fm.hexfunc
1186 hexfn = fm.hexfunc
1187 marks = repo._bookmarks
1187 marks = repo._bookmarks
1188 if len(marks) == 0 and not fm:
1188 if len(marks) == 0 and fm.isplain():
1189 ui.status(_("no bookmarks set\n"))
1189 ui.status(_("no bookmarks set\n"))
1190 for bmark, n in sorted(marks.iteritems()):
1190 for bmark, n in sorted(marks.iteritems()):
1191 active = repo._activebookmark
1191 active = repo._activebookmark
1192 if bmark == active:
1192 if bmark == active:
1193 prefix, label = '*', activebookmarklabel
1193 prefix, label = '*', activebookmarklabel
1194 else:
1194 else:
1195 prefix, label = ' ', ''
1195 prefix, label = ' ', ''
1196
1196
1197 fm.startitem()
1197 fm.startitem()
1198 if not ui.quiet:
1198 if not ui.quiet:
1199 fm.plain(' %s ' % prefix, label=label)
1199 fm.plain(' %s ' % prefix, label=label)
1200 fm.write('bookmark', '%s', bmark, label=label)
1200 fm.write('bookmark', '%s', bmark, label=label)
1201 pad = " " * (25 - encoding.colwidth(bmark))
1201 pad = " " * (25 - encoding.colwidth(bmark))
1202 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1202 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1203 repo.changelog.rev(n), hexfn(n), label=label)
1203 repo.changelog.rev(n), hexfn(n), label=label)
1204 fm.data(active=(bmark == active))
1204 fm.data(active=(bmark == active))
1205 fm.plain('\n')
1205 fm.plain('\n')
1206 fm.end()
1206 fm.end()
1207
1207
1208 @command('branch',
1208 @command('branch',
1209 [('f', 'force', None,
1209 [('f', 'force', None,
1210 _('set branch name even if it shadows an existing branch')),
1210 _('set branch name even if it shadows an existing branch')),
1211 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1211 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1212 _('[-fC] [NAME]'))
1212 _('[-fC] [NAME]'))
1213 def branch(ui, repo, label=None, **opts):
1213 def branch(ui, repo, label=None, **opts):
1214 """set or show the current branch name
1214 """set or show the current branch name
1215
1215
1216 .. note::
1216 .. note::
1217
1217
1218 Branch names are permanent and global. Use :hg:`bookmark` to create a
1218 Branch names are permanent and global. Use :hg:`bookmark` to create a
1219 light-weight bookmark instead. See :hg:`help glossary` for more
1219 light-weight bookmark instead. See :hg:`help glossary` for more
1220 information about named branches and bookmarks.
1220 information about named branches and bookmarks.
1221
1221
1222 With no argument, show the current branch name. With one argument,
1222 With no argument, show the current branch name. With one argument,
1223 set the working directory branch name (the branch will not exist
1223 set the working directory branch name (the branch will not exist
1224 in the repository until the next commit). Standard practice
1224 in the repository until the next commit). Standard practice
1225 recommends that primary development take place on the 'default'
1225 recommends that primary development take place on the 'default'
1226 branch.
1226 branch.
1227
1227
1228 Unless -f/--force is specified, branch will not let you set a
1228 Unless -f/--force is specified, branch will not let you set a
1229 branch name that already exists.
1229 branch name that already exists.
1230
1230
1231 Use -C/--clean to reset the working directory branch to that of
1231 Use -C/--clean to reset the working directory branch to that of
1232 the parent of the working directory, negating a previous branch
1232 the parent of the working directory, negating a previous branch
1233 change.
1233 change.
1234
1234
1235 Use the command :hg:`update` to switch to an existing branch. Use
1235 Use the command :hg:`update` to switch to an existing branch. Use
1236 :hg:`commit --close-branch` to mark this branch head as closed.
1236 :hg:`commit --close-branch` to mark this branch head as closed.
1237 When all heads of a branch are closed, the branch will be
1237 When all heads of a branch are closed, the branch will be
1238 considered closed.
1238 considered closed.
1239
1239
1240 Returns 0 on success.
1240 Returns 0 on success.
1241 """
1241 """
1242 if label:
1242 if label:
1243 label = label.strip()
1243 label = label.strip()
1244
1244
1245 if not opts.get('clean') and not label:
1245 if not opts.get('clean') and not label:
1246 ui.write("%s\n" % repo.dirstate.branch())
1246 ui.write("%s\n" % repo.dirstate.branch())
1247 return
1247 return
1248
1248
1249 with repo.wlock():
1249 with repo.wlock():
1250 if opts.get('clean'):
1250 if opts.get('clean'):
1251 label = repo[None].p1().branch()
1251 label = repo[None].p1().branch()
1252 repo.dirstate.setbranch(label)
1252 repo.dirstate.setbranch(label)
1253 ui.status(_('reset working directory to branch %s\n') % label)
1253 ui.status(_('reset working directory to branch %s\n') % label)
1254 elif label:
1254 elif label:
1255 if not opts.get('force') and label in repo.branchmap():
1255 if not opts.get('force') and label in repo.branchmap():
1256 if label not in [p.branch() for p in repo[None].parents()]:
1256 if label not in [p.branch() for p in repo[None].parents()]:
1257 raise error.Abort(_('a branch of the same name already'
1257 raise error.Abort(_('a branch of the same name already'
1258 ' exists'),
1258 ' exists'),
1259 # i18n: "it" refers to an existing branch
1259 # i18n: "it" refers to an existing branch
1260 hint=_("use 'hg update' to switch to it"))
1260 hint=_("use 'hg update' to switch to it"))
1261 scmutil.checknewlabel(repo, label, 'branch')
1261 scmutil.checknewlabel(repo, label, 'branch')
1262 repo.dirstate.setbranch(label)
1262 repo.dirstate.setbranch(label)
1263 ui.status(_('marked working directory as branch %s\n') % label)
1263 ui.status(_('marked working directory as branch %s\n') % label)
1264
1264
1265 # find any open named branches aside from default
1265 # find any open named branches aside from default
1266 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1266 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1267 if n != "default" and not c]
1267 if n != "default" and not c]
1268 if not others:
1268 if not others:
1269 ui.status(_('(branches are permanent and global, '
1269 ui.status(_('(branches are permanent and global, '
1270 'did you want a bookmark?)\n'))
1270 'did you want a bookmark?)\n'))
1271
1271
1272 @command('branches',
1272 @command('branches',
1273 [('a', 'active', False,
1273 [('a', 'active', False,
1274 _('show only branches that have unmerged heads (DEPRECATED)')),
1274 _('show only branches that have unmerged heads (DEPRECATED)')),
1275 ('c', 'closed', False, _('show normal and closed branches')),
1275 ('c', 'closed', False, _('show normal and closed branches')),
1276 ] + formatteropts,
1276 ] + formatteropts,
1277 _('[-c]'))
1277 _('[-c]'))
1278 def branches(ui, repo, active=False, closed=False, **opts):
1278 def branches(ui, repo, active=False, closed=False, **opts):
1279 """list repository named branches
1279 """list repository named branches
1280
1280
1281 List the repository's named branches, indicating which ones are
1281 List the repository's named branches, indicating which ones are
1282 inactive. If -c/--closed is specified, also list branches which have
1282 inactive. If -c/--closed is specified, also list branches which have
1283 been marked closed (see :hg:`commit --close-branch`).
1283 been marked closed (see :hg:`commit --close-branch`).
1284
1284
1285 Use the command :hg:`update` to switch to an existing branch.
1285 Use the command :hg:`update` to switch to an existing branch.
1286
1286
1287 Returns 0.
1287 Returns 0.
1288 """
1288 """
1289
1289
1290 fm = ui.formatter('branches', opts)
1290 fm = ui.formatter('branches', opts)
1291 hexfunc = fm.hexfunc
1291 hexfunc = fm.hexfunc
1292
1292
1293 allheads = set(repo.heads())
1293 allheads = set(repo.heads())
1294 branches = []
1294 branches = []
1295 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1295 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1296 isactive = not isclosed and bool(set(heads) & allheads)
1296 isactive = not isclosed and bool(set(heads) & allheads)
1297 branches.append((tag, repo[tip], isactive, not isclosed))
1297 branches.append((tag, repo[tip], isactive, not isclosed))
1298 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1298 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1299 reverse=True)
1299 reverse=True)
1300
1300
1301 for tag, ctx, isactive, isopen in branches:
1301 for tag, ctx, isactive, isopen in branches:
1302 if active and not isactive:
1302 if active and not isactive:
1303 continue
1303 continue
1304 if isactive:
1304 if isactive:
1305 label = 'branches.active'
1305 label = 'branches.active'
1306 notice = ''
1306 notice = ''
1307 elif not isopen:
1307 elif not isopen:
1308 if not closed:
1308 if not closed:
1309 continue
1309 continue
1310 label = 'branches.closed'
1310 label = 'branches.closed'
1311 notice = _(' (closed)')
1311 notice = _(' (closed)')
1312 else:
1312 else:
1313 label = 'branches.inactive'
1313 label = 'branches.inactive'
1314 notice = _(' (inactive)')
1314 notice = _(' (inactive)')
1315 current = (tag == repo.dirstate.branch())
1315 current = (tag == repo.dirstate.branch())
1316 if current:
1316 if current:
1317 label = 'branches.current'
1317 label = 'branches.current'
1318
1318
1319 fm.startitem()
1319 fm.startitem()
1320 fm.write('branch', '%s', tag, label=label)
1320 fm.write('branch', '%s', tag, label=label)
1321 rev = ctx.rev()
1321 rev = ctx.rev()
1322 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1322 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1323 fmt = ' ' * padsize + ' %d:%s'
1323 fmt = ' ' * padsize + ' %d:%s'
1324 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1324 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1325 label='log.changeset changeset.%s' % ctx.phasestr())
1325 label='log.changeset changeset.%s' % ctx.phasestr())
1326 fm.data(active=isactive, closed=not isopen, current=current)
1326 fm.data(active=isactive, closed=not isopen, current=current)
1327 if not ui.quiet:
1327 if not ui.quiet:
1328 fm.plain(notice)
1328 fm.plain(notice)
1329 fm.plain('\n')
1329 fm.plain('\n')
1330 fm.end()
1330 fm.end()
1331
1331
1332 @command('bundle',
1332 @command('bundle',
1333 [('f', 'force', None, _('run even when the destination is unrelated')),
1333 [('f', 'force', None, _('run even when the destination is unrelated')),
1334 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1334 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1335 _('REV')),
1335 _('REV')),
1336 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1336 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1337 _('BRANCH')),
1337 _('BRANCH')),
1338 ('', 'base', [],
1338 ('', 'base', [],
1339 _('a base changeset assumed to be available at the destination'),
1339 _('a base changeset assumed to be available at the destination'),
1340 _('REV')),
1340 _('REV')),
1341 ('a', 'all', None, _('bundle all changesets in the repository')),
1341 ('a', 'all', None, _('bundle all changesets in the repository')),
1342 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1342 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1343 ] + remoteopts,
1343 ] + remoteopts,
1344 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1344 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1345 def bundle(ui, repo, fname, dest=None, **opts):
1345 def bundle(ui, repo, fname, dest=None, **opts):
1346 """create a changegroup file
1346 """create a changegroup file
1347
1347
1348 Generate a changegroup file collecting changesets to be added
1348 Generate a changegroup file collecting changesets to be added
1349 to a repository.
1349 to a repository.
1350
1350
1351 To create a bundle containing all changesets, use -a/--all
1351 To create a bundle containing all changesets, use -a/--all
1352 (or --base null). Otherwise, hg assumes the destination will have
1352 (or --base null). Otherwise, hg assumes the destination will have
1353 all the nodes you specify with --base parameters. Otherwise, hg
1353 all the nodes you specify with --base parameters. Otherwise, hg
1354 will assume the repository has all the nodes in destination, or
1354 will assume the repository has all the nodes in destination, or
1355 default-push/default if no destination is specified.
1355 default-push/default if no destination is specified.
1356
1356
1357 You can change bundle format with the -t/--type option. You can
1357 You can change bundle format with the -t/--type option. You can
1358 specify a compression, a bundle version or both using a dash
1358 specify a compression, a bundle version or both using a dash
1359 (comp-version). The available compression methods are: none, bzip2,
1359 (comp-version). The available compression methods are: none, bzip2,
1360 and gzip (by default, bundles are compressed using bzip2). The
1360 and gzip (by default, bundles are compressed using bzip2). The
1361 available formats are: v1, v2 (default to most suitable).
1361 available formats are: v1, v2 (default to most suitable).
1362
1362
1363 The bundle file can then be transferred using conventional means
1363 The bundle file can then be transferred using conventional means
1364 and applied to another repository with the unbundle or pull
1364 and applied to another repository with the unbundle or pull
1365 command. This is useful when direct push and pull are not
1365 command. This is useful when direct push and pull are not
1366 available or when exporting an entire repository is undesirable.
1366 available or when exporting an entire repository is undesirable.
1367
1367
1368 Applying bundles preserves all changeset contents including
1368 Applying bundles preserves all changeset contents including
1369 permissions, copy/rename information, and revision history.
1369 permissions, copy/rename information, and revision history.
1370
1370
1371 Returns 0 on success, 1 if no changes found.
1371 Returns 0 on success, 1 if no changes found.
1372 """
1372 """
1373 revs = None
1373 revs = None
1374 if 'rev' in opts:
1374 if 'rev' in opts:
1375 revstrings = opts['rev']
1375 revstrings = opts['rev']
1376 revs = scmutil.revrange(repo, revstrings)
1376 revs = scmutil.revrange(repo, revstrings)
1377 if revstrings and not revs:
1377 if revstrings and not revs:
1378 raise error.Abort(_('no commits to bundle'))
1378 raise error.Abort(_('no commits to bundle'))
1379
1379
1380 bundletype = opts.get('type', 'bzip2').lower()
1380 bundletype = opts.get('type', 'bzip2').lower()
1381 try:
1381 try:
1382 bcompression, cgversion, params = exchange.parsebundlespec(
1382 bcompression, cgversion, params = exchange.parsebundlespec(
1383 repo, bundletype, strict=False)
1383 repo, bundletype, strict=False)
1384 except error.UnsupportedBundleSpecification as e:
1384 except error.UnsupportedBundleSpecification as e:
1385 raise error.Abort(str(e),
1385 raise error.Abort(str(e),
1386 hint=_('see "hg help bundle" for supported '
1386 hint=_('see "hg help bundle" for supported '
1387 'values for --type'))
1387 'values for --type'))
1388
1388
1389 # Packed bundles are a pseudo bundle format for now.
1389 # Packed bundles are a pseudo bundle format for now.
1390 if cgversion == 's1':
1390 if cgversion == 's1':
1391 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1391 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1392 hint=_("use 'hg debugcreatestreamclonebundle'"))
1392 hint=_("use 'hg debugcreatestreamclonebundle'"))
1393
1393
1394 if opts.get('all'):
1394 if opts.get('all'):
1395 if dest:
1395 if dest:
1396 raise error.Abort(_("--all is incompatible with specifying "
1396 raise error.Abort(_("--all is incompatible with specifying "
1397 "a destination"))
1397 "a destination"))
1398 if opts.get('base'):
1398 if opts.get('base'):
1399 ui.warn(_("ignoring --base because --all was specified\n"))
1399 ui.warn(_("ignoring --base because --all was specified\n"))
1400 base = ['null']
1400 base = ['null']
1401 else:
1401 else:
1402 base = scmutil.revrange(repo, opts.get('base'))
1402 base = scmutil.revrange(repo, opts.get('base'))
1403 # TODO: get desired bundlecaps from command line.
1403 # TODO: get desired bundlecaps from command line.
1404 bundlecaps = None
1404 bundlecaps = None
1405 if cgversion not in changegroup.supportedoutgoingversions(repo):
1405 if cgversion not in changegroup.supportedoutgoingversions(repo):
1406 raise error.Abort(_("repository does not support bundle version %s") %
1406 raise error.Abort(_("repository does not support bundle version %s") %
1407 cgversion)
1407 cgversion)
1408
1408
1409 if base:
1409 if base:
1410 if dest:
1410 if dest:
1411 raise error.Abort(_("--base is incompatible with specifying "
1411 raise error.Abort(_("--base is incompatible with specifying "
1412 "a destination"))
1412 "a destination"))
1413 common = [repo.lookup(rev) for rev in base]
1413 common = [repo.lookup(rev) for rev in base]
1414 heads = revs and map(repo.lookup, revs) or None
1414 heads = revs and map(repo.lookup, revs) or None
1415 outgoing = discovery.outgoing(repo, common, heads)
1415 outgoing = discovery.outgoing(repo, common, heads)
1416 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1416 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1417 bundlecaps=bundlecaps,
1417 bundlecaps=bundlecaps,
1418 version=cgversion)
1418 version=cgversion)
1419 outgoing = None
1419 outgoing = None
1420 else:
1420 else:
1421 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1421 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1422 dest, branches = hg.parseurl(dest, opts.get('branch'))
1422 dest, branches = hg.parseurl(dest, opts.get('branch'))
1423 other = hg.peer(repo, opts, dest)
1423 other = hg.peer(repo, opts, dest)
1424 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1424 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1425 heads = revs and map(repo.lookup, revs) or revs
1425 heads = revs and map(repo.lookup, revs) or revs
1426 outgoing = discovery.findcommonoutgoing(repo, other,
1426 outgoing = discovery.findcommonoutgoing(repo, other,
1427 onlyheads=heads,
1427 onlyheads=heads,
1428 force=opts.get('force'),
1428 force=opts.get('force'),
1429 portable=True)
1429 portable=True)
1430 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1430 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1431 bundlecaps, version=cgversion)
1431 bundlecaps, version=cgversion)
1432 if not cg:
1432 if not cg:
1433 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1433 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1434 return 1
1434 return 1
1435
1435
1436 if cgversion == '01': #bundle1
1436 if cgversion == '01': #bundle1
1437 if bcompression is None:
1437 if bcompression is None:
1438 bcompression = 'UN'
1438 bcompression = 'UN'
1439 bversion = 'HG10' + bcompression
1439 bversion = 'HG10' + bcompression
1440 bcompression = None
1440 bcompression = None
1441 else:
1441 else:
1442 assert cgversion == '02'
1442 assert cgversion == '02'
1443 bversion = 'HG20'
1443 bversion = 'HG20'
1444
1444
1445 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression)
1445 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression)
1446
1446
1447 @command('cat',
1447 @command('cat',
1448 [('o', 'output', '',
1448 [('o', 'output', '',
1449 _('print output to file with formatted name'), _('FORMAT')),
1449 _('print output to file with formatted name'), _('FORMAT')),
1450 ('r', 'rev', '', _('print the given revision'), _('REV')),
1450 ('r', 'rev', '', _('print the given revision'), _('REV')),
1451 ('', 'decode', None, _('apply any matching decode filter')),
1451 ('', 'decode', None, _('apply any matching decode filter')),
1452 ] + walkopts,
1452 ] + walkopts,
1453 _('[OPTION]... FILE...'),
1453 _('[OPTION]... FILE...'),
1454 inferrepo=True)
1454 inferrepo=True)
1455 def cat(ui, repo, file1, *pats, **opts):
1455 def cat(ui, repo, file1, *pats, **opts):
1456 """output the current or given revision of files
1456 """output the current or given revision of files
1457
1457
1458 Print the specified files as they were at the given revision. If
1458 Print the specified files as they were at the given revision. If
1459 no revision is given, the parent of the working directory is used.
1459 no revision is given, the parent of the working directory is used.
1460
1460
1461 Output may be to a file, in which case the name of the file is
1461 Output may be to a file, in which case the name of the file is
1462 given using a format string. The formatting rules as follows:
1462 given using a format string. The formatting rules as follows:
1463
1463
1464 :``%%``: literal "%" character
1464 :``%%``: literal "%" character
1465 :``%s``: basename of file being printed
1465 :``%s``: basename of file being printed
1466 :``%d``: dirname of file being printed, or '.' if in repository root
1466 :``%d``: dirname of file being printed, or '.' if in repository root
1467 :``%p``: root-relative path name of file being printed
1467 :``%p``: root-relative path name of file being printed
1468 :``%H``: changeset hash (40 hexadecimal digits)
1468 :``%H``: changeset hash (40 hexadecimal digits)
1469 :``%R``: changeset revision number
1469 :``%R``: changeset revision number
1470 :``%h``: short-form changeset hash (12 hexadecimal digits)
1470 :``%h``: short-form changeset hash (12 hexadecimal digits)
1471 :``%r``: zero-padded changeset revision number
1471 :``%r``: zero-padded changeset revision number
1472 :``%b``: basename of the exporting repository
1472 :``%b``: basename of the exporting repository
1473
1473
1474 Returns 0 on success.
1474 Returns 0 on success.
1475 """
1475 """
1476 ctx = scmutil.revsingle(repo, opts.get('rev'))
1476 ctx = scmutil.revsingle(repo, opts.get('rev'))
1477 m = scmutil.match(ctx, (file1,) + pats, opts)
1477 m = scmutil.match(ctx, (file1,) + pats, opts)
1478
1478
1479 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1479 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1480
1480
1481 @command('^clone',
1481 @command('^clone',
1482 [('U', 'noupdate', None, _('the clone will include an empty working '
1482 [('U', 'noupdate', None, _('the clone will include an empty working '
1483 'directory (only a repository)')),
1483 'directory (only a repository)')),
1484 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1484 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1485 _('REV')),
1485 _('REV')),
1486 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1486 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1487 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1487 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1488 ('', 'pull', None, _('use pull protocol to copy metadata')),
1488 ('', 'pull', None, _('use pull protocol to copy metadata')),
1489 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1489 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1490 ] + remoteopts,
1490 ] + remoteopts,
1491 _('[OPTION]... SOURCE [DEST]'),
1491 _('[OPTION]... SOURCE [DEST]'),
1492 norepo=True)
1492 norepo=True)
1493 def clone(ui, source, dest=None, **opts):
1493 def clone(ui, source, dest=None, **opts):
1494 """make a copy of an existing repository
1494 """make a copy of an existing repository
1495
1495
1496 Create a copy of an existing repository in a new directory.
1496 Create a copy of an existing repository in a new directory.
1497
1497
1498 If no destination directory name is specified, it defaults to the
1498 If no destination directory name is specified, it defaults to the
1499 basename of the source.
1499 basename of the source.
1500
1500
1501 The location of the source is added to the new repository's
1501 The location of the source is added to the new repository's
1502 ``.hg/hgrc`` file, as the default to be used for future pulls.
1502 ``.hg/hgrc`` file, as the default to be used for future pulls.
1503
1503
1504 Only local paths and ``ssh://`` URLs are supported as
1504 Only local paths and ``ssh://`` URLs are supported as
1505 destinations. For ``ssh://`` destinations, no working directory or
1505 destinations. For ``ssh://`` destinations, no working directory or
1506 ``.hg/hgrc`` will be created on the remote side.
1506 ``.hg/hgrc`` will be created on the remote side.
1507
1507
1508 If the source repository has a bookmark called '@' set, that
1508 If the source repository has a bookmark called '@' set, that
1509 revision will be checked out in the new repository by default.
1509 revision will be checked out in the new repository by default.
1510
1510
1511 To check out a particular version, use -u/--update, or
1511 To check out a particular version, use -u/--update, or
1512 -U/--noupdate to create a clone with no working directory.
1512 -U/--noupdate to create a clone with no working directory.
1513
1513
1514 To pull only a subset of changesets, specify one or more revisions
1514 To pull only a subset of changesets, specify one or more revisions
1515 identifiers with -r/--rev or branches with -b/--branch. The
1515 identifiers with -r/--rev or branches with -b/--branch. The
1516 resulting clone will contain only the specified changesets and
1516 resulting clone will contain only the specified changesets and
1517 their ancestors. These options (or 'clone src#rev dest') imply
1517 their ancestors. These options (or 'clone src#rev dest') imply
1518 --pull, even for local source repositories.
1518 --pull, even for local source repositories.
1519
1519
1520 .. note::
1520 .. note::
1521
1521
1522 Specifying a tag will include the tagged changeset but not the
1522 Specifying a tag will include the tagged changeset but not the
1523 changeset containing the tag.
1523 changeset containing the tag.
1524
1524
1525 .. container:: verbose
1525 .. container:: verbose
1526
1526
1527 For efficiency, hardlinks are used for cloning whenever the
1527 For efficiency, hardlinks are used for cloning whenever the
1528 source and destination are on the same filesystem (note this
1528 source and destination are on the same filesystem (note this
1529 applies only to the repository data, not to the working
1529 applies only to the repository data, not to the working
1530 directory). Some filesystems, such as AFS, implement hardlinking
1530 directory). Some filesystems, such as AFS, implement hardlinking
1531 incorrectly, but do not report errors. In these cases, use the
1531 incorrectly, but do not report errors. In these cases, use the
1532 --pull option to avoid hardlinking.
1532 --pull option to avoid hardlinking.
1533
1533
1534 In some cases, you can clone repositories and the working
1534 In some cases, you can clone repositories and the working
1535 directory using full hardlinks with ::
1535 directory using full hardlinks with ::
1536
1536
1537 $ cp -al REPO REPOCLONE
1537 $ cp -al REPO REPOCLONE
1538
1538
1539 This is the fastest way to clone, but it is not always safe. The
1539 This is the fastest way to clone, but it is not always safe. The
1540 operation is not atomic (making sure REPO is not modified during
1540 operation is not atomic (making sure REPO is not modified during
1541 the operation is up to you) and you have to make sure your
1541 the operation is up to you) and you have to make sure your
1542 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1542 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1543 so). Also, this is not compatible with certain extensions that
1543 so). Also, this is not compatible with certain extensions that
1544 place their metadata under the .hg directory, such as mq.
1544 place their metadata under the .hg directory, such as mq.
1545
1545
1546 Mercurial will update the working directory to the first applicable
1546 Mercurial will update the working directory to the first applicable
1547 revision from this list:
1547 revision from this list:
1548
1548
1549 a) null if -U or the source repository has no changesets
1549 a) null if -U or the source repository has no changesets
1550 b) if -u . and the source repository is local, the first parent of
1550 b) if -u . and the source repository is local, the first parent of
1551 the source repository's working directory
1551 the source repository's working directory
1552 c) the changeset specified with -u (if a branch name, this means the
1552 c) the changeset specified with -u (if a branch name, this means the
1553 latest head of that branch)
1553 latest head of that branch)
1554 d) the changeset specified with -r
1554 d) the changeset specified with -r
1555 e) the tipmost head specified with -b
1555 e) the tipmost head specified with -b
1556 f) the tipmost head specified with the url#branch source syntax
1556 f) the tipmost head specified with the url#branch source syntax
1557 g) the revision marked with the '@' bookmark, if present
1557 g) the revision marked with the '@' bookmark, if present
1558 h) the tipmost head of the default branch
1558 h) the tipmost head of the default branch
1559 i) tip
1559 i) tip
1560
1560
1561 When cloning from servers that support it, Mercurial may fetch
1561 When cloning from servers that support it, Mercurial may fetch
1562 pre-generated data from a server-advertised URL. When this is done,
1562 pre-generated data from a server-advertised URL. When this is done,
1563 hooks operating on incoming changesets and changegroups may fire twice,
1563 hooks operating on incoming changesets and changegroups may fire twice,
1564 once for the bundle fetched from the URL and another for any additional
1564 once for the bundle fetched from the URL and another for any additional
1565 data not fetched from this URL. In addition, if an error occurs, the
1565 data not fetched from this URL. In addition, if an error occurs, the
1566 repository may be rolled back to a partial clone. This behavior may
1566 repository may be rolled back to a partial clone. This behavior may
1567 change in future releases. See :hg:`help -e clonebundles` for more.
1567 change in future releases. See :hg:`help -e clonebundles` for more.
1568
1568
1569 Examples:
1569 Examples:
1570
1570
1571 - clone a remote repository to a new directory named hg/::
1571 - clone a remote repository to a new directory named hg/::
1572
1572
1573 hg clone http://selenic.com/hg
1573 hg clone http://selenic.com/hg
1574
1574
1575 - create a lightweight local clone::
1575 - create a lightweight local clone::
1576
1576
1577 hg clone project/ project-feature/
1577 hg clone project/ project-feature/
1578
1578
1579 - clone from an absolute path on an ssh server (note double-slash)::
1579 - clone from an absolute path on an ssh server (note double-slash)::
1580
1580
1581 hg clone ssh://user@server//home/projects/alpha/
1581 hg clone ssh://user@server//home/projects/alpha/
1582
1582
1583 - do a high-speed clone over a LAN while checking out a
1583 - do a high-speed clone over a LAN while checking out a
1584 specified version::
1584 specified version::
1585
1585
1586 hg clone --uncompressed http://server/repo -u 1.5
1586 hg clone --uncompressed http://server/repo -u 1.5
1587
1587
1588 - create a repository without changesets after a particular revision::
1588 - create a repository without changesets after a particular revision::
1589
1589
1590 hg clone -r 04e544 experimental/ good/
1590 hg clone -r 04e544 experimental/ good/
1591
1591
1592 - clone (and track) a particular named branch::
1592 - clone (and track) a particular named branch::
1593
1593
1594 hg clone http://selenic.com/hg#stable
1594 hg clone http://selenic.com/hg#stable
1595
1595
1596 See :hg:`help urls` for details on specifying URLs.
1596 See :hg:`help urls` for details on specifying URLs.
1597
1597
1598 Returns 0 on success.
1598 Returns 0 on success.
1599 """
1599 """
1600 if opts.get('noupdate') and opts.get('updaterev'):
1600 if opts.get('noupdate') and opts.get('updaterev'):
1601 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1601 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1602
1602
1603 r = hg.clone(ui, opts, source, dest,
1603 r = hg.clone(ui, opts, source, dest,
1604 pull=opts.get('pull'),
1604 pull=opts.get('pull'),
1605 stream=opts.get('uncompressed'),
1605 stream=opts.get('uncompressed'),
1606 rev=opts.get('rev'),
1606 rev=opts.get('rev'),
1607 update=opts.get('updaterev') or not opts.get('noupdate'),
1607 update=opts.get('updaterev') or not opts.get('noupdate'),
1608 branch=opts.get('branch'),
1608 branch=opts.get('branch'),
1609 shareopts=opts.get('shareopts'))
1609 shareopts=opts.get('shareopts'))
1610
1610
1611 return r is None
1611 return r is None
1612
1612
1613 @command('^commit|ci',
1613 @command('^commit|ci',
1614 [('A', 'addremove', None,
1614 [('A', 'addremove', None,
1615 _('mark new/missing files as added/removed before committing')),
1615 _('mark new/missing files as added/removed before committing')),
1616 ('', 'close-branch', None,
1616 ('', 'close-branch', None,
1617 _('mark a branch head as closed')),
1617 _('mark a branch head as closed')),
1618 ('', 'amend', None, _('amend the parent of the working directory')),
1618 ('', 'amend', None, _('amend the parent of the working directory')),
1619 ('s', 'secret', None, _('use the secret phase for committing')),
1619 ('s', 'secret', None, _('use the secret phase for committing')),
1620 ('e', 'edit', None, _('invoke editor on commit messages')),
1620 ('e', 'edit', None, _('invoke editor on commit messages')),
1621 ('i', 'interactive', None, _('use interactive mode')),
1621 ('i', 'interactive', None, _('use interactive mode')),
1622 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1622 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1623 _('[OPTION]... [FILE]...'),
1623 _('[OPTION]... [FILE]...'),
1624 inferrepo=True)
1624 inferrepo=True)
1625 def commit(ui, repo, *pats, **opts):
1625 def commit(ui, repo, *pats, **opts):
1626 """commit the specified files or all outstanding changes
1626 """commit the specified files or all outstanding changes
1627
1627
1628 Commit changes to the given files into the repository. Unlike a
1628 Commit changes to the given files into the repository. Unlike a
1629 centralized SCM, this operation is a local operation. See
1629 centralized SCM, this operation is a local operation. See
1630 :hg:`push` for a way to actively distribute your changes.
1630 :hg:`push` for a way to actively distribute your changes.
1631
1631
1632 If a list of files is omitted, all changes reported by :hg:`status`
1632 If a list of files is omitted, all changes reported by :hg:`status`
1633 will be committed.
1633 will be committed.
1634
1634
1635 If you are committing the result of a merge, do not provide any
1635 If you are committing the result of a merge, do not provide any
1636 filenames or -I/-X filters.
1636 filenames or -I/-X filters.
1637
1637
1638 If no commit message is specified, Mercurial starts your
1638 If no commit message is specified, Mercurial starts your
1639 configured editor where you can enter a message. In case your
1639 configured editor where you can enter a message. In case your
1640 commit fails, you will find a backup of your message in
1640 commit fails, you will find a backup of your message in
1641 ``.hg/last-message.txt``.
1641 ``.hg/last-message.txt``.
1642
1642
1643 The --close-branch flag can be used to mark the current branch
1643 The --close-branch flag can be used to mark the current branch
1644 head closed. When all heads of a branch are closed, the branch
1644 head closed. When all heads of a branch are closed, the branch
1645 will be considered closed and no longer listed.
1645 will be considered closed and no longer listed.
1646
1646
1647 The --amend flag can be used to amend the parent of the
1647 The --amend flag can be used to amend the parent of the
1648 working directory with a new commit that contains the changes
1648 working directory with a new commit that contains the changes
1649 in the parent in addition to those currently reported by :hg:`status`,
1649 in the parent in addition to those currently reported by :hg:`status`,
1650 if there are any. The old commit is stored in a backup bundle in
1650 if there are any. The old commit is stored in a backup bundle in
1651 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1651 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1652 on how to restore it).
1652 on how to restore it).
1653
1653
1654 Message, user and date are taken from the amended commit unless
1654 Message, user and date are taken from the amended commit unless
1655 specified. When a message isn't specified on the command line,
1655 specified. When a message isn't specified on the command line,
1656 the editor will open with the message of the amended commit.
1656 the editor will open with the message of the amended commit.
1657
1657
1658 It is not possible to amend public changesets (see :hg:`help phases`)
1658 It is not possible to amend public changesets (see :hg:`help phases`)
1659 or changesets that have children.
1659 or changesets that have children.
1660
1660
1661 See :hg:`help dates` for a list of formats valid for -d/--date.
1661 See :hg:`help dates` for a list of formats valid for -d/--date.
1662
1662
1663 Returns 0 on success, 1 if nothing changed.
1663 Returns 0 on success, 1 if nothing changed.
1664
1664
1665 .. container:: verbose
1665 .. container:: verbose
1666
1666
1667 Examples:
1667 Examples:
1668
1668
1669 - commit all files ending in .py::
1669 - commit all files ending in .py::
1670
1670
1671 hg commit --include "set:**.py"
1671 hg commit --include "set:**.py"
1672
1672
1673 - commit all non-binary files::
1673 - commit all non-binary files::
1674
1674
1675 hg commit --exclude "set:binary()"
1675 hg commit --exclude "set:binary()"
1676
1676
1677 - amend the current commit and set the date to now::
1677 - amend the current commit and set the date to now::
1678
1678
1679 hg commit --amend --date now
1679 hg commit --amend --date now
1680 """
1680 """
1681 wlock = lock = None
1681 wlock = lock = None
1682 try:
1682 try:
1683 wlock = repo.wlock()
1683 wlock = repo.wlock()
1684 lock = repo.lock()
1684 lock = repo.lock()
1685 return _docommit(ui, repo, *pats, **opts)
1685 return _docommit(ui, repo, *pats, **opts)
1686 finally:
1686 finally:
1687 release(lock, wlock)
1687 release(lock, wlock)
1688
1688
1689 def _docommit(ui, repo, *pats, **opts):
1689 def _docommit(ui, repo, *pats, **opts):
1690 if opts.get('interactive'):
1690 if opts.get('interactive'):
1691 opts.pop('interactive')
1691 opts.pop('interactive')
1692 cmdutil.dorecord(ui, repo, commit, None, False,
1692 cmdutil.dorecord(ui, repo, commit, None, False,
1693 cmdutil.recordfilter, *pats, **opts)
1693 cmdutil.recordfilter, *pats, **opts)
1694 return
1694 return
1695
1695
1696 if opts.get('subrepos'):
1696 if opts.get('subrepos'):
1697 if opts.get('amend'):
1697 if opts.get('amend'):
1698 raise error.Abort(_('cannot amend with --subrepos'))
1698 raise error.Abort(_('cannot amend with --subrepos'))
1699 # Let --subrepos on the command line override config setting.
1699 # Let --subrepos on the command line override config setting.
1700 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1700 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1701
1701
1702 cmdutil.checkunfinished(repo, commit=True)
1702 cmdutil.checkunfinished(repo, commit=True)
1703
1703
1704 branch = repo[None].branch()
1704 branch = repo[None].branch()
1705 bheads = repo.branchheads(branch)
1705 bheads = repo.branchheads(branch)
1706
1706
1707 extra = {}
1707 extra = {}
1708 if opts.get('close_branch'):
1708 if opts.get('close_branch'):
1709 extra['close'] = 1
1709 extra['close'] = 1
1710
1710
1711 if not bheads:
1711 if not bheads:
1712 raise error.Abort(_('can only close branch heads'))
1712 raise error.Abort(_('can only close branch heads'))
1713 elif opts.get('amend'):
1713 elif opts.get('amend'):
1714 if repo[None].parents()[0].p1().branch() != branch and \
1714 if repo[None].parents()[0].p1().branch() != branch and \
1715 repo[None].parents()[0].p2().branch() != branch:
1715 repo[None].parents()[0].p2().branch() != branch:
1716 raise error.Abort(_('can only close branch heads'))
1716 raise error.Abort(_('can only close branch heads'))
1717
1717
1718 if opts.get('amend'):
1718 if opts.get('amend'):
1719 if ui.configbool('ui', 'commitsubrepos'):
1719 if ui.configbool('ui', 'commitsubrepos'):
1720 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1720 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1721
1721
1722 old = repo['.']
1722 old = repo['.']
1723 if not old.mutable():
1723 if not old.mutable():
1724 raise error.Abort(_('cannot amend public changesets'))
1724 raise error.Abort(_('cannot amend public changesets'))
1725 if len(repo[None].parents()) > 1:
1725 if len(repo[None].parents()) > 1:
1726 raise error.Abort(_('cannot amend while merging'))
1726 raise error.Abort(_('cannot amend while merging'))
1727 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1727 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1728 if not allowunstable and old.children():
1728 if not allowunstable and old.children():
1729 raise error.Abort(_('cannot amend changeset with children'))
1729 raise error.Abort(_('cannot amend changeset with children'))
1730
1730
1731 # Currently histedit gets confused if an amend happens while histedit
1731 # Currently histedit gets confused if an amend happens while histedit
1732 # is in progress. Since we have a checkunfinished command, we are
1732 # is in progress. Since we have a checkunfinished command, we are
1733 # temporarily honoring it.
1733 # temporarily honoring it.
1734 #
1734 #
1735 # Note: eventually this guard will be removed. Please do not expect
1735 # Note: eventually this guard will be removed. Please do not expect
1736 # this behavior to remain.
1736 # this behavior to remain.
1737 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1737 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1738 cmdutil.checkunfinished(repo)
1738 cmdutil.checkunfinished(repo)
1739
1739
1740 # commitfunc is used only for temporary amend commit by cmdutil.amend
1740 # commitfunc is used only for temporary amend commit by cmdutil.amend
1741 def commitfunc(ui, repo, message, match, opts):
1741 def commitfunc(ui, repo, message, match, opts):
1742 return repo.commit(message,
1742 return repo.commit(message,
1743 opts.get('user') or old.user(),
1743 opts.get('user') or old.user(),
1744 opts.get('date') or old.date(),
1744 opts.get('date') or old.date(),
1745 match,
1745 match,
1746 extra=extra)
1746 extra=extra)
1747
1747
1748 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1748 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1749 if node == old.node():
1749 if node == old.node():
1750 ui.status(_("nothing changed\n"))
1750 ui.status(_("nothing changed\n"))
1751 return 1
1751 return 1
1752 else:
1752 else:
1753 def commitfunc(ui, repo, message, match, opts):
1753 def commitfunc(ui, repo, message, match, opts):
1754 backup = ui.backupconfig('phases', 'new-commit')
1754 backup = ui.backupconfig('phases', 'new-commit')
1755 baseui = repo.baseui
1755 baseui = repo.baseui
1756 basebackup = baseui.backupconfig('phases', 'new-commit')
1756 basebackup = baseui.backupconfig('phases', 'new-commit')
1757 try:
1757 try:
1758 if opts.get('secret'):
1758 if opts.get('secret'):
1759 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1759 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1760 # Propagate to subrepos
1760 # Propagate to subrepos
1761 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1761 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1762
1762
1763 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1763 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1764 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1764 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1765 return repo.commit(message, opts.get('user'), opts.get('date'),
1765 return repo.commit(message, opts.get('user'), opts.get('date'),
1766 match,
1766 match,
1767 editor=editor,
1767 editor=editor,
1768 extra=extra)
1768 extra=extra)
1769 finally:
1769 finally:
1770 ui.restoreconfig(backup)
1770 ui.restoreconfig(backup)
1771 repo.baseui.restoreconfig(basebackup)
1771 repo.baseui.restoreconfig(basebackup)
1772
1772
1773
1773
1774 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1774 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1775
1775
1776 if not node:
1776 if not node:
1777 stat = cmdutil.postcommitstatus(repo, pats, opts)
1777 stat = cmdutil.postcommitstatus(repo, pats, opts)
1778 if stat[3]:
1778 if stat[3]:
1779 ui.status(_("nothing changed (%d missing files, see "
1779 ui.status(_("nothing changed (%d missing files, see "
1780 "'hg status')\n") % len(stat[3]))
1780 "'hg status')\n") % len(stat[3]))
1781 else:
1781 else:
1782 ui.status(_("nothing changed\n"))
1782 ui.status(_("nothing changed\n"))
1783 return 1
1783 return 1
1784
1784
1785 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1785 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1786
1786
1787 @command('config|showconfig|debugconfig',
1787 @command('config|showconfig|debugconfig',
1788 [('u', 'untrusted', None, _('show untrusted configuration options')),
1788 [('u', 'untrusted', None, _('show untrusted configuration options')),
1789 ('e', 'edit', None, _('edit user config')),
1789 ('e', 'edit', None, _('edit user config')),
1790 ('l', 'local', None, _('edit repository config')),
1790 ('l', 'local', None, _('edit repository config')),
1791 ('g', 'global', None, _('edit global config'))],
1791 ('g', 'global', None, _('edit global config'))],
1792 _('[-u] [NAME]...'),
1792 _('[-u] [NAME]...'),
1793 optionalrepo=True)
1793 optionalrepo=True)
1794 def config(ui, repo, *values, **opts):
1794 def config(ui, repo, *values, **opts):
1795 """show combined config settings from all hgrc files
1795 """show combined config settings from all hgrc files
1796
1796
1797 With no arguments, print names and values of all config items.
1797 With no arguments, print names and values of all config items.
1798
1798
1799 With one argument of the form section.name, print just the value
1799 With one argument of the form section.name, print just the value
1800 of that config item.
1800 of that config item.
1801
1801
1802 With multiple arguments, print names and values of all config
1802 With multiple arguments, print names and values of all config
1803 items with matching section names.
1803 items with matching section names.
1804
1804
1805 With --edit, start an editor on the user-level config file. With
1805 With --edit, start an editor on the user-level config file. With
1806 --global, edit the system-wide config file. With --local, edit the
1806 --global, edit the system-wide config file. With --local, edit the
1807 repository-level config file.
1807 repository-level config file.
1808
1808
1809 With --debug, the source (filename and line number) is printed
1809 With --debug, the source (filename and line number) is printed
1810 for each config item.
1810 for each config item.
1811
1811
1812 See :hg:`help config` for more information about config files.
1812 See :hg:`help config` for more information about config files.
1813
1813
1814 Returns 0 on success, 1 if NAME does not exist.
1814 Returns 0 on success, 1 if NAME does not exist.
1815
1815
1816 """
1816 """
1817
1817
1818 if opts.get('edit') or opts.get('local') or opts.get('global'):
1818 if opts.get('edit') or opts.get('local') or opts.get('global'):
1819 if opts.get('local') and opts.get('global'):
1819 if opts.get('local') and opts.get('global'):
1820 raise error.Abort(_("can't use --local and --global together"))
1820 raise error.Abort(_("can't use --local and --global together"))
1821
1821
1822 if opts.get('local'):
1822 if opts.get('local'):
1823 if not repo:
1823 if not repo:
1824 raise error.Abort(_("can't use --local outside a repository"))
1824 raise error.Abort(_("can't use --local outside a repository"))
1825 paths = [repo.join('hgrc')]
1825 paths = [repo.join('hgrc')]
1826 elif opts.get('global'):
1826 elif opts.get('global'):
1827 paths = scmutil.systemrcpath()
1827 paths = scmutil.systemrcpath()
1828 else:
1828 else:
1829 paths = scmutil.userrcpath()
1829 paths = scmutil.userrcpath()
1830
1830
1831 for f in paths:
1831 for f in paths:
1832 if os.path.exists(f):
1832 if os.path.exists(f):
1833 break
1833 break
1834 else:
1834 else:
1835 if opts.get('global'):
1835 if opts.get('global'):
1836 samplehgrc = uimod.samplehgrcs['global']
1836 samplehgrc = uimod.samplehgrcs['global']
1837 elif opts.get('local'):
1837 elif opts.get('local'):
1838 samplehgrc = uimod.samplehgrcs['local']
1838 samplehgrc = uimod.samplehgrcs['local']
1839 else:
1839 else:
1840 samplehgrc = uimod.samplehgrcs['user']
1840 samplehgrc = uimod.samplehgrcs['user']
1841
1841
1842 f = paths[0]
1842 f = paths[0]
1843 fp = open(f, "w")
1843 fp = open(f, "w")
1844 fp.write(samplehgrc)
1844 fp.write(samplehgrc)
1845 fp.close()
1845 fp.close()
1846
1846
1847 editor = ui.geteditor()
1847 editor = ui.geteditor()
1848 ui.system("%s \"%s\"" % (editor, f),
1848 ui.system("%s \"%s\"" % (editor, f),
1849 onerr=error.Abort, errprefix=_("edit failed"))
1849 onerr=error.Abort, errprefix=_("edit failed"))
1850 return
1850 return
1851
1851
1852 for f in scmutil.rcpath():
1852 for f in scmutil.rcpath():
1853 ui.debug('read config from: %s\n' % f)
1853 ui.debug('read config from: %s\n' % f)
1854 untrusted = bool(opts.get('untrusted'))
1854 untrusted = bool(opts.get('untrusted'))
1855 if values:
1855 if values:
1856 sections = [v for v in values if '.' not in v]
1856 sections = [v for v in values if '.' not in v]
1857 items = [v for v in values if '.' in v]
1857 items = [v for v in values if '.' in v]
1858 if len(items) > 1 or items and sections:
1858 if len(items) > 1 or items and sections:
1859 raise error.Abort(_('only one config item permitted'))
1859 raise error.Abort(_('only one config item permitted'))
1860 matched = False
1860 matched = False
1861 for section, name, value in ui.walkconfig(untrusted=untrusted):
1861 for section, name, value in ui.walkconfig(untrusted=untrusted):
1862 value = str(value).replace('\n', '\\n')
1862 value = str(value).replace('\n', '\\n')
1863 sectname = section + '.' + name
1863 sectname = section + '.' + name
1864 if values:
1864 if values:
1865 for v in values:
1865 for v in values:
1866 if v == section:
1866 if v == section:
1867 ui.debug('%s: ' %
1867 ui.debug('%s: ' %
1868 ui.configsource(section, name, untrusted))
1868 ui.configsource(section, name, untrusted))
1869 ui.write('%s=%s\n' % (sectname, value))
1869 ui.write('%s=%s\n' % (sectname, value))
1870 matched = True
1870 matched = True
1871 elif v == sectname:
1871 elif v == sectname:
1872 ui.debug('%s: ' %
1872 ui.debug('%s: ' %
1873 ui.configsource(section, name, untrusted))
1873 ui.configsource(section, name, untrusted))
1874 ui.write(value, '\n')
1874 ui.write(value, '\n')
1875 matched = True
1875 matched = True
1876 else:
1876 else:
1877 ui.debug('%s: ' %
1877 ui.debug('%s: ' %
1878 ui.configsource(section, name, untrusted))
1878 ui.configsource(section, name, untrusted))
1879 ui.write('%s=%s\n' % (sectname, value))
1879 ui.write('%s=%s\n' % (sectname, value))
1880 matched = True
1880 matched = True
1881 if matched:
1881 if matched:
1882 return 0
1882 return 0
1883 return 1
1883 return 1
1884
1884
1885 @command('copy|cp',
1885 @command('copy|cp',
1886 [('A', 'after', None, _('record a copy that has already occurred')),
1886 [('A', 'after', None, _('record a copy that has already occurred')),
1887 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1887 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1888 ] + walkopts + dryrunopts,
1888 ] + walkopts + dryrunopts,
1889 _('[OPTION]... [SOURCE]... DEST'))
1889 _('[OPTION]... [SOURCE]... DEST'))
1890 def copy(ui, repo, *pats, **opts):
1890 def copy(ui, repo, *pats, **opts):
1891 """mark files as copied for the next commit
1891 """mark files as copied for the next commit
1892
1892
1893 Mark dest as having copies of source files. If dest is a
1893 Mark dest as having copies of source files. If dest is a
1894 directory, copies are put in that directory. If dest is a file,
1894 directory, copies are put in that directory. If dest is a file,
1895 the source must be a single file.
1895 the source must be a single file.
1896
1896
1897 By default, this command copies the contents of files as they
1897 By default, this command copies the contents of files as they
1898 exist in the working directory. If invoked with -A/--after, the
1898 exist in the working directory. If invoked with -A/--after, the
1899 operation is recorded, but no copying is performed.
1899 operation is recorded, but no copying is performed.
1900
1900
1901 This command takes effect with the next commit. To undo a copy
1901 This command takes effect with the next commit. To undo a copy
1902 before that, see :hg:`revert`.
1902 before that, see :hg:`revert`.
1903
1903
1904 Returns 0 on success, 1 if errors are encountered.
1904 Returns 0 on success, 1 if errors are encountered.
1905 """
1905 """
1906 with repo.wlock(False):
1906 with repo.wlock(False):
1907 return cmdutil.copy(ui, repo, pats, opts)
1907 return cmdutil.copy(ui, repo, pats, opts)
1908
1908
1909 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1909 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1910 def debugancestor(ui, repo, *args):
1910 def debugancestor(ui, repo, *args):
1911 """find the ancestor revision of two revisions in a given index"""
1911 """find the ancestor revision of two revisions in a given index"""
1912 if len(args) == 3:
1912 if len(args) == 3:
1913 index, rev1, rev2 = args
1913 index, rev1, rev2 = args
1914 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1914 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1915 lookup = r.lookup
1915 lookup = r.lookup
1916 elif len(args) == 2:
1916 elif len(args) == 2:
1917 if not repo:
1917 if not repo:
1918 raise error.Abort(_("there is no Mercurial repository here "
1918 raise error.Abort(_("there is no Mercurial repository here "
1919 "(.hg not found)"))
1919 "(.hg not found)"))
1920 rev1, rev2 = args
1920 rev1, rev2 = args
1921 r = repo.changelog
1921 r = repo.changelog
1922 lookup = repo.lookup
1922 lookup = repo.lookup
1923 else:
1923 else:
1924 raise error.Abort(_('either two or three arguments required'))
1924 raise error.Abort(_('either two or three arguments required'))
1925 a = r.ancestor(lookup(rev1), lookup(rev2))
1925 a = r.ancestor(lookup(rev1), lookup(rev2))
1926 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1926 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1927
1927
1928 @command('debugbuilddag',
1928 @command('debugbuilddag',
1929 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1929 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1930 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1930 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1931 ('n', 'new-file', None, _('add new file at each rev'))],
1931 ('n', 'new-file', None, _('add new file at each rev'))],
1932 _('[OPTION]... [TEXT]'))
1932 _('[OPTION]... [TEXT]'))
1933 def debugbuilddag(ui, repo, text=None,
1933 def debugbuilddag(ui, repo, text=None,
1934 mergeable_file=False,
1934 mergeable_file=False,
1935 overwritten_file=False,
1935 overwritten_file=False,
1936 new_file=False):
1936 new_file=False):
1937 """builds a repo with a given DAG from scratch in the current empty repo
1937 """builds a repo with a given DAG from scratch in the current empty repo
1938
1938
1939 The description of the DAG is read from stdin if not given on the
1939 The description of the DAG is read from stdin if not given on the
1940 command line.
1940 command line.
1941
1941
1942 Elements:
1942 Elements:
1943
1943
1944 - "+n" is a linear run of n nodes based on the current default parent
1944 - "+n" is a linear run of n nodes based on the current default parent
1945 - "." is a single node based on the current default parent
1945 - "." is a single node based on the current default parent
1946 - "$" resets the default parent to null (implied at the start);
1946 - "$" resets the default parent to null (implied at the start);
1947 otherwise the default parent is always the last node created
1947 otherwise the default parent is always the last node created
1948 - "<p" sets the default parent to the backref p
1948 - "<p" sets the default parent to the backref p
1949 - "*p" is a fork at parent p, which is a backref
1949 - "*p" is a fork at parent p, which is a backref
1950 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1950 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1951 - "/p2" is a merge of the preceding node and p2
1951 - "/p2" is a merge of the preceding node and p2
1952 - ":tag" defines a local tag for the preceding node
1952 - ":tag" defines a local tag for the preceding node
1953 - "@branch" sets the named branch for subsequent nodes
1953 - "@branch" sets the named branch for subsequent nodes
1954 - "#...\\n" is a comment up to the end of the line
1954 - "#...\\n" is a comment up to the end of the line
1955
1955
1956 Whitespace between the above elements is ignored.
1956 Whitespace between the above elements is ignored.
1957
1957
1958 A backref is either
1958 A backref is either
1959
1959
1960 - a number n, which references the node curr-n, where curr is the current
1960 - a number n, which references the node curr-n, where curr is the current
1961 node, or
1961 node, or
1962 - the name of a local tag you placed earlier using ":tag", or
1962 - the name of a local tag you placed earlier using ":tag", or
1963 - empty to denote the default parent.
1963 - empty to denote the default parent.
1964
1964
1965 All string valued-elements are either strictly alphanumeric, or must
1965 All string valued-elements are either strictly alphanumeric, or must
1966 be enclosed in double quotes ("..."), with "\\" as escape character.
1966 be enclosed in double quotes ("..."), with "\\" as escape character.
1967 """
1967 """
1968
1968
1969 if text is None:
1969 if text is None:
1970 ui.status(_("reading DAG from stdin\n"))
1970 ui.status(_("reading DAG from stdin\n"))
1971 text = ui.fin.read()
1971 text = ui.fin.read()
1972
1972
1973 cl = repo.changelog
1973 cl = repo.changelog
1974 if len(cl) > 0:
1974 if len(cl) > 0:
1975 raise error.Abort(_('repository is not empty'))
1975 raise error.Abort(_('repository is not empty'))
1976
1976
1977 # determine number of revs in DAG
1977 # determine number of revs in DAG
1978 total = 0
1978 total = 0
1979 for type, data in dagparser.parsedag(text):
1979 for type, data in dagparser.parsedag(text):
1980 if type == 'n':
1980 if type == 'n':
1981 total += 1
1981 total += 1
1982
1982
1983 if mergeable_file:
1983 if mergeable_file:
1984 linesperrev = 2
1984 linesperrev = 2
1985 # make a file with k lines per rev
1985 # make a file with k lines per rev
1986 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1986 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1987 initialmergedlines.append("")
1987 initialmergedlines.append("")
1988
1988
1989 tags = []
1989 tags = []
1990
1990
1991 wlock = lock = tr = None
1991 wlock = lock = tr = None
1992 try:
1992 try:
1993 wlock = repo.wlock()
1993 wlock = repo.wlock()
1994 lock = repo.lock()
1994 lock = repo.lock()
1995 tr = repo.transaction("builddag")
1995 tr = repo.transaction("builddag")
1996
1996
1997 at = -1
1997 at = -1
1998 atbranch = 'default'
1998 atbranch = 'default'
1999 nodeids = []
1999 nodeids = []
2000 id = 0
2000 id = 0
2001 ui.progress(_('building'), id, unit=_('revisions'), total=total)
2001 ui.progress(_('building'), id, unit=_('revisions'), total=total)
2002 for type, data in dagparser.parsedag(text):
2002 for type, data in dagparser.parsedag(text):
2003 if type == 'n':
2003 if type == 'n':
2004 ui.note(('node %s\n' % str(data)))
2004 ui.note(('node %s\n' % str(data)))
2005 id, ps = data
2005 id, ps = data
2006
2006
2007 files = []
2007 files = []
2008 fctxs = {}
2008 fctxs = {}
2009
2009
2010 p2 = None
2010 p2 = None
2011 if mergeable_file:
2011 if mergeable_file:
2012 fn = "mf"
2012 fn = "mf"
2013 p1 = repo[ps[0]]
2013 p1 = repo[ps[0]]
2014 if len(ps) > 1:
2014 if len(ps) > 1:
2015 p2 = repo[ps[1]]
2015 p2 = repo[ps[1]]
2016 pa = p1.ancestor(p2)
2016 pa = p1.ancestor(p2)
2017 base, local, other = [x[fn].data() for x in (pa, p1,
2017 base, local, other = [x[fn].data() for x in (pa, p1,
2018 p2)]
2018 p2)]
2019 m3 = simplemerge.Merge3Text(base, local, other)
2019 m3 = simplemerge.Merge3Text(base, local, other)
2020 ml = [l.strip() for l in m3.merge_lines()]
2020 ml = [l.strip() for l in m3.merge_lines()]
2021 ml.append("")
2021 ml.append("")
2022 elif at > 0:
2022 elif at > 0:
2023 ml = p1[fn].data().split("\n")
2023 ml = p1[fn].data().split("\n")
2024 else:
2024 else:
2025 ml = initialmergedlines
2025 ml = initialmergedlines
2026 ml[id * linesperrev] += " r%i" % id
2026 ml[id * linesperrev] += " r%i" % id
2027 mergedtext = "\n".join(ml)
2027 mergedtext = "\n".join(ml)
2028 files.append(fn)
2028 files.append(fn)
2029 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
2029 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
2030
2030
2031 if overwritten_file:
2031 if overwritten_file:
2032 fn = "of"
2032 fn = "of"
2033 files.append(fn)
2033 files.append(fn)
2034 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
2034 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
2035
2035
2036 if new_file:
2036 if new_file:
2037 fn = "nf%i" % id
2037 fn = "nf%i" % id
2038 files.append(fn)
2038 files.append(fn)
2039 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
2039 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
2040 if len(ps) > 1:
2040 if len(ps) > 1:
2041 if not p2:
2041 if not p2:
2042 p2 = repo[ps[1]]
2042 p2 = repo[ps[1]]
2043 for fn in p2:
2043 for fn in p2:
2044 if fn.startswith("nf"):
2044 if fn.startswith("nf"):
2045 files.append(fn)
2045 files.append(fn)
2046 fctxs[fn] = p2[fn]
2046 fctxs[fn] = p2[fn]
2047
2047
2048 def fctxfn(repo, cx, path):
2048 def fctxfn(repo, cx, path):
2049 return fctxs.get(path)
2049 return fctxs.get(path)
2050
2050
2051 if len(ps) == 0 or ps[0] < 0:
2051 if len(ps) == 0 or ps[0] < 0:
2052 pars = [None, None]
2052 pars = [None, None]
2053 elif len(ps) == 1:
2053 elif len(ps) == 1:
2054 pars = [nodeids[ps[0]], None]
2054 pars = [nodeids[ps[0]], None]
2055 else:
2055 else:
2056 pars = [nodeids[p] for p in ps]
2056 pars = [nodeids[p] for p in ps]
2057 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
2057 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
2058 date=(id, 0),
2058 date=(id, 0),
2059 user="debugbuilddag",
2059 user="debugbuilddag",
2060 extra={'branch': atbranch})
2060 extra={'branch': atbranch})
2061 nodeid = repo.commitctx(cx)
2061 nodeid = repo.commitctx(cx)
2062 nodeids.append(nodeid)
2062 nodeids.append(nodeid)
2063 at = id
2063 at = id
2064 elif type == 'l':
2064 elif type == 'l':
2065 id, name = data
2065 id, name = data
2066 ui.note(('tag %s\n' % name))
2066 ui.note(('tag %s\n' % name))
2067 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
2067 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
2068 elif type == 'a':
2068 elif type == 'a':
2069 ui.note(('branch %s\n' % data))
2069 ui.note(('branch %s\n' % data))
2070 atbranch = data
2070 atbranch = data
2071 ui.progress(_('building'), id, unit=_('revisions'), total=total)
2071 ui.progress(_('building'), id, unit=_('revisions'), total=total)
2072 tr.close()
2072 tr.close()
2073
2073
2074 if tags:
2074 if tags:
2075 repo.vfs.write("localtags", "".join(tags))
2075 repo.vfs.write("localtags", "".join(tags))
2076 finally:
2076 finally:
2077 ui.progress(_('building'), None)
2077 ui.progress(_('building'), None)
2078 release(tr, lock, wlock)
2078 release(tr, lock, wlock)
2079
2079
2080 @command('debugbundle',
2080 @command('debugbundle',
2081 [('a', 'all', None, _('show all details')),
2081 [('a', 'all', None, _('show all details')),
2082 ('', 'spec', None, _('print the bundlespec of the bundle'))],
2082 ('', 'spec', None, _('print the bundlespec of the bundle'))],
2083 _('FILE'),
2083 _('FILE'),
2084 norepo=True)
2084 norepo=True)
2085 def debugbundle(ui, bundlepath, all=None, spec=None, **opts):
2085 def debugbundle(ui, bundlepath, all=None, spec=None, **opts):
2086 """lists the contents of a bundle"""
2086 """lists the contents of a bundle"""
2087 with hg.openpath(ui, bundlepath) as f:
2087 with hg.openpath(ui, bundlepath) as f:
2088 if spec:
2088 if spec:
2089 spec = exchange.getbundlespec(ui, f)
2089 spec = exchange.getbundlespec(ui, f)
2090 ui.write('%s\n' % spec)
2090 ui.write('%s\n' % spec)
2091 return
2091 return
2092
2092
2093 gen = exchange.readbundle(ui, f, bundlepath)
2093 gen = exchange.readbundle(ui, f, bundlepath)
2094 if isinstance(gen, bundle2.unbundle20):
2094 if isinstance(gen, bundle2.unbundle20):
2095 return _debugbundle2(ui, gen, all=all, **opts)
2095 return _debugbundle2(ui, gen, all=all, **opts)
2096 _debugchangegroup(ui, gen, all=all, **opts)
2096 _debugchangegroup(ui, gen, all=all, **opts)
2097
2097
2098 def _debugchangegroup(ui, gen, all=None, indent=0, **opts):
2098 def _debugchangegroup(ui, gen, all=None, indent=0, **opts):
2099 indent_string = ' ' * indent
2099 indent_string = ' ' * indent
2100 if all:
2100 if all:
2101 ui.write(("%sformat: id, p1, p2, cset, delta base, len(delta)\n")
2101 ui.write(("%sformat: id, p1, p2, cset, delta base, len(delta)\n")
2102 % indent_string)
2102 % indent_string)
2103
2103
2104 def showchunks(named):
2104 def showchunks(named):
2105 ui.write("\n%s%s\n" % (indent_string, named))
2105 ui.write("\n%s%s\n" % (indent_string, named))
2106 chain = None
2106 chain = None
2107 for chunkdata in iter(lambda: gen.deltachunk(chain), {}):
2107 for chunkdata in iter(lambda: gen.deltachunk(chain), {}):
2108 node = chunkdata['node']
2108 node = chunkdata['node']
2109 p1 = chunkdata['p1']
2109 p1 = chunkdata['p1']
2110 p2 = chunkdata['p2']
2110 p2 = chunkdata['p2']
2111 cs = chunkdata['cs']
2111 cs = chunkdata['cs']
2112 deltabase = chunkdata['deltabase']
2112 deltabase = chunkdata['deltabase']
2113 delta = chunkdata['delta']
2113 delta = chunkdata['delta']
2114 ui.write("%s%s %s %s %s %s %s\n" %
2114 ui.write("%s%s %s %s %s %s %s\n" %
2115 (indent_string, hex(node), hex(p1), hex(p2),
2115 (indent_string, hex(node), hex(p1), hex(p2),
2116 hex(cs), hex(deltabase), len(delta)))
2116 hex(cs), hex(deltabase), len(delta)))
2117 chain = node
2117 chain = node
2118
2118
2119 chunkdata = gen.changelogheader()
2119 chunkdata = gen.changelogheader()
2120 showchunks("changelog")
2120 showchunks("changelog")
2121 chunkdata = gen.manifestheader()
2121 chunkdata = gen.manifestheader()
2122 showchunks("manifest")
2122 showchunks("manifest")
2123 for chunkdata in iter(gen.filelogheader, {}):
2123 for chunkdata in iter(gen.filelogheader, {}):
2124 fname = chunkdata['filename']
2124 fname = chunkdata['filename']
2125 showchunks(fname)
2125 showchunks(fname)
2126 else:
2126 else:
2127 if isinstance(gen, bundle2.unbundle20):
2127 if isinstance(gen, bundle2.unbundle20):
2128 raise error.Abort(_('use debugbundle2 for this file'))
2128 raise error.Abort(_('use debugbundle2 for this file'))
2129 chunkdata = gen.changelogheader()
2129 chunkdata = gen.changelogheader()
2130 chain = None
2130 chain = None
2131 for chunkdata in iter(lambda: gen.deltachunk(chain), {}):
2131 for chunkdata in iter(lambda: gen.deltachunk(chain), {}):
2132 node = chunkdata['node']
2132 node = chunkdata['node']
2133 ui.write("%s%s\n" % (indent_string, hex(node)))
2133 ui.write("%s%s\n" % (indent_string, hex(node)))
2134 chain = node
2134 chain = node
2135
2135
2136 def _debugbundle2(ui, gen, all=None, **opts):
2136 def _debugbundle2(ui, gen, all=None, **opts):
2137 """lists the contents of a bundle2"""
2137 """lists the contents of a bundle2"""
2138 if not isinstance(gen, bundle2.unbundle20):
2138 if not isinstance(gen, bundle2.unbundle20):
2139 raise error.Abort(_('not a bundle2 file'))
2139 raise error.Abort(_('not a bundle2 file'))
2140 ui.write(('Stream params: %s\n' % repr(gen.params)))
2140 ui.write(('Stream params: %s\n' % repr(gen.params)))
2141 for part in gen.iterparts():
2141 for part in gen.iterparts():
2142 ui.write('%s -- %r\n' % (part.type, repr(part.params)))
2142 ui.write('%s -- %r\n' % (part.type, repr(part.params)))
2143 if part.type == 'changegroup':
2143 if part.type == 'changegroup':
2144 version = part.params.get('version', '01')
2144 version = part.params.get('version', '01')
2145 cg = changegroup.getunbundler(version, part, 'UN')
2145 cg = changegroup.getunbundler(version, part, 'UN')
2146 _debugchangegroup(ui, cg, all=all, indent=4, **opts)
2146 _debugchangegroup(ui, cg, all=all, indent=4, **opts)
2147
2147
2148 @command('debugcreatestreamclonebundle', [], 'FILE')
2148 @command('debugcreatestreamclonebundle', [], 'FILE')
2149 def debugcreatestreamclonebundle(ui, repo, fname):
2149 def debugcreatestreamclonebundle(ui, repo, fname):
2150 """create a stream clone bundle file
2150 """create a stream clone bundle file
2151
2151
2152 Stream bundles are special bundles that are essentially archives of
2152 Stream bundles are special bundles that are essentially archives of
2153 revlog files. They are commonly used for cloning very quickly.
2153 revlog files. They are commonly used for cloning very quickly.
2154 """
2154 """
2155 requirements, gen = streamclone.generatebundlev1(repo)
2155 requirements, gen = streamclone.generatebundlev1(repo)
2156 changegroup.writechunks(ui, gen, fname)
2156 changegroup.writechunks(ui, gen, fname)
2157
2157
2158 ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements)))
2158 ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements)))
2159
2159
2160 @command('debugapplystreamclonebundle', [], 'FILE')
2160 @command('debugapplystreamclonebundle', [], 'FILE')
2161 def debugapplystreamclonebundle(ui, repo, fname):
2161 def debugapplystreamclonebundle(ui, repo, fname):
2162 """apply a stream clone bundle file"""
2162 """apply a stream clone bundle file"""
2163 f = hg.openpath(ui, fname)
2163 f = hg.openpath(ui, fname)
2164 gen = exchange.readbundle(ui, f, fname)
2164 gen = exchange.readbundle(ui, f, fname)
2165 gen.apply(repo)
2165 gen.apply(repo)
2166
2166
2167 @command('debugcheckstate', [], '')
2167 @command('debugcheckstate', [], '')
2168 def debugcheckstate(ui, repo):
2168 def debugcheckstate(ui, repo):
2169 """validate the correctness of the current dirstate"""
2169 """validate the correctness of the current dirstate"""
2170 parent1, parent2 = repo.dirstate.parents()
2170 parent1, parent2 = repo.dirstate.parents()
2171 m1 = repo[parent1].manifest()
2171 m1 = repo[parent1].manifest()
2172 m2 = repo[parent2].manifest()
2172 m2 = repo[parent2].manifest()
2173 errors = 0
2173 errors = 0
2174 for f in repo.dirstate:
2174 for f in repo.dirstate:
2175 state = repo.dirstate[f]
2175 state = repo.dirstate[f]
2176 if state in "nr" and f not in m1:
2176 if state in "nr" and f not in m1:
2177 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
2177 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
2178 errors += 1
2178 errors += 1
2179 if state in "a" and f in m1:
2179 if state in "a" and f in m1:
2180 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
2180 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
2181 errors += 1
2181 errors += 1
2182 if state in "m" and f not in m1 and f not in m2:
2182 if state in "m" and f not in m1 and f not in m2:
2183 ui.warn(_("%s in state %s, but not in either manifest\n") %
2183 ui.warn(_("%s in state %s, but not in either manifest\n") %
2184 (f, state))
2184 (f, state))
2185 errors += 1
2185 errors += 1
2186 for f in m1:
2186 for f in m1:
2187 state = repo.dirstate[f]
2187 state = repo.dirstate[f]
2188 if state not in "nrm":
2188 if state not in "nrm":
2189 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
2189 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
2190 errors += 1
2190 errors += 1
2191 if errors:
2191 if errors:
2192 error = _(".hg/dirstate inconsistent with current parent's manifest")
2192 error = _(".hg/dirstate inconsistent with current parent's manifest")
2193 raise error.Abort(error)
2193 raise error.Abort(error)
2194
2194
2195 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
2195 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
2196 def debugcommands(ui, cmd='', *args):
2196 def debugcommands(ui, cmd='', *args):
2197 """list all available commands and options"""
2197 """list all available commands and options"""
2198 for cmd, vals in sorted(table.iteritems()):
2198 for cmd, vals in sorted(table.iteritems()):
2199 cmd = cmd.split('|')[0].strip('^')
2199 cmd = cmd.split('|')[0].strip('^')
2200 opts = ', '.join([i[1] for i in vals[1]])
2200 opts = ', '.join([i[1] for i in vals[1]])
2201 ui.write('%s: %s\n' % (cmd, opts))
2201 ui.write('%s: %s\n' % (cmd, opts))
2202
2202
2203 @command('debugcomplete',
2203 @command('debugcomplete',
2204 [('o', 'options', None, _('show the command options'))],
2204 [('o', 'options', None, _('show the command options'))],
2205 _('[-o] CMD'),
2205 _('[-o] CMD'),
2206 norepo=True)
2206 norepo=True)
2207 def debugcomplete(ui, cmd='', **opts):
2207 def debugcomplete(ui, cmd='', **opts):
2208 """returns the completion list associated with the given command"""
2208 """returns the completion list associated with the given command"""
2209
2209
2210 if opts.get('options'):
2210 if opts.get('options'):
2211 options = []
2211 options = []
2212 otables = [globalopts]
2212 otables = [globalopts]
2213 if cmd:
2213 if cmd:
2214 aliases, entry = cmdutil.findcmd(cmd, table, False)
2214 aliases, entry = cmdutil.findcmd(cmd, table, False)
2215 otables.append(entry[1])
2215 otables.append(entry[1])
2216 for t in otables:
2216 for t in otables:
2217 for o in t:
2217 for o in t:
2218 if "(DEPRECATED)" in o[3]:
2218 if "(DEPRECATED)" in o[3]:
2219 continue
2219 continue
2220 if o[0]:
2220 if o[0]:
2221 options.append('-%s' % o[0])
2221 options.append('-%s' % o[0])
2222 options.append('--%s' % o[1])
2222 options.append('--%s' % o[1])
2223 ui.write("%s\n" % "\n".join(options))
2223 ui.write("%s\n" % "\n".join(options))
2224 return
2224 return
2225
2225
2226 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2226 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2227 if ui.verbose:
2227 if ui.verbose:
2228 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
2228 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
2229 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
2229 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
2230
2230
2231 @command('debugdag',
2231 @command('debugdag',
2232 [('t', 'tags', None, _('use tags as labels')),
2232 [('t', 'tags', None, _('use tags as labels')),
2233 ('b', 'branches', None, _('annotate with branch names')),
2233 ('b', 'branches', None, _('annotate with branch names')),
2234 ('', 'dots', None, _('use dots for runs')),
2234 ('', 'dots', None, _('use dots for runs')),
2235 ('s', 'spaces', None, _('separate elements by spaces'))],
2235 ('s', 'spaces', None, _('separate elements by spaces'))],
2236 _('[OPTION]... [FILE [REV]...]'),
2236 _('[OPTION]... [FILE [REV]...]'),
2237 optionalrepo=True)
2237 optionalrepo=True)
2238 def debugdag(ui, repo, file_=None, *revs, **opts):
2238 def debugdag(ui, repo, file_=None, *revs, **opts):
2239 """format the changelog or an index DAG as a concise textual description
2239 """format the changelog or an index DAG as a concise textual description
2240
2240
2241 If you pass a revlog index, the revlog's DAG is emitted. If you list
2241 If you pass a revlog index, the revlog's DAG is emitted. If you list
2242 revision numbers, they get labeled in the output as rN.
2242 revision numbers, they get labeled in the output as rN.
2243
2243
2244 Otherwise, the changelog DAG of the current repo is emitted.
2244 Otherwise, the changelog DAG of the current repo is emitted.
2245 """
2245 """
2246 spaces = opts.get('spaces')
2246 spaces = opts.get('spaces')
2247 dots = opts.get('dots')
2247 dots = opts.get('dots')
2248 if file_:
2248 if file_:
2249 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2249 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2250 revs = set((int(r) for r in revs))
2250 revs = set((int(r) for r in revs))
2251 def events():
2251 def events():
2252 for r in rlog:
2252 for r in rlog:
2253 yield 'n', (r, list(p for p in rlog.parentrevs(r)
2253 yield 'n', (r, list(p for p in rlog.parentrevs(r)
2254 if p != -1))
2254 if p != -1))
2255 if r in revs:
2255 if r in revs:
2256 yield 'l', (r, "r%i" % r)
2256 yield 'l', (r, "r%i" % r)
2257 elif repo:
2257 elif repo:
2258 cl = repo.changelog
2258 cl = repo.changelog
2259 tags = opts.get('tags')
2259 tags = opts.get('tags')
2260 branches = opts.get('branches')
2260 branches = opts.get('branches')
2261 if tags:
2261 if tags:
2262 labels = {}
2262 labels = {}
2263 for l, n in repo.tags().items():
2263 for l, n in repo.tags().items():
2264 labels.setdefault(cl.rev(n), []).append(l)
2264 labels.setdefault(cl.rev(n), []).append(l)
2265 def events():
2265 def events():
2266 b = "default"
2266 b = "default"
2267 for r in cl:
2267 for r in cl:
2268 if branches:
2268 if branches:
2269 newb = cl.read(cl.node(r))[5]['branch']
2269 newb = cl.read(cl.node(r))[5]['branch']
2270 if newb != b:
2270 if newb != b:
2271 yield 'a', newb
2271 yield 'a', newb
2272 b = newb
2272 b = newb
2273 yield 'n', (r, list(p for p in cl.parentrevs(r)
2273 yield 'n', (r, list(p for p in cl.parentrevs(r)
2274 if p != -1))
2274 if p != -1))
2275 if tags:
2275 if tags:
2276 ls = labels.get(r)
2276 ls = labels.get(r)
2277 if ls:
2277 if ls:
2278 for l in ls:
2278 for l in ls:
2279 yield 'l', (r, l)
2279 yield 'l', (r, l)
2280 else:
2280 else:
2281 raise error.Abort(_('need repo for changelog dag'))
2281 raise error.Abort(_('need repo for changelog dag'))
2282
2282
2283 for line in dagparser.dagtextlines(events(),
2283 for line in dagparser.dagtextlines(events(),
2284 addspaces=spaces,
2284 addspaces=spaces,
2285 wraplabels=True,
2285 wraplabels=True,
2286 wrapannotations=True,
2286 wrapannotations=True,
2287 wrapnonlinear=dots,
2287 wrapnonlinear=dots,
2288 usedots=dots,
2288 usedots=dots,
2289 maxlinewidth=70):
2289 maxlinewidth=70):
2290 ui.write(line)
2290 ui.write(line)
2291 ui.write("\n")
2291 ui.write("\n")
2292
2292
2293 @command('debugdata', debugrevlogopts, _('-c|-m|FILE REV'))
2293 @command('debugdata', debugrevlogopts, _('-c|-m|FILE REV'))
2294 def debugdata(ui, repo, file_, rev=None, **opts):
2294 def debugdata(ui, repo, file_, rev=None, **opts):
2295 """dump the contents of a data file revision"""
2295 """dump the contents of a data file revision"""
2296 if opts.get('changelog') or opts.get('manifest') or opts.get('dir'):
2296 if opts.get('changelog') or opts.get('manifest') or opts.get('dir'):
2297 if rev is not None:
2297 if rev is not None:
2298 raise error.CommandError('debugdata', _('invalid arguments'))
2298 raise error.CommandError('debugdata', _('invalid arguments'))
2299 file_, rev = None, file_
2299 file_, rev = None, file_
2300 elif rev is None:
2300 elif rev is None:
2301 raise error.CommandError('debugdata', _('invalid arguments'))
2301 raise error.CommandError('debugdata', _('invalid arguments'))
2302 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
2302 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
2303 try:
2303 try:
2304 ui.write(r.revision(r.lookup(rev)))
2304 ui.write(r.revision(r.lookup(rev)))
2305 except KeyError:
2305 except KeyError:
2306 raise error.Abort(_('invalid revision identifier %s') % rev)
2306 raise error.Abort(_('invalid revision identifier %s') % rev)
2307
2307
2308 @command('debugdate',
2308 @command('debugdate',
2309 [('e', 'extended', None, _('try extended date formats'))],
2309 [('e', 'extended', None, _('try extended date formats'))],
2310 _('[-e] DATE [RANGE]'),
2310 _('[-e] DATE [RANGE]'),
2311 norepo=True, optionalrepo=True)
2311 norepo=True, optionalrepo=True)
2312 def debugdate(ui, date, range=None, **opts):
2312 def debugdate(ui, date, range=None, **opts):
2313 """parse and display a date"""
2313 """parse and display a date"""
2314 if opts["extended"]:
2314 if opts["extended"]:
2315 d = util.parsedate(date, util.extendeddateformats)
2315 d = util.parsedate(date, util.extendeddateformats)
2316 else:
2316 else:
2317 d = util.parsedate(date)
2317 d = util.parsedate(date)
2318 ui.write(("internal: %s %s\n") % d)
2318 ui.write(("internal: %s %s\n") % d)
2319 ui.write(("standard: %s\n") % util.datestr(d))
2319 ui.write(("standard: %s\n") % util.datestr(d))
2320 if range:
2320 if range:
2321 m = util.matchdate(range)
2321 m = util.matchdate(range)
2322 ui.write(("match: %s\n") % m(d[0]))
2322 ui.write(("match: %s\n") % m(d[0]))
2323
2323
2324 @command('debugdiscovery',
2324 @command('debugdiscovery',
2325 [('', 'old', None, _('use old-style discovery')),
2325 [('', 'old', None, _('use old-style discovery')),
2326 ('', 'nonheads', None,
2326 ('', 'nonheads', None,
2327 _('use old-style discovery with non-heads included')),
2327 _('use old-style discovery with non-heads included')),
2328 ] + remoteopts,
2328 ] + remoteopts,
2329 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2329 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2330 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2330 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2331 """runs the changeset discovery protocol in isolation"""
2331 """runs the changeset discovery protocol in isolation"""
2332 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2332 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2333 opts.get('branch'))
2333 opts.get('branch'))
2334 remote = hg.peer(repo, opts, remoteurl)
2334 remote = hg.peer(repo, opts, remoteurl)
2335 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2335 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2336
2336
2337 # make sure tests are repeatable
2337 # make sure tests are repeatable
2338 random.seed(12323)
2338 random.seed(12323)
2339
2339
2340 def doit(localheads, remoteheads, remote=remote):
2340 def doit(localheads, remoteheads, remote=remote):
2341 if opts.get('old'):
2341 if opts.get('old'):
2342 if localheads:
2342 if localheads:
2343 raise error.Abort('cannot use localheads with old style '
2343 raise error.Abort('cannot use localheads with old style '
2344 'discovery')
2344 'discovery')
2345 if not util.safehasattr(remote, 'branches'):
2345 if not util.safehasattr(remote, 'branches'):
2346 # enable in-client legacy support
2346 # enable in-client legacy support
2347 remote = localrepo.locallegacypeer(remote.local())
2347 remote = localrepo.locallegacypeer(remote.local())
2348 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2348 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2349 force=True)
2349 force=True)
2350 common = set(common)
2350 common = set(common)
2351 if not opts.get('nonheads'):
2351 if not opts.get('nonheads'):
2352 ui.write(("unpruned common: %s\n") %
2352 ui.write(("unpruned common: %s\n") %
2353 " ".join(sorted(short(n) for n in common)))
2353 " ".join(sorted(short(n) for n in common)))
2354 dag = dagutil.revlogdag(repo.changelog)
2354 dag = dagutil.revlogdag(repo.changelog)
2355 all = dag.ancestorset(dag.internalizeall(common))
2355 all = dag.ancestorset(dag.internalizeall(common))
2356 common = dag.externalizeall(dag.headsetofconnecteds(all))
2356 common = dag.externalizeall(dag.headsetofconnecteds(all))
2357 else:
2357 else:
2358 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2358 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2359 common = set(common)
2359 common = set(common)
2360 rheads = set(hds)
2360 rheads = set(hds)
2361 lheads = set(repo.heads())
2361 lheads = set(repo.heads())
2362 ui.write(("common heads: %s\n") %
2362 ui.write(("common heads: %s\n") %
2363 " ".join(sorted(short(n) for n in common)))
2363 " ".join(sorted(short(n) for n in common)))
2364 if lheads <= common:
2364 if lheads <= common:
2365 ui.write(("local is subset\n"))
2365 ui.write(("local is subset\n"))
2366 elif rheads <= common:
2366 elif rheads <= common:
2367 ui.write(("remote is subset\n"))
2367 ui.write(("remote is subset\n"))
2368
2368
2369 serverlogs = opts.get('serverlog')
2369 serverlogs = opts.get('serverlog')
2370 if serverlogs:
2370 if serverlogs:
2371 for filename in serverlogs:
2371 for filename in serverlogs:
2372 with open(filename, 'r') as logfile:
2372 with open(filename, 'r') as logfile:
2373 line = logfile.readline()
2373 line = logfile.readline()
2374 while line:
2374 while line:
2375 parts = line.strip().split(';')
2375 parts = line.strip().split(';')
2376 op = parts[1]
2376 op = parts[1]
2377 if op == 'cg':
2377 if op == 'cg':
2378 pass
2378 pass
2379 elif op == 'cgss':
2379 elif op == 'cgss':
2380 doit(parts[2].split(' '), parts[3].split(' '))
2380 doit(parts[2].split(' '), parts[3].split(' '))
2381 elif op == 'unb':
2381 elif op == 'unb':
2382 doit(parts[3].split(' '), parts[2].split(' '))
2382 doit(parts[3].split(' '), parts[2].split(' '))
2383 line = logfile.readline()
2383 line = logfile.readline()
2384 else:
2384 else:
2385 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2385 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2386 opts.get('remote_head'))
2386 opts.get('remote_head'))
2387 localrevs = opts.get('local_head')
2387 localrevs = opts.get('local_head')
2388 doit(localrevs, remoterevs)
2388 doit(localrevs, remoterevs)
2389
2389
2390 @command('debugextensions', formatteropts, [], norepo=True)
2390 @command('debugextensions', formatteropts, [], norepo=True)
2391 def debugextensions(ui, **opts):
2391 def debugextensions(ui, **opts):
2392 '''show information about active extensions'''
2392 '''show information about active extensions'''
2393 exts = extensions.extensions(ui)
2393 exts = extensions.extensions(ui)
2394 hgver = util.version()
2394 hgver = util.version()
2395 fm = ui.formatter('debugextensions', opts)
2395 fm = ui.formatter('debugextensions', opts)
2396 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
2396 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
2397 isinternal = extensions.ismoduleinternal(extmod)
2397 isinternal = extensions.ismoduleinternal(extmod)
2398 extsource = extmod.__file__
2398 extsource = extmod.__file__
2399 if isinternal:
2399 if isinternal:
2400 exttestedwith = [] # never expose magic string to users
2400 exttestedwith = [] # never expose magic string to users
2401 else:
2401 else:
2402 exttestedwith = getattr(extmod, 'testedwith', '').split()
2402 exttestedwith = getattr(extmod, 'testedwith', '').split()
2403 extbuglink = getattr(extmod, 'buglink', None)
2403 extbuglink = getattr(extmod, 'buglink', None)
2404
2404
2405 fm.startitem()
2405 fm.startitem()
2406
2406
2407 if ui.quiet or ui.verbose:
2407 if ui.quiet or ui.verbose:
2408 fm.write('name', '%s\n', extname)
2408 fm.write('name', '%s\n', extname)
2409 else:
2409 else:
2410 fm.write('name', '%s', extname)
2410 fm.write('name', '%s', extname)
2411 if isinternal or hgver in exttestedwith:
2411 if isinternal or hgver in exttestedwith:
2412 fm.plain('\n')
2412 fm.plain('\n')
2413 elif not exttestedwith:
2413 elif not exttestedwith:
2414 fm.plain(_(' (untested!)\n'))
2414 fm.plain(_(' (untested!)\n'))
2415 else:
2415 else:
2416 lasttestedversion = exttestedwith[-1]
2416 lasttestedversion = exttestedwith[-1]
2417 fm.plain(' (%s!)\n' % lasttestedversion)
2417 fm.plain(' (%s!)\n' % lasttestedversion)
2418
2418
2419 fm.condwrite(ui.verbose and extsource, 'source',
2419 fm.condwrite(ui.verbose and extsource, 'source',
2420 _(' location: %s\n'), extsource or "")
2420 _(' location: %s\n'), extsource or "")
2421
2421
2422 if ui.verbose:
2422 if ui.verbose:
2423 fm.plain(_(' bundled: %s\n') % ['no', 'yes'][isinternal])
2423 fm.plain(_(' bundled: %s\n') % ['no', 'yes'][isinternal])
2424 fm.data(bundled=isinternal)
2424 fm.data(bundled=isinternal)
2425
2425
2426 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
2426 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
2427 _(' tested with: %s\n'),
2427 _(' tested with: %s\n'),
2428 fm.formatlist(exttestedwith, name='ver'))
2428 fm.formatlist(exttestedwith, name='ver'))
2429
2429
2430 fm.condwrite(ui.verbose and extbuglink, 'buglink',
2430 fm.condwrite(ui.verbose and extbuglink, 'buglink',
2431 _(' bug reporting: %s\n'), extbuglink or "")
2431 _(' bug reporting: %s\n'), extbuglink or "")
2432
2432
2433 fm.end()
2433 fm.end()
2434
2434
2435 @command('debugfileset',
2435 @command('debugfileset',
2436 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2436 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2437 _('[-r REV] FILESPEC'))
2437 _('[-r REV] FILESPEC'))
2438 def debugfileset(ui, repo, expr, **opts):
2438 def debugfileset(ui, repo, expr, **opts):
2439 '''parse and apply a fileset specification'''
2439 '''parse and apply a fileset specification'''
2440 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2440 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2441 if ui.verbose:
2441 if ui.verbose:
2442 tree = fileset.parse(expr)
2442 tree = fileset.parse(expr)
2443 ui.note(fileset.prettyformat(tree), "\n")
2443 ui.note(fileset.prettyformat(tree), "\n")
2444
2444
2445 for f in ctx.getfileset(expr):
2445 for f in ctx.getfileset(expr):
2446 ui.write("%s\n" % f)
2446 ui.write("%s\n" % f)
2447
2447
2448 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2448 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2449 def debugfsinfo(ui, path="."):
2449 def debugfsinfo(ui, path="."):
2450 """show information detected about current filesystem"""
2450 """show information detected about current filesystem"""
2451 util.writefile('.debugfsinfo', '')
2451 util.writefile('.debugfsinfo', '')
2452 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2452 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2453 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2453 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2454 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2454 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2455 ui.write(('case-sensitive: %s\n') % (util.fscasesensitive('.debugfsinfo')
2455 ui.write(('case-sensitive: %s\n') % (util.fscasesensitive('.debugfsinfo')
2456 and 'yes' or 'no'))
2456 and 'yes' or 'no'))
2457 os.unlink('.debugfsinfo')
2457 os.unlink('.debugfsinfo')
2458
2458
2459 @command('debuggetbundle',
2459 @command('debuggetbundle',
2460 [('H', 'head', [], _('id of head node'), _('ID')),
2460 [('H', 'head', [], _('id of head node'), _('ID')),
2461 ('C', 'common', [], _('id of common node'), _('ID')),
2461 ('C', 'common', [], _('id of common node'), _('ID')),
2462 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2462 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2463 _('REPO FILE [-H|-C ID]...'),
2463 _('REPO FILE [-H|-C ID]...'),
2464 norepo=True)
2464 norepo=True)
2465 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2465 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2466 """retrieves a bundle from a repo
2466 """retrieves a bundle from a repo
2467
2467
2468 Every ID must be a full-length hex node id string. Saves the bundle to the
2468 Every ID must be a full-length hex node id string. Saves the bundle to the
2469 given file.
2469 given file.
2470 """
2470 """
2471 repo = hg.peer(ui, opts, repopath)
2471 repo = hg.peer(ui, opts, repopath)
2472 if not repo.capable('getbundle'):
2472 if not repo.capable('getbundle'):
2473 raise error.Abort("getbundle() not supported by target repository")
2473 raise error.Abort("getbundle() not supported by target repository")
2474 args = {}
2474 args = {}
2475 if common:
2475 if common:
2476 args['common'] = [bin(s) for s in common]
2476 args['common'] = [bin(s) for s in common]
2477 if head:
2477 if head:
2478 args['heads'] = [bin(s) for s in head]
2478 args['heads'] = [bin(s) for s in head]
2479 # TODO: get desired bundlecaps from command line.
2479 # TODO: get desired bundlecaps from command line.
2480 args['bundlecaps'] = None
2480 args['bundlecaps'] = None
2481 bundle = repo.getbundle('debug', **args)
2481 bundle = repo.getbundle('debug', **args)
2482
2482
2483 bundletype = opts.get('type', 'bzip2').lower()
2483 bundletype = opts.get('type', 'bzip2').lower()
2484 btypes = {'none': 'HG10UN',
2484 btypes = {'none': 'HG10UN',
2485 'bzip2': 'HG10BZ',
2485 'bzip2': 'HG10BZ',
2486 'gzip': 'HG10GZ',
2486 'gzip': 'HG10GZ',
2487 'bundle2': 'HG20'}
2487 'bundle2': 'HG20'}
2488 bundletype = btypes.get(bundletype)
2488 bundletype = btypes.get(bundletype)
2489 if bundletype not in bundle2.bundletypes:
2489 if bundletype not in bundle2.bundletypes:
2490 raise error.Abort(_('unknown bundle type specified with --type'))
2490 raise error.Abort(_('unknown bundle type specified with --type'))
2491 bundle2.writebundle(ui, bundle, bundlepath, bundletype)
2491 bundle2.writebundle(ui, bundle, bundlepath, bundletype)
2492
2492
2493 @command('debugignore', [], '[FILE]')
2493 @command('debugignore', [], '[FILE]')
2494 def debugignore(ui, repo, *files, **opts):
2494 def debugignore(ui, repo, *files, **opts):
2495 """display the combined ignore pattern and information about ignored files
2495 """display the combined ignore pattern and information about ignored files
2496
2496
2497 With no argument display the combined ignore pattern.
2497 With no argument display the combined ignore pattern.
2498
2498
2499 Given space separated file names, shows if the given file is ignored and
2499 Given space separated file names, shows if the given file is ignored and
2500 if so, show the ignore rule (file and line number) that matched it.
2500 if so, show the ignore rule (file and line number) that matched it.
2501 """
2501 """
2502 ignore = repo.dirstate._ignore
2502 ignore = repo.dirstate._ignore
2503 if not files:
2503 if not files:
2504 # Show all the patterns
2504 # Show all the patterns
2505 includepat = getattr(ignore, 'includepat', None)
2505 includepat = getattr(ignore, 'includepat', None)
2506 if includepat is not None:
2506 if includepat is not None:
2507 ui.write("%s\n" % includepat)
2507 ui.write("%s\n" % includepat)
2508 else:
2508 else:
2509 raise error.Abort(_("no ignore patterns found"))
2509 raise error.Abort(_("no ignore patterns found"))
2510 else:
2510 else:
2511 for f in files:
2511 for f in files:
2512 nf = util.normpath(f)
2512 nf = util.normpath(f)
2513 ignored = None
2513 ignored = None
2514 ignoredata = None
2514 ignoredata = None
2515 if nf != '.':
2515 if nf != '.':
2516 if ignore(nf):
2516 if ignore(nf):
2517 ignored = nf
2517 ignored = nf
2518 ignoredata = repo.dirstate._ignorefileandline(nf)
2518 ignoredata = repo.dirstate._ignorefileandline(nf)
2519 else:
2519 else:
2520 for p in util.finddirs(nf):
2520 for p in util.finddirs(nf):
2521 if ignore(p):
2521 if ignore(p):
2522 ignored = p
2522 ignored = p
2523 ignoredata = repo.dirstate._ignorefileandline(p)
2523 ignoredata = repo.dirstate._ignorefileandline(p)
2524 break
2524 break
2525 if ignored:
2525 if ignored:
2526 if ignored == nf:
2526 if ignored == nf:
2527 ui.write(_("%s is ignored\n") % f)
2527 ui.write(_("%s is ignored\n") % f)
2528 else:
2528 else:
2529 ui.write(_("%s is ignored because of "
2529 ui.write(_("%s is ignored because of "
2530 "containing folder %s\n")
2530 "containing folder %s\n")
2531 % (f, ignored))
2531 % (f, ignored))
2532 ignorefile, lineno, line = ignoredata
2532 ignorefile, lineno, line = ignoredata
2533 ui.write(_("(ignore rule in %s, line %d: '%s')\n")
2533 ui.write(_("(ignore rule in %s, line %d: '%s')\n")
2534 % (ignorefile, lineno, line))
2534 % (ignorefile, lineno, line))
2535 else:
2535 else:
2536 ui.write(_("%s is not ignored\n") % f)
2536 ui.write(_("%s is not ignored\n") % f)
2537
2537
2538 @command('debugindex', debugrevlogopts +
2538 @command('debugindex', debugrevlogopts +
2539 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2539 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2540 _('[-f FORMAT] -c|-m|FILE'),
2540 _('[-f FORMAT] -c|-m|FILE'),
2541 optionalrepo=True)
2541 optionalrepo=True)
2542 def debugindex(ui, repo, file_=None, **opts):
2542 def debugindex(ui, repo, file_=None, **opts):
2543 """dump the contents of an index file"""
2543 """dump the contents of an index file"""
2544 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2544 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2545 format = opts.get('format', 0)
2545 format = opts.get('format', 0)
2546 if format not in (0, 1):
2546 if format not in (0, 1):
2547 raise error.Abort(_("unknown format %d") % format)
2547 raise error.Abort(_("unknown format %d") % format)
2548
2548
2549 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2549 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2550 if generaldelta:
2550 if generaldelta:
2551 basehdr = ' delta'
2551 basehdr = ' delta'
2552 else:
2552 else:
2553 basehdr = ' base'
2553 basehdr = ' base'
2554
2554
2555 if ui.debugflag:
2555 if ui.debugflag:
2556 shortfn = hex
2556 shortfn = hex
2557 else:
2557 else:
2558 shortfn = short
2558 shortfn = short
2559
2559
2560 # There might not be anything in r, so have a sane default
2560 # There might not be anything in r, so have a sane default
2561 idlen = 12
2561 idlen = 12
2562 for i in r:
2562 for i in r:
2563 idlen = len(shortfn(r.node(i)))
2563 idlen = len(shortfn(r.node(i)))
2564 break
2564 break
2565
2565
2566 if format == 0:
2566 if format == 0:
2567 ui.write((" rev offset length " + basehdr + " linkrev"
2567 ui.write((" rev offset length " + basehdr + " linkrev"
2568 " %s %s p2\n") % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2568 " %s %s p2\n") % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2569 elif format == 1:
2569 elif format == 1:
2570 ui.write((" rev flag offset length"
2570 ui.write((" rev flag offset length"
2571 " size " + basehdr + " link p1 p2"
2571 " size " + basehdr + " link p1 p2"
2572 " %s\n") % "nodeid".rjust(idlen))
2572 " %s\n") % "nodeid".rjust(idlen))
2573
2573
2574 for i in r:
2574 for i in r:
2575 node = r.node(i)
2575 node = r.node(i)
2576 if generaldelta:
2576 if generaldelta:
2577 base = r.deltaparent(i)
2577 base = r.deltaparent(i)
2578 else:
2578 else:
2579 base = r.chainbase(i)
2579 base = r.chainbase(i)
2580 if format == 0:
2580 if format == 0:
2581 try:
2581 try:
2582 pp = r.parents(node)
2582 pp = r.parents(node)
2583 except Exception:
2583 except Exception:
2584 pp = [nullid, nullid]
2584 pp = [nullid, nullid]
2585 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2585 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2586 i, r.start(i), r.length(i), base, r.linkrev(i),
2586 i, r.start(i), r.length(i), base, r.linkrev(i),
2587 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2587 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2588 elif format == 1:
2588 elif format == 1:
2589 pr = r.parentrevs(i)
2589 pr = r.parentrevs(i)
2590 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2590 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2591 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2591 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2592 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2592 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2593
2593
2594 @command('debugindexdot', debugrevlogopts,
2594 @command('debugindexdot', debugrevlogopts,
2595 _('-c|-m|FILE'), optionalrepo=True)
2595 _('-c|-m|FILE'), optionalrepo=True)
2596 def debugindexdot(ui, repo, file_=None, **opts):
2596 def debugindexdot(ui, repo, file_=None, **opts):
2597 """dump an index DAG as a graphviz dot file"""
2597 """dump an index DAG as a graphviz dot file"""
2598 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
2598 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
2599 ui.write(("digraph G {\n"))
2599 ui.write(("digraph G {\n"))
2600 for i in r:
2600 for i in r:
2601 node = r.node(i)
2601 node = r.node(i)
2602 pp = r.parents(node)
2602 pp = r.parents(node)
2603 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2603 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2604 if pp[1] != nullid:
2604 if pp[1] != nullid:
2605 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2605 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2606 ui.write("}\n")
2606 ui.write("}\n")
2607
2607
2608 @command('debugdeltachain',
2608 @command('debugdeltachain',
2609 debugrevlogopts + formatteropts,
2609 debugrevlogopts + formatteropts,
2610 _('-c|-m|FILE'),
2610 _('-c|-m|FILE'),
2611 optionalrepo=True)
2611 optionalrepo=True)
2612 def debugdeltachain(ui, repo, file_=None, **opts):
2612 def debugdeltachain(ui, repo, file_=None, **opts):
2613 """dump information about delta chains in a revlog
2613 """dump information about delta chains in a revlog
2614
2614
2615 Output can be templatized. Available template keywords are:
2615 Output can be templatized. Available template keywords are:
2616
2616
2617 :``rev``: revision number
2617 :``rev``: revision number
2618 :``chainid``: delta chain identifier (numbered by unique base)
2618 :``chainid``: delta chain identifier (numbered by unique base)
2619 :``chainlen``: delta chain length to this revision
2619 :``chainlen``: delta chain length to this revision
2620 :``prevrev``: previous revision in delta chain
2620 :``prevrev``: previous revision in delta chain
2621 :``deltatype``: role of delta / how it was computed
2621 :``deltatype``: role of delta / how it was computed
2622 :``compsize``: compressed size of revision
2622 :``compsize``: compressed size of revision
2623 :``uncompsize``: uncompressed size of revision
2623 :``uncompsize``: uncompressed size of revision
2624 :``chainsize``: total size of compressed revisions in chain
2624 :``chainsize``: total size of compressed revisions in chain
2625 :``chainratio``: total chain size divided by uncompressed revision size
2625 :``chainratio``: total chain size divided by uncompressed revision size
2626 (new delta chains typically start at ratio 2.00)
2626 (new delta chains typically start at ratio 2.00)
2627 :``lindist``: linear distance from base revision in delta chain to end
2627 :``lindist``: linear distance from base revision in delta chain to end
2628 of this revision
2628 of this revision
2629 :``extradist``: total size of revisions not part of this delta chain from
2629 :``extradist``: total size of revisions not part of this delta chain from
2630 base of delta chain to end of this revision; a measurement
2630 base of delta chain to end of this revision; a measurement
2631 of how much extra data we need to read/seek across to read
2631 of how much extra data we need to read/seek across to read
2632 the delta chain for this revision
2632 the delta chain for this revision
2633 :``extraratio``: extradist divided by chainsize; another representation of
2633 :``extraratio``: extradist divided by chainsize; another representation of
2634 how much unrelated data is needed to load this delta chain
2634 how much unrelated data is needed to load this delta chain
2635 """
2635 """
2636 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
2636 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
2637 index = r.index
2637 index = r.index
2638 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2638 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2639
2639
2640 def revinfo(rev):
2640 def revinfo(rev):
2641 e = index[rev]
2641 e = index[rev]
2642 compsize = e[1]
2642 compsize = e[1]
2643 uncompsize = e[2]
2643 uncompsize = e[2]
2644 chainsize = 0
2644 chainsize = 0
2645
2645
2646 if generaldelta:
2646 if generaldelta:
2647 if e[3] == e[5]:
2647 if e[3] == e[5]:
2648 deltatype = 'p1'
2648 deltatype = 'p1'
2649 elif e[3] == e[6]:
2649 elif e[3] == e[6]:
2650 deltatype = 'p2'
2650 deltatype = 'p2'
2651 elif e[3] == rev - 1:
2651 elif e[3] == rev - 1:
2652 deltatype = 'prev'
2652 deltatype = 'prev'
2653 elif e[3] == rev:
2653 elif e[3] == rev:
2654 deltatype = 'base'
2654 deltatype = 'base'
2655 else:
2655 else:
2656 deltatype = 'other'
2656 deltatype = 'other'
2657 else:
2657 else:
2658 if e[3] == rev:
2658 if e[3] == rev:
2659 deltatype = 'base'
2659 deltatype = 'base'
2660 else:
2660 else:
2661 deltatype = 'prev'
2661 deltatype = 'prev'
2662
2662
2663 chain = r._deltachain(rev)[0]
2663 chain = r._deltachain(rev)[0]
2664 for iterrev in chain:
2664 for iterrev in chain:
2665 e = index[iterrev]
2665 e = index[iterrev]
2666 chainsize += e[1]
2666 chainsize += e[1]
2667
2667
2668 return compsize, uncompsize, deltatype, chain, chainsize
2668 return compsize, uncompsize, deltatype, chain, chainsize
2669
2669
2670 fm = ui.formatter('debugdeltachain', opts)
2670 fm = ui.formatter('debugdeltachain', opts)
2671
2671
2672 fm.plain(' rev chain# chainlen prev delta '
2672 fm.plain(' rev chain# chainlen prev delta '
2673 'size rawsize chainsize ratio lindist extradist '
2673 'size rawsize chainsize ratio lindist extradist '
2674 'extraratio\n')
2674 'extraratio\n')
2675
2675
2676 chainbases = {}
2676 chainbases = {}
2677 for rev in r:
2677 for rev in r:
2678 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
2678 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
2679 chainbase = chain[0]
2679 chainbase = chain[0]
2680 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
2680 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
2681 basestart = r.start(chainbase)
2681 basestart = r.start(chainbase)
2682 revstart = r.start(rev)
2682 revstart = r.start(rev)
2683 lineardist = revstart + comp - basestart
2683 lineardist = revstart + comp - basestart
2684 extradist = lineardist - chainsize
2684 extradist = lineardist - chainsize
2685 try:
2685 try:
2686 prevrev = chain[-2]
2686 prevrev = chain[-2]
2687 except IndexError:
2687 except IndexError:
2688 prevrev = -1
2688 prevrev = -1
2689
2689
2690 chainratio = float(chainsize) / float(uncomp)
2690 chainratio = float(chainsize) / float(uncomp)
2691 extraratio = float(extradist) / float(chainsize)
2691 extraratio = float(extradist) / float(chainsize)
2692
2692
2693 fm.startitem()
2693 fm.startitem()
2694 fm.write('rev chainid chainlen prevrev deltatype compsize '
2694 fm.write('rev chainid chainlen prevrev deltatype compsize '
2695 'uncompsize chainsize chainratio lindist extradist '
2695 'uncompsize chainsize chainratio lindist extradist '
2696 'extraratio',
2696 'extraratio',
2697 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f\n',
2697 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f\n',
2698 rev, chainid, len(chain), prevrev, deltatype, comp,
2698 rev, chainid, len(chain), prevrev, deltatype, comp,
2699 uncomp, chainsize, chainratio, lineardist, extradist,
2699 uncomp, chainsize, chainratio, lineardist, extradist,
2700 extraratio,
2700 extraratio,
2701 rev=rev, chainid=chainid, chainlen=len(chain),
2701 rev=rev, chainid=chainid, chainlen=len(chain),
2702 prevrev=prevrev, deltatype=deltatype, compsize=comp,
2702 prevrev=prevrev, deltatype=deltatype, compsize=comp,
2703 uncompsize=uncomp, chainsize=chainsize,
2703 uncompsize=uncomp, chainsize=chainsize,
2704 chainratio=chainratio, lindist=lineardist,
2704 chainratio=chainratio, lindist=lineardist,
2705 extradist=extradist, extraratio=extraratio)
2705 extradist=extradist, extraratio=extraratio)
2706
2706
2707 fm.end()
2707 fm.end()
2708
2708
2709 @command('debuginstall', [] + formatteropts, '', norepo=True)
2709 @command('debuginstall', [] + formatteropts, '', norepo=True)
2710 def debuginstall(ui, **opts):
2710 def debuginstall(ui, **opts):
2711 '''test Mercurial installation
2711 '''test Mercurial installation
2712
2712
2713 Returns 0 on success.
2713 Returns 0 on success.
2714 '''
2714 '''
2715
2715
2716 def writetemp(contents):
2716 def writetemp(contents):
2717 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2717 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2718 f = os.fdopen(fd, "wb")
2718 f = os.fdopen(fd, "wb")
2719 f.write(contents)
2719 f.write(contents)
2720 f.close()
2720 f.close()
2721 return name
2721 return name
2722
2722
2723 problems = 0
2723 problems = 0
2724
2724
2725 fm = ui.formatter('debuginstall', opts)
2725 fm = ui.formatter('debuginstall', opts)
2726 fm.startitem()
2726 fm.startitem()
2727
2727
2728 # encoding
2728 # encoding
2729 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
2729 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
2730 err = None
2730 err = None
2731 try:
2731 try:
2732 encoding.fromlocal("test")
2732 encoding.fromlocal("test")
2733 except error.Abort as inst:
2733 except error.Abort as inst:
2734 err = inst
2734 err = inst
2735 problems += 1
2735 problems += 1
2736 fm.condwrite(err, 'encodingerror', _(" %s\n"
2736 fm.condwrite(err, 'encodingerror', _(" %s\n"
2737 " (check that your locale is properly set)\n"), err)
2737 " (check that your locale is properly set)\n"), err)
2738
2738
2739 # Python
2739 # Python
2740 fm.write('pythonexe', _("checking Python executable (%s)\n"),
2740 fm.write('pythonexe', _("checking Python executable (%s)\n"),
2741 sys.executable)
2741 sys.executable)
2742 fm.write('pythonver', _("checking Python version (%s)\n"),
2742 fm.write('pythonver', _("checking Python version (%s)\n"),
2743 ("%s.%s.%s" % sys.version_info[:3]))
2743 ("%s.%s.%s" % sys.version_info[:3]))
2744 fm.write('pythonlib', _("checking Python lib (%s)...\n"),
2744 fm.write('pythonlib', _("checking Python lib (%s)...\n"),
2745 os.path.dirname(os.__file__))
2745 os.path.dirname(os.__file__))
2746
2746
2747 # hg version
2747 # hg version
2748 hgver = util.version()
2748 hgver = util.version()
2749 fm.write('hgver', _("checking Mercurial version (%s)\n"),
2749 fm.write('hgver', _("checking Mercurial version (%s)\n"),
2750 hgver.split('+')[0])
2750 hgver.split('+')[0])
2751 fm.write('hgverextra', _("checking Mercurial custom build (%s)\n"),
2751 fm.write('hgverextra', _("checking Mercurial custom build (%s)\n"),
2752 '+'.join(hgver.split('+')[1:]))
2752 '+'.join(hgver.split('+')[1:]))
2753
2753
2754 # compiled modules
2754 # compiled modules
2755 fm.write('hgmodulepolicy', _("checking module policy (%s)\n"),
2755 fm.write('hgmodulepolicy', _("checking module policy (%s)\n"),
2756 policy.policy)
2756 policy.policy)
2757 fm.write('hgmodules', _("checking installed modules (%s)...\n"),
2757 fm.write('hgmodules', _("checking installed modules (%s)...\n"),
2758 os.path.dirname(__file__))
2758 os.path.dirname(__file__))
2759
2759
2760 err = None
2760 err = None
2761 try:
2761 try:
2762 from . import (
2762 from . import (
2763 base85,
2763 base85,
2764 bdiff,
2764 bdiff,
2765 mpatch,
2765 mpatch,
2766 osutil,
2766 osutil,
2767 )
2767 )
2768 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2768 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2769 except Exception as inst:
2769 except Exception as inst:
2770 err = inst
2770 err = inst
2771 problems += 1
2771 problems += 1
2772 fm.condwrite(err, 'extensionserror', " %s\n", err)
2772 fm.condwrite(err, 'extensionserror', " %s\n", err)
2773
2773
2774 # templates
2774 # templates
2775 p = templater.templatepaths()
2775 p = templater.templatepaths()
2776 fm.write('templatedirs', 'checking templates (%s)...\n', ' '.join(p))
2776 fm.write('templatedirs', 'checking templates (%s)...\n', ' '.join(p))
2777 fm.condwrite(not p, '', _(" no template directories found\n"))
2777 fm.condwrite(not p, '', _(" no template directories found\n"))
2778 if p:
2778 if p:
2779 m = templater.templatepath("map-cmdline.default")
2779 m = templater.templatepath("map-cmdline.default")
2780 if m:
2780 if m:
2781 # template found, check if it is working
2781 # template found, check if it is working
2782 err = None
2782 err = None
2783 try:
2783 try:
2784 templater.templater.frommapfile(m)
2784 templater.templater.frommapfile(m)
2785 except Exception as inst:
2785 except Exception as inst:
2786 err = inst
2786 err = inst
2787 p = None
2787 p = None
2788 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err)
2788 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err)
2789 else:
2789 else:
2790 p = None
2790 p = None
2791 fm.condwrite(p, 'defaulttemplate',
2791 fm.condwrite(p, 'defaulttemplate',
2792 _("checking default template (%s)\n"), m)
2792 _("checking default template (%s)\n"), m)
2793 fm.condwrite(not m, 'defaulttemplatenotfound',
2793 fm.condwrite(not m, 'defaulttemplatenotfound',
2794 _(" template '%s' not found\n"), "default")
2794 _(" template '%s' not found\n"), "default")
2795 if not p:
2795 if not p:
2796 problems += 1
2796 problems += 1
2797 fm.condwrite(not p, '',
2797 fm.condwrite(not p, '',
2798 _(" (templates seem to have been installed incorrectly)\n"))
2798 _(" (templates seem to have been installed incorrectly)\n"))
2799
2799
2800 # editor
2800 # editor
2801 editor = ui.geteditor()
2801 editor = ui.geteditor()
2802 editor = util.expandpath(editor)
2802 editor = util.expandpath(editor)
2803 fm.write('editor', _("checking commit editor... (%s)\n"), editor)
2803 fm.write('editor', _("checking commit editor... (%s)\n"), editor)
2804 cmdpath = util.findexe(shlex.split(editor)[0])
2804 cmdpath = util.findexe(shlex.split(editor)[0])
2805 fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
2805 fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
2806 _(" No commit editor set and can't find %s in PATH\n"
2806 _(" No commit editor set and can't find %s in PATH\n"
2807 " (specify a commit editor in your configuration"
2807 " (specify a commit editor in your configuration"
2808 " file)\n"), not cmdpath and editor == 'vi' and editor)
2808 " file)\n"), not cmdpath and editor == 'vi' and editor)
2809 fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
2809 fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
2810 _(" Can't find editor '%s' in PATH\n"
2810 _(" Can't find editor '%s' in PATH\n"
2811 " (specify a commit editor in your configuration"
2811 " (specify a commit editor in your configuration"
2812 " file)\n"), not cmdpath and editor)
2812 " file)\n"), not cmdpath and editor)
2813 if not cmdpath and editor != 'vi':
2813 if not cmdpath and editor != 'vi':
2814 problems += 1
2814 problems += 1
2815
2815
2816 # check username
2816 # check username
2817 username = None
2817 username = None
2818 err = None
2818 err = None
2819 try:
2819 try:
2820 username = ui.username()
2820 username = ui.username()
2821 except error.Abort as e:
2821 except error.Abort as e:
2822 err = e
2822 err = e
2823 problems += 1
2823 problems += 1
2824
2824
2825 fm.condwrite(username, 'username', _("checking username (%s)\n"), username)
2825 fm.condwrite(username, 'username', _("checking username (%s)\n"), username)
2826 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n"
2826 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n"
2827 " (specify a username in your configuration file)\n"), err)
2827 " (specify a username in your configuration file)\n"), err)
2828
2828
2829 fm.condwrite(not problems, '',
2829 fm.condwrite(not problems, '',
2830 _("no problems detected\n"))
2830 _("no problems detected\n"))
2831 if not problems:
2831 if not problems:
2832 fm.data(problems=problems)
2832 fm.data(problems=problems)
2833 fm.condwrite(problems, 'problems',
2833 fm.condwrite(problems, 'problems',
2834 _("%s problems detected,"
2834 _("%s problems detected,"
2835 " please check your install!\n"), problems)
2835 " please check your install!\n"), problems)
2836 fm.end()
2836 fm.end()
2837
2837
2838 return problems
2838 return problems
2839
2839
2840 @command('debugknown', [], _('REPO ID...'), norepo=True)
2840 @command('debugknown', [], _('REPO ID...'), norepo=True)
2841 def debugknown(ui, repopath, *ids, **opts):
2841 def debugknown(ui, repopath, *ids, **opts):
2842 """test whether node ids are known to a repo
2842 """test whether node ids are known to a repo
2843
2843
2844 Every ID must be a full-length hex node id string. Returns a list of 0s
2844 Every ID must be a full-length hex node id string. Returns a list of 0s
2845 and 1s indicating unknown/known.
2845 and 1s indicating unknown/known.
2846 """
2846 """
2847 repo = hg.peer(ui, opts, repopath)
2847 repo = hg.peer(ui, opts, repopath)
2848 if not repo.capable('known'):
2848 if not repo.capable('known'):
2849 raise error.Abort("known() not supported by target repository")
2849 raise error.Abort("known() not supported by target repository")
2850 flags = repo.known([bin(s) for s in ids])
2850 flags = repo.known([bin(s) for s in ids])
2851 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2851 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2852
2852
2853 @command('debuglabelcomplete', [], _('LABEL...'))
2853 @command('debuglabelcomplete', [], _('LABEL...'))
2854 def debuglabelcomplete(ui, repo, *args):
2854 def debuglabelcomplete(ui, repo, *args):
2855 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2855 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2856 debugnamecomplete(ui, repo, *args)
2856 debugnamecomplete(ui, repo, *args)
2857
2857
2858 @command('debugmergestate', [], '')
2858 @command('debugmergestate', [], '')
2859 def debugmergestate(ui, repo, *args):
2859 def debugmergestate(ui, repo, *args):
2860 """print merge state
2860 """print merge state
2861
2861
2862 Use --verbose to print out information about whether v1 or v2 merge state
2862 Use --verbose to print out information about whether v1 or v2 merge state
2863 was chosen."""
2863 was chosen."""
2864 def _hashornull(h):
2864 def _hashornull(h):
2865 if h == nullhex:
2865 if h == nullhex:
2866 return 'null'
2866 return 'null'
2867 else:
2867 else:
2868 return h
2868 return h
2869
2869
2870 def printrecords(version):
2870 def printrecords(version):
2871 ui.write(('* version %s records\n') % version)
2871 ui.write(('* version %s records\n') % version)
2872 if version == 1:
2872 if version == 1:
2873 records = v1records
2873 records = v1records
2874 else:
2874 else:
2875 records = v2records
2875 records = v2records
2876
2876
2877 for rtype, record in records:
2877 for rtype, record in records:
2878 # pretty print some record types
2878 # pretty print some record types
2879 if rtype == 'L':
2879 if rtype == 'L':
2880 ui.write(('local: %s\n') % record)
2880 ui.write(('local: %s\n') % record)
2881 elif rtype == 'O':
2881 elif rtype == 'O':
2882 ui.write(('other: %s\n') % record)
2882 ui.write(('other: %s\n') % record)
2883 elif rtype == 'm':
2883 elif rtype == 'm':
2884 driver, mdstate = record.split('\0', 1)
2884 driver, mdstate = record.split('\0', 1)
2885 ui.write(('merge driver: %s (state "%s")\n')
2885 ui.write(('merge driver: %s (state "%s")\n')
2886 % (driver, mdstate))
2886 % (driver, mdstate))
2887 elif rtype in 'FDC':
2887 elif rtype in 'FDC':
2888 r = record.split('\0')
2888 r = record.split('\0')
2889 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2889 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2890 if version == 1:
2890 if version == 1:
2891 onode = 'not stored in v1 format'
2891 onode = 'not stored in v1 format'
2892 flags = r[7]
2892 flags = r[7]
2893 else:
2893 else:
2894 onode, flags = r[7:9]
2894 onode, flags = r[7:9]
2895 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2895 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2896 % (f, rtype, state, _hashornull(hash)))
2896 % (f, rtype, state, _hashornull(hash)))
2897 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2897 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2898 ui.write((' ancestor path: %s (node %s)\n')
2898 ui.write((' ancestor path: %s (node %s)\n')
2899 % (afile, _hashornull(anode)))
2899 % (afile, _hashornull(anode)))
2900 ui.write((' other path: %s (node %s)\n')
2900 ui.write((' other path: %s (node %s)\n')
2901 % (ofile, _hashornull(onode)))
2901 % (ofile, _hashornull(onode)))
2902 elif rtype == 'f':
2902 elif rtype == 'f':
2903 filename, rawextras = record.split('\0', 1)
2903 filename, rawextras = record.split('\0', 1)
2904 extras = rawextras.split('\0')
2904 extras = rawextras.split('\0')
2905 i = 0
2905 i = 0
2906 extrastrings = []
2906 extrastrings = []
2907 while i < len(extras):
2907 while i < len(extras):
2908 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
2908 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
2909 i += 2
2909 i += 2
2910
2910
2911 ui.write(('file extras: %s (%s)\n')
2911 ui.write(('file extras: %s (%s)\n')
2912 % (filename, ', '.join(extrastrings)))
2912 % (filename, ', '.join(extrastrings)))
2913 elif rtype == 'l':
2913 elif rtype == 'l':
2914 labels = record.split('\0', 2)
2914 labels = record.split('\0', 2)
2915 labels = [l for l in labels if len(l) > 0]
2915 labels = [l for l in labels if len(l) > 0]
2916 ui.write(('labels:\n'))
2916 ui.write(('labels:\n'))
2917 ui.write((' local: %s\n' % labels[0]))
2917 ui.write((' local: %s\n' % labels[0]))
2918 ui.write((' other: %s\n' % labels[1]))
2918 ui.write((' other: %s\n' % labels[1]))
2919 if len(labels) > 2:
2919 if len(labels) > 2:
2920 ui.write((' base: %s\n' % labels[2]))
2920 ui.write((' base: %s\n' % labels[2]))
2921 else:
2921 else:
2922 ui.write(('unrecognized entry: %s\t%s\n')
2922 ui.write(('unrecognized entry: %s\t%s\n')
2923 % (rtype, record.replace('\0', '\t')))
2923 % (rtype, record.replace('\0', '\t')))
2924
2924
2925 # Avoid mergestate.read() since it may raise an exception for unsupported
2925 # Avoid mergestate.read() since it may raise an exception for unsupported
2926 # merge state records. We shouldn't be doing this, but this is OK since this
2926 # merge state records. We shouldn't be doing this, but this is OK since this
2927 # command is pretty low-level.
2927 # command is pretty low-level.
2928 ms = mergemod.mergestate(repo)
2928 ms = mergemod.mergestate(repo)
2929
2929
2930 # sort so that reasonable information is on top
2930 # sort so that reasonable information is on top
2931 v1records = ms._readrecordsv1()
2931 v1records = ms._readrecordsv1()
2932 v2records = ms._readrecordsv2()
2932 v2records = ms._readrecordsv2()
2933 order = 'LOml'
2933 order = 'LOml'
2934 def key(r):
2934 def key(r):
2935 idx = order.find(r[0])
2935 idx = order.find(r[0])
2936 if idx == -1:
2936 if idx == -1:
2937 return (1, r[1])
2937 return (1, r[1])
2938 else:
2938 else:
2939 return (0, idx)
2939 return (0, idx)
2940 v1records.sort(key=key)
2940 v1records.sort(key=key)
2941 v2records.sort(key=key)
2941 v2records.sort(key=key)
2942
2942
2943 if not v1records and not v2records:
2943 if not v1records and not v2records:
2944 ui.write(('no merge state found\n'))
2944 ui.write(('no merge state found\n'))
2945 elif not v2records:
2945 elif not v2records:
2946 ui.note(('no version 2 merge state\n'))
2946 ui.note(('no version 2 merge state\n'))
2947 printrecords(1)
2947 printrecords(1)
2948 elif ms._v1v2match(v1records, v2records):
2948 elif ms._v1v2match(v1records, v2records):
2949 ui.note(('v1 and v2 states match: using v2\n'))
2949 ui.note(('v1 and v2 states match: using v2\n'))
2950 printrecords(2)
2950 printrecords(2)
2951 else:
2951 else:
2952 ui.note(('v1 and v2 states mismatch: using v1\n'))
2952 ui.note(('v1 and v2 states mismatch: using v1\n'))
2953 printrecords(1)
2953 printrecords(1)
2954 if ui.verbose:
2954 if ui.verbose:
2955 printrecords(2)
2955 printrecords(2)
2956
2956
2957 @command('debugnamecomplete', [], _('NAME...'))
2957 @command('debugnamecomplete', [], _('NAME...'))
2958 def debugnamecomplete(ui, repo, *args):
2958 def debugnamecomplete(ui, repo, *args):
2959 '''complete "names" - tags, open branch names, bookmark names'''
2959 '''complete "names" - tags, open branch names, bookmark names'''
2960
2960
2961 names = set()
2961 names = set()
2962 # since we previously only listed open branches, we will handle that
2962 # since we previously only listed open branches, we will handle that
2963 # specially (after this for loop)
2963 # specially (after this for loop)
2964 for name, ns in repo.names.iteritems():
2964 for name, ns in repo.names.iteritems():
2965 if name != 'branches':
2965 if name != 'branches':
2966 names.update(ns.listnames(repo))
2966 names.update(ns.listnames(repo))
2967 names.update(tag for (tag, heads, tip, closed)
2967 names.update(tag for (tag, heads, tip, closed)
2968 in repo.branchmap().iterbranches() if not closed)
2968 in repo.branchmap().iterbranches() if not closed)
2969 completions = set()
2969 completions = set()
2970 if not args:
2970 if not args:
2971 args = ['']
2971 args = ['']
2972 for a in args:
2972 for a in args:
2973 completions.update(n for n in names if n.startswith(a))
2973 completions.update(n for n in names if n.startswith(a))
2974 ui.write('\n'.join(sorted(completions)))
2974 ui.write('\n'.join(sorted(completions)))
2975 ui.write('\n')
2975 ui.write('\n')
2976
2976
2977 @command('debuglocks',
2977 @command('debuglocks',
2978 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2978 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2979 ('W', 'force-wlock', None,
2979 ('W', 'force-wlock', None,
2980 _('free the working state lock (DANGEROUS)'))],
2980 _('free the working state lock (DANGEROUS)'))],
2981 _('[OPTION]...'))
2981 _('[OPTION]...'))
2982 def debuglocks(ui, repo, **opts):
2982 def debuglocks(ui, repo, **opts):
2983 """show or modify state of locks
2983 """show or modify state of locks
2984
2984
2985 By default, this command will show which locks are held. This
2985 By default, this command will show which locks are held. This
2986 includes the user and process holding the lock, the amount of time
2986 includes the user and process holding the lock, the amount of time
2987 the lock has been held, and the machine name where the process is
2987 the lock has been held, and the machine name where the process is
2988 running if it's not local.
2988 running if it's not local.
2989
2989
2990 Locks protect the integrity of Mercurial's data, so should be
2990 Locks protect the integrity of Mercurial's data, so should be
2991 treated with care. System crashes or other interruptions may cause
2991 treated with care. System crashes or other interruptions may cause
2992 locks to not be properly released, though Mercurial will usually
2992 locks to not be properly released, though Mercurial will usually
2993 detect and remove such stale locks automatically.
2993 detect and remove such stale locks automatically.
2994
2994
2995 However, detecting stale locks may not always be possible (for
2995 However, detecting stale locks may not always be possible (for
2996 instance, on a shared filesystem). Removing locks may also be
2996 instance, on a shared filesystem). Removing locks may also be
2997 blocked by filesystem permissions.
2997 blocked by filesystem permissions.
2998
2998
2999 Returns 0 if no locks are held.
2999 Returns 0 if no locks are held.
3000
3000
3001 """
3001 """
3002
3002
3003 if opts.get('force_lock'):
3003 if opts.get('force_lock'):
3004 repo.svfs.unlink('lock')
3004 repo.svfs.unlink('lock')
3005 if opts.get('force_wlock'):
3005 if opts.get('force_wlock'):
3006 repo.vfs.unlink('wlock')
3006 repo.vfs.unlink('wlock')
3007 if opts.get('force_lock') or opts.get('force_lock'):
3007 if opts.get('force_lock') or opts.get('force_lock'):
3008 return 0
3008 return 0
3009
3009
3010 now = time.time()
3010 now = time.time()
3011 held = 0
3011 held = 0
3012
3012
3013 def report(vfs, name, method):
3013 def report(vfs, name, method):
3014 # this causes stale locks to get reaped for more accurate reporting
3014 # this causes stale locks to get reaped for more accurate reporting
3015 try:
3015 try:
3016 l = method(False)
3016 l = method(False)
3017 except error.LockHeld:
3017 except error.LockHeld:
3018 l = None
3018 l = None
3019
3019
3020 if l:
3020 if l:
3021 l.release()
3021 l.release()
3022 else:
3022 else:
3023 try:
3023 try:
3024 stat = vfs.lstat(name)
3024 stat = vfs.lstat(name)
3025 age = now - stat.st_mtime
3025 age = now - stat.st_mtime
3026 user = util.username(stat.st_uid)
3026 user = util.username(stat.st_uid)
3027 locker = vfs.readlock(name)
3027 locker = vfs.readlock(name)
3028 if ":" in locker:
3028 if ":" in locker:
3029 host, pid = locker.split(':')
3029 host, pid = locker.split(':')
3030 if host == socket.gethostname():
3030 if host == socket.gethostname():
3031 locker = 'user %s, process %s' % (user, pid)
3031 locker = 'user %s, process %s' % (user, pid)
3032 else:
3032 else:
3033 locker = 'user %s, process %s, host %s' \
3033 locker = 'user %s, process %s, host %s' \
3034 % (user, pid, host)
3034 % (user, pid, host)
3035 ui.write(("%-6s %s (%ds)\n") % (name + ":", locker, age))
3035 ui.write(("%-6s %s (%ds)\n") % (name + ":", locker, age))
3036 return 1
3036 return 1
3037 except OSError as e:
3037 except OSError as e:
3038 if e.errno != errno.ENOENT:
3038 if e.errno != errno.ENOENT:
3039 raise
3039 raise
3040
3040
3041 ui.write(("%-6s free\n") % (name + ":"))
3041 ui.write(("%-6s free\n") % (name + ":"))
3042 return 0
3042 return 0
3043
3043
3044 held += report(repo.svfs, "lock", repo.lock)
3044 held += report(repo.svfs, "lock", repo.lock)
3045 held += report(repo.vfs, "wlock", repo.wlock)
3045 held += report(repo.vfs, "wlock", repo.wlock)
3046
3046
3047 return held
3047 return held
3048
3048
3049 @command('debugobsolete',
3049 @command('debugobsolete',
3050 [('', 'flags', 0, _('markers flag')),
3050 [('', 'flags', 0, _('markers flag')),
3051 ('', 'record-parents', False,
3051 ('', 'record-parents', False,
3052 _('record parent information for the precursor')),
3052 _('record parent information for the precursor')),
3053 ('r', 'rev', [], _('display markers relevant to REV')),
3053 ('r', 'rev', [], _('display markers relevant to REV')),
3054 ('', 'index', False, _('display index of the marker')),
3054 ('', 'index', False, _('display index of the marker')),
3055 ('', 'delete', [], _('delete markers specified by indices')),
3055 ('', 'delete', [], _('delete markers specified by indices')),
3056 ] + commitopts2 + formatteropts,
3056 ] + commitopts2 + formatteropts,
3057 _('[OBSOLETED [REPLACEMENT ...]]'))
3057 _('[OBSOLETED [REPLACEMENT ...]]'))
3058 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
3058 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
3059 """create arbitrary obsolete marker
3059 """create arbitrary obsolete marker
3060
3060
3061 With no arguments, displays the list of obsolescence markers."""
3061 With no arguments, displays the list of obsolescence markers."""
3062
3062
3063 def parsenodeid(s):
3063 def parsenodeid(s):
3064 try:
3064 try:
3065 # We do not use revsingle/revrange functions here to accept
3065 # We do not use revsingle/revrange functions here to accept
3066 # arbitrary node identifiers, possibly not present in the
3066 # arbitrary node identifiers, possibly not present in the
3067 # local repository.
3067 # local repository.
3068 n = bin(s)
3068 n = bin(s)
3069 if len(n) != len(nullid):
3069 if len(n) != len(nullid):
3070 raise TypeError()
3070 raise TypeError()
3071 return n
3071 return n
3072 except TypeError:
3072 except TypeError:
3073 raise error.Abort('changeset references must be full hexadecimal '
3073 raise error.Abort('changeset references must be full hexadecimal '
3074 'node identifiers')
3074 'node identifiers')
3075
3075
3076 if opts.get('delete'):
3076 if opts.get('delete'):
3077 indices = []
3077 indices = []
3078 for v in opts.get('delete'):
3078 for v in opts.get('delete'):
3079 try:
3079 try:
3080 indices.append(int(v))
3080 indices.append(int(v))
3081 except ValueError:
3081 except ValueError:
3082 raise error.Abort(_('invalid index value: %r') % v,
3082 raise error.Abort(_('invalid index value: %r') % v,
3083 hint=_('use integers for indices'))
3083 hint=_('use integers for indices'))
3084
3084
3085 if repo.currenttransaction():
3085 if repo.currenttransaction():
3086 raise error.Abort(_('cannot delete obsmarkers in the middle '
3086 raise error.Abort(_('cannot delete obsmarkers in the middle '
3087 'of transaction.'))
3087 'of transaction.'))
3088
3088
3089 with repo.lock():
3089 with repo.lock():
3090 n = repair.deleteobsmarkers(repo.obsstore, indices)
3090 n = repair.deleteobsmarkers(repo.obsstore, indices)
3091 ui.write(_('deleted %i obsolescense markers\n') % n)
3091 ui.write(_('deleted %i obsolescense markers\n') % n)
3092
3092
3093 return
3093 return
3094
3094
3095 if precursor is not None:
3095 if precursor is not None:
3096 if opts['rev']:
3096 if opts['rev']:
3097 raise error.Abort('cannot select revision when creating marker')
3097 raise error.Abort('cannot select revision when creating marker')
3098 metadata = {}
3098 metadata = {}
3099 metadata['user'] = opts['user'] or ui.username()
3099 metadata['user'] = opts['user'] or ui.username()
3100 succs = tuple(parsenodeid(succ) for succ in successors)
3100 succs = tuple(parsenodeid(succ) for succ in successors)
3101 l = repo.lock()
3101 l = repo.lock()
3102 try:
3102 try:
3103 tr = repo.transaction('debugobsolete')
3103 tr = repo.transaction('debugobsolete')
3104 try:
3104 try:
3105 date = opts.get('date')
3105 date = opts.get('date')
3106 if date:
3106 if date:
3107 date = util.parsedate(date)
3107 date = util.parsedate(date)
3108 else:
3108 else:
3109 date = None
3109 date = None
3110 prec = parsenodeid(precursor)
3110 prec = parsenodeid(precursor)
3111 parents = None
3111 parents = None
3112 if opts['record_parents']:
3112 if opts['record_parents']:
3113 if prec not in repo.unfiltered():
3113 if prec not in repo.unfiltered():
3114 raise error.Abort('cannot used --record-parents on '
3114 raise error.Abort('cannot used --record-parents on '
3115 'unknown changesets')
3115 'unknown changesets')
3116 parents = repo.unfiltered()[prec].parents()
3116 parents = repo.unfiltered()[prec].parents()
3117 parents = tuple(p.node() for p in parents)
3117 parents = tuple(p.node() for p in parents)
3118 repo.obsstore.create(tr, prec, succs, opts['flags'],
3118 repo.obsstore.create(tr, prec, succs, opts['flags'],
3119 parents=parents, date=date,
3119 parents=parents, date=date,
3120 metadata=metadata)
3120 metadata=metadata)
3121 tr.close()
3121 tr.close()
3122 except ValueError as exc:
3122 except ValueError as exc:
3123 raise error.Abort(_('bad obsmarker input: %s') % exc)
3123 raise error.Abort(_('bad obsmarker input: %s') % exc)
3124 finally:
3124 finally:
3125 tr.release()
3125 tr.release()
3126 finally:
3126 finally:
3127 l.release()
3127 l.release()
3128 else:
3128 else:
3129 if opts['rev']:
3129 if opts['rev']:
3130 revs = scmutil.revrange(repo, opts['rev'])
3130 revs = scmutil.revrange(repo, opts['rev'])
3131 nodes = [repo[r].node() for r in revs]
3131 nodes = [repo[r].node() for r in revs]
3132 markers = list(obsolete.getmarkers(repo, nodes=nodes))
3132 markers = list(obsolete.getmarkers(repo, nodes=nodes))
3133 markers.sort(key=lambda x: x._data)
3133 markers.sort(key=lambda x: x._data)
3134 else:
3134 else:
3135 markers = obsolete.getmarkers(repo)
3135 markers = obsolete.getmarkers(repo)
3136
3136
3137 markerstoiter = markers
3137 markerstoiter = markers
3138 isrelevant = lambda m: True
3138 isrelevant = lambda m: True
3139 if opts.get('rev') and opts.get('index'):
3139 if opts.get('rev') and opts.get('index'):
3140 markerstoiter = obsolete.getmarkers(repo)
3140 markerstoiter = obsolete.getmarkers(repo)
3141 markerset = set(markers)
3141 markerset = set(markers)
3142 isrelevant = lambda m: m in markerset
3142 isrelevant = lambda m: m in markerset
3143
3143
3144 fm = ui.formatter('debugobsolete', opts)
3144 fm = ui.formatter('debugobsolete', opts)
3145 for i, m in enumerate(markerstoiter):
3145 for i, m in enumerate(markerstoiter):
3146 if not isrelevant(m):
3146 if not isrelevant(m):
3147 # marker can be irrelevant when we're iterating over a set
3147 # marker can be irrelevant when we're iterating over a set
3148 # of markers (markerstoiter) which is bigger than the set
3148 # of markers (markerstoiter) which is bigger than the set
3149 # of markers we want to display (markers)
3149 # of markers we want to display (markers)
3150 # this can happen if both --index and --rev options are
3150 # this can happen if both --index and --rev options are
3151 # provided and thus we need to iterate over all of the markers
3151 # provided and thus we need to iterate over all of the markers
3152 # to get the correct indices, but only display the ones that
3152 # to get the correct indices, but only display the ones that
3153 # are relevant to --rev value
3153 # are relevant to --rev value
3154 continue
3154 continue
3155 fm.startitem()
3155 fm.startitem()
3156 ind = i if opts.get('index') else None
3156 ind = i if opts.get('index') else None
3157 cmdutil.showmarker(fm, m, index=ind)
3157 cmdutil.showmarker(fm, m, index=ind)
3158 fm.end()
3158 fm.end()
3159
3159
3160 @command('debugpathcomplete',
3160 @command('debugpathcomplete',
3161 [('f', 'full', None, _('complete an entire path')),
3161 [('f', 'full', None, _('complete an entire path')),
3162 ('n', 'normal', None, _('show only normal files')),
3162 ('n', 'normal', None, _('show only normal files')),
3163 ('a', 'added', None, _('show only added files')),
3163 ('a', 'added', None, _('show only added files')),
3164 ('r', 'removed', None, _('show only removed files'))],
3164 ('r', 'removed', None, _('show only removed files'))],
3165 _('FILESPEC...'))
3165 _('FILESPEC...'))
3166 def debugpathcomplete(ui, repo, *specs, **opts):
3166 def debugpathcomplete(ui, repo, *specs, **opts):
3167 '''complete part or all of a tracked path
3167 '''complete part or all of a tracked path
3168
3168
3169 This command supports shells that offer path name completion. It
3169 This command supports shells that offer path name completion. It
3170 currently completes only files already known to the dirstate.
3170 currently completes only files already known to the dirstate.
3171
3171
3172 Completion extends only to the next path segment unless
3172 Completion extends only to the next path segment unless
3173 --full is specified, in which case entire paths are used.'''
3173 --full is specified, in which case entire paths are used.'''
3174
3174
3175 def complete(path, acceptable):
3175 def complete(path, acceptable):
3176 dirstate = repo.dirstate
3176 dirstate = repo.dirstate
3177 spec = os.path.normpath(os.path.join(os.getcwd(), path))
3177 spec = os.path.normpath(os.path.join(os.getcwd(), path))
3178 rootdir = repo.root + os.sep
3178 rootdir = repo.root + os.sep
3179 if spec != repo.root and not spec.startswith(rootdir):
3179 if spec != repo.root and not spec.startswith(rootdir):
3180 return [], []
3180 return [], []
3181 if os.path.isdir(spec):
3181 if os.path.isdir(spec):
3182 spec += '/'
3182 spec += '/'
3183 spec = spec[len(rootdir):]
3183 spec = spec[len(rootdir):]
3184 fixpaths = os.sep != '/'
3184 fixpaths = os.sep != '/'
3185 if fixpaths:
3185 if fixpaths:
3186 spec = spec.replace(os.sep, '/')
3186 spec = spec.replace(os.sep, '/')
3187 speclen = len(spec)
3187 speclen = len(spec)
3188 fullpaths = opts['full']
3188 fullpaths = opts['full']
3189 files, dirs = set(), set()
3189 files, dirs = set(), set()
3190 adddir, addfile = dirs.add, files.add
3190 adddir, addfile = dirs.add, files.add
3191 for f, st in dirstate.iteritems():
3191 for f, st in dirstate.iteritems():
3192 if f.startswith(spec) and st[0] in acceptable:
3192 if f.startswith(spec) and st[0] in acceptable:
3193 if fixpaths:
3193 if fixpaths:
3194 f = f.replace('/', os.sep)
3194 f = f.replace('/', os.sep)
3195 if fullpaths:
3195 if fullpaths:
3196 addfile(f)
3196 addfile(f)
3197 continue
3197 continue
3198 s = f.find(os.sep, speclen)
3198 s = f.find(os.sep, speclen)
3199 if s >= 0:
3199 if s >= 0:
3200 adddir(f[:s])
3200 adddir(f[:s])
3201 else:
3201 else:
3202 addfile(f)
3202 addfile(f)
3203 return files, dirs
3203 return files, dirs
3204
3204
3205 acceptable = ''
3205 acceptable = ''
3206 if opts['normal']:
3206 if opts['normal']:
3207 acceptable += 'nm'
3207 acceptable += 'nm'
3208 if opts['added']:
3208 if opts['added']:
3209 acceptable += 'a'
3209 acceptable += 'a'
3210 if opts['removed']:
3210 if opts['removed']:
3211 acceptable += 'r'
3211 acceptable += 'r'
3212 cwd = repo.getcwd()
3212 cwd = repo.getcwd()
3213 if not specs:
3213 if not specs:
3214 specs = ['.']
3214 specs = ['.']
3215
3215
3216 files, dirs = set(), set()
3216 files, dirs = set(), set()
3217 for spec in specs:
3217 for spec in specs:
3218 f, d = complete(spec, acceptable or 'nmar')
3218 f, d = complete(spec, acceptable or 'nmar')
3219 files.update(f)
3219 files.update(f)
3220 dirs.update(d)
3220 dirs.update(d)
3221 files.update(dirs)
3221 files.update(dirs)
3222 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3222 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3223 ui.write('\n')
3223 ui.write('\n')
3224
3224
3225 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3225 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3226 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3226 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3227 '''access the pushkey key/value protocol
3227 '''access the pushkey key/value protocol
3228
3228
3229 With two args, list the keys in the given namespace.
3229 With two args, list the keys in the given namespace.
3230
3230
3231 With five args, set a key to new if it currently is set to old.
3231 With five args, set a key to new if it currently is set to old.
3232 Reports success or failure.
3232 Reports success or failure.
3233 '''
3233 '''
3234
3234
3235 target = hg.peer(ui, {}, repopath)
3235 target = hg.peer(ui, {}, repopath)
3236 if keyinfo:
3236 if keyinfo:
3237 key, old, new = keyinfo
3237 key, old, new = keyinfo
3238 r = target.pushkey(namespace, key, old, new)
3238 r = target.pushkey(namespace, key, old, new)
3239 ui.status(str(r) + '\n')
3239 ui.status(str(r) + '\n')
3240 return not r
3240 return not r
3241 else:
3241 else:
3242 for k, v in sorted(target.listkeys(namespace).iteritems()):
3242 for k, v in sorted(target.listkeys(namespace).iteritems()):
3243 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3243 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3244 v.encode('string-escape')))
3244 v.encode('string-escape')))
3245
3245
3246 @command('debugpvec', [], _('A B'))
3246 @command('debugpvec', [], _('A B'))
3247 def debugpvec(ui, repo, a, b=None):
3247 def debugpvec(ui, repo, a, b=None):
3248 ca = scmutil.revsingle(repo, a)
3248 ca = scmutil.revsingle(repo, a)
3249 cb = scmutil.revsingle(repo, b)
3249 cb = scmutil.revsingle(repo, b)
3250 pa = pvec.ctxpvec(ca)
3250 pa = pvec.ctxpvec(ca)
3251 pb = pvec.ctxpvec(cb)
3251 pb = pvec.ctxpvec(cb)
3252 if pa == pb:
3252 if pa == pb:
3253 rel = "="
3253 rel = "="
3254 elif pa > pb:
3254 elif pa > pb:
3255 rel = ">"
3255 rel = ">"
3256 elif pa < pb:
3256 elif pa < pb:
3257 rel = "<"
3257 rel = "<"
3258 elif pa | pb:
3258 elif pa | pb:
3259 rel = "|"
3259 rel = "|"
3260 ui.write(_("a: %s\n") % pa)
3260 ui.write(_("a: %s\n") % pa)
3261 ui.write(_("b: %s\n") % pb)
3261 ui.write(_("b: %s\n") % pb)
3262 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3262 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3263 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3263 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3264 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3264 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3265 pa.distance(pb), rel))
3265 pa.distance(pb), rel))
3266
3266
3267 @command('debugrebuilddirstate|debugrebuildstate',
3267 @command('debugrebuilddirstate|debugrebuildstate',
3268 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3268 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3269 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3269 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3270 'the working copy parent')),
3270 'the working copy parent')),
3271 ],
3271 ],
3272 _('[-r REV]'))
3272 _('[-r REV]'))
3273 def debugrebuilddirstate(ui, repo, rev, **opts):
3273 def debugrebuilddirstate(ui, repo, rev, **opts):
3274 """rebuild the dirstate as it would look like for the given revision
3274 """rebuild the dirstate as it would look like for the given revision
3275
3275
3276 If no revision is specified the first current parent will be used.
3276 If no revision is specified the first current parent will be used.
3277
3277
3278 The dirstate will be set to the files of the given revision.
3278 The dirstate will be set to the files of the given revision.
3279 The actual working directory content or existing dirstate
3279 The actual working directory content or existing dirstate
3280 information such as adds or removes is not considered.
3280 information such as adds or removes is not considered.
3281
3281
3282 ``minimal`` will only rebuild the dirstate status for files that claim to be
3282 ``minimal`` will only rebuild the dirstate status for files that claim to be
3283 tracked but are not in the parent manifest, or that exist in the parent
3283 tracked but are not in the parent manifest, or that exist in the parent
3284 manifest but are not in the dirstate. It will not change adds, removes, or
3284 manifest but are not in the dirstate. It will not change adds, removes, or
3285 modified files that are in the working copy parent.
3285 modified files that are in the working copy parent.
3286
3286
3287 One use of this command is to make the next :hg:`status` invocation
3287 One use of this command is to make the next :hg:`status` invocation
3288 check the actual file content.
3288 check the actual file content.
3289 """
3289 """
3290 ctx = scmutil.revsingle(repo, rev)
3290 ctx = scmutil.revsingle(repo, rev)
3291 with repo.wlock():
3291 with repo.wlock():
3292 dirstate = repo.dirstate
3292 dirstate = repo.dirstate
3293 changedfiles = None
3293 changedfiles = None
3294 # See command doc for what minimal does.
3294 # See command doc for what minimal does.
3295 if opts.get('minimal'):
3295 if opts.get('minimal'):
3296 manifestfiles = set(ctx.manifest().keys())
3296 manifestfiles = set(ctx.manifest().keys())
3297 dirstatefiles = set(dirstate)
3297 dirstatefiles = set(dirstate)
3298 manifestonly = manifestfiles - dirstatefiles
3298 manifestonly = manifestfiles - dirstatefiles
3299 dsonly = dirstatefiles - manifestfiles
3299 dsonly = dirstatefiles - manifestfiles
3300 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3300 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3301 changedfiles = manifestonly | dsnotadded
3301 changedfiles = manifestonly | dsnotadded
3302
3302
3303 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3303 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3304
3304
3305 @command('debugrebuildfncache', [], '')
3305 @command('debugrebuildfncache', [], '')
3306 def debugrebuildfncache(ui, repo):
3306 def debugrebuildfncache(ui, repo):
3307 """rebuild the fncache file"""
3307 """rebuild the fncache file"""
3308 repair.rebuildfncache(ui, repo)
3308 repair.rebuildfncache(ui, repo)
3309
3309
3310 @command('debugrename',
3310 @command('debugrename',
3311 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3311 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3312 _('[-r REV] FILE'))
3312 _('[-r REV] FILE'))
3313 def debugrename(ui, repo, file1, *pats, **opts):
3313 def debugrename(ui, repo, file1, *pats, **opts):
3314 """dump rename information"""
3314 """dump rename information"""
3315
3315
3316 ctx = scmutil.revsingle(repo, opts.get('rev'))
3316 ctx = scmutil.revsingle(repo, opts.get('rev'))
3317 m = scmutil.match(ctx, (file1,) + pats, opts)
3317 m = scmutil.match(ctx, (file1,) + pats, opts)
3318 for abs in ctx.walk(m):
3318 for abs in ctx.walk(m):
3319 fctx = ctx[abs]
3319 fctx = ctx[abs]
3320 o = fctx.filelog().renamed(fctx.filenode())
3320 o = fctx.filelog().renamed(fctx.filenode())
3321 rel = m.rel(abs)
3321 rel = m.rel(abs)
3322 if o:
3322 if o:
3323 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3323 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3324 else:
3324 else:
3325 ui.write(_("%s not renamed\n") % rel)
3325 ui.write(_("%s not renamed\n") % rel)
3326
3326
3327 @command('debugrevlog', debugrevlogopts +
3327 @command('debugrevlog', debugrevlogopts +
3328 [('d', 'dump', False, _('dump index data'))],
3328 [('d', 'dump', False, _('dump index data'))],
3329 _('-c|-m|FILE'),
3329 _('-c|-m|FILE'),
3330 optionalrepo=True)
3330 optionalrepo=True)
3331 def debugrevlog(ui, repo, file_=None, **opts):
3331 def debugrevlog(ui, repo, file_=None, **opts):
3332 """show data and statistics about a revlog"""
3332 """show data and statistics about a revlog"""
3333 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3333 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3334
3334
3335 if opts.get("dump"):
3335 if opts.get("dump"):
3336 numrevs = len(r)
3336 numrevs = len(r)
3337 ui.write(("# rev p1rev p2rev start end deltastart base p1 p2"
3337 ui.write(("# rev p1rev p2rev start end deltastart base p1 p2"
3338 " rawsize totalsize compression heads chainlen\n"))
3338 " rawsize totalsize compression heads chainlen\n"))
3339 ts = 0
3339 ts = 0
3340 heads = set()
3340 heads = set()
3341
3341
3342 for rev in xrange(numrevs):
3342 for rev in xrange(numrevs):
3343 dbase = r.deltaparent(rev)
3343 dbase = r.deltaparent(rev)
3344 if dbase == -1:
3344 if dbase == -1:
3345 dbase = rev
3345 dbase = rev
3346 cbase = r.chainbase(rev)
3346 cbase = r.chainbase(rev)
3347 clen = r.chainlen(rev)
3347 clen = r.chainlen(rev)
3348 p1, p2 = r.parentrevs(rev)
3348 p1, p2 = r.parentrevs(rev)
3349 rs = r.rawsize(rev)
3349 rs = r.rawsize(rev)
3350 ts = ts + rs
3350 ts = ts + rs
3351 heads -= set(r.parentrevs(rev))
3351 heads -= set(r.parentrevs(rev))
3352 heads.add(rev)
3352 heads.add(rev)
3353 try:
3353 try:
3354 compression = ts / r.end(rev)
3354 compression = ts / r.end(rev)
3355 except ZeroDivisionError:
3355 except ZeroDivisionError:
3356 compression = 0
3356 compression = 0
3357 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3357 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3358 "%11d %5d %8d\n" %
3358 "%11d %5d %8d\n" %
3359 (rev, p1, p2, r.start(rev), r.end(rev),
3359 (rev, p1, p2, r.start(rev), r.end(rev),
3360 r.start(dbase), r.start(cbase),
3360 r.start(dbase), r.start(cbase),
3361 r.start(p1), r.start(p2),
3361 r.start(p1), r.start(p2),
3362 rs, ts, compression, len(heads), clen))
3362 rs, ts, compression, len(heads), clen))
3363 return 0
3363 return 0
3364
3364
3365 v = r.version
3365 v = r.version
3366 format = v & 0xFFFF
3366 format = v & 0xFFFF
3367 flags = []
3367 flags = []
3368 gdelta = False
3368 gdelta = False
3369 if v & revlog.REVLOGNGINLINEDATA:
3369 if v & revlog.REVLOGNGINLINEDATA:
3370 flags.append('inline')
3370 flags.append('inline')
3371 if v & revlog.REVLOGGENERALDELTA:
3371 if v & revlog.REVLOGGENERALDELTA:
3372 gdelta = True
3372 gdelta = True
3373 flags.append('generaldelta')
3373 flags.append('generaldelta')
3374 if not flags:
3374 if not flags:
3375 flags = ['(none)']
3375 flags = ['(none)']
3376
3376
3377 nummerges = 0
3377 nummerges = 0
3378 numfull = 0
3378 numfull = 0
3379 numprev = 0
3379 numprev = 0
3380 nump1 = 0
3380 nump1 = 0
3381 nump2 = 0
3381 nump2 = 0
3382 numother = 0
3382 numother = 0
3383 nump1prev = 0
3383 nump1prev = 0
3384 nump2prev = 0
3384 nump2prev = 0
3385 chainlengths = []
3385 chainlengths = []
3386
3386
3387 datasize = [None, 0, 0]
3387 datasize = [None, 0, 0]
3388 fullsize = [None, 0, 0]
3388 fullsize = [None, 0, 0]
3389 deltasize = [None, 0, 0]
3389 deltasize = [None, 0, 0]
3390
3390
3391 def addsize(size, l):
3391 def addsize(size, l):
3392 if l[0] is None or size < l[0]:
3392 if l[0] is None or size < l[0]:
3393 l[0] = size
3393 l[0] = size
3394 if size > l[1]:
3394 if size > l[1]:
3395 l[1] = size
3395 l[1] = size
3396 l[2] += size
3396 l[2] += size
3397
3397
3398 numrevs = len(r)
3398 numrevs = len(r)
3399 for rev in xrange(numrevs):
3399 for rev in xrange(numrevs):
3400 p1, p2 = r.parentrevs(rev)
3400 p1, p2 = r.parentrevs(rev)
3401 delta = r.deltaparent(rev)
3401 delta = r.deltaparent(rev)
3402 if format > 0:
3402 if format > 0:
3403 addsize(r.rawsize(rev), datasize)
3403 addsize(r.rawsize(rev), datasize)
3404 if p2 != nullrev:
3404 if p2 != nullrev:
3405 nummerges += 1
3405 nummerges += 1
3406 size = r.length(rev)
3406 size = r.length(rev)
3407 if delta == nullrev:
3407 if delta == nullrev:
3408 chainlengths.append(0)
3408 chainlengths.append(0)
3409 numfull += 1
3409 numfull += 1
3410 addsize(size, fullsize)
3410 addsize(size, fullsize)
3411 else:
3411 else:
3412 chainlengths.append(chainlengths[delta] + 1)
3412 chainlengths.append(chainlengths[delta] + 1)
3413 addsize(size, deltasize)
3413 addsize(size, deltasize)
3414 if delta == rev - 1:
3414 if delta == rev - 1:
3415 numprev += 1
3415 numprev += 1
3416 if delta == p1:
3416 if delta == p1:
3417 nump1prev += 1
3417 nump1prev += 1
3418 elif delta == p2:
3418 elif delta == p2:
3419 nump2prev += 1
3419 nump2prev += 1
3420 elif delta == p1:
3420 elif delta == p1:
3421 nump1 += 1
3421 nump1 += 1
3422 elif delta == p2:
3422 elif delta == p2:
3423 nump2 += 1
3423 nump2 += 1
3424 elif delta != nullrev:
3424 elif delta != nullrev:
3425 numother += 1
3425 numother += 1
3426
3426
3427 # Adjust size min value for empty cases
3427 # Adjust size min value for empty cases
3428 for size in (datasize, fullsize, deltasize):
3428 for size in (datasize, fullsize, deltasize):
3429 if size[0] is None:
3429 if size[0] is None:
3430 size[0] = 0
3430 size[0] = 0
3431
3431
3432 numdeltas = numrevs - numfull
3432 numdeltas = numrevs - numfull
3433 numoprev = numprev - nump1prev - nump2prev
3433 numoprev = numprev - nump1prev - nump2prev
3434 totalrawsize = datasize[2]
3434 totalrawsize = datasize[2]
3435 datasize[2] /= numrevs
3435 datasize[2] /= numrevs
3436 fulltotal = fullsize[2]
3436 fulltotal = fullsize[2]
3437 fullsize[2] /= numfull
3437 fullsize[2] /= numfull
3438 deltatotal = deltasize[2]
3438 deltatotal = deltasize[2]
3439 if numrevs - numfull > 0:
3439 if numrevs - numfull > 0:
3440 deltasize[2] /= numrevs - numfull
3440 deltasize[2] /= numrevs - numfull
3441 totalsize = fulltotal + deltatotal
3441 totalsize = fulltotal + deltatotal
3442 avgchainlen = sum(chainlengths) / numrevs
3442 avgchainlen = sum(chainlengths) / numrevs
3443 maxchainlen = max(chainlengths)
3443 maxchainlen = max(chainlengths)
3444 compratio = 1
3444 compratio = 1
3445 if totalsize:
3445 if totalsize:
3446 compratio = totalrawsize / totalsize
3446 compratio = totalrawsize / totalsize
3447
3447
3448 basedfmtstr = '%%%dd\n'
3448 basedfmtstr = '%%%dd\n'
3449 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3449 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3450
3450
3451 def dfmtstr(max):
3451 def dfmtstr(max):
3452 return basedfmtstr % len(str(max))
3452 return basedfmtstr % len(str(max))
3453 def pcfmtstr(max, padding=0):
3453 def pcfmtstr(max, padding=0):
3454 return basepcfmtstr % (len(str(max)), ' ' * padding)
3454 return basepcfmtstr % (len(str(max)), ' ' * padding)
3455
3455
3456 def pcfmt(value, total):
3456 def pcfmt(value, total):
3457 if total:
3457 if total:
3458 return (value, 100 * float(value) / total)
3458 return (value, 100 * float(value) / total)
3459 else:
3459 else:
3460 return value, 100.0
3460 return value, 100.0
3461
3461
3462 ui.write(('format : %d\n') % format)
3462 ui.write(('format : %d\n') % format)
3463 ui.write(('flags : %s\n') % ', '.join(flags))
3463 ui.write(('flags : %s\n') % ', '.join(flags))
3464
3464
3465 ui.write('\n')
3465 ui.write('\n')
3466 fmt = pcfmtstr(totalsize)
3466 fmt = pcfmtstr(totalsize)
3467 fmt2 = dfmtstr(totalsize)
3467 fmt2 = dfmtstr(totalsize)
3468 ui.write(('revisions : ') + fmt2 % numrevs)
3468 ui.write(('revisions : ') + fmt2 % numrevs)
3469 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3469 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3470 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3470 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3471 ui.write(('revisions : ') + fmt2 % numrevs)
3471 ui.write(('revisions : ') + fmt2 % numrevs)
3472 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3472 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3473 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3473 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3474 ui.write(('revision size : ') + fmt2 % totalsize)
3474 ui.write(('revision size : ') + fmt2 % totalsize)
3475 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3475 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3476 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3476 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3477
3477
3478 ui.write('\n')
3478 ui.write('\n')
3479 fmt = dfmtstr(max(avgchainlen, compratio))
3479 fmt = dfmtstr(max(avgchainlen, compratio))
3480 ui.write(('avg chain length : ') + fmt % avgchainlen)
3480 ui.write(('avg chain length : ') + fmt % avgchainlen)
3481 ui.write(('max chain length : ') + fmt % maxchainlen)
3481 ui.write(('max chain length : ') + fmt % maxchainlen)
3482 ui.write(('compression ratio : ') + fmt % compratio)
3482 ui.write(('compression ratio : ') + fmt % compratio)
3483
3483
3484 if format > 0:
3484 if format > 0:
3485 ui.write('\n')
3485 ui.write('\n')
3486 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3486 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3487 % tuple(datasize))
3487 % tuple(datasize))
3488 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3488 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3489 % tuple(fullsize))
3489 % tuple(fullsize))
3490 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3490 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3491 % tuple(deltasize))
3491 % tuple(deltasize))
3492
3492
3493 if numdeltas > 0:
3493 if numdeltas > 0:
3494 ui.write('\n')
3494 ui.write('\n')
3495 fmt = pcfmtstr(numdeltas)
3495 fmt = pcfmtstr(numdeltas)
3496 fmt2 = pcfmtstr(numdeltas, 4)
3496 fmt2 = pcfmtstr(numdeltas, 4)
3497 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3497 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3498 if numprev > 0:
3498 if numprev > 0:
3499 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3499 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3500 numprev))
3500 numprev))
3501 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3501 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3502 numprev))
3502 numprev))
3503 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3503 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3504 numprev))
3504 numprev))
3505 if gdelta:
3505 if gdelta:
3506 ui.write(('deltas against p1 : ')
3506 ui.write(('deltas against p1 : ')
3507 + fmt % pcfmt(nump1, numdeltas))
3507 + fmt % pcfmt(nump1, numdeltas))
3508 ui.write(('deltas against p2 : ')
3508 ui.write(('deltas against p2 : ')
3509 + fmt % pcfmt(nump2, numdeltas))
3509 + fmt % pcfmt(nump2, numdeltas))
3510 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3510 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3511 numdeltas))
3511 numdeltas))
3512
3512
3513 @command('debugrevspec',
3513 @command('debugrevspec',
3514 [('', 'optimize', None,
3514 [('', 'optimize', None,
3515 _('print parsed tree after optimizing (DEPRECATED)')),
3515 _('print parsed tree after optimizing (DEPRECATED)')),
3516 ('p', 'show-stage', [],
3516 ('p', 'show-stage', [],
3517 _('print parsed tree at the given stage'), _('NAME')),
3517 _('print parsed tree at the given stage'), _('NAME')),
3518 ('', 'no-optimized', False, _('evaluate tree without optimization')),
3518 ('', 'no-optimized', False, _('evaluate tree without optimization')),
3519 ('', 'verify-optimized', False, _('verify optimized result')),
3519 ('', 'verify-optimized', False, _('verify optimized result')),
3520 ],
3520 ],
3521 ('REVSPEC'))
3521 ('REVSPEC'))
3522 def debugrevspec(ui, repo, expr, **opts):
3522 def debugrevspec(ui, repo, expr, **opts):
3523 """parse and apply a revision specification
3523 """parse and apply a revision specification
3524
3524
3525 Use -p/--show-stage option to print the parsed tree at the given stages.
3525 Use -p/--show-stage option to print the parsed tree at the given stages.
3526 Use -p all to print tree at every stage.
3526 Use -p all to print tree at every stage.
3527
3527
3528 Use --verify-optimized to compare the optimized result with the unoptimized
3528 Use --verify-optimized to compare the optimized result with the unoptimized
3529 one. Returns 1 if the optimized result differs.
3529 one. Returns 1 if the optimized result differs.
3530 """
3530 """
3531 stages = [
3531 stages = [
3532 ('parsed', lambda tree: tree),
3532 ('parsed', lambda tree: tree),
3533 ('expanded', lambda tree: revset.expandaliases(ui, tree)),
3533 ('expanded', lambda tree: revset.expandaliases(ui, tree)),
3534 ('concatenated', revset.foldconcat),
3534 ('concatenated', revset.foldconcat),
3535 ('analyzed', revset.analyze),
3535 ('analyzed', revset.analyze),
3536 ('optimized', revset.optimize),
3536 ('optimized', revset.optimize),
3537 ]
3537 ]
3538 if opts['no_optimized']:
3538 if opts['no_optimized']:
3539 stages = stages[:-1]
3539 stages = stages[:-1]
3540 if opts['verify_optimized'] and opts['no_optimized']:
3540 if opts['verify_optimized'] and opts['no_optimized']:
3541 raise error.Abort(_('cannot use --verify-optimized with '
3541 raise error.Abort(_('cannot use --verify-optimized with '
3542 '--no-optimized'))
3542 '--no-optimized'))
3543 stagenames = set(n for n, f in stages)
3543 stagenames = set(n for n, f in stages)
3544
3544
3545 showalways = set()
3545 showalways = set()
3546 showchanged = set()
3546 showchanged = set()
3547 if ui.verbose and not opts['show_stage']:
3547 if ui.verbose and not opts['show_stage']:
3548 # show parsed tree by --verbose (deprecated)
3548 # show parsed tree by --verbose (deprecated)
3549 showalways.add('parsed')
3549 showalways.add('parsed')
3550 showchanged.update(['expanded', 'concatenated'])
3550 showchanged.update(['expanded', 'concatenated'])
3551 if opts['optimize']:
3551 if opts['optimize']:
3552 showalways.add('optimized')
3552 showalways.add('optimized')
3553 if opts['show_stage'] and opts['optimize']:
3553 if opts['show_stage'] and opts['optimize']:
3554 raise error.Abort(_('cannot use --optimize with --show-stage'))
3554 raise error.Abort(_('cannot use --optimize with --show-stage'))
3555 if opts['show_stage'] == ['all']:
3555 if opts['show_stage'] == ['all']:
3556 showalways.update(stagenames)
3556 showalways.update(stagenames)
3557 else:
3557 else:
3558 for n in opts['show_stage']:
3558 for n in opts['show_stage']:
3559 if n not in stagenames:
3559 if n not in stagenames:
3560 raise error.Abort(_('invalid stage name: %s') % n)
3560 raise error.Abort(_('invalid stage name: %s') % n)
3561 showalways.update(opts['show_stage'])
3561 showalways.update(opts['show_stage'])
3562
3562
3563 treebystage = {}
3563 treebystage = {}
3564 printedtree = None
3564 printedtree = None
3565 tree = revset.parse(expr, lookup=repo.__contains__)
3565 tree = revset.parse(expr, lookup=repo.__contains__)
3566 for n, f in stages:
3566 for n, f in stages:
3567 treebystage[n] = tree = f(tree)
3567 treebystage[n] = tree = f(tree)
3568 if n in showalways or (n in showchanged and tree != printedtree):
3568 if n in showalways or (n in showchanged and tree != printedtree):
3569 if opts['show_stage'] or n != 'parsed':
3569 if opts['show_stage'] or n != 'parsed':
3570 ui.write(("* %s:\n") % n)
3570 ui.write(("* %s:\n") % n)
3571 ui.write(revset.prettyformat(tree), "\n")
3571 ui.write(revset.prettyformat(tree), "\n")
3572 printedtree = tree
3572 printedtree = tree
3573
3573
3574 if opts['verify_optimized']:
3574 if opts['verify_optimized']:
3575 arevs = revset.makematcher(treebystage['analyzed'])(repo)
3575 arevs = revset.makematcher(treebystage['analyzed'])(repo)
3576 brevs = revset.makematcher(treebystage['optimized'])(repo)
3576 brevs = revset.makematcher(treebystage['optimized'])(repo)
3577 if ui.verbose:
3577 if ui.verbose:
3578 ui.note(("* analyzed set:\n"), revset.prettyformatset(arevs), "\n")
3578 ui.note(("* analyzed set:\n"), revset.prettyformatset(arevs), "\n")
3579 ui.note(("* optimized set:\n"), revset.prettyformatset(brevs), "\n")
3579 ui.note(("* optimized set:\n"), revset.prettyformatset(brevs), "\n")
3580 arevs = list(arevs)
3580 arevs = list(arevs)
3581 brevs = list(brevs)
3581 brevs = list(brevs)
3582 if arevs == brevs:
3582 if arevs == brevs:
3583 return 0
3583 return 0
3584 ui.write(('--- analyzed\n'), label='diff.file_a')
3584 ui.write(('--- analyzed\n'), label='diff.file_a')
3585 ui.write(('+++ optimized\n'), label='diff.file_b')
3585 ui.write(('+++ optimized\n'), label='diff.file_b')
3586 sm = difflib.SequenceMatcher(None, arevs, brevs)
3586 sm = difflib.SequenceMatcher(None, arevs, brevs)
3587 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3587 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3588 if tag in ('delete', 'replace'):
3588 if tag in ('delete', 'replace'):
3589 for c in arevs[alo:ahi]:
3589 for c in arevs[alo:ahi]:
3590 ui.write('-%s\n' % c, label='diff.deleted')
3590 ui.write('-%s\n' % c, label='diff.deleted')
3591 if tag in ('insert', 'replace'):
3591 if tag in ('insert', 'replace'):
3592 for c in brevs[blo:bhi]:
3592 for c in brevs[blo:bhi]:
3593 ui.write('+%s\n' % c, label='diff.inserted')
3593 ui.write('+%s\n' % c, label='diff.inserted')
3594 if tag == 'equal':
3594 if tag == 'equal':
3595 for c in arevs[alo:ahi]:
3595 for c in arevs[alo:ahi]:
3596 ui.write(' %s\n' % c)
3596 ui.write(' %s\n' % c)
3597 return 1
3597 return 1
3598
3598
3599 func = revset.makematcher(tree)
3599 func = revset.makematcher(tree)
3600 revs = func(repo)
3600 revs = func(repo)
3601 if ui.verbose:
3601 if ui.verbose:
3602 ui.note(("* set:\n"), revset.prettyformatset(revs), "\n")
3602 ui.note(("* set:\n"), revset.prettyformatset(revs), "\n")
3603 for c in revs:
3603 for c in revs:
3604 ui.write("%s\n" % c)
3604 ui.write("%s\n" % c)
3605
3605
3606 @command('debugsetparents', [], _('REV1 [REV2]'))
3606 @command('debugsetparents', [], _('REV1 [REV2]'))
3607 def debugsetparents(ui, repo, rev1, rev2=None):
3607 def debugsetparents(ui, repo, rev1, rev2=None):
3608 """manually set the parents of the current working directory
3608 """manually set the parents of the current working directory
3609
3609
3610 This is useful for writing repository conversion tools, but should
3610 This is useful for writing repository conversion tools, but should
3611 be used with care. For example, neither the working directory nor the
3611 be used with care. For example, neither the working directory nor the
3612 dirstate is updated, so file status may be incorrect after running this
3612 dirstate is updated, so file status may be incorrect after running this
3613 command.
3613 command.
3614
3614
3615 Returns 0 on success.
3615 Returns 0 on success.
3616 """
3616 """
3617
3617
3618 r1 = scmutil.revsingle(repo, rev1).node()
3618 r1 = scmutil.revsingle(repo, rev1).node()
3619 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3619 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3620
3620
3621 with repo.wlock():
3621 with repo.wlock():
3622 repo.setparents(r1, r2)
3622 repo.setparents(r1, r2)
3623
3623
3624 @command('debugdirstate|debugstate',
3624 @command('debugdirstate|debugstate',
3625 [('', 'nodates', None, _('do not display the saved mtime')),
3625 [('', 'nodates', None, _('do not display the saved mtime')),
3626 ('', 'datesort', None, _('sort by saved mtime'))],
3626 ('', 'datesort', None, _('sort by saved mtime'))],
3627 _('[OPTION]...'))
3627 _('[OPTION]...'))
3628 def debugstate(ui, repo, **opts):
3628 def debugstate(ui, repo, **opts):
3629 """show the contents of the current dirstate"""
3629 """show the contents of the current dirstate"""
3630
3630
3631 nodates = opts.get('nodates')
3631 nodates = opts.get('nodates')
3632 datesort = opts.get('datesort')
3632 datesort = opts.get('datesort')
3633
3633
3634 timestr = ""
3634 timestr = ""
3635 if datesort:
3635 if datesort:
3636 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3636 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3637 else:
3637 else:
3638 keyfunc = None # sort by filename
3638 keyfunc = None # sort by filename
3639 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3639 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3640 if ent[3] == -1:
3640 if ent[3] == -1:
3641 timestr = 'unset '
3641 timestr = 'unset '
3642 elif nodates:
3642 elif nodates:
3643 timestr = 'set '
3643 timestr = 'set '
3644 else:
3644 else:
3645 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3645 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3646 time.localtime(ent[3]))
3646 time.localtime(ent[3]))
3647 if ent[1] & 0o20000:
3647 if ent[1] & 0o20000:
3648 mode = 'lnk'
3648 mode = 'lnk'
3649 else:
3649 else:
3650 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3650 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3651 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3651 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3652 for f in repo.dirstate.copies():
3652 for f in repo.dirstate.copies():
3653 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3653 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3654
3654
3655 @command('debugsub',
3655 @command('debugsub',
3656 [('r', 'rev', '',
3656 [('r', 'rev', '',
3657 _('revision to check'), _('REV'))],
3657 _('revision to check'), _('REV'))],
3658 _('[-r REV] [REV]'))
3658 _('[-r REV] [REV]'))
3659 def debugsub(ui, repo, rev=None):
3659 def debugsub(ui, repo, rev=None):
3660 ctx = scmutil.revsingle(repo, rev, None)
3660 ctx = scmutil.revsingle(repo, rev, None)
3661 for k, v in sorted(ctx.substate.items()):
3661 for k, v in sorted(ctx.substate.items()):
3662 ui.write(('path %s\n') % k)
3662 ui.write(('path %s\n') % k)
3663 ui.write((' source %s\n') % v[0])
3663 ui.write((' source %s\n') % v[0])
3664 ui.write((' revision %s\n') % v[1])
3664 ui.write((' revision %s\n') % v[1])
3665
3665
3666 @command('debugsuccessorssets',
3666 @command('debugsuccessorssets',
3667 [],
3667 [],
3668 _('[REV]'))
3668 _('[REV]'))
3669 def debugsuccessorssets(ui, repo, *revs):
3669 def debugsuccessorssets(ui, repo, *revs):
3670 """show set of successors for revision
3670 """show set of successors for revision
3671
3671
3672 A successors set of changeset A is a consistent group of revisions that
3672 A successors set of changeset A is a consistent group of revisions that
3673 succeed A. It contains non-obsolete changesets only.
3673 succeed A. It contains non-obsolete changesets only.
3674
3674
3675 In most cases a changeset A has a single successors set containing a single
3675 In most cases a changeset A has a single successors set containing a single
3676 successor (changeset A replaced by A').
3676 successor (changeset A replaced by A').
3677
3677
3678 A changeset that is made obsolete with no successors are called "pruned".
3678 A changeset that is made obsolete with no successors are called "pruned".
3679 Such changesets have no successors sets at all.
3679 Such changesets have no successors sets at all.
3680
3680
3681 A changeset that has been "split" will have a successors set containing
3681 A changeset that has been "split" will have a successors set containing
3682 more than one successor.
3682 more than one successor.
3683
3683
3684 A changeset that has been rewritten in multiple different ways is called
3684 A changeset that has been rewritten in multiple different ways is called
3685 "divergent". Such changesets have multiple successor sets (each of which
3685 "divergent". Such changesets have multiple successor sets (each of which
3686 may also be split, i.e. have multiple successors).
3686 may also be split, i.e. have multiple successors).
3687
3687
3688 Results are displayed as follows::
3688 Results are displayed as follows::
3689
3689
3690 <rev1>
3690 <rev1>
3691 <successors-1A>
3691 <successors-1A>
3692 <rev2>
3692 <rev2>
3693 <successors-2A>
3693 <successors-2A>
3694 <successors-2B1> <successors-2B2> <successors-2B3>
3694 <successors-2B1> <successors-2B2> <successors-2B3>
3695
3695
3696 Here rev2 has two possible (i.e. divergent) successors sets. The first
3696 Here rev2 has two possible (i.e. divergent) successors sets. The first
3697 holds one element, whereas the second holds three (i.e. the changeset has
3697 holds one element, whereas the second holds three (i.e. the changeset has
3698 been split).
3698 been split).
3699 """
3699 """
3700 # passed to successorssets caching computation from one call to another
3700 # passed to successorssets caching computation from one call to another
3701 cache = {}
3701 cache = {}
3702 ctx2str = str
3702 ctx2str = str
3703 node2str = short
3703 node2str = short
3704 if ui.debug():
3704 if ui.debug():
3705 def ctx2str(ctx):
3705 def ctx2str(ctx):
3706 return ctx.hex()
3706 return ctx.hex()
3707 node2str = hex
3707 node2str = hex
3708 for rev in scmutil.revrange(repo, revs):
3708 for rev in scmutil.revrange(repo, revs):
3709 ctx = repo[rev]
3709 ctx = repo[rev]
3710 ui.write('%s\n'% ctx2str(ctx))
3710 ui.write('%s\n'% ctx2str(ctx))
3711 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3711 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3712 if succsset:
3712 if succsset:
3713 ui.write(' ')
3713 ui.write(' ')
3714 ui.write(node2str(succsset[0]))
3714 ui.write(node2str(succsset[0]))
3715 for node in succsset[1:]:
3715 for node in succsset[1:]:
3716 ui.write(' ')
3716 ui.write(' ')
3717 ui.write(node2str(node))
3717 ui.write(node2str(node))
3718 ui.write('\n')
3718 ui.write('\n')
3719
3719
3720 @command('debugtemplate',
3720 @command('debugtemplate',
3721 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
3721 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
3722 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
3722 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
3723 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
3723 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
3724 optionalrepo=True)
3724 optionalrepo=True)
3725 def debugtemplate(ui, repo, tmpl, **opts):
3725 def debugtemplate(ui, repo, tmpl, **opts):
3726 """parse and apply a template
3726 """parse and apply a template
3727
3727
3728 If -r/--rev is given, the template is processed as a log template and
3728 If -r/--rev is given, the template is processed as a log template and
3729 applied to the given changesets. Otherwise, it is processed as a generic
3729 applied to the given changesets. Otherwise, it is processed as a generic
3730 template.
3730 template.
3731
3731
3732 Use --verbose to print the parsed tree.
3732 Use --verbose to print the parsed tree.
3733 """
3733 """
3734 revs = None
3734 revs = None
3735 if opts['rev']:
3735 if opts['rev']:
3736 if repo is None:
3736 if repo is None:
3737 raise error.RepoError(_('there is no Mercurial repository here '
3737 raise error.RepoError(_('there is no Mercurial repository here '
3738 '(.hg not found)'))
3738 '(.hg not found)'))
3739 revs = scmutil.revrange(repo, opts['rev'])
3739 revs = scmutil.revrange(repo, opts['rev'])
3740
3740
3741 props = {}
3741 props = {}
3742 for d in opts['define']:
3742 for d in opts['define']:
3743 try:
3743 try:
3744 k, v = (e.strip() for e in d.split('=', 1))
3744 k, v = (e.strip() for e in d.split('=', 1))
3745 if not k:
3745 if not k:
3746 raise ValueError
3746 raise ValueError
3747 props[k] = v
3747 props[k] = v
3748 except ValueError:
3748 except ValueError:
3749 raise error.Abort(_('malformed keyword definition: %s') % d)
3749 raise error.Abort(_('malformed keyword definition: %s') % d)
3750
3750
3751 if ui.verbose:
3751 if ui.verbose:
3752 aliases = ui.configitems('templatealias')
3752 aliases = ui.configitems('templatealias')
3753 tree = templater.parse(tmpl)
3753 tree = templater.parse(tmpl)
3754 ui.note(templater.prettyformat(tree), '\n')
3754 ui.note(templater.prettyformat(tree), '\n')
3755 newtree = templater.expandaliases(tree, aliases)
3755 newtree = templater.expandaliases(tree, aliases)
3756 if newtree != tree:
3756 if newtree != tree:
3757 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n')
3757 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n')
3758
3758
3759 mapfile = None
3759 mapfile = None
3760 if revs is None:
3760 if revs is None:
3761 k = 'debugtemplate'
3761 k = 'debugtemplate'
3762 t = formatter.maketemplater(ui, k, tmpl)
3762 t = formatter.maketemplater(ui, k, tmpl)
3763 ui.write(templater.stringify(t(k, **props)))
3763 ui.write(templater.stringify(t(k, **props)))
3764 else:
3764 else:
3765 displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl,
3765 displayer = cmdutil.changeset_templater(ui, repo, None, opts, tmpl,
3766 mapfile, buffered=False)
3766 mapfile, buffered=False)
3767 for r in revs:
3767 for r in revs:
3768 displayer.show(repo[r], **props)
3768 displayer.show(repo[r], **props)
3769 displayer.close()
3769 displayer.close()
3770
3770
3771 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3771 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3772 def debugwalk(ui, repo, *pats, **opts):
3772 def debugwalk(ui, repo, *pats, **opts):
3773 """show how files match on given patterns"""
3773 """show how files match on given patterns"""
3774 m = scmutil.match(repo[None], pats, opts)
3774 m = scmutil.match(repo[None], pats, opts)
3775 items = list(repo.walk(m))
3775 items = list(repo.walk(m))
3776 if not items:
3776 if not items:
3777 return
3777 return
3778 f = lambda fn: fn
3778 f = lambda fn: fn
3779 if ui.configbool('ui', 'slash') and os.sep != '/':
3779 if ui.configbool('ui', 'slash') and os.sep != '/':
3780 f = lambda fn: util.normpath(fn)
3780 f = lambda fn: util.normpath(fn)
3781 fmt = 'f %%-%ds %%-%ds %%s' % (
3781 fmt = 'f %%-%ds %%-%ds %%s' % (
3782 max([len(abs) for abs in items]),
3782 max([len(abs) for abs in items]),
3783 max([len(m.rel(abs)) for abs in items]))
3783 max([len(m.rel(abs)) for abs in items]))
3784 for abs in items:
3784 for abs in items:
3785 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3785 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3786 ui.write("%s\n" % line.rstrip())
3786 ui.write("%s\n" % line.rstrip())
3787
3787
3788 @command('debugwireargs',
3788 @command('debugwireargs',
3789 [('', 'three', '', 'three'),
3789 [('', 'three', '', 'three'),
3790 ('', 'four', '', 'four'),
3790 ('', 'four', '', 'four'),
3791 ('', 'five', '', 'five'),
3791 ('', 'five', '', 'five'),
3792 ] + remoteopts,
3792 ] + remoteopts,
3793 _('REPO [OPTIONS]... [ONE [TWO]]'),
3793 _('REPO [OPTIONS]... [ONE [TWO]]'),
3794 norepo=True)
3794 norepo=True)
3795 def debugwireargs(ui, repopath, *vals, **opts):
3795 def debugwireargs(ui, repopath, *vals, **opts):
3796 repo = hg.peer(ui, opts, repopath)
3796 repo = hg.peer(ui, opts, repopath)
3797 for opt in remoteopts:
3797 for opt in remoteopts:
3798 del opts[opt[1]]
3798 del opts[opt[1]]
3799 args = {}
3799 args = {}
3800 for k, v in opts.iteritems():
3800 for k, v in opts.iteritems():
3801 if v:
3801 if v:
3802 args[k] = v
3802 args[k] = v
3803 # run twice to check that we don't mess up the stream for the next command
3803 # run twice to check that we don't mess up the stream for the next command
3804 res1 = repo.debugwireargs(*vals, **args)
3804 res1 = repo.debugwireargs(*vals, **args)
3805 res2 = repo.debugwireargs(*vals, **args)
3805 res2 = repo.debugwireargs(*vals, **args)
3806 ui.write("%s\n" % res1)
3806 ui.write("%s\n" % res1)
3807 if res1 != res2:
3807 if res1 != res2:
3808 ui.warn("%s\n" % res2)
3808 ui.warn("%s\n" % res2)
3809
3809
3810 @command('^diff',
3810 @command('^diff',
3811 [('r', 'rev', [], _('revision'), _('REV')),
3811 [('r', 'rev', [], _('revision'), _('REV')),
3812 ('c', 'change', '', _('change made by revision'), _('REV'))
3812 ('c', 'change', '', _('change made by revision'), _('REV'))
3813 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3813 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3814 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3814 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3815 inferrepo=True)
3815 inferrepo=True)
3816 def diff(ui, repo, *pats, **opts):
3816 def diff(ui, repo, *pats, **opts):
3817 """diff repository (or selected files)
3817 """diff repository (or selected files)
3818
3818
3819 Show differences between revisions for the specified files.
3819 Show differences between revisions for the specified files.
3820
3820
3821 Differences between files are shown using the unified diff format.
3821 Differences between files are shown using the unified diff format.
3822
3822
3823 .. note::
3823 .. note::
3824
3824
3825 :hg:`diff` may generate unexpected results for merges, as it will
3825 :hg:`diff` may generate unexpected results for merges, as it will
3826 default to comparing against the working directory's first
3826 default to comparing against the working directory's first
3827 parent changeset if no revisions are specified.
3827 parent changeset if no revisions are specified.
3828
3828
3829 When two revision arguments are given, then changes are shown
3829 When two revision arguments are given, then changes are shown
3830 between those revisions. If only one revision is specified then
3830 between those revisions. If only one revision is specified then
3831 that revision is compared to the working directory, and, when no
3831 that revision is compared to the working directory, and, when no
3832 revisions are specified, the working directory files are compared
3832 revisions are specified, the working directory files are compared
3833 to its first parent.
3833 to its first parent.
3834
3834
3835 Alternatively you can specify -c/--change with a revision to see
3835 Alternatively you can specify -c/--change with a revision to see
3836 the changes in that changeset relative to its first parent.
3836 the changes in that changeset relative to its first parent.
3837
3837
3838 Without the -a/--text option, diff will avoid generating diffs of
3838 Without the -a/--text option, diff will avoid generating diffs of
3839 files it detects as binary. With -a, diff will generate a diff
3839 files it detects as binary. With -a, diff will generate a diff
3840 anyway, probably with undesirable results.
3840 anyway, probably with undesirable results.
3841
3841
3842 Use the -g/--git option to generate diffs in the git extended diff
3842 Use the -g/--git option to generate diffs in the git extended diff
3843 format. For more information, read :hg:`help diffs`.
3843 format. For more information, read :hg:`help diffs`.
3844
3844
3845 .. container:: verbose
3845 .. container:: verbose
3846
3846
3847 Examples:
3847 Examples:
3848
3848
3849 - compare a file in the current working directory to its parent::
3849 - compare a file in the current working directory to its parent::
3850
3850
3851 hg diff foo.c
3851 hg diff foo.c
3852
3852
3853 - compare two historical versions of a directory, with rename info::
3853 - compare two historical versions of a directory, with rename info::
3854
3854
3855 hg diff --git -r 1.0:1.2 lib/
3855 hg diff --git -r 1.0:1.2 lib/
3856
3856
3857 - get change stats relative to the last change on some date::
3857 - get change stats relative to the last change on some date::
3858
3858
3859 hg diff --stat -r "date('may 2')"
3859 hg diff --stat -r "date('may 2')"
3860
3860
3861 - diff all newly-added files that contain a keyword::
3861 - diff all newly-added files that contain a keyword::
3862
3862
3863 hg diff "set:added() and grep(GNU)"
3863 hg diff "set:added() and grep(GNU)"
3864
3864
3865 - compare a revision and its parents::
3865 - compare a revision and its parents::
3866
3866
3867 hg diff -c 9353 # compare against first parent
3867 hg diff -c 9353 # compare against first parent
3868 hg diff -r 9353^:9353 # same using revset syntax
3868 hg diff -r 9353^:9353 # same using revset syntax
3869 hg diff -r 9353^2:9353 # compare against the second parent
3869 hg diff -r 9353^2:9353 # compare against the second parent
3870
3870
3871 Returns 0 on success.
3871 Returns 0 on success.
3872 """
3872 """
3873
3873
3874 revs = opts.get('rev')
3874 revs = opts.get('rev')
3875 change = opts.get('change')
3875 change = opts.get('change')
3876 stat = opts.get('stat')
3876 stat = opts.get('stat')
3877 reverse = opts.get('reverse')
3877 reverse = opts.get('reverse')
3878
3878
3879 if revs and change:
3879 if revs and change:
3880 msg = _('cannot specify --rev and --change at the same time')
3880 msg = _('cannot specify --rev and --change at the same time')
3881 raise error.Abort(msg)
3881 raise error.Abort(msg)
3882 elif change:
3882 elif change:
3883 node2 = scmutil.revsingle(repo, change, None).node()
3883 node2 = scmutil.revsingle(repo, change, None).node()
3884 node1 = repo[node2].p1().node()
3884 node1 = repo[node2].p1().node()
3885 else:
3885 else:
3886 node1, node2 = scmutil.revpair(repo, revs)
3886 node1, node2 = scmutil.revpair(repo, revs)
3887
3887
3888 if reverse:
3888 if reverse:
3889 node1, node2 = node2, node1
3889 node1, node2 = node2, node1
3890
3890
3891 diffopts = patch.diffallopts(ui, opts)
3891 diffopts = patch.diffallopts(ui, opts)
3892 m = scmutil.match(repo[node2], pats, opts)
3892 m = scmutil.match(repo[node2], pats, opts)
3893 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3893 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3894 listsubrepos=opts.get('subrepos'),
3894 listsubrepos=opts.get('subrepos'),
3895 root=opts.get('root'))
3895 root=opts.get('root'))
3896
3896
3897 @command('^export',
3897 @command('^export',
3898 [('o', 'output', '',
3898 [('o', 'output', '',
3899 _('print output to file with formatted name'), _('FORMAT')),
3899 _('print output to file with formatted name'), _('FORMAT')),
3900 ('', 'switch-parent', None, _('diff against the second parent')),
3900 ('', 'switch-parent', None, _('diff against the second parent')),
3901 ('r', 'rev', [], _('revisions to export'), _('REV')),
3901 ('r', 'rev', [], _('revisions to export'), _('REV')),
3902 ] + diffopts,
3902 ] + diffopts,
3903 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3903 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3904 def export(ui, repo, *changesets, **opts):
3904 def export(ui, repo, *changesets, **opts):
3905 """dump the header and diffs for one or more changesets
3905 """dump the header and diffs for one or more changesets
3906
3906
3907 Print the changeset header and diffs for one or more revisions.
3907 Print the changeset header and diffs for one or more revisions.
3908 If no revision is given, the parent of the working directory is used.
3908 If no revision is given, the parent of the working directory is used.
3909
3909
3910 The information shown in the changeset header is: author, date,
3910 The information shown in the changeset header is: author, date,
3911 branch name (if non-default), changeset hash, parent(s) and commit
3911 branch name (if non-default), changeset hash, parent(s) and commit
3912 comment.
3912 comment.
3913
3913
3914 .. note::
3914 .. note::
3915
3915
3916 :hg:`export` may generate unexpected diff output for merge
3916 :hg:`export` may generate unexpected diff output for merge
3917 changesets, as it will compare the merge changeset against its
3917 changesets, as it will compare the merge changeset against its
3918 first parent only.
3918 first parent only.
3919
3919
3920 Output may be to a file, in which case the name of the file is
3920 Output may be to a file, in which case the name of the file is
3921 given using a format string. The formatting rules are as follows:
3921 given using a format string. The formatting rules are as follows:
3922
3922
3923 :``%%``: literal "%" character
3923 :``%%``: literal "%" character
3924 :``%H``: changeset hash (40 hexadecimal digits)
3924 :``%H``: changeset hash (40 hexadecimal digits)
3925 :``%N``: number of patches being generated
3925 :``%N``: number of patches being generated
3926 :``%R``: changeset revision number
3926 :``%R``: changeset revision number
3927 :``%b``: basename of the exporting repository
3927 :``%b``: basename of the exporting repository
3928 :``%h``: short-form changeset hash (12 hexadecimal digits)
3928 :``%h``: short-form changeset hash (12 hexadecimal digits)
3929 :``%m``: first line of the commit message (only alphanumeric characters)
3929 :``%m``: first line of the commit message (only alphanumeric characters)
3930 :``%n``: zero-padded sequence number, starting at 1
3930 :``%n``: zero-padded sequence number, starting at 1
3931 :``%r``: zero-padded changeset revision number
3931 :``%r``: zero-padded changeset revision number
3932
3932
3933 Without the -a/--text option, export will avoid generating diffs
3933 Without the -a/--text option, export will avoid generating diffs
3934 of files it detects as binary. With -a, export will generate a
3934 of files it detects as binary. With -a, export will generate a
3935 diff anyway, probably with undesirable results.
3935 diff anyway, probably with undesirable results.
3936
3936
3937 Use the -g/--git option to generate diffs in the git extended diff
3937 Use the -g/--git option to generate diffs in the git extended diff
3938 format. See :hg:`help diffs` for more information.
3938 format. See :hg:`help diffs` for more information.
3939
3939
3940 With the --switch-parent option, the diff will be against the
3940 With the --switch-parent option, the diff will be against the
3941 second parent. It can be useful to review a merge.
3941 second parent. It can be useful to review a merge.
3942
3942
3943 .. container:: verbose
3943 .. container:: verbose
3944
3944
3945 Examples:
3945 Examples:
3946
3946
3947 - use export and import to transplant a bugfix to the current
3947 - use export and import to transplant a bugfix to the current
3948 branch::
3948 branch::
3949
3949
3950 hg export -r 9353 | hg import -
3950 hg export -r 9353 | hg import -
3951
3951
3952 - export all the changesets between two revisions to a file with
3952 - export all the changesets between two revisions to a file with
3953 rename information::
3953 rename information::
3954
3954
3955 hg export --git -r 123:150 > changes.txt
3955 hg export --git -r 123:150 > changes.txt
3956
3956
3957 - split outgoing changes into a series of patches with
3957 - split outgoing changes into a series of patches with
3958 descriptive names::
3958 descriptive names::
3959
3959
3960 hg export -r "outgoing()" -o "%n-%m.patch"
3960 hg export -r "outgoing()" -o "%n-%m.patch"
3961
3961
3962 Returns 0 on success.
3962 Returns 0 on success.
3963 """
3963 """
3964 changesets += tuple(opts.get('rev', []))
3964 changesets += tuple(opts.get('rev', []))
3965 if not changesets:
3965 if not changesets:
3966 changesets = ['.']
3966 changesets = ['.']
3967 revs = scmutil.revrange(repo, changesets)
3967 revs = scmutil.revrange(repo, changesets)
3968 if not revs:
3968 if not revs:
3969 raise error.Abort(_("export requires at least one changeset"))
3969 raise error.Abort(_("export requires at least one changeset"))
3970 if len(revs) > 1:
3970 if len(revs) > 1:
3971 ui.note(_('exporting patches:\n'))
3971 ui.note(_('exporting patches:\n'))
3972 else:
3972 else:
3973 ui.note(_('exporting patch:\n'))
3973 ui.note(_('exporting patch:\n'))
3974 cmdutil.export(repo, revs, template=opts.get('output'),
3974 cmdutil.export(repo, revs, template=opts.get('output'),
3975 switch_parent=opts.get('switch_parent'),
3975 switch_parent=opts.get('switch_parent'),
3976 opts=patch.diffallopts(ui, opts))
3976 opts=patch.diffallopts(ui, opts))
3977
3977
3978 @command('files',
3978 @command('files',
3979 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3979 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3980 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3980 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3981 ] + walkopts + formatteropts + subrepoopts,
3981 ] + walkopts + formatteropts + subrepoopts,
3982 _('[OPTION]... [FILE]...'))
3982 _('[OPTION]... [FILE]...'))
3983 def files(ui, repo, *pats, **opts):
3983 def files(ui, repo, *pats, **opts):
3984 """list tracked files
3984 """list tracked files
3985
3985
3986 Print files under Mercurial control in the working directory or
3986 Print files under Mercurial control in the working directory or
3987 specified revision for given files (excluding removed files).
3987 specified revision for given files (excluding removed files).
3988 Files can be specified as filenames or filesets.
3988 Files can be specified as filenames or filesets.
3989
3989
3990 If no files are given to match, this command prints the names
3990 If no files are given to match, this command prints the names
3991 of all files under Mercurial control.
3991 of all files under Mercurial control.
3992
3992
3993 .. container:: verbose
3993 .. container:: verbose
3994
3994
3995 Examples:
3995 Examples:
3996
3996
3997 - list all files under the current directory::
3997 - list all files under the current directory::
3998
3998
3999 hg files .
3999 hg files .
4000
4000
4001 - shows sizes and flags for current revision::
4001 - shows sizes and flags for current revision::
4002
4002
4003 hg files -vr .
4003 hg files -vr .
4004
4004
4005 - list all files named README::
4005 - list all files named README::
4006
4006
4007 hg files -I "**/README"
4007 hg files -I "**/README"
4008
4008
4009 - list all binary files::
4009 - list all binary files::
4010
4010
4011 hg files "set:binary()"
4011 hg files "set:binary()"
4012
4012
4013 - find files containing a regular expression::
4013 - find files containing a regular expression::
4014
4014
4015 hg files "set:grep('bob')"
4015 hg files "set:grep('bob')"
4016
4016
4017 - search tracked file contents with xargs and grep::
4017 - search tracked file contents with xargs and grep::
4018
4018
4019 hg files -0 | xargs -0 grep foo
4019 hg files -0 | xargs -0 grep foo
4020
4020
4021 See :hg:`help patterns` and :hg:`help filesets` for more information
4021 See :hg:`help patterns` and :hg:`help filesets` for more information
4022 on specifying file patterns.
4022 on specifying file patterns.
4023
4023
4024 Returns 0 if a match is found, 1 otherwise.
4024 Returns 0 if a match is found, 1 otherwise.
4025
4025
4026 """
4026 """
4027 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4027 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4028
4028
4029 end = '\n'
4029 end = '\n'
4030 if opts.get('print0'):
4030 if opts.get('print0'):
4031 end = '\0'
4031 end = '\0'
4032 fmt = '%s' + end
4032 fmt = '%s' + end
4033
4033
4034 m = scmutil.match(ctx, pats, opts)
4034 m = scmutil.match(ctx, pats, opts)
4035 with ui.formatter('files', opts) as fm:
4035 with ui.formatter('files', opts) as fm:
4036 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
4036 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
4037
4037
4038 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
4038 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
4039 def forget(ui, repo, *pats, **opts):
4039 def forget(ui, repo, *pats, **opts):
4040 """forget the specified files on the next commit
4040 """forget the specified files on the next commit
4041
4041
4042 Mark the specified files so they will no longer be tracked
4042 Mark the specified files so they will no longer be tracked
4043 after the next commit.
4043 after the next commit.
4044
4044
4045 This only removes files from the current branch, not from the
4045 This only removes files from the current branch, not from the
4046 entire project history, and it does not delete them from the
4046 entire project history, and it does not delete them from the
4047 working directory.
4047 working directory.
4048
4048
4049 To delete the file from the working directory, see :hg:`remove`.
4049 To delete the file from the working directory, see :hg:`remove`.
4050
4050
4051 To undo a forget before the next commit, see :hg:`add`.
4051 To undo a forget before the next commit, see :hg:`add`.
4052
4052
4053 .. container:: verbose
4053 .. container:: verbose
4054
4054
4055 Examples:
4055 Examples:
4056
4056
4057 - forget newly-added binary files::
4057 - forget newly-added binary files::
4058
4058
4059 hg forget "set:added() and binary()"
4059 hg forget "set:added() and binary()"
4060
4060
4061 - forget files that would be excluded by .hgignore::
4061 - forget files that would be excluded by .hgignore::
4062
4062
4063 hg forget "set:hgignore()"
4063 hg forget "set:hgignore()"
4064
4064
4065 Returns 0 on success.
4065 Returns 0 on success.
4066 """
4066 """
4067
4067
4068 if not pats:
4068 if not pats:
4069 raise error.Abort(_('no files specified'))
4069 raise error.Abort(_('no files specified'))
4070
4070
4071 m = scmutil.match(repo[None], pats, opts)
4071 m = scmutil.match(repo[None], pats, opts)
4072 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
4072 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
4073 return rejected and 1 or 0
4073 return rejected and 1 or 0
4074
4074
4075 @command(
4075 @command(
4076 'graft',
4076 'graft',
4077 [('r', 'rev', [], _('revisions to graft'), _('REV')),
4077 [('r', 'rev', [], _('revisions to graft'), _('REV')),
4078 ('c', 'continue', False, _('resume interrupted graft')),
4078 ('c', 'continue', False, _('resume interrupted graft')),
4079 ('e', 'edit', False, _('invoke editor on commit messages')),
4079 ('e', 'edit', False, _('invoke editor on commit messages')),
4080 ('', 'log', None, _('append graft info to log message')),
4080 ('', 'log', None, _('append graft info to log message')),
4081 ('f', 'force', False, _('force graft')),
4081 ('f', 'force', False, _('force graft')),
4082 ('D', 'currentdate', False,
4082 ('D', 'currentdate', False,
4083 _('record the current date as commit date')),
4083 _('record the current date as commit date')),
4084 ('U', 'currentuser', False,
4084 ('U', 'currentuser', False,
4085 _('record the current user as committer'), _('DATE'))]
4085 _('record the current user as committer'), _('DATE'))]
4086 + commitopts2 + mergetoolopts + dryrunopts,
4086 + commitopts2 + mergetoolopts + dryrunopts,
4087 _('[OPTION]... [-r REV]... REV...'))
4087 _('[OPTION]... [-r REV]... REV...'))
4088 def graft(ui, repo, *revs, **opts):
4088 def graft(ui, repo, *revs, **opts):
4089 '''copy changes from other branches onto the current branch
4089 '''copy changes from other branches onto the current branch
4090
4090
4091 This command uses Mercurial's merge logic to copy individual
4091 This command uses Mercurial's merge logic to copy individual
4092 changes from other branches without merging branches in the
4092 changes from other branches without merging branches in the
4093 history graph. This is sometimes known as 'backporting' or
4093 history graph. This is sometimes known as 'backporting' or
4094 'cherry-picking'. By default, graft will copy user, date, and
4094 'cherry-picking'. By default, graft will copy user, date, and
4095 description from the source changesets.
4095 description from the source changesets.
4096
4096
4097 Changesets that are ancestors of the current revision, that have
4097 Changesets that are ancestors of the current revision, that have
4098 already been grafted, or that are merges will be skipped.
4098 already been grafted, or that are merges will be skipped.
4099
4099
4100 If --log is specified, log messages will have a comment appended
4100 If --log is specified, log messages will have a comment appended
4101 of the form::
4101 of the form::
4102
4102
4103 (grafted from CHANGESETHASH)
4103 (grafted from CHANGESETHASH)
4104
4104
4105 If --force is specified, revisions will be grafted even if they
4105 If --force is specified, revisions will be grafted even if they
4106 are already ancestors of or have been grafted to the destination.
4106 are already ancestors of or have been grafted to the destination.
4107 This is useful when the revisions have since been backed out.
4107 This is useful when the revisions have since been backed out.
4108
4108
4109 If a graft merge results in conflicts, the graft process is
4109 If a graft merge results in conflicts, the graft process is
4110 interrupted so that the current merge can be manually resolved.
4110 interrupted so that the current merge can be manually resolved.
4111 Once all conflicts are addressed, the graft process can be
4111 Once all conflicts are addressed, the graft process can be
4112 continued with the -c/--continue option.
4112 continued with the -c/--continue option.
4113
4113
4114 .. note::
4114 .. note::
4115
4115
4116 The -c/--continue option does not reapply earlier options, except
4116 The -c/--continue option does not reapply earlier options, except
4117 for --force.
4117 for --force.
4118
4118
4119 .. container:: verbose
4119 .. container:: verbose
4120
4120
4121 Examples:
4121 Examples:
4122
4122
4123 - copy a single change to the stable branch and edit its description::
4123 - copy a single change to the stable branch and edit its description::
4124
4124
4125 hg update stable
4125 hg update stable
4126 hg graft --edit 9393
4126 hg graft --edit 9393
4127
4127
4128 - graft a range of changesets with one exception, updating dates::
4128 - graft a range of changesets with one exception, updating dates::
4129
4129
4130 hg graft -D "2085::2093 and not 2091"
4130 hg graft -D "2085::2093 and not 2091"
4131
4131
4132 - continue a graft after resolving conflicts::
4132 - continue a graft after resolving conflicts::
4133
4133
4134 hg graft -c
4134 hg graft -c
4135
4135
4136 - show the source of a grafted changeset::
4136 - show the source of a grafted changeset::
4137
4137
4138 hg log --debug -r .
4138 hg log --debug -r .
4139
4139
4140 - show revisions sorted by date::
4140 - show revisions sorted by date::
4141
4141
4142 hg log -r "sort(all(), date)"
4142 hg log -r "sort(all(), date)"
4143
4143
4144 See :hg:`help revisions` and :hg:`help revsets` for more about
4144 See :hg:`help revisions` and :hg:`help revsets` for more about
4145 specifying revisions.
4145 specifying revisions.
4146
4146
4147 Returns 0 on successful completion.
4147 Returns 0 on successful completion.
4148 '''
4148 '''
4149 with repo.wlock():
4149 with repo.wlock():
4150 return _dograft(ui, repo, *revs, **opts)
4150 return _dograft(ui, repo, *revs, **opts)
4151
4151
4152 def _dograft(ui, repo, *revs, **opts):
4152 def _dograft(ui, repo, *revs, **opts):
4153 if revs and opts.get('rev'):
4153 if revs and opts.get('rev'):
4154 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
4154 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
4155 'revision ordering!\n'))
4155 'revision ordering!\n'))
4156
4156
4157 revs = list(revs)
4157 revs = list(revs)
4158 revs.extend(opts.get('rev'))
4158 revs.extend(opts.get('rev'))
4159
4159
4160 if not opts.get('user') and opts.get('currentuser'):
4160 if not opts.get('user') and opts.get('currentuser'):
4161 opts['user'] = ui.username()
4161 opts['user'] = ui.username()
4162 if not opts.get('date') and opts.get('currentdate'):
4162 if not opts.get('date') and opts.get('currentdate'):
4163 opts['date'] = "%d %d" % util.makedate()
4163 opts['date'] = "%d %d" % util.makedate()
4164
4164
4165 editor = cmdutil.getcommiteditor(editform='graft', **opts)
4165 editor = cmdutil.getcommiteditor(editform='graft', **opts)
4166
4166
4167 cont = False
4167 cont = False
4168 if opts.get('continue'):
4168 if opts.get('continue'):
4169 cont = True
4169 cont = True
4170 if revs:
4170 if revs:
4171 raise error.Abort(_("can't specify --continue and revisions"))
4171 raise error.Abort(_("can't specify --continue and revisions"))
4172 # read in unfinished revisions
4172 # read in unfinished revisions
4173 try:
4173 try:
4174 nodes = repo.vfs.read('graftstate').splitlines()
4174 nodes = repo.vfs.read('graftstate').splitlines()
4175 revs = [repo[node].rev() for node in nodes]
4175 revs = [repo[node].rev() for node in nodes]
4176 except IOError as inst:
4176 except IOError as inst:
4177 if inst.errno != errno.ENOENT:
4177 if inst.errno != errno.ENOENT:
4178 raise
4178 raise
4179 cmdutil.wrongtooltocontinue(repo, _('graft'))
4179 cmdutil.wrongtooltocontinue(repo, _('graft'))
4180 else:
4180 else:
4181 cmdutil.checkunfinished(repo)
4181 cmdutil.checkunfinished(repo)
4182 cmdutil.bailifchanged(repo)
4182 cmdutil.bailifchanged(repo)
4183 if not revs:
4183 if not revs:
4184 raise error.Abort(_('no revisions specified'))
4184 raise error.Abort(_('no revisions specified'))
4185 revs = scmutil.revrange(repo, revs)
4185 revs = scmutil.revrange(repo, revs)
4186
4186
4187 skipped = set()
4187 skipped = set()
4188 # check for merges
4188 # check for merges
4189 for rev in repo.revs('%ld and merge()', revs):
4189 for rev in repo.revs('%ld and merge()', revs):
4190 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
4190 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
4191 skipped.add(rev)
4191 skipped.add(rev)
4192 revs = [r for r in revs if r not in skipped]
4192 revs = [r for r in revs if r not in skipped]
4193 if not revs:
4193 if not revs:
4194 return -1
4194 return -1
4195
4195
4196 # Don't check in the --continue case, in effect retaining --force across
4196 # Don't check in the --continue case, in effect retaining --force across
4197 # --continues. That's because without --force, any revisions we decided to
4197 # --continues. That's because without --force, any revisions we decided to
4198 # skip would have been filtered out here, so they wouldn't have made their
4198 # skip would have been filtered out here, so they wouldn't have made their
4199 # way to the graftstate. With --force, any revisions we would have otherwise
4199 # way to the graftstate. With --force, any revisions we would have otherwise
4200 # skipped would not have been filtered out, and if they hadn't been applied
4200 # skipped would not have been filtered out, and if they hadn't been applied
4201 # already, they'd have been in the graftstate.
4201 # already, they'd have been in the graftstate.
4202 if not (cont or opts.get('force')):
4202 if not (cont or opts.get('force')):
4203 # check for ancestors of dest branch
4203 # check for ancestors of dest branch
4204 crev = repo['.'].rev()
4204 crev = repo['.'].rev()
4205 ancestors = repo.changelog.ancestors([crev], inclusive=True)
4205 ancestors = repo.changelog.ancestors([crev], inclusive=True)
4206 # XXX make this lazy in the future
4206 # XXX make this lazy in the future
4207 # don't mutate while iterating, create a copy
4207 # don't mutate while iterating, create a copy
4208 for rev in list(revs):
4208 for rev in list(revs):
4209 if rev in ancestors:
4209 if rev in ancestors:
4210 ui.warn(_('skipping ancestor revision %d:%s\n') %
4210 ui.warn(_('skipping ancestor revision %d:%s\n') %
4211 (rev, repo[rev]))
4211 (rev, repo[rev]))
4212 # XXX remove on list is slow
4212 # XXX remove on list is slow
4213 revs.remove(rev)
4213 revs.remove(rev)
4214 if not revs:
4214 if not revs:
4215 return -1
4215 return -1
4216
4216
4217 # analyze revs for earlier grafts
4217 # analyze revs for earlier grafts
4218 ids = {}
4218 ids = {}
4219 for ctx in repo.set("%ld", revs):
4219 for ctx in repo.set("%ld", revs):
4220 ids[ctx.hex()] = ctx.rev()
4220 ids[ctx.hex()] = ctx.rev()
4221 n = ctx.extra().get('source')
4221 n = ctx.extra().get('source')
4222 if n:
4222 if n:
4223 ids[n] = ctx.rev()
4223 ids[n] = ctx.rev()
4224
4224
4225 # check ancestors for earlier grafts
4225 # check ancestors for earlier grafts
4226 ui.debug('scanning for duplicate grafts\n')
4226 ui.debug('scanning for duplicate grafts\n')
4227
4227
4228 for rev in repo.changelog.findmissingrevs(revs, [crev]):
4228 for rev in repo.changelog.findmissingrevs(revs, [crev]):
4229 ctx = repo[rev]
4229 ctx = repo[rev]
4230 n = ctx.extra().get('source')
4230 n = ctx.extra().get('source')
4231 if n in ids:
4231 if n in ids:
4232 try:
4232 try:
4233 r = repo[n].rev()
4233 r = repo[n].rev()
4234 except error.RepoLookupError:
4234 except error.RepoLookupError:
4235 r = None
4235 r = None
4236 if r in revs:
4236 if r in revs:
4237 ui.warn(_('skipping revision %d:%s '
4237 ui.warn(_('skipping revision %d:%s '
4238 '(already grafted to %d:%s)\n')
4238 '(already grafted to %d:%s)\n')
4239 % (r, repo[r], rev, ctx))
4239 % (r, repo[r], rev, ctx))
4240 revs.remove(r)
4240 revs.remove(r)
4241 elif ids[n] in revs:
4241 elif ids[n] in revs:
4242 if r is None:
4242 if r is None:
4243 ui.warn(_('skipping already grafted revision %d:%s '
4243 ui.warn(_('skipping already grafted revision %d:%s '
4244 '(%d:%s also has unknown origin %s)\n')
4244 '(%d:%s also has unknown origin %s)\n')
4245 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
4245 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
4246 else:
4246 else:
4247 ui.warn(_('skipping already grafted revision %d:%s '
4247 ui.warn(_('skipping already grafted revision %d:%s '
4248 '(%d:%s also has origin %d:%s)\n')
4248 '(%d:%s also has origin %d:%s)\n')
4249 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
4249 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
4250 revs.remove(ids[n])
4250 revs.remove(ids[n])
4251 elif ctx.hex() in ids:
4251 elif ctx.hex() in ids:
4252 r = ids[ctx.hex()]
4252 r = ids[ctx.hex()]
4253 ui.warn(_('skipping already grafted revision %d:%s '
4253 ui.warn(_('skipping already grafted revision %d:%s '
4254 '(was grafted from %d:%s)\n') %
4254 '(was grafted from %d:%s)\n') %
4255 (r, repo[r], rev, ctx))
4255 (r, repo[r], rev, ctx))
4256 revs.remove(r)
4256 revs.remove(r)
4257 if not revs:
4257 if not revs:
4258 return -1
4258 return -1
4259
4259
4260 for pos, ctx in enumerate(repo.set("%ld", revs)):
4260 for pos, ctx in enumerate(repo.set("%ld", revs)):
4261 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
4261 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
4262 ctx.description().split('\n', 1)[0])
4262 ctx.description().split('\n', 1)[0])
4263 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
4263 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
4264 if names:
4264 if names:
4265 desc += ' (%s)' % ' '.join(names)
4265 desc += ' (%s)' % ' '.join(names)
4266 ui.status(_('grafting %s\n') % desc)
4266 ui.status(_('grafting %s\n') % desc)
4267 if opts.get('dry_run'):
4267 if opts.get('dry_run'):
4268 continue
4268 continue
4269
4269
4270 source = ctx.extra().get('source')
4270 source = ctx.extra().get('source')
4271 extra = {}
4271 extra = {}
4272 if source:
4272 if source:
4273 extra['source'] = source
4273 extra['source'] = source
4274 extra['intermediate-source'] = ctx.hex()
4274 extra['intermediate-source'] = ctx.hex()
4275 else:
4275 else:
4276 extra['source'] = ctx.hex()
4276 extra['source'] = ctx.hex()
4277 user = ctx.user()
4277 user = ctx.user()
4278 if opts.get('user'):
4278 if opts.get('user'):
4279 user = opts['user']
4279 user = opts['user']
4280 date = ctx.date()
4280 date = ctx.date()
4281 if opts.get('date'):
4281 if opts.get('date'):
4282 date = opts['date']
4282 date = opts['date']
4283 message = ctx.description()
4283 message = ctx.description()
4284 if opts.get('log'):
4284 if opts.get('log'):
4285 message += '\n(grafted from %s)' % ctx.hex()
4285 message += '\n(grafted from %s)' % ctx.hex()
4286
4286
4287 # we don't merge the first commit when continuing
4287 # we don't merge the first commit when continuing
4288 if not cont:
4288 if not cont:
4289 # perform the graft merge with p1(rev) as 'ancestor'
4289 # perform the graft merge with p1(rev) as 'ancestor'
4290 try:
4290 try:
4291 # ui.forcemerge is an internal variable, do not document
4291 # ui.forcemerge is an internal variable, do not document
4292 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4292 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4293 'graft')
4293 'graft')
4294 stats = mergemod.graft(repo, ctx, ctx.p1(),
4294 stats = mergemod.graft(repo, ctx, ctx.p1(),
4295 ['local', 'graft'])
4295 ['local', 'graft'])
4296 finally:
4296 finally:
4297 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4297 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4298 # report any conflicts
4298 # report any conflicts
4299 if stats and stats[3] > 0:
4299 if stats and stats[3] > 0:
4300 # write out state for --continue
4300 # write out state for --continue
4301 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4301 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4302 repo.vfs.write('graftstate', ''.join(nodelines))
4302 repo.vfs.write('graftstate', ''.join(nodelines))
4303 extra = ''
4303 extra = ''
4304 if opts.get('user'):
4304 if opts.get('user'):
4305 extra += ' --user %s' % util.shellquote(opts['user'])
4305 extra += ' --user %s' % util.shellquote(opts['user'])
4306 if opts.get('date'):
4306 if opts.get('date'):
4307 extra += ' --date %s' % util.shellquote(opts['date'])
4307 extra += ' --date %s' % util.shellquote(opts['date'])
4308 if opts.get('log'):
4308 if opts.get('log'):
4309 extra += ' --log'
4309 extra += ' --log'
4310 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
4310 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
4311 raise error.Abort(
4311 raise error.Abort(
4312 _("unresolved conflicts, can't continue"),
4312 _("unresolved conflicts, can't continue"),
4313 hint=hint)
4313 hint=hint)
4314 else:
4314 else:
4315 cont = False
4315 cont = False
4316
4316
4317 # commit
4317 # commit
4318 node = repo.commit(text=message, user=user,
4318 node = repo.commit(text=message, user=user,
4319 date=date, extra=extra, editor=editor)
4319 date=date, extra=extra, editor=editor)
4320 if node is None:
4320 if node is None:
4321 ui.warn(
4321 ui.warn(
4322 _('note: graft of %d:%s created no changes to commit\n') %
4322 _('note: graft of %d:%s created no changes to commit\n') %
4323 (ctx.rev(), ctx))
4323 (ctx.rev(), ctx))
4324
4324
4325 # remove state when we complete successfully
4325 # remove state when we complete successfully
4326 if not opts.get('dry_run'):
4326 if not opts.get('dry_run'):
4327 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4327 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4328
4328
4329 return 0
4329 return 0
4330
4330
4331 @command('grep',
4331 @command('grep',
4332 [('0', 'print0', None, _('end fields with NUL')),
4332 [('0', 'print0', None, _('end fields with NUL')),
4333 ('', 'all', None, _('print all revisions that match')),
4333 ('', 'all', None, _('print all revisions that match')),
4334 ('a', 'text', None, _('treat all files as text')),
4334 ('a', 'text', None, _('treat all files as text')),
4335 ('f', 'follow', None,
4335 ('f', 'follow', None,
4336 _('follow changeset history,'
4336 _('follow changeset history,'
4337 ' or file history across copies and renames')),
4337 ' or file history across copies and renames')),
4338 ('i', 'ignore-case', None, _('ignore case when matching')),
4338 ('i', 'ignore-case', None, _('ignore case when matching')),
4339 ('l', 'files-with-matches', None,
4339 ('l', 'files-with-matches', None,
4340 _('print only filenames and revisions that match')),
4340 _('print only filenames and revisions that match')),
4341 ('n', 'line-number', None, _('print matching line numbers')),
4341 ('n', 'line-number', None, _('print matching line numbers')),
4342 ('r', 'rev', [],
4342 ('r', 'rev', [],
4343 _('only search files changed within revision range'), _('REV')),
4343 _('only search files changed within revision range'), _('REV')),
4344 ('u', 'user', None, _('list the author (long with -v)')),
4344 ('u', 'user', None, _('list the author (long with -v)')),
4345 ('d', 'date', None, _('list the date (short with -q)')),
4345 ('d', 'date', None, _('list the date (short with -q)')),
4346 ] + formatteropts + walkopts,
4346 ] + formatteropts + walkopts,
4347 _('[OPTION]... PATTERN [FILE]...'),
4347 _('[OPTION]... PATTERN [FILE]...'),
4348 inferrepo=True)
4348 inferrepo=True)
4349 def grep(ui, repo, pattern, *pats, **opts):
4349 def grep(ui, repo, pattern, *pats, **opts):
4350 """search for a pattern in specified files and revisions
4350 """search for a pattern in specified files and revisions
4351
4351
4352 Search revisions of files for a regular expression.
4352 Search revisions of files for a regular expression.
4353
4353
4354 This command behaves differently than Unix grep. It only accepts
4354 This command behaves differently than Unix grep. It only accepts
4355 Python/Perl regexps. It searches repository history, not the
4355 Python/Perl regexps. It searches repository history, not the
4356 working directory. It always prints the revision number in which a
4356 working directory. It always prints the revision number in which a
4357 match appears.
4357 match appears.
4358
4358
4359 By default, grep only prints output for the first revision of a
4359 By default, grep only prints output for the first revision of a
4360 file in which it finds a match. To get it to print every revision
4360 file in which it finds a match. To get it to print every revision
4361 that contains a change in match status ("-" for a match that
4361 that contains a change in match status ("-" for a match that
4362 becomes a non-match, or "+" for a non-match that becomes a match),
4362 becomes a non-match, or "+" for a non-match that becomes a match),
4363 use the --all flag.
4363 use the --all flag.
4364
4364
4365 Returns 0 if a match is found, 1 otherwise.
4365 Returns 0 if a match is found, 1 otherwise.
4366 """
4366 """
4367 reflags = re.M
4367 reflags = re.M
4368 if opts.get('ignore_case'):
4368 if opts.get('ignore_case'):
4369 reflags |= re.I
4369 reflags |= re.I
4370 try:
4370 try:
4371 regexp = util.re.compile(pattern, reflags)
4371 regexp = util.re.compile(pattern, reflags)
4372 except re.error as inst:
4372 except re.error as inst:
4373 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4373 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4374 return 1
4374 return 1
4375 sep, eol = ':', '\n'
4375 sep, eol = ':', '\n'
4376 if opts.get('print0'):
4376 if opts.get('print0'):
4377 sep = eol = '\0'
4377 sep = eol = '\0'
4378
4378
4379 getfile = util.lrucachefunc(repo.file)
4379 getfile = util.lrucachefunc(repo.file)
4380
4380
4381 def matchlines(body):
4381 def matchlines(body):
4382 begin = 0
4382 begin = 0
4383 linenum = 0
4383 linenum = 0
4384 while begin < len(body):
4384 while begin < len(body):
4385 match = regexp.search(body, begin)
4385 match = regexp.search(body, begin)
4386 if not match:
4386 if not match:
4387 break
4387 break
4388 mstart, mend = match.span()
4388 mstart, mend = match.span()
4389 linenum += body.count('\n', begin, mstart) + 1
4389 linenum += body.count('\n', begin, mstart) + 1
4390 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4390 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4391 begin = body.find('\n', mend) + 1 or len(body) + 1
4391 begin = body.find('\n', mend) + 1 or len(body) + 1
4392 lend = begin - 1
4392 lend = begin - 1
4393 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4393 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4394
4394
4395 class linestate(object):
4395 class linestate(object):
4396 def __init__(self, line, linenum, colstart, colend):
4396 def __init__(self, line, linenum, colstart, colend):
4397 self.line = line
4397 self.line = line
4398 self.linenum = linenum
4398 self.linenum = linenum
4399 self.colstart = colstart
4399 self.colstart = colstart
4400 self.colend = colend
4400 self.colend = colend
4401
4401
4402 def __hash__(self):
4402 def __hash__(self):
4403 return hash((self.linenum, self.line))
4403 return hash((self.linenum, self.line))
4404
4404
4405 def __eq__(self, other):
4405 def __eq__(self, other):
4406 return self.line == other.line
4406 return self.line == other.line
4407
4407
4408 def findpos(self):
4408 def findpos(self):
4409 """Iterate all (start, end) indices of matches"""
4409 """Iterate all (start, end) indices of matches"""
4410 yield self.colstart, self.colend
4410 yield self.colstart, self.colend
4411 p = self.colend
4411 p = self.colend
4412 while p < len(self.line):
4412 while p < len(self.line):
4413 m = regexp.search(self.line, p)
4413 m = regexp.search(self.line, p)
4414 if not m:
4414 if not m:
4415 break
4415 break
4416 yield m.span()
4416 yield m.span()
4417 p = m.end()
4417 p = m.end()
4418
4418
4419 matches = {}
4419 matches = {}
4420 copies = {}
4420 copies = {}
4421 def grepbody(fn, rev, body):
4421 def grepbody(fn, rev, body):
4422 matches[rev].setdefault(fn, [])
4422 matches[rev].setdefault(fn, [])
4423 m = matches[rev][fn]
4423 m = matches[rev][fn]
4424 for lnum, cstart, cend, line in matchlines(body):
4424 for lnum, cstart, cend, line in matchlines(body):
4425 s = linestate(line, lnum, cstart, cend)
4425 s = linestate(line, lnum, cstart, cend)
4426 m.append(s)
4426 m.append(s)
4427
4427
4428 def difflinestates(a, b):
4428 def difflinestates(a, b):
4429 sm = difflib.SequenceMatcher(None, a, b)
4429 sm = difflib.SequenceMatcher(None, a, b)
4430 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4430 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4431 if tag == 'insert':
4431 if tag == 'insert':
4432 for i in xrange(blo, bhi):
4432 for i in xrange(blo, bhi):
4433 yield ('+', b[i])
4433 yield ('+', b[i])
4434 elif tag == 'delete':
4434 elif tag == 'delete':
4435 for i in xrange(alo, ahi):
4435 for i in xrange(alo, ahi):
4436 yield ('-', a[i])
4436 yield ('-', a[i])
4437 elif tag == 'replace':
4437 elif tag == 'replace':
4438 for i in xrange(alo, ahi):
4438 for i in xrange(alo, ahi):
4439 yield ('-', a[i])
4439 yield ('-', a[i])
4440 for i in xrange(blo, bhi):
4440 for i in xrange(blo, bhi):
4441 yield ('+', b[i])
4441 yield ('+', b[i])
4442
4442
4443 def display(fm, fn, ctx, pstates, states):
4443 def display(fm, fn, ctx, pstates, states):
4444 rev = ctx.rev()
4444 rev = ctx.rev()
4445 if fm:
4445 if fm.isplain():
4446 formatuser = ui.shortuser
4447 else:
4446 formatuser = str
4448 formatuser = str
4447 else:
4448 formatuser = ui.shortuser
4449 if ui.quiet:
4449 if ui.quiet:
4450 datefmt = '%Y-%m-%d'
4450 datefmt = '%Y-%m-%d'
4451 else:
4451 else:
4452 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
4452 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
4453 found = False
4453 found = False
4454 @util.cachefunc
4454 @util.cachefunc
4455 def binary():
4455 def binary():
4456 flog = getfile(fn)
4456 flog = getfile(fn)
4457 return util.binary(flog.read(ctx.filenode(fn)))
4457 return util.binary(flog.read(ctx.filenode(fn)))
4458
4458
4459 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
4459 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
4460 if opts.get('all'):
4460 if opts.get('all'):
4461 iter = difflinestates(pstates, states)
4461 iter = difflinestates(pstates, states)
4462 else:
4462 else:
4463 iter = [('', l) for l in states]
4463 iter = [('', l) for l in states]
4464 for change, l in iter:
4464 for change, l in iter:
4465 fm.startitem()
4465 fm.startitem()
4466 fm.data(node=fm.hexfunc(ctx.node()))
4466 fm.data(node=fm.hexfunc(ctx.node()))
4467 cols = [
4467 cols = [
4468 ('filename', fn, True),
4468 ('filename', fn, True),
4469 ('rev', rev, True),
4469 ('rev', rev, True),
4470 ('linenumber', l.linenum, opts.get('line_number')),
4470 ('linenumber', l.linenum, opts.get('line_number')),
4471 ]
4471 ]
4472 if opts.get('all'):
4472 if opts.get('all'):
4473 cols.append(('change', change, True))
4473 cols.append(('change', change, True))
4474 cols.extend([
4474 cols.extend([
4475 ('user', formatuser(ctx.user()), opts.get('user')),
4475 ('user', formatuser(ctx.user()), opts.get('user')),
4476 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
4476 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
4477 ])
4477 ])
4478 lastcol = next(name for name, data, cond in reversed(cols) if cond)
4478 lastcol = next(name for name, data, cond in reversed(cols) if cond)
4479 for name, data, cond in cols:
4479 for name, data, cond in cols:
4480 field = fieldnamemap.get(name, name)
4480 field = fieldnamemap.get(name, name)
4481 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
4481 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
4482 if cond and name != lastcol:
4482 if cond and name != lastcol:
4483 fm.plain(sep, label='grep.sep')
4483 fm.plain(sep, label='grep.sep')
4484 if not opts.get('files_with_matches'):
4484 if not opts.get('files_with_matches'):
4485 fm.plain(sep, label='grep.sep')
4485 fm.plain(sep, label='grep.sep')
4486 if not opts.get('text') and binary():
4486 if not opts.get('text') and binary():
4487 fm.plain(_(" Binary file matches"))
4487 fm.plain(_(" Binary file matches"))
4488 else:
4488 else:
4489 displaymatches(fm.nested('texts'), l)
4489 displaymatches(fm.nested('texts'), l)
4490 fm.plain(eol)
4490 fm.plain(eol)
4491 found = True
4491 found = True
4492 if opts.get('files_with_matches'):
4492 if opts.get('files_with_matches'):
4493 break
4493 break
4494 return found
4494 return found
4495
4495
4496 def displaymatches(fm, l):
4496 def displaymatches(fm, l):
4497 p = 0
4497 p = 0
4498 for s, e in l.findpos():
4498 for s, e in l.findpos():
4499 if p < s:
4499 if p < s:
4500 fm.startitem()
4500 fm.startitem()
4501 fm.write('text', '%s', l.line[p:s])
4501 fm.write('text', '%s', l.line[p:s])
4502 fm.data(matched=False)
4502 fm.data(matched=False)
4503 fm.startitem()
4503 fm.startitem()
4504 fm.write('text', '%s', l.line[s:e], label='grep.match')
4504 fm.write('text', '%s', l.line[s:e], label='grep.match')
4505 fm.data(matched=True)
4505 fm.data(matched=True)
4506 p = e
4506 p = e
4507 if p < len(l.line):
4507 if p < len(l.line):
4508 fm.startitem()
4508 fm.startitem()
4509 fm.write('text', '%s', l.line[p:])
4509 fm.write('text', '%s', l.line[p:])
4510 fm.data(matched=False)
4510 fm.data(matched=False)
4511 fm.end()
4511 fm.end()
4512
4512
4513 skip = {}
4513 skip = {}
4514 revfiles = {}
4514 revfiles = {}
4515 matchfn = scmutil.match(repo[None], pats, opts)
4515 matchfn = scmutil.match(repo[None], pats, opts)
4516 found = False
4516 found = False
4517 follow = opts.get('follow')
4517 follow = opts.get('follow')
4518
4518
4519 def prep(ctx, fns):
4519 def prep(ctx, fns):
4520 rev = ctx.rev()
4520 rev = ctx.rev()
4521 pctx = ctx.p1()
4521 pctx = ctx.p1()
4522 parent = pctx.rev()
4522 parent = pctx.rev()
4523 matches.setdefault(rev, {})
4523 matches.setdefault(rev, {})
4524 matches.setdefault(parent, {})
4524 matches.setdefault(parent, {})
4525 files = revfiles.setdefault(rev, [])
4525 files = revfiles.setdefault(rev, [])
4526 for fn in fns:
4526 for fn in fns:
4527 flog = getfile(fn)
4527 flog = getfile(fn)
4528 try:
4528 try:
4529 fnode = ctx.filenode(fn)
4529 fnode = ctx.filenode(fn)
4530 except error.LookupError:
4530 except error.LookupError:
4531 continue
4531 continue
4532
4532
4533 copied = flog.renamed(fnode)
4533 copied = flog.renamed(fnode)
4534 copy = follow and copied and copied[0]
4534 copy = follow and copied and copied[0]
4535 if copy:
4535 if copy:
4536 copies.setdefault(rev, {})[fn] = copy
4536 copies.setdefault(rev, {})[fn] = copy
4537 if fn in skip:
4537 if fn in skip:
4538 if copy:
4538 if copy:
4539 skip[copy] = True
4539 skip[copy] = True
4540 continue
4540 continue
4541 files.append(fn)
4541 files.append(fn)
4542
4542
4543 if fn not in matches[rev]:
4543 if fn not in matches[rev]:
4544 grepbody(fn, rev, flog.read(fnode))
4544 grepbody(fn, rev, flog.read(fnode))
4545
4545
4546 pfn = copy or fn
4546 pfn = copy or fn
4547 if pfn not in matches[parent]:
4547 if pfn not in matches[parent]:
4548 try:
4548 try:
4549 fnode = pctx.filenode(pfn)
4549 fnode = pctx.filenode(pfn)
4550 grepbody(pfn, parent, flog.read(fnode))
4550 grepbody(pfn, parent, flog.read(fnode))
4551 except error.LookupError:
4551 except error.LookupError:
4552 pass
4552 pass
4553
4553
4554 fm = ui.formatter('grep', opts)
4554 fm = ui.formatter('grep', opts)
4555 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4555 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4556 rev = ctx.rev()
4556 rev = ctx.rev()
4557 parent = ctx.p1().rev()
4557 parent = ctx.p1().rev()
4558 for fn in sorted(revfiles.get(rev, [])):
4558 for fn in sorted(revfiles.get(rev, [])):
4559 states = matches[rev][fn]
4559 states = matches[rev][fn]
4560 copy = copies.get(rev, {}).get(fn)
4560 copy = copies.get(rev, {}).get(fn)
4561 if fn in skip:
4561 if fn in skip:
4562 if copy:
4562 if copy:
4563 skip[copy] = True
4563 skip[copy] = True
4564 continue
4564 continue
4565 pstates = matches.get(parent, {}).get(copy or fn, [])
4565 pstates = matches.get(parent, {}).get(copy or fn, [])
4566 if pstates or states:
4566 if pstates or states:
4567 r = display(fm, fn, ctx, pstates, states)
4567 r = display(fm, fn, ctx, pstates, states)
4568 found = found or r
4568 found = found or r
4569 if r and not opts.get('all'):
4569 if r and not opts.get('all'):
4570 skip[fn] = True
4570 skip[fn] = True
4571 if copy:
4571 if copy:
4572 skip[copy] = True
4572 skip[copy] = True
4573 del matches[rev]
4573 del matches[rev]
4574 del revfiles[rev]
4574 del revfiles[rev]
4575 fm.end()
4575 fm.end()
4576
4576
4577 return not found
4577 return not found
4578
4578
4579 @command('heads',
4579 @command('heads',
4580 [('r', 'rev', '',
4580 [('r', 'rev', '',
4581 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4581 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4582 ('t', 'topo', False, _('show topological heads only')),
4582 ('t', 'topo', False, _('show topological heads only')),
4583 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4583 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4584 ('c', 'closed', False, _('show normal and closed branch heads')),
4584 ('c', 'closed', False, _('show normal and closed branch heads')),
4585 ] + templateopts,
4585 ] + templateopts,
4586 _('[-ct] [-r STARTREV] [REV]...'))
4586 _('[-ct] [-r STARTREV] [REV]...'))
4587 def heads(ui, repo, *branchrevs, **opts):
4587 def heads(ui, repo, *branchrevs, **opts):
4588 """show branch heads
4588 """show branch heads
4589
4589
4590 With no arguments, show all open branch heads in the repository.
4590 With no arguments, show all open branch heads in the repository.
4591 Branch heads are changesets that have no descendants on the
4591 Branch heads are changesets that have no descendants on the
4592 same branch. They are where development generally takes place and
4592 same branch. They are where development generally takes place and
4593 are the usual targets for update and merge operations.
4593 are the usual targets for update and merge operations.
4594
4594
4595 If one or more REVs are given, only open branch heads on the
4595 If one or more REVs are given, only open branch heads on the
4596 branches associated with the specified changesets are shown. This
4596 branches associated with the specified changesets are shown. This
4597 means that you can use :hg:`heads .` to see the heads on the
4597 means that you can use :hg:`heads .` to see the heads on the
4598 currently checked-out branch.
4598 currently checked-out branch.
4599
4599
4600 If -c/--closed is specified, also show branch heads marked closed
4600 If -c/--closed is specified, also show branch heads marked closed
4601 (see :hg:`commit --close-branch`).
4601 (see :hg:`commit --close-branch`).
4602
4602
4603 If STARTREV is specified, only those heads that are descendants of
4603 If STARTREV is specified, only those heads that are descendants of
4604 STARTREV will be displayed.
4604 STARTREV will be displayed.
4605
4605
4606 If -t/--topo is specified, named branch mechanics will be ignored and only
4606 If -t/--topo is specified, named branch mechanics will be ignored and only
4607 topological heads (changesets with no children) will be shown.
4607 topological heads (changesets with no children) will be shown.
4608
4608
4609 Returns 0 if matching heads are found, 1 if not.
4609 Returns 0 if matching heads are found, 1 if not.
4610 """
4610 """
4611
4611
4612 start = None
4612 start = None
4613 if 'rev' in opts:
4613 if 'rev' in opts:
4614 start = scmutil.revsingle(repo, opts['rev'], None).node()
4614 start = scmutil.revsingle(repo, opts['rev'], None).node()
4615
4615
4616 if opts.get('topo'):
4616 if opts.get('topo'):
4617 heads = [repo[h] for h in repo.heads(start)]
4617 heads = [repo[h] for h in repo.heads(start)]
4618 else:
4618 else:
4619 heads = []
4619 heads = []
4620 for branch in repo.branchmap():
4620 for branch in repo.branchmap():
4621 heads += repo.branchheads(branch, start, opts.get('closed'))
4621 heads += repo.branchheads(branch, start, opts.get('closed'))
4622 heads = [repo[h] for h in heads]
4622 heads = [repo[h] for h in heads]
4623
4623
4624 if branchrevs:
4624 if branchrevs:
4625 branches = set(repo[br].branch() for br in branchrevs)
4625 branches = set(repo[br].branch() for br in branchrevs)
4626 heads = [h for h in heads if h.branch() in branches]
4626 heads = [h for h in heads if h.branch() in branches]
4627
4627
4628 if opts.get('active') and branchrevs:
4628 if opts.get('active') and branchrevs:
4629 dagheads = repo.heads(start)
4629 dagheads = repo.heads(start)
4630 heads = [h for h in heads if h.node() in dagheads]
4630 heads = [h for h in heads if h.node() in dagheads]
4631
4631
4632 if branchrevs:
4632 if branchrevs:
4633 haveheads = set(h.branch() for h in heads)
4633 haveheads = set(h.branch() for h in heads)
4634 if branches - haveheads:
4634 if branches - haveheads:
4635 headless = ', '.join(b for b in branches - haveheads)
4635 headless = ', '.join(b for b in branches - haveheads)
4636 msg = _('no open branch heads found on branches %s')
4636 msg = _('no open branch heads found on branches %s')
4637 if opts.get('rev'):
4637 if opts.get('rev'):
4638 msg += _(' (started at %s)') % opts['rev']
4638 msg += _(' (started at %s)') % opts['rev']
4639 ui.warn((msg + '\n') % headless)
4639 ui.warn((msg + '\n') % headless)
4640
4640
4641 if not heads:
4641 if not heads:
4642 return 1
4642 return 1
4643
4643
4644 heads = sorted(heads, key=lambda x: -x.rev())
4644 heads = sorted(heads, key=lambda x: -x.rev())
4645 displayer = cmdutil.show_changeset(ui, repo, opts)
4645 displayer = cmdutil.show_changeset(ui, repo, opts)
4646 for ctx in heads:
4646 for ctx in heads:
4647 displayer.show(ctx)
4647 displayer.show(ctx)
4648 displayer.close()
4648 displayer.close()
4649
4649
4650 @command('help',
4650 @command('help',
4651 [('e', 'extension', None, _('show only help for extensions')),
4651 [('e', 'extension', None, _('show only help for extensions')),
4652 ('c', 'command', None, _('show only help for commands')),
4652 ('c', 'command', None, _('show only help for commands')),
4653 ('k', 'keyword', None, _('show topics matching keyword')),
4653 ('k', 'keyword', None, _('show topics matching keyword')),
4654 ('s', 'system', [], _('show help for specific platform(s)')),
4654 ('s', 'system', [], _('show help for specific platform(s)')),
4655 ],
4655 ],
4656 _('[-ecks] [TOPIC]'),
4656 _('[-ecks] [TOPIC]'),
4657 norepo=True)
4657 norepo=True)
4658 def help_(ui, name=None, **opts):
4658 def help_(ui, name=None, **opts):
4659 """show help for a given topic or a help overview
4659 """show help for a given topic or a help overview
4660
4660
4661 With no arguments, print a list of commands with short help messages.
4661 With no arguments, print a list of commands with short help messages.
4662
4662
4663 Given a topic, extension, or command name, print help for that
4663 Given a topic, extension, or command name, print help for that
4664 topic.
4664 topic.
4665
4665
4666 Returns 0 if successful.
4666 Returns 0 if successful.
4667 """
4667 """
4668
4668
4669 textwidth = ui.configint('ui', 'textwidth', 78)
4669 textwidth = ui.configint('ui', 'textwidth', 78)
4670 termwidth = ui.termwidth() - 2
4670 termwidth = ui.termwidth() - 2
4671 if textwidth <= 0 or termwidth < textwidth:
4671 if textwidth <= 0 or termwidth < textwidth:
4672 textwidth = termwidth
4672 textwidth = termwidth
4673
4673
4674 keep = opts.get('system') or []
4674 keep = opts.get('system') or []
4675 if len(keep) == 0:
4675 if len(keep) == 0:
4676 if sys.platform.startswith('win'):
4676 if sys.platform.startswith('win'):
4677 keep.append('windows')
4677 keep.append('windows')
4678 elif sys.platform == 'OpenVMS':
4678 elif sys.platform == 'OpenVMS':
4679 keep.append('vms')
4679 keep.append('vms')
4680 elif sys.platform == 'plan9':
4680 elif sys.platform == 'plan9':
4681 keep.append('plan9')
4681 keep.append('plan9')
4682 else:
4682 else:
4683 keep.append('unix')
4683 keep.append('unix')
4684 keep.append(sys.platform.lower())
4684 keep.append(sys.platform.lower())
4685 if ui.verbose:
4685 if ui.verbose:
4686 keep.append('verbose')
4686 keep.append('verbose')
4687
4687
4688 section = None
4688 section = None
4689 subtopic = None
4689 subtopic = None
4690 if name and '.' in name:
4690 if name and '.' in name:
4691 name, remaining = name.split('.', 1)
4691 name, remaining = name.split('.', 1)
4692 remaining = encoding.lower(remaining)
4692 remaining = encoding.lower(remaining)
4693 if '.' in remaining:
4693 if '.' in remaining:
4694 subtopic, section = remaining.split('.', 1)
4694 subtopic, section = remaining.split('.', 1)
4695 else:
4695 else:
4696 if name in help.subtopics:
4696 if name in help.subtopics:
4697 subtopic = remaining
4697 subtopic = remaining
4698 else:
4698 else:
4699 section = remaining
4699 section = remaining
4700
4700
4701 text = help.help_(ui, name, subtopic=subtopic, **opts)
4701 text = help.help_(ui, name, subtopic=subtopic, **opts)
4702
4702
4703 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4703 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4704 section=section)
4704 section=section)
4705
4705
4706 # We could have been given a weird ".foo" section without a name
4706 # We could have been given a weird ".foo" section without a name
4707 # to look for, or we could have simply failed to found "foo.bar"
4707 # to look for, or we could have simply failed to found "foo.bar"
4708 # because bar isn't a section of foo
4708 # because bar isn't a section of foo
4709 if section and not (formatted and name):
4709 if section and not (formatted and name):
4710 raise error.Abort(_("help section not found"))
4710 raise error.Abort(_("help section not found"))
4711
4711
4712 if 'verbose' in pruned:
4712 if 'verbose' in pruned:
4713 keep.append('omitted')
4713 keep.append('omitted')
4714 else:
4714 else:
4715 keep.append('notomitted')
4715 keep.append('notomitted')
4716 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4716 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4717 section=section)
4717 section=section)
4718 ui.write(formatted)
4718 ui.write(formatted)
4719
4719
4720
4720
4721 @command('identify|id',
4721 @command('identify|id',
4722 [('r', 'rev', '',
4722 [('r', 'rev', '',
4723 _('identify the specified revision'), _('REV')),
4723 _('identify the specified revision'), _('REV')),
4724 ('n', 'num', None, _('show local revision number')),
4724 ('n', 'num', None, _('show local revision number')),
4725 ('i', 'id', None, _('show global revision id')),
4725 ('i', 'id', None, _('show global revision id')),
4726 ('b', 'branch', None, _('show branch')),
4726 ('b', 'branch', None, _('show branch')),
4727 ('t', 'tags', None, _('show tags')),
4727 ('t', 'tags', None, _('show tags')),
4728 ('B', 'bookmarks', None, _('show bookmarks')),
4728 ('B', 'bookmarks', None, _('show bookmarks')),
4729 ] + remoteopts,
4729 ] + remoteopts,
4730 _('[-nibtB] [-r REV] [SOURCE]'),
4730 _('[-nibtB] [-r REV] [SOURCE]'),
4731 optionalrepo=True)
4731 optionalrepo=True)
4732 def identify(ui, repo, source=None, rev=None,
4732 def identify(ui, repo, source=None, rev=None,
4733 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4733 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4734 """identify the working directory or specified revision
4734 """identify the working directory or specified revision
4735
4735
4736 Print a summary identifying the repository state at REV using one or
4736 Print a summary identifying the repository state at REV using one or
4737 two parent hash identifiers, followed by a "+" if the working
4737 two parent hash identifiers, followed by a "+" if the working
4738 directory has uncommitted changes, the branch name (if not default),
4738 directory has uncommitted changes, the branch name (if not default),
4739 a list of tags, and a list of bookmarks.
4739 a list of tags, and a list of bookmarks.
4740
4740
4741 When REV is not given, print a summary of the current state of the
4741 When REV is not given, print a summary of the current state of the
4742 repository.
4742 repository.
4743
4743
4744 Specifying a path to a repository root or Mercurial bundle will
4744 Specifying a path to a repository root or Mercurial bundle will
4745 cause lookup to operate on that repository/bundle.
4745 cause lookup to operate on that repository/bundle.
4746
4746
4747 .. container:: verbose
4747 .. container:: verbose
4748
4748
4749 Examples:
4749 Examples:
4750
4750
4751 - generate a build identifier for the working directory::
4751 - generate a build identifier for the working directory::
4752
4752
4753 hg id --id > build-id.dat
4753 hg id --id > build-id.dat
4754
4754
4755 - find the revision corresponding to a tag::
4755 - find the revision corresponding to a tag::
4756
4756
4757 hg id -n -r 1.3
4757 hg id -n -r 1.3
4758
4758
4759 - check the most recent revision of a remote repository::
4759 - check the most recent revision of a remote repository::
4760
4760
4761 hg id -r tip http://selenic.com/hg/
4761 hg id -r tip http://selenic.com/hg/
4762
4762
4763 See :hg:`log` for generating more information about specific revisions,
4763 See :hg:`log` for generating more information about specific revisions,
4764 including full hash identifiers.
4764 including full hash identifiers.
4765
4765
4766 Returns 0 if successful.
4766 Returns 0 if successful.
4767 """
4767 """
4768
4768
4769 if not repo and not source:
4769 if not repo and not source:
4770 raise error.Abort(_("there is no Mercurial repository here "
4770 raise error.Abort(_("there is no Mercurial repository here "
4771 "(.hg not found)"))
4771 "(.hg not found)"))
4772
4772
4773 if ui.debugflag:
4773 if ui.debugflag:
4774 hexfunc = hex
4774 hexfunc = hex
4775 else:
4775 else:
4776 hexfunc = short
4776 hexfunc = short
4777 default = not (num or id or branch or tags or bookmarks)
4777 default = not (num or id or branch or tags or bookmarks)
4778 output = []
4778 output = []
4779 revs = []
4779 revs = []
4780
4780
4781 if source:
4781 if source:
4782 source, branches = hg.parseurl(ui.expandpath(source))
4782 source, branches = hg.parseurl(ui.expandpath(source))
4783 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4783 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4784 repo = peer.local()
4784 repo = peer.local()
4785 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4785 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4786
4786
4787 if not repo:
4787 if not repo:
4788 if num or branch or tags:
4788 if num or branch or tags:
4789 raise error.Abort(
4789 raise error.Abort(
4790 _("can't query remote revision number, branch, or tags"))
4790 _("can't query remote revision number, branch, or tags"))
4791 if not rev and revs:
4791 if not rev and revs:
4792 rev = revs[0]
4792 rev = revs[0]
4793 if not rev:
4793 if not rev:
4794 rev = "tip"
4794 rev = "tip"
4795
4795
4796 remoterev = peer.lookup(rev)
4796 remoterev = peer.lookup(rev)
4797 if default or id:
4797 if default or id:
4798 output = [hexfunc(remoterev)]
4798 output = [hexfunc(remoterev)]
4799
4799
4800 def getbms():
4800 def getbms():
4801 bms = []
4801 bms = []
4802
4802
4803 if 'bookmarks' in peer.listkeys('namespaces'):
4803 if 'bookmarks' in peer.listkeys('namespaces'):
4804 hexremoterev = hex(remoterev)
4804 hexremoterev = hex(remoterev)
4805 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4805 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4806 if bmr == hexremoterev]
4806 if bmr == hexremoterev]
4807
4807
4808 return sorted(bms)
4808 return sorted(bms)
4809
4809
4810 if bookmarks:
4810 if bookmarks:
4811 output.extend(getbms())
4811 output.extend(getbms())
4812 elif default and not ui.quiet:
4812 elif default and not ui.quiet:
4813 # multiple bookmarks for a single parent separated by '/'
4813 # multiple bookmarks for a single parent separated by '/'
4814 bm = '/'.join(getbms())
4814 bm = '/'.join(getbms())
4815 if bm:
4815 if bm:
4816 output.append(bm)
4816 output.append(bm)
4817 else:
4817 else:
4818 ctx = scmutil.revsingle(repo, rev, None)
4818 ctx = scmutil.revsingle(repo, rev, None)
4819
4819
4820 if ctx.rev() is None:
4820 if ctx.rev() is None:
4821 ctx = repo[None]
4821 ctx = repo[None]
4822 parents = ctx.parents()
4822 parents = ctx.parents()
4823 taglist = []
4823 taglist = []
4824 for p in parents:
4824 for p in parents:
4825 taglist.extend(p.tags())
4825 taglist.extend(p.tags())
4826
4826
4827 changed = ""
4827 changed = ""
4828 if default or id or num:
4828 if default or id or num:
4829 if (any(repo.status())
4829 if (any(repo.status())
4830 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4830 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4831 changed = '+'
4831 changed = '+'
4832 if default or id:
4832 if default or id:
4833 output = ["%s%s" %
4833 output = ["%s%s" %
4834 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4834 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4835 if num:
4835 if num:
4836 output.append("%s%s" %
4836 output.append("%s%s" %
4837 ('+'.join([str(p.rev()) for p in parents]), changed))
4837 ('+'.join([str(p.rev()) for p in parents]), changed))
4838 else:
4838 else:
4839 if default or id:
4839 if default or id:
4840 output = [hexfunc(ctx.node())]
4840 output = [hexfunc(ctx.node())]
4841 if num:
4841 if num:
4842 output.append(str(ctx.rev()))
4842 output.append(str(ctx.rev()))
4843 taglist = ctx.tags()
4843 taglist = ctx.tags()
4844
4844
4845 if default and not ui.quiet:
4845 if default and not ui.quiet:
4846 b = ctx.branch()
4846 b = ctx.branch()
4847 if b != 'default':
4847 if b != 'default':
4848 output.append("(%s)" % b)
4848 output.append("(%s)" % b)
4849
4849
4850 # multiple tags for a single parent separated by '/'
4850 # multiple tags for a single parent separated by '/'
4851 t = '/'.join(taglist)
4851 t = '/'.join(taglist)
4852 if t:
4852 if t:
4853 output.append(t)
4853 output.append(t)
4854
4854
4855 # multiple bookmarks for a single parent separated by '/'
4855 # multiple bookmarks for a single parent separated by '/'
4856 bm = '/'.join(ctx.bookmarks())
4856 bm = '/'.join(ctx.bookmarks())
4857 if bm:
4857 if bm:
4858 output.append(bm)
4858 output.append(bm)
4859 else:
4859 else:
4860 if branch:
4860 if branch:
4861 output.append(ctx.branch())
4861 output.append(ctx.branch())
4862
4862
4863 if tags:
4863 if tags:
4864 output.extend(taglist)
4864 output.extend(taglist)
4865
4865
4866 if bookmarks:
4866 if bookmarks:
4867 output.extend(ctx.bookmarks())
4867 output.extend(ctx.bookmarks())
4868
4868
4869 ui.write("%s\n" % ' '.join(output))
4869 ui.write("%s\n" % ' '.join(output))
4870
4870
4871 @command('import|patch',
4871 @command('import|patch',
4872 [('p', 'strip', 1,
4872 [('p', 'strip', 1,
4873 _('directory strip option for patch. This has the same '
4873 _('directory strip option for patch. This has the same '
4874 'meaning as the corresponding patch option'), _('NUM')),
4874 'meaning as the corresponding patch option'), _('NUM')),
4875 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4875 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4876 ('e', 'edit', False, _('invoke editor on commit messages')),
4876 ('e', 'edit', False, _('invoke editor on commit messages')),
4877 ('f', 'force', None,
4877 ('f', 'force', None,
4878 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4878 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4879 ('', 'no-commit', None,
4879 ('', 'no-commit', None,
4880 _("don't commit, just update the working directory")),
4880 _("don't commit, just update the working directory")),
4881 ('', 'bypass', None,
4881 ('', 'bypass', None,
4882 _("apply patch without touching the working directory")),
4882 _("apply patch without touching the working directory")),
4883 ('', 'partial', None,
4883 ('', 'partial', None,
4884 _('commit even if some hunks fail')),
4884 _('commit even if some hunks fail')),
4885 ('', 'exact', None,
4885 ('', 'exact', None,
4886 _('abort if patch would apply lossily')),
4886 _('abort if patch would apply lossily')),
4887 ('', 'prefix', '',
4887 ('', 'prefix', '',
4888 _('apply patch to subdirectory'), _('DIR')),
4888 _('apply patch to subdirectory'), _('DIR')),
4889 ('', 'import-branch', None,
4889 ('', 'import-branch', None,
4890 _('use any branch information in patch (implied by --exact)'))] +
4890 _('use any branch information in patch (implied by --exact)'))] +
4891 commitopts + commitopts2 + similarityopts,
4891 commitopts + commitopts2 + similarityopts,
4892 _('[OPTION]... PATCH...'))
4892 _('[OPTION]... PATCH...'))
4893 def import_(ui, repo, patch1=None, *patches, **opts):
4893 def import_(ui, repo, patch1=None, *patches, **opts):
4894 """import an ordered set of patches
4894 """import an ordered set of patches
4895
4895
4896 Import a list of patches and commit them individually (unless
4896 Import a list of patches and commit them individually (unless
4897 --no-commit is specified).
4897 --no-commit is specified).
4898
4898
4899 To read a patch from standard input, use "-" as the patch name. If
4899 To read a patch from standard input, use "-" as the patch name. If
4900 a URL is specified, the patch will be downloaded from there.
4900 a URL is specified, the patch will be downloaded from there.
4901
4901
4902 Import first applies changes to the working directory (unless
4902 Import first applies changes to the working directory (unless
4903 --bypass is specified), import will abort if there are outstanding
4903 --bypass is specified), import will abort if there are outstanding
4904 changes.
4904 changes.
4905
4905
4906 Use --bypass to apply and commit patches directly to the
4906 Use --bypass to apply and commit patches directly to the
4907 repository, without affecting the working directory. Without
4907 repository, without affecting the working directory. Without
4908 --exact, patches will be applied on top of the working directory
4908 --exact, patches will be applied on top of the working directory
4909 parent revision.
4909 parent revision.
4910
4910
4911 You can import a patch straight from a mail message. Even patches
4911 You can import a patch straight from a mail message. Even patches
4912 as attachments work (to use the body part, it must have type
4912 as attachments work (to use the body part, it must have type
4913 text/plain or text/x-patch). From and Subject headers of email
4913 text/plain or text/x-patch). From and Subject headers of email
4914 message are used as default committer and commit message. All
4914 message are used as default committer and commit message. All
4915 text/plain body parts before first diff are added to the commit
4915 text/plain body parts before first diff are added to the commit
4916 message.
4916 message.
4917
4917
4918 If the imported patch was generated by :hg:`export`, user and
4918 If the imported patch was generated by :hg:`export`, user and
4919 description from patch override values from message headers and
4919 description from patch override values from message headers and
4920 body. Values given on command line with -m/--message and -u/--user
4920 body. Values given on command line with -m/--message and -u/--user
4921 override these.
4921 override these.
4922
4922
4923 If --exact is specified, import will set the working directory to
4923 If --exact is specified, import will set the working directory to
4924 the parent of each patch before applying it, and will abort if the
4924 the parent of each patch before applying it, and will abort if the
4925 resulting changeset has a different ID than the one recorded in
4925 resulting changeset has a different ID than the one recorded in
4926 the patch. This will guard against various ways that portable
4926 the patch. This will guard against various ways that portable
4927 patch formats and mail systems might fail to transfer Mercurial
4927 patch formats and mail systems might fail to transfer Mercurial
4928 data or metadata. See :hg:`bundle` for lossless transmission.
4928 data or metadata. See :hg:`bundle` for lossless transmission.
4929
4929
4930 Use --partial to ensure a changeset will be created from the patch
4930 Use --partial to ensure a changeset will be created from the patch
4931 even if some hunks fail to apply. Hunks that fail to apply will be
4931 even if some hunks fail to apply. Hunks that fail to apply will be
4932 written to a <target-file>.rej file. Conflicts can then be resolved
4932 written to a <target-file>.rej file. Conflicts can then be resolved
4933 by hand before :hg:`commit --amend` is run to update the created
4933 by hand before :hg:`commit --amend` is run to update the created
4934 changeset. This flag exists to let people import patches that
4934 changeset. This flag exists to let people import patches that
4935 partially apply without losing the associated metadata (author,
4935 partially apply without losing the associated metadata (author,
4936 date, description, ...).
4936 date, description, ...).
4937
4937
4938 .. note::
4938 .. note::
4939
4939
4940 When no hunks apply cleanly, :hg:`import --partial` will create
4940 When no hunks apply cleanly, :hg:`import --partial` will create
4941 an empty changeset, importing only the patch metadata.
4941 an empty changeset, importing only the patch metadata.
4942
4942
4943 With -s/--similarity, hg will attempt to discover renames and
4943 With -s/--similarity, hg will attempt to discover renames and
4944 copies in the patch in the same way as :hg:`addremove`.
4944 copies in the patch in the same way as :hg:`addremove`.
4945
4945
4946 It is possible to use external patch programs to perform the patch
4946 It is possible to use external patch programs to perform the patch
4947 by setting the ``ui.patch`` configuration option. For the default
4947 by setting the ``ui.patch`` configuration option. For the default
4948 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4948 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4949 See :hg:`help config` for more information about configuration
4949 See :hg:`help config` for more information about configuration
4950 files and how to use these options.
4950 files and how to use these options.
4951
4951
4952 See :hg:`help dates` for a list of formats valid for -d/--date.
4952 See :hg:`help dates` for a list of formats valid for -d/--date.
4953
4953
4954 .. container:: verbose
4954 .. container:: verbose
4955
4955
4956 Examples:
4956 Examples:
4957
4957
4958 - import a traditional patch from a website and detect renames::
4958 - import a traditional patch from a website and detect renames::
4959
4959
4960 hg import -s 80 http://example.com/bugfix.patch
4960 hg import -s 80 http://example.com/bugfix.patch
4961
4961
4962 - import a changeset from an hgweb server::
4962 - import a changeset from an hgweb server::
4963
4963
4964 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4964 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4965
4965
4966 - import all the patches in an Unix-style mbox::
4966 - import all the patches in an Unix-style mbox::
4967
4967
4968 hg import incoming-patches.mbox
4968 hg import incoming-patches.mbox
4969
4969
4970 - attempt to exactly restore an exported changeset (not always
4970 - attempt to exactly restore an exported changeset (not always
4971 possible)::
4971 possible)::
4972
4972
4973 hg import --exact proposed-fix.patch
4973 hg import --exact proposed-fix.patch
4974
4974
4975 - use an external tool to apply a patch which is too fuzzy for
4975 - use an external tool to apply a patch which is too fuzzy for
4976 the default internal tool.
4976 the default internal tool.
4977
4977
4978 hg import --config ui.patch="patch --merge" fuzzy.patch
4978 hg import --config ui.patch="patch --merge" fuzzy.patch
4979
4979
4980 - change the default fuzzing from 2 to a less strict 7
4980 - change the default fuzzing from 2 to a less strict 7
4981
4981
4982 hg import --config ui.fuzz=7 fuzz.patch
4982 hg import --config ui.fuzz=7 fuzz.patch
4983
4983
4984 Returns 0 on success, 1 on partial success (see --partial).
4984 Returns 0 on success, 1 on partial success (see --partial).
4985 """
4985 """
4986
4986
4987 if not patch1:
4987 if not patch1:
4988 raise error.Abort(_('need at least one patch to import'))
4988 raise error.Abort(_('need at least one patch to import'))
4989
4989
4990 patches = (patch1,) + patches
4990 patches = (patch1,) + patches
4991
4991
4992 date = opts.get('date')
4992 date = opts.get('date')
4993 if date:
4993 if date:
4994 opts['date'] = util.parsedate(date)
4994 opts['date'] = util.parsedate(date)
4995
4995
4996 exact = opts.get('exact')
4996 exact = opts.get('exact')
4997 update = not opts.get('bypass')
4997 update = not opts.get('bypass')
4998 if not update and opts.get('no_commit'):
4998 if not update and opts.get('no_commit'):
4999 raise error.Abort(_('cannot use --no-commit with --bypass'))
4999 raise error.Abort(_('cannot use --no-commit with --bypass'))
5000 try:
5000 try:
5001 sim = float(opts.get('similarity') or 0)
5001 sim = float(opts.get('similarity') or 0)
5002 except ValueError:
5002 except ValueError:
5003 raise error.Abort(_('similarity must be a number'))
5003 raise error.Abort(_('similarity must be a number'))
5004 if sim < 0 or sim > 100:
5004 if sim < 0 or sim > 100:
5005 raise error.Abort(_('similarity must be between 0 and 100'))
5005 raise error.Abort(_('similarity must be between 0 and 100'))
5006 if sim and not update:
5006 if sim and not update:
5007 raise error.Abort(_('cannot use --similarity with --bypass'))
5007 raise error.Abort(_('cannot use --similarity with --bypass'))
5008 if exact:
5008 if exact:
5009 if opts.get('edit'):
5009 if opts.get('edit'):
5010 raise error.Abort(_('cannot use --exact with --edit'))
5010 raise error.Abort(_('cannot use --exact with --edit'))
5011 if opts.get('prefix'):
5011 if opts.get('prefix'):
5012 raise error.Abort(_('cannot use --exact with --prefix'))
5012 raise error.Abort(_('cannot use --exact with --prefix'))
5013
5013
5014 base = opts["base"]
5014 base = opts["base"]
5015 wlock = dsguard = lock = tr = None
5015 wlock = dsguard = lock = tr = None
5016 msgs = []
5016 msgs = []
5017 ret = 0
5017 ret = 0
5018
5018
5019
5019
5020 try:
5020 try:
5021 wlock = repo.wlock()
5021 wlock = repo.wlock()
5022
5022
5023 if update:
5023 if update:
5024 cmdutil.checkunfinished(repo)
5024 cmdutil.checkunfinished(repo)
5025 if (exact or not opts.get('force')):
5025 if (exact or not opts.get('force')):
5026 cmdutil.bailifchanged(repo)
5026 cmdutil.bailifchanged(repo)
5027
5027
5028 if not opts.get('no_commit'):
5028 if not opts.get('no_commit'):
5029 lock = repo.lock()
5029 lock = repo.lock()
5030 tr = repo.transaction('import')
5030 tr = repo.transaction('import')
5031 else:
5031 else:
5032 dsguard = cmdutil.dirstateguard(repo, 'import')
5032 dsguard = cmdutil.dirstateguard(repo, 'import')
5033 parents = repo[None].parents()
5033 parents = repo[None].parents()
5034 for patchurl in patches:
5034 for patchurl in patches:
5035 if patchurl == '-':
5035 if patchurl == '-':
5036 ui.status(_('applying patch from stdin\n'))
5036 ui.status(_('applying patch from stdin\n'))
5037 patchfile = ui.fin
5037 patchfile = ui.fin
5038 patchurl = 'stdin' # for error message
5038 patchurl = 'stdin' # for error message
5039 else:
5039 else:
5040 patchurl = os.path.join(base, patchurl)
5040 patchurl = os.path.join(base, patchurl)
5041 ui.status(_('applying %s\n') % patchurl)
5041 ui.status(_('applying %s\n') % patchurl)
5042 patchfile = hg.openpath(ui, patchurl)
5042 patchfile = hg.openpath(ui, patchurl)
5043
5043
5044 haspatch = False
5044 haspatch = False
5045 for hunk in patch.split(patchfile):
5045 for hunk in patch.split(patchfile):
5046 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
5046 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
5047 parents, opts,
5047 parents, opts,
5048 msgs, hg.clean)
5048 msgs, hg.clean)
5049 if msg:
5049 if msg:
5050 haspatch = True
5050 haspatch = True
5051 ui.note(msg + '\n')
5051 ui.note(msg + '\n')
5052 if update or exact:
5052 if update or exact:
5053 parents = repo[None].parents()
5053 parents = repo[None].parents()
5054 else:
5054 else:
5055 parents = [repo[node]]
5055 parents = [repo[node]]
5056 if rej:
5056 if rej:
5057 ui.write_err(_("patch applied partially\n"))
5057 ui.write_err(_("patch applied partially\n"))
5058 ui.write_err(_("(fix the .rej files and run "
5058 ui.write_err(_("(fix the .rej files and run "
5059 "`hg commit --amend`)\n"))
5059 "`hg commit --amend`)\n"))
5060 ret = 1
5060 ret = 1
5061 break
5061 break
5062
5062
5063 if not haspatch:
5063 if not haspatch:
5064 raise error.Abort(_('%s: no diffs found') % patchurl)
5064 raise error.Abort(_('%s: no diffs found') % patchurl)
5065
5065
5066 if tr:
5066 if tr:
5067 tr.close()
5067 tr.close()
5068 if msgs:
5068 if msgs:
5069 repo.savecommitmessage('\n* * *\n'.join(msgs))
5069 repo.savecommitmessage('\n* * *\n'.join(msgs))
5070 if dsguard:
5070 if dsguard:
5071 dsguard.close()
5071 dsguard.close()
5072 return ret
5072 return ret
5073 finally:
5073 finally:
5074 if tr:
5074 if tr:
5075 tr.release()
5075 tr.release()
5076 release(lock, dsguard, wlock)
5076 release(lock, dsguard, wlock)
5077
5077
5078 @command('incoming|in',
5078 @command('incoming|in',
5079 [('f', 'force', None,
5079 [('f', 'force', None,
5080 _('run even if remote repository is unrelated')),
5080 _('run even if remote repository is unrelated')),
5081 ('n', 'newest-first', None, _('show newest record first')),
5081 ('n', 'newest-first', None, _('show newest record first')),
5082 ('', 'bundle', '',
5082 ('', 'bundle', '',
5083 _('file to store the bundles into'), _('FILE')),
5083 _('file to store the bundles into'), _('FILE')),
5084 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5084 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5085 ('B', 'bookmarks', False, _("compare bookmarks")),
5085 ('B', 'bookmarks', False, _("compare bookmarks")),
5086 ('b', 'branch', [],
5086 ('b', 'branch', [],
5087 _('a specific branch you would like to pull'), _('BRANCH')),
5087 _('a specific branch you would like to pull'), _('BRANCH')),
5088 ] + logopts + remoteopts + subrepoopts,
5088 ] + logopts + remoteopts + subrepoopts,
5089 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
5089 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
5090 def incoming(ui, repo, source="default", **opts):
5090 def incoming(ui, repo, source="default", **opts):
5091 """show new changesets found in source
5091 """show new changesets found in source
5092
5092
5093 Show new changesets found in the specified path/URL or the default
5093 Show new changesets found in the specified path/URL or the default
5094 pull location. These are the changesets that would have been pulled
5094 pull location. These are the changesets that would have been pulled
5095 if a pull at the time you issued this command.
5095 if a pull at the time you issued this command.
5096
5096
5097 See pull for valid source format details.
5097 See pull for valid source format details.
5098
5098
5099 .. container:: verbose
5099 .. container:: verbose
5100
5100
5101 With -B/--bookmarks, the result of bookmark comparison between
5101 With -B/--bookmarks, the result of bookmark comparison between
5102 local and remote repositories is displayed. With -v/--verbose,
5102 local and remote repositories is displayed. With -v/--verbose,
5103 status is also displayed for each bookmark like below::
5103 status is also displayed for each bookmark like below::
5104
5104
5105 BM1 01234567890a added
5105 BM1 01234567890a added
5106 BM2 1234567890ab advanced
5106 BM2 1234567890ab advanced
5107 BM3 234567890abc diverged
5107 BM3 234567890abc diverged
5108 BM4 34567890abcd changed
5108 BM4 34567890abcd changed
5109
5109
5110 The action taken locally when pulling depends on the
5110 The action taken locally when pulling depends on the
5111 status of each bookmark:
5111 status of each bookmark:
5112
5112
5113 :``added``: pull will create it
5113 :``added``: pull will create it
5114 :``advanced``: pull will update it
5114 :``advanced``: pull will update it
5115 :``diverged``: pull will create a divergent bookmark
5115 :``diverged``: pull will create a divergent bookmark
5116 :``changed``: result depends on remote changesets
5116 :``changed``: result depends on remote changesets
5117
5117
5118 From the point of view of pulling behavior, bookmark
5118 From the point of view of pulling behavior, bookmark
5119 existing only in the remote repository are treated as ``added``,
5119 existing only in the remote repository are treated as ``added``,
5120 even if it is in fact locally deleted.
5120 even if it is in fact locally deleted.
5121
5121
5122 .. container:: verbose
5122 .. container:: verbose
5123
5123
5124 For remote repository, using --bundle avoids downloading the
5124 For remote repository, using --bundle avoids downloading the
5125 changesets twice if the incoming is followed by a pull.
5125 changesets twice if the incoming is followed by a pull.
5126
5126
5127 Examples:
5127 Examples:
5128
5128
5129 - show incoming changes with patches and full description::
5129 - show incoming changes with patches and full description::
5130
5130
5131 hg incoming -vp
5131 hg incoming -vp
5132
5132
5133 - show incoming changes excluding merges, store a bundle::
5133 - show incoming changes excluding merges, store a bundle::
5134
5134
5135 hg in -vpM --bundle incoming.hg
5135 hg in -vpM --bundle incoming.hg
5136 hg pull incoming.hg
5136 hg pull incoming.hg
5137
5137
5138 - briefly list changes inside a bundle::
5138 - briefly list changes inside a bundle::
5139
5139
5140 hg in changes.hg -T "{desc|firstline}\\n"
5140 hg in changes.hg -T "{desc|firstline}\\n"
5141
5141
5142 Returns 0 if there are incoming changes, 1 otherwise.
5142 Returns 0 if there are incoming changes, 1 otherwise.
5143 """
5143 """
5144 if opts.get('graph'):
5144 if opts.get('graph'):
5145 cmdutil.checkunsupportedgraphflags([], opts)
5145 cmdutil.checkunsupportedgraphflags([], opts)
5146 def display(other, chlist, displayer):
5146 def display(other, chlist, displayer):
5147 revdag = cmdutil.graphrevs(other, chlist, opts)
5147 revdag = cmdutil.graphrevs(other, chlist, opts)
5148 cmdutil.displaygraph(ui, repo, revdag, displayer,
5148 cmdutil.displaygraph(ui, repo, revdag, displayer,
5149 graphmod.asciiedges)
5149 graphmod.asciiedges)
5150
5150
5151 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
5151 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
5152 return 0
5152 return 0
5153
5153
5154 if opts.get('bundle') and opts.get('subrepos'):
5154 if opts.get('bundle') and opts.get('subrepos'):
5155 raise error.Abort(_('cannot combine --bundle and --subrepos'))
5155 raise error.Abort(_('cannot combine --bundle and --subrepos'))
5156
5156
5157 if opts.get('bookmarks'):
5157 if opts.get('bookmarks'):
5158 source, branches = hg.parseurl(ui.expandpath(source),
5158 source, branches = hg.parseurl(ui.expandpath(source),
5159 opts.get('branch'))
5159 opts.get('branch'))
5160 other = hg.peer(repo, opts, source)
5160 other = hg.peer(repo, opts, source)
5161 if 'bookmarks' not in other.listkeys('namespaces'):
5161 if 'bookmarks' not in other.listkeys('namespaces'):
5162 ui.warn(_("remote doesn't support bookmarks\n"))
5162 ui.warn(_("remote doesn't support bookmarks\n"))
5163 return 0
5163 return 0
5164 ui.status(_('comparing with %s\n') % util.hidepassword(source))
5164 ui.status(_('comparing with %s\n') % util.hidepassword(source))
5165 return bookmarks.incoming(ui, repo, other)
5165 return bookmarks.incoming(ui, repo, other)
5166
5166
5167 repo._subtoppath = ui.expandpath(source)
5167 repo._subtoppath = ui.expandpath(source)
5168 try:
5168 try:
5169 return hg.incoming(ui, repo, source, opts)
5169 return hg.incoming(ui, repo, source, opts)
5170 finally:
5170 finally:
5171 del repo._subtoppath
5171 del repo._subtoppath
5172
5172
5173
5173
5174 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
5174 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
5175 norepo=True)
5175 norepo=True)
5176 def init(ui, dest=".", **opts):
5176 def init(ui, dest=".", **opts):
5177 """create a new repository in the given directory
5177 """create a new repository in the given directory
5178
5178
5179 Initialize a new repository in the given directory. If the given
5179 Initialize a new repository in the given directory. If the given
5180 directory does not exist, it will be created.
5180 directory does not exist, it will be created.
5181
5181
5182 If no directory is given, the current directory is used.
5182 If no directory is given, the current directory is used.
5183
5183
5184 It is possible to specify an ``ssh://`` URL as the destination.
5184 It is possible to specify an ``ssh://`` URL as the destination.
5185 See :hg:`help urls` for more information.
5185 See :hg:`help urls` for more information.
5186
5186
5187 Returns 0 on success.
5187 Returns 0 on success.
5188 """
5188 """
5189 hg.peer(ui, opts, ui.expandpath(dest), create=True)
5189 hg.peer(ui, opts, ui.expandpath(dest), create=True)
5190
5190
5191 @command('locate',
5191 @command('locate',
5192 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
5192 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
5193 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5193 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5194 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
5194 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
5195 ] + walkopts,
5195 ] + walkopts,
5196 _('[OPTION]... [PATTERN]...'))
5196 _('[OPTION]... [PATTERN]...'))
5197 def locate(ui, repo, *pats, **opts):
5197 def locate(ui, repo, *pats, **opts):
5198 """locate files matching specific patterns (DEPRECATED)
5198 """locate files matching specific patterns (DEPRECATED)
5199
5199
5200 Print files under Mercurial control in the working directory whose
5200 Print files under Mercurial control in the working directory whose
5201 names match the given patterns.
5201 names match the given patterns.
5202
5202
5203 By default, this command searches all directories in the working
5203 By default, this command searches all directories in the working
5204 directory. To search just the current directory and its
5204 directory. To search just the current directory and its
5205 subdirectories, use "--include .".
5205 subdirectories, use "--include .".
5206
5206
5207 If no patterns are given to match, this command prints the names
5207 If no patterns are given to match, this command prints the names
5208 of all files under Mercurial control in the working directory.
5208 of all files under Mercurial control in the working directory.
5209
5209
5210 If you want to feed the output of this command into the "xargs"
5210 If you want to feed the output of this command into the "xargs"
5211 command, use the -0 option to both this command and "xargs". This
5211 command, use the -0 option to both this command and "xargs". This
5212 will avoid the problem of "xargs" treating single filenames that
5212 will avoid the problem of "xargs" treating single filenames that
5213 contain whitespace as multiple filenames.
5213 contain whitespace as multiple filenames.
5214
5214
5215 See :hg:`help files` for a more versatile command.
5215 See :hg:`help files` for a more versatile command.
5216
5216
5217 Returns 0 if a match is found, 1 otherwise.
5217 Returns 0 if a match is found, 1 otherwise.
5218 """
5218 """
5219 if opts.get('print0'):
5219 if opts.get('print0'):
5220 end = '\0'
5220 end = '\0'
5221 else:
5221 else:
5222 end = '\n'
5222 end = '\n'
5223 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
5223 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
5224
5224
5225 ret = 1
5225 ret = 1
5226 ctx = repo[rev]
5226 ctx = repo[rev]
5227 m = scmutil.match(ctx, pats, opts, default='relglob',
5227 m = scmutil.match(ctx, pats, opts, default='relglob',
5228 badfn=lambda x, y: False)
5228 badfn=lambda x, y: False)
5229
5229
5230 for abs in ctx.matches(m):
5230 for abs in ctx.matches(m):
5231 if opts.get('fullpath'):
5231 if opts.get('fullpath'):
5232 ui.write(repo.wjoin(abs), end)
5232 ui.write(repo.wjoin(abs), end)
5233 else:
5233 else:
5234 ui.write(((pats and m.rel(abs)) or abs), end)
5234 ui.write(((pats and m.rel(abs)) or abs), end)
5235 ret = 0
5235 ret = 0
5236
5236
5237 return ret
5237 return ret
5238
5238
5239 @command('^log|history',
5239 @command('^log|history',
5240 [('f', 'follow', None,
5240 [('f', 'follow', None,
5241 _('follow changeset history, or file history across copies and renames')),
5241 _('follow changeset history, or file history across copies and renames')),
5242 ('', 'follow-first', None,
5242 ('', 'follow-first', None,
5243 _('only follow the first parent of merge changesets (DEPRECATED)')),
5243 _('only follow the first parent of merge changesets (DEPRECATED)')),
5244 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
5244 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
5245 ('C', 'copies', None, _('show copied files')),
5245 ('C', 'copies', None, _('show copied files')),
5246 ('k', 'keyword', [],
5246 ('k', 'keyword', [],
5247 _('do case-insensitive search for a given text'), _('TEXT')),
5247 _('do case-insensitive search for a given text'), _('TEXT')),
5248 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
5248 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
5249 ('', 'removed', None, _('include revisions where files were removed')),
5249 ('', 'removed', None, _('include revisions where files were removed')),
5250 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
5250 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
5251 ('u', 'user', [], _('revisions committed by user'), _('USER')),
5251 ('u', 'user', [], _('revisions committed by user'), _('USER')),
5252 ('', 'only-branch', [],
5252 ('', 'only-branch', [],
5253 _('show only changesets within the given named branch (DEPRECATED)'),
5253 _('show only changesets within the given named branch (DEPRECATED)'),
5254 _('BRANCH')),
5254 _('BRANCH')),
5255 ('b', 'branch', [],
5255 ('b', 'branch', [],
5256 _('show changesets within the given named branch'), _('BRANCH')),
5256 _('show changesets within the given named branch'), _('BRANCH')),
5257 ('P', 'prune', [],
5257 ('P', 'prune', [],
5258 _('do not display revision or any of its ancestors'), _('REV')),
5258 _('do not display revision or any of its ancestors'), _('REV')),
5259 ] + logopts + walkopts,
5259 ] + logopts + walkopts,
5260 _('[OPTION]... [FILE]'),
5260 _('[OPTION]... [FILE]'),
5261 inferrepo=True)
5261 inferrepo=True)
5262 def log(ui, repo, *pats, **opts):
5262 def log(ui, repo, *pats, **opts):
5263 """show revision history of entire repository or files
5263 """show revision history of entire repository or files
5264
5264
5265 Print the revision history of the specified files or the entire
5265 Print the revision history of the specified files or the entire
5266 project.
5266 project.
5267
5267
5268 If no revision range is specified, the default is ``tip:0`` unless
5268 If no revision range is specified, the default is ``tip:0`` unless
5269 --follow is set, in which case the working directory parent is
5269 --follow is set, in which case the working directory parent is
5270 used as the starting revision.
5270 used as the starting revision.
5271
5271
5272 File history is shown without following rename or copy history of
5272 File history is shown without following rename or copy history of
5273 files. Use -f/--follow with a filename to follow history across
5273 files. Use -f/--follow with a filename to follow history across
5274 renames and copies. --follow without a filename will only show
5274 renames and copies. --follow without a filename will only show
5275 ancestors or descendants of the starting revision.
5275 ancestors or descendants of the starting revision.
5276
5276
5277 By default this command prints revision number and changeset id,
5277 By default this command prints revision number and changeset id,
5278 tags, non-trivial parents, user, date and time, and a summary for
5278 tags, non-trivial parents, user, date and time, and a summary for
5279 each commit. When the -v/--verbose switch is used, the list of
5279 each commit. When the -v/--verbose switch is used, the list of
5280 changed files and full commit message are shown.
5280 changed files and full commit message are shown.
5281
5281
5282 With --graph the revisions are shown as an ASCII art DAG with the most
5282 With --graph the revisions are shown as an ASCII art DAG with the most
5283 recent changeset at the top.
5283 recent changeset at the top.
5284 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
5284 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
5285 and '+' represents a fork where the changeset from the lines below is a
5285 and '+' represents a fork where the changeset from the lines below is a
5286 parent of the 'o' merge on the same line.
5286 parent of the 'o' merge on the same line.
5287
5287
5288 .. note::
5288 .. note::
5289
5289
5290 :hg:`log --patch` may generate unexpected diff output for merge
5290 :hg:`log --patch` may generate unexpected diff output for merge
5291 changesets, as it will only compare the merge changeset against
5291 changesets, as it will only compare the merge changeset against
5292 its first parent. Also, only files different from BOTH parents
5292 its first parent. Also, only files different from BOTH parents
5293 will appear in files:.
5293 will appear in files:.
5294
5294
5295 .. note::
5295 .. note::
5296
5296
5297 For performance reasons, :hg:`log FILE` may omit duplicate changes
5297 For performance reasons, :hg:`log FILE` may omit duplicate changes
5298 made on branches and will not show removals or mode changes. To
5298 made on branches and will not show removals or mode changes. To
5299 see all such changes, use the --removed switch.
5299 see all such changes, use the --removed switch.
5300
5300
5301 .. container:: verbose
5301 .. container:: verbose
5302
5302
5303 Some examples:
5303 Some examples:
5304
5304
5305 - changesets with full descriptions and file lists::
5305 - changesets with full descriptions and file lists::
5306
5306
5307 hg log -v
5307 hg log -v
5308
5308
5309 - changesets ancestral to the working directory::
5309 - changesets ancestral to the working directory::
5310
5310
5311 hg log -f
5311 hg log -f
5312
5312
5313 - last 10 commits on the current branch::
5313 - last 10 commits on the current branch::
5314
5314
5315 hg log -l 10 -b .
5315 hg log -l 10 -b .
5316
5316
5317 - changesets showing all modifications of a file, including removals::
5317 - changesets showing all modifications of a file, including removals::
5318
5318
5319 hg log --removed file.c
5319 hg log --removed file.c
5320
5320
5321 - all changesets that touch a directory, with diffs, excluding merges::
5321 - all changesets that touch a directory, with diffs, excluding merges::
5322
5322
5323 hg log -Mp lib/
5323 hg log -Mp lib/
5324
5324
5325 - all revision numbers that match a keyword::
5325 - all revision numbers that match a keyword::
5326
5326
5327 hg log -k bug --template "{rev}\\n"
5327 hg log -k bug --template "{rev}\\n"
5328
5328
5329 - the full hash identifier of the working directory parent::
5329 - the full hash identifier of the working directory parent::
5330
5330
5331 hg log -r . --template "{node}\\n"
5331 hg log -r . --template "{node}\\n"
5332
5332
5333 - list available log templates::
5333 - list available log templates::
5334
5334
5335 hg log -T list
5335 hg log -T list
5336
5336
5337 - check if a given changeset is included in a tagged release::
5337 - check if a given changeset is included in a tagged release::
5338
5338
5339 hg log -r "a21ccf and ancestor(1.9)"
5339 hg log -r "a21ccf and ancestor(1.9)"
5340
5340
5341 - find all changesets by some user in a date range::
5341 - find all changesets by some user in a date range::
5342
5342
5343 hg log -k alice -d "may 2008 to jul 2008"
5343 hg log -k alice -d "may 2008 to jul 2008"
5344
5344
5345 - summary of all changesets after the last tag::
5345 - summary of all changesets after the last tag::
5346
5346
5347 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5347 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5348
5348
5349 See :hg:`help dates` for a list of formats valid for -d/--date.
5349 See :hg:`help dates` for a list of formats valid for -d/--date.
5350
5350
5351 See :hg:`help revisions` and :hg:`help revsets` for more about
5351 See :hg:`help revisions` and :hg:`help revsets` for more about
5352 specifying and ordering revisions.
5352 specifying and ordering revisions.
5353
5353
5354 See :hg:`help templates` for more about pre-packaged styles and
5354 See :hg:`help templates` for more about pre-packaged styles and
5355 specifying custom templates.
5355 specifying custom templates.
5356
5356
5357 Returns 0 on success.
5357 Returns 0 on success.
5358
5358
5359 """
5359 """
5360 if opts.get('follow') and opts.get('rev'):
5360 if opts.get('follow') and opts.get('rev'):
5361 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5361 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5362 del opts['follow']
5362 del opts['follow']
5363
5363
5364 if opts.get('graph'):
5364 if opts.get('graph'):
5365 return cmdutil.graphlog(ui, repo, *pats, **opts)
5365 return cmdutil.graphlog(ui, repo, *pats, **opts)
5366
5366
5367 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5367 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5368 limit = cmdutil.loglimit(opts)
5368 limit = cmdutil.loglimit(opts)
5369 count = 0
5369 count = 0
5370
5370
5371 getrenamed = None
5371 getrenamed = None
5372 if opts.get('copies'):
5372 if opts.get('copies'):
5373 endrev = None
5373 endrev = None
5374 if opts.get('rev'):
5374 if opts.get('rev'):
5375 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5375 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5376 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5376 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5377
5377
5378 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5378 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5379 for rev in revs:
5379 for rev in revs:
5380 if count == limit:
5380 if count == limit:
5381 break
5381 break
5382 ctx = repo[rev]
5382 ctx = repo[rev]
5383 copies = None
5383 copies = None
5384 if getrenamed is not None and rev:
5384 if getrenamed is not None and rev:
5385 copies = []
5385 copies = []
5386 for fn in ctx.files():
5386 for fn in ctx.files():
5387 rename = getrenamed(fn, rev)
5387 rename = getrenamed(fn, rev)
5388 if rename:
5388 if rename:
5389 copies.append((fn, rename[0]))
5389 copies.append((fn, rename[0]))
5390 if filematcher:
5390 if filematcher:
5391 revmatchfn = filematcher(ctx.rev())
5391 revmatchfn = filematcher(ctx.rev())
5392 else:
5392 else:
5393 revmatchfn = None
5393 revmatchfn = None
5394 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5394 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5395 if displayer.flush(ctx):
5395 if displayer.flush(ctx):
5396 count += 1
5396 count += 1
5397
5397
5398 displayer.close()
5398 displayer.close()
5399
5399
5400 @command('manifest',
5400 @command('manifest',
5401 [('r', 'rev', '', _('revision to display'), _('REV')),
5401 [('r', 'rev', '', _('revision to display'), _('REV')),
5402 ('', 'all', False, _("list files from all revisions"))]
5402 ('', 'all', False, _("list files from all revisions"))]
5403 + formatteropts,
5403 + formatteropts,
5404 _('[-r REV]'))
5404 _('[-r REV]'))
5405 def manifest(ui, repo, node=None, rev=None, **opts):
5405 def manifest(ui, repo, node=None, rev=None, **opts):
5406 """output the current or given revision of the project manifest
5406 """output the current or given revision of the project manifest
5407
5407
5408 Print a list of version controlled files for the given revision.
5408 Print a list of version controlled files for the given revision.
5409 If no revision is given, the first parent of the working directory
5409 If no revision is given, the first parent of the working directory
5410 is used, or the null revision if no revision is checked out.
5410 is used, or the null revision if no revision is checked out.
5411
5411
5412 With -v, print file permissions, symlink and executable bits.
5412 With -v, print file permissions, symlink and executable bits.
5413 With --debug, print file revision hashes.
5413 With --debug, print file revision hashes.
5414
5414
5415 If option --all is specified, the list of all files from all revisions
5415 If option --all is specified, the list of all files from all revisions
5416 is printed. This includes deleted and renamed files.
5416 is printed. This includes deleted and renamed files.
5417
5417
5418 Returns 0 on success.
5418 Returns 0 on success.
5419 """
5419 """
5420
5420
5421 fm = ui.formatter('manifest', opts)
5421 fm = ui.formatter('manifest', opts)
5422
5422
5423 if opts.get('all'):
5423 if opts.get('all'):
5424 if rev or node:
5424 if rev or node:
5425 raise error.Abort(_("can't specify a revision with --all"))
5425 raise error.Abort(_("can't specify a revision with --all"))
5426
5426
5427 res = []
5427 res = []
5428 prefix = "data/"
5428 prefix = "data/"
5429 suffix = ".i"
5429 suffix = ".i"
5430 plen = len(prefix)
5430 plen = len(prefix)
5431 slen = len(suffix)
5431 slen = len(suffix)
5432 with repo.lock():
5432 with repo.lock():
5433 for fn, b, size in repo.store.datafiles():
5433 for fn, b, size in repo.store.datafiles():
5434 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5434 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5435 res.append(fn[plen:-slen])
5435 res.append(fn[plen:-slen])
5436 for f in res:
5436 for f in res:
5437 fm.startitem()
5437 fm.startitem()
5438 fm.write("path", '%s\n', f)
5438 fm.write("path", '%s\n', f)
5439 fm.end()
5439 fm.end()
5440 return
5440 return
5441
5441
5442 if rev and node:
5442 if rev and node:
5443 raise error.Abort(_("please specify just one revision"))
5443 raise error.Abort(_("please specify just one revision"))
5444
5444
5445 if not node:
5445 if not node:
5446 node = rev
5446 node = rev
5447
5447
5448 char = {'l': '@', 'x': '*', '': ''}
5448 char = {'l': '@', 'x': '*', '': ''}
5449 mode = {'l': '644', 'x': '755', '': '644'}
5449 mode = {'l': '644', 'x': '755', '': '644'}
5450 ctx = scmutil.revsingle(repo, node)
5450 ctx = scmutil.revsingle(repo, node)
5451 mf = ctx.manifest()
5451 mf = ctx.manifest()
5452 for f in ctx:
5452 for f in ctx:
5453 fm.startitem()
5453 fm.startitem()
5454 fl = ctx[f].flags()
5454 fl = ctx[f].flags()
5455 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5455 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5456 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5456 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5457 fm.write('path', '%s\n', f)
5457 fm.write('path', '%s\n', f)
5458 fm.end()
5458 fm.end()
5459
5459
5460 @command('^merge',
5460 @command('^merge',
5461 [('f', 'force', None,
5461 [('f', 'force', None,
5462 _('force a merge including outstanding changes (DEPRECATED)')),
5462 _('force a merge including outstanding changes (DEPRECATED)')),
5463 ('r', 'rev', '', _('revision to merge'), _('REV')),
5463 ('r', 'rev', '', _('revision to merge'), _('REV')),
5464 ('P', 'preview', None,
5464 ('P', 'preview', None,
5465 _('review revisions to merge (no merge is performed)'))
5465 _('review revisions to merge (no merge is performed)'))
5466 ] + mergetoolopts,
5466 ] + mergetoolopts,
5467 _('[-P] [[-r] REV]'))
5467 _('[-P] [[-r] REV]'))
5468 def merge(ui, repo, node=None, **opts):
5468 def merge(ui, repo, node=None, **opts):
5469 """merge another revision into working directory
5469 """merge another revision into working directory
5470
5470
5471 The current working directory is updated with all changes made in
5471 The current working directory is updated with all changes made in
5472 the requested revision since the last common predecessor revision.
5472 the requested revision since the last common predecessor revision.
5473
5473
5474 Files that changed between either parent are marked as changed for
5474 Files that changed between either parent are marked as changed for
5475 the next commit and a commit must be performed before any further
5475 the next commit and a commit must be performed before any further
5476 updates to the repository are allowed. The next commit will have
5476 updates to the repository are allowed. The next commit will have
5477 two parents.
5477 two parents.
5478
5478
5479 ``--tool`` can be used to specify the merge tool used for file
5479 ``--tool`` can be used to specify the merge tool used for file
5480 merges. It overrides the HGMERGE environment variable and your
5480 merges. It overrides the HGMERGE environment variable and your
5481 configuration files. See :hg:`help merge-tools` for options.
5481 configuration files. See :hg:`help merge-tools` for options.
5482
5482
5483 If no revision is specified, the working directory's parent is a
5483 If no revision is specified, the working directory's parent is a
5484 head revision, and the current branch contains exactly one other
5484 head revision, and the current branch contains exactly one other
5485 head, the other head is merged with by default. Otherwise, an
5485 head, the other head is merged with by default. Otherwise, an
5486 explicit revision with which to merge with must be provided.
5486 explicit revision with which to merge with must be provided.
5487
5487
5488 See :hg:`help resolve` for information on handling file conflicts.
5488 See :hg:`help resolve` for information on handling file conflicts.
5489
5489
5490 To undo an uncommitted merge, use :hg:`update --clean .` which
5490 To undo an uncommitted merge, use :hg:`update --clean .` which
5491 will check out a clean copy of the original merge parent, losing
5491 will check out a clean copy of the original merge parent, losing
5492 all changes.
5492 all changes.
5493
5493
5494 Returns 0 on success, 1 if there are unresolved files.
5494 Returns 0 on success, 1 if there are unresolved files.
5495 """
5495 """
5496
5496
5497 if opts.get('rev') and node:
5497 if opts.get('rev') and node:
5498 raise error.Abort(_("please specify just one revision"))
5498 raise error.Abort(_("please specify just one revision"))
5499 if not node:
5499 if not node:
5500 node = opts.get('rev')
5500 node = opts.get('rev')
5501
5501
5502 if node:
5502 if node:
5503 node = scmutil.revsingle(repo, node).node()
5503 node = scmutil.revsingle(repo, node).node()
5504
5504
5505 if not node:
5505 if not node:
5506 node = repo[destutil.destmerge(repo)].node()
5506 node = repo[destutil.destmerge(repo)].node()
5507
5507
5508 if opts.get('preview'):
5508 if opts.get('preview'):
5509 # find nodes that are ancestors of p2 but not of p1
5509 # find nodes that are ancestors of p2 but not of p1
5510 p1 = repo.lookup('.')
5510 p1 = repo.lookup('.')
5511 p2 = repo.lookup(node)
5511 p2 = repo.lookup(node)
5512 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5512 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5513
5513
5514 displayer = cmdutil.show_changeset(ui, repo, opts)
5514 displayer = cmdutil.show_changeset(ui, repo, opts)
5515 for node in nodes:
5515 for node in nodes:
5516 displayer.show(repo[node])
5516 displayer.show(repo[node])
5517 displayer.close()
5517 displayer.close()
5518 return 0
5518 return 0
5519
5519
5520 try:
5520 try:
5521 # ui.forcemerge is an internal variable, do not document
5521 # ui.forcemerge is an internal variable, do not document
5522 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5522 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5523 force = opts.get('force')
5523 force = opts.get('force')
5524 return hg.merge(repo, node, force=force, mergeforce=force)
5524 return hg.merge(repo, node, force=force, mergeforce=force)
5525 finally:
5525 finally:
5526 ui.setconfig('ui', 'forcemerge', '', 'merge')
5526 ui.setconfig('ui', 'forcemerge', '', 'merge')
5527
5527
5528 @command('outgoing|out',
5528 @command('outgoing|out',
5529 [('f', 'force', None, _('run even when the destination is unrelated')),
5529 [('f', 'force', None, _('run even when the destination is unrelated')),
5530 ('r', 'rev', [],
5530 ('r', 'rev', [],
5531 _('a changeset intended to be included in the destination'), _('REV')),
5531 _('a changeset intended to be included in the destination'), _('REV')),
5532 ('n', 'newest-first', None, _('show newest record first')),
5532 ('n', 'newest-first', None, _('show newest record first')),
5533 ('B', 'bookmarks', False, _('compare bookmarks')),
5533 ('B', 'bookmarks', False, _('compare bookmarks')),
5534 ('b', 'branch', [], _('a specific branch you would like to push'),
5534 ('b', 'branch', [], _('a specific branch you would like to push'),
5535 _('BRANCH')),
5535 _('BRANCH')),
5536 ] + logopts + remoteopts + subrepoopts,
5536 ] + logopts + remoteopts + subrepoopts,
5537 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5537 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5538 def outgoing(ui, repo, dest=None, **opts):
5538 def outgoing(ui, repo, dest=None, **opts):
5539 """show changesets not found in the destination
5539 """show changesets not found in the destination
5540
5540
5541 Show changesets not found in the specified destination repository
5541 Show changesets not found in the specified destination repository
5542 or the default push location. These are the changesets that would
5542 or the default push location. These are the changesets that would
5543 be pushed if a push was requested.
5543 be pushed if a push was requested.
5544
5544
5545 See pull for details of valid destination formats.
5545 See pull for details of valid destination formats.
5546
5546
5547 .. container:: verbose
5547 .. container:: verbose
5548
5548
5549 With -B/--bookmarks, the result of bookmark comparison between
5549 With -B/--bookmarks, the result of bookmark comparison between
5550 local and remote repositories is displayed. With -v/--verbose,
5550 local and remote repositories is displayed. With -v/--verbose,
5551 status is also displayed for each bookmark like below::
5551 status is also displayed for each bookmark like below::
5552
5552
5553 BM1 01234567890a added
5553 BM1 01234567890a added
5554 BM2 deleted
5554 BM2 deleted
5555 BM3 234567890abc advanced
5555 BM3 234567890abc advanced
5556 BM4 34567890abcd diverged
5556 BM4 34567890abcd diverged
5557 BM5 4567890abcde changed
5557 BM5 4567890abcde changed
5558
5558
5559 The action taken when pushing depends on the
5559 The action taken when pushing depends on the
5560 status of each bookmark:
5560 status of each bookmark:
5561
5561
5562 :``added``: push with ``-B`` will create it
5562 :``added``: push with ``-B`` will create it
5563 :``deleted``: push with ``-B`` will delete it
5563 :``deleted``: push with ``-B`` will delete it
5564 :``advanced``: push will update it
5564 :``advanced``: push will update it
5565 :``diverged``: push with ``-B`` will update it
5565 :``diverged``: push with ``-B`` will update it
5566 :``changed``: push with ``-B`` will update it
5566 :``changed``: push with ``-B`` will update it
5567
5567
5568 From the point of view of pushing behavior, bookmarks
5568 From the point of view of pushing behavior, bookmarks
5569 existing only in the remote repository are treated as
5569 existing only in the remote repository are treated as
5570 ``deleted``, even if it is in fact added remotely.
5570 ``deleted``, even if it is in fact added remotely.
5571
5571
5572 Returns 0 if there are outgoing changes, 1 otherwise.
5572 Returns 0 if there are outgoing changes, 1 otherwise.
5573 """
5573 """
5574 if opts.get('graph'):
5574 if opts.get('graph'):
5575 cmdutil.checkunsupportedgraphflags([], opts)
5575 cmdutil.checkunsupportedgraphflags([], opts)
5576 o, other = hg._outgoing(ui, repo, dest, opts)
5576 o, other = hg._outgoing(ui, repo, dest, opts)
5577 if not o:
5577 if not o:
5578 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5578 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5579 return
5579 return
5580
5580
5581 revdag = cmdutil.graphrevs(repo, o, opts)
5581 revdag = cmdutil.graphrevs(repo, o, opts)
5582 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5582 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5583 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5583 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5584 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5584 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5585 return 0
5585 return 0
5586
5586
5587 if opts.get('bookmarks'):
5587 if opts.get('bookmarks'):
5588 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5588 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5589 dest, branches = hg.parseurl(dest, opts.get('branch'))
5589 dest, branches = hg.parseurl(dest, opts.get('branch'))
5590 other = hg.peer(repo, opts, dest)
5590 other = hg.peer(repo, opts, dest)
5591 if 'bookmarks' not in other.listkeys('namespaces'):
5591 if 'bookmarks' not in other.listkeys('namespaces'):
5592 ui.warn(_("remote doesn't support bookmarks\n"))
5592 ui.warn(_("remote doesn't support bookmarks\n"))
5593 return 0
5593 return 0
5594 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5594 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5595 return bookmarks.outgoing(ui, repo, other)
5595 return bookmarks.outgoing(ui, repo, other)
5596
5596
5597 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5597 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5598 try:
5598 try:
5599 return hg.outgoing(ui, repo, dest, opts)
5599 return hg.outgoing(ui, repo, dest, opts)
5600 finally:
5600 finally:
5601 del repo._subtoppath
5601 del repo._subtoppath
5602
5602
5603 @command('parents',
5603 @command('parents',
5604 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5604 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5605 ] + templateopts,
5605 ] + templateopts,
5606 _('[-r REV] [FILE]'),
5606 _('[-r REV] [FILE]'),
5607 inferrepo=True)
5607 inferrepo=True)
5608 def parents(ui, repo, file_=None, **opts):
5608 def parents(ui, repo, file_=None, **opts):
5609 """show the parents of the working directory or revision (DEPRECATED)
5609 """show the parents of the working directory or revision (DEPRECATED)
5610
5610
5611 Print the working directory's parent revisions. If a revision is
5611 Print the working directory's parent revisions. If a revision is
5612 given via -r/--rev, the parent of that revision will be printed.
5612 given via -r/--rev, the parent of that revision will be printed.
5613 If a file argument is given, the revision in which the file was
5613 If a file argument is given, the revision in which the file was
5614 last changed (before the working directory revision or the
5614 last changed (before the working directory revision or the
5615 argument to --rev if given) is printed.
5615 argument to --rev if given) is printed.
5616
5616
5617 This command is equivalent to::
5617 This command is equivalent to::
5618
5618
5619 hg log -r "p1()+p2()" or
5619 hg log -r "p1()+p2()" or
5620 hg log -r "p1(REV)+p2(REV)" or
5620 hg log -r "p1(REV)+p2(REV)" or
5621 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5621 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5622 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5622 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5623
5623
5624 See :hg:`summary` and :hg:`help revsets` for related information.
5624 See :hg:`summary` and :hg:`help revsets` for related information.
5625
5625
5626 Returns 0 on success.
5626 Returns 0 on success.
5627 """
5627 """
5628
5628
5629 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5629 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5630
5630
5631 if file_:
5631 if file_:
5632 m = scmutil.match(ctx, (file_,), opts)
5632 m = scmutil.match(ctx, (file_,), opts)
5633 if m.anypats() or len(m.files()) != 1:
5633 if m.anypats() or len(m.files()) != 1:
5634 raise error.Abort(_('can only specify an explicit filename'))
5634 raise error.Abort(_('can only specify an explicit filename'))
5635 file_ = m.files()[0]
5635 file_ = m.files()[0]
5636 filenodes = []
5636 filenodes = []
5637 for cp in ctx.parents():
5637 for cp in ctx.parents():
5638 if not cp:
5638 if not cp:
5639 continue
5639 continue
5640 try:
5640 try:
5641 filenodes.append(cp.filenode(file_))
5641 filenodes.append(cp.filenode(file_))
5642 except error.LookupError:
5642 except error.LookupError:
5643 pass
5643 pass
5644 if not filenodes:
5644 if not filenodes:
5645 raise error.Abort(_("'%s' not found in manifest!") % file_)
5645 raise error.Abort(_("'%s' not found in manifest!") % file_)
5646 p = []
5646 p = []
5647 for fn in filenodes:
5647 for fn in filenodes:
5648 fctx = repo.filectx(file_, fileid=fn)
5648 fctx = repo.filectx(file_, fileid=fn)
5649 p.append(fctx.node())
5649 p.append(fctx.node())
5650 else:
5650 else:
5651 p = [cp.node() for cp in ctx.parents()]
5651 p = [cp.node() for cp in ctx.parents()]
5652
5652
5653 displayer = cmdutil.show_changeset(ui, repo, opts)
5653 displayer = cmdutil.show_changeset(ui, repo, opts)
5654 for n in p:
5654 for n in p:
5655 if n != nullid:
5655 if n != nullid:
5656 displayer.show(repo[n])
5656 displayer.show(repo[n])
5657 displayer.close()
5657 displayer.close()
5658
5658
5659 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
5659 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
5660 def paths(ui, repo, search=None, **opts):
5660 def paths(ui, repo, search=None, **opts):
5661 """show aliases for remote repositories
5661 """show aliases for remote repositories
5662
5662
5663 Show definition of symbolic path name NAME. If no name is given,
5663 Show definition of symbolic path name NAME. If no name is given,
5664 show definition of all available names.
5664 show definition of all available names.
5665
5665
5666 Option -q/--quiet suppresses all output when searching for NAME
5666 Option -q/--quiet suppresses all output when searching for NAME
5667 and shows only the path names when listing all definitions.
5667 and shows only the path names when listing all definitions.
5668
5668
5669 Path names are defined in the [paths] section of your
5669 Path names are defined in the [paths] section of your
5670 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5670 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5671 repository, ``.hg/hgrc`` is used, too.
5671 repository, ``.hg/hgrc`` is used, too.
5672
5672
5673 The path names ``default`` and ``default-push`` have a special
5673 The path names ``default`` and ``default-push`` have a special
5674 meaning. When performing a push or pull operation, they are used
5674 meaning. When performing a push or pull operation, they are used
5675 as fallbacks if no location is specified on the command-line.
5675 as fallbacks if no location is specified on the command-line.
5676 When ``default-push`` is set, it will be used for push and
5676 When ``default-push`` is set, it will be used for push and
5677 ``default`` will be used for pull; otherwise ``default`` is used
5677 ``default`` will be used for pull; otherwise ``default`` is used
5678 as the fallback for both. When cloning a repository, the clone
5678 as the fallback for both. When cloning a repository, the clone
5679 source is written as ``default`` in ``.hg/hgrc``.
5679 source is written as ``default`` in ``.hg/hgrc``.
5680
5680
5681 .. note::
5681 .. note::
5682
5682
5683 ``default`` and ``default-push`` apply to all inbound (e.g.
5683 ``default`` and ``default-push`` apply to all inbound (e.g.
5684 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5684 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5685 and :hg:`bundle`) operations.
5685 and :hg:`bundle`) operations.
5686
5686
5687 See :hg:`help urls` for more information.
5687 See :hg:`help urls` for more information.
5688
5688
5689 Returns 0 on success.
5689 Returns 0 on success.
5690 """
5690 """
5691 if search:
5691 if search:
5692 pathitems = [(name, path) for name, path in ui.paths.iteritems()
5692 pathitems = [(name, path) for name, path in ui.paths.iteritems()
5693 if name == search]
5693 if name == search]
5694 else:
5694 else:
5695 pathitems = sorted(ui.paths.iteritems())
5695 pathitems = sorted(ui.paths.iteritems())
5696
5696
5697 fm = ui.formatter('paths', opts)
5697 fm = ui.formatter('paths', opts)
5698 if fm:
5698 if fm.isplain():
5699 hidepassword = util.hidepassword
5700 else:
5699 hidepassword = str
5701 hidepassword = str
5700 else:
5701 hidepassword = util.hidepassword
5702 if ui.quiet:
5702 if ui.quiet:
5703 namefmt = '%s\n'
5703 namefmt = '%s\n'
5704 else:
5704 else:
5705 namefmt = '%s = '
5705 namefmt = '%s = '
5706 showsubopts = not search and not ui.quiet
5706 showsubopts = not search and not ui.quiet
5707
5707
5708 for name, path in pathitems:
5708 for name, path in pathitems:
5709 fm.startitem()
5709 fm.startitem()
5710 fm.condwrite(not search, 'name', namefmt, name)
5710 fm.condwrite(not search, 'name', namefmt, name)
5711 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
5711 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
5712 for subopt, value in sorted(path.suboptions.items()):
5712 for subopt, value in sorted(path.suboptions.items()):
5713 assert subopt not in ('name', 'url')
5713 assert subopt not in ('name', 'url')
5714 if showsubopts:
5714 if showsubopts:
5715 fm.plain('%s:%s = ' % (name, subopt))
5715 fm.plain('%s:%s = ' % (name, subopt))
5716 fm.condwrite(showsubopts, subopt, '%s\n', value)
5716 fm.condwrite(showsubopts, subopt, '%s\n', value)
5717
5717
5718 fm.end()
5718 fm.end()
5719
5719
5720 if search and not pathitems:
5720 if search and not pathitems:
5721 if not ui.quiet:
5721 if not ui.quiet:
5722 ui.warn(_("not found!\n"))
5722 ui.warn(_("not found!\n"))
5723 return 1
5723 return 1
5724 else:
5724 else:
5725 return 0
5725 return 0
5726
5726
5727 @command('phase',
5727 @command('phase',
5728 [('p', 'public', False, _('set changeset phase to public')),
5728 [('p', 'public', False, _('set changeset phase to public')),
5729 ('d', 'draft', False, _('set changeset phase to draft')),
5729 ('d', 'draft', False, _('set changeset phase to draft')),
5730 ('s', 'secret', False, _('set changeset phase to secret')),
5730 ('s', 'secret', False, _('set changeset phase to secret')),
5731 ('f', 'force', False, _('allow to move boundary backward')),
5731 ('f', 'force', False, _('allow to move boundary backward')),
5732 ('r', 'rev', [], _('target revision'), _('REV')),
5732 ('r', 'rev', [], _('target revision'), _('REV')),
5733 ],
5733 ],
5734 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5734 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5735 def phase(ui, repo, *revs, **opts):
5735 def phase(ui, repo, *revs, **opts):
5736 """set or show the current phase name
5736 """set or show the current phase name
5737
5737
5738 With no argument, show the phase name of the current revision(s).
5738 With no argument, show the phase name of the current revision(s).
5739
5739
5740 With one of -p/--public, -d/--draft or -s/--secret, change the
5740 With one of -p/--public, -d/--draft or -s/--secret, change the
5741 phase value of the specified revisions.
5741 phase value of the specified revisions.
5742
5742
5743 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5743 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5744 lower phase to an higher phase. Phases are ordered as follows::
5744 lower phase to an higher phase. Phases are ordered as follows::
5745
5745
5746 public < draft < secret
5746 public < draft < secret
5747
5747
5748 Returns 0 on success, 1 if some phases could not be changed.
5748 Returns 0 on success, 1 if some phases could not be changed.
5749
5749
5750 (For more information about the phases concept, see :hg:`help phases`.)
5750 (For more information about the phases concept, see :hg:`help phases`.)
5751 """
5751 """
5752 # search for a unique phase argument
5752 # search for a unique phase argument
5753 targetphase = None
5753 targetphase = None
5754 for idx, name in enumerate(phases.phasenames):
5754 for idx, name in enumerate(phases.phasenames):
5755 if opts[name]:
5755 if opts[name]:
5756 if targetphase is not None:
5756 if targetphase is not None:
5757 raise error.Abort(_('only one phase can be specified'))
5757 raise error.Abort(_('only one phase can be specified'))
5758 targetphase = idx
5758 targetphase = idx
5759
5759
5760 # look for specified revision
5760 # look for specified revision
5761 revs = list(revs)
5761 revs = list(revs)
5762 revs.extend(opts['rev'])
5762 revs.extend(opts['rev'])
5763 if not revs:
5763 if not revs:
5764 # display both parents as the second parent phase can influence
5764 # display both parents as the second parent phase can influence
5765 # the phase of a merge commit
5765 # the phase of a merge commit
5766 revs = [c.rev() for c in repo[None].parents()]
5766 revs = [c.rev() for c in repo[None].parents()]
5767
5767
5768 revs = scmutil.revrange(repo, revs)
5768 revs = scmutil.revrange(repo, revs)
5769
5769
5770 lock = None
5770 lock = None
5771 ret = 0
5771 ret = 0
5772 if targetphase is None:
5772 if targetphase is None:
5773 # display
5773 # display
5774 for r in revs:
5774 for r in revs:
5775 ctx = repo[r]
5775 ctx = repo[r]
5776 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5776 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5777 else:
5777 else:
5778 tr = None
5778 tr = None
5779 lock = repo.lock()
5779 lock = repo.lock()
5780 try:
5780 try:
5781 tr = repo.transaction("phase")
5781 tr = repo.transaction("phase")
5782 # set phase
5782 # set phase
5783 if not revs:
5783 if not revs:
5784 raise error.Abort(_('empty revision set'))
5784 raise error.Abort(_('empty revision set'))
5785 nodes = [repo[r].node() for r in revs]
5785 nodes = [repo[r].node() for r in revs]
5786 # moving revision from public to draft may hide them
5786 # moving revision from public to draft may hide them
5787 # We have to check result on an unfiltered repository
5787 # We have to check result on an unfiltered repository
5788 unfi = repo.unfiltered()
5788 unfi = repo.unfiltered()
5789 getphase = unfi._phasecache.phase
5789 getphase = unfi._phasecache.phase
5790 olddata = [getphase(unfi, r) for r in unfi]
5790 olddata = [getphase(unfi, r) for r in unfi]
5791 phases.advanceboundary(repo, tr, targetphase, nodes)
5791 phases.advanceboundary(repo, tr, targetphase, nodes)
5792 if opts['force']:
5792 if opts['force']:
5793 phases.retractboundary(repo, tr, targetphase, nodes)
5793 phases.retractboundary(repo, tr, targetphase, nodes)
5794 tr.close()
5794 tr.close()
5795 finally:
5795 finally:
5796 if tr is not None:
5796 if tr is not None:
5797 tr.release()
5797 tr.release()
5798 lock.release()
5798 lock.release()
5799 getphase = unfi._phasecache.phase
5799 getphase = unfi._phasecache.phase
5800 newdata = [getphase(unfi, r) for r in unfi]
5800 newdata = [getphase(unfi, r) for r in unfi]
5801 changes = sum(newdata[r] != olddata[r] for r in unfi)
5801 changes = sum(newdata[r] != olddata[r] for r in unfi)
5802 cl = unfi.changelog
5802 cl = unfi.changelog
5803 rejected = [n for n in nodes
5803 rejected = [n for n in nodes
5804 if newdata[cl.rev(n)] < targetphase]
5804 if newdata[cl.rev(n)] < targetphase]
5805 if rejected:
5805 if rejected:
5806 ui.warn(_('cannot move %i changesets to a higher '
5806 ui.warn(_('cannot move %i changesets to a higher '
5807 'phase, use --force\n') % len(rejected))
5807 'phase, use --force\n') % len(rejected))
5808 ret = 1
5808 ret = 1
5809 if changes:
5809 if changes:
5810 msg = _('phase changed for %i changesets\n') % changes
5810 msg = _('phase changed for %i changesets\n') % changes
5811 if ret:
5811 if ret:
5812 ui.status(msg)
5812 ui.status(msg)
5813 else:
5813 else:
5814 ui.note(msg)
5814 ui.note(msg)
5815 else:
5815 else:
5816 ui.warn(_('no phases changed\n'))
5816 ui.warn(_('no phases changed\n'))
5817 return ret
5817 return ret
5818
5818
5819 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5819 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5820 """Run after a changegroup has been added via pull/unbundle
5820 """Run after a changegroup has been added via pull/unbundle
5821
5821
5822 This takes arguments below:
5822 This takes arguments below:
5823
5823
5824 :modheads: change of heads by pull/unbundle
5824 :modheads: change of heads by pull/unbundle
5825 :optupdate: updating working directory is needed or not
5825 :optupdate: updating working directory is needed or not
5826 :checkout: update destination revision (or None to default destination)
5826 :checkout: update destination revision (or None to default destination)
5827 :brev: a name, which might be a bookmark to be activated after updating
5827 :brev: a name, which might be a bookmark to be activated after updating
5828 """
5828 """
5829 if modheads == 0:
5829 if modheads == 0:
5830 return
5830 return
5831 if optupdate:
5831 if optupdate:
5832 try:
5832 try:
5833 return hg.updatetotally(ui, repo, checkout, brev)
5833 return hg.updatetotally(ui, repo, checkout, brev)
5834 except error.UpdateAbort as inst:
5834 except error.UpdateAbort as inst:
5835 msg = _("not updating: %s") % str(inst)
5835 msg = _("not updating: %s") % str(inst)
5836 hint = inst.hint
5836 hint = inst.hint
5837 raise error.UpdateAbort(msg, hint=hint)
5837 raise error.UpdateAbort(msg, hint=hint)
5838 if modheads > 1:
5838 if modheads > 1:
5839 currentbranchheads = len(repo.branchheads())
5839 currentbranchheads = len(repo.branchheads())
5840 if currentbranchheads == modheads:
5840 if currentbranchheads == modheads:
5841 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5841 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5842 elif currentbranchheads > 1:
5842 elif currentbranchheads > 1:
5843 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5843 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5844 "merge)\n"))
5844 "merge)\n"))
5845 else:
5845 else:
5846 ui.status(_("(run 'hg heads' to see heads)\n"))
5846 ui.status(_("(run 'hg heads' to see heads)\n"))
5847 else:
5847 else:
5848 ui.status(_("(run 'hg update' to get a working copy)\n"))
5848 ui.status(_("(run 'hg update' to get a working copy)\n"))
5849
5849
5850 @command('^pull',
5850 @command('^pull',
5851 [('u', 'update', None,
5851 [('u', 'update', None,
5852 _('update to new branch head if changesets were pulled')),
5852 _('update to new branch head if changesets were pulled')),
5853 ('f', 'force', None, _('run even when remote repository is unrelated')),
5853 ('f', 'force', None, _('run even when remote repository is unrelated')),
5854 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5854 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5855 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5855 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5856 ('b', 'branch', [], _('a specific branch you would like to pull'),
5856 ('b', 'branch', [], _('a specific branch you would like to pull'),
5857 _('BRANCH')),
5857 _('BRANCH')),
5858 ] + remoteopts,
5858 ] + remoteopts,
5859 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5859 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5860 def pull(ui, repo, source="default", **opts):
5860 def pull(ui, repo, source="default", **opts):
5861 """pull changes from the specified source
5861 """pull changes from the specified source
5862
5862
5863 Pull changes from a remote repository to a local one.
5863 Pull changes from a remote repository to a local one.
5864
5864
5865 This finds all changes from the repository at the specified path
5865 This finds all changes from the repository at the specified path
5866 or URL and adds them to a local repository (the current one unless
5866 or URL and adds them to a local repository (the current one unless
5867 -R is specified). By default, this does not update the copy of the
5867 -R is specified). By default, this does not update the copy of the
5868 project in the working directory.
5868 project in the working directory.
5869
5869
5870 Use :hg:`incoming` if you want to see what would have been added
5870 Use :hg:`incoming` if you want to see what would have been added
5871 by a pull at the time you issued this command. If you then decide
5871 by a pull at the time you issued this command. If you then decide
5872 to add those changes to the repository, you should use :hg:`pull
5872 to add those changes to the repository, you should use :hg:`pull
5873 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5873 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5874
5874
5875 If SOURCE is omitted, the 'default' path will be used.
5875 If SOURCE is omitted, the 'default' path will be used.
5876 See :hg:`help urls` for more information.
5876 See :hg:`help urls` for more information.
5877
5877
5878 Specifying bookmark as ``.`` is equivalent to specifying the active
5878 Specifying bookmark as ``.`` is equivalent to specifying the active
5879 bookmark's name.
5879 bookmark's name.
5880
5880
5881 Returns 0 on success, 1 if an update had unresolved files.
5881 Returns 0 on success, 1 if an update had unresolved files.
5882 """
5882 """
5883 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5883 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5884 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5884 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5885 other = hg.peer(repo, opts, source)
5885 other = hg.peer(repo, opts, source)
5886 try:
5886 try:
5887 revs, checkout = hg.addbranchrevs(repo, other, branches,
5887 revs, checkout = hg.addbranchrevs(repo, other, branches,
5888 opts.get('rev'))
5888 opts.get('rev'))
5889
5889
5890
5890
5891 pullopargs = {}
5891 pullopargs = {}
5892 if opts.get('bookmark'):
5892 if opts.get('bookmark'):
5893 if not revs:
5893 if not revs:
5894 revs = []
5894 revs = []
5895 # The list of bookmark used here is not the one used to actually
5895 # The list of bookmark used here is not the one used to actually
5896 # update the bookmark name. This can result in the revision pulled
5896 # update the bookmark name. This can result in the revision pulled
5897 # not ending up with the name of the bookmark because of a race
5897 # not ending up with the name of the bookmark because of a race
5898 # condition on the server. (See issue 4689 for details)
5898 # condition on the server. (See issue 4689 for details)
5899 remotebookmarks = other.listkeys('bookmarks')
5899 remotebookmarks = other.listkeys('bookmarks')
5900 pullopargs['remotebookmarks'] = remotebookmarks
5900 pullopargs['remotebookmarks'] = remotebookmarks
5901 for b in opts['bookmark']:
5901 for b in opts['bookmark']:
5902 b = repo._bookmarks.expandname(b)
5902 b = repo._bookmarks.expandname(b)
5903 if b not in remotebookmarks:
5903 if b not in remotebookmarks:
5904 raise error.Abort(_('remote bookmark %s not found!') % b)
5904 raise error.Abort(_('remote bookmark %s not found!') % b)
5905 revs.append(remotebookmarks[b])
5905 revs.append(remotebookmarks[b])
5906
5906
5907 if revs:
5907 if revs:
5908 try:
5908 try:
5909 # When 'rev' is a bookmark name, we cannot guarantee that it
5909 # When 'rev' is a bookmark name, we cannot guarantee that it
5910 # will be updated with that name because of a race condition
5910 # will be updated with that name because of a race condition
5911 # server side. (See issue 4689 for details)
5911 # server side. (See issue 4689 for details)
5912 oldrevs = revs
5912 oldrevs = revs
5913 revs = [] # actually, nodes
5913 revs = [] # actually, nodes
5914 for r in oldrevs:
5914 for r in oldrevs:
5915 node = other.lookup(r)
5915 node = other.lookup(r)
5916 revs.append(node)
5916 revs.append(node)
5917 if r == checkout:
5917 if r == checkout:
5918 checkout = node
5918 checkout = node
5919 except error.CapabilityError:
5919 except error.CapabilityError:
5920 err = _("other repository doesn't support revision lookup, "
5920 err = _("other repository doesn't support revision lookup, "
5921 "so a rev cannot be specified.")
5921 "so a rev cannot be specified.")
5922 raise error.Abort(err)
5922 raise error.Abort(err)
5923
5923
5924 pullopargs.update(opts.get('opargs', {}))
5924 pullopargs.update(opts.get('opargs', {}))
5925 modheads = exchange.pull(repo, other, heads=revs,
5925 modheads = exchange.pull(repo, other, heads=revs,
5926 force=opts.get('force'),
5926 force=opts.get('force'),
5927 bookmarks=opts.get('bookmark', ()),
5927 bookmarks=opts.get('bookmark', ()),
5928 opargs=pullopargs).cgresult
5928 opargs=pullopargs).cgresult
5929
5929
5930 # brev is a name, which might be a bookmark to be activated at
5930 # brev is a name, which might be a bookmark to be activated at
5931 # the end of the update. In other words, it is an explicit
5931 # the end of the update. In other words, it is an explicit
5932 # destination of the update
5932 # destination of the update
5933 brev = None
5933 brev = None
5934
5934
5935 if checkout:
5935 if checkout:
5936 checkout = str(repo.changelog.rev(checkout))
5936 checkout = str(repo.changelog.rev(checkout))
5937
5937
5938 # order below depends on implementation of
5938 # order below depends on implementation of
5939 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5939 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5940 # because 'checkout' is determined without it.
5940 # because 'checkout' is determined without it.
5941 if opts.get('rev'):
5941 if opts.get('rev'):
5942 brev = opts['rev'][0]
5942 brev = opts['rev'][0]
5943 elif opts.get('branch'):
5943 elif opts.get('branch'):
5944 brev = opts['branch'][0]
5944 brev = opts['branch'][0]
5945 else:
5945 else:
5946 brev = branches[0]
5946 brev = branches[0]
5947 repo._subtoppath = source
5947 repo._subtoppath = source
5948 try:
5948 try:
5949 ret = postincoming(ui, repo, modheads, opts.get('update'),
5949 ret = postincoming(ui, repo, modheads, opts.get('update'),
5950 checkout, brev)
5950 checkout, brev)
5951
5951
5952 finally:
5952 finally:
5953 del repo._subtoppath
5953 del repo._subtoppath
5954
5954
5955 finally:
5955 finally:
5956 other.close()
5956 other.close()
5957 return ret
5957 return ret
5958
5958
5959 @command('^push',
5959 @command('^push',
5960 [('f', 'force', None, _('force push')),
5960 [('f', 'force', None, _('force push')),
5961 ('r', 'rev', [],
5961 ('r', 'rev', [],
5962 _('a changeset intended to be included in the destination'),
5962 _('a changeset intended to be included in the destination'),
5963 _('REV')),
5963 _('REV')),
5964 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5964 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5965 ('b', 'branch', [],
5965 ('b', 'branch', [],
5966 _('a specific branch you would like to push'), _('BRANCH')),
5966 _('a specific branch you would like to push'), _('BRANCH')),
5967 ('', 'new-branch', False, _('allow pushing a new branch')),
5967 ('', 'new-branch', False, _('allow pushing a new branch')),
5968 ] + remoteopts,
5968 ] + remoteopts,
5969 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5969 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5970 def push(ui, repo, dest=None, **opts):
5970 def push(ui, repo, dest=None, **opts):
5971 """push changes to the specified destination
5971 """push changes to the specified destination
5972
5972
5973 Push changesets from the local repository to the specified
5973 Push changesets from the local repository to the specified
5974 destination.
5974 destination.
5975
5975
5976 This operation is symmetrical to pull: it is identical to a pull
5976 This operation is symmetrical to pull: it is identical to a pull
5977 in the destination repository from the current one.
5977 in the destination repository from the current one.
5978
5978
5979 By default, push will not allow creation of new heads at the
5979 By default, push will not allow creation of new heads at the
5980 destination, since multiple heads would make it unclear which head
5980 destination, since multiple heads would make it unclear which head
5981 to use. In this situation, it is recommended to pull and merge
5981 to use. In this situation, it is recommended to pull and merge
5982 before pushing.
5982 before pushing.
5983
5983
5984 Use --new-branch if you want to allow push to create a new named
5984 Use --new-branch if you want to allow push to create a new named
5985 branch that is not present at the destination. This allows you to
5985 branch that is not present at the destination. This allows you to
5986 only create a new branch without forcing other changes.
5986 only create a new branch without forcing other changes.
5987
5987
5988 .. note::
5988 .. note::
5989
5989
5990 Extra care should be taken with the -f/--force option,
5990 Extra care should be taken with the -f/--force option,
5991 which will push all new heads on all branches, an action which will
5991 which will push all new heads on all branches, an action which will
5992 almost always cause confusion for collaborators.
5992 almost always cause confusion for collaborators.
5993
5993
5994 If -r/--rev is used, the specified revision and all its ancestors
5994 If -r/--rev is used, the specified revision and all its ancestors
5995 will be pushed to the remote repository.
5995 will be pushed to the remote repository.
5996
5996
5997 If -B/--bookmark is used, the specified bookmarked revision, its
5997 If -B/--bookmark is used, the specified bookmarked revision, its
5998 ancestors, and the bookmark will be pushed to the remote
5998 ancestors, and the bookmark will be pushed to the remote
5999 repository. Specifying ``.`` is equivalent to specifying the active
5999 repository. Specifying ``.`` is equivalent to specifying the active
6000 bookmark's name.
6000 bookmark's name.
6001
6001
6002 Please see :hg:`help urls` for important details about ``ssh://``
6002 Please see :hg:`help urls` for important details about ``ssh://``
6003 URLs. If DESTINATION is omitted, a default path will be used.
6003 URLs. If DESTINATION is omitted, a default path will be used.
6004
6004
6005 Returns 0 if push was successful, 1 if nothing to push.
6005 Returns 0 if push was successful, 1 if nothing to push.
6006 """
6006 """
6007
6007
6008 if opts.get('bookmark'):
6008 if opts.get('bookmark'):
6009 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
6009 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
6010 for b in opts['bookmark']:
6010 for b in opts['bookmark']:
6011 # translate -B options to -r so changesets get pushed
6011 # translate -B options to -r so changesets get pushed
6012 b = repo._bookmarks.expandname(b)
6012 b = repo._bookmarks.expandname(b)
6013 if b in repo._bookmarks:
6013 if b in repo._bookmarks:
6014 opts.setdefault('rev', []).append(b)
6014 opts.setdefault('rev', []).append(b)
6015 else:
6015 else:
6016 # if we try to push a deleted bookmark, translate it to null
6016 # if we try to push a deleted bookmark, translate it to null
6017 # this lets simultaneous -r, -b options continue working
6017 # this lets simultaneous -r, -b options continue working
6018 opts.setdefault('rev', []).append("null")
6018 opts.setdefault('rev', []).append("null")
6019
6019
6020 path = ui.paths.getpath(dest, default=('default-push', 'default'))
6020 path = ui.paths.getpath(dest, default=('default-push', 'default'))
6021 if not path:
6021 if not path:
6022 raise error.Abort(_('default repository not configured!'),
6022 raise error.Abort(_('default repository not configured!'),
6023 hint=_('see the "path" section in "hg help config"'))
6023 hint=_('see the "path" section in "hg help config"'))
6024 dest = path.pushloc or path.loc
6024 dest = path.pushloc or path.loc
6025 branches = (path.branch, opts.get('branch') or [])
6025 branches = (path.branch, opts.get('branch') or [])
6026 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
6026 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
6027 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
6027 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
6028 other = hg.peer(repo, opts, dest)
6028 other = hg.peer(repo, opts, dest)
6029
6029
6030 if revs:
6030 if revs:
6031 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
6031 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
6032 if not revs:
6032 if not revs:
6033 raise error.Abort(_("specified revisions evaluate to an empty set"),
6033 raise error.Abort(_("specified revisions evaluate to an empty set"),
6034 hint=_("use different revision arguments"))
6034 hint=_("use different revision arguments"))
6035 elif path.pushrev:
6035 elif path.pushrev:
6036 # It doesn't make any sense to specify ancestor revisions. So limit
6036 # It doesn't make any sense to specify ancestor revisions. So limit
6037 # to DAG heads to make discovery simpler.
6037 # to DAG heads to make discovery simpler.
6038 expr = revset.formatspec('heads(%r)', path.pushrev)
6038 expr = revset.formatspec('heads(%r)', path.pushrev)
6039 revs = scmutil.revrange(repo, [expr])
6039 revs = scmutil.revrange(repo, [expr])
6040 revs = [repo[rev].node() for rev in revs]
6040 revs = [repo[rev].node() for rev in revs]
6041 if not revs:
6041 if not revs:
6042 raise error.Abort(_('default push revset for path evaluates to an '
6042 raise error.Abort(_('default push revset for path evaluates to an '
6043 'empty set'))
6043 'empty set'))
6044
6044
6045 repo._subtoppath = dest
6045 repo._subtoppath = dest
6046 try:
6046 try:
6047 # push subrepos depth-first for coherent ordering
6047 # push subrepos depth-first for coherent ordering
6048 c = repo['']
6048 c = repo['']
6049 subs = c.substate # only repos that are committed
6049 subs = c.substate # only repos that are committed
6050 for s in sorted(subs):
6050 for s in sorted(subs):
6051 result = c.sub(s).push(opts)
6051 result = c.sub(s).push(opts)
6052 if result == 0:
6052 if result == 0:
6053 return not result
6053 return not result
6054 finally:
6054 finally:
6055 del repo._subtoppath
6055 del repo._subtoppath
6056 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
6056 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
6057 newbranch=opts.get('new_branch'),
6057 newbranch=opts.get('new_branch'),
6058 bookmarks=opts.get('bookmark', ()),
6058 bookmarks=opts.get('bookmark', ()),
6059 opargs=opts.get('opargs'))
6059 opargs=opts.get('opargs'))
6060
6060
6061 result = not pushop.cgresult
6061 result = not pushop.cgresult
6062
6062
6063 if pushop.bkresult is not None:
6063 if pushop.bkresult is not None:
6064 if pushop.bkresult == 2:
6064 if pushop.bkresult == 2:
6065 result = 2
6065 result = 2
6066 elif not result and pushop.bkresult:
6066 elif not result and pushop.bkresult:
6067 result = 2
6067 result = 2
6068
6068
6069 return result
6069 return result
6070
6070
6071 @command('recover', [])
6071 @command('recover', [])
6072 def recover(ui, repo):
6072 def recover(ui, repo):
6073 """roll back an interrupted transaction
6073 """roll back an interrupted transaction
6074
6074
6075 Recover from an interrupted commit or pull.
6075 Recover from an interrupted commit or pull.
6076
6076
6077 This command tries to fix the repository status after an
6077 This command tries to fix the repository status after an
6078 interrupted operation. It should only be necessary when Mercurial
6078 interrupted operation. It should only be necessary when Mercurial
6079 suggests it.
6079 suggests it.
6080
6080
6081 Returns 0 if successful, 1 if nothing to recover or verify fails.
6081 Returns 0 if successful, 1 if nothing to recover or verify fails.
6082 """
6082 """
6083 if repo.recover():
6083 if repo.recover():
6084 return hg.verify(repo)
6084 return hg.verify(repo)
6085 return 1
6085 return 1
6086
6086
6087 @command('^remove|rm',
6087 @command('^remove|rm',
6088 [('A', 'after', None, _('record delete for missing files')),
6088 [('A', 'after', None, _('record delete for missing files')),
6089 ('f', 'force', None,
6089 ('f', 'force', None,
6090 _('forget added files, delete modified files')),
6090 _('forget added files, delete modified files')),
6091 ] + subrepoopts + walkopts,
6091 ] + subrepoopts + walkopts,
6092 _('[OPTION]... FILE...'),
6092 _('[OPTION]... FILE...'),
6093 inferrepo=True)
6093 inferrepo=True)
6094 def remove(ui, repo, *pats, **opts):
6094 def remove(ui, repo, *pats, **opts):
6095 """remove the specified files on the next commit
6095 """remove the specified files on the next commit
6096
6096
6097 Schedule the indicated files for removal from the current branch.
6097 Schedule the indicated files for removal from the current branch.
6098
6098
6099 This command schedules the files to be removed at the next commit.
6099 This command schedules the files to be removed at the next commit.
6100 To undo a remove before that, see :hg:`revert`. To undo added
6100 To undo a remove before that, see :hg:`revert`. To undo added
6101 files, see :hg:`forget`.
6101 files, see :hg:`forget`.
6102
6102
6103 .. container:: verbose
6103 .. container:: verbose
6104
6104
6105 -A/--after can be used to remove only files that have already
6105 -A/--after can be used to remove only files that have already
6106 been deleted, -f/--force can be used to force deletion, and -Af
6106 been deleted, -f/--force can be used to force deletion, and -Af
6107 can be used to remove files from the next revision without
6107 can be used to remove files from the next revision without
6108 deleting them from the working directory.
6108 deleting them from the working directory.
6109
6109
6110 The following table details the behavior of remove for different
6110 The following table details the behavior of remove for different
6111 file states (columns) and option combinations (rows). The file
6111 file states (columns) and option combinations (rows). The file
6112 states are Added [A], Clean [C], Modified [M] and Missing [!]
6112 states are Added [A], Clean [C], Modified [M] and Missing [!]
6113 (as reported by :hg:`status`). The actions are Warn, Remove
6113 (as reported by :hg:`status`). The actions are Warn, Remove
6114 (from branch) and Delete (from disk):
6114 (from branch) and Delete (from disk):
6115
6115
6116 ========= == == == ==
6116 ========= == == == ==
6117 opt/state A C M !
6117 opt/state A C M !
6118 ========= == == == ==
6118 ========= == == == ==
6119 none W RD W R
6119 none W RD W R
6120 -f R RD RD R
6120 -f R RD RD R
6121 -A W W W R
6121 -A W W W R
6122 -Af R R R R
6122 -Af R R R R
6123 ========= == == == ==
6123 ========= == == == ==
6124
6124
6125 .. note::
6125 .. note::
6126
6126
6127 :hg:`remove` never deletes files in Added [A] state from the
6127 :hg:`remove` never deletes files in Added [A] state from the
6128 working directory, not even if ``--force`` is specified.
6128 working directory, not even if ``--force`` is specified.
6129
6129
6130 Returns 0 on success, 1 if any warnings encountered.
6130 Returns 0 on success, 1 if any warnings encountered.
6131 """
6131 """
6132
6132
6133 after, force = opts.get('after'), opts.get('force')
6133 after, force = opts.get('after'), opts.get('force')
6134 if not pats and not after:
6134 if not pats and not after:
6135 raise error.Abort(_('no files specified'))
6135 raise error.Abort(_('no files specified'))
6136
6136
6137 m = scmutil.match(repo[None], pats, opts)
6137 m = scmutil.match(repo[None], pats, opts)
6138 subrepos = opts.get('subrepos')
6138 subrepos = opts.get('subrepos')
6139 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
6139 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
6140
6140
6141 @command('rename|move|mv',
6141 @command('rename|move|mv',
6142 [('A', 'after', None, _('record a rename that has already occurred')),
6142 [('A', 'after', None, _('record a rename that has already occurred')),
6143 ('f', 'force', None, _('forcibly copy over an existing managed file')),
6143 ('f', 'force', None, _('forcibly copy over an existing managed file')),
6144 ] + walkopts + dryrunopts,
6144 ] + walkopts + dryrunopts,
6145 _('[OPTION]... SOURCE... DEST'))
6145 _('[OPTION]... SOURCE... DEST'))
6146 def rename(ui, repo, *pats, **opts):
6146 def rename(ui, repo, *pats, **opts):
6147 """rename files; equivalent of copy + remove
6147 """rename files; equivalent of copy + remove
6148
6148
6149 Mark dest as copies of sources; mark sources for deletion. If dest
6149 Mark dest as copies of sources; mark sources for deletion. If dest
6150 is a directory, copies are put in that directory. If dest is a
6150 is a directory, copies are put in that directory. If dest is a
6151 file, there can only be one source.
6151 file, there can only be one source.
6152
6152
6153 By default, this command copies the contents of files as they
6153 By default, this command copies the contents of files as they
6154 exist in the working directory. If invoked with -A/--after, the
6154 exist in the working directory. If invoked with -A/--after, the
6155 operation is recorded, but no copying is performed.
6155 operation is recorded, but no copying is performed.
6156
6156
6157 This command takes effect at the next commit. To undo a rename
6157 This command takes effect at the next commit. To undo a rename
6158 before that, see :hg:`revert`.
6158 before that, see :hg:`revert`.
6159
6159
6160 Returns 0 on success, 1 if errors are encountered.
6160 Returns 0 on success, 1 if errors are encountered.
6161 """
6161 """
6162 with repo.wlock(False):
6162 with repo.wlock(False):
6163 return cmdutil.copy(ui, repo, pats, opts, rename=True)
6163 return cmdutil.copy(ui, repo, pats, opts, rename=True)
6164
6164
6165 @command('resolve',
6165 @command('resolve',
6166 [('a', 'all', None, _('select all unresolved files')),
6166 [('a', 'all', None, _('select all unresolved files')),
6167 ('l', 'list', None, _('list state of files needing merge')),
6167 ('l', 'list', None, _('list state of files needing merge')),
6168 ('m', 'mark', None, _('mark files as resolved')),
6168 ('m', 'mark', None, _('mark files as resolved')),
6169 ('u', 'unmark', None, _('mark files as unresolved')),
6169 ('u', 'unmark', None, _('mark files as unresolved')),
6170 ('n', 'no-status', None, _('hide status prefix'))]
6170 ('n', 'no-status', None, _('hide status prefix'))]
6171 + mergetoolopts + walkopts + formatteropts,
6171 + mergetoolopts + walkopts + formatteropts,
6172 _('[OPTION]... [FILE]...'),
6172 _('[OPTION]... [FILE]...'),
6173 inferrepo=True)
6173 inferrepo=True)
6174 def resolve(ui, repo, *pats, **opts):
6174 def resolve(ui, repo, *pats, **opts):
6175 """redo merges or set/view the merge status of files
6175 """redo merges or set/view the merge status of files
6176
6176
6177 Merges with unresolved conflicts are often the result of
6177 Merges with unresolved conflicts are often the result of
6178 non-interactive merging using the ``internal:merge`` configuration
6178 non-interactive merging using the ``internal:merge`` configuration
6179 setting, or a command-line merge tool like ``diff3``. The resolve
6179 setting, or a command-line merge tool like ``diff3``. The resolve
6180 command is used to manage the files involved in a merge, after
6180 command is used to manage the files involved in a merge, after
6181 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
6181 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
6182 working directory must have two parents). See :hg:`help
6182 working directory must have two parents). See :hg:`help
6183 merge-tools` for information on configuring merge tools.
6183 merge-tools` for information on configuring merge tools.
6184
6184
6185 The resolve command can be used in the following ways:
6185 The resolve command can be used in the following ways:
6186
6186
6187 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
6187 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
6188 files, discarding any previous merge attempts. Re-merging is not
6188 files, discarding any previous merge attempts. Re-merging is not
6189 performed for files already marked as resolved. Use ``--all/-a``
6189 performed for files already marked as resolved. Use ``--all/-a``
6190 to select all unresolved files. ``--tool`` can be used to specify
6190 to select all unresolved files. ``--tool`` can be used to specify
6191 the merge tool used for the given files. It overrides the HGMERGE
6191 the merge tool used for the given files. It overrides the HGMERGE
6192 environment variable and your configuration files. Previous file
6192 environment variable and your configuration files. Previous file
6193 contents are saved with a ``.orig`` suffix.
6193 contents are saved with a ``.orig`` suffix.
6194
6194
6195 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
6195 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
6196 (e.g. after having manually fixed-up the files). The default is
6196 (e.g. after having manually fixed-up the files). The default is
6197 to mark all unresolved files.
6197 to mark all unresolved files.
6198
6198
6199 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6199 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6200 default is to mark all resolved files.
6200 default is to mark all resolved files.
6201
6201
6202 - :hg:`resolve -l`: list files which had or still have conflicts.
6202 - :hg:`resolve -l`: list files which had or still have conflicts.
6203 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6203 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6204
6204
6205 .. note::
6205 .. note::
6206
6206
6207 Mercurial will not let you commit files with unresolved merge
6207 Mercurial will not let you commit files with unresolved merge
6208 conflicts. You must use :hg:`resolve -m ...` before you can
6208 conflicts. You must use :hg:`resolve -m ...` before you can
6209 commit after a conflicting merge.
6209 commit after a conflicting merge.
6210
6210
6211 Returns 0 on success, 1 if any files fail a resolve attempt.
6211 Returns 0 on success, 1 if any files fail a resolve attempt.
6212 """
6212 """
6213
6213
6214 flaglist = 'all mark unmark list no_status'.split()
6214 flaglist = 'all mark unmark list no_status'.split()
6215 all, mark, unmark, show, nostatus = \
6215 all, mark, unmark, show, nostatus = \
6216 [opts.get(o) for o in flaglist]
6216 [opts.get(o) for o in flaglist]
6217
6217
6218 if (show and (mark or unmark)) or (mark and unmark):
6218 if (show and (mark or unmark)) or (mark and unmark):
6219 raise error.Abort(_("too many options specified"))
6219 raise error.Abort(_("too many options specified"))
6220 if pats and all:
6220 if pats and all:
6221 raise error.Abort(_("can't specify --all and patterns"))
6221 raise error.Abort(_("can't specify --all and patterns"))
6222 if not (all or pats or show or mark or unmark):
6222 if not (all or pats or show or mark or unmark):
6223 raise error.Abort(_('no files or directories specified'),
6223 raise error.Abort(_('no files or directories specified'),
6224 hint=('use --all to re-merge all unresolved files'))
6224 hint=('use --all to re-merge all unresolved files'))
6225
6225
6226 if show:
6226 if show:
6227 fm = ui.formatter('resolve', opts)
6227 fm = ui.formatter('resolve', opts)
6228 ms = mergemod.mergestate.read(repo)
6228 ms = mergemod.mergestate.read(repo)
6229 m = scmutil.match(repo[None], pats, opts)
6229 m = scmutil.match(repo[None], pats, opts)
6230 for f in ms:
6230 for f in ms:
6231 if not m(f):
6231 if not m(f):
6232 continue
6232 continue
6233 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
6233 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
6234 'd': 'driverresolved'}[ms[f]]
6234 'd': 'driverresolved'}[ms[f]]
6235 fm.startitem()
6235 fm.startitem()
6236 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
6236 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
6237 fm.write('path', '%s\n', f, label=l)
6237 fm.write('path', '%s\n', f, label=l)
6238 fm.end()
6238 fm.end()
6239 return 0
6239 return 0
6240
6240
6241 with repo.wlock():
6241 with repo.wlock():
6242 ms = mergemod.mergestate.read(repo)
6242 ms = mergemod.mergestate.read(repo)
6243
6243
6244 if not (ms.active() or repo.dirstate.p2() != nullid):
6244 if not (ms.active() or repo.dirstate.p2() != nullid):
6245 raise error.Abort(
6245 raise error.Abort(
6246 _('resolve command not applicable when not merging'))
6246 _('resolve command not applicable when not merging'))
6247
6247
6248 wctx = repo[None]
6248 wctx = repo[None]
6249
6249
6250 if ms.mergedriver and ms.mdstate() == 'u':
6250 if ms.mergedriver and ms.mdstate() == 'u':
6251 proceed = mergemod.driverpreprocess(repo, ms, wctx)
6251 proceed = mergemod.driverpreprocess(repo, ms, wctx)
6252 ms.commit()
6252 ms.commit()
6253 # allow mark and unmark to go through
6253 # allow mark and unmark to go through
6254 if not mark and not unmark and not proceed:
6254 if not mark and not unmark and not proceed:
6255 return 1
6255 return 1
6256
6256
6257 m = scmutil.match(wctx, pats, opts)
6257 m = scmutil.match(wctx, pats, opts)
6258 ret = 0
6258 ret = 0
6259 didwork = False
6259 didwork = False
6260 runconclude = False
6260 runconclude = False
6261
6261
6262 tocomplete = []
6262 tocomplete = []
6263 for f in ms:
6263 for f in ms:
6264 if not m(f):
6264 if not m(f):
6265 continue
6265 continue
6266
6266
6267 didwork = True
6267 didwork = True
6268
6268
6269 # don't let driver-resolved files be marked, and run the conclude
6269 # don't let driver-resolved files be marked, and run the conclude
6270 # step if asked to resolve
6270 # step if asked to resolve
6271 if ms[f] == "d":
6271 if ms[f] == "d":
6272 exact = m.exact(f)
6272 exact = m.exact(f)
6273 if mark:
6273 if mark:
6274 if exact:
6274 if exact:
6275 ui.warn(_('not marking %s as it is driver-resolved\n')
6275 ui.warn(_('not marking %s as it is driver-resolved\n')
6276 % f)
6276 % f)
6277 elif unmark:
6277 elif unmark:
6278 if exact:
6278 if exact:
6279 ui.warn(_('not unmarking %s as it is driver-resolved\n')
6279 ui.warn(_('not unmarking %s as it is driver-resolved\n')
6280 % f)
6280 % f)
6281 else:
6281 else:
6282 runconclude = True
6282 runconclude = True
6283 continue
6283 continue
6284
6284
6285 if mark:
6285 if mark:
6286 ms.mark(f, "r")
6286 ms.mark(f, "r")
6287 elif unmark:
6287 elif unmark:
6288 ms.mark(f, "u")
6288 ms.mark(f, "u")
6289 else:
6289 else:
6290 # backup pre-resolve (merge uses .orig for its own purposes)
6290 # backup pre-resolve (merge uses .orig for its own purposes)
6291 a = repo.wjoin(f)
6291 a = repo.wjoin(f)
6292 try:
6292 try:
6293 util.copyfile(a, a + ".resolve")
6293 util.copyfile(a, a + ".resolve")
6294 except (IOError, OSError) as inst:
6294 except (IOError, OSError) as inst:
6295 if inst.errno != errno.ENOENT:
6295 if inst.errno != errno.ENOENT:
6296 raise
6296 raise
6297
6297
6298 try:
6298 try:
6299 # preresolve file
6299 # preresolve file
6300 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6300 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6301 'resolve')
6301 'resolve')
6302 complete, r = ms.preresolve(f, wctx)
6302 complete, r = ms.preresolve(f, wctx)
6303 if not complete:
6303 if not complete:
6304 tocomplete.append(f)
6304 tocomplete.append(f)
6305 elif r:
6305 elif r:
6306 ret = 1
6306 ret = 1
6307 finally:
6307 finally:
6308 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6308 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6309 ms.commit()
6309 ms.commit()
6310
6310
6311 # replace filemerge's .orig file with our resolve file, but only
6311 # replace filemerge's .orig file with our resolve file, but only
6312 # for merges that are complete
6312 # for merges that are complete
6313 if complete:
6313 if complete:
6314 try:
6314 try:
6315 util.rename(a + ".resolve",
6315 util.rename(a + ".resolve",
6316 scmutil.origpath(ui, repo, a))
6316 scmutil.origpath(ui, repo, a))
6317 except OSError as inst:
6317 except OSError as inst:
6318 if inst.errno != errno.ENOENT:
6318 if inst.errno != errno.ENOENT:
6319 raise
6319 raise
6320
6320
6321 for f in tocomplete:
6321 for f in tocomplete:
6322 try:
6322 try:
6323 # resolve file
6323 # resolve file
6324 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6324 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6325 'resolve')
6325 'resolve')
6326 r = ms.resolve(f, wctx)
6326 r = ms.resolve(f, wctx)
6327 if r:
6327 if r:
6328 ret = 1
6328 ret = 1
6329 finally:
6329 finally:
6330 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6330 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6331 ms.commit()
6331 ms.commit()
6332
6332
6333 # replace filemerge's .orig file with our resolve file
6333 # replace filemerge's .orig file with our resolve file
6334 a = repo.wjoin(f)
6334 a = repo.wjoin(f)
6335 try:
6335 try:
6336 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
6336 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
6337 except OSError as inst:
6337 except OSError as inst:
6338 if inst.errno != errno.ENOENT:
6338 if inst.errno != errno.ENOENT:
6339 raise
6339 raise
6340
6340
6341 ms.commit()
6341 ms.commit()
6342 ms.recordactions()
6342 ms.recordactions()
6343
6343
6344 if not didwork and pats:
6344 if not didwork and pats:
6345 hint = None
6345 hint = None
6346 if not any([p for p in pats if p.find(':') >= 0]):
6346 if not any([p for p in pats if p.find(':') >= 0]):
6347 pats = ['path:%s' % p for p in pats]
6347 pats = ['path:%s' % p for p in pats]
6348 m = scmutil.match(wctx, pats, opts)
6348 m = scmutil.match(wctx, pats, opts)
6349 for f in ms:
6349 for f in ms:
6350 if not m(f):
6350 if not m(f):
6351 continue
6351 continue
6352 flags = ''.join(['-%s ' % o[0] for o in flaglist
6352 flags = ''.join(['-%s ' % o[0] for o in flaglist
6353 if opts.get(o)])
6353 if opts.get(o)])
6354 hint = _("(try: hg resolve %s%s)\n") % (
6354 hint = _("(try: hg resolve %s%s)\n") % (
6355 flags,
6355 flags,
6356 ' '.join(pats))
6356 ' '.join(pats))
6357 break
6357 break
6358 ui.warn(_("arguments do not match paths that need resolving\n"))
6358 ui.warn(_("arguments do not match paths that need resolving\n"))
6359 if hint:
6359 if hint:
6360 ui.warn(hint)
6360 ui.warn(hint)
6361 elif ms.mergedriver and ms.mdstate() != 's':
6361 elif ms.mergedriver and ms.mdstate() != 's':
6362 # run conclude step when either a driver-resolved file is requested
6362 # run conclude step when either a driver-resolved file is requested
6363 # or there are no driver-resolved files
6363 # or there are no driver-resolved files
6364 # we can't use 'ret' to determine whether any files are unresolved
6364 # we can't use 'ret' to determine whether any files are unresolved
6365 # because we might not have tried to resolve some
6365 # because we might not have tried to resolve some
6366 if ((runconclude or not list(ms.driverresolved()))
6366 if ((runconclude or not list(ms.driverresolved()))
6367 and not list(ms.unresolved())):
6367 and not list(ms.unresolved())):
6368 proceed = mergemod.driverconclude(repo, ms, wctx)
6368 proceed = mergemod.driverconclude(repo, ms, wctx)
6369 ms.commit()
6369 ms.commit()
6370 if not proceed:
6370 if not proceed:
6371 return 1
6371 return 1
6372
6372
6373 # Nudge users into finishing an unfinished operation
6373 # Nudge users into finishing an unfinished operation
6374 unresolvedf = list(ms.unresolved())
6374 unresolvedf = list(ms.unresolved())
6375 driverresolvedf = list(ms.driverresolved())
6375 driverresolvedf = list(ms.driverresolved())
6376 if not unresolvedf and not driverresolvedf:
6376 if not unresolvedf and not driverresolvedf:
6377 ui.status(_('(no more unresolved files)\n'))
6377 ui.status(_('(no more unresolved files)\n'))
6378 cmdutil.checkafterresolved(repo)
6378 cmdutil.checkafterresolved(repo)
6379 elif not unresolvedf:
6379 elif not unresolvedf:
6380 ui.status(_('(no more unresolved files -- '
6380 ui.status(_('(no more unresolved files -- '
6381 'run "hg resolve --all" to conclude)\n'))
6381 'run "hg resolve --all" to conclude)\n'))
6382
6382
6383 return ret
6383 return ret
6384
6384
6385 @command('revert',
6385 @command('revert',
6386 [('a', 'all', None, _('revert all changes when no arguments given')),
6386 [('a', 'all', None, _('revert all changes when no arguments given')),
6387 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6387 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6388 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6388 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6389 ('C', 'no-backup', None, _('do not save backup copies of files')),
6389 ('C', 'no-backup', None, _('do not save backup copies of files')),
6390 ('i', 'interactive', None,
6390 ('i', 'interactive', None,
6391 _('interactively select the changes (EXPERIMENTAL)')),
6391 _('interactively select the changes (EXPERIMENTAL)')),
6392 ] + walkopts + dryrunopts,
6392 ] + walkopts + dryrunopts,
6393 _('[OPTION]... [-r REV] [NAME]...'))
6393 _('[OPTION]... [-r REV] [NAME]...'))
6394 def revert(ui, repo, *pats, **opts):
6394 def revert(ui, repo, *pats, **opts):
6395 """restore files to their checkout state
6395 """restore files to their checkout state
6396
6396
6397 .. note::
6397 .. note::
6398
6398
6399 To check out earlier revisions, you should use :hg:`update REV`.
6399 To check out earlier revisions, you should use :hg:`update REV`.
6400 To cancel an uncommitted merge (and lose your changes),
6400 To cancel an uncommitted merge (and lose your changes),
6401 use :hg:`update --clean .`.
6401 use :hg:`update --clean .`.
6402
6402
6403 With no revision specified, revert the specified files or directories
6403 With no revision specified, revert the specified files or directories
6404 to the contents they had in the parent of the working directory.
6404 to the contents they had in the parent of the working directory.
6405 This restores the contents of files to an unmodified
6405 This restores the contents of files to an unmodified
6406 state and unschedules adds, removes, copies, and renames. If the
6406 state and unschedules adds, removes, copies, and renames. If the
6407 working directory has two parents, you must explicitly specify a
6407 working directory has two parents, you must explicitly specify a
6408 revision.
6408 revision.
6409
6409
6410 Using the -r/--rev or -d/--date options, revert the given files or
6410 Using the -r/--rev or -d/--date options, revert the given files or
6411 directories to their states as of a specific revision. Because
6411 directories to their states as of a specific revision. Because
6412 revert does not change the working directory parents, this will
6412 revert does not change the working directory parents, this will
6413 cause these files to appear modified. This can be helpful to "back
6413 cause these files to appear modified. This can be helpful to "back
6414 out" some or all of an earlier change. See :hg:`backout` for a
6414 out" some or all of an earlier change. See :hg:`backout` for a
6415 related method.
6415 related method.
6416
6416
6417 Modified files are saved with a .orig suffix before reverting.
6417 Modified files are saved with a .orig suffix before reverting.
6418 To disable these backups, use --no-backup. It is possible to store
6418 To disable these backups, use --no-backup. It is possible to store
6419 the backup files in a custom directory relative to the root of the
6419 the backup files in a custom directory relative to the root of the
6420 repository by setting the ``ui.origbackuppath`` configuration
6420 repository by setting the ``ui.origbackuppath`` configuration
6421 option.
6421 option.
6422
6422
6423 See :hg:`help dates` for a list of formats valid for -d/--date.
6423 See :hg:`help dates` for a list of formats valid for -d/--date.
6424
6424
6425 See :hg:`help backout` for a way to reverse the effect of an
6425 See :hg:`help backout` for a way to reverse the effect of an
6426 earlier changeset.
6426 earlier changeset.
6427
6427
6428 Returns 0 on success.
6428 Returns 0 on success.
6429 """
6429 """
6430
6430
6431 if opts.get("date"):
6431 if opts.get("date"):
6432 if opts.get("rev"):
6432 if opts.get("rev"):
6433 raise error.Abort(_("you can't specify a revision and a date"))
6433 raise error.Abort(_("you can't specify a revision and a date"))
6434 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6434 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6435
6435
6436 parent, p2 = repo.dirstate.parents()
6436 parent, p2 = repo.dirstate.parents()
6437 if not opts.get('rev') and p2 != nullid:
6437 if not opts.get('rev') and p2 != nullid:
6438 # revert after merge is a trap for new users (issue2915)
6438 # revert after merge is a trap for new users (issue2915)
6439 raise error.Abort(_('uncommitted merge with no revision specified'),
6439 raise error.Abort(_('uncommitted merge with no revision specified'),
6440 hint=_("use 'hg update' or see 'hg help revert'"))
6440 hint=_("use 'hg update' or see 'hg help revert'"))
6441
6441
6442 ctx = scmutil.revsingle(repo, opts.get('rev'))
6442 ctx = scmutil.revsingle(repo, opts.get('rev'))
6443
6443
6444 if (not (pats or opts.get('include') or opts.get('exclude') or
6444 if (not (pats or opts.get('include') or opts.get('exclude') or
6445 opts.get('all') or opts.get('interactive'))):
6445 opts.get('all') or opts.get('interactive'))):
6446 msg = _("no files or directories specified")
6446 msg = _("no files or directories specified")
6447 if p2 != nullid:
6447 if p2 != nullid:
6448 hint = _("uncommitted merge, use --all to discard all changes,"
6448 hint = _("uncommitted merge, use --all to discard all changes,"
6449 " or 'hg update -C .' to abort the merge")
6449 " or 'hg update -C .' to abort the merge")
6450 raise error.Abort(msg, hint=hint)
6450 raise error.Abort(msg, hint=hint)
6451 dirty = any(repo.status())
6451 dirty = any(repo.status())
6452 node = ctx.node()
6452 node = ctx.node()
6453 if node != parent:
6453 if node != parent:
6454 if dirty:
6454 if dirty:
6455 hint = _("uncommitted changes, use --all to discard all"
6455 hint = _("uncommitted changes, use --all to discard all"
6456 " changes, or 'hg update %s' to update") % ctx.rev()
6456 " changes, or 'hg update %s' to update") % ctx.rev()
6457 else:
6457 else:
6458 hint = _("use --all to revert all files,"
6458 hint = _("use --all to revert all files,"
6459 " or 'hg update %s' to update") % ctx.rev()
6459 " or 'hg update %s' to update") % ctx.rev()
6460 elif dirty:
6460 elif dirty:
6461 hint = _("uncommitted changes, use --all to discard all changes")
6461 hint = _("uncommitted changes, use --all to discard all changes")
6462 else:
6462 else:
6463 hint = _("use --all to revert all files")
6463 hint = _("use --all to revert all files")
6464 raise error.Abort(msg, hint=hint)
6464 raise error.Abort(msg, hint=hint)
6465
6465
6466 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6466 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6467
6467
6468 @command('rollback', dryrunopts +
6468 @command('rollback', dryrunopts +
6469 [('f', 'force', False, _('ignore safety measures'))])
6469 [('f', 'force', False, _('ignore safety measures'))])
6470 def rollback(ui, repo, **opts):
6470 def rollback(ui, repo, **opts):
6471 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6471 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6472
6472
6473 Please use :hg:`commit --amend` instead of rollback to correct
6473 Please use :hg:`commit --amend` instead of rollback to correct
6474 mistakes in the last commit.
6474 mistakes in the last commit.
6475
6475
6476 This command should be used with care. There is only one level of
6476 This command should be used with care. There is only one level of
6477 rollback, and there is no way to undo a rollback. It will also
6477 rollback, and there is no way to undo a rollback. It will also
6478 restore the dirstate at the time of the last transaction, losing
6478 restore the dirstate at the time of the last transaction, losing
6479 any dirstate changes since that time. This command does not alter
6479 any dirstate changes since that time. This command does not alter
6480 the working directory.
6480 the working directory.
6481
6481
6482 Transactions are used to encapsulate the effects of all commands
6482 Transactions are used to encapsulate the effects of all commands
6483 that create new changesets or propagate existing changesets into a
6483 that create new changesets or propagate existing changesets into a
6484 repository.
6484 repository.
6485
6485
6486 .. container:: verbose
6486 .. container:: verbose
6487
6487
6488 For example, the following commands are transactional, and their
6488 For example, the following commands are transactional, and their
6489 effects can be rolled back:
6489 effects can be rolled back:
6490
6490
6491 - commit
6491 - commit
6492 - import
6492 - import
6493 - pull
6493 - pull
6494 - push (with this repository as the destination)
6494 - push (with this repository as the destination)
6495 - unbundle
6495 - unbundle
6496
6496
6497 To avoid permanent data loss, rollback will refuse to rollback a
6497 To avoid permanent data loss, rollback will refuse to rollback a
6498 commit transaction if it isn't checked out. Use --force to
6498 commit transaction if it isn't checked out. Use --force to
6499 override this protection.
6499 override this protection.
6500
6500
6501 The rollback command can be entirely disabled by setting the
6501 The rollback command can be entirely disabled by setting the
6502 ``ui.rollback`` configuration setting to false. If you're here
6502 ``ui.rollback`` configuration setting to false. If you're here
6503 because you want to use rollback and it's disabled, you can
6503 because you want to use rollback and it's disabled, you can
6504 re-enable the command by setting ``ui.rollback`` to true.
6504 re-enable the command by setting ``ui.rollback`` to true.
6505
6505
6506 This command is not intended for use on public repositories. Once
6506 This command is not intended for use on public repositories. Once
6507 changes are visible for pull by other users, rolling a transaction
6507 changes are visible for pull by other users, rolling a transaction
6508 back locally is ineffective (someone else may already have pulled
6508 back locally is ineffective (someone else may already have pulled
6509 the changes). Furthermore, a race is possible with readers of the
6509 the changes). Furthermore, a race is possible with readers of the
6510 repository; for example an in-progress pull from the repository
6510 repository; for example an in-progress pull from the repository
6511 may fail if a rollback is performed.
6511 may fail if a rollback is performed.
6512
6512
6513 Returns 0 on success, 1 if no rollback data is available.
6513 Returns 0 on success, 1 if no rollback data is available.
6514 """
6514 """
6515 if not ui.configbool('ui', 'rollback', True):
6515 if not ui.configbool('ui', 'rollback', True):
6516 raise error.Abort(_('rollback is disabled because it is unsafe'),
6516 raise error.Abort(_('rollback is disabled because it is unsafe'),
6517 hint=('see `hg help -v rollback` for information'))
6517 hint=('see `hg help -v rollback` for information'))
6518 return repo.rollback(dryrun=opts.get('dry_run'),
6518 return repo.rollback(dryrun=opts.get('dry_run'),
6519 force=opts.get('force'))
6519 force=opts.get('force'))
6520
6520
6521 @command('root', [])
6521 @command('root', [])
6522 def root(ui, repo):
6522 def root(ui, repo):
6523 """print the root (top) of the current working directory
6523 """print the root (top) of the current working directory
6524
6524
6525 Print the root directory of the current repository.
6525 Print the root directory of the current repository.
6526
6526
6527 Returns 0 on success.
6527 Returns 0 on success.
6528 """
6528 """
6529 ui.write(repo.root + "\n")
6529 ui.write(repo.root + "\n")
6530
6530
6531 @command('^serve',
6531 @command('^serve',
6532 [('A', 'accesslog', '', _('name of access log file to write to'),
6532 [('A', 'accesslog', '', _('name of access log file to write to'),
6533 _('FILE')),
6533 _('FILE')),
6534 ('d', 'daemon', None, _('run server in background')),
6534 ('d', 'daemon', None, _('run server in background')),
6535 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
6535 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
6536 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6536 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6537 # use string type, then we can check if something was passed
6537 # use string type, then we can check if something was passed
6538 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6538 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6539 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6539 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6540 _('ADDR')),
6540 _('ADDR')),
6541 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6541 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6542 _('PREFIX')),
6542 _('PREFIX')),
6543 ('n', 'name', '',
6543 ('n', 'name', '',
6544 _('name to show in web pages (default: working directory)'), _('NAME')),
6544 _('name to show in web pages (default: working directory)'), _('NAME')),
6545 ('', 'web-conf', '',
6545 ('', 'web-conf', '',
6546 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6546 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6547 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6547 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6548 _('FILE')),
6548 _('FILE')),
6549 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6549 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6550 ('', 'stdio', None, _('for remote clients')),
6550 ('', 'stdio', None, _('for remote clients')),
6551 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6551 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6552 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6552 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6553 ('', 'style', '', _('template style to use'), _('STYLE')),
6553 ('', 'style', '', _('template style to use'), _('STYLE')),
6554 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6554 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6555 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6555 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6556 _('[OPTION]...'),
6556 _('[OPTION]...'),
6557 optionalrepo=True)
6557 optionalrepo=True)
6558 def serve(ui, repo, **opts):
6558 def serve(ui, repo, **opts):
6559 """start stand-alone webserver
6559 """start stand-alone webserver
6560
6560
6561 Start a local HTTP repository browser and pull server. You can use
6561 Start a local HTTP repository browser and pull server. You can use
6562 this for ad-hoc sharing and browsing of repositories. It is
6562 this for ad-hoc sharing and browsing of repositories. It is
6563 recommended to use a real web server to serve a repository for
6563 recommended to use a real web server to serve a repository for
6564 longer periods of time.
6564 longer periods of time.
6565
6565
6566 Please note that the server does not implement access control.
6566 Please note that the server does not implement access control.
6567 This means that, by default, anybody can read from the server and
6567 This means that, by default, anybody can read from the server and
6568 nobody can write to it by default. Set the ``web.allow_push``
6568 nobody can write to it by default. Set the ``web.allow_push``
6569 option to ``*`` to allow everybody to push to the server. You
6569 option to ``*`` to allow everybody to push to the server. You
6570 should use a real web server if you need to authenticate users.
6570 should use a real web server if you need to authenticate users.
6571
6571
6572 By default, the server logs accesses to stdout and errors to
6572 By default, the server logs accesses to stdout and errors to
6573 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6573 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6574 files.
6574 files.
6575
6575
6576 To have the server choose a free port number to listen on, specify
6576 To have the server choose a free port number to listen on, specify
6577 a port number of 0; in this case, the server will print the port
6577 a port number of 0; in this case, the server will print the port
6578 number it uses.
6578 number it uses.
6579
6579
6580 Returns 0 on success.
6580 Returns 0 on success.
6581 """
6581 """
6582
6582
6583 if opts["stdio"] and opts["cmdserver"]:
6583 if opts["stdio"] and opts["cmdserver"]:
6584 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6584 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6585
6585
6586 if opts["stdio"]:
6586 if opts["stdio"]:
6587 if repo is None:
6587 if repo is None:
6588 raise error.RepoError(_("there is no Mercurial repository here"
6588 raise error.RepoError(_("there is no Mercurial repository here"
6589 " (.hg not found)"))
6589 " (.hg not found)"))
6590 s = sshserver.sshserver(ui, repo)
6590 s = sshserver.sshserver(ui, repo)
6591 s.serve_forever()
6591 s.serve_forever()
6592
6592
6593 if opts["cmdserver"]:
6593 if opts["cmdserver"]:
6594 service = commandserver.createservice(ui, repo, opts)
6594 service = commandserver.createservice(ui, repo, opts)
6595 else:
6595 else:
6596 service = hgweb.createservice(ui, repo, opts)
6596 service = hgweb.createservice(ui, repo, opts)
6597 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6597 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6598
6598
6599 @command('^status|st',
6599 @command('^status|st',
6600 [('A', 'all', None, _('show status of all files')),
6600 [('A', 'all', None, _('show status of all files')),
6601 ('m', 'modified', None, _('show only modified files')),
6601 ('m', 'modified', None, _('show only modified files')),
6602 ('a', 'added', None, _('show only added files')),
6602 ('a', 'added', None, _('show only added files')),
6603 ('r', 'removed', None, _('show only removed files')),
6603 ('r', 'removed', None, _('show only removed files')),
6604 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6604 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6605 ('c', 'clean', None, _('show only files without changes')),
6605 ('c', 'clean', None, _('show only files without changes')),
6606 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6606 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6607 ('i', 'ignored', None, _('show only ignored files')),
6607 ('i', 'ignored', None, _('show only ignored files')),
6608 ('n', 'no-status', None, _('hide status prefix')),
6608 ('n', 'no-status', None, _('hide status prefix')),
6609 ('C', 'copies', None, _('show source of copied files')),
6609 ('C', 'copies', None, _('show source of copied files')),
6610 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6610 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6611 ('', 'rev', [], _('show difference from revision'), _('REV')),
6611 ('', 'rev', [], _('show difference from revision'), _('REV')),
6612 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6612 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6613 ] + walkopts + subrepoopts + formatteropts,
6613 ] + walkopts + subrepoopts + formatteropts,
6614 _('[OPTION]... [FILE]...'),
6614 _('[OPTION]... [FILE]...'),
6615 inferrepo=True)
6615 inferrepo=True)
6616 def status(ui, repo, *pats, **opts):
6616 def status(ui, repo, *pats, **opts):
6617 """show changed files in the working directory
6617 """show changed files in the working directory
6618
6618
6619 Show status of files in the repository. If names are given, only
6619 Show status of files in the repository. If names are given, only
6620 files that match are shown. Files that are clean or ignored or
6620 files that match are shown. Files that are clean or ignored or
6621 the source of a copy/move operation, are not listed unless
6621 the source of a copy/move operation, are not listed unless
6622 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6622 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6623 Unless options described with "show only ..." are given, the
6623 Unless options described with "show only ..." are given, the
6624 options -mardu are used.
6624 options -mardu are used.
6625
6625
6626 Option -q/--quiet hides untracked (unknown and ignored) files
6626 Option -q/--quiet hides untracked (unknown and ignored) files
6627 unless explicitly requested with -u/--unknown or -i/--ignored.
6627 unless explicitly requested with -u/--unknown or -i/--ignored.
6628
6628
6629 .. note::
6629 .. note::
6630
6630
6631 :hg:`status` may appear to disagree with diff if permissions have
6631 :hg:`status` may appear to disagree with diff if permissions have
6632 changed or a merge has occurred. The standard diff format does
6632 changed or a merge has occurred. The standard diff format does
6633 not report permission changes and diff only reports changes
6633 not report permission changes and diff only reports changes
6634 relative to one merge parent.
6634 relative to one merge parent.
6635
6635
6636 If one revision is given, it is used as the base revision.
6636 If one revision is given, it is used as the base revision.
6637 If two revisions are given, the differences between them are
6637 If two revisions are given, the differences between them are
6638 shown. The --change option can also be used as a shortcut to list
6638 shown. The --change option can also be used as a shortcut to list
6639 the changed files of a revision from its first parent.
6639 the changed files of a revision from its first parent.
6640
6640
6641 The codes used to show the status of files are::
6641 The codes used to show the status of files are::
6642
6642
6643 M = modified
6643 M = modified
6644 A = added
6644 A = added
6645 R = removed
6645 R = removed
6646 C = clean
6646 C = clean
6647 ! = missing (deleted by non-hg command, but still tracked)
6647 ! = missing (deleted by non-hg command, but still tracked)
6648 ? = not tracked
6648 ? = not tracked
6649 I = ignored
6649 I = ignored
6650 = origin of the previous file (with --copies)
6650 = origin of the previous file (with --copies)
6651
6651
6652 .. container:: verbose
6652 .. container:: verbose
6653
6653
6654 Examples:
6654 Examples:
6655
6655
6656 - show changes in the working directory relative to a
6656 - show changes in the working directory relative to a
6657 changeset::
6657 changeset::
6658
6658
6659 hg status --rev 9353
6659 hg status --rev 9353
6660
6660
6661 - show changes in the working directory relative to the
6661 - show changes in the working directory relative to the
6662 current directory (see :hg:`help patterns` for more information)::
6662 current directory (see :hg:`help patterns` for more information)::
6663
6663
6664 hg status re:
6664 hg status re:
6665
6665
6666 - show all changes including copies in an existing changeset::
6666 - show all changes including copies in an existing changeset::
6667
6667
6668 hg status --copies --change 9353
6668 hg status --copies --change 9353
6669
6669
6670 - get a NUL separated list of added files, suitable for xargs::
6670 - get a NUL separated list of added files, suitable for xargs::
6671
6671
6672 hg status -an0
6672 hg status -an0
6673
6673
6674 Returns 0 on success.
6674 Returns 0 on success.
6675 """
6675 """
6676
6676
6677 revs = opts.get('rev')
6677 revs = opts.get('rev')
6678 change = opts.get('change')
6678 change = opts.get('change')
6679
6679
6680 if revs and change:
6680 if revs and change:
6681 msg = _('cannot specify --rev and --change at the same time')
6681 msg = _('cannot specify --rev and --change at the same time')
6682 raise error.Abort(msg)
6682 raise error.Abort(msg)
6683 elif change:
6683 elif change:
6684 node2 = scmutil.revsingle(repo, change, None).node()
6684 node2 = scmutil.revsingle(repo, change, None).node()
6685 node1 = repo[node2].p1().node()
6685 node1 = repo[node2].p1().node()
6686 else:
6686 else:
6687 node1, node2 = scmutil.revpair(repo, revs)
6687 node1, node2 = scmutil.revpair(repo, revs)
6688
6688
6689 if pats:
6689 if pats:
6690 cwd = repo.getcwd()
6690 cwd = repo.getcwd()
6691 else:
6691 else:
6692 cwd = ''
6692 cwd = ''
6693
6693
6694 if opts.get('print0'):
6694 if opts.get('print0'):
6695 end = '\0'
6695 end = '\0'
6696 else:
6696 else:
6697 end = '\n'
6697 end = '\n'
6698 copy = {}
6698 copy = {}
6699 states = 'modified added removed deleted unknown ignored clean'.split()
6699 states = 'modified added removed deleted unknown ignored clean'.split()
6700 show = [k for k in states if opts.get(k)]
6700 show = [k for k in states if opts.get(k)]
6701 if opts.get('all'):
6701 if opts.get('all'):
6702 show += ui.quiet and (states[:4] + ['clean']) or states
6702 show += ui.quiet and (states[:4] + ['clean']) or states
6703 if not show:
6703 if not show:
6704 if ui.quiet:
6704 if ui.quiet:
6705 show = states[:4]
6705 show = states[:4]
6706 else:
6706 else:
6707 show = states[:5]
6707 show = states[:5]
6708
6708
6709 m = scmutil.match(repo[node2], pats, opts)
6709 m = scmutil.match(repo[node2], pats, opts)
6710 stat = repo.status(node1, node2, m,
6710 stat = repo.status(node1, node2, m,
6711 'ignored' in show, 'clean' in show, 'unknown' in show,
6711 'ignored' in show, 'clean' in show, 'unknown' in show,
6712 opts.get('subrepos'))
6712 opts.get('subrepos'))
6713 changestates = zip(states, 'MAR!?IC', stat)
6713 changestates = zip(states, 'MAR!?IC', stat)
6714
6714
6715 if (opts.get('all') or opts.get('copies')
6715 if (opts.get('all') or opts.get('copies')
6716 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6716 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6717 copy = copies.pathcopies(repo[node1], repo[node2], m)
6717 copy = copies.pathcopies(repo[node1], repo[node2], m)
6718
6718
6719 fm = ui.formatter('status', opts)
6719 fm = ui.formatter('status', opts)
6720 fmt = '%s' + end
6720 fmt = '%s' + end
6721 showchar = not opts.get('no_status')
6721 showchar = not opts.get('no_status')
6722
6722
6723 for state, char, files in changestates:
6723 for state, char, files in changestates:
6724 if state in show:
6724 if state in show:
6725 label = 'status.' + state
6725 label = 'status.' + state
6726 for f in files:
6726 for f in files:
6727 fm.startitem()
6727 fm.startitem()
6728 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6728 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6729 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6729 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6730 if f in copy:
6730 if f in copy:
6731 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6731 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6732 label='status.copied')
6732 label='status.copied')
6733 fm.end()
6733 fm.end()
6734
6734
6735 @command('^summary|sum',
6735 @command('^summary|sum',
6736 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6736 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6737 def summary(ui, repo, **opts):
6737 def summary(ui, repo, **opts):
6738 """summarize working directory state
6738 """summarize working directory state
6739
6739
6740 This generates a brief summary of the working directory state,
6740 This generates a brief summary of the working directory state,
6741 including parents, branch, commit status, phase and available updates.
6741 including parents, branch, commit status, phase and available updates.
6742
6742
6743 With the --remote option, this will check the default paths for
6743 With the --remote option, this will check the default paths for
6744 incoming and outgoing changes. This can be time-consuming.
6744 incoming and outgoing changes. This can be time-consuming.
6745
6745
6746 Returns 0 on success.
6746 Returns 0 on success.
6747 """
6747 """
6748
6748
6749 ctx = repo[None]
6749 ctx = repo[None]
6750 parents = ctx.parents()
6750 parents = ctx.parents()
6751 pnode = parents[0].node()
6751 pnode = parents[0].node()
6752 marks = []
6752 marks = []
6753
6753
6754 ms = None
6754 ms = None
6755 try:
6755 try:
6756 ms = mergemod.mergestate.read(repo)
6756 ms = mergemod.mergestate.read(repo)
6757 except error.UnsupportedMergeRecords as e:
6757 except error.UnsupportedMergeRecords as e:
6758 s = ' '.join(e.recordtypes)
6758 s = ' '.join(e.recordtypes)
6759 ui.warn(
6759 ui.warn(
6760 _('warning: merge state has unsupported record types: %s\n') % s)
6760 _('warning: merge state has unsupported record types: %s\n') % s)
6761 unresolved = 0
6761 unresolved = 0
6762 else:
6762 else:
6763 unresolved = [f for f in ms if ms[f] == 'u']
6763 unresolved = [f for f in ms if ms[f] == 'u']
6764
6764
6765 for p in parents:
6765 for p in parents:
6766 # label with log.changeset (instead of log.parent) since this
6766 # label with log.changeset (instead of log.parent) since this
6767 # shows a working directory parent *changeset*:
6767 # shows a working directory parent *changeset*:
6768 # i18n: column positioning for "hg summary"
6768 # i18n: column positioning for "hg summary"
6769 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6769 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6770 label='log.changeset changeset.%s' % p.phasestr())
6770 label='log.changeset changeset.%s' % p.phasestr())
6771 ui.write(' '.join(p.tags()), label='log.tag')
6771 ui.write(' '.join(p.tags()), label='log.tag')
6772 if p.bookmarks():
6772 if p.bookmarks():
6773 marks.extend(p.bookmarks())
6773 marks.extend(p.bookmarks())
6774 if p.rev() == -1:
6774 if p.rev() == -1:
6775 if not len(repo):
6775 if not len(repo):
6776 ui.write(_(' (empty repository)'))
6776 ui.write(_(' (empty repository)'))
6777 else:
6777 else:
6778 ui.write(_(' (no revision checked out)'))
6778 ui.write(_(' (no revision checked out)'))
6779 ui.write('\n')
6779 ui.write('\n')
6780 if p.description():
6780 if p.description():
6781 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6781 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6782 label='log.summary')
6782 label='log.summary')
6783
6783
6784 branch = ctx.branch()
6784 branch = ctx.branch()
6785 bheads = repo.branchheads(branch)
6785 bheads = repo.branchheads(branch)
6786 # i18n: column positioning for "hg summary"
6786 # i18n: column positioning for "hg summary"
6787 m = _('branch: %s\n') % branch
6787 m = _('branch: %s\n') % branch
6788 if branch != 'default':
6788 if branch != 'default':
6789 ui.write(m, label='log.branch')
6789 ui.write(m, label='log.branch')
6790 else:
6790 else:
6791 ui.status(m, label='log.branch')
6791 ui.status(m, label='log.branch')
6792
6792
6793 if marks:
6793 if marks:
6794 active = repo._activebookmark
6794 active = repo._activebookmark
6795 # i18n: column positioning for "hg summary"
6795 # i18n: column positioning for "hg summary"
6796 ui.write(_('bookmarks:'), label='log.bookmark')
6796 ui.write(_('bookmarks:'), label='log.bookmark')
6797 if active is not None:
6797 if active is not None:
6798 if active in marks:
6798 if active in marks:
6799 ui.write(' *' + active, label=activebookmarklabel)
6799 ui.write(' *' + active, label=activebookmarklabel)
6800 marks.remove(active)
6800 marks.remove(active)
6801 else:
6801 else:
6802 ui.write(' [%s]' % active, label=activebookmarklabel)
6802 ui.write(' [%s]' % active, label=activebookmarklabel)
6803 for m in marks:
6803 for m in marks:
6804 ui.write(' ' + m, label='log.bookmark')
6804 ui.write(' ' + m, label='log.bookmark')
6805 ui.write('\n', label='log.bookmark')
6805 ui.write('\n', label='log.bookmark')
6806
6806
6807 status = repo.status(unknown=True)
6807 status = repo.status(unknown=True)
6808
6808
6809 c = repo.dirstate.copies()
6809 c = repo.dirstate.copies()
6810 copied, renamed = [], []
6810 copied, renamed = [], []
6811 for d, s in c.iteritems():
6811 for d, s in c.iteritems():
6812 if s in status.removed:
6812 if s in status.removed:
6813 status.removed.remove(s)
6813 status.removed.remove(s)
6814 renamed.append(d)
6814 renamed.append(d)
6815 else:
6815 else:
6816 copied.append(d)
6816 copied.append(d)
6817 if d in status.added:
6817 if d in status.added:
6818 status.added.remove(d)
6818 status.added.remove(d)
6819
6819
6820 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6820 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6821
6821
6822 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6822 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6823 (ui.label(_('%d added'), 'status.added'), status.added),
6823 (ui.label(_('%d added'), 'status.added'), status.added),
6824 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6824 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6825 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6825 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6826 (ui.label(_('%d copied'), 'status.copied'), copied),
6826 (ui.label(_('%d copied'), 'status.copied'), copied),
6827 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6827 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6828 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6828 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6829 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6829 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6830 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6830 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6831 t = []
6831 t = []
6832 for l, s in labels:
6832 for l, s in labels:
6833 if s:
6833 if s:
6834 t.append(l % len(s))
6834 t.append(l % len(s))
6835
6835
6836 t = ', '.join(t)
6836 t = ', '.join(t)
6837 cleanworkdir = False
6837 cleanworkdir = False
6838
6838
6839 if repo.vfs.exists('graftstate'):
6839 if repo.vfs.exists('graftstate'):
6840 t += _(' (graft in progress)')
6840 t += _(' (graft in progress)')
6841 if repo.vfs.exists('updatestate'):
6841 if repo.vfs.exists('updatestate'):
6842 t += _(' (interrupted update)')
6842 t += _(' (interrupted update)')
6843 elif len(parents) > 1:
6843 elif len(parents) > 1:
6844 t += _(' (merge)')
6844 t += _(' (merge)')
6845 elif branch != parents[0].branch():
6845 elif branch != parents[0].branch():
6846 t += _(' (new branch)')
6846 t += _(' (new branch)')
6847 elif (parents[0].closesbranch() and
6847 elif (parents[0].closesbranch() and
6848 pnode in repo.branchheads(branch, closed=True)):
6848 pnode in repo.branchheads(branch, closed=True)):
6849 t += _(' (head closed)')
6849 t += _(' (head closed)')
6850 elif not (status.modified or status.added or status.removed or renamed or
6850 elif not (status.modified or status.added or status.removed or renamed or
6851 copied or subs):
6851 copied or subs):
6852 t += _(' (clean)')
6852 t += _(' (clean)')
6853 cleanworkdir = True
6853 cleanworkdir = True
6854 elif pnode not in bheads:
6854 elif pnode not in bheads:
6855 t += _(' (new branch head)')
6855 t += _(' (new branch head)')
6856
6856
6857 if parents:
6857 if parents:
6858 pendingphase = max(p.phase() for p in parents)
6858 pendingphase = max(p.phase() for p in parents)
6859 else:
6859 else:
6860 pendingphase = phases.public
6860 pendingphase = phases.public
6861
6861
6862 if pendingphase > phases.newcommitphase(ui):
6862 if pendingphase > phases.newcommitphase(ui):
6863 t += ' (%s)' % phases.phasenames[pendingphase]
6863 t += ' (%s)' % phases.phasenames[pendingphase]
6864
6864
6865 if cleanworkdir:
6865 if cleanworkdir:
6866 # i18n: column positioning for "hg summary"
6866 # i18n: column positioning for "hg summary"
6867 ui.status(_('commit: %s\n') % t.strip())
6867 ui.status(_('commit: %s\n') % t.strip())
6868 else:
6868 else:
6869 # i18n: column positioning for "hg summary"
6869 # i18n: column positioning for "hg summary"
6870 ui.write(_('commit: %s\n') % t.strip())
6870 ui.write(_('commit: %s\n') % t.strip())
6871
6871
6872 # all ancestors of branch heads - all ancestors of parent = new csets
6872 # all ancestors of branch heads - all ancestors of parent = new csets
6873 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6873 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6874 bheads))
6874 bheads))
6875
6875
6876 if new == 0:
6876 if new == 0:
6877 # i18n: column positioning for "hg summary"
6877 # i18n: column positioning for "hg summary"
6878 ui.status(_('update: (current)\n'))
6878 ui.status(_('update: (current)\n'))
6879 elif pnode not in bheads:
6879 elif pnode not in bheads:
6880 # i18n: column positioning for "hg summary"
6880 # i18n: column positioning for "hg summary"
6881 ui.write(_('update: %d new changesets (update)\n') % new)
6881 ui.write(_('update: %d new changesets (update)\n') % new)
6882 else:
6882 else:
6883 # i18n: column positioning for "hg summary"
6883 # i18n: column positioning for "hg summary"
6884 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6884 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6885 (new, len(bheads)))
6885 (new, len(bheads)))
6886
6886
6887 t = []
6887 t = []
6888 draft = len(repo.revs('draft()'))
6888 draft = len(repo.revs('draft()'))
6889 if draft:
6889 if draft:
6890 t.append(_('%d draft') % draft)
6890 t.append(_('%d draft') % draft)
6891 secret = len(repo.revs('secret()'))
6891 secret = len(repo.revs('secret()'))
6892 if secret:
6892 if secret:
6893 t.append(_('%d secret') % secret)
6893 t.append(_('%d secret') % secret)
6894
6894
6895 if draft or secret:
6895 if draft or secret:
6896 ui.status(_('phases: %s\n') % ', '.join(t))
6896 ui.status(_('phases: %s\n') % ', '.join(t))
6897
6897
6898 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6898 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6899 for trouble in ("unstable", "divergent", "bumped"):
6899 for trouble in ("unstable", "divergent", "bumped"):
6900 numtrouble = len(repo.revs(trouble + "()"))
6900 numtrouble = len(repo.revs(trouble + "()"))
6901 # We write all the possibilities to ease translation
6901 # We write all the possibilities to ease translation
6902 troublemsg = {
6902 troublemsg = {
6903 "unstable": _("unstable: %d changesets"),
6903 "unstable": _("unstable: %d changesets"),
6904 "divergent": _("divergent: %d changesets"),
6904 "divergent": _("divergent: %d changesets"),
6905 "bumped": _("bumped: %d changesets"),
6905 "bumped": _("bumped: %d changesets"),
6906 }
6906 }
6907 if numtrouble > 0:
6907 if numtrouble > 0:
6908 ui.status(troublemsg[trouble] % numtrouble + "\n")
6908 ui.status(troublemsg[trouble] % numtrouble + "\n")
6909
6909
6910 cmdutil.summaryhooks(ui, repo)
6910 cmdutil.summaryhooks(ui, repo)
6911
6911
6912 if opts.get('remote'):
6912 if opts.get('remote'):
6913 needsincoming, needsoutgoing = True, True
6913 needsincoming, needsoutgoing = True, True
6914 else:
6914 else:
6915 needsincoming, needsoutgoing = False, False
6915 needsincoming, needsoutgoing = False, False
6916 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6916 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6917 if i:
6917 if i:
6918 needsincoming = True
6918 needsincoming = True
6919 if o:
6919 if o:
6920 needsoutgoing = True
6920 needsoutgoing = True
6921 if not needsincoming and not needsoutgoing:
6921 if not needsincoming and not needsoutgoing:
6922 return
6922 return
6923
6923
6924 def getincoming():
6924 def getincoming():
6925 source, branches = hg.parseurl(ui.expandpath('default'))
6925 source, branches = hg.parseurl(ui.expandpath('default'))
6926 sbranch = branches[0]
6926 sbranch = branches[0]
6927 try:
6927 try:
6928 other = hg.peer(repo, {}, source)
6928 other = hg.peer(repo, {}, source)
6929 except error.RepoError:
6929 except error.RepoError:
6930 if opts.get('remote'):
6930 if opts.get('remote'):
6931 raise
6931 raise
6932 return source, sbranch, None, None, None
6932 return source, sbranch, None, None, None
6933 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6933 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6934 if revs:
6934 if revs:
6935 revs = [other.lookup(rev) for rev in revs]
6935 revs = [other.lookup(rev) for rev in revs]
6936 ui.debug('comparing with %s\n' % util.hidepassword(source))
6936 ui.debug('comparing with %s\n' % util.hidepassword(source))
6937 repo.ui.pushbuffer()
6937 repo.ui.pushbuffer()
6938 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6938 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6939 repo.ui.popbuffer()
6939 repo.ui.popbuffer()
6940 return source, sbranch, other, commoninc, commoninc[1]
6940 return source, sbranch, other, commoninc, commoninc[1]
6941
6941
6942 if needsincoming:
6942 if needsincoming:
6943 source, sbranch, sother, commoninc, incoming = getincoming()
6943 source, sbranch, sother, commoninc, incoming = getincoming()
6944 else:
6944 else:
6945 source = sbranch = sother = commoninc = incoming = None
6945 source = sbranch = sother = commoninc = incoming = None
6946
6946
6947 def getoutgoing():
6947 def getoutgoing():
6948 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6948 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6949 dbranch = branches[0]
6949 dbranch = branches[0]
6950 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6950 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6951 if source != dest:
6951 if source != dest:
6952 try:
6952 try:
6953 dother = hg.peer(repo, {}, dest)
6953 dother = hg.peer(repo, {}, dest)
6954 except error.RepoError:
6954 except error.RepoError:
6955 if opts.get('remote'):
6955 if opts.get('remote'):
6956 raise
6956 raise
6957 return dest, dbranch, None, None
6957 return dest, dbranch, None, None
6958 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6958 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6959 elif sother is None:
6959 elif sother is None:
6960 # there is no explicit destination peer, but source one is invalid
6960 # there is no explicit destination peer, but source one is invalid
6961 return dest, dbranch, None, None
6961 return dest, dbranch, None, None
6962 else:
6962 else:
6963 dother = sother
6963 dother = sother
6964 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6964 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6965 common = None
6965 common = None
6966 else:
6966 else:
6967 common = commoninc
6967 common = commoninc
6968 if revs:
6968 if revs:
6969 revs = [repo.lookup(rev) for rev in revs]
6969 revs = [repo.lookup(rev) for rev in revs]
6970 repo.ui.pushbuffer()
6970 repo.ui.pushbuffer()
6971 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6971 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6972 commoninc=common)
6972 commoninc=common)
6973 repo.ui.popbuffer()
6973 repo.ui.popbuffer()
6974 return dest, dbranch, dother, outgoing
6974 return dest, dbranch, dother, outgoing
6975
6975
6976 if needsoutgoing:
6976 if needsoutgoing:
6977 dest, dbranch, dother, outgoing = getoutgoing()
6977 dest, dbranch, dother, outgoing = getoutgoing()
6978 else:
6978 else:
6979 dest = dbranch = dother = outgoing = None
6979 dest = dbranch = dother = outgoing = None
6980
6980
6981 if opts.get('remote'):
6981 if opts.get('remote'):
6982 t = []
6982 t = []
6983 if incoming:
6983 if incoming:
6984 t.append(_('1 or more incoming'))
6984 t.append(_('1 or more incoming'))
6985 o = outgoing.missing
6985 o = outgoing.missing
6986 if o:
6986 if o:
6987 t.append(_('%d outgoing') % len(o))
6987 t.append(_('%d outgoing') % len(o))
6988 other = dother or sother
6988 other = dother or sother
6989 if 'bookmarks' in other.listkeys('namespaces'):
6989 if 'bookmarks' in other.listkeys('namespaces'):
6990 counts = bookmarks.summary(repo, other)
6990 counts = bookmarks.summary(repo, other)
6991 if counts[0] > 0:
6991 if counts[0] > 0:
6992 t.append(_('%d incoming bookmarks') % counts[0])
6992 t.append(_('%d incoming bookmarks') % counts[0])
6993 if counts[1] > 0:
6993 if counts[1] > 0:
6994 t.append(_('%d outgoing bookmarks') % counts[1])
6994 t.append(_('%d outgoing bookmarks') % counts[1])
6995
6995
6996 if t:
6996 if t:
6997 # i18n: column positioning for "hg summary"
6997 # i18n: column positioning for "hg summary"
6998 ui.write(_('remote: %s\n') % (', '.join(t)))
6998 ui.write(_('remote: %s\n') % (', '.join(t)))
6999 else:
6999 else:
7000 # i18n: column positioning for "hg summary"
7000 # i18n: column positioning for "hg summary"
7001 ui.status(_('remote: (synced)\n'))
7001 ui.status(_('remote: (synced)\n'))
7002
7002
7003 cmdutil.summaryremotehooks(ui, repo, opts,
7003 cmdutil.summaryremotehooks(ui, repo, opts,
7004 ((source, sbranch, sother, commoninc),
7004 ((source, sbranch, sother, commoninc),
7005 (dest, dbranch, dother, outgoing)))
7005 (dest, dbranch, dother, outgoing)))
7006
7006
7007 @command('tag',
7007 @command('tag',
7008 [('f', 'force', None, _('force tag')),
7008 [('f', 'force', None, _('force tag')),
7009 ('l', 'local', None, _('make the tag local')),
7009 ('l', 'local', None, _('make the tag local')),
7010 ('r', 'rev', '', _('revision to tag'), _('REV')),
7010 ('r', 'rev', '', _('revision to tag'), _('REV')),
7011 ('', 'remove', None, _('remove a tag')),
7011 ('', 'remove', None, _('remove a tag')),
7012 # -l/--local is already there, commitopts cannot be used
7012 # -l/--local is already there, commitopts cannot be used
7013 ('e', 'edit', None, _('invoke editor on commit messages')),
7013 ('e', 'edit', None, _('invoke editor on commit messages')),
7014 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
7014 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
7015 ] + commitopts2,
7015 ] + commitopts2,
7016 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
7016 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
7017 def tag(ui, repo, name1, *names, **opts):
7017 def tag(ui, repo, name1, *names, **opts):
7018 """add one or more tags for the current or given revision
7018 """add one or more tags for the current or given revision
7019
7019
7020 Name a particular revision using <name>.
7020 Name a particular revision using <name>.
7021
7021
7022 Tags are used to name particular revisions of the repository and are
7022 Tags are used to name particular revisions of the repository and are
7023 very useful to compare different revisions, to go back to significant
7023 very useful to compare different revisions, to go back to significant
7024 earlier versions or to mark branch points as releases, etc. Changing
7024 earlier versions or to mark branch points as releases, etc. Changing
7025 an existing tag is normally disallowed; use -f/--force to override.
7025 an existing tag is normally disallowed; use -f/--force to override.
7026
7026
7027 If no revision is given, the parent of the working directory is
7027 If no revision is given, the parent of the working directory is
7028 used.
7028 used.
7029
7029
7030 To facilitate version control, distribution, and merging of tags,
7030 To facilitate version control, distribution, and merging of tags,
7031 they are stored as a file named ".hgtags" which is managed similarly
7031 they are stored as a file named ".hgtags" which is managed similarly
7032 to other project files and can be hand-edited if necessary. This
7032 to other project files and can be hand-edited if necessary. This
7033 also means that tagging creates a new commit. The file
7033 also means that tagging creates a new commit. The file
7034 ".hg/localtags" is used for local tags (not shared among
7034 ".hg/localtags" is used for local tags (not shared among
7035 repositories).
7035 repositories).
7036
7036
7037 Tag commits are usually made at the head of a branch. If the parent
7037 Tag commits are usually made at the head of a branch. If the parent
7038 of the working directory is not a branch head, :hg:`tag` aborts; use
7038 of the working directory is not a branch head, :hg:`tag` aborts; use
7039 -f/--force to force the tag commit to be based on a non-head
7039 -f/--force to force the tag commit to be based on a non-head
7040 changeset.
7040 changeset.
7041
7041
7042 See :hg:`help dates` for a list of formats valid for -d/--date.
7042 See :hg:`help dates` for a list of formats valid for -d/--date.
7043
7043
7044 Since tag names have priority over branch names during revision
7044 Since tag names have priority over branch names during revision
7045 lookup, using an existing branch name as a tag name is discouraged.
7045 lookup, using an existing branch name as a tag name is discouraged.
7046
7046
7047 Returns 0 on success.
7047 Returns 0 on success.
7048 """
7048 """
7049 wlock = lock = None
7049 wlock = lock = None
7050 try:
7050 try:
7051 wlock = repo.wlock()
7051 wlock = repo.wlock()
7052 lock = repo.lock()
7052 lock = repo.lock()
7053 rev_ = "."
7053 rev_ = "."
7054 names = [t.strip() for t in (name1,) + names]
7054 names = [t.strip() for t in (name1,) + names]
7055 if len(names) != len(set(names)):
7055 if len(names) != len(set(names)):
7056 raise error.Abort(_('tag names must be unique'))
7056 raise error.Abort(_('tag names must be unique'))
7057 for n in names:
7057 for n in names:
7058 scmutil.checknewlabel(repo, n, 'tag')
7058 scmutil.checknewlabel(repo, n, 'tag')
7059 if not n:
7059 if not n:
7060 raise error.Abort(_('tag names cannot consist entirely of '
7060 raise error.Abort(_('tag names cannot consist entirely of '
7061 'whitespace'))
7061 'whitespace'))
7062 if opts.get('rev') and opts.get('remove'):
7062 if opts.get('rev') and opts.get('remove'):
7063 raise error.Abort(_("--rev and --remove are incompatible"))
7063 raise error.Abort(_("--rev and --remove are incompatible"))
7064 if opts.get('rev'):
7064 if opts.get('rev'):
7065 rev_ = opts['rev']
7065 rev_ = opts['rev']
7066 message = opts.get('message')
7066 message = opts.get('message')
7067 if opts.get('remove'):
7067 if opts.get('remove'):
7068 if opts.get('local'):
7068 if opts.get('local'):
7069 expectedtype = 'local'
7069 expectedtype = 'local'
7070 else:
7070 else:
7071 expectedtype = 'global'
7071 expectedtype = 'global'
7072
7072
7073 for n in names:
7073 for n in names:
7074 if not repo.tagtype(n):
7074 if not repo.tagtype(n):
7075 raise error.Abort(_("tag '%s' does not exist") % n)
7075 raise error.Abort(_("tag '%s' does not exist") % n)
7076 if repo.tagtype(n) != expectedtype:
7076 if repo.tagtype(n) != expectedtype:
7077 if expectedtype == 'global':
7077 if expectedtype == 'global':
7078 raise error.Abort(_("tag '%s' is not a global tag") % n)
7078 raise error.Abort(_("tag '%s' is not a global tag") % n)
7079 else:
7079 else:
7080 raise error.Abort(_("tag '%s' is not a local tag") % n)
7080 raise error.Abort(_("tag '%s' is not a local tag") % n)
7081 rev_ = 'null'
7081 rev_ = 'null'
7082 if not message:
7082 if not message:
7083 # we don't translate commit messages
7083 # we don't translate commit messages
7084 message = 'Removed tag %s' % ', '.join(names)
7084 message = 'Removed tag %s' % ', '.join(names)
7085 elif not opts.get('force'):
7085 elif not opts.get('force'):
7086 for n in names:
7086 for n in names:
7087 if n in repo.tags():
7087 if n in repo.tags():
7088 raise error.Abort(_("tag '%s' already exists "
7088 raise error.Abort(_("tag '%s' already exists "
7089 "(use -f to force)") % n)
7089 "(use -f to force)") % n)
7090 if not opts.get('local'):
7090 if not opts.get('local'):
7091 p1, p2 = repo.dirstate.parents()
7091 p1, p2 = repo.dirstate.parents()
7092 if p2 != nullid:
7092 if p2 != nullid:
7093 raise error.Abort(_('uncommitted merge'))
7093 raise error.Abort(_('uncommitted merge'))
7094 bheads = repo.branchheads()
7094 bheads = repo.branchheads()
7095 if not opts.get('force') and bheads and p1 not in bheads:
7095 if not opts.get('force') and bheads and p1 not in bheads:
7096 raise error.Abort(_('not at a branch head (use -f to force)'))
7096 raise error.Abort(_('not at a branch head (use -f to force)'))
7097 r = scmutil.revsingle(repo, rev_).node()
7097 r = scmutil.revsingle(repo, rev_).node()
7098
7098
7099 if not message:
7099 if not message:
7100 # we don't translate commit messages
7100 # we don't translate commit messages
7101 message = ('Added tag %s for changeset %s' %
7101 message = ('Added tag %s for changeset %s' %
7102 (', '.join(names), short(r)))
7102 (', '.join(names), short(r)))
7103
7103
7104 date = opts.get('date')
7104 date = opts.get('date')
7105 if date:
7105 if date:
7106 date = util.parsedate(date)
7106 date = util.parsedate(date)
7107
7107
7108 if opts.get('remove'):
7108 if opts.get('remove'):
7109 editform = 'tag.remove'
7109 editform = 'tag.remove'
7110 else:
7110 else:
7111 editform = 'tag.add'
7111 editform = 'tag.add'
7112 editor = cmdutil.getcommiteditor(editform=editform, **opts)
7112 editor = cmdutil.getcommiteditor(editform=editform, **opts)
7113
7113
7114 # don't allow tagging the null rev
7114 # don't allow tagging the null rev
7115 if (not opts.get('remove') and
7115 if (not opts.get('remove') and
7116 scmutil.revsingle(repo, rev_).rev() == nullrev):
7116 scmutil.revsingle(repo, rev_).rev() == nullrev):
7117 raise error.Abort(_("cannot tag null revision"))
7117 raise error.Abort(_("cannot tag null revision"))
7118
7118
7119 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
7119 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
7120 editor=editor)
7120 editor=editor)
7121 finally:
7121 finally:
7122 release(lock, wlock)
7122 release(lock, wlock)
7123
7123
7124 @command('tags', formatteropts, '')
7124 @command('tags', formatteropts, '')
7125 def tags(ui, repo, **opts):
7125 def tags(ui, repo, **opts):
7126 """list repository tags
7126 """list repository tags
7127
7127
7128 This lists both regular and local tags. When the -v/--verbose
7128 This lists both regular and local tags. When the -v/--verbose
7129 switch is used, a third column "local" is printed for local tags.
7129 switch is used, a third column "local" is printed for local tags.
7130 When the -q/--quiet switch is used, only the tag name is printed.
7130 When the -q/--quiet switch is used, only the tag name is printed.
7131
7131
7132 Returns 0 on success.
7132 Returns 0 on success.
7133 """
7133 """
7134
7134
7135 fm = ui.formatter('tags', opts)
7135 fm = ui.formatter('tags', opts)
7136 hexfunc = fm.hexfunc
7136 hexfunc = fm.hexfunc
7137 tagtype = ""
7137 tagtype = ""
7138
7138
7139 for t, n in reversed(repo.tagslist()):
7139 for t, n in reversed(repo.tagslist()):
7140 hn = hexfunc(n)
7140 hn = hexfunc(n)
7141 label = 'tags.normal'
7141 label = 'tags.normal'
7142 tagtype = ''
7142 tagtype = ''
7143 if repo.tagtype(t) == 'local':
7143 if repo.tagtype(t) == 'local':
7144 label = 'tags.local'
7144 label = 'tags.local'
7145 tagtype = 'local'
7145 tagtype = 'local'
7146
7146
7147 fm.startitem()
7147 fm.startitem()
7148 fm.write('tag', '%s', t, label=label)
7148 fm.write('tag', '%s', t, label=label)
7149 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
7149 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
7150 fm.condwrite(not ui.quiet, 'rev node', fmt,
7150 fm.condwrite(not ui.quiet, 'rev node', fmt,
7151 repo.changelog.rev(n), hn, label=label)
7151 repo.changelog.rev(n), hn, label=label)
7152 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
7152 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
7153 tagtype, label=label)
7153 tagtype, label=label)
7154 fm.plain('\n')
7154 fm.plain('\n')
7155 fm.end()
7155 fm.end()
7156
7156
7157 @command('tip',
7157 @command('tip',
7158 [('p', 'patch', None, _('show patch')),
7158 [('p', 'patch', None, _('show patch')),
7159 ('g', 'git', None, _('use git extended diff format')),
7159 ('g', 'git', None, _('use git extended diff format')),
7160 ] + templateopts,
7160 ] + templateopts,
7161 _('[-p] [-g]'))
7161 _('[-p] [-g]'))
7162 def tip(ui, repo, **opts):
7162 def tip(ui, repo, **opts):
7163 """show the tip revision (DEPRECATED)
7163 """show the tip revision (DEPRECATED)
7164
7164
7165 The tip revision (usually just called the tip) is the changeset
7165 The tip revision (usually just called the tip) is the changeset
7166 most recently added to the repository (and therefore the most
7166 most recently added to the repository (and therefore the most
7167 recently changed head).
7167 recently changed head).
7168
7168
7169 If you have just made a commit, that commit will be the tip. If
7169 If you have just made a commit, that commit will be the tip. If
7170 you have just pulled changes from another repository, the tip of
7170 you have just pulled changes from another repository, the tip of
7171 that repository becomes the current tip. The "tip" tag is special
7171 that repository becomes the current tip. The "tip" tag is special
7172 and cannot be renamed or assigned to a different changeset.
7172 and cannot be renamed or assigned to a different changeset.
7173
7173
7174 This command is deprecated, please use :hg:`heads` instead.
7174 This command is deprecated, please use :hg:`heads` instead.
7175
7175
7176 Returns 0 on success.
7176 Returns 0 on success.
7177 """
7177 """
7178 displayer = cmdutil.show_changeset(ui, repo, opts)
7178 displayer = cmdutil.show_changeset(ui, repo, opts)
7179 displayer.show(repo['tip'])
7179 displayer.show(repo['tip'])
7180 displayer.close()
7180 displayer.close()
7181
7181
7182 @command('unbundle',
7182 @command('unbundle',
7183 [('u', 'update', None,
7183 [('u', 'update', None,
7184 _('update to new branch head if changesets were unbundled'))],
7184 _('update to new branch head if changesets were unbundled'))],
7185 _('[-u] FILE...'))
7185 _('[-u] FILE...'))
7186 def unbundle(ui, repo, fname1, *fnames, **opts):
7186 def unbundle(ui, repo, fname1, *fnames, **opts):
7187 """apply one or more changegroup files
7187 """apply one or more changegroup files
7188
7188
7189 Apply one or more compressed changegroup files generated by the
7189 Apply one or more compressed changegroup files generated by the
7190 bundle command.
7190 bundle command.
7191
7191
7192 Returns 0 on success, 1 if an update has unresolved files.
7192 Returns 0 on success, 1 if an update has unresolved files.
7193 """
7193 """
7194 fnames = (fname1,) + fnames
7194 fnames = (fname1,) + fnames
7195
7195
7196 with repo.lock():
7196 with repo.lock():
7197 for fname in fnames:
7197 for fname in fnames:
7198 f = hg.openpath(ui, fname)
7198 f = hg.openpath(ui, fname)
7199 gen = exchange.readbundle(ui, f, fname)
7199 gen = exchange.readbundle(ui, f, fname)
7200 if isinstance(gen, bundle2.unbundle20):
7200 if isinstance(gen, bundle2.unbundle20):
7201 tr = repo.transaction('unbundle')
7201 tr = repo.transaction('unbundle')
7202 try:
7202 try:
7203 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
7203 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
7204 url='bundle:' + fname)
7204 url='bundle:' + fname)
7205 tr.close()
7205 tr.close()
7206 except error.BundleUnknownFeatureError as exc:
7206 except error.BundleUnknownFeatureError as exc:
7207 raise error.Abort(_('%s: unknown bundle feature, %s')
7207 raise error.Abort(_('%s: unknown bundle feature, %s')
7208 % (fname, exc),
7208 % (fname, exc),
7209 hint=_("see https://mercurial-scm.org/"
7209 hint=_("see https://mercurial-scm.org/"
7210 "wiki/BundleFeature for more "
7210 "wiki/BundleFeature for more "
7211 "information"))
7211 "information"))
7212 finally:
7212 finally:
7213 if tr:
7213 if tr:
7214 tr.release()
7214 tr.release()
7215 changes = [r.get('return', 0)
7215 changes = [r.get('return', 0)
7216 for r in op.records['changegroup']]
7216 for r in op.records['changegroup']]
7217 modheads = changegroup.combineresults(changes)
7217 modheads = changegroup.combineresults(changes)
7218 elif isinstance(gen, streamclone.streamcloneapplier):
7218 elif isinstance(gen, streamclone.streamcloneapplier):
7219 raise error.Abort(
7219 raise error.Abort(
7220 _('packed bundles cannot be applied with '
7220 _('packed bundles cannot be applied with '
7221 '"hg unbundle"'),
7221 '"hg unbundle"'),
7222 hint=_('use "hg debugapplystreamclonebundle"'))
7222 hint=_('use "hg debugapplystreamclonebundle"'))
7223 else:
7223 else:
7224 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
7224 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
7225
7225
7226 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7226 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
7227
7227
7228 @command('^update|up|checkout|co',
7228 @command('^update|up|checkout|co',
7229 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
7229 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
7230 ('c', 'check', None, _('require clean working directory')),
7230 ('c', 'check', None, _('require clean working directory')),
7231 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
7231 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
7232 ('r', 'rev', '', _('revision'), _('REV'))
7232 ('r', 'rev', '', _('revision'), _('REV'))
7233 ] + mergetoolopts,
7233 ] + mergetoolopts,
7234 _('[-c] [-C] [-d DATE] [[-r] REV]'))
7234 _('[-c] [-C] [-d DATE] [[-r] REV]'))
7235 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
7235 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
7236 tool=None):
7236 tool=None):
7237 """update working directory (or switch revisions)
7237 """update working directory (or switch revisions)
7238
7238
7239 Update the repository's working directory to the specified
7239 Update the repository's working directory to the specified
7240 changeset. If no changeset is specified, update to the tip of the
7240 changeset. If no changeset is specified, update to the tip of the
7241 current named branch and move the active bookmark (see :hg:`help
7241 current named branch and move the active bookmark (see :hg:`help
7242 bookmarks`).
7242 bookmarks`).
7243
7243
7244 Update sets the working directory's parent revision to the specified
7244 Update sets the working directory's parent revision to the specified
7245 changeset (see :hg:`help parents`).
7245 changeset (see :hg:`help parents`).
7246
7246
7247 If the changeset is not a descendant or ancestor of the working
7247 If the changeset is not a descendant or ancestor of the working
7248 directory's parent, the update is aborted. With the -c/--check
7248 directory's parent, the update is aborted. With the -c/--check
7249 option, the working directory is checked for uncommitted changes; if
7249 option, the working directory is checked for uncommitted changes; if
7250 none are found, the working directory is updated to the specified
7250 none are found, the working directory is updated to the specified
7251 changeset.
7251 changeset.
7252
7252
7253 .. container:: verbose
7253 .. container:: verbose
7254
7254
7255 The following rules apply when the working directory contains
7255 The following rules apply when the working directory contains
7256 uncommitted changes:
7256 uncommitted changes:
7257
7257
7258 1. If neither -c/--check nor -C/--clean is specified, and if
7258 1. If neither -c/--check nor -C/--clean is specified, and if
7259 the requested changeset is an ancestor or descendant of
7259 the requested changeset is an ancestor or descendant of
7260 the working directory's parent, the uncommitted changes
7260 the working directory's parent, the uncommitted changes
7261 are merged into the requested changeset and the merged
7261 are merged into the requested changeset and the merged
7262 result is left uncommitted. If the requested changeset is
7262 result is left uncommitted. If the requested changeset is
7263 not an ancestor or descendant (that is, it is on another
7263 not an ancestor or descendant (that is, it is on another
7264 branch), the update is aborted and the uncommitted changes
7264 branch), the update is aborted and the uncommitted changes
7265 are preserved.
7265 are preserved.
7266
7266
7267 2. With the -c/--check option, the update is aborted and the
7267 2. With the -c/--check option, the update is aborted and the
7268 uncommitted changes are preserved.
7268 uncommitted changes are preserved.
7269
7269
7270 3. With the -C/--clean option, uncommitted changes are discarded and
7270 3. With the -C/--clean option, uncommitted changes are discarded and
7271 the working directory is updated to the requested changeset.
7271 the working directory is updated to the requested changeset.
7272
7272
7273 To cancel an uncommitted merge (and lose your changes), use
7273 To cancel an uncommitted merge (and lose your changes), use
7274 :hg:`update --clean .`.
7274 :hg:`update --clean .`.
7275
7275
7276 Use null as the changeset to remove the working directory (like
7276 Use null as the changeset to remove the working directory (like
7277 :hg:`clone -U`).
7277 :hg:`clone -U`).
7278
7278
7279 If you want to revert just one file to an older revision, use
7279 If you want to revert just one file to an older revision, use
7280 :hg:`revert [-r REV] NAME`.
7280 :hg:`revert [-r REV] NAME`.
7281
7281
7282 See :hg:`help dates` for a list of formats valid for -d/--date.
7282 See :hg:`help dates` for a list of formats valid for -d/--date.
7283
7283
7284 Returns 0 on success, 1 if there are unresolved files.
7284 Returns 0 on success, 1 if there are unresolved files.
7285 """
7285 """
7286 if rev and node:
7286 if rev and node:
7287 raise error.Abort(_("please specify just one revision"))
7287 raise error.Abort(_("please specify just one revision"))
7288
7288
7289 if rev is None or rev == '':
7289 if rev is None or rev == '':
7290 rev = node
7290 rev = node
7291
7291
7292 if date and rev is not None:
7292 if date and rev is not None:
7293 raise error.Abort(_("you can't specify a revision and a date"))
7293 raise error.Abort(_("you can't specify a revision and a date"))
7294
7294
7295 if check and clean:
7295 if check and clean:
7296 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
7296 raise error.Abort(_("cannot specify both -c/--check and -C/--clean"))
7297
7297
7298 with repo.wlock():
7298 with repo.wlock():
7299 cmdutil.clearunfinished(repo)
7299 cmdutil.clearunfinished(repo)
7300
7300
7301 if date:
7301 if date:
7302 rev = cmdutil.finddate(ui, repo, date)
7302 rev = cmdutil.finddate(ui, repo, date)
7303
7303
7304 # if we defined a bookmark, we have to remember the original name
7304 # if we defined a bookmark, we have to remember the original name
7305 brev = rev
7305 brev = rev
7306 rev = scmutil.revsingle(repo, rev, rev).rev()
7306 rev = scmutil.revsingle(repo, rev, rev).rev()
7307
7307
7308 if check:
7308 if check:
7309 cmdutil.bailifchanged(repo, merge=False)
7309 cmdutil.bailifchanged(repo, merge=False)
7310
7310
7311 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
7311 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
7312
7312
7313 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
7313 return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
7314
7314
7315 @command('verify', [])
7315 @command('verify', [])
7316 def verify(ui, repo):
7316 def verify(ui, repo):
7317 """verify the integrity of the repository
7317 """verify the integrity of the repository
7318
7318
7319 Verify the integrity of the current repository.
7319 Verify the integrity of the current repository.
7320
7320
7321 This will perform an extensive check of the repository's
7321 This will perform an extensive check of the repository's
7322 integrity, validating the hashes and checksums of each entry in
7322 integrity, validating the hashes and checksums of each entry in
7323 the changelog, manifest, and tracked files, as well as the
7323 the changelog, manifest, and tracked files, as well as the
7324 integrity of their crosslinks and indices.
7324 integrity of their crosslinks and indices.
7325
7325
7326 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7326 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7327 for more information about recovery from corruption of the
7327 for more information about recovery from corruption of the
7328 repository.
7328 repository.
7329
7329
7330 Returns 0 on success, 1 if errors are encountered.
7330 Returns 0 on success, 1 if errors are encountered.
7331 """
7331 """
7332 return hg.verify(repo)
7332 return hg.verify(repo)
7333
7333
7334 @command('version', [] + formatteropts, norepo=True)
7334 @command('version', [] + formatteropts, norepo=True)
7335 def version_(ui, **opts):
7335 def version_(ui, **opts):
7336 """output version and copyright information"""
7336 """output version and copyright information"""
7337 fm = ui.formatter("version", opts)
7337 fm = ui.formatter("version", opts)
7338 fm.startitem()
7338 fm.startitem()
7339 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
7339 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
7340 util.version())
7340 util.version())
7341 license = _(
7341 license = _(
7342 "(see https://mercurial-scm.org for more information)\n"
7342 "(see https://mercurial-scm.org for more information)\n"
7343 "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
7343 "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
7344 "This is free software; see the source for copying conditions. "
7344 "This is free software; see the source for copying conditions. "
7345 "There is NO\nwarranty; "
7345 "There is NO\nwarranty; "
7346 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7346 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7347 )
7347 )
7348 if not ui.quiet:
7348 if not ui.quiet:
7349 fm.plain(license)
7349 fm.plain(license)
7350
7350
7351 if ui.verbose:
7351 if ui.verbose:
7352 fm.plain(_("\nEnabled extensions:\n\n"))
7352 fm.plain(_("\nEnabled extensions:\n\n"))
7353 # format names and versions into columns
7353 # format names and versions into columns
7354 names = []
7354 names = []
7355 vers = []
7355 vers = []
7356 isinternals = []
7356 isinternals = []
7357 for name, module in extensions.extensions():
7357 for name, module in extensions.extensions():
7358 names.append(name)
7358 names.append(name)
7359 vers.append(extensions.moduleversion(module) or None)
7359 vers.append(extensions.moduleversion(module) or None)
7360 isinternals.append(extensions.ismoduleinternal(module))
7360 isinternals.append(extensions.ismoduleinternal(module))
7361 fn = fm.nested("extensions")
7361 fn = fm.nested("extensions")
7362 if names:
7362 if names:
7363 namefmt = " %%-%ds " % max(len(n) for n in names)
7363 namefmt = " %%-%ds " % max(len(n) for n in names)
7364 places = [_("external"), _("internal")]
7364 places = [_("external"), _("internal")]
7365 for n, v, p in zip(names, vers, isinternals):
7365 for n, v, p in zip(names, vers, isinternals):
7366 fn.startitem()
7366 fn.startitem()
7367 fn.condwrite(ui.verbose, "name", namefmt, n)
7367 fn.condwrite(ui.verbose, "name", namefmt, n)
7368 if ui.verbose:
7368 if ui.verbose:
7369 fn.plain("%s " % places[p])
7369 fn.plain("%s " % places[p])
7370 fn.data(bundled=p)
7370 fn.data(bundled=p)
7371 fn.condwrite(ui.verbose and v, "ver", "%s", v)
7371 fn.condwrite(ui.verbose and v, "ver", "%s", v)
7372 if ui.verbose:
7372 if ui.verbose:
7373 fn.plain("\n")
7373 fn.plain("\n")
7374 fn.end()
7374 fn.end()
7375 fm.end()
7375 fm.end()
7376
7376
7377 def loadcmdtable(ui, name, cmdtable):
7377 def loadcmdtable(ui, name, cmdtable):
7378 """Load command functions from specified cmdtable
7378 """Load command functions from specified cmdtable
7379 """
7379 """
7380 overrides = [cmd for cmd in cmdtable if cmd in table]
7380 overrides = [cmd for cmd in cmdtable if cmd in table]
7381 if overrides:
7381 if overrides:
7382 ui.warn(_("extension '%s' overrides commands: %s\n")
7382 ui.warn(_("extension '%s' overrides commands: %s\n")
7383 % (name, " ".join(overrides)))
7383 % (name, " ".join(overrides)))
7384 table.update(cmdtable)
7384 table.update(cmdtable)
@@ -1,322 +1,321 b''
1 # formatter.py - generic output formatting for mercurial
1 # formatter.py - generic output formatting for mercurial
2 #
2 #
3 # Copyright 2012 Matt Mackall <mpm@selenic.com>
3 # Copyright 2012 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 os
10 import os
11
11
12 from .i18n import _
12 from .i18n import _
13 from .node import (
13 from .node import (
14 hex,
14 hex,
15 short,
15 short,
16 )
16 )
17
17
18 from . import (
18 from . import (
19 encoding,
19 encoding,
20 error,
20 error,
21 templatekw,
21 templatekw,
22 templater,
22 templater,
23 util,
23 util,
24 )
24 )
25
25
26 pickle = util.pickle
26 pickle = util.pickle
27
27
28 class _nullconverter(object):
28 class _nullconverter(object):
29 '''convert non-primitive data types to be processed by formatter'''
29 '''convert non-primitive data types to be processed by formatter'''
30 @staticmethod
30 @staticmethod
31 def formatdate(date, fmt):
31 def formatdate(date, fmt):
32 '''convert date tuple to appropriate format'''
32 '''convert date tuple to appropriate format'''
33 return date
33 return date
34 @staticmethod
34 @staticmethod
35 def formatdict(data, key, value, fmt, sep):
35 def formatdict(data, key, value, fmt, sep):
36 '''convert dict or key-value pairs to appropriate dict format'''
36 '''convert dict or key-value pairs to appropriate dict format'''
37 # use plain dict instead of util.sortdict so that data can be
37 # use plain dict instead of util.sortdict so that data can be
38 # serialized as a builtin dict in pickle output
38 # serialized as a builtin dict in pickle output
39 return dict(data)
39 return dict(data)
40 @staticmethod
40 @staticmethod
41 def formatlist(data, name, fmt, sep):
41 def formatlist(data, name, fmt, sep):
42 '''convert iterable to appropriate list format'''
42 '''convert iterable to appropriate list format'''
43 return list(data)
43 return list(data)
44
44
45 class baseformatter(object):
45 class baseformatter(object):
46 def __init__(self, ui, topic, opts, converter):
46 def __init__(self, ui, topic, opts, converter):
47 self._ui = ui
47 self._ui = ui
48 self._topic = topic
48 self._topic = topic
49 self._style = opts.get("style")
49 self._style = opts.get("style")
50 self._template = opts.get("template")
50 self._template = opts.get("template")
51 self._converter = converter
51 self._converter = converter
52 self._item = None
52 self._item = None
53 # function to convert node to string suitable for this output
53 # function to convert node to string suitable for this output
54 self.hexfunc = hex
54 self.hexfunc = hex
55 def __enter__(self):
55 def __enter__(self):
56 return self
56 return self
57 def __exit__(self, exctype, excvalue, traceback):
57 def __exit__(self, exctype, excvalue, traceback):
58 if exctype is None:
58 if exctype is None:
59 self.end()
59 self.end()
60 def __nonzero__(self):
61 '''return False if we're not doing real templating so we can
62 skip extra work'''
63 return True
64 def _showitem(self):
60 def _showitem(self):
65 '''show a formatted item once all data is collected'''
61 '''show a formatted item once all data is collected'''
66 pass
62 pass
67 def startitem(self):
63 def startitem(self):
68 '''begin an item in the format list'''
64 '''begin an item in the format list'''
69 if self._item is not None:
65 if self._item is not None:
70 self._showitem()
66 self._showitem()
71 self._item = {}
67 self._item = {}
72 def formatdate(self, date, fmt='%a %b %d %H:%M:%S %Y %1%2'):
68 def formatdate(self, date, fmt='%a %b %d %H:%M:%S %Y %1%2'):
73 '''convert date tuple to appropriate format'''
69 '''convert date tuple to appropriate format'''
74 return self._converter.formatdate(date, fmt)
70 return self._converter.formatdate(date, fmt)
75 def formatdict(self, data, key='key', value='value', fmt='%s=%s', sep=' '):
71 def formatdict(self, data, key='key', value='value', fmt='%s=%s', sep=' '):
76 '''convert dict or key-value pairs to appropriate dict format'''
72 '''convert dict or key-value pairs to appropriate dict format'''
77 return self._converter.formatdict(data, key, value, fmt, sep)
73 return self._converter.formatdict(data, key, value, fmt, sep)
78 def formatlist(self, data, name, fmt='%s', sep=' '):
74 def formatlist(self, data, name, fmt='%s', sep=' '):
79 '''convert iterable to appropriate list format'''
75 '''convert iterable to appropriate list format'''
80 # name is mandatory argument for now, but it could be optional if
76 # name is mandatory argument for now, but it could be optional if
81 # we have default template keyword, e.g. {item}
77 # we have default template keyword, e.g. {item}
82 return self._converter.formatlist(data, name, fmt, sep)
78 return self._converter.formatlist(data, name, fmt, sep)
83 def data(self, **data):
79 def data(self, **data):
84 '''insert data into item that's not shown in default output'''
80 '''insert data into item that's not shown in default output'''
85 self._item.update(data)
81 self._item.update(data)
86 def write(self, fields, deftext, *fielddata, **opts):
82 def write(self, fields, deftext, *fielddata, **opts):
87 '''do default text output while assigning data to item'''
83 '''do default text output while assigning data to item'''
88 fieldkeys = fields.split()
84 fieldkeys = fields.split()
89 assert len(fieldkeys) == len(fielddata)
85 assert len(fieldkeys) == len(fielddata)
90 self._item.update(zip(fieldkeys, fielddata))
86 self._item.update(zip(fieldkeys, fielddata))
91 def condwrite(self, cond, fields, deftext, *fielddata, **opts):
87 def condwrite(self, cond, fields, deftext, *fielddata, **opts):
92 '''do conditional write (primarily for plain formatter)'''
88 '''do conditional write (primarily for plain formatter)'''
93 fieldkeys = fields.split()
89 fieldkeys = fields.split()
94 assert len(fieldkeys) == len(fielddata)
90 assert len(fieldkeys) == len(fielddata)
95 self._item.update(zip(fieldkeys, fielddata))
91 self._item.update(zip(fieldkeys, fielddata))
96 def plain(self, text, **opts):
92 def plain(self, text, **opts):
97 '''show raw text for non-templated mode'''
93 '''show raw text for non-templated mode'''
98 pass
94 pass
95 def isplain(self):
96 '''check for plain formatter usage'''
97 return False
99 def nested(self, field):
98 def nested(self, field):
100 '''sub formatter to store nested data in the specified field'''
99 '''sub formatter to store nested data in the specified field'''
101 self._item[field] = data = []
100 self._item[field] = data = []
102 return _nestedformatter(self._ui, self._converter, data)
101 return _nestedformatter(self._ui, self._converter, data)
103 def end(self):
102 def end(self):
104 '''end output for the formatter'''
103 '''end output for the formatter'''
105 if self._item is not None:
104 if self._item is not None:
106 self._showitem()
105 self._showitem()
107
106
108 class _nestedformatter(baseformatter):
107 class _nestedformatter(baseformatter):
109 '''build sub items and store them in the parent formatter'''
108 '''build sub items and store them in the parent formatter'''
110 def __init__(self, ui, converter, data):
109 def __init__(self, ui, converter, data):
111 baseformatter.__init__(self, ui, topic='', opts={}, converter=converter)
110 baseformatter.__init__(self, ui, topic='', opts={}, converter=converter)
112 self._data = data
111 self._data = data
113 def _showitem(self):
112 def _showitem(self):
114 self._data.append(self._item)
113 self._data.append(self._item)
115
114
116 def _iteritems(data):
115 def _iteritems(data):
117 '''iterate key-value pairs in stable order'''
116 '''iterate key-value pairs in stable order'''
118 if isinstance(data, dict):
117 if isinstance(data, dict):
119 return sorted(data.iteritems())
118 return sorted(data.iteritems())
120 return data
119 return data
121
120
122 class _plainconverter(object):
121 class _plainconverter(object):
123 '''convert non-primitive data types to text'''
122 '''convert non-primitive data types to text'''
124 @staticmethod
123 @staticmethod
125 def formatdate(date, fmt):
124 def formatdate(date, fmt):
126 '''stringify date tuple in the given format'''
125 '''stringify date tuple in the given format'''
127 return util.datestr(date, fmt)
126 return util.datestr(date, fmt)
128 @staticmethod
127 @staticmethod
129 def formatdict(data, key, value, fmt, sep):
128 def formatdict(data, key, value, fmt, sep):
130 '''stringify key-value pairs separated by sep'''
129 '''stringify key-value pairs separated by sep'''
131 return sep.join(fmt % (k, v) for k, v in _iteritems(data))
130 return sep.join(fmt % (k, v) for k, v in _iteritems(data))
132 @staticmethod
131 @staticmethod
133 def formatlist(data, name, fmt, sep):
132 def formatlist(data, name, fmt, sep):
134 '''stringify iterable separated by sep'''
133 '''stringify iterable separated by sep'''
135 return sep.join(fmt % e for e in data)
134 return sep.join(fmt % e for e in data)
136
135
137 class plainformatter(baseformatter):
136 class plainformatter(baseformatter):
138 '''the default text output scheme'''
137 '''the default text output scheme'''
139 def __init__(self, ui, topic, opts):
138 def __init__(self, ui, topic, opts):
140 baseformatter.__init__(self, ui, topic, opts, _plainconverter)
139 baseformatter.__init__(self, ui, topic, opts, _plainconverter)
141 if ui.debugflag:
140 if ui.debugflag:
142 self.hexfunc = hex
141 self.hexfunc = hex
143 else:
142 else:
144 self.hexfunc = short
143 self.hexfunc = short
145 def __nonzero__(self):
146 return False
147 def startitem(self):
144 def startitem(self):
148 pass
145 pass
149 def data(self, **data):
146 def data(self, **data):
150 pass
147 pass
151 def write(self, fields, deftext, *fielddata, **opts):
148 def write(self, fields, deftext, *fielddata, **opts):
152 self._ui.write(deftext % fielddata, **opts)
149 self._ui.write(deftext % fielddata, **opts)
153 def condwrite(self, cond, fields, deftext, *fielddata, **opts):
150 def condwrite(self, cond, fields, deftext, *fielddata, **opts):
154 '''do conditional write'''
151 '''do conditional write'''
155 if cond:
152 if cond:
156 self._ui.write(deftext % fielddata, **opts)
153 self._ui.write(deftext % fielddata, **opts)
157 def plain(self, text, **opts):
154 def plain(self, text, **opts):
158 self._ui.write(text, **opts)
155 self._ui.write(text, **opts)
156 def isplain(self):
157 return True
159 def nested(self, field):
158 def nested(self, field):
160 # nested data will be directly written to ui
159 # nested data will be directly written to ui
161 return self
160 return self
162 def end(self):
161 def end(self):
163 pass
162 pass
164
163
165 class debugformatter(baseformatter):
164 class debugformatter(baseformatter):
166 def __init__(self, ui, topic, opts):
165 def __init__(self, ui, topic, opts):
167 baseformatter.__init__(self, ui, topic, opts, _nullconverter)
166 baseformatter.__init__(self, ui, topic, opts, _nullconverter)
168 self._ui.write("%s = [\n" % self._topic)
167 self._ui.write("%s = [\n" % self._topic)
169 def _showitem(self):
168 def _showitem(self):
170 self._ui.write(" " + repr(self._item) + ",\n")
169 self._ui.write(" " + repr(self._item) + ",\n")
171 def end(self):
170 def end(self):
172 baseformatter.end(self)
171 baseformatter.end(self)
173 self._ui.write("]\n")
172 self._ui.write("]\n")
174
173
175 class pickleformatter(baseformatter):
174 class pickleformatter(baseformatter):
176 def __init__(self, ui, topic, opts):
175 def __init__(self, ui, topic, opts):
177 baseformatter.__init__(self, ui, topic, opts, _nullconverter)
176 baseformatter.__init__(self, ui, topic, opts, _nullconverter)
178 self._data = []
177 self._data = []
179 def _showitem(self):
178 def _showitem(self):
180 self._data.append(self._item)
179 self._data.append(self._item)
181 def end(self):
180 def end(self):
182 baseformatter.end(self)
181 baseformatter.end(self)
183 self._ui.write(pickle.dumps(self._data))
182 self._ui.write(pickle.dumps(self._data))
184
183
185 def _jsonifyobj(v):
184 def _jsonifyobj(v):
186 if isinstance(v, dict):
185 if isinstance(v, dict):
187 xs = ['"%s": %s' % (encoding.jsonescape(k), _jsonifyobj(u))
186 xs = ['"%s": %s' % (encoding.jsonescape(k), _jsonifyobj(u))
188 for k, u in sorted(v.iteritems())]
187 for k, u in sorted(v.iteritems())]
189 return '{' + ', '.join(xs) + '}'
188 return '{' + ', '.join(xs) + '}'
190 elif isinstance(v, (list, tuple)):
189 elif isinstance(v, (list, tuple)):
191 return '[' + ', '.join(_jsonifyobj(e) for e in v) + ']'
190 return '[' + ', '.join(_jsonifyobj(e) for e in v) + ']'
192 elif v is None:
191 elif v is None:
193 return 'null'
192 return 'null'
194 elif v is True:
193 elif v is True:
195 return 'true'
194 return 'true'
196 elif v is False:
195 elif v is False:
197 return 'false'
196 return 'false'
198 elif isinstance(v, (int, float)):
197 elif isinstance(v, (int, float)):
199 return str(v)
198 return str(v)
200 else:
199 else:
201 return '"%s"' % encoding.jsonescape(v)
200 return '"%s"' % encoding.jsonescape(v)
202
201
203 class jsonformatter(baseformatter):
202 class jsonformatter(baseformatter):
204 def __init__(self, ui, topic, opts):
203 def __init__(self, ui, topic, opts):
205 baseformatter.__init__(self, ui, topic, opts, _nullconverter)
204 baseformatter.__init__(self, ui, topic, opts, _nullconverter)
206 self._ui.write("[")
205 self._ui.write("[")
207 self._ui._first = True
206 self._ui._first = True
208 def _showitem(self):
207 def _showitem(self):
209 if self._ui._first:
208 if self._ui._first:
210 self._ui._first = False
209 self._ui._first = False
211 else:
210 else:
212 self._ui.write(",")
211 self._ui.write(",")
213
212
214 self._ui.write("\n {\n")
213 self._ui.write("\n {\n")
215 first = True
214 first = True
216 for k, v in sorted(self._item.items()):
215 for k, v in sorted(self._item.items()):
217 if first:
216 if first:
218 first = False
217 first = False
219 else:
218 else:
220 self._ui.write(",\n")
219 self._ui.write(",\n")
221 self._ui.write(' "%s": %s' % (k, _jsonifyobj(v)))
220 self._ui.write(' "%s": %s' % (k, _jsonifyobj(v)))
222 self._ui.write("\n }")
221 self._ui.write("\n }")
223 def end(self):
222 def end(self):
224 baseformatter.end(self)
223 baseformatter.end(self)
225 self._ui.write("\n]\n")
224 self._ui.write("\n]\n")
226
225
227 class _templateconverter(object):
226 class _templateconverter(object):
228 '''convert non-primitive data types to be processed by templater'''
227 '''convert non-primitive data types to be processed by templater'''
229 @staticmethod
228 @staticmethod
230 def formatdate(date, fmt):
229 def formatdate(date, fmt):
231 '''return date tuple'''
230 '''return date tuple'''
232 return date
231 return date
233 @staticmethod
232 @staticmethod
234 def formatdict(data, key, value, fmt, sep):
233 def formatdict(data, key, value, fmt, sep):
235 '''build object that can be evaluated as either plain string or dict'''
234 '''build object that can be evaluated as either plain string or dict'''
236 data = util.sortdict(_iteritems(data))
235 data = util.sortdict(_iteritems(data))
237 def f():
236 def f():
238 yield _plainconverter.formatdict(data, key, value, fmt, sep)
237 yield _plainconverter.formatdict(data, key, value, fmt, sep)
239 return templatekw._hybrid(f(), data, lambda k: {key: k, value: data[k]},
238 return templatekw._hybrid(f(), data, lambda k: {key: k, value: data[k]},
240 lambda d: fmt % (d[key], d[value]))
239 lambda d: fmt % (d[key], d[value]))
241 @staticmethod
240 @staticmethod
242 def formatlist(data, name, fmt, sep):
241 def formatlist(data, name, fmt, sep):
243 '''build object that can be evaluated as either plain string or list'''
242 '''build object that can be evaluated as either plain string or list'''
244 data = list(data)
243 data = list(data)
245 def f():
244 def f():
246 yield _plainconverter.formatlist(data, name, fmt, sep)
245 yield _plainconverter.formatlist(data, name, fmt, sep)
247 return templatekw._hybrid(f(), data, lambda x: {name: x},
246 return templatekw._hybrid(f(), data, lambda x: {name: x},
248 lambda d: fmt % d[name])
247 lambda d: fmt % d[name])
249
248
250 class templateformatter(baseformatter):
249 class templateformatter(baseformatter):
251 def __init__(self, ui, topic, opts):
250 def __init__(self, ui, topic, opts):
252 baseformatter.__init__(self, ui, topic, opts, _templateconverter)
251 baseformatter.__init__(self, ui, topic, opts, _templateconverter)
253 self._topic = topic
252 self._topic = topic
254 self._t = gettemplater(ui, topic, opts.get('template', ''))
253 self._t = gettemplater(ui, topic, opts.get('template', ''))
255 def _showitem(self):
254 def _showitem(self):
256 g = self._t(self._topic, ui=self._ui, **self._item)
255 g = self._t(self._topic, ui=self._ui, **self._item)
257 self._ui.write(templater.stringify(g))
256 self._ui.write(templater.stringify(g))
258
257
259 def lookuptemplate(ui, topic, tmpl):
258 def lookuptemplate(ui, topic, tmpl):
260 # looks like a literal template?
259 # looks like a literal template?
261 if '{' in tmpl:
260 if '{' in tmpl:
262 return tmpl, None
261 return tmpl, None
263
262
264 # perhaps a stock style?
263 # perhaps a stock style?
265 if not os.path.split(tmpl)[0]:
264 if not os.path.split(tmpl)[0]:
266 mapname = (templater.templatepath('map-cmdline.' + tmpl)
265 mapname = (templater.templatepath('map-cmdline.' + tmpl)
267 or templater.templatepath(tmpl))
266 or templater.templatepath(tmpl))
268 if mapname and os.path.isfile(mapname):
267 if mapname and os.path.isfile(mapname):
269 return None, mapname
268 return None, mapname
270
269
271 # perhaps it's a reference to [templates]
270 # perhaps it's a reference to [templates]
272 t = ui.config('templates', tmpl)
271 t = ui.config('templates', tmpl)
273 if t:
272 if t:
274 return templater.unquotestring(t), None
273 return templater.unquotestring(t), None
275
274
276 if tmpl == 'list':
275 if tmpl == 'list':
277 ui.write(_("available styles: %s\n") % templater.stylelist())
276 ui.write(_("available styles: %s\n") % templater.stylelist())
278 raise error.Abort(_("specify a template"))
277 raise error.Abort(_("specify a template"))
279
278
280 # perhaps it's a path to a map or a template
279 # perhaps it's a path to a map or a template
281 if ('/' in tmpl or '\\' in tmpl) and os.path.isfile(tmpl):
280 if ('/' in tmpl or '\\' in tmpl) and os.path.isfile(tmpl):
282 # is it a mapfile for a style?
281 # is it a mapfile for a style?
283 if os.path.basename(tmpl).startswith("map-"):
282 if os.path.basename(tmpl).startswith("map-"):
284 return None, os.path.realpath(tmpl)
283 return None, os.path.realpath(tmpl)
285 tmpl = open(tmpl).read()
284 tmpl = open(tmpl).read()
286 return tmpl, None
285 return tmpl, None
287
286
288 # constant string?
287 # constant string?
289 return tmpl, None
288 return tmpl, None
290
289
291 def gettemplater(ui, topic, spec):
290 def gettemplater(ui, topic, spec):
292 tmpl, mapfile = lookuptemplate(ui, topic, spec)
291 tmpl, mapfile = lookuptemplate(ui, topic, spec)
293 assert not (tmpl and mapfile)
292 assert not (tmpl and mapfile)
294 if mapfile:
293 if mapfile:
295 return templater.templater.frommapfile(mapfile)
294 return templater.templater.frommapfile(mapfile)
296 return maketemplater(ui, topic, tmpl)
295 return maketemplater(ui, topic, tmpl)
297
296
298 def maketemplater(ui, topic, tmpl, filters=None, cache=None):
297 def maketemplater(ui, topic, tmpl, filters=None, cache=None):
299 """Create a templater from a string template 'tmpl'"""
298 """Create a templater from a string template 'tmpl'"""
300 aliases = ui.configitems('templatealias')
299 aliases = ui.configitems('templatealias')
301 t = templater.templater(filters=filters, cache=cache, aliases=aliases)
300 t = templater.templater(filters=filters, cache=cache, aliases=aliases)
302 if tmpl:
301 if tmpl:
303 t.cache[topic] = tmpl
302 t.cache[topic] = tmpl
304 return t
303 return t
305
304
306 def formatter(ui, topic, opts):
305 def formatter(ui, topic, opts):
307 template = opts.get("template", "")
306 template = opts.get("template", "")
308 if template == "json":
307 if template == "json":
309 return jsonformatter(ui, topic, opts)
308 return jsonformatter(ui, topic, opts)
310 elif template == "pickle":
309 elif template == "pickle":
311 return pickleformatter(ui, topic, opts)
310 return pickleformatter(ui, topic, opts)
312 elif template == "debug":
311 elif template == "debug":
313 return debugformatter(ui, topic, opts)
312 return debugformatter(ui, topic, opts)
314 elif template != "":
313 elif template != "":
315 return templateformatter(ui, topic, opts)
314 return templateformatter(ui, topic, opts)
316 # developer config: ui.formatdebug
315 # developer config: ui.formatdebug
317 elif ui.configbool('ui', 'formatdebug'):
316 elif ui.configbool('ui', 'formatdebug'):
318 return debugformatter(ui, topic, opts)
317 return debugformatter(ui, topic, opts)
319 # deprecated config: ui.formatjson
318 # deprecated config: ui.formatjson
320 elif ui.configbool('ui', 'formatjson'):
319 elif ui.configbool('ui', 'formatjson'):
321 return jsonformatter(ui, topic, opts)
320 return jsonformatter(ui, topic, opts)
322 return plainformatter(ui, topic, opts)
321 return plainformatter(ui, topic, opts)
General Comments 0
You need to be logged in to leave comments. Login now