##// END OF EJS Templates
help: pass subtopic into help()...
Gregory Szorc -
r27377:d1c998d7 default
parent child Browse files
Show More
@@ -1,6973 +1,6978 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 node import hex, bin, nullhex, nullid, nullrev, short
8 from node import hex, bin, nullhex, nullid, nullrev, short
9 from lock import release
9 from lock import release
10 from i18n import _
10 from i18n import _
11 import os, re, difflib, time, tempfile, errno, shlex
11 import os, re, difflib, time, tempfile, errno, shlex
12 import sys, socket
12 import sys, socket
13 import hg, scmutil, util, revlog, copies, error, bookmarks
13 import hg, scmutil, util, revlog, copies, error, bookmarks
14 import patch, help, encoding, templatekw, discovery
14 import patch, help, encoding, templatekw, discovery
15 import archival, changegroup, cmdutil, hbisect
15 import archival, changegroup, cmdutil, hbisect
16 import sshserver, hgweb
16 import sshserver, hgweb
17 import extensions
17 import extensions
18 import merge as mergemod
18 import merge as mergemod
19 import minirst, revset, fileset
19 import minirst, revset, fileset
20 import dagparser, context, simplemerge, graphmod, copies
20 import dagparser, context, simplemerge, graphmod, copies
21 import random, operator
21 import random, operator
22 import setdiscovery, treediscovery, dagutil, pvec, localrepo, destutil
22 import setdiscovery, treediscovery, dagutil, pvec, localrepo, destutil
23 import phases, obsolete, exchange, bundle2, repair, lock as lockmod
23 import phases, obsolete, exchange, bundle2, repair, lock as lockmod
24 import ui as uimod
24 import ui as uimod
25 import streamclone
25 import streamclone
26 import commandserver
26 import commandserver
27
27
28 table = {}
28 table = {}
29
29
30 command = cmdutil.command(table)
30 command = cmdutil.command(table)
31
31
32 # Space delimited list of commands that don't require local repositories.
32 # Space delimited list of commands that don't require local repositories.
33 # This should be populated by passing norepo=True into the @command decorator.
33 # This should be populated by passing norepo=True into the @command decorator.
34 norepo = ''
34 norepo = ''
35 # Space delimited list of commands that optionally require local repositories.
35 # Space delimited list of commands that optionally require local repositories.
36 # This should be populated by passing optionalrepo=True into the @command
36 # This should be populated by passing optionalrepo=True into the @command
37 # decorator.
37 # decorator.
38 optionalrepo = ''
38 optionalrepo = ''
39 # Space delimited list of commands that will examine arguments looking for
39 # Space delimited list of commands that will examine arguments looking for
40 # a repository. This should be populated by passing inferrepo=True into the
40 # a repository. This should be populated by passing inferrepo=True into the
41 # @command decorator.
41 # @command decorator.
42 inferrepo = ''
42 inferrepo = ''
43
43
44 # label constants
44 # label constants
45 # until 3.5, bookmarks.current was the advertised name, not
45 # until 3.5, bookmarks.current was the advertised name, not
46 # bookmarks.active, so we must use both to avoid breaking old
46 # bookmarks.active, so we must use both to avoid breaking old
47 # custom styles
47 # custom styles
48 activebookmarklabel = 'bookmarks.active bookmarks.current'
48 activebookmarklabel = 'bookmarks.active bookmarks.current'
49
49
50 # common command options
50 # common command options
51
51
52 globalopts = [
52 globalopts = [
53 ('R', 'repository', '',
53 ('R', 'repository', '',
54 _('repository root directory or name of overlay bundle file'),
54 _('repository root directory or name of overlay bundle file'),
55 _('REPO')),
55 _('REPO')),
56 ('', 'cwd', '',
56 ('', 'cwd', '',
57 _('change working directory'), _('DIR')),
57 _('change working directory'), _('DIR')),
58 ('y', 'noninteractive', None,
58 ('y', 'noninteractive', None,
59 _('do not prompt, automatically pick the first choice for all prompts')),
59 _('do not prompt, automatically pick the first choice for all prompts')),
60 ('q', 'quiet', None, _('suppress output')),
60 ('q', 'quiet', None, _('suppress output')),
61 ('v', 'verbose', None, _('enable additional output')),
61 ('v', 'verbose', None, _('enable additional output')),
62 ('', 'config', [],
62 ('', 'config', [],
63 _('set/override config option (use \'section.name=value\')'),
63 _('set/override config option (use \'section.name=value\')'),
64 _('CONFIG')),
64 _('CONFIG')),
65 ('', 'debug', None, _('enable debugging output')),
65 ('', 'debug', None, _('enable debugging output')),
66 ('', 'debugger', None, _('start debugger')),
66 ('', 'debugger', None, _('start debugger')),
67 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
67 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
68 _('ENCODE')),
68 _('ENCODE')),
69 ('', 'encodingmode', encoding.encodingmode,
69 ('', 'encodingmode', encoding.encodingmode,
70 _('set the charset encoding mode'), _('MODE')),
70 _('set the charset encoding mode'), _('MODE')),
71 ('', 'traceback', None, _('always print a traceback on exception')),
71 ('', 'traceback', None, _('always print a traceback on exception')),
72 ('', 'time', None, _('time how long the command takes')),
72 ('', 'time', None, _('time how long the command takes')),
73 ('', 'profile', None, _('print command execution profile')),
73 ('', 'profile', None, _('print command execution profile')),
74 ('', 'version', None, _('output version information and exit')),
74 ('', 'version', None, _('output version information and exit')),
75 ('h', 'help', None, _('display help and exit')),
75 ('h', 'help', None, _('display help and exit')),
76 ('', 'hidden', False, _('consider hidden changesets')),
76 ('', 'hidden', False, _('consider hidden changesets')),
77 ]
77 ]
78
78
79 dryrunopts = [('n', 'dry-run', None,
79 dryrunopts = [('n', 'dry-run', None,
80 _('do not perform actions, just print output'))]
80 _('do not perform actions, just print output'))]
81
81
82 remoteopts = [
82 remoteopts = [
83 ('e', 'ssh', '',
83 ('e', 'ssh', '',
84 _('specify ssh command to use'), _('CMD')),
84 _('specify ssh command to use'), _('CMD')),
85 ('', 'remotecmd', '',
85 ('', 'remotecmd', '',
86 _('specify hg command to run on the remote side'), _('CMD')),
86 _('specify hg command to run on the remote side'), _('CMD')),
87 ('', 'insecure', None,
87 ('', 'insecure', None,
88 _('do not verify server certificate (ignoring web.cacerts config)')),
88 _('do not verify server certificate (ignoring web.cacerts config)')),
89 ]
89 ]
90
90
91 walkopts = [
91 walkopts = [
92 ('I', 'include', [],
92 ('I', 'include', [],
93 _('include names matching the given patterns'), _('PATTERN')),
93 _('include names matching the given patterns'), _('PATTERN')),
94 ('X', 'exclude', [],
94 ('X', 'exclude', [],
95 _('exclude names matching the given patterns'), _('PATTERN')),
95 _('exclude names matching the given patterns'), _('PATTERN')),
96 ]
96 ]
97
97
98 commitopts = [
98 commitopts = [
99 ('m', 'message', '',
99 ('m', 'message', '',
100 _('use text as commit message'), _('TEXT')),
100 _('use text as commit message'), _('TEXT')),
101 ('l', 'logfile', '',
101 ('l', 'logfile', '',
102 _('read commit message from file'), _('FILE')),
102 _('read commit message from file'), _('FILE')),
103 ]
103 ]
104
104
105 commitopts2 = [
105 commitopts2 = [
106 ('d', 'date', '',
106 ('d', 'date', '',
107 _('record the specified date as commit date'), _('DATE')),
107 _('record the specified date as commit date'), _('DATE')),
108 ('u', 'user', '',
108 ('u', 'user', '',
109 _('record the specified user as committer'), _('USER')),
109 _('record the specified user as committer'), _('USER')),
110 ]
110 ]
111
111
112 # hidden for now
112 # hidden for now
113 formatteropts = [
113 formatteropts = [
114 ('T', 'template', '',
114 ('T', 'template', '',
115 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
115 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
116 ]
116 ]
117
117
118 templateopts = [
118 templateopts = [
119 ('', 'style', '',
119 ('', 'style', '',
120 _('display using template map file (DEPRECATED)'), _('STYLE')),
120 _('display using template map file (DEPRECATED)'), _('STYLE')),
121 ('T', 'template', '',
121 ('T', 'template', '',
122 _('display with template'), _('TEMPLATE')),
122 _('display with template'), _('TEMPLATE')),
123 ]
123 ]
124
124
125 logopts = [
125 logopts = [
126 ('p', 'patch', None, _('show patch')),
126 ('p', 'patch', None, _('show patch')),
127 ('g', 'git', None, _('use git extended diff format')),
127 ('g', 'git', None, _('use git extended diff format')),
128 ('l', 'limit', '',
128 ('l', 'limit', '',
129 _('limit number of changes displayed'), _('NUM')),
129 _('limit number of changes displayed'), _('NUM')),
130 ('M', 'no-merges', None, _('do not show merges')),
130 ('M', 'no-merges', None, _('do not show merges')),
131 ('', 'stat', None, _('output diffstat-style summary of changes')),
131 ('', 'stat', None, _('output diffstat-style summary of changes')),
132 ('G', 'graph', None, _("show the revision DAG")),
132 ('G', 'graph', None, _("show the revision DAG")),
133 ] + templateopts
133 ] + templateopts
134
134
135 diffopts = [
135 diffopts = [
136 ('a', 'text', None, _('treat all files as text')),
136 ('a', 'text', None, _('treat all files as text')),
137 ('g', 'git', None, _('use git extended diff format')),
137 ('g', 'git', None, _('use git extended diff format')),
138 ('', 'nodates', None, _('omit dates from diff headers'))
138 ('', 'nodates', None, _('omit dates from diff headers'))
139 ]
139 ]
140
140
141 diffwsopts = [
141 diffwsopts = [
142 ('w', 'ignore-all-space', None,
142 ('w', 'ignore-all-space', None,
143 _('ignore white space when comparing lines')),
143 _('ignore white space when comparing lines')),
144 ('b', 'ignore-space-change', None,
144 ('b', 'ignore-space-change', None,
145 _('ignore changes in the amount of white space')),
145 _('ignore changes in the amount of white space')),
146 ('B', 'ignore-blank-lines', None,
146 ('B', 'ignore-blank-lines', None,
147 _('ignore changes whose lines are all blank')),
147 _('ignore changes whose lines are all blank')),
148 ]
148 ]
149
149
150 diffopts2 = [
150 diffopts2 = [
151 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
151 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
152 ('p', 'show-function', None, _('show which function each change is in')),
152 ('p', 'show-function', None, _('show which function each change is in')),
153 ('', 'reverse', None, _('produce a diff that undoes the changes')),
153 ('', 'reverse', None, _('produce a diff that undoes the changes')),
154 ] + diffwsopts + [
154 ] + diffwsopts + [
155 ('U', 'unified', '',
155 ('U', 'unified', '',
156 _('number of lines of context to show'), _('NUM')),
156 _('number of lines of context to show'), _('NUM')),
157 ('', 'stat', None, _('output diffstat-style summary of changes')),
157 ('', 'stat', None, _('output diffstat-style summary of changes')),
158 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
158 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
159 ]
159 ]
160
160
161 mergetoolopts = [
161 mergetoolopts = [
162 ('t', 'tool', '', _('specify merge tool')),
162 ('t', 'tool', '', _('specify merge tool')),
163 ]
163 ]
164
164
165 similarityopts = [
165 similarityopts = [
166 ('s', 'similarity', '',
166 ('s', 'similarity', '',
167 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
167 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
168 ]
168 ]
169
169
170 subrepoopts = [
170 subrepoopts = [
171 ('S', 'subrepos', None,
171 ('S', 'subrepos', None,
172 _('recurse into subrepositories'))
172 _('recurse into subrepositories'))
173 ]
173 ]
174
174
175 debugrevlogopts = [
175 debugrevlogopts = [
176 ('c', 'changelog', False, _('open changelog')),
176 ('c', 'changelog', False, _('open changelog')),
177 ('m', 'manifest', False, _('open manifest')),
177 ('m', 'manifest', False, _('open manifest')),
178 ('', 'dir', False, _('open directory manifest')),
178 ('', 'dir', False, _('open directory manifest')),
179 ]
179 ]
180
180
181 # Commands start here, listed alphabetically
181 # Commands start here, listed alphabetically
182
182
183 @command('^add',
183 @command('^add',
184 walkopts + subrepoopts + dryrunopts,
184 walkopts + subrepoopts + dryrunopts,
185 _('[OPTION]... [FILE]...'),
185 _('[OPTION]... [FILE]...'),
186 inferrepo=True)
186 inferrepo=True)
187 def add(ui, repo, *pats, **opts):
187 def add(ui, repo, *pats, **opts):
188 """add the specified files on the next commit
188 """add the specified files on the next commit
189
189
190 Schedule files to be version controlled and added to the
190 Schedule files to be version controlled and added to the
191 repository.
191 repository.
192
192
193 The files will be added to the repository at the next commit. To
193 The files will be added to the repository at the next commit. To
194 undo an add before that, see :hg:`forget`.
194 undo an add before that, see :hg:`forget`.
195
195
196 If no names are given, add all files to the repository.
196 If no names are given, add all files to the repository.
197
197
198 .. container:: verbose
198 .. container:: verbose
199
199
200 Examples:
200 Examples:
201
201
202 - New (unknown) files are added
202 - New (unknown) files are added
203 automatically by :hg:`add`::
203 automatically by :hg:`add`::
204
204
205 $ ls
205 $ ls
206 foo.c
206 foo.c
207 $ hg status
207 $ hg status
208 ? foo.c
208 ? foo.c
209 $ hg add
209 $ hg add
210 adding foo.c
210 adding foo.c
211 $ hg status
211 $ hg status
212 A foo.c
212 A foo.c
213
213
214 - Specific files to be added can be specified::
214 - Specific files to be added can be specified::
215
215
216 $ ls
216 $ ls
217 bar.c foo.c
217 bar.c foo.c
218 $ hg status
218 $ hg status
219 ? bar.c
219 ? bar.c
220 ? foo.c
220 ? foo.c
221 $ hg add bar.c
221 $ hg add bar.c
222 $ hg status
222 $ hg status
223 A bar.c
223 A bar.c
224 ? foo.c
224 ? foo.c
225
225
226 Returns 0 if all files are successfully added.
226 Returns 0 if all files are successfully added.
227 """
227 """
228
228
229 m = scmutil.match(repo[None], pats, opts)
229 m = scmutil.match(repo[None], pats, opts)
230 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
230 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
231 return rejected and 1 or 0
231 return rejected and 1 or 0
232
232
233 @command('addremove',
233 @command('addremove',
234 similarityopts + subrepoopts + walkopts + dryrunopts,
234 similarityopts + subrepoopts + walkopts + dryrunopts,
235 _('[OPTION]... [FILE]...'),
235 _('[OPTION]... [FILE]...'),
236 inferrepo=True)
236 inferrepo=True)
237 def addremove(ui, repo, *pats, **opts):
237 def addremove(ui, repo, *pats, **opts):
238 """add all new files, delete all missing files
238 """add all new files, delete all missing files
239
239
240 Add all new files and remove all missing files from the
240 Add all new files and remove all missing files from the
241 repository.
241 repository.
242
242
243 New files are ignored if they match any of the patterns in
243 New files are ignored if they match any of the patterns in
244 ``.hgignore``. As with add, these changes take effect at the next
244 ``.hgignore``. As with add, these changes take effect at the next
245 commit.
245 commit.
246
246
247 Use the -s/--similarity option to detect renamed files. This
247 Use the -s/--similarity option to detect renamed files. This
248 option takes a percentage between 0 (disabled) and 100 (files must
248 option takes a percentage between 0 (disabled) and 100 (files must
249 be identical) as its parameter. With a parameter greater than 0,
249 be identical) as its parameter. With a parameter greater than 0,
250 this compares every removed file with every added file and records
250 this compares every removed file with every added file and records
251 those similar enough as renames. Detecting renamed files this way
251 those similar enough as renames. Detecting renamed files this way
252 can be expensive. After using this option, :hg:`status -C` can be
252 can be expensive. After using this option, :hg:`status -C` can be
253 used to check which files were identified as moved or renamed. If
253 used to check which files were identified as moved or renamed. If
254 not specified, -s/--similarity defaults to 100 and only renames of
254 not specified, -s/--similarity defaults to 100 and only renames of
255 identical files are detected.
255 identical files are detected.
256
256
257 .. container:: verbose
257 .. container:: verbose
258
258
259 Examples:
259 Examples:
260
260
261 - A number of files (bar.c and foo.c) are new,
261 - A number of files (bar.c and foo.c) are new,
262 while foobar.c has been removed (without using :hg:`remove`)
262 while foobar.c has been removed (without using :hg:`remove`)
263 from the repository::
263 from the repository::
264
264
265 $ ls
265 $ ls
266 bar.c foo.c
266 bar.c foo.c
267 $ hg status
267 $ hg status
268 ! foobar.c
268 ! foobar.c
269 ? bar.c
269 ? bar.c
270 ? foo.c
270 ? foo.c
271 $ hg addremove
271 $ hg addremove
272 adding bar.c
272 adding bar.c
273 adding foo.c
273 adding foo.c
274 removing foobar.c
274 removing foobar.c
275 $ hg status
275 $ hg status
276 A bar.c
276 A bar.c
277 A foo.c
277 A foo.c
278 R foobar.c
278 R foobar.c
279
279
280 - A file foobar.c was moved to foo.c without using :hg:`rename`.
280 - A file foobar.c was moved to foo.c without using :hg:`rename`.
281 Afterwards, it was edited slightly::
281 Afterwards, it was edited slightly::
282
282
283 $ ls
283 $ ls
284 foo.c
284 foo.c
285 $ hg status
285 $ hg status
286 ! foobar.c
286 ! foobar.c
287 ? foo.c
287 ? foo.c
288 $ hg addremove --similarity 90
288 $ hg addremove --similarity 90
289 removing foobar.c
289 removing foobar.c
290 adding foo.c
290 adding foo.c
291 recording removal of foobar.c as rename to foo.c (94% similar)
291 recording removal of foobar.c as rename to foo.c (94% similar)
292 $ hg status -C
292 $ hg status -C
293 A foo.c
293 A foo.c
294 foobar.c
294 foobar.c
295 R foobar.c
295 R foobar.c
296
296
297 Returns 0 if all files are successfully added.
297 Returns 0 if all files are successfully added.
298 """
298 """
299 try:
299 try:
300 sim = float(opts.get('similarity') or 100)
300 sim = float(opts.get('similarity') or 100)
301 except ValueError:
301 except ValueError:
302 raise error.Abort(_('similarity must be a number'))
302 raise error.Abort(_('similarity must be a number'))
303 if sim < 0 or sim > 100:
303 if sim < 0 or sim > 100:
304 raise error.Abort(_('similarity must be between 0 and 100'))
304 raise error.Abort(_('similarity must be between 0 and 100'))
305 matcher = scmutil.match(repo[None], pats, opts)
305 matcher = scmutil.match(repo[None], pats, opts)
306 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
306 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
307
307
308 @command('^annotate|blame',
308 @command('^annotate|blame',
309 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
309 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
310 ('', 'follow', None,
310 ('', 'follow', None,
311 _('follow copies/renames and list the filename (DEPRECATED)')),
311 _('follow copies/renames and list the filename (DEPRECATED)')),
312 ('', 'no-follow', None, _("don't follow copies and renames")),
312 ('', 'no-follow', None, _("don't follow copies and renames")),
313 ('a', 'text', None, _('treat all files as text')),
313 ('a', 'text', None, _('treat all files as text')),
314 ('u', 'user', None, _('list the author (long with -v)')),
314 ('u', 'user', None, _('list the author (long with -v)')),
315 ('f', 'file', None, _('list the filename')),
315 ('f', 'file', None, _('list the filename')),
316 ('d', 'date', None, _('list the date (short with -q)')),
316 ('d', 'date', None, _('list the date (short with -q)')),
317 ('n', 'number', None, _('list the revision number (default)')),
317 ('n', 'number', None, _('list the revision number (default)')),
318 ('c', 'changeset', None, _('list the changeset')),
318 ('c', 'changeset', None, _('list the changeset')),
319 ('l', 'line-number', None, _('show line number at the first appearance'))
319 ('l', 'line-number', None, _('show line number at the first appearance'))
320 ] + diffwsopts + walkopts + formatteropts,
320 ] + diffwsopts + walkopts + formatteropts,
321 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
321 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
322 inferrepo=True)
322 inferrepo=True)
323 def annotate(ui, repo, *pats, **opts):
323 def annotate(ui, repo, *pats, **opts):
324 """show changeset information by line for each file
324 """show changeset information by line for each file
325
325
326 List changes in files, showing the revision id responsible for
326 List changes in files, showing the revision id responsible for
327 each line
327 each line
328
328
329 This command is useful for discovering when a change was made and
329 This command is useful for discovering when a change was made and
330 by whom.
330 by whom.
331
331
332 Without the -a/--text option, annotate will avoid processing files
332 Without the -a/--text option, annotate will avoid processing files
333 it detects as binary. With -a, annotate will annotate the file
333 it detects as binary. With -a, annotate will annotate the file
334 anyway, although the results will probably be neither useful
334 anyway, although the results will probably be neither useful
335 nor desirable.
335 nor desirable.
336
336
337 Returns 0 on success.
337 Returns 0 on success.
338 """
338 """
339 if not pats:
339 if not pats:
340 raise error.Abort(_('at least one filename or pattern is required'))
340 raise error.Abort(_('at least one filename or pattern is required'))
341
341
342 if opts.get('follow'):
342 if opts.get('follow'):
343 # --follow is deprecated and now just an alias for -f/--file
343 # --follow is deprecated and now just an alias for -f/--file
344 # to mimic the behavior of Mercurial before version 1.5
344 # to mimic the behavior of Mercurial before version 1.5
345 opts['file'] = True
345 opts['file'] = True
346
346
347 ctx = scmutil.revsingle(repo, opts.get('rev'))
347 ctx = scmutil.revsingle(repo, opts.get('rev'))
348
348
349 fm = ui.formatter('annotate', opts)
349 fm = ui.formatter('annotate', opts)
350 if ui.quiet:
350 if ui.quiet:
351 datefunc = util.shortdate
351 datefunc = util.shortdate
352 else:
352 else:
353 datefunc = util.datestr
353 datefunc = util.datestr
354 if ctx.rev() is None:
354 if ctx.rev() is None:
355 def hexfn(node):
355 def hexfn(node):
356 if node is None:
356 if node is None:
357 return None
357 return None
358 else:
358 else:
359 return fm.hexfunc(node)
359 return fm.hexfunc(node)
360 if opts.get('changeset'):
360 if opts.get('changeset'):
361 # omit "+" suffix which is appended to node hex
361 # omit "+" suffix which is appended to node hex
362 def formatrev(rev):
362 def formatrev(rev):
363 if rev is None:
363 if rev is None:
364 return '%d' % ctx.p1().rev()
364 return '%d' % ctx.p1().rev()
365 else:
365 else:
366 return '%d' % rev
366 return '%d' % rev
367 else:
367 else:
368 def formatrev(rev):
368 def formatrev(rev):
369 if rev is None:
369 if rev is None:
370 return '%d+' % ctx.p1().rev()
370 return '%d+' % ctx.p1().rev()
371 else:
371 else:
372 return '%d ' % rev
372 return '%d ' % rev
373 def formathex(hex):
373 def formathex(hex):
374 if hex is None:
374 if hex is None:
375 return '%s+' % fm.hexfunc(ctx.p1().node())
375 return '%s+' % fm.hexfunc(ctx.p1().node())
376 else:
376 else:
377 return '%s ' % hex
377 return '%s ' % hex
378 else:
378 else:
379 hexfn = fm.hexfunc
379 hexfn = fm.hexfunc
380 formatrev = formathex = str
380 formatrev = formathex = str
381
381
382 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
382 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
383 ('number', ' ', lambda x: x[0].rev(), formatrev),
383 ('number', ' ', lambda x: x[0].rev(), formatrev),
384 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
384 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
385 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
385 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
386 ('file', ' ', lambda x: x[0].path(), str),
386 ('file', ' ', lambda x: x[0].path(), str),
387 ('line_number', ':', lambda x: x[1], str),
387 ('line_number', ':', lambda x: x[1], str),
388 ]
388 ]
389 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
389 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
390
390
391 if (not opts.get('user') and not opts.get('changeset')
391 if (not opts.get('user') and not opts.get('changeset')
392 and not opts.get('date') and not opts.get('file')):
392 and not opts.get('date') and not opts.get('file')):
393 opts['number'] = True
393 opts['number'] = True
394
394
395 linenumber = opts.get('line_number') is not None
395 linenumber = opts.get('line_number') is not None
396 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
396 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
397 raise error.Abort(_('at least one of -n/-c is required for -l'))
397 raise error.Abort(_('at least one of -n/-c is required for -l'))
398
398
399 if fm:
399 if fm:
400 def makefunc(get, fmt):
400 def makefunc(get, fmt):
401 return get
401 return get
402 else:
402 else:
403 def makefunc(get, fmt):
403 def makefunc(get, fmt):
404 return lambda x: fmt(get(x))
404 return lambda x: fmt(get(x))
405 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
405 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
406 if opts.get(op)]
406 if opts.get(op)]
407 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
407 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
408 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
408 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
409 if opts.get(op))
409 if opts.get(op))
410
410
411 def bad(x, y):
411 def bad(x, y):
412 raise error.Abort("%s: %s" % (x, y))
412 raise error.Abort("%s: %s" % (x, y))
413
413
414 m = scmutil.match(ctx, pats, opts, badfn=bad)
414 m = scmutil.match(ctx, pats, opts, badfn=bad)
415
415
416 follow = not opts.get('no_follow')
416 follow = not opts.get('no_follow')
417 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
417 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
418 whitespace=True)
418 whitespace=True)
419 for abs in ctx.walk(m):
419 for abs in ctx.walk(m):
420 fctx = ctx[abs]
420 fctx = ctx[abs]
421 if not opts.get('text') and util.binary(fctx.data()):
421 if not opts.get('text') and util.binary(fctx.data()):
422 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
422 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
423 continue
423 continue
424
424
425 lines = fctx.annotate(follow=follow, linenumber=linenumber,
425 lines = fctx.annotate(follow=follow, linenumber=linenumber,
426 diffopts=diffopts)
426 diffopts=diffopts)
427 formats = []
427 formats = []
428 pieces = []
428 pieces = []
429
429
430 for f, sep in funcmap:
430 for f, sep in funcmap:
431 l = [f(n) for n, dummy in lines]
431 l = [f(n) for n, dummy in lines]
432 if l:
432 if l:
433 if fm:
433 if fm:
434 formats.append(['%s' for x in l])
434 formats.append(['%s' for x in l])
435 else:
435 else:
436 sizes = [encoding.colwidth(x) for x in l]
436 sizes = [encoding.colwidth(x) for x in l]
437 ml = max(sizes)
437 ml = max(sizes)
438 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
438 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
439 pieces.append(l)
439 pieces.append(l)
440
440
441 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
441 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
442 fm.startitem()
442 fm.startitem()
443 fm.write(fields, "".join(f), *p)
443 fm.write(fields, "".join(f), *p)
444 fm.write('line', ": %s", l[1])
444 fm.write('line', ": %s", l[1])
445
445
446 if lines and not lines[-1][1].endswith('\n'):
446 if lines and not lines[-1][1].endswith('\n'):
447 fm.plain('\n')
447 fm.plain('\n')
448
448
449 fm.end()
449 fm.end()
450
450
451 @command('archive',
451 @command('archive',
452 [('', 'no-decode', None, _('do not pass files through decoders')),
452 [('', 'no-decode', None, _('do not pass files through decoders')),
453 ('p', 'prefix', '', _('directory prefix for files in archive'),
453 ('p', 'prefix', '', _('directory prefix for files in archive'),
454 _('PREFIX')),
454 _('PREFIX')),
455 ('r', 'rev', '', _('revision to distribute'), _('REV')),
455 ('r', 'rev', '', _('revision to distribute'), _('REV')),
456 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
456 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
457 ] + subrepoopts + walkopts,
457 ] + subrepoopts + walkopts,
458 _('[OPTION]... DEST'))
458 _('[OPTION]... DEST'))
459 def archive(ui, repo, dest, **opts):
459 def archive(ui, repo, dest, **opts):
460 '''create an unversioned archive of a repository revision
460 '''create an unversioned archive of a repository revision
461
461
462 By default, the revision used is the parent of the working
462 By default, the revision used is the parent of the working
463 directory; use -r/--rev to specify a different revision.
463 directory; use -r/--rev to specify a different revision.
464
464
465 The archive type is automatically detected based on file
465 The archive type is automatically detected based on file
466 extension (or override using -t/--type).
466 extension (or override using -t/--type).
467
467
468 .. container:: verbose
468 .. container:: verbose
469
469
470 Examples:
470 Examples:
471
471
472 - create a zip file containing the 1.0 release::
472 - create a zip file containing the 1.0 release::
473
473
474 hg archive -r 1.0 project-1.0.zip
474 hg archive -r 1.0 project-1.0.zip
475
475
476 - create a tarball excluding .hg files::
476 - create a tarball excluding .hg files::
477
477
478 hg archive project.tar.gz -X ".hg*"
478 hg archive project.tar.gz -X ".hg*"
479
479
480 Valid types are:
480 Valid types are:
481
481
482 :``files``: a directory full of files (default)
482 :``files``: a directory full of files (default)
483 :``tar``: tar archive, uncompressed
483 :``tar``: tar archive, uncompressed
484 :``tbz2``: tar archive, compressed using bzip2
484 :``tbz2``: tar archive, compressed using bzip2
485 :``tgz``: tar archive, compressed using gzip
485 :``tgz``: tar archive, compressed using gzip
486 :``uzip``: zip archive, uncompressed
486 :``uzip``: zip archive, uncompressed
487 :``zip``: zip archive, compressed using deflate
487 :``zip``: zip archive, compressed using deflate
488
488
489 The exact name of the destination archive or directory is given
489 The exact name of the destination archive or directory is given
490 using a format string; see :hg:`help export` for details.
490 using a format string; see :hg:`help export` for details.
491
491
492 Each member added to an archive file has a directory prefix
492 Each member added to an archive file has a directory prefix
493 prepended. Use -p/--prefix to specify a format string for the
493 prepended. Use -p/--prefix to specify a format string for the
494 prefix. The default is the basename of the archive, with suffixes
494 prefix. The default is the basename of the archive, with suffixes
495 removed.
495 removed.
496
496
497 Returns 0 on success.
497 Returns 0 on success.
498 '''
498 '''
499
499
500 ctx = scmutil.revsingle(repo, opts.get('rev'))
500 ctx = scmutil.revsingle(repo, opts.get('rev'))
501 if not ctx:
501 if not ctx:
502 raise error.Abort(_('no working directory: please specify a revision'))
502 raise error.Abort(_('no working directory: please specify a revision'))
503 node = ctx.node()
503 node = ctx.node()
504 dest = cmdutil.makefilename(repo, dest, node)
504 dest = cmdutil.makefilename(repo, dest, node)
505 if os.path.realpath(dest) == repo.root:
505 if os.path.realpath(dest) == repo.root:
506 raise error.Abort(_('repository root cannot be destination'))
506 raise error.Abort(_('repository root cannot be destination'))
507
507
508 kind = opts.get('type') or archival.guesskind(dest) or 'files'
508 kind = opts.get('type') or archival.guesskind(dest) or 'files'
509 prefix = opts.get('prefix')
509 prefix = opts.get('prefix')
510
510
511 if dest == '-':
511 if dest == '-':
512 if kind == 'files':
512 if kind == 'files':
513 raise error.Abort(_('cannot archive plain files to stdout'))
513 raise error.Abort(_('cannot archive plain files to stdout'))
514 dest = cmdutil.makefileobj(repo, dest)
514 dest = cmdutil.makefileobj(repo, dest)
515 if not prefix:
515 if not prefix:
516 prefix = os.path.basename(repo.root) + '-%h'
516 prefix = os.path.basename(repo.root) + '-%h'
517
517
518 prefix = cmdutil.makefilename(repo, prefix, node)
518 prefix = cmdutil.makefilename(repo, prefix, node)
519 matchfn = scmutil.match(ctx, [], opts)
519 matchfn = scmutil.match(ctx, [], opts)
520 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
520 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
521 matchfn, prefix, subrepos=opts.get('subrepos'))
521 matchfn, prefix, subrepos=opts.get('subrepos'))
522
522
523 @command('backout',
523 @command('backout',
524 [('', 'merge', None, _('merge with old dirstate parent after backout')),
524 [('', 'merge', None, _('merge with old dirstate parent after backout')),
525 ('', 'commit', None, _('commit if no conflicts were encountered')),
525 ('', 'commit', None, _('commit if no conflicts were encountered')),
526 ('', 'parent', '',
526 ('', 'parent', '',
527 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
527 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
528 ('r', 'rev', '', _('revision to backout'), _('REV')),
528 ('r', 'rev', '', _('revision to backout'), _('REV')),
529 ('e', 'edit', False, _('invoke editor on commit messages')),
529 ('e', 'edit', False, _('invoke editor on commit messages')),
530 ] + mergetoolopts + walkopts + commitopts + commitopts2,
530 ] + mergetoolopts + walkopts + commitopts + commitopts2,
531 _('[OPTION]... [-r] REV'))
531 _('[OPTION]... [-r] REV'))
532 def backout(ui, repo, node=None, rev=None, commit=False, **opts):
532 def backout(ui, repo, node=None, rev=None, commit=False, **opts):
533 '''reverse effect of earlier changeset
533 '''reverse effect of earlier changeset
534
534
535 Prepare a new changeset with the effect of REV undone in the
535 Prepare a new changeset with the effect of REV undone in the
536 current working directory.
536 current working directory.
537
537
538 If REV is the parent of the working directory, then this new changeset
538 If REV is the parent of the working directory, then this new changeset
539 is committed automatically. Otherwise, hg needs to merge the
539 is committed automatically. Otherwise, hg needs to merge the
540 changes and the merged result is left uncommitted.
540 changes and the merged result is left uncommitted.
541
541
542 .. note::
542 .. note::
543
543
544 backout cannot be used to fix either an unwanted or
544 backout cannot be used to fix either an unwanted or
545 incorrect merge.
545 incorrect merge.
546
546
547 .. container:: verbose
547 .. container:: verbose
548
548
549 Examples:
549 Examples:
550
550
551 - Reverse the effect of the parent of the working directory.
551 - Reverse the effect of the parent of the working directory.
552 This backout will be committed immediately::
552 This backout will be committed immediately::
553
553
554 hg backout -r .
554 hg backout -r .
555
555
556 - Reverse the effect of previous bad revision 23::
556 - Reverse the effect of previous bad revision 23::
557
557
558 hg backout -r 23
558 hg backout -r 23
559 hg commit -m "Backout revision 23"
559 hg commit -m "Backout revision 23"
560
560
561 - Reverse the effect of previous bad revision 23 and
561 - Reverse the effect of previous bad revision 23 and
562 commit the backout immediately::
562 commit the backout immediately::
563
563
564 hg backout -r 23 --commit
564 hg backout -r 23 --commit
565
565
566 By default, the pending changeset will have one parent,
566 By default, the pending changeset will have one parent,
567 maintaining a linear history. With --merge, the pending
567 maintaining a linear history. With --merge, the pending
568 changeset will instead have two parents: the old parent of the
568 changeset will instead have two parents: the old parent of the
569 working directory and a new child of REV that simply undoes REV.
569 working directory and a new child of REV that simply undoes REV.
570
570
571 Before version 1.7, the behavior without --merge was equivalent
571 Before version 1.7, the behavior without --merge was equivalent
572 to specifying --merge followed by :hg:`update --clean .` to
572 to specifying --merge followed by :hg:`update --clean .` to
573 cancel the merge and leave the child of REV as a head to be
573 cancel the merge and leave the child of REV as a head to be
574 merged separately.
574 merged separately.
575
575
576 See :hg:`help dates` for a list of formats valid for -d/--date.
576 See :hg:`help dates` for a list of formats valid for -d/--date.
577
577
578 See :hg:`help revert` for a way to restore files to the state
578 See :hg:`help revert` for a way to restore files to the state
579 of another revision.
579 of another revision.
580
580
581 Returns 0 on success, 1 if nothing to backout or there are unresolved
581 Returns 0 on success, 1 if nothing to backout or there are unresolved
582 files.
582 files.
583 '''
583 '''
584 wlock = lock = None
584 wlock = lock = None
585 try:
585 try:
586 wlock = repo.wlock()
586 wlock = repo.wlock()
587 lock = repo.lock()
587 lock = repo.lock()
588 return _dobackout(ui, repo, node, rev, commit, **opts)
588 return _dobackout(ui, repo, node, rev, commit, **opts)
589 finally:
589 finally:
590 release(lock, wlock)
590 release(lock, wlock)
591
591
592 def _dobackout(ui, repo, node=None, rev=None, commit=False, **opts):
592 def _dobackout(ui, repo, node=None, rev=None, commit=False, **opts):
593 if rev and node:
593 if rev and node:
594 raise error.Abort(_("please specify just one revision"))
594 raise error.Abort(_("please specify just one revision"))
595
595
596 if not rev:
596 if not rev:
597 rev = node
597 rev = node
598
598
599 if not rev:
599 if not rev:
600 raise error.Abort(_("please specify a revision to backout"))
600 raise error.Abort(_("please specify a revision to backout"))
601
601
602 date = opts.get('date')
602 date = opts.get('date')
603 if date:
603 if date:
604 opts['date'] = util.parsedate(date)
604 opts['date'] = util.parsedate(date)
605
605
606 cmdutil.checkunfinished(repo)
606 cmdutil.checkunfinished(repo)
607 cmdutil.bailifchanged(repo)
607 cmdutil.bailifchanged(repo)
608 node = scmutil.revsingle(repo, rev).node()
608 node = scmutil.revsingle(repo, rev).node()
609
609
610 op1, op2 = repo.dirstate.parents()
610 op1, op2 = repo.dirstate.parents()
611 if not repo.changelog.isancestor(node, op1):
611 if not repo.changelog.isancestor(node, op1):
612 raise error.Abort(_('cannot backout change that is not an ancestor'))
612 raise error.Abort(_('cannot backout change that is not an ancestor'))
613
613
614 p1, p2 = repo.changelog.parents(node)
614 p1, p2 = repo.changelog.parents(node)
615 if p1 == nullid:
615 if p1 == nullid:
616 raise error.Abort(_('cannot backout a change with no parents'))
616 raise error.Abort(_('cannot backout a change with no parents'))
617 if p2 != nullid:
617 if p2 != nullid:
618 if not opts.get('parent'):
618 if not opts.get('parent'):
619 raise error.Abort(_('cannot backout a merge changeset'))
619 raise error.Abort(_('cannot backout a merge changeset'))
620 p = repo.lookup(opts['parent'])
620 p = repo.lookup(opts['parent'])
621 if p not in (p1, p2):
621 if p not in (p1, p2):
622 raise error.Abort(_('%s is not a parent of %s') %
622 raise error.Abort(_('%s is not a parent of %s') %
623 (short(p), short(node)))
623 (short(p), short(node)))
624 parent = p
624 parent = p
625 else:
625 else:
626 if opts.get('parent'):
626 if opts.get('parent'):
627 raise error.Abort(_('cannot use --parent on non-merge changeset'))
627 raise error.Abort(_('cannot use --parent on non-merge changeset'))
628 parent = p1
628 parent = p1
629
629
630 # the backout should appear on the same branch
630 # the backout should appear on the same branch
631 try:
631 try:
632 branch = repo.dirstate.branch()
632 branch = repo.dirstate.branch()
633 bheads = repo.branchheads(branch)
633 bheads = repo.branchheads(branch)
634 rctx = scmutil.revsingle(repo, hex(parent))
634 rctx = scmutil.revsingle(repo, hex(parent))
635 if not opts.get('merge') and op1 != node:
635 if not opts.get('merge') and op1 != node:
636 dsguard = cmdutil.dirstateguard(repo, 'backout')
636 dsguard = cmdutil.dirstateguard(repo, 'backout')
637 try:
637 try:
638 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
638 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
639 'backout')
639 'backout')
640 stats = mergemod.update(repo, parent, True, True, node, False)
640 stats = mergemod.update(repo, parent, True, True, node, False)
641 repo.setparents(op1, op2)
641 repo.setparents(op1, op2)
642 dsguard.close()
642 dsguard.close()
643 hg._showstats(repo, stats)
643 hg._showstats(repo, stats)
644 if stats[3]:
644 if stats[3]:
645 repo.ui.status(_("use 'hg resolve' to retry unresolved "
645 repo.ui.status(_("use 'hg resolve' to retry unresolved "
646 "file merges\n"))
646 "file merges\n"))
647 return 1
647 return 1
648 elif not commit:
648 elif not commit:
649 msg = _("changeset %s backed out, "
649 msg = _("changeset %s backed out, "
650 "don't forget to commit.\n")
650 "don't forget to commit.\n")
651 ui.status(msg % short(node))
651 ui.status(msg % short(node))
652 return 0
652 return 0
653 finally:
653 finally:
654 ui.setconfig('ui', 'forcemerge', '', '')
654 ui.setconfig('ui', 'forcemerge', '', '')
655 lockmod.release(dsguard)
655 lockmod.release(dsguard)
656 else:
656 else:
657 hg.clean(repo, node, show_stats=False)
657 hg.clean(repo, node, show_stats=False)
658 repo.dirstate.setbranch(branch)
658 repo.dirstate.setbranch(branch)
659 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
659 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
660
660
661
661
662 def commitfunc(ui, repo, message, match, opts):
662 def commitfunc(ui, repo, message, match, opts):
663 editform = 'backout'
663 editform = 'backout'
664 e = cmdutil.getcommiteditor(editform=editform, **opts)
664 e = cmdutil.getcommiteditor(editform=editform, **opts)
665 if not message:
665 if not message:
666 # we don't translate commit messages
666 # we don't translate commit messages
667 message = "Backed out changeset %s" % short(node)
667 message = "Backed out changeset %s" % short(node)
668 e = cmdutil.getcommiteditor(edit=True, editform=editform)
668 e = cmdutil.getcommiteditor(edit=True, editform=editform)
669 return repo.commit(message, opts.get('user'), opts.get('date'),
669 return repo.commit(message, opts.get('user'), opts.get('date'),
670 match, editor=e)
670 match, editor=e)
671 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
671 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
672 if not newnode:
672 if not newnode:
673 ui.status(_("nothing changed\n"))
673 ui.status(_("nothing changed\n"))
674 return 1
674 return 1
675 cmdutil.commitstatus(repo, newnode, branch, bheads)
675 cmdutil.commitstatus(repo, newnode, branch, bheads)
676
676
677 def nice(node):
677 def nice(node):
678 return '%d:%s' % (repo.changelog.rev(node), short(node))
678 return '%d:%s' % (repo.changelog.rev(node), short(node))
679 ui.status(_('changeset %s backs out changeset %s\n') %
679 ui.status(_('changeset %s backs out changeset %s\n') %
680 (nice(repo.changelog.tip()), nice(node)))
680 (nice(repo.changelog.tip()), nice(node)))
681 if opts.get('merge') and op1 != node:
681 if opts.get('merge') and op1 != node:
682 hg.clean(repo, op1, show_stats=False)
682 hg.clean(repo, op1, show_stats=False)
683 ui.status(_('merging with changeset %s\n')
683 ui.status(_('merging with changeset %s\n')
684 % nice(repo.changelog.tip()))
684 % nice(repo.changelog.tip()))
685 try:
685 try:
686 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
686 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
687 'backout')
687 'backout')
688 return hg.merge(repo, hex(repo.changelog.tip()))
688 return hg.merge(repo, hex(repo.changelog.tip()))
689 finally:
689 finally:
690 ui.setconfig('ui', 'forcemerge', '', '')
690 ui.setconfig('ui', 'forcemerge', '', '')
691 finally:
691 finally:
692 # TODO: get rid of this meaningless try/finally enclosing.
692 # TODO: get rid of this meaningless try/finally enclosing.
693 # this is kept only to reduce changes in a patch.
693 # this is kept only to reduce changes in a patch.
694 pass
694 pass
695 return 0
695 return 0
696
696
697 @command('bisect',
697 @command('bisect',
698 [('r', 'reset', False, _('reset bisect state')),
698 [('r', 'reset', False, _('reset bisect state')),
699 ('g', 'good', False, _('mark changeset good')),
699 ('g', 'good', False, _('mark changeset good')),
700 ('b', 'bad', False, _('mark changeset bad')),
700 ('b', 'bad', False, _('mark changeset bad')),
701 ('s', 'skip', False, _('skip testing changeset')),
701 ('s', 'skip', False, _('skip testing changeset')),
702 ('e', 'extend', False, _('extend the bisect range')),
702 ('e', 'extend', False, _('extend the bisect range')),
703 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
703 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
704 ('U', 'noupdate', False, _('do not update to target'))],
704 ('U', 'noupdate', False, _('do not update to target'))],
705 _("[-gbsr] [-U] [-c CMD] [REV]"))
705 _("[-gbsr] [-U] [-c CMD] [REV]"))
706 def bisect(ui, repo, rev=None, extra=None, command=None,
706 def bisect(ui, repo, rev=None, extra=None, command=None,
707 reset=None, good=None, bad=None, skip=None, extend=None,
707 reset=None, good=None, bad=None, skip=None, extend=None,
708 noupdate=None):
708 noupdate=None):
709 """subdivision search of changesets
709 """subdivision search of changesets
710
710
711 This command helps to find changesets which introduce problems. To
711 This command helps to find changesets which introduce problems. To
712 use, mark the earliest changeset you know exhibits the problem as
712 use, mark the earliest changeset you know exhibits the problem as
713 bad, then mark the latest changeset which is free from the problem
713 bad, then mark the latest changeset which is free from the problem
714 as good. Bisect will update your working directory to a revision
714 as good. Bisect will update your working directory to a revision
715 for testing (unless the -U/--noupdate option is specified). Once
715 for testing (unless the -U/--noupdate option is specified). Once
716 you have performed tests, mark the working directory as good or
716 you have performed tests, mark the working directory as good or
717 bad, and bisect will either update to another candidate changeset
717 bad, and bisect will either update to another candidate changeset
718 or announce that it has found the bad revision.
718 or announce that it has found the bad revision.
719
719
720 As a shortcut, you can also use the revision argument to mark a
720 As a shortcut, you can also use the revision argument to mark a
721 revision as good or bad without checking it out first.
721 revision as good or bad without checking it out first.
722
722
723 If you supply a command, it will be used for automatic bisection.
723 If you supply a command, it will be used for automatic bisection.
724 The environment variable HG_NODE will contain the ID of the
724 The environment variable HG_NODE will contain the ID of the
725 changeset being tested. The exit status of the command will be
725 changeset being tested. The exit status of the command will be
726 used to mark revisions as good or bad: status 0 means good, 125
726 used to mark revisions as good or bad: status 0 means good, 125
727 means to skip the revision, 127 (command not found) will abort the
727 means to skip the revision, 127 (command not found) will abort the
728 bisection, and any other non-zero exit status means the revision
728 bisection, and any other non-zero exit status means the revision
729 is bad.
729 is bad.
730
730
731 .. container:: verbose
731 .. container:: verbose
732
732
733 Some examples:
733 Some examples:
734
734
735 - start a bisection with known bad revision 34, and good revision 12::
735 - start a bisection with known bad revision 34, and good revision 12::
736
736
737 hg bisect --bad 34
737 hg bisect --bad 34
738 hg bisect --good 12
738 hg bisect --good 12
739
739
740 - advance the current bisection by marking current revision as good or
740 - advance the current bisection by marking current revision as good or
741 bad::
741 bad::
742
742
743 hg bisect --good
743 hg bisect --good
744 hg bisect --bad
744 hg bisect --bad
745
745
746 - mark the current revision, or a known revision, to be skipped (e.g. if
746 - mark the current revision, or a known revision, to be skipped (e.g. if
747 that revision is not usable because of another issue)::
747 that revision is not usable because of another issue)::
748
748
749 hg bisect --skip
749 hg bisect --skip
750 hg bisect --skip 23
750 hg bisect --skip 23
751
751
752 - skip all revisions that do not touch directories ``foo`` or ``bar``::
752 - skip all revisions that do not touch directories ``foo`` or ``bar``::
753
753
754 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
754 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
755
755
756 - forget the current bisection::
756 - forget the current bisection::
757
757
758 hg bisect --reset
758 hg bisect --reset
759
759
760 - use 'make && make tests' to automatically find the first broken
760 - use 'make && make tests' to automatically find the first broken
761 revision::
761 revision::
762
762
763 hg bisect --reset
763 hg bisect --reset
764 hg bisect --bad 34
764 hg bisect --bad 34
765 hg bisect --good 12
765 hg bisect --good 12
766 hg bisect --command "make && make tests"
766 hg bisect --command "make && make tests"
767
767
768 - see all changesets whose states are already known in the current
768 - see all changesets whose states are already known in the current
769 bisection::
769 bisection::
770
770
771 hg log -r "bisect(pruned)"
771 hg log -r "bisect(pruned)"
772
772
773 - see the changeset currently being bisected (especially useful
773 - see the changeset currently being bisected (especially useful
774 if running with -U/--noupdate)::
774 if running with -U/--noupdate)::
775
775
776 hg log -r "bisect(current)"
776 hg log -r "bisect(current)"
777
777
778 - see all changesets that took part in the current bisection::
778 - see all changesets that took part in the current bisection::
779
779
780 hg log -r "bisect(range)"
780 hg log -r "bisect(range)"
781
781
782 - you can even get a nice graph::
782 - you can even get a nice graph::
783
783
784 hg log --graph -r "bisect(range)"
784 hg log --graph -r "bisect(range)"
785
785
786 See :hg:`help revsets` for more about the `bisect()` keyword.
786 See :hg:`help revsets` for more about the `bisect()` keyword.
787
787
788 Returns 0 on success.
788 Returns 0 on success.
789 """
789 """
790 def extendbisectrange(nodes, good):
790 def extendbisectrange(nodes, good):
791 # bisect is incomplete when it ends on a merge node and
791 # bisect is incomplete when it ends on a merge node and
792 # one of the parent was not checked.
792 # one of the parent was not checked.
793 parents = repo[nodes[0]].parents()
793 parents = repo[nodes[0]].parents()
794 if len(parents) > 1:
794 if len(parents) > 1:
795 if good:
795 if good:
796 side = state['bad']
796 side = state['bad']
797 else:
797 else:
798 side = state['good']
798 side = state['good']
799 num = len(set(i.node() for i in parents) & set(side))
799 num = len(set(i.node() for i in parents) & set(side))
800 if num == 1:
800 if num == 1:
801 return parents[0].ancestor(parents[1])
801 return parents[0].ancestor(parents[1])
802 return None
802 return None
803
803
804 def print_result(nodes, good):
804 def print_result(nodes, good):
805 displayer = cmdutil.show_changeset(ui, repo, {})
805 displayer = cmdutil.show_changeset(ui, repo, {})
806 if len(nodes) == 1:
806 if len(nodes) == 1:
807 # narrowed it down to a single revision
807 # narrowed it down to a single revision
808 if good:
808 if good:
809 ui.write(_("The first good revision is:\n"))
809 ui.write(_("The first good revision is:\n"))
810 else:
810 else:
811 ui.write(_("The first bad revision is:\n"))
811 ui.write(_("The first bad revision is:\n"))
812 displayer.show(repo[nodes[0]])
812 displayer.show(repo[nodes[0]])
813 extendnode = extendbisectrange(nodes, good)
813 extendnode = extendbisectrange(nodes, good)
814 if extendnode is not None:
814 if extendnode is not None:
815 ui.write(_('Not all ancestors of this changeset have been'
815 ui.write(_('Not all ancestors of this changeset have been'
816 ' checked.\nUse bisect --extend to continue the '
816 ' checked.\nUse bisect --extend to continue the '
817 'bisection from\nthe common ancestor, %s.\n')
817 'bisection from\nthe common ancestor, %s.\n')
818 % extendnode)
818 % extendnode)
819 else:
819 else:
820 # multiple possible revisions
820 # multiple possible revisions
821 if good:
821 if good:
822 ui.write(_("Due to skipped revisions, the first "
822 ui.write(_("Due to skipped revisions, the first "
823 "good revision could be any of:\n"))
823 "good revision could be any of:\n"))
824 else:
824 else:
825 ui.write(_("Due to skipped revisions, the first "
825 ui.write(_("Due to skipped revisions, the first "
826 "bad revision could be any of:\n"))
826 "bad revision could be any of:\n"))
827 for n in nodes:
827 for n in nodes:
828 displayer.show(repo[n])
828 displayer.show(repo[n])
829 displayer.close()
829 displayer.close()
830
830
831 def check_state(state, interactive=True):
831 def check_state(state, interactive=True):
832 if not state['good'] or not state['bad']:
832 if not state['good'] or not state['bad']:
833 if (good or bad or skip or reset) and interactive:
833 if (good or bad or skip or reset) and interactive:
834 return
834 return
835 if not state['good']:
835 if not state['good']:
836 raise error.Abort(_('cannot bisect (no known good revisions)'))
836 raise error.Abort(_('cannot bisect (no known good revisions)'))
837 else:
837 else:
838 raise error.Abort(_('cannot bisect (no known bad revisions)'))
838 raise error.Abort(_('cannot bisect (no known bad revisions)'))
839 return True
839 return True
840
840
841 # backward compatibility
841 # backward compatibility
842 if rev in "good bad reset init".split():
842 if rev in "good bad reset init".split():
843 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
843 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
844 cmd, rev, extra = rev, extra, None
844 cmd, rev, extra = rev, extra, None
845 if cmd == "good":
845 if cmd == "good":
846 good = True
846 good = True
847 elif cmd == "bad":
847 elif cmd == "bad":
848 bad = True
848 bad = True
849 else:
849 else:
850 reset = True
850 reset = True
851 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
851 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
852 raise error.Abort(_('incompatible arguments'))
852 raise error.Abort(_('incompatible arguments'))
853
853
854 cmdutil.checkunfinished(repo)
854 cmdutil.checkunfinished(repo)
855
855
856 if reset:
856 if reset:
857 p = repo.join("bisect.state")
857 p = repo.join("bisect.state")
858 if os.path.exists(p):
858 if os.path.exists(p):
859 os.unlink(p)
859 os.unlink(p)
860 return
860 return
861
861
862 state = hbisect.load_state(repo)
862 state = hbisect.load_state(repo)
863
863
864 if command:
864 if command:
865 changesets = 1
865 changesets = 1
866 if noupdate:
866 if noupdate:
867 try:
867 try:
868 node = state['current'][0]
868 node = state['current'][0]
869 except LookupError:
869 except LookupError:
870 raise error.Abort(_('current bisect revision is unknown - '
870 raise error.Abort(_('current bisect revision is unknown - '
871 'start a new bisect to fix'))
871 'start a new bisect to fix'))
872 else:
872 else:
873 node, p2 = repo.dirstate.parents()
873 node, p2 = repo.dirstate.parents()
874 if p2 != nullid:
874 if p2 != nullid:
875 raise error.Abort(_('current bisect revision is a merge'))
875 raise error.Abort(_('current bisect revision is a merge'))
876 try:
876 try:
877 while changesets:
877 while changesets:
878 # update state
878 # update state
879 state['current'] = [node]
879 state['current'] = [node]
880 hbisect.save_state(repo, state)
880 hbisect.save_state(repo, state)
881 status = ui.system(command, environ={'HG_NODE': hex(node)})
881 status = ui.system(command, environ={'HG_NODE': hex(node)})
882 if status == 125:
882 if status == 125:
883 transition = "skip"
883 transition = "skip"
884 elif status == 0:
884 elif status == 0:
885 transition = "good"
885 transition = "good"
886 # status < 0 means process was killed
886 # status < 0 means process was killed
887 elif status == 127:
887 elif status == 127:
888 raise error.Abort(_("failed to execute %s") % command)
888 raise error.Abort(_("failed to execute %s") % command)
889 elif status < 0:
889 elif status < 0:
890 raise error.Abort(_("%s killed") % command)
890 raise error.Abort(_("%s killed") % command)
891 else:
891 else:
892 transition = "bad"
892 transition = "bad"
893 ctx = scmutil.revsingle(repo, rev, node)
893 ctx = scmutil.revsingle(repo, rev, node)
894 rev = None # clear for future iterations
894 rev = None # clear for future iterations
895 state[transition].append(ctx.node())
895 state[transition].append(ctx.node())
896 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
896 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
897 check_state(state, interactive=False)
897 check_state(state, interactive=False)
898 # bisect
898 # bisect
899 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
899 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
900 # update to next check
900 # update to next check
901 node = nodes[0]
901 node = nodes[0]
902 if not noupdate:
902 if not noupdate:
903 cmdutil.bailifchanged(repo)
903 cmdutil.bailifchanged(repo)
904 hg.clean(repo, node, show_stats=False)
904 hg.clean(repo, node, show_stats=False)
905 finally:
905 finally:
906 state['current'] = [node]
906 state['current'] = [node]
907 hbisect.save_state(repo, state)
907 hbisect.save_state(repo, state)
908 print_result(nodes, bgood)
908 print_result(nodes, bgood)
909 return
909 return
910
910
911 # update state
911 # update state
912
912
913 if rev:
913 if rev:
914 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
914 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
915 else:
915 else:
916 nodes = [repo.lookup('.')]
916 nodes = [repo.lookup('.')]
917
917
918 if good or bad or skip:
918 if good or bad or skip:
919 if good:
919 if good:
920 state['good'] += nodes
920 state['good'] += nodes
921 elif bad:
921 elif bad:
922 state['bad'] += nodes
922 state['bad'] += nodes
923 elif skip:
923 elif skip:
924 state['skip'] += nodes
924 state['skip'] += nodes
925 hbisect.save_state(repo, state)
925 hbisect.save_state(repo, state)
926
926
927 if not check_state(state):
927 if not check_state(state):
928 return
928 return
929
929
930 # actually bisect
930 # actually bisect
931 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
931 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
932 if extend:
932 if extend:
933 if not changesets:
933 if not changesets:
934 extendnode = extendbisectrange(nodes, good)
934 extendnode = extendbisectrange(nodes, good)
935 if extendnode is not None:
935 if extendnode is not None:
936 ui.write(_("Extending search to changeset %d:%s\n")
936 ui.write(_("Extending search to changeset %d:%s\n")
937 % (extendnode.rev(), extendnode))
937 % (extendnode.rev(), extendnode))
938 state['current'] = [extendnode.node()]
938 state['current'] = [extendnode.node()]
939 hbisect.save_state(repo, state)
939 hbisect.save_state(repo, state)
940 if noupdate:
940 if noupdate:
941 return
941 return
942 cmdutil.bailifchanged(repo)
942 cmdutil.bailifchanged(repo)
943 return hg.clean(repo, extendnode.node())
943 return hg.clean(repo, extendnode.node())
944 raise error.Abort(_("nothing to extend"))
944 raise error.Abort(_("nothing to extend"))
945
945
946 if changesets == 0:
946 if changesets == 0:
947 print_result(nodes, good)
947 print_result(nodes, good)
948 else:
948 else:
949 assert len(nodes) == 1 # only a single node can be tested next
949 assert len(nodes) == 1 # only a single node can be tested next
950 node = nodes[0]
950 node = nodes[0]
951 # compute the approximate number of remaining tests
951 # compute the approximate number of remaining tests
952 tests, size = 0, 2
952 tests, size = 0, 2
953 while size <= changesets:
953 while size <= changesets:
954 tests, size = tests + 1, size * 2
954 tests, size = tests + 1, size * 2
955 rev = repo.changelog.rev(node)
955 rev = repo.changelog.rev(node)
956 ui.write(_("Testing changeset %d:%s "
956 ui.write(_("Testing changeset %d:%s "
957 "(%d changesets remaining, ~%d tests)\n")
957 "(%d changesets remaining, ~%d tests)\n")
958 % (rev, short(node), changesets, tests))
958 % (rev, short(node), changesets, tests))
959 state['current'] = [node]
959 state['current'] = [node]
960 hbisect.save_state(repo, state)
960 hbisect.save_state(repo, state)
961 if not noupdate:
961 if not noupdate:
962 cmdutil.bailifchanged(repo)
962 cmdutil.bailifchanged(repo)
963 return hg.clean(repo, node)
963 return hg.clean(repo, node)
964
964
965 @command('bookmarks|bookmark',
965 @command('bookmarks|bookmark',
966 [('f', 'force', False, _('force')),
966 [('f', 'force', False, _('force')),
967 ('r', 'rev', '', _('revision'), _('REV')),
967 ('r', 'rev', '', _('revision'), _('REV')),
968 ('d', 'delete', False, _('delete a given bookmark')),
968 ('d', 'delete', False, _('delete a given bookmark')),
969 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
969 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
970 ('i', 'inactive', False, _('mark a bookmark inactive')),
970 ('i', 'inactive', False, _('mark a bookmark inactive')),
971 ] + formatteropts,
971 ] + formatteropts,
972 _('hg bookmarks [OPTIONS]... [NAME]...'))
972 _('hg bookmarks [OPTIONS]... [NAME]...'))
973 def bookmark(ui, repo, *names, **opts):
973 def bookmark(ui, repo, *names, **opts):
974 '''create a new bookmark or list existing bookmarks
974 '''create a new bookmark or list existing bookmarks
975
975
976 Bookmarks are labels on changesets to help track lines of development.
976 Bookmarks are labels on changesets to help track lines of development.
977 Bookmarks are unversioned and can be moved, renamed and deleted.
977 Bookmarks are unversioned and can be moved, renamed and deleted.
978 Deleting or moving a bookmark has no effect on the associated changesets.
978 Deleting or moving a bookmark has no effect on the associated changesets.
979
979
980 Creating or updating to a bookmark causes it to be marked as 'active'.
980 Creating or updating to a bookmark causes it to be marked as 'active'.
981 The active bookmark is indicated with a '*'.
981 The active bookmark is indicated with a '*'.
982 When a commit is made, the active bookmark will advance to the new commit.
982 When a commit is made, the active bookmark will advance to the new commit.
983 A plain :hg:`update` will also advance an active bookmark, if possible.
983 A plain :hg:`update` will also advance an active bookmark, if possible.
984 Updating away from a bookmark will cause it to be deactivated.
984 Updating away from a bookmark will cause it to be deactivated.
985
985
986 Bookmarks can be pushed and pulled between repositories (see
986 Bookmarks can be pushed and pulled between repositories (see
987 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
987 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
988 diverged, a new 'divergent bookmark' of the form 'name@path' will
988 diverged, a new 'divergent bookmark' of the form 'name@path' will
989 be created. Using :hg:`merge` will resolve the divergence.
989 be created. Using :hg:`merge` will resolve the divergence.
990
990
991 A bookmark named '@' has the special property that :hg:`clone` will
991 A bookmark named '@' has the special property that :hg:`clone` will
992 check it out by default if it exists.
992 check it out by default if it exists.
993
993
994 .. container:: verbose
994 .. container:: verbose
995
995
996 Examples:
996 Examples:
997
997
998 - create an active bookmark for a new line of development::
998 - create an active bookmark for a new line of development::
999
999
1000 hg book new-feature
1000 hg book new-feature
1001
1001
1002 - create an inactive bookmark as a place marker::
1002 - create an inactive bookmark as a place marker::
1003
1003
1004 hg book -i reviewed
1004 hg book -i reviewed
1005
1005
1006 - create an inactive bookmark on another changeset::
1006 - create an inactive bookmark on another changeset::
1007
1007
1008 hg book -r .^ tested
1008 hg book -r .^ tested
1009
1009
1010 - rename bookmark turkey to dinner::
1010 - rename bookmark turkey to dinner::
1011
1011
1012 hg book -m turkey dinner
1012 hg book -m turkey dinner
1013
1013
1014 - move the '@' bookmark from another branch::
1014 - move the '@' bookmark from another branch::
1015
1015
1016 hg book -f @
1016 hg book -f @
1017 '''
1017 '''
1018 force = opts.get('force')
1018 force = opts.get('force')
1019 rev = opts.get('rev')
1019 rev = opts.get('rev')
1020 delete = opts.get('delete')
1020 delete = opts.get('delete')
1021 rename = opts.get('rename')
1021 rename = opts.get('rename')
1022 inactive = opts.get('inactive')
1022 inactive = opts.get('inactive')
1023
1023
1024 def checkformat(mark):
1024 def checkformat(mark):
1025 mark = mark.strip()
1025 mark = mark.strip()
1026 if not mark:
1026 if not mark:
1027 raise error.Abort(_("bookmark names cannot consist entirely of "
1027 raise error.Abort(_("bookmark names cannot consist entirely of "
1028 "whitespace"))
1028 "whitespace"))
1029 scmutil.checknewlabel(repo, mark, 'bookmark')
1029 scmutil.checknewlabel(repo, mark, 'bookmark')
1030 return mark
1030 return mark
1031
1031
1032 def checkconflict(repo, mark, cur, force=False, target=None):
1032 def checkconflict(repo, mark, cur, force=False, target=None):
1033 if mark in marks and not force:
1033 if mark in marks and not force:
1034 if target:
1034 if target:
1035 if marks[mark] == target and target == cur:
1035 if marks[mark] == target and target == cur:
1036 # re-activating a bookmark
1036 # re-activating a bookmark
1037 return
1037 return
1038 anc = repo.changelog.ancestors([repo[target].rev()])
1038 anc = repo.changelog.ancestors([repo[target].rev()])
1039 bmctx = repo[marks[mark]]
1039 bmctx = repo[marks[mark]]
1040 divs = [repo[b].node() for b in marks
1040 divs = [repo[b].node() for b in marks
1041 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1041 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1042
1042
1043 # allow resolving a single divergent bookmark even if moving
1043 # allow resolving a single divergent bookmark even if moving
1044 # the bookmark across branches when a revision is specified
1044 # the bookmark across branches when a revision is specified
1045 # that contains a divergent bookmark
1045 # that contains a divergent bookmark
1046 if bmctx.rev() not in anc and target in divs:
1046 if bmctx.rev() not in anc and target in divs:
1047 bookmarks.deletedivergent(repo, [target], mark)
1047 bookmarks.deletedivergent(repo, [target], mark)
1048 return
1048 return
1049
1049
1050 deletefrom = [b for b in divs
1050 deletefrom = [b for b in divs
1051 if repo[b].rev() in anc or b == target]
1051 if repo[b].rev() in anc or b == target]
1052 bookmarks.deletedivergent(repo, deletefrom, mark)
1052 bookmarks.deletedivergent(repo, deletefrom, mark)
1053 if bookmarks.validdest(repo, bmctx, repo[target]):
1053 if bookmarks.validdest(repo, bmctx, repo[target]):
1054 ui.status(_("moving bookmark '%s' forward from %s\n") %
1054 ui.status(_("moving bookmark '%s' forward from %s\n") %
1055 (mark, short(bmctx.node())))
1055 (mark, short(bmctx.node())))
1056 return
1056 return
1057 raise error.Abort(_("bookmark '%s' already exists "
1057 raise error.Abort(_("bookmark '%s' already exists "
1058 "(use -f to force)") % mark)
1058 "(use -f to force)") % mark)
1059 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1059 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1060 and not force):
1060 and not force):
1061 raise error.Abort(
1061 raise error.Abort(
1062 _("a bookmark cannot have the name of an existing branch"))
1062 _("a bookmark cannot have the name of an existing branch"))
1063
1063
1064 if delete and rename:
1064 if delete and rename:
1065 raise error.Abort(_("--delete and --rename are incompatible"))
1065 raise error.Abort(_("--delete and --rename are incompatible"))
1066 if delete and rev:
1066 if delete and rev:
1067 raise error.Abort(_("--rev is incompatible with --delete"))
1067 raise error.Abort(_("--rev is incompatible with --delete"))
1068 if rename and rev:
1068 if rename and rev:
1069 raise error.Abort(_("--rev is incompatible with --rename"))
1069 raise error.Abort(_("--rev is incompatible with --rename"))
1070 if not names and (delete or rev):
1070 if not names and (delete or rev):
1071 raise error.Abort(_("bookmark name required"))
1071 raise error.Abort(_("bookmark name required"))
1072
1072
1073 if delete or rename or names or inactive:
1073 if delete or rename or names or inactive:
1074 wlock = lock = tr = None
1074 wlock = lock = tr = None
1075 try:
1075 try:
1076 wlock = repo.wlock()
1076 wlock = repo.wlock()
1077 lock = repo.lock()
1077 lock = repo.lock()
1078 cur = repo.changectx('.').node()
1078 cur = repo.changectx('.').node()
1079 marks = repo._bookmarks
1079 marks = repo._bookmarks
1080 if delete:
1080 if delete:
1081 tr = repo.transaction('bookmark')
1081 tr = repo.transaction('bookmark')
1082 for mark in names:
1082 for mark in names:
1083 if mark not in marks:
1083 if mark not in marks:
1084 raise error.Abort(_("bookmark '%s' does not exist") %
1084 raise error.Abort(_("bookmark '%s' does not exist") %
1085 mark)
1085 mark)
1086 if mark == repo._activebookmark:
1086 if mark == repo._activebookmark:
1087 bookmarks.deactivate(repo)
1087 bookmarks.deactivate(repo)
1088 del marks[mark]
1088 del marks[mark]
1089
1089
1090 elif rename:
1090 elif rename:
1091 tr = repo.transaction('bookmark')
1091 tr = repo.transaction('bookmark')
1092 if not names:
1092 if not names:
1093 raise error.Abort(_("new bookmark name required"))
1093 raise error.Abort(_("new bookmark name required"))
1094 elif len(names) > 1:
1094 elif len(names) > 1:
1095 raise error.Abort(_("only one new bookmark name allowed"))
1095 raise error.Abort(_("only one new bookmark name allowed"))
1096 mark = checkformat(names[0])
1096 mark = checkformat(names[0])
1097 if rename not in marks:
1097 if rename not in marks:
1098 raise error.Abort(_("bookmark '%s' does not exist")
1098 raise error.Abort(_("bookmark '%s' does not exist")
1099 % rename)
1099 % rename)
1100 checkconflict(repo, mark, cur, force)
1100 checkconflict(repo, mark, cur, force)
1101 marks[mark] = marks[rename]
1101 marks[mark] = marks[rename]
1102 if repo._activebookmark == rename and not inactive:
1102 if repo._activebookmark == rename and not inactive:
1103 bookmarks.activate(repo, mark)
1103 bookmarks.activate(repo, mark)
1104 del marks[rename]
1104 del marks[rename]
1105 elif names:
1105 elif names:
1106 tr = repo.transaction('bookmark')
1106 tr = repo.transaction('bookmark')
1107 newact = None
1107 newact = None
1108 for mark in names:
1108 for mark in names:
1109 mark = checkformat(mark)
1109 mark = checkformat(mark)
1110 if newact is None:
1110 if newact is None:
1111 newact = mark
1111 newact = mark
1112 if inactive and mark == repo._activebookmark:
1112 if inactive and mark == repo._activebookmark:
1113 bookmarks.deactivate(repo)
1113 bookmarks.deactivate(repo)
1114 return
1114 return
1115 tgt = cur
1115 tgt = cur
1116 if rev:
1116 if rev:
1117 tgt = scmutil.revsingle(repo, rev).node()
1117 tgt = scmutil.revsingle(repo, rev).node()
1118 checkconflict(repo, mark, cur, force, tgt)
1118 checkconflict(repo, mark, cur, force, tgt)
1119 marks[mark] = tgt
1119 marks[mark] = tgt
1120 if not inactive and cur == marks[newact] and not rev:
1120 if not inactive and cur == marks[newact] and not rev:
1121 bookmarks.activate(repo, newact)
1121 bookmarks.activate(repo, newact)
1122 elif cur != tgt and newact == repo._activebookmark:
1122 elif cur != tgt and newact == repo._activebookmark:
1123 bookmarks.deactivate(repo)
1123 bookmarks.deactivate(repo)
1124 elif inactive:
1124 elif inactive:
1125 if len(marks) == 0:
1125 if len(marks) == 0:
1126 ui.status(_("no bookmarks set\n"))
1126 ui.status(_("no bookmarks set\n"))
1127 elif not repo._activebookmark:
1127 elif not repo._activebookmark:
1128 ui.status(_("no active bookmark\n"))
1128 ui.status(_("no active bookmark\n"))
1129 else:
1129 else:
1130 bookmarks.deactivate(repo)
1130 bookmarks.deactivate(repo)
1131 if tr is not None:
1131 if tr is not None:
1132 marks.recordchange(tr)
1132 marks.recordchange(tr)
1133 tr.close()
1133 tr.close()
1134 finally:
1134 finally:
1135 lockmod.release(tr, lock, wlock)
1135 lockmod.release(tr, lock, wlock)
1136 else: # show bookmarks
1136 else: # show bookmarks
1137 fm = ui.formatter('bookmarks', opts)
1137 fm = ui.formatter('bookmarks', opts)
1138 hexfn = fm.hexfunc
1138 hexfn = fm.hexfunc
1139 marks = repo._bookmarks
1139 marks = repo._bookmarks
1140 if len(marks) == 0 and not fm:
1140 if len(marks) == 0 and not fm:
1141 ui.status(_("no bookmarks set\n"))
1141 ui.status(_("no bookmarks set\n"))
1142 for bmark, n in sorted(marks.iteritems()):
1142 for bmark, n in sorted(marks.iteritems()):
1143 active = repo._activebookmark
1143 active = repo._activebookmark
1144 if bmark == active:
1144 if bmark == active:
1145 prefix, label = '*', activebookmarklabel
1145 prefix, label = '*', activebookmarklabel
1146 else:
1146 else:
1147 prefix, label = ' ', ''
1147 prefix, label = ' ', ''
1148
1148
1149 fm.startitem()
1149 fm.startitem()
1150 if not ui.quiet:
1150 if not ui.quiet:
1151 fm.plain(' %s ' % prefix, label=label)
1151 fm.plain(' %s ' % prefix, label=label)
1152 fm.write('bookmark', '%s', bmark, label=label)
1152 fm.write('bookmark', '%s', bmark, label=label)
1153 pad = " " * (25 - encoding.colwidth(bmark))
1153 pad = " " * (25 - encoding.colwidth(bmark))
1154 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1154 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1155 repo.changelog.rev(n), hexfn(n), label=label)
1155 repo.changelog.rev(n), hexfn(n), label=label)
1156 fm.data(active=(bmark == active))
1156 fm.data(active=(bmark == active))
1157 fm.plain('\n')
1157 fm.plain('\n')
1158 fm.end()
1158 fm.end()
1159
1159
1160 @command('branch',
1160 @command('branch',
1161 [('f', 'force', None,
1161 [('f', 'force', None,
1162 _('set branch name even if it shadows an existing branch')),
1162 _('set branch name even if it shadows an existing branch')),
1163 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1163 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1164 _('[-fC] [NAME]'))
1164 _('[-fC] [NAME]'))
1165 def branch(ui, repo, label=None, **opts):
1165 def branch(ui, repo, label=None, **opts):
1166 """set or show the current branch name
1166 """set or show the current branch name
1167
1167
1168 .. note::
1168 .. note::
1169
1169
1170 Branch names are permanent and global. Use :hg:`bookmark` to create a
1170 Branch names are permanent and global. Use :hg:`bookmark` to create a
1171 light-weight bookmark instead. See :hg:`help glossary` for more
1171 light-weight bookmark instead. See :hg:`help glossary` for more
1172 information about named branches and bookmarks.
1172 information about named branches and bookmarks.
1173
1173
1174 With no argument, show the current branch name. With one argument,
1174 With no argument, show the current branch name. With one argument,
1175 set the working directory branch name (the branch will not exist
1175 set the working directory branch name (the branch will not exist
1176 in the repository until the next commit). Standard practice
1176 in the repository until the next commit). Standard practice
1177 recommends that primary development take place on the 'default'
1177 recommends that primary development take place on the 'default'
1178 branch.
1178 branch.
1179
1179
1180 Unless -f/--force is specified, branch will not let you set a
1180 Unless -f/--force is specified, branch will not let you set a
1181 branch name that already exists.
1181 branch name that already exists.
1182
1182
1183 Use -C/--clean to reset the working directory branch to that of
1183 Use -C/--clean to reset the working directory branch to that of
1184 the parent of the working directory, negating a previous branch
1184 the parent of the working directory, negating a previous branch
1185 change.
1185 change.
1186
1186
1187 Use the command :hg:`update` to switch to an existing branch. Use
1187 Use the command :hg:`update` to switch to an existing branch. Use
1188 :hg:`commit --close-branch` to mark this branch head as closed.
1188 :hg:`commit --close-branch` to mark this branch head as closed.
1189 When all heads of the branch are closed, the branch will be
1189 When all heads of the branch are closed, the branch will be
1190 considered closed.
1190 considered closed.
1191
1191
1192 Returns 0 on success.
1192 Returns 0 on success.
1193 """
1193 """
1194 if label:
1194 if label:
1195 label = label.strip()
1195 label = label.strip()
1196
1196
1197 if not opts.get('clean') and not label:
1197 if not opts.get('clean') and not label:
1198 ui.write("%s\n" % repo.dirstate.branch())
1198 ui.write("%s\n" % repo.dirstate.branch())
1199 return
1199 return
1200
1200
1201 wlock = repo.wlock()
1201 wlock = repo.wlock()
1202 try:
1202 try:
1203 if opts.get('clean'):
1203 if opts.get('clean'):
1204 label = repo[None].p1().branch()
1204 label = repo[None].p1().branch()
1205 repo.dirstate.setbranch(label)
1205 repo.dirstate.setbranch(label)
1206 ui.status(_('reset working directory to branch %s\n') % label)
1206 ui.status(_('reset working directory to branch %s\n') % label)
1207 elif label:
1207 elif label:
1208 if not opts.get('force') and label in repo.branchmap():
1208 if not opts.get('force') and label in repo.branchmap():
1209 if label not in [p.branch() for p in repo[None].parents()]:
1209 if label not in [p.branch() for p in repo[None].parents()]:
1210 raise error.Abort(_('a branch of the same name already'
1210 raise error.Abort(_('a branch of the same name already'
1211 ' exists'),
1211 ' exists'),
1212 # i18n: "it" refers to an existing branch
1212 # i18n: "it" refers to an existing branch
1213 hint=_("use 'hg update' to switch to it"))
1213 hint=_("use 'hg update' to switch to it"))
1214 scmutil.checknewlabel(repo, label, 'branch')
1214 scmutil.checknewlabel(repo, label, 'branch')
1215 repo.dirstate.setbranch(label)
1215 repo.dirstate.setbranch(label)
1216 ui.status(_('marked working directory as branch %s\n') % label)
1216 ui.status(_('marked working directory as branch %s\n') % label)
1217
1217
1218 # find any open named branches aside from default
1218 # find any open named branches aside from default
1219 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1219 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1220 if n != "default" and not c]
1220 if n != "default" and not c]
1221 if not others:
1221 if not others:
1222 ui.status(_('(branches are permanent and global, '
1222 ui.status(_('(branches are permanent and global, '
1223 'did you want a bookmark?)\n'))
1223 'did you want a bookmark?)\n'))
1224 finally:
1224 finally:
1225 wlock.release()
1225 wlock.release()
1226
1226
1227 @command('branches',
1227 @command('branches',
1228 [('a', 'active', False,
1228 [('a', 'active', False,
1229 _('show only branches that have unmerged heads (DEPRECATED)')),
1229 _('show only branches that have unmerged heads (DEPRECATED)')),
1230 ('c', 'closed', False, _('show normal and closed branches')),
1230 ('c', 'closed', False, _('show normal and closed branches')),
1231 ] + formatteropts,
1231 ] + formatteropts,
1232 _('[-ac]'))
1232 _('[-ac]'))
1233 def branches(ui, repo, active=False, closed=False, **opts):
1233 def branches(ui, repo, active=False, closed=False, **opts):
1234 """list repository named branches
1234 """list repository named branches
1235
1235
1236 List the repository's named branches, indicating which ones are
1236 List the repository's named branches, indicating which ones are
1237 inactive. If -c/--closed is specified, also list branches which have
1237 inactive. If -c/--closed is specified, also list branches which have
1238 been marked closed (see :hg:`commit --close-branch`).
1238 been marked closed (see :hg:`commit --close-branch`).
1239
1239
1240 Use the command :hg:`update` to switch to an existing branch.
1240 Use the command :hg:`update` to switch to an existing branch.
1241
1241
1242 Returns 0.
1242 Returns 0.
1243 """
1243 """
1244
1244
1245 fm = ui.formatter('branches', opts)
1245 fm = ui.formatter('branches', opts)
1246 hexfunc = fm.hexfunc
1246 hexfunc = fm.hexfunc
1247
1247
1248 allheads = set(repo.heads())
1248 allheads = set(repo.heads())
1249 branches = []
1249 branches = []
1250 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1250 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1251 isactive = not isclosed and bool(set(heads) & allheads)
1251 isactive = not isclosed and bool(set(heads) & allheads)
1252 branches.append((tag, repo[tip], isactive, not isclosed))
1252 branches.append((tag, repo[tip], isactive, not isclosed))
1253 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1253 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1254 reverse=True)
1254 reverse=True)
1255
1255
1256 for tag, ctx, isactive, isopen in branches:
1256 for tag, ctx, isactive, isopen in branches:
1257 if active and not isactive:
1257 if active and not isactive:
1258 continue
1258 continue
1259 if isactive:
1259 if isactive:
1260 label = 'branches.active'
1260 label = 'branches.active'
1261 notice = ''
1261 notice = ''
1262 elif not isopen:
1262 elif not isopen:
1263 if not closed:
1263 if not closed:
1264 continue
1264 continue
1265 label = 'branches.closed'
1265 label = 'branches.closed'
1266 notice = _(' (closed)')
1266 notice = _(' (closed)')
1267 else:
1267 else:
1268 label = 'branches.inactive'
1268 label = 'branches.inactive'
1269 notice = _(' (inactive)')
1269 notice = _(' (inactive)')
1270 current = (tag == repo.dirstate.branch())
1270 current = (tag == repo.dirstate.branch())
1271 if current:
1271 if current:
1272 label = 'branches.current'
1272 label = 'branches.current'
1273
1273
1274 fm.startitem()
1274 fm.startitem()
1275 fm.write('branch', '%s', tag, label=label)
1275 fm.write('branch', '%s', tag, label=label)
1276 rev = ctx.rev()
1276 rev = ctx.rev()
1277 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1277 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1278 fmt = ' ' * padsize + ' %d:%s'
1278 fmt = ' ' * padsize + ' %d:%s'
1279 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1279 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1280 label='log.changeset changeset.%s' % ctx.phasestr())
1280 label='log.changeset changeset.%s' % ctx.phasestr())
1281 fm.data(active=isactive, closed=not isopen, current=current)
1281 fm.data(active=isactive, closed=not isopen, current=current)
1282 if not ui.quiet:
1282 if not ui.quiet:
1283 fm.plain(notice)
1283 fm.plain(notice)
1284 fm.plain('\n')
1284 fm.plain('\n')
1285 fm.end()
1285 fm.end()
1286
1286
1287 @command('bundle',
1287 @command('bundle',
1288 [('f', 'force', None, _('run even when the destination is unrelated')),
1288 [('f', 'force', None, _('run even when the destination is unrelated')),
1289 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1289 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1290 _('REV')),
1290 _('REV')),
1291 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1291 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1292 _('BRANCH')),
1292 _('BRANCH')),
1293 ('', 'base', [],
1293 ('', 'base', [],
1294 _('a base changeset assumed to be available at the destination'),
1294 _('a base changeset assumed to be available at the destination'),
1295 _('REV')),
1295 _('REV')),
1296 ('a', 'all', None, _('bundle all changesets in the repository')),
1296 ('a', 'all', None, _('bundle all changesets in the repository')),
1297 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1297 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1298 ] + remoteopts,
1298 ] + remoteopts,
1299 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1299 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1300 def bundle(ui, repo, fname, dest=None, **opts):
1300 def bundle(ui, repo, fname, dest=None, **opts):
1301 """create a changegroup file
1301 """create a changegroup file
1302
1302
1303 Generate a compressed changegroup file collecting changesets not
1303 Generate a compressed changegroup file collecting changesets not
1304 known to be in another repository.
1304 known to be in another repository.
1305
1305
1306 If you omit the destination repository, then hg assumes the
1306 If you omit the destination repository, then hg assumes the
1307 destination will have all the nodes you specify with --base
1307 destination will have all the nodes you specify with --base
1308 parameters. To create a bundle containing all changesets, use
1308 parameters. To create a bundle containing all changesets, use
1309 -a/--all (or --base null).
1309 -a/--all (or --base null).
1310
1310
1311 You can change bundle format with the -t/--type option. You can
1311 You can change bundle format with the -t/--type option. You can
1312 specify a compression, a bundle version or both using a dash
1312 specify a compression, a bundle version or both using a dash
1313 (comp-version). The available compression methods are: none, bzip2,
1313 (comp-version). The available compression methods are: none, bzip2,
1314 and gzip (by default, bundles are compressed using bzip2). The
1314 and gzip (by default, bundles are compressed using bzip2). The
1315 available format are: v1, v2 (default to most suitable).
1315 available format are: v1, v2 (default to most suitable).
1316
1316
1317 The bundle file can then be transferred using conventional means
1317 The bundle file can then be transferred using conventional means
1318 and applied to another repository with the unbundle or pull
1318 and applied to another repository with the unbundle or pull
1319 command. This is useful when direct push and pull are not
1319 command. This is useful when direct push and pull are not
1320 available or when exporting an entire repository is undesirable.
1320 available or when exporting an entire repository is undesirable.
1321
1321
1322 Applying bundles preserves all changeset contents including
1322 Applying bundles preserves all changeset contents including
1323 permissions, copy/rename information, and revision history.
1323 permissions, copy/rename information, and revision history.
1324
1324
1325 Returns 0 on success, 1 if no changes found.
1325 Returns 0 on success, 1 if no changes found.
1326 """
1326 """
1327 revs = None
1327 revs = None
1328 if 'rev' in opts:
1328 if 'rev' in opts:
1329 revs = scmutil.revrange(repo, opts['rev'])
1329 revs = scmutil.revrange(repo, opts['rev'])
1330
1330
1331 bundletype = opts.get('type', 'bzip2').lower()
1331 bundletype = opts.get('type', 'bzip2').lower()
1332 try:
1332 try:
1333 bcompression, cgversion, params = exchange.parsebundlespec(
1333 bcompression, cgversion, params = exchange.parsebundlespec(
1334 repo, bundletype, strict=False)
1334 repo, bundletype, strict=False)
1335 except error.UnsupportedBundleSpecification as e:
1335 except error.UnsupportedBundleSpecification as e:
1336 raise error.Abort(str(e),
1336 raise error.Abort(str(e),
1337 hint=_('see "hg help bundle" for supported '
1337 hint=_('see "hg help bundle" for supported '
1338 'values for --type'))
1338 'values for --type'))
1339
1339
1340 # Packed bundles are a pseudo bundle format for now.
1340 # Packed bundles are a pseudo bundle format for now.
1341 if cgversion == 's1':
1341 if cgversion == 's1':
1342 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1342 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1343 hint=_('use "hg debugcreatestreamclonebundle"'))
1343 hint=_('use "hg debugcreatestreamclonebundle"'))
1344
1344
1345 if opts.get('all'):
1345 if opts.get('all'):
1346 base = ['null']
1346 base = ['null']
1347 else:
1347 else:
1348 base = scmutil.revrange(repo, opts.get('base'))
1348 base = scmutil.revrange(repo, opts.get('base'))
1349 # TODO: get desired bundlecaps from command line.
1349 # TODO: get desired bundlecaps from command line.
1350 bundlecaps = None
1350 bundlecaps = None
1351 if base:
1351 if base:
1352 if dest:
1352 if dest:
1353 raise error.Abort(_("--base is incompatible with specifying "
1353 raise error.Abort(_("--base is incompatible with specifying "
1354 "a destination"))
1354 "a destination"))
1355 common = [repo.lookup(rev) for rev in base]
1355 common = [repo.lookup(rev) for rev in base]
1356 heads = revs and map(repo.lookup, revs) or revs
1356 heads = revs and map(repo.lookup, revs) or revs
1357 cg = changegroup.getchangegroup(repo, 'bundle', heads=heads,
1357 cg = changegroup.getchangegroup(repo, 'bundle', heads=heads,
1358 common=common, bundlecaps=bundlecaps,
1358 common=common, bundlecaps=bundlecaps,
1359 version=cgversion)
1359 version=cgversion)
1360 outgoing = None
1360 outgoing = None
1361 else:
1361 else:
1362 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1362 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1363 dest, branches = hg.parseurl(dest, opts.get('branch'))
1363 dest, branches = hg.parseurl(dest, opts.get('branch'))
1364 other = hg.peer(repo, opts, dest)
1364 other = hg.peer(repo, opts, dest)
1365 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1365 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1366 heads = revs and map(repo.lookup, revs) or revs
1366 heads = revs and map(repo.lookup, revs) or revs
1367 outgoing = discovery.findcommonoutgoing(repo, other,
1367 outgoing = discovery.findcommonoutgoing(repo, other,
1368 onlyheads=heads,
1368 onlyheads=heads,
1369 force=opts.get('force'),
1369 force=opts.get('force'),
1370 portable=True)
1370 portable=True)
1371 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1371 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1372 bundlecaps, version=cgversion)
1372 bundlecaps, version=cgversion)
1373 if not cg:
1373 if not cg:
1374 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1374 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1375 return 1
1375 return 1
1376
1376
1377 if cgversion == '01': #bundle1
1377 if cgversion == '01': #bundle1
1378 if bcompression is None:
1378 if bcompression is None:
1379 bcompression = 'UN'
1379 bcompression = 'UN'
1380 bversion = 'HG10' + bcompression
1380 bversion = 'HG10' + bcompression
1381 bcompression = None
1381 bcompression = None
1382 else:
1382 else:
1383 assert cgversion == '02'
1383 assert cgversion == '02'
1384 bversion = 'HG20'
1384 bversion = 'HG20'
1385
1385
1386
1386
1387 changegroup.writebundle(ui, cg, fname, bversion, compression=bcompression)
1387 changegroup.writebundle(ui, cg, fname, bversion, compression=bcompression)
1388
1388
1389 @command('cat',
1389 @command('cat',
1390 [('o', 'output', '',
1390 [('o', 'output', '',
1391 _('print output to file with formatted name'), _('FORMAT')),
1391 _('print output to file with formatted name'), _('FORMAT')),
1392 ('r', 'rev', '', _('print the given revision'), _('REV')),
1392 ('r', 'rev', '', _('print the given revision'), _('REV')),
1393 ('', 'decode', None, _('apply any matching decode filter')),
1393 ('', 'decode', None, _('apply any matching decode filter')),
1394 ] + walkopts,
1394 ] + walkopts,
1395 _('[OPTION]... FILE...'),
1395 _('[OPTION]... FILE...'),
1396 inferrepo=True)
1396 inferrepo=True)
1397 def cat(ui, repo, file1, *pats, **opts):
1397 def cat(ui, repo, file1, *pats, **opts):
1398 """output the current or given revision of files
1398 """output the current or given revision of files
1399
1399
1400 Print the specified files as they were at the given revision. If
1400 Print the specified files as they were at the given revision. If
1401 no revision is given, the parent of the working directory is used.
1401 no revision is given, the parent of the working directory is used.
1402
1402
1403 Output may be to a file, in which case the name of the file is
1403 Output may be to a file, in which case the name of the file is
1404 given using a format string. The formatting rules as follows:
1404 given using a format string. The formatting rules as follows:
1405
1405
1406 :``%%``: literal "%" character
1406 :``%%``: literal "%" character
1407 :``%s``: basename of file being printed
1407 :``%s``: basename of file being printed
1408 :``%d``: dirname of file being printed, or '.' if in repository root
1408 :``%d``: dirname of file being printed, or '.' if in repository root
1409 :``%p``: root-relative path name of file being printed
1409 :``%p``: root-relative path name of file being printed
1410 :``%H``: changeset hash (40 hexadecimal digits)
1410 :``%H``: changeset hash (40 hexadecimal digits)
1411 :``%R``: changeset revision number
1411 :``%R``: changeset revision number
1412 :``%h``: short-form changeset hash (12 hexadecimal digits)
1412 :``%h``: short-form changeset hash (12 hexadecimal digits)
1413 :``%r``: zero-padded changeset revision number
1413 :``%r``: zero-padded changeset revision number
1414 :``%b``: basename of the exporting repository
1414 :``%b``: basename of the exporting repository
1415
1415
1416 Returns 0 on success.
1416 Returns 0 on success.
1417 """
1417 """
1418 ctx = scmutil.revsingle(repo, opts.get('rev'))
1418 ctx = scmutil.revsingle(repo, opts.get('rev'))
1419 m = scmutil.match(ctx, (file1,) + pats, opts)
1419 m = scmutil.match(ctx, (file1,) + pats, opts)
1420
1420
1421 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1421 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1422
1422
1423 @command('^clone',
1423 @command('^clone',
1424 [('U', 'noupdate', None, _('the clone will include an empty working '
1424 [('U', 'noupdate', None, _('the clone will include an empty working '
1425 'directory (only a repository)')),
1425 'directory (only a repository)')),
1426 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1426 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1427 _('REV')),
1427 _('REV')),
1428 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1428 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1429 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1429 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1430 ('', 'pull', None, _('use pull protocol to copy metadata')),
1430 ('', 'pull', None, _('use pull protocol to copy metadata')),
1431 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1431 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1432 ] + remoteopts,
1432 ] + remoteopts,
1433 _('[OPTION]... SOURCE [DEST]'),
1433 _('[OPTION]... SOURCE [DEST]'),
1434 norepo=True)
1434 norepo=True)
1435 def clone(ui, source, dest=None, **opts):
1435 def clone(ui, source, dest=None, **opts):
1436 """make a copy of an existing repository
1436 """make a copy of an existing repository
1437
1437
1438 Create a copy of an existing repository in a new directory.
1438 Create a copy of an existing repository in a new directory.
1439
1439
1440 If no destination directory name is specified, it defaults to the
1440 If no destination directory name is specified, it defaults to the
1441 basename of the source.
1441 basename of the source.
1442
1442
1443 The location of the source is added to the new repository's
1443 The location of the source is added to the new repository's
1444 ``.hg/hgrc`` file, as the default to be used for future pulls.
1444 ``.hg/hgrc`` file, as the default to be used for future pulls.
1445
1445
1446 Only local paths and ``ssh://`` URLs are supported as
1446 Only local paths and ``ssh://`` URLs are supported as
1447 destinations. For ``ssh://`` destinations, no working directory or
1447 destinations. For ``ssh://`` destinations, no working directory or
1448 ``.hg/hgrc`` will be created on the remote side.
1448 ``.hg/hgrc`` will be created on the remote side.
1449
1449
1450 To pull only a subset of changesets, specify one or more revisions
1450 To pull only a subset of changesets, specify one or more revisions
1451 identifiers with -r/--rev or branches with -b/--branch. The
1451 identifiers with -r/--rev or branches with -b/--branch. The
1452 resulting clone will contain only the specified changesets and
1452 resulting clone will contain only the specified changesets and
1453 their ancestors. These options (or 'clone src#rev dest') imply
1453 their ancestors. These options (or 'clone src#rev dest') imply
1454 --pull, even for local source repositories. Note that specifying a
1454 --pull, even for local source repositories. Note that specifying a
1455 tag will include the tagged changeset but not the changeset
1455 tag will include the tagged changeset but not the changeset
1456 containing the tag.
1456 containing the tag.
1457
1457
1458 If the source repository has a bookmark called '@' set, that
1458 If the source repository has a bookmark called '@' set, that
1459 revision will be checked out in the new repository by default.
1459 revision will be checked out in the new repository by default.
1460
1460
1461 To check out a particular version, use -u/--update, or
1461 To check out a particular version, use -u/--update, or
1462 -U/--noupdate to create a clone with no working directory.
1462 -U/--noupdate to create a clone with no working directory.
1463
1463
1464 .. container:: verbose
1464 .. container:: verbose
1465
1465
1466 For efficiency, hardlinks are used for cloning whenever the
1466 For efficiency, hardlinks are used for cloning whenever the
1467 source and destination are on the same filesystem (note this
1467 source and destination are on the same filesystem (note this
1468 applies only to the repository data, not to the working
1468 applies only to the repository data, not to the working
1469 directory). Some filesystems, such as AFS, implement hardlinking
1469 directory). Some filesystems, such as AFS, implement hardlinking
1470 incorrectly, but do not report errors. In these cases, use the
1470 incorrectly, but do not report errors. In these cases, use the
1471 --pull option to avoid hardlinking.
1471 --pull option to avoid hardlinking.
1472
1472
1473 In some cases, you can clone repositories and the working
1473 In some cases, you can clone repositories and the working
1474 directory using full hardlinks with ::
1474 directory using full hardlinks with ::
1475
1475
1476 $ cp -al REPO REPOCLONE
1476 $ cp -al REPO REPOCLONE
1477
1477
1478 This is the fastest way to clone, but it is not always safe. The
1478 This is the fastest way to clone, but it is not always safe. The
1479 operation is not atomic (making sure REPO is not modified during
1479 operation is not atomic (making sure REPO is not modified during
1480 the operation is up to you) and you have to make sure your
1480 the operation is up to you) and you have to make sure your
1481 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1481 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1482 so). Also, this is not compatible with certain extensions that
1482 so). Also, this is not compatible with certain extensions that
1483 place their metadata under the .hg directory, such as mq.
1483 place their metadata under the .hg directory, such as mq.
1484
1484
1485 Mercurial will update the working directory to the first applicable
1485 Mercurial will update the working directory to the first applicable
1486 revision from this list:
1486 revision from this list:
1487
1487
1488 a) null if -U or the source repository has no changesets
1488 a) null if -U or the source repository has no changesets
1489 b) if -u . and the source repository is local, the first parent of
1489 b) if -u . and the source repository is local, the first parent of
1490 the source repository's working directory
1490 the source repository's working directory
1491 c) the changeset specified with -u (if a branch name, this means the
1491 c) the changeset specified with -u (if a branch name, this means the
1492 latest head of that branch)
1492 latest head of that branch)
1493 d) the changeset specified with -r
1493 d) the changeset specified with -r
1494 e) the tipmost head specified with -b
1494 e) the tipmost head specified with -b
1495 f) the tipmost head specified with the url#branch source syntax
1495 f) the tipmost head specified with the url#branch source syntax
1496 g) the revision marked with the '@' bookmark, if present
1496 g) the revision marked with the '@' bookmark, if present
1497 h) the tipmost head of the default branch
1497 h) the tipmost head of the default branch
1498 i) tip
1498 i) tip
1499
1499
1500 Examples:
1500 Examples:
1501
1501
1502 - clone a remote repository to a new directory named hg/::
1502 - clone a remote repository to a new directory named hg/::
1503
1503
1504 hg clone http://selenic.com/hg
1504 hg clone http://selenic.com/hg
1505
1505
1506 - create a lightweight local clone::
1506 - create a lightweight local clone::
1507
1507
1508 hg clone project/ project-feature/
1508 hg clone project/ project-feature/
1509
1509
1510 - clone from an absolute path on an ssh server (note double-slash)::
1510 - clone from an absolute path on an ssh server (note double-slash)::
1511
1511
1512 hg clone ssh://user@server//home/projects/alpha/
1512 hg clone ssh://user@server//home/projects/alpha/
1513
1513
1514 - do a high-speed clone over a LAN while checking out a
1514 - do a high-speed clone over a LAN while checking out a
1515 specified version::
1515 specified version::
1516
1516
1517 hg clone --uncompressed http://server/repo -u 1.5
1517 hg clone --uncompressed http://server/repo -u 1.5
1518
1518
1519 - create a repository without changesets after a particular revision::
1519 - create a repository without changesets after a particular revision::
1520
1520
1521 hg clone -r 04e544 experimental/ good/
1521 hg clone -r 04e544 experimental/ good/
1522
1522
1523 - clone (and track) a particular named branch::
1523 - clone (and track) a particular named branch::
1524
1524
1525 hg clone http://selenic.com/hg#stable
1525 hg clone http://selenic.com/hg#stable
1526
1526
1527 See :hg:`help urls` for details on specifying URLs.
1527 See :hg:`help urls` for details on specifying URLs.
1528
1528
1529 Returns 0 on success.
1529 Returns 0 on success.
1530 """
1530 """
1531 if opts.get('noupdate') and opts.get('updaterev'):
1531 if opts.get('noupdate') and opts.get('updaterev'):
1532 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1532 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1533
1533
1534 r = hg.clone(ui, opts, source, dest,
1534 r = hg.clone(ui, opts, source, dest,
1535 pull=opts.get('pull'),
1535 pull=opts.get('pull'),
1536 stream=opts.get('uncompressed'),
1536 stream=opts.get('uncompressed'),
1537 rev=opts.get('rev'),
1537 rev=opts.get('rev'),
1538 update=opts.get('updaterev') or not opts.get('noupdate'),
1538 update=opts.get('updaterev') or not opts.get('noupdate'),
1539 branch=opts.get('branch'),
1539 branch=opts.get('branch'),
1540 shareopts=opts.get('shareopts'))
1540 shareopts=opts.get('shareopts'))
1541
1541
1542 return r is None
1542 return r is None
1543
1543
1544 @command('^commit|ci',
1544 @command('^commit|ci',
1545 [('A', 'addremove', None,
1545 [('A', 'addremove', None,
1546 _('mark new/missing files as added/removed before committing')),
1546 _('mark new/missing files as added/removed before committing')),
1547 ('', 'close-branch', None,
1547 ('', 'close-branch', None,
1548 _('mark a branch head as closed')),
1548 _('mark a branch head as closed')),
1549 ('', 'amend', None, _('amend the parent of the working directory')),
1549 ('', 'amend', None, _('amend the parent of the working directory')),
1550 ('s', 'secret', None, _('use the secret phase for committing')),
1550 ('s', 'secret', None, _('use the secret phase for committing')),
1551 ('e', 'edit', None, _('invoke editor on commit messages')),
1551 ('e', 'edit', None, _('invoke editor on commit messages')),
1552 ('i', 'interactive', None, _('use interactive mode')),
1552 ('i', 'interactive', None, _('use interactive mode')),
1553 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1553 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1554 _('[OPTION]... [FILE]...'),
1554 _('[OPTION]... [FILE]...'),
1555 inferrepo=True)
1555 inferrepo=True)
1556 def commit(ui, repo, *pats, **opts):
1556 def commit(ui, repo, *pats, **opts):
1557 """commit the specified files or all outstanding changes
1557 """commit the specified files or all outstanding changes
1558
1558
1559 Commit changes to the given files into the repository. Unlike a
1559 Commit changes to the given files into the repository. Unlike a
1560 centralized SCM, this operation is a local operation. See
1560 centralized SCM, this operation is a local operation. See
1561 :hg:`push` for a way to actively distribute your changes.
1561 :hg:`push` for a way to actively distribute your changes.
1562
1562
1563 If a list of files is omitted, all changes reported by :hg:`status`
1563 If a list of files is omitted, all changes reported by :hg:`status`
1564 will be committed.
1564 will be committed.
1565
1565
1566 If you are committing the result of a merge, do not provide any
1566 If you are committing the result of a merge, do not provide any
1567 filenames or -I/-X filters.
1567 filenames or -I/-X filters.
1568
1568
1569 If no commit message is specified, Mercurial starts your
1569 If no commit message is specified, Mercurial starts your
1570 configured editor where you can enter a message. In case your
1570 configured editor where you can enter a message. In case your
1571 commit fails, you will find a backup of your message in
1571 commit fails, you will find a backup of your message in
1572 ``.hg/last-message.txt``.
1572 ``.hg/last-message.txt``.
1573
1573
1574 The --close-branch flag can be used to mark the current branch
1574 The --close-branch flag can be used to mark the current branch
1575 head closed. When all heads of a branch are closed, the branch
1575 head closed. When all heads of a branch are closed, the branch
1576 will be considered closed and no longer listed.
1576 will be considered closed and no longer listed.
1577
1577
1578 The --amend flag can be used to amend the parent of the
1578 The --amend flag can be used to amend the parent of the
1579 working directory with a new commit that contains the changes
1579 working directory with a new commit that contains the changes
1580 in the parent in addition to those currently reported by :hg:`status`,
1580 in the parent in addition to those currently reported by :hg:`status`,
1581 if there are any. The old commit is stored in a backup bundle in
1581 if there are any. The old commit is stored in a backup bundle in
1582 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1582 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1583 on how to restore it).
1583 on how to restore it).
1584
1584
1585 Message, user and date are taken from the amended commit unless
1585 Message, user and date are taken from the amended commit unless
1586 specified. When a message isn't specified on the command line,
1586 specified. When a message isn't specified on the command line,
1587 the editor will open with the message of the amended commit.
1587 the editor will open with the message of the amended commit.
1588
1588
1589 It is not possible to amend public changesets (see :hg:`help phases`)
1589 It is not possible to amend public changesets (see :hg:`help phases`)
1590 or changesets that have children.
1590 or changesets that have children.
1591
1591
1592 See :hg:`help dates` for a list of formats valid for -d/--date.
1592 See :hg:`help dates` for a list of formats valid for -d/--date.
1593
1593
1594 Returns 0 on success, 1 if nothing changed.
1594 Returns 0 on success, 1 if nothing changed.
1595
1595
1596 .. container:: verbose
1596 .. container:: verbose
1597
1597
1598 Examples:
1598 Examples:
1599
1599
1600 - commit all files ending in .py::
1600 - commit all files ending in .py::
1601
1601
1602 hg commit --include "set:**.py"
1602 hg commit --include "set:**.py"
1603
1603
1604 - commit all non-binary files::
1604 - commit all non-binary files::
1605
1605
1606 hg commit --exclude "set:binary()"
1606 hg commit --exclude "set:binary()"
1607
1607
1608 - amend the current commit and set the date to now::
1608 - amend the current commit and set the date to now::
1609
1609
1610 hg commit --amend --date now
1610 hg commit --amend --date now
1611 """
1611 """
1612 wlock = lock = None
1612 wlock = lock = None
1613 try:
1613 try:
1614 wlock = repo.wlock()
1614 wlock = repo.wlock()
1615 lock = repo.lock()
1615 lock = repo.lock()
1616 return _docommit(ui, repo, *pats, **opts)
1616 return _docommit(ui, repo, *pats, **opts)
1617 finally:
1617 finally:
1618 release(lock, wlock)
1618 release(lock, wlock)
1619
1619
1620 def _docommit(ui, repo, *pats, **opts):
1620 def _docommit(ui, repo, *pats, **opts):
1621 if opts.get('interactive'):
1621 if opts.get('interactive'):
1622 opts.pop('interactive')
1622 opts.pop('interactive')
1623 cmdutil.dorecord(ui, repo, commit, None, False,
1623 cmdutil.dorecord(ui, repo, commit, None, False,
1624 cmdutil.recordfilter, *pats, **opts)
1624 cmdutil.recordfilter, *pats, **opts)
1625 return
1625 return
1626
1626
1627 if opts.get('subrepos'):
1627 if opts.get('subrepos'):
1628 if opts.get('amend'):
1628 if opts.get('amend'):
1629 raise error.Abort(_('cannot amend with --subrepos'))
1629 raise error.Abort(_('cannot amend with --subrepos'))
1630 # Let --subrepos on the command line override config setting.
1630 # Let --subrepos on the command line override config setting.
1631 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1631 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1632
1632
1633 cmdutil.checkunfinished(repo, commit=True)
1633 cmdutil.checkunfinished(repo, commit=True)
1634
1634
1635 branch = repo[None].branch()
1635 branch = repo[None].branch()
1636 bheads = repo.branchheads(branch)
1636 bheads = repo.branchheads(branch)
1637
1637
1638 extra = {}
1638 extra = {}
1639 if opts.get('close_branch'):
1639 if opts.get('close_branch'):
1640 extra['close'] = 1
1640 extra['close'] = 1
1641
1641
1642 if not bheads:
1642 if not bheads:
1643 raise error.Abort(_('can only close branch heads'))
1643 raise error.Abort(_('can only close branch heads'))
1644 elif opts.get('amend'):
1644 elif opts.get('amend'):
1645 if repo[None].parents()[0].p1().branch() != branch and \
1645 if repo[None].parents()[0].p1().branch() != branch and \
1646 repo[None].parents()[0].p2().branch() != branch:
1646 repo[None].parents()[0].p2().branch() != branch:
1647 raise error.Abort(_('can only close branch heads'))
1647 raise error.Abort(_('can only close branch heads'))
1648
1648
1649 if opts.get('amend'):
1649 if opts.get('amend'):
1650 if ui.configbool('ui', 'commitsubrepos'):
1650 if ui.configbool('ui', 'commitsubrepos'):
1651 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1651 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1652
1652
1653 old = repo['.']
1653 old = repo['.']
1654 if not old.mutable():
1654 if not old.mutable():
1655 raise error.Abort(_('cannot amend public changesets'))
1655 raise error.Abort(_('cannot amend public changesets'))
1656 if len(repo[None].parents()) > 1:
1656 if len(repo[None].parents()) > 1:
1657 raise error.Abort(_('cannot amend while merging'))
1657 raise error.Abort(_('cannot amend while merging'))
1658 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1658 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1659 if not allowunstable and old.children():
1659 if not allowunstable and old.children():
1660 raise error.Abort(_('cannot amend changeset with children'))
1660 raise error.Abort(_('cannot amend changeset with children'))
1661
1661
1662 newextra = extra.copy()
1662 newextra = extra.copy()
1663 newextra['branch'] = branch
1663 newextra['branch'] = branch
1664 extra = newextra
1664 extra = newextra
1665 # commitfunc is used only for temporary amend commit by cmdutil.amend
1665 # commitfunc is used only for temporary amend commit by cmdutil.amend
1666 def commitfunc(ui, repo, message, match, opts):
1666 def commitfunc(ui, repo, message, match, opts):
1667 return repo.commit(message,
1667 return repo.commit(message,
1668 opts.get('user') or old.user(),
1668 opts.get('user') or old.user(),
1669 opts.get('date') or old.date(),
1669 opts.get('date') or old.date(),
1670 match,
1670 match,
1671 extra=extra)
1671 extra=extra)
1672
1672
1673 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1673 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1674 if node == old.node():
1674 if node == old.node():
1675 ui.status(_("nothing changed\n"))
1675 ui.status(_("nothing changed\n"))
1676 return 1
1676 return 1
1677 else:
1677 else:
1678 def commitfunc(ui, repo, message, match, opts):
1678 def commitfunc(ui, repo, message, match, opts):
1679 backup = ui.backupconfig('phases', 'new-commit')
1679 backup = ui.backupconfig('phases', 'new-commit')
1680 baseui = repo.baseui
1680 baseui = repo.baseui
1681 basebackup = baseui.backupconfig('phases', 'new-commit')
1681 basebackup = baseui.backupconfig('phases', 'new-commit')
1682 try:
1682 try:
1683 if opts.get('secret'):
1683 if opts.get('secret'):
1684 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1684 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1685 # Propagate to subrepos
1685 # Propagate to subrepos
1686 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1686 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1687
1687
1688 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1688 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1689 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1689 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1690 return repo.commit(message, opts.get('user'), opts.get('date'),
1690 return repo.commit(message, opts.get('user'), opts.get('date'),
1691 match,
1691 match,
1692 editor=editor,
1692 editor=editor,
1693 extra=extra)
1693 extra=extra)
1694 finally:
1694 finally:
1695 ui.restoreconfig(backup)
1695 ui.restoreconfig(backup)
1696 repo.baseui.restoreconfig(basebackup)
1696 repo.baseui.restoreconfig(basebackup)
1697
1697
1698
1698
1699 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1699 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1700
1700
1701 if not node:
1701 if not node:
1702 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1702 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1703 if stat[3]:
1703 if stat[3]:
1704 ui.status(_("nothing changed (%d missing files, see "
1704 ui.status(_("nothing changed (%d missing files, see "
1705 "'hg status')\n") % len(stat[3]))
1705 "'hg status')\n") % len(stat[3]))
1706 else:
1706 else:
1707 ui.status(_("nothing changed\n"))
1707 ui.status(_("nothing changed\n"))
1708 return 1
1708 return 1
1709
1709
1710 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1710 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1711
1711
1712 @command('config|showconfig|debugconfig',
1712 @command('config|showconfig|debugconfig',
1713 [('u', 'untrusted', None, _('show untrusted configuration options')),
1713 [('u', 'untrusted', None, _('show untrusted configuration options')),
1714 ('e', 'edit', None, _('edit user config')),
1714 ('e', 'edit', None, _('edit user config')),
1715 ('l', 'local', None, _('edit repository config')),
1715 ('l', 'local', None, _('edit repository config')),
1716 ('g', 'global', None, _('edit global config'))],
1716 ('g', 'global', None, _('edit global config'))],
1717 _('[-u] [NAME]...'),
1717 _('[-u] [NAME]...'),
1718 optionalrepo=True)
1718 optionalrepo=True)
1719 def config(ui, repo, *values, **opts):
1719 def config(ui, repo, *values, **opts):
1720 """show combined config settings from all hgrc files
1720 """show combined config settings from all hgrc files
1721
1721
1722 With no arguments, print names and values of all config items.
1722 With no arguments, print names and values of all config items.
1723
1723
1724 With one argument of the form section.name, print just the value
1724 With one argument of the form section.name, print just the value
1725 of that config item.
1725 of that config item.
1726
1726
1727 With multiple arguments, print names and values of all config
1727 With multiple arguments, print names and values of all config
1728 items with matching section names.
1728 items with matching section names.
1729
1729
1730 With --edit, start an editor on the user-level config file. With
1730 With --edit, start an editor on the user-level config file. With
1731 --global, edit the system-wide config file. With --local, edit the
1731 --global, edit the system-wide config file. With --local, edit the
1732 repository-level config file.
1732 repository-level config file.
1733
1733
1734 With --debug, the source (filename and line number) is printed
1734 With --debug, the source (filename and line number) is printed
1735 for each config item.
1735 for each config item.
1736
1736
1737 See :hg:`help config` for more information about config files.
1737 See :hg:`help config` for more information about config files.
1738
1738
1739 Returns 0 on success, 1 if NAME does not exist.
1739 Returns 0 on success, 1 if NAME does not exist.
1740
1740
1741 """
1741 """
1742
1742
1743 if opts.get('edit') or opts.get('local') or opts.get('global'):
1743 if opts.get('edit') or opts.get('local') or opts.get('global'):
1744 if opts.get('local') and opts.get('global'):
1744 if opts.get('local') and opts.get('global'):
1745 raise error.Abort(_("can't use --local and --global together"))
1745 raise error.Abort(_("can't use --local and --global together"))
1746
1746
1747 if opts.get('local'):
1747 if opts.get('local'):
1748 if not repo:
1748 if not repo:
1749 raise error.Abort(_("can't use --local outside a repository"))
1749 raise error.Abort(_("can't use --local outside a repository"))
1750 paths = [repo.join('hgrc')]
1750 paths = [repo.join('hgrc')]
1751 elif opts.get('global'):
1751 elif opts.get('global'):
1752 paths = scmutil.systemrcpath()
1752 paths = scmutil.systemrcpath()
1753 else:
1753 else:
1754 paths = scmutil.userrcpath()
1754 paths = scmutil.userrcpath()
1755
1755
1756 for f in paths:
1756 for f in paths:
1757 if os.path.exists(f):
1757 if os.path.exists(f):
1758 break
1758 break
1759 else:
1759 else:
1760 if opts.get('global'):
1760 if opts.get('global'):
1761 samplehgrc = uimod.samplehgrcs['global']
1761 samplehgrc = uimod.samplehgrcs['global']
1762 elif opts.get('local'):
1762 elif opts.get('local'):
1763 samplehgrc = uimod.samplehgrcs['local']
1763 samplehgrc = uimod.samplehgrcs['local']
1764 else:
1764 else:
1765 samplehgrc = uimod.samplehgrcs['user']
1765 samplehgrc = uimod.samplehgrcs['user']
1766
1766
1767 f = paths[0]
1767 f = paths[0]
1768 fp = open(f, "w")
1768 fp = open(f, "w")
1769 fp.write(samplehgrc)
1769 fp.write(samplehgrc)
1770 fp.close()
1770 fp.close()
1771
1771
1772 editor = ui.geteditor()
1772 editor = ui.geteditor()
1773 ui.system("%s \"%s\"" % (editor, f),
1773 ui.system("%s \"%s\"" % (editor, f),
1774 onerr=error.Abort, errprefix=_("edit failed"))
1774 onerr=error.Abort, errprefix=_("edit failed"))
1775 return
1775 return
1776
1776
1777 for f in scmutil.rcpath():
1777 for f in scmutil.rcpath():
1778 ui.debug('read config from: %s\n' % f)
1778 ui.debug('read config from: %s\n' % f)
1779 untrusted = bool(opts.get('untrusted'))
1779 untrusted = bool(opts.get('untrusted'))
1780 if values:
1780 if values:
1781 sections = [v for v in values if '.' not in v]
1781 sections = [v for v in values if '.' not in v]
1782 items = [v for v in values if '.' in v]
1782 items = [v for v in values if '.' in v]
1783 if len(items) > 1 or items and sections:
1783 if len(items) > 1 or items and sections:
1784 raise error.Abort(_('only one config item permitted'))
1784 raise error.Abort(_('only one config item permitted'))
1785 matched = False
1785 matched = False
1786 for section, name, value in ui.walkconfig(untrusted=untrusted):
1786 for section, name, value in ui.walkconfig(untrusted=untrusted):
1787 value = str(value).replace('\n', '\\n')
1787 value = str(value).replace('\n', '\\n')
1788 sectname = section + '.' + name
1788 sectname = section + '.' + name
1789 if values:
1789 if values:
1790 for v in values:
1790 for v in values:
1791 if v == section:
1791 if v == section:
1792 ui.debug('%s: ' %
1792 ui.debug('%s: ' %
1793 ui.configsource(section, name, untrusted))
1793 ui.configsource(section, name, untrusted))
1794 ui.write('%s=%s\n' % (sectname, value))
1794 ui.write('%s=%s\n' % (sectname, value))
1795 matched = True
1795 matched = True
1796 elif v == sectname:
1796 elif v == sectname:
1797 ui.debug('%s: ' %
1797 ui.debug('%s: ' %
1798 ui.configsource(section, name, untrusted))
1798 ui.configsource(section, name, untrusted))
1799 ui.write(value, '\n')
1799 ui.write(value, '\n')
1800 matched = True
1800 matched = True
1801 else:
1801 else:
1802 ui.debug('%s: ' %
1802 ui.debug('%s: ' %
1803 ui.configsource(section, name, untrusted))
1803 ui.configsource(section, name, untrusted))
1804 ui.write('%s=%s\n' % (sectname, value))
1804 ui.write('%s=%s\n' % (sectname, value))
1805 matched = True
1805 matched = True
1806 if matched:
1806 if matched:
1807 return 0
1807 return 0
1808 return 1
1808 return 1
1809
1809
1810 @command('copy|cp',
1810 @command('copy|cp',
1811 [('A', 'after', None, _('record a copy that has already occurred')),
1811 [('A', 'after', None, _('record a copy that has already occurred')),
1812 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1812 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1813 ] + walkopts + dryrunopts,
1813 ] + walkopts + dryrunopts,
1814 _('[OPTION]... [SOURCE]... DEST'))
1814 _('[OPTION]... [SOURCE]... DEST'))
1815 def copy(ui, repo, *pats, **opts):
1815 def copy(ui, repo, *pats, **opts):
1816 """mark files as copied for the next commit
1816 """mark files as copied for the next commit
1817
1817
1818 Mark dest as having copies of source files. If dest is a
1818 Mark dest as having copies of source files. If dest is a
1819 directory, copies are put in that directory. If dest is a file,
1819 directory, copies are put in that directory. If dest is a file,
1820 the source must be a single file.
1820 the source must be a single file.
1821
1821
1822 By default, this command copies the contents of files as they
1822 By default, this command copies the contents of files as they
1823 exist in the working directory. If invoked with -A/--after, the
1823 exist in the working directory. If invoked with -A/--after, the
1824 operation is recorded, but no copying is performed.
1824 operation is recorded, but no copying is performed.
1825
1825
1826 This command takes effect with the next commit. To undo a copy
1826 This command takes effect with the next commit. To undo a copy
1827 before that, see :hg:`revert`.
1827 before that, see :hg:`revert`.
1828
1828
1829 Returns 0 on success, 1 if errors are encountered.
1829 Returns 0 on success, 1 if errors are encountered.
1830 """
1830 """
1831 wlock = repo.wlock(False)
1831 wlock = repo.wlock(False)
1832 try:
1832 try:
1833 return cmdutil.copy(ui, repo, pats, opts)
1833 return cmdutil.copy(ui, repo, pats, opts)
1834 finally:
1834 finally:
1835 wlock.release()
1835 wlock.release()
1836
1836
1837 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1837 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1838 def debugancestor(ui, repo, *args):
1838 def debugancestor(ui, repo, *args):
1839 """find the ancestor revision of two revisions in a given index"""
1839 """find the ancestor revision of two revisions in a given index"""
1840 if len(args) == 3:
1840 if len(args) == 3:
1841 index, rev1, rev2 = args
1841 index, rev1, rev2 = args
1842 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1842 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1843 lookup = r.lookup
1843 lookup = r.lookup
1844 elif len(args) == 2:
1844 elif len(args) == 2:
1845 if not repo:
1845 if not repo:
1846 raise error.Abort(_("there is no Mercurial repository here "
1846 raise error.Abort(_("there is no Mercurial repository here "
1847 "(.hg not found)"))
1847 "(.hg not found)"))
1848 rev1, rev2 = args
1848 rev1, rev2 = args
1849 r = repo.changelog
1849 r = repo.changelog
1850 lookup = repo.lookup
1850 lookup = repo.lookup
1851 else:
1851 else:
1852 raise error.Abort(_('either two or three arguments required'))
1852 raise error.Abort(_('either two or three arguments required'))
1853 a = r.ancestor(lookup(rev1), lookup(rev2))
1853 a = r.ancestor(lookup(rev1), lookup(rev2))
1854 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1854 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1855
1855
1856 @command('debugbuilddag',
1856 @command('debugbuilddag',
1857 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1857 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1858 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1858 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1859 ('n', 'new-file', None, _('add new file at each rev'))],
1859 ('n', 'new-file', None, _('add new file at each rev'))],
1860 _('[OPTION]... [TEXT]'))
1860 _('[OPTION]... [TEXT]'))
1861 def debugbuilddag(ui, repo, text=None,
1861 def debugbuilddag(ui, repo, text=None,
1862 mergeable_file=False,
1862 mergeable_file=False,
1863 overwritten_file=False,
1863 overwritten_file=False,
1864 new_file=False):
1864 new_file=False):
1865 """builds a repo with a given DAG from scratch in the current empty repo
1865 """builds a repo with a given DAG from scratch in the current empty repo
1866
1866
1867 The description of the DAG is read from stdin if not given on the
1867 The description of the DAG is read from stdin if not given on the
1868 command line.
1868 command line.
1869
1869
1870 Elements:
1870 Elements:
1871
1871
1872 - "+n" is a linear run of n nodes based on the current default parent
1872 - "+n" is a linear run of n nodes based on the current default parent
1873 - "." is a single node based on the current default parent
1873 - "." is a single node based on the current default parent
1874 - "$" resets the default parent to null (implied at the start);
1874 - "$" resets the default parent to null (implied at the start);
1875 otherwise the default parent is always the last node created
1875 otherwise the default parent is always the last node created
1876 - "<p" sets the default parent to the backref p
1876 - "<p" sets the default parent to the backref p
1877 - "*p" is a fork at parent p, which is a backref
1877 - "*p" is a fork at parent p, which is a backref
1878 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1878 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1879 - "/p2" is a merge of the preceding node and p2
1879 - "/p2" is a merge of the preceding node and p2
1880 - ":tag" defines a local tag for the preceding node
1880 - ":tag" defines a local tag for the preceding node
1881 - "@branch" sets the named branch for subsequent nodes
1881 - "@branch" sets the named branch for subsequent nodes
1882 - "#...\\n" is a comment up to the end of the line
1882 - "#...\\n" is a comment up to the end of the line
1883
1883
1884 Whitespace between the above elements is ignored.
1884 Whitespace between the above elements is ignored.
1885
1885
1886 A backref is either
1886 A backref is either
1887
1887
1888 - a number n, which references the node curr-n, where curr is the current
1888 - a number n, which references the node curr-n, where curr is the current
1889 node, or
1889 node, or
1890 - the name of a local tag you placed earlier using ":tag", or
1890 - the name of a local tag you placed earlier using ":tag", or
1891 - empty to denote the default parent.
1891 - empty to denote the default parent.
1892
1892
1893 All string valued-elements are either strictly alphanumeric, or must
1893 All string valued-elements are either strictly alphanumeric, or must
1894 be enclosed in double quotes ("..."), with "\\" as escape character.
1894 be enclosed in double quotes ("..."), with "\\" as escape character.
1895 """
1895 """
1896
1896
1897 if text is None:
1897 if text is None:
1898 ui.status(_("reading DAG from stdin\n"))
1898 ui.status(_("reading DAG from stdin\n"))
1899 text = ui.fin.read()
1899 text = ui.fin.read()
1900
1900
1901 cl = repo.changelog
1901 cl = repo.changelog
1902 if len(cl) > 0:
1902 if len(cl) > 0:
1903 raise error.Abort(_('repository is not empty'))
1903 raise error.Abort(_('repository is not empty'))
1904
1904
1905 # determine number of revs in DAG
1905 # determine number of revs in DAG
1906 total = 0
1906 total = 0
1907 for type, data in dagparser.parsedag(text):
1907 for type, data in dagparser.parsedag(text):
1908 if type == 'n':
1908 if type == 'n':
1909 total += 1
1909 total += 1
1910
1910
1911 if mergeable_file:
1911 if mergeable_file:
1912 linesperrev = 2
1912 linesperrev = 2
1913 # make a file with k lines per rev
1913 # make a file with k lines per rev
1914 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1914 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1915 initialmergedlines.append("")
1915 initialmergedlines.append("")
1916
1916
1917 tags = []
1917 tags = []
1918
1918
1919 lock = tr = None
1919 lock = tr = None
1920 try:
1920 try:
1921 lock = repo.lock()
1921 lock = repo.lock()
1922 tr = repo.transaction("builddag")
1922 tr = repo.transaction("builddag")
1923
1923
1924 at = -1
1924 at = -1
1925 atbranch = 'default'
1925 atbranch = 'default'
1926 nodeids = []
1926 nodeids = []
1927 id = 0
1927 id = 0
1928 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1928 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1929 for type, data in dagparser.parsedag(text):
1929 for type, data in dagparser.parsedag(text):
1930 if type == 'n':
1930 if type == 'n':
1931 ui.note(('node %s\n' % str(data)))
1931 ui.note(('node %s\n' % str(data)))
1932 id, ps = data
1932 id, ps = data
1933
1933
1934 files = []
1934 files = []
1935 fctxs = {}
1935 fctxs = {}
1936
1936
1937 p2 = None
1937 p2 = None
1938 if mergeable_file:
1938 if mergeable_file:
1939 fn = "mf"
1939 fn = "mf"
1940 p1 = repo[ps[0]]
1940 p1 = repo[ps[0]]
1941 if len(ps) > 1:
1941 if len(ps) > 1:
1942 p2 = repo[ps[1]]
1942 p2 = repo[ps[1]]
1943 pa = p1.ancestor(p2)
1943 pa = p1.ancestor(p2)
1944 base, local, other = [x[fn].data() for x in (pa, p1,
1944 base, local, other = [x[fn].data() for x in (pa, p1,
1945 p2)]
1945 p2)]
1946 m3 = simplemerge.Merge3Text(base, local, other)
1946 m3 = simplemerge.Merge3Text(base, local, other)
1947 ml = [l.strip() for l in m3.merge_lines()]
1947 ml = [l.strip() for l in m3.merge_lines()]
1948 ml.append("")
1948 ml.append("")
1949 elif at > 0:
1949 elif at > 0:
1950 ml = p1[fn].data().split("\n")
1950 ml = p1[fn].data().split("\n")
1951 else:
1951 else:
1952 ml = initialmergedlines
1952 ml = initialmergedlines
1953 ml[id * linesperrev] += " r%i" % id
1953 ml[id * linesperrev] += " r%i" % id
1954 mergedtext = "\n".join(ml)
1954 mergedtext = "\n".join(ml)
1955 files.append(fn)
1955 files.append(fn)
1956 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
1956 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
1957
1957
1958 if overwritten_file:
1958 if overwritten_file:
1959 fn = "of"
1959 fn = "of"
1960 files.append(fn)
1960 files.append(fn)
1961 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1961 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1962
1962
1963 if new_file:
1963 if new_file:
1964 fn = "nf%i" % id
1964 fn = "nf%i" % id
1965 files.append(fn)
1965 files.append(fn)
1966 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1966 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1967 if len(ps) > 1:
1967 if len(ps) > 1:
1968 if not p2:
1968 if not p2:
1969 p2 = repo[ps[1]]
1969 p2 = repo[ps[1]]
1970 for fn in p2:
1970 for fn in p2:
1971 if fn.startswith("nf"):
1971 if fn.startswith("nf"):
1972 files.append(fn)
1972 files.append(fn)
1973 fctxs[fn] = p2[fn]
1973 fctxs[fn] = p2[fn]
1974
1974
1975 def fctxfn(repo, cx, path):
1975 def fctxfn(repo, cx, path):
1976 return fctxs.get(path)
1976 return fctxs.get(path)
1977
1977
1978 if len(ps) == 0 or ps[0] < 0:
1978 if len(ps) == 0 or ps[0] < 0:
1979 pars = [None, None]
1979 pars = [None, None]
1980 elif len(ps) == 1:
1980 elif len(ps) == 1:
1981 pars = [nodeids[ps[0]], None]
1981 pars = [nodeids[ps[0]], None]
1982 else:
1982 else:
1983 pars = [nodeids[p] for p in ps]
1983 pars = [nodeids[p] for p in ps]
1984 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1984 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1985 date=(id, 0),
1985 date=(id, 0),
1986 user="debugbuilddag",
1986 user="debugbuilddag",
1987 extra={'branch': atbranch})
1987 extra={'branch': atbranch})
1988 nodeid = repo.commitctx(cx)
1988 nodeid = repo.commitctx(cx)
1989 nodeids.append(nodeid)
1989 nodeids.append(nodeid)
1990 at = id
1990 at = id
1991 elif type == 'l':
1991 elif type == 'l':
1992 id, name = data
1992 id, name = data
1993 ui.note(('tag %s\n' % name))
1993 ui.note(('tag %s\n' % name))
1994 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1994 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1995 elif type == 'a':
1995 elif type == 'a':
1996 ui.note(('branch %s\n' % data))
1996 ui.note(('branch %s\n' % data))
1997 atbranch = data
1997 atbranch = data
1998 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1998 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1999 tr.close()
1999 tr.close()
2000
2000
2001 if tags:
2001 if tags:
2002 repo.vfs.write("localtags", "".join(tags))
2002 repo.vfs.write("localtags", "".join(tags))
2003 finally:
2003 finally:
2004 ui.progress(_('building'), None)
2004 ui.progress(_('building'), None)
2005 release(tr, lock)
2005 release(tr, lock)
2006
2006
2007 @command('debugbundle',
2007 @command('debugbundle',
2008 [('a', 'all', None, _('show all details'))],
2008 [('a', 'all', None, _('show all details'))],
2009 _('FILE'),
2009 _('FILE'),
2010 norepo=True)
2010 norepo=True)
2011 def debugbundle(ui, bundlepath, all=None, **opts):
2011 def debugbundle(ui, bundlepath, all=None, **opts):
2012 """lists the contents of a bundle"""
2012 """lists the contents of a bundle"""
2013 f = hg.openpath(ui, bundlepath)
2013 f = hg.openpath(ui, bundlepath)
2014 try:
2014 try:
2015 gen = exchange.readbundle(ui, f, bundlepath)
2015 gen = exchange.readbundle(ui, f, bundlepath)
2016 if isinstance(gen, bundle2.unbundle20):
2016 if isinstance(gen, bundle2.unbundle20):
2017 return _debugbundle2(ui, gen, all=all, **opts)
2017 return _debugbundle2(ui, gen, all=all, **opts)
2018 if all:
2018 if all:
2019 ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n"))
2019 ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n"))
2020
2020
2021 def showchunks(named):
2021 def showchunks(named):
2022 ui.write("\n%s\n" % named)
2022 ui.write("\n%s\n" % named)
2023 chain = None
2023 chain = None
2024 while True:
2024 while True:
2025 chunkdata = gen.deltachunk(chain)
2025 chunkdata = gen.deltachunk(chain)
2026 if not chunkdata:
2026 if not chunkdata:
2027 break
2027 break
2028 node = chunkdata['node']
2028 node = chunkdata['node']
2029 p1 = chunkdata['p1']
2029 p1 = chunkdata['p1']
2030 p2 = chunkdata['p2']
2030 p2 = chunkdata['p2']
2031 cs = chunkdata['cs']
2031 cs = chunkdata['cs']
2032 deltabase = chunkdata['deltabase']
2032 deltabase = chunkdata['deltabase']
2033 delta = chunkdata['delta']
2033 delta = chunkdata['delta']
2034 ui.write("%s %s %s %s %s %s\n" %
2034 ui.write("%s %s %s %s %s %s\n" %
2035 (hex(node), hex(p1), hex(p2),
2035 (hex(node), hex(p1), hex(p2),
2036 hex(cs), hex(deltabase), len(delta)))
2036 hex(cs), hex(deltabase), len(delta)))
2037 chain = node
2037 chain = node
2038
2038
2039 chunkdata = gen.changelogheader()
2039 chunkdata = gen.changelogheader()
2040 showchunks("changelog")
2040 showchunks("changelog")
2041 chunkdata = gen.manifestheader()
2041 chunkdata = gen.manifestheader()
2042 showchunks("manifest")
2042 showchunks("manifest")
2043 while True:
2043 while True:
2044 chunkdata = gen.filelogheader()
2044 chunkdata = gen.filelogheader()
2045 if not chunkdata:
2045 if not chunkdata:
2046 break
2046 break
2047 fname = chunkdata['filename']
2047 fname = chunkdata['filename']
2048 showchunks(fname)
2048 showchunks(fname)
2049 else:
2049 else:
2050 if isinstance(gen, bundle2.unbundle20):
2050 if isinstance(gen, bundle2.unbundle20):
2051 raise error.Abort(_('use debugbundle2 for this file'))
2051 raise error.Abort(_('use debugbundle2 for this file'))
2052 chunkdata = gen.changelogheader()
2052 chunkdata = gen.changelogheader()
2053 chain = None
2053 chain = None
2054 while True:
2054 while True:
2055 chunkdata = gen.deltachunk(chain)
2055 chunkdata = gen.deltachunk(chain)
2056 if not chunkdata:
2056 if not chunkdata:
2057 break
2057 break
2058 node = chunkdata['node']
2058 node = chunkdata['node']
2059 ui.write("%s\n" % hex(node))
2059 ui.write("%s\n" % hex(node))
2060 chain = node
2060 chain = node
2061 finally:
2061 finally:
2062 f.close()
2062 f.close()
2063
2063
2064 def _debugbundle2(ui, gen, **opts):
2064 def _debugbundle2(ui, gen, **opts):
2065 """lists the contents of a bundle2"""
2065 """lists the contents of a bundle2"""
2066 if not isinstance(gen, bundle2.unbundle20):
2066 if not isinstance(gen, bundle2.unbundle20):
2067 raise error.Abort(_('not a bundle2 file'))
2067 raise error.Abort(_('not a bundle2 file'))
2068 ui.write(('Stream params: %s\n' % repr(gen.params)))
2068 ui.write(('Stream params: %s\n' % repr(gen.params)))
2069 for part in gen.iterparts():
2069 for part in gen.iterparts():
2070 ui.write('%s -- %r\n' % (part.type, repr(part.params)))
2070 ui.write('%s -- %r\n' % (part.type, repr(part.params)))
2071 if part.type == 'changegroup':
2071 if part.type == 'changegroup':
2072 version = part.params.get('version', '01')
2072 version = part.params.get('version', '01')
2073 cg = changegroup.packermap[version][1](part, 'UN')
2073 cg = changegroup.packermap[version][1](part, 'UN')
2074 chunkdata = cg.changelogheader()
2074 chunkdata = cg.changelogheader()
2075 chain = None
2075 chain = None
2076 while True:
2076 while True:
2077 chunkdata = cg.deltachunk(chain)
2077 chunkdata = cg.deltachunk(chain)
2078 if not chunkdata:
2078 if not chunkdata:
2079 break
2079 break
2080 node = chunkdata['node']
2080 node = chunkdata['node']
2081 ui.write(" %s\n" % hex(node))
2081 ui.write(" %s\n" % hex(node))
2082 chain = node
2082 chain = node
2083
2083
2084 @command('debugcreatestreamclonebundle', [], 'FILE')
2084 @command('debugcreatestreamclonebundle', [], 'FILE')
2085 def debugcreatestreamclonebundle(ui, repo, fname):
2085 def debugcreatestreamclonebundle(ui, repo, fname):
2086 """create a stream clone bundle file
2086 """create a stream clone bundle file
2087
2087
2088 Stream bundles are special bundles that are essentially archives of
2088 Stream bundles are special bundles that are essentially archives of
2089 revlog files. They are commonly used for cloning very quickly.
2089 revlog files. They are commonly used for cloning very quickly.
2090 """
2090 """
2091 requirements, gen = streamclone.generatebundlev1(repo)
2091 requirements, gen = streamclone.generatebundlev1(repo)
2092 changegroup.writechunks(ui, gen, fname)
2092 changegroup.writechunks(ui, gen, fname)
2093
2093
2094 ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements)))
2094 ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements)))
2095
2095
2096 @command('debugapplystreamclonebundle', [], 'FILE')
2096 @command('debugapplystreamclonebundle', [], 'FILE')
2097 def debugapplystreamclonebundle(ui, repo, fname):
2097 def debugapplystreamclonebundle(ui, repo, fname):
2098 """apply a stream clone bundle file"""
2098 """apply a stream clone bundle file"""
2099 f = hg.openpath(ui, fname)
2099 f = hg.openpath(ui, fname)
2100 gen = exchange.readbundle(ui, f, fname)
2100 gen = exchange.readbundle(ui, f, fname)
2101 gen.apply(repo)
2101 gen.apply(repo)
2102
2102
2103 @command('debugcheckstate', [], '')
2103 @command('debugcheckstate', [], '')
2104 def debugcheckstate(ui, repo):
2104 def debugcheckstate(ui, repo):
2105 """validate the correctness of the current dirstate"""
2105 """validate the correctness of the current dirstate"""
2106 parent1, parent2 = repo.dirstate.parents()
2106 parent1, parent2 = repo.dirstate.parents()
2107 m1 = repo[parent1].manifest()
2107 m1 = repo[parent1].manifest()
2108 m2 = repo[parent2].manifest()
2108 m2 = repo[parent2].manifest()
2109 errors = 0
2109 errors = 0
2110 for f in repo.dirstate:
2110 for f in repo.dirstate:
2111 state = repo.dirstate[f]
2111 state = repo.dirstate[f]
2112 if state in "nr" and f not in m1:
2112 if state in "nr" and f not in m1:
2113 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
2113 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
2114 errors += 1
2114 errors += 1
2115 if state in "a" and f in m1:
2115 if state in "a" and f in m1:
2116 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
2116 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
2117 errors += 1
2117 errors += 1
2118 if state in "m" and f not in m1 and f not in m2:
2118 if state in "m" and f not in m1 and f not in m2:
2119 ui.warn(_("%s in state %s, but not in either manifest\n") %
2119 ui.warn(_("%s in state %s, but not in either manifest\n") %
2120 (f, state))
2120 (f, state))
2121 errors += 1
2121 errors += 1
2122 for f in m1:
2122 for f in m1:
2123 state = repo.dirstate[f]
2123 state = repo.dirstate[f]
2124 if state not in "nrm":
2124 if state not in "nrm":
2125 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
2125 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
2126 errors += 1
2126 errors += 1
2127 if errors:
2127 if errors:
2128 error = _(".hg/dirstate inconsistent with current parent's manifest")
2128 error = _(".hg/dirstate inconsistent with current parent's manifest")
2129 raise error.Abort(error)
2129 raise error.Abort(error)
2130
2130
2131 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
2131 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
2132 def debugcommands(ui, cmd='', *args):
2132 def debugcommands(ui, cmd='', *args):
2133 """list all available commands and options"""
2133 """list all available commands and options"""
2134 for cmd, vals in sorted(table.iteritems()):
2134 for cmd, vals in sorted(table.iteritems()):
2135 cmd = cmd.split('|')[0].strip('^')
2135 cmd = cmd.split('|')[0].strip('^')
2136 opts = ', '.join([i[1] for i in vals[1]])
2136 opts = ', '.join([i[1] for i in vals[1]])
2137 ui.write('%s: %s\n' % (cmd, opts))
2137 ui.write('%s: %s\n' % (cmd, opts))
2138
2138
2139 @command('debugcomplete',
2139 @command('debugcomplete',
2140 [('o', 'options', None, _('show the command options'))],
2140 [('o', 'options', None, _('show the command options'))],
2141 _('[-o] CMD'),
2141 _('[-o] CMD'),
2142 norepo=True)
2142 norepo=True)
2143 def debugcomplete(ui, cmd='', **opts):
2143 def debugcomplete(ui, cmd='', **opts):
2144 """returns the completion list associated with the given command"""
2144 """returns the completion list associated with the given command"""
2145
2145
2146 if opts.get('options'):
2146 if opts.get('options'):
2147 options = []
2147 options = []
2148 otables = [globalopts]
2148 otables = [globalopts]
2149 if cmd:
2149 if cmd:
2150 aliases, entry = cmdutil.findcmd(cmd, table, False)
2150 aliases, entry = cmdutil.findcmd(cmd, table, False)
2151 otables.append(entry[1])
2151 otables.append(entry[1])
2152 for t in otables:
2152 for t in otables:
2153 for o in t:
2153 for o in t:
2154 if "(DEPRECATED)" in o[3]:
2154 if "(DEPRECATED)" in o[3]:
2155 continue
2155 continue
2156 if o[0]:
2156 if o[0]:
2157 options.append('-%s' % o[0])
2157 options.append('-%s' % o[0])
2158 options.append('--%s' % o[1])
2158 options.append('--%s' % o[1])
2159 ui.write("%s\n" % "\n".join(options))
2159 ui.write("%s\n" % "\n".join(options))
2160 return
2160 return
2161
2161
2162 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2162 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2163 if ui.verbose:
2163 if ui.verbose:
2164 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
2164 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
2165 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
2165 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
2166
2166
2167 @command('debugdag',
2167 @command('debugdag',
2168 [('t', 'tags', None, _('use tags as labels')),
2168 [('t', 'tags', None, _('use tags as labels')),
2169 ('b', 'branches', None, _('annotate with branch names')),
2169 ('b', 'branches', None, _('annotate with branch names')),
2170 ('', 'dots', None, _('use dots for runs')),
2170 ('', 'dots', None, _('use dots for runs')),
2171 ('s', 'spaces', None, _('separate elements by spaces'))],
2171 ('s', 'spaces', None, _('separate elements by spaces'))],
2172 _('[OPTION]... [FILE [REV]...]'),
2172 _('[OPTION]... [FILE [REV]...]'),
2173 optionalrepo=True)
2173 optionalrepo=True)
2174 def debugdag(ui, repo, file_=None, *revs, **opts):
2174 def debugdag(ui, repo, file_=None, *revs, **opts):
2175 """format the changelog or an index DAG as a concise textual description
2175 """format the changelog or an index DAG as a concise textual description
2176
2176
2177 If you pass a revlog index, the revlog's DAG is emitted. If you list
2177 If you pass a revlog index, the revlog's DAG is emitted. If you list
2178 revision numbers, they get labeled in the output as rN.
2178 revision numbers, they get labeled in the output as rN.
2179
2179
2180 Otherwise, the changelog DAG of the current repo is emitted.
2180 Otherwise, the changelog DAG of the current repo is emitted.
2181 """
2181 """
2182 spaces = opts.get('spaces')
2182 spaces = opts.get('spaces')
2183 dots = opts.get('dots')
2183 dots = opts.get('dots')
2184 if file_:
2184 if file_:
2185 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2185 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2186 revs = set((int(r) for r in revs))
2186 revs = set((int(r) for r in revs))
2187 def events():
2187 def events():
2188 for r in rlog:
2188 for r in rlog:
2189 yield 'n', (r, list(p for p in rlog.parentrevs(r)
2189 yield 'n', (r, list(p for p in rlog.parentrevs(r)
2190 if p != -1))
2190 if p != -1))
2191 if r in revs:
2191 if r in revs:
2192 yield 'l', (r, "r%i" % r)
2192 yield 'l', (r, "r%i" % r)
2193 elif repo:
2193 elif repo:
2194 cl = repo.changelog
2194 cl = repo.changelog
2195 tags = opts.get('tags')
2195 tags = opts.get('tags')
2196 branches = opts.get('branches')
2196 branches = opts.get('branches')
2197 if tags:
2197 if tags:
2198 labels = {}
2198 labels = {}
2199 for l, n in repo.tags().items():
2199 for l, n in repo.tags().items():
2200 labels.setdefault(cl.rev(n), []).append(l)
2200 labels.setdefault(cl.rev(n), []).append(l)
2201 def events():
2201 def events():
2202 b = "default"
2202 b = "default"
2203 for r in cl:
2203 for r in cl:
2204 if branches:
2204 if branches:
2205 newb = cl.read(cl.node(r))[5]['branch']
2205 newb = cl.read(cl.node(r))[5]['branch']
2206 if newb != b:
2206 if newb != b:
2207 yield 'a', newb
2207 yield 'a', newb
2208 b = newb
2208 b = newb
2209 yield 'n', (r, list(p for p in cl.parentrevs(r)
2209 yield 'n', (r, list(p for p in cl.parentrevs(r)
2210 if p != -1))
2210 if p != -1))
2211 if tags:
2211 if tags:
2212 ls = labels.get(r)
2212 ls = labels.get(r)
2213 if ls:
2213 if ls:
2214 for l in ls:
2214 for l in ls:
2215 yield 'l', (r, l)
2215 yield 'l', (r, l)
2216 else:
2216 else:
2217 raise error.Abort(_('need repo for changelog dag'))
2217 raise error.Abort(_('need repo for changelog dag'))
2218
2218
2219 for line in dagparser.dagtextlines(events(),
2219 for line in dagparser.dagtextlines(events(),
2220 addspaces=spaces,
2220 addspaces=spaces,
2221 wraplabels=True,
2221 wraplabels=True,
2222 wrapannotations=True,
2222 wrapannotations=True,
2223 wrapnonlinear=dots,
2223 wrapnonlinear=dots,
2224 usedots=dots,
2224 usedots=dots,
2225 maxlinewidth=70):
2225 maxlinewidth=70):
2226 ui.write(line)
2226 ui.write(line)
2227 ui.write("\n")
2227 ui.write("\n")
2228
2228
2229 @command('debugdata', debugrevlogopts, _('-c|-m|FILE REV'))
2229 @command('debugdata', debugrevlogopts, _('-c|-m|FILE REV'))
2230 def debugdata(ui, repo, file_, rev=None, **opts):
2230 def debugdata(ui, repo, file_, rev=None, **opts):
2231 """dump the contents of a data file revision"""
2231 """dump the contents of a data file revision"""
2232 if opts.get('changelog') or opts.get('manifest'):
2232 if opts.get('changelog') or opts.get('manifest'):
2233 file_, rev = None, file_
2233 file_, rev = None, file_
2234 elif rev is None:
2234 elif rev is None:
2235 raise error.CommandError('debugdata', _('invalid arguments'))
2235 raise error.CommandError('debugdata', _('invalid arguments'))
2236 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
2236 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
2237 try:
2237 try:
2238 ui.write(r.revision(r.lookup(rev)))
2238 ui.write(r.revision(r.lookup(rev)))
2239 except KeyError:
2239 except KeyError:
2240 raise error.Abort(_('invalid revision identifier %s') % rev)
2240 raise error.Abort(_('invalid revision identifier %s') % rev)
2241
2241
2242 @command('debugdate',
2242 @command('debugdate',
2243 [('e', 'extended', None, _('try extended date formats'))],
2243 [('e', 'extended', None, _('try extended date formats'))],
2244 _('[-e] DATE [RANGE]'),
2244 _('[-e] DATE [RANGE]'),
2245 norepo=True, optionalrepo=True)
2245 norepo=True, optionalrepo=True)
2246 def debugdate(ui, date, range=None, **opts):
2246 def debugdate(ui, date, range=None, **opts):
2247 """parse and display a date"""
2247 """parse and display a date"""
2248 if opts["extended"]:
2248 if opts["extended"]:
2249 d = util.parsedate(date, util.extendeddateformats)
2249 d = util.parsedate(date, util.extendeddateformats)
2250 else:
2250 else:
2251 d = util.parsedate(date)
2251 d = util.parsedate(date)
2252 ui.write(("internal: %s %s\n") % d)
2252 ui.write(("internal: %s %s\n") % d)
2253 ui.write(("standard: %s\n") % util.datestr(d))
2253 ui.write(("standard: %s\n") % util.datestr(d))
2254 if range:
2254 if range:
2255 m = util.matchdate(range)
2255 m = util.matchdate(range)
2256 ui.write(("match: %s\n") % m(d[0]))
2256 ui.write(("match: %s\n") % m(d[0]))
2257
2257
2258 @command('debugdiscovery',
2258 @command('debugdiscovery',
2259 [('', 'old', None, _('use old-style discovery')),
2259 [('', 'old', None, _('use old-style discovery')),
2260 ('', 'nonheads', None,
2260 ('', 'nonheads', None,
2261 _('use old-style discovery with non-heads included')),
2261 _('use old-style discovery with non-heads included')),
2262 ] + remoteopts,
2262 ] + remoteopts,
2263 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2263 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2264 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2264 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2265 """runs the changeset discovery protocol in isolation"""
2265 """runs the changeset discovery protocol in isolation"""
2266 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2266 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2267 opts.get('branch'))
2267 opts.get('branch'))
2268 remote = hg.peer(repo, opts, remoteurl)
2268 remote = hg.peer(repo, opts, remoteurl)
2269 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2269 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2270
2270
2271 # make sure tests are repeatable
2271 # make sure tests are repeatable
2272 random.seed(12323)
2272 random.seed(12323)
2273
2273
2274 def doit(localheads, remoteheads, remote=remote):
2274 def doit(localheads, remoteheads, remote=remote):
2275 if opts.get('old'):
2275 if opts.get('old'):
2276 if localheads:
2276 if localheads:
2277 raise error.Abort('cannot use localheads with old style '
2277 raise error.Abort('cannot use localheads with old style '
2278 'discovery')
2278 'discovery')
2279 if not util.safehasattr(remote, 'branches'):
2279 if not util.safehasattr(remote, 'branches'):
2280 # enable in-client legacy support
2280 # enable in-client legacy support
2281 remote = localrepo.locallegacypeer(remote.local())
2281 remote = localrepo.locallegacypeer(remote.local())
2282 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2282 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2283 force=True)
2283 force=True)
2284 common = set(common)
2284 common = set(common)
2285 if not opts.get('nonheads'):
2285 if not opts.get('nonheads'):
2286 ui.write(("unpruned common: %s\n") %
2286 ui.write(("unpruned common: %s\n") %
2287 " ".join(sorted(short(n) for n in common)))
2287 " ".join(sorted(short(n) for n in common)))
2288 dag = dagutil.revlogdag(repo.changelog)
2288 dag = dagutil.revlogdag(repo.changelog)
2289 all = dag.ancestorset(dag.internalizeall(common))
2289 all = dag.ancestorset(dag.internalizeall(common))
2290 common = dag.externalizeall(dag.headsetofconnecteds(all))
2290 common = dag.externalizeall(dag.headsetofconnecteds(all))
2291 else:
2291 else:
2292 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2292 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2293 common = set(common)
2293 common = set(common)
2294 rheads = set(hds)
2294 rheads = set(hds)
2295 lheads = set(repo.heads())
2295 lheads = set(repo.heads())
2296 ui.write(("common heads: %s\n") %
2296 ui.write(("common heads: %s\n") %
2297 " ".join(sorted(short(n) for n in common)))
2297 " ".join(sorted(short(n) for n in common)))
2298 if lheads <= common:
2298 if lheads <= common:
2299 ui.write(("local is subset\n"))
2299 ui.write(("local is subset\n"))
2300 elif rheads <= common:
2300 elif rheads <= common:
2301 ui.write(("remote is subset\n"))
2301 ui.write(("remote is subset\n"))
2302
2302
2303 serverlogs = opts.get('serverlog')
2303 serverlogs = opts.get('serverlog')
2304 if serverlogs:
2304 if serverlogs:
2305 for filename in serverlogs:
2305 for filename in serverlogs:
2306 logfile = open(filename, 'r')
2306 logfile = open(filename, 'r')
2307 try:
2307 try:
2308 line = logfile.readline()
2308 line = logfile.readline()
2309 while line:
2309 while line:
2310 parts = line.strip().split(';')
2310 parts = line.strip().split(';')
2311 op = parts[1]
2311 op = parts[1]
2312 if op == 'cg':
2312 if op == 'cg':
2313 pass
2313 pass
2314 elif op == 'cgss':
2314 elif op == 'cgss':
2315 doit(parts[2].split(' '), parts[3].split(' '))
2315 doit(parts[2].split(' '), parts[3].split(' '))
2316 elif op == 'unb':
2316 elif op == 'unb':
2317 doit(parts[3].split(' '), parts[2].split(' '))
2317 doit(parts[3].split(' '), parts[2].split(' '))
2318 line = logfile.readline()
2318 line = logfile.readline()
2319 finally:
2319 finally:
2320 logfile.close()
2320 logfile.close()
2321
2321
2322 else:
2322 else:
2323 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2323 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2324 opts.get('remote_head'))
2324 opts.get('remote_head'))
2325 localrevs = opts.get('local_head')
2325 localrevs = opts.get('local_head')
2326 doit(localrevs, remoterevs)
2326 doit(localrevs, remoterevs)
2327
2327
2328 @command('debugextensions', formatteropts, [], norepo=True)
2328 @command('debugextensions', formatteropts, [], norepo=True)
2329 def debugextensions(ui, **opts):
2329 def debugextensions(ui, **opts):
2330 '''show information about active extensions'''
2330 '''show information about active extensions'''
2331 exts = extensions.extensions(ui)
2331 exts = extensions.extensions(ui)
2332 fm = ui.formatter('debugextensions', opts)
2332 fm = ui.formatter('debugextensions', opts)
2333 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
2333 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
2334 extsource = extmod.__file__
2334 extsource = extmod.__file__
2335 exttestedwith = getattr(extmod, 'testedwith', None)
2335 exttestedwith = getattr(extmod, 'testedwith', None)
2336 if exttestedwith is not None:
2336 if exttestedwith is not None:
2337 exttestedwith = exttestedwith.split()
2337 exttestedwith = exttestedwith.split()
2338 extbuglink = getattr(extmod, 'buglink', None)
2338 extbuglink = getattr(extmod, 'buglink', None)
2339
2339
2340 fm.startitem()
2340 fm.startitem()
2341
2341
2342 if ui.quiet or ui.verbose:
2342 if ui.quiet or ui.verbose:
2343 fm.write('name', '%s\n', extname)
2343 fm.write('name', '%s\n', extname)
2344 else:
2344 else:
2345 fm.write('name', '%s', extname)
2345 fm.write('name', '%s', extname)
2346 if not exttestedwith:
2346 if not exttestedwith:
2347 fm.plain(_(' (untested!)\n'))
2347 fm.plain(_(' (untested!)\n'))
2348 else:
2348 else:
2349 if exttestedwith == ['internal'] or \
2349 if exttestedwith == ['internal'] or \
2350 util.version() in exttestedwith:
2350 util.version() in exttestedwith:
2351 fm.plain('\n')
2351 fm.plain('\n')
2352 else:
2352 else:
2353 lasttestedversion = exttestedwith[-1]
2353 lasttestedversion = exttestedwith[-1]
2354 fm.plain(' (%s!)\n' % lasttestedversion)
2354 fm.plain(' (%s!)\n' % lasttestedversion)
2355
2355
2356 fm.condwrite(ui.verbose and extsource, 'source',
2356 fm.condwrite(ui.verbose and extsource, 'source',
2357 _(' location: %s\n'), extsource or "")
2357 _(' location: %s\n'), extsource or "")
2358
2358
2359 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
2359 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
2360 _(' tested with: %s\n'), ' '.join(exttestedwith or []))
2360 _(' tested with: %s\n'), ' '.join(exttestedwith or []))
2361
2361
2362 fm.condwrite(ui.verbose and extbuglink, 'buglink',
2362 fm.condwrite(ui.verbose and extbuglink, 'buglink',
2363 _(' bug reporting: %s\n'), extbuglink or "")
2363 _(' bug reporting: %s\n'), extbuglink or "")
2364
2364
2365 fm.end()
2365 fm.end()
2366
2366
2367 @command('debugfileset',
2367 @command('debugfileset',
2368 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2368 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2369 _('[-r REV] FILESPEC'))
2369 _('[-r REV] FILESPEC'))
2370 def debugfileset(ui, repo, expr, **opts):
2370 def debugfileset(ui, repo, expr, **opts):
2371 '''parse and apply a fileset specification'''
2371 '''parse and apply a fileset specification'''
2372 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2372 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2373 if ui.verbose:
2373 if ui.verbose:
2374 tree = fileset.parse(expr)
2374 tree = fileset.parse(expr)
2375 ui.note(fileset.prettyformat(tree), "\n")
2375 ui.note(fileset.prettyformat(tree), "\n")
2376
2376
2377 for f in ctx.getfileset(expr):
2377 for f in ctx.getfileset(expr):
2378 ui.write("%s\n" % f)
2378 ui.write("%s\n" % f)
2379
2379
2380 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2380 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2381 def debugfsinfo(ui, path="."):
2381 def debugfsinfo(ui, path="."):
2382 """show information detected about current filesystem"""
2382 """show information detected about current filesystem"""
2383 util.writefile('.debugfsinfo', '')
2383 util.writefile('.debugfsinfo', '')
2384 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2384 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2385 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2385 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2386 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2386 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2387 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
2387 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
2388 and 'yes' or 'no'))
2388 and 'yes' or 'no'))
2389 os.unlink('.debugfsinfo')
2389 os.unlink('.debugfsinfo')
2390
2390
2391 @command('debuggetbundle',
2391 @command('debuggetbundle',
2392 [('H', 'head', [], _('id of head node'), _('ID')),
2392 [('H', 'head', [], _('id of head node'), _('ID')),
2393 ('C', 'common', [], _('id of common node'), _('ID')),
2393 ('C', 'common', [], _('id of common node'), _('ID')),
2394 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2394 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2395 _('REPO FILE [-H|-C ID]...'),
2395 _('REPO FILE [-H|-C ID]...'),
2396 norepo=True)
2396 norepo=True)
2397 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2397 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2398 """retrieves a bundle from a repo
2398 """retrieves a bundle from a repo
2399
2399
2400 Every ID must be a full-length hex node id string. Saves the bundle to the
2400 Every ID must be a full-length hex node id string. Saves the bundle to the
2401 given file.
2401 given file.
2402 """
2402 """
2403 repo = hg.peer(ui, opts, repopath)
2403 repo = hg.peer(ui, opts, repopath)
2404 if not repo.capable('getbundle'):
2404 if not repo.capable('getbundle'):
2405 raise error.Abort("getbundle() not supported by target repository")
2405 raise error.Abort("getbundle() not supported by target repository")
2406 args = {}
2406 args = {}
2407 if common:
2407 if common:
2408 args['common'] = [bin(s) for s in common]
2408 args['common'] = [bin(s) for s in common]
2409 if head:
2409 if head:
2410 args['heads'] = [bin(s) for s in head]
2410 args['heads'] = [bin(s) for s in head]
2411 # TODO: get desired bundlecaps from command line.
2411 # TODO: get desired bundlecaps from command line.
2412 args['bundlecaps'] = None
2412 args['bundlecaps'] = None
2413 bundle = repo.getbundle('debug', **args)
2413 bundle = repo.getbundle('debug', **args)
2414
2414
2415 bundletype = opts.get('type', 'bzip2').lower()
2415 bundletype = opts.get('type', 'bzip2').lower()
2416 btypes = {'none': 'HG10UN',
2416 btypes = {'none': 'HG10UN',
2417 'bzip2': 'HG10BZ',
2417 'bzip2': 'HG10BZ',
2418 'gzip': 'HG10GZ',
2418 'gzip': 'HG10GZ',
2419 'bundle2': 'HG20'}
2419 'bundle2': 'HG20'}
2420 bundletype = btypes.get(bundletype)
2420 bundletype = btypes.get(bundletype)
2421 if bundletype not in changegroup.bundletypes:
2421 if bundletype not in changegroup.bundletypes:
2422 raise error.Abort(_('unknown bundle type specified with --type'))
2422 raise error.Abort(_('unknown bundle type specified with --type'))
2423 changegroup.writebundle(ui, bundle, bundlepath, bundletype)
2423 changegroup.writebundle(ui, bundle, bundlepath, bundletype)
2424
2424
2425 @command('debugignore', [], '')
2425 @command('debugignore', [], '')
2426 def debugignore(ui, repo, *values, **opts):
2426 def debugignore(ui, repo, *values, **opts):
2427 """display the combined ignore pattern"""
2427 """display the combined ignore pattern"""
2428 ignore = repo.dirstate._ignore
2428 ignore = repo.dirstate._ignore
2429 includepat = getattr(ignore, 'includepat', None)
2429 includepat = getattr(ignore, 'includepat', None)
2430 if includepat is not None:
2430 if includepat is not None:
2431 ui.write("%s\n" % includepat)
2431 ui.write("%s\n" % includepat)
2432 else:
2432 else:
2433 raise error.Abort(_("no ignore patterns found"))
2433 raise error.Abort(_("no ignore patterns found"))
2434
2434
2435 @command('debugindex', debugrevlogopts +
2435 @command('debugindex', debugrevlogopts +
2436 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2436 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2437 _('[-f FORMAT] -c|-m|FILE'),
2437 _('[-f FORMAT] -c|-m|FILE'),
2438 optionalrepo=True)
2438 optionalrepo=True)
2439 def debugindex(ui, repo, file_=None, **opts):
2439 def debugindex(ui, repo, file_=None, **opts):
2440 """dump the contents of an index file"""
2440 """dump the contents of an index file"""
2441 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2441 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2442 format = opts.get('format', 0)
2442 format = opts.get('format', 0)
2443 if format not in (0, 1):
2443 if format not in (0, 1):
2444 raise error.Abort(_("unknown format %d") % format)
2444 raise error.Abort(_("unknown format %d") % format)
2445
2445
2446 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2446 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2447 if generaldelta:
2447 if generaldelta:
2448 basehdr = ' delta'
2448 basehdr = ' delta'
2449 else:
2449 else:
2450 basehdr = ' base'
2450 basehdr = ' base'
2451
2451
2452 if ui.debugflag:
2452 if ui.debugflag:
2453 shortfn = hex
2453 shortfn = hex
2454 else:
2454 else:
2455 shortfn = short
2455 shortfn = short
2456
2456
2457 # There might not be anything in r, so have a sane default
2457 # There might not be anything in r, so have a sane default
2458 idlen = 12
2458 idlen = 12
2459 for i in r:
2459 for i in r:
2460 idlen = len(shortfn(r.node(i)))
2460 idlen = len(shortfn(r.node(i)))
2461 break
2461 break
2462
2462
2463 if format == 0:
2463 if format == 0:
2464 ui.write(" rev offset length " + basehdr + " linkrev"
2464 ui.write(" rev offset length " + basehdr + " linkrev"
2465 " %s %s p2\n" % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2465 " %s %s p2\n" % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2466 elif format == 1:
2466 elif format == 1:
2467 ui.write(" rev flag offset length"
2467 ui.write(" rev flag offset length"
2468 " size " + basehdr + " link p1 p2"
2468 " size " + basehdr + " link p1 p2"
2469 " %s\n" % "nodeid".rjust(idlen))
2469 " %s\n" % "nodeid".rjust(idlen))
2470
2470
2471 for i in r:
2471 for i in r:
2472 node = r.node(i)
2472 node = r.node(i)
2473 if generaldelta:
2473 if generaldelta:
2474 base = r.deltaparent(i)
2474 base = r.deltaparent(i)
2475 else:
2475 else:
2476 base = r.chainbase(i)
2476 base = r.chainbase(i)
2477 if format == 0:
2477 if format == 0:
2478 try:
2478 try:
2479 pp = r.parents(node)
2479 pp = r.parents(node)
2480 except Exception:
2480 except Exception:
2481 pp = [nullid, nullid]
2481 pp = [nullid, nullid]
2482 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2482 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2483 i, r.start(i), r.length(i), base, r.linkrev(i),
2483 i, r.start(i), r.length(i), base, r.linkrev(i),
2484 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2484 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2485 elif format == 1:
2485 elif format == 1:
2486 pr = r.parentrevs(i)
2486 pr = r.parentrevs(i)
2487 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2487 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2488 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2488 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2489 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2489 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2490
2490
2491 @command('debugindexdot', debugrevlogopts,
2491 @command('debugindexdot', debugrevlogopts,
2492 _('-c|-m|FILE'), optionalrepo=True)
2492 _('-c|-m|FILE'), optionalrepo=True)
2493 def debugindexdot(ui, repo, file_=None, **opts):
2493 def debugindexdot(ui, repo, file_=None, **opts):
2494 """dump an index DAG as a graphviz dot file"""
2494 """dump an index DAG as a graphviz dot file"""
2495 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
2495 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
2496 ui.write(("digraph G {\n"))
2496 ui.write(("digraph G {\n"))
2497 for i in r:
2497 for i in r:
2498 node = r.node(i)
2498 node = r.node(i)
2499 pp = r.parents(node)
2499 pp = r.parents(node)
2500 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2500 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2501 if pp[1] != nullid:
2501 if pp[1] != nullid:
2502 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2502 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2503 ui.write("}\n")
2503 ui.write("}\n")
2504
2504
2505 @command('debugdeltachain',
2505 @command('debugdeltachain',
2506 debugrevlogopts + formatteropts,
2506 debugrevlogopts + formatteropts,
2507 _('-c|-m|FILE'),
2507 _('-c|-m|FILE'),
2508 optionalrepo=True)
2508 optionalrepo=True)
2509 def debugdeltachain(ui, repo, file_=None, **opts):
2509 def debugdeltachain(ui, repo, file_=None, **opts):
2510 """dump information about delta chains in a revlog
2510 """dump information about delta chains in a revlog
2511
2511
2512 Output can be templatized. Available template keywords are:
2512 Output can be templatized. Available template keywords are:
2513
2513
2514 rev revision number
2514 rev revision number
2515 chainid delta chain identifier (numbered by unique base)
2515 chainid delta chain identifier (numbered by unique base)
2516 chainlen delta chain length to this revision
2516 chainlen delta chain length to this revision
2517 prevrev previous revision in delta chain
2517 prevrev previous revision in delta chain
2518 deltatype role of delta / how it was computed
2518 deltatype role of delta / how it was computed
2519 compsize compressed size of revision
2519 compsize compressed size of revision
2520 uncompsize uncompressed size of revision
2520 uncompsize uncompressed size of revision
2521 chainsize total size of compressed revisions in chain
2521 chainsize total size of compressed revisions in chain
2522 chainratio total chain size divided by uncompressed revision size
2522 chainratio total chain size divided by uncompressed revision size
2523 (new delta chains typically start at ratio 2.00)
2523 (new delta chains typically start at ratio 2.00)
2524 lindist linear distance from base revision in delta chain to end
2524 lindist linear distance from base revision in delta chain to end
2525 of this revision
2525 of this revision
2526 extradist total size of revisions not part of this delta chain from
2526 extradist total size of revisions not part of this delta chain from
2527 base of delta chain to end of this revision; a measurement
2527 base of delta chain to end of this revision; a measurement
2528 of how much extra data we need to read/seek across to read
2528 of how much extra data we need to read/seek across to read
2529 the delta chain for this revision
2529 the delta chain for this revision
2530 extraratio extradist divided by chainsize; another representation of
2530 extraratio extradist divided by chainsize; another representation of
2531 how much unrelated data is needed to load this delta chain
2531 how much unrelated data is needed to load this delta chain
2532 """
2532 """
2533 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
2533 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
2534 index = r.index
2534 index = r.index
2535 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2535 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2536
2536
2537 def revinfo(rev):
2537 def revinfo(rev):
2538 iterrev = rev
2538 iterrev = rev
2539 e = index[iterrev]
2539 e = index[iterrev]
2540 chain = []
2540 chain = []
2541 compsize = e[1]
2541 compsize = e[1]
2542 uncompsize = e[2]
2542 uncompsize = e[2]
2543 chainsize = 0
2543 chainsize = 0
2544
2544
2545 if generaldelta:
2545 if generaldelta:
2546 if e[3] == e[5]:
2546 if e[3] == e[5]:
2547 deltatype = 'p1'
2547 deltatype = 'p1'
2548 elif e[3] == e[6]:
2548 elif e[3] == e[6]:
2549 deltatype = 'p2'
2549 deltatype = 'p2'
2550 elif e[3] == rev - 1:
2550 elif e[3] == rev - 1:
2551 deltatype = 'prev'
2551 deltatype = 'prev'
2552 elif e[3] == rev:
2552 elif e[3] == rev:
2553 deltatype = 'base'
2553 deltatype = 'base'
2554 else:
2554 else:
2555 deltatype = 'other'
2555 deltatype = 'other'
2556 else:
2556 else:
2557 if e[3] == rev:
2557 if e[3] == rev:
2558 deltatype = 'base'
2558 deltatype = 'base'
2559 else:
2559 else:
2560 deltatype = 'prev'
2560 deltatype = 'prev'
2561
2561
2562 while iterrev != e[3]:
2562 while iterrev != e[3]:
2563 chain.append(iterrev)
2563 chain.append(iterrev)
2564 chainsize += e[1]
2564 chainsize += e[1]
2565 if generaldelta:
2565 if generaldelta:
2566 iterrev = e[3]
2566 iterrev = e[3]
2567 else:
2567 else:
2568 iterrev -= 1
2568 iterrev -= 1
2569 e = index[iterrev]
2569 e = index[iterrev]
2570 else:
2570 else:
2571 chainsize += e[1]
2571 chainsize += e[1]
2572 chain.append(iterrev)
2572 chain.append(iterrev)
2573
2573
2574 chain.reverse()
2574 chain.reverse()
2575 return compsize, uncompsize, deltatype, chain, chainsize
2575 return compsize, uncompsize, deltatype, chain, chainsize
2576
2576
2577 fm = ui.formatter('debugdeltachain', opts)
2577 fm = ui.formatter('debugdeltachain', opts)
2578
2578
2579 fm.plain(' rev chain# chainlen prev delta '
2579 fm.plain(' rev chain# chainlen prev delta '
2580 'size rawsize chainsize ratio lindist extradist '
2580 'size rawsize chainsize ratio lindist extradist '
2581 'extraratio\n')
2581 'extraratio\n')
2582
2582
2583 chainbases = {}
2583 chainbases = {}
2584 for rev in r:
2584 for rev in r:
2585 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
2585 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
2586 chainbase = chain[0]
2586 chainbase = chain[0]
2587 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
2587 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
2588 basestart = r.start(chainbase)
2588 basestart = r.start(chainbase)
2589 revstart = r.start(rev)
2589 revstart = r.start(rev)
2590 lineardist = revstart + comp - basestart
2590 lineardist = revstart + comp - basestart
2591 extradist = lineardist - chainsize
2591 extradist = lineardist - chainsize
2592 try:
2592 try:
2593 prevrev = chain[-2]
2593 prevrev = chain[-2]
2594 except IndexError:
2594 except IndexError:
2595 prevrev = -1
2595 prevrev = -1
2596
2596
2597 chainratio = float(chainsize) / float(uncomp)
2597 chainratio = float(chainsize) / float(uncomp)
2598 extraratio = float(extradist) / float(chainsize)
2598 extraratio = float(extradist) / float(chainsize)
2599
2599
2600 fm.startitem()
2600 fm.startitem()
2601 fm.write('rev chainid chainlen prevrev deltatype compsize '
2601 fm.write('rev chainid chainlen prevrev deltatype compsize '
2602 'uncompsize chainsize chainratio lindist extradist '
2602 'uncompsize chainsize chainratio lindist extradist '
2603 'extraratio',
2603 'extraratio',
2604 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f\n',
2604 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f\n',
2605 rev, chainid, len(chain), prevrev, deltatype, comp,
2605 rev, chainid, len(chain), prevrev, deltatype, comp,
2606 uncomp, chainsize, chainratio, lineardist, extradist,
2606 uncomp, chainsize, chainratio, lineardist, extradist,
2607 extraratio,
2607 extraratio,
2608 rev=rev, chainid=chainid, chainlen=len(chain),
2608 rev=rev, chainid=chainid, chainlen=len(chain),
2609 prevrev=prevrev, deltatype=deltatype, compsize=comp,
2609 prevrev=prevrev, deltatype=deltatype, compsize=comp,
2610 uncompsize=uncomp, chainsize=chainsize,
2610 uncompsize=uncomp, chainsize=chainsize,
2611 chainratio=chainratio, lindist=lineardist,
2611 chainratio=chainratio, lindist=lineardist,
2612 extradist=extradist, extraratio=extraratio)
2612 extradist=extradist, extraratio=extraratio)
2613
2613
2614 fm.end()
2614 fm.end()
2615
2615
2616 @command('debuginstall', [], '', norepo=True)
2616 @command('debuginstall', [], '', norepo=True)
2617 def debuginstall(ui):
2617 def debuginstall(ui):
2618 '''test Mercurial installation
2618 '''test Mercurial installation
2619
2619
2620 Returns 0 on success.
2620 Returns 0 on success.
2621 '''
2621 '''
2622
2622
2623 def writetemp(contents):
2623 def writetemp(contents):
2624 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2624 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2625 f = os.fdopen(fd, "wb")
2625 f = os.fdopen(fd, "wb")
2626 f.write(contents)
2626 f.write(contents)
2627 f.close()
2627 f.close()
2628 return name
2628 return name
2629
2629
2630 problems = 0
2630 problems = 0
2631
2631
2632 # encoding
2632 # encoding
2633 ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
2633 ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
2634 try:
2634 try:
2635 encoding.fromlocal("test")
2635 encoding.fromlocal("test")
2636 except error.Abort as inst:
2636 except error.Abort as inst:
2637 ui.write(" %s\n" % inst)
2637 ui.write(" %s\n" % inst)
2638 ui.write(_(" (check that your locale is properly set)\n"))
2638 ui.write(_(" (check that your locale is properly set)\n"))
2639 problems += 1
2639 problems += 1
2640
2640
2641 # Python
2641 # Python
2642 ui.status(_("checking Python executable (%s)\n") % sys.executable)
2642 ui.status(_("checking Python executable (%s)\n") % sys.executable)
2643 ui.status(_("checking Python version (%s)\n")
2643 ui.status(_("checking Python version (%s)\n")
2644 % ("%s.%s.%s" % sys.version_info[:3]))
2644 % ("%s.%s.%s" % sys.version_info[:3]))
2645 ui.status(_("checking Python lib (%s)...\n")
2645 ui.status(_("checking Python lib (%s)...\n")
2646 % os.path.dirname(os.__file__))
2646 % os.path.dirname(os.__file__))
2647
2647
2648 # compiled modules
2648 # compiled modules
2649 ui.status(_("checking installed modules (%s)...\n")
2649 ui.status(_("checking installed modules (%s)...\n")
2650 % os.path.dirname(__file__))
2650 % os.path.dirname(__file__))
2651 try:
2651 try:
2652 import bdiff, mpatch, base85, osutil
2652 import bdiff, mpatch, base85, osutil
2653 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2653 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2654 except Exception as inst:
2654 except Exception as inst:
2655 ui.write(" %s\n" % inst)
2655 ui.write(" %s\n" % inst)
2656 ui.write(_(" One or more extensions could not be found"))
2656 ui.write(_(" One or more extensions could not be found"))
2657 ui.write(_(" (check that you compiled the extensions)\n"))
2657 ui.write(_(" (check that you compiled the extensions)\n"))
2658 problems += 1
2658 problems += 1
2659
2659
2660 # templates
2660 # templates
2661 import templater
2661 import templater
2662 p = templater.templatepaths()
2662 p = templater.templatepaths()
2663 ui.status(_("checking templates (%s)...\n") % ' '.join(p))
2663 ui.status(_("checking templates (%s)...\n") % ' '.join(p))
2664 if p:
2664 if p:
2665 m = templater.templatepath("map-cmdline.default")
2665 m = templater.templatepath("map-cmdline.default")
2666 if m:
2666 if m:
2667 # template found, check if it is working
2667 # template found, check if it is working
2668 try:
2668 try:
2669 templater.templater(m)
2669 templater.templater(m)
2670 except Exception as inst:
2670 except Exception as inst:
2671 ui.write(" %s\n" % inst)
2671 ui.write(" %s\n" % inst)
2672 p = None
2672 p = None
2673 else:
2673 else:
2674 ui.write(_(" template 'default' not found\n"))
2674 ui.write(_(" template 'default' not found\n"))
2675 p = None
2675 p = None
2676 else:
2676 else:
2677 ui.write(_(" no template directories found\n"))
2677 ui.write(_(" no template directories found\n"))
2678 if not p:
2678 if not p:
2679 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
2679 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
2680 problems += 1
2680 problems += 1
2681
2681
2682 # editor
2682 # editor
2683 ui.status(_("checking commit editor...\n"))
2683 ui.status(_("checking commit editor...\n"))
2684 editor = ui.geteditor()
2684 editor = ui.geteditor()
2685 editor = util.expandpath(editor)
2685 editor = util.expandpath(editor)
2686 cmdpath = util.findexe(shlex.split(editor)[0])
2686 cmdpath = util.findexe(shlex.split(editor)[0])
2687 if not cmdpath:
2687 if not cmdpath:
2688 if editor == 'vi':
2688 if editor == 'vi':
2689 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2689 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2690 ui.write(_(" (specify a commit editor in your configuration"
2690 ui.write(_(" (specify a commit editor in your configuration"
2691 " file)\n"))
2691 " file)\n"))
2692 else:
2692 else:
2693 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2693 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2694 ui.write(_(" (specify a commit editor in your configuration"
2694 ui.write(_(" (specify a commit editor in your configuration"
2695 " file)\n"))
2695 " file)\n"))
2696 problems += 1
2696 problems += 1
2697
2697
2698 # check username
2698 # check username
2699 ui.status(_("checking username...\n"))
2699 ui.status(_("checking username...\n"))
2700 try:
2700 try:
2701 ui.username()
2701 ui.username()
2702 except error.Abort as e:
2702 except error.Abort as e:
2703 ui.write(" %s\n" % e)
2703 ui.write(" %s\n" % e)
2704 ui.write(_(" (specify a username in your configuration file)\n"))
2704 ui.write(_(" (specify a username in your configuration file)\n"))
2705 problems += 1
2705 problems += 1
2706
2706
2707 if not problems:
2707 if not problems:
2708 ui.status(_("no problems detected\n"))
2708 ui.status(_("no problems detected\n"))
2709 else:
2709 else:
2710 ui.write(_("%s problems detected,"
2710 ui.write(_("%s problems detected,"
2711 " please check your install!\n") % problems)
2711 " please check your install!\n") % problems)
2712
2712
2713 return problems
2713 return problems
2714
2714
2715 @command('debugknown', [], _('REPO ID...'), norepo=True)
2715 @command('debugknown', [], _('REPO ID...'), norepo=True)
2716 def debugknown(ui, repopath, *ids, **opts):
2716 def debugknown(ui, repopath, *ids, **opts):
2717 """test whether node ids are known to a repo
2717 """test whether node ids are known to a repo
2718
2718
2719 Every ID must be a full-length hex node id string. Returns a list of 0s
2719 Every ID must be a full-length hex node id string. Returns a list of 0s
2720 and 1s indicating unknown/known.
2720 and 1s indicating unknown/known.
2721 """
2721 """
2722 repo = hg.peer(ui, opts, repopath)
2722 repo = hg.peer(ui, opts, repopath)
2723 if not repo.capable('known'):
2723 if not repo.capable('known'):
2724 raise error.Abort("known() not supported by target repository")
2724 raise error.Abort("known() not supported by target repository")
2725 flags = repo.known([bin(s) for s in ids])
2725 flags = repo.known([bin(s) for s in ids])
2726 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2726 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2727
2727
2728 @command('debuglabelcomplete', [], _('LABEL...'))
2728 @command('debuglabelcomplete', [], _('LABEL...'))
2729 def debuglabelcomplete(ui, repo, *args):
2729 def debuglabelcomplete(ui, repo, *args):
2730 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2730 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2731 debugnamecomplete(ui, repo, *args)
2731 debugnamecomplete(ui, repo, *args)
2732
2732
2733 @command('debugmergestate', [], '')
2733 @command('debugmergestate', [], '')
2734 def debugmergestate(ui, repo, *args):
2734 def debugmergestate(ui, repo, *args):
2735 """print merge state
2735 """print merge state
2736
2736
2737 Use --verbose to print out information about whether v1 or v2 merge state
2737 Use --verbose to print out information about whether v1 or v2 merge state
2738 was chosen."""
2738 was chosen."""
2739 def _hashornull(h):
2739 def _hashornull(h):
2740 if h == nullhex:
2740 if h == nullhex:
2741 return 'null'
2741 return 'null'
2742 else:
2742 else:
2743 return h
2743 return h
2744
2744
2745 def printrecords(version):
2745 def printrecords(version):
2746 ui.write(('* version %s records\n') % version)
2746 ui.write(('* version %s records\n') % version)
2747 if version == 1:
2747 if version == 1:
2748 records = v1records
2748 records = v1records
2749 else:
2749 else:
2750 records = v2records
2750 records = v2records
2751
2751
2752 for rtype, record in records:
2752 for rtype, record in records:
2753 # pretty print some record types
2753 # pretty print some record types
2754 if rtype == 'L':
2754 if rtype == 'L':
2755 ui.write(('local: %s\n') % record)
2755 ui.write(('local: %s\n') % record)
2756 elif rtype == 'O':
2756 elif rtype == 'O':
2757 ui.write(('other: %s\n') % record)
2757 ui.write(('other: %s\n') % record)
2758 elif rtype == 'm':
2758 elif rtype == 'm':
2759 driver, mdstate = record.split('\0', 1)
2759 driver, mdstate = record.split('\0', 1)
2760 ui.write(('merge driver: %s (state "%s")\n')
2760 ui.write(('merge driver: %s (state "%s")\n')
2761 % (driver, mdstate))
2761 % (driver, mdstate))
2762 elif rtype in 'FDC':
2762 elif rtype in 'FDC':
2763 r = record.split('\0')
2763 r = record.split('\0')
2764 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2764 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2765 if version == 1:
2765 if version == 1:
2766 onode = 'not stored in v1 format'
2766 onode = 'not stored in v1 format'
2767 flags = r[7]
2767 flags = r[7]
2768 else:
2768 else:
2769 onode, flags = r[7:9]
2769 onode, flags = r[7:9]
2770 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2770 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2771 % (f, rtype, state, _hashornull(hash)))
2771 % (f, rtype, state, _hashornull(hash)))
2772 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2772 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2773 ui.write((' ancestor path: %s (node %s)\n')
2773 ui.write((' ancestor path: %s (node %s)\n')
2774 % (afile, _hashornull(anode)))
2774 % (afile, _hashornull(anode)))
2775 ui.write((' other path: %s (node %s)\n')
2775 ui.write((' other path: %s (node %s)\n')
2776 % (ofile, _hashornull(onode)))
2776 % (ofile, _hashornull(onode)))
2777 else:
2777 else:
2778 ui.write(('unrecognized entry: %s\t%s\n')
2778 ui.write(('unrecognized entry: %s\t%s\n')
2779 % (rtype, record.replace('\0', '\t')))
2779 % (rtype, record.replace('\0', '\t')))
2780
2780
2781 # Avoid mergestate.read() since it may raise an exception for unsupported
2781 # Avoid mergestate.read() since it may raise an exception for unsupported
2782 # merge state records. We shouldn't be doing this, but this is OK since this
2782 # merge state records. We shouldn't be doing this, but this is OK since this
2783 # command is pretty low-level.
2783 # command is pretty low-level.
2784 ms = mergemod.mergestate(repo)
2784 ms = mergemod.mergestate(repo)
2785
2785
2786 # sort so that reasonable information is on top
2786 # sort so that reasonable information is on top
2787 v1records = ms._readrecordsv1()
2787 v1records = ms._readrecordsv1()
2788 v2records = ms._readrecordsv2()
2788 v2records = ms._readrecordsv2()
2789 order = 'LOm'
2789 order = 'LOm'
2790 def key(r):
2790 def key(r):
2791 idx = order.find(r[0])
2791 idx = order.find(r[0])
2792 if idx == -1:
2792 if idx == -1:
2793 return (1, r[1])
2793 return (1, r[1])
2794 else:
2794 else:
2795 return (0, idx)
2795 return (0, idx)
2796 v1records.sort(key=key)
2796 v1records.sort(key=key)
2797 v2records.sort(key=key)
2797 v2records.sort(key=key)
2798
2798
2799 if not v1records and not v2records:
2799 if not v1records and not v2records:
2800 ui.write(('no merge state found\n'))
2800 ui.write(('no merge state found\n'))
2801 elif not v2records:
2801 elif not v2records:
2802 ui.note(('no version 2 merge state\n'))
2802 ui.note(('no version 2 merge state\n'))
2803 printrecords(1)
2803 printrecords(1)
2804 elif ms._v1v2match(v1records, v2records):
2804 elif ms._v1v2match(v1records, v2records):
2805 ui.note(('v1 and v2 states match: using v2\n'))
2805 ui.note(('v1 and v2 states match: using v2\n'))
2806 printrecords(2)
2806 printrecords(2)
2807 else:
2807 else:
2808 ui.note(('v1 and v2 states mismatch: using v1\n'))
2808 ui.note(('v1 and v2 states mismatch: using v1\n'))
2809 printrecords(1)
2809 printrecords(1)
2810 if ui.verbose:
2810 if ui.verbose:
2811 printrecords(2)
2811 printrecords(2)
2812
2812
2813 @command('debugnamecomplete', [], _('NAME...'))
2813 @command('debugnamecomplete', [], _('NAME...'))
2814 def debugnamecomplete(ui, repo, *args):
2814 def debugnamecomplete(ui, repo, *args):
2815 '''complete "names" - tags, open branch names, bookmark names'''
2815 '''complete "names" - tags, open branch names, bookmark names'''
2816
2816
2817 names = set()
2817 names = set()
2818 # since we previously only listed open branches, we will handle that
2818 # since we previously only listed open branches, we will handle that
2819 # specially (after this for loop)
2819 # specially (after this for loop)
2820 for name, ns in repo.names.iteritems():
2820 for name, ns in repo.names.iteritems():
2821 if name != 'branches':
2821 if name != 'branches':
2822 names.update(ns.listnames(repo))
2822 names.update(ns.listnames(repo))
2823 names.update(tag for (tag, heads, tip, closed)
2823 names.update(tag for (tag, heads, tip, closed)
2824 in repo.branchmap().iterbranches() if not closed)
2824 in repo.branchmap().iterbranches() if not closed)
2825 completions = set()
2825 completions = set()
2826 if not args:
2826 if not args:
2827 args = ['']
2827 args = ['']
2828 for a in args:
2828 for a in args:
2829 completions.update(n for n in names if n.startswith(a))
2829 completions.update(n for n in names if n.startswith(a))
2830 ui.write('\n'.join(sorted(completions)))
2830 ui.write('\n'.join(sorted(completions)))
2831 ui.write('\n')
2831 ui.write('\n')
2832
2832
2833 @command('debuglocks',
2833 @command('debuglocks',
2834 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2834 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2835 ('W', 'force-wlock', None,
2835 ('W', 'force-wlock', None,
2836 _('free the working state lock (DANGEROUS)'))],
2836 _('free the working state lock (DANGEROUS)'))],
2837 _('[OPTION]...'))
2837 _('[OPTION]...'))
2838 def debuglocks(ui, repo, **opts):
2838 def debuglocks(ui, repo, **opts):
2839 """show or modify state of locks
2839 """show or modify state of locks
2840
2840
2841 By default, this command will show which locks are held. This
2841 By default, this command will show which locks are held. This
2842 includes the user and process holding the lock, the amount of time
2842 includes the user and process holding the lock, the amount of time
2843 the lock has been held, and the machine name where the process is
2843 the lock has been held, and the machine name where the process is
2844 running if it's not local.
2844 running if it's not local.
2845
2845
2846 Locks protect the integrity of Mercurial's data, so should be
2846 Locks protect the integrity of Mercurial's data, so should be
2847 treated with care. System crashes or other interruptions may cause
2847 treated with care. System crashes or other interruptions may cause
2848 locks to not be properly released, though Mercurial will usually
2848 locks to not be properly released, though Mercurial will usually
2849 detect and remove such stale locks automatically.
2849 detect and remove such stale locks automatically.
2850
2850
2851 However, detecting stale locks may not always be possible (for
2851 However, detecting stale locks may not always be possible (for
2852 instance, on a shared filesystem). Removing locks may also be
2852 instance, on a shared filesystem). Removing locks may also be
2853 blocked by filesystem permissions.
2853 blocked by filesystem permissions.
2854
2854
2855 Returns 0 if no locks are held.
2855 Returns 0 if no locks are held.
2856
2856
2857 """
2857 """
2858
2858
2859 if opts.get('force_lock'):
2859 if opts.get('force_lock'):
2860 repo.svfs.unlink('lock')
2860 repo.svfs.unlink('lock')
2861 if opts.get('force_wlock'):
2861 if opts.get('force_wlock'):
2862 repo.vfs.unlink('wlock')
2862 repo.vfs.unlink('wlock')
2863 if opts.get('force_lock') or opts.get('force_lock'):
2863 if opts.get('force_lock') or opts.get('force_lock'):
2864 return 0
2864 return 0
2865
2865
2866 now = time.time()
2866 now = time.time()
2867 held = 0
2867 held = 0
2868
2868
2869 def report(vfs, name, method):
2869 def report(vfs, name, method):
2870 # this causes stale locks to get reaped for more accurate reporting
2870 # this causes stale locks to get reaped for more accurate reporting
2871 try:
2871 try:
2872 l = method(False)
2872 l = method(False)
2873 except error.LockHeld:
2873 except error.LockHeld:
2874 l = None
2874 l = None
2875
2875
2876 if l:
2876 if l:
2877 l.release()
2877 l.release()
2878 else:
2878 else:
2879 try:
2879 try:
2880 stat = vfs.lstat(name)
2880 stat = vfs.lstat(name)
2881 age = now - stat.st_mtime
2881 age = now - stat.st_mtime
2882 user = util.username(stat.st_uid)
2882 user = util.username(stat.st_uid)
2883 locker = vfs.readlock(name)
2883 locker = vfs.readlock(name)
2884 if ":" in locker:
2884 if ":" in locker:
2885 host, pid = locker.split(':')
2885 host, pid = locker.split(':')
2886 if host == socket.gethostname():
2886 if host == socket.gethostname():
2887 locker = 'user %s, process %s' % (user, pid)
2887 locker = 'user %s, process %s' % (user, pid)
2888 else:
2888 else:
2889 locker = 'user %s, process %s, host %s' \
2889 locker = 'user %s, process %s, host %s' \
2890 % (user, pid, host)
2890 % (user, pid, host)
2891 ui.write("%-6s %s (%ds)\n" % (name + ":", locker, age))
2891 ui.write("%-6s %s (%ds)\n" % (name + ":", locker, age))
2892 return 1
2892 return 1
2893 except OSError as e:
2893 except OSError as e:
2894 if e.errno != errno.ENOENT:
2894 if e.errno != errno.ENOENT:
2895 raise
2895 raise
2896
2896
2897 ui.write("%-6s free\n" % (name + ":"))
2897 ui.write("%-6s free\n" % (name + ":"))
2898 return 0
2898 return 0
2899
2899
2900 held += report(repo.svfs, "lock", repo.lock)
2900 held += report(repo.svfs, "lock", repo.lock)
2901 held += report(repo.vfs, "wlock", repo.wlock)
2901 held += report(repo.vfs, "wlock", repo.wlock)
2902
2902
2903 return held
2903 return held
2904
2904
2905 @command('debugobsolete',
2905 @command('debugobsolete',
2906 [('', 'flags', 0, _('markers flag')),
2906 [('', 'flags', 0, _('markers flag')),
2907 ('', 'record-parents', False,
2907 ('', 'record-parents', False,
2908 _('record parent information for the precursor')),
2908 _('record parent information for the precursor')),
2909 ('r', 'rev', [], _('display markers relevant to REV')),
2909 ('r', 'rev', [], _('display markers relevant to REV')),
2910 ] + commitopts2,
2910 ] + commitopts2,
2911 _('[OBSOLETED [REPLACEMENT ...]]'))
2911 _('[OBSOLETED [REPLACEMENT ...]]'))
2912 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2912 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2913 """create arbitrary obsolete marker
2913 """create arbitrary obsolete marker
2914
2914
2915 With no arguments, displays the list of obsolescence markers."""
2915 With no arguments, displays the list of obsolescence markers."""
2916
2916
2917 def parsenodeid(s):
2917 def parsenodeid(s):
2918 try:
2918 try:
2919 # We do not use revsingle/revrange functions here to accept
2919 # We do not use revsingle/revrange functions here to accept
2920 # arbitrary node identifiers, possibly not present in the
2920 # arbitrary node identifiers, possibly not present in the
2921 # local repository.
2921 # local repository.
2922 n = bin(s)
2922 n = bin(s)
2923 if len(n) != len(nullid):
2923 if len(n) != len(nullid):
2924 raise TypeError()
2924 raise TypeError()
2925 return n
2925 return n
2926 except TypeError:
2926 except TypeError:
2927 raise error.Abort('changeset references must be full hexadecimal '
2927 raise error.Abort('changeset references must be full hexadecimal '
2928 'node identifiers')
2928 'node identifiers')
2929
2929
2930 if precursor is not None:
2930 if precursor is not None:
2931 if opts['rev']:
2931 if opts['rev']:
2932 raise error.Abort('cannot select revision when creating marker')
2932 raise error.Abort('cannot select revision when creating marker')
2933 metadata = {}
2933 metadata = {}
2934 metadata['user'] = opts['user'] or ui.username()
2934 metadata['user'] = opts['user'] or ui.username()
2935 succs = tuple(parsenodeid(succ) for succ in successors)
2935 succs = tuple(parsenodeid(succ) for succ in successors)
2936 l = repo.lock()
2936 l = repo.lock()
2937 try:
2937 try:
2938 tr = repo.transaction('debugobsolete')
2938 tr = repo.transaction('debugobsolete')
2939 try:
2939 try:
2940 date = opts.get('date')
2940 date = opts.get('date')
2941 if date:
2941 if date:
2942 date = util.parsedate(date)
2942 date = util.parsedate(date)
2943 else:
2943 else:
2944 date = None
2944 date = None
2945 prec = parsenodeid(precursor)
2945 prec = parsenodeid(precursor)
2946 parents = None
2946 parents = None
2947 if opts['record_parents']:
2947 if opts['record_parents']:
2948 if prec not in repo.unfiltered():
2948 if prec not in repo.unfiltered():
2949 raise error.Abort('cannot used --record-parents on '
2949 raise error.Abort('cannot used --record-parents on '
2950 'unknown changesets')
2950 'unknown changesets')
2951 parents = repo.unfiltered()[prec].parents()
2951 parents = repo.unfiltered()[prec].parents()
2952 parents = tuple(p.node() for p in parents)
2952 parents = tuple(p.node() for p in parents)
2953 repo.obsstore.create(tr, prec, succs, opts['flags'],
2953 repo.obsstore.create(tr, prec, succs, opts['flags'],
2954 parents=parents, date=date,
2954 parents=parents, date=date,
2955 metadata=metadata)
2955 metadata=metadata)
2956 tr.close()
2956 tr.close()
2957 except ValueError as exc:
2957 except ValueError as exc:
2958 raise error.Abort(_('bad obsmarker input: %s') % exc)
2958 raise error.Abort(_('bad obsmarker input: %s') % exc)
2959 finally:
2959 finally:
2960 tr.release()
2960 tr.release()
2961 finally:
2961 finally:
2962 l.release()
2962 l.release()
2963 else:
2963 else:
2964 if opts['rev']:
2964 if opts['rev']:
2965 revs = scmutil.revrange(repo, opts['rev'])
2965 revs = scmutil.revrange(repo, opts['rev'])
2966 nodes = [repo[r].node() for r in revs]
2966 nodes = [repo[r].node() for r in revs]
2967 markers = list(obsolete.getmarkers(repo, nodes=nodes))
2967 markers = list(obsolete.getmarkers(repo, nodes=nodes))
2968 markers.sort(key=lambda x: x._data)
2968 markers.sort(key=lambda x: x._data)
2969 else:
2969 else:
2970 markers = obsolete.getmarkers(repo)
2970 markers = obsolete.getmarkers(repo)
2971
2971
2972 for m in markers:
2972 for m in markers:
2973 cmdutil.showmarker(ui, m)
2973 cmdutil.showmarker(ui, m)
2974
2974
2975 @command('debugpathcomplete',
2975 @command('debugpathcomplete',
2976 [('f', 'full', None, _('complete an entire path')),
2976 [('f', 'full', None, _('complete an entire path')),
2977 ('n', 'normal', None, _('show only normal files')),
2977 ('n', 'normal', None, _('show only normal files')),
2978 ('a', 'added', None, _('show only added files')),
2978 ('a', 'added', None, _('show only added files')),
2979 ('r', 'removed', None, _('show only removed files'))],
2979 ('r', 'removed', None, _('show only removed files'))],
2980 _('FILESPEC...'))
2980 _('FILESPEC...'))
2981 def debugpathcomplete(ui, repo, *specs, **opts):
2981 def debugpathcomplete(ui, repo, *specs, **opts):
2982 '''complete part or all of a tracked path
2982 '''complete part or all of a tracked path
2983
2983
2984 This command supports shells that offer path name completion. It
2984 This command supports shells that offer path name completion. It
2985 currently completes only files already known to the dirstate.
2985 currently completes only files already known to the dirstate.
2986
2986
2987 Completion extends only to the next path segment unless
2987 Completion extends only to the next path segment unless
2988 --full is specified, in which case entire paths are used.'''
2988 --full is specified, in which case entire paths are used.'''
2989
2989
2990 def complete(path, acceptable):
2990 def complete(path, acceptable):
2991 dirstate = repo.dirstate
2991 dirstate = repo.dirstate
2992 spec = os.path.normpath(os.path.join(os.getcwd(), path))
2992 spec = os.path.normpath(os.path.join(os.getcwd(), path))
2993 rootdir = repo.root + os.sep
2993 rootdir = repo.root + os.sep
2994 if spec != repo.root and not spec.startswith(rootdir):
2994 if spec != repo.root and not spec.startswith(rootdir):
2995 return [], []
2995 return [], []
2996 if os.path.isdir(spec):
2996 if os.path.isdir(spec):
2997 spec += '/'
2997 spec += '/'
2998 spec = spec[len(rootdir):]
2998 spec = spec[len(rootdir):]
2999 fixpaths = os.sep != '/'
2999 fixpaths = os.sep != '/'
3000 if fixpaths:
3000 if fixpaths:
3001 spec = spec.replace(os.sep, '/')
3001 spec = spec.replace(os.sep, '/')
3002 speclen = len(spec)
3002 speclen = len(spec)
3003 fullpaths = opts['full']
3003 fullpaths = opts['full']
3004 files, dirs = set(), set()
3004 files, dirs = set(), set()
3005 adddir, addfile = dirs.add, files.add
3005 adddir, addfile = dirs.add, files.add
3006 for f, st in dirstate.iteritems():
3006 for f, st in dirstate.iteritems():
3007 if f.startswith(spec) and st[0] in acceptable:
3007 if f.startswith(spec) and st[0] in acceptable:
3008 if fixpaths:
3008 if fixpaths:
3009 f = f.replace('/', os.sep)
3009 f = f.replace('/', os.sep)
3010 if fullpaths:
3010 if fullpaths:
3011 addfile(f)
3011 addfile(f)
3012 continue
3012 continue
3013 s = f.find(os.sep, speclen)
3013 s = f.find(os.sep, speclen)
3014 if s >= 0:
3014 if s >= 0:
3015 adddir(f[:s])
3015 adddir(f[:s])
3016 else:
3016 else:
3017 addfile(f)
3017 addfile(f)
3018 return files, dirs
3018 return files, dirs
3019
3019
3020 acceptable = ''
3020 acceptable = ''
3021 if opts['normal']:
3021 if opts['normal']:
3022 acceptable += 'nm'
3022 acceptable += 'nm'
3023 if opts['added']:
3023 if opts['added']:
3024 acceptable += 'a'
3024 acceptable += 'a'
3025 if opts['removed']:
3025 if opts['removed']:
3026 acceptable += 'r'
3026 acceptable += 'r'
3027 cwd = repo.getcwd()
3027 cwd = repo.getcwd()
3028 if not specs:
3028 if not specs:
3029 specs = ['.']
3029 specs = ['.']
3030
3030
3031 files, dirs = set(), set()
3031 files, dirs = set(), set()
3032 for spec in specs:
3032 for spec in specs:
3033 f, d = complete(spec, acceptable or 'nmar')
3033 f, d = complete(spec, acceptable or 'nmar')
3034 files.update(f)
3034 files.update(f)
3035 dirs.update(d)
3035 dirs.update(d)
3036 files.update(dirs)
3036 files.update(dirs)
3037 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3037 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3038 ui.write('\n')
3038 ui.write('\n')
3039
3039
3040 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3040 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3041 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3041 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3042 '''access the pushkey key/value protocol
3042 '''access the pushkey key/value protocol
3043
3043
3044 With two args, list the keys in the given namespace.
3044 With two args, list the keys in the given namespace.
3045
3045
3046 With five args, set a key to new if it currently is set to old.
3046 With five args, set a key to new if it currently is set to old.
3047 Reports success or failure.
3047 Reports success or failure.
3048 '''
3048 '''
3049
3049
3050 target = hg.peer(ui, {}, repopath)
3050 target = hg.peer(ui, {}, repopath)
3051 if keyinfo:
3051 if keyinfo:
3052 key, old, new = keyinfo
3052 key, old, new = keyinfo
3053 r = target.pushkey(namespace, key, old, new)
3053 r = target.pushkey(namespace, key, old, new)
3054 ui.status(str(r) + '\n')
3054 ui.status(str(r) + '\n')
3055 return not r
3055 return not r
3056 else:
3056 else:
3057 for k, v in sorted(target.listkeys(namespace).iteritems()):
3057 for k, v in sorted(target.listkeys(namespace).iteritems()):
3058 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3058 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3059 v.encode('string-escape')))
3059 v.encode('string-escape')))
3060
3060
3061 @command('debugpvec', [], _('A B'))
3061 @command('debugpvec', [], _('A B'))
3062 def debugpvec(ui, repo, a, b=None):
3062 def debugpvec(ui, repo, a, b=None):
3063 ca = scmutil.revsingle(repo, a)
3063 ca = scmutil.revsingle(repo, a)
3064 cb = scmutil.revsingle(repo, b)
3064 cb = scmutil.revsingle(repo, b)
3065 pa = pvec.ctxpvec(ca)
3065 pa = pvec.ctxpvec(ca)
3066 pb = pvec.ctxpvec(cb)
3066 pb = pvec.ctxpvec(cb)
3067 if pa == pb:
3067 if pa == pb:
3068 rel = "="
3068 rel = "="
3069 elif pa > pb:
3069 elif pa > pb:
3070 rel = ">"
3070 rel = ">"
3071 elif pa < pb:
3071 elif pa < pb:
3072 rel = "<"
3072 rel = "<"
3073 elif pa | pb:
3073 elif pa | pb:
3074 rel = "|"
3074 rel = "|"
3075 ui.write(_("a: %s\n") % pa)
3075 ui.write(_("a: %s\n") % pa)
3076 ui.write(_("b: %s\n") % pb)
3076 ui.write(_("b: %s\n") % pb)
3077 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3077 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3078 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3078 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3079 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3079 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3080 pa.distance(pb), rel))
3080 pa.distance(pb), rel))
3081
3081
3082 @command('debugrebuilddirstate|debugrebuildstate',
3082 @command('debugrebuilddirstate|debugrebuildstate',
3083 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3083 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3084 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3084 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3085 'the working copy parent')),
3085 'the working copy parent')),
3086 ],
3086 ],
3087 _('[-r REV]'))
3087 _('[-r REV]'))
3088 def debugrebuilddirstate(ui, repo, rev, **opts):
3088 def debugrebuilddirstate(ui, repo, rev, **opts):
3089 """rebuild the dirstate as it would look like for the given revision
3089 """rebuild the dirstate as it would look like for the given revision
3090
3090
3091 If no revision is specified the first current parent will be used.
3091 If no revision is specified the first current parent will be used.
3092
3092
3093 The dirstate will be set to the files of the given revision.
3093 The dirstate will be set to the files of the given revision.
3094 The actual working directory content or existing dirstate
3094 The actual working directory content or existing dirstate
3095 information such as adds or removes is not considered.
3095 information such as adds or removes is not considered.
3096
3096
3097 ``minimal`` will only rebuild the dirstate status for files that claim to be
3097 ``minimal`` will only rebuild the dirstate status for files that claim to be
3098 tracked but are not in the parent manifest, or that exist in the parent
3098 tracked but are not in the parent manifest, or that exist in the parent
3099 manifest but are not in the dirstate. It will not change adds, removes, or
3099 manifest but are not in the dirstate. It will not change adds, removes, or
3100 modified files that are in the working copy parent.
3100 modified files that are in the working copy parent.
3101
3101
3102 One use of this command is to make the next :hg:`status` invocation
3102 One use of this command is to make the next :hg:`status` invocation
3103 check the actual file content.
3103 check the actual file content.
3104 """
3104 """
3105 ctx = scmutil.revsingle(repo, rev)
3105 ctx = scmutil.revsingle(repo, rev)
3106 wlock = repo.wlock()
3106 wlock = repo.wlock()
3107 try:
3107 try:
3108 dirstate = repo.dirstate
3108 dirstate = repo.dirstate
3109 changedfiles = None
3109 changedfiles = None
3110 # See command doc for what minimal does.
3110 # See command doc for what minimal does.
3111 if opts.get('minimal'):
3111 if opts.get('minimal'):
3112 manifestfiles = set(ctx.manifest().keys())
3112 manifestfiles = set(ctx.manifest().keys())
3113 dirstatefiles = set(dirstate)
3113 dirstatefiles = set(dirstate)
3114 manifestonly = manifestfiles - dirstatefiles
3114 manifestonly = manifestfiles - dirstatefiles
3115 dsonly = dirstatefiles - manifestfiles
3115 dsonly = dirstatefiles - manifestfiles
3116 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3116 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3117 changedfiles = manifestonly | dsnotadded
3117 changedfiles = manifestonly | dsnotadded
3118
3118
3119 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3119 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3120 finally:
3120 finally:
3121 wlock.release()
3121 wlock.release()
3122
3122
3123 @command('debugrebuildfncache', [], '')
3123 @command('debugrebuildfncache', [], '')
3124 def debugrebuildfncache(ui, repo):
3124 def debugrebuildfncache(ui, repo):
3125 """rebuild the fncache file"""
3125 """rebuild the fncache file"""
3126 repair.rebuildfncache(ui, repo)
3126 repair.rebuildfncache(ui, repo)
3127
3127
3128 @command('debugrename',
3128 @command('debugrename',
3129 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3129 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3130 _('[-r REV] FILE'))
3130 _('[-r REV] FILE'))
3131 def debugrename(ui, repo, file1, *pats, **opts):
3131 def debugrename(ui, repo, file1, *pats, **opts):
3132 """dump rename information"""
3132 """dump rename information"""
3133
3133
3134 ctx = scmutil.revsingle(repo, opts.get('rev'))
3134 ctx = scmutil.revsingle(repo, opts.get('rev'))
3135 m = scmutil.match(ctx, (file1,) + pats, opts)
3135 m = scmutil.match(ctx, (file1,) + pats, opts)
3136 for abs in ctx.walk(m):
3136 for abs in ctx.walk(m):
3137 fctx = ctx[abs]
3137 fctx = ctx[abs]
3138 o = fctx.filelog().renamed(fctx.filenode())
3138 o = fctx.filelog().renamed(fctx.filenode())
3139 rel = m.rel(abs)
3139 rel = m.rel(abs)
3140 if o:
3140 if o:
3141 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3141 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3142 else:
3142 else:
3143 ui.write(_("%s not renamed\n") % rel)
3143 ui.write(_("%s not renamed\n") % rel)
3144
3144
3145 @command('debugrevlog', debugrevlogopts +
3145 @command('debugrevlog', debugrevlogopts +
3146 [('d', 'dump', False, _('dump index data'))],
3146 [('d', 'dump', False, _('dump index data'))],
3147 _('-c|-m|FILE'),
3147 _('-c|-m|FILE'),
3148 optionalrepo=True)
3148 optionalrepo=True)
3149 def debugrevlog(ui, repo, file_=None, **opts):
3149 def debugrevlog(ui, repo, file_=None, **opts):
3150 """show data and statistics about a revlog"""
3150 """show data and statistics about a revlog"""
3151 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3151 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3152
3152
3153 if opts.get("dump"):
3153 if opts.get("dump"):
3154 numrevs = len(r)
3154 numrevs = len(r)
3155 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
3155 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
3156 " rawsize totalsize compression heads chainlen\n")
3156 " rawsize totalsize compression heads chainlen\n")
3157 ts = 0
3157 ts = 0
3158 heads = set()
3158 heads = set()
3159
3159
3160 for rev in xrange(numrevs):
3160 for rev in xrange(numrevs):
3161 dbase = r.deltaparent(rev)
3161 dbase = r.deltaparent(rev)
3162 if dbase == -1:
3162 if dbase == -1:
3163 dbase = rev
3163 dbase = rev
3164 cbase = r.chainbase(rev)
3164 cbase = r.chainbase(rev)
3165 clen = r.chainlen(rev)
3165 clen = r.chainlen(rev)
3166 p1, p2 = r.parentrevs(rev)
3166 p1, p2 = r.parentrevs(rev)
3167 rs = r.rawsize(rev)
3167 rs = r.rawsize(rev)
3168 ts = ts + rs
3168 ts = ts + rs
3169 heads -= set(r.parentrevs(rev))
3169 heads -= set(r.parentrevs(rev))
3170 heads.add(rev)
3170 heads.add(rev)
3171 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3171 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3172 "%11d %5d %8d\n" %
3172 "%11d %5d %8d\n" %
3173 (rev, p1, p2, r.start(rev), r.end(rev),
3173 (rev, p1, p2, r.start(rev), r.end(rev),
3174 r.start(dbase), r.start(cbase),
3174 r.start(dbase), r.start(cbase),
3175 r.start(p1), r.start(p2),
3175 r.start(p1), r.start(p2),
3176 rs, ts, ts / r.end(rev), len(heads), clen))
3176 rs, ts, ts / r.end(rev), len(heads), clen))
3177 return 0
3177 return 0
3178
3178
3179 v = r.version
3179 v = r.version
3180 format = v & 0xFFFF
3180 format = v & 0xFFFF
3181 flags = []
3181 flags = []
3182 gdelta = False
3182 gdelta = False
3183 if v & revlog.REVLOGNGINLINEDATA:
3183 if v & revlog.REVLOGNGINLINEDATA:
3184 flags.append('inline')
3184 flags.append('inline')
3185 if v & revlog.REVLOGGENERALDELTA:
3185 if v & revlog.REVLOGGENERALDELTA:
3186 gdelta = True
3186 gdelta = True
3187 flags.append('generaldelta')
3187 flags.append('generaldelta')
3188 if not flags:
3188 if not flags:
3189 flags = ['(none)']
3189 flags = ['(none)']
3190
3190
3191 nummerges = 0
3191 nummerges = 0
3192 numfull = 0
3192 numfull = 0
3193 numprev = 0
3193 numprev = 0
3194 nump1 = 0
3194 nump1 = 0
3195 nump2 = 0
3195 nump2 = 0
3196 numother = 0
3196 numother = 0
3197 nump1prev = 0
3197 nump1prev = 0
3198 nump2prev = 0
3198 nump2prev = 0
3199 chainlengths = []
3199 chainlengths = []
3200
3200
3201 datasize = [None, 0, 0L]
3201 datasize = [None, 0, 0L]
3202 fullsize = [None, 0, 0L]
3202 fullsize = [None, 0, 0L]
3203 deltasize = [None, 0, 0L]
3203 deltasize = [None, 0, 0L]
3204
3204
3205 def addsize(size, l):
3205 def addsize(size, l):
3206 if l[0] is None or size < l[0]:
3206 if l[0] is None or size < l[0]:
3207 l[0] = size
3207 l[0] = size
3208 if size > l[1]:
3208 if size > l[1]:
3209 l[1] = size
3209 l[1] = size
3210 l[2] += size
3210 l[2] += size
3211
3211
3212 numrevs = len(r)
3212 numrevs = len(r)
3213 for rev in xrange(numrevs):
3213 for rev in xrange(numrevs):
3214 p1, p2 = r.parentrevs(rev)
3214 p1, p2 = r.parentrevs(rev)
3215 delta = r.deltaparent(rev)
3215 delta = r.deltaparent(rev)
3216 if format > 0:
3216 if format > 0:
3217 addsize(r.rawsize(rev), datasize)
3217 addsize(r.rawsize(rev), datasize)
3218 if p2 != nullrev:
3218 if p2 != nullrev:
3219 nummerges += 1
3219 nummerges += 1
3220 size = r.length(rev)
3220 size = r.length(rev)
3221 if delta == nullrev:
3221 if delta == nullrev:
3222 chainlengths.append(0)
3222 chainlengths.append(0)
3223 numfull += 1
3223 numfull += 1
3224 addsize(size, fullsize)
3224 addsize(size, fullsize)
3225 else:
3225 else:
3226 chainlengths.append(chainlengths[delta] + 1)
3226 chainlengths.append(chainlengths[delta] + 1)
3227 addsize(size, deltasize)
3227 addsize(size, deltasize)
3228 if delta == rev - 1:
3228 if delta == rev - 1:
3229 numprev += 1
3229 numprev += 1
3230 if delta == p1:
3230 if delta == p1:
3231 nump1prev += 1
3231 nump1prev += 1
3232 elif delta == p2:
3232 elif delta == p2:
3233 nump2prev += 1
3233 nump2prev += 1
3234 elif delta == p1:
3234 elif delta == p1:
3235 nump1 += 1
3235 nump1 += 1
3236 elif delta == p2:
3236 elif delta == p2:
3237 nump2 += 1
3237 nump2 += 1
3238 elif delta != nullrev:
3238 elif delta != nullrev:
3239 numother += 1
3239 numother += 1
3240
3240
3241 # Adjust size min value for empty cases
3241 # Adjust size min value for empty cases
3242 for size in (datasize, fullsize, deltasize):
3242 for size in (datasize, fullsize, deltasize):
3243 if size[0] is None:
3243 if size[0] is None:
3244 size[0] = 0
3244 size[0] = 0
3245
3245
3246 numdeltas = numrevs - numfull
3246 numdeltas = numrevs - numfull
3247 numoprev = numprev - nump1prev - nump2prev
3247 numoprev = numprev - nump1prev - nump2prev
3248 totalrawsize = datasize[2]
3248 totalrawsize = datasize[2]
3249 datasize[2] /= numrevs
3249 datasize[2] /= numrevs
3250 fulltotal = fullsize[2]
3250 fulltotal = fullsize[2]
3251 fullsize[2] /= numfull
3251 fullsize[2] /= numfull
3252 deltatotal = deltasize[2]
3252 deltatotal = deltasize[2]
3253 if numrevs - numfull > 0:
3253 if numrevs - numfull > 0:
3254 deltasize[2] /= numrevs - numfull
3254 deltasize[2] /= numrevs - numfull
3255 totalsize = fulltotal + deltatotal
3255 totalsize = fulltotal + deltatotal
3256 avgchainlen = sum(chainlengths) / numrevs
3256 avgchainlen = sum(chainlengths) / numrevs
3257 maxchainlen = max(chainlengths)
3257 maxchainlen = max(chainlengths)
3258 compratio = 1
3258 compratio = 1
3259 if totalsize:
3259 if totalsize:
3260 compratio = totalrawsize / totalsize
3260 compratio = totalrawsize / totalsize
3261
3261
3262 basedfmtstr = '%%%dd\n'
3262 basedfmtstr = '%%%dd\n'
3263 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3263 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3264
3264
3265 def dfmtstr(max):
3265 def dfmtstr(max):
3266 return basedfmtstr % len(str(max))
3266 return basedfmtstr % len(str(max))
3267 def pcfmtstr(max, padding=0):
3267 def pcfmtstr(max, padding=0):
3268 return basepcfmtstr % (len(str(max)), ' ' * padding)
3268 return basepcfmtstr % (len(str(max)), ' ' * padding)
3269
3269
3270 def pcfmt(value, total):
3270 def pcfmt(value, total):
3271 if total:
3271 if total:
3272 return (value, 100 * float(value) / total)
3272 return (value, 100 * float(value) / total)
3273 else:
3273 else:
3274 return value, 100.0
3274 return value, 100.0
3275
3275
3276 ui.write(('format : %d\n') % format)
3276 ui.write(('format : %d\n') % format)
3277 ui.write(('flags : %s\n') % ', '.join(flags))
3277 ui.write(('flags : %s\n') % ', '.join(flags))
3278
3278
3279 ui.write('\n')
3279 ui.write('\n')
3280 fmt = pcfmtstr(totalsize)
3280 fmt = pcfmtstr(totalsize)
3281 fmt2 = dfmtstr(totalsize)
3281 fmt2 = dfmtstr(totalsize)
3282 ui.write(('revisions : ') + fmt2 % numrevs)
3282 ui.write(('revisions : ') + fmt2 % numrevs)
3283 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3283 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3284 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3284 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3285 ui.write(('revisions : ') + fmt2 % numrevs)
3285 ui.write(('revisions : ') + fmt2 % numrevs)
3286 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3286 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3287 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3287 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3288 ui.write(('revision size : ') + fmt2 % totalsize)
3288 ui.write(('revision size : ') + fmt2 % totalsize)
3289 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3289 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3290 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3290 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3291
3291
3292 ui.write('\n')
3292 ui.write('\n')
3293 fmt = dfmtstr(max(avgchainlen, compratio))
3293 fmt = dfmtstr(max(avgchainlen, compratio))
3294 ui.write(('avg chain length : ') + fmt % avgchainlen)
3294 ui.write(('avg chain length : ') + fmt % avgchainlen)
3295 ui.write(('max chain length : ') + fmt % maxchainlen)
3295 ui.write(('max chain length : ') + fmt % maxchainlen)
3296 ui.write(('compression ratio : ') + fmt % compratio)
3296 ui.write(('compression ratio : ') + fmt % compratio)
3297
3297
3298 if format > 0:
3298 if format > 0:
3299 ui.write('\n')
3299 ui.write('\n')
3300 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3300 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3301 % tuple(datasize))
3301 % tuple(datasize))
3302 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3302 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3303 % tuple(fullsize))
3303 % tuple(fullsize))
3304 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3304 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3305 % tuple(deltasize))
3305 % tuple(deltasize))
3306
3306
3307 if numdeltas > 0:
3307 if numdeltas > 0:
3308 ui.write('\n')
3308 ui.write('\n')
3309 fmt = pcfmtstr(numdeltas)
3309 fmt = pcfmtstr(numdeltas)
3310 fmt2 = pcfmtstr(numdeltas, 4)
3310 fmt2 = pcfmtstr(numdeltas, 4)
3311 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3311 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3312 if numprev > 0:
3312 if numprev > 0:
3313 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3313 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3314 numprev))
3314 numprev))
3315 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3315 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3316 numprev))
3316 numprev))
3317 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3317 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3318 numprev))
3318 numprev))
3319 if gdelta:
3319 if gdelta:
3320 ui.write(('deltas against p1 : ')
3320 ui.write(('deltas against p1 : ')
3321 + fmt % pcfmt(nump1, numdeltas))
3321 + fmt % pcfmt(nump1, numdeltas))
3322 ui.write(('deltas against p2 : ')
3322 ui.write(('deltas against p2 : ')
3323 + fmt % pcfmt(nump2, numdeltas))
3323 + fmt % pcfmt(nump2, numdeltas))
3324 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3324 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3325 numdeltas))
3325 numdeltas))
3326
3326
3327 @command('debugrevspec',
3327 @command('debugrevspec',
3328 [('', 'optimize', None, _('print parsed tree after optimizing'))],
3328 [('', 'optimize', None, _('print parsed tree after optimizing'))],
3329 ('REVSPEC'))
3329 ('REVSPEC'))
3330 def debugrevspec(ui, repo, expr, **opts):
3330 def debugrevspec(ui, repo, expr, **opts):
3331 """parse and apply a revision specification
3331 """parse and apply a revision specification
3332
3332
3333 Use --verbose to print the parsed tree before and after aliases
3333 Use --verbose to print the parsed tree before and after aliases
3334 expansion.
3334 expansion.
3335 """
3335 """
3336 if ui.verbose:
3336 if ui.verbose:
3337 tree = revset.parse(expr, lookup=repo.__contains__)
3337 tree = revset.parse(expr, lookup=repo.__contains__)
3338 ui.note(revset.prettyformat(tree), "\n")
3338 ui.note(revset.prettyformat(tree), "\n")
3339 newtree = revset.findaliases(ui, tree)
3339 newtree = revset.findaliases(ui, tree)
3340 if newtree != tree:
3340 if newtree != tree:
3341 ui.note(revset.prettyformat(newtree), "\n")
3341 ui.note(revset.prettyformat(newtree), "\n")
3342 tree = newtree
3342 tree = newtree
3343 newtree = revset.foldconcat(tree)
3343 newtree = revset.foldconcat(tree)
3344 if newtree != tree:
3344 if newtree != tree:
3345 ui.note(revset.prettyformat(newtree), "\n")
3345 ui.note(revset.prettyformat(newtree), "\n")
3346 if opts["optimize"]:
3346 if opts["optimize"]:
3347 weight, optimizedtree = revset.optimize(newtree, True)
3347 weight, optimizedtree = revset.optimize(newtree, True)
3348 ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n")
3348 ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n")
3349 func = revset.match(ui, expr, repo)
3349 func = revset.match(ui, expr, repo)
3350 revs = func(repo)
3350 revs = func(repo)
3351 if ui.verbose:
3351 if ui.verbose:
3352 ui.note("* set:\n", revset.prettyformatset(revs), "\n")
3352 ui.note("* set:\n", revset.prettyformatset(revs), "\n")
3353 for c in revs:
3353 for c in revs:
3354 ui.write("%s\n" % c)
3354 ui.write("%s\n" % c)
3355
3355
3356 @command('debugsetparents', [], _('REV1 [REV2]'))
3356 @command('debugsetparents', [], _('REV1 [REV2]'))
3357 def debugsetparents(ui, repo, rev1, rev2=None):
3357 def debugsetparents(ui, repo, rev1, rev2=None):
3358 """manually set the parents of the current working directory
3358 """manually set the parents of the current working directory
3359
3359
3360 This is useful for writing repository conversion tools, but should
3360 This is useful for writing repository conversion tools, but should
3361 be used with care. For example, neither the working directory nor the
3361 be used with care. For example, neither the working directory nor the
3362 dirstate is updated, so file status may be incorrect after running this
3362 dirstate is updated, so file status may be incorrect after running this
3363 command.
3363 command.
3364
3364
3365 Returns 0 on success.
3365 Returns 0 on success.
3366 """
3366 """
3367
3367
3368 r1 = scmutil.revsingle(repo, rev1).node()
3368 r1 = scmutil.revsingle(repo, rev1).node()
3369 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3369 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3370
3370
3371 wlock = repo.wlock()
3371 wlock = repo.wlock()
3372 try:
3372 try:
3373 repo.dirstate.beginparentchange()
3373 repo.dirstate.beginparentchange()
3374 repo.setparents(r1, r2)
3374 repo.setparents(r1, r2)
3375 repo.dirstate.endparentchange()
3375 repo.dirstate.endparentchange()
3376 finally:
3376 finally:
3377 wlock.release()
3377 wlock.release()
3378
3378
3379 @command('debugdirstate|debugstate',
3379 @command('debugdirstate|debugstate',
3380 [('', 'nodates', None, _('do not display the saved mtime')),
3380 [('', 'nodates', None, _('do not display the saved mtime')),
3381 ('', 'datesort', None, _('sort by saved mtime'))],
3381 ('', 'datesort', None, _('sort by saved mtime'))],
3382 _('[OPTION]...'))
3382 _('[OPTION]...'))
3383 def debugstate(ui, repo, **opts):
3383 def debugstate(ui, repo, **opts):
3384 """show the contents of the current dirstate"""
3384 """show the contents of the current dirstate"""
3385
3385
3386 nodates = opts.get('nodates')
3386 nodates = opts.get('nodates')
3387 datesort = opts.get('datesort')
3387 datesort = opts.get('datesort')
3388
3388
3389 timestr = ""
3389 timestr = ""
3390 if datesort:
3390 if datesort:
3391 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3391 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3392 else:
3392 else:
3393 keyfunc = None # sort by filename
3393 keyfunc = None # sort by filename
3394 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3394 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3395 if ent[3] == -1:
3395 if ent[3] == -1:
3396 timestr = 'unset '
3396 timestr = 'unset '
3397 elif nodates:
3397 elif nodates:
3398 timestr = 'set '
3398 timestr = 'set '
3399 else:
3399 else:
3400 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3400 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3401 time.localtime(ent[3]))
3401 time.localtime(ent[3]))
3402 if ent[1] & 0o20000:
3402 if ent[1] & 0o20000:
3403 mode = 'lnk'
3403 mode = 'lnk'
3404 else:
3404 else:
3405 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3405 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3406 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3406 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3407 for f in repo.dirstate.copies():
3407 for f in repo.dirstate.copies():
3408 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3408 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3409
3409
3410 @command('debugsub',
3410 @command('debugsub',
3411 [('r', 'rev', '',
3411 [('r', 'rev', '',
3412 _('revision to check'), _('REV'))],
3412 _('revision to check'), _('REV'))],
3413 _('[-r REV] [REV]'))
3413 _('[-r REV] [REV]'))
3414 def debugsub(ui, repo, rev=None):
3414 def debugsub(ui, repo, rev=None):
3415 ctx = scmutil.revsingle(repo, rev, None)
3415 ctx = scmutil.revsingle(repo, rev, None)
3416 for k, v in sorted(ctx.substate.items()):
3416 for k, v in sorted(ctx.substate.items()):
3417 ui.write(('path %s\n') % k)
3417 ui.write(('path %s\n') % k)
3418 ui.write((' source %s\n') % v[0])
3418 ui.write((' source %s\n') % v[0])
3419 ui.write((' revision %s\n') % v[1])
3419 ui.write((' revision %s\n') % v[1])
3420
3420
3421 @command('debugsuccessorssets',
3421 @command('debugsuccessorssets',
3422 [],
3422 [],
3423 _('[REV]'))
3423 _('[REV]'))
3424 def debugsuccessorssets(ui, repo, *revs):
3424 def debugsuccessorssets(ui, repo, *revs):
3425 """show set of successors for revision
3425 """show set of successors for revision
3426
3426
3427 A successors set of changeset A is a consistent group of revisions that
3427 A successors set of changeset A is a consistent group of revisions that
3428 succeed A. It contains non-obsolete changesets only.
3428 succeed A. It contains non-obsolete changesets only.
3429
3429
3430 In most cases a changeset A has a single successors set containing a single
3430 In most cases a changeset A has a single successors set containing a single
3431 successor (changeset A replaced by A').
3431 successor (changeset A replaced by A').
3432
3432
3433 A changeset that is made obsolete with no successors are called "pruned".
3433 A changeset that is made obsolete with no successors are called "pruned".
3434 Such changesets have no successors sets at all.
3434 Such changesets have no successors sets at all.
3435
3435
3436 A changeset that has been "split" will have a successors set containing
3436 A changeset that has been "split" will have a successors set containing
3437 more than one successor.
3437 more than one successor.
3438
3438
3439 A changeset that has been rewritten in multiple different ways is called
3439 A changeset that has been rewritten in multiple different ways is called
3440 "divergent". Such changesets have multiple successor sets (each of which
3440 "divergent". Such changesets have multiple successor sets (each of which
3441 may also be split, i.e. have multiple successors).
3441 may also be split, i.e. have multiple successors).
3442
3442
3443 Results are displayed as follows::
3443 Results are displayed as follows::
3444
3444
3445 <rev1>
3445 <rev1>
3446 <successors-1A>
3446 <successors-1A>
3447 <rev2>
3447 <rev2>
3448 <successors-2A>
3448 <successors-2A>
3449 <successors-2B1> <successors-2B2> <successors-2B3>
3449 <successors-2B1> <successors-2B2> <successors-2B3>
3450
3450
3451 Here rev2 has two possible (i.e. divergent) successors sets. The first
3451 Here rev2 has two possible (i.e. divergent) successors sets. The first
3452 holds one element, whereas the second holds three (i.e. the changeset has
3452 holds one element, whereas the second holds three (i.e. the changeset has
3453 been split).
3453 been split).
3454 """
3454 """
3455 # passed to successorssets caching computation from one call to another
3455 # passed to successorssets caching computation from one call to another
3456 cache = {}
3456 cache = {}
3457 ctx2str = str
3457 ctx2str = str
3458 node2str = short
3458 node2str = short
3459 if ui.debug():
3459 if ui.debug():
3460 def ctx2str(ctx):
3460 def ctx2str(ctx):
3461 return ctx.hex()
3461 return ctx.hex()
3462 node2str = hex
3462 node2str = hex
3463 for rev in scmutil.revrange(repo, revs):
3463 for rev in scmutil.revrange(repo, revs):
3464 ctx = repo[rev]
3464 ctx = repo[rev]
3465 ui.write('%s\n'% ctx2str(ctx))
3465 ui.write('%s\n'% ctx2str(ctx))
3466 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3466 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3467 if succsset:
3467 if succsset:
3468 ui.write(' ')
3468 ui.write(' ')
3469 ui.write(node2str(succsset[0]))
3469 ui.write(node2str(succsset[0]))
3470 for node in succsset[1:]:
3470 for node in succsset[1:]:
3471 ui.write(' ')
3471 ui.write(' ')
3472 ui.write(node2str(node))
3472 ui.write(node2str(node))
3473 ui.write('\n')
3473 ui.write('\n')
3474
3474
3475 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3475 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3476 def debugwalk(ui, repo, *pats, **opts):
3476 def debugwalk(ui, repo, *pats, **opts):
3477 """show how files match on given patterns"""
3477 """show how files match on given patterns"""
3478 m = scmutil.match(repo[None], pats, opts)
3478 m = scmutil.match(repo[None], pats, opts)
3479 items = list(repo.walk(m))
3479 items = list(repo.walk(m))
3480 if not items:
3480 if not items:
3481 return
3481 return
3482 f = lambda fn: fn
3482 f = lambda fn: fn
3483 if ui.configbool('ui', 'slash') and os.sep != '/':
3483 if ui.configbool('ui', 'slash') and os.sep != '/':
3484 f = lambda fn: util.normpath(fn)
3484 f = lambda fn: util.normpath(fn)
3485 fmt = 'f %%-%ds %%-%ds %%s' % (
3485 fmt = 'f %%-%ds %%-%ds %%s' % (
3486 max([len(abs) for abs in items]),
3486 max([len(abs) for abs in items]),
3487 max([len(m.rel(abs)) for abs in items]))
3487 max([len(m.rel(abs)) for abs in items]))
3488 for abs in items:
3488 for abs in items:
3489 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3489 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3490 ui.write("%s\n" % line.rstrip())
3490 ui.write("%s\n" % line.rstrip())
3491
3491
3492 @command('debugwireargs',
3492 @command('debugwireargs',
3493 [('', 'three', '', 'three'),
3493 [('', 'three', '', 'three'),
3494 ('', 'four', '', 'four'),
3494 ('', 'four', '', 'four'),
3495 ('', 'five', '', 'five'),
3495 ('', 'five', '', 'five'),
3496 ] + remoteopts,
3496 ] + remoteopts,
3497 _('REPO [OPTIONS]... [ONE [TWO]]'),
3497 _('REPO [OPTIONS]... [ONE [TWO]]'),
3498 norepo=True)
3498 norepo=True)
3499 def debugwireargs(ui, repopath, *vals, **opts):
3499 def debugwireargs(ui, repopath, *vals, **opts):
3500 repo = hg.peer(ui, opts, repopath)
3500 repo = hg.peer(ui, opts, repopath)
3501 for opt in remoteopts:
3501 for opt in remoteopts:
3502 del opts[opt[1]]
3502 del opts[opt[1]]
3503 args = {}
3503 args = {}
3504 for k, v in opts.iteritems():
3504 for k, v in opts.iteritems():
3505 if v:
3505 if v:
3506 args[k] = v
3506 args[k] = v
3507 # run twice to check that we don't mess up the stream for the next command
3507 # run twice to check that we don't mess up the stream for the next command
3508 res1 = repo.debugwireargs(*vals, **args)
3508 res1 = repo.debugwireargs(*vals, **args)
3509 res2 = repo.debugwireargs(*vals, **args)
3509 res2 = repo.debugwireargs(*vals, **args)
3510 ui.write("%s\n" % res1)
3510 ui.write("%s\n" % res1)
3511 if res1 != res2:
3511 if res1 != res2:
3512 ui.warn("%s\n" % res2)
3512 ui.warn("%s\n" % res2)
3513
3513
3514 @command('^diff',
3514 @command('^diff',
3515 [('r', 'rev', [], _('revision'), _('REV')),
3515 [('r', 'rev', [], _('revision'), _('REV')),
3516 ('c', 'change', '', _('change made by revision'), _('REV'))
3516 ('c', 'change', '', _('change made by revision'), _('REV'))
3517 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3517 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3518 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3518 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3519 inferrepo=True)
3519 inferrepo=True)
3520 def diff(ui, repo, *pats, **opts):
3520 def diff(ui, repo, *pats, **opts):
3521 """diff repository (or selected files)
3521 """diff repository (or selected files)
3522
3522
3523 Show differences between revisions for the specified files.
3523 Show differences between revisions for the specified files.
3524
3524
3525 Differences between files are shown using the unified diff format.
3525 Differences between files are shown using the unified diff format.
3526
3526
3527 .. note::
3527 .. note::
3528
3528
3529 diff may generate unexpected results for merges, as it will
3529 diff may generate unexpected results for merges, as it will
3530 default to comparing against the working directory's first
3530 default to comparing against the working directory's first
3531 parent changeset if no revisions are specified.
3531 parent changeset if no revisions are specified.
3532
3532
3533 When two revision arguments are given, then changes are shown
3533 When two revision arguments are given, then changes are shown
3534 between those revisions. If only one revision is specified then
3534 between those revisions. If only one revision is specified then
3535 that revision is compared to the working directory, and, when no
3535 that revision is compared to the working directory, and, when no
3536 revisions are specified, the working directory files are compared
3536 revisions are specified, the working directory files are compared
3537 to its parent.
3537 to its parent.
3538
3538
3539 Alternatively you can specify -c/--change with a revision to see
3539 Alternatively you can specify -c/--change with a revision to see
3540 the changes in that changeset relative to its first parent.
3540 the changes in that changeset relative to its first parent.
3541
3541
3542 Without the -a/--text option, diff will avoid generating diffs of
3542 Without the -a/--text option, diff will avoid generating diffs of
3543 files it detects as binary. With -a, diff will generate a diff
3543 files it detects as binary. With -a, diff will generate a diff
3544 anyway, probably with undesirable results.
3544 anyway, probably with undesirable results.
3545
3545
3546 Use the -g/--git option to generate diffs in the git extended diff
3546 Use the -g/--git option to generate diffs in the git extended diff
3547 format. For more information, read :hg:`help diffs`.
3547 format. For more information, read :hg:`help diffs`.
3548
3548
3549 .. container:: verbose
3549 .. container:: verbose
3550
3550
3551 Examples:
3551 Examples:
3552
3552
3553 - compare a file in the current working directory to its parent::
3553 - compare a file in the current working directory to its parent::
3554
3554
3555 hg diff foo.c
3555 hg diff foo.c
3556
3556
3557 - compare two historical versions of a directory, with rename info::
3557 - compare two historical versions of a directory, with rename info::
3558
3558
3559 hg diff --git -r 1.0:1.2 lib/
3559 hg diff --git -r 1.0:1.2 lib/
3560
3560
3561 - get change stats relative to the last change on some date::
3561 - get change stats relative to the last change on some date::
3562
3562
3563 hg diff --stat -r "date('may 2')"
3563 hg diff --stat -r "date('may 2')"
3564
3564
3565 - diff all newly-added files that contain a keyword::
3565 - diff all newly-added files that contain a keyword::
3566
3566
3567 hg diff "set:added() and grep(GNU)"
3567 hg diff "set:added() and grep(GNU)"
3568
3568
3569 - compare a revision and its parents::
3569 - compare a revision and its parents::
3570
3570
3571 hg diff -c 9353 # compare against first parent
3571 hg diff -c 9353 # compare against first parent
3572 hg diff -r 9353^:9353 # same using revset syntax
3572 hg diff -r 9353^:9353 # same using revset syntax
3573 hg diff -r 9353^2:9353 # compare against the second parent
3573 hg diff -r 9353^2:9353 # compare against the second parent
3574
3574
3575 Returns 0 on success.
3575 Returns 0 on success.
3576 """
3576 """
3577
3577
3578 revs = opts.get('rev')
3578 revs = opts.get('rev')
3579 change = opts.get('change')
3579 change = opts.get('change')
3580 stat = opts.get('stat')
3580 stat = opts.get('stat')
3581 reverse = opts.get('reverse')
3581 reverse = opts.get('reverse')
3582
3582
3583 if revs and change:
3583 if revs and change:
3584 msg = _('cannot specify --rev and --change at the same time')
3584 msg = _('cannot specify --rev and --change at the same time')
3585 raise error.Abort(msg)
3585 raise error.Abort(msg)
3586 elif change:
3586 elif change:
3587 node2 = scmutil.revsingle(repo, change, None).node()
3587 node2 = scmutil.revsingle(repo, change, None).node()
3588 node1 = repo[node2].p1().node()
3588 node1 = repo[node2].p1().node()
3589 else:
3589 else:
3590 node1, node2 = scmutil.revpair(repo, revs)
3590 node1, node2 = scmutil.revpair(repo, revs)
3591
3591
3592 if reverse:
3592 if reverse:
3593 node1, node2 = node2, node1
3593 node1, node2 = node2, node1
3594
3594
3595 diffopts = patch.diffallopts(ui, opts)
3595 diffopts = patch.diffallopts(ui, opts)
3596 m = scmutil.match(repo[node2], pats, opts)
3596 m = scmutil.match(repo[node2], pats, opts)
3597 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3597 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3598 listsubrepos=opts.get('subrepos'),
3598 listsubrepos=opts.get('subrepos'),
3599 root=opts.get('root'))
3599 root=opts.get('root'))
3600
3600
3601 @command('^export',
3601 @command('^export',
3602 [('o', 'output', '',
3602 [('o', 'output', '',
3603 _('print output to file with formatted name'), _('FORMAT')),
3603 _('print output to file with formatted name'), _('FORMAT')),
3604 ('', 'switch-parent', None, _('diff against the second parent')),
3604 ('', 'switch-parent', None, _('diff against the second parent')),
3605 ('r', 'rev', [], _('revisions to export'), _('REV')),
3605 ('r', 'rev', [], _('revisions to export'), _('REV')),
3606 ] + diffopts,
3606 ] + diffopts,
3607 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3607 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3608 def export(ui, repo, *changesets, **opts):
3608 def export(ui, repo, *changesets, **opts):
3609 """dump the header and diffs for one or more changesets
3609 """dump the header and diffs for one or more changesets
3610
3610
3611 Print the changeset header and diffs for one or more revisions.
3611 Print the changeset header and diffs for one or more revisions.
3612 If no revision is given, the parent of the working directory is used.
3612 If no revision is given, the parent of the working directory is used.
3613
3613
3614 The information shown in the changeset header is: author, date,
3614 The information shown in the changeset header is: author, date,
3615 branch name (if non-default), changeset hash, parent(s) and commit
3615 branch name (if non-default), changeset hash, parent(s) and commit
3616 comment.
3616 comment.
3617
3617
3618 .. note::
3618 .. note::
3619
3619
3620 export may generate unexpected diff output for merge
3620 export may generate unexpected diff output for merge
3621 changesets, as it will compare the merge changeset against its
3621 changesets, as it will compare the merge changeset against its
3622 first parent only.
3622 first parent only.
3623
3623
3624 Output may be to a file, in which case the name of the file is
3624 Output may be to a file, in which case the name of the file is
3625 given using a format string. The formatting rules are as follows:
3625 given using a format string. The formatting rules are as follows:
3626
3626
3627 :``%%``: literal "%" character
3627 :``%%``: literal "%" character
3628 :``%H``: changeset hash (40 hexadecimal digits)
3628 :``%H``: changeset hash (40 hexadecimal digits)
3629 :``%N``: number of patches being generated
3629 :``%N``: number of patches being generated
3630 :``%R``: changeset revision number
3630 :``%R``: changeset revision number
3631 :``%b``: basename of the exporting repository
3631 :``%b``: basename of the exporting repository
3632 :``%h``: short-form changeset hash (12 hexadecimal digits)
3632 :``%h``: short-form changeset hash (12 hexadecimal digits)
3633 :``%m``: first line of the commit message (only alphanumeric characters)
3633 :``%m``: first line of the commit message (only alphanumeric characters)
3634 :``%n``: zero-padded sequence number, starting at 1
3634 :``%n``: zero-padded sequence number, starting at 1
3635 :``%r``: zero-padded changeset revision number
3635 :``%r``: zero-padded changeset revision number
3636
3636
3637 Without the -a/--text option, export will avoid generating diffs
3637 Without the -a/--text option, export will avoid generating diffs
3638 of files it detects as binary. With -a, export will generate a
3638 of files it detects as binary. With -a, export will generate a
3639 diff anyway, probably with undesirable results.
3639 diff anyway, probably with undesirable results.
3640
3640
3641 Use the -g/--git option to generate diffs in the git extended diff
3641 Use the -g/--git option to generate diffs in the git extended diff
3642 format. See :hg:`help diffs` for more information.
3642 format. See :hg:`help diffs` for more information.
3643
3643
3644 With the --switch-parent option, the diff will be against the
3644 With the --switch-parent option, the diff will be against the
3645 second parent. It can be useful to review a merge.
3645 second parent. It can be useful to review a merge.
3646
3646
3647 .. container:: verbose
3647 .. container:: verbose
3648
3648
3649 Examples:
3649 Examples:
3650
3650
3651 - use export and import to transplant a bugfix to the current
3651 - use export and import to transplant a bugfix to the current
3652 branch::
3652 branch::
3653
3653
3654 hg export -r 9353 | hg import -
3654 hg export -r 9353 | hg import -
3655
3655
3656 - export all the changesets between two revisions to a file with
3656 - export all the changesets between two revisions to a file with
3657 rename information::
3657 rename information::
3658
3658
3659 hg export --git -r 123:150 > changes.txt
3659 hg export --git -r 123:150 > changes.txt
3660
3660
3661 - split outgoing changes into a series of patches with
3661 - split outgoing changes into a series of patches with
3662 descriptive names::
3662 descriptive names::
3663
3663
3664 hg export -r "outgoing()" -o "%n-%m.patch"
3664 hg export -r "outgoing()" -o "%n-%m.patch"
3665
3665
3666 Returns 0 on success.
3666 Returns 0 on success.
3667 """
3667 """
3668 changesets += tuple(opts.get('rev', []))
3668 changesets += tuple(opts.get('rev', []))
3669 if not changesets:
3669 if not changesets:
3670 changesets = ['.']
3670 changesets = ['.']
3671 revs = scmutil.revrange(repo, changesets)
3671 revs = scmutil.revrange(repo, changesets)
3672 if not revs:
3672 if not revs:
3673 raise error.Abort(_("export requires at least one changeset"))
3673 raise error.Abort(_("export requires at least one changeset"))
3674 if len(revs) > 1:
3674 if len(revs) > 1:
3675 ui.note(_('exporting patches:\n'))
3675 ui.note(_('exporting patches:\n'))
3676 else:
3676 else:
3677 ui.note(_('exporting patch:\n'))
3677 ui.note(_('exporting patch:\n'))
3678 cmdutil.export(repo, revs, template=opts.get('output'),
3678 cmdutil.export(repo, revs, template=opts.get('output'),
3679 switch_parent=opts.get('switch_parent'),
3679 switch_parent=opts.get('switch_parent'),
3680 opts=patch.diffallopts(ui, opts))
3680 opts=patch.diffallopts(ui, opts))
3681
3681
3682 @command('files',
3682 @command('files',
3683 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3683 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3684 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3684 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3685 ] + walkopts + formatteropts + subrepoopts,
3685 ] + walkopts + formatteropts + subrepoopts,
3686 _('[OPTION]... [PATTERN]...'))
3686 _('[OPTION]... [PATTERN]...'))
3687 def files(ui, repo, *pats, **opts):
3687 def files(ui, repo, *pats, **opts):
3688 """list tracked files
3688 """list tracked files
3689
3689
3690 Print files under Mercurial control in the working directory or
3690 Print files under Mercurial control in the working directory or
3691 specified revision whose names match the given patterns (excluding
3691 specified revision whose names match the given patterns (excluding
3692 removed files).
3692 removed files).
3693
3693
3694 If no patterns are given to match, this command prints the names
3694 If no patterns are given to match, this command prints the names
3695 of all files under Mercurial control in the working directory.
3695 of all files under Mercurial control in the working directory.
3696
3696
3697 .. container:: verbose
3697 .. container:: verbose
3698
3698
3699 Examples:
3699 Examples:
3700
3700
3701 - list all files under the current directory::
3701 - list all files under the current directory::
3702
3702
3703 hg files .
3703 hg files .
3704
3704
3705 - shows sizes and flags for current revision::
3705 - shows sizes and flags for current revision::
3706
3706
3707 hg files -vr .
3707 hg files -vr .
3708
3708
3709 - list all files named README::
3709 - list all files named README::
3710
3710
3711 hg files -I "**/README"
3711 hg files -I "**/README"
3712
3712
3713 - list all binary files::
3713 - list all binary files::
3714
3714
3715 hg files "set:binary()"
3715 hg files "set:binary()"
3716
3716
3717 - find files containing a regular expression::
3717 - find files containing a regular expression::
3718
3718
3719 hg files "set:grep('bob')"
3719 hg files "set:grep('bob')"
3720
3720
3721 - search tracked file contents with xargs and grep::
3721 - search tracked file contents with xargs and grep::
3722
3722
3723 hg files -0 | xargs -0 grep foo
3723 hg files -0 | xargs -0 grep foo
3724
3724
3725 See :hg:`help patterns` and :hg:`help filesets` for more information
3725 See :hg:`help patterns` and :hg:`help filesets` for more information
3726 on specifying file patterns.
3726 on specifying file patterns.
3727
3727
3728 Returns 0 if a match is found, 1 otherwise.
3728 Returns 0 if a match is found, 1 otherwise.
3729
3729
3730 """
3730 """
3731 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3731 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3732
3732
3733 end = '\n'
3733 end = '\n'
3734 if opts.get('print0'):
3734 if opts.get('print0'):
3735 end = '\0'
3735 end = '\0'
3736 fm = ui.formatter('files', opts)
3736 fm = ui.formatter('files', opts)
3737 fmt = '%s' + end
3737 fmt = '%s' + end
3738
3738
3739 m = scmutil.match(ctx, pats, opts)
3739 m = scmutil.match(ctx, pats, opts)
3740 ret = cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3740 ret = cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3741
3741
3742 fm.end()
3742 fm.end()
3743
3743
3744 return ret
3744 return ret
3745
3745
3746 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3746 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3747 def forget(ui, repo, *pats, **opts):
3747 def forget(ui, repo, *pats, **opts):
3748 """forget the specified files on the next commit
3748 """forget the specified files on the next commit
3749
3749
3750 Mark the specified files so they will no longer be tracked
3750 Mark the specified files so they will no longer be tracked
3751 after the next commit.
3751 after the next commit.
3752
3752
3753 This only removes files from the current branch, not from the
3753 This only removes files from the current branch, not from the
3754 entire project history, and it does not delete them from the
3754 entire project history, and it does not delete them from the
3755 working directory.
3755 working directory.
3756
3756
3757 To delete the file from the working directory, see :hg:`remove`.
3757 To delete the file from the working directory, see :hg:`remove`.
3758
3758
3759 To undo a forget before the next commit, see :hg:`add`.
3759 To undo a forget before the next commit, see :hg:`add`.
3760
3760
3761 .. container:: verbose
3761 .. container:: verbose
3762
3762
3763 Examples:
3763 Examples:
3764
3764
3765 - forget newly-added binary files::
3765 - forget newly-added binary files::
3766
3766
3767 hg forget "set:added() and binary()"
3767 hg forget "set:added() and binary()"
3768
3768
3769 - forget files that would be excluded by .hgignore::
3769 - forget files that would be excluded by .hgignore::
3770
3770
3771 hg forget "set:hgignore()"
3771 hg forget "set:hgignore()"
3772
3772
3773 Returns 0 on success.
3773 Returns 0 on success.
3774 """
3774 """
3775
3775
3776 if not pats:
3776 if not pats:
3777 raise error.Abort(_('no files specified'))
3777 raise error.Abort(_('no files specified'))
3778
3778
3779 m = scmutil.match(repo[None], pats, opts)
3779 m = scmutil.match(repo[None], pats, opts)
3780 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
3780 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
3781 return rejected and 1 or 0
3781 return rejected and 1 or 0
3782
3782
3783 @command(
3783 @command(
3784 'graft',
3784 'graft',
3785 [('r', 'rev', [], _('revisions to graft'), _('REV')),
3785 [('r', 'rev', [], _('revisions to graft'), _('REV')),
3786 ('c', 'continue', False, _('resume interrupted graft')),
3786 ('c', 'continue', False, _('resume interrupted graft')),
3787 ('e', 'edit', False, _('invoke editor on commit messages')),
3787 ('e', 'edit', False, _('invoke editor on commit messages')),
3788 ('', 'log', None, _('append graft info to log message')),
3788 ('', 'log', None, _('append graft info to log message')),
3789 ('f', 'force', False, _('force graft')),
3789 ('f', 'force', False, _('force graft')),
3790 ('D', 'currentdate', False,
3790 ('D', 'currentdate', False,
3791 _('record the current date as commit date')),
3791 _('record the current date as commit date')),
3792 ('U', 'currentuser', False,
3792 ('U', 'currentuser', False,
3793 _('record the current user as committer'), _('DATE'))]
3793 _('record the current user as committer'), _('DATE'))]
3794 + commitopts2 + mergetoolopts + dryrunopts,
3794 + commitopts2 + mergetoolopts + dryrunopts,
3795 _('[OPTION]... [-r] REV...'))
3795 _('[OPTION]... [-r] REV...'))
3796 def graft(ui, repo, *revs, **opts):
3796 def graft(ui, repo, *revs, **opts):
3797 '''copy changes from other branches onto the current branch
3797 '''copy changes from other branches onto the current branch
3798
3798
3799 This command uses Mercurial's merge logic to copy individual
3799 This command uses Mercurial's merge logic to copy individual
3800 changes from other branches without merging branches in the
3800 changes from other branches without merging branches in the
3801 history graph. This is sometimes known as 'backporting' or
3801 history graph. This is sometimes known as 'backporting' or
3802 'cherry-picking'. By default, graft will copy user, date, and
3802 'cherry-picking'. By default, graft will copy user, date, and
3803 description from the source changesets.
3803 description from the source changesets.
3804
3804
3805 Changesets that are ancestors of the current revision, that have
3805 Changesets that are ancestors of the current revision, that have
3806 already been grafted, or that are merges will be skipped.
3806 already been grafted, or that are merges will be skipped.
3807
3807
3808 If --log is specified, log messages will have a comment appended
3808 If --log is specified, log messages will have a comment appended
3809 of the form::
3809 of the form::
3810
3810
3811 (grafted from CHANGESETHASH)
3811 (grafted from CHANGESETHASH)
3812
3812
3813 If --force is specified, revisions will be grafted even if they
3813 If --force is specified, revisions will be grafted even if they
3814 are already ancestors of or have been grafted to the destination.
3814 are already ancestors of or have been grafted to the destination.
3815 This is useful when the revisions have since been backed out.
3815 This is useful when the revisions have since been backed out.
3816
3816
3817 If a graft merge results in conflicts, the graft process is
3817 If a graft merge results in conflicts, the graft process is
3818 interrupted so that the current merge can be manually resolved.
3818 interrupted so that the current merge can be manually resolved.
3819 Once all conflicts are addressed, the graft process can be
3819 Once all conflicts are addressed, the graft process can be
3820 continued with the -c/--continue option.
3820 continued with the -c/--continue option.
3821
3821
3822 .. note::
3822 .. note::
3823
3823
3824 The -c/--continue option does not reapply earlier options, except
3824 The -c/--continue option does not reapply earlier options, except
3825 for --force.
3825 for --force.
3826
3826
3827 .. container:: verbose
3827 .. container:: verbose
3828
3828
3829 Examples:
3829 Examples:
3830
3830
3831 - copy a single change to the stable branch and edit its description::
3831 - copy a single change to the stable branch and edit its description::
3832
3832
3833 hg update stable
3833 hg update stable
3834 hg graft --edit 9393
3834 hg graft --edit 9393
3835
3835
3836 - graft a range of changesets with one exception, updating dates::
3836 - graft a range of changesets with one exception, updating dates::
3837
3837
3838 hg graft -D "2085::2093 and not 2091"
3838 hg graft -D "2085::2093 and not 2091"
3839
3839
3840 - continue a graft after resolving conflicts::
3840 - continue a graft after resolving conflicts::
3841
3841
3842 hg graft -c
3842 hg graft -c
3843
3843
3844 - show the source of a grafted changeset::
3844 - show the source of a grafted changeset::
3845
3845
3846 hg log --debug -r .
3846 hg log --debug -r .
3847
3847
3848 See :hg:`help revisions` and :hg:`help revsets` for more about
3848 See :hg:`help revisions` and :hg:`help revsets` for more about
3849 specifying revisions.
3849 specifying revisions.
3850
3850
3851 Returns 0 on successful completion.
3851 Returns 0 on successful completion.
3852 '''
3852 '''
3853 wlock = None
3853 wlock = None
3854 try:
3854 try:
3855 wlock = repo.wlock()
3855 wlock = repo.wlock()
3856 return _dograft(ui, repo, *revs, **opts)
3856 return _dograft(ui, repo, *revs, **opts)
3857 finally:
3857 finally:
3858 release(wlock)
3858 release(wlock)
3859
3859
3860 def _dograft(ui, repo, *revs, **opts):
3860 def _dograft(ui, repo, *revs, **opts):
3861 revs = list(revs)
3861 revs = list(revs)
3862 revs.extend(opts['rev'])
3862 revs.extend(opts['rev'])
3863
3863
3864 if not opts.get('user') and opts.get('currentuser'):
3864 if not opts.get('user') and opts.get('currentuser'):
3865 opts['user'] = ui.username()
3865 opts['user'] = ui.username()
3866 if not opts.get('date') and opts.get('currentdate'):
3866 if not opts.get('date') and opts.get('currentdate'):
3867 opts['date'] = "%d %d" % util.makedate()
3867 opts['date'] = "%d %d" % util.makedate()
3868
3868
3869 editor = cmdutil.getcommiteditor(editform='graft', **opts)
3869 editor = cmdutil.getcommiteditor(editform='graft', **opts)
3870
3870
3871 cont = False
3871 cont = False
3872 if opts['continue']:
3872 if opts['continue']:
3873 cont = True
3873 cont = True
3874 if revs:
3874 if revs:
3875 raise error.Abort(_("can't specify --continue and revisions"))
3875 raise error.Abort(_("can't specify --continue and revisions"))
3876 # read in unfinished revisions
3876 # read in unfinished revisions
3877 try:
3877 try:
3878 nodes = repo.vfs.read('graftstate').splitlines()
3878 nodes = repo.vfs.read('graftstate').splitlines()
3879 revs = [repo[node].rev() for node in nodes]
3879 revs = [repo[node].rev() for node in nodes]
3880 except IOError as inst:
3880 except IOError as inst:
3881 if inst.errno != errno.ENOENT:
3881 if inst.errno != errno.ENOENT:
3882 raise
3882 raise
3883 raise error.Abort(_("no graft state found, can't continue"))
3883 raise error.Abort(_("no graft state found, can't continue"))
3884 else:
3884 else:
3885 cmdutil.checkunfinished(repo)
3885 cmdutil.checkunfinished(repo)
3886 cmdutil.bailifchanged(repo)
3886 cmdutil.bailifchanged(repo)
3887 if not revs:
3887 if not revs:
3888 raise error.Abort(_('no revisions specified'))
3888 raise error.Abort(_('no revisions specified'))
3889 revs = scmutil.revrange(repo, revs)
3889 revs = scmutil.revrange(repo, revs)
3890
3890
3891 skipped = set()
3891 skipped = set()
3892 # check for merges
3892 # check for merges
3893 for rev in repo.revs('%ld and merge()', revs):
3893 for rev in repo.revs('%ld and merge()', revs):
3894 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
3894 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
3895 skipped.add(rev)
3895 skipped.add(rev)
3896 revs = [r for r in revs if r not in skipped]
3896 revs = [r for r in revs if r not in skipped]
3897 if not revs:
3897 if not revs:
3898 return -1
3898 return -1
3899
3899
3900 # Don't check in the --continue case, in effect retaining --force across
3900 # Don't check in the --continue case, in effect retaining --force across
3901 # --continues. That's because without --force, any revisions we decided to
3901 # --continues. That's because without --force, any revisions we decided to
3902 # skip would have been filtered out here, so they wouldn't have made their
3902 # skip would have been filtered out here, so they wouldn't have made their
3903 # way to the graftstate. With --force, any revisions we would have otherwise
3903 # way to the graftstate. With --force, any revisions we would have otherwise
3904 # skipped would not have been filtered out, and if they hadn't been applied
3904 # skipped would not have been filtered out, and if they hadn't been applied
3905 # already, they'd have been in the graftstate.
3905 # already, they'd have been in the graftstate.
3906 if not (cont or opts.get('force')):
3906 if not (cont or opts.get('force')):
3907 # check for ancestors of dest branch
3907 # check for ancestors of dest branch
3908 crev = repo['.'].rev()
3908 crev = repo['.'].rev()
3909 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3909 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3910 # Cannot use x.remove(y) on smart set, this has to be a list.
3910 # Cannot use x.remove(y) on smart set, this has to be a list.
3911 # XXX make this lazy in the future
3911 # XXX make this lazy in the future
3912 revs = list(revs)
3912 revs = list(revs)
3913 # don't mutate while iterating, create a copy
3913 # don't mutate while iterating, create a copy
3914 for rev in list(revs):
3914 for rev in list(revs):
3915 if rev in ancestors:
3915 if rev in ancestors:
3916 ui.warn(_('skipping ancestor revision %d:%s\n') %
3916 ui.warn(_('skipping ancestor revision %d:%s\n') %
3917 (rev, repo[rev]))
3917 (rev, repo[rev]))
3918 # XXX remove on list is slow
3918 # XXX remove on list is slow
3919 revs.remove(rev)
3919 revs.remove(rev)
3920 if not revs:
3920 if not revs:
3921 return -1
3921 return -1
3922
3922
3923 # analyze revs for earlier grafts
3923 # analyze revs for earlier grafts
3924 ids = {}
3924 ids = {}
3925 for ctx in repo.set("%ld", revs):
3925 for ctx in repo.set("%ld", revs):
3926 ids[ctx.hex()] = ctx.rev()
3926 ids[ctx.hex()] = ctx.rev()
3927 n = ctx.extra().get('source')
3927 n = ctx.extra().get('source')
3928 if n:
3928 if n:
3929 ids[n] = ctx.rev()
3929 ids[n] = ctx.rev()
3930
3930
3931 # check ancestors for earlier grafts
3931 # check ancestors for earlier grafts
3932 ui.debug('scanning for duplicate grafts\n')
3932 ui.debug('scanning for duplicate grafts\n')
3933
3933
3934 for rev in repo.changelog.findmissingrevs(revs, [crev]):
3934 for rev in repo.changelog.findmissingrevs(revs, [crev]):
3935 ctx = repo[rev]
3935 ctx = repo[rev]
3936 n = ctx.extra().get('source')
3936 n = ctx.extra().get('source')
3937 if n in ids:
3937 if n in ids:
3938 try:
3938 try:
3939 r = repo[n].rev()
3939 r = repo[n].rev()
3940 except error.RepoLookupError:
3940 except error.RepoLookupError:
3941 r = None
3941 r = None
3942 if r in revs:
3942 if r in revs:
3943 ui.warn(_('skipping revision %d:%s '
3943 ui.warn(_('skipping revision %d:%s '
3944 '(already grafted to %d:%s)\n')
3944 '(already grafted to %d:%s)\n')
3945 % (r, repo[r], rev, ctx))
3945 % (r, repo[r], rev, ctx))
3946 revs.remove(r)
3946 revs.remove(r)
3947 elif ids[n] in revs:
3947 elif ids[n] in revs:
3948 if r is None:
3948 if r is None:
3949 ui.warn(_('skipping already grafted revision %d:%s '
3949 ui.warn(_('skipping already grafted revision %d:%s '
3950 '(%d:%s also has unknown origin %s)\n')
3950 '(%d:%s also has unknown origin %s)\n')
3951 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
3951 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
3952 else:
3952 else:
3953 ui.warn(_('skipping already grafted revision %d:%s '
3953 ui.warn(_('skipping already grafted revision %d:%s '
3954 '(%d:%s also has origin %d:%s)\n')
3954 '(%d:%s also has origin %d:%s)\n')
3955 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
3955 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
3956 revs.remove(ids[n])
3956 revs.remove(ids[n])
3957 elif ctx.hex() in ids:
3957 elif ctx.hex() in ids:
3958 r = ids[ctx.hex()]
3958 r = ids[ctx.hex()]
3959 ui.warn(_('skipping already grafted revision %d:%s '
3959 ui.warn(_('skipping already grafted revision %d:%s '
3960 '(was grafted from %d:%s)\n') %
3960 '(was grafted from %d:%s)\n') %
3961 (r, repo[r], rev, ctx))
3961 (r, repo[r], rev, ctx))
3962 revs.remove(r)
3962 revs.remove(r)
3963 if not revs:
3963 if not revs:
3964 return -1
3964 return -1
3965
3965
3966 try:
3966 try:
3967 for pos, ctx in enumerate(repo.set("%ld", revs)):
3967 for pos, ctx in enumerate(repo.set("%ld", revs)):
3968 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
3968 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
3969 ctx.description().split('\n', 1)[0])
3969 ctx.description().split('\n', 1)[0])
3970 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3970 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3971 if names:
3971 if names:
3972 desc += ' (%s)' % ' '.join(names)
3972 desc += ' (%s)' % ' '.join(names)
3973 ui.status(_('grafting %s\n') % desc)
3973 ui.status(_('grafting %s\n') % desc)
3974 if opts.get('dry_run'):
3974 if opts.get('dry_run'):
3975 continue
3975 continue
3976
3976
3977 extra = ctx.extra().copy()
3977 extra = ctx.extra().copy()
3978 del extra['branch']
3978 del extra['branch']
3979 source = extra.get('source')
3979 source = extra.get('source')
3980 if source:
3980 if source:
3981 extra['intermediate-source'] = ctx.hex()
3981 extra['intermediate-source'] = ctx.hex()
3982 else:
3982 else:
3983 extra['source'] = ctx.hex()
3983 extra['source'] = ctx.hex()
3984 user = ctx.user()
3984 user = ctx.user()
3985 if opts.get('user'):
3985 if opts.get('user'):
3986 user = opts['user']
3986 user = opts['user']
3987 date = ctx.date()
3987 date = ctx.date()
3988 if opts.get('date'):
3988 if opts.get('date'):
3989 date = opts['date']
3989 date = opts['date']
3990 message = ctx.description()
3990 message = ctx.description()
3991 if opts.get('log'):
3991 if opts.get('log'):
3992 message += '\n(grafted from %s)' % ctx.hex()
3992 message += '\n(grafted from %s)' % ctx.hex()
3993
3993
3994 # we don't merge the first commit when continuing
3994 # we don't merge the first commit when continuing
3995 if not cont:
3995 if not cont:
3996 # perform the graft merge with p1(rev) as 'ancestor'
3996 # perform the graft merge with p1(rev) as 'ancestor'
3997 try:
3997 try:
3998 # ui.forcemerge is an internal variable, do not document
3998 # ui.forcemerge is an internal variable, do not document
3999 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
3999 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4000 'graft')
4000 'graft')
4001 stats = mergemod.graft(repo, ctx, ctx.p1(),
4001 stats = mergemod.graft(repo, ctx, ctx.p1(),
4002 ['local', 'graft'])
4002 ['local', 'graft'])
4003 finally:
4003 finally:
4004 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4004 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4005 # report any conflicts
4005 # report any conflicts
4006 if stats and stats[3] > 0:
4006 if stats and stats[3] > 0:
4007 # write out state for --continue
4007 # write out state for --continue
4008 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4008 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4009 repo.vfs.write('graftstate', ''.join(nodelines))
4009 repo.vfs.write('graftstate', ''.join(nodelines))
4010 extra = ''
4010 extra = ''
4011 if opts.get('user'):
4011 if opts.get('user'):
4012 extra += ' --user %s' % opts['user']
4012 extra += ' --user %s' % opts['user']
4013 if opts.get('date'):
4013 if opts.get('date'):
4014 extra += ' --date %s' % opts['date']
4014 extra += ' --date %s' % opts['date']
4015 if opts.get('log'):
4015 if opts.get('log'):
4016 extra += ' --log'
4016 extra += ' --log'
4017 hint=_('use hg resolve and hg graft --continue%s') % extra
4017 hint=_('use hg resolve and hg graft --continue%s') % extra
4018 raise error.Abort(
4018 raise error.Abort(
4019 _("unresolved conflicts, can't continue"),
4019 _("unresolved conflicts, can't continue"),
4020 hint=hint)
4020 hint=hint)
4021 else:
4021 else:
4022 cont = False
4022 cont = False
4023
4023
4024 # commit
4024 # commit
4025 node = repo.commit(text=message, user=user,
4025 node = repo.commit(text=message, user=user,
4026 date=date, extra=extra, editor=editor)
4026 date=date, extra=extra, editor=editor)
4027 if node is None:
4027 if node is None:
4028 ui.warn(
4028 ui.warn(
4029 _('note: graft of %d:%s created no changes to commit\n') %
4029 _('note: graft of %d:%s created no changes to commit\n') %
4030 (ctx.rev(), ctx))
4030 (ctx.rev(), ctx))
4031 finally:
4031 finally:
4032 # TODO: get rid of this meaningless try/finally enclosing.
4032 # TODO: get rid of this meaningless try/finally enclosing.
4033 # this is kept only to reduce changes in a patch.
4033 # this is kept only to reduce changes in a patch.
4034 pass
4034 pass
4035
4035
4036 # remove state when we complete successfully
4036 # remove state when we complete successfully
4037 if not opts.get('dry_run'):
4037 if not opts.get('dry_run'):
4038 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4038 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4039
4039
4040 return 0
4040 return 0
4041
4041
4042 @command('grep',
4042 @command('grep',
4043 [('0', 'print0', None, _('end fields with NUL')),
4043 [('0', 'print0', None, _('end fields with NUL')),
4044 ('', 'all', None, _('print all revisions that match')),
4044 ('', 'all', None, _('print all revisions that match')),
4045 ('a', 'text', None, _('treat all files as text')),
4045 ('a', 'text', None, _('treat all files as text')),
4046 ('f', 'follow', None,
4046 ('f', 'follow', None,
4047 _('follow changeset history,'
4047 _('follow changeset history,'
4048 ' or file history across copies and renames')),
4048 ' or file history across copies and renames')),
4049 ('i', 'ignore-case', None, _('ignore case when matching')),
4049 ('i', 'ignore-case', None, _('ignore case when matching')),
4050 ('l', 'files-with-matches', None,
4050 ('l', 'files-with-matches', None,
4051 _('print only filenames and revisions that match')),
4051 _('print only filenames and revisions that match')),
4052 ('n', 'line-number', None, _('print matching line numbers')),
4052 ('n', 'line-number', None, _('print matching line numbers')),
4053 ('r', 'rev', [],
4053 ('r', 'rev', [],
4054 _('only search files changed within revision range'), _('REV')),
4054 _('only search files changed within revision range'), _('REV')),
4055 ('u', 'user', None, _('list the author (long with -v)')),
4055 ('u', 'user', None, _('list the author (long with -v)')),
4056 ('d', 'date', None, _('list the date (short with -q)')),
4056 ('d', 'date', None, _('list the date (short with -q)')),
4057 ] + walkopts,
4057 ] + walkopts,
4058 _('[OPTION]... PATTERN [FILE]...'),
4058 _('[OPTION]... PATTERN [FILE]...'),
4059 inferrepo=True)
4059 inferrepo=True)
4060 def grep(ui, repo, pattern, *pats, **opts):
4060 def grep(ui, repo, pattern, *pats, **opts):
4061 """search for a pattern in specified files and revisions
4061 """search for a pattern in specified files and revisions
4062
4062
4063 Search revisions of files for a regular expression.
4063 Search revisions of files for a regular expression.
4064
4064
4065 This command behaves differently than Unix grep. It only accepts
4065 This command behaves differently than Unix grep. It only accepts
4066 Python/Perl regexps. It searches repository history, not the
4066 Python/Perl regexps. It searches repository history, not the
4067 working directory. It always prints the revision number in which a
4067 working directory. It always prints the revision number in which a
4068 match appears.
4068 match appears.
4069
4069
4070 By default, grep only prints output for the first revision of a
4070 By default, grep only prints output for the first revision of a
4071 file in which it finds a match. To get it to print every revision
4071 file in which it finds a match. To get it to print every revision
4072 that contains a change in match status ("-" for a match that
4072 that contains a change in match status ("-" for a match that
4073 becomes a non-match, or "+" for a non-match that becomes a match),
4073 becomes a non-match, or "+" for a non-match that becomes a match),
4074 use the --all flag.
4074 use the --all flag.
4075
4075
4076 Returns 0 if a match is found, 1 otherwise.
4076 Returns 0 if a match is found, 1 otherwise.
4077 """
4077 """
4078 reflags = re.M
4078 reflags = re.M
4079 if opts.get('ignore_case'):
4079 if opts.get('ignore_case'):
4080 reflags |= re.I
4080 reflags |= re.I
4081 try:
4081 try:
4082 regexp = util.re.compile(pattern, reflags)
4082 regexp = util.re.compile(pattern, reflags)
4083 except re.error as inst:
4083 except re.error as inst:
4084 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4084 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4085 return 1
4085 return 1
4086 sep, eol = ':', '\n'
4086 sep, eol = ':', '\n'
4087 if opts.get('print0'):
4087 if opts.get('print0'):
4088 sep = eol = '\0'
4088 sep = eol = '\0'
4089
4089
4090 getfile = util.lrucachefunc(repo.file)
4090 getfile = util.lrucachefunc(repo.file)
4091
4091
4092 def matchlines(body):
4092 def matchlines(body):
4093 begin = 0
4093 begin = 0
4094 linenum = 0
4094 linenum = 0
4095 while begin < len(body):
4095 while begin < len(body):
4096 match = regexp.search(body, begin)
4096 match = regexp.search(body, begin)
4097 if not match:
4097 if not match:
4098 break
4098 break
4099 mstart, mend = match.span()
4099 mstart, mend = match.span()
4100 linenum += body.count('\n', begin, mstart) + 1
4100 linenum += body.count('\n', begin, mstart) + 1
4101 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4101 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4102 begin = body.find('\n', mend) + 1 or len(body) + 1
4102 begin = body.find('\n', mend) + 1 or len(body) + 1
4103 lend = begin - 1
4103 lend = begin - 1
4104 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4104 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4105
4105
4106 class linestate(object):
4106 class linestate(object):
4107 def __init__(self, line, linenum, colstart, colend):
4107 def __init__(self, line, linenum, colstart, colend):
4108 self.line = line
4108 self.line = line
4109 self.linenum = linenum
4109 self.linenum = linenum
4110 self.colstart = colstart
4110 self.colstart = colstart
4111 self.colend = colend
4111 self.colend = colend
4112
4112
4113 def __hash__(self):
4113 def __hash__(self):
4114 return hash((self.linenum, self.line))
4114 return hash((self.linenum, self.line))
4115
4115
4116 def __eq__(self, other):
4116 def __eq__(self, other):
4117 return self.line == other.line
4117 return self.line == other.line
4118
4118
4119 def __iter__(self):
4119 def __iter__(self):
4120 yield (self.line[:self.colstart], '')
4120 yield (self.line[:self.colstart], '')
4121 yield (self.line[self.colstart:self.colend], 'grep.match')
4121 yield (self.line[self.colstart:self.colend], 'grep.match')
4122 rest = self.line[self.colend:]
4122 rest = self.line[self.colend:]
4123 while rest != '':
4123 while rest != '':
4124 match = regexp.search(rest)
4124 match = regexp.search(rest)
4125 if not match:
4125 if not match:
4126 yield (rest, '')
4126 yield (rest, '')
4127 break
4127 break
4128 mstart, mend = match.span()
4128 mstart, mend = match.span()
4129 yield (rest[:mstart], '')
4129 yield (rest[:mstart], '')
4130 yield (rest[mstart:mend], 'grep.match')
4130 yield (rest[mstart:mend], 'grep.match')
4131 rest = rest[mend:]
4131 rest = rest[mend:]
4132
4132
4133 matches = {}
4133 matches = {}
4134 copies = {}
4134 copies = {}
4135 def grepbody(fn, rev, body):
4135 def grepbody(fn, rev, body):
4136 matches[rev].setdefault(fn, [])
4136 matches[rev].setdefault(fn, [])
4137 m = matches[rev][fn]
4137 m = matches[rev][fn]
4138 for lnum, cstart, cend, line in matchlines(body):
4138 for lnum, cstart, cend, line in matchlines(body):
4139 s = linestate(line, lnum, cstart, cend)
4139 s = linestate(line, lnum, cstart, cend)
4140 m.append(s)
4140 m.append(s)
4141
4141
4142 def difflinestates(a, b):
4142 def difflinestates(a, b):
4143 sm = difflib.SequenceMatcher(None, a, b)
4143 sm = difflib.SequenceMatcher(None, a, b)
4144 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4144 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4145 if tag == 'insert':
4145 if tag == 'insert':
4146 for i in xrange(blo, bhi):
4146 for i in xrange(blo, bhi):
4147 yield ('+', b[i])
4147 yield ('+', b[i])
4148 elif tag == 'delete':
4148 elif tag == 'delete':
4149 for i in xrange(alo, ahi):
4149 for i in xrange(alo, ahi):
4150 yield ('-', a[i])
4150 yield ('-', a[i])
4151 elif tag == 'replace':
4151 elif tag == 'replace':
4152 for i in xrange(alo, ahi):
4152 for i in xrange(alo, ahi):
4153 yield ('-', a[i])
4153 yield ('-', a[i])
4154 for i in xrange(blo, bhi):
4154 for i in xrange(blo, bhi):
4155 yield ('+', b[i])
4155 yield ('+', b[i])
4156
4156
4157 def display(fn, ctx, pstates, states):
4157 def display(fn, ctx, pstates, states):
4158 rev = ctx.rev()
4158 rev = ctx.rev()
4159 if ui.quiet:
4159 if ui.quiet:
4160 datefunc = util.shortdate
4160 datefunc = util.shortdate
4161 else:
4161 else:
4162 datefunc = util.datestr
4162 datefunc = util.datestr
4163 found = False
4163 found = False
4164 @util.cachefunc
4164 @util.cachefunc
4165 def binary():
4165 def binary():
4166 flog = getfile(fn)
4166 flog = getfile(fn)
4167 return util.binary(flog.read(ctx.filenode(fn)))
4167 return util.binary(flog.read(ctx.filenode(fn)))
4168
4168
4169 if opts.get('all'):
4169 if opts.get('all'):
4170 iter = difflinestates(pstates, states)
4170 iter = difflinestates(pstates, states)
4171 else:
4171 else:
4172 iter = [('', l) for l in states]
4172 iter = [('', l) for l in states]
4173 for change, l in iter:
4173 for change, l in iter:
4174 cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
4174 cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
4175
4175
4176 if opts.get('line_number'):
4176 if opts.get('line_number'):
4177 cols.append((str(l.linenum), 'grep.linenumber'))
4177 cols.append((str(l.linenum), 'grep.linenumber'))
4178 if opts.get('all'):
4178 if opts.get('all'):
4179 cols.append((change, 'grep.change'))
4179 cols.append((change, 'grep.change'))
4180 if opts.get('user'):
4180 if opts.get('user'):
4181 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
4181 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
4182 if opts.get('date'):
4182 if opts.get('date'):
4183 cols.append((datefunc(ctx.date()), 'grep.date'))
4183 cols.append((datefunc(ctx.date()), 'grep.date'))
4184 for col, label in cols[:-1]:
4184 for col, label in cols[:-1]:
4185 ui.write(col, label=label)
4185 ui.write(col, label=label)
4186 ui.write(sep, label='grep.sep')
4186 ui.write(sep, label='grep.sep')
4187 ui.write(cols[-1][0], label=cols[-1][1])
4187 ui.write(cols[-1][0], label=cols[-1][1])
4188 if not opts.get('files_with_matches'):
4188 if not opts.get('files_with_matches'):
4189 ui.write(sep, label='grep.sep')
4189 ui.write(sep, label='grep.sep')
4190 if not opts.get('text') and binary():
4190 if not opts.get('text') and binary():
4191 ui.write(" Binary file matches")
4191 ui.write(" Binary file matches")
4192 else:
4192 else:
4193 for s, label in l:
4193 for s, label in l:
4194 ui.write(s, label=label)
4194 ui.write(s, label=label)
4195 ui.write(eol)
4195 ui.write(eol)
4196 found = True
4196 found = True
4197 if opts.get('files_with_matches'):
4197 if opts.get('files_with_matches'):
4198 break
4198 break
4199 return found
4199 return found
4200
4200
4201 skip = {}
4201 skip = {}
4202 revfiles = {}
4202 revfiles = {}
4203 matchfn = scmutil.match(repo[None], pats, opts)
4203 matchfn = scmutil.match(repo[None], pats, opts)
4204 found = False
4204 found = False
4205 follow = opts.get('follow')
4205 follow = opts.get('follow')
4206
4206
4207 def prep(ctx, fns):
4207 def prep(ctx, fns):
4208 rev = ctx.rev()
4208 rev = ctx.rev()
4209 pctx = ctx.p1()
4209 pctx = ctx.p1()
4210 parent = pctx.rev()
4210 parent = pctx.rev()
4211 matches.setdefault(rev, {})
4211 matches.setdefault(rev, {})
4212 matches.setdefault(parent, {})
4212 matches.setdefault(parent, {})
4213 files = revfiles.setdefault(rev, [])
4213 files = revfiles.setdefault(rev, [])
4214 for fn in fns:
4214 for fn in fns:
4215 flog = getfile(fn)
4215 flog = getfile(fn)
4216 try:
4216 try:
4217 fnode = ctx.filenode(fn)
4217 fnode = ctx.filenode(fn)
4218 except error.LookupError:
4218 except error.LookupError:
4219 continue
4219 continue
4220
4220
4221 copied = flog.renamed(fnode)
4221 copied = flog.renamed(fnode)
4222 copy = follow and copied and copied[0]
4222 copy = follow and copied and copied[0]
4223 if copy:
4223 if copy:
4224 copies.setdefault(rev, {})[fn] = copy
4224 copies.setdefault(rev, {})[fn] = copy
4225 if fn in skip:
4225 if fn in skip:
4226 if copy:
4226 if copy:
4227 skip[copy] = True
4227 skip[copy] = True
4228 continue
4228 continue
4229 files.append(fn)
4229 files.append(fn)
4230
4230
4231 if fn not in matches[rev]:
4231 if fn not in matches[rev]:
4232 grepbody(fn, rev, flog.read(fnode))
4232 grepbody(fn, rev, flog.read(fnode))
4233
4233
4234 pfn = copy or fn
4234 pfn = copy or fn
4235 if pfn not in matches[parent]:
4235 if pfn not in matches[parent]:
4236 try:
4236 try:
4237 fnode = pctx.filenode(pfn)
4237 fnode = pctx.filenode(pfn)
4238 grepbody(pfn, parent, flog.read(fnode))
4238 grepbody(pfn, parent, flog.read(fnode))
4239 except error.LookupError:
4239 except error.LookupError:
4240 pass
4240 pass
4241
4241
4242 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4242 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4243 rev = ctx.rev()
4243 rev = ctx.rev()
4244 parent = ctx.p1().rev()
4244 parent = ctx.p1().rev()
4245 for fn in sorted(revfiles.get(rev, [])):
4245 for fn in sorted(revfiles.get(rev, [])):
4246 states = matches[rev][fn]
4246 states = matches[rev][fn]
4247 copy = copies.get(rev, {}).get(fn)
4247 copy = copies.get(rev, {}).get(fn)
4248 if fn in skip:
4248 if fn in skip:
4249 if copy:
4249 if copy:
4250 skip[copy] = True
4250 skip[copy] = True
4251 continue
4251 continue
4252 pstates = matches.get(parent, {}).get(copy or fn, [])
4252 pstates = matches.get(parent, {}).get(copy or fn, [])
4253 if pstates or states:
4253 if pstates or states:
4254 r = display(fn, ctx, pstates, states)
4254 r = display(fn, ctx, pstates, states)
4255 found = found or r
4255 found = found or r
4256 if r and not opts.get('all'):
4256 if r and not opts.get('all'):
4257 skip[fn] = True
4257 skip[fn] = True
4258 if copy:
4258 if copy:
4259 skip[copy] = True
4259 skip[copy] = True
4260 del matches[rev]
4260 del matches[rev]
4261 del revfiles[rev]
4261 del revfiles[rev]
4262
4262
4263 return not found
4263 return not found
4264
4264
4265 @command('heads',
4265 @command('heads',
4266 [('r', 'rev', '',
4266 [('r', 'rev', '',
4267 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4267 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4268 ('t', 'topo', False, _('show topological heads only')),
4268 ('t', 'topo', False, _('show topological heads only')),
4269 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4269 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4270 ('c', 'closed', False, _('show normal and closed branch heads')),
4270 ('c', 'closed', False, _('show normal and closed branch heads')),
4271 ] + templateopts,
4271 ] + templateopts,
4272 _('[-ct] [-r STARTREV] [REV]...'))
4272 _('[-ct] [-r STARTREV] [REV]...'))
4273 def heads(ui, repo, *branchrevs, **opts):
4273 def heads(ui, repo, *branchrevs, **opts):
4274 """show branch heads
4274 """show branch heads
4275
4275
4276 With no arguments, show all open branch heads in the repository.
4276 With no arguments, show all open branch heads in the repository.
4277 Branch heads are changesets that have no descendants on the
4277 Branch heads are changesets that have no descendants on the
4278 same branch. They are where development generally takes place and
4278 same branch. They are where development generally takes place and
4279 are the usual targets for update and merge operations.
4279 are the usual targets for update and merge operations.
4280
4280
4281 If one or more REVs are given, only open branch heads on the
4281 If one or more REVs are given, only open branch heads on the
4282 branches associated with the specified changesets are shown. This
4282 branches associated with the specified changesets are shown. This
4283 means that you can use :hg:`heads .` to see the heads on the
4283 means that you can use :hg:`heads .` to see the heads on the
4284 currently checked-out branch.
4284 currently checked-out branch.
4285
4285
4286 If -c/--closed is specified, also show branch heads marked closed
4286 If -c/--closed is specified, also show branch heads marked closed
4287 (see :hg:`commit --close-branch`).
4287 (see :hg:`commit --close-branch`).
4288
4288
4289 If STARTREV is specified, only those heads that are descendants of
4289 If STARTREV is specified, only those heads that are descendants of
4290 STARTREV will be displayed.
4290 STARTREV will be displayed.
4291
4291
4292 If -t/--topo is specified, named branch mechanics will be ignored and only
4292 If -t/--topo is specified, named branch mechanics will be ignored and only
4293 topological heads (changesets with no children) will be shown.
4293 topological heads (changesets with no children) will be shown.
4294
4294
4295 Returns 0 if matching heads are found, 1 if not.
4295 Returns 0 if matching heads are found, 1 if not.
4296 """
4296 """
4297
4297
4298 start = None
4298 start = None
4299 if 'rev' in opts:
4299 if 'rev' in opts:
4300 start = scmutil.revsingle(repo, opts['rev'], None).node()
4300 start = scmutil.revsingle(repo, opts['rev'], None).node()
4301
4301
4302 if opts.get('topo'):
4302 if opts.get('topo'):
4303 heads = [repo[h] for h in repo.heads(start)]
4303 heads = [repo[h] for h in repo.heads(start)]
4304 else:
4304 else:
4305 heads = []
4305 heads = []
4306 for branch in repo.branchmap():
4306 for branch in repo.branchmap():
4307 heads += repo.branchheads(branch, start, opts.get('closed'))
4307 heads += repo.branchheads(branch, start, opts.get('closed'))
4308 heads = [repo[h] for h in heads]
4308 heads = [repo[h] for h in heads]
4309
4309
4310 if branchrevs:
4310 if branchrevs:
4311 branches = set(repo[br].branch() for br in branchrevs)
4311 branches = set(repo[br].branch() for br in branchrevs)
4312 heads = [h for h in heads if h.branch() in branches]
4312 heads = [h for h in heads if h.branch() in branches]
4313
4313
4314 if opts.get('active') and branchrevs:
4314 if opts.get('active') and branchrevs:
4315 dagheads = repo.heads(start)
4315 dagheads = repo.heads(start)
4316 heads = [h for h in heads if h.node() in dagheads]
4316 heads = [h for h in heads if h.node() in dagheads]
4317
4317
4318 if branchrevs:
4318 if branchrevs:
4319 haveheads = set(h.branch() for h in heads)
4319 haveheads = set(h.branch() for h in heads)
4320 if branches - haveheads:
4320 if branches - haveheads:
4321 headless = ', '.join(b for b in branches - haveheads)
4321 headless = ', '.join(b for b in branches - haveheads)
4322 msg = _('no open branch heads found on branches %s')
4322 msg = _('no open branch heads found on branches %s')
4323 if opts.get('rev'):
4323 if opts.get('rev'):
4324 msg += _(' (started at %s)') % opts['rev']
4324 msg += _(' (started at %s)') % opts['rev']
4325 ui.warn((msg + '\n') % headless)
4325 ui.warn((msg + '\n') % headless)
4326
4326
4327 if not heads:
4327 if not heads:
4328 return 1
4328 return 1
4329
4329
4330 heads = sorted(heads, key=lambda x: -x.rev())
4330 heads = sorted(heads, key=lambda x: -x.rev())
4331 displayer = cmdutil.show_changeset(ui, repo, opts)
4331 displayer = cmdutil.show_changeset(ui, repo, opts)
4332 for ctx in heads:
4332 for ctx in heads:
4333 displayer.show(ctx)
4333 displayer.show(ctx)
4334 displayer.close()
4334 displayer.close()
4335
4335
4336 @command('help',
4336 @command('help',
4337 [('e', 'extension', None, _('show only help for extensions')),
4337 [('e', 'extension', None, _('show only help for extensions')),
4338 ('c', 'command', None, _('show only help for commands')),
4338 ('c', 'command', None, _('show only help for commands')),
4339 ('k', 'keyword', None, _('show topics matching keyword')),
4339 ('k', 'keyword', None, _('show topics matching keyword')),
4340 ],
4340 ],
4341 _('[-eck] [TOPIC]'),
4341 _('[-eck] [TOPIC]'),
4342 norepo=True)
4342 norepo=True)
4343 def help_(ui, name=None, **opts):
4343 def help_(ui, name=None, **opts):
4344 """show help for a given topic or a help overview
4344 """show help for a given topic or a help overview
4345
4345
4346 With no arguments, print a list of commands with short help messages.
4346 With no arguments, print a list of commands with short help messages.
4347
4347
4348 Given a topic, extension, or command name, print help for that
4348 Given a topic, extension, or command name, print help for that
4349 topic.
4349 topic.
4350
4350
4351 Returns 0 if successful.
4351 Returns 0 if successful.
4352 """
4352 """
4353
4353
4354 textwidth = min(ui.termwidth(), 80) - 2
4354 textwidth = min(ui.termwidth(), 80) - 2
4355
4355
4356 keep = []
4356 keep = []
4357 if ui.verbose:
4357 if ui.verbose:
4358 keep.append('verbose')
4358 keep.append('verbose')
4359 if sys.platform.startswith('win'):
4359 if sys.platform.startswith('win'):
4360 keep.append('windows')
4360 keep.append('windows')
4361 elif sys.platform == 'OpenVMS':
4361 elif sys.platform == 'OpenVMS':
4362 keep.append('vms')
4362 keep.append('vms')
4363 elif sys.platform == 'plan9':
4363 elif sys.platform == 'plan9':
4364 keep.append('plan9')
4364 keep.append('plan9')
4365 else:
4365 else:
4366 keep.append('unix')
4366 keep.append('unix')
4367 keep.append(sys.platform.lower())
4367 keep.append(sys.platform.lower())
4368
4368
4369 section = None
4369 section = None
4370 subtopic = None
4370 if name and '.' in name:
4371 if name and '.' in name:
4371 name, section = name.split('.', 1)
4372 name, section = name.split('.', 1)
4372 section = section.lower()
4373 section = section.lower()
4373
4374 if '.' in section:
4374 text = help.help_(ui, name, **opts)
4375 subtopic, section = section.split('.', 1)
4376 else:
4377 subtopic = section
4378
4379 text = help.help_(ui, name, subtopic=subtopic, **opts)
4375
4380
4376 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4381 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4377 section=section)
4382 section=section)
4378
4383
4379 # We could have been given a weird ".foo" section without a name
4384 # We could have been given a weird ".foo" section without a name
4380 # to look for, or we could have simply failed to found "foo.bar"
4385 # to look for, or we could have simply failed to found "foo.bar"
4381 # because bar isn't a section of foo
4386 # because bar isn't a section of foo
4382 if section and not (formatted and name):
4387 if section and not (formatted and name):
4383 raise error.Abort(_("help section not found"))
4388 raise error.Abort(_("help section not found"))
4384
4389
4385 if 'verbose' in pruned:
4390 if 'verbose' in pruned:
4386 keep.append('omitted')
4391 keep.append('omitted')
4387 else:
4392 else:
4388 keep.append('notomitted')
4393 keep.append('notomitted')
4389 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4394 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4390 section=section)
4395 section=section)
4391 ui.write(formatted)
4396 ui.write(formatted)
4392
4397
4393
4398
4394 @command('identify|id',
4399 @command('identify|id',
4395 [('r', 'rev', '',
4400 [('r', 'rev', '',
4396 _('identify the specified revision'), _('REV')),
4401 _('identify the specified revision'), _('REV')),
4397 ('n', 'num', None, _('show local revision number')),
4402 ('n', 'num', None, _('show local revision number')),
4398 ('i', 'id', None, _('show global revision id')),
4403 ('i', 'id', None, _('show global revision id')),
4399 ('b', 'branch', None, _('show branch')),
4404 ('b', 'branch', None, _('show branch')),
4400 ('t', 'tags', None, _('show tags')),
4405 ('t', 'tags', None, _('show tags')),
4401 ('B', 'bookmarks', None, _('show bookmarks')),
4406 ('B', 'bookmarks', None, _('show bookmarks')),
4402 ] + remoteopts,
4407 ] + remoteopts,
4403 _('[-nibtB] [-r REV] [SOURCE]'),
4408 _('[-nibtB] [-r REV] [SOURCE]'),
4404 optionalrepo=True)
4409 optionalrepo=True)
4405 def identify(ui, repo, source=None, rev=None,
4410 def identify(ui, repo, source=None, rev=None,
4406 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4411 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4407 """identify the working directory or specified revision
4412 """identify the working directory or specified revision
4408
4413
4409 Print a summary identifying the repository state at REV using one or
4414 Print a summary identifying the repository state at REV using one or
4410 two parent hash identifiers, followed by a "+" if the working
4415 two parent hash identifiers, followed by a "+" if the working
4411 directory has uncommitted changes, the branch name (if not default),
4416 directory has uncommitted changes, the branch name (if not default),
4412 a list of tags, and a list of bookmarks.
4417 a list of tags, and a list of bookmarks.
4413
4418
4414 When REV is not given, print a summary of the current state of the
4419 When REV is not given, print a summary of the current state of the
4415 repository.
4420 repository.
4416
4421
4417 Specifying a path to a repository root or Mercurial bundle will
4422 Specifying a path to a repository root or Mercurial bundle will
4418 cause lookup to operate on that repository/bundle.
4423 cause lookup to operate on that repository/bundle.
4419
4424
4420 .. container:: verbose
4425 .. container:: verbose
4421
4426
4422 Examples:
4427 Examples:
4423
4428
4424 - generate a build identifier for the working directory::
4429 - generate a build identifier for the working directory::
4425
4430
4426 hg id --id > build-id.dat
4431 hg id --id > build-id.dat
4427
4432
4428 - find the revision corresponding to a tag::
4433 - find the revision corresponding to a tag::
4429
4434
4430 hg id -n -r 1.3
4435 hg id -n -r 1.3
4431
4436
4432 - check the most recent revision of a remote repository::
4437 - check the most recent revision of a remote repository::
4433
4438
4434 hg id -r tip http://selenic.com/hg/
4439 hg id -r tip http://selenic.com/hg/
4435
4440
4436 See :hg:`log` for generating more information about specific revisions,
4441 See :hg:`log` for generating more information about specific revisions,
4437 including full hash identifiers.
4442 including full hash identifiers.
4438
4443
4439 Returns 0 if successful.
4444 Returns 0 if successful.
4440 """
4445 """
4441
4446
4442 if not repo and not source:
4447 if not repo and not source:
4443 raise error.Abort(_("there is no Mercurial repository here "
4448 raise error.Abort(_("there is no Mercurial repository here "
4444 "(.hg not found)"))
4449 "(.hg not found)"))
4445
4450
4446 if ui.debugflag:
4451 if ui.debugflag:
4447 hexfunc = hex
4452 hexfunc = hex
4448 else:
4453 else:
4449 hexfunc = short
4454 hexfunc = short
4450 default = not (num or id or branch or tags or bookmarks)
4455 default = not (num or id or branch or tags or bookmarks)
4451 output = []
4456 output = []
4452 revs = []
4457 revs = []
4453
4458
4454 if source:
4459 if source:
4455 source, branches = hg.parseurl(ui.expandpath(source))
4460 source, branches = hg.parseurl(ui.expandpath(source))
4456 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4461 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4457 repo = peer.local()
4462 repo = peer.local()
4458 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4463 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4459
4464
4460 if not repo:
4465 if not repo:
4461 if num or branch or tags:
4466 if num or branch or tags:
4462 raise error.Abort(
4467 raise error.Abort(
4463 _("can't query remote revision number, branch, or tags"))
4468 _("can't query remote revision number, branch, or tags"))
4464 if not rev and revs:
4469 if not rev and revs:
4465 rev = revs[0]
4470 rev = revs[0]
4466 if not rev:
4471 if not rev:
4467 rev = "tip"
4472 rev = "tip"
4468
4473
4469 remoterev = peer.lookup(rev)
4474 remoterev = peer.lookup(rev)
4470 if default or id:
4475 if default or id:
4471 output = [hexfunc(remoterev)]
4476 output = [hexfunc(remoterev)]
4472
4477
4473 def getbms():
4478 def getbms():
4474 bms = []
4479 bms = []
4475
4480
4476 if 'bookmarks' in peer.listkeys('namespaces'):
4481 if 'bookmarks' in peer.listkeys('namespaces'):
4477 hexremoterev = hex(remoterev)
4482 hexremoterev = hex(remoterev)
4478 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4483 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4479 if bmr == hexremoterev]
4484 if bmr == hexremoterev]
4480
4485
4481 return sorted(bms)
4486 return sorted(bms)
4482
4487
4483 if bookmarks:
4488 if bookmarks:
4484 output.extend(getbms())
4489 output.extend(getbms())
4485 elif default and not ui.quiet:
4490 elif default and not ui.quiet:
4486 # multiple bookmarks for a single parent separated by '/'
4491 # multiple bookmarks for a single parent separated by '/'
4487 bm = '/'.join(getbms())
4492 bm = '/'.join(getbms())
4488 if bm:
4493 if bm:
4489 output.append(bm)
4494 output.append(bm)
4490 else:
4495 else:
4491 ctx = scmutil.revsingle(repo, rev, None)
4496 ctx = scmutil.revsingle(repo, rev, None)
4492
4497
4493 if ctx.rev() is None:
4498 if ctx.rev() is None:
4494 ctx = repo[None]
4499 ctx = repo[None]
4495 parents = ctx.parents()
4500 parents = ctx.parents()
4496 taglist = []
4501 taglist = []
4497 for p in parents:
4502 for p in parents:
4498 taglist.extend(p.tags())
4503 taglist.extend(p.tags())
4499
4504
4500 changed = ""
4505 changed = ""
4501 if default or id or num:
4506 if default or id or num:
4502 if (any(repo.status())
4507 if (any(repo.status())
4503 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4508 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4504 changed = '+'
4509 changed = '+'
4505 if default or id:
4510 if default or id:
4506 output = ["%s%s" %
4511 output = ["%s%s" %
4507 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4512 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4508 if num:
4513 if num:
4509 output.append("%s%s" %
4514 output.append("%s%s" %
4510 ('+'.join([str(p.rev()) for p in parents]), changed))
4515 ('+'.join([str(p.rev()) for p in parents]), changed))
4511 else:
4516 else:
4512 if default or id:
4517 if default or id:
4513 output = [hexfunc(ctx.node())]
4518 output = [hexfunc(ctx.node())]
4514 if num:
4519 if num:
4515 output.append(str(ctx.rev()))
4520 output.append(str(ctx.rev()))
4516 taglist = ctx.tags()
4521 taglist = ctx.tags()
4517
4522
4518 if default and not ui.quiet:
4523 if default and not ui.quiet:
4519 b = ctx.branch()
4524 b = ctx.branch()
4520 if b != 'default':
4525 if b != 'default':
4521 output.append("(%s)" % b)
4526 output.append("(%s)" % b)
4522
4527
4523 # multiple tags for a single parent separated by '/'
4528 # multiple tags for a single parent separated by '/'
4524 t = '/'.join(taglist)
4529 t = '/'.join(taglist)
4525 if t:
4530 if t:
4526 output.append(t)
4531 output.append(t)
4527
4532
4528 # multiple bookmarks for a single parent separated by '/'
4533 # multiple bookmarks for a single parent separated by '/'
4529 bm = '/'.join(ctx.bookmarks())
4534 bm = '/'.join(ctx.bookmarks())
4530 if bm:
4535 if bm:
4531 output.append(bm)
4536 output.append(bm)
4532 else:
4537 else:
4533 if branch:
4538 if branch:
4534 output.append(ctx.branch())
4539 output.append(ctx.branch())
4535
4540
4536 if tags:
4541 if tags:
4537 output.extend(taglist)
4542 output.extend(taglist)
4538
4543
4539 if bookmarks:
4544 if bookmarks:
4540 output.extend(ctx.bookmarks())
4545 output.extend(ctx.bookmarks())
4541
4546
4542 ui.write("%s\n" % ' '.join(output))
4547 ui.write("%s\n" % ' '.join(output))
4543
4548
4544 @command('import|patch',
4549 @command('import|patch',
4545 [('p', 'strip', 1,
4550 [('p', 'strip', 1,
4546 _('directory strip option for patch. This has the same '
4551 _('directory strip option for patch. This has the same '
4547 'meaning as the corresponding patch option'), _('NUM')),
4552 'meaning as the corresponding patch option'), _('NUM')),
4548 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4553 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4549 ('e', 'edit', False, _('invoke editor on commit messages')),
4554 ('e', 'edit', False, _('invoke editor on commit messages')),
4550 ('f', 'force', None,
4555 ('f', 'force', None,
4551 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4556 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4552 ('', 'no-commit', None,
4557 ('', 'no-commit', None,
4553 _("don't commit, just update the working directory")),
4558 _("don't commit, just update the working directory")),
4554 ('', 'bypass', None,
4559 ('', 'bypass', None,
4555 _("apply patch without touching the working directory")),
4560 _("apply patch without touching the working directory")),
4556 ('', 'partial', None,
4561 ('', 'partial', None,
4557 _('commit even if some hunks fail')),
4562 _('commit even if some hunks fail')),
4558 ('', 'exact', None,
4563 ('', 'exact', None,
4559 _('apply patch to the nodes from which it was generated')),
4564 _('apply patch to the nodes from which it was generated')),
4560 ('', 'prefix', '',
4565 ('', 'prefix', '',
4561 _('apply patch to subdirectory'), _('DIR')),
4566 _('apply patch to subdirectory'), _('DIR')),
4562 ('', 'import-branch', None,
4567 ('', 'import-branch', None,
4563 _('use any branch information in patch (implied by --exact)'))] +
4568 _('use any branch information in patch (implied by --exact)'))] +
4564 commitopts + commitopts2 + similarityopts,
4569 commitopts + commitopts2 + similarityopts,
4565 _('[OPTION]... PATCH...'))
4570 _('[OPTION]... PATCH...'))
4566 def import_(ui, repo, patch1=None, *patches, **opts):
4571 def import_(ui, repo, patch1=None, *patches, **opts):
4567 """import an ordered set of patches
4572 """import an ordered set of patches
4568
4573
4569 Import a list of patches and commit them individually (unless
4574 Import a list of patches and commit them individually (unless
4570 --no-commit is specified).
4575 --no-commit is specified).
4571
4576
4572 Because import first applies changes to the working directory,
4577 Because import first applies changes to the working directory,
4573 import will abort if there are outstanding changes.
4578 import will abort if there are outstanding changes.
4574
4579
4575 You can import a patch straight from a mail message. Even patches
4580 You can import a patch straight from a mail message. Even patches
4576 as attachments work (to use the body part, it must have type
4581 as attachments work (to use the body part, it must have type
4577 text/plain or text/x-patch). From and Subject headers of email
4582 text/plain or text/x-patch). From and Subject headers of email
4578 message are used as default committer and commit message. All
4583 message are used as default committer and commit message. All
4579 text/plain body parts before first diff are added to commit
4584 text/plain body parts before first diff are added to commit
4580 message.
4585 message.
4581
4586
4582 If the imported patch was generated by :hg:`export`, user and
4587 If the imported patch was generated by :hg:`export`, user and
4583 description from patch override values from message headers and
4588 description from patch override values from message headers and
4584 body. Values given on command line with -m/--message and -u/--user
4589 body. Values given on command line with -m/--message and -u/--user
4585 override these.
4590 override these.
4586
4591
4587 If --exact is specified, import will set the working directory to
4592 If --exact is specified, import will set the working directory to
4588 the parent of each patch before applying it, and will abort if the
4593 the parent of each patch before applying it, and will abort if the
4589 resulting changeset has a different ID than the one recorded in
4594 resulting changeset has a different ID than the one recorded in
4590 the patch. This may happen due to character set problems or other
4595 the patch. This may happen due to character set problems or other
4591 deficiencies in the text patch format.
4596 deficiencies in the text patch format.
4592
4597
4593 Use --bypass to apply and commit patches directly to the
4598 Use --bypass to apply and commit patches directly to the
4594 repository, not touching the working directory. Without --exact,
4599 repository, not touching the working directory. Without --exact,
4595 patches will be applied on top of the working directory parent
4600 patches will be applied on top of the working directory parent
4596 revision.
4601 revision.
4597
4602
4598 With -s/--similarity, hg will attempt to discover renames and
4603 With -s/--similarity, hg will attempt to discover renames and
4599 copies in the patch in the same way as :hg:`addremove`.
4604 copies in the patch in the same way as :hg:`addremove`.
4600
4605
4601 Use --partial to ensure a changeset will be created from the patch
4606 Use --partial to ensure a changeset will be created from the patch
4602 even if some hunks fail to apply. Hunks that fail to apply will be
4607 even if some hunks fail to apply. Hunks that fail to apply will be
4603 written to a <target-file>.rej file. Conflicts can then be resolved
4608 written to a <target-file>.rej file. Conflicts can then be resolved
4604 by hand before :hg:`commit --amend` is run to update the created
4609 by hand before :hg:`commit --amend` is run to update the created
4605 changeset. This flag exists to let people import patches that
4610 changeset. This flag exists to let people import patches that
4606 partially apply without losing the associated metadata (author,
4611 partially apply without losing the associated metadata (author,
4607 date, description, ...). Note that when none of the hunk applies
4612 date, description, ...). Note that when none of the hunk applies
4608 cleanly, :hg:`import --partial` will create an empty changeset,
4613 cleanly, :hg:`import --partial` will create an empty changeset,
4609 importing only the patch metadata.
4614 importing only the patch metadata.
4610
4615
4611 It is possible to use external patch programs to perform the patch
4616 It is possible to use external patch programs to perform the patch
4612 by setting the ``ui.patch`` configuration option. For the default
4617 by setting the ``ui.patch`` configuration option. For the default
4613 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4618 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4614 See :hg:`help config` for more information about configuration
4619 See :hg:`help config` for more information about configuration
4615 files and how to use these options.
4620 files and how to use these options.
4616
4621
4617 To read a patch from standard input, use "-" as the patch name. If
4622 To read a patch from standard input, use "-" as the patch name. If
4618 a URL is specified, the patch will be downloaded from it.
4623 a URL is specified, the patch will be downloaded from it.
4619 See :hg:`help dates` for a list of formats valid for -d/--date.
4624 See :hg:`help dates` for a list of formats valid for -d/--date.
4620
4625
4621 .. container:: verbose
4626 .. container:: verbose
4622
4627
4623 Examples:
4628 Examples:
4624
4629
4625 - import a traditional patch from a website and detect renames::
4630 - import a traditional patch from a website and detect renames::
4626
4631
4627 hg import -s 80 http://example.com/bugfix.patch
4632 hg import -s 80 http://example.com/bugfix.patch
4628
4633
4629 - import a changeset from an hgweb server::
4634 - import a changeset from an hgweb server::
4630
4635
4631 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4636 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4632
4637
4633 - import all the patches in an Unix-style mbox::
4638 - import all the patches in an Unix-style mbox::
4634
4639
4635 hg import incoming-patches.mbox
4640 hg import incoming-patches.mbox
4636
4641
4637 - attempt to exactly restore an exported changeset (not always
4642 - attempt to exactly restore an exported changeset (not always
4638 possible)::
4643 possible)::
4639
4644
4640 hg import --exact proposed-fix.patch
4645 hg import --exact proposed-fix.patch
4641
4646
4642 - use an external tool to apply a patch which is too fuzzy for
4647 - use an external tool to apply a patch which is too fuzzy for
4643 the default internal tool.
4648 the default internal tool.
4644
4649
4645 hg import --config ui.patch="patch --merge" fuzzy.patch
4650 hg import --config ui.patch="patch --merge" fuzzy.patch
4646
4651
4647 - change the default fuzzing from 2 to a less strict 7
4652 - change the default fuzzing from 2 to a less strict 7
4648
4653
4649 hg import --config ui.fuzz=7 fuzz.patch
4654 hg import --config ui.fuzz=7 fuzz.patch
4650
4655
4651 Returns 0 on success, 1 on partial success (see --partial).
4656 Returns 0 on success, 1 on partial success (see --partial).
4652 """
4657 """
4653
4658
4654 if not patch1:
4659 if not patch1:
4655 raise error.Abort(_('need at least one patch to import'))
4660 raise error.Abort(_('need at least one patch to import'))
4656
4661
4657 patches = (patch1,) + patches
4662 patches = (patch1,) + patches
4658
4663
4659 date = opts.get('date')
4664 date = opts.get('date')
4660 if date:
4665 if date:
4661 opts['date'] = util.parsedate(date)
4666 opts['date'] = util.parsedate(date)
4662
4667
4663 update = not opts.get('bypass')
4668 update = not opts.get('bypass')
4664 if not update and opts.get('no_commit'):
4669 if not update and opts.get('no_commit'):
4665 raise error.Abort(_('cannot use --no-commit with --bypass'))
4670 raise error.Abort(_('cannot use --no-commit with --bypass'))
4666 try:
4671 try:
4667 sim = float(opts.get('similarity') or 0)
4672 sim = float(opts.get('similarity') or 0)
4668 except ValueError:
4673 except ValueError:
4669 raise error.Abort(_('similarity must be a number'))
4674 raise error.Abort(_('similarity must be a number'))
4670 if sim < 0 or sim > 100:
4675 if sim < 0 or sim > 100:
4671 raise error.Abort(_('similarity must be between 0 and 100'))
4676 raise error.Abort(_('similarity must be between 0 and 100'))
4672 if sim and not update:
4677 if sim and not update:
4673 raise error.Abort(_('cannot use --similarity with --bypass'))
4678 raise error.Abort(_('cannot use --similarity with --bypass'))
4674 if opts.get('exact') and opts.get('edit'):
4679 if opts.get('exact') and opts.get('edit'):
4675 raise error.Abort(_('cannot use --exact with --edit'))
4680 raise error.Abort(_('cannot use --exact with --edit'))
4676 if opts.get('exact') and opts.get('prefix'):
4681 if opts.get('exact') and opts.get('prefix'):
4677 raise error.Abort(_('cannot use --exact with --prefix'))
4682 raise error.Abort(_('cannot use --exact with --prefix'))
4678
4683
4679 base = opts["base"]
4684 base = opts["base"]
4680 wlock = dsguard = lock = tr = None
4685 wlock = dsguard = lock = tr = None
4681 msgs = []
4686 msgs = []
4682 ret = 0
4687 ret = 0
4683
4688
4684
4689
4685 try:
4690 try:
4686 try:
4691 try:
4687 wlock = repo.wlock()
4692 wlock = repo.wlock()
4688
4693
4689 if update:
4694 if update:
4690 cmdutil.checkunfinished(repo)
4695 cmdutil.checkunfinished(repo)
4691 if (opts.get('exact') or not opts.get('force')) and update:
4696 if (opts.get('exact') or not opts.get('force')) and update:
4692 cmdutil.bailifchanged(repo)
4697 cmdutil.bailifchanged(repo)
4693
4698
4694 if not opts.get('no_commit'):
4699 if not opts.get('no_commit'):
4695 lock = repo.lock()
4700 lock = repo.lock()
4696 tr = repo.transaction('import')
4701 tr = repo.transaction('import')
4697 else:
4702 else:
4698 dsguard = cmdutil.dirstateguard(repo, 'import')
4703 dsguard = cmdutil.dirstateguard(repo, 'import')
4699 parents = repo[None].parents()
4704 parents = repo[None].parents()
4700 for patchurl in patches:
4705 for patchurl in patches:
4701 if patchurl == '-':
4706 if patchurl == '-':
4702 ui.status(_('applying patch from stdin\n'))
4707 ui.status(_('applying patch from stdin\n'))
4703 patchfile = ui.fin
4708 patchfile = ui.fin
4704 patchurl = 'stdin' # for error message
4709 patchurl = 'stdin' # for error message
4705 else:
4710 else:
4706 patchurl = os.path.join(base, patchurl)
4711 patchurl = os.path.join(base, patchurl)
4707 ui.status(_('applying %s\n') % patchurl)
4712 ui.status(_('applying %s\n') % patchurl)
4708 patchfile = hg.openpath(ui, patchurl)
4713 patchfile = hg.openpath(ui, patchurl)
4709
4714
4710 haspatch = False
4715 haspatch = False
4711 for hunk in patch.split(patchfile):
4716 for hunk in patch.split(patchfile):
4712 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4717 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4713 parents, opts,
4718 parents, opts,
4714 msgs, hg.clean)
4719 msgs, hg.clean)
4715 if msg:
4720 if msg:
4716 haspatch = True
4721 haspatch = True
4717 ui.note(msg + '\n')
4722 ui.note(msg + '\n')
4718 if update or opts.get('exact'):
4723 if update or opts.get('exact'):
4719 parents = repo[None].parents()
4724 parents = repo[None].parents()
4720 else:
4725 else:
4721 parents = [repo[node]]
4726 parents = [repo[node]]
4722 if rej:
4727 if rej:
4723 ui.write_err(_("patch applied partially\n"))
4728 ui.write_err(_("patch applied partially\n"))
4724 ui.write_err(_("(fix the .rej files and run "
4729 ui.write_err(_("(fix the .rej files and run "
4725 "`hg commit --amend`)\n"))
4730 "`hg commit --amend`)\n"))
4726 ret = 1
4731 ret = 1
4727 break
4732 break
4728
4733
4729 if not haspatch:
4734 if not haspatch:
4730 raise error.Abort(_('%s: no diffs found') % patchurl)
4735 raise error.Abort(_('%s: no diffs found') % patchurl)
4731
4736
4732 if tr:
4737 if tr:
4733 tr.close()
4738 tr.close()
4734 if msgs:
4739 if msgs:
4735 repo.savecommitmessage('\n* * *\n'.join(msgs))
4740 repo.savecommitmessage('\n* * *\n'.join(msgs))
4736 if dsguard:
4741 if dsguard:
4737 dsguard.close()
4742 dsguard.close()
4738 return ret
4743 return ret
4739 finally:
4744 finally:
4740 # TODO: get rid of this meaningless try/finally enclosing.
4745 # TODO: get rid of this meaningless try/finally enclosing.
4741 # this is kept only to reduce changes in a patch.
4746 # this is kept only to reduce changes in a patch.
4742 pass
4747 pass
4743 finally:
4748 finally:
4744 if tr:
4749 if tr:
4745 tr.release()
4750 tr.release()
4746 release(lock, dsguard, wlock)
4751 release(lock, dsguard, wlock)
4747
4752
4748 @command('incoming|in',
4753 @command('incoming|in',
4749 [('f', 'force', None,
4754 [('f', 'force', None,
4750 _('run even if remote repository is unrelated')),
4755 _('run even if remote repository is unrelated')),
4751 ('n', 'newest-first', None, _('show newest record first')),
4756 ('n', 'newest-first', None, _('show newest record first')),
4752 ('', 'bundle', '',
4757 ('', 'bundle', '',
4753 _('file to store the bundles into'), _('FILE')),
4758 _('file to store the bundles into'), _('FILE')),
4754 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4759 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4755 ('B', 'bookmarks', False, _("compare bookmarks")),
4760 ('B', 'bookmarks', False, _("compare bookmarks")),
4756 ('b', 'branch', [],
4761 ('b', 'branch', [],
4757 _('a specific branch you would like to pull'), _('BRANCH')),
4762 _('a specific branch you would like to pull'), _('BRANCH')),
4758 ] + logopts + remoteopts + subrepoopts,
4763 ] + logopts + remoteopts + subrepoopts,
4759 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
4764 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
4760 def incoming(ui, repo, source="default", **opts):
4765 def incoming(ui, repo, source="default", **opts):
4761 """show new changesets found in source
4766 """show new changesets found in source
4762
4767
4763 Show new changesets found in the specified path/URL or the default
4768 Show new changesets found in the specified path/URL or the default
4764 pull location. These are the changesets that would have been pulled
4769 pull location. These are the changesets that would have been pulled
4765 if a pull at the time you issued this command.
4770 if a pull at the time you issued this command.
4766
4771
4767 See pull for valid source format details.
4772 See pull for valid source format details.
4768
4773
4769 .. container:: verbose
4774 .. container:: verbose
4770
4775
4771 With -B/--bookmarks, the result of bookmark comparison between
4776 With -B/--bookmarks, the result of bookmark comparison between
4772 local and remote repositories is displayed. With -v/--verbose,
4777 local and remote repositories is displayed. With -v/--verbose,
4773 status is also displayed for each bookmark like below::
4778 status is also displayed for each bookmark like below::
4774
4779
4775 BM1 01234567890a added
4780 BM1 01234567890a added
4776 BM2 1234567890ab advanced
4781 BM2 1234567890ab advanced
4777 BM3 234567890abc diverged
4782 BM3 234567890abc diverged
4778 BM4 34567890abcd changed
4783 BM4 34567890abcd changed
4779
4784
4780 The action taken locally when pulling depends on the
4785 The action taken locally when pulling depends on the
4781 status of each bookmark:
4786 status of each bookmark:
4782
4787
4783 :``added``: pull will create it
4788 :``added``: pull will create it
4784 :``advanced``: pull will update it
4789 :``advanced``: pull will update it
4785 :``diverged``: pull will create a divergent bookmark
4790 :``diverged``: pull will create a divergent bookmark
4786 :``changed``: result depends on remote changesets
4791 :``changed``: result depends on remote changesets
4787
4792
4788 From the point of view of pulling behavior, bookmark
4793 From the point of view of pulling behavior, bookmark
4789 existing only in the remote repository are treated as ``added``,
4794 existing only in the remote repository are treated as ``added``,
4790 even if it is in fact locally deleted.
4795 even if it is in fact locally deleted.
4791
4796
4792 .. container:: verbose
4797 .. container:: verbose
4793
4798
4794 For remote repository, using --bundle avoids downloading the
4799 For remote repository, using --bundle avoids downloading the
4795 changesets twice if the incoming is followed by a pull.
4800 changesets twice if the incoming is followed by a pull.
4796
4801
4797 Examples:
4802 Examples:
4798
4803
4799 - show incoming changes with patches and full description::
4804 - show incoming changes with patches and full description::
4800
4805
4801 hg incoming -vp
4806 hg incoming -vp
4802
4807
4803 - show incoming changes excluding merges, store a bundle::
4808 - show incoming changes excluding merges, store a bundle::
4804
4809
4805 hg in -vpM --bundle incoming.hg
4810 hg in -vpM --bundle incoming.hg
4806 hg pull incoming.hg
4811 hg pull incoming.hg
4807
4812
4808 - briefly list changes inside a bundle::
4813 - briefly list changes inside a bundle::
4809
4814
4810 hg in changes.hg -T "{desc|firstline}\\n"
4815 hg in changes.hg -T "{desc|firstline}\\n"
4811
4816
4812 Returns 0 if there are incoming changes, 1 otherwise.
4817 Returns 0 if there are incoming changes, 1 otherwise.
4813 """
4818 """
4814 if opts.get('graph'):
4819 if opts.get('graph'):
4815 cmdutil.checkunsupportedgraphflags([], opts)
4820 cmdutil.checkunsupportedgraphflags([], opts)
4816 def display(other, chlist, displayer):
4821 def display(other, chlist, displayer):
4817 revdag = cmdutil.graphrevs(other, chlist, opts)
4822 revdag = cmdutil.graphrevs(other, chlist, opts)
4818 cmdutil.displaygraph(ui, repo, revdag, displayer,
4823 cmdutil.displaygraph(ui, repo, revdag, displayer,
4819 graphmod.asciiedges)
4824 graphmod.asciiedges)
4820
4825
4821 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4826 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4822 return 0
4827 return 0
4823
4828
4824 if opts.get('bundle') and opts.get('subrepos'):
4829 if opts.get('bundle') and opts.get('subrepos'):
4825 raise error.Abort(_('cannot combine --bundle and --subrepos'))
4830 raise error.Abort(_('cannot combine --bundle and --subrepos'))
4826
4831
4827 if opts.get('bookmarks'):
4832 if opts.get('bookmarks'):
4828 source, branches = hg.parseurl(ui.expandpath(source),
4833 source, branches = hg.parseurl(ui.expandpath(source),
4829 opts.get('branch'))
4834 opts.get('branch'))
4830 other = hg.peer(repo, opts, source)
4835 other = hg.peer(repo, opts, source)
4831 if 'bookmarks' not in other.listkeys('namespaces'):
4836 if 'bookmarks' not in other.listkeys('namespaces'):
4832 ui.warn(_("remote doesn't support bookmarks\n"))
4837 ui.warn(_("remote doesn't support bookmarks\n"))
4833 return 0
4838 return 0
4834 ui.status(_('comparing with %s\n') % util.hidepassword(source))
4839 ui.status(_('comparing with %s\n') % util.hidepassword(source))
4835 return bookmarks.incoming(ui, repo, other)
4840 return bookmarks.incoming(ui, repo, other)
4836
4841
4837 repo._subtoppath = ui.expandpath(source)
4842 repo._subtoppath = ui.expandpath(source)
4838 try:
4843 try:
4839 return hg.incoming(ui, repo, source, opts)
4844 return hg.incoming(ui, repo, source, opts)
4840 finally:
4845 finally:
4841 del repo._subtoppath
4846 del repo._subtoppath
4842
4847
4843
4848
4844 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
4849 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
4845 norepo=True)
4850 norepo=True)
4846 def init(ui, dest=".", **opts):
4851 def init(ui, dest=".", **opts):
4847 """create a new repository in the given directory
4852 """create a new repository in the given directory
4848
4853
4849 Initialize a new repository in the given directory. If the given
4854 Initialize a new repository in the given directory. If the given
4850 directory does not exist, it will be created.
4855 directory does not exist, it will be created.
4851
4856
4852 If no directory is given, the current directory is used.
4857 If no directory is given, the current directory is used.
4853
4858
4854 It is possible to specify an ``ssh://`` URL as the destination.
4859 It is possible to specify an ``ssh://`` URL as the destination.
4855 See :hg:`help urls` for more information.
4860 See :hg:`help urls` for more information.
4856
4861
4857 Returns 0 on success.
4862 Returns 0 on success.
4858 """
4863 """
4859 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4864 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4860
4865
4861 @command('locate',
4866 @command('locate',
4862 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
4867 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
4863 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4868 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4864 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
4869 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
4865 ] + walkopts,
4870 ] + walkopts,
4866 _('[OPTION]... [PATTERN]...'))
4871 _('[OPTION]... [PATTERN]...'))
4867 def locate(ui, repo, *pats, **opts):
4872 def locate(ui, repo, *pats, **opts):
4868 """locate files matching specific patterns (DEPRECATED)
4873 """locate files matching specific patterns (DEPRECATED)
4869
4874
4870 Print files under Mercurial control in the working directory whose
4875 Print files under Mercurial control in the working directory whose
4871 names match the given patterns.
4876 names match the given patterns.
4872
4877
4873 By default, this command searches all directories in the working
4878 By default, this command searches all directories in the working
4874 directory. To search just the current directory and its
4879 directory. To search just the current directory and its
4875 subdirectories, use "--include .".
4880 subdirectories, use "--include .".
4876
4881
4877 If no patterns are given to match, this command prints the names
4882 If no patterns are given to match, this command prints the names
4878 of all files under Mercurial control in the working directory.
4883 of all files under Mercurial control in the working directory.
4879
4884
4880 If you want to feed the output of this command into the "xargs"
4885 If you want to feed the output of this command into the "xargs"
4881 command, use the -0 option to both this command and "xargs". This
4886 command, use the -0 option to both this command and "xargs". This
4882 will avoid the problem of "xargs" treating single filenames that
4887 will avoid the problem of "xargs" treating single filenames that
4883 contain whitespace as multiple filenames.
4888 contain whitespace as multiple filenames.
4884
4889
4885 See :hg:`help files` for a more versatile command.
4890 See :hg:`help files` for a more versatile command.
4886
4891
4887 Returns 0 if a match is found, 1 otherwise.
4892 Returns 0 if a match is found, 1 otherwise.
4888 """
4893 """
4889 if opts.get('print0'):
4894 if opts.get('print0'):
4890 end = '\0'
4895 end = '\0'
4891 else:
4896 else:
4892 end = '\n'
4897 end = '\n'
4893 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
4898 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
4894
4899
4895 ret = 1
4900 ret = 1
4896 ctx = repo[rev]
4901 ctx = repo[rev]
4897 m = scmutil.match(ctx, pats, opts, default='relglob',
4902 m = scmutil.match(ctx, pats, opts, default='relglob',
4898 badfn=lambda x, y: False)
4903 badfn=lambda x, y: False)
4899
4904
4900 for abs in ctx.matches(m):
4905 for abs in ctx.matches(m):
4901 if opts.get('fullpath'):
4906 if opts.get('fullpath'):
4902 ui.write(repo.wjoin(abs), end)
4907 ui.write(repo.wjoin(abs), end)
4903 else:
4908 else:
4904 ui.write(((pats and m.rel(abs)) or abs), end)
4909 ui.write(((pats and m.rel(abs)) or abs), end)
4905 ret = 0
4910 ret = 0
4906
4911
4907 return ret
4912 return ret
4908
4913
4909 @command('^log|history',
4914 @command('^log|history',
4910 [('f', 'follow', None,
4915 [('f', 'follow', None,
4911 _('follow changeset history, or file history across copies and renames')),
4916 _('follow changeset history, or file history across copies and renames')),
4912 ('', 'follow-first', None,
4917 ('', 'follow-first', None,
4913 _('only follow the first parent of merge changesets (DEPRECATED)')),
4918 _('only follow the first parent of merge changesets (DEPRECATED)')),
4914 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
4919 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
4915 ('C', 'copies', None, _('show copied files')),
4920 ('C', 'copies', None, _('show copied files')),
4916 ('k', 'keyword', [],
4921 ('k', 'keyword', [],
4917 _('do case-insensitive search for a given text'), _('TEXT')),
4922 _('do case-insensitive search for a given text'), _('TEXT')),
4918 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
4923 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
4919 ('', 'removed', None, _('include revisions where files were removed')),
4924 ('', 'removed', None, _('include revisions where files were removed')),
4920 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
4925 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
4921 ('u', 'user', [], _('revisions committed by user'), _('USER')),
4926 ('u', 'user', [], _('revisions committed by user'), _('USER')),
4922 ('', 'only-branch', [],
4927 ('', 'only-branch', [],
4923 _('show only changesets within the given named branch (DEPRECATED)'),
4928 _('show only changesets within the given named branch (DEPRECATED)'),
4924 _('BRANCH')),
4929 _('BRANCH')),
4925 ('b', 'branch', [],
4930 ('b', 'branch', [],
4926 _('show changesets within the given named branch'), _('BRANCH')),
4931 _('show changesets within the given named branch'), _('BRANCH')),
4927 ('P', 'prune', [],
4932 ('P', 'prune', [],
4928 _('do not display revision or any of its ancestors'), _('REV')),
4933 _('do not display revision or any of its ancestors'), _('REV')),
4929 ] + logopts + walkopts,
4934 ] + logopts + walkopts,
4930 _('[OPTION]... [FILE]'),
4935 _('[OPTION]... [FILE]'),
4931 inferrepo=True)
4936 inferrepo=True)
4932 def log(ui, repo, *pats, **opts):
4937 def log(ui, repo, *pats, **opts):
4933 """show revision history of entire repository or files
4938 """show revision history of entire repository or files
4934
4939
4935 Print the revision history of the specified files or the entire
4940 Print the revision history of the specified files or the entire
4936 project.
4941 project.
4937
4942
4938 If no revision range is specified, the default is ``tip:0`` unless
4943 If no revision range is specified, the default is ``tip:0`` unless
4939 --follow is set, in which case the working directory parent is
4944 --follow is set, in which case the working directory parent is
4940 used as the starting revision.
4945 used as the starting revision.
4941
4946
4942 File history is shown without following rename or copy history of
4947 File history is shown without following rename or copy history of
4943 files. Use -f/--follow with a filename to follow history across
4948 files. Use -f/--follow with a filename to follow history across
4944 renames and copies. --follow without a filename will only show
4949 renames and copies. --follow without a filename will only show
4945 ancestors or descendants of the starting revision.
4950 ancestors or descendants of the starting revision.
4946
4951
4947 By default this command prints revision number and changeset id,
4952 By default this command prints revision number and changeset id,
4948 tags, non-trivial parents, user, date and time, and a summary for
4953 tags, non-trivial parents, user, date and time, and a summary for
4949 each commit. When the -v/--verbose switch is used, the list of
4954 each commit. When the -v/--verbose switch is used, the list of
4950 changed files and full commit message are shown.
4955 changed files and full commit message are shown.
4951
4956
4952 With --graph the revisions are shown as an ASCII art DAG with the most
4957 With --graph the revisions are shown as an ASCII art DAG with the most
4953 recent changeset at the top.
4958 recent changeset at the top.
4954 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
4959 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
4955 and '+' represents a fork where the changeset from the lines below is a
4960 and '+' represents a fork where the changeset from the lines below is a
4956 parent of the 'o' merge on the same line.
4961 parent of the 'o' merge on the same line.
4957
4962
4958 .. note::
4963 .. note::
4959
4964
4960 log -p/--patch may generate unexpected diff output for merge
4965 log -p/--patch may generate unexpected diff output for merge
4961 changesets, as it will only compare the merge changeset against
4966 changesets, as it will only compare the merge changeset against
4962 its first parent. Also, only files different from BOTH parents
4967 its first parent. Also, only files different from BOTH parents
4963 will appear in files:.
4968 will appear in files:.
4964
4969
4965 .. note::
4970 .. note::
4966
4971
4967 for performance reasons, log FILE may omit duplicate changes
4972 for performance reasons, log FILE may omit duplicate changes
4968 made on branches and will not show removals or mode changes. To
4973 made on branches and will not show removals or mode changes. To
4969 see all such changes, use the --removed switch.
4974 see all such changes, use the --removed switch.
4970
4975
4971 .. container:: verbose
4976 .. container:: verbose
4972
4977
4973 Some examples:
4978 Some examples:
4974
4979
4975 - changesets with full descriptions and file lists::
4980 - changesets with full descriptions and file lists::
4976
4981
4977 hg log -v
4982 hg log -v
4978
4983
4979 - changesets ancestral to the working directory::
4984 - changesets ancestral to the working directory::
4980
4985
4981 hg log -f
4986 hg log -f
4982
4987
4983 - last 10 commits on the current branch::
4988 - last 10 commits on the current branch::
4984
4989
4985 hg log -l 10 -b .
4990 hg log -l 10 -b .
4986
4991
4987 - changesets showing all modifications of a file, including removals::
4992 - changesets showing all modifications of a file, including removals::
4988
4993
4989 hg log --removed file.c
4994 hg log --removed file.c
4990
4995
4991 - all changesets that touch a directory, with diffs, excluding merges::
4996 - all changesets that touch a directory, with diffs, excluding merges::
4992
4997
4993 hg log -Mp lib/
4998 hg log -Mp lib/
4994
4999
4995 - all revision numbers that match a keyword::
5000 - all revision numbers that match a keyword::
4996
5001
4997 hg log -k bug --template "{rev}\\n"
5002 hg log -k bug --template "{rev}\\n"
4998
5003
4999 - the full hash identifier of the working directory parent::
5004 - the full hash identifier of the working directory parent::
5000
5005
5001 hg log -r . --template "{node}\\n"
5006 hg log -r . --template "{node}\\n"
5002
5007
5003 - list available log templates::
5008 - list available log templates::
5004
5009
5005 hg log -T list
5010 hg log -T list
5006
5011
5007 - check if a given changeset is included in a tagged release::
5012 - check if a given changeset is included in a tagged release::
5008
5013
5009 hg log -r "a21ccf and ancestor(1.9)"
5014 hg log -r "a21ccf and ancestor(1.9)"
5010
5015
5011 - find all changesets by some user in a date range::
5016 - find all changesets by some user in a date range::
5012
5017
5013 hg log -k alice -d "may 2008 to jul 2008"
5018 hg log -k alice -d "may 2008 to jul 2008"
5014
5019
5015 - summary of all changesets after the last tag::
5020 - summary of all changesets after the last tag::
5016
5021
5017 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5022 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5018
5023
5019 See :hg:`help dates` for a list of formats valid for -d/--date.
5024 See :hg:`help dates` for a list of formats valid for -d/--date.
5020
5025
5021 See :hg:`help revisions` and :hg:`help revsets` for more about
5026 See :hg:`help revisions` and :hg:`help revsets` for more about
5022 specifying revisions.
5027 specifying revisions.
5023
5028
5024 See :hg:`help templates` for more about pre-packaged styles and
5029 See :hg:`help templates` for more about pre-packaged styles and
5025 specifying custom templates.
5030 specifying custom templates.
5026
5031
5027 Returns 0 on success.
5032 Returns 0 on success.
5028
5033
5029 """
5034 """
5030 if opts.get('follow') and opts.get('rev'):
5035 if opts.get('follow') and opts.get('rev'):
5031 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5036 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5032 del opts['follow']
5037 del opts['follow']
5033
5038
5034 if opts.get('graph'):
5039 if opts.get('graph'):
5035 return cmdutil.graphlog(ui, repo, *pats, **opts)
5040 return cmdutil.graphlog(ui, repo, *pats, **opts)
5036
5041
5037 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5042 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5038 limit = cmdutil.loglimit(opts)
5043 limit = cmdutil.loglimit(opts)
5039 count = 0
5044 count = 0
5040
5045
5041 getrenamed = None
5046 getrenamed = None
5042 if opts.get('copies'):
5047 if opts.get('copies'):
5043 endrev = None
5048 endrev = None
5044 if opts.get('rev'):
5049 if opts.get('rev'):
5045 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5050 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5046 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5051 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5047
5052
5048 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5053 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5049 for rev in revs:
5054 for rev in revs:
5050 if count == limit:
5055 if count == limit:
5051 break
5056 break
5052 ctx = repo[rev]
5057 ctx = repo[rev]
5053 copies = None
5058 copies = None
5054 if getrenamed is not None and rev:
5059 if getrenamed is not None and rev:
5055 copies = []
5060 copies = []
5056 for fn in ctx.files():
5061 for fn in ctx.files():
5057 rename = getrenamed(fn, rev)
5062 rename = getrenamed(fn, rev)
5058 if rename:
5063 if rename:
5059 copies.append((fn, rename[0]))
5064 copies.append((fn, rename[0]))
5060 if filematcher:
5065 if filematcher:
5061 revmatchfn = filematcher(ctx.rev())
5066 revmatchfn = filematcher(ctx.rev())
5062 else:
5067 else:
5063 revmatchfn = None
5068 revmatchfn = None
5064 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5069 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5065 if displayer.flush(ctx):
5070 if displayer.flush(ctx):
5066 count += 1
5071 count += 1
5067
5072
5068 displayer.close()
5073 displayer.close()
5069
5074
5070 @command('manifest',
5075 @command('manifest',
5071 [('r', 'rev', '', _('revision to display'), _('REV')),
5076 [('r', 'rev', '', _('revision to display'), _('REV')),
5072 ('', 'all', False, _("list files from all revisions"))]
5077 ('', 'all', False, _("list files from all revisions"))]
5073 + formatteropts,
5078 + formatteropts,
5074 _('[-r REV]'))
5079 _('[-r REV]'))
5075 def manifest(ui, repo, node=None, rev=None, **opts):
5080 def manifest(ui, repo, node=None, rev=None, **opts):
5076 """output the current or given revision of the project manifest
5081 """output the current or given revision of the project manifest
5077
5082
5078 Print a list of version controlled files for the given revision.
5083 Print a list of version controlled files for the given revision.
5079 If no revision is given, the first parent of the working directory
5084 If no revision is given, the first parent of the working directory
5080 is used, or the null revision if no revision is checked out.
5085 is used, or the null revision if no revision is checked out.
5081
5086
5082 With -v, print file permissions, symlink and executable bits.
5087 With -v, print file permissions, symlink and executable bits.
5083 With --debug, print file revision hashes.
5088 With --debug, print file revision hashes.
5084
5089
5085 If option --all is specified, the list of all files from all revisions
5090 If option --all is specified, the list of all files from all revisions
5086 is printed. This includes deleted and renamed files.
5091 is printed. This includes deleted and renamed files.
5087
5092
5088 Returns 0 on success.
5093 Returns 0 on success.
5089 """
5094 """
5090
5095
5091 fm = ui.formatter('manifest', opts)
5096 fm = ui.formatter('manifest', opts)
5092
5097
5093 if opts.get('all'):
5098 if opts.get('all'):
5094 if rev or node:
5099 if rev or node:
5095 raise error.Abort(_("can't specify a revision with --all"))
5100 raise error.Abort(_("can't specify a revision with --all"))
5096
5101
5097 res = []
5102 res = []
5098 prefix = "data/"
5103 prefix = "data/"
5099 suffix = ".i"
5104 suffix = ".i"
5100 plen = len(prefix)
5105 plen = len(prefix)
5101 slen = len(suffix)
5106 slen = len(suffix)
5102 lock = repo.lock()
5107 lock = repo.lock()
5103 try:
5108 try:
5104 for fn, b, size in repo.store.datafiles():
5109 for fn, b, size in repo.store.datafiles():
5105 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5110 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5106 res.append(fn[plen:-slen])
5111 res.append(fn[plen:-slen])
5107 finally:
5112 finally:
5108 lock.release()
5113 lock.release()
5109 for f in res:
5114 for f in res:
5110 fm.startitem()
5115 fm.startitem()
5111 fm.write("path", '%s\n', f)
5116 fm.write("path", '%s\n', f)
5112 fm.end()
5117 fm.end()
5113 return
5118 return
5114
5119
5115 if rev and node:
5120 if rev and node:
5116 raise error.Abort(_("please specify just one revision"))
5121 raise error.Abort(_("please specify just one revision"))
5117
5122
5118 if not node:
5123 if not node:
5119 node = rev
5124 node = rev
5120
5125
5121 char = {'l': '@', 'x': '*', '': ''}
5126 char = {'l': '@', 'x': '*', '': ''}
5122 mode = {'l': '644', 'x': '755', '': '644'}
5127 mode = {'l': '644', 'x': '755', '': '644'}
5123 ctx = scmutil.revsingle(repo, node)
5128 ctx = scmutil.revsingle(repo, node)
5124 mf = ctx.manifest()
5129 mf = ctx.manifest()
5125 for f in ctx:
5130 for f in ctx:
5126 fm.startitem()
5131 fm.startitem()
5127 fl = ctx[f].flags()
5132 fl = ctx[f].flags()
5128 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5133 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5129 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5134 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5130 fm.write('path', '%s\n', f)
5135 fm.write('path', '%s\n', f)
5131 fm.end()
5136 fm.end()
5132
5137
5133 @command('^merge',
5138 @command('^merge',
5134 [('f', 'force', None,
5139 [('f', 'force', None,
5135 _('force a merge including outstanding changes (DEPRECATED)')),
5140 _('force a merge including outstanding changes (DEPRECATED)')),
5136 ('r', 'rev', '', _('revision to merge'), _('REV')),
5141 ('r', 'rev', '', _('revision to merge'), _('REV')),
5137 ('P', 'preview', None,
5142 ('P', 'preview', None,
5138 _('review revisions to merge (no merge is performed)'))
5143 _('review revisions to merge (no merge is performed)'))
5139 ] + mergetoolopts,
5144 ] + mergetoolopts,
5140 _('[-P] [-f] [[-r] REV]'))
5145 _('[-P] [-f] [[-r] REV]'))
5141 def merge(ui, repo, node=None, **opts):
5146 def merge(ui, repo, node=None, **opts):
5142 """merge another revision into working directory
5147 """merge another revision into working directory
5143
5148
5144 The current working directory is updated with all changes made in
5149 The current working directory is updated with all changes made in
5145 the requested revision since the last common predecessor revision.
5150 the requested revision since the last common predecessor revision.
5146
5151
5147 Files that changed between either parent are marked as changed for
5152 Files that changed between either parent are marked as changed for
5148 the next commit and a commit must be performed before any further
5153 the next commit and a commit must be performed before any further
5149 updates to the repository are allowed. The next commit will have
5154 updates to the repository are allowed. The next commit will have
5150 two parents.
5155 two parents.
5151
5156
5152 ``--tool`` can be used to specify the merge tool used for file
5157 ``--tool`` can be used to specify the merge tool used for file
5153 merges. It overrides the HGMERGE environment variable and your
5158 merges. It overrides the HGMERGE environment variable and your
5154 configuration files. See :hg:`help merge-tools` for options.
5159 configuration files. See :hg:`help merge-tools` for options.
5155
5160
5156 If no revision is specified, the working directory's parent is a
5161 If no revision is specified, the working directory's parent is a
5157 head revision, and the current branch contains exactly one other
5162 head revision, and the current branch contains exactly one other
5158 head, the other head is merged with by default. Otherwise, an
5163 head, the other head is merged with by default. Otherwise, an
5159 explicit revision with which to merge with must be provided.
5164 explicit revision with which to merge with must be provided.
5160
5165
5161 :hg:`resolve` must be used to resolve unresolved files.
5166 :hg:`resolve` must be used to resolve unresolved files.
5162
5167
5163 To undo an uncommitted merge, use :hg:`update --clean .` which
5168 To undo an uncommitted merge, use :hg:`update --clean .` which
5164 will check out a clean copy of the original merge parent, losing
5169 will check out a clean copy of the original merge parent, losing
5165 all changes.
5170 all changes.
5166
5171
5167 Returns 0 on success, 1 if there are unresolved files.
5172 Returns 0 on success, 1 if there are unresolved files.
5168 """
5173 """
5169
5174
5170 if opts.get('rev') and node:
5175 if opts.get('rev') and node:
5171 raise error.Abort(_("please specify just one revision"))
5176 raise error.Abort(_("please specify just one revision"))
5172 if not node:
5177 if not node:
5173 node = opts.get('rev')
5178 node = opts.get('rev')
5174
5179
5175 if node:
5180 if node:
5176 node = scmutil.revsingle(repo, node).node()
5181 node = scmutil.revsingle(repo, node).node()
5177
5182
5178 if not node:
5183 if not node:
5179 node = repo[destutil.destmerge(repo)].node()
5184 node = repo[destutil.destmerge(repo)].node()
5180
5185
5181 if opts.get('preview'):
5186 if opts.get('preview'):
5182 # find nodes that are ancestors of p2 but not of p1
5187 # find nodes that are ancestors of p2 but not of p1
5183 p1 = repo.lookup('.')
5188 p1 = repo.lookup('.')
5184 p2 = repo.lookup(node)
5189 p2 = repo.lookup(node)
5185 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5190 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5186
5191
5187 displayer = cmdutil.show_changeset(ui, repo, opts)
5192 displayer = cmdutil.show_changeset(ui, repo, opts)
5188 for node in nodes:
5193 for node in nodes:
5189 displayer.show(repo[node])
5194 displayer.show(repo[node])
5190 displayer.close()
5195 displayer.close()
5191 return 0
5196 return 0
5192
5197
5193 try:
5198 try:
5194 # ui.forcemerge is an internal variable, do not document
5199 # ui.forcemerge is an internal variable, do not document
5195 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5200 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5196 return hg.merge(repo, node, force=opts.get('force'))
5201 return hg.merge(repo, node, force=opts.get('force'))
5197 finally:
5202 finally:
5198 ui.setconfig('ui', 'forcemerge', '', 'merge')
5203 ui.setconfig('ui', 'forcemerge', '', 'merge')
5199
5204
5200 @command('outgoing|out',
5205 @command('outgoing|out',
5201 [('f', 'force', None, _('run even when the destination is unrelated')),
5206 [('f', 'force', None, _('run even when the destination is unrelated')),
5202 ('r', 'rev', [],
5207 ('r', 'rev', [],
5203 _('a changeset intended to be included in the destination'), _('REV')),
5208 _('a changeset intended to be included in the destination'), _('REV')),
5204 ('n', 'newest-first', None, _('show newest record first')),
5209 ('n', 'newest-first', None, _('show newest record first')),
5205 ('B', 'bookmarks', False, _('compare bookmarks')),
5210 ('B', 'bookmarks', False, _('compare bookmarks')),
5206 ('b', 'branch', [], _('a specific branch you would like to push'),
5211 ('b', 'branch', [], _('a specific branch you would like to push'),
5207 _('BRANCH')),
5212 _('BRANCH')),
5208 ] + logopts + remoteopts + subrepoopts,
5213 ] + logopts + remoteopts + subrepoopts,
5209 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5214 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5210 def outgoing(ui, repo, dest=None, **opts):
5215 def outgoing(ui, repo, dest=None, **opts):
5211 """show changesets not found in the destination
5216 """show changesets not found in the destination
5212
5217
5213 Show changesets not found in the specified destination repository
5218 Show changesets not found in the specified destination repository
5214 or the default push location. These are the changesets that would
5219 or the default push location. These are the changesets that would
5215 be pushed if a push was requested.
5220 be pushed if a push was requested.
5216
5221
5217 See pull for details of valid destination formats.
5222 See pull for details of valid destination formats.
5218
5223
5219 .. container:: verbose
5224 .. container:: verbose
5220
5225
5221 With -B/--bookmarks, the result of bookmark comparison between
5226 With -B/--bookmarks, the result of bookmark comparison between
5222 local and remote repositories is displayed. With -v/--verbose,
5227 local and remote repositories is displayed. With -v/--verbose,
5223 status is also displayed for each bookmark like below::
5228 status is also displayed for each bookmark like below::
5224
5229
5225 BM1 01234567890a added
5230 BM1 01234567890a added
5226 BM2 deleted
5231 BM2 deleted
5227 BM3 234567890abc advanced
5232 BM3 234567890abc advanced
5228 BM4 34567890abcd diverged
5233 BM4 34567890abcd diverged
5229 BM5 4567890abcde changed
5234 BM5 4567890abcde changed
5230
5235
5231 The action taken when pushing depends on the
5236 The action taken when pushing depends on the
5232 status of each bookmark:
5237 status of each bookmark:
5233
5238
5234 :``added``: push with ``-B`` will create it
5239 :``added``: push with ``-B`` will create it
5235 :``deleted``: push with ``-B`` will delete it
5240 :``deleted``: push with ``-B`` will delete it
5236 :``advanced``: push will update it
5241 :``advanced``: push will update it
5237 :``diverged``: push with ``-B`` will update it
5242 :``diverged``: push with ``-B`` will update it
5238 :``changed``: push with ``-B`` will update it
5243 :``changed``: push with ``-B`` will update it
5239
5244
5240 From the point of view of pushing behavior, bookmarks
5245 From the point of view of pushing behavior, bookmarks
5241 existing only in the remote repository are treated as
5246 existing only in the remote repository are treated as
5242 ``deleted``, even if it is in fact added remotely.
5247 ``deleted``, even if it is in fact added remotely.
5243
5248
5244 Returns 0 if there are outgoing changes, 1 otherwise.
5249 Returns 0 if there are outgoing changes, 1 otherwise.
5245 """
5250 """
5246 if opts.get('graph'):
5251 if opts.get('graph'):
5247 cmdutil.checkunsupportedgraphflags([], opts)
5252 cmdutil.checkunsupportedgraphflags([], opts)
5248 o, other = hg._outgoing(ui, repo, dest, opts)
5253 o, other = hg._outgoing(ui, repo, dest, opts)
5249 if not o:
5254 if not o:
5250 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5255 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5251 return
5256 return
5252
5257
5253 revdag = cmdutil.graphrevs(repo, o, opts)
5258 revdag = cmdutil.graphrevs(repo, o, opts)
5254 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5259 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5255 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5260 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5256 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5261 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5257 return 0
5262 return 0
5258
5263
5259 if opts.get('bookmarks'):
5264 if opts.get('bookmarks'):
5260 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5265 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5261 dest, branches = hg.parseurl(dest, opts.get('branch'))
5266 dest, branches = hg.parseurl(dest, opts.get('branch'))
5262 other = hg.peer(repo, opts, dest)
5267 other = hg.peer(repo, opts, dest)
5263 if 'bookmarks' not in other.listkeys('namespaces'):
5268 if 'bookmarks' not in other.listkeys('namespaces'):
5264 ui.warn(_("remote doesn't support bookmarks\n"))
5269 ui.warn(_("remote doesn't support bookmarks\n"))
5265 return 0
5270 return 0
5266 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5271 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5267 return bookmarks.outgoing(ui, repo, other)
5272 return bookmarks.outgoing(ui, repo, other)
5268
5273
5269 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5274 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5270 try:
5275 try:
5271 return hg.outgoing(ui, repo, dest, opts)
5276 return hg.outgoing(ui, repo, dest, opts)
5272 finally:
5277 finally:
5273 del repo._subtoppath
5278 del repo._subtoppath
5274
5279
5275 @command('parents',
5280 @command('parents',
5276 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5281 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5277 ] + templateopts,
5282 ] + templateopts,
5278 _('[-r REV] [FILE]'),
5283 _('[-r REV] [FILE]'),
5279 inferrepo=True)
5284 inferrepo=True)
5280 def parents(ui, repo, file_=None, **opts):
5285 def parents(ui, repo, file_=None, **opts):
5281 """show the parents of the working directory or revision (DEPRECATED)
5286 """show the parents of the working directory or revision (DEPRECATED)
5282
5287
5283 Print the working directory's parent revisions. If a revision is
5288 Print the working directory's parent revisions. If a revision is
5284 given via -r/--rev, the parent of that revision will be printed.
5289 given via -r/--rev, the parent of that revision will be printed.
5285 If a file argument is given, the revision in which the file was
5290 If a file argument is given, the revision in which the file was
5286 last changed (before the working directory revision or the
5291 last changed (before the working directory revision or the
5287 argument to --rev if given) is printed.
5292 argument to --rev if given) is printed.
5288
5293
5289 This command is equivalent to::
5294 This command is equivalent to::
5290
5295
5291 hg log -r "parents()" or
5296 hg log -r "parents()" or
5292 hg log -r "parents(REV)" or
5297 hg log -r "parents(REV)" or
5293 hg log -r "max(file(FILE))" or
5298 hg log -r "max(file(FILE))" or
5294 hg log -r "max(::REV and file(FILE))"
5299 hg log -r "max(::REV and file(FILE))"
5295
5300
5296 See :hg:`summary` and :hg:`help revsets` for related information.
5301 See :hg:`summary` and :hg:`help revsets` for related information.
5297
5302
5298 Returns 0 on success.
5303 Returns 0 on success.
5299 """
5304 """
5300
5305
5301 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5306 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5302
5307
5303 if file_:
5308 if file_:
5304 m = scmutil.match(ctx, (file_,), opts)
5309 m = scmutil.match(ctx, (file_,), opts)
5305 if m.anypats() or len(m.files()) != 1:
5310 if m.anypats() or len(m.files()) != 1:
5306 raise error.Abort(_('can only specify an explicit filename'))
5311 raise error.Abort(_('can only specify an explicit filename'))
5307 file_ = m.files()[0]
5312 file_ = m.files()[0]
5308 filenodes = []
5313 filenodes = []
5309 for cp in ctx.parents():
5314 for cp in ctx.parents():
5310 if not cp:
5315 if not cp:
5311 continue
5316 continue
5312 try:
5317 try:
5313 filenodes.append(cp.filenode(file_))
5318 filenodes.append(cp.filenode(file_))
5314 except error.LookupError:
5319 except error.LookupError:
5315 pass
5320 pass
5316 if not filenodes:
5321 if not filenodes:
5317 raise error.Abort(_("'%s' not found in manifest!") % file_)
5322 raise error.Abort(_("'%s' not found in manifest!") % file_)
5318 p = []
5323 p = []
5319 for fn in filenodes:
5324 for fn in filenodes:
5320 fctx = repo.filectx(file_, fileid=fn)
5325 fctx = repo.filectx(file_, fileid=fn)
5321 p.append(fctx.node())
5326 p.append(fctx.node())
5322 else:
5327 else:
5323 p = [cp.node() for cp in ctx.parents()]
5328 p = [cp.node() for cp in ctx.parents()]
5324
5329
5325 displayer = cmdutil.show_changeset(ui, repo, opts)
5330 displayer = cmdutil.show_changeset(ui, repo, opts)
5326 for n in p:
5331 for n in p:
5327 if n != nullid:
5332 if n != nullid:
5328 displayer.show(repo[n])
5333 displayer.show(repo[n])
5329 displayer.close()
5334 displayer.close()
5330
5335
5331 @command('paths', [], _('[NAME]'), optionalrepo=True)
5336 @command('paths', [], _('[NAME]'), optionalrepo=True)
5332 def paths(ui, repo, search=None):
5337 def paths(ui, repo, search=None):
5333 """show aliases for remote repositories
5338 """show aliases for remote repositories
5334
5339
5335 Show definition of symbolic path name NAME. If no name is given,
5340 Show definition of symbolic path name NAME. If no name is given,
5336 show definition of all available names.
5341 show definition of all available names.
5337
5342
5338 Option -q/--quiet suppresses all output when searching for NAME
5343 Option -q/--quiet suppresses all output when searching for NAME
5339 and shows only the path names when listing all definitions.
5344 and shows only the path names when listing all definitions.
5340
5345
5341 Path names are defined in the [paths] section of your
5346 Path names are defined in the [paths] section of your
5342 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5347 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5343 repository, ``.hg/hgrc`` is used, too.
5348 repository, ``.hg/hgrc`` is used, too.
5344
5349
5345 The path names ``default`` and ``default-push`` have a special
5350 The path names ``default`` and ``default-push`` have a special
5346 meaning. When performing a push or pull operation, they are used
5351 meaning. When performing a push or pull operation, they are used
5347 as fallbacks if no location is specified on the command-line.
5352 as fallbacks if no location is specified on the command-line.
5348 When ``default-push`` is set, it will be used for push and
5353 When ``default-push`` is set, it will be used for push and
5349 ``default`` will be used for pull; otherwise ``default`` is used
5354 ``default`` will be used for pull; otherwise ``default`` is used
5350 as the fallback for both. When cloning a repository, the clone
5355 as the fallback for both. When cloning a repository, the clone
5351 source is written as ``default`` in ``.hg/hgrc``. Note that
5356 source is written as ``default`` in ``.hg/hgrc``. Note that
5352 ``default`` and ``default-push`` apply to all inbound (e.g.
5357 ``default`` and ``default-push`` apply to all inbound (e.g.
5353 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
5358 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
5354 :hg:`bundle`) operations.
5359 :hg:`bundle`) operations.
5355
5360
5356 See :hg:`help urls` for more information.
5361 See :hg:`help urls` for more information.
5357
5362
5358 Returns 0 on success.
5363 Returns 0 on success.
5359 """
5364 """
5360 if search:
5365 if search:
5361 for name, path in sorted(ui.paths.iteritems()):
5366 for name, path in sorted(ui.paths.iteritems()):
5362 if name == search:
5367 if name == search:
5363 ui.status("%s\n" % util.hidepassword(path.rawloc))
5368 ui.status("%s\n" % util.hidepassword(path.rawloc))
5364 return
5369 return
5365 if not ui.quiet:
5370 if not ui.quiet:
5366 ui.warn(_("not found!\n"))
5371 ui.warn(_("not found!\n"))
5367 return 1
5372 return 1
5368 else:
5373 else:
5369 for name, path in sorted(ui.paths.iteritems()):
5374 for name, path in sorted(ui.paths.iteritems()):
5370 if ui.quiet:
5375 if ui.quiet:
5371 ui.write("%s\n" % name)
5376 ui.write("%s\n" % name)
5372 else:
5377 else:
5373 ui.write("%s = %s\n" % (name,
5378 ui.write("%s = %s\n" % (name,
5374 util.hidepassword(path.rawloc)))
5379 util.hidepassword(path.rawloc)))
5375 for subopt, value in sorted(path.suboptions.items()):
5380 for subopt, value in sorted(path.suboptions.items()):
5376 ui.write('%s:%s = %s\n' % (name, subopt, value))
5381 ui.write('%s:%s = %s\n' % (name, subopt, value))
5377
5382
5378 @command('phase',
5383 @command('phase',
5379 [('p', 'public', False, _('set changeset phase to public')),
5384 [('p', 'public', False, _('set changeset phase to public')),
5380 ('d', 'draft', False, _('set changeset phase to draft')),
5385 ('d', 'draft', False, _('set changeset phase to draft')),
5381 ('s', 'secret', False, _('set changeset phase to secret')),
5386 ('s', 'secret', False, _('set changeset phase to secret')),
5382 ('f', 'force', False, _('allow to move boundary backward')),
5387 ('f', 'force', False, _('allow to move boundary backward')),
5383 ('r', 'rev', [], _('target revision'), _('REV')),
5388 ('r', 'rev', [], _('target revision'), _('REV')),
5384 ],
5389 ],
5385 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5390 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5386 def phase(ui, repo, *revs, **opts):
5391 def phase(ui, repo, *revs, **opts):
5387 """set or show the current phase name
5392 """set or show the current phase name
5388
5393
5389 With no argument, show the phase name of the current revision(s).
5394 With no argument, show the phase name of the current revision(s).
5390
5395
5391 With one of -p/--public, -d/--draft or -s/--secret, change the
5396 With one of -p/--public, -d/--draft or -s/--secret, change the
5392 phase value of the specified revisions.
5397 phase value of the specified revisions.
5393
5398
5394 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5399 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5395 lower phase to an higher phase. Phases are ordered as follows::
5400 lower phase to an higher phase. Phases are ordered as follows::
5396
5401
5397 public < draft < secret
5402 public < draft < secret
5398
5403
5399 Returns 0 on success, 1 if some phases could not be changed.
5404 Returns 0 on success, 1 if some phases could not be changed.
5400
5405
5401 (For more information about the phases concept, see :hg:`help phases`.)
5406 (For more information about the phases concept, see :hg:`help phases`.)
5402 """
5407 """
5403 # search for a unique phase argument
5408 # search for a unique phase argument
5404 targetphase = None
5409 targetphase = None
5405 for idx, name in enumerate(phases.phasenames):
5410 for idx, name in enumerate(phases.phasenames):
5406 if opts[name]:
5411 if opts[name]:
5407 if targetphase is not None:
5412 if targetphase is not None:
5408 raise error.Abort(_('only one phase can be specified'))
5413 raise error.Abort(_('only one phase can be specified'))
5409 targetphase = idx
5414 targetphase = idx
5410
5415
5411 # look for specified revision
5416 # look for specified revision
5412 revs = list(revs)
5417 revs = list(revs)
5413 revs.extend(opts['rev'])
5418 revs.extend(opts['rev'])
5414 if not revs:
5419 if not revs:
5415 # display both parents as the second parent phase can influence
5420 # display both parents as the second parent phase can influence
5416 # the phase of a merge commit
5421 # the phase of a merge commit
5417 revs = [c.rev() for c in repo[None].parents()]
5422 revs = [c.rev() for c in repo[None].parents()]
5418
5423
5419 revs = scmutil.revrange(repo, revs)
5424 revs = scmutil.revrange(repo, revs)
5420
5425
5421 lock = None
5426 lock = None
5422 ret = 0
5427 ret = 0
5423 if targetphase is None:
5428 if targetphase is None:
5424 # display
5429 # display
5425 for r in revs:
5430 for r in revs:
5426 ctx = repo[r]
5431 ctx = repo[r]
5427 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5432 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5428 else:
5433 else:
5429 tr = None
5434 tr = None
5430 lock = repo.lock()
5435 lock = repo.lock()
5431 try:
5436 try:
5432 tr = repo.transaction("phase")
5437 tr = repo.transaction("phase")
5433 # set phase
5438 # set phase
5434 if not revs:
5439 if not revs:
5435 raise error.Abort(_('empty revision set'))
5440 raise error.Abort(_('empty revision set'))
5436 nodes = [repo[r].node() for r in revs]
5441 nodes = [repo[r].node() for r in revs]
5437 # moving revision from public to draft may hide them
5442 # moving revision from public to draft may hide them
5438 # We have to check result on an unfiltered repository
5443 # We have to check result on an unfiltered repository
5439 unfi = repo.unfiltered()
5444 unfi = repo.unfiltered()
5440 getphase = unfi._phasecache.phase
5445 getphase = unfi._phasecache.phase
5441 olddata = [getphase(unfi, r) for r in unfi]
5446 olddata = [getphase(unfi, r) for r in unfi]
5442 phases.advanceboundary(repo, tr, targetphase, nodes)
5447 phases.advanceboundary(repo, tr, targetphase, nodes)
5443 if opts['force']:
5448 if opts['force']:
5444 phases.retractboundary(repo, tr, targetphase, nodes)
5449 phases.retractboundary(repo, tr, targetphase, nodes)
5445 tr.close()
5450 tr.close()
5446 finally:
5451 finally:
5447 if tr is not None:
5452 if tr is not None:
5448 tr.release()
5453 tr.release()
5449 lock.release()
5454 lock.release()
5450 getphase = unfi._phasecache.phase
5455 getphase = unfi._phasecache.phase
5451 newdata = [getphase(unfi, r) for r in unfi]
5456 newdata = [getphase(unfi, r) for r in unfi]
5452 changes = sum(newdata[r] != olddata[r] for r in unfi)
5457 changes = sum(newdata[r] != olddata[r] for r in unfi)
5453 cl = unfi.changelog
5458 cl = unfi.changelog
5454 rejected = [n for n in nodes
5459 rejected = [n for n in nodes
5455 if newdata[cl.rev(n)] < targetphase]
5460 if newdata[cl.rev(n)] < targetphase]
5456 if rejected:
5461 if rejected:
5457 ui.warn(_('cannot move %i changesets to a higher '
5462 ui.warn(_('cannot move %i changesets to a higher '
5458 'phase, use --force\n') % len(rejected))
5463 'phase, use --force\n') % len(rejected))
5459 ret = 1
5464 ret = 1
5460 if changes:
5465 if changes:
5461 msg = _('phase changed for %i changesets\n') % changes
5466 msg = _('phase changed for %i changesets\n') % changes
5462 if ret:
5467 if ret:
5463 ui.status(msg)
5468 ui.status(msg)
5464 else:
5469 else:
5465 ui.note(msg)
5470 ui.note(msg)
5466 else:
5471 else:
5467 ui.warn(_('no phases changed\n'))
5472 ui.warn(_('no phases changed\n'))
5468 return ret
5473 return ret
5469
5474
5470 def postincoming(ui, repo, modheads, optupdate, checkout):
5475 def postincoming(ui, repo, modheads, optupdate, checkout):
5471 if modheads == 0:
5476 if modheads == 0:
5472 return
5477 return
5473 if optupdate:
5478 if optupdate:
5474 try:
5479 try:
5475 brev = checkout
5480 brev = checkout
5476 movemarkfrom = None
5481 movemarkfrom = None
5477 if not checkout:
5482 if not checkout:
5478 updata = destutil.destupdate(repo)
5483 updata = destutil.destupdate(repo)
5479 checkout, movemarkfrom, brev = updata
5484 checkout, movemarkfrom, brev = updata
5480 ret = hg.update(repo, checkout)
5485 ret = hg.update(repo, checkout)
5481 except error.UpdateAbort as inst:
5486 except error.UpdateAbort as inst:
5482 msg = _("not updating: %s") % str(inst)
5487 msg = _("not updating: %s") % str(inst)
5483 hint = inst.hint
5488 hint = inst.hint
5484 raise error.UpdateAbort(msg, hint=hint)
5489 raise error.UpdateAbort(msg, hint=hint)
5485 if not ret and not checkout:
5490 if not ret and not checkout:
5486 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5491 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5487 ui.status(_("updating bookmark %s\n") % repo._activebookmark)
5492 ui.status(_("updating bookmark %s\n") % repo._activebookmark)
5488 return ret
5493 return ret
5489 if modheads > 1:
5494 if modheads > 1:
5490 currentbranchheads = len(repo.branchheads())
5495 currentbranchheads = len(repo.branchheads())
5491 if currentbranchheads == modheads:
5496 if currentbranchheads == modheads:
5492 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5497 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5493 elif currentbranchheads > 1:
5498 elif currentbranchheads > 1:
5494 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5499 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5495 "merge)\n"))
5500 "merge)\n"))
5496 else:
5501 else:
5497 ui.status(_("(run 'hg heads' to see heads)\n"))
5502 ui.status(_("(run 'hg heads' to see heads)\n"))
5498 else:
5503 else:
5499 ui.status(_("(run 'hg update' to get a working copy)\n"))
5504 ui.status(_("(run 'hg update' to get a working copy)\n"))
5500
5505
5501 @command('^pull',
5506 @command('^pull',
5502 [('u', 'update', None,
5507 [('u', 'update', None,
5503 _('update to new branch head if changesets were pulled')),
5508 _('update to new branch head if changesets were pulled')),
5504 ('f', 'force', None, _('run even when remote repository is unrelated')),
5509 ('f', 'force', None, _('run even when remote repository is unrelated')),
5505 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5510 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5506 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5511 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5507 ('b', 'branch', [], _('a specific branch you would like to pull'),
5512 ('b', 'branch', [], _('a specific branch you would like to pull'),
5508 _('BRANCH')),
5513 _('BRANCH')),
5509 ] + remoteopts,
5514 ] + remoteopts,
5510 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5515 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5511 def pull(ui, repo, source="default", **opts):
5516 def pull(ui, repo, source="default", **opts):
5512 """pull changes from the specified source
5517 """pull changes from the specified source
5513
5518
5514 Pull changes from a remote repository to a local one.
5519 Pull changes from a remote repository to a local one.
5515
5520
5516 This finds all changes from the repository at the specified path
5521 This finds all changes from the repository at the specified path
5517 or URL and adds them to a local repository (the current one unless
5522 or URL and adds them to a local repository (the current one unless
5518 -R is specified). By default, this does not update the copy of the
5523 -R is specified). By default, this does not update the copy of the
5519 project in the working directory.
5524 project in the working directory.
5520
5525
5521 Use :hg:`incoming` if you want to see what would have been added
5526 Use :hg:`incoming` if you want to see what would have been added
5522 by a pull at the time you issued this command. If you then decide
5527 by a pull at the time you issued this command. If you then decide
5523 to add those changes to the repository, you should use :hg:`pull
5528 to add those changes to the repository, you should use :hg:`pull
5524 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5529 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5525
5530
5526 If SOURCE is omitted, the 'default' path will be used.
5531 If SOURCE is omitted, the 'default' path will be used.
5527 See :hg:`help urls` for more information.
5532 See :hg:`help urls` for more information.
5528
5533
5529 Returns 0 on success, 1 if an update had unresolved files.
5534 Returns 0 on success, 1 if an update had unresolved files.
5530 """
5535 """
5531 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5536 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5532 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5537 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5533 other = hg.peer(repo, opts, source)
5538 other = hg.peer(repo, opts, source)
5534 try:
5539 try:
5535 revs, checkout = hg.addbranchrevs(repo, other, branches,
5540 revs, checkout = hg.addbranchrevs(repo, other, branches,
5536 opts.get('rev'))
5541 opts.get('rev'))
5537
5542
5538
5543
5539 pullopargs = {}
5544 pullopargs = {}
5540 if opts.get('bookmark'):
5545 if opts.get('bookmark'):
5541 if not revs:
5546 if not revs:
5542 revs = []
5547 revs = []
5543 # The list of bookmark used here is not the one used to actually
5548 # The list of bookmark used here is not the one used to actually
5544 # update the bookmark name. This can result in the revision pulled
5549 # update the bookmark name. This can result in the revision pulled
5545 # not ending up with the name of the bookmark because of a race
5550 # not ending up with the name of the bookmark because of a race
5546 # condition on the server. (See issue 4689 for details)
5551 # condition on the server. (See issue 4689 for details)
5547 remotebookmarks = other.listkeys('bookmarks')
5552 remotebookmarks = other.listkeys('bookmarks')
5548 pullopargs['remotebookmarks'] = remotebookmarks
5553 pullopargs['remotebookmarks'] = remotebookmarks
5549 for b in opts['bookmark']:
5554 for b in opts['bookmark']:
5550 if b not in remotebookmarks:
5555 if b not in remotebookmarks:
5551 raise error.Abort(_('remote bookmark %s not found!') % b)
5556 raise error.Abort(_('remote bookmark %s not found!') % b)
5552 revs.append(remotebookmarks[b])
5557 revs.append(remotebookmarks[b])
5553
5558
5554 if revs:
5559 if revs:
5555 try:
5560 try:
5556 # When 'rev' is a bookmark name, we cannot guarantee that it
5561 # When 'rev' is a bookmark name, we cannot guarantee that it
5557 # will be updated with that name because of a race condition
5562 # will be updated with that name because of a race condition
5558 # server side. (See issue 4689 for details)
5563 # server side. (See issue 4689 for details)
5559 oldrevs = revs
5564 oldrevs = revs
5560 revs = [] # actually, nodes
5565 revs = [] # actually, nodes
5561 for r in oldrevs:
5566 for r in oldrevs:
5562 node = other.lookup(r)
5567 node = other.lookup(r)
5563 revs.append(node)
5568 revs.append(node)
5564 if r == checkout:
5569 if r == checkout:
5565 checkout = node
5570 checkout = node
5566 except error.CapabilityError:
5571 except error.CapabilityError:
5567 err = _("other repository doesn't support revision lookup, "
5572 err = _("other repository doesn't support revision lookup, "
5568 "so a rev cannot be specified.")
5573 "so a rev cannot be specified.")
5569 raise error.Abort(err)
5574 raise error.Abort(err)
5570
5575
5571 pullopargs.update(opts.get('opargs', {}))
5576 pullopargs.update(opts.get('opargs', {}))
5572 modheads = exchange.pull(repo, other, heads=revs,
5577 modheads = exchange.pull(repo, other, heads=revs,
5573 force=opts.get('force'),
5578 force=opts.get('force'),
5574 bookmarks=opts.get('bookmark', ()),
5579 bookmarks=opts.get('bookmark', ()),
5575 opargs=pullopargs).cgresult
5580 opargs=pullopargs).cgresult
5576 if checkout:
5581 if checkout:
5577 checkout = str(repo.changelog.rev(checkout))
5582 checkout = str(repo.changelog.rev(checkout))
5578 repo._subtoppath = source
5583 repo._subtoppath = source
5579 try:
5584 try:
5580 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
5585 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
5581
5586
5582 finally:
5587 finally:
5583 del repo._subtoppath
5588 del repo._subtoppath
5584
5589
5585 finally:
5590 finally:
5586 other.close()
5591 other.close()
5587 return ret
5592 return ret
5588
5593
5589 @command('^push',
5594 @command('^push',
5590 [('f', 'force', None, _('force push')),
5595 [('f', 'force', None, _('force push')),
5591 ('r', 'rev', [],
5596 ('r', 'rev', [],
5592 _('a changeset intended to be included in the destination'),
5597 _('a changeset intended to be included in the destination'),
5593 _('REV')),
5598 _('REV')),
5594 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5599 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5595 ('b', 'branch', [],
5600 ('b', 'branch', [],
5596 _('a specific branch you would like to push'), _('BRANCH')),
5601 _('a specific branch you would like to push'), _('BRANCH')),
5597 ('', 'new-branch', False, _('allow pushing a new branch')),
5602 ('', 'new-branch', False, _('allow pushing a new branch')),
5598 ] + remoteopts,
5603 ] + remoteopts,
5599 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5604 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5600 def push(ui, repo, dest=None, **opts):
5605 def push(ui, repo, dest=None, **opts):
5601 """push changes to the specified destination
5606 """push changes to the specified destination
5602
5607
5603 Push changesets from the local repository to the specified
5608 Push changesets from the local repository to the specified
5604 destination.
5609 destination.
5605
5610
5606 This operation is symmetrical to pull: it is identical to a pull
5611 This operation is symmetrical to pull: it is identical to a pull
5607 in the destination repository from the current one.
5612 in the destination repository from the current one.
5608
5613
5609 By default, push will not allow creation of new heads at the
5614 By default, push will not allow creation of new heads at the
5610 destination, since multiple heads would make it unclear which head
5615 destination, since multiple heads would make it unclear which head
5611 to use. In this situation, it is recommended to pull and merge
5616 to use. In this situation, it is recommended to pull and merge
5612 before pushing.
5617 before pushing.
5613
5618
5614 Use --new-branch if you want to allow push to create a new named
5619 Use --new-branch if you want to allow push to create a new named
5615 branch that is not present at the destination. This allows you to
5620 branch that is not present at the destination. This allows you to
5616 only create a new branch without forcing other changes.
5621 only create a new branch without forcing other changes.
5617
5622
5618 .. note::
5623 .. note::
5619
5624
5620 Extra care should be taken with the -f/--force option,
5625 Extra care should be taken with the -f/--force option,
5621 which will push all new heads on all branches, an action which will
5626 which will push all new heads on all branches, an action which will
5622 almost always cause confusion for collaborators.
5627 almost always cause confusion for collaborators.
5623
5628
5624 If -r/--rev is used, the specified revision and all its ancestors
5629 If -r/--rev is used, the specified revision and all its ancestors
5625 will be pushed to the remote repository.
5630 will be pushed to the remote repository.
5626
5631
5627 If -B/--bookmark is used, the specified bookmarked revision, its
5632 If -B/--bookmark is used, the specified bookmarked revision, its
5628 ancestors, and the bookmark will be pushed to the remote
5633 ancestors, and the bookmark will be pushed to the remote
5629 repository.
5634 repository.
5630
5635
5631 Please see :hg:`help urls` for important details about ``ssh://``
5636 Please see :hg:`help urls` for important details about ``ssh://``
5632 URLs. If DESTINATION is omitted, a default path will be used.
5637 URLs. If DESTINATION is omitted, a default path will be used.
5633
5638
5634 Returns 0 if push was successful, 1 if nothing to push.
5639 Returns 0 if push was successful, 1 if nothing to push.
5635 """
5640 """
5636
5641
5637 if opts.get('bookmark'):
5642 if opts.get('bookmark'):
5638 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5643 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5639 for b in opts['bookmark']:
5644 for b in opts['bookmark']:
5640 # translate -B options to -r so changesets get pushed
5645 # translate -B options to -r so changesets get pushed
5641 if b in repo._bookmarks:
5646 if b in repo._bookmarks:
5642 opts.setdefault('rev', []).append(b)
5647 opts.setdefault('rev', []).append(b)
5643 else:
5648 else:
5644 # if we try to push a deleted bookmark, translate it to null
5649 # if we try to push a deleted bookmark, translate it to null
5645 # this lets simultaneous -r, -b options continue working
5650 # this lets simultaneous -r, -b options continue working
5646 opts.setdefault('rev', []).append("null")
5651 opts.setdefault('rev', []).append("null")
5647
5652
5648 path = ui.paths.getpath(dest, default='default')
5653 path = ui.paths.getpath(dest, default='default')
5649 if not path:
5654 if not path:
5650 raise error.Abort(_('default repository not configured!'),
5655 raise error.Abort(_('default repository not configured!'),
5651 hint=_('see the "path" section in "hg help config"'))
5656 hint=_('see the "path" section in "hg help config"'))
5652 dest = path.pushloc or path.loc
5657 dest = path.pushloc or path.loc
5653 branches = (path.branch, opts.get('branch') or [])
5658 branches = (path.branch, opts.get('branch') or [])
5654 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5659 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5655 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5660 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5656 other = hg.peer(repo, opts, dest)
5661 other = hg.peer(repo, opts, dest)
5657
5662
5658 if revs:
5663 if revs:
5659 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5664 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5660 if not revs:
5665 if not revs:
5661 raise error.Abort(_("specified revisions evaluate to an empty set"),
5666 raise error.Abort(_("specified revisions evaluate to an empty set"),
5662 hint=_("use different revision arguments"))
5667 hint=_("use different revision arguments"))
5663
5668
5664 repo._subtoppath = dest
5669 repo._subtoppath = dest
5665 try:
5670 try:
5666 # push subrepos depth-first for coherent ordering
5671 # push subrepos depth-first for coherent ordering
5667 c = repo['']
5672 c = repo['']
5668 subs = c.substate # only repos that are committed
5673 subs = c.substate # only repos that are committed
5669 for s in sorted(subs):
5674 for s in sorted(subs):
5670 result = c.sub(s).push(opts)
5675 result = c.sub(s).push(opts)
5671 if result == 0:
5676 if result == 0:
5672 return not result
5677 return not result
5673 finally:
5678 finally:
5674 del repo._subtoppath
5679 del repo._subtoppath
5675 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5680 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5676 newbranch=opts.get('new_branch'),
5681 newbranch=opts.get('new_branch'),
5677 bookmarks=opts.get('bookmark', ()),
5682 bookmarks=opts.get('bookmark', ()),
5678 opargs=opts.get('opargs'))
5683 opargs=opts.get('opargs'))
5679
5684
5680 result = not pushop.cgresult
5685 result = not pushop.cgresult
5681
5686
5682 if pushop.bkresult is not None:
5687 if pushop.bkresult is not None:
5683 if pushop.bkresult == 2:
5688 if pushop.bkresult == 2:
5684 result = 2
5689 result = 2
5685 elif not result and pushop.bkresult:
5690 elif not result and pushop.bkresult:
5686 result = 2
5691 result = 2
5687
5692
5688 return result
5693 return result
5689
5694
5690 @command('recover', [])
5695 @command('recover', [])
5691 def recover(ui, repo):
5696 def recover(ui, repo):
5692 """roll back an interrupted transaction
5697 """roll back an interrupted transaction
5693
5698
5694 Recover from an interrupted commit or pull.
5699 Recover from an interrupted commit or pull.
5695
5700
5696 This command tries to fix the repository status after an
5701 This command tries to fix the repository status after an
5697 interrupted operation. It should only be necessary when Mercurial
5702 interrupted operation. It should only be necessary when Mercurial
5698 suggests it.
5703 suggests it.
5699
5704
5700 Returns 0 if successful, 1 if nothing to recover or verify fails.
5705 Returns 0 if successful, 1 if nothing to recover or verify fails.
5701 """
5706 """
5702 if repo.recover():
5707 if repo.recover():
5703 return hg.verify(repo)
5708 return hg.verify(repo)
5704 return 1
5709 return 1
5705
5710
5706 @command('^remove|rm',
5711 @command('^remove|rm',
5707 [('A', 'after', None, _('record delete for missing files')),
5712 [('A', 'after', None, _('record delete for missing files')),
5708 ('f', 'force', None,
5713 ('f', 'force', None,
5709 _('remove (and delete) file even if added or modified')),
5714 _('remove (and delete) file even if added or modified')),
5710 ] + subrepoopts + walkopts,
5715 ] + subrepoopts + walkopts,
5711 _('[OPTION]... FILE...'),
5716 _('[OPTION]... FILE...'),
5712 inferrepo=True)
5717 inferrepo=True)
5713 def remove(ui, repo, *pats, **opts):
5718 def remove(ui, repo, *pats, **opts):
5714 """remove the specified files on the next commit
5719 """remove the specified files on the next commit
5715
5720
5716 Schedule the indicated files for removal from the current branch.
5721 Schedule the indicated files for removal from the current branch.
5717
5722
5718 This command schedules the files to be removed at the next commit.
5723 This command schedules the files to be removed at the next commit.
5719 To undo a remove before that, see :hg:`revert`. To undo added
5724 To undo a remove before that, see :hg:`revert`. To undo added
5720 files, see :hg:`forget`.
5725 files, see :hg:`forget`.
5721
5726
5722 .. container:: verbose
5727 .. container:: verbose
5723
5728
5724 -A/--after can be used to remove only files that have already
5729 -A/--after can be used to remove only files that have already
5725 been deleted, -f/--force can be used to force deletion, and -Af
5730 been deleted, -f/--force can be used to force deletion, and -Af
5726 can be used to remove files from the next revision without
5731 can be used to remove files from the next revision without
5727 deleting them from the working directory.
5732 deleting them from the working directory.
5728
5733
5729 The following table details the behavior of remove for different
5734 The following table details the behavior of remove for different
5730 file states (columns) and option combinations (rows). The file
5735 file states (columns) and option combinations (rows). The file
5731 states are Added [A], Clean [C], Modified [M] and Missing [!]
5736 states are Added [A], Clean [C], Modified [M] and Missing [!]
5732 (as reported by :hg:`status`). The actions are Warn, Remove
5737 (as reported by :hg:`status`). The actions are Warn, Remove
5733 (from branch) and Delete (from disk):
5738 (from branch) and Delete (from disk):
5734
5739
5735 ========= == == == ==
5740 ========= == == == ==
5736 opt/state A C M !
5741 opt/state A C M !
5737 ========= == == == ==
5742 ========= == == == ==
5738 none W RD W R
5743 none W RD W R
5739 -f R RD RD R
5744 -f R RD RD R
5740 -A W W W R
5745 -A W W W R
5741 -Af R R R R
5746 -Af R R R R
5742 ========= == == == ==
5747 ========= == == == ==
5743
5748
5744 Note that remove never deletes files in Added [A] state from the
5749 Note that remove never deletes files in Added [A] state from the
5745 working directory, not even if option --force is specified.
5750 working directory, not even if option --force is specified.
5746
5751
5747 Returns 0 on success, 1 if any warnings encountered.
5752 Returns 0 on success, 1 if any warnings encountered.
5748 """
5753 """
5749
5754
5750 after, force = opts.get('after'), opts.get('force')
5755 after, force = opts.get('after'), opts.get('force')
5751 if not pats and not after:
5756 if not pats and not after:
5752 raise error.Abort(_('no files specified'))
5757 raise error.Abort(_('no files specified'))
5753
5758
5754 m = scmutil.match(repo[None], pats, opts)
5759 m = scmutil.match(repo[None], pats, opts)
5755 subrepos = opts.get('subrepos')
5760 subrepos = opts.get('subrepos')
5756 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
5761 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
5757
5762
5758 @command('rename|move|mv',
5763 @command('rename|move|mv',
5759 [('A', 'after', None, _('record a rename that has already occurred')),
5764 [('A', 'after', None, _('record a rename that has already occurred')),
5760 ('f', 'force', None, _('forcibly copy over an existing managed file')),
5765 ('f', 'force', None, _('forcibly copy over an existing managed file')),
5761 ] + walkopts + dryrunopts,
5766 ] + walkopts + dryrunopts,
5762 _('[OPTION]... SOURCE... DEST'))
5767 _('[OPTION]... SOURCE... DEST'))
5763 def rename(ui, repo, *pats, **opts):
5768 def rename(ui, repo, *pats, **opts):
5764 """rename files; equivalent of copy + remove
5769 """rename files; equivalent of copy + remove
5765
5770
5766 Mark dest as copies of sources; mark sources for deletion. If dest
5771 Mark dest as copies of sources; mark sources for deletion. If dest
5767 is a directory, copies are put in that directory. If dest is a
5772 is a directory, copies are put in that directory. If dest is a
5768 file, there can only be one source.
5773 file, there can only be one source.
5769
5774
5770 By default, this command copies the contents of files as they
5775 By default, this command copies the contents of files as they
5771 exist in the working directory. If invoked with -A/--after, the
5776 exist in the working directory. If invoked with -A/--after, the
5772 operation is recorded, but no copying is performed.
5777 operation is recorded, but no copying is performed.
5773
5778
5774 This command takes effect at the next commit. To undo a rename
5779 This command takes effect at the next commit. To undo a rename
5775 before that, see :hg:`revert`.
5780 before that, see :hg:`revert`.
5776
5781
5777 Returns 0 on success, 1 if errors are encountered.
5782 Returns 0 on success, 1 if errors are encountered.
5778 """
5783 """
5779 wlock = repo.wlock(False)
5784 wlock = repo.wlock(False)
5780 try:
5785 try:
5781 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5786 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5782 finally:
5787 finally:
5783 wlock.release()
5788 wlock.release()
5784
5789
5785 @command('resolve',
5790 @command('resolve',
5786 [('a', 'all', None, _('select all unresolved files')),
5791 [('a', 'all', None, _('select all unresolved files')),
5787 ('l', 'list', None, _('list state of files needing merge')),
5792 ('l', 'list', None, _('list state of files needing merge')),
5788 ('m', 'mark', None, _('mark files as resolved')),
5793 ('m', 'mark', None, _('mark files as resolved')),
5789 ('u', 'unmark', None, _('mark files as unresolved')),
5794 ('u', 'unmark', None, _('mark files as unresolved')),
5790 ('n', 'no-status', None, _('hide status prefix'))]
5795 ('n', 'no-status', None, _('hide status prefix'))]
5791 + mergetoolopts + walkopts + formatteropts,
5796 + mergetoolopts + walkopts + formatteropts,
5792 _('[OPTION]... [FILE]...'),
5797 _('[OPTION]... [FILE]...'),
5793 inferrepo=True)
5798 inferrepo=True)
5794 def resolve(ui, repo, *pats, **opts):
5799 def resolve(ui, repo, *pats, **opts):
5795 """redo merges or set/view the merge status of files
5800 """redo merges or set/view the merge status of files
5796
5801
5797 Merges with unresolved conflicts are often the result of
5802 Merges with unresolved conflicts are often the result of
5798 non-interactive merging using the ``internal:merge`` configuration
5803 non-interactive merging using the ``internal:merge`` configuration
5799 setting, or a command-line merge tool like ``diff3``. The resolve
5804 setting, or a command-line merge tool like ``diff3``. The resolve
5800 command is used to manage the files involved in a merge, after
5805 command is used to manage the files involved in a merge, after
5801 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5806 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5802 working directory must have two parents). See :hg:`help
5807 working directory must have two parents). See :hg:`help
5803 merge-tools` for information on configuring merge tools.
5808 merge-tools` for information on configuring merge tools.
5804
5809
5805 The resolve command can be used in the following ways:
5810 The resolve command can be used in the following ways:
5806
5811
5807 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
5812 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
5808 files, discarding any previous merge attempts. Re-merging is not
5813 files, discarding any previous merge attempts. Re-merging is not
5809 performed for files already marked as resolved. Use ``--all/-a``
5814 performed for files already marked as resolved. Use ``--all/-a``
5810 to select all unresolved files. ``--tool`` can be used to specify
5815 to select all unresolved files. ``--tool`` can be used to specify
5811 the merge tool used for the given files. It overrides the HGMERGE
5816 the merge tool used for the given files. It overrides the HGMERGE
5812 environment variable and your configuration files. Previous file
5817 environment variable and your configuration files. Previous file
5813 contents are saved with a ``.orig`` suffix.
5818 contents are saved with a ``.orig`` suffix.
5814
5819
5815 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5820 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5816 (e.g. after having manually fixed-up the files). The default is
5821 (e.g. after having manually fixed-up the files). The default is
5817 to mark all unresolved files.
5822 to mark all unresolved files.
5818
5823
5819 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5824 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5820 default is to mark all resolved files.
5825 default is to mark all resolved files.
5821
5826
5822 - :hg:`resolve -l`: list files which had or still have conflicts.
5827 - :hg:`resolve -l`: list files which had or still have conflicts.
5823 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5828 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5824
5829
5825 Note that Mercurial will not let you commit files with unresolved
5830 Note that Mercurial will not let you commit files with unresolved
5826 merge conflicts. You must use :hg:`resolve -m ...` before you can
5831 merge conflicts. You must use :hg:`resolve -m ...` before you can
5827 commit after a conflicting merge.
5832 commit after a conflicting merge.
5828
5833
5829 Returns 0 on success, 1 if any files fail a resolve attempt.
5834 Returns 0 on success, 1 if any files fail a resolve attempt.
5830 """
5835 """
5831
5836
5832 all, mark, unmark, show, nostatus = \
5837 all, mark, unmark, show, nostatus = \
5833 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
5838 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
5834
5839
5835 if (show and (mark or unmark)) or (mark and unmark):
5840 if (show and (mark or unmark)) or (mark and unmark):
5836 raise error.Abort(_("too many options specified"))
5841 raise error.Abort(_("too many options specified"))
5837 if pats and all:
5842 if pats and all:
5838 raise error.Abort(_("can't specify --all and patterns"))
5843 raise error.Abort(_("can't specify --all and patterns"))
5839 if not (all or pats or show or mark or unmark):
5844 if not (all or pats or show or mark or unmark):
5840 raise error.Abort(_('no files or directories specified'),
5845 raise error.Abort(_('no files or directories specified'),
5841 hint=('use --all to re-merge all unresolved files'))
5846 hint=('use --all to re-merge all unresolved files'))
5842
5847
5843 if show:
5848 if show:
5844 fm = ui.formatter('resolve', opts)
5849 fm = ui.formatter('resolve', opts)
5845 ms = mergemod.mergestate.read(repo)
5850 ms = mergemod.mergestate.read(repo)
5846 m = scmutil.match(repo[None], pats, opts)
5851 m = scmutil.match(repo[None], pats, opts)
5847 for f in ms:
5852 for f in ms:
5848 if not m(f):
5853 if not m(f):
5849 continue
5854 continue
5850 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
5855 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
5851 'd': 'driverresolved'}[ms[f]]
5856 'd': 'driverresolved'}[ms[f]]
5852 fm.startitem()
5857 fm.startitem()
5853 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
5858 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
5854 fm.write('path', '%s\n', f, label=l)
5859 fm.write('path', '%s\n', f, label=l)
5855 fm.end()
5860 fm.end()
5856 return 0
5861 return 0
5857
5862
5858 wlock = repo.wlock()
5863 wlock = repo.wlock()
5859 try:
5864 try:
5860 ms = mergemod.mergestate.read(repo)
5865 ms = mergemod.mergestate.read(repo)
5861
5866
5862 if not (ms.active() or repo.dirstate.p2() != nullid):
5867 if not (ms.active() or repo.dirstate.p2() != nullid):
5863 raise error.Abort(
5868 raise error.Abort(
5864 _('resolve command not applicable when not merging'))
5869 _('resolve command not applicable when not merging'))
5865
5870
5866 wctx = repo[None]
5871 wctx = repo[None]
5867
5872
5868 if ms.mergedriver and ms.mdstate() == 'u':
5873 if ms.mergedriver and ms.mdstate() == 'u':
5869 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5874 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5870 ms.commit()
5875 ms.commit()
5871 # allow mark and unmark to go through
5876 # allow mark and unmark to go through
5872 if not mark and not unmark and not proceed:
5877 if not mark and not unmark and not proceed:
5873 return 1
5878 return 1
5874
5879
5875 m = scmutil.match(wctx, pats, opts)
5880 m = scmutil.match(wctx, pats, opts)
5876 ret = 0
5881 ret = 0
5877 didwork = False
5882 didwork = False
5878 runconclude = False
5883 runconclude = False
5879
5884
5880 tocomplete = []
5885 tocomplete = []
5881 for f in ms:
5886 for f in ms:
5882 if not m(f):
5887 if not m(f):
5883 continue
5888 continue
5884
5889
5885 didwork = True
5890 didwork = True
5886
5891
5887 # don't let driver-resolved files be marked, and run the conclude
5892 # don't let driver-resolved files be marked, and run the conclude
5888 # step if asked to resolve
5893 # step if asked to resolve
5889 if ms[f] == "d":
5894 if ms[f] == "d":
5890 exact = m.exact(f)
5895 exact = m.exact(f)
5891 if mark:
5896 if mark:
5892 if exact:
5897 if exact:
5893 ui.warn(_('not marking %s as it is driver-resolved\n')
5898 ui.warn(_('not marking %s as it is driver-resolved\n')
5894 % f)
5899 % f)
5895 elif unmark:
5900 elif unmark:
5896 if exact:
5901 if exact:
5897 ui.warn(_('not unmarking %s as it is driver-resolved\n')
5902 ui.warn(_('not unmarking %s as it is driver-resolved\n')
5898 % f)
5903 % f)
5899 else:
5904 else:
5900 runconclude = True
5905 runconclude = True
5901 continue
5906 continue
5902
5907
5903 if mark:
5908 if mark:
5904 ms.mark(f, "r")
5909 ms.mark(f, "r")
5905 elif unmark:
5910 elif unmark:
5906 ms.mark(f, "u")
5911 ms.mark(f, "u")
5907 else:
5912 else:
5908 # backup pre-resolve (merge uses .orig for its own purposes)
5913 # backup pre-resolve (merge uses .orig for its own purposes)
5909 a = repo.wjoin(f)
5914 a = repo.wjoin(f)
5910 try:
5915 try:
5911 util.copyfile(a, a + ".resolve")
5916 util.copyfile(a, a + ".resolve")
5912 except (IOError, OSError) as inst:
5917 except (IOError, OSError) as inst:
5913 if inst.errno != errno.ENOENT:
5918 if inst.errno != errno.ENOENT:
5914 raise
5919 raise
5915
5920
5916 try:
5921 try:
5917 # preresolve file
5922 # preresolve file
5918 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5923 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5919 'resolve')
5924 'resolve')
5920 complete, r = ms.preresolve(f, wctx)
5925 complete, r = ms.preresolve(f, wctx)
5921 if not complete:
5926 if not complete:
5922 tocomplete.append(f)
5927 tocomplete.append(f)
5923 elif r:
5928 elif r:
5924 ret = 1
5929 ret = 1
5925 finally:
5930 finally:
5926 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5931 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5927 ms.commit()
5932 ms.commit()
5928
5933
5929 # replace filemerge's .orig file with our resolve file, but only
5934 # replace filemerge's .orig file with our resolve file, but only
5930 # for merges that are complete
5935 # for merges that are complete
5931 if complete:
5936 if complete:
5932 try:
5937 try:
5933 util.rename(a + ".resolve",
5938 util.rename(a + ".resolve",
5934 cmdutil.origpath(ui, repo, a))
5939 cmdutil.origpath(ui, repo, a))
5935 except OSError as inst:
5940 except OSError as inst:
5936 if inst.errno != errno.ENOENT:
5941 if inst.errno != errno.ENOENT:
5937 raise
5942 raise
5938
5943
5939 for f in tocomplete:
5944 for f in tocomplete:
5940 try:
5945 try:
5941 # resolve file
5946 # resolve file
5942 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5947 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5943 'resolve')
5948 'resolve')
5944 r = ms.resolve(f, wctx)
5949 r = ms.resolve(f, wctx)
5945 if r:
5950 if r:
5946 ret = 1
5951 ret = 1
5947 finally:
5952 finally:
5948 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5953 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5949 ms.commit()
5954 ms.commit()
5950
5955
5951 # replace filemerge's .orig file with our resolve file
5956 # replace filemerge's .orig file with our resolve file
5952 a = repo.wjoin(f)
5957 a = repo.wjoin(f)
5953 try:
5958 try:
5954 util.rename(a + ".resolve", cmdutil.origpath(ui, repo, a))
5959 util.rename(a + ".resolve", cmdutil.origpath(ui, repo, a))
5955 except OSError as inst:
5960 except OSError as inst:
5956 if inst.errno != errno.ENOENT:
5961 if inst.errno != errno.ENOENT:
5957 raise
5962 raise
5958
5963
5959 ms.commit()
5964 ms.commit()
5960 ms.recordactions()
5965 ms.recordactions()
5961
5966
5962 if not didwork and pats:
5967 if not didwork and pats:
5963 ui.warn(_("arguments do not match paths that need resolving\n"))
5968 ui.warn(_("arguments do not match paths that need resolving\n"))
5964 elif ms.mergedriver and ms.mdstate() != 's':
5969 elif ms.mergedriver and ms.mdstate() != 's':
5965 # run conclude step when either a driver-resolved file is requested
5970 # run conclude step when either a driver-resolved file is requested
5966 # or there are no driver-resolved files
5971 # or there are no driver-resolved files
5967 # we can't use 'ret' to determine whether any files are unresolved
5972 # we can't use 'ret' to determine whether any files are unresolved
5968 # because we might not have tried to resolve some
5973 # because we might not have tried to resolve some
5969 if ((runconclude or not list(ms.driverresolved()))
5974 if ((runconclude or not list(ms.driverresolved()))
5970 and not list(ms.unresolved())):
5975 and not list(ms.unresolved())):
5971 proceed = mergemod.driverconclude(repo, ms, wctx)
5976 proceed = mergemod.driverconclude(repo, ms, wctx)
5972 ms.commit()
5977 ms.commit()
5973 if not proceed:
5978 if not proceed:
5974 return 1
5979 return 1
5975
5980
5976 finally:
5981 finally:
5977 wlock.release()
5982 wlock.release()
5978
5983
5979 # Nudge users into finishing an unfinished operation
5984 # Nudge users into finishing an unfinished operation
5980 unresolvedf = list(ms.unresolved())
5985 unresolvedf = list(ms.unresolved())
5981 driverresolvedf = list(ms.driverresolved())
5986 driverresolvedf = list(ms.driverresolved())
5982 if not unresolvedf and not driverresolvedf:
5987 if not unresolvedf and not driverresolvedf:
5983 ui.status(_('(no more unresolved files)\n'))
5988 ui.status(_('(no more unresolved files)\n'))
5984 elif not unresolvedf:
5989 elif not unresolvedf:
5985 ui.status(_('(no more unresolved files -- '
5990 ui.status(_('(no more unresolved files -- '
5986 'run "hg resolve --all" to conclude)\n'))
5991 'run "hg resolve --all" to conclude)\n'))
5987
5992
5988 return ret
5993 return ret
5989
5994
5990 @command('revert',
5995 @command('revert',
5991 [('a', 'all', None, _('revert all changes when no arguments given')),
5996 [('a', 'all', None, _('revert all changes when no arguments given')),
5992 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5997 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5993 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
5998 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
5994 ('C', 'no-backup', None, _('do not save backup copies of files')),
5999 ('C', 'no-backup', None, _('do not save backup copies of files')),
5995 ('i', 'interactive', None,
6000 ('i', 'interactive', None,
5996 _('interactively select the changes (EXPERIMENTAL)')),
6001 _('interactively select the changes (EXPERIMENTAL)')),
5997 ] + walkopts + dryrunopts,
6002 ] + walkopts + dryrunopts,
5998 _('[OPTION]... [-r REV] [NAME]...'))
6003 _('[OPTION]... [-r REV] [NAME]...'))
5999 def revert(ui, repo, *pats, **opts):
6004 def revert(ui, repo, *pats, **opts):
6000 """restore files to their checkout state
6005 """restore files to their checkout state
6001
6006
6002 .. note::
6007 .. note::
6003
6008
6004 To check out earlier revisions, you should use :hg:`update REV`.
6009 To check out earlier revisions, you should use :hg:`update REV`.
6005 To cancel an uncommitted merge (and lose your changes),
6010 To cancel an uncommitted merge (and lose your changes),
6006 use :hg:`update --clean .`.
6011 use :hg:`update --clean .`.
6007
6012
6008 With no revision specified, revert the specified files or directories
6013 With no revision specified, revert the specified files or directories
6009 to the contents they had in the parent of the working directory.
6014 to the contents they had in the parent of the working directory.
6010 This restores the contents of files to an unmodified
6015 This restores the contents of files to an unmodified
6011 state and unschedules adds, removes, copies, and renames. If the
6016 state and unschedules adds, removes, copies, and renames. If the
6012 working directory has two parents, you must explicitly specify a
6017 working directory has two parents, you must explicitly specify a
6013 revision.
6018 revision.
6014
6019
6015 Using the -r/--rev or -d/--date options, revert the given files or
6020 Using the -r/--rev or -d/--date options, revert the given files or
6016 directories to their states as of a specific revision. Because
6021 directories to their states as of a specific revision. Because
6017 revert does not change the working directory parents, this will
6022 revert does not change the working directory parents, this will
6018 cause these files to appear modified. This can be helpful to "back
6023 cause these files to appear modified. This can be helpful to "back
6019 out" some or all of an earlier change. See :hg:`backout` for a
6024 out" some or all of an earlier change. See :hg:`backout` for a
6020 related method.
6025 related method.
6021
6026
6022 Modified files are saved with a .orig suffix before reverting.
6027 Modified files are saved with a .orig suffix before reverting.
6023 To disable these backups, use --no-backup.
6028 To disable these backups, use --no-backup.
6024
6029
6025 See :hg:`help dates` for a list of formats valid for -d/--date.
6030 See :hg:`help dates` for a list of formats valid for -d/--date.
6026
6031
6027 See :hg:`help backout` for a way to reverse the effect of an
6032 See :hg:`help backout` for a way to reverse the effect of an
6028 earlier changeset.
6033 earlier changeset.
6029
6034
6030 Returns 0 on success.
6035 Returns 0 on success.
6031 """
6036 """
6032
6037
6033 if opts.get("date"):
6038 if opts.get("date"):
6034 if opts.get("rev"):
6039 if opts.get("rev"):
6035 raise error.Abort(_("you can't specify a revision and a date"))
6040 raise error.Abort(_("you can't specify a revision and a date"))
6036 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6041 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6037
6042
6038 parent, p2 = repo.dirstate.parents()
6043 parent, p2 = repo.dirstate.parents()
6039 if not opts.get('rev') and p2 != nullid:
6044 if not opts.get('rev') and p2 != nullid:
6040 # revert after merge is a trap for new users (issue2915)
6045 # revert after merge is a trap for new users (issue2915)
6041 raise error.Abort(_('uncommitted merge with no revision specified'),
6046 raise error.Abort(_('uncommitted merge with no revision specified'),
6042 hint=_('use "hg update" or see "hg help revert"'))
6047 hint=_('use "hg update" or see "hg help revert"'))
6043
6048
6044 ctx = scmutil.revsingle(repo, opts.get('rev'))
6049 ctx = scmutil.revsingle(repo, opts.get('rev'))
6045
6050
6046 if (not (pats or opts.get('include') or opts.get('exclude') or
6051 if (not (pats or opts.get('include') or opts.get('exclude') or
6047 opts.get('all') or opts.get('interactive'))):
6052 opts.get('all') or opts.get('interactive'))):
6048 msg = _("no files or directories specified")
6053 msg = _("no files or directories specified")
6049 if p2 != nullid:
6054 if p2 != nullid:
6050 hint = _("uncommitted merge, use --all to discard all changes,"
6055 hint = _("uncommitted merge, use --all to discard all changes,"
6051 " or 'hg update -C .' to abort the merge")
6056 " or 'hg update -C .' to abort the merge")
6052 raise error.Abort(msg, hint=hint)
6057 raise error.Abort(msg, hint=hint)
6053 dirty = any(repo.status())
6058 dirty = any(repo.status())
6054 node = ctx.node()
6059 node = ctx.node()
6055 if node != parent:
6060 if node != parent:
6056 if dirty:
6061 if dirty:
6057 hint = _("uncommitted changes, use --all to discard all"
6062 hint = _("uncommitted changes, use --all to discard all"
6058 " changes, or 'hg update %s' to update") % ctx.rev()
6063 " changes, or 'hg update %s' to update") % ctx.rev()
6059 else:
6064 else:
6060 hint = _("use --all to revert all files,"
6065 hint = _("use --all to revert all files,"
6061 " or 'hg update %s' to update") % ctx.rev()
6066 " or 'hg update %s' to update") % ctx.rev()
6062 elif dirty:
6067 elif dirty:
6063 hint = _("uncommitted changes, use --all to discard all changes")
6068 hint = _("uncommitted changes, use --all to discard all changes")
6064 else:
6069 else:
6065 hint = _("use --all to revert all files")
6070 hint = _("use --all to revert all files")
6066 raise error.Abort(msg, hint=hint)
6071 raise error.Abort(msg, hint=hint)
6067
6072
6068 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6073 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6069
6074
6070 @command('rollback', dryrunopts +
6075 @command('rollback', dryrunopts +
6071 [('f', 'force', False, _('ignore safety measures'))])
6076 [('f', 'force', False, _('ignore safety measures'))])
6072 def rollback(ui, repo, **opts):
6077 def rollback(ui, repo, **opts):
6073 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6078 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6074
6079
6075 Please use :hg:`commit --amend` instead of rollback to correct
6080 Please use :hg:`commit --amend` instead of rollback to correct
6076 mistakes in the last commit.
6081 mistakes in the last commit.
6077
6082
6078 This command should be used with care. There is only one level of
6083 This command should be used with care. There is only one level of
6079 rollback, and there is no way to undo a rollback. It will also
6084 rollback, and there is no way to undo a rollback. It will also
6080 restore the dirstate at the time of the last transaction, losing
6085 restore the dirstate at the time of the last transaction, losing
6081 any dirstate changes since that time. This command does not alter
6086 any dirstate changes since that time. This command does not alter
6082 the working directory.
6087 the working directory.
6083
6088
6084 Transactions are used to encapsulate the effects of all commands
6089 Transactions are used to encapsulate the effects of all commands
6085 that create new changesets or propagate existing changesets into a
6090 that create new changesets or propagate existing changesets into a
6086 repository.
6091 repository.
6087
6092
6088 .. container:: verbose
6093 .. container:: verbose
6089
6094
6090 For example, the following commands are transactional, and their
6095 For example, the following commands are transactional, and their
6091 effects can be rolled back:
6096 effects can be rolled back:
6092
6097
6093 - commit
6098 - commit
6094 - import
6099 - import
6095 - pull
6100 - pull
6096 - push (with this repository as the destination)
6101 - push (with this repository as the destination)
6097 - unbundle
6102 - unbundle
6098
6103
6099 To avoid permanent data loss, rollback will refuse to rollback a
6104 To avoid permanent data loss, rollback will refuse to rollback a
6100 commit transaction if it isn't checked out. Use --force to
6105 commit transaction if it isn't checked out. Use --force to
6101 override this protection.
6106 override this protection.
6102
6107
6103 This command is not intended for use on public repositories. Once
6108 This command is not intended for use on public repositories. Once
6104 changes are visible for pull by other users, rolling a transaction
6109 changes are visible for pull by other users, rolling a transaction
6105 back locally is ineffective (someone else may already have pulled
6110 back locally is ineffective (someone else may already have pulled
6106 the changes). Furthermore, a race is possible with readers of the
6111 the changes). Furthermore, a race is possible with readers of the
6107 repository; for example an in-progress pull from the repository
6112 repository; for example an in-progress pull from the repository
6108 may fail if a rollback is performed.
6113 may fail if a rollback is performed.
6109
6114
6110 Returns 0 on success, 1 if no rollback data is available.
6115 Returns 0 on success, 1 if no rollback data is available.
6111 """
6116 """
6112 return repo.rollback(dryrun=opts.get('dry_run'),
6117 return repo.rollback(dryrun=opts.get('dry_run'),
6113 force=opts.get('force'))
6118 force=opts.get('force'))
6114
6119
6115 @command('root', [])
6120 @command('root', [])
6116 def root(ui, repo):
6121 def root(ui, repo):
6117 """print the root (top) of the current working directory
6122 """print the root (top) of the current working directory
6118
6123
6119 Print the root directory of the current repository.
6124 Print the root directory of the current repository.
6120
6125
6121 Returns 0 on success.
6126 Returns 0 on success.
6122 """
6127 """
6123 ui.write(repo.root + "\n")
6128 ui.write(repo.root + "\n")
6124
6129
6125 @command('^serve',
6130 @command('^serve',
6126 [('A', 'accesslog', '', _('name of access log file to write to'),
6131 [('A', 'accesslog', '', _('name of access log file to write to'),
6127 _('FILE')),
6132 _('FILE')),
6128 ('d', 'daemon', None, _('run server in background')),
6133 ('d', 'daemon', None, _('run server in background')),
6129 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('FILE')),
6134 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('FILE')),
6130 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6135 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6131 # use string type, then we can check if something was passed
6136 # use string type, then we can check if something was passed
6132 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6137 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6133 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6138 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6134 _('ADDR')),
6139 _('ADDR')),
6135 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6140 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6136 _('PREFIX')),
6141 _('PREFIX')),
6137 ('n', 'name', '',
6142 ('n', 'name', '',
6138 _('name to show in web pages (default: working directory)'), _('NAME')),
6143 _('name to show in web pages (default: working directory)'), _('NAME')),
6139 ('', 'web-conf', '',
6144 ('', 'web-conf', '',
6140 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6145 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6141 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6146 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6142 _('FILE')),
6147 _('FILE')),
6143 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6148 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6144 ('', 'stdio', None, _('for remote clients')),
6149 ('', 'stdio', None, _('for remote clients')),
6145 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6150 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6146 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6151 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6147 ('', 'style', '', _('template style to use'), _('STYLE')),
6152 ('', 'style', '', _('template style to use'), _('STYLE')),
6148 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6153 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6149 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6154 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6150 _('[OPTION]...'),
6155 _('[OPTION]...'),
6151 optionalrepo=True)
6156 optionalrepo=True)
6152 def serve(ui, repo, **opts):
6157 def serve(ui, repo, **opts):
6153 """start stand-alone webserver
6158 """start stand-alone webserver
6154
6159
6155 Start a local HTTP repository browser and pull server. You can use
6160 Start a local HTTP repository browser and pull server. You can use
6156 this for ad-hoc sharing and browsing of repositories. It is
6161 this for ad-hoc sharing and browsing of repositories. It is
6157 recommended to use a real web server to serve a repository for
6162 recommended to use a real web server to serve a repository for
6158 longer periods of time.
6163 longer periods of time.
6159
6164
6160 Please note that the server does not implement access control.
6165 Please note that the server does not implement access control.
6161 This means that, by default, anybody can read from the server and
6166 This means that, by default, anybody can read from the server and
6162 nobody can write to it by default. Set the ``web.allow_push``
6167 nobody can write to it by default. Set the ``web.allow_push``
6163 option to ``*`` to allow everybody to push to the server. You
6168 option to ``*`` to allow everybody to push to the server. You
6164 should use a real web server if you need to authenticate users.
6169 should use a real web server if you need to authenticate users.
6165
6170
6166 By default, the server logs accesses to stdout and errors to
6171 By default, the server logs accesses to stdout and errors to
6167 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6172 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6168 files.
6173 files.
6169
6174
6170 To have the server choose a free port number to listen on, specify
6175 To have the server choose a free port number to listen on, specify
6171 a port number of 0; in this case, the server will print the port
6176 a port number of 0; in this case, the server will print the port
6172 number it uses.
6177 number it uses.
6173
6178
6174 Returns 0 on success.
6179 Returns 0 on success.
6175 """
6180 """
6176
6181
6177 if opts["stdio"] and opts["cmdserver"]:
6182 if opts["stdio"] and opts["cmdserver"]:
6178 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6183 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6179
6184
6180 if opts["stdio"]:
6185 if opts["stdio"]:
6181 if repo is None:
6186 if repo is None:
6182 raise error.RepoError(_("there is no Mercurial repository here"
6187 raise error.RepoError(_("there is no Mercurial repository here"
6183 " (.hg not found)"))
6188 " (.hg not found)"))
6184 s = sshserver.sshserver(ui, repo)
6189 s = sshserver.sshserver(ui, repo)
6185 s.serve_forever()
6190 s.serve_forever()
6186
6191
6187 if opts["cmdserver"]:
6192 if opts["cmdserver"]:
6188 service = commandserver.createservice(ui, repo, opts)
6193 service = commandserver.createservice(ui, repo, opts)
6189 else:
6194 else:
6190 service = hgweb.createservice(ui, repo, opts)
6195 service = hgweb.createservice(ui, repo, opts)
6191 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6196 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6192
6197
6193 @command('^status|st',
6198 @command('^status|st',
6194 [('A', 'all', None, _('show status of all files')),
6199 [('A', 'all', None, _('show status of all files')),
6195 ('m', 'modified', None, _('show only modified files')),
6200 ('m', 'modified', None, _('show only modified files')),
6196 ('a', 'added', None, _('show only added files')),
6201 ('a', 'added', None, _('show only added files')),
6197 ('r', 'removed', None, _('show only removed files')),
6202 ('r', 'removed', None, _('show only removed files')),
6198 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6203 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6199 ('c', 'clean', None, _('show only files without changes')),
6204 ('c', 'clean', None, _('show only files without changes')),
6200 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6205 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6201 ('i', 'ignored', None, _('show only ignored files')),
6206 ('i', 'ignored', None, _('show only ignored files')),
6202 ('n', 'no-status', None, _('hide status prefix')),
6207 ('n', 'no-status', None, _('hide status prefix')),
6203 ('C', 'copies', None, _('show source of copied files')),
6208 ('C', 'copies', None, _('show source of copied files')),
6204 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6209 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6205 ('', 'rev', [], _('show difference from revision'), _('REV')),
6210 ('', 'rev', [], _('show difference from revision'), _('REV')),
6206 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6211 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6207 ] + walkopts + subrepoopts + formatteropts,
6212 ] + walkopts + subrepoopts + formatteropts,
6208 _('[OPTION]... [FILE]...'),
6213 _('[OPTION]... [FILE]...'),
6209 inferrepo=True)
6214 inferrepo=True)
6210 def status(ui, repo, *pats, **opts):
6215 def status(ui, repo, *pats, **opts):
6211 """show changed files in the working directory
6216 """show changed files in the working directory
6212
6217
6213 Show status of files in the repository. If names are given, only
6218 Show status of files in the repository. If names are given, only
6214 files that match are shown. Files that are clean or ignored or
6219 files that match are shown. Files that are clean or ignored or
6215 the source of a copy/move operation, are not listed unless
6220 the source of a copy/move operation, are not listed unless
6216 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6221 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6217 Unless options described with "show only ..." are given, the
6222 Unless options described with "show only ..." are given, the
6218 options -mardu are used.
6223 options -mardu are used.
6219
6224
6220 Option -q/--quiet hides untracked (unknown and ignored) files
6225 Option -q/--quiet hides untracked (unknown and ignored) files
6221 unless explicitly requested with -u/--unknown or -i/--ignored.
6226 unless explicitly requested with -u/--unknown or -i/--ignored.
6222
6227
6223 .. note::
6228 .. note::
6224
6229
6225 status may appear to disagree with diff if permissions have
6230 status may appear to disagree with diff if permissions have
6226 changed or a merge has occurred. The standard diff format does
6231 changed or a merge has occurred. The standard diff format does
6227 not report permission changes and diff only reports changes
6232 not report permission changes and diff only reports changes
6228 relative to one merge parent.
6233 relative to one merge parent.
6229
6234
6230 If one revision is given, it is used as the base revision.
6235 If one revision is given, it is used as the base revision.
6231 If two revisions are given, the differences between them are
6236 If two revisions are given, the differences between them are
6232 shown. The --change option can also be used as a shortcut to list
6237 shown. The --change option can also be used as a shortcut to list
6233 the changed files of a revision from its first parent.
6238 the changed files of a revision from its first parent.
6234
6239
6235 The codes used to show the status of files are::
6240 The codes used to show the status of files are::
6236
6241
6237 M = modified
6242 M = modified
6238 A = added
6243 A = added
6239 R = removed
6244 R = removed
6240 C = clean
6245 C = clean
6241 ! = missing (deleted by non-hg command, but still tracked)
6246 ! = missing (deleted by non-hg command, but still tracked)
6242 ? = not tracked
6247 ? = not tracked
6243 I = ignored
6248 I = ignored
6244 = origin of the previous file (with --copies)
6249 = origin of the previous file (with --copies)
6245
6250
6246 .. container:: verbose
6251 .. container:: verbose
6247
6252
6248 Examples:
6253 Examples:
6249
6254
6250 - show changes in the working directory relative to a
6255 - show changes in the working directory relative to a
6251 changeset::
6256 changeset::
6252
6257
6253 hg status --rev 9353
6258 hg status --rev 9353
6254
6259
6255 - show changes in the working directory relative to the
6260 - show changes in the working directory relative to the
6256 current directory (see :hg:`help patterns` for more information)::
6261 current directory (see :hg:`help patterns` for more information)::
6257
6262
6258 hg status re:
6263 hg status re:
6259
6264
6260 - show all changes including copies in an existing changeset::
6265 - show all changes including copies in an existing changeset::
6261
6266
6262 hg status --copies --change 9353
6267 hg status --copies --change 9353
6263
6268
6264 - get a NUL separated list of added files, suitable for xargs::
6269 - get a NUL separated list of added files, suitable for xargs::
6265
6270
6266 hg status -an0
6271 hg status -an0
6267
6272
6268 Returns 0 on success.
6273 Returns 0 on success.
6269 """
6274 """
6270
6275
6271 revs = opts.get('rev')
6276 revs = opts.get('rev')
6272 change = opts.get('change')
6277 change = opts.get('change')
6273
6278
6274 if revs and change:
6279 if revs and change:
6275 msg = _('cannot specify --rev and --change at the same time')
6280 msg = _('cannot specify --rev and --change at the same time')
6276 raise error.Abort(msg)
6281 raise error.Abort(msg)
6277 elif change:
6282 elif change:
6278 node2 = scmutil.revsingle(repo, change, None).node()
6283 node2 = scmutil.revsingle(repo, change, None).node()
6279 node1 = repo[node2].p1().node()
6284 node1 = repo[node2].p1().node()
6280 else:
6285 else:
6281 node1, node2 = scmutil.revpair(repo, revs)
6286 node1, node2 = scmutil.revpair(repo, revs)
6282
6287
6283 if pats:
6288 if pats:
6284 cwd = repo.getcwd()
6289 cwd = repo.getcwd()
6285 else:
6290 else:
6286 cwd = ''
6291 cwd = ''
6287
6292
6288 if opts.get('print0'):
6293 if opts.get('print0'):
6289 end = '\0'
6294 end = '\0'
6290 else:
6295 else:
6291 end = '\n'
6296 end = '\n'
6292 copy = {}
6297 copy = {}
6293 states = 'modified added removed deleted unknown ignored clean'.split()
6298 states = 'modified added removed deleted unknown ignored clean'.split()
6294 show = [k for k in states if opts.get(k)]
6299 show = [k for k in states if opts.get(k)]
6295 if opts.get('all'):
6300 if opts.get('all'):
6296 show += ui.quiet and (states[:4] + ['clean']) or states
6301 show += ui.quiet and (states[:4] + ['clean']) or states
6297 if not show:
6302 if not show:
6298 if ui.quiet:
6303 if ui.quiet:
6299 show = states[:4]
6304 show = states[:4]
6300 else:
6305 else:
6301 show = states[:5]
6306 show = states[:5]
6302
6307
6303 m = scmutil.match(repo[node2], pats, opts)
6308 m = scmutil.match(repo[node2], pats, opts)
6304 stat = repo.status(node1, node2, m,
6309 stat = repo.status(node1, node2, m,
6305 'ignored' in show, 'clean' in show, 'unknown' in show,
6310 'ignored' in show, 'clean' in show, 'unknown' in show,
6306 opts.get('subrepos'))
6311 opts.get('subrepos'))
6307 changestates = zip(states, 'MAR!?IC', stat)
6312 changestates = zip(states, 'MAR!?IC', stat)
6308
6313
6309 if (opts.get('all') or opts.get('copies')
6314 if (opts.get('all') or opts.get('copies')
6310 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6315 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6311 copy = copies.pathcopies(repo[node1], repo[node2], m)
6316 copy = copies.pathcopies(repo[node1], repo[node2], m)
6312
6317
6313 fm = ui.formatter('status', opts)
6318 fm = ui.formatter('status', opts)
6314 fmt = '%s' + end
6319 fmt = '%s' + end
6315 showchar = not opts.get('no_status')
6320 showchar = not opts.get('no_status')
6316
6321
6317 for state, char, files in changestates:
6322 for state, char, files in changestates:
6318 if state in show:
6323 if state in show:
6319 label = 'status.' + state
6324 label = 'status.' + state
6320 for f in files:
6325 for f in files:
6321 fm.startitem()
6326 fm.startitem()
6322 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6327 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6323 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6328 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6324 if f in copy:
6329 if f in copy:
6325 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6330 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6326 label='status.copied')
6331 label='status.copied')
6327 fm.end()
6332 fm.end()
6328
6333
6329 @command('^summary|sum',
6334 @command('^summary|sum',
6330 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6335 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6331 def summary(ui, repo, **opts):
6336 def summary(ui, repo, **opts):
6332 """summarize working directory state
6337 """summarize working directory state
6333
6338
6334 This generates a brief summary of the working directory state,
6339 This generates a brief summary of the working directory state,
6335 including parents, branch, commit status, phase and available updates.
6340 including parents, branch, commit status, phase and available updates.
6336
6341
6337 With the --remote option, this will check the default paths for
6342 With the --remote option, this will check the default paths for
6338 incoming and outgoing changes. This can be time-consuming.
6343 incoming and outgoing changes. This can be time-consuming.
6339
6344
6340 Returns 0 on success.
6345 Returns 0 on success.
6341 """
6346 """
6342
6347
6343 ctx = repo[None]
6348 ctx = repo[None]
6344 parents = ctx.parents()
6349 parents = ctx.parents()
6345 pnode = parents[0].node()
6350 pnode = parents[0].node()
6346 marks = []
6351 marks = []
6347
6352
6348 for p in parents:
6353 for p in parents:
6349 # label with log.changeset (instead of log.parent) since this
6354 # label with log.changeset (instead of log.parent) since this
6350 # shows a working directory parent *changeset*:
6355 # shows a working directory parent *changeset*:
6351 # i18n: column positioning for "hg summary"
6356 # i18n: column positioning for "hg summary"
6352 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6357 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6353 label='log.changeset changeset.%s' % p.phasestr())
6358 label='log.changeset changeset.%s' % p.phasestr())
6354 ui.write(' '.join(p.tags()), label='log.tag')
6359 ui.write(' '.join(p.tags()), label='log.tag')
6355 if p.bookmarks():
6360 if p.bookmarks():
6356 marks.extend(p.bookmarks())
6361 marks.extend(p.bookmarks())
6357 if p.rev() == -1:
6362 if p.rev() == -1:
6358 if not len(repo):
6363 if not len(repo):
6359 ui.write(_(' (empty repository)'))
6364 ui.write(_(' (empty repository)'))
6360 else:
6365 else:
6361 ui.write(_(' (no revision checked out)'))
6366 ui.write(_(' (no revision checked out)'))
6362 ui.write('\n')
6367 ui.write('\n')
6363 if p.description():
6368 if p.description():
6364 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6369 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6365 label='log.summary')
6370 label='log.summary')
6366
6371
6367 branch = ctx.branch()
6372 branch = ctx.branch()
6368 bheads = repo.branchheads(branch)
6373 bheads = repo.branchheads(branch)
6369 # i18n: column positioning for "hg summary"
6374 # i18n: column positioning for "hg summary"
6370 m = _('branch: %s\n') % branch
6375 m = _('branch: %s\n') % branch
6371 if branch != 'default':
6376 if branch != 'default':
6372 ui.write(m, label='log.branch')
6377 ui.write(m, label='log.branch')
6373 else:
6378 else:
6374 ui.status(m, label='log.branch')
6379 ui.status(m, label='log.branch')
6375
6380
6376 if marks:
6381 if marks:
6377 active = repo._activebookmark
6382 active = repo._activebookmark
6378 # i18n: column positioning for "hg summary"
6383 # i18n: column positioning for "hg summary"
6379 ui.write(_('bookmarks:'), label='log.bookmark')
6384 ui.write(_('bookmarks:'), label='log.bookmark')
6380 if active is not None:
6385 if active is not None:
6381 if active in marks:
6386 if active in marks:
6382 ui.write(' *' + active, label=activebookmarklabel)
6387 ui.write(' *' + active, label=activebookmarklabel)
6383 marks.remove(active)
6388 marks.remove(active)
6384 else:
6389 else:
6385 ui.write(' [%s]' % active, label=activebookmarklabel)
6390 ui.write(' [%s]' % active, label=activebookmarklabel)
6386 for m in marks:
6391 for m in marks:
6387 ui.write(' ' + m, label='log.bookmark')
6392 ui.write(' ' + m, label='log.bookmark')
6388 ui.write('\n', label='log.bookmark')
6393 ui.write('\n', label='log.bookmark')
6389
6394
6390 status = repo.status(unknown=True)
6395 status = repo.status(unknown=True)
6391
6396
6392 c = repo.dirstate.copies()
6397 c = repo.dirstate.copies()
6393 copied, renamed = [], []
6398 copied, renamed = [], []
6394 for d, s in c.iteritems():
6399 for d, s in c.iteritems():
6395 if s in status.removed:
6400 if s in status.removed:
6396 status.removed.remove(s)
6401 status.removed.remove(s)
6397 renamed.append(d)
6402 renamed.append(d)
6398 else:
6403 else:
6399 copied.append(d)
6404 copied.append(d)
6400 if d in status.added:
6405 if d in status.added:
6401 status.added.remove(d)
6406 status.added.remove(d)
6402
6407
6403 try:
6408 try:
6404 ms = mergemod.mergestate.read(repo)
6409 ms = mergemod.mergestate.read(repo)
6405 except error.UnsupportedMergeRecords as e:
6410 except error.UnsupportedMergeRecords as e:
6406 s = ' '.join(e.recordtypes)
6411 s = ' '.join(e.recordtypes)
6407 ui.warn(
6412 ui.warn(
6408 _('warning: merge state has unsupported record types: %s\n') % s)
6413 _('warning: merge state has unsupported record types: %s\n') % s)
6409 unresolved = 0
6414 unresolved = 0
6410 else:
6415 else:
6411 unresolved = [f for f in ms if ms[f] == 'u']
6416 unresolved = [f for f in ms if ms[f] == 'u']
6412
6417
6413 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6418 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6414
6419
6415 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6420 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6416 (ui.label(_('%d added'), 'status.added'), status.added),
6421 (ui.label(_('%d added'), 'status.added'), status.added),
6417 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6422 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6418 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6423 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6419 (ui.label(_('%d copied'), 'status.copied'), copied),
6424 (ui.label(_('%d copied'), 'status.copied'), copied),
6420 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6425 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6421 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6426 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6422 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6427 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6423 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6428 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6424 t = []
6429 t = []
6425 for l, s in labels:
6430 for l, s in labels:
6426 if s:
6431 if s:
6427 t.append(l % len(s))
6432 t.append(l % len(s))
6428
6433
6429 t = ', '.join(t)
6434 t = ', '.join(t)
6430 cleanworkdir = False
6435 cleanworkdir = False
6431
6436
6432 if repo.vfs.exists('graftstate'):
6437 if repo.vfs.exists('graftstate'):
6433 t += _(' (graft in progress)')
6438 t += _(' (graft in progress)')
6434 if repo.vfs.exists('updatestate'):
6439 if repo.vfs.exists('updatestate'):
6435 t += _(' (interrupted update)')
6440 t += _(' (interrupted update)')
6436 elif len(parents) > 1:
6441 elif len(parents) > 1:
6437 t += _(' (merge)')
6442 t += _(' (merge)')
6438 elif branch != parents[0].branch():
6443 elif branch != parents[0].branch():
6439 t += _(' (new branch)')
6444 t += _(' (new branch)')
6440 elif (parents[0].closesbranch() and
6445 elif (parents[0].closesbranch() and
6441 pnode in repo.branchheads(branch, closed=True)):
6446 pnode in repo.branchheads(branch, closed=True)):
6442 t += _(' (head closed)')
6447 t += _(' (head closed)')
6443 elif not (status.modified or status.added or status.removed or renamed or
6448 elif not (status.modified or status.added or status.removed or renamed or
6444 copied or subs):
6449 copied or subs):
6445 t += _(' (clean)')
6450 t += _(' (clean)')
6446 cleanworkdir = True
6451 cleanworkdir = True
6447 elif pnode not in bheads:
6452 elif pnode not in bheads:
6448 t += _(' (new branch head)')
6453 t += _(' (new branch head)')
6449
6454
6450 if parents:
6455 if parents:
6451 pendingphase = max(p.phase() for p in parents)
6456 pendingphase = max(p.phase() for p in parents)
6452 else:
6457 else:
6453 pendingphase = phases.public
6458 pendingphase = phases.public
6454
6459
6455 if pendingphase > phases.newcommitphase(ui):
6460 if pendingphase > phases.newcommitphase(ui):
6456 t += ' (%s)' % phases.phasenames[pendingphase]
6461 t += ' (%s)' % phases.phasenames[pendingphase]
6457
6462
6458 if cleanworkdir:
6463 if cleanworkdir:
6459 # i18n: column positioning for "hg summary"
6464 # i18n: column positioning for "hg summary"
6460 ui.status(_('commit: %s\n') % t.strip())
6465 ui.status(_('commit: %s\n') % t.strip())
6461 else:
6466 else:
6462 # i18n: column positioning for "hg summary"
6467 # i18n: column positioning for "hg summary"
6463 ui.write(_('commit: %s\n') % t.strip())
6468 ui.write(_('commit: %s\n') % t.strip())
6464
6469
6465 # all ancestors of branch heads - all ancestors of parent = new csets
6470 # all ancestors of branch heads - all ancestors of parent = new csets
6466 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6471 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6467 bheads))
6472 bheads))
6468
6473
6469 if new == 0:
6474 if new == 0:
6470 # i18n: column positioning for "hg summary"
6475 # i18n: column positioning for "hg summary"
6471 ui.status(_('update: (current)\n'))
6476 ui.status(_('update: (current)\n'))
6472 elif pnode not in bheads:
6477 elif pnode not in bheads:
6473 # i18n: column positioning for "hg summary"
6478 # i18n: column positioning for "hg summary"
6474 ui.write(_('update: %d new changesets (update)\n') % new)
6479 ui.write(_('update: %d new changesets (update)\n') % new)
6475 else:
6480 else:
6476 # i18n: column positioning for "hg summary"
6481 # i18n: column positioning for "hg summary"
6477 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6482 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6478 (new, len(bheads)))
6483 (new, len(bheads)))
6479
6484
6480 t = []
6485 t = []
6481 draft = len(repo.revs('draft()'))
6486 draft = len(repo.revs('draft()'))
6482 if draft:
6487 if draft:
6483 t.append(_('%d draft') % draft)
6488 t.append(_('%d draft') % draft)
6484 secret = len(repo.revs('secret()'))
6489 secret = len(repo.revs('secret()'))
6485 if secret:
6490 if secret:
6486 t.append(_('%d secret') % secret)
6491 t.append(_('%d secret') % secret)
6487
6492
6488 if draft or secret:
6493 if draft or secret:
6489 ui.status(_('phases: %s\n') % ', '.join(t))
6494 ui.status(_('phases: %s\n') % ', '.join(t))
6490
6495
6491 cmdutil.summaryhooks(ui, repo)
6496 cmdutil.summaryhooks(ui, repo)
6492
6497
6493 if opts.get('remote'):
6498 if opts.get('remote'):
6494 needsincoming, needsoutgoing = True, True
6499 needsincoming, needsoutgoing = True, True
6495 else:
6500 else:
6496 needsincoming, needsoutgoing = False, False
6501 needsincoming, needsoutgoing = False, False
6497 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6502 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6498 if i:
6503 if i:
6499 needsincoming = True
6504 needsincoming = True
6500 if o:
6505 if o:
6501 needsoutgoing = True
6506 needsoutgoing = True
6502 if not needsincoming and not needsoutgoing:
6507 if not needsincoming and not needsoutgoing:
6503 return
6508 return
6504
6509
6505 def getincoming():
6510 def getincoming():
6506 source, branches = hg.parseurl(ui.expandpath('default'))
6511 source, branches = hg.parseurl(ui.expandpath('default'))
6507 sbranch = branches[0]
6512 sbranch = branches[0]
6508 try:
6513 try:
6509 other = hg.peer(repo, {}, source)
6514 other = hg.peer(repo, {}, source)
6510 except error.RepoError:
6515 except error.RepoError:
6511 if opts.get('remote'):
6516 if opts.get('remote'):
6512 raise
6517 raise
6513 return source, sbranch, None, None, None
6518 return source, sbranch, None, None, None
6514 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6519 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6515 if revs:
6520 if revs:
6516 revs = [other.lookup(rev) for rev in revs]
6521 revs = [other.lookup(rev) for rev in revs]
6517 ui.debug('comparing with %s\n' % util.hidepassword(source))
6522 ui.debug('comparing with %s\n' % util.hidepassword(source))
6518 repo.ui.pushbuffer()
6523 repo.ui.pushbuffer()
6519 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6524 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6520 repo.ui.popbuffer()
6525 repo.ui.popbuffer()
6521 return source, sbranch, other, commoninc, commoninc[1]
6526 return source, sbranch, other, commoninc, commoninc[1]
6522
6527
6523 if needsincoming:
6528 if needsincoming:
6524 source, sbranch, sother, commoninc, incoming = getincoming()
6529 source, sbranch, sother, commoninc, incoming = getincoming()
6525 else:
6530 else:
6526 source = sbranch = sother = commoninc = incoming = None
6531 source = sbranch = sother = commoninc = incoming = None
6527
6532
6528 def getoutgoing():
6533 def getoutgoing():
6529 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6534 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6530 dbranch = branches[0]
6535 dbranch = branches[0]
6531 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6536 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6532 if source != dest:
6537 if source != dest:
6533 try:
6538 try:
6534 dother = hg.peer(repo, {}, dest)
6539 dother = hg.peer(repo, {}, dest)
6535 except error.RepoError:
6540 except error.RepoError:
6536 if opts.get('remote'):
6541 if opts.get('remote'):
6537 raise
6542 raise
6538 return dest, dbranch, None, None
6543 return dest, dbranch, None, None
6539 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6544 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6540 elif sother is None:
6545 elif sother is None:
6541 # there is no explicit destination peer, but source one is invalid
6546 # there is no explicit destination peer, but source one is invalid
6542 return dest, dbranch, None, None
6547 return dest, dbranch, None, None
6543 else:
6548 else:
6544 dother = sother
6549 dother = sother
6545 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6550 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6546 common = None
6551 common = None
6547 else:
6552 else:
6548 common = commoninc
6553 common = commoninc
6549 if revs:
6554 if revs:
6550 revs = [repo.lookup(rev) for rev in revs]
6555 revs = [repo.lookup(rev) for rev in revs]
6551 repo.ui.pushbuffer()
6556 repo.ui.pushbuffer()
6552 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6557 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6553 commoninc=common)
6558 commoninc=common)
6554 repo.ui.popbuffer()
6559 repo.ui.popbuffer()
6555 return dest, dbranch, dother, outgoing
6560 return dest, dbranch, dother, outgoing
6556
6561
6557 if needsoutgoing:
6562 if needsoutgoing:
6558 dest, dbranch, dother, outgoing = getoutgoing()
6563 dest, dbranch, dother, outgoing = getoutgoing()
6559 else:
6564 else:
6560 dest = dbranch = dother = outgoing = None
6565 dest = dbranch = dother = outgoing = None
6561
6566
6562 if opts.get('remote'):
6567 if opts.get('remote'):
6563 t = []
6568 t = []
6564 if incoming:
6569 if incoming:
6565 t.append(_('1 or more incoming'))
6570 t.append(_('1 or more incoming'))
6566 o = outgoing.missing
6571 o = outgoing.missing
6567 if o:
6572 if o:
6568 t.append(_('%d outgoing') % len(o))
6573 t.append(_('%d outgoing') % len(o))
6569 other = dother or sother
6574 other = dother or sother
6570 if 'bookmarks' in other.listkeys('namespaces'):
6575 if 'bookmarks' in other.listkeys('namespaces'):
6571 counts = bookmarks.summary(repo, other)
6576 counts = bookmarks.summary(repo, other)
6572 if counts[0] > 0:
6577 if counts[0] > 0:
6573 t.append(_('%d incoming bookmarks') % counts[0])
6578 t.append(_('%d incoming bookmarks') % counts[0])
6574 if counts[1] > 0:
6579 if counts[1] > 0:
6575 t.append(_('%d outgoing bookmarks') % counts[1])
6580 t.append(_('%d outgoing bookmarks') % counts[1])
6576
6581
6577 if t:
6582 if t:
6578 # i18n: column positioning for "hg summary"
6583 # i18n: column positioning for "hg summary"
6579 ui.write(_('remote: %s\n') % (', '.join(t)))
6584 ui.write(_('remote: %s\n') % (', '.join(t)))
6580 else:
6585 else:
6581 # i18n: column positioning for "hg summary"
6586 # i18n: column positioning for "hg summary"
6582 ui.status(_('remote: (synced)\n'))
6587 ui.status(_('remote: (synced)\n'))
6583
6588
6584 cmdutil.summaryremotehooks(ui, repo, opts,
6589 cmdutil.summaryremotehooks(ui, repo, opts,
6585 ((source, sbranch, sother, commoninc),
6590 ((source, sbranch, sother, commoninc),
6586 (dest, dbranch, dother, outgoing)))
6591 (dest, dbranch, dother, outgoing)))
6587
6592
6588 @command('tag',
6593 @command('tag',
6589 [('f', 'force', None, _('force tag')),
6594 [('f', 'force', None, _('force tag')),
6590 ('l', 'local', None, _('make the tag local')),
6595 ('l', 'local', None, _('make the tag local')),
6591 ('r', 'rev', '', _('revision to tag'), _('REV')),
6596 ('r', 'rev', '', _('revision to tag'), _('REV')),
6592 ('', 'remove', None, _('remove a tag')),
6597 ('', 'remove', None, _('remove a tag')),
6593 # -l/--local is already there, commitopts cannot be used
6598 # -l/--local is already there, commitopts cannot be used
6594 ('e', 'edit', None, _('invoke editor on commit messages')),
6599 ('e', 'edit', None, _('invoke editor on commit messages')),
6595 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6600 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6596 ] + commitopts2,
6601 ] + commitopts2,
6597 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6602 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6598 def tag(ui, repo, name1, *names, **opts):
6603 def tag(ui, repo, name1, *names, **opts):
6599 """add one or more tags for the current or given revision
6604 """add one or more tags for the current or given revision
6600
6605
6601 Name a particular revision using <name>.
6606 Name a particular revision using <name>.
6602
6607
6603 Tags are used to name particular revisions of the repository and are
6608 Tags are used to name particular revisions of the repository and are
6604 very useful to compare different revisions, to go back to significant
6609 very useful to compare different revisions, to go back to significant
6605 earlier versions or to mark branch points as releases, etc. Changing
6610 earlier versions or to mark branch points as releases, etc. Changing
6606 an existing tag is normally disallowed; use -f/--force to override.
6611 an existing tag is normally disallowed; use -f/--force to override.
6607
6612
6608 If no revision is given, the parent of the working directory is
6613 If no revision is given, the parent of the working directory is
6609 used.
6614 used.
6610
6615
6611 To facilitate version control, distribution, and merging of tags,
6616 To facilitate version control, distribution, and merging of tags,
6612 they are stored as a file named ".hgtags" which is managed similarly
6617 they are stored as a file named ".hgtags" which is managed similarly
6613 to other project files and can be hand-edited if necessary. This
6618 to other project files and can be hand-edited if necessary. This
6614 also means that tagging creates a new commit. The file
6619 also means that tagging creates a new commit. The file
6615 ".hg/localtags" is used for local tags (not shared among
6620 ".hg/localtags" is used for local tags (not shared among
6616 repositories).
6621 repositories).
6617
6622
6618 Tag commits are usually made at the head of a branch. If the parent
6623 Tag commits are usually made at the head of a branch. If the parent
6619 of the working directory is not a branch head, :hg:`tag` aborts; use
6624 of the working directory is not a branch head, :hg:`tag` aborts; use
6620 -f/--force to force the tag commit to be based on a non-head
6625 -f/--force to force the tag commit to be based on a non-head
6621 changeset.
6626 changeset.
6622
6627
6623 See :hg:`help dates` for a list of formats valid for -d/--date.
6628 See :hg:`help dates` for a list of formats valid for -d/--date.
6624
6629
6625 Since tag names have priority over branch names during revision
6630 Since tag names have priority over branch names during revision
6626 lookup, using an existing branch name as a tag name is discouraged.
6631 lookup, using an existing branch name as a tag name is discouraged.
6627
6632
6628 Returns 0 on success.
6633 Returns 0 on success.
6629 """
6634 """
6630 wlock = lock = None
6635 wlock = lock = None
6631 try:
6636 try:
6632 wlock = repo.wlock()
6637 wlock = repo.wlock()
6633 lock = repo.lock()
6638 lock = repo.lock()
6634 rev_ = "."
6639 rev_ = "."
6635 names = [t.strip() for t in (name1,) + names]
6640 names = [t.strip() for t in (name1,) + names]
6636 if len(names) != len(set(names)):
6641 if len(names) != len(set(names)):
6637 raise error.Abort(_('tag names must be unique'))
6642 raise error.Abort(_('tag names must be unique'))
6638 for n in names:
6643 for n in names:
6639 scmutil.checknewlabel(repo, n, 'tag')
6644 scmutil.checknewlabel(repo, n, 'tag')
6640 if not n:
6645 if not n:
6641 raise error.Abort(_('tag names cannot consist entirely of '
6646 raise error.Abort(_('tag names cannot consist entirely of '
6642 'whitespace'))
6647 'whitespace'))
6643 if opts.get('rev') and opts.get('remove'):
6648 if opts.get('rev') and opts.get('remove'):
6644 raise error.Abort(_("--rev and --remove are incompatible"))
6649 raise error.Abort(_("--rev and --remove are incompatible"))
6645 if opts.get('rev'):
6650 if opts.get('rev'):
6646 rev_ = opts['rev']
6651 rev_ = opts['rev']
6647 message = opts.get('message')
6652 message = opts.get('message')
6648 if opts.get('remove'):
6653 if opts.get('remove'):
6649 if opts.get('local'):
6654 if opts.get('local'):
6650 expectedtype = 'local'
6655 expectedtype = 'local'
6651 else:
6656 else:
6652 expectedtype = 'global'
6657 expectedtype = 'global'
6653
6658
6654 for n in names:
6659 for n in names:
6655 if not repo.tagtype(n):
6660 if not repo.tagtype(n):
6656 raise error.Abort(_("tag '%s' does not exist") % n)
6661 raise error.Abort(_("tag '%s' does not exist") % n)
6657 if repo.tagtype(n) != expectedtype:
6662 if repo.tagtype(n) != expectedtype:
6658 if expectedtype == 'global':
6663 if expectedtype == 'global':
6659 raise error.Abort(_("tag '%s' is not a global tag") % n)
6664 raise error.Abort(_("tag '%s' is not a global tag") % n)
6660 else:
6665 else:
6661 raise error.Abort(_("tag '%s' is not a local tag") % n)
6666 raise error.Abort(_("tag '%s' is not a local tag") % n)
6662 rev_ = 'null'
6667 rev_ = 'null'
6663 if not message:
6668 if not message:
6664 # we don't translate commit messages
6669 # we don't translate commit messages
6665 message = 'Removed tag %s' % ', '.join(names)
6670 message = 'Removed tag %s' % ', '.join(names)
6666 elif not opts.get('force'):
6671 elif not opts.get('force'):
6667 for n in names:
6672 for n in names:
6668 if n in repo.tags():
6673 if n in repo.tags():
6669 raise error.Abort(_("tag '%s' already exists "
6674 raise error.Abort(_("tag '%s' already exists "
6670 "(use -f to force)") % n)
6675 "(use -f to force)") % n)
6671 if not opts.get('local'):
6676 if not opts.get('local'):
6672 p1, p2 = repo.dirstate.parents()
6677 p1, p2 = repo.dirstate.parents()
6673 if p2 != nullid:
6678 if p2 != nullid:
6674 raise error.Abort(_('uncommitted merge'))
6679 raise error.Abort(_('uncommitted merge'))
6675 bheads = repo.branchheads()
6680 bheads = repo.branchheads()
6676 if not opts.get('force') and bheads and p1 not in bheads:
6681 if not opts.get('force') and bheads and p1 not in bheads:
6677 raise error.Abort(_('not at a branch head (use -f to force)'))
6682 raise error.Abort(_('not at a branch head (use -f to force)'))
6678 r = scmutil.revsingle(repo, rev_).node()
6683 r = scmutil.revsingle(repo, rev_).node()
6679
6684
6680 if not message:
6685 if not message:
6681 # we don't translate commit messages
6686 # we don't translate commit messages
6682 message = ('Added tag %s for changeset %s' %
6687 message = ('Added tag %s for changeset %s' %
6683 (', '.join(names), short(r)))
6688 (', '.join(names), short(r)))
6684
6689
6685 date = opts.get('date')
6690 date = opts.get('date')
6686 if date:
6691 if date:
6687 date = util.parsedate(date)
6692 date = util.parsedate(date)
6688
6693
6689 if opts.get('remove'):
6694 if opts.get('remove'):
6690 editform = 'tag.remove'
6695 editform = 'tag.remove'
6691 else:
6696 else:
6692 editform = 'tag.add'
6697 editform = 'tag.add'
6693 editor = cmdutil.getcommiteditor(editform=editform, **opts)
6698 editor = cmdutil.getcommiteditor(editform=editform, **opts)
6694
6699
6695 # don't allow tagging the null rev
6700 # don't allow tagging the null rev
6696 if (not opts.get('remove') and
6701 if (not opts.get('remove') and
6697 scmutil.revsingle(repo, rev_).rev() == nullrev):
6702 scmutil.revsingle(repo, rev_).rev() == nullrev):
6698 raise error.Abort(_("cannot tag null revision"))
6703 raise error.Abort(_("cannot tag null revision"))
6699
6704
6700 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
6705 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
6701 editor=editor)
6706 editor=editor)
6702 finally:
6707 finally:
6703 release(lock, wlock)
6708 release(lock, wlock)
6704
6709
6705 @command('tags', formatteropts, '')
6710 @command('tags', formatteropts, '')
6706 def tags(ui, repo, **opts):
6711 def tags(ui, repo, **opts):
6707 """list repository tags
6712 """list repository tags
6708
6713
6709 This lists both regular and local tags. When the -v/--verbose
6714 This lists both regular and local tags. When the -v/--verbose
6710 switch is used, a third column "local" is printed for local tags.
6715 switch is used, a third column "local" is printed for local tags.
6711
6716
6712 Returns 0 on success.
6717 Returns 0 on success.
6713 """
6718 """
6714
6719
6715 fm = ui.formatter('tags', opts)
6720 fm = ui.formatter('tags', opts)
6716 hexfunc = fm.hexfunc
6721 hexfunc = fm.hexfunc
6717 tagtype = ""
6722 tagtype = ""
6718
6723
6719 for t, n in reversed(repo.tagslist()):
6724 for t, n in reversed(repo.tagslist()):
6720 hn = hexfunc(n)
6725 hn = hexfunc(n)
6721 label = 'tags.normal'
6726 label = 'tags.normal'
6722 tagtype = ''
6727 tagtype = ''
6723 if repo.tagtype(t) == 'local':
6728 if repo.tagtype(t) == 'local':
6724 label = 'tags.local'
6729 label = 'tags.local'
6725 tagtype = 'local'
6730 tagtype = 'local'
6726
6731
6727 fm.startitem()
6732 fm.startitem()
6728 fm.write('tag', '%s', t, label=label)
6733 fm.write('tag', '%s', t, label=label)
6729 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
6734 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
6730 fm.condwrite(not ui.quiet, 'rev node', fmt,
6735 fm.condwrite(not ui.quiet, 'rev node', fmt,
6731 repo.changelog.rev(n), hn, label=label)
6736 repo.changelog.rev(n), hn, label=label)
6732 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
6737 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
6733 tagtype, label=label)
6738 tagtype, label=label)
6734 fm.plain('\n')
6739 fm.plain('\n')
6735 fm.end()
6740 fm.end()
6736
6741
6737 @command('tip',
6742 @command('tip',
6738 [('p', 'patch', None, _('show patch')),
6743 [('p', 'patch', None, _('show patch')),
6739 ('g', 'git', None, _('use git extended diff format')),
6744 ('g', 'git', None, _('use git extended diff format')),
6740 ] + templateopts,
6745 ] + templateopts,
6741 _('[-p] [-g]'))
6746 _('[-p] [-g]'))
6742 def tip(ui, repo, **opts):
6747 def tip(ui, repo, **opts):
6743 """show the tip revision (DEPRECATED)
6748 """show the tip revision (DEPRECATED)
6744
6749
6745 The tip revision (usually just called the tip) is the changeset
6750 The tip revision (usually just called the tip) is the changeset
6746 most recently added to the repository (and therefore the most
6751 most recently added to the repository (and therefore the most
6747 recently changed head).
6752 recently changed head).
6748
6753
6749 If you have just made a commit, that commit will be the tip. If
6754 If you have just made a commit, that commit will be the tip. If
6750 you have just pulled changes from another repository, the tip of
6755 you have just pulled changes from another repository, the tip of
6751 that repository becomes the current tip. The "tip" tag is special
6756 that repository becomes the current tip. The "tip" tag is special
6752 and cannot be renamed or assigned to a different changeset.
6757 and cannot be renamed or assigned to a different changeset.
6753
6758
6754 This command is deprecated, please use :hg:`heads` instead.
6759 This command is deprecated, please use :hg:`heads` instead.
6755
6760
6756 Returns 0 on success.
6761 Returns 0 on success.
6757 """
6762 """
6758 displayer = cmdutil.show_changeset(ui, repo, opts)
6763 displayer = cmdutil.show_changeset(ui, repo, opts)
6759 displayer.show(repo['tip'])
6764 displayer.show(repo['tip'])
6760 displayer.close()
6765 displayer.close()
6761
6766
6762 @command('unbundle',
6767 @command('unbundle',
6763 [('u', 'update', None,
6768 [('u', 'update', None,
6764 _('update to new branch head if changesets were unbundled'))],
6769 _('update to new branch head if changesets were unbundled'))],
6765 _('[-u] FILE...'))
6770 _('[-u] FILE...'))
6766 def unbundle(ui, repo, fname1, *fnames, **opts):
6771 def unbundle(ui, repo, fname1, *fnames, **opts):
6767 """apply one or more changegroup files
6772 """apply one or more changegroup files
6768
6773
6769 Apply one or more compressed changegroup files generated by the
6774 Apply one or more compressed changegroup files generated by the
6770 bundle command.
6775 bundle command.
6771
6776
6772 Returns 0 on success, 1 if an update has unresolved files.
6777 Returns 0 on success, 1 if an update has unresolved files.
6773 """
6778 """
6774 fnames = (fname1,) + fnames
6779 fnames = (fname1,) + fnames
6775
6780
6776 lock = repo.lock()
6781 lock = repo.lock()
6777 try:
6782 try:
6778 for fname in fnames:
6783 for fname in fnames:
6779 f = hg.openpath(ui, fname)
6784 f = hg.openpath(ui, fname)
6780 gen = exchange.readbundle(ui, f, fname)
6785 gen = exchange.readbundle(ui, f, fname)
6781 if isinstance(gen, bundle2.unbundle20):
6786 if isinstance(gen, bundle2.unbundle20):
6782 tr = repo.transaction('unbundle')
6787 tr = repo.transaction('unbundle')
6783 try:
6788 try:
6784 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
6789 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
6785 url='bundle:' + fname)
6790 url='bundle:' + fname)
6786 tr.close()
6791 tr.close()
6787 except error.BundleUnknownFeatureError as exc:
6792 except error.BundleUnknownFeatureError as exc:
6788 raise error.Abort(_('%s: unknown bundle feature, %s')
6793 raise error.Abort(_('%s: unknown bundle feature, %s')
6789 % (fname, exc),
6794 % (fname, exc),
6790 hint=_("see https://mercurial-scm.org/"
6795 hint=_("see https://mercurial-scm.org/"
6791 "wiki/BundleFeature for more "
6796 "wiki/BundleFeature for more "
6792 "information"))
6797 "information"))
6793 finally:
6798 finally:
6794 if tr:
6799 if tr:
6795 tr.release()
6800 tr.release()
6796 changes = [r.get('return', 0)
6801 changes = [r.get('return', 0)
6797 for r in op.records['changegroup']]
6802 for r in op.records['changegroup']]
6798 modheads = changegroup.combineresults(changes)
6803 modheads = changegroup.combineresults(changes)
6799 elif isinstance(gen, streamclone.streamcloneapplier):
6804 elif isinstance(gen, streamclone.streamcloneapplier):
6800 raise error.Abort(
6805 raise error.Abort(
6801 _('packed bundles cannot be applied with '
6806 _('packed bundles cannot be applied with '
6802 '"hg unbundle"'),
6807 '"hg unbundle"'),
6803 hint=_('use "hg debugapplystreamclonebundle"'))
6808 hint=_('use "hg debugapplystreamclonebundle"'))
6804 else:
6809 else:
6805 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
6810 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
6806 finally:
6811 finally:
6807 lock.release()
6812 lock.release()
6808
6813
6809 return postincoming(ui, repo, modheads, opts.get('update'), None)
6814 return postincoming(ui, repo, modheads, opts.get('update'), None)
6810
6815
6811 @command('^update|up|checkout|co',
6816 @command('^update|up|checkout|co',
6812 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6817 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6813 ('c', 'check', None,
6818 ('c', 'check', None,
6814 _('update across branches if no uncommitted changes')),
6819 _('update across branches if no uncommitted changes')),
6815 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6820 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6816 ('r', 'rev', '', _('revision'), _('REV'))
6821 ('r', 'rev', '', _('revision'), _('REV'))
6817 ] + mergetoolopts,
6822 ] + mergetoolopts,
6818 _('[-c] [-C] [-d DATE] [[-r] REV]'))
6823 _('[-c] [-C] [-d DATE] [[-r] REV]'))
6819 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
6824 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
6820 tool=None):
6825 tool=None):
6821 """update working directory (or switch revisions)
6826 """update working directory (or switch revisions)
6822
6827
6823 Update the repository's working directory to the specified
6828 Update the repository's working directory to the specified
6824 changeset. If no changeset is specified, update to the tip of the
6829 changeset. If no changeset is specified, update to the tip of the
6825 current named branch and move the active bookmark (see :hg:`help
6830 current named branch and move the active bookmark (see :hg:`help
6826 bookmarks`).
6831 bookmarks`).
6827
6832
6828 Update sets the working directory's parent revision to the specified
6833 Update sets the working directory's parent revision to the specified
6829 changeset (see :hg:`help parents`).
6834 changeset (see :hg:`help parents`).
6830
6835
6831 If the changeset is not a descendant or ancestor of the working
6836 If the changeset is not a descendant or ancestor of the working
6832 directory's parent, the update is aborted. With the -c/--check
6837 directory's parent, the update is aborted. With the -c/--check
6833 option, the working directory is checked for uncommitted changes; if
6838 option, the working directory is checked for uncommitted changes; if
6834 none are found, the working directory is updated to the specified
6839 none are found, the working directory is updated to the specified
6835 changeset.
6840 changeset.
6836
6841
6837 .. container:: verbose
6842 .. container:: verbose
6838
6843
6839 The following rules apply when the working directory contains
6844 The following rules apply when the working directory contains
6840 uncommitted changes:
6845 uncommitted changes:
6841
6846
6842 1. If neither -c/--check nor -C/--clean is specified, and if
6847 1. If neither -c/--check nor -C/--clean is specified, and if
6843 the requested changeset is an ancestor or descendant of
6848 the requested changeset is an ancestor or descendant of
6844 the working directory's parent, the uncommitted changes
6849 the working directory's parent, the uncommitted changes
6845 are merged into the requested changeset and the merged
6850 are merged into the requested changeset and the merged
6846 result is left uncommitted. If the requested changeset is
6851 result is left uncommitted. If the requested changeset is
6847 not an ancestor or descendant (that is, it is on another
6852 not an ancestor or descendant (that is, it is on another
6848 branch), the update is aborted and the uncommitted changes
6853 branch), the update is aborted and the uncommitted changes
6849 are preserved.
6854 are preserved.
6850
6855
6851 2. With the -c/--check option, the update is aborted and the
6856 2. With the -c/--check option, the update is aborted and the
6852 uncommitted changes are preserved.
6857 uncommitted changes are preserved.
6853
6858
6854 3. With the -C/--clean option, uncommitted changes are discarded and
6859 3. With the -C/--clean option, uncommitted changes are discarded and
6855 the working directory is updated to the requested changeset.
6860 the working directory is updated to the requested changeset.
6856
6861
6857 To cancel an uncommitted merge (and lose your changes), use
6862 To cancel an uncommitted merge (and lose your changes), use
6858 :hg:`update --clean .`.
6863 :hg:`update --clean .`.
6859
6864
6860 Use null as the changeset to remove the working directory (like
6865 Use null as the changeset to remove the working directory (like
6861 :hg:`clone -U`).
6866 :hg:`clone -U`).
6862
6867
6863 If you want to revert just one file to an older revision, use
6868 If you want to revert just one file to an older revision, use
6864 :hg:`revert [-r REV] NAME`.
6869 :hg:`revert [-r REV] NAME`.
6865
6870
6866 See :hg:`help dates` for a list of formats valid for -d/--date.
6871 See :hg:`help dates` for a list of formats valid for -d/--date.
6867
6872
6868 Returns 0 on success, 1 if there are unresolved files.
6873 Returns 0 on success, 1 if there are unresolved files.
6869 """
6874 """
6870 movemarkfrom = None
6875 movemarkfrom = None
6871 if rev and node:
6876 if rev and node:
6872 raise error.Abort(_("please specify just one revision"))
6877 raise error.Abort(_("please specify just one revision"))
6873
6878
6874 if rev is None or rev == '':
6879 if rev is None or rev == '':
6875 rev = node
6880 rev = node
6876
6881
6877 wlock = repo.wlock()
6882 wlock = repo.wlock()
6878 try:
6883 try:
6879 cmdutil.clearunfinished(repo)
6884 cmdutil.clearunfinished(repo)
6880
6885
6881 if date:
6886 if date:
6882 if rev is not None:
6887 if rev is not None:
6883 raise error.Abort(_("you can't specify a revision and a date"))
6888 raise error.Abort(_("you can't specify a revision and a date"))
6884 rev = cmdutil.finddate(ui, repo, date)
6889 rev = cmdutil.finddate(ui, repo, date)
6885
6890
6886 # if we defined a bookmark, we have to remember the original name
6891 # if we defined a bookmark, we have to remember the original name
6887 brev = rev
6892 brev = rev
6888 rev = scmutil.revsingle(repo, rev, rev).rev()
6893 rev = scmutil.revsingle(repo, rev, rev).rev()
6889
6894
6890 if check and clean:
6895 if check and clean:
6891 raise error.Abort(_("cannot specify both -c/--check and -C/--clean")
6896 raise error.Abort(_("cannot specify both -c/--check and -C/--clean")
6892 )
6897 )
6893
6898
6894 if check:
6899 if check:
6895 cmdutil.bailifchanged(repo, merge=False)
6900 cmdutil.bailifchanged(repo, merge=False)
6896 if rev is None:
6901 if rev is None:
6897 updata = destutil.destupdate(repo, clean=clean, check=check)
6902 updata = destutil.destupdate(repo, clean=clean, check=check)
6898 rev, movemarkfrom, brev = updata
6903 rev, movemarkfrom, brev = updata
6899
6904
6900 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
6905 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
6901
6906
6902 if clean:
6907 if clean:
6903 ret = hg.clean(repo, rev)
6908 ret = hg.clean(repo, rev)
6904 else:
6909 else:
6905 ret = hg.update(repo, rev)
6910 ret = hg.update(repo, rev)
6906
6911
6907 if not ret and movemarkfrom:
6912 if not ret and movemarkfrom:
6908 if movemarkfrom == repo['.'].node():
6913 if movemarkfrom == repo['.'].node():
6909 pass # no-op update
6914 pass # no-op update
6910 elif bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
6915 elif bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
6911 ui.status(_("updating bookmark %s\n") % repo._activebookmark)
6916 ui.status(_("updating bookmark %s\n") % repo._activebookmark)
6912 else:
6917 else:
6913 # this can happen with a non-linear update
6918 # this can happen with a non-linear update
6914 ui.status(_("(leaving bookmark %s)\n") %
6919 ui.status(_("(leaving bookmark %s)\n") %
6915 repo._activebookmark)
6920 repo._activebookmark)
6916 bookmarks.deactivate(repo)
6921 bookmarks.deactivate(repo)
6917 elif brev in repo._bookmarks:
6922 elif brev in repo._bookmarks:
6918 bookmarks.activate(repo, brev)
6923 bookmarks.activate(repo, brev)
6919 ui.status(_("(activating bookmark %s)\n") % brev)
6924 ui.status(_("(activating bookmark %s)\n") % brev)
6920 elif brev:
6925 elif brev:
6921 if repo._activebookmark:
6926 if repo._activebookmark:
6922 ui.status(_("(leaving bookmark %s)\n") %
6927 ui.status(_("(leaving bookmark %s)\n") %
6923 repo._activebookmark)
6928 repo._activebookmark)
6924 bookmarks.deactivate(repo)
6929 bookmarks.deactivate(repo)
6925 finally:
6930 finally:
6926 wlock.release()
6931 wlock.release()
6927
6932
6928 return ret
6933 return ret
6929
6934
6930 @command('verify', [])
6935 @command('verify', [])
6931 def verify(ui, repo):
6936 def verify(ui, repo):
6932 """verify the integrity of the repository
6937 """verify the integrity of the repository
6933
6938
6934 Verify the integrity of the current repository.
6939 Verify the integrity of the current repository.
6935
6940
6936 This will perform an extensive check of the repository's
6941 This will perform an extensive check of the repository's
6937 integrity, validating the hashes and checksums of each entry in
6942 integrity, validating the hashes and checksums of each entry in
6938 the changelog, manifest, and tracked files, as well as the
6943 the changelog, manifest, and tracked files, as well as the
6939 integrity of their crosslinks and indices.
6944 integrity of their crosslinks and indices.
6940
6945
6941 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
6946 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
6942 for more information about recovery from corruption of the
6947 for more information about recovery from corruption of the
6943 repository.
6948 repository.
6944
6949
6945 Returns 0 on success, 1 if errors are encountered.
6950 Returns 0 on success, 1 if errors are encountered.
6946 """
6951 """
6947 return hg.verify(repo)
6952 return hg.verify(repo)
6948
6953
6949 @command('version', [], norepo=True)
6954 @command('version', [], norepo=True)
6950 def version_(ui):
6955 def version_(ui):
6951 """output version and copyright information"""
6956 """output version and copyright information"""
6952 ui.write(_("Mercurial Distributed SCM (version %s)\n")
6957 ui.write(_("Mercurial Distributed SCM (version %s)\n")
6953 % util.version())
6958 % util.version())
6954 ui.status(_(
6959 ui.status(_(
6955 "(see https://mercurial-scm.org for more information)\n"
6960 "(see https://mercurial-scm.org for more information)\n"
6956 "\nCopyright (C) 2005-2015 Matt Mackall and others\n"
6961 "\nCopyright (C) 2005-2015 Matt Mackall and others\n"
6957 "This is free software; see the source for copying conditions. "
6962 "This is free software; see the source for copying conditions. "
6958 "There is NO\nwarranty; "
6963 "There is NO\nwarranty; "
6959 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6964 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6960 ))
6965 ))
6961
6966
6962 ui.note(_("\nEnabled extensions:\n\n"))
6967 ui.note(_("\nEnabled extensions:\n\n"))
6963 if ui.verbose:
6968 if ui.verbose:
6964 # format names and versions into columns
6969 # format names and versions into columns
6965 names = []
6970 names = []
6966 vers = []
6971 vers = []
6967 for name, module in extensions.extensions():
6972 for name, module in extensions.extensions():
6968 names.append(name)
6973 names.append(name)
6969 vers.append(extensions.moduleversion(module))
6974 vers.append(extensions.moduleversion(module))
6970 if names:
6975 if names:
6971 maxnamelen = max(len(n) for n in names)
6976 maxnamelen = max(len(n) for n in names)
6972 for i, name in enumerate(names):
6977 for i, name in enumerate(names):
6973 ui.write(" %-*s %s\n" % (maxnamelen, name, vers[i]))
6978 ui.write(" %-*s %s\n" % (maxnamelen, name, vers[i]))
@@ -1,565 +1,565 b''
1 # help.py - help data for mercurial
1 # help.py - help data for mercurial
2 #
2 #
3 # Copyright 2006 Matt Mackall <mpm@selenic.com>
3 # Copyright 2006 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 i18n import gettext, _
8 from i18n import gettext, _
9 import itertools, os, textwrap
9 import itertools, os, textwrap
10 import error
10 import error
11 import extensions, revset, fileset, templatekw, templatefilters, filemerge
11 import extensions, revset, fileset, templatekw, templatefilters, filemerge
12 import templater
12 import templater
13 import encoding, util, minirst
13 import encoding, util, minirst
14 import cmdutil
14 import cmdutil
15 import hgweb.webcommands as webcommands
15 import hgweb.webcommands as webcommands
16
16
17 _exclkeywords = [
17 _exclkeywords = [
18 "(DEPRECATED)",
18 "(DEPRECATED)",
19 "(EXPERIMENTAL)",
19 "(EXPERIMENTAL)",
20 # i18n: "(DEPRECATED)" is a keyword, must be translated consistently
20 # i18n: "(DEPRECATED)" is a keyword, must be translated consistently
21 _("(DEPRECATED)"),
21 _("(DEPRECATED)"),
22 # i18n: "(EXPERIMENTAL)" is a keyword, must be translated consistently
22 # i18n: "(EXPERIMENTAL)" is a keyword, must be translated consistently
23 _("(EXPERIMENTAL)"),
23 _("(EXPERIMENTAL)"),
24 ]
24 ]
25
25
26 def listexts(header, exts, indent=1, showdeprecated=False):
26 def listexts(header, exts, indent=1, showdeprecated=False):
27 '''return a text listing of the given extensions'''
27 '''return a text listing of the given extensions'''
28 rst = []
28 rst = []
29 if exts:
29 if exts:
30 for name, desc in sorted(exts.iteritems()):
30 for name, desc in sorted(exts.iteritems()):
31 if not showdeprecated and any(w in desc for w in _exclkeywords):
31 if not showdeprecated and any(w in desc for w in _exclkeywords):
32 continue
32 continue
33 rst.append('%s:%s: %s\n' % (' ' * indent, name, desc))
33 rst.append('%s:%s: %s\n' % (' ' * indent, name, desc))
34 if rst:
34 if rst:
35 rst.insert(0, '\n%s\n\n' % header)
35 rst.insert(0, '\n%s\n\n' % header)
36 return rst
36 return rst
37
37
38 def extshelp(ui):
38 def extshelp(ui):
39 rst = loaddoc('extensions')(ui).splitlines(True)
39 rst = loaddoc('extensions')(ui).splitlines(True)
40 rst.extend(listexts(
40 rst.extend(listexts(
41 _('enabled extensions:'), extensions.enabled(), showdeprecated=True))
41 _('enabled extensions:'), extensions.enabled(), showdeprecated=True))
42 rst.extend(listexts(_('disabled extensions:'), extensions.disabled()))
42 rst.extend(listexts(_('disabled extensions:'), extensions.disabled()))
43 doc = ''.join(rst)
43 doc = ''.join(rst)
44 return doc
44 return doc
45
45
46 def optrst(header, options, verbose):
46 def optrst(header, options, verbose):
47 data = []
47 data = []
48 multioccur = False
48 multioccur = False
49 for option in options:
49 for option in options:
50 if len(option) == 5:
50 if len(option) == 5:
51 shortopt, longopt, default, desc, optlabel = option
51 shortopt, longopt, default, desc, optlabel = option
52 else:
52 else:
53 shortopt, longopt, default, desc = option
53 shortopt, longopt, default, desc = option
54 optlabel = _("VALUE") # default label
54 optlabel = _("VALUE") # default label
55
55
56 if not verbose and any(w in desc for w in _exclkeywords):
56 if not verbose and any(w in desc for w in _exclkeywords):
57 continue
57 continue
58
58
59 so = ''
59 so = ''
60 if shortopt:
60 if shortopt:
61 so = '-' + shortopt
61 so = '-' + shortopt
62 lo = '--' + longopt
62 lo = '--' + longopt
63 if default:
63 if default:
64 desc += _(" (default: %s)") % default
64 desc += _(" (default: %s)") % default
65
65
66 if isinstance(default, list):
66 if isinstance(default, list):
67 lo += " %s [+]" % optlabel
67 lo += " %s [+]" % optlabel
68 multioccur = True
68 multioccur = True
69 elif (default is not None) and not isinstance(default, bool):
69 elif (default is not None) and not isinstance(default, bool):
70 lo += " %s" % optlabel
70 lo += " %s" % optlabel
71
71
72 data.append((so, lo, desc))
72 data.append((so, lo, desc))
73
73
74 if multioccur:
74 if multioccur:
75 header += (_(" ([+] can be repeated)"))
75 header += (_(" ([+] can be repeated)"))
76
76
77 rst = ['\n%s:\n\n' % header]
77 rst = ['\n%s:\n\n' % header]
78 rst.extend(minirst.maketable(data, 1))
78 rst.extend(minirst.maketable(data, 1))
79
79
80 return ''.join(rst)
80 return ''.join(rst)
81
81
82 def indicateomitted(rst, omitted, notomitted=None):
82 def indicateomitted(rst, omitted, notomitted=None):
83 rst.append('\n\n.. container:: omitted\n\n %s\n\n' % omitted)
83 rst.append('\n\n.. container:: omitted\n\n %s\n\n' % omitted)
84 if notomitted:
84 if notomitted:
85 rst.append('\n\n.. container:: notomitted\n\n %s\n\n' % notomitted)
85 rst.append('\n\n.. container:: notomitted\n\n %s\n\n' % notomitted)
86
86
87 def filtercmd(ui, cmd, kw, doc):
87 def filtercmd(ui, cmd, kw, doc):
88 if not ui.debugflag and cmd.startswith("debug") and kw != "debug":
88 if not ui.debugflag and cmd.startswith("debug") and kw != "debug":
89 return True
89 return True
90 if not ui.verbose and doc and any(w in doc for w in _exclkeywords):
90 if not ui.verbose and doc and any(w in doc for w in _exclkeywords):
91 return True
91 return True
92 return False
92 return False
93
93
94 def topicmatch(ui, kw):
94 def topicmatch(ui, kw):
95 """Return help topics matching kw.
95 """Return help topics matching kw.
96
96
97 Returns {'section': [(name, summary), ...], ...} where section is
97 Returns {'section': [(name, summary), ...], ...} where section is
98 one of topics, commands, extensions, or extensioncommands.
98 one of topics, commands, extensions, or extensioncommands.
99 """
99 """
100 kw = encoding.lower(kw)
100 kw = encoding.lower(kw)
101 def lowercontains(container):
101 def lowercontains(container):
102 return kw in encoding.lower(container) # translated in helptable
102 return kw in encoding.lower(container) # translated in helptable
103 results = {'topics': [],
103 results = {'topics': [],
104 'commands': [],
104 'commands': [],
105 'extensions': [],
105 'extensions': [],
106 'extensioncommands': [],
106 'extensioncommands': [],
107 }
107 }
108 for names, header, doc in helptable:
108 for names, header, doc in helptable:
109 # Old extensions may use a str as doc.
109 # Old extensions may use a str as doc.
110 if (sum(map(lowercontains, names))
110 if (sum(map(lowercontains, names))
111 or lowercontains(header)
111 or lowercontains(header)
112 or (callable(doc) and lowercontains(doc(ui)))):
112 or (callable(doc) and lowercontains(doc(ui)))):
113 results['topics'].append((names[0], header))
113 results['topics'].append((names[0], header))
114 import commands # avoid cycle
114 import commands # avoid cycle
115 for cmd, entry in commands.table.iteritems():
115 for cmd, entry in commands.table.iteritems():
116 if len(entry) == 3:
116 if len(entry) == 3:
117 summary = entry[2]
117 summary = entry[2]
118 else:
118 else:
119 summary = ''
119 summary = ''
120 # translate docs *before* searching there
120 # translate docs *before* searching there
121 docs = _(getattr(entry[0], '__doc__', None)) or ''
121 docs = _(getattr(entry[0], '__doc__', None)) or ''
122 if kw in cmd or lowercontains(summary) or lowercontains(docs):
122 if kw in cmd or lowercontains(summary) or lowercontains(docs):
123 doclines = docs.splitlines()
123 doclines = docs.splitlines()
124 if doclines:
124 if doclines:
125 summary = doclines[0]
125 summary = doclines[0]
126 cmdname = cmd.partition('|')[0].lstrip('^')
126 cmdname = cmd.partition('|')[0].lstrip('^')
127 if filtercmd(ui, cmdname, kw, docs):
127 if filtercmd(ui, cmdname, kw, docs):
128 continue
128 continue
129 results['commands'].append((cmdname, summary))
129 results['commands'].append((cmdname, summary))
130 for name, docs in itertools.chain(
130 for name, docs in itertools.chain(
131 extensions.enabled(False).iteritems(),
131 extensions.enabled(False).iteritems(),
132 extensions.disabled().iteritems()):
132 extensions.disabled().iteritems()):
133 # extensions.load ignores the UI argument
133 # extensions.load ignores the UI argument
134 mod = extensions.load(None, name, '')
134 mod = extensions.load(None, name, '')
135 name = name.rpartition('.')[-1]
135 name = name.rpartition('.')[-1]
136 if lowercontains(name) or lowercontains(docs):
136 if lowercontains(name) or lowercontains(docs):
137 # extension docs are already translated
137 # extension docs are already translated
138 results['extensions'].append((name, docs.splitlines()[0]))
138 results['extensions'].append((name, docs.splitlines()[0]))
139 for cmd, entry in getattr(mod, 'cmdtable', {}).iteritems():
139 for cmd, entry in getattr(mod, 'cmdtable', {}).iteritems():
140 if kw in cmd or (len(entry) > 2 and lowercontains(entry[2])):
140 if kw in cmd or (len(entry) > 2 and lowercontains(entry[2])):
141 cmdname = cmd.partition('|')[0].lstrip('^')
141 cmdname = cmd.partition('|')[0].lstrip('^')
142 if entry[0].__doc__:
142 if entry[0].__doc__:
143 cmddoc = gettext(entry[0].__doc__).splitlines()[0]
143 cmddoc = gettext(entry[0].__doc__).splitlines()[0]
144 else:
144 else:
145 cmddoc = _('(no help text available)')
145 cmddoc = _('(no help text available)')
146 results['extensioncommands'].append((cmdname, cmddoc))
146 results['extensioncommands'].append((cmdname, cmddoc))
147 return results
147 return results
148
148
149 def loaddoc(topic, subdir=None):
149 def loaddoc(topic, subdir=None):
150 """Return a delayed loader for help/topic.txt."""
150 """Return a delayed loader for help/topic.txt."""
151
151
152 def loader(ui):
152 def loader(ui):
153 docdir = os.path.join(util.datapath, 'help')
153 docdir = os.path.join(util.datapath, 'help')
154 if subdir:
154 if subdir:
155 docdir = os.path.join(docdir, subdir)
155 docdir = os.path.join(docdir, subdir)
156 path = os.path.join(docdir, topic + ".txt")
156 path = os.path.join(docdir, topic + ".txt")
157 doc = gettext(util.readfile(path))
157 doc = gettext(util.readfile(path))
158 for rewriter in helphooks.get(topic, []):
158 for rewriter in helphooks.get(topic, []):
159 doc = rewriter(ui, topic, doc)
159 doc = rewriter(ui, topic, doc)
160 return doc
160 return doc
161
161
162 return loader
162 return loader
163
163
164 internalstable = sorted([
164 internalstable = sorted([
165 (['bundles'], _('container for exchange of repository data'),
165 (['bundles'], _('container for exchange of repository data'),
166 loaddoc('bundles', subdir='internals')),
166 loaddoc('bundles', subdir='internals')),
167 (['changegroups'], _('representation of revlog data'),
167 (['changegroups'], _('representation of revlog data'),
168 loaddoc('changegroups', subdir='internals')),
168 loaddoc('changegroups', subdir='internals')),
169 ])
169 ])
170
170
171 def internalshelp(ui):
171 def internalshelp(ui):
172 """Generate the index for the "internals" topic."""
172 """Generate the index for the "internals" topic."""
173 lines = []
173 lines = []
174 for names, header, doc in internalstable:
174 for names, header, doc in internalstable:
175 lines.append(' :%s: %s' % (names[0], header))
175 lines.append(' :%s: %s' % (names[0], header))
176
176
177 return '\n'.join(lines)
177 return '\n'.join(lines)
178
178
179 helptable = sorted([
179 helptable = sorted([
180 (["config", "hgrc"], _("Configuration Files"), loaddoc('config')),
180 (["config", "hgrc"], _("Configuration Files"), loaddoc('config')),
181 (["dates"], _("Date Formats"), loaddoc('dates')),
181 (["dates"], _("Date Formats"), loaddoc('dates')),
182 (["patterns"], _("File Name Patterns"), loaddoc('patterns')),
182 (["patterns"], _("File Name Patterns"), loaddoc('patterns')),
183 (['environment', 'env'], _('Environment Variables'),
183 (['environment', 'env'], _('Environment Variables'),
184 loaddoc('environment')),
184 loaddoc('environment')),
185 (['revisions', 'revs'], _('Specifying Single Revisions'),
185 (['revisions', 'revs'], _('Specifying Single Revisions'),
186 loaddoc('revisions')),
186 loaddoc('revisions')),
187 (['multirevs', 'mrevs'], _('Specifying Multiple Revisions'),
187 (['multirevs', 'mrevs'], _('Specifying Multiple Revisions'),
188 loaddoc('multirevs')),
188 loaddoc('multirevs')),
189 (['revsets', 'revset'], _("Specifying Revision Sets"), loaddoc('revsets')),
189 (['revsets', 'revset'], _("Specifying Revision Sets"), loaddoc('revsets')),
190 (['filesets', 'fileset'], _("Specifying File Sets"), loaddoc('filesets')),
190 (['filesets', 'fileset'], _("Specifying File Sets"), loaddoc('filesets')),
191 (['diffs'], _('Diff Formats'), loaddoc('diffs')),
191 (['diffs'], _('Diff Formats'), loaddoc('diffs')),
192 (['merge-tools', 'mergetools'], _('Merge Tools'), loaddoc('merge-tools')),
192 (['merge-tools', 'mergetools'], _('Merge Tools'), loaddoc('merge-tools')),
193 (['templating', 'templates', 'template', 'style'], _('Template Usage'),
193 (['templating', 'templates', 'template', 'style'], _('Template Usage'),
194 loaddoc('templates')),
194 loaddoc('templates')),
195 (['urls'], _('URL Paths'), loaddoc('urls')),
195 (['urls'], _('URL Paths'), loaddoc('urls')),
196 (["extensions"], _("Using Additional Features"), extshelp),
196 (["extensions"], _("Using Additional Features"), extshelp),
197 (["subrepos", "subrepo"], _("Subrepositories"), loaddoc('subrepos')),
197 (["subrepos", "subrepo"], _("Subrepositories"), loaddoc('subrepos')),
198 (["hgweb"], _("Configuring hgweb"), loaddoc('hgweb')),
198 (["hgweb"], _("Configuring hgweb"), loaddoc('hgweb')),
199 (["glossary"], _("Glossary"), loaddoc('glossary')),
199 (["glossary"], _("Glossary"), loaddoc('glossary')),
200 (["hgignore", "ignore"], _("Syntax for Mercurial Ignore Files"),
200 (["hgignore", "ignore"], _("Syntax for Mercurial Ignore Files"),
201 loaddoc('hgignore')),
201 loaddoc('hgignore')),
202 (["phases"], _("Working with Phases"), loaddoc('phases')),
202 (["phases"], _("Working with Phases"), loaddoc('phases')),
203 (['scripting'], _('Using Mercurial from scripts and automation'),
203 (['scripting'], _('Using Mercurial from scripts and automation'),
204 loaddoc('scripting')),
204 loaddoc('scripting')),
205 (['internals'], _("Technical implementation topics"),
205 (['internals'], _("Technical implementation topics"),
206 internalshelp),
206 internalshelp),
207 ])
207 ])
208
208
209 # Map topics to lists of callable taking the current topic help and
209 # Map topics to lists of callable taking the current topic help and
210 # returning the updated version
210 # returning the updated version
211 helphooks = {}
211 helphooks = {}
212
212
213 def addtopichook(topic, rewriter):
213 def addtopichook(topic, rewriter):
214 helphooks.setdefault(topic, []).append(rewriter)
214 helphooks.setdefault(topic, []).append(rewriter)
215
215
216 def makeitemsdoc(ui, topic, doc, marker, items, dedent=False):
216 def makeitemsdoc(ui, topic, doc, marker, items, dedent=False):
217 """Extract docstring from the items key to function mapping, build a
217 """Extract docstring from the items key to function mapping, build a
218 single documentation block and use it to overwrite the marker in doc.
218 single documentation block and use it to overwrite the marker in doc.
219 """
219 """
220 entries = []
220 entries = []
221 for name in sorted(items):
221 for name in sorted(items):
222 text = (items[name].__doc__ or '').rstrip()
222 text = (items[name].__doc__ or '').rstrip()
223 if (not text
223 if (not text
224 or not ui.verbose and any(w in text for w in _exclkeywords)):
224 or not ui.verbose and any(w in text for w in _exclkeywords)):
225 continue
225 continue
226 text = gettext(text)
226 text = gettext(text)
227 if dedent:
227 if dedent:
228 text = textwrap.dedent(text)
228 text = textwrap.dedent(text)
229 lines = text.splitlines()
229 lines = text.splitlines()
230 doclines = [(lines[0])]
230 doclines = [(lines[0])]
231 for l in lines[1:]:
231 for l in lines[1:]:
232 # Stop once we find some Python doctest
232 # Stop once we find some Python doctest
233 if l.strip().startswith('>>>'):
233 if l.strip().startswith('>>>'):
234 break
234 break
235 if dedent:
235 if dedent:
236 doclines.append(l.rstrip())
236 doclines.append(l.rstrip())
237 else:
237 else:
238 doclines.append(' ' + l.strip())
238 doclines.append(' ' + l.strip())
239 entries.append('\n'.join(doclines))
239 entries.append('\n'.join(doclines))
240 entries = '\n\n'.join(entries)
240 entries = '\n\n'.join(entries)
241 return doc.replace(marker, entries)
241 return doc.replace(marker, entries)
242
242
243 def addtopicsymbols(topic, marker, symbols, dedent=False):
243 def addtopicsymbols(topic, marker, symbols, dedent=False):
244 def add(ui, topic, doc):
244 def add(ui, topic, doc):
245 return makeitemsdoc(ui, topic, doc, marker, symbols, dedent=dedent)
245 return makeitemsdoc(ui, topic, doc, marker, symbols, dedent=dedent)
246 addtopichook(topic, add)
246 addtopichook(topic, add)
247
247
248 addtopicsymbols('filesets', '.. predicatesmarker', fileset.symbols)
248 addtopicsymbols('filesets', '.. predicatesmarker', fileset.symbols)
249 addtopicsymbols('merge-tools', '.. internaltoolsmarker',
249 addtopicsymbols('merge-tools', '.. internaltoolsmarker',
250 filemerge.internalsdoc)
250 filemerge.internalsdoc)
251 addtopicsymbols('revsets', '.. predicatesmarker', revset.symbols)
251 addtopicsymbols('revsets', '.. predicatesmarker', revset.symbols)
252 addtopicsymbols('templates', '.. keywordsmarker', templatekw.keywords)
252 addtopicsymbols('templates', '.. keywordsmarker', templatekw.keywords)
253 addtopicsymbols('templates', '.. filtersmarker', templatefilters.filters)
253 addtopicsymbols('templates', '.. filtersmarker', templatefilters.filters)
254 addtopicsymbols('templates', '.. functionsmarker', templater.funcs)
254 addtopicsymbols('templates', '.. functionsmarker', templater.funcs)
255 addtopicsymbols('hgweb', '.. webcommandsmarker', webcommands.commands,
255 addtopicsymbols('hgweb', '.. webcommandsmarker', webcommands.commands,
256 dedent=True)
256 dedent=True)
257
257
258 def help_(ui, name, unknowncmd=False, full=True, **opts):
258 def help_(ui, name, unknowncmd=False, full=True, subtopic=None, **opts):
259 '''
259 '''
260 Generate the help for 'name' as unformatted restructured text. If
260 Generate the help for 'name' as unformatted restructured text. If
261 'name' is None, describe the commands available.
261 'name' is None, describe the commands available.
262 '''
262 '''
263
263
264 import commands # avoid cycle
264 import commands # avoid cycle
265
265
266 def helpcmd(name):
266 def helpcmd(name):
267 try:
267 try:
268 aliases, entry = cmdutil.findcmd(name, commands.table,
268 aliases, entry = cmdutil.findcmd(name, commands.table,
269 strict=unknowncmd)
269 strict=unknowncmd)
270 except error.AmbiguousCommand as inst:
270 except error.AmbiguousCommand as inst:
271 # py3k fix: except vars can't be used outside the scope of the
271 # py3k fix: except vars can't be used outside the scope of the
272 # except block, nor can be used inside a lambda. python issue4617
272 # except block, nor can be used inside a lambda. python issue4617
273 prefix = inst.args[0]
273 prefix = inst.args[0]
274 select = lambda c: c.lstrip('^').startswith(prefix)
274 select = lambda c: c.lstrip('^').startswith(prefix)
275 rst = helplist(select)
275 rst = helplist(select)
276 return rst
276 return rst
277
277
278 rst = []
278 rst = []
279
279
280 # check if it's an invalid alias and display its error if it is
280 # check if it's an invalid alias and display its error if it is
281 if getattr(entry[0], 'badalias', None):
281 if getattr(entry[0], 'badalias', None):
282 rst.append(entry[0].badalias + '\n')
282 rst.append(entry[0].badalias + '\n')
283 if entry[0].unknowncmd:
283 if entry[0].unknowncmd:
284 try:
284 try:
285 rst.extend(helpextcmd(entry[0].cmdname))
285 rst.extend(helpextcmd(entry[0].cmdname))
286 except error.UnknownCommand:
286 except error.UnknownCommand:
287 pass
287 pass
288 return rst
288 return rst
289
289
290 # synopsis
290 # synopsis
291 if len(entry) > 2:
291 if len(entry) > 2:
292 if entry[2].startswith('hg'):
292 if entry[2].startswith('hg'):
293 rst.append("%s\n" % entry[2])
293 rst.append("%s\n" % entry[2])
294 else:
294 else:
295 rst.append('hg %s %s\n' % (aliases[0], entry[2]))
295 rst.append('hg %s %s\n' % (aliases[0], entry[2]))
296 else:
296 else:
297 rst.append('hg %s\n' % aliases[0])
297 rst.append('hg %s\n' % aliases[0])
298 # aliases
298 # aliases
299 if full and not ui.quiet and len(aliases) > 1:
299 if full and not ui.quiet and len(aliases) > 1:
300 rst.append(_("\naliases: %s\n") % ', '.join(aliases[1:]))
300 rst.append(_("\naliases: %s\n") % ', '.join(aliases[1:]))
301 rst.append('\n')
301 rst.append('\n')
302
302
303 # description
303 # description
304 doc = gettext(entry[0].__doc__)
304 doc = gettext(entry[0].__doc__)
305 if not doc:
305 if not doc:
306 doc = _("(no help text available)")
306 doc = _("(no help text available)")
307 if util.safehasattr(entry[0], 'definition'): # aliased command
307 if util.safehasattr(entry[0], 'definition'): # aliased command
308 if entry[0].definition.startswith('!'): # shell alias
308 if entry[0].definition.startswith('!'): # shell alias
309 doc = _('shell alias for::\n\n %s') % entry[0].definition[1:]
309 doc = _('shell alias for::\n\n %s') % entry[0].definition[1:]
310 else:
310 else:
311 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
311 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
312 doc = doc.splitlines(True)
312 doc = doc.splitlines(True)
313 if ui.quiet or not full:
313 if ui.quiet or not full:
314 rst.append(doc[0])
314 rst.append(doc[0])
315 else:
315 else:
316 rst.extend(doc)
316 rst.extend(doc)
317 rst.append('\n')
317 rst.append('\n')
318
318
319 # check if this command shadows a non-trivial (multi-line)
319 # check if this command shadows a non-trivial (multi-line)
320 # extension help text
320 # extension help text
321 try:
321 try:
322 mod = extensions.find(name)
322 mod = extensions.find(name)
323 doc = gettext(mod.__doc__) or ''
323 doc = gettext(mod.__doc__) or ''
324 if '\n' in doc.strip():
324 if '\n' in doc.strip():
325 msg = _('(use "hg help -e %s" to show help for '
325 msg = _('(use "hg help -e %s" to show help for '
326 'the %s extension)') % (name, name)
326 'the %s extension)') % (name, name)
327 rst.append('\n%s\n' % msg)
327 rst.append('\n%s\n' % msg)
328 except KeyError:
328 except KeyError:
329 pass
329 pass
330
330
331 # options
331 # options
332 if not ui.quiet and entry[1]:
332 if not ui.quiet and entry[1]:
333 rst.append(optrst(_("options"), entry[1], ui.verbose))
333 rst.append(optrst(_("options"), entry[1], ui.verbose))
334
334
335 if ui.verbose:
335 if ui.verbose:
336 rst.append(optrst(_("global options"),
336 rst.append(optrst(_("global options"),
337 commands.globalopts, ui.verbose))
337 commands.globalopts, ui.verbose))
338
338
339 if not ui.verbose:
339 if not ui.verbose:
340 if not full:
340 if not full:
341 rst.append(_('\n(use "hg %s -h" to show more help)\n')
341 rst.append(_('\n(use "hg %s -h" to show more help)\n')
342 % name)
342 % name)
343 elif not ui.quiet:
343 elif not ui.quiet:
344 rst.append(_('\n(some details hidden, use --verbose '
344 rst.append(_('\n(some details hidden, use --verbose '
345 'to show complete help)'))
345 'to show complete help)'))
346
346
347 return rst
347 return rst
348
348
349
349
350 def helplist(select=None, **opts):
350 def helplist(select=None, **opts):
351 # list of commands
351 # list of commands
352 if name == "shortlist":
352 if name == "shortlist":
353 header = _('basic commands:\n\n')
353 header = _('basic commands:\n\n')
354 elif name == "debug":
354 elif name == "debug":
355 header = _('debug commands (internal and unsupported):\n\n')
355 header = _('debug commands (internal and unsupported):\n\n')
356 else:
356 else:
357 header = _('list of commands:\n\n')
357 header = _('list of commands:\n\n')
358
358
359 h = {}
359 h = {}
360 cmds = {}
360 cmds = {}
361 for c, e in commands.table.iteritems():
361 for c, e in commands.table.iteritems():
362 f = c.partition("|")[0]
362 f = c.partition("|")[0]
363 if select and not select(f):
363 if select and not select(f):
364 continue
364 continue
365 if (not select and name != 'shortlist' and
365 if (not select and name != 'shortlist' and
366 e[0].__module__ != commands.__name__):
366 e[0].__module__ != commands.__name__):
367 continue
367 continue
368 if name == "shortlist" and not f.startswith("^"):
368 if name == "shortlist" and not f.startswith("^"):
369 continue
369 continue
370 f = f.lstrip("^")
370 f = f.lstrip("^")
371 doc = e[0].__doc__
371 doc = e[0].__doc__
372 if filtercmd(ui, f, name, doc):
372 if filtercmd(ui, f, name, doc):
373 continue
373 continue
374 doc = gettext(doc)
374 doc = gettext(doc)
375 if not doc:
375 if not doc:
376 doc = _("(no help text available)")
376 doc = _("(no help text available)")
377 h[f] = doc.splitlines()[0].rstrip()
377 h[f] = doc.splitlines()[0].rstrip()
378 cmds[f] = c.lstrip("^")
378 cmds[f] = c.lstrip("^")
379
379
380 rst = []
380 rst = []
381 if not h:
381 if not h:
382 if not ui.quiet:
382 if not ui.quiet:
383 rst.append(_('no commands defined\n'))
383 rst.append(_('no commands defined\n'))
384 return rst
384 return rst
385
385
386 if not ui.quiet:
386 if not ui.quiet:
387 rst.append(header)
387 rst.append(header)
388 fns = sorted(h)
388 fns = sorted(h)
389 for f in fns:
389 for f in fns:
390 if ui.verbose:
390 if ui.verbose:
391 commacmds = cmds[f].replace("|",", ")
391 commacmds = cmds[f].replace("|",", ")
392 rst.append(" :%s: %s\n" % (commacmds, h[f]))
392 rst.append(" :%s: %s\n" % (commacmds, h[f]))
393 else:
393 else:
394 rst.append(' :%s: %s\n' % (f, h[f]))
394 rst.append(' :%s: %s\n' % (f, h[f]))
395
395
396 ex = opts.get
396 ex = opts.get
397 anyopts = (ex('keyword') or not (ex('command') or ex('extension')))
397 anyopts = (ex('keyword') or not (ex('command') or ex('extension')))
398 if not name and anyopts:
398 if not name and anyopts:
399 exts = listexts(_('enabled extensions:'), extensions.enabled())
399 exts = listexts(_('enabled extensions:'), extensions.enabled())
400 if exts:
400 if exts:
401 rst.append('\n')
401 rst.append('\n')
402 rst.extend(exts)
402 rst.extend(exts)
403
403
404 rst.append(_("\nadditional help topics:\n\n"))
404 rst.append(_("\nadditional help topics:\n\n"))
405 topics = []
405 topics = []
406 for names, header, doc in helptable:
406 for names, header, doc in helptable:
407 topics.append((names[0], header))
407 topics.append((names[0], header))
408 for t, desc in topics:
408 for t, desc in topics:
409 rst.append(" :%s: %s\n" % (t, desc))
409 rst.append(" :%s: %s\n" % (t, desc))
410
410
411 if ui.quiet:
411 if ui.quiet:
412 pass
412 pass
413 elif ui.verbose:
413 elif ui.verbose:
414 rst.append('\n%s\n' % optrst(_("global options"),
414 rst.append('\n%s\n' % optrst(_("global options"),
415 commands.globalopts, ui.verbose))
415 commands.globalopts, ui.verbose))
416 if name == 'shortlist':
416 if name == 'shortlist':
417 rst.append(_('\n(use "hg help" for the full list '
417 rst.append(_('\n(use "hg help" for the full list '
418 'of commands)\n'))
418 'of commands)\n'))
419 else:
419 else:
420 if name == 'shortlist':
420 if name == 'shortlist':
421 rst.append(_('\n(use "hg help" for the full list of commands '
421 rst.append(_('\n(use "hg help" for the full list of commands '
422 'or "hg -v" for details)\n'))
422 'or "hg -v" for details)\n'))
423 elif name and not full:
423 elif name and not full:
424 rst.append(_('\n(use "hg help %s" to show the full help '
424 rst.append(_('\n(use "hg help %s" to show the full help '
425 'text)\n') % name)
425 'text)\n') % name)
426 elif name and cmds and name in cmds.keys():
426 elif name and cmds and name in cmds.keys():
427 rst.append(_('\n(use "hg help -v -e %s" to show built-in '
427 rst.append(_('\n(use "hg help -v -e %s" to show built-in '
428 'aliases and global options)\n') % name)
428 'aliases and global options)\n') % name)
429 else:
429 else:
430 rst.append(_('\n(use "hg help -v%s" to show built-in aliases '
430 rst.append(_('\n(use "hg help -v%s" to show built-in aliases '
431 'and global options)\n')
431 'and global options)\n')
432 % (name and " " + name or ""))
432 % (name and " " + name or ""))
433 return rst
433 return rst
434
434
435 def helptopic(name):
435 def helptopic(name):
436 for names, header, doc in helptable:
436 for names, header, doc in helptable:
437 if name in names:
437 if name in names:
438 break
438 break
439 else:
439 else:
440 raise error.UnknownCommand(name)
440 raise error.UnknownCommand(name)
441
441
442 rst = [minirst.section(header)]
442 rst = [minirst.section(header)]
443
443
444 # description
444 # description
445 if not doc:
445 if not doc:
446 rst.append(" %s\n" % _("(no help text available)"))
446 rst.append(" %s\n" % _("(no help text available)"))
447 if callable(doc):
447 if callable(doc):
448 rst += [" %s\n" % l for l in doc(ui).splitlines()]
448 rst += [" %s\n" % l for l in doc(ui).splitlines()]
449
449
450 if not ui.verbose:
450 if not ui.verbose:
451 omitted = _('(some details hidden, use --verbose'
451 omitted = _('(some details hidden, use --verbose'
452 ' to show complete help)')
452 ' to show complete help)')
453 indicateomitted(rst, omitted)
453 indicateomitted(rst, omitted)
454
454
455 try:
455 try:
456 cmdutil.findcmd(name, commands.table)
456 cmdutil.findcmd(name, commands.table)
457 rst.append(_('\nuse "hg help -c %s" to see help for '
457 rst.append(_('\nuse "hg help -c %s" to see help for '
458 'the %s command\n') % (name, name))
458 'the %s command\n') % (name, name))
459 except error.UnknownCommand:
459 except error.UnknownCommand:
460 pass
460 pass
461 return rst
461 return rst
462
462
463 def helpext(name):
463 def helpext(name):
464 try:
464 try:
465 mod = extensions.find(name)
465 mod = extensions.find(name)
466 doc = gettext(mod.__doc__) or _('no help text available')
466 doc = gettext(mod.__doc__) or _('no help text available')
467 except KeyError:
467 except KeyError:
468 mod = None
468 mod = None
469 doc = extensions.disabledext(name)
469 doc = extensions.disabledext(name)
470 if not doc:
470 if not doc:
471 raise error.UnknownCommand(name)
471 raise error.UnknownCommand(name)
472
472
473 if '\n' not in doc:
473 if '\n' not in doc:
474 head, tail = doc, ""
474 head, tail = doc, ""
475 else:
475 else:
476 head, tail = doc.split('\n', 1)
476 head, tail = doc.split('\n', 1)
477 rst = [_('%s extension - %s\n\n') % (name.rpartition('.')[-1], head)]
477 rst = [_('%s extension - %s\n\n') % (name.rpartition('.')[-1], head)]
478 if tail:
478 if tail:
479 rst.extend(tail.splitlines(True))
479 rst.extend(tail.splitlines(True))
480 rst.append('\n')
480 rst.append('\n')
481
481
482 if not ui.verbose:
482 if not ui.verbose:
483 omitted = _('(some details hidden, use --verbose'
483 omitted = _('(some details hidden, use --verbose'
484 ' to show complete help)')
484 ' to show complete help)')
485 indicateomitted(rst, omitted)
485 indicateomitted(rst, omitted)
486
486
487 if mod:
487 if mod:
488 try:
488 try:
489 ct = mod.cmdtable
489 ct = mod.cmdtable
490 except AttributeError:
490 except AttributeError:
491 ct = {}
491 ct = {}
492 modcmds = set([c.partition('|')[0] for c in ct])
492 modcmds = set([c.partition('|')[0] for c in ct])
493 rst.extend(helplist(modcmds.__contains__))
493 rst.extend(helplist(modcmds.__contains__))
494 else:
494 else:
495 rst.append(_('(use "hg help extensions" for information on enabling'
495 rst.append(_('(use "hg help extensions" for information on enabling'
496 ' extensions)\n'))
496 ' extensions)\n'))
497 return rst
497 return rst
498
498
499 def helpextcmd(name):
499 def helpextcmd(name):
500 cmd, ext, mod = extensions.disabledcmd(ui, name,
500 cmd, ext, mod = extensions.disabledcmd(ui, name,
501 ui.configbool('ui', 'strict'))
501 ui.configbool('ui', 'strict'))
502 doc = gettext(mod.__doc__).splitlines()[0]
502 doc = gettext(mod.__doc__).splitlines()[0]
503
503
504 rst = listexts(_("'%s' is provided by the following "
504 rst = listexts(_("'%s' is provided by the following "
505 "extension:") % cmd, {ext: doc}, indent=4,
505 "extension:") % cmd, {ext: doc}, indent=4,
506 showdeprecated=True)
506 showdeprecated=True)
507 rst.append('\n')
507 rst.append('\n')
508 rst.append(_('(use "hg help extensions" for information on enabling '
508 rst.append(_('(use "hg help extensions" for information on enabling '
509 'extensions)\n'))
509 'extensions)\n'))
510 return rst
510 return rst
511
511
512
512
513 rst = []
513 rst = []
514 kw = opts.get('keyword')
514 kw = opts.get('keyword')
515 if kw or name is None and any(opts[o] for o in opts):
515 if kw or name is None and any(opts[o] for o in opts):
516 matches = topicmatch(ui, name or '')
516 matches = topicmatch(ui, name or '')
517 helpareas = []
517 helpareas = []
518 if opts.get('extension'):
518 if opts.get('extension'):
519 helpareas += [('extensions', _('Extensions'))]
519 helpareas += [('extensions', _('Extensions'))]
520 if opts.get('command'):
520 if opts.get('command'):
521 helpareas += [('commands', _('Commands'))]
521 helpareas += [('commands', _('Commands'))]
522 if not helpareas:
522 if not helpareas:
523 helpareas = [('topics', _('Topics')),
523 helpareas = [('topics', _('Topics')),
524 ('commands', _('Commands')),
524 ('commands', _('Commands')),
525 ('extensions', _('Extensions')),
525 ('extensions', _('Extensions')),
526 ('extensioncommands', _('Extension Commands'))]
526 ('extensioncommands', _('Extension Commands'))]
527 for t, title in helpareas:
527 for t, title in helpareas:
528 if matches[t]:
528 if matches[t]:
529 rst.append('%s:\n\n' % title)
529 rst.append('%s:\n\n' % title)
530 rst.extend(minirst.maketable(sorted(matches[t]), 1))
530 rst.extend(minirst.maketable(sorted(matches[t]), 1))
531 rst.append('\n')
531 rst.append('\n')
532 if not rst:
532 if not rst:
533 msg = _('no matches')
533 msg = _('no matches')
534 hint = _('try "hg help" for a list of topics')
534 hint = _('try "hg help" for a list of topics')
535 raise error.Abort(msg, hint=hint)
535 raise error.Abort(msg, hint=hint)
536 elif name and name != 'shortlist':
536 elif name and name != 'shortlist':
537 queries = []
537 queries = []
538 if unknowncmd:
538 if unknowncmd:
539 queries += [helpextcmd]
539 queries += [helpextcmd]
540 if opts.get('extension'):
540 if opts.get('extension'):
541 queries += [helpext]
541 queries += [helpext]
542 if opts.get('command'):
542 if opts.get('command'):
543 queries += [helpcmd]
543 queries += [helpcmd]
544 if not queries:
544 if not queries:
545 queries = (helptopic, helpcmd, helpext, helpextcmd)
545 queries = (helptopic, helpcmd, helpext, helpextcmd)
546 for f in queries:
546 for f in queries:
547 try:
547 try:
548 rst = f(name)
548 rst = f(name)
549 break
549 break
550 except error.UnknownCommand:
550 except error.UnknownCommand:
551 pass
551 pass
552 else:
552 else:
553 if unknowncmd:
553 if unknowncmd:
554 raise error.UnknownCommand(name)
554 raise error.UnknownCommand(name)
555 else:
555 else:
556 msg = _('no such help topic: %s') % name
556 msg = _('no such help topic: %s') % name
557 hint = _('try "hg help --keyword %s"') % name
557 hint = _('try "hg help --keyword %s"') % name
558 raise error.Abort(msg, hint=hint)
558 raise error.Abort(msg, hint=hint)
559 else:
559 else:
560 # program name
560 # program name
561 if not ui.quiet:
561 if not ui.quiet:
562 rst = [_("Mercurial Distributed SCM\n"), '\n']
562 rst = [_("Mercurial Distributed SCM\n"), '\n']
563 rst.extend(helplist(None, **opts))
563 rst.extend(helplist(None, **opts))
564
564
565 return ''.join(rst)
565 return ''.join(rst)
General Comments 0
You need to be logged in to leave comments. Login now