##// END OF EJS Templates
add: mention .hgignore in help
timeless -
r27424:c2854c41 default
parent child Browse files
Show More
@@ -1,7001 +1,7002 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 (except
197 files matching ``.hgignore``).
197
198
198 .. container:: verbose
199 .. container:: verbose
199
200
200 Examples:
201 Examples:
201
202
202 - New (unknown) files are added
203 - New (unknown) files are added
203 automatically by :hg:`add`::
204 automatically by :hg:`add`::
204
205
205 $ ls
206 $ ls
206 foo.c
207 foo.c
207 $ hg status
208 $ hg status
208 ? foo.c
209 ? foo.c
209 $ hg add
210 $ hg add
210 adding foo.c
211 adding foo.c
211 $ hg status
212 $ hg status
212 A foo.c
213 A foo.c
213
214
214 - Specific files to be added can be specified::
215 - Specific files to be added can be specified::
215
216
216 $ ls
217 $ ls
217 bar.c foo.c
218 bar.c foo.c
218 $ hg status
219 $ hg status
219 ? bar.c
220 ? bar.c
220 ? foo.c
221 ? foo.c
221 $ hg add bar.c
222 $ hg add bar.c
222 $ hg status
223 $ hg status
223 A bar.c
224 A bar.c
224 ? foo.c
225 ? foo.c
225
226
226 Returns 0 if all files are successfully added.
227 Returns 0 if all files are successfully added.
227 """
228 """
228
229
229 m = scmutil.match(repo[None], pats, opts)
230 m = scmutil.match(repo[None], pats, opts)
230 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
231 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
231 return rejected and 1 or 0
232 return rejected and 1 or 0
232
233
233 @command('addremove',
234 @command('addremove',
234 similarityopts + subrepoopts + walkopts + dryrunopts,
235 similarityopts + subrepoopts + walkopts + dryrunopts,
235 _('[OPTION]... [FILE]...'),
236 _('[OPTION]... [FILE]...'),
236 inferrepo=True)
237 inferrepo=True)
237 def addremove(ui, repo, *pats, **opts):
238 def addremove(ui, repo, *pats, **opts):
238 """add all new files, delete all missing files
239 """add all new files, delete all missing files
239
240
240 Add all new files and remove all missing files from the
241 Add all new files and remove all missing files from the
241 repository.
242 repository.
242
243
243 New files are ignored if they match any of the patterns in
244 New files are ignored if they match any of the patterns in
244 ``.hgignore``. As with add, these changes take effect at the next
245 ``.hgignore``. As with add, these changes take effect at the next
245 commit.
246 commit.
246
247
247 Use the -s/--similarity option to detect renamed files. This
248 Use the -s/--similarity option to detect renamed files. This
248 option takes a percentage between 0 (disabled) and 100 (files must
249 option takes a percentage between 0 (disabled) and 100 (files must
249 be identical) as its parameter. With a parameter greater than 0,
250 be identical) as its parameter. With a parameter greater than 0,
250 this compares every removed file with every added file and records
251 this compares every removed file with every added file and records
251 those similar enough as renames. Detecting renamed files this way
252 those similar enough as renames. Detecting renamed files this way
252 can be expensive. After using this option, :hg:`status -C` can be
253 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
254 used to check which files were identified as moved or renamed. If
254 not specified, -s/--similarity defaults to 100 and only renames of
255 not specified, -s/--similarity defaults to 100 and only renames of
255 identical files are detected.
256 identical files are detected.
256
257
257 .. container:: verbose
258 .. container:: verbose
258
259
259 Examples:
260 Examples:
260
261
261 - A number of files (bar.c and foo.c) are new,
262 - A number of files (bar.c and foo.c) are new,
262 while foobar.c has been removed (without using :hg:`remove`)
263 while foobar.c has been removed (without using :hg:`remove`)
263 from the repository::
264 from the repository::
264
265
265 $ ls
266 $ ls
266 bar.c foo.c
267 bar.c foo.c
267 $ hg status
268 $ hg status
268 ! foobar.c
269 ! foobar.c
269 ? bar.c
270 ? bar.c
270 ? foo.c
271 ? foo.c
271 $ hg addremove
272 $ hg addremove
272 adding bar.c
273 adding bar.c
273 adding foo.c
274 adding foo.c
274 removing foobar.c
275 removing foobar.c
275 $ hg status
276 $ hg status
276 A bar.c
277 A bar.c
277 A foo.c
278 A foo.c
278 R foobar.c
279 R foobar.c
279
280
280 - A file foobar.c was moved to foo.c without using :hg:`rename`.
281 - A file foobar.c was moved to foo.c without using :hg:`rename`.
281 Afterwards, it was edited slightly::
282 Afterwards, it was edited slightly::
282
283
283 $ ls
284 $ ls
284 foo.c
285 foo.c
285 $ hg status
286 $ hg status
286 ! foobar.c
287 ! foobar.c
287 ? foo.c
288 ? foo.c
288 $ hg addremove --similarity 90
289 $ hg addremove --similarity 90
289 removing foobar.c
290 removing foobar.c
290 adding foo.c
291 adding foo.c
291 recording removal of foobar.c as rename to foo.c (94% similar)
292 recording removal of foobar.c as rename to foo.c (94% similar)
292 $ hg status -C
293 $ hg status -C
293 A foo.c
294 A foo.c
294 foobar.c
295 foobar.c
295 R foobar.c
296 R foobar.c
296
297
297 Returns 0 if all files are successfully added.
298 Returns 0 if all files are successfully added.
298 """
299 """
299 try:
300 try:
300 sim = float(opts.get('similarity') or 100)
301 sim = float(opts.get('similarity') or 100)
301 except ValueError:
302 except ValueError:
302 raise error.Abort(_('similarity must be a number'))
303 raise error.Abort(_('similarity must be a number'))
303 if sim < 0 or sim > 100:
304 if sim < 0 or sim > 100:
304 raise error.Abort(_('similarity must be between 0 and 100'))
305 raise error.Abort(_('similarity must be between 0 and 100'))
305 matcher = scmutil.match(repo[None], pats, opts)
306 matcher = scmutil.match(repo[None], pats, opts)
306 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
307 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
307
308
308 @command('^annotate|blame',
309 @command('^annotate|blame',
309 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
310 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
310 ('', 'follow', None,
311 ('', 'follow', None,
311 _('follow copies/renames and list the filename (DEPRECATED)')),
312 _('follow copies/renames and list the filename (DEPRECATED)')),
312 ('', 'no-follow', None, _("don't follow copies and renames")),
313 ('', 'no-follow', None, _("don't follow copies and renames")),
313 ('a', 'text', None, _('treat all files as text')),
314 ('a', 'text', None, _('treat all files as text')),
314 ('u', 'user', None, _('list the author (long with -v)')),
315 ('u', 'user', None, _('list the author (long with -v)')),
315 ('f', 'file', None, _('list the filename')),
316 ('f', 'file', None, _('list the filename')),
316 ('d', 'date', None, _('list the date (short with -q)')),
317 ('d', 'date', None, _('list the date (short with -q)')),
317 ('n', 'number', None, _('list the revision number (default)')),
318 ('n', 'number', None, _('list the revision number (default)')),
318 ('c', 'changeset', None, _('list the changeset')),
319 ('c', 'changeset', None, _('list the changeset')),
319 ('l', 'line-number', None, _('show line number at the first appearance'))
320 ('l', 'line-number', None, _('show line number at the first appearance'))
320 ] + diffwsopts + walkopts + formatteropts,
321 ] + diffwsopts + walkopts + formatteropts,
321 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
322 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
322 inferrepo=True)
323 inferrepo=True)
323 def annotate(ui, repo, *pats, **opts):
324 def annotate(ui, repo, *pats, **opts):
324 """show changeset information by line for each file
325 """show changeset information by line for each file
325
326
326 List changes in files, showing the revision id responsible for
327 List changes in files, showing the revision id responsible for
327 each line
328 each line
328
329
329 This command is useful for discovering when a change was made and
330 This command is useful for discovering when a change was made and
330 by whom.
331 by whom.
331
332
332 Without the -a/--text option, annotate will avoid processing files
333 Without the -a/--text option, annotate will avoid processing files
333 it detects as binary. With -a, annotate will annotate the file
334 it detects as binary. With -a, annotate will annotate the file
334 anyway, although the results will probably be neither useful
335 anyway, although the results will probably be neither useful
335 nor desirable.
336 nor desirable.
336
337
337 Returns 0 on success.
338 Returns 0 on success.
338 """
339 """
339 if not pats:
340 if not pats:
340 raise error.Abort(_('at least one filename or pattern is required'))
341 raise error.Abort(_('at least one filename or pattern is required'))
341
342
342 if opts.get('follow'):
343 if opts.get('follow'):
343 # --follow is deprecated and now just an alias for -f/--file
344 # --follow is deprecated and now just an alias for -f/--file
344 # to mimic the behavior of Mercurial before version 1.5
345 # to mimic the behavior of Mercurial before version 1.5
345 opts['file'] = True
346 opts['file'] = True
346
347
347 ctx = scmutil.revsingle(repo, opts.get('rev'))
348 ctx = scmutil.revsingle(repo, opts.get('rev'))
348
349
349 fm = ui.formatter('annotate', opts)
350 fm = ui.formatter('annotate', opts)
350 if ui.quiet:
351 if ui.quiet:
351 datefunc = util.shortdate
352 datefunc = util.shortdate
352 else:
353 else:
353 datefunc = util.datestr
354 datefunc = util.datestr
354 if ctx.rev() is None:
355 if ctx.rev() is None:
355 def hexfn(node):
356 def hexfn(node):
356 if node is None:
357 if node is None:
357 return None
358 return None
358 else:
359 else:
359 return fm.hexfunc(node)
360 return fm.hexfunc(node)
360 if opts.get('changeset'):
361 if opts.get('changeset'):
361 # omit "+" suffix which is appended to node hex
362 # omit "+" suffix which is appended to node hex
362 def formatrev(rev):
363 def formatrev(rev):
363 if rev is None:
364 if rev is None:
364 return '%d' % ctx.p1().rev()
365 return '%d' % ctx.p1().rev()
365 else:
366 else:
366 return '%d' % rev
367 return '%d' % rev
367 else:
368 else:
368 def formatrev(rev):
369 def formatrev(rev):
369 if rev is None:
370 if rev is None:
370 return '%d+' % ctx.p1().rev()
371 return '%d+' % ctx.p1().rev()
371 else:
372 else:
372 return '%d ' % rev
373 return '%d ' % rev
373 def formathex(hex):
374 def formathex(hex):
374 if hex is None:
375 if hex is None:
375 return '%s+' % fm.hexfunc(ctx.p1().node())
376 return '%s+' % fm.hexfunc(ctx.p1().node())
376 else:
377 else:
377 return '%s ' % hex
378 return '%s ' % hex
378 else:
379 else:
379 hexfn = fm.hexfunc
380 hexfn = fm.hexfunc
380 formatrev = formathex = str
381 formatrev = formathex = str
381
382
382 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
383 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
383 ('number', ' ', lambda x: x[0].rev(), formatrev),
384 ('number', ' ', lambda x: x[0].rev(), formatrev),
384 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
385 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
385 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
386 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
386 ('file', ' ', lambda x: x[0].path(), str),
387 ('file', ' ', lambda x: x[0].path(), str),
387 ('line_number', ':', lambda x: x[1], str),
388 ('line_number', ':', lambda x: x[1], str),
388 ]
389 ]
389 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
390 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
390
391
391 if (not opts.get('user') and not opts.get('changeset')
392 if (not opts.get('user') and not opts.get('changeset')
392 and not opts.get('date') and not opts.get('file')):
393 and not opts.get('date') and not opts.get('file')):
393 opts['number'] = True
394 opts['number'] = True
394
395
395 linenumber = opts.get('line_number') is not None
396 linenumber = opts.get('line_number') is not None
396 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
397 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'))
398 raise error.Abort(_('at least one of -n/-c is required for -l'))
398
399
399 if fm:
400 if fm:
400 def makefunc(get, fmt):
401 def makefunc(get, fmt):
401 return get
402 return get
402 else:
403 else:
403 def makefunc(get, fmt):
404 def makefunc(get, fmt):
404 return lambda x: fmt(get(x))
405 return lambda x: fmt(get(x))
405 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
406 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
406 if opts.get(op)]
407 if opts.get(op)]
407 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
408 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
409 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
409 if opts.get(op))
410 if opts.get(op))
410
411
411 def bad(x, y):
412 def bad(x, y):
412 raise error.Abort("%s: %s" % (x, y))
413 raise error.Abort("%s: %s" % (x, y))
413
414
414 m = scmutil.match(ctx, pats, opts, badfn=bad)
415 m = scmutil.match(ctx, pats, opts, badfn=bad)
415
416
416 follow = not opts.get('no_follow')
417 follow = not opts.get('no_follow')
417 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
418 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
418 whitespace=True)
419 whitespace=True)
419 for abs in ctx.walk(m):
420 for abs in ctx.walk(m):
420 fctx = ctx[abs]
421 fctx = ctx[abs]
421 if not opts.get('text') and util.binary(fctx.data()):
422 if not opts.get('text') and util.binary(fctx.data()):
422 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
423 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
423 continue
424 continue
424
425
425 lines = fctx.annotate(follow=follow, linenumber=linenumber,
426 lines = fctx.annotate(follow=follow, linenumber=linenumber,
426 diffopts=diffopts)
427 diffopts=diffopts)
427 formats = []
428 formats = []
428 pieces = []
429 pieces = []
429
430
430 for f, sep in funcmap:
431 for f, sep in funcmap:
431 l = [f(n) for n, dummy in lines]
432 l = [f(n) for n, dummy in lines]
432 if l:
433 if l:
433 if fm:
434 if fm:
434 formats.append(['%s' for x in l])
435 formats.append(['%s' for x in l])
435 else:
436 else:
436 sizes = [encoding.colwidth(x) for x in l]
437 sizes = [encoding.colwidth(x) for x in l]
437 ml = max(sizes)
438 ml = max(sizes)
438 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
439 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
439 pieces.append(l)
440 pieces.append(l)
440
441
441 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
442 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
442 fm.startitem()
443 fm.startitem()
443 fm.write(fields, "".join(f), *p)
444 fm.write(fields, "".join(f), *p)
444 fm.write('line', ": %s", l[1])
445 fm.write('line', ": %s", l[1])
445
446
446 if lines and not lines[-1][1].endswith('\n'):
447 if lines and not lines[-1][1].endswith('\n'):
447 fm.plain('\n')
448 fm.plain('\n')
448
449
449 fm.end()
450 fm.end()
450
451
451 @command('archive',
452 @command('archive',
452 [('', 'no-decode', None, _('do not pass files through decoders')),
453 [('', 'no-decode', None, _('do not pass files through decoders')),
453 ('p', 'prefix', '', _('directory prefix for files in archive'),
454 ('p', 'prefix', '', _('directory prefix for files in archive'),
454 _('PREFIX')),
455 _('PREFIX')),
455 ('r', 'rev', '', _('revision to distribute'), _('REV')),
456 ('r', 'rev', '', _('revision to distribute'), _('REV')),
456 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
457 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
457 ] + subrepoopts + walkopts,
458 ] + subrepoopts + walkopts,
458 _('[OPTION]... DEST'))
459 _('[OPTION]... DEST'))
459 def archive(ui, repo, dest, **opts):
460 def archive(ui, repo, dest, **opts):
460 '''create an unversioned archive of a repository revision
461 '''create an unversioned archive of a repository revision
461
462
462 By default, the revision used is the parent of the working
463 By default, the revision used is the parent of the working
463 directory; use -r/--rev to specify a different revision.
464 directory; use -r/--rev to specify a different revision.
464
465
465 The archive type is automatically detected based on file
466 The archive type is automatically detected based on file
466 extension (or override using -t/--type).
467 extension (or override using -t/--type).
467
468
468 .. container:: verbose
469 .. container:: verbose
469
470
470 Examples:
471 Examples:
471
472
472 - create a zip file containing the 1.0 release::
473 - create a zip file containing the 1.0 release::
473
474
474 hg archive -r 1.0 project-1.0.zip
475 hg archive -r 1.0 project-1.0.zip
475
476
476 - create a tarball excluding .hg files::
477 - create a tarball excluding .hg files::
477
478
478 hg archive project.tar.gz -X ".hg*"
479 hg archive project.tar.gz -X ".hg*"
479
480
480 Valid types are:
481 Valid types are:
481
482
482 :``files``: a directory full of files (default)
483 :``files``: a directory full of files (default)
483 :``tar``: tar archive, uncompressed
484 :``tar``: tar archive, uncompressed
484 :``tbz2``: tar archive, compressed using bzip2
485 :``tbz2``: tar archive, compressed using bzip2
485 :``tgz``: tar archive, compressed using gzip
486 :``tgz``: tar archive, compressed using gzip
486 :``uzip``: zip archive, uncompressed
487 :``uzip``: zip archive, uncompressed
487 :``zip``: zip archive, compressed using deflate
488 :``zip``: zip archive, compressed using deflate
488
489
489 The exact name of the destination archive or directory is given
490 The exact name of the destination archive or directory is given
490 using a format string; see :hg:`help export` for details.
491 using a format string; see :hg:`help export` for details.
491
492
492 Each member added to an archive file has a directory prefix
493 Each member added to an archive file has a directory prefix
493 prepended. Use -p/--prefix to specify a format string for the
494 prepended. Use -p/--prefix to specify a format string for the
494 prefix. The default is the basename of the archive, with suffixes
495 prefix. The default is the basename of the archive, with suffixes
495 removed.
496 removed.
496
497
497 Returns 0 on success.
498 Returns 0 on success.
498 '''
499 '''
499
500
500 ctx = scmutil.revsingle(repo, opts.get('rev'))
501 ctx = scmutil.revsingle(repo, opts.get('rev'))
501 if not ctx:
502 if not ctx:
502 raise error.Abort(_('no working directory: please specify a revision'))
503 raise error.Abort(_('no working directory: please specify a revision'))
503 node = ctx.node()
504 node = ctx.node()
504 dest = cmdutil.makefilename(repo, dest, node)
505 dest = cmdutil.makefilename(repo, dest, node)
505 if os.path.realpath(dest) == repo.root:
506 if os.path.realpath(dest) == repo.root:
506 raise error.Abort(_('repository root cannot be destination'))
507 raise error.Abort(_('repository root cannot be destination'))
507
508
508 kind = opts.get('type') or archival.guesskind(dest) or 'files'
509 kind = opts.get('type') or archival.guesskind(dest) or 'files'
509 prefix = opts.get('prefix')
510 prefix = opts.get('prefix')
510
511
511 if dest == '-':
512 if dest == '-':
512 if kind == 'files':
513 if kind == 'files':
513 raise error.Abort(_('cannot archive plain files to stdout'))
514 raise error.Abort(_('cannot archive plain files to stdout'))
514 dest = cmdutil.makefileobj(repo, dest)
515 dest = cmdutil.makefileobj(repo, dest)
515 if not prefix:
516 if not prefix:
516 prefix = os.path.basename(repo.root) + '-%h'
517 prefix = os.path.basename(repo.root) + '-%h'
517
518
518 prefix = cmdutil.makefilename(repo, prefix, node)
519 prefix = cmdutil.makefilename(repo, prefix, node)
519 matchfn = scmutil.match(ctx, [], opts)
520 matchfn = scmutil.match(ctx, [], opts)
520 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
521 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
521 matchfn, prefix, subrepos=opts.get('subrepos'))
522 matchfn, prefix, subrepos=opts.get('subrepos'))
522
523
523 @command('backout',
524 @command('backout',
524 [('', 'merge', None, _('merge with old dirstate parent after backout')),
525 [('', 'merge', None, _('merge with old dirstate parent after backout')),
525 ('', 'commit', None, _('commit if no conflicts were encountered')),
526 ('', 'commit', None, _('commit if no conflicts were encountered')),
526 ('', 'parent', '',
527 ('', 'parent', '',
527 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
528 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
528 ('r', 'rev', '', _('revision to backout'), _('REV')),
529 ('r', 'rev', '', _('revision to backout'), _('REV')),
529 ('e', 'edit', False, _('invoke editor on commit messages')),
530 ('e', 'edit', False, _('invoke editor on commit messages')),
530 ] + mergetoolopts + walkopts + commitopts + commitopts2,
531 ] + mergetoolopts + walkopts + commitopts + commitopts2,
531 _('[OPTION]... [-r] REV'))
532 _('[OPTION]... [-r] REV'))
532 def backout(ui, repo, node=None, rev=None, commit=False, **opts):
533 def backout(ui, repo, node=None, rev=None, commit=False, **opts):
533 '''reverse effect of earlier changeset
534 '''reverse effect of earlier changeset
534
535
535 Prepare a new changeset with the effect of REV undone in the
536 Prepare a new changeset with the effect of REV undone in the
536 current working directory.
537 current working directory.
537
538
538 If REV is the parent of the working directory, then this new changeset
539 If REV is the parent of the working directory, then this new changeset
539 is committed automatically. Otherwise, hg needs to merge the
540 is committed automatically. Otherwise, hg needs to merge the
540 changes and the merged result is left uncommitted.
541 changes and the merged result is left uncommitted.
541
542
542 .. note::
543 .. note::
543
544
544 backout cannot be used to fix either an unwanted or
545 backout cannot be used to fix either an unwanted or
545 incorrect merge.
546 incorrect merge.
546
547
547 .. container:: verbose
548 .. container:: verbose
548
549
549 Examples:
550 Examples:
550
551
551 - Reverse the effect of the parent of the working directory.
552 - Reverse the effect of the parent of the working directory.
552 This backout will be committed immediately::
553 This backout will be committed immediately::
553
554
554 hg backout -r .
555 hg backout -r .
555
556
556 - Reverse the effect of previous bad revision 23::
557 - Reverse the effect of previous bad revision 23::
557
558
558 hg backout -r 23
559 hg backout -r 23
559 hg commit -m "Backout revision 23"
560 hg commit -m "Backout revision 23"
560
561
561 - Reverse the effect of previous bad revision 23 and
562 - Reverse the effect of previous bad revision 23 and
562 commit the backout immediately::
563 commit the backout immediately::
563
564
564 hg backout -r 23 --commit
565 hg backout -r 23 --commit
565
566
566 By default, the pending changeset will have one parent,
567 By default, the pending changeset will have one parent,
567 maintaining a linear history. With --merge, the pending
568 maintaining a linear history. With --merge, the pending
568 changeset will instead have two parents: the old parent of the
569 changeset will instead have two parents: the old parent of the
569 working directory and a new child of REV that simply undoes REV.
570 working directory and a new child of REV that simply undoes REV.
570
571
571 Before version 1.7, the behavior without --merge was equivalent
572 Before version 1.7, the behavior without --merge was equivalent
572 to specifying --merge followed by :hg:`update --clean .` to
573 to specifying --merge followed by :hg:`update --clean .` to
573 cancel the merge and leave the child of REV as a head to be
574 cancel the merge and leave the child of REV as a head to be
574 merged separately.
575 merged separately.
575
576
576 See :hg:`help dates` for a list of formats valid for -d/--date.
577 See :hg:`help dates` for a list of formats valid for -d/--date.
577
578
578 See :hg:`help revert` for a way to restore files to the state
579 See :hg:`help revert` for a way to restore files to the state
579 of another revision.
580 of another revision.
580
581
581 Returns 0 on success, 1 if nothing to backout or there are unresolved
582 Returns 0 on success, 1 if nothing to backout or there are unresolved
582 files.
583 files.
583 '''
584 '''
584 wlock = lock = None
585 wlock = lock = None
585 try:
586 try:
586 wlock = repo.wlock()
587 wlock = repo.wlock()
587 lock = repo.lock()
588 lock = repo.lock()
588 return _dobackout(ui, repo, node, rev, commit, **opts)
589 return _dobackout(ui, repo, node, rev, commit, **opts)
589 finally:
590 finally:
590 release(lock, wlock)
591 release(lock, wlock)
591
592
592 def _dobackout(ui, repo, node=None, rev=None, commit=False, **opts):
593 def _dobackout(ui, repo, node=None, rev=None, commit=False, **opts):
593 if rev and node:
594 if rev and node:
594 raise error.Abort(_("please specify just one revision"))
595 raise error.Abort(_("please specify just one revision"))
595
596
596 if not rev:
597 if not rev:
597 rev = node
598 rev = node
598
599
599 if not rev:
600 if not rev:
600 raise error.Abort(_("please specify a revision to backout"))
601 raise error.Abort(_("please specify a revision to backout"))
601
602
602 date = opts.get('date')
603 date = opts.get('date')
603 if date:
604 if date:
604 opts['date'] = util.parsedate(date)
605 opts['date'] = util.parsedate(date)
605
606
606 cmdutil.checkunfinished(repo)
607 cmdutil.checkunfinished(repo)
607 cmdutil.bailifchanged(repo)
608 cmdutil.bailifchanged(repo)
608 node = scmutil.revsingle(repo, rev).node()
609 node = scmutil.revsingle(repo, rev).node()
609
610
610 op1, op2 = repo.dirstate.parents()
611 op1, op2 = repo.dirstate.parents()
611 if not repo.changelog.isancestor(node, op1):
612 if not repo.changelog.isancestor(node, op1):
612 raise error.Abort(_('cannot backout change that is not an ancestor'))
613 raise error.Abort(_('cannot backout change that is not an ancestor'))
613
614
614 p1, p2 = repo.changelog.parents(node)
615 p1, p2 = repo.changelog.parents(node)
615 if p1 == nullid:
616 if p1 == nullid:
616 raise error.Abort(_('cannot backout a change with no parents'))
617 raise error.Abort(_('cannot backout a change with no parents'))
617 if p2 != nullid:
618 if p2 != nullid:
618 if not opts.get('parent'):
619 if not opts.get('parent'):
619 raise error.Abort(_('cannot backout a merge changeset'))
620 raise error.Abort(_('cannot backout a merge changeset'))
620 p = repo.lookup(opts['parent'])
621 p = repo.lookup(opts['parent'])
621 if p not in (p1, p2):
622 if p not in (p1, p2):
622 raise error.Abort(_('%s is not a parent of %s') %
623 raise error.Abort(_('%s is not a parent of %s') %
623 (short(p), short(node)))
624 (short(p), short(node)))
624 parent = p
625 parent = p
625 else:
626 else:
626 if opts.get('parent'):
627 if opts.get('parent'):
627 raise error.Abort(_('cannot use --parent on non-merge changeset'))
628 raise error.Abort(_('cannot use --parent on non-merge changeset'))
628 parent = p1
629 parent = p1
629
630
630 # the backout should appear on the same branch
631 # the backout should appear on the same branch
631 try:
632 try:
632 branch = repo.dirstate.branch()
633 branch = repo.dirstate.branch()
633 bheads = repo.branchheads(branch)
634 bheads = repo.branchheads(branch)
634 rctx = scmutil.revsingle(repo, hex(parent))
635 rctx = scmutil.revsingle(repo, hex(parent))
635 if not opts.get('merge') and op1 != node:
636 if not opts.get('merge') and op1 != node:
636 dsguard = cmdutil.dirstateguard(repo, 'backout')
637 dsguard = cmdutil.dirstateguard(repo, 'backout')
637 try:
638 try:
638 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
639 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
639 'backout')
640 'backout')
640 stats = mergemod.update(repo, parent, True, True, node, False)
641 stats = mergemod.update(repo, parent, True, True, node, False)
641 repo.setparents(op1, op2)
642 repo.setparents(op1, op2)
642 dsguard.close()
643 dsguard.close()
643 hg._showstats(repo, stats)
644 hg._showstats(repo, stats)
644 if stats[3]:
645 if stats[3]:
645 repo.ui.status(_("use 'hg resolve' to retry unresolved "
646 repo.ui.status(_("use 'hg resolve' to retry unresolved "
646 "file merges\n"))
647 "file merges\n"))
647 return 1
648 return 1
648 elif not commit:
649 elif not commit:
649 msg = _("changeset %s backed out, "
650 msg = _("changeset %s backed out, "
650 "don't forget to commit.\n")
651 "don't forget to commit.\n")
651 ui.status(msg % short(node))
652 ui.status(msg % short(node))
652 return 0
653 return 0
653 finally:
654 finally:
654 ui.setconfig('ui', 'forcemerge', '', '')
655 ui.setconfig('ui', 'forcemerge', '', '')
655 lockmod.release(dsguard)
656 lockmod.release(dsguard)
656 else:
657 else:
657 hg.clean(repo, node, show_stats=False)
658 hg.clean(repo, node, show_stats=False)
658 repo.dirstate.setbranch(branch)
659 repo.dirstate.setbranch(branch)
659 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
660 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
660
661
661
662
662 def commitfunc(ui, repo, message, match, opts):
663 def commitfunc(ui, repo, message, match, opts):
663 editform = 'backout'
664 editform = 'backout'
664 e = cmdutil.getcommiteditor(editform=editform, **opts)
665 e = cmdutil.getcommiteditor(editform=editform, **opts)
665 if not message:
666 if not message:
666 # we don't translate commit messages
667 # we don't translate commit messages
667 message = "Backed out changeset %s" % short(node)
668 message = "Backed out changeset %s" % short(node)
668 e = cmdutil.getcommiteditor(edit=True, editform=editform)
669 e = cmdutil.getcommiteditor(edit=True, editform=editform)
669 return repo.commit(message, opts.get('user'), opts.get('date'),
670 return repo.commit(message, opts.get('user'), opts.get('date'),
670 match, editor=e)
671 match, editor=e)
671 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
672 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
672 if not newnode:
673 if not newnode:
673 ui.status(_("nothing changed\n"))
674 ui.status(_("nothing changed\n"))
674 return 1
675 return 1
675 cmdutil.commitstatus(repo, newnode, branch, bheads)
676 cmdutil.commitstatus(repo, newnode, branch, bheads)
676
677
677 def nice(node):
678 def nice(node):
678 return '%d:%s' % (repo.changelog.rev(node), short(node))
679 return '%d:%s' % (repo.changelog.rev(node), short(node))
679 ui.status(_('changeset %s backs out changeset %s\n') %
680 ui.status(_('changeset %s backs out changeset %s\n') %
680 (nice(repo.changelog.tip()), nice(node)))
681 (nice(repo.changelog.tip()), nice(node)))
681 if opts.get('merge') and op1 != node:
682 if opts.get('merge') and op1 != node:
682 hg.clean(repo, op1, show_stats=False)
683 hg.clean(repo, op1, show_stats=False)
683 ui.status(_('merging with changeset %s\n')
684 ui.status(_('merging with changeset %s\n')
684 % nice(repo.changelog.tip()))
685 % nice(repo.changelog.tip()))
685 try:
686 try:
686 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
687 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
687 'backout')
688 'backout')
688 return hg.merge(repo, hex(repo.changelog.tip()))
689 return hg.merge(repo, hex(repo.changelog.tip()))
689 finally:
690 finally:
690 ui.setconfig('ui', 'forcemerge', '', '')
691 ui.setconfig('ui', 'forcemerge', '', '')
691 finally:
692 finally:
692 # TODO: get rid of this meaningless try/finally enclosing.
693 # TODO: get rid of this meaningless try/finally enclosing.
693 # this is kept only to reduce changes in a patch.
694 # this is kept only to reduce changes in a patch.
694 pass
695 pass
695 return 0
696 return 0
696
697
697 @command('bisect',
698 @command('bisect',
698 [('r', 'reset', False, _('reset bisect state')),
699 [('r', 'reset', False, _('reset bisect state')),
699 ('g', 'good', False, _('mark changeset good')),
700 ('g', 'good', False, _('mark changeset good')),
700 ('b', 'bad', False, _('mark changeset bad')),
701 ('b', 'bad', False, _('mark changeset bad')),
701 ('s', 'skip', False, _('skip testing changeset')),
702 ('s', 'skip', False, _('skip testing changeset')),
702 ('e', 'extend', False, _('extend the bisect range')),
703 ('e', 'extend', False, _('extend the bisect range')),
703 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
704 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
704 ('U', 'noupdate', False, _('do not update to target'))],
705 ('U', 'noupdate', False, _('do not update to target'))],
705 _("[-gbsr] [-U] [-c CMD] [REV]"))
706 _("[-gbsr] [-U] [-c CMD] [REV]"))
706 def bisect(ui, repo, rev=None, extra=None, command=None,
707 def bisect(ui, repo, rev=None, extra=None, command=None,
707 reset=None, good=None, bad=None, skip=None, extend=None,
708 reset=None, good=None, bad=None, skip=None, extend=None,
708 noupdate=None):
709 noupdate=None):
709 """subdivision search of changesets
710 """subdivision search of changesets
710
711
711 This command helps to find changesets which introduce problems. To
712 This command helps to find changesets which introduce problems. To
712 use, mark the earliest changeset you know exhibits the problem as
713 use, mark the earliest changeset you know exhibits the problem as
713 bad, then mark the latest changeset which is free from the problem
714 bad, then mark the latest changeset which is free from the problem
714 as good. Bisect will update your working directory to a revision
715 as good. Bisect will update your working directory to a revision
715 for testing (unless the -U/--noupdate option is specified). Once
716 for testing (unless the -U/--noupdate option is specified). Once
716 you have performed tests, mark the working directory as good or
717 you have performed tests, mark the working directory as good or
717 bad, and bisect will either update to another candidate changeset
718 bad, and bisect will either update to another candidate changeset
718 or announce that it has found the bad revision.
719 or announce that it has found the bad revision.
719
720
720 As a shortcut, you can also use the revision argument to mark a
721 As a shortcut, you can also use the revision argument to mark a
721 revision as good or bad without checking it out first.
722 revision as good or bad without checking it out first.
722
723
723 If you supply a command, it will be used for automatic bisection.
724 If you supply a command, it will be used for automatic bisection.
724 The environment variable HG_NODE will contain the ID of the
725 The environment variable HG_NODE will contain the ID of the
725 changeset being tested. The exit status of the command will be
726 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
727 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
728 means to skip the revision, 127 (command not found) will abort the
728 bisection, and any other non-zero exit status means the revision
729 bisection, and any other non-zero exit status means the revision
729 is bad.
730 is bad.
730
731
731 .. container:: verbose
732 .. container:: verbose
732
733
733 Some examples:
734 Some examples:
734
735
735 - start a bisection with known bad revision 34, and good revision 12::
736 - start a bisection with known bad revision 34, and good revision 12::
736
737
737 hg bisect --bad 34
738 hg bisect --bad 34
738 hg bisect --good 12
739 hg bisect --good 12
739
740
740 - advance the current bisection by marking current revision as good or
741 - advance the current bisection by marking current revision as good or
741 bad::
742 bad::
742
743
743 hg bisect --good
744 hg bisect --good
744 hg bisect --bad
745 hg bisect --bad
745
746
746 - mark the current revision, or a known revision, to be skipped (e.g. if
747 - mark the current revision, or a known revision, to be skipped (e.g. if
747 that revision is not usable because of another issue)::
748 that revision is not usable because of another issue)::
748
749
749 hg bisect --skip
750 hg bisect --skip
750 hg bisect --skip 23
751 hg bisect --skip 23
751
752
752 - skip all revisions that do not touch directories ``foo`` or ``bar``::
753 - skip all revisions that do not touch directories ``foo`` or ``bar``::
753
754
754 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
755 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
755
756
756 - forget the current bisection::
757 - forget the current bisection::
757
758
758 hg bisect --reset
759 hg bisect --reset
759
760
760 - use 'make && make tests' to automatically find the first broken
761 - use 'make && make tests' to automatically find the first broken
761 revision::
762 revision::
762
763
763 hg bisect --reset
764 hg bisect --reset
764 hg bisect --bad 34
765 hg bisect --bad 34
765 hg bisect --good 12
766 hg bisect --good 12
766 hg bisect --command "make && make tests"
767 hg bisect --command "make && make tests"
767
768
768 - see all changesets whose states are already known in the current
769 - see all changesets whose states are already known in the current
769 bisection::
770 bisection::
770
771
771 hg log -r "bisect(pruned)"
772 hg log -r "bisect(pruned)"
772
773
773 - see the changeset currently being bisected (especially useful
774 - see the changeset currently being bisected (especially useful
774 if running with -U/--noupdate)::
775 if running with -U/--noupdate)::
775
776
776 hg log -r "bisect(current)"
777 hg log -r "bisect(current)"
777
778
778 - see all changesets that took part in the current bisection::
779 - see all changesets that took part in the current bisection::
779
780
780 hg log -r "bisect(range)"
781 hg log -r "bisect(range)"
781
782
782 - you can even get a nice graph::
783 - you can even get a nice graph::
783
784
784 hg log --graph -r "bisect(range)"
785 hg log --graph -r "bisect(range)"
785
786
786 See :hg:`help revsets` for more about the `bisect()` keyword.
787 See :hg:`help revsets` for more about the `bisect()` keyword.
787
788
788 Returns 0 on success.
789 Returns 0 on success.
789 """
790 """
790 def extendbisectrange(nodes, good):
791 def extendbisectrange(nodes, good):
791 # bisect is incomplete when it ends on a merge node and
792 # bisect is incomplete when it ends on a merge node and
792 # one of the parent was not checked.
793 # one of the parent was not checked.
793 parents = repo[nodes[0]].parents()
794 parents = repo[nodes[0]].parents()
794 if len(parents) > 1:
795 if len(parents) > 1:
795 if good:
796 if good:
796 side = state['bad']
797 side = state['bad']
797 else:
798 else:
798 side = state['good']
799 side = state['good']
799 num = len(set(i.node() for i in parents) & set(side))
800 num = len(set(i.node() for i in parents) & set(side))
800 if num == 1:
801 if num == 1:
801 return parents[0].ancestor(parents[1])
802 return parents[0].ancestor(parents[1])
802 return None
803 return None
803
804
804 def print_result(nodes, good):
805 def print_result(nodes, good):
805 displayer = cmdutil.show_changeset(ui, repo, {})
806 displayer = cmdutil.show_changeset(ui, repo, {})
806 if len(nodes) == 1:
807 if len(nodes) == 1:
807 # narrowed it down to a single revision
808 # narrowed it down to a single revision
808 if good:
809 if good:
809 ui.write(_("The first good revision is:\n"))
810 ui.write(_("The first good revision is:\n"))
810 else:
811 else:
811 ui.write(_("The first bad revision is:\n"))
812 ui.write(_("The first bad revision is:\n"))
812 displayer.show(repo[nodes[0]])
813 displayer.show(repo[nodes[0]])
813 extendnode = extendbisectrange(nodes, good)
814 extendnode = extendbisectrange(nodes, good)
814 if extendnode is not None:
815 if extendnode is not None:
815 ui.write(_('Not all ancestors of this changeset have been'
816 ui.write(_('Not all ancestors of this changeset have been'
816 ' checked.\nUse bisect --extend to continue the '
817 ' checked.\nUse bisect --extend to continue the '
817 'bisection from\nthe common ancestor, %s.\n')
818 'bisection from\nthe common ancestor, %s.\n')
818 % extendnode)
819 % extendnode)
819 else:
820 else:
820 # multiple possible revisions
821 # multiple possible revisions
821 if good:
822 if good:
822 ui.write(_("Due to skipped revisions, the first "
823 ui.write(_("Due to skipped revisions, the first "
823 "good revision could be any of:\n"))
824 "good revision could be any of:\n"))
824 else:
825 else:
825 ui.write(_("Due to skipped revisions, the first "
826 ui.write(_("Due to skipped revisions, the first "
826 "bad revision could be any of:\n"))
827 "bad revision could be any of:\n"))
827 for n in nodes:
828 for n in nodes:
828 displayer.show(repo[n])
829 displayer.show(repo[n])
829 displayer.close()
830 displayer.close()
830
831
831 def check_state(state, interactive=True):
832 def check_state(state, interactive=True):
832 if not state['good'] or not state['bad']:
833 if not state['good'] or not state['bad']:
833 if (good or bad or skip or reset) and interactive:
834 if (good or bad or skip or reset) and interactive:
834 return
835 return
835 if not state['good']:
836 if not state['good']:
836 raise error.Abort(_('cannot bisect (no known good revisions)'))
837 raise error.Abort(_('cannot bisect (no known good revisions)'))
837 else:
838 else:
838 raise error.Abort(_('cannot bisect (no known bad revisions)'))
839 raise error.Abort(_('cannot bisect (no known bad revisions)'))
839 return True
840 return True
840
841
841 # backward compatibility
842 # backward compatibility
842 if rev in "good bad reset init".split():
843 if rev in "good bad reset init".split():
843 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
844 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
844 cmd, rev, extra = rev, extra, None
845 cmd, rev, extra = rev, extra, None
845 if cmd == "good":
846 if cmd == "good":
846 good = True
847 good = True
847 elif cmd == "bad":
848 elif cmd == "bad":
848 bad = True
849 bad = True
849 else:
850 else:
850 reset = True
851 reset = True
851 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
852 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
852 raise error.Abort(_('incompatible arguments'))
853 raise error.Abort(_('incompatible arguments'))
853
854
854 cmdutil.checkunfinished(repo)
855 cmdutil.checkunfinished(repo)
855
856
856 if reset:
857 if reset:
857 p = repo.join("bisect.state")
858 p = repo.join("bisect.state")
858 if os.path.exists(p):
859 if os.path.exists(p):
859 os.unlink(p)
860 os.unlink(p)
860 return
861 return
861
862
862 state = hbisect.load_state(repo)
863 state = hbisect.load_state(repo)
863
864
864 if command:
865 if command:
865 changesets = 1
866 changesets = 1
866 if noupdate:
867 if noupdate:
867 try:
868 try:
868 node = state['current'][0]
869 node = state['current'][0]
869 except LookupError:
870 except LookupError:
870 raise error.Abort(_('current bisect revision is unknown - '
871 raise error.Abort(_('current bisect revision is unknown - '
871 'start a new bisect to fix'))
872 'start a new bisect to fix'))
872 else:
873 else:
873 node, p2 = repo.dirstate.parents()
874 node, p2 = repo.dirstate.parents()
874 if p2 != nullid:
875 if p2 != nullid:
875 raise error.Abort(_('current bisect revision is a merge'))
876 raise error.Abort(_('current bisect revision is a merge'))
876 try:
877 try:
877 while changesets:
878 while changesets:
878 # update state
879 # update state
879 state['current'] = [node]
880 state['current'] = [node]
880 hbisect.save_state(repo, state)
881 hbisect.save_state(repo, state)
881 status = ui.system(command, environ={'HG_NODE': hex(node)})
882 status = ui.system(command, environ={'HG_NODE': hex(node)})
882 if status == 125:
883 if status == 125:
883 transition = "skip"
884 transition = "skip"
884 elif status == 0:
885 elif status == 0:
885 transition = "good"
886 transition = "good"
886 # status < 0 means process was killed
887 # status < 0 means process was killed
887 elif status == 127:
888 elif status == 127:
888 raise error.Abort(_("failed to execute %s") % command)
889 raise error.Abort(_("failed to execute %s") % command)
889 elif status < 0:
890 elif status < 0:
890 raise error.Abort(_("%s killed") % command)
891 raise error.Abort(_("%s killed") % command)
891 else:
892 else:
892 transition = "bad"
893 transition = "bad"
893 ctx = scmutil.revsingle(repo, rev, node)
894 ctx = scmutil.revsingle(repo, rev, node)
894 rev = None # clear for future iterations
895 rev = None # clear for future iterations
895 state[transition].append(ctx.node())
896 state[transition].append(ctx.node())
896 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
897 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
897 check_state(state, interactive=False)
898 check_state(state, interactive=False)
898 # bisect
899 # bisect
899 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
900 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
900 # update to next check
901 # update to next check
901 node = nodes[0]
902 node = nodes[0]
902 if not noupdate:
903 if not noupdate:
903 cmdutil.bailifchanged(repo)
904 cmdutil.bailifchanged(repo)
904 hg.clean(repo, node, show_stats=False)
905 hg.clean(repo, node, show_stats=False)
905 finally:
906 finally:
906 state['current'] = [node]
907 state['current'] = [node]
907 hbisect.save_state(repo, state)
908 hbisect.save_state(repo, state)
908 print_result(nodes, bgood)
909 print_result(nodes, bgood)
909 return
910 return
910
911
911 # update state
912 # update state
912
913
913 if rev:
914 if rev:
914 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
915 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
915 else:
916 else:
916 nodes = [repo.lookup('.')]
917 nodes = [repo.lookup('.')]
917
918
918 if good or bad or skip:
919 if good or bad or skip:
919 if good:
920 if good:
920 state['good'] += nodes
921 state['good'] += nodes
921 elif bad:
922 elif bad:
922 state['bad'] += nodes
923 state['bad'] += nodes
923 elif skip:
924 elif skip:
924 state['skip'] += nodes
925 state['skip'] += nodes
925 hbisect.save_state(repo, state)
926 hbisect.save_state(repo, state)
926
927
927 if not check_state(state):
928 if not check_state(state):
928 return
929 return
929
930
930 # actually bisect
931 # actually bisect
931 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
932 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
932 if extend:
933 if extend:
933 if not changesets:
934 if not changesets:
934 extendnode = extendbisectrange(nodes, good)
935 extendnode = extendbisectrange(nodes, good)
935 if extendnode is not None:
936 if extendnode is not None:
936 ui.write(_("Extending search to changeset %d:%s\n")
937 ui.write(_("Extending search to changeset %d:%s\n")
937 % (extendnode.rev(), extendnode))
938 % (extendnode.rev(), extendnode))
938 state['current'] = [extendnode.node()]
939 state['current'] = [extendnode.node()]
939 hbisect.save_state(repo, state)
940 hbisect.save_state(repo, state)
940 if noupdate:
941 if noupdate:
941 return
942 return
942 cmdutil.bailifchanged(repo)
943 cmdutil.bailifchanged(repo)
943 return hg.clean(repo, extendnode.node())
944 return hg.clean(repo, extendnode.node())
944 raise error.Abort(_("nothing to extend"))
945 raise error.Abort(_("nothing to extend"))
945
946
946 if changesets == 0:
947 if changesets == 0:
947 print_result(nodes, good)
948 print_result(nodes, good)
948 else:
949 else:
949 assert len(nodes) == 1 # only a single node can be tested next
950 assert len(nodes) == 1 # only a single node can be tested next
950 node = nodes[0]
951 node = nodes[0]
951 # compute the approximate number of remaining tests
952 # compute the approximate number of remaining tests
952 tests, size = 0, 2
953 tests, size = 0, 2
953 while size <= changesets:
954 while size <= changesets:
954 tests, size = tests + 1, size * 2
955 tests, size = tests + 1, size * 2
955 rev = repo.changelog.rev(node)
956 rev = repo.changelog.rev(node)
956 ui.write(_("Testing changeset %d:%s "
957 ui.write(_("Testing changeset %d:%s "
957 "(%d changesets remaining, ~%d tests)\n")
958 "(%d changesets remaining, ~%d tests)\n")
958 % (rev, short(node), changesets, tests))
959 % (rev, short(node), changesets, tests))
959 state['current'] = [node]
960 state['current'] = [node]
960 hbisect.save_state(repo, state)
961 hbisect.save_state(repo, state)
961 if not noupdate:
962 if not noupdate:
962 cmdutil.bailifchanged(repo)
963 cmdutil.bailifchanged(repo)
963 return hg.clean(repo, node)
964 return hg.clean(repo, node)
964
965
965 @command('bookmarks|bookmark',
966 @command('bookmarks|bookmark',
966 [('f', 'force', False, _('force')),
967 [('f', 'force', False, _('force')),
967 ('r', 'rev', '', _('revision'), _('REV')),
968 ('r', 'rev', '', _('revision'), _('REV')),
968 ('d', 'delete', False, _('delete a given bookmark')),
969 ('d', 'delete', False, _('delete a given bookmark')),
969 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
970 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
970 ('i', 'inactive', False, _('mark a bookmark inactive')),
971 ('i', 'inactive', False, _('mark a bookmark inactive')),
971 ] + formatteropts,
972 ] + formatteropts,
972 _('hg bookmarks [OPTIONS]... [NAME]...'))
973 _('hg bookmarks [OPTIONS]... [NAME]...'))
973 def bookmark(ui, repo, *names, **opts):
974 def bookmark(ui, repo, *names, **opts):
974 '''create a new bookmark or list existing bookmarks
975 '''create a new bookmark or list existing bookmarks
975
976
976 Bookmarks are labels on changesets to help track lines of development.
977 Bookmarks are labels on changesets to help track lines of development.
977 Bookmarks are unversioned and can be moved, renamed and deleted.
978 Bookmarks are unversioned and can be moved, renamed and deleted.
978 Deleting or moving a bookmark has no effect on the associated changesets.
979 Deleting or moving a bookmark has no effect on the associated changesets.
979
980
980 Creating or updating to a bookmark causes it to be marked as 'active'.
981 Creating or updating to a bookmark causes it to be marked as 'active'.
981 The active bookmark is indicated with a '*'.
982 The active bookmark is indicated with a '*'.
982 When a commit is made, the active bookmark will advance to the new commit.
983 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.
984 A plain :hg:`update` will also advance an active bookmark, if possible.
984 Updating away from a bookmark will cause it to be deactivated.
985 Updating away from a bookmark will cause it to be deactivated.
985
986
986 Bookmarks can be pushed and pulled between repositories (see
987 Bookmarks can be pushed and pulled between repositories (see
987 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
988 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
988 diverged, a new 'divergent bookmark' of the form 'name@path' will
989 diverged, a new 'divergent bookmark' of the form 'name@path' will
989 be created. Using :hg:`merge` will resolve the divergence.
990 be created. Using :hg:`merge` will resolve the divergence.
990
991
991 A bookmark named '@' has the special property that :hg:`clone` will
992 A bookmark named '@' has the special property that :hg:`clone` will
992 check it out by default if it exists.
993 check it out by default if it exists.
993
994
994 .. container:: verbose
995 .. container:: verbose
995
996
996 Examples:
997 Examples:
997
998
998 - create an active bookmark for a new line of development::
999 - create an active bookmark for a new line of development::
999
1000
1000 hg book new-feature
1001 hg book new-feature
1001
1002
1002 - create an inactive bookmark as a place marker::
1003 - create an inactive bookmark as a place marker::
1003
1004
1004 hg book -i reviewed
1005 hg book -i reviewed
1005
1006
1006 - create an inactive bookmark on another changeset::
1007 - create an inactive bookmark on another changeset::
1007
1008
1008 hg book -r .^ tested
1009 hg book -r .^ tested
1009
1010
1010 - rename bookmark turkey to dinner::
1011 - rename bookmark turkey to dinner::
1011
1012
1012 hg book -m turkey dinner
1013 hg book -m turkey dinner
1013
1014
1014 - move the '@' bookmark from another branch::
1015 - move the '@' bookmark from another branch::
1015
1016
1016 hg book -f @
1017 hg book -f @
1017 '''
1018 '''
1018 force = opts.get('force')
1019 force = opts.get('force')
1019 rev = opts.get('rev')
1020 rev = opts.get('rev')
1020 delete = opts.get('delete')
1021 delete = opts.get('delete')
1021 rename = opts.get('rename')
1022 rename = opts.get('rename')
1022 inactive = opts.get('inactive')
1023 inactive = opts.get('inactive')
1023
1024
1024 def checkformat(mark):
1025 def checkformat(mark):
1025 mark = mark.strip()
1026 mark = mark.strip()
1026 if not mark:
1027 if not mark:
1027 raise error.Abort(_("bookmark names cannot consist entirely of "
1028 raise error.Abort(_("bookmark names cannot consist entirely of "
1028 "whitespace"))
1029 "whitespace"))
1029 scmutil.checknewlabel(repo, mark, 'bookmark')
1030 scmutil.checknewlabel(repo, mark, 'bookmark')
1030 return mark
1031 return mark
1031
1032
1032 def checkconflict(repo, mark, cur, force=False, target=None):
1033 def checkconflict(repo, mark, cur, force=False, target=None):
1033 if mark in marks and not force:
1034 if mark in marks and not force:
1034 if target:
1035 if target:
1035 if marks[mark] == target and target == cur:
1036 if marks[mark] == target and target == cur:
1036 # re-activating a bookmark
1037 # re-activating a bookmark
1037 return
1038 return
1038 anc = repo.changelog.ancestors([repo[target].rev()])
1039 anc = repo.changelog.ancestors([repo[target].rev()])
1039 bmctx = repo[marks[mark]]
1040 bmctx = repo[marks[mark]]
1040 divs = [repo[b].node() for b in marks
1041 divs = [repo[b].node() for b in marks
1041 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1042 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1042
1043
1043 # allow resolving a single divergent bookmark even if moving
1044 # allow resolving a single divergent bookmark even if moving
1044 # the bookmark across branches when a revision is specified
1045 # the bookmark across branches when a revision is specified
1045 # that contains a divergent bookmark
1046 # that contains a divergent bookmark
1046 if bmctx.rev() not in anc and target in divs:
1047 if bmctx.rev() not in anc and target in divs:
1047 bookmarks.deletedivergent(repo, [target], mark)
1048 bookmarks.deletedivergent(repo, [target], mark)
1048 return
1049 return
1049
1050
1050 deletefrom = [b for b in divs
1051 deletefrom = [b for b in divs
1051 if repo[b].rev() in anc or b == target]
1052 if repo[b].rev() in anc or b == target]
1052 bookmarks.deletedivergent(repo, deletefrom, mark)
1053 bookmarks.deletedivergent(repo, deletefrom, mark)
1053 if bookmarks.validdest(repo, bmctx, repo[target]):
1054 if bookmarks.validdest(repo, bmctx, repo[target]):
1054 ui.status(_("moving bookmark '%s' forward from %s\n") %
1055 ui.status(_("moving bookmark '%s' forward from %s\n") %
1055 (mark, short(bmctx.node())))
1056 (mark, short(bmctx.node())))
1056 return
1057 return
1057 raise error.Abort(_("bookmark '%s' already exists "
1058 raise error.Abort(_("bookmark '%s' already exists "
1058 "(use -f to force)") % mark)
1059 "(use -f to force)") % mark)
1059 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1060 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1060 and not force):
1061 and not force):
1061 raise error.Abort(
1062 raise error.Abort(
1062 _("a bookmark cannot have the name of an existing branch"))
1063 _("a bookmark cannot have the name of an existing branch"))
1063
1064
1064 if delete and rename:
1065 if delete and rename:
1065 raise error.Abort(_("--delete and --rename are incompatible"))
1066 raise error.Abort(_("--delete and --rename are incompatible"))
1066 if delete and rev:
1067 if delete and rev:
1067 raise error.Abort(_("--rev is incompatible with --delete"))
1068 raise error.Abort(_("--rev is incompatible with --delete"))
1068 if rename and rev:
1069 if rename and rev:
1069 raise error.Abort(_("--rev is incompatible with --rename"))
1070 raise error.Abort(_("--rev is incompatible with --rename"))
1070 if not names and (delete or rev):
1071 if not names and (delete or rev):
1071 raise error.Abort(_("bookmark name required"))
1072 raise error.Abort(_("bookmark name required"))
1072
1073
1073 if delete or rename or names or inactive:
1074 if delete or rename or names or inactive:
1074 wlock = lock = tr = None
1075 wlock = lock = tr = None
1075 try:
1076 try:
1076 wlock = repo.wlock()
1077 wlock = repo.wlock()
1077 lock = repo.lock()
1078 lock = repo.lock()
1078 cur = repo.changectx('.').node()
1079 cur = repo.changectx('.').node()
1079 marks = repo._bookmarks
1080 marks = repo._bookmarks
1080 if delete:
1081 if delete:
1081 tr = repo.transaction('bookmark')
1082 tr = repo.transaction('bookmark')
1082 for mark in names:
1083 for mark in names:
1083 if mark not in marks:
1084 if mark not in marks:
1084 raise error.Abort(_("bookmark '%s' does not exist") %
1085 raise error.Abort(_("bookmark '%s' does not exist") %
1085 mark)
1086 mark)
1086 if mark == repo._activebookmark:
1087 if mark == repo._activebookmark:
1087 bookmarks.deactivate(repo)
1088 bookmarks.deactivate(repo)
1088 del marks[mark]
1089 del marks[mark]
1089
1090
1090 elif rename:
1091 elif rename:
1091 tr = repo.transaction('bookmark')
1092 tr = repo.transaction('bookmark')
1092 if not names:
1093 if not names:
1093 raise error.Abort(_("new bookmark name required"))
1094 raise error.Abort(_("new bookmark name required"))
1094 elif len(names) > 1:
1095 elif len(names) > 1:
1095 raise error.Abort(_("only one new bookmark name allowed"))
1096 raise error.Abort(_("only one new bookmark name allowed"))
1096 mark = checkformat(names[0])
1097 mark = checkformat(names[0])
1097 if rename not in marks:
1098 if rename not in marks:
1098 raise error.Abort(_("bookmark '%s' does not exist")
1099 raise error.Abort(_("bookmark '%s' does not exist")
1099 % rename)
1100 % rename)
1100 checkconflict(repo, mark, cur, force)
1101 checkconflict(repo, mark, cur, force)
1101 marks[mark] = marks[rename]
1102 marks[mark] = marks[rename]
1102 if repo._activebookmark == rename and not inactive:
1103 if repo._activebookmark == rename and not inactive:
1103 bookmarks.activate(repo, mark)
1104 bookmarks.activate(repo, mark)
1104 del marks[rename]
1105 del marks[rename]
1105 elif names:
1106 elif names:
1106 tr = repo.transaction('bookmark')
1107 tr = repo.transaction('bookmark')
1107 newact = None
1108 newact = None
1108 for mark in names:
1109 for mark in names:
1109 mark = checkformat(mark)
1110 mark = checkformat(mark)
1110 if newact is None:
1111 if newact is None:
1111 newact = mark
1112 newact = mark
1112 if inactive and mark == repo._activebookmark:
1113 if inactive and mark == repo._activebookmark:
1113 bookmarks.deactivate(repo)
1114 bookmarks.deactivate(repo)
1114 return
1115 return
1115 tgt = cur
1116 tgt = cur
1116 if rev:
1117 if rev:
1117 tgt = scmutil.revsingle(repo, rev).node()
1118 tgt = scmutil.revsingle(repo, rev).node()
1118 checkconflict(repo, mark, cur, force, tgt)
1119 checkconflict(repo, mark, cur, force, tgt)
1119 marks[mark] = tgt
1120 marks[mark] = tgt
1120 if not inactive and cur == marks[newact] and not rev:
1121 if not inactive and cur == marks[newact] and not rev:
1121 bookmarks.activate(repo, newact)
1122 bookmarks.activate(repo, newact)
1122 elif cur != tgt and newact == repo._activebookmark:
1123 elif cur != tgt and newact == repo._activebookmark:
1123 bookmarks.deactivate(repo)
1124 bookmarks.deactivate(repo)
1124 elif inactive:
1125 elif inactive:
1125 if len(marks) == 0:
1126 if len(marks) == 0:
1126 ui.status(_("no bookmarks set\n"))
1127 ui.status(_("no bookmarks set\n"))
1127 elif not repo._activebookmark:
1128 elif not repo._activebookmark:
1128 ui.status(_("no active bookmark\n"))
1129 ui.status(_("no active bookmark\n"))
1129 else:
1130 else:
1130 bookmarks.deactivate(repo)
1131 bookmarks.deactivate(repo)
1131 if tr is not None:
1132 if tr is not None:
1132 marks.recordchange(tr)
1133 marks.recordchange(tr)
1133 tr.close()
1134 tr.close()
1134 finally:
1135 finally:
1135 lockmod.release(tr, lock, wlock)
1136 lockmod.release(tr, lock, wlock)
1136 else: # show bookmarks
1137 else: # show bookmarks
1137 fm = ui.formatter('bookmarks', opts)
1138 fm = ui.formatter('bookmarks', opts)
1138 hexfn = fm.hexfunc
1139 hexfn = fm.hexfunc
1139 marks = repo._bookmarks
1140 marks = repo._bookmarks
1140 if len(marks) == 0 and not fm:
1141 if len(marks) == 0 and not fm:
1141 ui.status(_("no bookmarks set\n"))
1142 ui.status(_("no bookmarks set\n"))
1142 for bmark, n in sorted(marks.iteritems()):
1143 for bmark, n in sorted(marks.iteritems()):
1143 active = repo._activebookmark
1144 active = repo._activebookmark
1144 if bmark == active:
1145 if bmark == active:
1145 prefix, label = '*', activebookmarklabel
1146 prefix, label = '*', activebookmarklabel
1146 else:
1147 else:
1147 prefix, label = ' ', ''
1148 prefix, label = ' ', ''
1148
1149
1149 fm.startitem()
1150 fm.startitem()
1150 if not ui.quiet:
1151 if not ui.quiet:
1151 fm.plain(' %s ' % prefix, label=label)
1152 fm.plain(' %s ' % prefix, label=label)
1152 fm.write('bookmark', '%s', bmark, label=label)
1153 fm.write('bookmark', '%s', bmark, label=label)
1153 pad = " " * (25 - encoding.colwidth(bmark))
1154 pad = " " * (25 - encoding.colwidth(bmark))
1154 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1155 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1155 repo.changelog.rev(n), hexfn(n), label=label)
1156 repo.changelog.rev(n), hexfn(n), label=label)
1156 fm.data(active=(bmark == active))
1157 fm.data(active=(bmark == active))
1157 fm.plain('\n')
1158 fm.plain('\n')
1158 fm.end()
1159 fm.end()
1159
1160
1160 @command('branch',
1161 @command('branch',
1161 [('f', 'force', None,
1162 [('f', 'force', None,
1162 _('set branch name even if it shadows an existing branch')),
1163 _('set branch name even if it shadows an existing branch')),
1163 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1164 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1164 _('[-fC] [NAME]'))
1165 _('[-fC] [NAME]'))
1165 def branch(ui, repo, label=None, **opts):
1166 def branch(ui, repo, label=None, **opts):
1166 """set or show the current branch name
1167 """set or show the current branch name
1167
1168
1168 .. note::
1169 .. note::
1169
1170
1170 Branch names are permanent and global. Use :hg:`bookmark` to create a
1171 Branch names are permanent and global. Use :hg:`bookmark` to create a
1171 light-weight bookmark instead. See :hg:`help glossary` for more
1172 light-weight bookmark instead. See :hg:`help glossary` for more
1172 information about named branches and bookmarks.
1173 information about named branches and bookmarks.
1173
1174
1174 With no argument, show the current branch name. With one argument,
1175 With no argument, show the current branch name. With one argument,
1175 set the working directory branch name (the branch will not exist
1176 set the working directory branch name (the branch will not exist
1176 in the repository until the next commit). Standard practice
1177 in the repository until the next commit). Standard practice
1177 recommends that primary development take place on the 'default'
1178 recommends that primary development take place on the 'default'
1178 branch.
1179 branch.
1179
1180
1180 Unless -f/--force is specified, branch will not let you set a
1181 Unless -f/--force is specified, branch will not let you set a
1181 branch name that already exists.
1182 branch name that already exists.
1182
1183
1183 Use -C/--clean to reset the working directory branch to that of
1184 Use -C/--clean to reset the working directory branch to that of
1184 the parent of the working directory, negating a previous branch
1185 the parent of the working directory, negating a previous branch
1185 change.
1186 change.
1186
1187
1187 Use the command :hg:`update` to switch to an existing branch. Use
1188 Use the command :hg:`update` to switch to an existing branch. Use
1188 :hg:`commit --close-branch` to mark this branch head as closed.
1189 :hg:`commit --close-branch` to mark this branch head as closed.
1189 When all heads of the branch are closed, the branch will be
1190 When all heads of the branch are closed, the branch will be
1190 considered closed.
1191 considered closed.
1191
1192
1192 Returns 0 on success.
1193 Returns 0 on success.
1193 """
1194 """
1194 if label:
1195 if label:
1195 label = label.strip()
1196 label = label.strip()
1196
1197
1197 if not opts.get('clean') and not label:
1198 if not opts.get('clean') and not label:
1198 ui.write("%s\n" % repo.dirstate.branch())
1199 ui.write("%s\n" % repo.dirstate.branch())
1199 return
1200 return
1200
1201
1201 wlock = repo.wlock()
1202 wlock = repo.wlock()
1202 try:
1203 try:
1203 if opts.get('clean'):
1204 if opts.get('clean'):
1204 label = repo[None].p1().branch()
1205 label = repo[None].p1().branch()
1205 repo.dirstate.setbranch(label)
1206 repo.dirstate.setbranch(label)
1206 ui.status(_('reset working directory to branch %s\n') % label)
1207 ui.status(_('reset working directory to branch %s\n') % label)
1207 elif label:
1208 elif label:
1208 if not opts.get('force') and label in repo.branchmap():
1209 if not opts.get('force') and label in repo.branchmap():
1209 if label not in [p.branch() for p in repo[None].parents()]:
1210 if label not in [p.branch() for p in repo[None].parents()]:
1210 raise error.Abort(_('a branch of the same name already'
1211 raise error.Abort(_('a branch of the same name already'
1211 ' exists'),
1212 ' exists'),
1212 # i18n: "it" refers to an existing branch
1213 # i18n: "it" refers to an existing branch
1213 hint=_("use 'hg update' to switch to it"))
1214 hint=_("use 'hg update' to switch to it"))
1214 scmutil.checknewlabel(repo, label, 'branch')
1215 scmutil.checknewlabel(repo, label, 'branch')
1215 repo.dirstate.setbranch(label)
1216 repo.dirstate.setbranch(label)
1216 ui.status(_('marked working directory as branch %s\n') % label)
1217 ui.status(_('marked working directory as branch %s\n') % label)
1217
1218
1218 # find any open named branches aside from default
1219 # find any open named branches aside from default
1219 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1220 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1220 if n != "default" and not c]
1221 if n != "default" and not c]
1221 if not others:
1222 if not others:
1222 ui.status(_('(branches are permanent and global, '
1223 ui.status(_('(branches are permanent and global, '
1223 'did you want a bookmark?)\n'))
1224 'did you want a bookmark?)\n'))
1224 finally:
1225 finally:
1225 wlock.release()
1226 wlock.release()
1226
1227
1227 @command('branches',
1228 @command('branches',
1228 [('a', 'active', False,
1229 [('a', 'active', False,
1229 _('show only branches that have unmerged heads (DEPRECATED)')),
1230 _('show only branches that have unmerged heads (DEPRECATED)')),
1230 ('c', 'closed', False, _('show normal and closed branches')),
1231 ('c', 'closed', False, _('show normal and closed branches')),
1231 ] + formatteropts,
1232 ] + formatteropts,
1232 _('[-ac]'))
1233 _('[-ac]'))
1233 def branches(ui, repo, active=False, closed=False, **opts):
1234 def branches(ui, repo, active=False, closed=False, **opts):
1234 """list repository named branches
1235 """list repository named branches
1235
1236
1236 List the repository's named branches, indicating which ones are
1237 List the repository's named branches, indicating which ones are
1237 inactive. If -c/--closed is specified, also list branches which have
1238 inactive. If -c/--closed is specified, also list branches which have
1238 been marked closed (see :hg:`commit --close-branch`).
1239 been marked closed (see :hg:`commit --close-branch`).
1239
1240
1240 Use the command :hg:`update` to switch to an existing branch.
1241 Use the command :hg:`update` to switch to an existing branch.
1241
1242
1242 Returns 0.
1243 Returns 0.
1243 """
1244 """
1244
1245
1245 fm = ui.formatter('branches', opts)
1246 fm = ui.formatter('branches', opts)
1246 hexfunc = fm.hexfunc
1247 hexfunc = fm.hexfunc
1247
1248
1248 allheads = set(repo.heads())
1249 allheads = set(repo.heads())
1249 branches = []
1250 branches = []
1250 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1251 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1251 isactive = not isclosed and bool(set(heads) & allheads)
1252 isactive = not isclosed and bool(set(heads) & allheads)
1252 branches.append((tag, repo[tip], isactive, not isclosed))
1253 branches.append((tag, repo[tip], isactive, not isclosed))
1253 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1254 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1254 reverse=True)
1255 reverse=True)
1255
1256
1256 for tag, ctx, isactive, isopen in branches:
1257 for tag, ctx, isactive, isopen in branches:
1257 if active and not isactive:
1258 if active and not isactive:
1258 continue
1259 continue
1259 if isactive:
1260 if isactive:
1260 label = 'branches.active'
1261 label = 'branches.active'
1261 notice = ''
1262 notice = ''
1262 elif not isopen:
1263 elif not isopen:
1263 if not closed:
1264 if not closed:
1264 continue
1265 continue
1265 label = 'branches.closed'
1266 label = 'branches.closed'
1266 notice = _(' (closed)')
1267 notice = _(' (closed)')
1267 else:
1268 else:
1268 label = 'branches.inactive'
1269 label = 'branches.inactive'
1269 notice = _(' (inactive)')
1270 notice = _(' (inactive)')
1270 current = (tag == repo.dirstate.branch())
1271 current = (tag == repo.dirstate.branch())
1271 if current:
1272 if current:
1272 label = 'branches.current'
1273 label = 'branches.current'
1273
1274
1274 fm.startitem()
1275 fm.startitem()
1275 fm.write('branch', '%s', tag, label=label)
1276 fm.write('branch', '%s', tag, label=label)
1276 rev = ctx.rev()
1277 rev = ctx.rev()
1277 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1278 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1278 fmt = ' ' * padsize + ' %d:%s'
1279 fmt = ' ' * padsize + ' %d:%s'
1279 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1280 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1280 label='log.changeset changeset.%s' % ctx.phasestr())
1281 label='log.changeset changeset.%s' % ctx.phasestr())
1281 fm.data(active=isactive, closed=not isopen, current=current)
1282 fm.data(active=isactive, closed=not isopen, current=current)
1282 if not ui.quiet:
1283 if not ui.quiet:
1283 fm.plain(notice)
1284 fm.plain(notice)
1284 fm.plain('\n')
1285 fm.plain('\n')
1285 fm.end()
1286 fm.end()
1286
1287
1287 @command('bundle',
1288 @command('bundle',
1288 [('f', 'force', None, _('run even when the destination is unrelated')),
1289 [('f', 'force', None, _('run even when the destination is unrelated')),
1289 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1290 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1290 _('REV')),
1291 _('REV')),
1291 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1292 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1292 _('BRANCH')),
1293 _('BRANCH')),
1293 ('', 'base', [],
1294 ('', 'base', [],
1294 _('a base changeset assumed to be available at the destination'),
1295 _('a base changeset assumed to be available at the destination'),
1295 _('REV')),
1296 _('REV')),
1296 ('a', 'all', None, _('bundle all changesets in the repository')),
1297 ('a', 'all', None, _('bundle all changesets in the repository')),
1297 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1298 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1298 ] + remoteopts,
1299 ] + remoteopts,
1299 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1300 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1300 def bundle(ui, repo, fname, dest=None, **opts):
1301 def bundle(ui, repo, fname, dest=None, **opts):
1301 """create a changegroup file
1302 """create a changegroup file
1302
1303
1303 Generate a changegroup file collecting changesets to be added
1304 Generate a changegroup file collecting changesets to be added
1304 to a repository.
1305 to a repository.
1305
1306
1306 To create a bundle containing all changesets, use -a/--all
1307 To create a bundle containing all changesets, use -a/--all
1307 (or --base null). Otherwise, hg assumes the destination will have
1308 (or --base null). Otherwise, hg assumes the destination will have
1308 all the nodes you specify with --base parameters. Otherwise, hg
1309 all the nodes you specify with --base parameters. Otherwise, hg
1309 will assume the repository has all the nodes in destination, or
1310 will assume the repository has all the nodes in destination, or
1310 default-push/default if no destination is specified.
1311 default-push/default if no destination is specified.
1311
1312
1312 You can change bundle format with the -t/--type option. You can
1313 You can change bundle format with the -t/--type option. You can
1313 specify a compression, a bundle version or both using a dash
1314 specify a compression, a bundle version or both using a dash
1314 (comp-version). The available compression methods are: none, bzip2,
1315 (comp-version). The available compression methods are: none, bzip2,
1315 and gzip (by default, bundles are compressed using bzip2). The
1316 and gzip (by default, bundles are compressed using bzip2). The
1316 available formats are: v1, v2 (default to most suitable).
1317 available formats are: v1, v2 (default to most suitable).
1317
1318
1318 The bundle file can then be transferred using conventional means
1319 The bundle file can then be transferred using conventional means
1319 and applied to another repository with the unbundle or pull
1320 and applied to another repository with the unbundle or pull
1320 command. This is useful when direct push and pull are not
1321 command. This is useful when direct push and pull are not
1321 available or when exporting an entire repository is undesirable.
1322 available or when exporting an entire repository is undesirable.
1322
1323
1323 Applying bundles preserves all changeset contents including
1324 Applying bundles preserves all changeset contents including
1324 permissions, copy/rename information, and revision history.
1325 permissions, copy/rename information, and revision history.
1325
1326
1326 Returns 0 on success, 1 if no changes found.
1327 Returns 0 on success, 1 if no changes found.
1327 """
1328 """
1328 revs = None
1329 revs = None
1329 if 'rev' in opts:
1330 if 'rev' in opts:
1330 revs = scmutil.revrange(repo, opts['rev'])
1331 revs = scmutil.revrange(repo, opts['rev'])
1331
1332
1332 bundletype = opts.get('type', 'bzip2').lower()
1333 bundletype = opts.get('type', 'bzip2').lower()
1333 try:
1334 try:
1334 bcompression, cgversion, params = exchange.parsebundlespec(
1335 bcompression, cgversion, params = exchange.parsebundlespec(
1335 repo, bundletype, strict=False)
1336 repo, bundletype, strict=False)
1336 except error.UnsupportedBundleSpecification as e:
1337 except error.UnsupportedBundleSpecification as e:
1337 raise error.Abort(str(e),
1338 raise error.Abort(str(e),
1338 hint=_('see "hg help bundle" for supported '
1339 hint=_('see "hg help bundle" for supported '
1339 'values for --type'))
1340 'values for --type'))
1340
1341
1341 # Packed bundles are a pseudo bundle format for now.
1342 # Packed bundles are a pseudo bundle format for now.
1342 if cgversion == 's1':
1343 if cgversion == 's1':
1343 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1344 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1344 hint=_('use "hg debugcreatestreamclonebundle"'))
1345 hint=_('use "hg debugcreatestreamclonebundle"'))
1345
1346
1346 if opts.get('all'):
1347 if opts.get('all'):
1347 if dest:
1348 if dest:
1348 raise error.Abort(_("--all is incompatible with specifying "
1349 raise error.Abort(_("--all is incompatible with specifying "
1349 "a destination"))
1350 "a destination"))
1350 if opts.get('base'):
1351 if opts.get('base'):
1351 ui.warn(_("ignoring --base because --all was specified\n"))
1352 ui.warn(_("ignoring --base because --all was specified\n"))
1352 base = ['null']
1353 base = ['null']
1353 else:
1354 else:
1354 base = scmutil.revrange(repo, opts.get('base'))
1355 base = scmutil.revrange(repo, opts.get('base'))
1355 # TODO: get desired bundlecaps from command line.
1356 # TODO: get desired bundlecaps from command line.
1356 bundlecaps = None
1357 bundlecaps = None
1357 if base:
1358 if base:
1358 if dest:
1359 if dest:
1359 raise error.Abort(_("--base is incompatible with specifying "
1360 raise error.Abort(_("--base is incompatible with specifying "
1360 "a destination"))
1361 "a destination"))
1361 common = [repo.lookup(rev) for rev in base]
1362 common = [repo.lookup(rev) for rev in base]
1362 heads = revs and map(repo.lookup, revs) or revs
1363 heads = revs and map(repo.lookup, revs) or revs
1363 cg = changegroup.getchangegroup(repo, 'bundle', heads=heads,
1364 cg = changegroup.getchangegroup(repo, 'bundle', heads=heads,
1364 common=common, bundlecaps=bundlecaps,
1365 common=common, bundlecaps=bundlecaps,
1365 version=cgversion)
1366 version=cgversion)
1366 outgoing = None
1367 outgoing = None
1367 else:
1368 else:
1368 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1369 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1369 dest, branches = hg.parseurl(dest, opts.get('branch'))
1370 dest, branches = hg.parseurl(dest, opts.get('branch'))
1370 other = hg.peer(repo, opts, dest)
1371 other = hg.peer(repo, opts, dest)
1371 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1372 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1372 heads = revs and map(repo.lookup, revs) or revs
1373 heads = revs and map(repo.lookup, revs) or revs
1373 outgoing = discovery.findcommonoutgoing(repo, other,
1374 outgoing = discovery.findcommonoutgoing(repo, other,
1374 onlyheads=heads,
1375 onlyheads=heads,
1375 force=opts.get('force'),
1376 force=opts.get('force'),
1376 portable=True)
1377 portable=True)
1377 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1378 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1378 bundlecaps, version=cgversion)
1379 bundlecaps, version=cgversion)
1379 if not cg:
1380 if not cg:
1380 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1381 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1381 return 1
1382 return 1
1382
1383
1383 if cgversion == '01': #bundle1
1384 if cgversion == '01': #bundle1
1384 if bcompression is None:
1385 if bcompression is None:
1385 bcompression = 'UN'
1386 bcompression = 'UN'
1386 bversion = 'HG10' + bcompression
1387 bversion = 'HG10' + bcompression
1387 bcompression = None
1388 bcompression = None
1388 else:
1389 else:
1389 assert cgversion == '02'
1390 assert cgversion == '02'
1390 bversion = 'HG20'
1391 bversion = 'HG20'
1391
1392
1392
1393
1393 changegroup.writebundle(ui, cg, fname, bversion, compression=bcompression)
1394 changegroup.writebundle(ui, cg, fname, bversion, compression=bcompression)
1394
1395
1395 @command('cat',
1396 @command('cat',
1396 [('o', 'output', '',
1397 [('o', 'output', '',
1397 _('print output to file with formatted name'), _('FORMAT')),
1398 _('print output to file with formatted name'), _('FORMAT')),
1398 ('r', 'rev', '', _('print the given revision'), _('REV')),
1399 ('r', 'rev', '', _('print the given revision'), _('REV')),
1399 ('', 'decode', None, _('apply any matching decode filter')),
1400 ('', 'decode', None, _('apply any matching decode filter')),
1400 ] + walkopts,
1401 ] + walkopts,
1401 _('[OPTION]... FILE...'),
1402 _('[OPTION]... FILE...'),
1402 inferrepo=True)
1403 inferrepo=True)
1403 def cat(ui, repo, file1, *pats, **opts):
1404 def cat(ui, repo, file1, *pats, **opts):
1404 """output the current or given revision of files
1405 """output the current or given revision of files
1405
1406
1406 Print the specified files as they were at the given revision. If
1407 Print the specified files as they were at the given revision. If
1407 no revision is given, the parent of the working directory is used.
1408 no revision is given, the parent of the working directory is used.
1408
1409
1409 Output may be to a file, in which case the name of the file is
1410 Output may be to a file, in which case the name of the file is
1410 given using a format string. The formatting rules as follows:
1411 given using a format string. The formatting rules as follows:
1411
1412
1412 :``%%``: literal "%" character
1413 :``%%``: literal "%" character
1413 :``%s``: basename of file being printed
1414 :``%s``: basename of file being printed
1414 :``%d``: dirname of file being printed, or '.' if in repository root
1415 :``%d``: dirname of file being printed, or '.' if in repository root
1415 :``%p``: root-relative path name of file being printed
1416 :``%p``: root-relative path name of file being printed
1416 :``%H``: changeset hash (40 hexadecimal digits)
1417 :``%H``: changeset hash (40 hexadecimal digits)
1417 :``%R``: changeset revision number
1418 :``%R``: changeset revision number
1418 :``%h``: short-form changeset hash (12 hexadecimal digits)
1419 :``%h``: short-form changeset hash (12 hexadecimal digits)
1419 :``%r``: zero-padded changeset revision number
1420 :``%r``: zero-padded changeset revision number
1420 :``%b``: basename of the exporting repository
1421 :``%b``: basename of the exporting repository
1421
1422
1422 Returns 0 on success.
1423 Returns 0 on success.
1423 """
1424 """
1424 ctx = scmutil.revsingle(repo, opts.get('rev'))
1425 ctx = scmutil.revsingle(repo, opts.get('rev'))
1425 m = scmutil.match(ctx, (file1,) + pats, opts)
1426 m = scmutil.match(ctx, (file1,) + pats, opts)
1426
1427
1427 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1428 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1428
1429
1429 @command('^clone',
1430 @command('^clone',
1430 [('U', 'noupdate', None, _('the clone will include an empty working '
1431 [('U', 'noupdate', None, _('the clone will include an empty working '
1431 'directory (only a repository)')),
1432 'directory (only a repository)')),
1432 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1433 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1433 _('REV')),
1434 _('REV')),
1434 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1435 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1435 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1436 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1436 ('', 'pull', None, _('use pull protocol to copy metadata')),
1437 ('', 'pull', None, _('use pull protocol to copy metadata')),
1437 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1438 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1438 ] + remoteopts,
1439 ] + remoteopts,
1439 _('[OPTION]... SOURCE [DEST]'),
1440 _('[OPTION]... SOURCE [DEST]'),
1440 norepo=True)
1441 norepo=True)
1441 def clone(ui, source, dest=None, **opts):
1442 def clone(ui, source, dest=None, **opts):
1442 """make a copy of an existing repository
1443 """make a copy of an existing repository
1443
1444
1444 Create a copy of an existing repository in a new directory.
1445 Create a copy of an existing repository in a new directory.
1445
1446
1446 If no destination directory name is specified, it defaults to the
1447 If no destination directory name is specified, it defaults to the
1447 basename of the source.
1448 basename of the source.
1448
1449
1449 The location of the source is added to the new repository's
1450 The location of the source is added to the new repository's
1450 ``.hg/hgrc`` file, as the default to be used for future pulls.
1451 ``.hg/hgrc`` file, as the default to be used for future pulls.
1451
1452
1452 Only local paths and ``ssh://`` URLs are supported as
1453 Only local paths and ``ssh://`` URLs are supported as
1453 destinations. For ``ssh://`` destinations, no working directory or
1454 destinations. For ``ssh://`` destinations, no working directory or
1454 ``.hg/hgrc`` will be created on the remote side.
1455 ``.hg/hgrc`` will be created on the remote side.
1455
1456
1456 To pull only a subset of changesets, specify one or more revisions
1457 To pull only a subset of changesets, specify one or more revisions
1457 identifiers with -r/--rev or branches with -b/--branch. The
1458 identifiers with -r/--rev or branches with -b/--branch. The
1458 resulting clone will contain only the specified changesets and
1459 resulting clone will contain only the specified changesets and
1459 their ancestors. These options (or 'clone src#rev dest') imply
1460 their ancestors. These options (or 'clone src#rev dest') imply
1460 --pull, even for local source repositories. Note that specifying a
1461 --pull, even for local source repositories. Note that specifying a
1461 tag will include the tagged changeset but not the changeset
1462 tag will include the tagged changeset but not the changeset
1462 containing the tag.
1463 containing the tag.
1463
1464
1464 If the source repository has a bookmark called '@' set, that
1465 If the source repository has a bookmark called '@' set, that
1465 revision will be checked out in the new repository by default.
1466 revision will be checked out in the new repository by default.
1466
1467
1467 To check out a particular version, use -u/--update, or
1468 To check out a particular version, use -u/--update, or
1468 -U/--noupdate to create a clone with no working directory.
1469 -U/--noupdate to create a clone with no working directory.
1469
1470
1470 .. container:: verbose
1471 .. container:: verbose
1471
1472
1472 For efficiency, hardlinks are used for cloning whenever the
1473 For efficiency, hardlinks are used for cloning whenever the
1473 source and destination are on the same filesystem (note this
1474 source and destination are on the same filesystem (note this
1474 applies only to the repository data, not to the working
1475 applies only to the repository data, not to the working
1475 directory). Some filesystems, such as AFS, implement hardlinking
1476 directory). Some filesystems, such as AFS, implement hardlinking
1476 incorrectly, but do not report errors. In these cases, use the
1477 incorrectly, but do not report errors. In these cases, use the
1477 --pull option to avoid hardlinking.
1478 --pull option to avoid hardlinking.
1478
1479
1479 In some cases, you can clone repositories and the working
1480 In some cases, you can clone repositories and the working
1480 directory using full hardlinks with ::
1481 directory using full hardlinks with ::
1481
1482
1482 $ cp -al REPO REPOCLONE
1483 $ cp -al REPO REPOCLONE
1483
1484
1484 This is the fastest way to clone, but it is not always safe. The
1485 This is the fastest way to clone, but it is not always safe. The
1485 operation is not atomic (making sure REPO is not modified during
1486 operation is not atomic (making sure REPO is not modified during
1486 the operation is up to you) and you have to make sure your
1487 the operation is up to you) and you have to make sure your
1487 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1488 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1488 so). Also, this is not compatible with certain extensions that
1489 so). Also, this is not compatible with certain extensions that
1489 place their metadata under the .hg directory, such as mq.
1490 place their metadata under the .hg directory, such as mq.
1490
1491
1491 Mercurial will update the working directory to the first applicable
1492 Mercurial will update the working directory to the first applicable
1492 revision from this list:
1493 revision from this list:
1493
1494
1494 a) null if -U or the source repository has no changesets
1495 a) null if -U or the source repository has no changesets
1495 b) if -u . and the source repository is local, the first parent of
1496 b) if -u . and the source repository is local, the first parent of
1496 the source repository's working directory
1497 the source repository's working directory
1497 c) the changeset specified with -u (if a branch name, this means the
1498 c) the changeset specified with -u (if a branch name, this means the
1498 latest head of that branch)
1499 latest head of that branch)
1499 d) the changeset specified with -r
1500 d) the changeset specified with -r
1500 e) the tipmost head specified with -b
1501 e) the tipmost head specified with -b
1501 f) the tipmost head specified with the url#branch source syntax
1502 f) the tipmost head specified with the url#branch source syntax
1502 g) the revision marked with the '@' bookmark, if present
1503 g) the revision marked with the '@' bookmark, if present
1503 h) the tipmost head of the default branch
1504 h) the tipmost head of the default branch
1504 i) tip
1505 i) tip
1505
1506
1506 Examples:
1507 Examples:
1507
1508
1508 - clone a remote repository to a new directory named hg/::
1509 - clone a remote repository to a new directory named hg/::
1509
1510
1510 hg clone http://selenic.com/hg
1511 hg clone http://selenic.com/hg
1511
1512
1512 - create a lightweight local clone::
1513 - create a lightweight local clone::
1513
1514
1514 hg clone project/ project-feature/
1515 hg clone project/ project-feature/
1515
1516
1516 - clone from an absolute path on an ssh server (note double-slash)::
1517 - clone from an absolute path on an ssh server (note double-slash)::
1517
1518
1518 hg clone ssh://user@server//home/projects/alpha/
1519 hg clone ssh://user@server//home/projects/alpha/
1519
1520
1520 - do a high-speed clone over a LAN while checking out a
1521 - do a high-speed clone over a LAN while checking out a
1521 specified version::
1522 specified version::
1522
1523
1523 hg clone --uncompressed http://server/repo -u 1.5
1524 hg clone --uncompressed http://server/repo -u 1.5
1524
1525
1525 - create a repository without changesets after a particular revision::
1526 - create a repository without changesets after a particular revision::
1526
1527
1527 hg clone -r 04e544 experimental/ good/
1528 hg clone -r 04e544 experimental/ good/
1528
1529
1529 - clone (and track) a particular named branch::
1530 - clone (and track) a particular named branch::
1530
1531
1531 hg clone http://selenic.com/hg#stable
1532 hg clone http://selenic.com/hg#stable
1532
1533
1533 See :hg:`help urls` for details on specifying URLs.
1534 See :hg:`help urls` for details on specifying URLs.
1534
1535
1535 Returns 0 on success.
1536 Returns 0 on success.
1536 """
1537 """
1537 if opts.get('noupdate') and opts.get('updaterev'):
1538 if opts.get('noupdate') and opts.get('updaterev'):
1538 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1539 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1539
1540
1540 r = hg.clone(ui, opts, source, dest,
1541 r = hg.clone(ui, opts, source, dest,
1541 pull=opts.get('pull'),
1542 pull=opts.get('pull'),
1542 stream=opts.get('uncompressed'),
1543 stream=opts.get('uncompressed'),
1543 rev=opts.get('rev'),
1544 rev=opts.get('rev'),
1544 update=opts.get('updaterev') or not opts.get('noupdate'),
1545 update=opts.get('updaterev') or not opts.get('noupdate'),
1545 branch=opts.get('branch'),
1546 branch=opts.get('branch'),
1546 shareopts=opts.get('shareopts'))
1547 shareopts=opts.get('shareopts'))
1547
1548
1548 return r is None
1549 return r is None
1549
1550
1550 @command('^commit|ci',
1551 @command('^commit|ci',
1551 [('A', 'addremove', None,
1552 [('A', 'addremove', None,
1552 _('mark new/missing files as added/removed before committing')),
1553 _('mark new/missing files as added/removed before committing')),
1553 ('', 'close-branch', None,
1554 ('', 'close-branch', None,
1554 _('mark a branch head as closed')),
1555 _('mark a branch head as closed')),
1555 ('', 'amend', None, _('amend the parent of the working directory')),
1556 ('', 'amend', None, _('amend the parent of the working directory')),
1556 ('s', 'secret', None, _('use the secret phase for committing')),
1557 ('s', 'secret', None, _('use the secret phase for committing')),
1557 ('e', 'edit', None, _('invoke editor on commit messages')),
1558 ('e', 'edit', None, _('invoke editor on commit messages')),
1558 ('i', 'interactive', None, _('use interactive mode')),
1559 ('i', 'interactive', None, _('use interactive mode')),
1559 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1560 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1560 _('[OPTION]... [FILE]...'),
1561 _('[OPTION]... [FILE]...'),
1561 inferrepo=True)
1562 inferrepo=True)
1562 def commit(ui, repo, *pats, **opts):
1563 def commit(ui, repo, *pats, **opts):
1563 """commit the specified files or all outstanding changes
1564 """commit the specified files or all outstanding changes
1564
1565
1565 Commit changes to the given files into the repository. Unlike a
1566 Commit changes to the given files into the repository. Unlike a
1566 centralized SCM, this operation is a local operation. See
1567 centralized SCM, this operation is a local operation. See
1567 :hg:`push` for a way to actively distribute your changes.
1568 :hg:`push` for a way to actively distribute your changes.
1568
1569
1569 If a list of files is omitted, all changes reported by :hg:`status`
1570 If a list of files is omitted, all changes reported by :hg:`status`
1570 will be committed.
1571 will be committed.
1571
1572
1572 If you are committing the result of a merge, do not provide any
1573 If you are committing the result of a merge, do not provide any
1573 filenames or -I/-X filters.
1574 filenames or -I/-X filters.
1574
1575
1575 If no commit message is specified, Mercurial starts your
1576 If no commit message is specified, Mercurial starts your
1576 configured editor where you can enter a message. In case your
1577 configured editor where you can enter a message. In case your
1577 commit fails, you will find a backup of your message in
1578 commit fails, you will find a backup of your message in
1578 ``.hg/last-message.txt``.
1579 ``.hg/last-message.txt``.
1579
1580
1580 The --close-branch flag can be used to mark the current branch
1581 The --close-branch flag can be used to mark the current branch
1581 head closed. When all heads of a branch are closed, the branch
1582 head closed. When all heads of a branch are closed, the branch
1582 will be considered closed and no longer listed.
1583 will be considered closed and no longer listed.
1583
1584
1584 The --amend flag can be used to amend the parent of the
1585 The --amend flag can be used to amend the parent of the
1585 working directory with a new commit that contains the changes
1586 working directory with a new commit that contains the changes
1586 in the parent in addition to those currently reported by :hg:`status`,
1587 in the parent in addition to those currently reported by :hg:`status`,
1587 if there are any. The old commit is stored in a backup bundle in
1588 if there are any. The old commit is stored in a backup bundle in
1588 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1589 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1589 on how to restore it).
1590 on how to restore it).
1590
1591
1591 Message, user and date are taken from the amended commit unless
1592 Message, user and date are taken from the amended commit unless
1592 specified. When a message isn't specified on the command line,
1593 specified. When a message isn't specified on the command line,
1593 the editor will open with the message of the amended commit.
1594 the editor will open with the message of the amended commit.
1594
1595
1595 It is not possible to amend public changesets (see :hg:`help phases`)
1596 It is not possible to amend public changesets (see :hg:`help phases`)
1596 or changesets that have children.
1597 or changesets that have children.
1597
1598
1598 See :hg:`help dates` for a list of formats valid for -d/--date.
1599 See :hg:`help dates` for a list of formats valid for -d/--date.
1599
1600
1600 Returns 0 on success, 1 if nothing changed.
1601 Returns 0 on success, 1 if nothing changed.
1601
1602
1602 .. container:: verbose
1603 .. container:: verbose
1603
1604
1604 Examples:
1605 Examples:
1605
1606
1606 - commit all files ending in .py::
1607 - commit all files ending in .py::
1607
1608
1608 hg commit --include "set:**.py"
1609 hg commit --include "set:**.py"
1609
1610
1610 - commit all non-binary files::
1611 - commit all non-binary files::
1611
1612
1612 hg commit --exclude "set:binary()"
1613 hg commit --exclude "set:binary()"
1613
1614
1614 - amend the current commit and set the date to now::
1615 - amend the current commit and set the date to now::
1615
1616
1616 hg commit --amend --date now
1617 hg commit --amend --date now
1617 """
1618 """
1618 wlock = lock = None
1619 wlock = lock = None
1619 try:
1620 try:
1620 wlock = repo.wlock()
1621 wlock = repo.wlock()
1621 lock = repo.lock()
1622 lock = repo.lock()
1622 return _docommit(ui, repo, *pats, **opts)
1623 return _docommit(ui, repo, *pats, **opts)
1623 finally:
1624 finally:
1624 release(lock, wlock)
1625 release(lock, wlock)
1625
1626
1626 def _docommit(ui, repo, *pats, **opts):
1627 def _docommit(ui, repo, *pats, **opts):
1627 if opts.get('interactive'):
1628 if opts.get('interactive'):
1628 opts.pop('interactive')
1629 opts.pop('interactive')
1629 cmdutil.dorecord(ui, repo, commit, None, False,
1630 cmdutil.dorecord(ui, repo, commit, None, False,
1630 cmdutil.recordfilter, *pats, **opts)
1631 cmdutil.recordfilter, *pats, **opts)
1631 return
1632 return
1632
1633
1633 if opts.get('subrepos'):
1634 if opts.get('subrepos'):
1634 if opts.get('amend'):
1635 if opts.get('amend'):
1635 raise error.Abort(_('cannot amend with --subrepos'))
1636 raise error.Abort(_('cannot amend with --subrepos'))
1636 # Let --subrepos on the command line override config setting.
1637 # Let --subrepos on the command line override config setting.
1637 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1638 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1638
1639
1639 cmdutil.checkunfinished(repo, commit=True)
1640 cmdutil.checkunfinished(repo, commit=True)
1640
1641
1641 branch = repo[None].branch()
1642 branch = repo[None].branch()
1642 bheads = repo.branchheads(branch)
1643 bheads = repo.branchheads(branch)
1643
1644
1644 extra = {}
1645 extra = {}
1645 if opts.get('close_branch'):
1646 if opts.get('close_branch'):
1646 extra['close'] = 1
1647 extra['close'] = 1
1647
1648
1648 if not bheads:
1649 if not bheads:
1649 raise error.Abort(_('can only close branch heads'))
1650 raise error.Abort(_('can only close branch heads'))
1650 elif opts.get('amend'):
1651 elif opts.get('amend'):
1651 if repo[None].parents()[0].p1().branch() != branch and \
1652 if repo[None].parents()[0].p1().branch() != branch and \
1652 repo[None].parents()[0].p2().branch() != branch:
1653 repo[None].parents()[0].p2().branch() != branch:
1653 raise error.Abort(_('can only close branch heads'))
1654 raise error.Abort(_('can only close branch heads'))
1654
1655
1655 if opts.get('amend'):
1656 if opts.get('amend'):
1656 if ui.configbool('ui', 'commitsubrepos'):
1657 if ui.configbool('ui', 'commitsubrepos'):
1657 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1658 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1658
1659
1659 old = repo['.']
1660 old = repo['.']
1660 if not old.mutable():
1661 if not old.mutable():
1661 raise error.Abort(_('cannot amend public changesets'))
1662 raise error.Abort(_('cannot amend public changesets'))
1662 if len(repo[None].parents()) > 1:
1663 if len(repo[None].parents()) > 1:
1663 raise error.Abort(_('cannot amend while merging'))
1664 raise error.Abort(_('cannot amend while merging'))
1664 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1665 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1665 if not allowunstable and old.children():
1666 if not allowunstable and old.children():
1666 raise error.Abort(_('cannot amend changeset with children'))
1667 raise error.Abort(_('cannot amend changeset with children'))
1667
1668
1668 newextra = extra.copy()
1669 newextra = extra.copy()
1669 newextra['branch'] = branch
1670 newextra['branch'] = branch
1670 extra = newextra
1671 extra = newextra
1671 # commitfunc is used only for temporary amend commit by cmdutil.amend
1672 # commitfunc is used only for temporary amend commit by cmdutil.amend
1672 def commitfunc(ui, repo, message, match, opts):
1673 def commitfunc(ui, repo, message, match, opts):
1673 return repo.commit(message,
1674 return repo.commit(message,
1674 opts.get('user') or old.user(),
1675 opts.get('user') or old.user(),
1675 opts.get('date') or old.date(),
1676 opts.get('date') or old.date(),
1676 match,
1677 match,
1677 extra=extra)
1678 extra=extra)
1678
1679
1679 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1680 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1680 if node == old.node():
1681 if node == old.node():
1681 ui.status(_("nothing changed\n"))
1682 ui.status(_("nothing changed\n"))
1682 return 1
1683 return 1
1683 else:
1684 else:
1684 def commitfunc(ui, repo, message, match, opts):
1685 def commitfunc(ui, repo, message, match, opts):
1685 backup = ui.backupconfig('phases', 'new-commit')
1686 backup = ui.backupconfig('phases', 'new-commit')
1686 baseui = repo.baseui
1687 baseui = repo.baseui
1687 basebackup = baseui.backupconfig('phases', 'new-commit')
1688 basebackup = baseui.backupconfig('phases', 'new-commit')
1688 try:
1689 try:
1689 if opts.get('secret'):
1690 if opts.get('secret'):
1690 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1691 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1691 # Propagate to subrepos
1692 # Propagate to subrepos
1692 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1693 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1693
1694
1694 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1695 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1695 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1696 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1696 return repo.commit(message, opts.get('user'), opts.get('date'),
1697 return repo.commit(message, opts.get('user'), opts.get('date'),
1697 match,
1698 match,
1698 editor=editor,
1699 editor=editor,
1699 extra=extra)
1700 extra=extra)
1700 finally:
1701 finally:
1701 ui.restoreconfig(backup)
1702 ui.restoreconfig(backup)
1702 repo.baseui.restoreconfig(basebackup)
1703 repo.baseui.restoreconfig(basebackup)
1703
1704
1704
1705
1705 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1706 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1706
1707
1707 if not node:
1708 if not node:
1708 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1709 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1709 if stat[3]:
1710 if stat[3]:
1710 ui.status(_("nothing changed (%d missing files, see "
1711 ui.status(_("nothing changed (%d missing files, see "
1711 "'hg status')\n") % len(stat[3]))
1712 "'hg status')\n") % len(stat[3]))
1712 else:
1713 else:
1713 ui.status(_("nothing changed\n"))
1714 ui.status(_("nothing changed\n"))
1714 return 1
1715 return 1
1715
1716
1716 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1717 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1717
1718
1718 @command('config|showconfig|debugconfig',
1719 @command('config|showconfig|debugconfig',
1719 [('u', 'untrusted', None, _('show untrusted configuration options')),
1720 [('u', 'untrusted', None, _('show untrusted configuration options')),
1720 ('e', 'edit', None, _('edit user config')),
1721 ('e', 'edit', None, _('edit user config')),
1721 ('l', 'local', None, _('edit repository config')),
1722 ('l', 'local', None, _('edit repository config')),
1722 ('g', 'global', None, _('edit global config'))],
1723 ('g', 'global', None, _('edit global config'))],
1723 _('[-u] [NAME]...'),
1724 _('[-u] [NAME]...'),
1724 optionalrepo=True)
1725 optionalrepo=True)
1725 def config(ui, repo, *values, **opts):
1726 def config(ui, repo, *values, **opts):
1726 """show combined config settings from all hgrc files
1727 """show combined config settings from all hgrc files
1727
1728
1728 With no arguments, print names and values of all config items.
1729 With no arguments, print names and values of all config items.
1729
1730
1730 With one argument of the form section.name, print just the value
1731 With one argument of the form section.name, print just the value
1731 of that config item.
1732 of that config item.
1732
1733
1733 With multiple arguments, print names and values of all config
1734 With multiple arguments, print names and values of all config
1734 items with matching section names.
1735 items with matching section names.
1735
1736
1736 With --edit, start an editor on the user-level config file. With
1737 With --edit, start an editor on the user-level config file. With
1737 --global, edit the system-wide config file. With --local, edit the
1738 --global, edit the system-wide config file. With --local, edit the
1738 repository-level config file.
1739 repository-level config file.
1739
1740
1740 With --debug, the source (filename and line number) is printed
1741 With --debug, the source (filename and line number) is printed
1741 for each config item.
1742 for each config item.
1742
1743
1743 See :hg:`help config` for more information about config files.
1744 See :hg:`help config` for more information about config files.
1744
1745
1745 Returns 0 on success, 1 if NAME does not exist.
1746 Returns 0 on success, 1 if NAME does not exist.
1746
1747
1747 """
1748 """
1748
1749
1749 if opts.get('edit') or opts.get('local') or opts.get('global'):
1750 if opts.get('edit') or opts.get('local') or opts.get('global'):
1750 if opts.get('local') and opts.get('global'):
1751 if opts.get('local') and opts.get('global'):
1751 raise error.Abort(_("can't use --local and --global together"))
1752 raise error.Abort(_("can't use --local and --global together"))
1752
1753
1753 if opts.get('local'):
1754 if opts.get('local'):
1754 if not repo:
1755 if not repo:
1755 raise error.Abort(_("can't use --local outside a repository"))
1756 raise error.Abort(_("can't use --local outside a repository"))
1756 paths = [repo.join('hgrc')]
1757 paths = [repo.join('hgrc')]
1757 elif opts.get('global'):
1758 elif opts.get('global'):
1758 paths = scmutil.systemrcpath()
1759 paths = scmutil.systemrcpath()
1759 else:
1760 else:
1760 paths = scmutil.userrcpath()
1761 paths = scmutil.userrcpath()
1761
1762
1762 for f in paths:
1763 for f in paths:
1763 if os.path.exists(f):
1764 if os.path.exists(f):
1764 break
1765 break
1765 else:
1766 else:
1766 if opts.get('global'):
1767 if opts.get('global'):
1767 samplehgrc = uimod.samplehgrcs['global']
1768 samplehgrc = uimod.samplehgrcs['global']
1768 elif opts.get('local'):
1769 elif opts.get('local'):
1769 samplehgrc = uimod.samplehgrcs['local']
1770 samplehgrc = uimod.samplehgrcs['local']
1770 else:
1771 else:
1771 samplehgrc = uimod.samplehgrcs['user']
1772 samplehgrc = uimod.samplehgrcs['user']
1772
1773
1773 f = paths[0]
1774 f = paths[0]
1774 fp = open(f, "w")
1775 fp = open(f, "w")
1775 fp.write(samplehgrc)
1776 fp.write(samplehgrc)
1776 fp.close()
1777 fp.close()
1777
1778
1778 editor = ui.geteditor()
1779 editor = ui.geteditor()
1779 ui.system("%s \"%s\"" % (editor, f),
1780 ui.system("%s \"%s\"" % (editor, f),
1780 onerr=error.Abort, errprefix=_("edit failed"))
1781 onerr=error.Abort, errprefix=_("edit failed"))
1781 return
1782 return
1782
1783
1783 for f in scmutil.rcpath():
1784 for f in scmutil.rcpath():
1784 ui.debug('read config from: %s\n' % f)
1785 ui.debug('read config from: %s\n' % f)
1785 untrusted = bool(opts.get('untrusted'))
1786 untrusted = bool(opts.get('untrusted'))
1786 if values:
1787 if values:
1787 sections = [v for v in values if '.' not in v]
1788 sections = [v for v in values if '.' not in v]
1788 items = [v for v in values if '.' in v]
1789 items = [v for v in values if '.' in v]
1789 if len(items) > 1 or items and sections:
1790 if len(items) > 1 or items and sections:
1790 raise error.Abort(_('only one config item permitted'))
1791 raise error.Abort(_('only one config item permitted'))
1791 matched = False
1792 matched = False
1792 for section, name, value in ui.walkconfig(untrusted=untrusted):
1793 for section, name, value in ui.walkconfig(untrusted=untrusted):
1793 value = str(value).replace('\n', '\\n')
1794 value = str(value).replace('\n', '\\n')
1794 sectname = section + '.' + name
1795 sectname = section + '.' + name
1795 if values:
1796 if values:
1796 for v in values:
1797 for v in values:
1797 if v == section:
1798 if v == section:
1798 ui.debug('%s: ' %
1799 ui.debug('%s: ' %
1799 ui.configsource(section, name, untrusted))
1800 ui.configsource(section, name, untrusted))
1800 ui.write('%s=%s\n' % (sectname, value))
1801 ui.write('%s=%s\n' % (sectname, value))
1801 matched = True
1802 matched = True
1802 elif v == sectname:
1803 elif v == sectname:
1803 ui.debug('%s: ' %
1804 ui.debug('%s: ' %
1804 ui.configsource(section, name, untrusted))
1805 ui.configsource(section, name, untrusted))
1805 ui.write(value, '\n')
1806 ui.write(value, '\n')
1806 matched = True
1807 matched = True
1807 else:
1808 else:
1808 ui.debug('%s: ' %
1809 ui.debug('%s: ' %
1809 ui.configsource(section, name, untrusted))
1810 ui.configsource(section, name, untrusted))
1810 ui.write('%s=%s\n' % (sectname, value))
1811 ui.write('%s=%s\n' % (sectname, value))
1811 matched = True
1812 matched = True
1812 if matched:
1813 if matched:
1813 return 0
1814 return 0
1814 return 1
1815 return 1
1815
1816
1816 @command('copy|cp',
1817 @command('copy|cp',
1817 [('A', 'after', None, _('record a copy that has already occurred')),
1818 [('A', 'after', None, _('record a copy that has already occurred')),
1818 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1819 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1819 ] + walkopts + dryrunopts,
1820 ] + walkopts + dryrunopts,
1820 _('[OPTION]... [SOURCE]... DEST'))
1821 _('[OPTION]... [SOURCE]... DEST'))
1821 def copy(ui, repo, *pats, **opts):
1822 def copy(ui, repo, *pats, **opts):
1822 """mark files as copied for the next commit
1823 """mark files as copied for the next commit
1823
1824
1824 Mark dest as having copies of source files. If dest is a
1825 Mark dest as having copies of source files. If dest is a
1825 directory, copies are put in that directory. If dest is a file,
1826 directory, copies are put in that directory. If dest is a file,
1826 the source must be a single file.
1827 the source must be a single file.
1827
1828
1828 By default, this command copies the contents of files as they
1829 By default, this command copies the contents of files as they
1829 exist in the working directory. If invoked with -A/--after, the
1830 exist in the working directory. If invoked with -A/--after, the
1830 operation is recorded, but no copying is performed.
1831 operation is recorded, but no copying is performed.
1831
1832
1832 This command takes effect with the next commit. To undo a copy
1833 This command takes effect with the next commit. To undo a copy
1833 before that, see :hg:`revert`.
1834 before that, see :hg:`revert`.
1834
1835
1835 Returns 0 on success, 1 if errors are encountered.
1836 Returns 0 on success, 1 if errors are encountered.
1836 """
1837 """
1837 wlock = repo.wlock(False)
1838 wlock = repo.wlock(False)
1838 try:
1839 try:
1839 return cmdutil.copy(ui, repo, pats, opts)
1840 return cmdutil.copy(ui, repo, pats, opts)
1840 finally:
1841 finally:
1841 wlock.release()
1842 wlock.release()
1842
1843
1843 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1844 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1844 def debugancestor(ui, repo, *args):
1845 def debugancestor(ui, repo, *args):
1845 """find the ancestor revision of two revisions in a given index"""
1846 """find the ancestor revision of two revisions in a given index"""
1846 if len(args) == 3:
1847 if len(args) == 3:
1847 index, rev1, rev2 = args
1848 index, rev1, rev2 = args
1848 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1849 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1849 lookup = r.lookup
1850 lookup = r.lookup
1850 elif len(args) == 2:
1851 elif len(args) == 2:
1851 if not repo:
1852 if not repo:
1852 raise error.Abort(_("there is no Mercurial repository here "
1853 raise error.Abort(_("there is no Mercurial repository here "
1853 "(.hg not found)"))
1854 "(.hg not found)"))
1854 rev1, rev2 = args
1855 rev1, rev2 = args
1855 r = repo.changelog
1856 r = repo.changelog
1856 lookup = repo.lookup
1857 lookup = repo.lookup
1857 else:
1858 else:
1858 raise error.Abort(_('either two or three arguments required'))
1859 raise error.Abort(_('either two or three arguments required'))
1859 a = r.ancestor(lookup(rev1), lookup(rev2))
1860 a = r.ancestor(lookup(rev1), lookup(rev2))
1860 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1861 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1861
1862
1862 @command('debugbuilddag',
1863 @command('debugbuilddag',
1863 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1864 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1864 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1865 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1865 ('n', 'new-file', None, _('add new file at each rev'))],
1866 ('n', 'new-file', None, _('add new file at each rev'))],
1866 _('[OPTION]... [TEXT]'))
1867 _('[OPTION]... [TEXT]'))
1867 def debugbuilddag(ui, repo, text=None,
1868 def debugbuilddag(ui, repo, text=None,
1868 mergeable_file=False,
1869 mergeable_file=False,
1869 overwritten_file=False,
1870 overwritten_file=False,
1870 new_file=False):
1871 new_file=False):
1871 """builds a repo with a given DAG from scratch in the current empty repo
1872 """builds a repo with a given DAG from scratch in the current empty repo
1872
1873
1873 The description of the DAG is read from stdin if not given on the
1874 The description of the DAG is read from stdin if not given on the
1874 command line.
1875 command line.
1875
1876
1876 Elements:
1877 Elements:
1877
1878
1878 - "+n" is a linear run of n nodes based on the current default parent
1879 - "+n" is a linear run of n nodes based on the current default parent
1879 - "." is a single node based on the current default parent
1880 - "." is a single node based on the current default parent
1880 - "$" resets the default parent to null (implied at the start);
1881 - "$" resets the default parent to null (implied at the start);
1881 otherwise the default parent is always the last node created
1882 otherwise the default parent is always the last node created
1882 - "<p" sets the default parent to the backref p
1883 - "<p" sets the default parent to the backref p
1883 - "*p" is a fork at parent p, which is a backref
1884 - "*p" is a fork at parent p, which is a backref
1884 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1885 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1885 - "/p2" is a merge of the preceding node and p2
1886 - "/p2" is a merge of the preceding node and p2
1886 - ":tag" defines a local tag for the preceding node
1887 - ":tag" defines a local tag for the preceding node
1887 - "@branch" sets the named branch for subsequent nodes
1888 - "@branch" sets the named branch for subsequent nodes
1888 - "#...\\n" is a comment up to the end of the line
1889 - "#...\\n" is a comment up to the end of the line
1889
1890
1890 Whitespace between the above elements is ignored.
1891 Whitespace between the above elements is ignored.
1891
1892
1892 A backref is either
1893 A backref is either
1893
1894
1894 - a number n, which references the node curr-n, where curr is the current
1895 - a number n, which references the node curr-n, where curr is the current
1895 node, or
1896 node, or
1896 - the name of a local tag you placed earlier using ":tag", or
1897 - the name of a local tag you placed earlier using ":tag", or
1897 - empty to denote the default parent.
1898 - empty to denote the default parent.
1898
1899
1899 All string valued-elements are either strictly alphanumeric, or must
1900 All string valued-elements are either strictly alphanumeric, or must
1900 be enclosed in double quotes ("..."), with "\\" as escape character.
1901 be enclosed in double quotes ("..."), with "\\" as escape character.
1901 """
1902 """
1902
1903
1903 if text is None:
1904 if text is None:
1904 ui.status(_("reading DAG from stdin\n"))
1905 ui.status(_("reading DAG from stdin\n"))
1905 text = ui.fin.read()
1906 text = ui.fin.read()
1906
1907
1907 cl = repo.changelog
1908 cl = repo.changelog
1908 if len(cl) > 0:
1909 if len(cl) > 0:
1909 raise error.Abort(_('repository is not empty'))
1910 raise error.Abort(_('repository is not empty'))
1910
1911
1911 # determine number of revs in DAG
1912 # determine number of revs in DAG
1912 total = 0
1913 total = 0
1913 for type, data in dagparser.parsedag(text):
1914 for type, data in dagparser.parsedag(text):
1914 if type == 'n':
1915 if type == 'n':
1915 total += 1
1916 total += 1
1916
1917
1917 if mergeable_file:
1918 if mergeable_file:
1918 linesperrev = 2
1919 linesperrev = 2
1919 # make a file with k lines per rev
1920 # make a file with k lines per rev
1920 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1921 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1921 initialmergedlines.append("")
1922 initialmergedlines.append("")
1922
1923
1923 tags = []
1924 tags = []
1924
1925
1925 lock = tr = None
1926 lock = tr = None
1926 try:
1927 try:
1927 lock = repo.lock()
1928 lock = repo.lock()
1928 tr = repo.transaction("builddag")
1929 tr = repo.transaction("builddag")
1929
1930
1930 at = -1
1931 at = -1
1931 atbranch = 'default'
1932 atbranch = 'default'
1932 nodeids = []
1933 nodeids = []
1933 id = 0
1934 id = 0
1934 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1935 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1935 for type, data in dagparser.parsedag(text):
1936 for type, data in dagparser.parsedag(text):
1936 if type == 'n':
1937 if type == 'n':
1937 ui.note(('node %s\n' % str(data)))
1938 ui.note(('node %s\n' % str(data)))
1938 id, ps = data
1939 id, ps = data
1939
1940
1940 files = []
1941 files = []
1941 fctxs = {}
1942 fctxs = {}
1942
1943
1943 p2 = None
1944 p2 = None
1944 if mergeable_file:
1945 if mergeable_file:
1945 fn = "mf"
1946 fn = "mf"
1946 p1 = repo[ps[0]]
1947 p1 = repo[ps[0]]
1947 if len(ps) > 1:
1948 if len(ps) > 1:
1948 p2 = repo[ps[1]]
1949 p2 = repo[ps[1]]
1949 pa = p1.ancestor(p2)
1950 pa = p1.ancestor(p2)
1950 base, local, other = [x[fn].data() for x in (pa, p1,
1951 base, local, other = [x[fn].data() for x in (pa, p1,
1951 p2)]
1952 p2)]
1952 m3 = simplemerge.Merge3Text(base, local, other)
1953 m3 = simplemerge.Merge3Text(base, local, other)
1953 ml = [l.strip() for l in m3.merge_lines()]
1954 ml = [l.strip() for l in m3.merge_lines()]
1954 ml.append("")
1955 ml.append("")
1955 elif at > 0:
1956 elif at > 0:
1956 ml = p1[fn].data().split("\n")
1957 ml = p1[fn].data().split("\n")
1957 else:
1958 else:
1958 ml = initialmergedlines
1959 ml = initialmergedlines
1959 ml[id * linesperrev] += " r%i" % id
1960 ml[id * linesperrev] += " r%i" % id
1960 mergedtext = "\n".join(ml)
1961 mergedtext = "\n".join(ml)
1961 files.append(fn)
1962 files.append(fn)
1962 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
1963 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
1963
1964
1964 if overwritten_file:
1965 if overwritten_file:
1965 fn = "of"
1966 fn = "of"
1966 files.append(fn)
1967 files.append(fn)
1967 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1968 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1968
1969
1969 if new_file:
1970 if new_file:
1970 fn = "nf%i" % id
1971 fn = "nf%i" % id
1971 files.append(fn)
1972 files.append(fn)
1972 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1973 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1973 if len(ps) > 1:
1974 if len(ps) > 1:
1974 if not p2:
1975 if not p2:
1975 p2 = repo[ps[1]]
1976 p2 = repo[ps[1]]
1976 for fn in p2:
1977 for fn in p2:
1977 if fn.startswith("nf"):
1978 if fn.startswith("nf"):
1978 files.append(fn)
1979 files.append(fn)
1979 fctxs[fn] = p2[fn]
1980 fctxs[fn] = p2[fn]
1980
1981
1981 def fctxfn(repo, cx, path):
1982 def fctxfn(repo, cx, path):
1982 return fctxs.get(path)
1983 return fctxs.get(path)
1983
1984
1984 if len(ps) == 0 or ps[0] < 0:
1985 if len(ps) == 0 or ps[0] < 0:
1985 pars = [None, None]
1986 pars = [None, None]
1986 elif len(ps) == 1:
1987 elif len(ps) == 1:
1987 pars = [nodeids[ps[0]], None]
1988 pars = [nodeids[ps[0]], None]
1988 else:
1989 else:
1989 pars = [nodeids[p] for p in ps]
1990 pars = [nodeids[p] for p in ps]
1990 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1991 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1991 date=(id, 0),
1992 date=(id, 0),
1992 user="debugbuilddag",
1993 user="debugbuilddag",
1993 extra={'branch': atbranch})
1994 extra={'branch': atbranch})
1994 nodeid = repo.commitctx(cx)
1995 nodeid = repo.commitctx(cx)
1995 nodeids.append(nodeid)
1996 nodeids.append(nodeid)
1996 at = id
1997 at = id
1997 elif type == 'l':
1998 elif type == 'l':
1998 id, name = data
1999 id, name = data
1999 ui.note(('tag %s\n' % name))
2000 ui.note(('tag %s\n' % name))
2000 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
2001 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
2001 elif type == 'a':
2002 elif type == 'a':
2002 ui.note(('branch %s\n' % data))
2003 ui.note(('branch %s\n' % data))
2003 atbranch = data
2004 atbranch = data
2004 ui.progress(_('building'), id, unit=_('revisions'), total=total)
2005 ui.progress(_('building'), id, unit=_('revisions'), total=total)
2005 tr.close()
2006 tr.close()
2006
2007
2007 if tags:
2008 if tags:
2008 repo.vfs.write("localtags", "".join(tags))
2009 repo.vfs.write("localtags", "".join(tags))
2009 finally:
2010 finally:
2010 ui.progress(_('building'), None)
2011 ui.progress(_('building'), None)
2011 release(tr, lock)
2012 release(tr, lock)
2012
2013
2013 @command('debugbundle',
2014 @command('debugbundle',
2014 [('a', 'all', None, _('show all details'))],
2015 [('a', 'all', None, _('show all details'))],
2015 _('FILE'),
2016 _('FILE'),
2016 norepo=True)
2017 norepo=True)
2017 def debugbundle(ui, bundlepath, all=None, **opts):
2018 def debugbundle(ui, bundlepath, all=None, **opts):
2018 """lists the contents of a bundle"""
2019 """lists the contents of a bundle"""
2019 f = hg.openpath(ui, bundlepath)
2020 f = hg.openpath(ui, bundlepath)
2020 try:
2021 try:
2021 gen = exchange.readbundle(ui, f, bundlepath)
2022 gen = exchange.readbundle(ui, f, bundlepath)
2022 if isinstance(gen, bundle2.unbundle20):
2023 if isinstance(gen, bundle2.unbundle20):
2023 return _debugbundle2(ui, gen, all=all, **opts)
2024 return _debugbundle2(ui, gen, all=all, **opts)
2024 if all:
2025 if all:
2025 ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n"))
2026 ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n"))
2026
2027
2027 def showchunks(named):
2028 def showchunks(named):
2028 ui.write("\n%s\n" % named)
2029 ui.write("\n%s\n" % named)
2029 chain = None
2030 chain = None
2030 while True:
2031 while True:
2031 chunkdata = gen.deltachunk(chain)
2032 chunkdata = gen.deltachunk(chain)
2032 if not chunkdata:
2033 if not chunkdata:
2033 break
2034 break
2034 node = chunkdata['node']
2035 node = chunkdata['node']
2035 p1 = chunkdata['p1']
2036 p1 = chunkdata['p1']
2036 p2 = chunkdata['p2']
2037 p2 = chunkdata['p2']
2037 cs = chunkdata['cs']
2038 cs = chunkdata['cs']
2038 deltabase = chunkdata['deltabase']
2039 deltabase = chunkdata['deltabase']
2039 delta = chunkdata['delta']
2040 delta = chunkdata['delta']
2040 ui.write("%s %s %s %s %s %s\n" %
2041 ui.write("%s %s %s %s %s %s\n" %
2041 (hex(node), hex(p1), hex(p2),
2042 (hex(node), hex(p1), hex(p2),
2042 hex(cs), hex(deltabase), len(delta)))
2043 hex(cs), hex(deltabase), len(delta)))
2043 chain = node
2044 chain = node
2044
2045
2045 chunkdata = gen.changelogheader()
2046 chunkdata = gen.changelogheader()
2046 showchunks("changelog")
2047 showchunks("changelog")
2047 chunkdata = gen.manifestheader()
2048 chunkdata = gen.manifestheader()
2048 showchunks("manifest")
2049 showchunks("manifest")
2049 while True:
2050 while True:
2050 chunkdata = gen.filelogheader()
2051 chunkdata = gen.filelogheader()
2051 if not chunkdata:
2052 if not chunkdata:
2052 break
2053 break
2053 fname = chunkdata['filename']
2054 fname = chunkdata['filename']
2054 showchunks(fname)
2055 showchunks(fname)
2055 else:
2056 else:
2056 if isinstance(gen, bundle2.unbundle20):
2057 if isinstance(gen, bundle2.unbundle20):
2057 raise error.Abort(_('use debugbundle2 for this file'))
2058 raise error.Abort(_('use debugbundle2 for this file'))
2058 chunkdata = gen.changelogheader()
2059 chunkdata = gen.changelogheader()
2059 chain = None
2060 chain = None
2060 while True:
2061 while True:
2061 chunkdata = gen.deltachunk(chain)
2062 chunkdata = gen.deltachunk(chain)
2062 if not chunkdata:
2063 if not chunkdata:
2063 break
2064 break
2064 node = chunkdata['node']
2065 node = chunkdata['node']
2065 ui.write("%s\n" % hex(node))
2066 ui.write("%s\n" % hex(node))
2066 chain = node
2067 chain = node
2067 finally:
2068 finally:
2068 f.close()
2069 f.close()
2069
2070
2070 def _debugbundle2(ui, gen, **opts):
2071 def _debugbundle2(ui, gen, **opts):
2071 """lists the contents of a bundle2"""
2072 """lists the contents of a bundle2"""
2072 if not isinstance(gen, bundle2.unbundle20):
2073 if not isinstance(gen, bundle2.unbundle20):
2073 raise error.Abort(_('not a bundle2 file'))
2074 raise error.Abort(_('not a bundle2 file'))
2074 ui.write(('Stream params: %s\n' % repr(gen.params)))
2075 ui.write(('Stream params: %s\n' % repr(gen.params)))
2075 for part in gen.iterparts():
2076 for part in gen.iterparts():
2076 ui.write('%s -- %r\n' % (part.type, repr(part.params)))
2077 ui.write('%s -- %r\n' % (part.type, repr(part.params)))
2077 if part.type == 'changegroup':
2078 if part.type == 'changegroup':
2078 version = part.params.get('version', '01')
2079 version = part.params.get('version', '01')
2079 cg = changegroup.packermap[version][1](part, 'UN')
2080 cg = changegroup.packermap[version][1](part, 'UN')
2080 chunkdata = cg.changelogheader()
2081 chunkdata = cg.changelogheader()
2081 chain = None
2082 chain = None
2082 while True:
2083 while True:
2083 chunkdata = cg.deltachunk(chain)
2084 chunkdata = cg.deltachunk(chain)
2084 if not chunkdata:
2085 if not chunkdata:
2085 break
2086 break
2086 node = chunkdata['node']
2087 node = chunkdata['node']
2087 ui.write(" %s\n" % hex(node))
2088 ui.write(" %s\n" % hex(node))
2088 chain = node
2089 chain = node
2089
2090
2090 @command('debugcreatestreamclonebundle', [], 'FILE')
2091 @command('debugcreatestreamclonebundle', [], 'FILE')
2091 def debugcreatestreamclonebundle(ui, repo, fname):
2092 def debugcreatestreamclonebundle(ui, repo, fname):
2092 """create a stream clone bundle file
2093 """create a stream clone bundle file
2093
2094
2094 Stream bundles are special bundles that are essentially archives of
2095 Stream bundles are special bundles that are essentially archives of
2095 revlog files. They are commonly used for cloning very quickly.
2096 revlog files. They are commonly used for cloning very quickly.
2096 """
2097 """
2097 requirements, gen = streamclone.generatebundlev1(repo)
2098 requirements, gen = streamclone.generatebundlev1(repo)
2098 changegroup.writechunks(ui, gen, fname)
2099 changegroup.writechunks(ui, gen, fname)
2099
2100
2100 ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements)))
2101 ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements)))
2101
2102
2102 @command('debugapplystreamclonebundle', [], 'FILE')
2103 @command('debugapplystreamclonebundle', [], 'FILE')
2103 def debugapplystreamclonebundle(ui, repo, fname):
2104 def debugapplystreamclonebundle(ui, repo, fname):
2104 """apply a stream clone bundle file"""
2105 """apply a stream clone bundle file"""
2105 f = hg.openpath(ui, fname)
2106 f = hg.openpath(ui, fname)
2106 gen = exchange.readbundle(ui, f, fname)
2107 gen = exchange.readbundle(ui, f, fname)
2107 gen.apply(repo)
2108 gen.apply(repo)
2108
2109
2109 @command('debugcheckstate', [], '')
2110 @command('debugcheckstate', [], '')
2110 def debugcheckstate(ui, repo):
2111 def debugcheckstate(ui, repo):
2111 """validate the correctness of the current dirstate"""
2112 """validate the correctness of the current dirstate"""
2112 parent1, parent2 = repo.dirstate.parents()
2113 parent1, parent2 = repo.dirstate.parents()
2113 m1 = repo[parent1].manifest()
2114 m1 = repo[parent1].manifest()
2114 m2 = repo[parent2].manifest()
2115 m2 = repo[parent2].manifest()
2115 errors = 0
2116 errors = 0
2116 for f in repo.dirstate:
2117 for f in repo.dirstate:
2117 state = repo.dirstate[f]
2118 state = repo.dirstate[f]
2118 if state in "nr" and f not in m1:
2119 if state in "nr" and f not in m1:
2119 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
2120 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
2120 errors += 1
2121 errors += 1
2121 if state in "a" and f in m1:
2122 if state in "a" and f in m1:
2122 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
2123 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
2123 errors += 1
2124 errors += 1
2124 if state in "m" and f not in m1 and f not in m2:
2125 if state in "m" and f not in m1 and f not in m2:
2125 ui.warn(_("%s in state %s, but not in either manifest\n") %
2126 ui.warn(_("%s in state %s, but not in either manifest\n") %
2126 (f, state))
2127 (f, state))
2127 errors += 1
2128 errors += 1
2128 for f in m1:
2129 for f in m1:
2129 state = repo.dirstate[f]
2130 state = repo.dirstate[f]
2130 if state not in "nrm":
2131 if state not in "nrm":
2131 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
2132 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
2132 errors += 1
2133 errors += 1
2133 if errors:
2134 if errors:
2134 error = _(".hg/dirstate inconsistent with current parent's manifest")
2135 error = _(".hg/dirstate inconsistent with current parent's manifest")
2135 raise error.Abort(error)
2136 raise error.Abort(error)
2136
2137
2137 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
2138 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
2138 def debugcommands(ui, cmd='', *args):
2139 def debugcommands(ui, cmd='', *args):
2139 """list all available commands and options"""
2140 """list all available commands and options"""
2140 for cmd, vals in sorted(table.iteritems()):
2141 for cmd, vals in sorted(table.iteritems()):
2141 cmd = cmd.split('|')[0].strip('^')
2142 cmd = cmd.split('|')[0].strip('^')
2142 opts = ', '.join([i[1] for i in vals[1]])
2143 opts = ', '.join([i[1] for i in vals[1]])
2143 ui.write('%s: %s\n' % (cmd, opts))
2144 ui.write('%s: %s\n' % (cmd, opts))
2144
2145
2145 @command('debugcomplete',
2146 @command('debugcomplete',
2146 [('o', 'options', None, _('show the command options'))],
2147 [('o', 'options', None, _('show the command options'))],
2147 _('[-o] CMD'),
2148 _('[-o] CMD'),
2148 norepo=True)
2149 norepo=True)
2149 def debugcomplete(ui, cmd='', **opts):
2150 def debugcomplete(ui, cmd='', **opts):
2150 """returns the completion list associated with the given command"""
2151 """returns the completion list associated with the given command"""
2151
2152
2152 if opts.get('options'):
2153 if opts.get('options'):
2153 options = []
2154 options = []
2154 otables = [globalopts]
2155 otables = [globalopts]
2155 if cmd:
2156 if cmd:
2156 aliases, entry = cmdutil.findcmd(cmd, table, False)
2157 aliases, entry = cmdutil.findcmd(cmd, table, False)
2157 otables.append(entry[1])
2158 otables.append(entry[1])
2158 for t in otables:
2159 for t in otables:
2159 for o in t:
2160 for o in t:
2160 if "(DEPRECATED)" in o[3]:
2161 if "(DEPRECATED)" in o[3]:
2161 continue
2162 continue
2162 if o[0]:
2163 if o[0]:
2163 options.append('-%s' % o[0])
2164 options.append('-%s' % o[0])
2164 options.append('--%s' % o[1])
2165 options.append('--%s' % o[1])
2165 ui.write("%s\n" % "\n".join(options))
2166 ui.write("%s\n" % "\n".join(options))
2166 return
2167 return
2167
2168
2168 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2169 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2169 if ui.verbose:
2170 if ui.verbose:
2170 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
2171 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
2171 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
2172 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
2172
2173
2173 @command('debugdag',
2174 @command('debugdag',
2174 [('t', 'tags', None, _('use tags as labels')),
2175 [('t', 'tags', None, _('use tags as labels')),
2175 ('b', 'branches', None, _('annotate with branch names')),
2176 ('b', 'branches', None, _('annotate with branch names')),
2176 ('', 'dots', None, _('use dots for runs')),
2177 ('', 'dots', None, _('use dots for runs')),
2177 ('s', 'spaces', None, _('separate elements by spaces'))],
2178 ('s', 'spaces', None, _('separate elements by spaces'))],
2178 _('[OPTION]... [FILE [REV]...]'),
2179 _('[OPTION]... [FILE [REV]...]'),
2179 optionalrepo=True)
2180 optionalrepo=True)
2180 def debugdag(ui, repo, file_=None, *revs, **opts):
2181 def debugdag(ui, repo, file_=None, *revs, **opts):
2181 """format the changelog or an index DAG as a concise textual description
2182 """format the changelog or an index DAG as a concise textual description
2182
2183
2183 If you pass a revlog index, the revlog's DAG is emitted. If you list
2184 If you pass a revlog index, the revlog's DAG is emitted. If you list
2184 revision numbers, they get labeled in the output as rN.
2185 revision numbers, they get labeled in the output as rN.
2185
2186
2186 Otherwise, the changelog DAG of the current repo is emitted.
2187 Otherwise, the changelog DAG of the current repo is emitted.
2187 """
2188 """
2188 spaces = opts.get('spaces')
2189 spaces = opts.get('spaces')
2189 dots = opts.get('dots')
2190 dots = opts.get('dots')
2190 if file_:
2191 if file_:
2191 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2192 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2192 revs = set((int(r) for r in revs))
2193 revs = set((int(r) for r in revs))
2193 def events():
2194 def events():
2194 for r in rlog:
2195 for r in rlog:
2195 yield 'n', (r, list(p for p in rlog.parentrevs(r)
2196 yield 'n', (r, list(p for p in rlog.parentrevs(r)
2196 if p != -1))
2197 if p != -1))
2197 if r in revs:
2198 if r in revs:
2198 yield 'l', (r, "r%i" % r)
2199 yield 'l', (r, "r%i" % r)
2199 elif repo:
2200 elif repo:
2200 cl = repo.changelog
2201 cl = repo.changelog
2201 tags = opts.get('tags')
2202 tags = opts.get('tags')
2202 branches = opts.get('branches')
2203 branches = opts.get('branches')
2203 if tags:
2204 if tags:
2204 labels = {}
2205 labels = {}
2205 for l, n in repo.tags().items():
2206 for l, n in repo.tags().items():
2206 labels.setdefault(cl.rev(n), []).append(l)
2207 labels.setdefault(cl.rev(n), []).append(l)
2207 def events():
2208 def events():
2208 b = "default"
2209 b = "default"
2209 for r in cl:
2210 for r in cl:
2210 if branches:
2211 if branches:
2211 newb = cl.read(cl.node(r))[5]['branch']
2212 newb = cl.read(cl.node(r))[5]['branch']
2212 if newb != b:
2213 if newb != b:
2213 yield 'a', newb
2214 yield 'a', newb
2214 b = newb
2215 b = newb
2215 yield 'n', (r, list(p for p in cl.parentrevs(r)
2216 yield 'n', (r, list(p for p in cl.parentrevs(r)
2216 if p != -1))
2217 if p != -1))
2217 if tags:
2218 if tags:
2218 ls = labels.get(r)
2219 ls = labels.get(r)
2219 if ls:
2220 if ls:
2220 for l in ls:
2221 for l in ls:
2221 yield 'l', (r, l)
2222 yield 'l', (r, l)
2222 else:
2223 else:
2223 raise error.Abort(_('need repo for changelog dag'))
2224 raise error.Abort(_('need repo for changelog dag'))
2224
2225
2225 for line in dagparser.dagtextlines(events(),
2226 for line in dagparser.dagtextlines(events(),
2226 addspaces=spaces,
2227 addspaces=spaces,
2227 wraplabels=True,
2228 wraplabels=True,
2228 wrapannotations=True,
2229 wrapannotations=True,
2229 wrapnonlinear=dots,
2230 wrapnonlinear=dots,
2230 usedots=dots,
2231 usedots=dots,
2231 maxlinewidth=70):
2232 maxlinewidth=70):
2232 ui.write(line)
2233 ui.write(line)
2233 ui.write("\n")
2234 ui.write("\n")
2234
2235
2235 @command('debugdata', debugrevlogopts, _('-c|-m|FILE REV'))
2236 @command('debugdata', debugrevlogopts, _('-c|-m|FILE REV'))
2236 def debugdata(ui, repo, file_, rev=None, **opts):
2237 def debugdata(ui, repo, file_, rev=None, **opts):
2237 """dump the contents of a data file revision"""
2238 """dump the contents of a data file revision"""
2238 if opts.get('changelog') or opts.get('manifest'):
2239 if opts.get('changelog') or opts.get('manifest'):
2239 file_, rev = None, file_
2240 file_, rev = None, file_
2240 elif rev is None:
2241 elif rev is None:
2241 raise error.CommandError('debugdata', _('invalid arguments'))
2242 raise error.CommandError('debugdata', _('invalid arguments'))
2242 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
2243 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
2243 try:
2244 try:
2244 ui.write(r.revision(r.lookup(rev)))
2245 ui.write(r.revision(r.lookup(rev)))
2245 except KeyError:
2246 except KeyError:
2246 raise error.Abort(_('invalid revision identifier %s') % rev)
2247 raise error.Abort(_('invalid revision identifier %s') % rev)
2247
2248
2248 @command('debugdate',
2249 @command('debugdate',
2249 [('e', 'extended', None, _('try extended date formats'))],
2250 [('e', 'extended', None, _('try extended date formats'))],
2250 _('[-e] DATE [RANGE]'),
2251 _('[-e] DATE [RANGE]'),
2251 norepo=True, optionalrepo=True)
2252 norepo=True, optionalrepo=True)
2252 def debugdate(ui, date, range=None, **opts):
2253 def debugdate(ui, date, range=None, **opts):
2253 """parse and display a date"""
2254 """parse and display a date"""
2254 if opts["extended"]:
2255 if opts["extended"]:
2255 d = util.parsedate(date, util.extendeddateformats)
2256 d = util.parsedate(date, util.extendeddateformats)
2256 else:
2257 else:
2257 d = util.parsedate(date)
2258 d = util.parsedate(date)
2258 ui.write(("internal: %s %s\n") % d)
2259 ui.write(("internal: %s %s\n") % d)
2259 ui.write(("standard: %s\n") % util.datestr(d))
2260 ui.write(("standard: %s\n") % util.datestr(d))
2260 if range:
2261 if range:
2261 m = util.matchdate(range)
2262 m = util.matchdate(range)
2262 ui.write(("match: %s\n") % m(d[0]))
2263 ui.write(("match: %s\n") % m(d[0]))
2263
2264
2264 @command('debugdiscovery',
2265 @command('debugdiscovery',
2265 [('', 'old', None, _('use old-style discovery')),
2266 [('', 'old', None, _('use old-style discovery')),
2266 ('', 'nonheads', None,
2267 ('', 'nonheads', None,
2267 _('use old-style discovery with non-heads included')),
2268 _('use old-style discovery with non-heads included')),
2268 ] + remoteopts,
2269 ] + remoteopts,
2269 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2270 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2270 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2271 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2271 """runs the changeset discovery protocol in isolation"""
2272 """runs the changeset discovery protocol in isolation"""
2272 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2273 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2273 opts.get('branch'))
2274 opts.get('branch'))
2274 remote = hg.peer(repo, opts, remoteurl)
2275 remote = hg.peer(repo, opts, remoteurl)
2275 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2276 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2276
2277
2277 # make sure tests are repeatable
2278 # make sure tests are repeatable
2278 random.seed(12323)
2279 random.seed(12323)
2279
2280
2280 def doit(localheads, remoteheads, remote=remote):
2281 def doit(localheads, remoteheads, remote=remote):
2281 if opts.get('old'):
2282 if opts.get('old'):
2282 if localheads:
2283 if localheads:
2283 raise error.Abort('cannot use localheads with old style '
2284 raise error.Abort('cannot use localheads with old style '
2284 'discovery')
2285 'discovery')
2285 if not util.safehasattr(remote, 'branches'):
2286 if not util.safehasattr(remote, 'branches'):
2286 # enable in-client legacy support
2287 # enable in-client legacy support
2287 remote = localrepo.locallegacypeer(remote.local())
2288 remote = localrepo.locallegacypeer(remote.local())
2288 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2289 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2289 force=True)
2290 force=True)
2290 common = set(common)
2291 common = set(common)
2291 if not opts.get('nonheads'):
2292 if not opts.get('nonheads'):
2292 ui.write(("unpruned common: %s\n") %
2293 ui.write(("unpruned common: %s\n") %
2293 " ".join(sorted(short(n) for n in common)))
2294 " ".join(sorted(short(n) for n in common)))
2294 dag = dagutil.revlogdag(repo.changelog)
2295 dag = dagutil.revlogdag(repo.changelog)
2295 all = dag.ancestorset(dag.internalizeall(common))
2296 all = dag.ancestorset(dag.internalizeall(common))
2296 common = dag.externalizeall(dag.headsetofconnecteds(all))
2297 common = dag.externalizeall(dag.headsetofconnecteds(all))
2297 else:
2298 else:
2298 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2299 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2299 common = set(common)
2300 common = set(common)
2300 rheads = set(hds)
2301 rheads = set(hds)
2301 lheads = set(repo.heads())
2302 lheads = set(repo.heads())
2302 ui.write(("common heads: %s\n") %
2303 ui.write(("common heads: %s\n") %
2303 " ".join(sorted(short(n) for n in common)))
2304 " ".join(sorted(short(n) for n in common)))
2304 if lheads <= common:
2305 if lheads <= common:
2305 ui.write(("local is subset\n"))
2306 ui.write(("local is subset\n"))
2306 elif rheads <= common:
2307 elif rheads <= common:
2307 ui.write(("remote is subset\n"))
2308 ui.write(("remote is subset\n"))
2308
2309
2309 serverlogs = opts.get('serverlog')
2310 serverlogs = opts.get('serverlog')
2310 if serverlogs:
2311 if serverlogs:
2311 for filename in serverlogs:
2312 for filename in serverlogs:
2312 logfile = open(filename, 'r')
2313 logfile = open(filename, 'r')
2313 try:
2314 try:
2314 line = logfile.readline()
2315 line = logfile.readline()
2315 while line:
2316 while line:
2316 parts = line.strip().split(';')
2317 parts = line.strip().split(';')
2317 op = parts[1]
2318 op = parts[1]
2318 if op == 'cg':
2319 if op == 'cg':
2319 pass
2320 pass
2320 elif op == 'cgss':
2321 elif op == 'cgss':
2321 doit(parts[2].split(' '), parts[3].split(' '))
2322 doit(parts[2].split(' '), parts[3].split(' '))
2322 elif op == 'unb':
2323 elif op == 'unb':
2323 doit(parts[3].split(' '), parts[2].split(' '))
2324 doit(parts[3].split(' '), parts[2].split(' '))
2324 line = logfile.readline()
2325 line = logfile.readline()
2325 finally:
2326 finally:
2326 logfile.close()
2327 logfile.close()
2327
2328
2328 else:
2329 else:
2329 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2330 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2330 opts.get('remote_head'))
2331 opts.get('remote_head'))
2331 localrevs = opts.get('local_head')
2332 localrevs = opts.get('local_head')
2332 doit(localrevs, remoterevs)
2333 doit(localrevs, remoterevs)
2333
2334
2334 @command('debugextensions', formatteropts, [], norepo=True)
2335 @command('debugextensions', formatteropts, [], norepo=True)
2335 def debugextensions(ui, **opts):
2336 def debugextensions(ui, **opts):
2336 '''show information about active extensions'''
2337 '''show information about active extensions'''
2337 exts = extensions.extensions(ui)
2338 exts = extensions.extensions(ui)
2338 fm = ui.formatter('debugextensions', opts)
2339 fm = ui.formatter('debugextensions', opts)
2339 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
2340 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
2340 extsource = extmod.__file__
2341 extsource = extmod.__file__
2341 exttestedwith = getattr(extmod, 'testedwith', None)
2342 exttestedwith = getattr(extmod, 'testedwith', None)
2342 if exttestedwith is not None:
2343 if exttestedwith is not None:
2343 exttestedwith = exttestedwith.split()
2344 exttestedwith = exttestedwith.split()
2344 extbuglink = getattr(extmod, 'buglink', None)
2345 extbuglink = getattr(extmod, 'buglink', None)
2345
2346
2346 fm.startitem()
2347 fm.startitem()
2347
2348
2348 if ui.quiet or ui.verbose:
2349 if ui.quiet or ui.verbose:
2349 fm.write('name', '%s\n', extname)
2350 fm.write('name', '%s\n', extname)
2350 else:
2351 else:
2351 fm.write('name', '%s', extname)
2352 fm.write('name', '%s', extname)
2352 if not exttestedwith:
2353 if not exttestedwith:
2353 fm.plain(_(' (untested!)\n'))
2354 fm.plain(_(' (untested!)\n'))
2354 else:
2355 else:
2355 if exttestedwith == ['internal'] or \
2356 if exttestedwith == ['internal'] or \
2356 util.version() in exttestedwith:
2357 util.version() in exttestedwith:
2357 fm.plain('\n')
2358 fm.plain('\n')
2358 else:
2359 else:
2359 lasttestedversion = exttestedwith[-1]
2360 lasttestedversion = exttestedwith[-1]
2360 fm.plain(' (%s!)\n' % lasttestedversion)
2361 fm.plain(' (%s!)\n' % lasttestedversion)
2361
2362
2362 fm.condwrite(ui.verbose and extsource, 'source',
2363 fm.condwrite(ui.verbose and extsource, 'source',
2363 _(' location: %s\n'), extsource or "")
2364 _(' location: %s\n'), extsource or "")
2364
2365
2365 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
2366 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
2366 _(' tested with: %s\n'), ' '.join(exttestedwith or []))
2367 _(' tested with: %s\n'), ' '.join(exttestedwith or []))
2367
2368
2368 fm.condwrite(ui.verbose and extbuglink, 'buglink',
2369 fm.condwrite(ui.verbose and extbuglink, 'buglink',
2369 _(' bug reporting: %s\n'), extbuglink or "")
2370 _(' bug reporting: %s\n'), extbuglink or "")
2370
2371
2371 fm.end()
2372 fm.end()
2372
2373
2373 @command('debugfileset',
2374 @command('debugfileset',
2374 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2375 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2375 _('[-r REV] FILESPEC'))
2376 _('[-r REV] FILESPEC'))
2376 def debugfileset(ui, repo, expr, **opts):
2377 def debugfileset(ui, repo, expr, **opts):
2377 '''parse and apply a fileset specification'''
2378 '''parse and apply a fileset specification'''
2378 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2379 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2379 if ui.verbose:
2380 if ui.verbose:
2380 tree = fileset.parse(expr)
2381 tree = fileset.parse(expr)
2381 ui.note(fileset.prettyformat(tree), "\n")
2382 ui.note(fileset.prettyformat(tree), "\n")
2382
2383
2383 for f in ctx.getfileset(expr):
2384 for f in ctx.getfileset(expr):
2384 ui.write("%s\n" % f)
2385 ui.write("%s\n" % f)
2385
2386
2386 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2387 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2387 def debugfsinfo(ui, path="."):
2388 def debugfsinfo(ui, path="."):
2388 """show information detected about current filesystem"""
2389 """show information detected about current filesystem"""
2389 util.writefile('.debugfsinfo', '')
2390 util.writefile('.debugfsinfo', '')
2390 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2391 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2391 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2392 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2392 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2393 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2393 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
2394 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
2394 and 'yes' or 'no'))
2395 and 'yes' or 'no'))
2395 os.unlink('.debugfsinfo')
2396 os.unlink('.debugfsinfo')
2396
2397
2397 @command('debuggetbundle',
2398 @command('debuggetbundle',
2398 [('H', 'head', [], _('id of head node'), _('ID')),
2399 [('H', 'head', [], _('id of head node'), _('ID')),
2399 ('C', 'common', [], _('id of common node'), _('ID')),
2400 ('C', 'common', [], _('id of common node'), _('ID')),
2400 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2401 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2401 _('REPO FILE [-H|-C ID]...'),
2402 _('REPO FILE [-H|-C ID]...'),
2402 norepo=True)
2403 norepo=True)
2403 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2404 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2404 """retrieves a bundle from a repo
2405 """retrieves a bundle from a repo
2405
2406
2406 Every ID must be a full-length hex node id string. Saves the bundle to the
2407 Every ID must be a full-length hex node id string. Saves the bundle to the
2407 given file.
2408 given file.
2408 """
2409 """
2409 repo = hg.peer(ui, opts, repopath)
2410 repo = hg.peer(ui, opts, repopath)
2410 if not repo.capable('getbundle'):
2411 if not repo.capable('getbundle'):
2411 raise error.Abort("getbundle() not supported by target repository")
2412 raise error.Abort("getbundle() not supported by target repository")
2412 args = {}
2413 args = {}
2413 if common:
2414 if common:
2414 args['common'] = [bin(s) for s in common]
2415 args['common'] = [bin(s) for s in common]
2415 if head:
2416 if head:
2416 args['heads'] = [bin(s) for s in head]
2417 args['heads'] = [bin(s) for s in head]
2417 # TODO: get desired bundlecaps from command line.
2418 # TODO: get desired bundlecaps from command line.
2418 args['bundlecaps'] = None
2419 args['bundlecaps'] = None
2419 bundle = repo.getbundle('debug', **args)
2420 bundle = repo.getbundle('debug', **args)
2420
2421
2421 bundletype = opts.get('type', 'bzip2').lower()
2422 bundletype = opts.get('type', 'bzip2').lower()
2422 btypes = {'none': 'HG10UN',
2423 btypes = {'none': 'HG10UN',
2423 'bzip2': 'HG10BZ',
2424 'bzip2': 'HG10BZ',
2424 'gzip': 'HG10GZ',
2425 'gzip': 'HG10GZ',
2425 'bundle2': 'HG20'}
2426 'bundle2': 'HG20'}
2426 bundletype = btypes.get(bundletype)
2427 bundletype = btypes.get(bundletype)
2427 if bundletype not in changegroup.bundletypes:
2428 if bundletype not in changegroup.bundletypes:
2428 raise error.Abort(_('unknown bundle type specified with --type'))
2429 raise error.Abort(_('unknown bundle type specified with --type'))
2429 changegroup.writebundle(ui, bundle, bundlepath, bundletype)
2430 changegroup.writebundle(ui, bundle, bundlepath, bundletype)
2430
2431
2431 @command('debugignore', [], '')
2432 @command('debugignore', [], '')
2432 def debugignore(ui, repo, *values, **opts):
2433 def debugignore(ui, repo, *values, **opts):
2433 """display the combined ignore pattern"""
2434 """display the combined ignore pattern"""
2434 ignore = repo.dirstate._ignore
2435 ignore = repo.dirstate._ignore
2435 includepat = getattr(ignore, 'includepat', None)
2436 includepat = getattr(ignore, 'includepat', None)
2436 if includepat is not None:
2437 if includepat is not None:
2437 ui.write("%s\n" % includepat)
2438 ui.write("%s\n" % includepat)
2438 else:
2439 else:
2439 raise error.Abort(_("no ignore patterns found"))
2440 raise error.Abort(_("no ignore patterns found"))
2440
2441
2441 @command('debugindex', debugrevlogopts +
2442 @command('debugindex', debugrevlogopts +
2442 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2443 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2443 _('[-f FORMAT] -c|-m|FILE'),
2444 _('[-f FORMAT] -c|-m|FILE'),
2444 optionalrepo=True)
2445 optionalrepo=True)
2445 def debugindex(ui, repo, file_=None, **opts):
2446 def debugindex(ui, repo, file_=None, **opts):
2446 """dump the contents of an index file"""
2447 """dump the contents of an index file"""
2447 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2448 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2448 format = opts.get('format', 0)
2449 format = opts.get('format', 0)
2449 if format not in (0, 1):
2450 if format not in (0, 1):
2450 raise error.Abort(_("unknown format %d") % format)
2451 raise error.Abort(_("unknown format %d") % format)
2451
2452
2452 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2453 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2453 if generaldelta:
2454 if generaldelta:
2454 basehdr = ' delta'
2455 basehdr = ' delta'
2455 else:
2456 else:
2456 basehdr = ' base'
2457 basehdr = ' base'
2457
2458
2458 if ui.debugflag:
2459 if ui.debugflag:
2459 shortfn = hex
2460 shortfn = hex
2460 else:
2461 else:
2461 shortfn = short
2462 shortfn = short
2462
2463
2463 # There might not be anything in r, so have a sane default
2464 # There might not be anything in r, so have a sane default
2464 idlen = 12
2465 idlen = 12
2465 for i in r:
2466 for i in r:
2466 idlen = len(shortfn(r.node(i)))
2467 idlen = len(shortfn(r.node(i)))
2467 break
2468 break
2468
2469
2469 if format == 0:
2470 if format == 0:
2470 ui.write(" rev offset length " + basehdr + " linkrev"
2471 ui.write(" rev offset length " + basehdr + " linkrev"
2471 " %s %s p2\n" % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2472 " %s %s p2\n" % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2472 elif format == 1:
2473 elif format == 1:
2473 ui.write(" rev flag offset length"
2474 ui.write(" rev flag offset length"
2474 " size " + basehdr + " link p1 p2"
2475 " size " + basehdr + " link p1 p2"
2475 " %s\n" % "nodeid".rjust(idlen))
2476 " %s\n" % "nodeid".rjust(idlen))
2476
2477
2477 for i in r:
2478 for i in r:
2478 node = r.node(i)
2479 node = r.node(i)
2479 if generaldelta:
2480 if generaldelta:
2480 base = r.deltaparent(i)
2481 base = r.deltaparent(i)
2481 else:
2482 else:
2482 base = r.chainbase(i)
2483 base = r.chainbase(i)
2483 if format == 0:
2484 if format == 0:
2484 try:
2485 try:
2485 pp = r.parents(node)
2486 pp = r.parents(node)
2486 except Exception:
2487 except Exception:
2487 pp = [nullid, nullid]
2488 pp = [nullid, nullid]
2488 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2489 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2489 i, r.start(i), r.length(i), base, r.linkrev(i),
2490 i, r.start(i), r.length(i), base, r.linkrev(i),
2490 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2491 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2491 elif format == 1:
2492 elif format == 1:
2492 pr = r.parentrevs(i)
2493 pr = r.parentrevs(i)
2493 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2494 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2494 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2495 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2495 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2496 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2496
2497
2497 @command('debugindexdot', debugrevlogopts,
2498 @command('debugindexdot', debugrevlogopts,
2498 _('-c|-m|FILE'), optionalrepo=True)
2499 _('-c|-m|FILE'), optionalrepo=True)
2499 def debugindexdot(ui, repo, file_=None, **opts):
2500 def debugindexdot(ui, repo, file_=None, **opts):
2500 """dump an index DAG as a graphviz dot file"""
2501 """dump an index DAG as a graphviz dot file"""
2501 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
2502 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
2502 ui.write(("digraph G {\n"))
2503 ui.write(("digraph G {\n"))
2503 for i in r:
2504 for i in r:
2504 node = r.node(i)
2505 node = r.node(i)
2505 pp = r.parents(node)
2506 pp = r.parents(node)
2506 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2507 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2507 if pp[1] != nullid:
2508 if pp[1] != nullid:
2508 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2509 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2509 ui.write("}\n")
2510 ui.write("}\n")
2510
2511
2511 @command('debugdeltachain',
2512 @command('debugdeltachain',
2512 debugrevlogopts + formatteropts,
2513 debugrevlogopts + formatteropts,
2513 _('-c|-m|FILE'),
2514 _('-c|-m|FILE'),
2514 optionalrepo=True)
2515 optionalrepo=True)
2515 def debugdeltachain(ui, repo, file_=None, **opts):
2516 def debugdeltachain(ui, repo, file_=None, **opts):
2516 """dump information about delta chains in a revlog
2517 """dump information about delta chains in a revlog
2517
2518
2518 Output can be templatized. Available template keywords are:
2519 Output can be templatized. Available template keywords are:
2519
2520
2520 rev revision number
2521 rev revision number
2521 chainid delta chain identifier (numbered by unique base)
2522 chainid delta chain identifier (numbered by unique base)
2522 chainlen delta chain length to this revision
2523 chainlen delta chain length to this revision
2523 prevrev previous revision in delta chain
2524 prevrev previous revision in delta chain
2524 deltatype role of delta / how it was computed
2525 deltatype role of delta / how it was computed
2525 compsize compressed size of revision
2526 compsize compressed size of revision
2526 uncompsize uncompressed size of revision
2527 uncompsize uncompressed size of revision
2527 chainsize total size of compressed revisions in chain
2528 chainsize total size of compressed revisions in chain
2528 chainratio total chain size divided by uncompressed revision size
2529 chainratio total chain size divided by uncompressed revision size
2529 (new delta chains typically start at ratio 2.00)
2530 (new delta chains typically start at ratio 2.00)
2530 lindist linear distance from base revision in delta chain to end
2531 lindist linear distance from base revision in delta chain to end
2531 of this revision
2532 of this revision
2532 extradist total size of revisions not part of this delta chain from
2533 extradist total size of revisions not part of this delta chain from
2533 base of delta chain to end of this revision; a measurement
2534 base of delta chain to end of this revision; a measurement
2534 of how much extra data we need to read/seek across to read
2535 of how much extra data we need to read/seek across to read
2535 the delta chain for this revision
2536 the delta chain for this revision
2536 extraratio extradist divided by chainsize; another representation of
2537 extraratio extradist divided by chainsize; another representation of
2537 how much unrelated data is needed to load this delta chain
2538 how much unrelated data is needed to load this delta chain
2538 """
2539 """
2539 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
2540 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
2540 index = r.index
2541 index = r.index
2541 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2542 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2542
2543
2543 def revinfo(rev):
2544 def revinfo(rev):
2544 iterrev = rev
2545 iterrev = rev
2545 e = index[iterrev]
2546 e = index[iterrev]
2546 chain = []
2547 chain = []
2547 compsize = e[1]
2548 compsize = e[1]
2548 uncompsize = e[2]
2549 uncompsize = e[2]
2549 chainsize = 0
2550 chainsize = 0
2550
2551
2551 if generaldelta:
2552 if generaldelta:
2552 if e[3] == e[5]:
2553 if e[3] == e[5]:
2553 deltatype = 'p1'
2554 deltatype = 'p1'
2554 elif e[3] == e[6]:
2555 elif e[3] == e[6]:
2555 deltatype = 'p2'
2556 deltatype = 'p2'
2556 elif e[3] == rev - 1:
2557 elif e[3] == rev - 1:
2557 deltatype = 'prev'
2558 deltatype = 'prev'
2558 elif e[3] == rev:
2559 elif e[3] == rev:
2559 deltatype = 'base'
2560 deltatype = 'base'
2560 else:
2561 else:
2561 deltatype = 'other'
2562 deltatype = 'other'
2562 else:
2563 else:
2563 if e[3] == rev:
2564 if e[3] == rev:
2564 deltatype = 'base'
2565 deltatype = 'base'
2565 else:
2566 else:
2566 deltatype = 'prev'
2567 deltatype = 'prev'
2567
2568
2568 while iterrev != e[3]:
2569 while iterrev != e[3]:
2569 chain.append(iterrev)
2570 chain.append(iterrev)
2570 chainsize += e[1]
2571 chainsize += e[1]
2571 if generaldelta:
2572 if generaldelta:
2572 iterrev = e[3]
2573 iterrev = e[3]
2573 else:
2574 else:
2574 iterrev -= 1
2575 iterrev -= 1
2575 e = index[iterrev]
2576 e = index[iterrev]
2576 else:
2577 else:
2577 chainsize += e[1]
2578 chainsize += e[1]
2578 chain.append(iterrev)
2579 chain.append(iterrev)
2579
2580
2580 chain.reverse()
2581 chain.reverse()
2581 return compsize, uncompsize, deltatype, chain, chainsize
2582 return compsize, uncompsize, deltatype, chain, chainsize
2582
2583
2583 fm = ui.formatter('debugdeltachain', opts)
2584 fm = ui.formatter('debugdeltachain', opts)
2584
2585
2585 fm.plain(' rev chain# chainlen prev delta '
2586 fm.plain(' rev chain# chainlen prev delta '
2586 'size rawsize chainsize ratio lindist extradist '
2587 'size rawsize chainsize ratio lindist extradist '
2587 'extraratio\n')
2588 'extraratio\n')
2588
2589
2589 chainbases = {}
2590 chainbases = {}
2590 for rev in r:
2591 for rev in r:
2591 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
2592 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
2592 chainbase = chain[0]
2593 chainbase = chain[0]
2593 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
2594 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
2594 basestart = r.start(chainbase)
2595 basestart = r.start(chainbase)
2595 revstart = r.start(rev)
2596 revstart = r.start(rev)
2596 lineardist = revstart + comp - basestart
2597 lineardist = revstart + comp - basestart
2597 extradist = lineardist - chainsize
2598 extradist = lineardist - chainsize
2598 try:
2599 try:
2599 prevrev = chain[-2]
2600 prevrev = chain[-2]
2600 except IndexError:
2601 except IndexError:
2601 prevrev = -1
2602 prevrev = -1
2602
2603
2603 chainratio = float(chainsize) / float(uncomp)
2604 chainratio = float(chainsize) / float(uncomp)
2604 extraratio = float(extradist) / float(chainsize)
2605 extraratio = float(extradist) / float(chainsize)
2605
2606
2606 fm.startitem()
2607 fm.startitem()
2607 fm.write('rev chainid chainlen prevrev deltatype compsize '
2608 fm.write('rev chainid chainlen prevrev deltatype compsize '
2608 'uncompsize chainsize chainratio lindist extradist '
2609 'uncompsize chainsize chainratio lindist extradist '
2609 'extraratio',
2610 'extraratio',
2610 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f\n',
2611 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f\n',
2611 rev, chainid, len(chain), prevrev, deltatype, comp,
2612 rev, chainid, len(chain), prevrev, deltatype, comp,
2612 uncomp, chainsize, chainratio, lineardist, extradist,
2613 uncomp, chainsize, chainratio, lineardist, extradist,
2613 extraratio,
2614 extraratio,
2614 rev=rev, chainid=chainid, chainlen=len(chain),
2615 rev=rev, chainid=chainid, chainlen=len(chain),
2615 prevrev=prevrev, deltatype=deltatype, compsize=comp,
2616 prevrev=prevrev, deltatype=deltatype, compsize=comp,
2616 uncompsize=uncomp, chainsize=chainsize,
2617 uncompsize=uncomp, chainsize=chainsize,
2617 chainratio=chainratio, lindist=lineardist,
2618 chainratio=chainratio, lindist=lineardist,
2618 extradist=extradist, extraratio=extraratio)
2619 extradist=extradist, extraratio=extraratio)
2619
2620
2620 fm.end()
2621 fm.end()
2621
2622
2622 @command('debuginstall', [], '', norepo=True)
2623 @command('debuginstall', [], '', norepo=True)
2623 def debuginstall(ui):
2624 def debuginstall(ui):
2624 '''test Mercurial installation
2625 '''test Mercurial installation
2625
2626
2626 Returns 0 on success.
2627 Returns 0 on success.
2627 '''
2628 '''
2628
2629
2629 def writetemp(contents):
2630 def writetemp(contents):
2630 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2631 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2631 f = os.fdopen(fd, "wb")
2632 f = os.fdopen(fd, "wb")
2632 f.write(contents)
2633 f.write(contents)
2633 f.close()
2634 f.close()
2634 return name
2635 return name
2635
2636
2636 problems = 0
2637 problems = 0
2637
2638
2638 # encoding
2639 # encoding
2639 ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
2640 ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
2640 try:
2641 try:
2641 encoding.fromlocal("test")
2642 encoding.fromlocal("test")
2642 except error.Abort as inst:
2643 except error.Abort as inst:
2643 ui.write(" %s\n" % inst)
2644 ui.write(" %s\n" % inst)
2644 ui.write(_(" (check that your locale is properly set)\n"))
2645 ui.write(_(" (check that your locale is properly set)\n"))
2645 problems += 1
2646 problems += 1
2646
2647
2647 # Python
2648 # Python
2648 ui.status(_("checking Python executable (%s)\n") % sys.executable)
2649 ui.status(_("checking Python executable (%s)\n") % sys.executable)
2649 ui.status(_("checking Python version (%s)\n")
2650 ui.status(_("checking Python version (%s)\n")
2650 % ("%s.%s.%s" % sys.version_info[:3]))
2651 % ("%s.%s.%s" % sys.version_info[:3]))
2651 ui.status(_("checking Python lib (%s)...\n")
2652 ui.status(_("checking Python lib (%s)...\n")
2652 % os.path.dirname(os.__file__))
2653 % os.path.dirname(os.__file__))
2653
2654
2654 # compiled modules
2655 # compiled modules
2655 ui.status(_("checking installed modules (%s)...\n")
2656 ui.status(_("checking installed modules (%s)...\n")
2656 % os.path.dirname(__file__))
2657 % os.path.dirname(__file__))
2657 try:
2658 try:
2658 import bdiff, mpatch, base85, osutil
2659 import bdiff, mpatch, base85, osutil
2659 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2660 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2660 except Exception as inst:
2661 except Exception as inst:
2661 ui.write(" %s\n" % inst)
2662 ui.write(" %s\n" % inst)
2662 ui.write(_(" One or more extensions could not be found"))
2663 ui.write(_(" One or more extensions could not be found"))
2663 ui.write(_(" (check that you compiled the extensions)\n"))
2664 ui.write(_(" (check that you compiled the extensions)\n"))
2664 problems += 1
2665 problems += 1
2665
2666
2666 # templates
2667 # templates
2667 import templater
2668 import templater
2668 p = templater.templatepaths()
2669 p = templater.templatepaths()
2669 ui.status(_("checking templates (%s)...\n") % ' '.join(p))
2670 ui.status(_("checking templates (%s)...\n") % ' '.join(p))
2670 if p:
2671 if p:
2671 m = templater.templatepath("map-cmdline.default")
2672 m = templater.templatepath("map-cmdline.default")
2672 if m:
2673 if m:
2673 # template found, check if it is working
2674 # template found, check if it is working
2674 try:
2675 try:
2675 templater.templater(m)
2676 templater.templater(m)
2676 except Exception as inst:
2677 except Exception as inst:
2677 ui.write(" %s\n" % inst)
2678 ui.write(" %s\n" % inst)
2678 p = None
2679 p = None
2679 else:
2680 else:
2680 ui.write(_(" template 'default' not found\n"))
2681 ui.write(_(" template 'default' not found\n"))
2681 p = None
2682 p = None
2682 else:
2683 else:
2683 ui.write(_(" no template directories found\n"))
2684 ui.write(_(" no template directories found\n"))
2684 if not p:
2685 if not p:
2685 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
2686 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
2686 problems += 1
2687 problems += 1
2687
2688
2688 # editor
2689 # editor
2689 ui.status(_("checking commit editor...\n"))
2690 ui.status(_("checking commit editor...\n"))
2690 editor = ui.geteditor()
2691 editor = ui.geteditor()
2691 editor = util.expandpath(editor)
2692 editor = util.expandpath(editor)
2692 cmdpath = util.findexe(shlex.split(editor)[0])
2693 cmdpath = util.findexe(shlex.split(editor)[0])
2693 if not cmdpath:
2694 if not cmdpath:
2694 if editor == 'vi':
2695 if editor == 'vi':
2695 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2696 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2696 ui.write(_(" (specify a commit editor in your configuration"
2697 ui.write(_(" (specify a commit editor in your configuration"
2697 " file)\n"))
2698 " file)\n"))
2698 else:
2699 else:
2699 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2700 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2700 ui.write(_(" (specify a commit editor in your configuration"
2701 ui.write(_(" (specify a commit editor in your configuration"
2701 " file)\n"))
2702 " file)\n"))
2702 problems += 1
2703 problems += 1
2703
2704
2704 # check username
2705 # check username
2705 ui.status(_("checking username...\n"))
2706 ui.status(_("checking username...\n"))
2706 try:
2707 try:
2707 ui.username()
2708 ui.username()
2708 except error.Abort as e:
2709 except error.Abort as e:
2709 ui.write(" %s\n" % e)
2710 ui.write(" %s\n" % e)
2710 ui.write(_(" (specify a username in your configuration file)\n"))
2711 ui.write(_(" (specify a username in your configuration file)\n"))
2711 problems += 1
2712 problems += 1
2712
2713
2713 if not problems:
2714 if not problems:
2714 ui.status(_("no problems detected\n"))
2715 ui.status(_("no problems detected\n"))
2715 else:
2716 else:
2716 ui.write(_("%s problems detected,"
2717 ui.write(_("%s problems detected,"
2717 " please check your install!\n") % problems)
2718 " please check your install!\n") % problems)
2718
2719
2719 return problems
2720 return problems
2720
2721
2721 @command('debugknown', [], _('REPO ID...'), norepo=True)
2722 @command('debugknown', [], _('REPO ID...'), norepo=True)
2722 def debugknown(ui, repopath, *ids, **opts):
2723 def debugknown(ui, repopath, *ids, **opts):
2723 """test whether node ids are known to a repo
2724 """test whether node ids are known to a repo
2724
2725
2725 Every ID must be a full-length hex node id string. Returns a list of 0s
2726 Every ID must be a full-length hex node id string. Returns a list of 0s
2726 and 1s indicating unknown/known.
2727 and 1s indicating unknown/known.
2727 """
2728 """
2728 repo = hg.peer(ui, opts, repopath)
2729 repo = hg.peer(ui, opts, repopath)
2729 if not repo.capable('known'):
2730 if not repo.capable('known'):
2730 raise error.Abort("known() not supported by target repository")
2731 raise error.Abort("known() not supported by target repository")
2731 flags = repo.known([bin(s) for s in ids])
2732 flags = repo.known([bin(s) for s in ids])
2732 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2733 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2733
2734
2734 @command('debuglabelcomplete', [], _('LABEL...'))
2735 @command('debuglabelcomplete', [], _('LABEL...'))
2735 def debuglabelcomplete(ui, repo, *args):
2736 def debuglabelcomplete(ui, repo, *args):
2736 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2737 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2737 debugnamecomplete(ui, repo, *args)
2738 debugnamecomplete(ui, repo, *args)
2738
2739
2739 @command('debugmergestate', [], '')
2740 @command('debugmergestate', [], '')
2740 def debugmergestate(ui, repo, *args):
2741 def debugmergestate(ui, repo, *args):
2741 """print merge state
2742 """print merge state
2742
2743
2743 Use --verbose to print out information about whether v1 or v2 merge state
2744 Use --verbose to print out information about whether v1 or v2 merge state
2744 was chosen."""
2745 was chosen."""
2745 def _hashornull(h):
2746 def _hashornull(h):
2746 if h == nullhex:
2747 if h == nullhex:
2747 return 'null'
2748 return 'null'
2748 else:
2749 else:
2749 return h
2750 return h
2750
2751
2751 def printrecords(version):
2752 def printrecords(version):
2752 ui.write(('* version %s records\n') % version)
2753 ui.write(('* version %s records\n') % version)
2753 if version == 1:
2754 if version == 1:
2754 records = v1records
2755 records = v1records
2755 else:
2756 else:
2756 records = v2records
2757 records = v2records
2757
2758
2758 for rtype, record in records:
2759 for rtype, record in records:
2759 # pretty print some record types
2760 # pretty print some record types
2760 if rtype == 'L':
2761 if rtype == 'L':
2761 ui.write(('local: %s\n') % record)
2762 ui.write(('local: %s\n') % record)
2762 elif rtype == 'O':
2763 elif rtype == 'O':
2763 ui.write(('other: %s\n') % record)
2764 ui.write(('other: %s\n') % record)
2764 elif rtype == 'm':
2765 elif rtype == 'm':
2765 driver, mdstate = record.split('\0', 1)
2766 driver, mdstate = record.split('\0', 1)
2766 ui.write(('merge driver: %s (state "%s")\n')
2767 ui.write(('merge driver: %s (state "%s")\n')
2767 % (driver, mdstate))
2768 % (driver, mdstate))
2768 elif rtype in 'FDC':
2769 elif rtype in 'FDC':
2769 r = record.split('\0')
2770 r = record.split('\0')
2770 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2771 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2771 if version == 1:
2772 if version == 1:
2772 onode = 'not stored in v1 format'
2773 onode = 'not stored in v1 format'
2773 flags = r[7]
2774 flags = r[7]
2774 else:
2775 else:
2775 onode, flags = r[7:9]
2776 onode, flags = r[7:9]
2776 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2777 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2777 % (f, rtype, state, _hashornull(hash)))
2778 % (f, rtype, state, _hashornull(hash)))
2778 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2779 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2779 ui.write((' ancestor path: %s (node %s)\n')
2780 ui.write((' ancestor path: %s (node %s)\n')
2780 % (afile, _hashornull(anode)))
2781 % (afile, _hashornull(anode)))
2781 ui.write((' other path: %s (node %s)\n')
2782 ui.write((' other path: %s (node %s)\n')
2782 % (ofile, _hashornull(onode)))
2783 % (ofile, _hashornull(onode)))
2783 else:
2784 else:
2784 ui.write(('unrecognized entry: %s\t%s\n')
2785 ui.write(('unrecognized entry: %s\t%s\n')
2785 % (rtype, record.replace('\0', '\t')))
2786 % (rtype, record.replace('\0', '\t')))
2786
2787
2787 # Avoid mergestate.read() since it may raise an exception for unsupported
2788 # Avoid mergestate.read() since it may raise an exception for unsupported
2788 # merge state records. We shouldn't be doing this, but this is OK since this
2789 # merge state records. We shouldn't be doing this, but this is OK since this
2789 # command is pretty low-level.
2790 # command is pretty low-level.
2790 ms = mergemod.mergestate(repo)
2791 ms = mergemod.mergestate(repo)
2791
2792
2792 # sort so that reasonable information is on top
2793 # sort so that reasonable information is on top
2793 v1records = ms._readrecordsv1()
2794 v1records = ms._readrecordsv1()
2794 v2records = ms._readrecordsv2()
2795 v2records = ms._readrecordsv2()
2795 order = 'LOm'
2796 order = 'LOm'
2796 def key(r):
2797 def key(r):
2797 idx = order.find(r[0])
2798 idx = order.find(r[0])
2798 if idx == -1:
2799 if idx == -1:
2799 return (1, r[1])
2800 return (1, r[1])
2800 else:
2801 else:
2801 return (0, idx)
2802 return (0, idx)
2802 v1records.sort(key=key)
2803 v1records.sort(key=key)
2803 v2records.sort(key=key)
2804 v2records.sort(key=key)
2804
2805
2805 if not v1records and not v2records:
2806 if not v1records and not v2records:
2806 ui.write(('no merge state found\n'))
2807 ui.write(('no merge state found\n'))
2807 elif not v2records:
2808 elif not v2records:
2808 ui.note(('no version 2 merge state\n'))
2809 ui.note(('no version 2 merge state\n'))
2809 printrecords(1)
2810 printrecords(1)
2810 elif ms._v1v2match(v1records, v2records):
2811 elif ms._v1v2match(v1records, v2records):
2811 ui.note(('v1 and v2 states match: using v2\n'))
2812 ui.note(('v1 and v2 states match: using v2\n'))
2812 printrecords(2)
2813 printrecords(2)
2813 else:
2814 else:
2814 ui.note(('v1 and v2 states mismatch: using v1\n'))
2815 ui.note(('v1 and v2 states mismatch: using v1\n'))
2815 printrecords(1)
2816 printrecords(1)
2816 if ui.verbose:
2817 if ui.verbose:
2817 printrecords(2)
2818 printrecords(2)
2818
2819
2819 @command('debugnamecomplete', [], _('NAME...'))
2820 @command('debugnamecomplete', [], _('NAME...'))
2820 def debugnamecomplete(ui, repo, *args):
2821 def debugnamecomplete(ui, repo, *args):
2821 '''complete "names" - tags, open branch names, bookmark names'''
2822 '''complete "names" - tags, open branch names, bookmark names'''
2822
2823
2823 names = set()
2824 names = set()
2824 # since we previously only listed open branches, we will handle that
2825 # since we previously only listed open branches, we will handle that
2825 # specially (after this for loop)
2826 # specially (after this for loop)
2826 for name, ns in repo.names.iteritems():
2827 for name, ns in repo.names.iteritems():
2827 if name != 'branches':
2828 if name != 'branches':
2828 names.update(ns.listnames(repo))
2829 names.update(ns.listnames(repo))
2829 names.update(tag for (tag, heads, tip, closed)
2830 names.update(tag for (tag, heads, tip, closed)
2830 in repo.branchmap().iterbranches() if not closed)
2831 in repo.branchmap().iterbranches() if not closed)
2831 completions = set()
2832 completions = set()
2832 if not args:
2833 if not args:
2833 args = ['']
2834 args = ['']
2834 for a in args:
2835 for a in args:
2835 completions.update(n for n in names if n.startswith(a))
2836 completions.update(n for n in names if n.startswith(a))
2836 ui.write('\n'.join(sorted(completions)))
2837 ui.write('\n'.join(sorted(completions)))
2837 ui.write('\n')
2838 ui.write('\n')
2838
2839
2839 @command('debuglocks',
2840 @command('debuglocks',
2840 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2841 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2841 ('W', 'force-wlock', None,
2842 ('W', 'force-wlock', None,
2842 _('free the working state lock (DANGEROUS)'))],
2843 _('free the working state lock (DANGEROUS)'))],
2843 _('[OPTION]...'))
2844 _('[OPTION]...'))
2844 def debuglocks(ui, repo, **opts):
2845 def debuglocks(ui, repo, **opts):
2845 """show or modify state of locks
2846 """show or modify state of locks
2846
2847
2847 By default, this command will show which locks are held. This
2848 By default, this command will show which locks are held. This
2848 includes the user and process holding the lock, the amount of time
2849 includes the user and process holding the lock, the amount of time
2849 the lock has been held, and the machine name where the process is
2850 the lock has been held, and the machine name where the process is
2850 running if it's not local.
2851 running if it's not local.
2851
2852
2852 Locks protect the integrity of Mercurial's data, so should be
2853 Locks protect the integrity of Mercurial's data, so should be
2853 treated with care. System crashes or other interruptions may cause
2854 treated with care. System crashes or other interruptions may cause
2854 locks to not be properly released, though Mercurial will usually
2855 locks to not be properly released, though Mercurial will usually
2855 detect and remove such stale locks automatically.
2856 detect and remove such stale locks automatically.
2856
2857
2857 However, detecting stale locks may not always be possible (for
2858 However, detecting stale locks may not always be possible (for
2858 instance, on a shared filesystem). Removing locks may also be
2859 instance, on a shared filesystem). Removing locks may also be
2859 blocked by filesystem permissions.
2860 blocked by filesystem permissions.
2860
2861
2861 Returns 0 if no locks are held.
2862 Returns 0 if no locks are held.
2862
2863
2863 """
2864 """
2864
2865
2865 if opts.get('force_lock'):
2866 if opts.get('force_lock'):
2866 repo.svfs.unlink('lock')
2867 repo.svfs.unlink('lock')
2867 if opts.get('force_wlock'):
2868 if opts.get('force_wlock'):
2868 repo.vfs.unlink('wlock')
2869 repo.vfs.unlink('wlock')
2869 if opts.get('force_lock') or opts.get('force_lock'):
2870 if opts.get('force_lock') or opts.get('force_lock'):
2870 return 0
2871 return 0
2871
2872
2872 now = time.time()
2873 now = time.time()
2873 held = 0
2874 held = 0
2874
2875
2875 def report(vfs, name, method):
2876 def report(vfs, name, method):
2876 # this causes stale locks to get reaped for more accurate reporting
2877 # this causes stale locks to get reaped for more accurate reporting
2877 try:
2878 try:
2878 l = method(False)
2879 l = method(False)
2879 except error.LockHeld:
2880 except error.LockHeld:
2880 l = None
2881 l = None
2881
2882
2882 if l:
2883 if l:
2883 l.release()
2884 l.release()
2884 else:
2885 else:
2885 try:
2886 try:
2886 stat = vfs.lstat(name)
2887 stat = vfs.lstat(name)
2887 age = now - stat.st_mtime
2888 age = now - stat.st_mtime
2888 user = util.username(stat.st_uid)
2889 user = util.username(stat.st_uid)
2889 locker = vfs.readlock(name)
2890 locker = vfs.readlock(name)
2890 if ":" in locker:
2891 if ":" in locker:
2891 host, pid = locker.split(':')
2892 host, pid = locker.split(':')
2892 if host == socket.gethostname():
2893 if host == socket.gethostname():
2893 locker = 'user %s, process %s' % (user, pid)
2894 locker = 'user %s, process %s' % (user, pid)
2894 else:
2895 else:
2895 locker = 'user %s, process %s, host %s' \
2896 locker = 'user %s, process %s, host %s' \
2896 % (user, pid, host)
2897 % (user, pid, host)
2897 ui.write("%-6s %s (%ds)\n" % (name + ":", locker, age))
2898 ui.write("%-6s %s (%ds)\n" % (name + ":", locker, age))
2898 return 1
2899 return 1
2899 except OSError as e:
2900 except OSError as e:
2900 if e.errno != errno.ENOENT:
2901 if e.errno != errno.ENOENT:
2901 raise
2902 raise
2902
2903
2903 ui.write("%-6s free\n" % (name + ":"))
2904 ui.write("%-6s free\n" % (name + ":"))
2904 return 0
2905 return 0
2905
2906
2906 held += report(repo.svfs, "lock", repo.lock)
2907 held += report(repo.svfs, "lock", repo.lock)
2907 held += report(repo.vfs, "wlock", repo.wlock)
2908 held += report(repo.vfs, "wlock", repo.wlock)
2908
2909
2909 return held
2910 return held
2910
2911
2911 @command('debugobsolete',
2912 @command('debugobsolete',
2912 [('', 'flags', 0, _('markers flag')),
2913 [('', 'flags', 0, _('markers flag')),
2913 ('', 'record-parents', False,
2914 ('', 'record-parents', False,
2914 _('record parent information for the precursor')),
2915 _('record parent information for the precursor')),
2915 ('r', 'rev', [], _('display markers relevant to REV')),
2916 ('r', 'rev', [], _('display markers relevant to REV')),
2916 ] + commitopts2,
2917 ] + commitopts2,
2917 _('[OBSOLETED [REPLACEMENT ...]]'))
2918 _('[OBSOLETED [REPLACEMENT ...]]'))
2918 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2919 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2919 """create arbitrary obsolete marker
2920 """create arbitrary obsolete marker
2920
2921
2921 With no arguments, displays the list of obsolescence markers."""
2922 With no arguments, displays the list of obsolescence markers."""
2922
2923
2923 def parsenodeid(s):
2924 def parsenodeid(s):
2924 try:
2925 try:
2925 # We do not use revsingle/revrange functions here to accept
2926 # We do not use revsingle/revrange functions here to accept
2926 # arbitrary node identifiers, possibly not present in the
2927 # arbitrary node identifiers, possibly not present in the
2927 # local repository.
2928 # local repository.
2928 n = bin(s)
2929 n = bin(s)
2929 if len(n) != len(nullid):
2930 if len(n) != len(nullid):
2930 raise TypeError()
2931 raise TypeError()
2931 return n
2932 return n
2932 except TypeError:
2933 except TypeError:
2933 raise error.Abort('changeset references must be full hexadecimal '
2934 raise error.Abort('changeset references must be full hexadecimal '
2934 'node identifiers')
2935 'node identifiers')
2935
2936
2936 if precursor is not None:
2937 if precursor is not None:
2937 if opts['rev']:
2938 if opts['rev']:
2938 raise error.Abort('cannot select revision when creating marker')
2939 raise error.Abort('cannot select revision when creating marker')
2939 metadata = {}
2940 metadata = {}
2940 metadata['user'] = opts['user'] or ui.username()
2941 metadata['user'] = opts['user'] or ui.username()
2941 succs = tuple(parsenodeid(succ) for succ in successors)
2942 succs = tuple(parsenodeid(succ) for succ in successors)
2942 l = repo.lock()
2943 l = repo.lock()
2943 try:
2944 try:
2944 tr = repo.transaction('debugobsolete')
2945 tr = repo.transaction('debugobsolete')
2945 try:
2946 try:
2946 date = opts.get('date')
2947 date = opts.get('date')
2947 if date:
2948 if date:
2948 date = util.parsedate(date)
2949 date = util.parsedate(date)
2949 else:
2950 else:
2950 date = None
2951 date = None
2951 prec = parsenodeid(precursor)
2952 prec = parsenodeid(precursor)
2952 parents = None
2953 parents = None
2953 if opts['record_parents']:
2954 if opts['record_parents']:
2954 if prec not in repo.unfiltered():
2955 if prec not in repo.unfiltered():
2955 raise error.Abort('cannot used --record-parents on '
2956 raise error.Abort('cannot used --record-parents on '
2956 'unknown changesets')
2957 'unknown changesets')
2957 parents = repo.unfiltered()[prec].parents()
2958 parents = repo.unfiltered()[prec].parents()
2958 parents = tuple(p.node() for p in parents)
2959 parents = tuple(p.node() for p in parents)
2959 repo.obsstore.create(tr, prec, succs, opts['flags'],
2960 repo.obsstore.create(tr, prec, succs, opts['flags'],
2960 parents=parents, date=date,
2961 parents=parents, date=date,
2961 metadata=metadata)
2962 metadata=metadata)
2962 tr.close()
2963 tr.close()
2963 except ValueError as exc:
2964 except ValueError as exc:
2964 raise error.Abort(_('bad obsmarker input: %s') % exc)
2965 raise error.Abort(_('bad obsmarker input: %s') % exc)
2965 finally:
2966 finally:
2966 tr.release()
2967 tr.release()
2967 finally:
2968 finally:
2968 l.release()
2969 l.release()
2969 else:
2970 else:
2970 if opts['rev']:
2971 if opts['rev']:
2971 revs = scmutil.revrange(repo, opts['rev'])
2972 revs = scmutil.revrange(repo, opts['rev'])
2972 nodes = [repo[r].node() for r in revs]
2973 nodes = [repo[r].node() for r in revs]
2973 markers = list(obsolete.getmarkers(repo, nodes=nodes))
2974 markers = list(obsolete.getmarkers(repo, nodes=nodes))
2974 markers.sort(key=lambda x: x._data)
2975 markers.sort(key=lambda x: x._data)
2975 else:
2976 else:
2976 markers = obsolete.getmarkers(repo)
2977 markers = obsolete.getmarkers(repo)
2977
2978
2978 for m in markers:
2979 for m in markers:
2979 cmdutil.showmarker(ui, m)
2980 cmdutil.showmarker(ui, m)
2980
2981
2981 @command('debugpathcomplete',
2982 @command('debugpathcomplete',
2982 [('f', 'full', None, _('complete an entire path')),
2983 [('f', 'full', None, _('complete an entire path')),
2983 ('n', 'normal', None, _('show only normal files')),
2984 ('n', 'normal', None, _('show only normal files')),
2984 ('a', 'added', None, _('show only added files')),
2985 ('a', 'added', None, _('show only added files')),
2985 ('r', 'removed', None, _('show only removed files'))],
2986 ('r', 'removed', None, _('show only removed files'))],
2986 _('FILESPEC...'))
2987 _('FILESPEC...'))
2987 def debugpathcomplete(ui, repo, *specs, **opts):
2988 def debugpathcomplete(ui, repo, *specs, **opts):
2988 '''complete part or all of a tracked path
2989 '''complete part or all of a tracked path
2989
2990
2990 This command supports shells that offer path name completion. It
2991 This command supports shells that offer path name completion. It
2991 currently completes only files already known to the dirstate.
2992 currently completes only files already known to the dirstate.
2992
2993
2993 Completion extends only to the next path segment unless
2994 Completion extends only to the next path segment unless
2994 --full is specified, in which case entire paths are used.'''
2995 --full is specified, in which case entire paths are used.'''
2995
2996
2996 def complete(path, acceptable):
2997 def complete(path, acceptable):
2997 dirstate = repo.dirstate
2998 dirstate = repo.dirstate
2998 spec = os.path.normpath(os.path.join(os.getcwd(), path))
2999 spec = os.path.normpath(os.path.join(os.getcwd(), path))
2999 rootdir = repo.root + os.sep
3000 rootdir = repo.root + os.sep
3000 if spec != repo.root and not spec.startswith(rootdir):
3001 if spec != repo.root and not spec.startswith(rootdir):
3001 return [], []
3002 return [], []
3002 if os.path.isdir(spec):
3003 if os.path.isdir(spec):
3003 spec += '/'
3004 spec += '/'
3004 spec = spec[len(rootdir):]
3005 spec = spec[len(rootdir):]
3005 fixpaths = os.sep != '/'
3006 fixpaths = os.sep != '/'
3006 if fixpaths:
3007 if fixpaths:
3007 spec = spec.replace(os.sep, '/')
3008 spec = spec.replace(os.sep, '/')
3008 speclen = len(spec)
3009 speclen = len(spec)
3009 fullpaths = opts['full']
3010 fullpaths = opts['full']
3010 files, dirs = set(), set()
3011 files, dirs = set(), set()
3011 adddir, addfile = dirs.add, files.add
3012 adddir, addfile = dirs.add, files.add
3012 for f, st in dirstate.iteritems():
3013 for f, st in dirstate.iteritems():
3013 if f.startswith(spec) and st[0] in acceptable:
3014 if f.startswith(spec) and st[0] in acceptable:
3014 if fixpaths:
3015 if fixpaths:
3015 f = f.replace('/', os.sep)
3016 f = f.replace('/', os.sep)
3016 if fullpaths:
3017 if fullpaths:
3017 addfile(f)
3018 addfile(f)
3018 continue
3019 continue
3019 s = f.find(os.sep, speclen)
3020 s = f.find(os.sep, speclen)
3020 if s >= 0:
3021 if s >= 0:
3021 adddir(f[:s])
3022 adddir(f[:s])
3022 else:
3023 else:
3023 addfile(f)
3024 addfile(f)
3024 return files, dirs
3025 return files, dirs
3025
3026
3026 acceptable = ''
3027 acceptable = ''
3027 if opts['normal']:
3028 if opts['normal']:
3028 acceptable += 'nm'
3029 acceptable += 'nm'
3029 if opts['added']:
3030 if opts['added']:
3030 acceptable += 'a'
3031 acceptable += 'a'
3031 if opts['removed']:
3032 if opts['removed']:
3032 acceptable += 'r'
3033 acceptable += 'r'
3033 cwd = repo.getcwd()
3034 cwd = repo.getcwd()
3034 if not specs:
3035 if not specs:
3035 specs = ['.']
3036 specs = ['.']
3036
3037
3037 files, dirs = set(), set()
3038 files, dirs = set(), set()
3038 for spec in specs:
3039 for spec in specs:
3039 f, d = complete(spec, acceptable or 'nmar')
3040 f, d = complete(spec, acceptable or 'nmar')
3040 files.update(f)
3041 files.update(f)
3041 dirs.update(d)
3042 dirs.update(d)
3042 files.update(dirs)
3043 files.update(dirs)
3043 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3044 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3044 ui.write('\n')
3045 ui.write('\n')
3045
3046
3046 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3047 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3047 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3048 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3048 '''access the pushkey key/value protocol
3049 '''access the pushkey key/value protocol
3049
3050
3050 With two args, list the keys in the given namespace.
3051 With two args, list the keys in the given namespace.
3051
3052
3052 With five args, set a key to new if it currently is set to old.
3053 With five args, set a key to new if it currently is set to old.
3053 Reports success or failure.
3054 Reports success or failure.
3054 '''
3055 '''
3055
3056
3056 target = hg.peer(ui, {}, repopath)
3057 target = hg.peer(ui, {}, repopath)
3057 if keyinfo:
3058 if keyinfo:
3058 key, old, new = keyinfo
3059 key, old, new = keyinfo
3059 r = target.pushkey(namespace, key, old, new)
3060 r = target.pushkey(namespace, key, old, new)
3060 ui.status(str(r) + '\n')
3061 ui.status(str(r) + '\n')
3061 return not r
3062 return not r
3062 else:
3063 else:
3063 for k, v in sorted(target.listkeys(namespace).iteritems()):
3064 for k, v in sorted(target.listkeys(namespace).iteritems()):
3064 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3065 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3065 v.encode('string-escape')))
3066 v.encode('string-escape')))
3066
3067
3067 @command('debugpvec', [], _('A B'))
3068 @command('debugpvec', [], _('A B'))
3068 def debugpvec(ui, repo, a, b=None):
3069 def debugpvec(ui, repo, a, b=None):
3069 ca = scmutil.revsingle(repo, a)
3070 ca = scmutil.revsingle(repo, a)
3070 cb = scmutil.revsingle(repo, b)
3071 cb = scmutil.revsingle(repo, b)
3071 pa = pvec.ctxpvec(ca)
3072 pa = pvec.ctxpvec(ca)
3072 pb = pvec.ctxpvec(cb)
3073 pb = pvec.ctxpvec(cb)
3073 if pa == pb:
3074 if pa == pb:
3074 rel = "="
3075 rel = "="
3075 elif pa > pb:
3076 elif pa > pb:
3076 rel = ">"
3077 rel = ">"
3077 elif pa < pb:
3078 elif pa < pb:
3078 rel = "<"
3079 rel = "<"
3079 elif pa | pb:
3080 elif pa | pb:
3080 rel = "|"
3081 rel = "|"
3081 ui.write(_("a: %s\n") % pa)
3082 ui.write(_("a: %s\n") % pa)
3082 ui.write(_("b: %s\n") % pb)
3083 ui.write(_("b: %s\n") % pb)
3083 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3084 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3084 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3085 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3085 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3086 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3086 pa.distance(pb), rel))
3087 pa.distance(pb), rel))
3087
3088
3088 @command('debugrebuilddirstate|debugrebuildstate',
3089 @command('debugrebuilddirstate|debugrebuildstate',
3089 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3090 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3090 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3091 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3091 'the working copy parent')),
3092 'the working copy parent')),
3092 ],
3093 ],
3093 _('[-r REV]'))
3094 _('[-r REV]'))
3094 def debugrebuilddirstate(ui, repo, rev, **opts):
3095 def debugrebuilddirstate(ui, repo, rev, **opts):
3095 """rebuild the dirstate as it would look like for the given revision
3096 """rebuild the dirstate as it would look like for the given revision
3096
3097
3097 If no revision is specified the first current parent will be used.
3098 If no revision is specified the first current parent will be used.
3098
3099
3099 The dirstate will be set to the files of the given revision.
3100 The dirstate will be set to the files of the given revision.
3100 The actual working directory content or existing dirstate
3101 The actual working directory content or existing dirstate
3101 information such as adds or removes is not considered.
3102 information such as adds or removes is not considered.
3102
3103
3103 ``minimal`` will only rebuild the dirstate status for files that claim to be
3104 ``minimal`` will only rebuild the dirstate status for files that claim to be
3104 tracked but are not in the parent manifest, or that exist in the parent
3105 tracked but are not in the parent manifest, or that exist in the parent
3105 manifest but are not in the dirstate. It will not change adds, removes, or
3106 manifest but are not in the dirstate. It will not change adds, removes, or
3106 modified files that are in the working copy parent.
3107 modified files that are in the working copy parent.
3107
3108
3108 One use of this command is to make the next :hg:`status` invocation
3109 One use of this command is to make the next :hg:`status` invocation
3109 check the actual file content.
3110 check the actual file content.
3110 """
3111 """
3111 ctx = scmutil.revsingle(repo, rev)
3112 ctx = scmutil.revsingle(repo, rev)
3112 wlock = repo.wlock()
3113 wlock = repo.wlock()
3113 try:
3114 try:
3114 dirstate = repo.dirstate
3115 dirstate = repo.dirstate
3115 changedfiles = None
3116 changedfiles = None
3116 # See command doc for what minimal does.
3117 # See command doc for what minimal does.
3117 if opts.get('minimal'):
3118 if opts.get('minimal'):
3118 manifestfiles = set(ctx.manifest().keys())
3119 manifestfiles = set(ctx.manifest().keys())
3119 dirstatefiles = set(dirstate)
3120 dirstatefiles = set(dirstate)
3120 manifestonly = manifestfiles - dirstatefiles
3121 manifestonly = manifestfiles - dirstatefiles
3121 dsonly = dirstatefiles - manifestfiles
3122 dsonly = dirstatefiles - manifestfiles
3122 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3123 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3123 changedfiles = manifestonly | dsnotadded
3124 changedfiles = manifestonly | dsnotadded
3124
3125
3125 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3126 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3126 finally:
3127 finally:
3127 wlock.release()
3128 wlock.release()
3128
3129
3129 @command('debugrebuildfncache', [], '')
3130 @command('debugrebuildfncache', [], '')
3130 def debugrebuildfncache(ui, repo):
3131 def debugrebuildfncache(ui, repo):
3131 """rebuild the fncache file"""
3132 """rebuild the fncache file"""
3132 repair.rebuildfncache(ui, repo)
3133 repair.rebuildfncache(ui, repo)
3133
3134
3134 @command('debugrename',
3135 @command('debugrename',
3135 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3136 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3136 _('[-r REV] FILE'))
3137 _('[-r REV] FILE'))
3137 def debugrename(ui, repo, file1, *pats, **opts):
3138 def debugrename(ui, repo, file1, *pats, **opts):
3138 """dump rename information"""
3139 """dump rename information"""
3139
3140
3140 ctx = scmutil.revsingle(repo, opts.get('rev'))
3141 ctx = scmutil.revsingle(repo, opts.get('rev'))
3141 m = scmutil.match(ctx, (file1,) + pats, opts)
3142 m = scmutil.match(ctx, (file1,) + pats, opts)
3142 for abs in ctx.walk(m):
3143 for abs in ctx.walk(m):
3143 fctx = ctx[abs]
3144 fctx = ctx[abs]
3144 o = fctx.filelog().renamed(fctx.filenode())
3145 o = fctx.filelog().renamed(fctx.filenode())
3145 rel = m.rel(abs)
3146 rel = m.rel(abs)
3146 if o:
3147 if o:
3147 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3148 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3148 else:
3149 else:
3149 ui.write(_("%s not renamed\n") % rel)
3150 ui.write(_("%s not renamed\n") % rel)
3150
3151
3151 @command('debugrevlog', debugrevlogopts +
3152 @command('debugrevlog', debugrevlogopts +
3152 [('d', 'dump', False, _('dump index data'))],
3153 [('d', 'dump', False, _('dump index data'))],
3153 _('-c|-m|FILE'),
3154 _('-c|-m|FILE'),
3154 optionalrepo=True)
3155 optionalrepo=True)
3155 def debugrevlog(ui, repo, file_=None, **opts):
3156 def debugrevlog(ui, repo, file_=None, **opts):
3156 """show data and statistics about a revlog"""
3157 """show data and statistics about a revlog"""
3157 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3158 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3158
3159
3159 if opts.get("dump"):
3160 if opts.get("dump"):
3160 numrevs = len(r)
3161 numrevs = len(r)
3161 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
3162 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
3162 " rawsize totalsize compression heads chainlen\n")
3163 " rawsize totalsize compression heads chainlen\n")
3163 ts = 0
3164 ts = 0
3164 heads = set()
3165 heads = set()
3165
3166
3166 for rev in xrange(numrevs):
3167 for rev in xrange(numrevs):
3167 dbase = r.deltaparent(rev)
3168 dbase = r.deltaparent(rev)
3168 if dbase == -1:
3169 if dbase == -1:
3169 dbase = rev
3170 dbase = rev
3170 cbase = r.chainbase(rev)
3171 cbase = r.chainbase(rev)
3171 clen = r.chainlen(rev)
3172 clen = r.chainlen(rev)
3172 p1, p2 = r.parentrevs(rev)
3173 p1, p2 = r.parentrevs(rev)
3173 rs = r.rawsize(rev)
3174 rs = r.rawsize(rev)
3174 ts = ts + rs
3175 ts = ts + rs
3175 heads -= set(r.parentrevs(rev))
3176 heads -= set(r.parentrevs(rev))
3176 heads.add(rev)
3177 heads.add(rev)
3177 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3178 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3178 "%11d %5d %8d\n" %
3179 "%11d %5d %8d\n" %
3179 (rev, p1, p2, r.start(rev), r.end(rev),
3180 (rev, p1, p2, r.start(rev), r.end(rev),
3180 r.start(dbase), r.start(cbase),
3181 r.start(dbase), r.start(cbase),
3181 r.start(p1), r.start(p2),
3182 r.start(p1), r.start(p2),
3182 rs, ts, ts / r.end(rev), len(heads), clen))
3183 rs, ts, ts / r.end(rev), len(heads), clen))
3183 return 0
3184 return 0
3184
3185
3185 v = r.version
3186 v = r.version
3186 format = v & 0xFFFF
3187 format = v & 0xFFFF
3187 flags = []
3188 flags = []
3188 gdelta = False
3189 gdelta = False
3189 if v & revlog.REVLOGNGINLINEDATA:
3190 if v & revlog.REVLOGNGINLINEDATA:
3190 flags.append('inline')
3191 flags.append('inline')
3191 if v & revlog.REVLOGGENERALDELTA:
3192 if v & revlog.REVLOGGENERALDELTA:
3192 gdelta = True
3193 gdelta = True
3193 flags.append('generaldelta')
3194 flags.append('generaldelta')
3194 if not flags:
3195 if not flags:
3195 flags = ['(none)']
3196 flags = ['(none)']
3196
3197
3197 nummerges = 0
3198 nummerges = 0
3198 numfull = 0
3199 numfull = 0
3199 numprev = 0
3200 numprev = 0
3200 nump1 = 0
3201 nump1 = 0
3201 nump2 = 0
3202 nump2 = 0
3202 numother = 0
3203 numother = 0
3203 nump1prev = 0
3204 nump1prev = 0
3204 nump2prev = 0
3205 nump2prev = 0
3205 chainlengths = []
3206 chainlengths = []
3206
3207
3207 datasize = [None, 0, 0L]
3208 datasize = [None, 0, 0L]
3208 fullsize = [None, 0, 0L]
3209 fullsize = [None, 0, 0L]
3209 deltasize = [None, 0, 0L]
3210 deltasize = [None, 0, 0L]
3210
3211
3211 def addsize(size, l):
3212 def addsize(size, l):
3212 if l[0] is None or size < l[0]:
3213 if l[0] is None or size < l[0]:
3213 l[0] = size
3214 l[0] = size
3214 if size > l[1]:
3215 if size > l[1]:
3215 l[1] = size
3216 l[1] = size
3216 l[2] += size
3217 l[2] += size
3217
3218
3218 numrevs = len(r)
3219 numrevs = len(r)
3219 for rev in xrange(numrevs):
3220 for rev in xrange(numrevs):
3220 p1, p2 = r.parentrevs(rev)
3221 p1, p2 = r.parentrevs(rev)
3221 delta = r.deltaparent(rev)
3222 delta = r.deltaparent(rev)
3222 if format > 0:
3223 if format > 0:
3223 addsize(r.rawsize(rev), datasize)
3224 addsize(r.rawsize(rev), datasize)
3224 if p2 != nullrev:
3225 if p2 != nullrev:
3225 nummerges += 1
3226 nummerges += 1
3226 size = r.length(rev)
3227 size = r.length(rev)
3227 if delta == nullrev:
3228 if delta == nullrev:
3228 chainlengths.append(0)
3229 chainlengths.append(0)
3229 numfull += 1
3230 numfull += 1
3230 addsize(size, fullsize)
3231 addsize(size, fullsize)
3231 else:
3232 else:
3232 chainlengths.append(chainlengths[delta] + 1)
3233 chainlengths.append(chainlengths[delta] + 1)
3233 addsize(size, deltasize)
3234 addsize(size, deltasize)
3234 if delta == rev - 1:
3235 if delta == rev - 1:
3235 numprev += 1
3236 numprev += 1
3236 if delta == p1:
3237 if delta == p1:
3237 nump1prev += 1
3238 nump1prev += 1
3238 elif delta == p2:
3239 elif delta == p2:
3239 nump2prev += 1
3240 nump2prev += 1
3240 elif delta == p1:
3241 elif delta == p1:
3241 nump1 += 1
3242 nump1 += 1
3242 elif delta == p2:
3243 elif delta == p2:
3243 nump2 += 1
3244 nump2 += 1
3244 elif delta != nullrev:
3245 elif delta != nullrev:
3245 numother += 1
3246 numother += 1
3246
3247
3247 # Adjust size min value for empty cases
3248 # Adjust size min value for empty cases
3248 for size in (datasize, fullsize, deltasize):
3249 for size in (datasize, fullsize, deltasize):
3249 if size[0] is None:
3250 if size[0] is None:
3250 size[0] = 0
3251 size[0] = 0
3251
3252
3252 numdeltas = numrevs - numfull
3253 numdeltas = numrevs - numfull
3253 numoprev = numprev - nump1prev - nump2prev
3254 numoprev = numprev - nump1prev - nump2prev
3254 totalrawsize = datasize[2]
3255 totalrawsize = datasize[2]
3255 datasize[2] /= numrevs
3256 datasize[2] /= numrevs
3256 fulltotal = fullsize[2]
3257 fulltotal = fullsize[2]
3257 fullsize[2] /= numfull
3258 fullsize[2] /= numfull
3258 deltatotal = deltasize[2]
3259 deltatotal = deltasize[2]
3259 if numrevs - numfull > 0:
3260 if numrevs - numfull > 0:
3260 deltasize[2] /= numrevs - numfull
3261 deltasize[2] /= numrevs - numfull
3261 totalsize = fulltotal + deltatotal
3262 totalsize = fulltotal + deltatotal
3262 avgchainlen = sum(chainlengths) / numrevs
3263 avgchainlen = sum(chainlengths) / numrevs
3263 maxchainlen = max(chainlengths)
3264 maxchainlen = max(chainlengths)
3264 compratio = 1
3265 compratio = 1
3265 if totalsize:
3266 if totalsize:
3266 compratio = totalrawsize / totalsize
3267 compratio = totalrawsize / totalsize
3267
3268
3268 basedfmtstr = '%%%dd\n'
3269 basedfmtstr = '%%%dd\n'
3269 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3270 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3270
3271
3271 def dfmtstr(max):
3272 def dfmtstr(max):
3272 return basedfmtstr % len(str(max))
3273 return basedfmtstr % len(str(max))
3273 def pcfmtstr(max, padding=0):
3274 def pcfmtstr(max, padding=0):
3274 return basepcfmtstr % (len(str(max)), ' ' * padding)
3275 return basepcfmtstr % (len(str(max)), ' ' * padding)
3275
3276
3276 def pcfmt(value, total):
3277 def pcfmt(value, total):
3277 if total:
3278 if total:
3278 return (value, 100 * float(value) / total)
3279 return (value, 100 * float(value) / total)
3279 else:
3280 else:
3280 return value, 100.0
3281 return value, 100.0
3281
3282
3282 ui.write(('format : %d\n') % format)
3283 ui.write(('format : %d\n') % format)
3283 ui.write(('flags : %s\n') % ', '.join(flags))
3284 ui.write(('flags : %s\n') % ', '.join(flags))
3284
3285
3285 ui.write('\n')
3286 ui.write('\n')
3286 fmt = pcfmtstr(totalsize)
3287 fmt = pcfmtstr(totalsize)
3287 fmt2 = dfmtstr(totalsize)
3288 fmt2 = dfmtstr(totalsize)
3288 ui.write(('revisions : ') + fmt2 % numrevs)
3289 ui.write(('revisions : ') + fmt2 % numrevs)
3289 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3290 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3290 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3291 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3291 ui.write(('revisions : ') + fmt2 % numrevs)
3292 ui.write(('revisions : ') + fmt2 % numrevs)
3292 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3293 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3293 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3294 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3294 ui.write(('revision size : ') + fmt2 % totalsize)
3295 ui.write(('revision size : ') + fmt2 % totalsize)
3295 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3296 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3296 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3297 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3297
3298
3298 ui.write('\n')
3299 ui.write('\n')
3299 fmt = dfmtstr(max(avgchainlen, compratio))
3300 fmt = dfmtstr(max(avgchainlen, compratio))
3300 ui.write(('avg chain length : ') + fmt % avgchainlen)
3301 ui.write(('avg chain length : ') + fmt % avgchainlen)
3301 ui.write(('max chain length : ') + fmt % maxchainlen)
3302 ui.write(('max chain length : ') + fmt % maxchainlen)
3302 ui.write(('compression ratio : ') + fmt % compratio)
3303 ui.write(('compression ratio : ') + fmt % compratio)
3303
3304
3304 if format > 0:
3305 if format > 0:
3305 ui.write('\n')
3306 ui.write('\n')
3306 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3307 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3307 % tuple(datasize))
3308 % tuple(datasize))
3308 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3309 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3309 % tuple(fullsize))
3310 % tuple(fullsize))
3310 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3311 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3311 % tuple(deltasize))
3312 % tuple(deltasize))
3312
3313
3313 if numdeltas > 0:
3314 if numdeltas > 0:
3314 ui.write('\n')
3315 ui.write('\n')
3315 fmt = pcfmtstr(numdeltas)
3316 fmt = pcfmtstr(numdeltas)
3316 fmt2 = pcfmtstr(numdeltas, 4)
3317 fmt2 = pcfmtstr(numdeltas, 4)
3317 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3318 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3318 if numprev > 0:
3319 if numprev > 0:
3319 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3320 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3320 numprev))
3321 numprev))
3321 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3322 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3322 numprev))
3323 numprev))
3323 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3324 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3324 numprev))
3325 numprev))
3325 if gdelta:
3326 if gdelta:
3326 ui.write(('deltas against p1 : ')
3327 ui.write(('deltas against p1 : ')
3327 + fmt % pcfmt(nump1, numdeltas))
3328 + fmt % pcfmt(nump1, numdeltas))
3328 ui.write(('deltas against p2 : ')
3329 ui.write(('deltas against p2 : ')
3329 + fmt % pcfmt(nump2, numdeltas))
3330 + fmt % pcfmt(nump2, numdeltas))
3330 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3331 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3331 numdeltas))
3332 numdeltas))
3332
3333
3333 @command('debugrevspec',
3334 @command('debugrevspec',
3334 [('', 'optimize', None, _('print parsed tree after optimizing'))],
3335 [('', 'optimize', None, _('print parsed tree after optimizing'))],
3335 ('REVSPEC'))
3336 ('REVSPEC'))
3336 def debugrevspec(ui, repo, expr, **opts):
3337 def debugrevspec(ui, repo, expr, **opts):
3337 """parse and apply a revision specification
3338 """parse and apply a revision specification
3338
3339
3339 Use --verbose to print the parsed tree before and after aliases
3340 Use --verbose to print the parsed tree before and after aliases
3340 expansion.
3341 expansion.
3341 """
3342 """
3342 if ui.verbose:
3343 if ui.verbose:
3343 tree = revset.parse(expr, lookup=repo.__contains__)
3344 tree = revset.parse(expr, lookup=repo.__contains__)
3344 ui.note(revset.prettyformat(tree), "\n")
3345 ui.note(revset.prettyformat(tree), "\n")
3345 newtree = revset.findaliases(ui, tree)
3346 newtree = revset.findaliases(ui, tree)
3346 if newtree != tree:
3347 if newtree != tree:
3347 ui.note(revset.prettyformat(newtree), "\n")
3348 ui.note(revset.prettyformat(newtree), "\n")
3348 tree = newtree
3349 tree = newtree
3349 newtree = revset.foldconcat(tree)
3350 newtree = revset.foldconcat(tree)
3350 if newtree != tree:
3351 if newtree != tree:
3351 ui.note(revset.prettyformat(newtree), "\n")
3352 ui.note(revset.prettyformat(newtree), "\n")
3352 if opts["optimize"]:
3353 if opts["optimize"]:
3353 weight, optimizedtree = revset.optimize(newtree, True)
3354 weight, optimizedtree = revset.optimize(newtree, True)
3354 ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n")
3355 ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n")
3355 func = revset.match(ui, expr, repo)
3356 func = revset.match(ui, expr, repo)
3356 revs = func(repo)
3357 revs = func(repo)
3357 if ui.verbose:
3358 if ui.verbose:
3358 ui.note("* set:\n", revset.prettyformatset(revs), "\n")
3359 ui.note("* set:\n", revset.prettyformatset(revs), "\n")
3359 for c in revs:
3360 for c in revs:
3360 ui.write("%s\n" % c)
3361 ui.write("%s\n" % c)
3361
3362
3362 @command('debugsetparents', [], _('REV1 [REV2]'))
3363 @command('debugsetparents', [], _('REV1 [REV2]'))
3363 def debugsetparents(ui, repo, rev1, rev2=None):
3364 def debugsetparents(ui, repo, rev1, rev2=None):
3364 """manually set the parents of the current working directory
3365 """manually set the parents of the current working directory
3365
3366
3366 This is useful for writing repository conversion tools, but should
3367 This is useful for writing repository conversion tools, but should
3367 be used with care. For example, neither the working directory nor the
3368 be used with care. For example, neither the working directory nor the
3368 dirstate is updated, so file status may be incorrect after running this
3369 dirstate is updated, so file status may be incorrect after running this
3369 command.
3370 command.
3370
3371
3371 Returns 0 on success.
3372 Returns 0 on success.
3372 """
3373 """
3373
3374
3374 r1 = scmutil.revsingle(repo, rev1).node()
3375 r1 = scmutil.revsingle(repo, rev1).node()
3375 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3376 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3376
3377
3377 wlock = repo.wlock()
3378 wlock = repo.wlock()
3378 try:
3379 try:
3379 repo.dirstate.beginparentchange()
3380 repo.dirstate.beginparentchange()
3380 repo.setparents(r1, r2)
3381 repo.setparents(r1, r2)
3381 repo.dirstate.endparentchange()
3382 repo.dirstate.endparentchange()
3382 finally:
3383 finally:
3383 wlock.release()
3384 wlock.release()
3384
3385
3385 @command('debugdirstate|debugstate',
3386 @command('debugdirstate|debugstate',
3386 [('', 'nodates', None, _('do not display the saved mtime')),
3387 [('', 'nodates', None, _('do not display the saved mtime')),
3387 ('', 'datesort', None, _('sort by saved mtime'))],
3388 ('', 'datesort', None, _('sort by saved mtime'))],
3388 _('[OPTION]...'))
3389 _('[OPTION]...'))
3389 def debugstate(ui, repo, **opts):
3390 def debugstate(ui, repo, **opts):
3390 """show the contents of the current dirstate"""
3391 """show the contents of the current dirstate"""
3391
3392
3392 nodates = opts.get('nodates')
3393 nodates = opts.get('nodates')
3393 datesort = opts.get('datesort')
3394 datesort = opts.get('datesort')
3394
3395
3395 timestr = ""
3396 timestr = ""
3396 if datesort:
3397 if datesort:
3397 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3398 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3398 else:
3399 else:
3399 keyfunc = None # sort by filename
3400 keyfunc = None # sort by filename
3400 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3401 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3401 if ent[3] == -1:
3402 if ent[3] == -1:
3402 timestr = 'unset '
3403 timestr = 'unset '
3403 elif nodates:
3404 elif nodates:
3404 timestr = 'set '
3405 timestr = 'set '
3405 else:
3406 else:
3406 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3407 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3407 time.localtime(ent[3]))
3408 time.localtime(ent[3]))
3408 if ent[1] & 0o20000:
3409 if ent[1] & 0o20000:
3409 mode = 'lnk'
3410 mode = 'lnk'
3410 else:
3411 else:
3411 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3412 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3412 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3413 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3413 for f in repo.dirstate.copies():
3414 for f in repo.dirstate.copies():
3414 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3415 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3415
3416
3416 @command('debugsub',
3417 @command('debugsub',
3417 [('r', 'rev', '',
3418 [('r', 'rev', '',
3418 _('revision to check'), _('REV'))],
3419 _('revision to check'), _('REV'))],
3419 _('[-r REV] [REV]'))
3420 _('[-r REV] [REV]'))
3420 def debugsub(ui, repo, rev=None):
3421 def debugsub(ui, repo, rev=None):
3421 ctx = scmutil.revsingle(repo, rev, None)
3422 ctx = scmutil.revsingle(repo, rev, None)
3422 for k, v in sorted(ctx.substate.items()):
3423 for k, v in sorted(ctx.substate.items()):
3423 ui.write(('path %s\n') % k)
3424 ui.write(('path %s\n') % k)
3424 ui.write((' source %s\n') % v[0])
3425 ui.write((' source %s\n') % v[0])
3425 ui.write((' revision %s\n') % v[1])
3426 ui.write((' revision %s\n') % v[1])
3426
3427
3427 @command('debugsuccessorssets',
3428 @command('debugsuccessorssets',
3428 [],
3429 [],
3429 _('[REV]'))
3430 _('[REV]'))
3430 def debugsuccessorssets(ui, repo, *revs):
3431 def debugsuccessorssets(ui, repo, *revs):
3431 """show set of successors for revision
3432 """show set of successors for revision
3432
3433
3433 A successors set of changeset A is a consistent group of revisions that
3434 A successors set of changeset A is a consistent group of revisions that
3434 succeed A. It contains non-obsolete changesets only.
3435 succeed A. It contains non-obsolete changesets only.
3435
3436
3436 In most cases a changeset A has a single successors set containing a single
3437 In most cases a changeset A has a single successors set containing a single
3437 successor (changeset A replaced by A').
3438 successor (changeset A replaced by A').
3438
3439
3439 A changeset that is made obsolete with no successors are called "pruned".
3440 A changeset that is made obsolete with no successors are called "pruned".
3440 Such changesets have no successors sets at all.
3441 Such changesets have no successors sets at all.
3441
3442
3442 A changeset that has been "split" will have a successors set containing
3443 A changeset that has been "split" will have a successors set containing
3443 more than one successor.
3444 more than one successor.
3444
3445
3445 A changeset that has been rewritten in multiple different ways is called
3446 A changeset that has been rewritten in multiple different ways is called
3446 "divergent". Such changesets have multiple successor sets (each of which
3447 "divergent". Such changesets have multiple successor sets (each of which
3447 may also be split, i.e. have multiple successors).
3448 may also be split, i.e. have multiple successors).
3448
3449
3449 Results are displayed as follows::
3450 Results are displayed as follows::
3450
3451
3451 <rev1>
3452 <rev1>
3452 <successors-1A>
3453 <successors-1A>
3453 <rev2>
3454 <rev2>
3454 <successors-2A>
3455 <successors-2A>
3455 <successors-2B1> <successors-2B2> <successors-2B3>
3456 <successors-2B1> <successors-2B2> <successors-2B3>
3456
3457
3457 Here rev2 has two possible (i.e. divergent) successors sets. The first
3458 Here rev2 has two possible (i.e. divergent) successors sets. The first
3458 holds one element, whereas the second holds three (i.e. the changeset has
3459 holds one element, whereas the second holds three (i.e. the changeset has
3459 been split).
3460 been split).
3460 """
3461 """
3461 # passed to successorssets caching computation from one call to another
3462 # passed to successorssets caching computation from one call to another
3462 cache = {}
3463 cache = {}
3463 ctx2str = str
3464 ctx2str = str
3464 node2str = short
3465 node2str = short
3465 if ui.debug():
3466 if ui.debug():
3466 def ctx2str(ctx):
3467 def ctx2str(ctx):
3467 return ctx.hex()
3468 return ctx.hex()
3468 node2str = hex
3469 node2str = hex
3469 for rev in scmutil.revrange(repo, revs):
3470 for rev in scmutil.revrange(repo, revs):
3470 ctx = repo[rev]
3471 ctx = repo[rev]
3471 ui.write('%s\n'% ctx2str(ctx))
3472 ui.write('%s\n'% ctx2str(ctx))
3472 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3473 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3473 if succsset:
3474 if succsset:
3474 ui.write(' ')
3475 ui.write(' ')
3475 ui.write(node2str(succsset[0]))
3476 ui.write(node2str(succsset[0]))
3476 for node in succsset[1:]:
3477 for node in succsset[1:]:
3477 ui.write(' ')
3478 ui.write(' ')
3478 ui.write(node2str(node))
3479 ui.write(node2str(node))
3479 ui.write('\n')
3480 ui.write('\n')
3480
3481
3481 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3482 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3482 def debugwalk(ui, repo, *pats, **opts):
3483 def debugwalk(ui, repo, *pats, **opts):
3483 """show how files match on given patterns"""
3484 """show how files match on given patterns"""
3484 m = scmutil.match(repo[None], pats, opts)
3485 m = scmutil.match(repo[None], pats, opts)
3485 items = list(repo.walk(m))
3486 items = list(repo.walk(m))
3486 if not items:
3487 if not items:
3487 return
3488 return
3488 f = lambda fn: fn
3489 f = lambda fn: fn
3489 if ui.configbool('ui', 'slash') and os.sep != '/':
3490 if ui.configbool('ui', 'slash') and os.sep != '/':
3490 f = lambda fn: util.normpath(fn)
3491 f = lambda fn: util.normpath(fn)
3491 fmt = 'f %%-%ds %%-%ds %%s' % (
3492 fmt = 'f %%-%ds %%-%ds %%s' % (
3492 max([len(abs) for abs in items]),
3493 max([len(abs) for abs in items]),
3493 max([len(m.rel(abs)) for abs in items]))
3494 max([len(m.rel(abs)) for abs in items]))
3494 for abs in items:
3495 for abs in items:
3495 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3496 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3496 ui.write("%s\n" % line.rstrip())
3497 ui.write("%s\n" % line.rstrip())
3497
3498
3498 @command('debugwireargs',
3499 @command('debugwireargs',
3499 [('', 'three', '', 'three'),
3500 [('', 'three', '', 'three'),
3500 ('', 'four', '', 'four'),
3501 ('', 'four', '', 'four'),
3501 ('', 'five', '', 'five'),
3502 ('', 'five', '', 'five'),
3502 ] + remoteopts,
3503 ] + remoteopts,
3503 _('REPO [OPTIONS]... [ONE [TWO]]'),
3504 _('REPO [OPTIONS]... [ONE [TWO]]'),
3504 norepo=True)
3505 norepo=True)
3505 def debugwireargs(ui, repopath, *vals, **opts):
3506 def debugwireargs(ui, repopath, *vals, **opts):
3506 repo = hg.peer(ui, opts, repopath)
3507 repo = hg.peer(ui, opts, repopath)
3507 for opt in remoteopts:
3508 for opt in remoteopts:
3508 del opts[opt[1]]
3509 del opts[opt[1]]
3509 args = {}
3510 args = {}
3510 for k, v in opts.iteritems():
3511 for k, v in opts.iteritems():
3511 if v:
3512 if v:
3512 args[k] = v
3513 args[k] = v
3513 # run twice to check that we don't mess up the stream for the next command
3514 # run twice to check that we don't mess up the stream for the next command
3514 res1 = repo.debugwireargs(*vals, **args)
3515 res1 = repo.debugwireargs(*vals, **args)
3515 res2 = repo.debugwireargs(*vals, **args)
3516 res2 = repo.debugwireargs(*vals, **args)
3516 ui.write("%s\n" % res1)
3517 ui.write("%s\n" % res1)
3517 if res1 != res2:
3518 if res1 != res2:
3518 ui.warn("%s\n" % res2)
3519 ui.warn("%s\n" % res2)
3519
3520
3520 @command('^diff',
3521 @command('^diff',
3521 [('r', 'rev', [], _('revision'), _('REV')),
3522 [('r', 'rev', [], _('revision'), _('REV')),
3522 ('c', 'change', '', _('change made by revision'), _('REV'))
3523 ('c', 'change', '', _('change made by revision'), _('REV'))
3523 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3524 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3524 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3525 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3525 inferrepo=True)
3526 inferrepo=True)
3526 def diff(ui, repo, *pats, **opts):
3527 def diff(ui, repo, *pats, **opts):
3527 """diff repository (or selected files)
3528 """diff repository (or selected files)
3528
3529
3529 Show differences between revisions for the specified files.
3530 Show differences between revisions for the specified files.
3530
3531
3531 Differences between files are shown using the unified diff format.
3532 Differences between files are shown using the unified diff format.
3532
3533
3533 .. note::
3534 .. note::
3534
3535
3535 diff may generate unexpected results for merges, as it will
3536 diff may generate unexpected results for merges, as it will
3536 default to comparing against the working directory's first
3537 default to comparing against the working directory's first
3537 parent changeset if no revisions are specified.
3538 parent changeset if no revisions are specified.
3538
3539
3539 When two revision arguments are given, then changes are shown
3540 When two revision arguments are given, then changes are shown
3540 between those revisions. If only one revision is specified then
3541 between those revisions. If only one revision is specified then
3541 that revision is compared to the working directory, and, when no
3542 that revision is compared to the working directory, and, when no
3542 revisions are specified, the working directory files are compared
3543 revisions are specified, the working directory files are compared
3543 to its parent.
3544 to its parent.
3544
3545
3545 Alternatively you can specify -c/--change with a revision to see
3546 Alternatively you can specify -c/--change with a revision to see
3546 the changes in that changeset relative to its first parent.
3547 the changes in that changeset relative to its first parent.
3547
3548
3548 Without the -a/--text option, diff will avoid generating diffs of
3549 Without the -a/--text option, diff will avoid generating diffs of
3549 files it detects as binary. With -a, diff will generate a diff
3550 files it detects as binary. With -a, diff will generate a diff
3550 anyway, probably with undesirable results.
3551 anyway, probably with undesirable results.
3551
3552
3552 Use the -g/--git option to generate diffs in the git extended diff
3553 Use the -g/--git option to generate diffs in the git extended diff
3553 format. For more information, read :hg:`help diffs`.
3554 format. For more information, read :hg:`help diffs`.
3554
3555
3555 .. container:: verbose
3556 .. container:: verbose
3556
3557
3557 Examples:
3558 Examples:
3558
3559
3559 - compare a file in the current working directory to its parent::
3560 - compare a file in the current working directory to its parent::
3560
3561
3561 hg diff foo.c
3562 hg diff foo.c
3562
3563
3563 - compare two historical versions of a directory, with rename info::
3564 - compare two historical versions of a directory, with rename info::
3564
3565
3565 hg diff --git -r 1.0:1.2 lib/
3566 hg diff --git -r 1.0:1.2 lib/
3566
3567
3567 - get change stats relative to the last change on some date::
3568 - get change stats relative to the last change on some date::
3568
3569
3569 hg diff --stat -r "date('may 2')"
3570 hg diff --stat -r "date('may 2')"
3570
3571
3571 - diff all newly-added files that contain a keyword::
3572 - diff all newly-added files that contain a keyword::
3572
3573
3573 hg diff "set:added() and grep(GNU)"
3574 hg diff "set:added() and grep(GNU)"
3574
3575
3575 - compare a revision and its parents::
3576 - compare a revision and its parents::
3576
3577
3577 hg diff -c 9353 # compare against first parent
3578 hg diff -c 9353 # compare against first parent
3578 hg diff -r 9353^:9353 # same using revset syntax
3579 hg diff -r 9353^:9353 # same using revset syntax
3579 hg diff -r 9353^2:9353 # compare against the second parent
3580 hg diff -r 9353^2:9353 # compare against the second parent
3580
3581
3581 Returns 0 on success.
3582 Returns 0 on success.
3582 """
3583 """
3583
3584
3584 revs = opts.get('rev')
3585 revs = opts.get('rev')
3585 change = opts.get('change')
3586 change = opts.get('change')
3586 stat = opts.get('stat')
3587 stat = opts.get('stat')
3587 reverse = opts.get('reverse')
3588 reverse = opts.get('reverse')
3588
3589
3589 if revs and change:
3590 if revs and change:
3590 msg = _('cannot specify --rev and --change at the same time')
3591 msg = _('cannot specify --rev and --change at the same time')
3591 raise error.Abort(msg)
3592 raise error.Abort(msg)
3592 elif change:
3593 elif change:
3593 node2 = scmutil.revsingle(repo, change, None).node()
3594 node2 = scmutil.revsingle(repo, change, None).node()
3594 node1 = repo[node2].p1().node()
3595 node1 = repo[node2].p1().node()
3595 else:
3596 else:
3596 node1, node2 = scmutil.revpair(repo, revs)
3597 node1, node2 = scmutil.revpair(repo, revs)
3597
3598
3598 if reverse:
3599 if reverse:
3599 node1, node2 = node2, node1
3600 node1, node2 = node2, node1
3600
3601
3601 diffopts = patch.diffallopts(ui, opts)
3602 diffopts = patch.diffallopts(ui, opts)
3602 m = scmutil.match(repo[node2], pats, opts)
3603 m = scmutil.match(repo[node2], pats, opts)
3603 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3604 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3604 listsubrepos=opts.get('subrepos'),
3605 listsubrepos=opts.get('subrepos'),
3605 root=opts.get('root'))
3606 root=opts.get('root'))
3606
3607
3607 @command('^export',
3608 @command('^export',
3608 [('o', 'output', '',
3609 [('o', 'output', '',
3609 _('print output to file with formatted name'), _('FORMAT')),
3610 _('print output to file with formatted name'), _('FORMAT')),
3610 ('', 'switch-parent', None, _('diff against the second parent')),
3611 ('', 'switch-parent', None, _('diff against the second parent')),
3611 ('r', 'rev', [], _('revisions to export'), _('REV')),
3612 ('r', 'rev', [], _('revisions to export'), _('REV')),
3612 ] + diffopts,
3613 ] + diffopts,
3613 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3614 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3614 def export(ui, repo, *changesets, **opts):
3615 def export(ui, repo, *changesets, **opts):
3615 """dump the header and diffs for one or more changesets
3616 """dump the header and diffs for one or more changesets
3616
3617
3617 Print the changeset header and diffs for one or more revisions.
3618 Print the changeset header and diffs for one or more revisions.
3618 If no revision is given, the parent of the working directory is used.
3619 If no revision is given, the parent of the working directory is used.
3619
3620
3620 The information shown in the changeset header is: author, date,
3621 The information shown in the changeset header is: author, date,
3621 branch name (if non-default), changeset hash, parent(s) and commit
3622 branch name (if non-default), changeset hash, parent(s) and commit
3622 comment.
3623 comment.
3623
3624
3624 .. note::
3625 .. note::
3625
3626
3626 export may generate unexpected diff output for merge
3627 export may generate unexpected diff output for merge
3627 changesets, as it will compare the merge changeset against its
3628 changesets, as it will compare the merge changeset against its
3628 first parent only.
3629 first parent only.
3629
3630
3630 Output may be to a file, in which case the name of the file is
3631 Output may be to a file, in which case the name of the file is
3631 given using a format string. The formatting rules are as follows:
3632 given using a format string. The formatting rules are as follows:
3632
3633
3633 :``%%``: literal "%" character
3634 :``%%``: literal "%" character
3634 :``%H``: changeset hash (40 hexadecimal digits)
3635 :``%H``: changeset hash (40 hexadecimal digits)
3635 :``%N``: number of patches being generated
3636 :``%N``: number of patches being generated
3636 :``%R``: changeset revision number
3637 :``%R``: changeset revision number
3637 :``%b``: basename of the exporting repository
3638 :``%b``: basename of the exporting repository
3638 :``%h``: short-form changeset hash (12 hexadecimal digits)
3639 :``%h``: short-form changeset hash (12 hexadecimal digits)
3639 :``%m``: first line of the commit message (only alphanumeric characters)
3640 :``%m``: first line of the commit message (only alphanumeric characters)
3640 :``%n``: zero-padded sequence number, starting at 1
3641 :``%n``: zero-padded sequence number, starting at 1
3641 :``%r``: zero-padded changeset revision number
3642 :``%r``: zero-padded changeset revision number
3642
3643
3643 Without the -a/--text option, export will avoid generating diffs
3644 Without the -a/--text option, export will avoid generating diffs
3644 of files it detects as binary. With -a, export will generate a
3645 of files it detects as binary. With -a, export will generate a
3645 diff anyway, probably with undesirable results.
3646 diff anyway, probably with undesirable results.
3646
3647
3647 Use the -g/--git option to generate diffs in the git extended diff
3648 Use the -g/--git option to generate diffs in the git extended diff
3648 format. See :hg:`help diffs` for more information.
3649 format. See :hg:`help diffs` for more information.
3649
3650
3650 With the --switch-parent option, the diff will be against the
3651 With the --switch-parent option, the diff will be against the
3651 second parent. It can be useful to review a merge.
3652 second parent. It can be useful to review a merge.
3652
3653
3653 .. container:: verbose
3654 .. container:: verbose
3654
3655
3655 Examples:
3656 Examples:
3656
3657
3657 - use export and import to transplant a bugfix to the current
3658 - use export and import to transplant a bugfix to the current
3658 branch::
3659 branch::
3659
3660
3660 hg export -r 9353 | hg import -
3661 hg export -r 9353 | hg import -
3661
3662
3662 - export all the changesets between two revisions to a file with
3663 - export all the changesets between two revisions to a file with
3663 rename information::
3664 rename information::
3664
3665
3665 hg export --git -r 123:150 > changes.txt
3666 hg export --git -r 123:150 > changes.txt
3666
3667
3667 - split outgoing changes into a series of patches with
3668 - split outgoing changes into a series of patches with
3668 descriptive names::
3669 descriptive names::
3669
3670
3670 hg export -r "outgoing()" -o "%n-%m.patch"
3671 hg export -r "outgoing()" -o "%n-%m.patch"
3671
3672
3672 Returns 0 on success.
3673 Returns 0 on success.
3673 """
3674 """
3674 changesets += tuple(opts.get('rev', []))
3675 changesets += tuple(opts.get('rev', []))
3675 if not changesets:
3676 if not changesets:
3676 changesets = ['.']
3677 changesets = ['.']
3677 revs = scmutil.revrange(repo, changesets)
3678 revs = scmutil.revrange(repo, changesets)
3678 if not revs:
3679 if not revs:
3679 raise error.Abort(_("export requires at least one changeset"))
3680 raise error.Abort(_("export requires at least one changeset"))
3680 if len(revs) > 1:
3681 if len(revs) > 1:
3681 ui.note(_('exporting patches:\n'))
3682 ui.note(_('exporting patches:\n'))
3682 else:
3683 else:
3683 ui.note(_('exporting patch:\n'))
3684 ui.note(_('exporting patch:\n'))
3684 cmdutil.export(repo, revs, template=opts.get('output'),
3685 cmdutil.export(repo, revs, template=opts.get('output'),
3685 switch_parent=opts.get('switch_parent'),
3686 switch_parent=opts.get('switch_parent'),
3686 opts=patch.diffallopts(ui, opts))
3687 opts=patch.diffallopts(ui, opts))
3687
3688
3688 @command('files',
3689 @command('files',
3689 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3690 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3690 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3691 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3691 ] + walkopts + formatteropts + subrepoopts,
3692 ] + walkopts + formatteropts + subrepoopts,
3692 _('[OPTION]... [PATTERN]...'))
3693 _('[OPTION]... [PATTERN]...'))
3693 def files(ui, repo, *pats, **opts):
3694 def files(ui, repo, *pats, **opts):
3694 """list tracked files
3695 """list tracked files
3695
3696
3696 Print files under Mercurial control in the working directory or
3697 Print files under Mercurial control in the working directory or
3697 specified revision whose names match the given patterns (excluding
3698 specified revision whose names match the given patterns (excluding
3698 removed files).
3699 removed files).
3699
3700
3700 If no patterns are given to match, this command prints the names
3701 If no patterns are given to match, this command prints the names
3701 of all files under Mercurial control in the working directory.
3702 of all files under Mercurial control in the working directory.
3702
3703
3703 .. container:: verbose
3704 .. container:: verbose
3704
3705
3705 Examples:
3706 Examples:
3706
3707
3707 - list all files under the current directory::
3708 - list all files under the current directory::
3708
3709
3709 hg files .
3710 hg files .
3710
3711
3711 - shows sizes and flags for current revision::
3712 - shows sizes and flags for current revision::
3712
3713
3713 hg files -vr .
3714 hg files -vr .
3714
3715
3715 - list all files named README::
3716 - list all files named README::
3716
3717
3717 hg files -I "**/README"
3718 hg files -I "**/README"
3718
3719
3719 - list all binary files::
3720 - list all binary files::
3720
3721
3721 hg files "set:binary()"
3722 hg files "set:binary()"
3722
3723
3723 - find files containing a regular expression::
3724 - find files containing a regular expression::
3724
3725
3725 hg files "set:grep('bob')"
3726 hg files "set:grep('bob')"
3726
3727
3727 - search tracked file contents with xargs and grep::
3728 - search tracked file contents with xargs and grep::
3728
3729
3729 hg files -0 | xargs -0 grep foo
3730 hg files -0 | xargs -0 grep foo
3730
3731
3731 See :hg:`help patterns` and :hg:`help filesets` for more information
3732 See :hg:`help patterns` and :hg:`help filesets` for more information
3732 on specifying file patterns.
3733 on specifying file patterns.
3733
3734
3734 Returns 0 if a match is found, 1 otherwise.
3735 Returns 0 if a match is found, 1 otherwise.
3735
3736
3736 """
3737 """
3737 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3738 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3738
3739
3739 end = '\n'
3740 end = '\n'
3740 if opts.get('print0'):
3741 if opts.get('print0'):
3741 end = '\0'
3742 end = '\0'
3742 fm = ui.formatter('files', opts)
3743 fm = ui.formatter('files', opts)
3743 fmt = '%s' + end
3744 fmt = '%s' + end
3744
3745
3745 m = scmutil.match(ctx, pats, opts)
3746 m = scmutil.match(ctx, pats, opts)
3746 ret = cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3747 ret = cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3747
3748
3748 fm.end()
3749 fm.end()
3749
3750
3750 return ret
3751 return ret
3751
3752
3752 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3753 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3753 def forget(ui, repo, *pats, **opts):
3754 def forget(ui, repo, *pats, **opts):
3754 """forget the specified files on the next commit
3755 """forget the specified files on the next commit
3755
3756
3756 Mark the specified files so they will no longer be tracked
3757 Mark the specified files so they will no longer be tracked
3757 after the next commit.
3758 after the next commit.
3758
3759
3759 This only removes files from the current branch, not from the
3760 This only removes files from the current branch, not from the
3760 entire project history, and it does not delete them from the
3761 entire project history, and it does not delete them from the
3761 working directory.
3762 working directory.
3762
3763
3763 To delete the file from the working directory, see :hg:`remove`.
3764 To delete the file from the working directory, see :hg:`remove`.
3764
3765
3765 To undo a forget before the next commit, see :hg:`add`.
3766 To undo a forget before the next commit, see :hg:`add`.
3766
3767
3767 .. container:: verbose
3768 .. container:: verbose
3768
3769
3769 Examples:
3770 Examples:
3770
3771
3771 - forget newly-added binary files::
3772 - forget newly-added binary files::
3772
3773
3773 hg forget "set:added() and binary()"
3774 hg forget "set:added() and binary()"
3774
3775
3775 - forget files that would be excluded by .hgignore::
3776 - forget files that would be excluded by .hgignore::
3776
3777
3777 hg forget "set:hgignore()"
3778 hg forget "set:hgignore()"
3778
3779
3779 Returns 0 on success.
3780 Returns 0 on success.
3780 """
3781 """
3781
3782
3782 if not pats:
3783 if not pats:
3783 raise error.Abort(_('no files specified'))
3784 raise error.Abort(_('no files specified'))
3784
3785
3785 m = scmutil.match(repo[None], pats, opts)
3786 m = scmutil.match(repo[None], pats, opts)
3786 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
3787 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
3787 return rejected and 1 or 0
3788 return rejected and 1 or 0
3788
3789
3789 @command(
3790 @command(
3790 'graft',
3791 'graft',
3791 [('r', 'rev', [], _('revisions to graft'), _('REV')),
3792 [('r', 'rev', [], _('revisions to graft'), _('REV')),
3792 ('c', 'continue', False, _('resume interrupted graft')),
3793 ('c', 'continue', False, _('resume interrupted graft')),
3793 ('e', 'edit', False, _('invoke editor on commit messages')),
3794 ('e', 'edit', False, _('invoke editor on commit messages')),
3794 ('', 'log', None, _('append graft info to log message')),
3795 ('', 'log', None, _('append graft info to log message')),
3795 ('f', 'force', False, _('force graft')),
3796 ('f', 'force', False, _('force graft')),
3796 ('D', 'currentdate', False,
3797 ('D', 'currentdate', False,
3797 _('record the current date as commit date')),
3798 _('record the current date as commit date')),
3798 ('U', 'currentuser', False,
3799 ('U', 'currentuser', False,
3799 _('record the current user as committer'), _('DATE'))]
3800 _('record the current user as committer'), _('DATE'))]
3800 + commitopts2 + mergetoolopts + dryrunopts,
3801 + commitopts2 + mergetoolopts + dryrunopts,
3801 _('[OPTION]... [-r] REV...'))
3802 _('[OPTION]... [-r] REV...'))
3802 def graft(ui, repo, *revs, **opts):
3803 def graft(ui, repo, *revs, **opts):
3803 '''copy changes from other branches onto the current branch
3804 '''copy changes from other branches onto the current branch
3804
3805
3805 This command uses Mercurial's merge logic to copy individual
3806 This command uses Mercurial's merge logic to copy individual
3806 changes from other branches without merging branches in the
3807 changes from other branches without merging branches in the
3807 history graph. This is sometimes known as 'backporting' or
3808 history graph. This is sometimes known as 'backporting' or
3808 'cherry-picking'. By default, graft will copy user, date, and
3809 'cherry-picking'. By default, graft will copy user, date, and
3809 description from the source changesets.
3810 description from the source changesets.
3810
3811
3811 Changesets that are ancestors of the current revision, that have
3812 Changesets that are ancestors of the current revision, that have
3812 already been grafted, or that are merges will be skipped.
3813 already been grafted, or that are merges will be skipped.
3813
3814
3814 If --log is specified, log messages will have a comment appended
3815 If --log is specified, log messages will have a comment appended
3815 of the form::
3816 of the form::
3816
3817
3817 (grafted from CHANGESETHASH)
3818 (grafted from CHANGESETHASH)
3818
3819
3819 If --force is specified, revisions will be grafted even if they
3820 If --force is specified, revisions will be grafted even if they
3820 are already ancestors of or have been grafted to the destination.
3821 are already ancestors of or have been grafted to the destination.
3821 This is useful when the revisions have since been backed out.
3822 This is useful when the revisions have since been backed out.
3822
3823
3823 If a graft merge results in conflicts, the graft process is
3824 If a graft merge results in conflicts, the graft process is
3824 interrupted so that the current merge can be manually resolved.
3825 interrupted so that the current merge can be manually resolved.
3825 Once all conflicts are addressed, the graft process can be
3826 Once all conflicts are addressed, the graft process can be
3826 continued with the -c/--continue option.
3827 continued with the -c/--continue option.
3827
3828
3828 .. note::
3829 .. note::
3829
3830
3830 The -c/--continue option does not reapply earlier options, except
3831 The -c/--continue option does not reapply earlier options, except
3831 for --force.
3832 for --force.
3832
3833
3833 .. container:: verbose
3834 .. container:: verbose
3834
3835
3835 Examples:
3836 Examples:
3836
3837
3837 - copy a single change to the stable branch and edit its description::
3838 - copy a single change to the stable branch and edit its description::
3838
3839
3839 hg update stable
3840 hg update stable
3840 hg graft --edit 9393
3841 hg graft --edit 9393
3841
3842
3842 - graft a range of changesets with one exception, updating dates::
3843 - graft a range of changesets with one exception, updating dates::
3843
3844
3844 hg graft -D "2085::2093 and not 2091"
3845 hg graft -D "2085::2093 and not 2091"
3845
3846
3846 - continue a graft after resolving conflicts::
3847 - continue a graft after resolving conflicts::
3847
3848
3848 hg graft -c
3849 hg graft -c
3849
3850
3850 - show the source of a grafted changeset::
3851 - show the source of a grafted changeset::
3851
3852
3852 hg log --debug -r .
3853 hg log --debug -r .
3853
3854
3854 See :hg:`help revisions` and :hg:`help revsets` for more about
3855 See :hg:`help revisions` and :hg:`help revsets` for more about
3855 specifying revisions.
3856 specifying revisions.
3856
3857
3857 Returns 0 on successful completion.
3858 Returns 0 on successful completion.
3858 '''
3859 '''
3859 wlock = None
3860 wlock = None
3860 try:
3861 try:
3861 wlock = repo.wlock()
3862 wlock = repo.wlock()
3862 return _dograft(ui, repo, *revs, **opts)
3863 return _dograft(ui, repo, *revs, **opts)
3863 finally:
3864 finally:
3864 release(wlock)
3865 release(wlock)
3865
3866
3866 def _dograft(ui, repo, *revs, **opts):
3867 def _dograft(ui, repo, *revs, **opts):
3867 revs = list(revs)
3868 revs = list(revs)
3868 revs.extend(opts['rev'])
3869 revs.extend(opts['rev'])
3869
3870
3870 if not opts.get('user') and opts.get('currentuser'):
3871 if not opts.get('user') and opts.get('currentuser'):
3871 opts['user'] = ui.username()
3872 opts['user'] = ui.username()
3872 if not opts.get('date') and opts.get('currentdate'):
3873 if not opts.get('date') and opts.get('currentdate'):
3873 opts['date'] = "%d %d" % util.makedate()
3874 opts['date'] = "%d %d" % util.makedate()
3874
3875
3875 editor = cmdutil.getcommiteditor(editform='graft', **opts)
3876 editor = cmdutil.getcommiteditor(editform='graft', **opts)
3876
3877
3877 cont = False
3878 cont = False
3878 if opts['continue']:
3879 if opts['continue']:
3879 cont = True
3880 cont = True
3880 if revs:
3881 if revs:
3881 raise error.Abort(_("can't specify --continue and revisions"))
3882 raise error.Abort(_("can't specify --continue and revisions"))
3882 # read in unfinished revisions
3883 # read in unfinished revisions
3883 try:
3884 try:
3884 nodes = repo.vfs.read('graftstate').splitlines()
3885 nodes = repo.vfs.read('graftstate').splitlines()
3885 revs = [repo[node].rev() for node in nodes]
3886 revs = [repo[node].rev() for node in nodes]
3886 except IOError as inst:
3887 except IOError as inst:
3887 if inst.errno != errno.ENOENT:
3888 if inst.errno != errno.ENOENT:
3888 raise
3889 raise
3889 raise error.Abort(_("no graft state found, can't continue"))
3890 raise error.Abort(_("no graft state found, can't continue"))
3890 else:
3891 else:
3891 cmdutil.checkunfinished(repo)
3892 cmdutil.checkunfinished(repo)
3892 cmdutil.bailifchanged(repo)
3893 cmdutil.bailifchanged(repo)
3893 if not revs:
3894 if not revs:
3894 raise error.Abort(_('no revisions specified'))
3895 raise error.Abort(_('no revisions specified'))
3895 revs = scmutil.revrange(repo, revs)
3896 revs = scmutil.revrange(repo, revs)
3896
3897
3897 skipped = set()
3898 skipped = set()
3898 # check for merges
3899 # check for merges
3899 for rev in repo.revs('%ld and merge()', revs):
3900 for rev in repo.revs('%ld and merge()', revs):
3900 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
3901 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
3901 skipped.add(rev)
3902 skipped.add(rev)
3902 revs = [r for r in revs if r not in skipped]
3903 revs = [r for r in revs if r not in skipped]
3903 if not revs:
3904 if not revs:
3904 return -1
3905 return -1
3905
3906
3906 # Don't check in the --continue case, in effect retaining --force across
3907 # Don't check in the --continue case, in effect retaining --force across
3907 # --continues. That's because without --force, any revisions we decided to
3908 # --continues. That's because without --force, any revisions we decided to
3908 # skip would have been filtered out here, so they wouldn't have made their
3909 # skip would have been filtered out here, so they wouldn't have made their
3909 # way to the graftstate. With --force, any revisions we would have otherwise
3910 # way to the graftstate. With --force, any revisions we would have otherwise
3910 # skipped would not have been filtered out, and if they hadn't been applied
3911 # skipped would not have been filtered out, and if they hadn't been applied
3911 # already, they'd have been in the graftstate.
3912 # already, they'd have been in the graftstate.
3912 if not (cont or opts.get('force')):
3913 if not (cont or opts.get('force')):
3913 # check for ancestors of dest branch
3914 # check for ancestors of dest branch
3914 crev = repo['.'].rev()
3915 crev = repo['.'].rev()
3915 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3916 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3916 # Cannot use x.remove(y) on smart set, this has to be a list.
3917 # Cannot use x.remove(y) on smart set, this has to be a list.
3917 # XXX make this lazy in the future
3918 # XXX make this lazy in the future
3918 revs = list(revs)
3919 revs = list(revs)
3919 # don't mutate while iterating, create a copy
3920 # don't mutate while iterating, create a copy
3920 for rev in list(revs):
3921 for rev in list(revs):
3921 if rev in ancestors:
3922 if rev in ancestors:
3922 ui.warn(_('skipping ancestor revision %d:%s\n') %
3923 ui.warn(_('skipping ancestor revision %d:%s\n') %
3923 (rev, repo[rev]))
3924 (rev, repo[rev]))
3924 # XXX remove on list is slow
3925 # XXX remove on list is slow
3925 revs.remove(rev)
3926 revs.remove(rev)
3926 if not revs:
3927 if not revs:
3927 return -1
3928 return -1
3928
3929
3929 # analyze revs for earlier grafts
3930 # analyze revs for earlier grafts
3930 ids = {}
3931 ids = {}
3931 for ctx in repo.set("%ld", revs):
3932 for ctx in repo.set("%ld", revs):
3932 ids[ctx.hex()] = ctx.rev()
3933 ids[ctx.hex()] = ctx.rev()
3933 n = ctx.extra().get('source')
3934 n = ctx.extra().get('source')
3934 if n:
3935 if n:
3935 ids[n] = ctx.rev()
3936 ids[n] = ctx.rev()
3936
3937
3937 # check ancestors for earlier grafts
3938 # check ancestors for earlier grafts
3938 ui.debug('scanning for duplicate grafts\n')
3939 ui.debug('scanning for duplicate grafts\n')
3939
3940
3940 for rev in repo.changelog.findmissingrevs(revs, [crev]):
3941 for rev in repo.changelog.findmissingrevs(revs, [crev]):
3941 ctx = repo[rev]
3942 ctx = repo[rev]
3942 n = ctx.extra().get('source')
3943 n = ctx.extra().get('source')
3943 if n in ids:
3944 if n in ids:
3944 try:
3945 try:
3945 r = repo[n].rev()
3946 r = repo[n].rev()
3946 except error.RepoLookupError:
3947 except error.RepoLookupError:
3947 r = None
3948 r = None
3948 if r in revs:
3949 if r in revs:
3949 ui.warn(_('skipping revision %d:%s '
3950 ui.warn(_('skipping revision %d:%s '
3950 '(already grafted to %d:%s)\n')
3951 '(already grafted to %d:%s)\n')
3951 % (r, repo[r], rev, ctx))
3952 % (r, repo[r], rev, ctx))
3952 revs.remove(r)
3953 revs.remove(r)
3953 elif ids[n] in revs:
3954 elif ids[n] in revs:
3954 if r is None:
3955 if r is None:
3955 ui.warn(_('skipping already grafted revision %d:%s '
3956 ui.warn(_('skipping already grafted revision %d:%s '
3956 '(%d:%s also has unknown origin %s)\n')
3957 '(%d:%s also has unknown origin %s)\n')
3957 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
3958 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
3958 else:
3959 else:
3959 ui.warn(_('skipping already grafted revision %d:%s '
3960 ui.warn(_('skipping already grafted revision %d:%s '
3960 '(%d:%s also has origin %d:%s)\n')
3961 '(%d:%s also has origin %d:%s)\n')
3961 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
3962 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
3962 revs.remove(ids[n])
3963 revs.remove(ids[n])
3963 elif ctx.hex() in ids:
3964 elif ctx.hex() in ids:
3964 r = ids[ctx.hex()]
3965 r = ids[ctx.hex()]
3965 ui.warn(_('skipping already grafted revision %d:%s '
3966 ui.warn(_('skipping already grafted revision %d:%s '
3966 '(was grafted from %d:%s)\n') %
3967 '(was grafted from %d:%s)\n') %
3967 (r, repo[r], rev, ctx))
3968 (r, repo[r], rev, ctx))
3968 revs.remove(r)
3969 revs.remove(r)
3969 if not revs:
3970 if not revs:
3970 return -1
3971 return -1
3971
3972
3972 try:
3973 try:
3973 for pos, ctx in enumerate(repo.set("%ld", revs)):
3974 for pos, ctx in enumerate(repo.set("%ld", revs)):
3974 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
3975 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
3975 ctx.description().split('\n', 1)[0])
3976 ctx.description().split('\n', 1)[0])
3976 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3977 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3977 if names:
3978 if names:
3978 desc += ' (%s)' % ' '.join(names)
3979 desc += ' (%s)' % ' '.join(names)
3979 ui.status(_('grafting %s\n') % desc)
3980 ui.status(_('grafting %s\n') % desc)
3980 if opts.get('dry_run'):
3981 if opts.get('dry_run'):
3981 continue
3982 continue
3982
3983
3983 extra = ctx.extra().copy()
3984 extra = ctx.extra().copy()
3984 del extra['branch']
3985 del extra['branch']
3985 source = extra.get('source')
3986 source = extra.get('source')
3986 if source:
3987 if source:
3987 extra['intermediate-source'] = ctx.hex()
3988 extra['intermediate-source'] = ctx.hex()
3988 else:
3989 else:
3989 extra['source'] = ctx.hex()
3990 extra['source'] = ctx.hex()
3990 user = ctx.user()
3991 user = ctx.user()
3991 if opts.get('user'):
3992 if opts.get('user'):
3992 user = opts['user']
3993 user = opts['user']
3993 date = ctx.date()
3994 date = ctx.date()
3994 if opts.get('date'):
3995 if opts.get('date'):
3995 date = opts['date']
3996 date = opts['date']
3996 message = ctx.description()
3997 message = ctx.description()
3997 if opts.get('log'):
3998 if opts.get('log'):
3998 message += '\n(grafted from %s)' % ctx.hex()
3999 message += '\n(grafted from %s)' % ctx.hex()
3999
4000
4000 # we don't merge the first commit when continuing
4001 # we don't merge the first commit when continuing
4001 if not cont:
4002 if not cont:
4002 # perform the graft merge with p1(rev) as 'ancestor'
4003 # perform the graft merge with p1(rev) as 'ancestor'
4003 try:
4004 try:
4004 # ui.forcemerge is an internal variable, do not document
4005 # ui.forcemerge is an internal variable, do not document
4005 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4006 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4006 'graft')
4007 'graft')
4007 stats = mergemod.graft(repo, ctx, ctx.p1(),
4008 stats = mergemod.graft(repo, ctx, ctx.p1(),
4008 ['local', 'graft'])
4009 ['local', 'graft'])
4009 finally:
4010 finally:
4010 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4011 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4011 # report any conflicts
4012 # report any conflicts
4012 if stats and stats[3] > 0:
4013 if stats and stats[3] > 0:
4013 # write out state for --continue
4014 # write out state for --continue
4014 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4015 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4015 repo.vfs.write('graftstate', ''.join(nodelines))
4016 repo.vfs.write('graftstate', ''.join(nodelines))
4016 extra = ''
4017 extra = ''
4017 if opts.get('user'):
4018 if opts.get('user'):
4018 extra += ' --user %s' % opts['user']
4019 extra += ' --user %s' % opts['user']
4019 if opts.get('date'):
4020 if opts.get('date'):
4020 extra += ' --date %s' % opts['date']
4021 extra += ' --date %s' % opts['date']
4021 if opts.get('log'):
4022 if opts.get('log'):
4022 extra += ' --log'
4023 extra += ' --log'
4023 hint=_('use hg resolve and hg graft --continue%s') % extra
4024 hint=_('use hg resolve and hg graft --continue%s') % extra
4024 raise error.Abort(
4025 raise error.Abort(
4025 _("unresolved conflicts, can't continue"),
4026 _("unresolved conflicts, can't continue"),
4026 hint=hint)
4027 hint=hint)
4027 else:
4028 else:
4028 cont = False
4029 cont = False
4029
4030
4030 # commit
4031 # commit
4031 node = repo.commit(text=message, user=user,
4032 node = repo.commit(text=message, user=user,
4032 date=date, extra=extra, editor=editor)
4033 date=date, extra=extra, editor=editor)
4033 if node is None:
4034 if node is None:
4034 ui.warn(
4035 ui.warn(
4035 _('note: graft of %d:%s created no changes to commit\n') %
4036 _('note: graft of %d:%s created no changes to commit\n') %
4036 (ctx.rev(), ctx))
4037 (ctx.rev(), ctx))
4037 finally:
4038 finally:
4038 # TODO: get rid of this meaningless try/finally enclosing.
4039 # TODO: get rid of this meaningless try/finally enclosing.
4039 # this is kept only to reduce changes in a patch.
4040 # this is kept only to reduce changes in a patch.
4040 pass
4041 pass
4041
4042
4042 # remove state when we complete successfully
4043 # remove state when we complete successfully
4043 if not opts.get('dry_run'):
4044 if not opts.get('dry_run'):
4044 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4045 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4045
4046
4046 return 0
4047 return 0
4047
4048
4048 @command('grep',
4049 @command('grep',
4049 [('0', 'print0', None, _('end fields with NUL')),
4050 [('0', 'print0', None, _('end fields with NUL')),
4050 ('', 'all', None, _('print all revisions that match')),
4051 ('', 'all', None, _('print all revisions that match')),
4051 ('a', 'text', None, _('treat all files as text')),
4052 ('a', 'text', None, _('treat all files as text')),
4052 ('f', 'follow', None,
4053 ('f', 'follow', None,
4053 _('follow changeset history,'
4054 _('follow changeset history,'
4054 ' or file history across copies and renames')),
4055 ' or file history across copies and renames')),
4055 ('i', 'ignore-case', None, _('ignore case when matching')),
4056 ('i', 'ignore-case', None, _('ignore case when matching')),
4056 ('l', 'files-with-matches', None,
4057 ('l', 'files-with-matches', None,
4057 _('print only filenames and revisions that match')),
4058 _('print only filenames and revisions that match')),
4058 ('n', 'line-number', None, _('print matching line numbers')),
4059 ('n', 'line-number', None, _('print matching line numbers')),
4059 ('r', 'rev', [],
4060 ('r', 'rev', [],
4060 _('only search files changed within revision range'), _('REV')),
4061 _('only search files changed within revision range'), _('REV')),
4061 ('u', 'user', None, _('list the author (long with -v)')),
4062 ('u', 'user', None, _('list the author (long with -v)')),
4062 ('d', 'date', None, _('list the date (short with -q)')),
4063 ('d', 'date', None, _('list the date (short with -q)')),
4063 ] + walkopts,
4064 ] + walkopts,
4064 _('[OPTION]... PATTERN [FILE]...'),
4065 _('[OPTION]... PATTERN [FILE]...'),
4065 inferrepo=True)
4066 inferrepo=True)
4066 def grep(ui, repo, pattern, *pats, **opts):
4067 def grep(ui, repo, pattern, *pats, **opts):
4067 """search for a pattern in specified files and revisions
4068 """search for a pattern in specified files and revisions
4068
4069
4069 Search revisions of files for a regular expression.
4070 Search revisions of files for a regular expression.
4070
4071
4071 This command behaves differently than Unix grep. It only accepts
4072 This command behaves differently than Unix grep. It only accepts
4072 Python/Perl regexps. It searches repository history, not the
4073 Python/Perl regexps. It searches repository history, not the
4073 working directory. It always prints the revision number in which a
4074 working directory. It always prints the revision number in which a
4074 match appears.
4075 match appears.
4075
4076
4076 By default, grep only prints output for the first revision of a
4077 By default, grep only prints output for the first revision of a
4077 file in which it finds a match. To get it to print every revision
4078 file in which it finds a match. To get it to print every revision
4078 that contains a change in match status ("-" for a match that
4079 that contains a change in match status ("-" for a match that
4079 becomes a non-match, or "+" for a non-match that becomes a match),
4080 becomes a non-match, or "+" for a non-match that becomes a match),
4080 use the --all flag.
4081 use the --all flag.
4081
4082
4082 Returns 0 if a match is found, 1 otherwise.
4083 Returns 0 if a match is found, 1 otherwise.
4083 """
4084 """
4084 reflags = re.M
4085 reflags = re.M
4085 if opts.get('ignore_case'):
4086 if opts.get('ignore_case'):
4086 reflags |= re.I
4087 reflags |= re.I
4087 try:
4088 try:
4088 regexp = util.re.compile(pattern, reflags)
4089 regexp = util.re.compile(pattern, reflags)
4089 except re.error as inst:
4090 except re.error as inst:
4090 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4091 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4091 return 1
4092 return 1
4092 sep, eol = ':', '\n'
4093 sep, eol = ':', '\n'
4093 if opts.get('print0'):
4094 if opts.get('print0'):
4094 sep = eol = '\0'
4095 sep = eol = '\0'
4095
4096
4096 getfile = util.lrucachefunc(repo.file)
4097 getfile = util.lrucachefunc(repo.file)
4097
4098
4098 def matchlines(body):
4099 def matchlines(body):
4099 begin = 0
4100 begin = 0
4100 linenum = 0
4101 linenum = 0
4101 while begin < len(body):
4102 while begin < len(body):
4102 match = regexp.search(body, begin)
4103 match = regexp.search(body, begin)
4103 if not match:
4104 if not match:
4104 break
4105 break
4105 mstart, mend = match.span()
4106 mstart, mend = match.span()
4106 linenum += body.count('\n', begin, mstart) + 1
4107 linenum += body.count('\n', begin, mstart) + 1
4107 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4108 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4108 begin = body.find('\n', mend) + 1 or len(body) + 1
4109 begin = body.find('\n', mend) + 1 or len(body) + 1
4109 lend = begin - 1
4110 lend = begin - 1
4110 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4111 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4111
4112
4112 class linestate(object):
4113 class linestate(object):
4113 def __init__(self, line, linenum, colstart, colend):
4114 def __init__(self, line, linenum, colstart, colend):
4114 self.line = line
4115 self.line = line
4115 self.linenum = linenum
4116 self.linenum = linenum
4116 self.colstart = colstart
4117 self.colstart = colstart
4117 self.colend = colend
4118 self.colend = colend
4118
4119
4119 def __hash__(self):
4120 def __hash__(self):
4120 return hash((self.linenum, self.line))
4121 return hash((self.linenum, self.line))
4121
4122
4122 def __eq__(self, other):
4123 def __eq__(self, other):
4123 return self.line == other.line
4124 return self.line == other.line
4124
4125
4125 def __iter__(self):
4126 def __iter__(self):
4126 yield (self.line[:self.colstart], '')
4127 yield (self.line[:self.colstart], '')
4127 yield (self.line[self.colstart:self.colend], 'grep.match')
4128 yield (self.line[self.colstart:self.colend], 'grep.match')
4128 rest = self.line[self.colend:]
4129 rest = self.line[self.colend:]
4129 while rest != '':
4130 while rest != '':
4130 match = regexp.search(rest)
4131 match = regexp.search(rest)
4131 if not match:
4132 if not match:
4132 yield (rest, '')
4133 yield (rest, '')
4133 break
4134 break
4134 mstart, mend = match.span()
4135 mstart, mend = match.span()
4135 yield (rest[:mstart], '')
4136 yield (rest[:mstart], '')
4136 yield (rest[mstart:mend], 'grep.match')
4137 yield (rest[mstart:mend], 'grep.match')
4137 rest = rest[mend:]
4138 rest = rest[mend:]
4138
4139
4139 matches = {}
4140 matches = {}
4140 copies = {}
4141 copies = {}
4141 def grepbody(fn, rev, body):
4142 def grepbody(fn, rev, body):
4142 matches[rev].setdefault(fn, [])
4143 matches[rev].setdefault(fn, [])
4143 m = matches[rev][fn]
4144 m = matches[rev][fn]
4144 for lnum, cstart, cend, line in matchlines(body):
4145 for lnum, cstart, cend, line in matchlines(body):
4145 s = linestate(line, lnum, cstart, cend)
4146 s = linestate(line, lnum, cstart, cend)
4146 m.append(s)
4147 m.append(s)
4147
4148
4148 def difflinestates(a, b):
4149 def difflinestates(a, b):
4149 sm = difflib.SequenceMatcher(None, a, b)
4150 sm = difflib.SequenceMatcher(None, a, b)
4150 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4151 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4151 if tag == 'insert':
4152 if tag == 'insert':
4152 for i in xrange(blo, bhi):
4153 for i in xrange(blo, bhi):
4153 yield ('+', b[i])
4154 yield ('+', b[i])
4154 elif tag == 'delete':
4155 elif tag == 'delete':
4155 for i in xrange(alo, ahi):
4156 for i in xrange(alo, ahi):
4156 yield ('-', a[i])
4157 yield ('-', a[i])
4157 elif tag == 'replace':
4158 elif tag == 'replace':
4158 for i in xrange(alo, ahi):
4159 for i in xrange(alo, ahi):
4159 yield ('-', a[i])
4160 yield ('-', a[i])
4160 for i in xrange(blo, bhi):
4161 for i in xrange(blo, bhi):
4161 yield ('+', b[i])
4162 yield ('+', b[i])
4162
4163
4163 def display(fn, ctx, pstates, states):
4164 def display(fn, ctx, pstates, states):
4164 rev = ctx.rev()
4165 rev = ctx.rev()
4165 if ui.quiet:
4166 if ui.quiet:
4166 datefunc = util.shortdate
4167 datefunc = util.shortdate
4167 else:
4168 else:
4168 datefunc = util.datestr
4169 datefunc = util.datestr
4169 found = False
4170 found = False
4170 @util.cachefunc
4171 @util.cachefunc
4171 def binary():
4172 def binary():
4172 flog = getfile(fn)
4173 flog = getfile(fn)
4173 return util.binary(flog.read(ctx.filenode(fn)))
4174 return util.binary(flog.read(ctx.filenode(fn)))
4174
4175
4175 if opts.get('all'):
4176 if opts.get('all'):
4176 iter = difflinestates(pstates, states)
4177 iter = difflinestates(pstates, states)
4177 else:
4178 else:
4178 iter = [('', l) for l in states]
4179 iter = [('', l) for l in states]
4179 for change, l in iter:
4180 for change, l in iter:
4180 cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
4181 cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
4181
4182
4182 if opts.get('line_number'):
4183 if opts.get('line_number'):
4183 cols.append((str(l.linenum), 'grep.linenumber'))
4184 cols.append((str(l.linenum), 'grep.linenumber'))
4184 if opts.get('all'):
4185 if opts.get('all'):
4185 cols.append((change, 'grep.change'))
4186 cols.append((change, 'grep.change'))
4186 if opts.get('user'):
4187 if opts.get('user'):
4187 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
4188 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
4188 if opts.get('date'):
4189 if opts.get('date'):
4189 cols.append((datefunc(ctx.date()), 'grep.date'))
4190 cols.append((datefunc(ctx.date()), 'grep.date'))
4190 for col, label in cols[:-1]:
4191 for col, label in cols[:-1]:
4191 ui.write(col, label=label)
4192 ui.write(col, label=label)
4192 ui.write(sep, label='grep.sep')
4193 ui.write(sep, label='grep.sep')
4193 ui.write(cols[-1][0], label=cols[-1][1])
4194 ui.write(cols[-1][0], label=cols[-1][1])
4194 if not opts.get('files_with_matches'):
4195 if not opts.get('files_with_matches'):
4195 ui.write(sep, label='grep.sep')
4196 ui.write(sep, label='grep.sep')
4196 if not opts.get('text') and binary():
4197 if not opts.get('text') and binary():
4197 ui.write(" Binary file matches")
4198 ui.write(" Binary file matches")
4198 else:
4199 else:
4199 for s, label in l:
4200 for s, label in l:
4200 ui.write(s, label=label)
4201 ui.write(s, label=label)
4201 ui.write(eol)
4202 ui.write(eol)
4202 found = True
4203 found = True
4203 if opts.get('files_with_matches'):
4204 if opts.get('files_with_matches'):
4204 break
4205 break
4205 return found
4206 return found
4206
4207
4207 skip = {}
4208 skip = {}
4208 revfiles = {}
4209 revfiles = {}
4209 matchfn = scmutil.match(repo[None], pats, opts)
4210 matchfn = scmutil.match(repo[None], pats, opts)
4210 found = False
4211 found = False
4211 follow = opts.get('follow')
4212 follow = opts.get('follow')
4212
4213
4213 def prep(ctx, fns):
4214 def prep(ctx, fns):
4214 rev = ctx.rev()
4215 rev = ctx.rev()
4215 pctx = ctx.p1()
4216 pctx = ctx.p1()
4216 parent = pctx.rev()
4217 parent = pctx.rev()
4217 matches.setdefault(rev, {})
4218 matches.setdefault(rev, {})
4218 matches.setdefault(parent, {})
4219 matches.setdefault(parent, {})
4219 files = revfiles.setdefault(rev, [])
4220 files = revfiles.setdefault(rev, [])
4220 for fn in fns:
4221 for fn in fns:
4221 flog = getfile(fn)
4222 flog = getfile(fn)
4222 try:
4223 try:
4223 fnode = ctx.filenode(fn)
4224 fnode = ctx.filenode(fn)
4224 except error.LookupError:
4225 except error.LookupError:
4225 continue
4226 continue
4226
4227
4227 copied = flog.renamed(fnode)
4228 copied = flog.renamed(fnode)
4228 copy = follow and copied and copied[0]
4229 copy = follow and copied and copied[0]
4229 if copy:
4230 if copy:
4230 copies.setdefault(rev, {})[fn] = copy
4231 copies.setdefault(rev, {})[fn] = copy
4231 if fn in skip:
4232 if fn in skip:
4232 if copy:
4233 if copy:
4233 skip[copy] = True
4234 skip[copy] = True
4234 continue
4235 continue
4235 files.append(fn)
4236 files.append(fn)
4236
4237
4237 if fn not in matches[rev]:
4238 if fn not in matches[rev]:
4238 grepbody(fn, rev, flog.read(fnode))
4239 grepbody(fn, rev, flog.read(fnode))
4239
4240
4240 pfn = copy or fn
4241 pfn = copy or fn
4241 if pfn not in matches[parent]:
4242 if pfn not in matches[parent]:
4242 try:
4243 try:
4243 fnode = pctx.filenode(pfn)
4244 fnode = pctx.filenode(pfn)
4244 grepbody(pfn, parent, flog.read(fnode))
4245 grepbody(pfn, parent, flog.read(fnode))
4245 except error.LookupError:
4246 except error.LookupError:
4246 pass
4247 pass
4247
4248
4248 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4249 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4249 rev = ctx.rev()
4250 rev = ctx.rev()
4250 parent = ctx.p1().rev()
4251 parent = ctx.p1().rev()
4251 for fn in sorted(revfiles.get(rev, [])):
4252 for fn in sorted(revfiles.get(rev, [])):
4252 states = matches[rev][fn]
4253 states = matches[rev][fn]
4253 copy = copies.get(rev, {}).get(fn)
4254 copy = copies.get(rev, {}).get(fn)
4254 if fn in skip:
4255 if fn in skip:
4255 if copy:
4256 if copy:
4256 skip[copy] = True
4257 skip[copy] = True
4257 continue
4258 continue
4258 pstates = matches.get(parent, {}).get(copy or fn, [])
4259 pstates = matches.get(parent, {}).get(copy or fn, [])
4259 if pstates or states:
4260 if pstates or states:
4260 r = display(fn, ctx, pstates, states)
4261 r = display(fn, ctx, pstates, states)
4261 found = found or r
4262 found = found or r
4262 if r and not opts.get('all'):
4263 if r and not opts.get('all'):
4263 skip[fn] = True
4264 skip[fn] = True
4264 if copy:
4265 if copy:
4265 skip[copy] = True
4266 skip[copy] = True
4266 del matches[rev]
4267 del matches[rev]
4267 del revfiles[rev]
4268 del revfiles[rev]
4268
4269
4269 return not found
4270 return not found
4270
4271
4271 @command('heads',
4272 @command('heads',
4272 [('r', 'rev', '',
4273 [('r', 'rev', '',
4273 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4274 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4274 ('t', 'topo', False, _('show topological heads only')),
4275 ('t', 'topo', False, _('show topological heads only')),
4275 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4276 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4276 ('c', 'closed', False, _('show normal and closed branch heads')),
4277 ('c', 'closed', False, _('show normal and closed branch heads')),
4277 ] + templateopts,
4278 ] + templateopts,
4278 _('[-ct] [-r STARTREV] [REV]...'))
4279 _('[-ct] [-r STARTREV] [REV]...'))
4279 def heads(ui, repo, *branchrevs, **opts):
4280 def heads(ui, repo, *branchrevs, **opts):
4280 """show branch heads
4281 """show branch heads
4281
4282
4282 With no arguments, show all open branch heads in the repository.
4283 With no arguments, show all open branch heads in the repository.
4283 Branch heads are changesets that have no descendants on the
4284 Branch heads are changesets that have no descendants on the
4284 same branch. They are where development generally takes place and
4285 same branch. They are where development generally takes place and
4285 are the usual targets for update and merge operations.
4286 are the usual targets for update and merge operations.
4286
4287
4287 If one or more REVs are given, only open branch heads on the
4288 If one or more REVs are given, only open branch heads on the
4288 branches associated with the specified changesets are shown. This
4289 branches associated with the specified changesets are shown. This
4289 means that you can use :hg:`heads .` to see the heads on the
4290 means that you can use :hg:`heads .` to see the heads on the
4290 currently checked-out branch.
4291 currently checked-out branch.
4291
4292
4292 If -c/--closed is specified, also show branch heads marked closed
4293 If -c/--closed is specified, also show branch heads marked closed
4293 (see :hg:`commit --close-branch`).
4294 (see :hg:`commit --close-branch`).
4294
4295
4295 If STARTREV is specified, only those heads that are descendants of
4296 If STARTREV is specified, only those heads that are descendants of
4296 STARTREV will be displayed.
4297 STARTREV will be displayed.
4297
4298
4298 If -t/--topo is specified, named branch mechanics will be ignored and only
4299 If -t/--topo is specified, named branch mechanics will be ignored and only
4299 topological heads (changesets with no children) will be shown.
4300 topological heads (changesets with no children) will be shown.
4300
4301
4301 Returns 0 if matching heads are found, 1 if not.
4302 Returns 0 if matching heads are found, 1 if not.
4302 """
4303 """
4303
4304
4304 start = None
4305 start = None
4305 if 'rev' in opts:
4306 if 'rev' in opts:
4306 start = scmutil.revsingle(repo, opts['rev'], None).node()
4307 start = scmutil.revsingle(repo, opts['rev'], None).node()
4307
4308
4308 if opts.get('topo'):
4309 if opts.get('topo'):
4309 heads = [repo[h] for h in repo.heads(start)]
4310 heads = [repo[h] for h in repo.heads(start)]
4310 else:
4311 else:
4311 heads = []
4312 heads = []
4312 for branch in repo.branchmap():
4313 for branch in repo.branchmap():
4313 heads += repo.branchheads(branch, start, opts.get('closed'))
4314 heads += repo.branchheads(branch, start, opts.get('closed'))
4314 heads = [repo[h] for h in heads]
4315 heads = [repo[h] for h in heads]
4315
4316
4316 if branchrevs:
4317 if branchrevs:
4317 branches = set(repo[br].branch() for br in branchrevs)
4318 branches = set(repo[br].branch() for br in branchrevs)
4318 heads = [h for h in heads if h.branch() in branches]
4319 heads = [h for h in heads if h.branch() in branches]
4319
4320
4320 if opts.get('active') and branchrevs:
4321 if opts.get('active') and branchrevs:
4321 dagheads = repo.heads(start)
4322 dagheads = repo.heads(start)
4322 heads = [h for h in heads if h.node() in dagheads]
4323 heads = [h for h in heads if h.node() in dagheads]
4323
4324
4324 if branchrevs:
4325 if branchrevs:
4325 haveheads = set(h.branch() for h in heads)
4326 haveheads = set(h.branch() for h in heads)
4326 if branches - haveheads:
4327 if branches - haveheads:
4327 headless = ', '.join(b for b in branches - haveheads)
4328 headless = ', '.join(b for b in branches - haveheads)
4328 msg = _('no open branch heads found on branches %s')
4329 msg = _('no open branch heads found on branches %s')
4329 if opts.get('rev'):
4330 if opts.get('rev'):
4330 msg += _(' (started at %s)') % opts['rev']
4331 msg += _(' (started at %s)') % opts['rev']
4331 ui.warn((msg + '\n') % headless)
4332 ui.warn((msg + '\n') % headless)
4332
4333
4333 if not heads:
4334 if not heads:
4334 return 1
4335 return 1
4335
4336
4336 heads = sorted(heads, key=lambda x: -x.rev())
4337 heads = sorted(heads, key=lambda x: -x.rev())
4337 displayer = cmdutil.show_changeset(ui, repo, opts)
4338 displayer = cmdutil.show_changeset(ui, repo, opts)
4338 for ctx in heads:
4339 for ctx in heads:
4339 displayer.show(ctx)
4340 displayer.show(ctx)
4340 displayer.close()
4341 displayer.close()
4341
4342
4342 @command('help',
4343 @command('help',
4343 [('e', 'extension', None, _('show only help for extensions')),
4344 [('e', 'extension', None, _('show only help for extensions')),
4344 ('c', 'command', None, _('show only help for commands')),
4345 ('c', 'command', None, _('show only help for commands')),
4345 ('k', 'keyword', None, _('show topics matching keyword')),
4346 ('k', 'keyword', None, _('show topics matching keyword')),
4346 ],
4347 ],
4347 _('[-eck] [TOPIC]'),
4348 _('[-eck] [TOPIC]'),
4348 norepo=True)
4349 norepo=True)
4349 def help_(ui, name=None, **opts):
4350 def help_(ui, name=None, **opts):
4350 """show help for a given topic or a help overview
4351 """show help for a given topic or a help overview
4351
4352
4352 With no arguments, print a list of commands with short help messages.
4353 With no arguments, print a list of commands with short help messages.
4353
4354
4354 Given a topic, extension, or command name, print help for that
4355 Given a topic, extension, or command name, print help for that
4355 topic.
4356 topic.
4356
4357
4357 Returns 0 if successful.
4358 Returns 0 if successful.
4358 """
4359 """
4359
4360
4360 textwidth = min(ui.termwidth(), 80) - 2
4361 textwidth = min(ui.termwidth(), 80) - 2
4361
4362
4362 keep = []
4363 keep = []
4363 if ui.verbose:
4364 if ui.verbose:
4364 keep.append('verbose')
4365 keep.append('verbose')
4365 if sys.platform.startswith('win'):
4366 if sys.platform.startswith('win'):
4366 keep.append('windows')
4367 keep.append('windows')
4367 elif sys.platform == 'OpenVMS':
4368 elif sys.platform == 'OpenVMS':
4368 keep.append('vms')
4369 keep.append('vms')
4369 elif sys.platform == 'plan9':
4370 elif sys.platform == 'plan9':
4370 keep.append('plan9')
4371 keep.append('plan9')
4371 else:
4372 else:
4372 keep.append('unix')
4373 keep.append('unix')
4373 keep.append(sys.platform.lower())
4374 keep.append(sys.platform.lower())
4374
4375
4375 section = None
4376 section = None
4376 subtopic = None
4377 subtopic = None
4377 if name and '.' in name:
4378 if name and '.' in name:
4378 name, section = name.split('.', 1)
4379 name, section = name.split('.', 1)
4379 section = section.lower()
4380 section = section.lower()
4380 if '.' in section:
4381 if '.' in section:
4381 subtopic, section = section.split('.', 1)
4382 subtopic, section = section.split('.', 1)
4382 else:
4383 else:
4383 subtopic = section
4384 subtopic = section
4384
4385
4385 text = help.help_(ui, name, subtopic=subtopic, **opts)
4386 text = help.help_(ui, name, subtopic=subtopic, **opts)
4386
4387
4387 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4388 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4388 section=section)
4389 section=section)
4389
4390
4390 # We could have been given a weird ".foo" section without a name
4391 # We could have been given a weird ".foo" section without a name
4391 # to look for, or we could have simply failed to found "foo.bar"
4392 # to look for, or we could have simply failed to found "foo.bar"
4392 # because bar isn't a section of foo
4393 # because bar isn't a section of foo
4393 if section and not (formatted and name):
4394 if section and not (formatted and name):
4394 raise error.Abort(_("help section not found"))
4395 raise error.Abort(_("help section not found"))
4395
4396
4396 if 'verbose' in pruned:
4397 if 'verbose' in pruned:
4397 keep.append('omitted')
4398 keep.append('omitted')
4398 else:
4399 else:
4399 keep.append('notomitted')
4400 keep.append('notomitted')
4400 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4401 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4401 section=section)
4402 section=section)
4402 ui.write(formatted)
4403 ui.write(formatted)
4403
4404
4404
4405
4405 @command('identify|id',
4406 @command('identify|id',
4406 [('r', 'rev', '',
4407 [('r', 'rev', '',
4407 _('identify the specified revision'), _('REV')),
4408 _('identify the specified revision'), _('REV')),
4408 ('n', 'num', None, _('show local revision number')),
4409 ('n', 'num', None, _('show local revision number')),
4409 ('i', 'id', None, _('show global revision id')),
4410 ('i', 'id', None, _('show global revision id')),
4410 ('b', 'branch', None, _('show branch')),
4411 ('b', 'branch', None, _('show branch')),
4411 ('t', 'tags', None, _('show tags')),
4412 ('t', 'tags', None, _('show tags')),
4412 ('B', 'bookmarks', None, _('show bookmarks')),
4413 ('B', 'bookmarks', None, _('show bookmarks')),
4413 ] + remoteopts,
4414 ] + remoteopts,
4414 _('[-nibtB] [-r REV] [SOURCE]'),
4415 _('[-nibtB] [-r REV] [SOURCE]'),
4415 optionalrepo=True)
4416 optionalrepo=True)
4416 def identify(ui, repo, source=None, rev=None,
4417 def identify(ui, repo, source=None, rev=None,
4417 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4418 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4418 """identify the working directory or specified revision
4419 """identify the working directory or specified revision
4419
4420
4420 Print a summary identifying the repository state at REV using one or
4421 Print a summary identifying the repository state at REV using one or
4421 two parent hash identifiers, followed by a "+" if the working
4422 two parent hash identifiers, followed by a "+" if the working
4422 directory has uncommitted changes, the branch name (if not default),
4423 directory has uncommitted changes, the branch name (if not default),
4423 a list of tags, and a list of bookmarks.
4424 a list of tags, and a list of bookmarks.
4424
4425
4425 When REV is not given, print a summary of the current state of the
4426 When REV is not given, print a summary of the current state of the
4426 repository.
4427 repository.
4427
4428
4428 Specifying a path to a repository root or Mercurial bundle will
4429 Specifying a path to a repository root or Mercurial bundle will
4429 cause lookup to operate on that repository/bundle.
4430 cause lookup to operate on that repository/bundle.
4430
4431
4431 .. container:: verbose
4432 .. container:: verbose
4432
4433
4433 Examples:
4434 Examples:
4434
4435
4435 - generate a build identifier for the working directory::
4436 - generate a build identifier for the working directory::
4436
4437
4437 hg id --id > build-id.dat
4438 hg id --id > build-id.dat
4438
4439
4439 - find the revision corresponding to a tag::
4440 - find the revision corresponding to a tag::
4440
4441
4441 hg id -n -r 1.3
4442 hg id -n -r 1.3
4442
4443
4443 - check the most recent revision of a remote repository::
4444 - check the most recent revision of a remote repository::
4444
4445
4445 hg id -r tip http://selenic.com/hg/
4446 hg id -r tip http://selenic.com/hg/
4446
4447
4447 See :hg:`log` for generating more information about specific revisions,
4448 See :hg:`log` for generating more information about specific revisions,
4448 including full hash identifiers.
4449 including full hash identifiers.
4449
4450
4450 Returns 0 if successful.
4451 Returns 0 if successful.
4451 """
4452 """
4452
4453
4453 if not repo and not source:
4454 if not repo and not source:
4454 raise error.Abort(_("there is no Mercurial repository here "
4455 raise error.Abort(_("there is no Mercurial repository here "
4455 "(.hg not found)"))
4456 "(.hg not found)"))
4456
4457
4457 if ui.debugflag:
4458 if ui.debugflag:
4458 hexfunc = hex
4459 hexfunc = hex
4459 else:
4460 else:
4460 hexfunc = short
4461 hexfunc = short
4461 default = not (num or id or branch or tags or bookmarks)
4462 default = not (num or id or branch or tags or bookmarks)
4462 output = []
4463 output = []
4463 revs = []
4464 revs = []
4464
4465
4465 if source:
4466 if source:
4466 source, branches = hg.parseurl(ui.expandpath(source))
4467 source, branches = hg.parseurl(ui.expandpath(source))
4467 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4468 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4468 repo = peer.local()
4469 repo = peer.local()
4469 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4470 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4470
4471
4471 if not repo:
4472 if not repo:
4472 if num or branch or tags:
4473 if num or branch or tags:
4473 raise error.Abort(
4474 raise error.Abort(
4474 _("can't query remote revision number, branch, or tags"))
4475 _("can't query remote revision number, branch, or tags"))
4475 if not rev and revs:
4476 if not rev and revs:
4476 rev = revs[0]
4477 rev = revs[0]
4477 if not rev:
4478 if not rev:
4478 rev = "tip"
4479 rev = "tip"
4479
4480
4480 remoterev = peer.lookup(rev)
4481 remoterev = peer.lookup(rev)
4481 if default or id:
4482 if default or id:
4482 output = [hexfunc(remoterev)]
4483 output = [hexfunc(remoterev)]
4483
4484
4484 def getbms():
4485 def getbms():
4485 bms = []
4486 bms = []
4486
4487
4487 if 'bookmarks' in peer.listkeys('namespaces'):
4488 if 'bookmarks' in peer.listkeys('namespaces'):
4488 hexremoterev = hex(remoterev)
4489 hexremoterev = hex(remoterev)
4489 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4490 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4490 if bmr == hexremoterev]
4491 if bmr == hexremoterev]
4491
4492
4492 return sorted(bms)
4493 return sorted(bms)
4493
4494
4494 if bookmarks:
4495 if bookmarks:
4495 output.extend(getbms())
4496 output.extend(getbms())
4496 elif default and not ui.quiet:
4497 elif default and not ui.quiet:
4497 # multiple bookmarks for a single parent separated by '/'
4498 # multiple bookmarks for a single parent separated by '/'
4498 bm = '/'.join(getbms())
4499 bm = '/'.join(getbms())
4499 if bm:
4500 if bm:
4500 output.append(bm)
4501 output.append(bm)
4501 else:
4502 else:
4502 ctx = scmutil.revsingle(repo, rev, None)
4503 ctx = scmutil.revsingle(repo, rev, None)
4503
4504
4504 if ctx.rev() is None:
4505 if ctx.rev() is None:
4505 ctx = repo[None]
4506 ctx = repo[None]
4506 parents = ctx.parents()
4507 parents = ctx.parents()
4507 taglist = []
4508 taglist = []
4508 for p in parents:
4509 for p in parents:
4509 taglist.extend(p.tags())
4510 taglist.extend(p.tags())
4510
4511
4511 changed = ""
4512 changed = ""
4512 if default or id or num:
4513 if default or id or num:
4513 if (any(repo.status())
4514 if (any(repo.status())
4514 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4515 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4515 changed = '+'
4516 changed = '+'
4516 if default or id:
4517 if default or id:
4517 output = ["%s%s" %
4518 output = ["%s%s" %
4518 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4519 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4519 if num:
4520 if num:
4520 output.append("%s%s" %
4521 output.append("%s%s" %
4521 ('+'.join([str(p.rev()) for p in parents]), changed))
4522 ('+'.join([str(p.rev()) for p in parents]), changed))
4522 else:
4523 else:
4523 if default or id:
4524 if default or id:
4524 output = [hexfunc(ctx.node())]
4525 output = [hexfunc(ctx.node())]
4525 if num:
4526 if num:
4526 output.append(str(ctx.rev()))
4527 output.append(str(ctx.rev()))
4527 taglist = ctx.tags()
4528 taglist = ctx.tags()
4528
4529
4529 if default and not ui.quiet:
4530 if default and not ui.quiet:
4530 b = ctx.branch()
4531 b = ctx.branch()
4531 if b != 'default':
4532 if b != 'default':
4532 output.append("(%s)" % b)
4533 output.append("(%s)" % b)
4533
4534
4534 # multiple tags for a single parent separated by '/'
4535 # multiple tags for a single parent separated by '/'
4535 t = '/'.join(taglist)
4536 t = '/'.join(taglist)
4536 if t:
4537 if t:
4537 output.append(t)
4538 output.append(t)
4538
4539
4539 # multiple bookmarks for a single parent separated by '/'
4540 # multiple bookmarks for a single parent separated by '/'
4540 bm = '/'.join(ctx.bookmarks())
4541 bm = '/'.join(ctx.bookmarks())
4541 if bm:
4542 if bm:
4542 output.append(bm)
4543 output.append(bm)
4543 else:
4544 else:
4544 if branch:
4545 if branch:
4545 output.append(ctx.branch())
4546 output.append(ctx.branch())
4546
4547
4547 if tags:
4548 if tags:
4548 output.extend(taglist)
4549 output.extend(taglist)
4549
4550
4550 if bookmarks:
4551 if bookmarks:
4551 output.extend(ctx.bookmarks())
4552 output.extend(ctx.bookmarks())
4552
4553
4553 ui.write("%s\n" % ' '.join(output))
4554 ui.write("%s\n" % ' '.join(output))
4554
4555
4555 @command('import|patch',
4556 @command('import|patch',
4556 [('p', 'strip', 1,
4557 [('p', 'strip', 1,
4557 _('directory strip option for patch. This has the same '
4558 _('directory strip option for patch. This has the same '
4558 'meaning as the corresponding patch option'), _('NUM')),
4559 'meaning as the corresponding patch option'), _('NUM')),
4559 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4560 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4560 ('e', 'edit', False, _('invoke editor on commit messages')),
4561 ('e', 'edit', False, _('invoke editor on commit messages')),
4561 ('f', 'force', None,
4562 ('f', 'force', None,
4562 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4563 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4563 ('', 'no-commit', None,
4564 ('', 'no-commit', None,
4564 _("don't commit, just update the working directory")),
4565 _("don't commit, just update the working directory")),
4565 ('', 'bypass', None,
4566 ('', 'bypass', None,
4566 _("apply patch without touching the working directory")),
4567 _("apply patch without touching the working directory")),
4567 ('', 'partial', None,
4568 ('', 'partial', None,
4568 _('commit even if some hunks fail')),
4569 _('commit even if some hunks fail')),
4569 ('', 'exact', None,
4570 ('', 'exact', None,
4570 _('apply patch to the nodes from which it was generated')),
4571 _('apply patch to the nodes from which it was generated')),
4571 ('', 'prefix', '',
4572 ('', 'prefix', '',
4572 _('apply patch to subdirectory'), _('DIR')),
4573 _('apply patch to subdirectory'), _('DIR')),
4573 ('', 'import-branch', None,
4574 ('', 'import-branch', None,
4574 _('use any branch information in patch (implied by --exact)'))] +
4575 _('use any branch information in patch (implied by --exact)'))] +
4575 commitopts + commitopts2 + similarityopts,
4576 commitopts + commitopts2 + similarityopts,
4576 _('[OPTION]... PATCH...'))
4577 _('[OPTION]... PATCH...'))
4577 def import_(ui, repo, patch1=None, *patches, **opts):
4578 def import_(ui, repo, patch1=None, *patches, **opts):
4578 """import an ordered set of patches
4579 """import an ordered set of patches
4579
4580
4580 Import a list of patches and commit them individually (unless
4581 Import a list of patches and commit them individually (unless
4581 --no-commit is specified).
4582 --no-commit is specified).
4582
4583
4583 To read a patch from standard input, use "-" as the patch name. If
4584 To read a patch from standard input, use "-" as the patch name. If
4584 a URL is specified, the patch will be downloaded from there.
4585 a URL is specified, the patch will be downloaded from there.
4585
4586
4586 Import first applies changes to the working directory (unless
4587 Import first applies changes to the working directory (unless
4587 --bypass is specified), import will abort if there are outstanding
4588 --bypass is specified), import will abort if there are outstanding
4588 changes.
4589 changes.
4589
4590
4590 Use --bypass to apply and commit patches directly to the
4591 Use --bypass to apply and commit patches directly to the
4591 repository, without affecting the working directory. Without
4592 repository, without affecting the working directory. Without
4592 --exact, patches will be applied on top of the working directory
4593 --exact, patches will be applied on top of the working directory
4593 parent revision.
4594 parent revision.
4594
4595
4595 You can import a patch straight from a mail message. Even patches
4596 You can import a patch straight from a mail message. Even patches
4596 as attachments work (to use the body part, it must have type
4597 as attachments work (to use the body part, it must have type
4597 text/plain or text/x-patch). From and Subject headers of email
4598 text/plain or text/x-patch). From and Subject headers of email
4598 message are used as default committer and commit message. All
4599 message are used as default committer and commit message. All
4599 text/plain body parts before first diff are added to the commit
4600 text/plain body parts before first diff are added to the commit
4600 message.
4601 message.
4601
4602
4602 If the imported patch was generated by :hg:`export`, user and
4603 If the imported patch was generated by :hg:`export`, user and
4603 description from patch override values from message headers and
4604 description from patch override values from message headers and
4604 body. Values given on command line with -m/--message and -u/--user
4605 body. Values given on command line with -m/--message and -u/--user
4605 override these.
4606 override these.
4606
4607
4607 If --exact is specified, import will set the working directory to
4608 If --exact is specified, import will set the working directory to
4608 the parent of each patch before applying it, and will abort if the
4609 the parent of each patch before applying it, and will abort if the
4609 resulting changeset has a different ID than the one recorded in
4610 resulting changeset has a different ID than the one recorded in
4610 the patch. This may happen due to character set problems or other
4611 the patch. This may happen due to character set problems or other
4611 deficiencies in the text patch format.
4612 deficiencies in the text patch format.
4612
4613
4613 Use --partial to ensure a changeset will be created from the patch
4614 Use --partial to ensure a changeset will be created from the patch
4614 even if some hunks fail to apply. Hunks that fail to apply will be
4615 even if some hunks fail to apply. Hunks that fail to apply will be
4615 written to a <target-file>.rej file. Conflicts can then be resolved
4616 written to a <target-file>.rej file. Conflicts can then be resolved
4616 by hand before :hg:`commit --amend` is run to update the created
4617 by hand before :hg:`commit --amend` is run to update the created
4617 changeset. This flag exists to let people import patches that
4618 changeset. This flag exists to let people import patches that
4618 partially apply without losing the associated metadata (author,
4619 partially apply without losing the associated metadata (author,
4619 date, description, ...). Note that when none of the hunk applies
4620 date, description, ...). Note that when none of the hunk applies
4620 cleanly, :hg:`import --partial` will create an empty changeset,
4621 cleanly, :hg:`import --partial` will create an empty changeset,
4621 importing only the patch metadata.
4622 importing only the patch metadata.
4622
4623
4623 With -s/--similarity, hg will attempt to discover renames and
4624 With -s/--similarity, hg will attempt to discover renames and
4624 copies in the patch in the same way as :hg:`addremove`.
4625 copies in the patch in the same way as :hg:`addremove`.
4625
4626
4626 It is possible to use external patch programs to perform the patch
4627 It is possible to use external patch programs to perform the patch
4627 by setting the ``ui.patch`` configuration option. For the default
4628 by setting the ``ui.patch`` configuration option. For the default
4628 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4629 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4629 See :hg:`help config` for more information about configuration
4630 See :hg:`help config` for more information about configuration
4630 files and how to use these options.
4631 files and how to use these options.
4631
4632
4632 See :hg:`help dates` for a list of formats valid for -d/--date.
4633 See :hg:`help dates` for a list of formats valid for -d/--date.
4633
4634
4634 .. container:: verbose
4635 .. container:: verbose
4635
4636
4636 Examples:
4637 Examples:
4637
4638
4638 - import a traditional patch from a website and detect renames::
4639 - import a traditional patch from a website and detect renames::
4639
4640
4640 hg import -s 80 http://example.com/bugfix.patch
4641 hg import -s 80 http://example.com/bugfix.patch
4641
4642
4642 - import a changeset from an hgweb server::
4643 - import a changeset from an hgweb server::
4643
4644
4644 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4645 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4645
4646
4646 - import all the patches in an Unix-style mbox::
4647 - import all the patches in an Unix-style mbox::
4647
4648
4648 hg import incoming-patches.mbox
4649 hg import incoming-patches.mbox
4649
4650
4650 - attempt to exactly restore an exported changeset (not always
4651 - attempt to exactly restore an exported changeset (not always
4651 possible)::
4652 possible)::
4652
4653
4653 hg import --exact proposed-fix.patch
4654 hg import --exact proposed-fix.patch
4654
4655
4655 - use an external tool to apply a patch which is too fuzzy for
4656 - use an external tool to apply a patch which is too fuzzy for
4656 the default internal tool.
4657 the default internal tool.
4657
4658
4658 hg import --config ui.patch="patch --merge" fuzzy.patch
4659 hg import --config ui.patch="patch --merge" fuzzy.patch
4659
4660
4660 - change the default fuzzing from 2 to a less strict 7
4661 - change the default fuzzing from 2 to a less strict 7
4661
4662
4662 hg import --config ui.fuzz=7 fuzz.patch
4663 hg import --config ui.fuzz=7 fuzz.patch
4663
4664
4664 Returns 0 on success, 1 on partial success (see --partial).
4665 Returns 0 on success, 1 on partial success (see --partial).
4665 """
4666 """
4666
4667
4667 if not patch1:
4668 if not patch1:
4668 raise error.Abort(_('need at least one patch to import'))
4669 raise error.Abort(_('need at least one patch to import'))
4669
4670
4670 patches = (patch1,) + patches
4671 patches = (patch1,) + patches
4671
4672
4672 date = opts.get('date')
4673 date = opts.get('date')
4673 if date:
4674 if date:
4674 opts['date'] = util.parsedate(date)
4675 opts['date'] = util.parsedate(date)
4675
4676
4676 exact = opts.get('exact')
4677 exact = opts.get('exact')
4677 update = not opts.get('bypass')
4678 update = not opts.get('bypass')
4678 if not update and opts.get('no_commit'):
4679 if not update and opts.get('no_commit'):
4679 raise error.Abort(_('cannot use --no-commit with --bypass'))
4680 raise error.Abort(_('cannot use --no-commit with --bypass'))
4680 try:
4681 try:
4681 sim = float(opts.get('similarity') or 0)
4682 sim = float(opts.get('similarity') or 0)
4682 except ValueError:
4683 except ValueError:
4683 raise error.Abort(_('similarity must be a number'))
4684 raise error.Abort(_('similarity must be a number'))
4684 if sim < 0 or sim > 100:
4685 if sim < 0 or sim > 100:
4685 raise error.Abort(_('similarity must be between 0 and 100'))
4686 raise error.Abort(_('similarity must be between 0 and 100'))
4686 if sim and not update:
4687 if sim and not update:
4687 raise error.Abort(_('cannot use --similarity with --bypass'))
4688 raise error.Abort(_('cannot use --similarity with --bypass'))
4688 if exact:
4689 if exact:
4689 if opts.get('edit'):
4690 if opts.get('edit'):
4690 raise error.Abort(_('cannot use --exact with --edit'))
4691 raise error.Abort(_('cannot use --exact with --edit'))
4691 if opts.get('prefix'):
4692 if opts.get('prefix'):
4692 raise error.Abort(_('cannot use --exact with --prefix'))
4693 raise error.Abort(_('cannot use --exact with --prefix'))
4693
4694
4694 base = opts["base"]
4695 base = opts["base"]
4695 wlock = dsguard = lock = tr = None
4696 wlock = dsguard = lock = tr = None
4696 msgs = []
4697 msgs = []
4697 ret = 0
4698 ret = 0
4698
4699
4699
4700
4700 try:
4701 try:
4701 try:
4702 try:
4702 wlock = repo.wlock()
4703 wlock = repo.wlock()
4703
4704
4704 if update:
4705 if update:
4705 cmdutil.checkunfinished(repo)
4706 cmdutil.checkunfinished(repo)
4706 if (exact or not opts.get('force')):
4707 if (exact or not opts.get('force')):
4707 cmdutil.bailifchanged(repo)
4708 cmdutil.bailifchanged(repo)
4708
4709
4709 if not opts.get('no_commit'):
4710 if not opts.get('no_commit'):
4710 lock = repo.lock()
4711 lock = repo.lock()
4711 tr = repo.transaction('import')
4712 tr = repo.transaction('import')
4712 else:
4713 else:
4713 dsguard = cmdutil.dirstateguard(repo, 'import')
4714 dsguard = cmdutil.dirstateguard(repo, 'import')
4714 parents = repo[None].parents()
4715 parents = repo[None].parents()
4715 for patchurl in patches:
4716 for patchurl in patches:
4716 if patchurl == '-':
4717 if patchurl == '-':
4717 ui.status(_('applying patch from stdin\n'))
4718 ui.status(_('applying patch from stdin\n'))
4718 patchfile = ui.fin
4719 patchfile = ui.fin
4719 patchurl = 'stdin' # for error message
4720 patchurl = 'stdin' # for error message
4720 else:
4721 else:
4721 patchurl = os.path.join(base, patchurl)
4722 patchurl = os.path.join(base, patchurl)
4722 ui.status(_('applying %s\n') % patchurl)
4723 ui.status(_('applying %s\n') % patchurl)
4723 patchfile = hg.openpath(ui, patchurl)
4724 patchfile = hg.openpath(ui, patchurl)
4724
4725
4725 haspatch = False
4726 haspatch = False
4726 for hunk in patch.split(patchfile):
4727 for hunk in patch.split(patchfile):
4727 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4728 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4728 parents, opts,
4729 parents, opts,
4729 msgs, hg.clean)
4730 msgs, hg.clean)
4730 if msg:
4731 if msg:
4731 haspatch = True
4732 haspatch = True
4732 ui.note(msg + '\n')
4733 ui.note(msg + '\n')
4733 if update or exact:
4734 if update or exact:
4734 parents = repo[None].parents()
4735 parents = repo[None].parents()
4735 else:
4736 else:
4736 parents = [repo[node]]
4737 parents = [repo[node]]
4737 if rej:
4738 if rej:
4738 ui.write_err(_("patch applied partially\n"))
4739 ui.write_err(_("patch applied partially\n"))
4739 ui.write_err(_("(fix the .rej files and run "
4740 ui.write_err(_("(fix the .rej files and run "
4740 "`hg commit --amend`)\n"))
4741 "`hg commit --amend`)\n"))
4741 ret = 1
4742 ret = 1
4742 break
4743 break
4743
4744
4744 if not haspatch:
4745 if not haspatch:
4745 raise error.Abort(_('%s: no diffs found') % patchurl)
4746 raise error.Abort(_('%s: no diffs found') % patchurl)
4746
4747
4747 if tr:
4748 if tr:
4748 tr.close()
4749 tr.close()
4749 if msgs:
4750 if msgs:
4750 repo.savecommitmessage('\n* * *\n'.join(msgs))
4751 repo.savecommitmessage('\n* * *\n'.join(msgs))
4751 if dsguard:
4752 if dsguard:
4752 dsguard.close()
4753 dsguard.close()
4753 return ret
4754 return ret
4754 finally:
4755 finally:
4755 # TODO: get rid of this meaningless try/finally enclosing.
4756 # TODO: get rid of this meaningless try/finally enclosing.
4756 # this is kept only to reduce changes in a patch.
4757 # this is kept only to reduce changes in a patch.
4757 pass
4758 pass
4758 finally:
4759 finally:
4759 if tr:
4760 if tr:
4760 tr.release()
4761 tr.release()
4761 release(lock, dsguard, wlock)
4762 release(lock, dsguard, wlock)
4762
4763
4763 @command('incoming|in',
4764 @command('incoming|in',
4764 [('f', 'force', None,
4765 [('f', 'force', None,
4765 _('run even if remote repository is unrelated')),
4766 _('run even if remote repository is unrelated')),
4766 ('n', 'newest-first', None, _('show newest record first')),
4767 ('n', 'newest-first', None, _('show newest record first')),
4767 ('', 'bundle', '',
4768 ('', 'bundle', '',
4768 _('file to store the bundles into'), _('FILE')),
4769 _('file to store the bundles into'), _('FILE')),
4769 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4770 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4770 ('B', 'bookmarks', False, _("compare bookmarks")),
4771 ('B', 'bookmarks', False, _("compare bookmarks")),
4771 ('b', 'branch', [],
4772 ('b', 'branch', [],
4772 _('a specific branch you would like to pull'), _('BRANCH')),
4773 _('a specific branch you would like to pull'), _('BRANCH')),
4773 ] + logopts + remoteopts + subrepoopts,
4774 ] + logopts + remoteopts + subrepoopts,
4774 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
4775 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
4775 def incoming(ui, repo, source="default", **opts):
4776 def incoming(ui, repo, source="default", **opts):
4776 """show new changesets found in source
4777 """show new changesets found in source
4777
4778
4778 Show new changesets found in the specified path/URL or the default
4779 Show new changesets found in the specified path/URL or the default
4779 pull location. These are the changesets that would have been pulled
4780 pull location. These are the changesets that would have been pulled
4780 if a pull at the time you issued this command.
4781 if a pull at the time you issued this command.
4781
4782
4782 See pull for valid source format details.
4783 See pull for valid source format details.
4783
4784
4784 .. container:: verbose
4785 .. container:: verbose
4785
4786
4786 With -B/--bookmarks, the result of bookmark comparison between
4787 With -B/--bookmarks, the result of bookmark comparison between
4787 local and remote repositories is displayed. With -v/--verbose,
4788 local and remote repositories is displayed. With -v/--verbose,
4788 status is also displayed for each bookmark like below::
4789 status is also displayed for each bookmark like below::
4789
4790
4790 BM1 01234567890a added
4791 BM1 01234567890a added
4791 BM2 1234567890ab advanced
4792 BM2 1234567890ab advanced
4792 BM3 234567890abc diverged
4793 BM3 234567890abc diverged
4793 BM4 34567890abcd changed
4794 BM4 34567890abcd changed
4794
4795
4795 The action taken locally when pulling depends on the
4796 The action taken locally when pulling depends on the
4796 status of each bookmark:
4797 status of each bookmark:
4797
4798
4798 :``added``: pull will create it
4799 :``added``: pull will create it
4799 :``advanced``: pull will update it
4800 :``advanced``: pull will update it
4800 :``diverged``: pull will create a divergent bookmark
4801 :``diverged``: pull will create a divergent bookmark
4801 :``changed``: result depends on remote changesets
4802 :``changed``: result depends on remote changesets
4802
4803
4803 From the point of view of pulling behavior, bookmark
4804 From the point of view of pulling behavior, bookmark
4804 existing only in the remote repository are treated as ``added``,
4805 existing only in the remote repository are treated as ``added``,
4805 even if it is in fact locally deleted.
4806 even if it is in fact locally deleted.
4806
4807
4807 .. container:: verbose
4808 .. container:: verbose
4808
4809
4809 For remote repository, using --bundle avoids downloading the
4810 For remote repository, using --bundle avoids downloading the
4810 changesets twice if the incoming is followed by a pull.
4811 changesets twice if the incoming is followed by a pull.
4811
4812
4812 Examples:
4813 Examples:
4813
4814
4814 - show incoming changes with patches and full description::
4815 - show incoming changes with patches and full description::
4815
4816
4816 hg incoming -vp
4817 hg incoming -vp
4817
4818
4818 - show incoming changes excluding merges, store a bundle::
4819 - show incoming changes excluding merges, store a bundle::
4819
4820
4820 hg in -vpM --bundle incoming.hg
4821 hg in -vpM --bundle incoming.hg
4821 hg pull incoming.hg
4822 hg pull incoming.hg
4822
4823
4823 - briefly list changes inside a bundle::
4824 - briefly list changes inside a bundle::
4824
4825
4825 hg in changes.hg -T "{desc|firstline}\\n"
4826 hg in changes.hg -T "{desc|firstline}\\n"
4826
4827
4827 Returns 0 if there are incoming changes, 1 otherwise.
4828 Returns 0 if there are incoming changes, 1 otherwise.
4828 """
4829 """
4829 if opts.get('graph'):
4830 if opts.get('graph'):
4830 cmdutil.checkunsupportedgraphflags([], opts)
4831 cmdutil.checkunsupportedgraphflags([], opts)
4831 def display(other, chlist, displayer):
4832 def display(other, chlist, displayer):
4832 revdag = cmdutil.graphrevs(other, chlist, opts)
4833 revdag = cmdutil.graphrevs(other, chlist, opts)
4833 cmdutil.displaygraph(ui, repo, revdag, displayer,
4834 cmdutil.displaygraph(ui, repo, revdag, displayer,
4834 graphmod.asciiedges)
4835 graphmod.asciiedges)
4835
4836
4836 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4837 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4837 return 0
4838 return 0
4838
4839
4839 if opts.get('bundle') and opts.get('subrepos'):
4840 if opts.get('bundle') and opts.get('subrepos'):
4840 raise error.Abort(_('cannot combine --bundle and --subrepos'))
4841 raise error.Abort(_('cannot combine --bundle and --subrepos'))
4841
4842
4842 if opts.get('bookmarks'):
4843 if opts.get('bookmarks'):
4843 source, branches = hg.parseurl(ui.expandpath(source),
4844 source, branches = hg.parseurl(ui.expandpath(source),
4844 opts.get('branch'))
4845 opts.get('branch'))
4845 other = hg.peer(repo, opts, source)
4846 other = hg.peer(repo, opts, source)
4846 if 'bookmarks' not in other.listkeys('namespaces'):
4847 if 'bookmarks' not in other.listkeys('namespaces'):
4847 ui.warn(_("remote doesn't support bookmarks\n"))
4848 ui.warn(_("remote doesn't support bookmarks\n"))
4848 return 0
4849 return 0
4849 ui.status(_('comparing with %s\n') % util.hidepassword(source))
4850 ui.status(_('comparing with %s\n') % util.hidepassword(source))
4850 return bookmarks.incoming(ui, repo, other)
4851 return bookmarks.incoming(ui, repo, other)
4851
4852
4852 repo._subtoppath = ui.expandpath(source)
4853 repo._subtoppath = ui.expandpath(source)
4853 try:
4854 try:
4854 return hg.incoming(ui, repo, source, opts)
4855 return hg.incoming(ui, repo, source, opts)
4855 finally:
4856 finally:
4856 del repo._subtoppath
4857 del repo._subtoppath
4857
4858
4858
4859
4859 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
4860 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
4860 norepo=True)
4861 norepo=True)
4861 def init(ui, dest=".", **opts):
4862 def init(ui, dest=".", **opts):
4862 """create a new repository in the given directory
4863 """create a new repository in the given directory
4863
4864
4864 Initialize a new repository in the given directory. If the given
4865 Initialize a new repository in the given directory. If the given
4865 directory does not exist, it will be created.
4866 directory does not exist, it will be created.
4866
4867
4867 If no directory is given, the current directory is used.
4868 If no directory is given, the current directory is used.
4868
4869
4869 It is possible to specify an ``ssh://`` URL as the destination.
4870 It is possible to specify an ``ssh://`` URL as the destination.
4870 See :hg:`help urls` for more information.
4871 See :hg:`help urls` for more information.
4871
4872
4872 Returns 0 on success.
4873 Returns 0 on success.
4873 """
4874 """
4874 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4875 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4875
4876
4876 @command('locate',
4877 @command('locate',
4877 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
4878 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
4878 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4879 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4879 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
4880 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
4880 ] + walkopts,
4881 ] + walkopts,
4881 _('[OPTION]... [PATTERN]...'))
4882 _('[OPTION]... [PATTERN]...'))
4882 def locate(ui, repo, *pats, **opts):
4883 def locate(ui, repo, *pats, **opts):
4883 """locate files matching specific patterns (DEPRECATED)
4884 """locate files matching specific patterns (DEPRECATED)
4884
4885
4885 Print files under Mercurial control in the working directory whose
4886 Print files under Mercurial control in the working directory whose
4886 names match the given patterns.
4887 names match the given patterns.
4887
4888
4888 By default, this command searches all directories in the working
4889 By default, this command searches all directories in the working
4889 directory. To search just the current directory and its
4890 directory. To search just the current directory and its
4890 subdirectories, use "--include .".
4891 subdirectories, use "--include .".
4891
4892
4892 If no patterns are given to match, this command prints the names
4893 If no patterns are given to match, this command prints the names
4893 of all files under Mercurial control in the working directory.
4894 of all files under Mercurial control in the working directory.
4894
4895
4895 If you want to feed the output of this command into the "xargs"
4896 If you want to feed the output of this command into the "xargs"
4896 command, use the -0 option to both this command and "xargs". This
4897 command, use the -0 option to both this command and "xargs". This
4897 will avoid the problem of "xargs" treating single filenames that
4898 will avoid the problem of "xargs" treating single filenames that
4898 contain whitespace as multiple filenames.
4899 contain whitespace as multiple filenames.
4899
4900
4900 See :hg:`help files` for a more versatile command.
4901 See :hg:`help files` for a more versatile command.
4901
4902
4902 Returns 0 if a match is found, 1 otherwise.
4903 Returns 0 if a match is found, 1 otherwise.
4903 """
4904 """
4904 if opts.get('print0'):
4905 if opts.get('print0'):
4905 end = '\0'
4906 end = '\0'
4906 else:
4907 else:
4907 end = '\n'
4908 end = '\n'
4908 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
4909 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
4909
4910
4910 ret = 1
4911 ret = 1
4911 ctx = repo[rev]
4912 ctx = repo[rev]
4912 m = scmutil.match(ctx, pats, opts, default='relglob',
4913 m = scmutil.match(ctx, pats, opts, default='relglob',
4913 badfn=lambda x, y: False)
4914 badfn=lambda x, y: False)
4914
4915
4915 for abs in ctx.matches(m):
4916 for abs in ctx.matches(m):
4916 if opts.get('fullpath'):
4917 if opts.get('fullpath'):
4917 ui.write(repo.wjoin(abs), end)
4918 ui.write(repo.wjoin(abs), end)
4918 else:
4919 else:
4919 ui.write(((pats and m.rel(abs)) or abs), end)
4920 ui.write(((pats and m.rel(abs)) or abs), end)
4920 ret = 0
4921 ret = 0
4921
4922
4922 return ret
4923 return ret
4923
4924
4924 @command('^log|history',
4925 @command('^log|history',
4925 [('f', 'follow', None,
4926 [('f', 'follow', None,
4926 _('follow changeset history, or file history across copies and renames')),
4927 _('follow changeset history, or file history across copies and renames')),
4927 ('', 'follow-first', None,
4928 ('', 'follow-first', None,
4928 _('only follow the first parent of merge changesets (DEPRECATED)')),
4929 _('only follow the first parent of merge changesets (DEPRECATED)')),
4929 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
4930 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
4930 ('C', 'copies', None, _('show copied files')),
4931 ('C', 'copies', None, _('show copied files')),
4931 ('k', 'keyword', [],
4932 ('k', 'keyword', [],
4932 _('do case-insensitive search for a given text'), _('TEXT')),
4933 _('do case-insensitive search for a given text'), _('TEXT')),
4933 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
4934 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
4934 ('', 'removed', None, _('include revisions where files were removed')),
4935 ('', 'removed', None, _('include revisions where files were removed')),
4935 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
4936 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
4936 ('u', 'user', [], _('revisions committed by user'), _('USER')),
4937 ('u', 'user', [], _('revisions committed by user'), _('USER')),
4937 ('', 'only-branch', [],
4938 ('', 'only-branch', [],
4938 _('show only changesets within the given named branch (DEPRECATED)'),
4939 _('show only changesets within the given named branch (DEPRECATED)'),
4939 _('BRANCH')),
4940 _('BRANCH')),
4940 ('b', 'branch', [],
4941 ('b', 'branch', [],
4941 _('show changesets within the given named branch'), _('BRANCH')),
4942 _('show changesets within the given named branch'), _('BRANCH')),
4942 ('P', 'prune', [],
4943 ('P', 'prune', [],
4943 _('do not display revision or any of its ancestors'), _('REV')),
4944 _('do not display revision or any of its ancestors'), _('REV')),
4944 ] + logopts + walkopts,
4945 ] + logopts + walkopts,
4945 _('[OPTION]... [FILE]'),
4946 _('[OPTION]... [FILE]'),
4946 inferrepo=True)
4947 inferrepo=True)
4947 def log(ui, repo, *pats, **opts):
4948 def log(ui, repo, *pats, **opts):
4948 """show revision history of entire repository or files
4949 """show revision history of entire repository or files
4949
4950
4950 Print the revision history of the specified files or the entire
4951 Print the revision history of the specified files or the entire
4951 project.
4952 project.
4952
4953
4953 If no revision range is specified, the default is ``tip:0`` unless
4954 If no revision range is specified, the default is ``tip:0`` unless
4954 --follow is set, in which case the working directory parent is
4955 --follow is set, in which case the working directory parent is
4955 used as the starting revision.
4956 used as the starting revision.
4956
4957
4957 File history is shown without following rename or copy history of
4958 File history is shown without following rename or copy history of
4958 files. Use -f/--follow with a filename to follow history across
4959 files. Use -f/--follow with a filename to follow history across
4959 renames and copies. --follow without a filename will only show
4960 renames and copies. --follow without a filename will only show
4960 ancestors or descendants of the starting revision.
4961 ancestors or descendants of the starting revision.
4961
4962
4962 By default this command prints revision number and changeset id,
4963 By default this command prints revision number and changeset id,
4963 tags, non-trivial parents, user, date and time, and a summary for
4964 tags, non-trivial parents, user, date and time, and a summary for
4964 each commit. When the -v/--verbose switch is used, the list of
4965 each commit. When the -v/--verbose switch is used, the list of
4965 changed files and full commit message are shown.
4966 changed files and full commit message are shown.
4966
4967
4967 With --graph the revisions are shown as an ASCII art DAG with the most
4968 With --graph the revisions are shown as an ASCII art DAG with the most
4968 recent changeset at the top.
4969 recent changeset at the top.
4969 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
4970 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
4970 and '+' represents a fork where the changeset from the lines below is a
4971 and '+' represents a fork where the changeset from the lines below is a
4971 parent of the 'o' merge on the same line.
4972 parent of the 'o' merge on the same line.
4972
4973
4973 .. note::
4974 .. note::
4974
4975
4975 log -p/--patch may generate unexpected diff output for merge
4976 log -p/--patch may generate unexpected diff output for merge
4976 changesets, as it will only compare the merge changeset against
4977 changesets, as it will only compare the merge changeset against
4977 its first parent. Also, only files different from BOTH parents
4978 its first parent. Also, only files different from BOTH parents
4978 will appear in files:.
4979 will appear in files:.
4979
4980
4980 .. note::
4981 .. note::
4981
4982
4982 for performance reasons, log FILE may omit duplicate changes
4983 for performance reasons, log FILE may omit duplicate changes
4983 made on branches and will not show removals or mode changes. To
4984 made on branches and will not show removals or mode changes. To
4984 see all such changes, use the --removed switch.
4985 see all such changes, use the --removed switch.
4985
4986
4986 .. container:: verbose
4987 .. container:: verbose
4987
4988
4988 Some examples:
4989 Some examples:
4989
4990
4990 - changesets with full descriptions and file lists::
4991 - changesets with full descriptions and file lists::
4991
4992
4992 hg log -v
4993 hg log -v
4993
4994
4994 - changesets ancestral to the working directory::
4995 - changesets ancestral to the working directory::
4995
4996
4996 hg log -f
4997 hg log -f
4997
4998
4998 - last 10 commits on the current branch::
4999 - last 10 commits on the current branch::
4999
5000
5000 hg log -l 10 -b .
5001 hg log -l 10 -b .
5001
5002
5002 - changesets showing all modifications of a file, including removals::
5003 - changesets showing all modifications of a file, including removals::
5003
5004
5004 hg log --removed file.c
5005 hg log --removed file.c
5005
5006
5006 - all changesets that touch a directory, with diffs, excluding merges::
5007 - all changesets that touch a directory, with diffs, excluding merges::
5007
5008
5008 hg log -Mp lib/
5009 hg log -Mp lib/
5009
5010
5010 - all revision numbers that match a keyword::
5011 - all revision numbers that match a keyword::
5011
5012
5012 hg log -k bug --template "{rev}\\n"
5013 hg log -k bug --template "{rev}\\n"
5013
5014
5014 - the full hash identifier of the working directory parent::
5015 - the full hash identifier of the working directory parent::
5015
5016
5016 hg log -r . --template "{node}\\n"
5017 hg log -r . --template "{node}\\n"
5017
5018
5018 - list available log templates::
5019 - list available log templates::
5019
5020
5020 hg log -T list
5021 hg log -T list
5021
5022
5022 - check if a given changeset is included in a tagged release::
5023 - check if a given changeset is included in a tagged release::
5023
5024
5024 hg log -r "a21ccf and ancestor(1.9)"
5025 hg log -r "a21ccf and ancestor(1.9)"
5025
5026
5026 - find all changesets by some user in a date range::
5027 - find all changesets by some user in a date range::
5027
5028
5028 hg log -k alice -d "may 2008 to jul 2008"
5029 hg log -k alice -d "may 2008 to jul 2008"
5029
5030
5030 - summary of all changesets after the last tag::
5031 - summary of all changesets after the last tag::
5031
5032
5032 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5033 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5033
5034
5034 See :hg:`help dates` for a list of formats valid for -d/--date.
5035 See :hg:`help dates` for a list of formats valid for -d/--date.
5035
5036
5036 See :hg:`help revisions` and :hg:`help revsets` for more about
5037 See :hg:`help revisions` and :hg:`help revsets` for more about
5037 specifying revisions.
5038 specifying revisions.
5038
5039
5039 See :hg:`help templates` for more about pre-packaged styles and
5040 See :hg:`help templates` for more about pre-packaged styles and
5040 specifying custom templates.
5041 specifying custom templates.
5041
5042
5042 Returns 0 on success.
5043 Returns 0 on success.
5043
5044
5044 """
5045 """
5045 if opts.get('follow') and opts.get('rev'):
5046 if opts.get('follow') and opts.get('rev'):
5046 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5047 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5047 del opts['follow']
5048 del opts['follow']
5048
5049
5049 if opts.get('graph'):
5050 if opts.get('graph'):
5050 return cmdutil.graphlog(ui, repo, *pats, **opts)
5051 return cmdutil.graphlog(ui, repo, *pats, **opts)
5051
5052
5052 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5053 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5053 limit = cmdutil.loglimit(opts)
5054 limit = cmdutil.loglimit(opts)
5054 count = 0
5055 count = 0
5055
5056
5056 getrenamed = None
5057 getrenamed = None
5057 if opts.get('copies'):
5058 if opts.get('copies'):
5058 endrev = None
5059 endrev = None
5059 if opts.get('rev'):
5060 if opts.get('rev'):
5060 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5061 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5061 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5062 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5062
5063
5063 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5064 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5064 for rev in revs:
5065 for rev in revs:
5065 if count == limit:
5066 if count == limit:
5066 break
5067 break
5067 ctx = repo[rev]
5068 ctx = repo[rev]
5068 copies = None
5069 copies = None
5069 if getrenamed is not None and rev:
5070 if getrenamed is not None and rev:
5070 copies = []
5071 copies = []
5071 for fn in ctx.files():
5072 for fn in ctx.files():
5072 rename = getrenamed(fn, rev)
5073 rename = getrenamed(fn, rev)
5073 if rename:
5074 if rename:
5074 copies.append((fn, rename[0]))
5075 copies.append((fn, rename[0]))
5075 if filematcher:
5076 if filematcher:
5076 revmatchfn = filematcher(ctx.rev())
5077 revmatchfn = filematcher(ctx.rev())
5077 else:
5078 else:
5078 revmatchfn = None
5079 revmatchfn = None
5079 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5080 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5080 if displayer.flush(ctx):
5081 if displayer.flush(ctx):
5081 count += 1
5082 count += 1
5082
5083
5083 displayer.close()
5084 displayer.close()
5084
5085
5085 @command('manifest',
5086 @command('manifest',
5086 [('r', 'rev', '', _('revision to display'), _('REV')),
5087 [('r', 'rev', '', _('revision to display'), _('REV')),
5087 ('', 'all', False, _("list files from all revisions"))]
5088 ('', 'all', False, _("list files from all revisions"))]
5088 + formatteropts,
5089 + formatteropts,
5089 _('[-r REV]'))
5090 _('[-r REV]'))
5090 def manifest(ui, repo, node=None, rev=None, **opts):
5091 def manifest(ui, repo, node=None, rev=None, **opts):
5091 """output the current or given revision of the project manifest
5092 """output the current or given revision of the project manifest
5092
5093
5093 Print a list of version controlled files for the given revision.
5094 Print a list of version controlled files for the given revision.
5094 If no revision is given, the first parent of the working directory
5095 If no revision is given, the first parent of the working directory
5095 is used, or the null revision if no revision is checked out.
5096 is used, or the null revision if no revision is checked out.
5096
5097
5097 With -v, print file permissions, symlink and executable bits.
5098 With -v, print file permissions, symlink and executable bits.
5098 With --debug, print file revision hashes.
5099 With --debug, print file revision hashes.
5099
5100
5100 If option --all is specified, the list of all files from all revisions
5101 If option --all is specified, the list of all files from all revisions
5101 is printed. This includes deleted and renamed files.
5102 is printed. This includes deleted and renamed files.
5102
5103
5103 Returns 0 on success.
5104 Returns 0 on success.
5104 """
5105 """
5105
5106
5106 fm = ui.formatter('manifest', opts)
5107 fm = ui.formatter('manifest', opts)
5107
5108
5108 if opts.get('all'):
5109 if opts.get('all'):
5109 if rev or node:
5110 if rev or node:
5110 raise error.Abort(_("can't specify a revision with --all"))
5111 raise error.Abort(_("can't specify a revision with --all"))
5111
5112
5112 res = []
5113 res = []
5113 prefix = "data/"
5114 prefix = "data/"
5114 suffix = ".i"
5115 suffix = ".i"
5115 plen = len(prefix)
5116 plen = len(prefix)
5116 slen = len(suffix)
5117 slen = len(suffix)
5117 lock = repo.lock()
5118 lock = repo.lock()
5118 try:
5119 try:
5119 for fn, b, size in repo.store.datafiles():
5120 for fn, b, size in repo.store.datafiles():
5120 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5121 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5121 res.append(fn[plen:-slen])
5122 res.append(fn[plen:-slen])
5122 finally:
5123 finally:
5123 lock.release()
5124 lock.release()
5124 for f in res:
5125 for f in res:
5125 fm.startitem()
5126 fm.startitem()
5126 fm.write("path", '%s\n', f)
5127 fm.write("path", '%s\n', f)
5127 fm.end()
5128 fm.end()
5128 return
5129 return
5129
5130
5130 if rev and node:
5131 if rev and node:
5131 raise error.Abort(_("please specify just one revision"))
5132 raise error.Abort(_("please specify just one revision"))
5132
5133
5133 if not node:
5134 if not node:
5134 node = rev
5135 node = rev
5135
5136
5136 char = {'l': '@', 'x': '*', '': ''}
5137 char = {'l': '@', 'x': '*', '': ''}
5137 mode = {'l': '644', 'x': '755', '': '644'}
5138 mode = {'l': '644', 'x': '755', '': '644'}
5138 ctx = scmutil.revsingle(repo, node)
5139 ctx = scmutil.revsingle(repo, node)
5139 mf = ctx.manifest()
5140 mf = ctx.manifest()
5140 for f in ctx:
5141 for f in ctx:
5141 fm.startitem()
5142 fm.startitem()
5142 fl = ctx[f].flags()
5143 fl = ctx[f].flags()
5143 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5144 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5144 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5145 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5145 fm.write('path', '%s\n', f)
5146 fm.write('path', '%s\n', f)
5146 fm.end()
5147 fm.end()
5147
5148
5148 @command('^merge',
5149 @command('^merge',
5149 [('f', 'force', None,
5150 [('f', 'force', None,
5150 _('force a merge including outstanding changes (DEPRECATED)')),
5151 _('force a merge including outstanding changes (DEPRECATED)')),
5151 ('r', 'rev', '', _('revision to merge'), _('REV')),
5152 ('r', 'rev', '', _('revision to merge'), _('REV')),
5152 ('P', 'preview', None,
5153 ('P', 'preview', None,
5153 _('review revisions to merge (no merge is performed)'))
5154 _('review revisions to merge (no merge is performed)'))
5154 ] + mergetoolopts,
5155 ] + mergetoolopts,
5155 _('[-P] [-f] [[-r] REV]'))
5156 _('[-P] [-f] [[-r] REV]'))
5156 def merge(ui, repo, node=None, **opts):
5157 def merge(ui, repo, node=None, **opts):
5157 """merge another revision into working directory
5158 """merge another revision into working directory
5158
5159
5159 The current working directory is updated with all changes made in
5160 The current working directory is updated with all changes made in
5160 the requested revision since the last common predecessor revision.
5161 the requested revision since the last common predecessor revision.
5161
5162
5162 Files that changed between either parent are marked as changed for
5163 Files that changed between either parent are marked as changed for
5163 the next commit and a commit must be performed before any further
5164 the next commit and a commit must be performed before any further
5164 updates to the repository are allowed. The next commit will have
5165 updates to the repository are allowed. The next commit will have
5165 two parents.
5166 two parents.
5166
5167
5167 ``--tool`` can be used to specify the merge tool used for file
5168 ``--tool`` can be used to specify the merge tool used for file
5168 merges. It overrides the HGMERGE environment variable and your
5169 merges. It overrides the HGMERGE environment variable and your
5169 configuration files. See :hg:`help merge-tools` for options.
5170 configuration files. See :hg:`help merge-tools` for options.
5170
5171
5171 If no revision is specified, the working directory's parent is a
5172 If no revision is specified, the working directory's parent is a
5172 head revision, and the current branch contains exactly one other
5173 head revision, and the current branch contains exactly one other
5173 head, the other head is merged with by default. Otherwise, an
5174 head, the other head is merged with by default. Otherwise, an
5174 explicit revision with which to merge with must be provided.
5175 explicit revision with which to merge with must be provided.
5175
5176
5176 :hg:`resolve` must be used to resolve unresolved files.
5177 :hg:`resolve` must be used to resolve unresolved files.
5177
5178
5178 To undo an uncommitted merge, use :hg:`update --clean .` which
5179 To undo an uncommitted merge, use :hg:`update --clean .` which
5179 will check out a clean copy of the original merge parent, losing
5180 will check out a clean copy of the original merge parent, losing
5180 all changes.
5181 all changes.
5181
5182
5182 Returns 0 on success, 1 if there are unresolved files.
5183 Returns 0 on success, 1 if there are unresolved files.
5183 """
5184 """
5184
5185
5185 if opts.get('rev') and node:
5186 if opts.get('rev') and node:
5186 raise error.Abort(_("please specify just one revision"))
5187 raise error.Abort(_("please specify just one revision"))
5187 if not node:
5188 if not node:
5188 node = opts.get('rev')
5189 node = opts.get('rev')
5189
5190
5190 if node:
5191 if node:
5191 node = scmutil.revsingle(repo, node).node()
5192 node = scmutil.revsingle(repo, node).node()
5192
5193
5193 if not node:
5194 if not node:
5194 node = repo[destutil.destmerge(repo)].node()
5195 node = repo[destutil.destmerge(repo)].node()
5195
5196
5196 if opts.get('preview'):
5197 if opts.get('preview'):
5197 # find nodes that are ancestors of p2 but not of p1
5198 # find nodes that are ancestors of p2 but not of p1
5198 p1 = repo.lookup('.')
5199 p1 = repo.lookup('.')
5199 p2 = repo.lookup(node)
5200 p2 = repo.lookup(node)
5200 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5201 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5201
5202
5202 displayer = cmdutil.show_changeset(ui, repo, opts)
5203 displayer = cmdutil.show_changeset(ui, repo, opts)
5203 for node in nodes:
5204 for node in nodes:
5204 displayer.show(repo[node])
5205 displayer.show(repo[node])
5205 displayer.close()
5206 displayer.close()
5206 return 0
5207 return 0
5207
5208
5208 try:
5209 try:
5209 # ui.forcemerge is an internal variable, do not document
5210 # ui.forcemerge is an internal variable, do not document
5210 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5211 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5211 return hg.merge(repo, node, force=opts.get('force'))
5212 return hg.merge(repo, node, force=opts.get('force'))
5212 finally:
5213 finally:
5213 ui.setconfig('ui', 'forcemerge', '', 'merge')
5214 ui.setconfig('ui', 'forcemerge', '', 'merge')
5214
5215
5215 @command('outgoing|out',
5216 @command('outgoing|out',
5216 [('f', 'force', None, _('run even when the destination is unrelated')),
5217 [('f', 'force', None, _('run even when the destination is unrelated')),
5217 ('r', 'rev', [],
5218 ('r', 'rev', [],
5218 _('a changeset intended to be included in the destination'), _('REV')),
5219 _('a changeset intended to be included in the destination'), _('REV')),
5219 ('n', 'newest-first', None, _('show newest record first')),
5220 ('n', 'newest-first', None, _('show newest record first')),
5220 ('B', 'bookmarks', False, _('compare bookmarks')),
5221 ('B', 'bookmarks', False, _('compare bookmarks')),
5221 ('b', 'branch', [], _('a specific branch you would like to push'),
5222 ('b', 'branch', [], _('a specific branch you would like to push'),
5222 _('BRANCH')),
5223 _('BRANCH')),
5223 ] + logopts + remoteopts + subrepoopts,
5224 ] + logopts + remoteopts + subrepoopts,
5224 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5225 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5225 def outgoing(ui, repo, dest=None, **opts):
5226 def outgoing(ui, repo, dest=None, **opts):
5226 """show changesets not found in the destination
5227 """show changesets not found in the destination
5227
5228
5228 Show changesets not found in the specified destination repository
5229 Show changesets not found in the specified destination repository
5229 or the default push location. These are the changesets that would
5230 or the default push location. These are the changesets that would
5230 be pushed if a push was requested.
5231 be pushed if a push was requested.
5231
5232
5232 See pull for details of valid destination formats.
5233 See pull for details of valid destination formats.
5233
5234
5234 .. container:: verbose
5235 .. container:: verbose
5235
5236
5236 With -B/--bookmarks, the result of bookmark comparison between
5237 With -B/--bookmarks, the result of bookmark comparison between
5237 local and remote repositories is displayed. With -v/--verbose,
5238 local and remote repositories is displayed. With -v/--verbose,
5238 status is also displayed for each bookmark like below::
5239 status is also displayed for each bookmark like below::
5239
5240
5240 BM1 01234567890a added
5241 BM1 01234567890a added
5241 BM2 deleted
5242 BM2 deleted
5242 BM3 234567890abc advanced
5243 BM3 234567890abc advanced
5243 BM4 34567890abcd diverged
5244 BM4 34567890abcd diverged
5244 BM5 4567890abcde changed
5245 BM5 4567890abcde changed
5245
5246
5246 The action taken when pushing depends on the
5247 The action taken when pushing depends on the
5247 status of each bookmark:
5248 status of each bookmark:
5248
5249
5249 :``added``: push with ``-B`` will create it
5250 :``added``: push with ``-B`` will create it
5250 :``deleted``: push with ``-B`` will delete it
5251 :``deleted``: push with ``-B`` will delete it
5251 :``advanced``: push will update it
5252 :``advanced``: push will update it
5252 :``diverged``: push with ``-B`` will update it
5253 :``diverged``: push with ``-B`` will update it
5253 :``changed``: push with ``-B`` will update it
5254 :``changed``: push with ``-B`` will update it
5254
5255
5255 From the point of view of pushing behavior, bookmarks
5256 From the point of view of pushing behavior, bookmarks
5256 existing only in the remote repository are treated as
5257 existing only in the remote repository are treated as
5257 ``deleted``, even if it is in fact added remotely.
5258 ``deleted``, even if it is in fact added remotely.
5258
5259
5259 Returns 0 if there are outgoing changes, 1 otherwise.
5260 Returns 0 if there are outgoing changes, 1 otherwise.
5260 """
5261 """
5261 if opts.get('graph'):
5262 if opts.get('graph'):
5262 cmdutil.checkunsupportedgraphflags([], opts)
5263 cmdutil.checkunsupportedgraphflags([], opts)
5263 o, other = hg._outgoing(ui, repo, dest, opts)
5264 o, other = hg._outgoing(ui, repo, dest, opts)
5264 if not o:
5265 if not o:
5265 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5266 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5266 return
5267 return
5267
5268
5268 revdag = cmdutil.graphrevs(repo, o, opts)
5269 revdag = cmdutil.graphrevs(repo, o, opts)
5269 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5270 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5270 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5271 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5271 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5272 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5272 return 0
5273 return 0
5273
5274
5274 if opts.get('bookmarks'):
5275 if opts.get('bookmarks'):
5275 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5276 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5276 dest, branches = hg.parseurl(dest, opts.get('branch'))
5277 dest, branches = hg.parseurl(dest, opts.get('branch'))
5277 other = hg.peer(repo, opts, dest)
5278 other = hg.peer(repo, opts, dest)
5278 if 'bookmarks' not in other.listkeys('namespaces'):
5279 if 'bookmarks' not in other.listkeys('namespaces'):
5279 ui.warn(_("remote doesn't support bookmarks\n"))
5280 ui.warn(_("remote doesn't support bookmarks\n"))
5280 return 0
5281 return 0
5281 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5282 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5282 return bookmarks.outgoing(ui, repo, other)
5283 return bookmarks.outgoing(ui, repo, other)
5283
5284
5284 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5285 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5285 try:
5286 try:
5286 return hg.outgoing(ui, repo, dest, opts)
5287 return hg.outgoing(ui, repo, dest, opts)
5287 finally:
5288 finally:
5288 del repo._subtoppath
5289 del repo._subtoppath
5289
5290
5290 @command('parents',
5291 @command('parents',
5291 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5292 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5292 ] + templateopts,
5293 ] + templateopts,
5293 _('[-r REV] [FILE]'),
5294 _('[-r REV] [FILE]'),
5294 inferrepo=True)
5295 inferrepo=True)
5295 def parents(ui, repo, file_=None, **opts):
5296 def parents(ui, repo, file_=None, **opts):
5296 """show the parents of the working directory or revision (DEPRECATED)
5297 """show the parents of the working directory or revision (DEPRECATED)
5297
5298
5298 Print the working directory's parent revisions. If a revision is
5299 Print the working directory's parent revisions. If a revision is
5299 given via -r/--rev, the parent of that revision will be printed.
5300 given via -r/--rev, the parent of that revision will be printed.
5300 If a file argument is given, the revision in which the file was
5301 If a file argument is given, the revision in which the file was
5301 last changed (before the working directory revision or the
5302 last changed (before the working directory revision or the
5302 argument to --rev if given) is printed.
5303 argument to --rev if given) is printed.
5303
5304
5304 This command is equivalent to::
5305 This command is equivalent to::
5305
5306
5306 hg log -r "parents()" or
5307 hg log -r "parents()" or
5307 hg log -r "parents(REV)" or
5308 hg log -r "parents(REV)" or
5308 hg log -r "max(file(FILE))" or
5309 hg log -r "max(file(FILE))" or
5309 hg log -r "max(::REV and file(FILE))"
5310 hg log -r "max(::REV and file(FILE))"
5310
5311
5311 See :hg:`summary` and :hg:`help revsets` for related information.
5312 See :hg:`summary` and :hg:`help revsets` for related information.
5312
5313
5313 Returns 0 on success.
5314 Returns 0 on success.
5314 """
5315 """
5315
5316
5316 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5317 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5317
5318
5318 if file_:
5319 if file_:
5319 m = scmutil.match(ctx, (file_,), opts)
5320 m = scmutil.match(ctx, (file_,), opts)
5320 if m.anypats() or len(m.files()) != 1:
5321 if m.anypats() or len(m.files()) != 1:
5321 raise error.Abort(_('can only specify an explicit filename'))
5322 raise error.Abort(_('can only specify an explicit filename'))
5322 file_ = m.files()[0]
5323 file_ = m.files()[0]
5323 filenodes = []
5324 filenodes = []
5324 for cp in ctx.parents():
5325 for cp in ctx.parents():
5325 if not cp:
5326 if not cp:
5326 continue
5327 continue
5327 try:
5328 try:
5328 filenodes.append(cp.filenode(file_))
5329 filenodes.append(cp.filenode(file_))
5329 except error.LookupError:
5330 except error.LookupError:
5330 pass
5331 pass
5331 if not filenodes:
5332 if not filenodes:
5332 raise error.Abort(_("'%s' not found in manifest!") % file_)
5333 raise error.Abort(_("'%s' not found in manifest!") % file_)
5333 p = []
5334 p = []
5334 for fn in filenodes:
5335 for fn in filenodes:
5335 fctx = repo.filectx(file_, fileid=fn)
5336 fctx = repo.filectx(file_, fileid=fn)
5336 p.append(fctx.node())
5337 p.append(fctx.node())
5337 else:
5338 else:
5338 p = [cp.node() for cp in ctx.parents()]
5339 p = [cp.node() for cp in ctx.parents()]
5339
5340
5340 displayer = cmdutil.show_changeset(ui, repo, opts)
5341 displayer = cmdutil.show_changeset(ui, repo, opts)
5341 for n in p:
5342 for n in p:
5342 if n != nullid:
5343 if n != nullid:
5343 displayer.show(repo[n])
5344 displayer.show(repo[n])
5344 displayer.close()
5345 displayer.close()
5345
5346
5346 @command('paths', [], _('[NAME]'), optionalrepo=True)
5347 @command('paths', [], _('[NAME]'), optionalrepo=True)
5347 def paths(ui, repo, search=None):
5348 def paths(ui, repo, search=None):
5348 """show aliases for remote repositories
5349 """show aliases for remote repositories
5349
5350
5350 Show definition of symbolic path name NAME. If no name is given,
5351 Show definition of symbolic path name NAME. If no name is given,
5351 show definition of all available names.
5352 show definition of all available names.
5352
5353
5353 Option -q/--quiet suppresses all output when searching for NAME
5354 Option -q/--quiet suppresses all output when searching for NAME
5354 and shows only the path names when listing all definitions.
5355 and shows only the path names when listing all definitions.
5355
5356
5356 Path names are defined in the [paths] section of your
5357 Path names are defined in the [paths] section of your
5357 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5358 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5358 repository, ``.hg/hgrc`` is used, too.
5359 repository, ``.hg/hgrc`` is used, too.
5359
5360
5360 The path names ``default`` and ``default-push`` have a special
5361 The path names ``default`` and ``default-push`` have a special
5361 meaning. When performing a push or pull operation, they are used
5362 meaning. When performing a push or pull operation, they are used
5362 as fallbacks if no location is specified on the command-line.
5363 as fallbacks if no location is specified on the command-line.
5363 When ``default-push`` is set, it will be used for push and
5364 When ``default-push`` is set, it will be used for push and
5364 ``default`` will be used for pull; otherwise ``default`` is used
5365 ``default`` will be used for pull; otherwise ``default`` is used
5365 as the fallback for both. When cloning a repository, the clone
5366 as the fallback for both. When cloning a repository, the clone
5366 source is written as ``default`` in ``.hg/hgrc``. Note that
5367 source is written as ``default`` in ``.hg/hgrc``. Note that
5367 ``default`` and ``default-push`` apply to all inbound (e.g.
5368 ``default`` and ``default-push`` apply to all inbound (e.g.
5368 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
5369 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
5369 :hg:`bundle`) operations.
5370 :hg:`bundle`) operations.
5370
5371
5371 See :hg:`help urls` for more information.
5372 See :hg:`help urls` for more information.
5372
5373
5373 Returns 0 on success.
5374 Returns 0 on success.
5374 """
5375 """
5375 if search:
5376 if search:
5376 for name, path in sorted(ui.paths.iteritems()):
5377 for name, path in sorted(ui.paths.iteritems()):
5377 if name == search:
5378 if name == search:
5378 ui.status("%s\n" % util.hidepassword(path.rawloc))
5379 ui.status("%s\n" % util.hidepassword(path.rawloc))
5379 return
5380 return
5380 if not ui.quiet:
5381 if not ui.quiet:
5381 ui.warn(_("not found!\n"))
5382 ui.warn(_("not found!\n"))
5382 return 1
5383 return 1
5383 else:
5384 else:
5384 for name, path in sorted(ui.paths.iteritems()):
5385 for name, path in sorted(ui.paths.iteritems()):
5385 if ui.quiet:
5386 if ui.quiet:
5386 ui.write("%s\n" % name)
5387 ui.write("%s\n" % name)
5387 else:
5388 else:
5388 ui.write("%s = %s\n" % (name,
5389 ui.write("%s = %s\n" % (name,
5389 util.hidepassword(path.rawloc)))
5390 util.hidepassword(path.rawloc)))
5390 for subopt, value in sorted(path.suboptions.items()):
5391 for subopt, value in sorted(path.suboptions.items()):
5391 ui.write('%s:%s = %s\n' % (name, subopt, value))
5392 ui.write('%s:%s = %s\n' % (name, subopt, value))
5392
5393
5393 @command('phase',
5394 @command('phase',
5394 [('p', 'public', False, _('set changeset phase to public')),
5395 [('p', 'public', False, _('set changeset phase to public')),
5395 ('d', 'draft', False, _('set changeset phase to draft')),
5396 ('d', 'draft', False, _('set changeset phase to draft')),
5396 ('s', 'secret', False, _('set changeset phase to secret')),
5397 ('s', 'secret', False, _('set changeset phase to secret')),
5397 ('f', 'force', False, _('allow to move boundary backward')),
5398 ('f', 'force', False, _('allow to move boundary backward')),
5398 ('r', 'rev', [], _('target revision'), _('REV')),
5399 ('r', 'rev', [], _('target revision'), _('REV')),
5399 ],
5400 ],
5400 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5401 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5401 def phase(ui, repo, *revs, **opts):
5402 def phase(ui, repo, *revs, **opts):
5402 """set or show the current phase name
5403 """set or show the current phase name
5403
5404
5404 With no argument, show the phase name of the current revision(s).
5405 With no argument, show the phase name of the current revision(s).
5405
5406
5406 With one of -p/--public, -d/--draft or -s/--secret, change the
5407 With one of -p/--public, -d/--draft or -s/--secret, change the
5407 phase value of the specified revisions.
5408 phase value of the specified revisions.
5408
5409
5409 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5410 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5410 lower phase to an higher phase. Phases are ordered as follows::
5411 lower phase to an higher phase. Phases are ordered as follows::
5411
5412
5412 public < draft < secret
5413 public < draft < secret
5413
5414
5414 Returns 0 on success, 1 if some phases could not be changed.
5415 Returns 0 on success, 1 if some phases could not be changed.
5415
5416
5416 (For more information about the phases concept, see :hg:`help phases`.)
5417 (For more information about the phases concept, see :hg:`help phases`.)
5417 """
5418 """
5418 # search for a unique phase argument
5419 # search for a unique phase argument
5419 targetphase = None
5420 targetphase = None
5420 for idx, name in enumerate(phases.phasenames):
5421 for idx, name in enumerate(phases.phasenames):
5421 if opts[name]:
5422 if opts[name]:
5422 if targetphase is not None:
5423 if targetphase is not None:
5423 raise error.Abort(_('only one phase can be specified'))
5424 raise error.Abort(_('only one phase can be specified'))
5424 targetphase = idx
5425 targetphase = idx
5425
5426
5426 # look for specified revision
5427 # look for specified revision
5427 revs = list(revs)
5428 revs = list(revs)
5428 revs.extend(opts['rev'])
5429 revs.extend(opts['rev'])
5429 if not revs:
5430 if not revs:
5430 # display both parents as the second parent phase can influence
5431 # display both parents as the second parent phase can influence
5431 # the phase of a merge commit
5432 # the phase of a merge commit
5432 revs = [c.rev() for c in repo[None].parents()]
5433 revs = [c.rev() for c in repo[None].parents()]
5433
5434
5434 revs = scmutil.revrange(repo, revs)
5435 revs = scmutil.revrange(repo, revs)
5435
5436
5436 lock = None
5437 lock = None
5437 ret = 0
5438 ret = 0
5438 if targetphase is None:
5439 if targetphase is None:
5439 # display
5440 # display
5440 for r in revs:
5441 for r in revs:
5441 ctx = repo[r]
5442 ctx = repo[r]
5442 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5443 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5443 else:
5444 else:
5444 tr = None
5445 tr = None
5445 lock = repo.lock()
5446 lock = repo.lock()
5446 try:
5447 try:
5447 tr = repo.transaction("phase")
5448 tr = repo.transaction("phase")
5448 # set phase
5449 # set phase
5449 if not revs:
5450 if not revs:
5450 raise error.Abort(_('empty revision set'))
5451 raise error.Abort(_('empty revision set'))
5451 nodes = [repo[r].node() for r in revs]
5452 nodes = [repo[r].node() for r in revs]
5452 # moving revision from public to draft may hide them
5453 # moving revision from public to draft may hide them
5453 # We have to check result on an unfiltered repository
5454 # We have to check result on an unfiltered repository
5454 unfi = repo.unfiltered()
5455 unfi = repo.unfiltered()
5455 getphase = unfi._phasecache.phase
5456 getphase = unfi._phasecache.phase
5456 olddata = [getphase(unfi, r) for r in unfi]
5457 olddata = [getphase(unfi, r) for r in unfi]
5457 phases.advanceboundary(repo, tr, targetphase, nodes)
5458 phases.advanceboundary(repo, tr, targetphase, nodes)
5458 if opts['force']:
5459 if opts['force']:
5459 phases.retractboundary(repo, tr, targetphase, nodes)
5460 phases.retractboundary(repo, tr, targetphase, nodes)
5460 tr.close()
5461 tr.close()
5461 finally:
5462 finally:
5462 if tr is not None:
5463 if tr is not None:
5463 tr.release()
5464 tr.release()
5464 lock.release()
5465 lock.release()
5465 getphase = unfi._phasecache.phase
5466 getphase = unfi._phasecache.phase
5466 newdata = [getphase(unfi, r) for r in unfi]
5467 newdata = [getphase(unfi, r) for r in unfi]
5467 changes = sum(newdata[r] != olddata[r] for r in unfi)
5468 changes = sum(newdata[r] != olddata[r] for r in unfi)
5468 cl = unfi.changelog
5469 cl = unfi.changelog
5469 rejected = [n for n in nodes
5470 rejected = [n for n in nodes
5470 if newdata[cl.rev(n)] < targetphase]
5471 if newdata[cl.rev(n)] < targetphase]
5471 if rejected:
5472 if rejected:
5472 ui.warn(_('cannot move %i changesets to a higher '
5473 ui.warn(_('cannot move %i changesets to a higher '
5473 'phase, use --force\n') % len(rejected))
5474 'phase, use --force\n') % len(rejected))
5474 ret = 1
5475 ret = 1
5475 if changes:
5476 if changes:
5476 msg = _('phase changed for %i changesets\n') % changes
5477 msg = _('phase changed for %i changesets\n') % changes
5477 if ret:
5478 if ret:
5478 ui.status(msg)
5479 ui.status(msg)
5479 else:
5480 else:
5480 ui.note(msg)
5481 ui.note(msg)
5481 else:
5482 else:
5482 ui.warn(_('no phases changed\n'))
5483 ui.warn(_('no phases changed\n'))
5483 return ret
5484 return ret
5484
5485
5485 def postincoming(ui, repo, modheads, optupdate, checkout):
5486 def postincoming(ui, repo, modheads, optupdate, checkout):
5486 if modheads == 0:
5487 if modheads == 0:
5487 return
5488 return
5488 if optupdate:
5489 if optupdate:
5489 try:
5490 try:
5490 brev = checkout
5491 brev = checkout
5491 movemarkfrom = None
5492 movemarkfrom = None
5492 if not checkout:
5493 if not checkout:
5493 updata = destutil.destupdate(repo)
5494 updata = destutil.destupdate(repo)
5494 checkout, movemarkfrom, brev = updata
5495 checkout, movemarkfrom, brev = updata
5495 ret = hg.update(repo, checkout)
5496 ret = hg.update(repo, checkout)
5496 except error.UpdateAbort as inst:
5497 except error.UpdateAbort as inst:
5497 msg = _("not updating: %s") % str(inst)
5498 msg = _("not updating: %s") % str(inst)
5498 hint = inst.hint
5499 hint = inst.hint
5499 raise error.UpdateAbort(msg, hint=hint)
5500 raise error.UpdateAbort(msg, hint=hint)
5500 if not ret and not checkout:
5501 if not ret and not checkout:
5501 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5502 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5502 ui.status(_("updating bookmark %s\n") % repo._activebookmark)
5503 ui.status(_("updating bookmark %s\n") % repo._activebookmark)
5503 return ret
5504 return ret
5504 if modheads > 1:
5505 if modheads > 1:
5505 currentbranchheads = len(repo.branchheads())
5506 currentbranchheads = len(repo.branchheads())
5506 if currentbranchheads == modheads:
5507 if currentbranchheads == modheads:
5507 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5508 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5508 elif currentbranchheads > 1:
5509 elif currentbranchheads > 1:
5509 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5510 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5510 "merge)\n"))
5511 "merge)\n"))
5511 else:
5512 else:
5512 ui.status(_("(run 'hg heads' to see heads)\n"))
5513 ui.status(_("(run 'hg heads' to see heads)\n"))
5513 else:
5514 else:
5514 ui.status(_("(run 'hg update' to get a working copy)\n"))
5515 ui.status(_("(run 'hg update' to get a working copy)\n"))
5515
5516
5516 @command('^pull',
5517 @command('^pull',
5517 [('u', 'update', None,
5518 [('u', 'update', None,
5518 _('update to new branch head if changesets were pulled')),
5519 _('update to new branch head if changesets were pulled')),
5519 ('f', 'force', None, _('run even when remote repository is unrelated')),
5520 ('f', 'force', None, _('run even when remote repository is unrelated')),
5520 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5521 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5521 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5522 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5522 ('b', 'branch', [], _('a specific branch you would like to pull'),
5523 ('b', 'branch', [], _('a specific branch you would like to pull'),
5523 _('BRANCH')),
5524 _('BRANCH')),
5524 ] + remoteopts,
5525 ] + remoteopts,
5525 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5526 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5526 def pull(ui, repo, source="default", **opts):
5527 def pull(ui, repo, source="default", **opts):
5527 """pull changes from the specified source
5528 """pull changes from the specified source
5528
5529
5529 Pull changes from a remote repository to a local one.
5530 Pull changes from a remote repository to a local one.
5530
5531
5531 This finds all changes from the repository at the specified path
5532 This finds all changes from the repository at the specified path
5532 or URL and adds them to a local repository (the current one unless
5533 or URL and adds them to a local repository (the current one unless
5533 -R is specified). By default, this does not update the copy of the
5534 -R is specified). By default, this does not update the copy of the
5534 project in the working directory.
5535 project in the working directory.
5535
5536
5536 Use :hg:`incoming` if you want to see what would have been added
5537 Use :hg:`incoming` if you want to see what would have been added
5537 by a pull at the time you issued this command. If you then decide
5538 by a pull at the time you issued this command. If you then decide
5538 to add those changes to the repository, you should use :hg:`pull
5539 to add those changes to the repository, you should use :hg:`pull
5539 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5540 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5540
5541
5541 If SOURCE is omitted, the 'default' path will be used.
5542 If SOURCE is omitted, the 'default' path will be used.
5542 See :hg:`help urls` for more information.
5543 See :hg:`help urls` for more information.
5543
5544
5544 Returns 0 on success, 1 if an update had unresolved files.
5545 Returns 0 on success, 1 if an update had unresolved files.
5545 """
5546 """
5546 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5547 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5547 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5548 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5548 other = hg.peer(repo, opts, source)
5549 other = hg.peer(repo, opts, source)
5549 try:
5550 try:
5550 revs, checkout = hg.addbranchrevs(repo, other, branches,
5551 revs, checkout = hg.addbranchrevs(repo, other, branches,
5551 opts.get('rev'))
5552 opts.get('rev'))
5552
5553
5553
5554
5554 pullopargs = {}
5555 pullopargs = {}
5555 if opts.get('bookmark'):
5556 if opts.get('bookmark'):
5556 if not revs:
5557 if not revs:
5557 revs = []
5558 revs = []
5558 # The list of bookmark used here is not the one used to actually
5559 # The list of bookmark used here is not the one used to actually
5559 # update the bookmark name. This can result in the revision pulled
5560 # update the bookmark name. This can result in the revision pulled
5560 # not ending up with the name of the bookmark because of a race
5561 # not ending up with the name of the bookmark because of a race
5561 # condition on the server. (See issue 4689 for details)
5562 # condition on the server. (See issue 4689 for details)
5562 remotebookmarks = other.listkeys('bookmarks')
5563 remotebookmarks = other.listkeys('bookmarks')
5563 pullopargs['remotebookmarks'] = remotebookmarks
5564 pullopargs['remotebookmarks'] = remotebookmarks
5564 for b in opts['bookmark']:
5565 for b in opts['bookmark']:
5565 if b not in remotebookmarks:
5566 if b not in remotebookmarks:
5566 raise error.Abort(_('remote bookmark %s not found!') % b)
5567 raise error.Abort(_('remote bookmark %s not found!') % b)
5567 revs.append(remotebookmarks[b])
5568 revs.append(remotebookmarks[b])
5568
5569
5569 if revs:
5570 if revs:
5570 try:
5571 try:
5571 # When 'rev' is a bookmark name, we cannot guarantee that it
5572 # When 'rev' is a bookmark name, we cannot guarantee that it
5572 # will be updated with that name because of a race condition
5573 # will be updated with that name because of a race condition
5573 # server side. (See issue 4689 for details)
5574 # server side. (See issue 4689 for details)
5574 oldrevs = revs
5575 oldrevs = revs
5575 revs = [] # actually, nodes
5576 revs = [] # actually, nodes
5576 for r in oldrevs:
5577 for r in oldrevs:
5577 node = other.lookup(r)
5578 node = other.lookup(r)
5578 revs.append(node)
5579 revs.append(node)
5579 if r == checkout:
5580 if r == checkout:
5580 checkout = node
5581 checkout = node
5581 except error.CapabilityError:
5582 except error.CapabilityError:
5582 err = _("other repository doesn't support revision lookup, "
5583 err = _("other repository doesn't support revision lookup, "
5583 "so a rev cannot be specified.")
5584 "so a rev cannot be specified.")
5584 raise error.Abort(err)
5585 raise error.Abort(err)
5585
5586
5586 pullopargs.update(opts.get('opargs', {}))
5587 pullopargs.update(opts.get('opargs', {}))
5587 modheads = exchange.pull(repo, other, heads=revs,
5588 modheads = exchange.pull(repo, other, heads=revs,
5588 force=opts.get('force'),
5589 force=opts.get('force'),
5589 bookmarks=opts.get('bookmark', ()),
5590 bookmarks=opts.get('bookmark', ()),
5590 opargs=pullopargs).cgresult
5591 opargs=pullopargs).cgresult
5591 if checkout:
5592 if checkout:
5592 checkout = str(repo.changelog.rev(checkout))
5593 checkout = str(repo.changelog.rev(checkout))
5593 repo._subtoppath = source
5594 repo._subtoppath = source
5594 try:
5595 try:
5595 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
5596 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
5596
5597
5597 finally:
5598 finally:
5598 del repo._subtoppath
5599 del repo._subtoppath
5599
5600
5600 finally:
5601 finally:
5601 other.close()
5602 other.close()
5602 return ret
5603 return ret
5603
5604
5604 @command('^push',
5605 @command('^push',
5605 [('f', 'force', None, _('force push')),
5606 [('f', 'force', None, _('force push')),
5606 ('r', 'rev', [],
5607 ('r', 'rev', [],
5607 _('a changeset intended to be included in the destination'),
5608 _('a changeset intended to be included in the destination'),
5608 _('REV')),
5609 _('REV')),
5609 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5610 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5610 ('b', 'branch', [],
5611 ('b', 'branch', [],
5611 _('a specific branch you would like to push'), _('BRANCH')),
5612 _('a specific branch you would like to push'), _('BRANCH')),
5612 ('', 'new-branch', False, _('allow pushing a new branch')),
5613 ('', 'new-branch', False, _('allow pushing a new branch')),
5613 ] + remoteopts,
5614 ] + remoteopts,
5614 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5615 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5615 def push(ui, repo, dest=None, **opts):
5616 def push(ui, repo, dest=None, **opts):
5616 """push changes to the specified destination
5617 """push changes to the specified destination
5617
5618
5618 Push changesets from the local repository to the specified
5619 Push changesets from the local repository to the specified
5619 destination.
5620 destination.
5620
5621
5621 This operation is symmetrical to pull: it is identical to a pull
5622 This operation is symmetrical to pull: it is identical to a pull
5622 in the destination repository from the current one.
5623 in the destination repository from the current one.
5623
5624
5624 By default, push will not allow creation of new heads at the
5625 By default, push will not allow creation of new heads at the
5625 destination, since multiple heads would make it unclear which head
5626 destination, since multiple heads would make it unclear which head
5626 to use. In this situation, it is recommended to pull and merge
5627 to use. In this situation, it is recommended to pull and merge
5627 before pushing.
5628 before pushing.
5628
5629
5629 Use --new-branch if you want to allow push to create a new named
5630 Use --new-branch if you want to allow push to create a new named
5630 branch that is not present at the destination. This allows you to
5631 branch that is not present at the destination. This allows you to
5631 only create a new branch without forcing other changes.
5632 only create a new branch without forcing other changes.
5632
5633
5633 .. note::
5634 .. note::
5634
5635
5635 Extra care should be taken with the -f/--force option,
5636 Extra care should be taken with the -f/--force option,
5636 which will push all new heads on all branches, an action which will
5637 which will push all new heads on all branches, an action which will
5637 almost always cause confusion for collaborators.
5638 almost always cause confusion for collaborators.
5638
5639
5639 If -r/--rev is used, the specified revision and all its ancestors
5640 If -r/--rev is used, the specified revision and all its ancestors
5640 will be pushed to the remote repository.
5641 will be pushed to the remote repository.
5641
5642
5642 If -B/--bookmark is used, the specified bookmarked revision, its
5643 If -B/--bookmark is used, the specified bookmarked revision, its
5643 ancestors, and the bookmark will be pushed to the remote
5644 ancestors, and the bookmark will be pushed to the remote
5644 repository.
5645 repository.
5645
5646
5646 Please see :hg:`help urls` for important details about ``ssh://``
5647 Please see :hg:`help urls` for important details about ``ssh://``
5647 URLs. If DESTINATION is omitted, a default path will be used.
5648 URLs. If DESTINATION is omitted, a default path will be used.
5648
5649
5649 Returns 0 if push was successful, 1 if nothing to push.
5650 Returns 0 if push was successful, 1 if nothing to push.
5650 """
5651 """
5651
5652
5652 if opts.get('bookmark'):
5653 if opts.get('bookmark'):
5653 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5654 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5654 for b in opts['bookmark']:
5655 for b in opts['bookmark']:
5655 # translate -B options to -r so changesets get pushed
5656 # translate -B options to -r so changesets get pushed
5656 if b in repo._bookmarks:
5657 if b in repo._bookmarks:
5657 opts.setdefault('rev', []).append(b)
5658 opts.setdefault('rev', []).append(b)
5658 else:
5659 else:
5659 # if we try to push a deleted bookmark, translate it to null
5660 # if we try to push a deleted bookmark, translate it to null
5660 # this lets simultaneous -r, -b options continue working
5661 # this lets simultaneous -r, -b options continue working
5661 opts.setdefault('rev', []).append("null")
5662 opts.setdefault('rev', []).append("null")
5662
5663
5663 path = ui.paths.getpath(dest, default='default')
5664 path = ui.paths.getpath(dest, default='default')
5664 if not path:
5665 if not path:
5665 raise error.Abort(_('default repository not configured!'),
5666 raise error.Abort(_('default repository not configured!'),
5666 hint=_('see the "path" section in "hg help config"'))
5667 hint=_('see the "path" section in "hg help config"'))
5667 dest = path.pushloc or path.loc
5668 dest = path.pushloc or path.loc
5668 branches = (path.branch, opts.get('branch') or [])
5669 branches = (path.branch, opts.get('branch') or [])
5669 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5670 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5670 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5671 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5671 other = hg.peer(repo, opts, dest)
5672 other = hg.peer(repo, opts, dest)
5672
5673
5673 if revs:
5674 if revs:
5674 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5675 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5675 if not revs:
5676 if not revs:
5676 raise error.Abort(_("specified revisions evaluate to an empty set"),
5677 raise error.Abort(_("specified revisions evaluate to an empty set"),
5677 hint=_("use different revision arguments"))
5678 hint=_("use different revision arguments"))
5678
5679
5679 repo._subtoppath = dest
5680 repo._subtoppath = dest
5680 try:
5681 try:
5681 # push subrepos depth-first for coherent ordering
5682 # push subrepos depth-first for coherent ordering
5682 c = repo['']
5683 c = repo['']
5683 subs = c.substate # only repos that are committed
5684 subs = c.substate # only repos that are committed
5684 for s in sorted(subs):
5685 for s in sorted(subs):
5685 result = c.sub(s).push(opts)
5686 result = c.sub(s).push(opts)
5686 if result == 0:
5687 if result == 0:
5687 return not result
5688 return not result
5688 finally:
5689 finally:
5689 del repo._subtoppath
5690 del repo._subtoppath
5690 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5691 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5691 newbranch=opts.get('new_branch'),
5692 newbranch=opts.get('new_branch'),
5692 bookmarks=opts.get('bookmark', ()),
5693 bookmarks=opts.get('bookmark', ()),
5693 opargs=opts.get('opargs'))
5694 opargs=opts.get('opargs'))
5694
5695
5695 result = not pushop.cgresult
5696 result = not pushop.cgresult
5696
5697
5697 if pushop.bkresult is not None:
5698 if pushop.bkresult is not None:
5698 if pushop.bkresult == 2:
5699 if pushop.bkresult == 2:
5699 result = 2
5700 result = 2
5700 elif not result and pushop.bkresult:
5701 elif not result and pushop.bkresult:
5701 result = 2
5702 result = 2
5702
5703
5703 return result
5704 return result
5704
5705
5705 @command('recover', [])
5706 @command('recover', [])
5706 def recover(ui, repo):
5707 def recover(ui, repo):
5707 """roll back an interrupted transaction
5708 """roll back an interrupted transaction
5708
5709
5709 Recover from an interrupted commit or pull.
5710 Recover from an interrupted commit or pull.
5710
5711
5711 This command tries to fix the repository status after an
5712 This command tries to fix the repository status after an
5712 interrupted operation. It should only be necessary when Mercurial
5713 interrupted operation. It should only be necessary when Mercurial
5713 suggests it.
5714 suggests it.
5714
5715
5715 Returns 0 if successful, 1 if nothing to recover or verify fails.
5716 Returns 0 if successful, 1 if nothing to recover or verify fails.
5716 """
5717 """
5717 if repo.recover():
5718 if repo.recover():
5718 return hg.verify(repo)
5719 return hg.verify(repo)
5719 return 1
5720 return 1
5720
5721
5721 @command('^remove|rm',
5722 @command('^remove|rm',
5722 [('A', 'after', None, _('record delete for missing files')),
5723 [('A', 'after', None, _('record delete for missing files')),
5723 ('f', 'force', None,
5724 ('f', 'force', None,
5724 _('remove (and delete) file even if added or modified')),
5725 _('remove (and delete) file even if added or modified')),
5725 ] + subrepoopts + walkopts,
5726 ] + subrepoopts + walkopts,
5726 _('[OPTION]... FILE...'),
5727 _('[OPTION]... FILE...'),
5727 inferrepo=True)
5728 inferrepo=True)
5728 def remove(ui, repo, *pats, **opts):
5729 def remove(ui, repo, *pats, **opts):
5729 """remove the specified files on the next commit
5730 """remove the specified files on the next commit
5730
5731
5731 Schedule the indicated files for removal from the current branch.
5732 Schedule the indicated files for removal from the current branch.
5732
5733
5733 This command schedules the files to be removed at the next commit.
5734 This command schedules the files to be removed at the next commit.
5734 To undo a remove before that, see :hg:`revert`. To undo added
5735 To undo a remove before that, see :hg:`revert`. To undo added
5735 files, see :hg:`forget`.
5736 files, see :hg:`forget`.
5736
5737
5737 .. container:: verbose
5738 .. container:: verbose
5738
5739
5739 -A/--after can be used to remove only files that have already
5740 -A/--after can be used to remove only files that have already
5740 been deleted, -f/--force can be used to force deletion, and -Af
5741 been deleted, -f/--force can be used to force deletion, and -Af
5741 can be used to remove files from the next revision without
5742 can be used to remove files from the next revision without
5742 deleting them from the working directory.
5743 deleting them from the working directory.
5743
5744
5744 The following table details the behavior of remove for different
5745 The following table details the behavior of remove for different
5745 file states (columns) and option combinations (rows). The file
5746 file states (columns) and option combinations (rows). The file
5746 states are Added [A], Clean [C], Modified [M] and Missing [!]
5747 states are Added [A], Clean [C], Modified [M] and Missing [!]
5747 (as reported by :hg:`status`). The actions are Warn, Remove
5748 (as reported by :hg:`status`). The actions are Warn, Remove
5748 (from branch) and Delete (from disk):
5749 (from branch) and Delete (from disk):
5749
5750
5750 ========= == == == ==
5751 ========= == == == ==
5751 opt/state A C M !
5752 opt/state A C M !
5752 ========= == == == ==
5753 ========= == == == ==
5753 none W RD W R
5754 none W RD W R
5754 -f R RD RD R
5755 -f R RD RD R
5755 -A W W W R
5756 -A W W W R
5756 -Af R R R R
5757 -Af R R R R
5757 ========= == == == ==
5758 ========= == == == ==
5758
5759
5759 Note that remove never deletes files in Added [A] state from the
5760 Note that remove never deletes files in Added [A] state from the
5760 working directory, not even if option --force is specified.
5761 working directory, not even if option --force is specified.
5761
5762
5762 Returns 0 on success, 1 if any warnings encountered.
5763 Returns 0 on success, 1 if any warnings encountered.
5763 """
5764 """
5764
5765
5765 after, force = opts.get('after'), opts.get('force')
5766 after, force = opts.get('after'), opts.get('force')
5766 if not pats and not after:
5767 if not pats and not after:
5767 raise error.Abort(_('no files specified'))
5768 raise error.Abort(_('no files specified'))
5768
5769
5769 m = scmutil.match(repo[None], pats, opts)
5770 m = scmutil.match(repo[None], pats, opts)
5770 subrepos = opts.get('subrepos')
5771 subrepos = opts.get('subrepos')
5771 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
5772 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
5772
5773
5773 @command('rename|move|mv',
5774 @command('rename|move|mv',
5774 [('A', 'after', None, _('record a rename that has already occurred')),
5775 [('A', 'after', None, _('record a rename that has already occurred')),
5775 ('f', 'force', None, _('forcibly copy over an existing managed file')),
5776 ('f', 'force', None, _('forcibly copy over an existing managed file')),
5776 ] + walkopts + dryrunopts,
5777 ] + walkopts + dryrunopts,
5777 _('[OPTION]... SOURCE... DEST'))
5778 _('[OPTION]... SOURCE... DEST'))
5778 def rename(ui, repo, *pats, **opts):
5779 def rename(ui, repo, *pats, **opts):
5779 """rename files; equivalent of copy + remove
5780 """rename files; equivalent of copy + remove
5780
5781
5781 Mark dest as copies of sources; mark sources for deletion. If dest
5782 Mark dest as copies of sources; mark sources for deletion. If dest
5782 is a directory, copies are put in that directory. If dest is a
5783 is a directory, copies are put in that directory. If dest is a
5783 file, there can only be one source.
5784 file, there can only be one source.
5784
5785
5785 By default, this command copies the contents of files as they
5786 By default, this command copies the contents of files as they
5786 exist in the working directory. If invoked with -A/--after, the
5787 exist in the working directory. If invoked with -A/--after, the
5787 operation is recorded, but no copying is performed.
5788 operation is recorded, but no copying is performed.
5788
5789
5789 This command takes effect at the next commit. To undo a rename
5790 This command takes effect at the next commit. To undo a rename
5790 before that, see :hg:`revert`.
5791 before that, see :hg:`revert`.
5791
5792
5792 Returns 0 on success, 1 if errors are encountered.
5793 Returns 0 on success, 1 if errors are encountered.
5793 """
5794 """
5794 wlock = repo.wlock(False)
5795 wlock = repo.wlock(False)
5795 try:
5796 try:
5796 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5797 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5797 finally:
5798 finally:
5798 wlock.release()
5799 wlock.release()
5799
5800
5800 @command('resolve',
5801 @command('resolve',
5801 [('a', 'all', None, _('select all unresolved files')),
5802 [('a', 'all', None, _('select all unresolved files')),
5802 ('l', 'list', None, _('list state of files needing merge')),
5803 ('l', 'list', None, _('list state of files needing merge')),
5803 ('m', 'mark', None, _('mark files as resolved')),
5804 ('m', 'mark', None, _('mark files as resolved')),
5804 ('u', 'unmark', None, _('mark files as unresolved')),
5805 ('u', 'unmark', None, _('mark files as unresolved')),
5805 ('n', 'no-status', None, _('hide status prefix'))]
5806 ('n', 'no-status', None, _('hide status prefix'))]
5806 + mergetoolopts + walkopts + formatteropts,
5807 + mergetoolopts + walkopts + formatteropts,
5807 _('[OPTION]... [FILE]...'),
5808 _('[OPTION]... [FILE]...'),
5808 inferrepo=True)
5809 inferrepo=True)
5809 def resolve(ui, repo, *pats, **opts):
5810 def resolve(ui, repo, *pats, **opts):
5810 """redo merges or set/view the merge status of files
5811 """redo merges or set/view the merge status of files
5811
5812
5812 Merges with unresolved conflicts are often the result of
5813 Merges with unresolved conflicts are often the result of
5813 non-interactive merging using the ``internal:merge`` configuration
5814 non-interactive merging using the ``internal:merge`` configuration
5814 setting, or a command-line merge tool like ``diff3``. The resolve
5815 setting, or a command-line merge tool like ``diff3``. The resolve
5815 command is used to manage the files involved in a merge, after
5816 command is used to manage the files involved in a merge, after
5816 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5817 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5817 working directory must have two parents). See :hg:`help
5818 working directory must have two parents). See :hg:`help
5818 merge-tools` for information on configuring merge tools.
5819 merge-tools` for information on configuring merge tools.
5819
5820
5820 The resolve command can be used in the following ways:
5821 The resolve command can be used in the following ways:
5821
5822
5822 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
5823 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
5823 files, discarding any previous merge attempts. Re-merging is not
5824 files, discarding any previous merge attempts. Re-merging is not
5824 performed for files already marked as resolved. Use ``--all/-a``
5825 performed for files already marked as resolved. Use ``--all/-a``
5825 to select all unresolved files. ``--tool`` can be used to specify
5826 to select all unresolved files. ``--tool`` can be used to specify
5826 the merge tool used for the given files. It overrides the HGMERGE
5827 the merge tool used for the given files. It overrides the HGMERGE
5827 environment variable and your configuration files. Previous file
5828 environment variable and your configuration files. Previous file
5828 contents are saved with a ``.orig`` suffix.
5829 contents are saved with a ``.orig`` suffix.
5829
5830
5830 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5831 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5831 (e.g. after having manually fixed-up the files). The default is
5832 (e.g. after having manually fixed-up the files). The default is
5832 to mark all unresolved files.
5833 to mark all unresolved files.
5833
5834
5834 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5835 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5835 default is to mark all resolved files.
5836 default is to mark all resolved files.
5836
5837
5837 - :hg:`resolve -l`: list files which had or still have conflicts.
5838 - :hg:`resolve -l`: list files which had or still have conflicts.
5838 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5839 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5839
5840
5840 Note that Mercurial will not let you commit files with unresolved
5841 Note that Mercurial will not let you commit files with unresolved
5841 merge conflicts. You must use :hg:`resolve -m ...` before you can
5842 merge conflicts. You must use :hg:`resolve -m ...` before you can
5842 commit after a conflicting merge.
5843 commit after a conflicting merge.
5843
5844
5844 Returns 0 on success, 1 if any files fail a resolve attempt.
5845 Returns 0 on success, 1 if any files fail a resolve attempt.
5845 """
5846 """
5846
5847
5847 all, mark, unmark, show, nostatus = \
5848 all, mark, unmark, show, nostatus = \
5848 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
5849 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
5849
5850
5850 if (show and (mark or unmark)) or (mark and unmark):
5851 if (show and (mark or unmark)) or (mark and unmark):
5851 raise error.Abort(_("too many options specified"))
5852 raise error.Abort(_("too many options specified"))
5852 if pats and all:
5853 if pats and all:
5853 raise error.Abort(_("can't specify --all and patterns"))
5854 raise error.Abort(_("can't specify --all and patterns"))
5854 if not (all or pats or show or mark or unmark):
5855 if not (all or pats or show or mark or unmark):
5855 raise error.Abort(_('no files or directories specified'),
5856 raise error.Abort(_('no files or directories specified'),
5856 hint=('use --all to re-merge all unresolved files'))
5857 hint=('use --all to re-merge all unresolved files'))
5857
5858
5858 if show:
5859 if show:
5859 fm = ui.formatter('resolve', opts)
5860 fm = ui.formatter('resolve', opts)
5860 ms = mergemod.mergestate.read(repo)
5861 ms = mergemod.mergestate.read(repo)
5861 m = scmutil.match(repo[None], pats, opts)
5862 m = scmutil.match(repo[None], pats, opts)
5862 for f in ms:
5863 for f in ms:
5863 if not m(f):
5864 if not m(f):
5864 continue
5865 continue
5865 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
5866 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
5866 'd': 'driverresolved'}[ms[f]]
5867 'd': 'driverresolved'}[ms[f]]
5867 fm.startitem()
5868 fm.startitem()
5868 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
5869 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
5869 fm.write('path', '%s\n', f, label=l)
5870 fm.write('path', '%s\n', f, label=l)
5870 fm.end()
5871 fm.end()
5871 return 0
5872 return 0
5872
5873
5873 wlock = repo.wlock()
5874 wlock = repo.wlock()
5874 try:
5875 try:
5875 ms = mergemod.mergestate.read(repo)
5876 ms = mergemod.mergestate.read(repo)
5876
5877
5877 if not (ms.active() or repo.dirstate.p2() != nullid):
5878 if not (ms.active() or repo.dirstate.p2() != nullid):
5878 raise error.Abort(
5879 raise error.Abort(
5879 _('resolve command not applicable when not merging'))
5880 _('resolve command not applicable when not merging'))
5880
5881
5881 wctx = repo[None]
5882 wctx = repo[None]
5882
5883
5883 if ms.mergedriver and ms.mdstate() == 'u':
5884 if ms.mergedriver and ms.mdstate() == 'u':
5884 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5885 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5885 ms.commit()
5886 ms.commit()
5886 # allow mark and unmark to go through
5887 # allow mark and unmark to go through
5887 if not mark and not unmark and not proceed:
5888 if not mark and not unmark and not proceed:
5888 return 1
5889 return 1
5889
5890
5890 m = scmutil.match(wctx, pats, opts)
5891 m = scmutil.match(wctx, pats, opts)
5891 ret = 0
5892 ret = 0
5892 didwork = False
5893 didwork = False
5893 runconclude = False
5894 runconclude = False
5894
5895
5895 tocomplete = []
5896 tocomplete = []
5896 for f in ms:
5897 for f in ms:
5897 if not m(f):
5898 if not m(f):
5898 continue
5899 continue
5899
5900
5900 didwork = True
5901 didwork = True
5901
5902
5902 # don't let driver-resolved files be marked, and run the conclude
5903 # don't let driver-resolved files be marked, and run the conclude
5903 # step if asked to resolve
5904 # step if asked to resolve
5904 if ms[f] == "d":
5905 if ms[f] == "d":
5905 exact = m.exact(f)
5906 exact = m.exact(f)
5906 if mark:
5907 if mark:
5907 if exact:
5908 if exact:
5908 ui.warn(_('not marking %s as it is driver-resolved\n')
5909 ui.warn(_('not marking %s as it is driver-resolved\n')
5909 % f)
5910 % f)
5910 elif unmark:
5911 elif unmark:
5911 if exact:
5912 if exact:
5912 ui.warn(_('not unmarking %s as it is driver-resolved\n')
5913 ui.warn(_('not unmarking %s as it is driver-resolved\n')
5913 % f)
5914 % f)
5914 else:
5915 else:
5915 runconclude = True
5916 runconclude = True
5916 continue
5917 continue
5917
5918
5918 if mark:
5919 if mark:
5919 ms.mark(f, "r")
5920 ms.mark(f, "r")
5920 elif unmark:
5921 elif unmark:
5921 ms.mark(f, "u")
5922 ms.mark(f, "u")
5922 else:
5923 else:
5923 # backup pre-resolve (merge uses .orig for its own purposes)
5924 # backup pre-resolve (merge uses .orig for its own purposes)
5924 a = repo.wjoin(f)
5925 a = repo.wjoin(f)
5925 try:
5926 try:
5926 util.copyfile(a, a + ".resolve")
5927 util.copyfile(a, a + ".resolve")
5927 except (IOError, OSError) as inst:
5928 except (IOError, OSError) as inst:
5928 if inst.errno != errno.ENOENT:
5929 if inst.errno != errno.ENOENT:
5929 raise
5930 raise
5930
5931
5931 try:
5932 try:
5932 # preresolve file
5933 # preresolve file
5933 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5934 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5934 'resolve')
5935 'resolve')
5935 complete, r = ms.preresolve(f, wctx)
5936 complete, r = ms.preresolve(f, wctx)
5936 if not complete:
5937 if not complete:
5937 tocomplete.append(f)
5938 tocomplete.append(f)
5938 elif r:
5939 elif r:
5939 ret = 1
5940 ret = 1
5940 finally:
5941 finally:
5941 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5942 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5942 ms.commit()
5943 ms.commit()
5943
5944
5944 # replace filemerge's .orig file with our resolve file, but only
5945 # replace filemerge's .orig file with our resolve file, but only
5945 # for merges that are complete
5946 # for merges that are complete
5946 if complete:
5947 if complete:
5947 try:
5948 try:
5948 util.rename(a + ".resolve",
5949 util.rename(a + ".resolve",
5949 cmdutil.origpath(ui, repo, a))
5950 cmdutil.origpath(ui, repo, a))
5950 except OSError as inst:
5951 except OSError as inst:
5951 if inst.errno != errno.ENOENT:
5952 if inst.errno != errno.ENOENT:
5952 raise
5953 raise
5953
5954
5954 for f in tocomplete:
5955 for f in tocomplete:
5955 try:
5956 try:
5956 # resolve file
5957 # resolve file
5957 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5958 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5958 'resolve')
5959 'resolve')
5959 r = ms.resolve(f, wctx)
5960 r = ms.resolve(f, wctx)
5960 if r:
5961 if r:
5961 ret = 1
5962 ret = 1
5962 finally:
5963 finally:
5963 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5964 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5964 ms.commit()
5965 ms.commit()
5965
5966
5966 # replace filemerge's .orig file with our resolve file
5967 # replace filemerge's .orig file with our resolve file
5967 a = repo.wjoin(f)
5968 a = repo.wjoin(f)
5968 try:
5969 try:
5969 util.rename(a + ".resolve", cmdutil.origpath(ui, repo, a))
5970 util.rename(a + ".resolve", cmdutil.origpath(ui, repo, a))
5970 except OSError as inst:
5971 except OSError as inst:
5971 if inst.errno != errno.ENOENT:
5972 if inst.errno != errno.ENOENT:
5972 raise
5973 raise
5973
5974
5974 ms.commit()
5975 ms.commit()
5975 ms.recordactions()
5976 ms.recordactions()
5976
5977
5977 if not didwork and pats:
5978 if not didwork and pats:
5978 ui.warn(_("arguments do not match paths that need resolving\n"))
5979 ui.warn(_("arguments do not match paths that need resolving\n"))
5979 elif ms.mergedriver and ms.mdstate() != 's':
5980 elif ms.mergedriver and ms.mdstate() != 's':
5980 # run conclude step when either a driver-resolved file is requested
5981 # run conclude step when either a driver-resolved file is requested
5981 # or there are no driver-resolved files
5982 # or there are no driver-resolved files
5982 # we can't use 'ret' to determine whether any files are unresolved
5983 # we can't use 'ret' to determine whether any files are unresolved
5983 # because we might not have tried to resolve some
5984 # because we might not have tried to resolve some
5984 if ((runconclude or not list(ms.driverresolved()))
5985 if ((runconclude or not list(ms.driverresolved()))
5985 and not list(ms.unresolved())):
5986 and not list(ms.unresolved())):
5986 proceed = mergemod.driverconclude(repo, ms, wctx)
5987 proceed = mergemod.driverconclude(repo, ms, wctx)
5987 ms.commit()
5988 ms.commit()
5988 if not proceed:
5989 if not proceed:
5989 return 1
5990 return 1
5990
5991
5991 finally:
5992 finally:
5992 wlock.release()
5993 wlock.release()
5993
5994
5994 # Nudge users into finishing an unfinished operation
5995 # Nudge users into finishing an unfinished operation
5995 unresolvedf = list(ms.unresolved())
5996 unresolvedf = list(ms.unresolved())
5996 driverresolvedf = list(ms.driverresolved())
5997 driverresolvedf = list(ms.driverresolved())
5997 if not unresolvedf and not driverresolvedf:
5998 if not unresolvedf and not driverresolvedf:
5998 ui.status(_('(no more unresolved files)\n'))
5999 ui.status(_('(no more unresolved files)\n'))
5999 elif not unresolvedf:
6000 elif not unresolvedf:
6000 ui.status(_('(no more unresolved files -- '
6001 ui.status(_('(no more unresolved files -- '
6001 'run "hg resolve --all" to conclude)\n'))
6002 'run "hg resolve --all" to conclude)\n'))
6002
6003
6003 return ret
6004 return ret
6004
6005
6005 @command('revert',
6006 @command('revert',
6006 [('a', 'all', None, _('revert all changes when no arguments given')),
6007 [('a', 'all', None, _('revert all changes when no arguments given')),
6007 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6008 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6008 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6009 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6009 ('C', 'no-backup', None, _('do not save backup copies of files')),
6010 ('C', 'no-backup', None, _('do not save backup copies of files')),
6010 ('i', 'interactive', None,
6011 ('i', 'interactive', None,
6011 _('interactively select the changes (EXPERIMENTAL)')),
6012 _('interactively select the changes (EXPERIMENTAL)')),
6012 ] + walkopts + dryrunopts,
6013 ] + walkopts + dryrunopts,
6013 _('[OPTION]... [-r REV] [NAME]...'))
6014 _('[OPTION]... [-r REV] [NAME]...'))
6014 def revert(ui, repo, *pats, **opts):
6015 def revert(ui, repo, *pats, **opts):
6015 """restore files to their checkout state
6016 """restore files to their checkout state
6016
6017
6017 .. note::
6018 .. note::
6018
6019
6019 To check out earlier revisions, you should use :hg:`update REV`.
6020 To check out earlier revisions, you should use :hg:`update REV`.
6020 To cancel an uncommitted merge (and lose your changes),
6021 To cancel an uncommitted merge (and lose your changes),
6021 use :hg:`update --clean .`.
6022 use :hg:`update --clean .`.
6022
6023
6023 With no revision specified, revert the specified files or directories
6024 With no revision specified, revert the specified files or directories
6024 to the contents they had in the parent of the working directory.
6025 to the contents they had in the parent of the working directory.
6025 This restores the contents of files to an unmodified
6026 This restores the contents of files to an unmodified
6026 state and unschedules adds, removes, copies, and renames. If the
6027 state and unschedules adds, removes, copies, and renames. If the
6027 working directory has two parents, you must explicitly specify a
6028 working directory has two parents, you must explicitly specify a
6028 revision.
6029 revision.
6029
6030
6030 Using the -r/--rev or -d/--date options, revert the given files or
6031 Using the -r/--rev or -d/--date options, revert the given files or
6031 directories to their states as of a specific revision. Because
6032 directories to their states as of a specific revision. Because
6032 revert does not change the working directory parents, this will
6033 revert does not change the working directory parents, this will
6033 cause these files to appear modified. This can be helpful to "back
6034 cause these files to appear modified. This can be helpful to "back
6034 out" some or all of an earlier change. See :hg:`backout` for a
6035 out" some or all of an earlier change. See :hg:`backout` for a
6035 related method.
6036 related method.
6036
6037
6037 Modified files are saved with a .orig suffix before reverting.
6038 Modified files are saved with a .orig suffix before reverting.
6038 To disable these backups, use --no-backup.
6039 To disable these backups, use --no-backup.
6039
6040
6040 See :hg:`help dates` for a list of formats valid for -d/--date.
6041 See :hg:`help dates` for a list of formats valid for -d/--date.
6041
6042
6042 See :hg:`help backout` for a way to reverse the effect of an
6043 See :hg:`help backout` for a way to reverse the effect of an
6043 earlier changeset.
6044 earlier changeset.
6044
6045
6045 Returns 0 on success.
6046 Returns 0 on success.
6046 """
6047 """
6047
6048
6048 if opts.get("date"):
6049 if opts.get("date"):
6049 if opts.get("rev"):
6050 if opts.get("rev"):
6050 raise error.Abort(_("you can't specify a revision and a date"))
6051 raise error.Abort(_("you can't specify a revision and a date"))
6051 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6052 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6052
6053
6053 parent, p2 = repo.dirstate.parents()
6054 parent, p2 = repo.dirstate.parents()
6054 if not opts.get('rev') and p2 != nullid:
6055 if not opts.get('rev') and p2 != nullid:
6055 # revert after merge is a trap for new users (issue2915)
6056 # revert after merge is a trap for new users (issue2915)
6056 raise error.Abort(_('uncommitted merge with no revision specified'),
6057 raise error.Abort(_('uncommitted merge with no revision specified'),
6057 hint=_('use "hg update" or see "hg help revert"'))
6058 hint=_('use "hg update" or see "hg help revert"'))
6058
6059
6059 ctx = scmutil.revsingle(repo, opts.get('rev'))
6060 ctx = scmutil.revsingle(repo, opts.get('rev'))
6060
6061
6061 if (not (pats or opts.get('include') or opts.get('exclude') or
6062 if (not (pats or opts.get('include') or opts.get('exclude') or
6062 opts.get('all') or opts.get('interactive'))):
6063 opts.get('all') or opts.get('interactive'))):
6063 msg = _("no files or directories specified")
6064 msg = _("no files or directories specified")
6064 if p2 != nullid:
6065 if p2 != nullid:
6065 hint = _("uncommitted merge, use --all to discard all changes,"
6066 hint = _("uncommitted merge, use --all to discard all changes,"
6066 " or 'hg update -C .' to abort the merge")
6067 " or 'hg update -C .' to abort the merge")
6067 raise error.Abort(msg, hint=hint)
6068 raise error.Abort(msg, hint=hint)
6068 dirty = any(repo.status())
6069 dirty = any(repo.status())
6069 node = ctx.node()
6070 node = ctx.node()
6070 if node != parent:
6071 if node != parent:
6071 if dirty:
6072 if dirty:
6072 hint = _("uncommitted changes, use --all to discard all"
6073 hint = _("uncommitted changes, use --all to discard all"
6073 " changes, or 'hg update %s' to update") % ctx.rev()
6074 " changes, or 'hg update %s' to update") % ctx.rev()
6074 else:
6075 else:
6075 hint = _("use --all to revert all files,"
6076 hint = _("use --all to revert all files,"
6076 " or 'hg update %s' to update") % ctx.rev()
6077 " or 'hg update %s' to update") % ctx.rev()
6077 elif dirty:
6078 elif dirty:
6078 hint = _("uncommitted changes, use --all to discard all changes")
6079 hint = _("uncommitted changes, use --all to discard all changes")
6079 else:
6080 else:
6080 hint = _("use --all to revert all files")
6081 hint = _("use --all to revert all files")
6081 raise error.Abort(msg, hint=hint)
6082 raise error.Abort(msg, hint=hint)
6082
6083
6083 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6084 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6084
6085
6085 @command('rollback', dryrunopts +
6086 @command('rollback', dryrunopts +
6086 [('f', 'force', False, _('ignore safety measures'))])
6087 [('f', 'force', False, _('ignore safety measures'))])
6087 def rollback(ui, repo, **opts):
6088 def rollback(ui, repo, **opts):
6088 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6089 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6089
6090
6090 Please use :hg:`commit --amend` instead of rollback to correct
6091 Please use :hg:`commit --amend` instead of rollback to correct
6091 mistakes in the last commit.
6092 mistakes in the last commit.
6092
6093
6093 This command should be used with care. There is only one level of
6094 This command should be used with care. There is only one level of
6094 rollback, and there is no way to undo a rollback. It will also
6095 rollback, and there is no way to undo a rollback. It will also
6095 restore the dirstate at the time of the last transaction, losing
6096 restore the dirstate at the time of the last transaction, losing
6096 any dirstate changes since that time. This command does not alter
6097 any dirstate changes since that time. This command does not alter
6097 the working directory.
6098 the working directory.
6098
6099
6099 Transactions are used to encapsulate the effects of all commands
6100 Transactions are used to encapsulate the effects of all commands
6100 that create new changesets or propagate existing changesets into a
6101 that create new changesets or propagate existing changesets into a
6101 repository.
6102 repository.
6102
6103
6103 .. container:: verbose
6104 .. container:: verbose
6104
6105
6105 For example, the following commands are transactional, and their
6106 For example, the following commands are transactional, and their
6106 effects can be rolled back:
6107 effects can be rolled back:
6107
6108
6108 - commit
6109 - commit
6109 - import
6110 - import
6110 - pull
6111 - pull
6111 - push (with this repository as the destination)
6112 - push (with this repository as the destination)
6112 - unbundle
6113 - unbundle
6113
6114
6114 To avoid permanent data loss, rollback will refuse to rollback a
6115 To avoid permanent data loss, rollback will refuse to rollback a
6115 commit transaction if it isn't checked out. Use --force to
6116 commit transaction if it isn't checked out. Use --force to
6116 override this protection.
6117 override this protection.
6117
6118
6118 This command is not intended for use on public repositories. Once
6119 This command is not intended for use on public repositories. Once
6119 changes are visible for pull by other users, rolling a transaction
6120 changes are visible for pull by other users, rolling a transaction
6120 back locally is ineffective (someone else may already have pulled
6121 back locally is ineffective (someone else may already have pulled
6121 the changes). Furthermore, a race is possible with readers of the
6122 the changes). Furthermore, a race is possible with readers of the
6122 repository; for example an in-progress pull from the repository
6123 repository; for example an in-progress pull from the repository
6123 may fail if a rollback is performed.
6124 may fail if a rollback is performed.
6124
6125
6125 Returns 0 on success, 1 if no rollback data is available.
6126 Returns 0 on success, 1 if no rollback data is available.
6126 """
6127 """
6127 return repo.rollback(dryrun=opts.get('dry_run'),
6128 return repo.rollback(dryrun=opts.get('dry_run'),
6128 force=opts.get('force'))
6129 force=opts.get('force'))
6129
6130
6130 @command('root', [])
6131 @command('root', [])
6131 def root(ui, repo):
6132 def root(ui, repo):
6132 """print the root (top) of the current working directory
6133 """print the root (top) of the current working directory
6133
6134
6134 Print the root directory of the current repository.
6135 Print the root directory of the current repository.
6135
6136
6136 Returns 0 on success.
6137 Returns 0 on success.
6137 """
6138 """
6138 ui.write(repo.root + "\n")
6139 ui.write(repo.root + "\n")
6139
6140
6140 @command('^serve',
6141 @command('^serve',
6141 [('A', 'accesslog', '', _('name of access log file to write to'),
6142 [('A', 'accesslog', '', _('name of access log file to write to'),
6142 _('FILE')),
6143 _('FILE')),
6143 ('d', 'daemon', None, _('run server in background')),
6144 ('d', 'daemon', None, _('run server in background')),
6144 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('FILE')),
6145 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('FILE')),
6145 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6146 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6146 # use string type, then we can check if something was passed
6147 # use string type, then we can check if something was passed
6147 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6148 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6148 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6149 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6149 _('ADDR')),
6150 _('ADDR')),
6150 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6151 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6151 _('PREFIX')),
6152 _('PREFIX')),
6152 ('n', 'name', '',
6153 ('n', 'name', '',
6153 _('name to show in web pages (default: working directory)'), _('NAME')),
6154 _('name to show in web pages (default: working directory)'), _('NAME')),
6154 ('', 'web-conf', '',
6155 ('', 'web-conf', '',
6155 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6156 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6156 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6157 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6157 _('FILE')),
6158 _('FILE')),
6158 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6159 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6159 ('', 'stdio', None, _('for remote clients')),
6160 ('', 'stdio', None, _('for remote clients')),
6160 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6161 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6161 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6162 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6162 ('', 'style', '', _('template style to use'), _('STYLE')),
6163 ('', 'style', '', _('template style to use'), _('STYLE')),
6163 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6164 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6164 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6165 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6165 _('[OPTION]...'),
6166 _('[OPTION]...'),
6166 optionalrepo=True)
6167 optionalrepo=True)
6167 def serve(ui, repo, **opts):
6168 def serve(ui, repo, **opts):
6168 """start stand-alone webserver
6169 """start stand-alone webserver
6169
6170
6170 Start a local HTTP repository browser and pull server. You can use
6171 Start a local HTTP repository browser and pull server. You can use
6171 this for ad-hoc sharing and browsing of repositories. It is
6172 this for ad-hoc sharing and browsing of repositories. It is
6172 recommended to use a real web server to serve a repository for
6173 recommended to use a real web server to serve a repository for
6173 longer periods of time.
6174 longer periods of time.
6174
6175
6175 Please note that the server does not implement access control.
6176 Please note that the server does not implement access control.
6176 This means that, by default, anybody can read from the server and
6177 This means that, by default, anybody can read from the server and
6177 nobody can write to it by default. Set the ``web.allow_push``
6178 nobody can write to it by default. Set the ``web.allow_push``
6178 option to ``*`` to allow everybody to push to the server. You
6179 option to ``*`` to allow everybody to push to the server. You
6179 should use a real web server if you need to authenticate users.
6180 should use a real web server if you need to authenticate users.
6180
6181
6181 By default, the server logs accesses to stdout and errors to
6182 By default, the server logs accesses to stdout and errors to
6182 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6183 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6183 files.
6184 files.
6184
6185
6185 To have the server choose a free port number to listen on, specify
6186 To have the server choose a free port number to listen on, specify
6186 a port number of 0; in this case, the server will print the port
6187 a port number of 0; in this case, the server will print the port
6187 number it uses.
6188 number it uses.
6188
6189
6189 Returns 0 on success.
6190 Returns 0 on success.
6190 """
6191 """
6191
6192
6192 if opts["stdio"] and opts["cmdserver"]:
6193 if opts["stdio"] and opts["cmdserver"]:
6193 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6194 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6194
6195
6195 if opts["stdio"]:
6196 if opts["stdio"]:
6196 if repo is None:
6197 if repo is None:
6197 raise error.RepoError(_("there is no Mercurial repository here"
6198 raise error.RepoError(_("there is no Mercurial repository here"
6198 " (.hg not found)"))
6199 " (.hg not found)"))
6199 s = sshserver.sshserver(ui, repo)
6200 s = sshserver.sshserver(ui, repo)
6200 s.serve_forever()
6201 s.serve_forever()
6201
6202
6202 if opts["cmdserver"]:
6203 if opts["cmdserver"]:
6203 service = commandserver.createservice(ui, repo, opts)
6204 service = commandserver.createservice(ui, repo, opts)
6204 else:
6205 else:
6205 service = hgweb.createservice(ui, repo, opts)
6206 service = hgweb.createservice(ui, repo, opts)
6206 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6207 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6207
6208
6208 @command('^status|st',
6209 @command('^status|st',
6209 [('A', 'all', None, _('show status of all files')),
6210 [('A', 'all', None, _('show status of all files')),
6210 ('m', 'modified', None, _('show only modified files')),
6211 ('m', 'modified', None, _('show only modified files')),
6211 ('a', 'added', None, _('show only added files')),
6212 ('a', 'added', None, _('show only added files')),
6212 ('r', 'removed', None, _('show only removed files')),
6213 ('r', 'removed', None, _('show only removed files')),
6213 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6214 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6214 ('c', 'clean', None, _('show only files without changes')),
6215 ('c', 'clean', None, _('show only files without changes')),
6215 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6216 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6216 ('i', 'ignored', None, _('show only ignored files')),
6217 ('i', 'ignored', None, _('show only ignored files')),
6217 ('n', 'no-status', None, _('hide status prefix')),
6218 ('n', 'no-status', None, _('hide status prefix')),
6218 ('C', 'copies', None, _('show source of copied files')),
6219 ('C', 'copies', None, _('show source of copied files')),
6219 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6220 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6220 ('', 'rev', [], _('show difference from revision'), _('REV')),
6221 ('', 'rev', [], _('show difference from revision'), _('REV')),
6221 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6222 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6222 ] + walkopts + subrepoopts + formatteropts,
6223 ] + walkopts + subrepoopts + formatteropts,
6223 _('[OPTION]... [FILE]...'),
6224 _('[OPTION]... [FILE]...'),
6224 inferrepo=True)
6225 inferrepo=True)
6225 def status(ui, repo, *pats, **opts):
6226 def status(ui, repo, *pats, **opts):
6226 """show changed files in the working directory
6227 """show changed files in the working directory
6227
6228
6228 Show status of files in the repository. If names are given, only
6229 Show status of files in the repository. If names are given, only
6229 files that match are shown. Files that are clean or ignored or
6230 files that match are shown. Files that are clean or ignored or
6230 the source of a copy/move operation, are not listed unless
6231 the source of a copy/move operation, are not listed unless
6231 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6232 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6232 Unless options described with "show only ..." are given, the
6233 Unless options described with "show only ..." are given, the
6233 options -mardu are used.
6234 options -mardu are used.
6234
6235
6235 Option -q/--quiet hides untracked (unknown and ignored) files
6236 Option -q/--quiet hides untracked (unknown and ignored) files
6236 unless explicitly requested with -u/--unknown or -i/--ignored.
6237 unless explicitly requested with -u/--unknown or -i/--ignored.
6237
6238
6238 .. note::
6239 .. note::
6239
6240
6240 status may appear to disagree with diff if permissions have
6241 status may appear to disagree with diff if permissions have
6241 changed or a merge has occurred. The standard diff format does
6242 changed or a merge has occurred. The standard diff format does
6242 not report permission changes and diff only reports changes
6243 not report permission changes and diff only reports changes
6243 relative to one merge parent.
6244 relative to one merge parent.
6244
6245
6245 If one revision is given, it is used as the base revision.
6246 If one revision is given, it is used as the base revision.
6246 If two revisions are given, the differences between them are
6247 If two revisions are given, the differences between them are
6247 shown. The --change option can also be used as a shortcut to list
6248 shown. The --change option can also be used as a shortcut to list
6248 the changed files of a revision from its first parent.
6249 the changed files of a revision from its first parent.
6249
6250
6250 The codes used to show the status of files are::
6251 The codes used to show the status of files are::
6251
6252
6252 M = modified
6253 M = modified
6253 A = added
6254 A = added
6254 R = removed
6255 R = removed
6255 C = clean
6256 C = clean
6256 ! = missing (deleted by non-hg command, but still tracked)
6257 ! = missing (deleted by non-hg command, but still tracked)
6257 ? = not tracked
6258 ? = not tracked
6258 I = ignored
6259 I = ignored
6259 = origin of the previous file (with --copies)
6260 = origin of the previous file (with --copies)
6260
6261
6261 .. container:: verbose
6262 .. container:: verbose
6262
6263
6263 Examples:
6264 Examples:
6264
6265
6265 - show changes in the working directory relative to a
6266 - show changes in the working directory relative to a
6266 changeset::
6267 changeset::
6267
6268
6268 hg status --rev 9353
6269 hg status --rev 9353
6269
6270
6270 - show changes in the working directory relative to the
6271 - show changes in the working directory relative to the
6271 current directory (see :hg:`help patterns` for more information)::
6272 current directory (see :hg:`help patterns` for more information)::
6272
6273
6273 hg status re:
6274 hg status re:
6274
6275
6275 - show all changes including copies in an existing changeset::
6276 - show all changes including copies in an existing changeset::
6276
6277
6277 hg status --copies --change 9353
6278 hg status --copies --change 9353
6278
6279
6279 - get a NUL separated list of added files, suitable for xargs::
6280 - get a NUL separated list of added files, suitable for xargs::
6280
6281
6281 hg status -an0
6282 hg status -an0
6282
6283
6283 Returns 0 on success.
6284 Returns 0 on success.
6284 """
6285 """
6285
6286
6286 revs = opts.get('rev')
6287 revs = opts.get('rev')
6287 change = opts.get('change')
6288 change = opts.get('change')
6288
6289
6289 if revs and change:
6290 if revs and change:
6290 msg = _('cannot specify --rev and --change at the same time')
6291 msg = _('cannot specify --rev and --change at the same time')
6291 raise error.Abort(msg)
6292 raise error.Abort(msg)
6292 elif change:
6293 elif change:
6293 node2 = scmutil.revsingle(repo, change, None).node()
6294 node2 = scmutil.revsingle(repo, change, None).node()
6294 node1 = repo[node2].p1().node()
6295 node1 = repo[node2].p1().node()
6295 else:
6296 else:
6296 node1, node2 = scmutil.revpair(repo, revs)
6297 node1, node2 = scmutil.revpair(repo, revs)
6297
6298
6298 if pats:
6299 if pats:
6299 cwd = repo.getcwd()
6300 cwd = repo.getcwd()
6300 else:
6301 else:
6301 cwd = ''
6302 cwd = ''
6302
6303
6303 if opts.get('print0'):
6304 if opts.get('print0'):
6304 end = '\0'
6305 end = '\0'
6305 else:
6306 else:
6306 end = '\n'
6307 end = '\n'
6307 copy = {}
6308 copy = {}
6308 states = 'modified added removed deleted unknown ignored clean'.split()
6309 states = 'modified added removed deleted unknown ignored clean'.split()
6309 show = [k for k in states if opts.get(k)]
6310 show = [k for k in states if opts.get(k)]
6310 if opts.get('all'):
6311 if opts.get('all'):
6311 show += ui.quiet and (states[:4] + ['clean']) or states
6312 show += ui.quiet and (states[:4] + ['clean']) or states
6312 if not show:
6313 if not show:
6313 if ui.quiet:
6314 if ui.quiet:
6314 show = states[:4]
6315 show = states[:4]
6315 else:
6316 else:
6316 show = states[:5]
6317 show = states[:5]
6317
6318
6318 m = scmutil.match(repo[node2], pats, opts)
6319 m = scmutil.match(repo[node2], pats, opts)
6319 stat = repo.status(node1, node2, m,
6320 stat = repo.status(node1, node2, m,
6320 'ignored' in show, 'clean' in show, 'unknown' in show,
6321 'ignored' in show, 'clean' in show, 'unknown' in show,
6321 opts.get('subrepos'))
6322 opts.get('subrepos'))
6322 changestates = zip(states, 'MAR!?IC', stat)
6323 changestates = zip(states, 'MAR!?IC', stat)
6323
6324
6324 if (opts.get('all') or opts.get('copies')
6325 if (opts.get('all') or opts.get('copies')
6325 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6326 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6326 copy = copies.pathcopies(repo[node1], repo[node2], m)
6327 copy = copies.pathcopies(repo[node1], repo[node2], m)
6327
6328
6328 fm = ui.formatter('status', opts)
6329 fm = ui.formatter('status', opts)
6329 fmt = '%s' + end
6330 fmt = '%s' + end
6330 showchar = not opts.get('no_status')
6331 showchar = not opts.get('no_status')
6331
6332
6332 for state, char, files in changestates:
6333 for state, char, files in changestates:
6333 if state in show:
6334 if state in show:
6334 label = 'status.' + state
6335 label = 'status.' + state
6335 for f in files:
6336 for f in files:
6336 fm.startitem()
6337 fm.startitem()
6337 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6338 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6338 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6339 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6339 if f in copy:
6340 if f in copy:
6340 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6341 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6341 label='status.copied')
6342 label='status.copied')
6342 fm.end()
6343 fm.end()
6343
6344
6344 @command('^summary|sum',
6345 @command('^summary|sum',
6345 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6346 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6346 def summary(ui, repo, **opts):
6347 def summary(ui, repo, **opts):
6347 """summarize working directory state
6348 """summarize working directory state
6348
6349
6349 This generates a brief summary of the working directory state,
6350 This generates a brief summary of the working directory state,
6350 including parents, branch, commit status, phase and available updates.
6351 including parents, branch, commit status, phase and available updates.
6351
6352
6352 With the --remote option, this will check the default paths for
6353 With the --remote option, this will check the default paths for
6353 incoming and outgoing changes. This can be time-consuming.
6354 incoming and outgoing changes. This can be time-consuming.
6354
6355
6355 Returns 0 on success.
6356 Returns 0 on success.
6356 """
6357 """
6357
6358
6358 ctx = repo[None]
6359 ctx = repo[None]
6359 parents = ctx.parents()
6360 parents = ctx.parents()
6360 pnode = parents[0].node()
6361 pnode = parents[0].node()
6361 marks = []
6362 marks = []
6362
6363
6363 for p in parents:
6364 for p in parents:
6364 # label with log.changeset (instead of log.parent) since this
6365 # label with log.changeset (instead of log.parent) since this
6365 # shows a working directory parent *changeset*:
6366 # shows a working directory parent *changeset*:
6366 # i18n: column positioning for "hg summary"
6367 # i18n: column positioning for "hg summary"
6367 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6368 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6368 label='log.changeset changeset.%s' % p.phasestr())
6369 label='log.changeset changeset.%s' % p.phasestr())
6369 ui.write(' '.join(p.tags()), label='log.tag')
6370 ui.write(' '.join(p.tags()), label='log.tag')
6370 if p.bookmarks():
6371 if p.bookmarks():
6371 marks.extend(p.bookmarks())
6372 marks.extend(p.bookmarks())
6372 if p.rev() == -1:
6373 if p.rev() == -1:
6373 if not len(repo):
6374 if not len(repo):
6374 ui.write(_(' (empty repository)'))
6375 ui.write(_(' (empty repository)'))
6375 else:
6376 else:
6376 ui.write(_(' (no revision checked out)'))
6377 ui.write(_(' (no revision checked out)'))
6377 ui.write('\n')
6378 ui.write('\n')
6378 if p.description():
6379 if p.description():
6379 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6380 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6380 label='log.summary')
6381 label='log.summary')
6381
6382
6382 branch = ctx.branch()
6383 branch = ctx.branch()
6383 bheads = repo.branchheads(branch)
6384 bheads = repo.branchheads(branch)
6384 # i18n: column positioning for "hg summary"
6385 # i18n: column positioning for "hg summary"
6385 m = _('branch: %s\n') % branch
6386 m = _('branch: %s\n') % branch
6386 if branch != 'default':
6387 if branch != 'default':
6387 ui.write(m, label='log.branch')
6388 ui.write(m, label='log.branch')
6388 else:
6389 else:
6389 ui.status(m, label='log.branch')
6390 ui.status(m, label='log.branch')
6390
6391
6391 if marks:
6392 if marks:
6392 active = repo._activebookmark
6393 active = repo._activebookmark
6393 # i18n: column positioning for "hg summary"
6394 # i18n: column positioning for "hg summary"
6394 ui.write(_('bookmarks:'), label='log.bookmark')
6395 ui.write(_('bookmarks:'), label='log.bookmark')
6395 if active is not None:
6396 if active is not None:
6396 if active in marks:
6397 if active in marks:
6397 ui.write(' *' + active, label=activebookmarklabel)
6398 ui.write(' *' + active, label=activebookmarklabel)
6398 marks.remove(active)
6399 marks.remove(active)
6399 else:
6400 else:
6400 ui.write(' [%s]' % active, label=activebookmarklabel)
6401 ui.write(' [%s]' % active, label=activebookmarklabel)
6401 for m in marks:
6402 for m in marks:
6402 ui.write(' ' + m, label='log.bookmark')
6403 ui.write(' ' + m, label='log.bookmark')
6403 ui.write('\n', label='log.bookmark')
6404 ui.write('\n', label='log.bookmark')
6404
6405
6405 status = repo.status(unknown=True)
6406 status = repo.status(unknown=True)
6406
6407
6407 c = repo.dirstate.copies()
6408 c = repo.dirstate.copies()
6408 copied, renamed = [], []
6409 copied, renamed = [], []
6409 for d, s in c.iteritems():
6410 for d, s in c.iteritems():
6410 if s in status.removed:
6411 if s in status.removed:
6411 status.removed.remove(s)
6412 status.removed.remove(s)
6412 renamed.append(d)
6413 renamed.append(d)
6413 else:
6414 else:
6414 copied.append(d)
6415 copied.append(d)
6415 if d in status.added:
6416 if d in status.added:
6416 status.added.remove(d)
6417 status.added.remove(d)
6417
6418
6418 try:
6419 try:
6419 ms = mergemod.mergestate.read(repo)
6420 ms = mergemod.mergestate.read(repo)
6420 except error.UnsupportedMergeRecords as e:
6421 except error.UnsupportedMergeRecords as e:
6421 s = ' '.join(e.recordtypes)
6422 s = ' '.join(e.recordtypes)
6422 ui.warn(
6423 ui.warn(
6423 _('warning: merge state has unsupported record types: %s\n') % s)
6424 _('warning: merge state has unsupported record types: %s\n') % s)
6424 unresolved = 0
6425 unresolved = 0
6425 else:
6426 else:
6426 unresolved = [f for f in ms if ms[f] == 'u']
6427 unresolved = [f for f in ms if ms[f] == 'u']
6427
6428
6428 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6429 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6429
6430
6430 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6431 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6431 (ui.label(_('%d added'), 'status.added'), status.added),
6432 (ui.label(_('%d added'), 'status.added'), status.added),
6432 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6433 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6433 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6434 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6434 (ui.label(_('%d copied'), 'status.copied'), copied),
6435 (ui.label(_('%d copied'), 'status.copied'), copied),
6435 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6436 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6436 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6437 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6437 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6438 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6438 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6439 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6439 t = []
6440 t = []
6440 for l, s in labels:
6441 for l, s in labels:
6441 if s:
6442 if s:
6442 t.append(l % len(s))
6443 t.append(l % len(s))
6443
6444
6444 t = ', '.join(t)
6445 t = ', '.join(t)
6445 cleanworkdir = False
6446 cleanworkdir = False
6446
6447
6447 if repo.vfs.exists('graftstate'):
6448 if repo.vfs.exists('graftstate'):
6448 t += _(' (graft in progress)')
6449 t += _(' (graft in progress)')
6449 if repo.vfs.exists('updatestate'):
6450 if repo.vfs.exists('updatestate'):
6450 t += _(' (interrupted update)')
6451 t += _(' (interrupted update)')
6451 elif len(parents) > 1:
6452 elif len(parents) > 1:
6452 t += _(' (merge)')
6453 t += _(' (merge)')
6453 elif branch != parents[0].branch():
6454 elif branch != parents[0].branch():
6454 t += _(' (new branch)')
6455 t += _(' (new branch)')
6455 elif (parents[0].closesbranch() and
6456 elif (parents[0].closesbranch() and
6456 pnode in repo.branchheads(branch, closed=True)):
6457 pnode in repo.branchheads(branch, closed=True)):
6457 t += _(' (head closed)')
6458 t += _(' (head closed)')
6458 elif not (status.modified or status.added or status.removed or renamed or
6459 elif not (status.modified or status.added or status.removed or renamed or
6459 copied or subs):
6460 copied or subs):
6460 t += _(' (clean)')
6461 t += _(' (clean)')
6461 cleanworkdir = True
6462 cleanworkdir = True
6462 elif pnode not in bheads:
6463 elif pnode not in bheads:
6463 t += _(' (new branch head)')
6464 t += _(' (new branch head)')
6464
6465
6465 if parents:
6466 if parents:
6466 pendingphase = max(p.phase() for p in parents)
6467 pendingphase = max(p.phase() for p in parents)
6467 else:
6468 else:
6468 pendingphase = phases.public
6469 pendingphase = phases.public
6469
6470
6470 if pendingphase > phases.newcommitphase(ui):
6471 if pendingphase > phases.newcommitphase(ui):
6471 t += ' (%s)' % phases.phasenames[pendingphase]
6472 t += ' (%s)' % phases.phasenames[pendingphase]
6472
6473
6473 if cleanworkdir:
6474 if cleanworkdir:
6474 # i18n: column positioning for "hg summary"
6475 # i18n: column positioning for "hg summary"
6475 ui.status(_('commit: %s\n') % t.strip())
6476 ui.status(_('commit: %s\n') % t.strip())
6476 else:
6477 else:
6477 # i18n: column positioning for "hg summary"
6478 # i18n: column positioning for "hg summary"
6478 ui.write(_('commit: %s\n') % t.strip())
6479 ui.write(_('commit: %s\n') % t.strip())
6479
6480
6480 # all ancestors of branch heads - all ancestors of parent = new csets
6481 # all ancestors of branch heads - all ancestors of parent = new csets
6481 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6482 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6482 bheads))
6483 bheads))
6483
6484
6484 if new == 0:
6485 if new == 0:
6485 # i18n: column positioning for "hg summary"
6486 # i18n: column positioning for "hg summary"
6486 ui.status(_('update: (current)\n'))
6487 ui.status(_('update: (current)\n'))
6487 elif pnode not in bheads:
6488 elif pnode not in bheads:
6488 # i18n: column positioning for "hg summary"
6489 # i18n: column positioning for "hg summary"
6489 ui.write(_('update: %d new changesets (update)\n') % new)
6490 ui.write(_('update: %d new changesets (update)\n') % new)
6490 else:
6491 else:
6491 # i18n: column positioning for "hg summary"
6492 # i18n: column positioning for "hg summary"
6492 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6493 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6493 (new, len(bheads)))
6494 (new, len(bheads)))
6494
6495
6495 t = []
6496 t = []
6496 draft = len(repo.revs('draft()'))
6497 draft = len(repo.revs('draft()'))
6497 if draft:
6498 if draft:
6498 t.append(_('%d draft') % draft)
6499 t.append(_('%d draft') % draft)
6499 secret = len(repo.revs('secret()'))
6500 secret = len(repo.revs('secret()'))
6500 if secret:
6501 if secret:
6501 t.append(_('%d secret') % secret)
6502 t.append(_('%d secret') % secret)
6502
6503
6503 if draft or secret:
6504 if draft or secret:
6504 ui.status(_('phases: %s\n') % ', '.join(t))
6505 ui.status(_('phases: %s\n') % ', '.join(t))
6505
6506
6506 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6507 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6507 for trouble in ("unstable", "divergent", "bumped"):
6508 for trouble in ("unstable", "divergent", "bumped"):
6508 numtrouble = len(repo.revs(trouble + "()"))
6509 numtrouble = len(repo.revs(trouble + "()"))
6509 # We write all the possibilities to ease translation
6510 # We write all the possibilities to ease translation
6510 troublemsg = {
6511 troublemsg = {
6511 "unstable": _("unstable: %d changeset"),
6512 "unstable": _("unstable: %d changeset"),
6512 "divergent": _("divergent: %d changeset"),
6513 "divergent": _("divergent: %d changeset"),
6513 "bumped": _("bumped: %d changeset"),
6514 "bumped": _("bumped: %d changeset"),
6514 }
6515 }
6515 if numtrouble > 0:
6516 if numtrouble > 0:
6516 ui.status(troublemsg[trouble] % numtrouble + "\n")
6517 ui.status(troublemsg[trouble] % numtrouble + "\n")
6517
6518
6518 cmdutil.summaryhooks(ui, repo)
6519 cmdutil.summaryhooks(ui, repo)
6519
6520
6520 if opts.get('remote'):
6521 if opts.get('remote'):
6521 needsincoming, needsoutgoing = True, True
6522 needsincoming, needsoutgoing = True, True
6522 else:
6523 else:
6523 needsincoming, needsoutgoing = False, False
6524 needsincoming, needsoutgoing = False, False
6524 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6525 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6525 if i:
6526 if i:
6526 needsincoming = True
6527 needsincoming = True
6527 if o:
6528 if o:
6528 needsoutgoing = True
6529 needsoutgoing = True
6529 if not needsincoming and not needsoutgoing:
6530 if not needsincoming and not needsoutgoing:
6530 return
6531 return
6531
6532
6532 def getincoming():
6533 def getincoming():
6533 source, branches = hg.parseurl(ui.expandpath('default'))
6534 source, branches = hg.parseurl(ui.expandpath('default'))
6534 sbranch = branches[0]
6535 sbranch = branches[0]
6535 try:
6536 try:
6536 other = hg.peer(repo, {}, source)
6537 other = hg.peer(repo, {}, source)
6537 except error.RepoError:
6538 except error.RepoError:
6538 if opts.get('remote'):
6539 if opts.get('remote'):
6539 raise
6540 raise
6540 return source, sbranch, None, None, None
6541 return source, sbranch, None, None, None
6541 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6542 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6542 if revs:
6543 if revs:
6543 revs = [other.lookup(rev) for rev in revs]
6544 revs = [other.lookup(rev) for rev in revs]
6544 ui.debug('comparing with %s\n' % util.hidepassword(source))
6545 ui.debug('comparing with %s\n' % util.hidepassword(source))
6545 repo.ui.pushbuffer()
6546 repo.ui.pushbuffer()
6546 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6547 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6547 repo.ui.popbuffer()
6548 repo.ui.popbuffer()
6548 return source, sbranch, other, commoninc, commoninc[1]
6549 return source, sbranch, other, commoninc, commoninc[1]
6549
6550
6550 if needsincoming:
6551 if needsincoming:
6551 source, sbranch, sother, commoninc, incoming = getincoming()
6552 source, sbranch, sother, commoninc, incoming = getincoming()
6552 else:
6553 else:
6553 source = sbranch = sother = commoninc = incoming = None
6554 source = sbranch = sother = commoninc = incoming = None
6554
6555
6555 def getoutgoing():
6556 def getoutgoing():
6556 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6557 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6557 dbranch = branches[0]
6558 dbranch = branches[0]
6558 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6559 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6559 if source != dest:
6560 if source != dest:
6560 try:
6561 try:
6561 dother = hg.peer(repo, {}, dest)
6562 dother = hg.peer(repo, {}, dest)
6562 except error.RepoError:
6563 except error.RepoError:
6563 if opts.get('remote'):
6564 if opts.get('remote'):
6564 raise
6565 raise
6565 return dest, dbranch, None, None
6566 return dest, dbranch, None, None
6566 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6567 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6567 elif sother is None:
6568 elif sother is None:
6568 # there is no explicit destination peer, but source one is invalid
6569 # there is no explicit destination peer, but source one is invalid
6569 return dest, dbranch, None, None
6570 return dest, dbranch, None, None
6570 else:
6571 else:
6571 dother = sother
6572 dother = sother
6572 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6573 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6573 common = None
6574 common = None
6574 else:
6575 else:
6575 common = commoninc
6576 common = commoninc
6576 if revs:
6577 if revs:
6577 revs = [repo.lookup(rev) for rev in revs]
6578 revs = [repo.lookup(rev) for rev in revs]
6578 repo.ui.pushbuffer()
6579 repo.ui.pushbuffer()
6579 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6580 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6580 commoninc=common)
6581 commoninc=common)
6581 repo.ui.popbuffer()
6582 repo.ui.popbuffer()
6582 return dest, dbranch, dother, outgoing
6583 return dest, dbranch, dother, outgoing
6583
6584
6584 if needsoutgoing:
6585 if needsoutgoing:
6585 dest, dbranch, dother, outgoing = getoutgoing()
6586 dest, dbranch, dother, outgoing = getoutgoing()
6586 else:
6587 else:
6587 dest = dbranch = dother = outgoing = None
6588 dest = dbranch = dother = outgoing = None
6588
6589
6589 if opts.get('remote'):
6590 if opts.get('remote'):
6590 t = []
6591 t = []
6591 if incoming:
6592 if incoming:
6592 t.append(_('1 or more incoming'))
6593 t.append(_('1 or more incoming'))
6593 o = outgoing.missing
6594 o = outgoing.missing
6594 if o:
6595 if o:
6595 t.append(_('%d outgoing') % len(o))
6596 t.append(_('%d outgoing') % len(o))
6596 other = dother or sother
6597 other = dother or sother
6597 if 'bookmarks' in other.listkeys('namespaces'):
6598 if 'bookmarks' in other.listkeys('namespaces'):
6598 counts = bookmarks.summary(repo, other)
6599 counts = bookmarks.summary(repo, other)
6599 if counts[0] > 0:
6600 if counts[0] > 0:
6600 t.append(_('%d incoming bookmarks') % counts[0])
6601 t.append(_('%d incoming bookmarks') % counts[0])
6601 if counts[1] > 0:
6602 if counts[1] > 0:
6602 t.append(_('%d outgoing bookmarks') % counts[1])
6603 t.append(_('%d outgoing bookmarks') % counts[1])
6603
6604
6604 if t:
6605 if t:
6605 # i18n: column positioning for "hg summary"
6606 # i18n: column positioning for "hg summary"
6606 ui.write(_('remote: %s\n') % (', '.join(t)))
6607 ui.write(_('remote: %s\n') % (', '.join(t)))
6607 else:
6608 else:
6608 # i18n: column positioning for "hg summary"
6609 # i18n: column positioning for "hg summary"
6609 ui.status(_('remote: (synced)\n'))
6610 ui.status(_('remote: (synced)\n'))
6610
6611
6611 cmdutil.summaryremotehooks(ui, repo, opts,
6612 cmdutil.summaryremotehooks(ui, repo, opts,
6612 ((source, sbranch, sother, commoninc),
6613 ((source, sbranch, sother, commoninc),
6613 (dest, dbranch, dother, outgoing)))
6614 (dest, dbranch, dother, outgoing)))
6614
6615
6615 @command('tag',
6616 @command('tag',
6616 [('f', 'force', None, _('force tag')),
6617 [('f', 'force', None, _('force tag')),
6617 ('l', 'local', None, _('make the tag local')),
6618 ('l', 'local', None, _('make the tag local')),
6618 ('r', 'rev', '', _('revision to tag'), _('REV')),
6619 ('r', 'rev', '', _('revision to tag'), _('REV')),
6619 ('', 'remove', None, _('remove a tag')),
6620 ('', 'remove', None, _('remove a tag')),
6620 # -l/--local is already there, commitopts cannot be used
6621 # -l/--local is already there, commitopts cannot be used
6621 ('e', 'edit', None, _('invoke editor on commit messages')),
6622 ('e', 'edit', None, _('invoke editor on commit messages')),
6622 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6623 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6623 ] + commitopts2,
6624 ] + commitopts2,
6624 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6625 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6625 def tag(ui, repo, name1, *names, **opts):
6626 def tag(ui, repo, name1, *names, **opts):
6626 """add one or more tags for the current or given revision
6627 """add one or more tags for the current or given revision
6627
6628
6628 Name a particular revision using <name>.
6629 Name a particular revision using <name>.
6629
6630
6630 Tags are used to name particular revisions of the repository and are
6631 Tags are used to name particular revisions of the repository and are
6631 very useful to compare different revisions, to go back to significant
6632 very useful to compare different revisions, to go back to significant
6632 earlier versions or to mark branch points as releases, etc. Changing
6633 earlier versions or to mark branch points as releases, etc. Changing
6633 an existing tag is normally disallowed; use -f/--force to override.
6634 an existing tag is normally disallowed; use -f/--force to override.
6634
6635
6635 If no revision is given, the parent of the working directory is
6636 If no revision is given, the parent of the working directory is
6636 used.
6637 used.
6637
6638
6638 To facilitate version control, distribution, and merging of tags,
6639 To facilitate version control, distribution, and merging of tags,
6639 they are stored as a file named ".hgtags" which is managed similarly
6640 they are stored as a file named ".hgtags" which is managed similarly
6640 to other project files and can be hand-edited if necessary. This
6641 to other project files and can be hand-edited if necessary. This
6641 also means that tagging creates a new commit. The file
6642 also means that tagging creates a new commit. The file
6642 ".hg/localtags" is used for local tags (not shared among
6643 ".hg/localtags" is used for local tags (not shared among
6643 repositories).
6644 repositories).
6644
6645
6645 Tag commits are usually made at the head of a branch. If the parent
6646 Tag commits are usually made at the head of a branch. If the parent
6646 of the working directory is not a branch head, :hg:`tag` aborts; use
6647 of the working directory is not a branch head, :hg:`tag` aborts; use
6647 -f/--force to force the tag commit to be based on a non-head
6648 -f/--force to force the tag commit to be based on a non-head
6648 changeset.
6649 changeset.
6649
6650
6650 See :hg:`help dates` for a list of formats valid for -d/--date.
6651 See :hg:`help dates` for a list of formats valid for -d/--date.
6651
6652
6652 Since tag names have priority over branch names during revision
6653 Since tag names have priority over branch names during revision
6653 lookup, using an existing branch name as a tag name is discouraged.
6654 lookup, using an existing branch name as a tag name is discouraged.
6654
6655
6655 Returns 0 on success.
6656 Returns 0 on success.
6656 """
6657 """
6657 wlock = lock = None
6658 wlock = lock = None
6658 try:
6659 try:
6659 wlock = repo.wlock()
6660 wlock = repo.wlock()
6660 lock = repo.lock()
6661 lock = repo.lock()
6661 rev_ = "."
6662 rev_ = "."
6662 names = [t.strip() for t in (name1,) + names]
6663 names = [t.strip() for t in (name1,) + names]
6663 if len(names) != len(set(names)):
6664 if len(names) != len(set(names)):
6664 raise error.Abort(_('tag names must be unique'))
6665 raise error.Abort(_('tag names must be unique'))
6665 for n in names:
6666 for n in names:
6666 scmutil.checknewlabel(repo, n, 'tag')
6667 scmutil.checknewlabel(repo, n, 'tag')
6667 if not n:
6668 if not n:
6668 raise error.Abort(_('tag names cannot consist entirely of '
6669 raise error.Abort(_('tag names cannot consist entirely of '
6669 'whitespace'))
6670 'whitespace'))
6670 if opts.get('rev') and opts.get('remove'):
6671 if opts.get('rev') and opts.get('remove'):
6671 raise error.Abort(_("--rev and --remove are incompatible"))
6672 raise error.Abort(_("--rev and --remove are incompatible"))
6672 if opts.get('rev'):
6673 if opts.get('rev'):
6673 rev_ = opts['rev']
6674 rev_ = opts['rev']
6674 message = opts.get('message')
6675 message = opts.get('message')
6675 if opts.get('remove'):
6676 if opts.get('remove'):
6676 if opts.get('local'):
6677 if opts.get('local'):
6677 expectedtype = 'local'
6678 expectedtype = 'local'
6678 else:
6679 else:
6679 expectedtype = 'global'
6680 expectedtype = 'global'
6680
6681
6681 for n in names:
6682 for n in names:
6682 if not repo.tagtype(n):
6683 if not repo.tagtype(n):
6683 raise error.Abort(_("tag '%s' does not exist") % n)
6684 raise error.Abort(_("tag '%s' does not exist") % n)
6684 if repo.tagtype(n) != expectedtype:
6685 if repo.tagtype(n) != expectedtype:
6685 if expectedtype == 'global':
6686 if expectedtype == 'global':
6686 raise error.Abort(_("tag '%s' is not a global tag") % n)
6687 raise error.Abort(_("tag '%s' is not a global tag") % n)
6687 else:
6688 else:
6688 raise error.Abort(_("tag '%s' is not a local tag") % n)
6689 raise error.Abort(_("tag '%s' is not a local tag") % n)
6689 rev_ = 'null'
6690 rev_ = 'null'
6690 if not message:
6691 if not message:
6691 # we don't translate commit messages
6692 # we don't translate commit messages
6692 message = 'Removed tag %s' % ', '.join(names)
6693 message = 'Removed tag %s' % ', '.join(names)
6693 elif not opts.get('force'):
6694 elif not opts.get('force'):
6694 for n in names:
6695 for n in names:
6695 if n in repo.tags():
6696 if n in repo.tags():
6696 raise error.Abort(_("tag '%s' already exists "
6697 raise error.Abort(_("tag '%s' already exists "
6697 "(use -f to force)") % n)
6698 "(use -f to force)") % n)
6698 if not opts.get('local'):
6699 if not opts.get('local'):
6699 p1, p2 = repo.dirstate.parents()
6700 p1, p2 = repo.dirstate.parents()
6700 if p2 != nullid:
6701 if p2 != nullid:
6701 raise error.Abort(_('uncommitted merge'))
6702 raise error.Abort(_('uncommitted merge'))
6702 bheads = repo.branchheads()
6703 bheads = repo.branchheads()
6703 if not opts.get('force') and bheads and p1 not in bheads:
6704 if not opts.get('force') and bheads and p1 not in bheads:
6704 raise error.Abort(_('not at a branch head (use -f to force)'))
6705 raise error.Abort(_('not at a branch head (use -f to force)'))
6705 r = scmutil.revsingle(repo, rev_).node()
6706 r = scmutil.revsingle(repo, rev_).node()
6706
6707
6707 if not message:
6708 if not message:
6708 # we don't translate commit messages
6709 # we don't translate commit messages
6709 message = ('Added tag %s for changeset %s' %
6710 message = ('Added tag %s for changeset %s' %
6710 (', '.join(names), short(r)))
6711 (', '.join(names), short(r)))
6711
6712
6712 date = opts.get('date')
6713 date = opts.get('date')
6713 if date:
6714 if date:
6714 date = util.parsedate(date)
6715 date = util.parsedate(date)
6715
6716
6716 if opts.get('remove'):
6717 if opts.get('remove'):
6717 editform = 'tag.remove'
6718 editform = 'tag.remove'
6718 else:
6719 else:
6719 editform = 'tag.add'
6720 editform = 'tag.add'
6720 editor = cmdutil.getcommiteditor(editform=editform, **opts)
6721 editor = cmdutil.getcommiteditor(editform=editform, **opts)
6721
6722
6722 # don't allow tagging the null rev
6723 # don't allow tagging the null rev
6723 if (not opts.get('remove') and
6724 if (not opts.get('remove') and
6724 scmutil.revsingle(repo, rev_).rev() == nullrev):
6725 scmutil.revsingle(repo, rev_).rev() == nullrev):
6725 raise error.Abort(_("cannot tag null revision"))
6726 raise error.Abort(_("cannot tag null revision"))
6726
6727
6727 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
6728 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
6728 editor=editor)
6729 editor=editor)
6729 finally:
6730 finally:
6730 release(lock, wlock)
6731 release(lock, wlock)
6731
6732
6732 @command('tags', formatteropts, '')
6733 @command('tags', formatteropts, '')
6733 def tags(ui, repo, **opts):
6734 def tags(ui, repo, **opts):
6734 """list repository tags
6735 """list repository tags
6735
6736
6736 This lists both regular and local tags. When the -v/--verbose
6737 This lists both regular and local tags. When the -v/--verbose
6737 switch is used, a third column "local" is printed for local tags.
6738 switch is used, a third column "local" is printed for local tags.
6738 When the -q/--quiet switch is used, only the tag name is printed.
6739 When the -q/--quiet switch is used, only the tag name is printed.
6739
6740
6740 Returns 0 on success.
6741 Returns 0 on success.
6741 """
6742 """
6742
6743
6743 fm = ui.formatter('tags', opts)
6744 fm = ui.formatter('tags', opts)
6744 hexfunc = fm.hexfunc
6745 hexfunc = fm.hexfunc
6745 tagtype = ""
6746 tagtype = ""
6746
6747
6747 for t, n in reversed(repo.tagslist()):
6748 for t, n in reversed(repo.tagslist()):
6748 hn = hexfunc(n)
6749 hn = hexfunc(n)
6749 label = 'tags.normal'
6750 label = 'tags.normal'
6750 tagtype = ''
6751 tagtype = ''
6751 if repo.tagtype(t) == 'local':
6752 if repo.tagtype(t) == 'local':
6752 label = 'tags.local'
6753 label = 'tags.local'
6753 tagtype = 'local'
6754 tagtype = 'local'
6754
6755
6755 fm.startitem()
6756 fm.startitem()
6756 fm.write('tag', '%s', t, label=label)
6757 fm.write('tag', '%s', t, label=label)
6757 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
6758 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
6758 fm.condwrite(not ui.quiet, 'rev node', fmt,
6759 fm.condwrite(not ui.quiet, 'rev node', fmt,
6759 repo.changelog.rev(n), hn, label=label)
6760 repo.changelog.rev(n), hn, label=label)
6760 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
6761 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
6761 tagtype, label=label)
6762 tagtype, label=label)
6762 fm.plain('\n')
6763 fm.plain('\n')
6763 fm.end()
6764 fm.end()
6764
6765
6765 @command('tip',
6766 @command('tip',
6766 [('p', 'patch', None, _('show patch')),
6767 [('p', 'patch', None, _('show patch')),
6767 ('g', 'git', None, _('use git extended diff format')),
6768 ('g', 'git', None, _('use git extended diff format')),
6768 ] + templateopts,
6769 ] + templateopts,
6769 _('[-p] [-g]'))
6770 _('[-p] [-g]'))
6770 def tip(ui, repo, **opts):
6771 def tip(ui, repo, **opts):
6771 """show the tip revision (DEPRECATED)
6772 """show the tip revision (DEPRECATED)
6772
6773
6773 The tip revision (usually just called the tip) is the changeset
6774 The tip revision (usually just called the tip) is the changeset
6774 most recently added to the repository (and therefore the most
6775 most recently added to the repository (and therefore the most
6775 recently changed head).
6776 recently changed head).
6776
6777
6777 If you have just made a commit, that commit will be the tip. If
6778 If you have just made a commit, that commit will be the tip. If
6778 you have just pulled changes from another repository, the tip of
6779 you have just pulled changes from another repository, the tip of
6779 that repository becomes the current tip. The "tip" tag is special
6780 that repository becomes the current tip. The "tip" tag is special
6780 and cannot be renamed or assigned to a different changeset.
6781 and cannot be renamed or assigned to a different changeset.
6781
6782
6782 This command is deprecated, please use :hg:`heads` instead.
6783 This command is deprecated, please use :hg:`heads` instead.
6783
6784
6784 Returns 0 on success.
6785 Returns 0 on success.
6785 """
6786 """
6786 displayer = cmdutil.show_changeset(ui, repo, opts)
6787 displayer = cmdutil.show_changeset(ui, repo, opts)
6787 displayer.show(repo['tip'])
6788 displayer.show(repo['tip'])
6788 displayer.close()
6789 displayer.close()
6789
6790
6790 @command('unbundle',
6791 @command('unbundle',
6791 [('u', 'update', None,
6792 [('u', 'update', None,
6792 _('update to new branch head if changesets were unbundled'))],
6793 _('update to new branch head if changesets were unbundled'))],
6793 _('[-u] FILE...'))
6794 _('[-u] FILE...'))
6794 def unbundle(ui, repo, fname1, *fnames, **opts):
6795 def unbundle(ui, repo, fname1, *fnames, **opts):
6795 """apply one or more changegroup files
6796 """apply one or more changegroup files
6796
6797
6797 Apply one or more compressed changegroup files generated by the
6798 Apply one or more compressed changegroup files generated by the
6798 bundle command.
6799 bundle command.
6799
6800
6800 Returns 0 on success, 1 if an update has unresolved files.
6801 Returns 0 on success, 1 if an update has unresolved files.
6801 """
6802 """
6802 fnames = (fname1,) + fnames
6803 fnames = (fname1,) + fnames
6803
6804
6804 lock = repo.lock()
6805 lock = repo.lock()
6805 try:
6806 try:
6806 for fname in fnames:
6807 for fname in fnames:
6807 f = hg.openpath(ui, fname)
6808 f = hg.openpath(ui, fname)
6808 gen = exchange.readbundle(ui, f, fname)
6809 gen = exchange.readbundle(ui, f, fname)
6809 if isinstance(gen, bundle2.unbundle20):
6810 if isinstance(gen, bundle2.unbundle20):
6810 tr = repo.transaction('unbundle')
6811 tr = repo.transaction('unbundle')
6811 try:
6812 try:
6812 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
6813 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
6813 url='bundle:' + fname)
6814 url='bundle:' + fname)
6814 tr.close()
6815 tr.close()
6815 except error.BundleUnknownFeatureError as exc:
6816 except error.BundleUnknownFeatureError as exc:
6816 raise error.Abort(_('%s: unknown bundle feature, %s')
6817 raise error.Abort(_('%s: unknown bundle feature, %s')
6817 % (fname, exc),
6818 % (fname, exc),
6818 hint=_("see https://mercurial-scm.org/"
6819 hint=_("see https://mercurial-scm.org/"
6819 "wiki/BundleFeature for more "
6820 "wiki/BundleFeature for more "
6820 "information"))
6821 "information"))
6821 finally:
6822 finally:
6822 if tr:
6823 if tr:
6823 tr.release()
6824 tr.release()
6824 changes = [r.get('return', 0)
6825 changes = [r.get('return', 0)
6825 for r in op.records['changegroup']]
6826 for r in op.records['changegroup']]
6826 modheads = changegroup.combineresults(changes)
6827 modheads = changegroup.combineresults(changes)
6827 elif isinstance(gen, streamclone.streamcloneapplier):
6828 elif isinstance(gen, streamclone.streamcloneapplier):
6828 raise error.Abort(
6829 raise error.Abort(
6829 _('packed bundles cannot be applied with '
6830 _('packed bundles cannot be applied with '
6830 '"hg unbundle"'),
6831 '"hg unbundle"'),
6831 hint=_('use "hg debugapplystreamclonebundle"'))
6832 hint=_('use "hg debugapplystreamclonebundle"'))
6832 else:
6833 else:
6833 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
6834 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
6834 finally:
6835 finally:
6835 lock.release()
6836 lock.release()
6836
6837
6837 return postincoming(ui, repo, modheads, opts.get('update'), None)
6838 return postincoming(ui, repo, modheads, opts.get('update'), None)
6838
6839
6839 @command('^update|up|checkout|co',
6840 @command('^update|up|checkout|co',
6840 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6841 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6841 ('c', 'check', None,
6842 ('c', 'check', None,
6842 _('update across branches if no uncommitted changes')),
6843 _('update across branches if no uncommitted changes')),
6843 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6844 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6844 ('r', 'rev', '', _('revision'), _('REV'))
6845 ('r', 'rev', '', _('revision'), _('REV'))
6845 ] + mergetoolopts,
6846 ] + mergetoolopts,
6846 _('[-c] [-C] [-d DATE] [[-r] REV]'))
6847 _('[-c] [-C] [-d DATE] [[-r] REV]'))
6847 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
6848 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
6848 tool=None):
6849 tool=None):
6849 """update working directory (or switch revisions)
6850 """update working directory (or switch revisions)
6850
6851
6851 Update the repository's working directory to the specified
6852 Update the repository's working directory to the specified
6852 changeset. If no changeset is specified, update to the tip of the
6853 changeset. If no changeset is specified, update to the tip of the
6853 current named branch and move the active bookmark (see :hg:`help
6854 current named branch and move the active bookmark (see :hg:`help
6854 bookmarks`).
6855 bookmarks`).
6855
6856
6856 Update sets the working directory's parent revision to the specified
6857 Update sets the working directory's parent revision to the specified
6857 changeset (see :hg:`help parents`).
6858 changeset (see :hg:`help parents`).
6858
6859
6859 If the changeset is not a descendant or ancestor of the working
6860 If the changeset is not a descendant or ancestor of the working
6860 directory's parent, the update is aborted. With the -c/--check
6861 directory's parent, the update is aborted. With the -c/--check
6861 option, the working directory is checked for uncommitted changes; if
6862 option, the working directory is checked for uncommitted changes; if
6862 none are found, the working directory is updated to the specified
6863 none are found, the working directory is updated to the specified
6863 changeset.
6864 changeset.
6864
6865
6865 .. container:: verbose
6866 .. container:: verbose
6866
6867
6867 The following rules apply when the working directory contains
6868 The following rules apply when the working directory contains
6868 uncommitted changes:
6869 uncommitted changes:
6869
6870
6870 1. If neither -c/--check nor -C/--clean is specified, and if
6871 1. If neither -c/--check nor -C/--clean is specified, and if
6871 the requested changeset is an ancestor or descendant of
6872 the requested changeset is an ancestor or descendant of
6872 the working directory's parent, the uncommitted changes
6873 the working directory's parent, the uncommitted changes
6873 are merged into the requested changeset and the merged
6874 are merged into the requested changeset and the merged
6874 result is left uncommitted. If the requested changeset is
6875 result is left uncommitted. If the requested changeset is
6875 not an ancestor or descendant (that is, it is on another
6876 not an ancestor or descendant (that is, it is on another
6876 branch), the update is aborted and the uncommitted changes
6877 branch), the update is aborted and the uncommitted changes
6877 are preserved.
6878 are preserved.
6878
6879
6879 2. With the -c/--check option, the update is aborted and the
6880 2. With the -c/--check option, the update is aborted and the
6880 uncommitted changes are preserved.
6881 uncommitted changes are preserved.
6881
6882
6882 3. With the -C/--clean option, uncommitted changes are discarded and
6883 3. With the -C/--clean option, uncommitted changes are discarded and
6883 the working directory is updated to the requested changeset.
6884 the working directory is updated to the requested changeset.
6884
6885
6885 To cancel an uncommitted merge (and lose your changes), use
6886 To cancel an uncommitted merge (and lose your changes), use
6886 :hg:`update --clean .`.
6887 :hg:`update --clean .`.
6887
6888
6888 Use null as the changeset to remove the working directory (like
6889 Use null as the changeset to remove the working directory (like
6889 :hg:`clone -U`).
6890 :hg:`clone -U`).
6890
6891
6891 If you want to revert just one file to an older revision, use
6892 If you want to revert just one file to an older revision, use
6892 :hg:`revert [-r REV] NAME`.
6893 :hg:`revert [-r REV] NAME`.
6893
6894
6894 See :hg:`help dates` for a list of formats valid for -d/--date.
6895 See :hg:`help dates` for a list of formats valid for -d/--date.
6895
6896
6896 Returns 0 on success, 1 if there are unresolved files.
6897 Returns 0 on success, 1 if there are unresolved files.
6897 """
6898 """
6898 movemarkfrom = None
6899 movemarkfrom = None
6899 if rev and node:
6900 if rev and node:
6900 raise error.Abort(_("please specify just one revision"))
6901 raise error.Abort(_("please specify just one revision"))
6901
6902
6902 if rev is None or rev == '':
6903 if rev is None or rev == '':
6903 rev = node
6904 rev = node
6904
6905
6905 wlock = repo.wlock()
6906 wlock = repo.wlock()
6906 try:
6907 try:
6907 cmdutil.clearunfinished(repo)
6908 cmdutil.clearunfinished(repo)
6908
6909
6909 if date:
6910 if date:
6910 if rev is not None:
6911 if rev is not None:
6911 raise error.Abort(_("you can't specify a revision and a date"))
6912 raise error.Abort(_("you can't specify a revision and a date"))
6912 rev = cmdutil.finddate(ui, repo, date)
6913 rev = cmdutil.finddate(ui, repo, date)
6913
6914
6914 # if we defined a bookmark, we have to remember the original name
6915 # if we defined a bookmark, we have to remember the original name
6915 brev = rev
6916 brev = rev
6916 rev = scmutil.revsingle(repo, rev, rev).rev()
6917 rev = scmutil.revsingle(repo, rev, rev).rev()
6917
6918
6918 if check and clean:
6919 if check and clean:
6919 raise error.Abort(_("cannot specify both -c/--check and -C/--clean")
6920 raise error.Abort(_("cannot specify both -c/--check and -C/--clean")
6920 )
6921 )
6921
6922
6922 if check:
6923 if check:
6923 cmdutil.bailifchanged(repo, merge=False)
6924 cmdutil.bailifchanged(repo, merge=False)
6924 if rev is None:
6925 if rev is None:
6925 updata = destutil.destupdate(repo, clean=clean, check=check)
6926 updata = destutil.destupdate(repo, clean=clean, check=check)
6926 rev, movemarkfrom, brev = updata
6927 rev, movemarkfrom, brev = updata
6927
6928
6928 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
6929 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
6929
6930
6930 if clean:
6931 if clean:
6931 ret = hg.clean(repo, rev)
6932 ret = hg.clean(repo, rev)
6932 else:
6933 else:
6933 ret = hg.update(repo, rev)
6934 ret = hg.update(repo, rev)
6934
6935
6935 if not ret and movemarkfrom:
6936 if not ret and movemarkfrom:
6936 if movemarkfrom == repo['.'].node():
6937 if movemarkfrom == repo['.'].node():
6937 pass # no-op update
6938 pass # no-op update
6938 elif bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
6939 elif bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
6939 ui.status(_("updating bookmark %s\n") % repo._activebookmark)
6940 ui.status(_("updating bookmark %s\n") % repo._activebookmark)
6940 else:
6941 else:
6941 # this can happen with a non-linear update
6942 # this can happen with a non-linear update
6942 ui.status(_("(leaving bookmark %s)\n") %
6943 ui.status(_("(leaving bookmark %s)\n") %
6943 repo._activebookmark)
6944 repo._activebookmark)
6944 bookmarks.deactivate(repo)
6945 bookmarks.deactivate(repo)
6945 elif brev in repo._bookmarks:
6946 elif brev in repo._bookmarks:
6946 bookmarks.activate(repo, brev)
6947 bookmarks.activate(repo, brev)
6947 ui.status(_("(activating bookmark %s)\n") % brev)
6948 ui.status(_("(activating bookmark %s)\n") % brev)
6948 elif brev:
6949 elif brev:
6949 if repo._activebookmark:
6950 if repo._activebookmark:
6950 ui.status(_("(leaving bookmark %s)\n") %
6951 ui.status(_("(leaving bookmark %s)\n") %
6951 repo._activebookmark)
6952 repo._activebookmark)
6952 bookmarks.deactivate(repo)
6953 bookmarks.deactivate(repo)
6953 finally:
6954 finally:
6954 wlock.release()
6955 wlock.release()
6955
6956
6956 return ret
6957 return ret
6957
6958
6958 @command('verify', [])
6959 @command('verify', [])
6959 def verify(ui, repo):
6960 def verify(ui, repo):
6960 """verify the integrity of the repository
6961 """verify the integrity of the repository
6961
6962
6962 Verify the integrity of the current repository.
6963 Verify the integrity of the current repository.
6963
6964
6964 This will perform an extensive check of the repository's
6965 This will perform an extensive check of the repository's
6965 integrity, validating the hashes and checksums of each entry in
6966 integrity, validating the hashes and checksums of each entry in
6966 the changelog, manifest, and tracked files, as well as the
6967 the changelog, manifest, and tracked files, as well as the
6967 integrity of their crosslinks and indices.
6968 integrity of their crosslinks and indices.
6968
6969
6969 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
6970 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
6970 for more information about recovery from corruption of the
6971 for more information about recovery from corruption of the
6971 repository.
6972 repository.
6972
6973
6973 Returns 0 on success, 1 if errors are encountered.
6974 Returns 0 on success, 1 if errors are encountered.
6974 """
6975 """
6975 return hg.verify(repo)
6976 return hg.verify(repo)
6976
6977
6977 @command('version', [], norepo=True)
6978 @command('version', [], norepo=True)
6978 def version_(ui):
6979 def version_(ui):
6979 """output version and copyright information"""
6980 """output version and copyright information"""
6980 ui.write(_("Mercurial Distributed SCM (version %s)\n")
6981 ui.write(_("Mercurial Distributed SCM (version %s)\n")
6981 % util.version())
6982 % util.version())
6982 ui.status(_(
6983 ui.status(_(
6983 "(see https://mercurial-scm.org for more information)\n"
6984 "(see https://mercurial-scm.org for more information)\n"
6984 "\nCopyright (C) 2005-2015 Matt Mackall and others\n"
6985 "\nCopyright (C) 2005-2015 Matt Mackall and others\n"
6985 "This is free software; see the source for copying conditions. "
6986 "This is free software; see the source for copying conditions. "
6986 "There is NO\nwarranty; "
6987 "There is NO\nwarranty; "
6987 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6988 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6988 ))
6989 ))
6989
6990
6990 ui.note(_("\nEnabled extensions:\n\n"))
6991 ui.note(_("\nEnabled extensions:\n\n"))
6991 if ui.verbose:
6992 if ui.verbose:
6992 # format names and versions into columns
6993 # format names and versions into columns
6993 names = []
6994 names = []
6994 vers = []
6995 vers = []
6995 for name, module in extensions.extensions():
6996 for name, module in extensions.extensions():
6996 names.append(name)
6997 names.append(name)
6997 vers.append(extensions.moduleversion(module))
6998 vers.append(extensions.moduleversion(module))
6998 if names:
6999 if names:
6999 maxnamelen = max(len(n) for n in names)
7000 maxnamelen = max(len(n) for n in names)
7000 for i, name in enumerate(names):
7001 for i, name in enumerate(names):
7001 ui.write(" %-*s %s\n" % (maxnamelen, name, vers[i]))
7002 ui.write(" %-*s %s\n" % (maxnamelen, name, vers[i]))
@@ -1,2610 +1,2613 b''
1 Short help:
1 Short help:
2
2
3 $ hg
3 $ hg
4 Mercurial Distributed SCM
4 Mercurial Distributed SCM
5
5
6 basic commands:
6 basic commands:
7
7
8 add add the specified files on the next commit
8 add add the specified files on the next commit
9 annotate show changeset information by line for each file
9 annotate show changeset information by line for each file
10 clone make a copy of an existing repository
10 clone make a copy of an existing repository
11 commit commit the specified files or all outstanding changes
11 commit commit the specified files or all outstanding changes
12 diff diff repository (or selected files)
12 diff diff repository (or selected files)
13 export dump the header and diffs for one or more changesets
13 export dump the header and diffs for one or more changesets
14 forget forget the specified files on the next commit
14 forget forget the specified files on the next commit
15 init create a new repository in the given directory
15 init create a new repository in the given directory
16 log show revision history of entire repository or files
16 log show revision history of entire repository or files
17 merge merge another revision into working directory
17 merge merge another revision into working directory
18 pull pull changes from the specified source
18 pull pull changes from the specified source
19 push push changes to the specified destination
19 push push changes to the specified destination
20 remove remove the specified files on the next commit
20 remove remove the specified files on the next commit
21 serve start stand-alone webserver
21 serve start stand-alone webserver
22 status show changed files in the working directory
22 status show changed files in the working directory
23 summary summarize working directory state
23 summary summarize working directory state
24 update update working directory (or switch revisions)
24 update update working directory (or switch revisions)
25
25
26 (use "hg help" for the full list of commands or "hg -v" for details)
26 (use "hg help" for the full list of commands or "hg -v" for details)
27
27
28 $ hg -q
28 $ hg -q
29 add add the specified files on the next commit
29 add add the specified files on the next commit
30 annotate show changeset information by line for each file
30 annotate show changeset information by line for each file
31 clone make a copy of an existing repository
31 clone make a copy of an existing repository
32 commit commit the specified files or all outstanding changes
32 commit commit the specified files or all outstanding changes
33 diff diff repository (or selected files)
33 diff diff repository (or selected files)
34 export dump the header and diffs for one or more changesets
34 export dump the header and diffs for one or more changesets
35 forget forget the specified files on the next commit
35 forget forget the specified files on the next commit
36 init create a new repository in the given directory
36 init create a new repository in the given directory
37 log show revision history of entire repository or files
37 log show revision history of entire repository or files
38 merge merge another revision into working directory
38 merge merge another revision into working directory
39 pull pull changes from the specified source
39 pull pull changes from the specified source
40 push push changes to the specified destination
40 push push changes to the specified destination
41 remove remove the specified files on the next commit
41 remove remove the specified files on the next commit
42 serve start stand-alone webserver
42 serve start stand-alone webserver
43 status show changed files in the working directory
43 status show changed files in the working directory
44 summary summarize working directory state
44 summary summarize working directory state
45 update update working directory (or switch revisions)
45 update update working directory (or switch revisions)
46
46
47 $ hg help
47 $ hg help
48 Mercurial Distributed SCM
48 Mercurial Distributed SCM
49
49
50 list of commands:
50 list of commands:
51
51
52 add add the specified files on the next commit
52 add add the specified files on the next commit
53 addremove add all new files, delete all missing files
53 addremove add all new files, delete all missing files
54 annotate show changeset information by line for each file
54 annotate show changeset information by line for each file
55 archive create an unversioned archive of a repository revision
55 archive create an unversioned archive of a repository revision
56 backout reverse effect of earlier changeset
56 backout reverse effect of earlier changeset
57 bisect subdivision search of changesets
57 bisect subdivision search of changesets
58 bookmarks create a new bookmark or list existing bookmarks
58 bookmarks create a new bookmark or list existing bookmarks
59 branch set or show the current branch name
59 branch set or show the current branch name
60 branches list repository named branches
60 branches list repository named branches
61 bundle create a changegroup file
61 bundle create a changegroup file
62 cat output the current or given revision of files
62 cat output the current or given revision of files
63 clone make a copy of an existing repository
63 clone make a copy of an existing repository
64 commit commit the specified files or all outstanding changes
64 commit commit the specified files or all outstanding changes
65 config show combined config settings from all hgrc files
65 config show combined config settings from all hgrc files
66 copy mark files as copied for the next commit
66 copy mark files as copied for the next commit
67 diff diff repository (or selected files)
67 diff diff repository (or selected files)
68 export dump the header and diffs for one or more changesets
68 export dump the header and diffs for one or more changesets
69 files list tracked files
69 files list tracked files
70 forget forget the specified files on the next commit
70 forget forget the specified files on the next commit
71 graft copy changes from other branches onto the current branch
71 graft copy changes from other branches onto the current branch
72 grep search for a pattern in specified files and revisions
72 grep search for a pattern in specified files and revisions
73 heads show branch heads
73 heads show branch heads
74 help show help for a given topic or a help overview
74 help show help for a given topic or a help overview
75 identify identify the working directory or specified revision
75 identify identify the working directory or specified revision
76 import import an ordered set of patches
76 import import an ordered set of patches
77 incoming show new changesets found in source
77 incoming show new changesets found in source
78 init create a new repository in the given directory
78 init create a new repository in the given directory
79 log show revision history of entire repository or files
79 log show revision history of entire repository or files
80 manifest output the current or given revision of the project manifest
80 manifest output the current or given revision of the project manifest
81 merge merge another revision into working directory
81 merge merge another revision into working directory
82 outgoing show changesets not found in the destination
82 outgoing show changesets not found in the destination
83 paths show aliases for remote repositories
83 paths show aliases for remote repositories
84 phase set or show the current phase name
84 phase set or show the current phase name
85 pull pull changes from the specified source
85 pull pull changes from the specified source
86 push push changes to the specified destination
86 push push changes to the specified destination
87 recover roll back an interrupted transaction
87 recover roll back an interrupted transaction
88 remove remove the specified files on the next commit
88 remove remove the specified files on the next commit
89 rename rename files; equivalent of copy + remove
89 rename rename files; equivalent of copy + remove
90 resolve redo merges or set/view the merge status of files
90 resolve redo merges or set/view the merge status of files
91 revert restore files to their checkout state
91 revert restore files to their checkout state
92 root print the root (top) of the current working directory
92 root print the root (top) of the current working directory
93 serve start stand-alone webserver
93 serve start stand-alone webserver
94 status show changed files in the working directory
94 status show changed files in the working directory
95 summary summarize working directory state
95 summary summarize working directory state
96 tag add one or more tags for the current or given revision
96 tag add one or more tags for the current or given revision
97 tags list repository tags
97 tags list repository tags
98 unbundle apply one or more changegroup files
98 unbundle apply one or more changegroup files
99 update update working directory (or switch revisions)
99 update update working directory (or switch revisions)
100 verify verify the integrity of the repository
100 verify verify the integrity of the repository
101 version output version and copyright information
101 version output version and copyright information
102
102
103 additional help topics:
103 additional help topics:
104
104
105 config Configuration Files
105 config Configuration Files
106 dates Date Formats
106 dates Date Formats
107 diffs Diff Formats
107 diffs Diff Formats
108 environment Environment Variables
108 environment Environment Variables
109 extensions Using Additional Features
109 extensions Using Additional Features
110 filesets Specifying File Sets
110 filesets Specifying File Sets
111 glossary Glossary
111 glossary Glossary
112 hgignore Syntax for Mercurial Ignore Files
112 hgignore Syntax for Mercurial Ignore Files
113 hgweb Configuring hgweb
113 hgweb Configuring hgweb
114 internals Technical implementation topics
114 internals Technical implementation topics
115 merge-tools Merge Tools
115 merge-tools Merge Tools
116 multirevs Specifying Multiple Revisions
116 multirevs Specifying Multiple Revisions
117 patterns File Name Patterns
117 patterns File Name Patterns
118 phases Working with Phases
118 phases Working with Phases
119 revisions Specifying Single Revisions
119 revisions Specifying Single Revisions
120 revsets Specifying Revision Sets
120 revsets Specifying Revision Sets
121 scripting Using Mercurial from scripts and automation
121 scripting Using Mercurial from scripts and automation
122 subrepos Subrepositories
122 subrepos Subrepositories
123 templating Template Usage
123 templating Template Usage
124 urls URL Paths
124 urls URL Paths
125
125
126 (use "hg help -v" to show built-in aliases and global options)
126 (use "hg help -v" to show built-in aliases and global options)
127
127
128 $ hg -q help
128 $ hg -q help
129 add add the specified files on the next commit
129 add add the specified files on the next commit
130 addremove add all new files, delete all missing files
130 addremove add all new files, delete all missing files
131 annotate show changeset information by line for each file
131 annotate show changeset information by line for each file
132 archive create an unversioned archive of a repository revision
132 archive create an unversioned archive of a repository revision
133 backout reverse effect of earlier changeset
133 backout reverse effect of earlier changeset
134 bisect subdivision search of changesets
134 bisect subdivision search of changesets
135 bookmarks create a new bookmark or list existing bookmarks
135 bookmarks create a new bookmark or list existing bookmarks
136 branch set or show the current branch name
136 branch set or show the current branch name
137 branches list repository named branches
137 branches list repository named branches
138 bundle create a changegroup file
138 bundle create a changegroup file
139 cat output the current or given revision of files
139 cat output the current or given revision of files
140 clone make a copy of an existing repository
140 clone make a copy of an existing repository
141 commit commit the specified files or all outstanding changes
141 commit commit the specified files or all outstanding changes
142 config show combined config settings from all hgrc files
142 config show combined config settings from all hgrc files
143 copy mark files as copied for the next commit
143 copy mark files as copied for the next commit
144 diff diff repository (or selected files)
144 diff diff repository (or selected files)
145 export dump the header and diffs for one or more changesets
145 export dump the header and diffs for one or more changesets
146 files list tracked files
146 files list tracked files
147 forget forget the specified files on the next commit
147 forget forget the specified files on the next commit
148 graft copy changes from other branches onto the current branch
148 graft copy changes from other branches onto the current branch
149 grep search for a pattern in specified files and revisions
149 grep search for a pattern in specified files and revisions
150 heads show branch heads
150 heads show branch heads
151 help show help for a given topic or a help overview
151 help show help for a given topic or a help overview
152 identify identify the working directory or specified revision
152 identify identify the working directory or specified revision
153 import import an ordered set of patches
153 import import an ordered set of patches
154 incoming show new changesets found in source
154 incoming show new changesets found in source
155 init create a new repository in the given directory
155 init create a new repository in the given directory
156 log show revision history of entire repository or files
156 log show revision history of entire repository or files
157 manifest output the current or given revision of the project manifest
157 manifest output the current or given revision of the project manifest
158 merge merge another revision into working directory
158 merge merge another revision into working directory
159 outgoing show changesets not found in the destination
159 outgoing show changesets not found in the destination
160 paths show aliases for remote repositories
160 paths show aliases for remote repositories
161 phase set or show the current phase name
161 phase set or show the current phase name
162 pull pull changes from the specified source
162 pull pull changes from the specified source
163 push push changes to the specified destination
163 push push changes to the specified destination
164 recover roll back an interrupted transaction
164 recover roll back an interrupted transaction
165 remove remove the specified files on the next commit
165 remove remove the specified files on the next commit
166 rename rename files; equivalent of copy + remove
166 rename rename files; equivalent of copy + remove
167 resolve redo merges or set/view the merge status of files
167 resolve redo merges or set/view the merge status of files
168 revert restore files to their checkout state
168 revert restore files to their checkout state
169 root print the root (top) of the current working directory
169 root print the root (top) of the current working directory
170 serve start stand-alone webserver
170 serve start stand-alone webserver
171 status show changed files in the working directory
171 status show changed files in the working directory
172 summary summarize working directory state
172 summary summarize working directory state
173 tag add one or more tags for the current or given revision
173 tag add one or more tags for the current or given revision
174 tags list repository tags
174 tags list repository tags
175 unbundle apply one or more changegroup files
175 unbundle apply one or more changegroup files
176 update update working directory (or switch revisions)
176 update update working directory (or switch revisions)
177 verify verify the integrity of the repository
177 verify verify the integrity of the repository
178 version output version and copyright information
178 version output version and copyright information
179
179
180 additional help topics:
180 additional help topics:
181
181
182 config Configuration Files
182 config Configuration Files
183 dates Date Formats
183 dates Date Formats
184 diffs Diff Formats
184 diffs Diff Formats
185 environment Environment Variables
185 environment Environment Variables
186 extensions Using Additional Features
186 extensions Using Additional Features
187 filesets Specifying File Sets
187 filesets Specifying File Sets
188 glossary Glossary
188 glossary Glossary
189 hgignore Syntax for Mercurial Ignore Files
189 hgignore Syntax for Mercurial Ignore Files
190 hgweb Configuring hgweb
190 hgweb Configuring hgweb
191 internals Technical implementation topics
191 internals Technical implementation topics
192 merge-tools Merge Tools
192 merge-tools Merge Tools
193 multirevs Specifying Multiple Revisions
193 multirevs Specifying Multiple Revisions
194 patterns File Name Patterns
194 patterns File Name Patterns
195 phases Working with Phases
195 phases Working with Phases
196 revisions Specifying Single Revisions
196 revisions Specifying Single Revisions
197 revsets Specifying Revision Sets
197 revsets Specifying Revision Sets
198 scripting Using Mercurial from scripts and automation
198 scripting Using Mercurial from scripts and automation
199 subrepos Subrepositories
199 subrepos Subrepositories
200 templating Template Usage
200 templating Template Usage
201 urls URL Paths
201 urls URL Paths
202
202
203 Test extension help:
203 Test extension help:
204 $ hg help extensions --config extensions.rebase= --config extensions.children=
204 $ hg help extensions --config extensions.rebase= --config extensions.children=
205 Using Additional Features
205 Using Additional Features
206 """""""""""""""""""""""""
206 """""""""""""""""""""""""
207
207
208 Mercurial has the ability to add new features through the use of
208 Mercurial has the ability to add new features through the use of
209 extensions. Extensions may add new commands, add options to existing
209 extensions. Extensions may add new commands, add options to existing
210 commands, change the default behavior of commands, or implement hooks.
210 commands, change the default behavior of commands, or implement hooks.
211
211
212 To enable the "foo" extension, either shipped with Mercurial or in the
212 To enable the "foo" extension, either shipped with Mercurial or in the
213 Python search path, create an entry for it in your configuration file,
213 Python search path, create an entry for it in your configuration file,
214 like this:
214 like this:
215
215
216 [extensions]
216 [extensions]
217 foo =
217 foo =
218
218
219 You may also specify the full path to an extension:
219 You may also specify the full path to an extension:
220
220
221 [extensions]
221 [extensions]
222 myfeature = ~/.hgext/myfeature.py
222 myfeature = ~/.hgext/myfeature.py
223
223
224 See "hg help config" for more information on configuration files.
224 See "hg help config" for more information on configuration files.
225
225
226 Extensions are not loaded by default for a variety of reasons: they can
226 Extensions are not loaded by default for a variety of reasons: they can
227 increase startup overhead; they may be meant for advanced usage only; they
227 increase startup overhead; they may be meant for advanced usage only; they
228 may provide potentially dangerous abilities (such as letting you destroy
228 may provide potentially dangerous abilities (such as letting you destroy
229 or modify history); they might not be ready for prime time; or they may
229 or modify history); they might not be ready for prime time; or they may
230 alter some usual behaviors of stock Mercurial. It is thus up to the user
230 alter some usual behaviors of stock Mercurial. It is thus up to the user
231 to activate extensions as needed.
231 to activate extensions as needed.
232
232
233 To explicitly disable an extension enabled in a configuration file of
233 To explicitly disable an extension enabled in a configuration file of
234 broader scope, prepend its path with !:
234 broader scope, prepend its path with !:
235
235
236 [extensions]
236 [extensions]
237 # disabling extension bar residing in /path/to/extension/bar.py
237 # disabling extension bar residing in /path/to/extension/bar.py
238 bar = !/path/to/extension/bar.py
238 bar = !/path/to/extension/bar.py
239 # ditto, but no path was supplied for extension baz
239 # ditto, but no path was supplied for extension baz
240 baz = !
240 baz = !
241
241
242 enabled extensions:
242 enabled extensions:
243
243
244 children command to display child changesets (DEPRECATED)
244 children command to display child changesets (DEPRECATED)
245 rebase command to move sets of revisions to a different ancestor
245 rebase command to move sets of revisions to a different ancestor
246
246
247 disabled extensions:
247 disabled extensions:
248
248
249 acl hooks for controlling repository access
249 acl hooks for controlling repository access
250 blackbox log repository events to a blackbox for debugging
250 blackbox log repository events to a blackbox for debugging
251 bugzilla hooks for integrating with the Bugzilla bug tracker
251 bugzilla hooks for integrating with the Bugzilla bug tracker
252 censor erase file content at a given revision
252 censor erase file content at a given revision
253 churn command to display statistics about repository history
253 churn command to display statistics about repository history
254 clonebundles advertise pre-generated bundles to seed clones
254 clonebundles advertise pre-generated bundles to seed clones
255 (experimental)
255 (experimental)
256 color colorize output from some commands
256 color colorize output from some commands
257 convert import revisions from foreign VCS repositories into
257 convert import revisions from foreign VCS repositories into
258 Mercurial
258 Mercurial
259 eol automatically manage newlines in repository files
259 eol automatically manage newlines in repository files
260 extdiff command to allow external programs to compare revisions
260 extdiff command to allow external programs to compare revisions
261 factotum http authentication with factotum
261 factotum http authentication with factotum
262 gpg commands to sign and verify changesets
262 gpg commands to sign and verify changesets
263 hgcia hooks for integrating with the CIA.vc notification service
263 hgcia hooks for integrating with the CIA.vc notification service
264 hgk browse the repository in a graphical way
264 hgk browse the repository in a graphical way
265 highlight syntax highlighting for hgweb (requires Pygments)
265 highlight syntax highlighting for hgweb (requires Pygments)
266 histedit interactive history editing
266 histedit interactive history editing
267 keyword expand keywords in tracked files
267 keyword expand keywords in tracked files
268 largefiles track large binary files
268 largefiles track large binary files
269 mq manage a stack of patches
269 mq manage a stack of patches
270 notify hooks for sending email push notifications
270 notify hooks for sending email push notifications
271 pager browse command output with an external pager
271 pager browse command output with an external pager
272 patchbomb command to send changesets as (a series of) patch emails
272 patchbomb command to send changesets as (a series of) patch emails
273 purge command to delete untracked files from the working
273 purge command to delete untracked files from the working
274 directory
274 directory
275 record commands to interactively select changes for
275 record commands to interactively select changes for
276 commit/qrefresh
276 commit/qrefresh
277 relink recreates hardlinks between repository clones
277 relink recreates hardlinks between repository clones
278 schemes extend schemes with shortcuts to repository swarms
278 schemes extend schemes with shortcuts to repository swarms
279 share share a common history between several working directories
279 share share a common history between several working directories
280 shelve save and restore changes to the working directory
280 shelve save and restore changes to the working directory
281 strip strip changesets and their descendants from history
281 strip strip changesets and their descendants from history
282 transplant command to transplant changesets from another branch
282 transplant command to transplant changesets from another branch
283 win32mbcs allow the use of MBCS paths with problematic encodings
283 win32mbcs allow the use of MBCS paths with problematic encodings
284 zeroconf discover and advertise repositories on the local network
284 zeroconf discover and advertise repositories on the local network
285
285
286 Verify that extension keywords appear in help templates
286 Verify that extension keywords appear in help templates
287
287
288 $ hg help --config extensions.transplant= templating|grep transplant > /dev/null
288 $ hg help --config extensions.transplant= templating|grep transplant > /dev/null
289
289
290 Test short command list with verbose option
290 Test short command list with verbose option
291
291
292 $ hg -v help shortlist
292 $ hg -v help shortlist
293 Mercurial Distributed SCM
293 Mercurial Distributed SCM
294
294
295 basic commands:
295 basic commands:
296
296
297 add add the specified files on the next commit
297 add add the specified files on the next commit
298 annotate, blame
298 annotate, blame
299 show changeset information by line for each file
299 show changeset information by line for each file
300 clone make a copy of an existing repository
300 clone make a copy of an existing repository
301 commit, ci commit the specified files or all outstanding changes
301 commit, ci commit the specified files or all outstanding changes
302 diff diff repository (or selected files)
302 diff diff repository (or selected files)
303 export dump the header and diffs for one or more changesets
303 export dump the header and diffs for one or more changesets
304 forget forget the specified files on the next commit
304 forget forget the specified files on the next commit
305 init create a new repository in the given directory
305 init create a new repository in the given directory
306 log, history show revision history of entire repository or files
306 log, history show revision history of entire repository or files
307 merge merge another revision into working directory
307 merge merge another revision into working directory
308 pull pull changes from the specified source
308 pull pull changes from the specified source
309 push push changes to the specified destination
309 push push changes to the specified destination
310 remove, rm remove the specified files on the next commit
310 remove, rm remove the specified files on the next commit
311 serve start stand-alone webserver
311 serve start stand-alone webserver
312 status, st show changed files in the working directory
312 status, st show changed files in the working directory
313 summary, sum summarize working directory state
313 summary, sum summarize working directory state
314 update, up, checkout, co
314 update, up, checkout, co
315 update working directory (or switch revisions)
315 update working directory (or switch revisions)
316
316
317 global options ([+] can be repeated):
317 global options ([+] can be repeated):
318
318
319 -R --repository REPO repository root directory or name of overlay bundle
319 -R --repository REPO repository root directory or name of overlay bundle
320 file
320 file
321 --cwd DIR change working directory
321 --cwd DIR change working directory
322 -y --noninteractive do not prompt, automatically pick the first choice for
322 -y --noninteractive do not prompt, automatically pick the first choice for
323 all prompts
323 all prompts
324 -q --quiet suppress output
324 -q --quiet suppress output
325 -v --verbose enable additional output
325 -v --verbose enable additional output
326 --config CONFIG [+] set/override config option (use 'section.name=value')
326 --config CONFIG [+] set/override config option (use 'section.name=value')
327 --debug enable debugging output
327 --debug enable debugging output
328 --debugger start debugger
328 --debugger start debugger
329 --encoding ENCODE set the charset encoding (default: ascii)
329 --encoding ENCODE set the charset encoding (default: ascii)
330 --encodingmode MODE set the charset encoding mode (default: strict)
330 --encodingmode MODE set the charset encoding mode (default: strict)
331 --traceback always print a traceback on exception
331 --traceback always print a traceback on exception
332 --time time how long the command takes
332 --time time how long the command takes
333 --profile print command execution profile
333 --profile print command execution profile
334 --version output version information and exit
334 --version output version information and exit
335 -h --help display help and exit
335 -h --help display help and exit
336 --hidden consider hidden changesets
336 --hidden consider hidden changesets
337
337
338 (use "hg help" for the full list of commands)
338 (use "hg help" for the full list of commands)
339
339
340 $ hg add -h
340 $ hg add -h
341 hg add [OPTION]... [FILE]...
341 hg add [OPTION]... [FILE]...
342
342
343 add the specified files on the next commit
343 add the specified files on the next commit
344
344
345 Schedule files to be version controlled and added to the repository.
345 Schedule files to be version controlled and added to the repository.
346
346
347 The files will be added to the repository at the next commit. To undo an
347 The files will be added to the repository at the next commit. To undo an
348 add before that, see "hg forget".
348 add before that, see "hg forget".
349
349
350 If no names are given, add all files to the repository.
350 If no names are given, add all files to the repository (except files
351 matching ".hgignore").
351
352
352 Returns 0 if all files are successfully added.
353 Returns 0 if all files are successfully added.
353
354
354 options ([+] can be repeated):
355 options ([+] can be repeated):
355
356
356 -I --include PATTERN [+] include names matching the given patterns
357 -I --include PATTERN [+] include names matching the given patterns
357 -X --exclude PATTERN [+] exclude names matching the given patterns
358 -X --exclude PATTERN [+] exclude names matching the given patterns
358 -S --subrepos recurse into subrepositories
359 -S --subrepos recurse into subrepositories
359 -n --dry-run do not perform actions, just print output
360 -n --dry-run do not perform actions, just print output
360
361
361 (some details hidden, use --verbose to show complete help)
362 (some details hidden, use --verbose to show complete help)
362
363
363 Verbose help for add
364 Verbose help for add
364
365
365 $ hg add -hv
366 $ hg add -hv
366 hg add [OPTION]... [FILE]...
367 hg add [OPTION]... [FILE]...
367
368
368 add the specified files on the next commit
369 add the specified files on the next commit
369
370
370 Schedule files to be version controlled and added to the repository.
371 Schedule files to be version controlled and added to the repository.
371
372
372 The files will be added to the repository at the next commit. To undo an
373 The files will be added to the repository at the next commit. To undo an
373 add before that, see "hg forget".
374 add before that, see "hg forget".
374
375
375 If no names are given, add all files to the repository.
376 If no names are given, add all files to the repository (except files
377 matching ".hgignore").
376
378
377 Examples:
379 Examples:
378
380
379 - New (unknown) files are added automatically by "hg add":
381 - New (unknown) files are added automatically by "hg add":
380
382
381 $ ls
383 $ ls
382 foo.c
384 foo.c
383 $ hg status
385 $ hg status
384 ? foo.c
386 ? foo.c
385 $ hg add
387 $ hg add
386 adding foo.c
388 adding foo.c
387 $ hg status
389 $ hg status
388 A foo.c
390 A foo.c
389
391
390 - Specific files to be added can be specified:
392 - Specific files to be added can be specified:
391
393
392 $ ls
394 $ ls
393 bar.c foo.c
395 bar.c foo.c
394 $ hg status
396 $ hg status
395 ? bar.c
397 ? bar.c
396 ? foo.c
398 ? foo.c
397 $ hg add bar.c
399 $ hg add bar.c
398 $ hg status
400 $ hg status
399 A bar.c
401 A bar.c
400 ? foo.c
402 ? foo.c
401
403
402 Returns 0 if all files are successfully added.
404 Returns 0 if all files are successfully added.
403
405
404 options ([+] can be repeated):
406 options ([+] can be repeated):
405
407
406 -I --include PATTERN [+] include names matching the given patterns
408 -I --include PATTERN [+] include names matching the given patterns
407 -X --exclude PATTERN [+] exclude names matching the given patterns
409 -X --exclude PATTERN [+] exclude names matching the given patterns
408 -S --subrepos recurse into subrepositories
410 -S --subrepos recurse into subrepositories
409 -n --dry-run do not perform actions, just print output
411 -n --dry-run do not perform actions, just print output
410
412
411 global options ([+] can be repeated):
413 global options ([+] can be repeated):
412
414
413 -R --repository REPO repository root directory or name of overlay bundle
415 -R --repository REPO repository root directory or name of overlay bundle
414 file
416 file
415 --cwd DIR change working directory
417 --cwd DIR change working directory
416 -y --noninteractive do not prompt, automatically pick the first choice for
418 -y --noninteractive do not prompt, automatically pick the first choice for
417 all prompts
419 all prompts
418 -q --quiet suppress output
420 -q --quiet suppress output
419 -v --verbose enable additional output
421 -v --verbose enable additional output
420 --config CONFIG [+] set/override config option (use 'section.name=value')
422 --config CONFIG [+] set/override config option (use 'section.name=value')
421 --debug enable debugging output
423 --debug enable debugging output
422 --debugger start debugger
424 --debugger start debugger
423 --encoding ENCODE set the charset encoding (default: ascii)
425 --encoding ENCODE set the charset encoding (default: ascii)
424 --encodingmode MODE set the charset encoding mode (default: strict)
426 --encodingmode MODE set the charset encoding mode (default: strict)
425 --traceback always print a traceback on exception
427 --traceback always print a traceback on exception
426 --time time how long the command takes
428 --time time how long the command takes
427 --profile print command execution profile
429 --profile print command execution profile
428 --version output version information and exit
430 --version output version information and exit
429 -h --help display help and exit
431 -h --help display help and exit
430 --hidden consider hidden changesets
432 --hidden consider hidden changesets
431
433
432 Test help option with version option
434 Test help option with version option
433
435
434 $ hg add -h --version
436 $ hg add -h --version
435 Mercurial Distributed SCM (version *) (glob)
437 Mercurial Distributed SCM (version *) (glob)
436 (see https://mercurial-scm.org for more information)
438 (see https://mercurial-scm.org for more information)
437
439
438 Copyright (C) 2005-2015 Matt Mackall and others
440 Copyright (C) 2005-2015 Matt Mackall and others
439 This is free software; see the source for copying conditions. There is NO
441 This is free software; see the source for copying conditions. There is NO
440 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
442 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
441
443
442 $ hg add --skjdfks
444 $ hg add --skjdfks
443 hg add: option --skjdfks not recognized
445 hg add: option --skjdfks not recognized
444 hg add [OPTION]... [FILE]...
446 hg add [OPTION]... [FILE]...
445
447
446 add the specified files on the next commit
448 add the specified files on the next commit
447
449
448 options ([+] can be repeated):
450 options ([+] can be repeated):
449
451
450 -I --include PATTERN [+] include names matching the given patterns
452 -I --include PATTERN [+] include names matching the given patterns
451 -X --exclude PATTERN [+] exclude names matching the given patterns
453 -X --exclude PATTERN [+] exclude names matching the given patterns
452 -S --subrepos recurse into subrepositories
454 -S --subrepos recurse into subrepositories
453 -n --dry-run do not perform actions, just print output
455 -n --dry-run do not perform actions, just print output
454
456
455 (use "hg add -h" to show more help)
457 (use "hg add -h" to show more help)
456 [255]
458 [255]
457
459
458 Test ambiguous command help
460 Test ambiguous command help
459
461
460 $ hg help ad
462 $ hg help ad
461 list of commands:
463 list of commands:
462
464
463 add add the specified files on the next commit
465 add add the specified files on the next commit
464 addremove add all new files, delete all missing files
466 addremove add all new files, delete all missing files
465
467
466 (use "hg help -v ad" to show built-in aliases and global options)
468 (use "hg help -v ad" to show built-in aliases and global options)
467
469
468 Test command without options
470 Test command without options
469
471
470 $ hg help verify
472 $ hg help verify
471 hg verify
473 hg verify
472
474
473 verify the integrity of the repository
475 verify the integrity of the repository
474
476
475 Verify the integrity of the current repository.
477 Verify the integrity of the current repository.
476
478
477 This will perform an extensive check of the repository's integrity,
479 This will perform an extensive check of the repository's integrity,
478 validating the hashes and checksums of each entry in the changelog,
480 validating the hashes and checksums of each entry in the changelog,
479 manifest, and tracked files, as well as the integrity of their crosslinks
481 manifest, and tracked files, as well as the integrity of their crosslinks
480 and indices.
482 and indices.
481
483
482 Please see https://mercurial-scm.org/wiki/RepositoryCorruption for more
484 Please see https://mercurial-scm.org/wiki/RepositoryCorruption for more
483 information about recovery from corruption of the repository.
485 information about recovery from corruption of the repository.
484
486
485 Returns 0 on success, 1 if errors are encountered.
487 Returns 0 on success, 1 if errors are encountered.
486
488
487 (some details hidden, use --verbose to show complete help)
489 (some details hidden, use --verbose to show complete help)
488
490
489 $ hg help diff
491 $ hg help diff
490 hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...
492 hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...
491
493
492 diff repository (or selected files)
494 diff repository (or selected files)
493
495
494 Show differences between revisions for the specified files.
496 Show differences between revisions for the specified files.
495
497
496 Differences between files are shown using the unified diff format.
498 Differences between files are shown using the unified diff format.
497
499
498 Note:
500 Note:
499 diff may generate unexpected results for merges, as it will default to
501 diff may generate unexpected results for merges, as it will default to
500 comparing against the working directory's first parent changeset if no
502 comparing against the working directory's first parent changeset if no
501 revisions are specified.
503 revisions are specified.
502
504
503 When two revision arguments are given, then changes are shown between
505 When two revision arguments are given, then changes are shown between
504 those revisions. If only one revision is specified then that revision is
506 those revisions. If only one revision is specified then that revision is
505 compared to the working directory, and, when no revisions are specified,
507 compared to the working directory, and, when no revisions are specified,
506 the working directory files are compared to its parent.
508 the working directory files are compared to its parent.
507
509
508 Alternatively you can specify -c/--change with a revision to see the
510 Alternatively you can specify -c/--change with a revision to see the
509 changes in that changeset relative to its first parent.
511 changes in that changeset relative to its first parent.
510
512
511 Without the -a/--text option, diff will avoid generating diffs of files it
513 Without the -a/--text option, diff will avoid generating diffs of files it
512 detects as binary. With -a, diff will generate a diff anyway, probably
514 detects as binary. With -a, diff will generate a diff anyway, probably
513 with undesirable results.
515 with undesirable results.
514
516
515 Use the -g/--git option to generate diffs in the git extended diff format.
517 Use the -g/--git option to generate diffs in the git extended diff format.
516 For more information, read "hg help diffs".
518 For more information, read "hg help diffs".
517
519
518 Returns 0 on success.
520 Returns 0 on success.
519
521
520 options ([+] can be repeated):
522 options ([+] can be repeated):
521
523
522 -r --rev REV [+] revision
524 -r --rev REV [+] revision
523 -c --change REV change made by revision
525 -c --change REV change made by revision
524 -a --text treat all files as text
526 -a --text treat all files as text
525 -g --git use git extended diff format
527 -g --git use git extended diff format
526 --nodates omit dates from diff headers
528 --nodates omit dates from diff headers
527 --noprefix omit a/ and b/ prefixes from filenames
529 --noprefix omit a/ and b/ prefixes from filenames
528 -p --show-function show which function each change is in
530 -p --show-function show which function each change is in
529 --reverse produce a diff that undoes the changes
531 --reverse produce a diff that undoes the changes
530 -w --ignore-all-space ignore white space when comparing lines
532 -w --ignore-all-space ignore white space when comparing lines
531 -b --ignore-space-change ignore changes in the amount of white space
533 -b --ignore-space-change ignore changes in the amount of white space
532 -B --ignore-blank-lines ignore changes whose lines are all blank
534 -B --ignore-blank-lines ignore changes whose lines are all blank
533 -U --unified NUM number of lines of context to show
535 -U --unified NUM number of lines of context to show
534 --stat output diffstat-style summary of changes
536 --stat output diffstat-style summary of changes
535 --root DIR produce diffs relative to subdirectory
537 --root DIR produce diffs relative to subdirectory
536 -I --include PATTERN [+] include names matching the given patterns
538 -I --include PATTERN [+] include names matching the given patterns
537 -X --exclude PATTERN [+] exclude names matching the given patterns
539 -X --exclude PATTERN [+] exclude names matching the given patterns
538 -S --subrepos recurse into subrepositories
540 -S --subrepos recurse into subrepositories
539
541
540 (some details hidden, use --verbose to show complete help)
542 (some details hidden, use --verbose to show complete help)
541
543
542 $ hg help status
544 $ hg help status
543 hg status [OPTION]... [FILE]...
545 hg status [OPTION]... [FILE]...
544
546
545 aliases: st
547 aliases: st
546
548
547 show changed files in the working directory
549 show changed files in the working directory
548
550
549 Show status of files in the repository. If names are given, only files
551 Show status of files in the repository. If names are given, only files
550 that match are shown. Files that are clean or ignored or the source of a
552 that match are shown. Files that are clean or ignored or the source of a
551 copy/move operation, are not listed unless -c/--clean, -i/--ignored,
553 copy/move operation, are not listed unless -c/--clean, -i/--ignored,
552 -C/--copies or -A/--all are given. Unless options described with "show
554 -C/--copies or -A/--all are given. Unless options described with "show
553 only ..." are given, the options -mardu are used.
555 only ..." are given, the options -mardu are used.
554
556
555 Option -q/--quiet hides untracked (unknown and ignored) files unless
557 Option -q/--quiet hides untracked (unknown and ignored) files unless
556 explicitly requested with -u/--unknown or -i/--ignored.
558 explicitly requested with -u/--unknown or -i/--ignored.
557
559
558 Note:
560 Note:
559 status may appear to disagree with diff if permissions have changed or
561 status may appear to disagree with diff if permissions have changed or
560 a merge has occurred. The standard diff format does not report
562 a merge has occurred. The standard diff format does not report
561 permission changes and diff only reports changes relative to one merge
563 permission changes and diff only reports changes relative to one merge
562 parent.
564 parent.
563
565
564 If one revision is given, it is used as the base revision. If two
566 If one revision is given, it is used as the base revision. If two
565 revisions are given, the differences between them are shown. The --change
567 revisions are given, the differences between them are shown. The --change
566 option can also be used as a shortcut to list the changed files of a
568 option can also be used as a shortcut to list the changed files of a
567 revision from its first parent.
569 revision from its first parent.
568
570
569 The codes used to show the status of files are:
571 The codes used to show the status of files are:
570
572
571 M = modified
573 M = modified
572 A = added
574 A = added
573 R = removed
575 R = removed
574 C = clean
576 C = clean
575 ! = missing (deleted by non-hg command, but still tracked)
577 ! = missing (deleted by non-hg command, but still tracked)
576 ? = not tracked
578 ? = not tracked
577 I = ignored
579 I = ignored
578 = origin of the previous file (with --copies)
580 = origin of the previous file (with --copies)
579
581
580 Returns 0 on success.
582 Returns 0 on success.
581
583
582 options ([+] can be repeated):
584 options ([+] can be repeated):
583
585
584 -A --all show status of all files
586 -A --all show status of all files
585 -m --modified show only modified files
587 -m --modified show only modified files
586 -a --added show only added files
588 -a --added show only added files
587 -r --removed show only removed files
589 -r --removed show only removed files
588 -d --deleted show only deleted (but tracked) files
590 -d --deleted show only deleted (but tracked) files
589 -c --clean show only files without changes
591 -c --clean show only files without changes
590 -u --unknown show only unknown (not tracked) files
592 -u --unknown show only unknown (not tracked) files
591 -i --ignored show only ignored files
593 -i --ignored show only ignored files
592 -n --no-status hide status prefix
594 -n --no-status hide status prefix
593 -C --copies show source of copied files
595 -C --copies show source of copied files
594 -0 --print0 end filenames with NUL, for use with xargs
596 -0 --print0 end filenames with NUL, for use with xargs
595 --rev REV [+] show difference from revision
597 --rev REV [+] show difference from revision
596 --change REV list the changed files of a revision
598 --change REV list the changed files of a revision
597 -I --include PATTERN [+] include names matching the given patterns
599 -I --include PATTERN [+] include names matching the given patterns
598 -X --exclude PATTERN [+] exclude names matching the given patterns
600 -X --exclude PATTERN [+] exclude names matching the given patterns
599 -S --subrepos recurse into subrepositories
601 -S --subrepos recurse into subrepositories
600
602
601 (some details hidden, use --verbose to show complete help)
603 (some details hidden, use --verbose to show complete help)
602
604
603 $ hg -q help status
605 $ hg -q help status
604 hg status [OPTION]... [FILE]...
606 hg status [OPTION]... [FILE]...
605
607
606 show changed files in the working directory
608 show changed files in the working directory
607
609
608 $ hg help foo
610 $ hg help foo
609 abort: no such help topic: foo
611 abort: no such help topic: foo
610 (try "hg help --keyword foo")
612 (try "hg help --keyword foo")
611 [255]
613 [255]
612
614
613 $ hg skjdfks
615 $ hg skjdfks
614 hg: unknown command 'skjdfks'
616 hg: unknown command 'skjdfks'
615 Mercurial Distributed SCM
617 Mercurial Distributed SCM
616
618
617 basic commands:
619 basic commands:
618
620
619 add add the specified files on the next commit
621 add add the specified files on the next commit
620 annotate show changeset information by line for each file
622 annotate show changeset information by line for each file
621 clone make a copy of an existing repository
623 clone make a copy of an existing repository
622 commit commit the specified files or all outstanding changes
624 commit commit the specified files or all outstanding changes
623 diff diff repository (or selected files)
625 diff diff repository (or selected files)
624 export dump the header and diffs for one or more changesets
626 export dump the header and diffs for one or more changesets
625 forget forget the specified files on the next commit
627 forget forget the specified files on the next commit
626 init create a new repository in the given directory
628 init create a new repository in the given directory
627 log show revision history of entire repository or files
629 log show revision history of entire repository or files
628 merge merge another revision into working directory
630 merge merge another revision into working directory
629 pull pull changes from the specified source
631 pull pull changes from the specified source
630 push push changes to the specified destination
632 push push changes to the specified destination
631 remove remove the specified files on the next commit
633 remove remove the specified files on the next commit
632 serve start stand-alone webserver
634 serve start stand-alone webserver
633 status show changed files in the working directory
635 status show changed files in the working directory
634 summary summarize working directory state
636 summary summarize working directory state
635 update update working directory (or switch revisions)
637 update update working directory (or switch revisions)
636
638
637 (use "hg help" for the full list of commands or "hg -v" for details)
639 (use "hg help" for the full list of commands or "hg -v" for details)
638 [255]
640 [255]
639
641
640
642
641 Make sure that we don't run afoul of the help system thinking that
643 Make sure that we don't run afoul of the help system thinking that
642 this is a section and erroring out weirdly.
644 this is a section and erroring out weirdly.
643
645
644 $ hg .log
646 $ hg .log
645 hg: unknown command '.log'
647 hg: unknown command '.log'
646 (did you mean one of log?)
648 (did you mean one of log?)
647 [255]
649 [255]
648
650
649 $ hg log.
651 $ hg log.
650 hg: unknown command 'log.'
652 hg: unknown command 'log.'
651 (did you mean one of log?)
653 (did you mean one of log?)
652 [255]
654 [255]
653 $ hg pu.lh
655 $ hg pu.lh
654 hg: unknown command 'pu.lh'
656 hg: unknown command 'pu.lh'
655 (did you mean one of pull, push?)
657 (did you mean one of pull, push?)
656 [255]
658 [255]
657
659
658 $ cat > helpext.py <<EOF
660 $ cat > helpext.py <<EOF
659 > import os
661 > import os
660 > from mercurial import cmdutil, commands
662 > from mercurial import cmdutil, commands
661 >
663 >
662 > cmdtable = {}
664 > cmdtable = {}
663 > command = cmdutil.command(cmdtable)
665 > command = cmdutil.command(cmdtable)
664 >
666 >
665 > @command('nohelp',
667 > @command('nohelp',
666 > [('', 'longdesc', 3, 'x'*90),
668 > [('', 'longdesc', 3, 'x'*90),
667 > ('n', '', None, 'normal desc'),
669 > ('n', '', None, 'normal desc'),
668 > ('', 'newline', '', 'line1\nline2')],
670 > ('', 'newline', '', 'line1\nline2')],
669 > 'hg nohelp',
671 > 'hg nohelp',
670 > norepo=True)
672 > norepo=True)
671 > @command('debugoptDEP', [('', 'dopt', None, 'option is (DEPRECATED)')])
673 > @command('debugoptDEP', [('', 'dopt', None, 'option is (DEPRECATED)')])
672 > @command('debugoptEXP', [('', 'eopt', None, 'option is (EXPERIMENTAL)')])
674 > @command('debugoptEXP', [('', 'eopt', None, 'option is (EXPERIMENTAL)')])
673 > def nohelp(ui, *args, **kwargs):
675 > def nohelp(ui, *args, **kwargs):
674 > pass
676 > pass
675 >
677 >
676 > EOF
678 > EOF
677 $ echo '[extensions]' >> $HGRCPATH
679 $ echo '[extensions]' >> $HGRCPATH
678 $ echo "helpext = `pwd`/helpext.py" >> $HGRCPATH
680 $ echo "helpext = `pwd`/helpext.py" >> $HGRCPATH
679
681
680 Test command with no help text
682 Test command with no help text
681
683
682 $ hg help nohelp
684 $ hg help nohelp
683 hg nohelp
685 hg nohelp
684
686
685 (no help text available)
687 (no help text available)
686
688
687 options:
689 options:
688
690
689 --longdesc VALUE xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
691 --longdesc VALUE xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
690 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx (default: 3)
692 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx (default: 3)
691 -n -- normal desc
693 -n -- normal desc
692 --newline VALUE line1 line2
694 --newline VALUE line1 line2
693
695
694 (some details hidden, use --verbose to show complete help)
696 (some details hidden, use --verbose to show complete help)
695
697
696 $ hg help -k nohelp
698 $ hg help -k nohelp
697 Commands:
699 Commands:
698
700
699 nohelp hg nohelp
701 nohelp hg nohelp
700
702
701 Extension Commands:
703 Extension Commands:
702
704
703 nohelp (no help text available)
705 nohelp (no help text available)
704
706
705 Test that default list of commands omits extension commands
707 Test that default list of commands omits extension commands
706
708
707 $ hg help
709 $ hg help
708 Mercurial Distributed SCM
710 Mercurial Distributed SCM
709
711
710 list of commands:
712 list of commands:
711
713
712 add add the specified files on the next commit
714 add add the specified files on the next commit
713 addremove add all new files, delete all missing files
715 addremove add all new files, delete all missing files
714 annotate show changeset information by line for each file
716 annotate show changeset information by line for each file
715 archive create an unversioned archive of a repository revision
717 archive create an unversioned archive of a repository revision
716 backout reverse effect of earlier changeset
718 backout reverse effect of earlier changeset
717 bisect subdivision search of changesets
719 bisect subdivision search of changesets
718 bookmarks create a new bookmark or list existing bookmarks
720 bookmarks create a new bookmark or list existing bookmarks
719 branch set or show the current branch name
721 branch set or show the current branch name
720 branches list repository named branches
722 branches list repository named branches
721 bundle create a changegroup file
723 bundle create a changegroup file
722 cat output the current or given revision of files
724 cat output the current or given revision of files
723 clone make a copy of an existing repository
725 clone make a copy of an existing repository
724 commit commit the specified files or all outstanding changes
726 commit commit the specified files or all outstanding changes
725 config show combined config settings from all hgrc files
727 config show combined config settings from all hgrc files
726 copy mark files as copied for the next commit
728 copy mark files as copied for the next commit
727 diff diff repository (or selected files)
729 diff diff repository (or selected files)
728 export dump the header and diffs for one or more changesets
730 export dump the header and diffs for one or more changesets
729 files list tracked files
731 files list tracked files
730 forget forget the specified files on the next commit
732 forget forget the specified files on the next commit
731 graft copy changes from other branches onto the current branch
733 graft copy changes from other branches onto the current branch
732 grep search for a pattern in specified files and revisions
734 grep search for a pattern in specified files and revisions
733 heads show branch heads
735 heads show branch heads
734 help show help for a given topic or a help overview
736 help show help for a given topic or a help overview
735 identify identify the working directory or specified revision
737 identify identify the working directory or specified revision
736 import import an ordered set of patches
738 import import an ordered set of patches
737 incoming show new changesets found in source
739 incoming show new changesets found in source
738 init create a new repository in the given directory
740 init create a new repository in the given directory
739 log show revision history of entire repository or files
741 log show revision history of entire repository or files
740 manifest output the current or given revision of the project manifest
742 manifest output the current or given revision of the project manifest
741 merge merge another revision into working directory
743 merge merge another revision into working directory
742 outgoing show changesets not found in the destination
744 outgoing show changesets not found in the destination
743 paths show aliases for remote repositories
745 paths show aliases for remote repositories
744 phase set or show the current phase name
746 phase set or show the current phase name
745 pull pull changes from the specified source
747 pull pull changes from the specified source
746 push push changes to the specified destination
748 push push changes to the specified destination
747 recover roll back an interrupted transaction
749 recover roll back an interrupted transaction
748 remove remove the specified files on the next commit
750 remove remove the specified files on the next commit
749 rename rename files; equivalent of copy + remove
751 rename rename files; equivalent of copy + remove
750 resolve redo merges or set/view the merge status of files
752 resolve redo merges or set/view the merge status of files
751 revert restore files to their checkout state
753 revert restore files to their checkout state
752 root print the root (top) of the current working directory
754 root print the root (top) of the current working directory
753 serve start stand-alone webserver
755 serve start stand-alone webserver
754 status show changed files in the working directory
756 status show changed files in the working directory
755 summary summarize working directory state
757 summary summarize working directory state
756 tag add one or more tags for the current or given revision
758 tag add one or more tags for the current or given revision
757 tags list repository tags
759 tags list repository tags
758 unbundle apply one or more changegroup files
760 unbundle apply one or more changegroup files
759 update update working directory (or switch revisions)
761 update update working directory (or switch revisions)
760 verify verify the integrity of the repository
762 verify verify the integrity of the repository
761 version output version and copyright information
763 version output version and copyright information
762
764
763 enabled extensions:
765 enabled extensions:
764
766
765 helpext (no help text available)
767 helpext (no help text available)
766
768
767 additional help topics:
769 additional help topics:
768
770
769 config Configuration Files
771 config Configuration Files
770 dates Date Formats
772 dates Date Formats
771 diffs Diff Formats
773 diffs Diff Formats
772 environment Environment Variables
774 environment Environment Variables
773 extensions Using Additional Features
775 extensions Using Additional Features
774 filesets Specifying File Sets
776 filesets Specifying File Sets
775 glossary Glossary
777 glossary Glossary
776 hgignore Syntax for Mercurial Ignore Files
778 hgignore Syntax for Mercurial Ignore Files
777 hgweb Configuring hgweb
779 hgweb Configuring hgweb
778 internals Technical implementation topics
780 internals Technical implementation topics
779 merge-tools Merge Tools
781 merge-tools Merge Tools
780 multirevs Specifying Multiple Revisions
782 multirevs Specifying Multiple Revisions
781 patterns File Name Patterns
783 patterns File Name Patterns
782 phases Working with Phases
784 phases Working with Phases
783 revisions Specifying Single Revisions
785 revisions Specifying Single Revisions
784 revsets Specifying Revision Sets
786 revsets Specifying Revision Sets
785 scripting Using Mercurial from scripts and automation
787 scripting Using Mercurial from scripts and automation
786 subrepos Subrepositories
788 subrepos Subrepositories
787 templating Template Usage
789 templating Template Usage
788 urls URL Paths
790 urls URL Paths
789
791
790 (use "hg help -v" to show built-in aliases and global options)
792 (use "hg help -v" to show built-in aliases and global options)
791
793
792
794
793 Test list of internal help commands
795 Test list of internal help commands
794
796
795 $ hg help debug
797 $ hg help debug
796 debug commands (internal and unsupported):
798 debug commands (internal and unsupported):
797
799
798 debugancestor
800 debugancestor
799 find the ancestor revision of two revisions in a given index
801 find the ancestor revision of two revisions in a given index
800 debugapplystreamclonebundle
802 debugapplystreamclonebundle
801 apply a stream clone bundle file
803 apply a stream clone bundle file
802 debugbuilddag
804 debugbuilddag
803 builds a repo with a given DAG from scratch in the current
805 builds a repo with a given DAG from scratch in the current
804 empty repo
806 empty repo
805 debugbundle lists the contents of a bundle
807 debugbundle lists the contents of a bundle
806 debugcheckstate
808 debugcheckstate
807 validate the correctness of the current dirstate
809 validate the correctness of the current dirstate
808 debugcommands
810 debugcommands
809 list all available commands and options
811 list all available commands and options
810 debugcomplete
812 debugcomplete
811 returns the completion list associated with the given command
813 returns the completion list associated with the given command
812 debugcreatestreamclonebundle
814 debugcreatestreamclonebundle
813 create a stream clone bundle file
815 create a stream clone bundle file
814 debugdag format the changelog or an index DAG as a concise textual
816 debugdag format the changelog or an index DAG as a concise textual
815 description
817 description
816 debugdata dump the contents of a data file revision
818 debugdata dump the contents of a data file revision
817 debugdate parse and display a date
819 debugdate parse and display a date
818 debugdeltachain
820 debugdeltachain
819 dump information about delta chains in a revlog
821 dump information about delta chains in a revlog
820 debugdirstate
822 debugdirstate
821 show the contents of the current dirstate
823 show the contents of the current dirstate
822 debugdiscovery
824 debugdiscovery
823 runs the changeset discovery protocol in isolation
825 runs the changeset discovery protocol in isolation
824 debugextensions
826 debugextensions
825 show information about active extensions
827 show information about active extensions
826 debugfileset parse and apply a fileset specification
828 debugfileset parse and apply a fileset specification
827 debugfsinfo show information detected about current filesystem
829 debugfsinfo show information detected about current filesystem
828 debuggetbundle
830 debuggetbundle
829 retrieves a bundle from a repo
831 retrieves a bundle from a repo
830 debugignore display the combined ignore pattern
832 debugignore display the combined ignore pattern
831 debugindex dump the contents of an index file
833 debugindex dump the contents of an index file
832 debugindexdot
834 debugindexdot
833 dump an index DAG as a graphviz dot file
835 dump an index DAG as a graphviz dot file
834 debuginstall test Mercurial installation
836 debuginstall test Mercurial installation
835 debugknown test whether node ids are known to a repo
837 debugknown test whether node ids are known to a repo
836 debuglocks show or modify state of locks
838 debuglocks show or modify state of locks
837 debugmergestate
839 debugmergestate
838 print merge state
840 print merge state
839 debugnamecomplete
841 debugnamecomplete
840 complete "names" - tags, open branch names, bookmark names
842 complete "names" - tags, open branch names, bookmark names
841 debugobsolete
843 debugobsolete
842 create arbitrary obsolete marker
844 create arbitrary obsolete marker
843 debugoptDEP (no help text available)
845 debugoptDEP (no help text available)
844 debugoptEXP (no help text available)
846 debugoptEXP (no help text available)
845 debugpathcomplete
847 debugpathcomplete
846 complete part or all of a tracked path
848 complete part or all of a tracked path
847 debugpushkey access the pushkey key/value protocol
849 debugpushkey access the pushkey key/value protocol
848 debugpvec (no help text available)
850 debugpvec (no help text available)
849 debugrebuilddirstate
851 debugrebuilddirstate
850 rebuild the dirstate as it would look like for the given
852 rebuild the dirstate as it would look like for the given
851 revision
853 revision
852 debugrebuildfncache
854 debugrebuildfncache
853 rebuild the fncache file
855 rebuild the fncache file
854 debugrename dump rename information
856 debugrename dump rename information
855 debugrevlog show data and statistics about a revlog
857 debugrevlog show data and statistics about a revlog
856 debugrevspec parse and apply a revision specification
858 debugrevspec parse and apply a revision specification
857 debugsetparents
859 debugsetparents
858 manually set the parents of the current working directory
860 manually set the parents of the current working directory
859 debugsub (no help text available)
861 debugsub (no help text available)
860 debugsuccessorssets
862 debugsuccessorssets
861 show set of successors for revision
863 show set of successors for revision
862 debugwalk show how files match on given patterns
864 debugwalk show how files match on given patterns
863 debugwireargs
865 debugwireargs
864 (no help text available)
866 (no help text available)
865
867
866 (use "hg help -v debug" to show built-in aliases and global options)
868 (use "hg help -v debug" to show built-in aliases and global options)
867
869
868 internals topic renders index of available sub-topics
870 internals topic renders index of available sub-topics
869
871
870 $ hg help internals
872 $ hg help internals
871 Technical implementation topics
873 Technical implementation topics
872 """""""""""""""""""""""""""""""
874 """""""""""""""""""""""""""""""
873
875
874 bundles container for exchange of repository data
876 bundles container for exchange of repository data
875 changegroups representation of revlog data
877 changegroups representation of revlog data
876
878
877 sub-topics can be accessed
879 sub-topics can be accessed
878
880
879 $ hg help internals.changegroups
881 $ hg help internals.changegroups
880 Changegroups
882 Changegroups
881 ============
883 ============
882
884
883 Changegroups are representations of repository revlog data, specifically
885 Changegroups are representations of repository revlog data, specifically
884 the changelog, manifest, and filelogs.
886 the changelog, manifest, and filelogs.
885
887
886 There are 2 versions of changegroups: "1" and "2". From a high-level, they
888 There are 2 versions of changegroups: "1" and "2". From a high-level, they
887 are almost exactly the same, with the only difference being a header on
889 are almost exactly the same, with the only difference being a header on
888 entries in the changeset segment.
890 entries in the changeset segment.
889
891
890 Changegroups consists of 3 logical segments:
892 Changegroups consists of 3 logical segments:
891
893
892 +---------------------------------+
894 +---------------------------------+
893 | | | |
895 | | | |
894 | changeset | manifest | filelogs |
896 | changeset | manifest | filelogs |
895 | | | |
897 | | | |
896 +---------------------------------+
898 +---------------------------------+
897
899
898 The principle building block of each segment is a *chunk*. A *chunk* is a
900 The principle building block of each segment is a *chunk*. A *chunk* is a
899 framed piece of data:
901 framed piece of data:
900
902
901 +---------------------------------------+
903 +---------------------------------------+
902 | | |
904 | | |
903 | length | data |
905 | length | data |
904 | (32 bits) | <length> bytes |
906 | (32 bits) | <length> bytes |
905 | | |
907 | | |
906 +---------------------------------------+
908 +---------------------------------------+
907
909
908 Each chunk starts with a 32-bit big-endian signed integer indicating the
910 Each chunk starts with a 32-bit big-endian signed integer indicating the
909 length of the raw data that follows.
911 length of the raw data that follows.
910
912
911 There is a special case chunk that has 0 length ("0x00000000"). We call
913 There is a special case chunk that has 0 length ("0x00000000"). We call
912 this an *empty chunk*.
914 this an *empty chunk*.
913
915
914 Delta Groups
916 Delta Groups
915 ------------
917 ------------
916
918
917 A *delta group* expresses the content of a revlog as a series of deltas,
919 A *delta group* expresses the content of a revlog as a series of deltas,
918 or patches against previous revisions.
920 or patches against previous revisions.
919
921
920 Delta groups consist of 0 or more *chunks* followed by the *empty chunk*
922 Delta groups consist of 0 or more *chunks* followed by the *empty chunk*
921 to signal the end of the delta group:
923 to signal the end of the delta group:
922
924
923 +------------------------------------------------------------------------+
925 +------------------------------------------------------------------------+
924 | | | | | |
926 | | | | | |
925 | chunk0 length | chunk0 data | chunk1 length | chunk1 data | 0x0 |
927 | chunk0 length | chunk0 data | chunk1 length | chunk1 data | 0x0 |
926 | (32 bits) | (various) | (32 bits) | (various) | (32 bits) |
928 | (32 bits) | (various) | (32 bits) | (various) | (32 bits) |
927 | | | | | |
929 | | | | | |
928 +------------------------------------------------------------+-----------+
930 +------------------------------------------------------------+-----------+
929
931
930 Each *chunk*'s data consists of the following:
932 Each *chunk*'s data consists of the following:
931
933
932 +-----------------------------------------+
934 +-----------------------------------------+
933 | | | |
935 | | | |
934 | delta header | mdiff header | delta |
936 | delta header | mdiff header | delta |
935 | (various) | (12 bytes) | (various) |
937 | (various) | (12 bytes) | (various) |
936 | | | |
938 | | | |
937 +-----------------------------------------+
939 +-----------------------------------------+
938
940
939 The *length* field is the byte length of the remaining 3 logical pieces of
941 The *length* field is the byte length of the remaining 3 logical pieces of
940 data. The *delta* is a diff from an existing entry in the changelog.
942 data. The *delta* is a diff from an existing entry in the changelog.
941
943
942 The *delta header* is different between versions "1" and "2" of the
944 The *delta header* is different between versions "1" and "2" of the
943 changegroup format.
945 changegroup format.
944
946
945 Version 1:
947 Version 1:
946
948
947 +------------------------------------------------------+
949 +------------------------------------------------------+
948 | | | | |
950 | | | | |
949 | node | p1 node | p2 node | link node |
951 | node | p1 node | p2 node | link node |
950 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
952 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
951 | | | | |
953 | | | | |
952 +------------------------------------------------------+
954 +------------------------------------------------------+
953
955
954 Version 2:
956 Version 2:
955
957
956 +------------------------------------------------------------------+
958 +------------------------------------------------------------------+
957 | | | | | |
959 | | | | | |
958 | node | p1 node | p2 node | base node | link node |
960 | node | p1 node | p2 node | base node | link node |
959 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
961 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
960 | | | | | |
962 | | | | | |
961 +------------------------------------------------------------------+
963 +------------------------------------------------------------------+
962
964
963 The *mdiff header* consists of 3 32-bit big-endian signed integers
965 The *mdiff header* consists of 3 32-bit big-endian signed integers
964 describing offsets at which to apply the following delta content:
966 describing offsets at which to apply the following delta content:
965
967
966 +-------------------------------------+
968 +-------------------------------------+
967 | | | |
969 | | | |
968 | offset | old length | new length |
970 | offset | old length | new length |
969 | (32 bits) | (32 bits) | (32 bits) |
971 | (32 bits) | (32 bits) | (32 bits) |
970 | | | |
972 | | | |
971 +-------------------------------------+
973 +-------------------------------------+
972
974
973 In version 1, the delta is always applied against the previous node from
975 In version 1, the delta is always applied against the previous node from
974 the changegroup or the first parent if this is the first entry in the
976 the changegroup or the first parent if this is the first entry in the
975 changegroup.
977 changegroup.
976
978
977 In version 2, the delta base node is encoded in the entry in the
979 In version 2, the delta base node is encoded in the entry in the
978 changegroup. This allows the delta to be expressed against any parent,
980 changegroup. This allows the delta to be expressed against any parent,
979 which can result in smaller deltas and more efficient encoding of data.
981 which can result in smaller deltas and more efficient encoding of data.
980
982
981 Changeset Segment
983 Changeset Segment
982 -----------------
984 -----------------
983
985
984 The *changeset segment* consists of a single *delta group* holding
986 The *changeset segment* consists of a single *delta group* holding
985 changelog data. It is followed by an *empty chunk* to denote the boundary
987 changelog data. It is followed by an *empty chunk* to denote the boundary
986 to the *manifests segment*.
988 to the *manifests segment*.
987
989
988 Manifest Segment
990 Manifest Segment
989 ----------------
991 ----------------
990
992
991 The *manifest segment* consists of a single *delta group* holding manifest
993 The *manifest segment* consists of a single *delta group* holding manifest
992 data. It is followed by an *empty chunk* to denote the boundary to the
994 data. It is followed by an *empty chunk* to denote the boundary to the
993 *filelogs segment*.
995 *filelogs segment*.
994
996
995 Filelogs Segment
997 Filelogs Segment
996 ----------------
998 ----------------
997
999
998 The *filelogs* segment consists of multiple sub-segments, each
1000 The *filelogs* segment consists of multiple sub-segments, each
999 corresponding to an individual file whose data is being described:
1001 corresponding to an individual file whose data is being described:
1000
1002
1001 +--------------------------------------+
1003 +--------------------------------------+
1002 | | | | |
1004 | | | | |
1003 | filelog0 | filelog1 | filelog2 | ... |
1005 | filelog0 | filelog1 | filelog2 | ... |
1004 | | | | |
1006 | | | | |
1005 +--------------------------------------+
1007 +--------------------------------------+
1006
1008
1007 The final filelog sub-segment is followed by an *empty chunk* to denote
1009 The final filelog sub-segment is followed by an *empty chunk* to denote
1008 the end of the segment and the overall changegroup.
1010 the end of the segment and the overall changegroup.
1009
1011
1010 Each filelog sub-segment consists of the following:
1012 Each filelog sub-segment consists of the following:
1011
1013
1012 +------------------------------------------+
1014 +------------------------------------------+
1013 | | | |
1015 | | | |
1014 | filename size | filename | delta group |
1016 | filename size | filename | delta group |
1015 | (32 bits) | (various) | (various) |
1017 | (32 bits) | (various) | (various) |
1016 | | | |
1018 | | | |
1017 +------------------------------------------+
1019 +------------------------------------------+
1018
1020
1019 That is, a *chunk* consisting of the filename (not terminated or padded)
1021 That is, a *chunk* consisting of the filename (not terminated or padded)
1020 followed by N chunks constituting the *delta group* for this file.
1022 followed by N chunks constituting the *delta group* for this file.
1021
1023
1022 Test list of commands with command with no help text
1024 Test list of commands with command with no help text
1023
1025
1024 $ hg help helpext
1026 $ hg help helpext
1025 helpext extension - no help text available
1027 helpext extension - no help text available
1026
1028
1027 list of commands:
1029 list of commands:
1028
1030
1029 nohelp (no help text available)
1031 nohelp (no help text available)
1030
1032
1031 (use "hg help -v helpext" to show built-in aliases and global options)
1033 (use "hg help -v helpext" to show built-in aliases and global options)
1032
1034
1033
1035
1034 test deprecated and experimental options are hidden in command help
1036 test deprecated and experimental options are hidden in command help
1035 $ hg help debugoptDEP
1037 $ hg help debugoptDEP
1036 hg debugoptDEP
1038 hg debugoptDEP
1037
1039
1038 (no help text available)
1040 (no help text available)
1039
1041
1040 options:
1042 options:
1041
1043
1042 (some details hidden, use --verbose to show complete help)
1044 (some details hidden, use --verbose to show complete help)
1043
1045
1044 $ hg help debugoptEXP
1046 $ hg help debugoptEXP
1045 hg debugoptEXP
1047 hg debugoptEXP
1046
1048
1047 (no help text available)
1049 (no help text available)
1048
1050
1049 options:
1051 options:
1050
1052
1051 (some details hidden, use --verbose to show complete help)
1053 (some details hidden, use --verbose to show complete help)
1052
1054
1053 test deprecated and experimental options is shown with -v
1055 test deprecated and experimental options is shown with -v
1054 $ hg help -v debugoptDEP | grep dopt
1056 $ hg help -v debugoptDEP | grep dopt
1055 --dopt option is (DEPRECATED)
1057 --dopt option is (DEPRECATED)
1056 $ hg help -v debugoptEXP | grep eopt
1058 $ hg help -v debugoptEXP | grep eopt
1057 --eopt option is (EXPERIMENTAL)
1059 --eopt option is (EXPERIMENTAL)
1058
1060
1059 #if gettext
1061 #if gettext
1060 test deprecated option is hidden with translation with untranslated description
1062 test deprecated option is hidden with translation with untranslated description
1061 (use many globy for not failing on changed transaction)
1063 (use many globy for not failing on changed transaction)
1062 $ LANGUAGE=sv hg help debugoptDEP
1064 $ LANGUAGE=sv hg help debugoptDEP
1063 hg debugoptDEP
1065 hg debugoptDEP
1064
1066
1065 (*) (glob)
1067 (*) (glob)
1066
1068
1067 options:
1069 options:
1068
1070
1069 (some details hidden, use --verbose to show complete help)
1071 (some details hidden, use --verbose to show complete help)
1070 #endif
1072 #endif
1071
1073
1072 Test commands that collide with topics (issue4240)
1074 Test commands that collide with topics (issue4240)
1073
1075
1074 $ hg config -hq
1076 $ hg config -hq
1075 hg config [-u] [NAME]...
1077 hg config [-u] [NAME]...
1076
1078
1077 show combined config settings from all hgrc files
1079 show combined config settings from all hgrc files
1078 $ hg showconfig -hq
1080 $ hg showconfig -hq
1079 hg config [-u] [NAME]...
1081 hg config [-u] [NAME]...
1080
1082
1081 show combined config settings from all hgrc files
1083 show combined config settings from all hgrc files
1082
1084
1083 Test a help topic
1085 Test a help topic
1084
1086
1085 $ hg help revs
1087 $ hg help revs
1086 Specifying Single Revisions
1088 Specifying Single Revisions
1087 """""""""""""""""""""""""""
1089 """""""""""""""""""""""""""
1088
1090
1089 Mercurial supports several ways to specify individual revisions.
1091 Mercurial supports several ways to specify individual revisions.
1090
1092
1091 A plain integer is treated as a revision number. Negative integers are
1093 A plain integer is treated as a revision number. Negative integers are
1092 treated as sequential offsets from the tip, with -1 denoting the tip, -2
1094 treated as sequential offsets from the tip, with -1 denoting the tip, -2
1093 denoting the revision prior to the tip, and so forth.
1095 denoting the revision prior to the tip, and so forth.
1094
1096
1095 A 40-digit hexadecimal string is treated as a unique revision identifier.
1097 A 40-digit hexadecimal string is treated as a unique revision identifier.
1096
1098
1097 A hexadecimal string less than 40 characters long is treated as a unique
1099 A hexadecimal string less than 40 characters long is treated as a unique
1098 revision identifier and is referred to as a short-form identifier. A
1100 revision identifier and is referred to as a short-form identifier. A
1099 short-form identifier is only valid if it is the prefix of exactly one
1101 short-form identifier is only valid if it is the prefix of exactly one
1100 full-length identifier.
1102 full-length identifier.
1101
1103
1102 Any other string is treated as a bookmark, tag, or branch name. A bookmark
1104 Any other string is treated as a bookmark, tag, or branch name. A bookmark
1103 is a movable pointer to a revision. A tag is a permanent name associated
1105 is a movable pointer to a revision. A tag is a permanent name associated
1104 with a revision. A branch name denotes the tipmost open branch head of
1106 with a revision. A branch name denotes the tipmost open branch head of
1105 that branch - or if they are all closed, the tipmost closed head of the
1107 that branch - or if they are all closed, the tipmost closed head of the
1106 branch. Bookmark, tag, and branch names must not contain the ":"
1108 branch. Bookmark, tag, and branch names must not contain the ":"
1107 character.
1109 character.
1108
1110
1109 The reserved name "tip" always identifies the most recent revision.
1111 The reserved name "tip" always identifies the most recent revision.
1110
1112
1111 The reserved name "null" indicates the null revision. This is the revision
1113 The reserved name "null" indicates the null revision. This is the revision
1112 of an empty repository, and the parent of revision 0.
1114 of an empty repository, and the parent of revision 0.
1113
1115
1114 The reserved name "." indicates the working directory parent. If no
1116 The reserved name "." indicates the working directory parent. If no
1115 working directory is checked out, it is equivalent to null. If an
1117 working directory is checked out, it is equivalent to null. If an
1116 uncommitted merge is in progress, "." is the revision of the first parent.
1118 uncommitted merge is in progress, "." is the revision of the first parent.
1117
1119
1118 Test repeated config section name
1120 Test repeated config section name
1119
1121
1120 $ hg help config.host
1122 $ hg help config.host
1121 "http_proxy.host"
1123 "http_proxy.host"
1122 Host name and (optional) port of the proxy server, for example
1124 Host name and (optional) port of the proxy server, for example
1123 "myproxy:8000".
1125 "myproxy:8000".
1124
1126
1125 "smtp.host"
1127 "smtp.host"
1126 Host name of mail server, e.g. "mail.example.com".
1128 Host name of mail server, e.g. "mail.example.com".
1127
1129
1128 Unrelated trailing paragraphs shouldn't be included
1130 Unrelated trailing paragraphs shouldn't be included
1129
1131
1130 $ hg help config.extramsg | grep '^$'
1132 $ hg help config.extramsg | grep '^$'
1131
1133
1132
1134
1133 Test capitalized section name
1135 Test capitalized section name
1134
1136
1135 $ hg help scripting.HGPLAIN > /dev/null
1137 $ hg help scripting.HGPLAIN > /dev/null
1136
1138
1137 Help subsection:
1139 Help subsection:
1138
1140
1139 $ hg help config.charsets |grep "Email example:" > /dev/null
1141 $ hg help config.charsets |grep "Email example:" > /dev/null
1140 [1]
1142 [1]
1141
1143
1142 Show nested definitions
1144 Show nested definitions
1143 ("profiling.type"[break]"ls"[break]"stat"[break])
1145 ("profiling.type"[break]"ls"[break]"stat"[break])
1144
1146
1145 $ hg help config.type | egrep '^$'|wc -l
1147 $ hg help config.type | egrep '^$'|wc -l
1146 \s*3 (re)
1148 \s*3 (re)
1147
1149
1148 Last item in help config.*:
1150 Last item in help config.*:
1149
1151
1150 $ hg help config.`hg help config|grep '^ "'| \
1152 $ hg help config.`hg help config|grep '^ "'| \
1151 > tail -1|sed 's![ "]*!!g'`| \
1153 > tail -1|sed 's![ "]*!!g'`| \
1152 > grep "hg help -c config" > /dev/null
1154 > grep "hg help -c config" > /dev/null
1153 [1]
1155 [1]
1154
1156
1155 note to use help -c for general hg help config:
1157 note to use help -c for general hg help config:
1156
1158
1157 $ hg help config |grep "hg help -c config" > /dev/null
1159 $ hg help config |grep "hg help -c config" > /dev/null
1158
1160
1159 Test templating help
1161 Test templating help
1160
1162
1161 $ hg help templating | egrep '(desc|diffstat|firstline|nonempty) '
1163 $ hg help templating | egrep '(desc|diffstat|firstline|nonempty) '
1162 desc String. The text of the changeset description.
1164 desc String. The text of the changeset description.
1163 diffstat String. Statistics of changes with the following format:
1165 diffstat String. Statistics of changes with the following format:
1164 firstline Any text. Returns the first line of text.
1166 firstline Any text. Returns the first line of text.
1165 nonempty Any text. Returns '(none)' if the string is empty.
1167 nonempty Any text. Returns '(none)' if the string is empty.
1166
1168
1167 Test deprecated items
1169 Test deprecated items
1168
1170
1169 $ hg help -v templating | grep currentbookmark
1171 $ hg help -v templating | grep currentbookmark
1170 currentbookmark
1172 currentbookmark
1171 $ hg help templating | (grep currentbookmark || true)
1173 $ hg help templating | (grep currentbookmark || true)
1172
1174
1173 Test help hooks
1175 Test help hooks
1174
1176
1175 $ cat > helphook1.py <<EOF
1177 $ cat > helphook1.py <<EOF
1176 > from mercurial import help
1178 > from mercurial import help
1177 >
1179 >
1178 > def rewrite(ui, topic, doc):
1180 > def rewrite(ui, topic, doc):
1179 > return doc + '\nhelphook1\n'
1181 > return doc + '\nhelphook1\n'
1180 >
1182 >
1181 > def extsetup(ui):
1183 > def extsetup(ui):
1182 > help.addtopichook('revsets', rewrite)
1184 > help.addtopichook('revsets', rewrite)
1183 > EOF
1185 > EOF
1184 $ cat > helphook2.py <<EOF
1186 $ cat > helphook2.py <<EOF
1185 > from mercurial import help
1187 > from mercurial import help
1186 >
1188 >
1187 > def rewrite(ui, topic, doc):
1189 > def rewrite(ui, topic, doc):
1188 > return doc + '\nhelphook2\n'
1190 > return doc + '\nhelphook2\n'
1189 >
1191 >
1190 > def extsetup(ui):
1192 > def extsetup(ui):
1191 > help.addtopichook('revsets', rewrite)
1193 > help.addtopichook('revsets', rewrite)
1192 > EOF
1194 > EOF
1193 $ echo '[extensions]' >> $HGRCPATH
1195 $ echo '[extensions]' >> $HGRCPATH
1194 $ echo "helphook1 = `pwd`/helphook1.py" >> $HGRCPATH
1196 $ echo "helphook1 = `pwd`/helphook1.py" >> $HGRCPATH
1195 $ echo "helphook2 = `pwd`/helphook2.py" >> $HGRCPATH
1197 $ echo "helphook2 = `pwd`/helphook2.py" >> $HGRCPATH
1196 $ hg help revsets | grep helphook
1198 $ hg help revsets | grep helphook
1197 helphook1
1199 helphook1
1198 helphook2
1200 helphook2
1199
1201
1200 help -c should only show debug --debug
1202 help -c should only show debug --debug
1201
1203
1202 $ hg help -c --debug|egrep debug|wc -l|egrep '^\s*0\s*$'
1204 $ hg help -c --debug|egrep debug|wc -l|egrep '^\s*0\s*$'
1203 [1]
1205 [1]
1204
1206
1205 help -c should only show deprecated for -v
1207 help -c should only show deprecated for -v
1206
1208
1207 $ hg help -c -v|egrep DEPRECATED|wc -l|egrep '^\s*0\s*$'
1209 $ hg help -c -v|egrep DEPRECATED|wc -l|egrep '^\s*0\s*$'
1208 [1]
1210 [1]
1209
1211
1210 Test -e / -c / -k combinations
1212 Test -e / -c / -k combinations
1211
1213
1212 $ hg help -c|egrep '^[A-Z].*:|^ debug'
1214 $ hg help -c|egrep '^[A-Z].*:|^ debug'
1213 Commands:
1215 Commands:
1214 $ hg help -e|egrep '^[A-Z].*:|^ debug'
1216 $ hg help -e|egrep '^[A-Z].*:|^ debug'
1215 Extensions:
1217 Extensions:
1216 $ hg help -k|egrep '^[A-Z].*:|^ debug'
1218 $ hg help -k|egrep '^[A-Z].*:|^ debug'
1217 Topics:
1219 Topics:
1218 Commands:
1220 Commands:
1219 Extensions:
1221 Extensions:
1220 Extension Commands:
1222 Extension Commands:
1221 $ hg help -c schemes
1223 $ hg help -c schemes
1222 abort: no such help topic: schemes
1224 abort: no such help topic: schemes
1223 (try "hg help --keyword schemes")
1225 (try "hg help --keyword schemes")
1224 [255]
1226 [255]
1225 $ hg help -e schemes |head -1
1227 $ hg help -e schemes |head -1
1226 schemes extension - extend schemes with shortcuts to repository swarms
1228 schemes extension - extend schemes with shortcuts to repository swarms
1227 $ hg help -c -k dates |egrep '^(Topics|Extensions|Commands):'
1229 $ hg help -c -k dates |egrep '^(Topics|Extensions|Commands):'
1228 Commands:
1230 Commands:
1229 $ hg help -e -k a |egrep '^(Topics|Extensions|Commands):'
1231 $ hg help -e -k a |egrep '^(Topics|Extensions|Commands):'
1230 Extensions:
1232 Extensions:
1231 $ hg help -e -c -k date |egrep '^(Topics|Extensions|Commands):'
1233 $ hg help -e -c -k date |egrep '^(Topics|Extensions|Commands):'
1232 Extensions:
1234 Extensions:
1233 Commands:
1235 Commands:
1234 $ hg help -c commit > /dev/null
1236 $ hg help -c commit > /dev/null
1235 $ hg help -e -c commit > /dev/null
1237 $ hg help -e -c commit > /dev/null
1236 $ hg help -e commit > /dev/null
1238 $ hg help -e commit > /dev/null
1237 abort: no such help topic: commit
1239 abort: no such help topic: commit
1238 (try "hg help --keyword commit")
1240 (try "hg help --keyword commit")
1239 [255]
1241 [255]
1240
1242
1241 Test keyword search help
1243 Test keyword search help
1242
1244
1243 $ cat > prefixedname.py <<EOF
1245 $ cat > prefixedname.py <<EOF
1244 > '''matched against word "clone"
1246 > '''matched against word "clone"
1245 > '''
1247 > '''
1246 > EOF
1248 > EOF
1247 $ echo '[extensions]' >> $HGRCPATH
1249 $ echo '[extensions]' >> $HGRCPATH
1248 $ echo "dot.dot.prefixedname = `pwd`/prefixedname.py" >> $HGRCPATH
1250 $ echo "dot.dot.prefixedname = `pwd`/prefixedname.py" >> $HGRCPATH
1249 $ hg help -k clone
1251 $ hg help -k clone
1250 Topics:
1252 Topics:
1251
1253
1252 config Configuration Files
1254 config Configuration Files
1253 extensions Using Additional Features
1255 extensions Using Additional Features
1254 glossary Glossary
1256 glossary Glossary
1255 phases Working with Phases
1257 phases Working with Phases
1256 subrepos Subrepositories
1258 subrepos Subrepositories
1257 urls URL Paths
1259 urls URL Paths
1258
1260
1259 Commands:
1261 Commands:
1260
1262
1261 bookmarks create a new bookmark or list existing bookmarks
1263 bookmarks create a new bookmark or list existing bookmarks
1262 clone make a copy of an existing repository
1264 clone make a copy of an existing repository
1263 paths show aliases for remote repositories
1265 paths show aliases for remote repositories
1264 update update working directory (or switch revisions)
1266 update update working directory (or switch revisions)
1265
1267
1266 Extensions:
1268 Extensions:
1267
1269
1268 clonebundles advertise pre-generated bundles to seed clones (experimental)
1270 clonebundles advertise pre-generated bundles to seed clones (experimental)
1269 prefixedname matched against word "clone"
1271 prefixedname matched against word "clone"
1270 relink recreates hardlinks between repository clones
1272 relink recreates hardlinks between repository clones
1271
1273
1272 Extension Commands:
1274 Extension Commands:
1273
1275
1274 qclone clone main and patch repository at same time
1276 qclone clone main and patch repository at same time
1275
1277
1276 Test unfound topic
1278 Test unfound topic
1277
1279
1278 $ hg help nonexistingtopicthatwillneverexisteverever
1280 $ hg help nonexistingtopicthatwillneverexisteverever
1279 abort: no such help topic: nonexistingtopicthatwillneverexisteverever
1281 abort: no such help topic: nonexistingtopicthatwillneverexisteverever
1280 (try "hg help --keyword nonexistingtopicthatwillneverexisteverever")
1282 (try "hg help --keyword nonexistingtopicthatwillneverexisteverever")
1281 [255]
1283 [255]
1282
1284
1283 Test unfound keyword
1285 Test unfound keyword
1284
1286
1285 $ hg help --keyword nonexistingwordthatwillneverexisteverever
1287 $ hg help --keyword nonexistingwordthatwillneverexisteverever
1286 abort: no matches
1288 abort: no matches
1287 (try "hg help" for a list of topics)
1289 (try "hg help" for a list of topics)
1288 [255]
1290 [255]
1289
1291
1290 Test omit indicating for help
1292 Test omit indicating for help
1291
1293
1292 $ cat > addverboseitems.py <<EOF
1294 $ cat > addverboseitems.py <<EOF
1293 > '''extension to test omit indicating.
1295 > '''extension to test omit indicating.
1294 >
1296 >
1295 > This paragraph is never omitted (for extension)
1297 > This paragraph is never omitted (for extension)
1296 >
1298 >
1297 > .. container:: verbose
1299 > .. container:: verbose
1298 >
1300 >
1299 > This paragraph is omitted,
1301 > This paragraph is omitted,
1300 > if :hg:\`help\` is invoked without \`\`-v\`\` (for extension)
1302 > if :hg:\`help\` is invoked without \`\`-v\`\` (for extension)
1301 >
1303 >
1302 > This paragraph is never omitted, too (for extension)
1304 > This paragraph is never omitted, too (for extension)
1303 > '''
1305 > '''
1304 >
1306 >
1305 > from mercurial import help, commands
1307 > from mercurial import help, commands
1306 > testtopic = """This paragraph is never omitted (for topic).
1308 > testtopic = """This paragraph is never omitted (for topic).
1307 >
1309 >
1308 > .. container:: verbose
1310 > .. container:: verbose
1309 >
1311 >
1310 > This paragraph is omitted,
1312 > This paragraph is omitted,
1311 > if :hg:\`help\` is invoked without \`\`-v\`\` (for topic)
1313 > if :hg:\`help\` is invoked without \`\`-v\`\` (for topic)
1312 >
1314 >
1313 > This paragraph is never omitted, too (for topic)
1315 > This paragraph is never omitted, too (for topic)
1314 > """
1316 > """
1315 > def extsetup(ui):
1317 > def extsetup(ui):
1316 > help.helptable.append((["topic-containing-verbose"],
1318 > help.helptable.append((["topic-containing-verbose"],
1317 > "This is the topic to test omit indicating.",
1319 > "This is the topic to test omit indicating.",
1318 > lambda ui: testtopic))
1320 > lambda ui: testtopic))
1319 > EOF
1321 > EOF
1320 $ echo '[extensions]' >> $HGRCPATH
1322 $ echo '[extensions]' >> $HGRCPATH
1321 $ echo "addverboseitems = `pwd`/addverboseitems.py" >> $HGRCPATH
1323 $ echo "addverboseitems = `pwd`/addverboseitems.py" >> $HGRCPATH
1322 $ hg help addverboseitems
1324 $ hg help addverboseitems
1323 addverboseitems extension - extension to test omit indicating.
1325 addverboseitems extension - extension to test omit indicating.
1324
1326
1325 This paragraph is never omitted (for extension)
1327 This paragraph is never omitted (for extension)
1326
1328
1327 This paragraph is never omitted, too (for extension)
1329 This paragraph is never omitted, too (for extension)
1328
1330
1329 (some details hidden, use --verbose to show complete help)
1331 (some details hidden, use --verbose to show complete help)
1330
1332
1331 no commands defined
1333 no commands defined
1332 $ hg help -v addverboseitems
1334 $ hg help -v addverboseitems
1333 addverboseitems extension - extension to test omit indicating.
1335 addverboseitems extension - extension to test omit indicating.
1334
1336
1335 This paragraph is never omitted (for extension)
1337 This paragraph is never omitted (for extension)
1336
1338
1337 This paragraph is omitted, if "hg help" is invoked without "-v" (for
1339 This paragraph is omitted, if "hg help" is invoked without "-v" (for
1338 extension)
1340 extension)
1339
1341
1340 This paragraph is never omitted, too (for extension)
1342 This paragraph is never omitted, too (for extension)
1341
1343
1342 no commands defined
1344 no commands defined
1343 $ hg help topic-containing-verbose
1345 $ hg help topic-containing-verbose
1344 This is the topic to test omit indicating.
1346 This is the topic to test omit indicating.
1345 """"""""""""""""""""""""""""""""""""""""""
1347 """"""""""""""""""""""""""""""""""""""""""
1346
1348
1347 This paragraph is never omitted (for topic).
1349 This paragraph is never omitted (for topic).
1348
1350
1349 This paragraph is never omitted, too (for topic)
1351 This paragraph is never omitted, too (for topic)
1350
1352
1351 (some details hidden, use --verbose to show complete help)
1353 (some details hidden, use --verbose to show complete help)
1352 $ hg help -v topic-containing-verbose
1354 $ hg help -v topic-containing-verbose
1353 This is the topic to test omit indicating.
1355 This is the topic to test omit indicating.
1354 """"""""""""""""""""""""""""""""""""""""""
1356 """"""""""""""""""""""""""""""""""""""""""
1355
1357
1356 This paragraph is never omitted (for topic).
1358 This paragraph is never omitted (for topic).
1357
1359
1358 This paragraph is omitted, if "hg help" is invoked without "-v" (for
1360 This paragraph is omitted, if "hg help" is invoked without "-v" (for
1359 topic)
1361 topic)
1360
1362
1361 This paragraph is never omitted, too (for topic)
1363 This paragraph is never omitted, too (for topic)
1362
1364
1363 Test section lookup
1365 Test section lookup
1364
1366
1365 $ hg help revset.merge
1367 $ hg help revset.merge
1366 "merge()"
1368 "merge()"
1367 Changeset is a merge changeset.
1369 Changeset is a merge changeset.
1368
1370
1369 $ hg help glossary.dag
1371 $ hg help glossary.dag
1370 DAG
1372 DAG
1371 The repository of changesets of a distributed version control system
1373 The repository of changesets of a distributed version control system
1372 (DVCS) can be described as a directed acyclic graph (DAG), consisting
1374 (DVCS) can be described as a directed acyclic graph (DAG), consisting
1373 of nodes and edges, where nodes correspond to changesets and edges
1375 of nodes and edges, where nodes correspond to changesets and edges
1374 imply a parent -> child relation. This graph can be visualized by
1376 imply a parent -> child relation. This graph can be visualized by
1375 graphical tools such as "hg log --graph". In Mercurial, the DAG is
1377 graphical tools such as "hg log --graph". In Mercurial, the DAG is
1376 limited by the requirement for children to have at most two parents.
1378 limited by the requirement for children to have at most two parents.
1377
1379
1378
1380
1379 $ hg help hgrc.paths
1381 $ hg help hgrc.paths
1380 "paths"
1382 "paths"
1381 -------
1383 -------
1382
1384
1383 Assigns symbolic names and behavior to repositories.
1385 Assigns symbolic names and behavior to repositories.
1384
1386
1385 Options are symbolic names defining the URL or directory that is the
1387 Options are symbolic names defining the URL or directory that is the
1386 location of the repository. Example:
1388 location of the repository. Example:
1387
1389
1388 [paths]
1390 [paths]
1389 my_server = https://example.com/my_repo
1391 my_server = https://example.com/my_repo
1390 local_path = /home/me/repo
1392 local_path = /home/me/repo
1391
1393
1392 These symbolic names can be used from the command line. To pull from
1394 These symbolic names can be used from the command line. To pull from
1393 "my_server": "hg pull my_server". To push to "local_path": "hg push
1395 "my_server": "hg pull my_server". To push to "local_path": "hg push
1394 local_path".
1396 local_path".
1395
1397
1396 Options containing colons (":") denote sub-options that can influence
1398 Options containing colons (":") denote sub-options that can influence
1397 behavior for that specific path. Example:
1399 behavior for that specific path. Example:
1398
1400
1399 [paths]
1401 [paths]
1400 my_server = https://example.com/my_path
1402 my_server = https://example.com/my_path
1401 my_server:pushurl = ssh://example.com/my_path
1403 my_server:pushurl = ssh://example.com/my_path
1402
1404
1403 The following sub-options can be defined:
1405 The following sub-options can be defined:
1404
1406
1405 "pushurl"
1407 "pushurl"
1406 The URL to use for push operations. If not defined, the location
1408 The URL to use for push operations. If not defined, the location
1407 defined by the path's main entry is used.
1409 defined by the path's main entry is used.
1408
1410
1409 The following special named paths exist:
1411 The following special named paths exist:
1410
1412
1411 "default"
1413 "default"
1412 The URL or directory to use when no source or remote is specified.
1414 The URL or directory to use when no source or remote is specified.
1413
1415
1414 "hg clone" will automatically define this path to the location the
1416 "hg clone" will automatically define this path to the location the
1415 repository was cloned from.
1417 repository was cloned from.
1416
1418
1417 "default-push"
1419 "default-push"
1418 (deprecated) The URL or directory for the default "hg push" location.
1420 (deprecated) The URL or directory for the default "hg push" location.
1419 "default:pushurl" should be used instead.
1421 "default:pushurl" should be used instead.
1420
1422
1421 $ hg help glossary.mcguffin
1423 $ hg help glossary.mcguffin
1422 abort: help section not found
1424 abort: help section not found
1423 [255]
1425 [255]
1424
1426
1425 $ hg help glossary.mc.guffin
1427 $ hg help glossary.mc.guffin
1426 abort: help section not found
1428 abort: help section not found
1427 [255]
1429 [255]
1428
1430
1429 $ hg help template.files
1431 $ hg help template.files
1430 files List of strings. All files modified, added, or removed by
1432 files List of strings. All files modified, added, or removed by
1431 this changeset.
1433 this changeset.
1432
1434
1433 Test dynamic list of merge tools only shows up once
1435 Test dynamic list of merge tools only shows up once
1434 $ hg help merge-tools
1436 $ hg help merge-tools
1435 Merge Tools
1437 Merge Tools
1436 """""""""""
1438 """""""""""
1437
1439
1438 To merge files Mercurial uses merge tools.
1440 To merge files Mercurial uses merge tools.
1439
1441
1440 A merge tool combines two different versions of a file into a merged file.
1442 A merge tool combines two different versions of a file into a merged file.
1441 Merge tools are given the two files and the greatest common ancestor of
1443 Merge tools are given the two files and the greatest common ancestor of
1442 the two file versions, so they can determine the changes made on both
1444 the two file versions, so they can determine the changes made on both
1443 branches.
1445 branches.
1444
1446
1445 Merge tools are used both for "hg resolve", "hg merge", "hg update", "hg
1447 Merge tools are used both for "hg resolve", "hg merge", "hg update", "hg
1446 backout" and in several extensions.
1448 backout" and in several extensions.
1447
1449
1448 Usually, the merge tool tries to automatically reconcile the files by
1450 Usually, the merge tool tries to automatically reconcile the files by
1449 combining all non-overlapping changes that occurred separately in the two
1451 combining all non-overlapping changes that occurred separately in the two
1450 different evolutions of the same initial base file. Furthermore, some
1452 different evolutions of the same initial base file. Furthermore, some
1451 interactive merge programs make it easier to manually resolve conflicting
1453 interactive merge programs make it easier to manually resolve conflicting
1452 merges, either in a graphical way, or by inserting some conflict markers.
1454 merges, either in a graphical way, or by inserting some conflict markers.
1453 Mercurial does not include any interactive merge programs but relies on
1455 Mercurial does not include any interactive merge programs but relies on
1454 external tools for that.
1456 external tools for that.
1455
1457
1456 Available merge tools
1458 Available merge tools
1457 =====================
1459 =====================
1458
1460
1459 External merge tools and their properties are configured in the merge-
1461 External merge tools and their properties are configured in the merge-
1460 tools configuration section - see hgrc(5) - but they can often just be
1462 tools configuration section - see hgrc(5) - but they can often just be
1461 named by their executable.
1463 named by their executable.
1462
1464
1463 A merge tool is generally usable if its executable can be found on the
1465 A merge tool is generally usable if its executable can be found on the
1464 system and if it can handle the merge. The executable is found if it is an
1466 system and if it can handle the merge. The executable is found if it is an
1465 absolute or relative executable path or the name of an application in the
1467 absolute or relative executable path or the name of an application in the
1466 executable search path. The tool is assumed to be able to handle the merge
1468 executable search path. The tool is assumed to be able to handle the merge
1467 if it can handle symlinks if the file is a symlink, if it can handle
1469 if it can handle symlinks if the file is a symlink, if it can handle
1468 binary files if the file is binary, and if a GUI is available if the tool
1470 binary files if the file is binary, and if a GUI is available if the tool
1469 requires a GUI.
1471 requires a GUI.
1470
1472
1471 There are some internal merge tools which can be used. The internal merge
1473 There are some internal merge tools which can be used. The internal merge
1472 tools are:
1474 tools are:
1473
1475
1474 ":dump"
1476 ":dump"
1475 Creates three versions of the files to merge, containing the contents of
1477 Creates three versions of the files to merge, containing the contents of
1476 local, other and base. These files can then be used to perform a merge
1478 local, other and base. These files can then be used to perform a merge
1477 manually. If the file to be merged is named "a.txt", these files will
1479 manually. If the file to be merged is named "a.txt", these files will
1478 accordingly be named "a.txt.local", "a.txt.other" and "a.txt.base" and
1480 accordingly be named "a.txt.local", "a.txt.other" and "a.txt.base" and
1479 they will be placed in the same directory as "a.txt".
1481 they will be placed in the same directory as "a.txt".
1480
1482
1481 ":fail"
1483 ":fail"
1482 Rather than attempting to merge files that were modified on both
1484 Rather than attempting to merge files that were modified on both
1483 branches, it marks them as unresolved. The resolve command must be used
1485 branches, it marks them as unresolved. The resolve command must be used
1484 to resolve these conflicts.
1486 to resolve these conflicts.
1485
1487
1486 ":local"
1488 ":local"
1487 Uses the local version of files as the merged version.
1489 Uses the local version of files as the merged version.
1488
1490
1489 ":merge"
1491 ":merge"
1490 Uses the internal non-interactive simple merge algorithm for merging
1492 Uses the internal non-interactive simple merge algorithm for merging
1491 files. It will fail if there are any conflicts and leave markers in the
1493 files. It will fail if there are any conflicts and leave markers in the
1492 partially merged file. Markers will have two sections, one for each side
1494 partially merged file. Markers will have two sections, one for each side
1493 of merge.
1495 of merge.
1494
1496
1495 ":merge-local"
1497 ":merge-local"
1496 Like :merge, but resolve all conflicts non-interactively in favor of the
1498 Like :merge, but resolve all conflicts non-interactively in favor of the
1497 local changes.
1499 local changes.
1498
1500
1499 ":merge-other"
1501 ":merge-other"
1500 Like :merge, but resolve all conflicts non-interactively in favor of the
1502 Like :merge, but resolve all conflicts non-interactively in favor of the
1501 other changes.
1503 other changes.
1502
1504
1503 ":merge3"
1505 ":merge3"
1504 Uses the internal non-interactive simple merge algorithm for merging
1506 Uses the internal non-interactive simple merge algorithm for merging
1505 files. It will fail if there are any conflicts and leave markers in the
1507 files. It will fail if there are any conflicts and leave markers in the
1506 partially merged file. Marker will have three sections, one from each
1508 partially merged file. Marker will have three sections, one from each
1507 side of the merge and one for the base content.
1509 side of the merge and one for the base content.
1508
1510
1509 ":other"
1511 ":other"
1510 Uses the other version of files as the merged version.
1512 Uses the other version of files as the merged version.
1511
1513
1512 ":prompt"
1514 ":prompt"
1513 Asks the user which of the local or the other version to keep as the
1515 Asks the user which of the local or the other version to keep as the
1514 merged version.
1516 merged version.
1515
1517
1516 ":tagmerge"
1518 ":tagmerge"
1517 Uses the internal tag merge algorithm (experimental).
1519 Uses the internal tag merge algorithm (experimental).
1518
1520
1519 ":union"
1521 ":union"
1520 Uses the internal non-interactive simple merge algorithm for merging
1522 Uses the internal non-interactive simple merge algorithm for merging
1521 files. It will use both left and right sides for conflict regions. No
1523 files. It will use both left and right sides for conflict regions. No
1522 markers are inserted.
1524 markers are inserted.
1523
1525
1524 Internal tools are always available and do not require a GUI but will by
1526 Internal tools are always available and do not require a GUI but will by
1525 default not handle symlinks or binary files.
1527 default not handle symlinks or binary files.
1526
1528
1527 Choosing a merge tool
1529 Choosing a merge tool
1528 =====================
1530 =====================
1529
1531
1530 Mercurial uses these rules when deciding which merge tool to use:
1532 Mercurial uses these rules when deciding which merge tool to use:
1531
1533
1532 1. If a tool has been specified with the --tool option to merge or
1534 1. If a tool has been specified with the --tool option to merge or
1533 resolve, it is used. If it is the name of a tool in the merge-tools
1535 resolve, it is used. If it is the name of a tool in the merge-tools
1534 configuration, its configuration is used. Otherwise the specified tool
1536 configuration, its configuration is used. Otherwise the specified tool
1535 must be executable by the shell.
1537 must be executable by the shell.
1536 2. If the "HGMERGE" environment variable is present, its value is used and
1538 2. If the "HGMERGE" environment variable is present, its value is used and
1537 must be executable by the shell.
1539 must be executable by the shell.
1538 3. If the filename of the file to be merged matches any of the patterns in
1540 3. If the filename of the file to be merged matches any of the patterns in
1539 the merge-patterns configuration section, the first usable merge tool
1541 the merge-patterns configuration section, the first usable merge tool
1540 corresponding to a matching pattern is used. Here, binary capabilities
1542 corresponding to a matching pattern is used. Here, binary capabilities
1541 of the merge tool are not considered.
1543 of the merge tool are not considered.
1542 4. If ui.merge is set it will be considered next. If the value is not the
1544 4. If ui.merge is set it will be considered next. If the value is not the
1543 name of a configured tool, the specified value is used and must be
1545 name of a configured tool, the specified value is used and must be
1544 executable by the shell. Otherwise the named tool is used if it is
1546 executable by the shell. Otherwise the named tool is used if it is
1545 usable.
1547 usable.
1546 5. If any usable merge tools are present in the merge-tools configuration
1548 5. If any usable merge tools are present in the merge-tools configuration
1547 section, the one with the highest priority is used.
1549 section, the one with the highest priority is used.
1548 6. If a program named "hgmerge" can be found on the system, it is used -
1550 6. If a program named "hgmerge" can be found on the system, it is used -
1549 but it will by default not be used for symlinks and binary files.
1551 but it will by default not be used for symlinks and binary files.
1550 7. If the file to be merged is not binary and is not a symlink, then
1552 7. If the file to be merged is not binary and is not a symlink, then
1551 internal ":merge" is used.
1553 internal ":merge" is used.
1552 8. The merge of the file fails and must be resolved before commit.
1554 8. The merge of the file fails and must be resolved before commit.
1553
1555
1554 Note:
1556 Note:
1555 After selecting a merge program, Mercurial will by default attempt to
1557 After selecting a merge program, Mercurial will by default attempt to
1556 merge the files using a simple merge algorithm first. Only if it
1558 merge the files using a simple merge algorithm first. Only if it
1557 doesn't succeed because of conflicting changes Mercurial will actually
1559 doesn't succeed because of conflicting changes Mercurial will actually
1558 execute the merge program. Whether to use the simple merge algorithm
1560 execute the merge program. Whether to use the simple merge algorithm
1559 first can be controlled by the premerge setting of the merge tool.
1561 first can be controlled by the premerge setting of the merge tool.
1560 Premerge is enabled by default unless the file is binary or a symlink.
1562 Premerge is enabled by default unless the file is binary or a symlink.
1561
1563
1562 See the merge-tools and ui sections of hgrc(5) for details on the
1564 See the merge-tools and ui sections of hgrc(5) for details on the
1563 configuration of merge tools.
1565 configuration of merge tools.
1564
1566
1565 Test usage of section marks in help documents
1567 Test usage of section marks in help documents
1566
1568
1567 $ cd "$TESTDIR"/../doc
1569 $ cd "$TESTDIR"/../doc
1568 $ python check-seclevel.py
1570 $ python check-seclevel.py
1569 $ cd $TESTTMP
1571 $ cd $TESTTMP
1570
1572
1571 #if serve
1573 #if serve
1572
1574
1573 Test the help pages in hgweb.
1575 Test the help pages in hgweb.
1574
1576
1575 Dish up an empty repo; serve it cold.
1577 Dish up an empty repo; serve it cold.
1576
1578
1577 $ hg init "$TESTTMP/test"
1579 $ hg init "$TESTTMP/test"
1578 $ hg serve -R "$TESTTMP/test" -n test -p $HGPORT -d --pid-file=hg.pid
1580 $ hg serve -R "$TESTTMP/test" -n test -p $HGPORT -d --pid-file=hg.pid
1579 $ cat hg.pid >> $DAEMON_PIDS
1581 $ cat hg.pid >> $DAEMON_PIDS
1580
1582
1581 $ get-with-headers.py 127.0.0.1:$HGPORT "help"
1583 $ get-with-headers.py 127.0.0.1:$HGPORT "help"
1582 200 Script output follows
1584 200 Script output follows
1583
1585
1584 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
1586 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
1585 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
1587 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
1586 <head>
1588 <head>
1587 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1589 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1588 <meta name="robots" content="index, nofollow" />
1590 <meta name="robots" content="index, nofollow" />
1589 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1591 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1590 <script type="text/javascript" src="/static/mercurial.js"></script>
1592 <script type="text/javascript" src="/static/mercurial.js"></script>
1591
1593
1592 <title>Help: Index</title>
1594 <title>Help: Index</title>
1593 </head>
1595 </head>
1594 <body>
1596 <body>
1595
1597
1596 <div class="container">
1598 <div class="container">
1597 <div class="menu">
1599 <div class="menu">
1598 <div class="logo">
1600 <div class="logo">
1599 <a href="https://mercurial-scm.org/">
1601 <a href="https://mercurial-scm.org/">
1600 <img src="/static/hglogo.png" alt="mercurial" /></a>
1602 <img src="/static/hglogo.png" alt="mercurial" /></a>
1601 </div>
1603 </div>
1602 <ul>
1604 <ul>
1603 <li><a href="/shortlog">log</a></li>
1605 <li><a href="/shortlog">log</a></li>
1604 <li><a href="/graph">graph</a></li>
1606 <li><a href="/graph">graph</a></li>
1605 <li><a href="/tags">tags</a></li>
1607 <li><a href="/tags">tags</a></li>
1606 <li><a href="/bookmarks">bookmarks</a></li>
1608 <li><a href="/bookmarks">bookmarks</a></li>
1607 <li><a href="/branches">branches</a></li>
1609 <li><a href="/branches">branches</a></li>
1608 </ul>
1610 </ul>
1609 <ul>
1611 <ul>
1610 <li class="active">help</li>
1612 <li class="active">help</li>
1611 </ul>
1613 </ul>
1612 </div>
1614 </div>
1613
1615
1614 <div class="main">
1616 <div class="main">
1615 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
1617 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
1616 <form class="search" action="/log">
1618 <form class="search" action="/log">
1617
1619
1618 <p><input name="rev" id="search1" type="text" size="30" /></p>
1620 <p><input name="rev" id="search1" type="text" size="30" /></p>
1619 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
1621 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
1620 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
1622 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
1621 </form>
1623 </form>
1622 <table class="bigtable">
1624 <table class="bigtable">
1623 <tr><td colspan="2"><h2><a name="main" href="#topics">Topics</a></h2></td></tr>
1625 <tr><td colspan="2"><h2><a name="main" href="#topics">Topics</a></h2></td></tr>
1624
1626
1625 <tr><td>
1627 <tr><td>
1626 <a href="/help/config">
1628 <a href="/help/config">
1627 config
1629 config
1628 </a>
1630 </a>
1629 </td><td>
1631 </td><td>
1630 Configuration Files
1632 Configuration Files
1631 </td></tr>
1633 </td></tr>
1632 <tr><td>
1634 <tr><td>
1633 <a href="/help/dates">
1635 <a href="/help/dates">
1634 dates
1636 dates
1635 </a>
1637 </a>
1636 </td><td>
1638 </td><td>
1637 Date Formats
1639 Date Formats
1638 </td></tr>
1640 </td></tr>
1639 <tr><td>
1641 <tr><td>
1640 <a href="/help/diffs">
1642 <a href="/help/diffs">
1641 diffs
1643 diffs
1642 </a>
1644 </a>
1643 </td><td>
1645 </td><td>
1644 Diff Formats
1646 Diff Formats
1645 </td></tr>
1647 </td></tr>
1646 <tr><td>
1648 <tr><td>
1647 <a href="/help/environment">
1649 <a href="/help/environment">
1648 environment
1650 environment
1649 </a>
1651 </a>
1650 </td><td>
1652 </td><td>
1651 Environment Variables
1653 Environment Variables
1652 </td></tr>
1654 </td></tr>
1653 <tr><td>
1655 <tr><td>
1654 <a href="/help/extensions">
1656 <a href="/help/extensions">
1655 extensions
1657 extensions
1656 </a>
1658 </a>
1657 </td><td>
1659 </td><td>
1658 Using Additional Features
1660 Using Additional Features
1659 </td></tr>
1661 </td></tr>
1660 <tr><td>
1662 <tr><td>
1661 <a href="/help/filesets">
1663 <a href="/help/filesets">
1662 filesets
1664 filesets
1663 </a>
1665 </a>
1664 </td><td>
1666 </td><td>
1665 Specifying File Sets
1667 Specifying File Sets
1666 </td></tr>
1668 </td></tr>
1667 <tr><td>
1669 <tr><td>
1668 <a href="/help/glossary">
1670 <a href="/help/glossary">
1669 glossary
1671 glossary
1670 </a>
1672 </a>
1671 </td><td>
1673 </td><td>
1672 Glossary
1674 Glossary
1673 </td></tr>
1675 </td></tr>
1674 <tr><td>
1676 <tr><td>
1675 <a href="/help/hgignore">
1677 <a href="/help/hgignore">
1676 hgignore
1678 hgignore
1677 </a>
1679 </a>
1678 </td><td>
1680 </td><td>
1679 Syntax for Mercurial Ignore Files
1681 Syntax for Mercurial Ignore Files
1680 </td></tr>
1682 </td></tr>
1681 <tr><td>
1683 <tr><td>
1682 <a href="/help/hgweb">
1684 <a href="/help/hgweb">
1683 hgweb
1685 hgweb
1684 </a>
1686 </a>
1685 </td><td>
1687 </td><td>
1686 Configuring hgweb
1688 Configuring hgweb
1687 </td></tr>
1689 </td></tr>
1688 <tr><td>
1690 <tr><td>
1689 <a href="/help/internals">
1691 <a href="/help/internals">
1690 internals
1692 internals
1691 </a>
1693 </a>
1692 </td><td>
1694 </td><td>
1693 Technical implementation topics
1695 Technical implementation topics
1694 </td></tr>
1696 </td></tr>
1695 <tr><td>
1697 <tr><td>
1696 <a href="/help/merge-tools">
1698 <a href="/help/merge-tools">
1697 merge-tools
1699 merge-tools
1698 </a>
1700 </a>
1699 </td><td>
1701 </td><td>
1700 Merge Tools
1702 Merge Tools
1701 </td></tr>
1703 </td></tr>
1702 <tr><td>
1704 <tr><td>
1703 <a href="/help/multirevs">
1705 <a href="/help/multirevs">
1704 multirevs
1706 multirevs
1705 </a>
1707 </a>
1706 </td><td>
1708 </td><td>
1707 Specifying Multiple Revisions
1709 Specifying Multiple Revisions
1708 </td></tr>
1710 </td></tr>
1709 <tr><td>
1711 <tr><td>
1710 <a href="/help/patterns">
1712 <a href="/help/patterns">
1711 patterns
1713 patterns
1712 </a>
1714 </a>
1713 </td><td>
1715 </td><td>
1714 File Name Patterns
1716 File Name Patterns
1715 </td></tr>
1717 </td></tr>
1716 <tr><td>
1718 <tr><td>
1717 <a href="/help/phases">
1719 <a href="/help/phases">
1718 phases
1720 phases
1719 </a>
1721 </a>
1720 </td><td>
1722 </td><td>
1721 Working with Phases
1723 Working with Phases
1722 </td></tr>
1724 </td></tr>
1723 <tr><td>
1725 <tr><td>
1724 <a href="/help/revisions">
1726 <a href="/help/revisions">
1725 revisions
1727 revisions
1726 </a>
1728 </a>
1727 </td><td>
1729 </td><td>
1728 Specifying Single Revisions
1730 Specifying Single Revisions
1729 </td></tr>
1731 </td></tr>
1730 <tr><td>
1732 <tr><td>
1731 <a href="/help/revsets">
1733 <a href="/help/revsets">
1732 revsets
1734 revsets
1733 </a>
1735 </a>
1734 </td><td>
1736 </td><td>
1735 Specifying Revision Sets
1737 Specifying Revision Sets
1736 </td></tr>
1738 </td></tr>
1737 <tr><td>
1739 <tr><td>
1738 <a href="/help/scripting">
1740 <a href="/help/scripting">
1739 scripting
1741 scripting
1740 </a>
1742 </a>
1741 </td><td>
1743 </td><td>
1742 Using Mercurial from scripts and automation
1744 Using Mercurial from scripts and automation
1743 </td></tr>
1745 </td></tr>
1744 <tr><td>
1746 <tr><td>
1745 <a href="/help/subrepos">
1747 <a href="/help/subrepos">
1746 subrepos
1748 subrepos
1747 </a>
1749 </a>
1748 </td><td>
1750 </td><td>
1749 Subrepositories
1751 Subrepositories
1750 </td></tr>
1752 </td></tr>
1751 <tr><td>
1753 <tr><td>
1752 <a href="/help/templating">
1754 <a href="/help/templating">
1753 templating
1755 templating
1754 </a>
1756 </a>
1755 </td><td>
1757 </td><td>
1756 Template Usage
1758 Template Usage
1757 </td></tr>
1759 </td></tr>
1758 <tr><td>
1760 <tr><td>
1759 <a href="/help/urls">
1761 <a href="/help/urls">
1760 urls
1762 urls
1761 </a>
1763 </a>
1762 </td><td>
1764 </td><td>
1763 URL Paths
1765 URL Paths
1764 </td></tr>
1766 </td></tr>
1765 <tr><td>
1767 <tr><td>
1766 <a href="/help/topic-containing-verbose">
1768 <a href="/help/topic-containing-verbose">
1767 topic-containing-verbose
1769 topic-containing-verbose
1768 </a>
1770 </a>
1769 </td><td>
1771 </td><td>
1770 This is the topic to test omit indicating.
1772 This is the topic to test omit indicating.
1771 </td></tr>
1773 </td></tr>
1772
1774
1773 <tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
1775 <tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
1774
1776
1775 <tr><td>
1777 <tr><td>
1776 <a href="/help/add">
1778 <a href="/help/add">
1777 add
1779 add
1778 </a>
1780 </a>
1779 </td><td>
1781 </td><td>
1780 add the specified files on the next commit
1782 add the specified files on the next commit
1781 </td></tr>
1783 </td></tr>
1782 <tr><td>
1784 <tr><td>
1783 <a href="/help/annotate">
1785 <a href="/help/annotate">
1784 annotate
1786 annotate
1785 </a>
1787 </a>
1786 </td><td>
1788 </td><td>
1787 show changeset information by line for each file
1789 show changeset information by line for each file
1788 </td></tr>
1790 </td></tr>
1789 <tr><td>
1791 <tr><td>
1790 <a href="/help/clone">
1792 <a href="/help/clone">
1791 clone
1793 clone
1792 </a>
1794 </a>
1793 </td><td>
1795 </td><td>
1794 make a copy of an existing repository
1796 make a copy of an existing repository
1795 </td></tr>
1797 </td></tr>
1796 <tr><td>
1798 <tr><td>
1797 <a href="/help/commit">
1799 <a href="/help/commit">
1798 commit
1800 commit
1799 </a>
1801 </a>
1800 </td><td>
1802 </td><td>
1801 commit the specified files or all outstanding changes
1803 commit the specified files or all outstanding changes
1802 </td></tr>
1804 </td></tr>
1803 <tr><td>
1805 <tr><td>
1804 <a href="/help/diff">
1806 <a href="/help/diff">
1805 diff
1807 diff
1806 </a>
1808 </a>
1807 </td><td>
1809 </td><td>
1808 diff repository (or selected files)
1810 diff repository (or selected files)
1809 </td></tr>
1811 </td></tr>
1810 <tr><td>
1812 <tr><td>
1811 <a href="/help/export">
1813 <a href="/help/export">
1812 export
1814 export
1813 </a>
1815 </a>
1814 </td><td>
1816 </td><td>
1815 dump the header and diffs for one or more changesets
1817 dump the header and diffs for one or more changesets
1816 </td></tr>
1818 </td></tr>
1817 <tr><td>
1819 <tr><td>
1818 <a href="/help/forget">
1820 <a href="/help/forget">
1819 forget
1821 forget
1820 </a>
1822 </a>
1821 </td><td>
1823 </td><td>
1822 forget the specified files on the next commit
1824 forget the specified files on the next commit
1823 </td></tr>
1825 </td></tr>
1824 <tr><td>
1826 <tr><td>
1825 <a href="/help/init">
1827 <a href="/help/init">
1826 init
1828 init
1827 </a>
1829 </a>
1828 </td><td>
1830 </td><td>
1829 create a new repository in the given directory
1831 create a new repository in the given directory
1830 </td></tr>
1832 </td></tr>
1831 <tr><td>
1833 <tr><td>
1832 <a href="/help/log">
1834 <a href="/help/log">
1833 log
1835 log
1834 </a>
1836 </a>
1835 </td><td>
1837 </td><td>
1836 show revision history of entire repository or files
1838 show revision history of entire repository or files
1837 </td></tr>
1839 </td></tr>
1838 <tr><td>
1840 <tr><td>
1839 <a href="/help/merge">
1841 <a href="/help/merge">
1840 merge
1842 merge
1841 </a>
1843 </a>
1842 </td><td>
1844 </td><td>
1843 merge another revision into working directory
1845 merge another revision into working directory
1844 </td></tr>
1846 </td></tr>
1845 <tr><td>
1847 <tr><td>
1846 <a href="/help/pull">
1848 <a href="/help/pull">
1847 pull
1849 pull
1848 </a>
1850 </a>
1849 </td><td>
1851 </td><td>
1850 pull changes from the specified source
1852 pull changes from the specified source
1851 </td></tr>
1853 </td></tr>
1852 <tr><td>
1854 <tr><td>
1853 <a href="/help/push">
1855 <a href="/help/push">
1854 push
1856 push
1855 </a>
1857 </a>
1856 </td><td>
1858 </td><td>
1857 push changes to the specified destination
1859 push changes to the specified destination
1858 </td></tr>
1860 </td></tr>
1859 <tr><td>
1861 <tr><td>
1860 <a href="/help/remove">
1862 <a href="/help/remove">
1861 remove
1863 remove
1862 </a>
1864 </a>
1863 </td><td>
1865 </td><td>
1864 remove the specified files on the next commit
1866 remove the specified files on the next commit
1865 </td></tr>
1867 </td></tr>
1866 <tr><td>
1868 <tr><td>
1867 <a href="/help/serve">
1869 <a href="/help/serve">
1868 serve
1870 serve
1869 </a>
1871 </a>
1870 </td><td>
1872 </td><td>
1871 start stand-alone webserver
1873 start stand-alone webserver
1872 </td></tr>
1874 </td></tr>
1873 <tr><td>
1875 <tr><td>
1874 <a href="/help/status">
1876 <a href="/help/status">
1875 status
1877 status
1876 </a>
1878 </a>
1877 </td><td>
1879 </td><td>
1878 show changed files in the working directory
1880 show changed files in the working directory
1879 </td></tr>
1881 </td></tr>
1880 <tr><td>
1882 <tr><td>
1881 <a href="/help/summary">
1883 <a href="/help/summary">
1882 summary
1884 summary
1883 </a>
1885 </a>
1884 </td><td>
1886 </td><td>
1885 summarize working directory state
1887 summarize working directory state
1886 </td></tr>
1888 </td></tr>
1887 <tr><td>
1889 <tr><td>
1888 <a href="/help/update">
1890 <a href="/help/update">
1889 update
1891 update
1890 </a>
1892 </a>
1891 </td><td>
1893 </td><td>
1892 update working directory (or switch revisions)
1894 update working directory (or switch revisions)
1893 </td></tr>
1895 </td></tr>
1894
1896
1895 <tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
1897 <tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
1896
1898
1897 <tr><td>
1899 <tr><td>
1898 <a href="/help/addremove">
1900 <a href="/help/addremove">
1899 addremove
1901 addremove
1900 </a>
1902 </a>
1901 </td><td>
1903 </td><td>
1902 add all new files, delete all missing files
1904 add all new files, delete all missing files
1903 </td></tr>
1905 </td></tr>
1904 <tr><td>
1906 <tr><td>
1905 <a href="/help/archive">
1907 <a href="/help/archive">
1906 archive
1908 archive
1907 </a>
1909 </a>
1908 </td><td>
1910 </td><td>
1909 create an unversioned archive of a repository revision
1911 create an unversioned archive of a repository revision
1910 </td></tr>
1912 </td></tr>
1911 <tr><td>
1913 <tr><td>
1912 <a href="/help/backout">
1914 <a href="/help/backout">
1913 backout
1915 backout
1914 </a>
1916 </a>
1915 </td><td>
1917 </td><td>
1916 reverse effect of earlier changeset
1918 reverse effect of earlier changeset
1917 </td></tr>
1919 </td></tr>
1918 <tr><td>
1920 <tr><td>
1919 <a href="/help/bisect">
1921 <a href="/help/bisect">
1920 bisect
1922 bisect
1921 </a>
1923 </a>
1922 </td><td>
1924 </td><td>
1923 subdivision search of changesets
1925 subdivision search of changesets
1924 </td></tr>
1926 </td></tr>
1925 <tr><td>
1927 <tr><td>
1926 <a href="/help/bookmarks">
1928 <a href="/help/bookmarks">
1927 bookmarks
1929 bookmarks
1928 </a>
1930 </a>
1929 </td><td>
1931 </td><td>
1930 create a new bookmark or list existing bookmarks
1932 create a new bookmark or list existing bookmarks
1931 </td></tr>
1933 </td></tr>
1932 <tr><td>
1934 <tr><td>
1933 <a href="/help/branch">
1935 <a href="/help/branch">
1934 branch
1936 branch
1935 </a>
1937 </a>
1936 </td><td>
1938 </td><td>
1937 set or show the current branch name
1939 set or show the current branch name
1938 </td></tr>
1940 </td></tr>
1939 <tr><td>
1941 <tr><td>
1940 <a href="/help/branches">
1942 <a href="/help/branches">
1941 branches
1943 branches
1942 </a>
1944 </a>
1943 </td><td>
1945 </td><td>
1944 list repository named branches
1946 list repository named branches
1945 </td></tr>
1947 </td></tr>
1946 <tr><td>
1948 <tr><td>
1947 <a href="/help/bundle">
1949 <a href="/help/bundle">
1948 bundle
1950 bundle
1949 </a>
1951 </a>
1950 </td><td>
1952 </td><td>
1951 create a changegroup file
1953 create a changegroup file
1952 </td></tr>
1954 </td></tr>
1953 <tr><td>
1955 <tr><td>
1954 <a href="/help/cat">
1956 <a href="/help/cat">
1955 cat
1957 cat
1956 </a>
1958 </a>
1957 </td><td>
1959 </td><td>
1958 output the current or given revision of files
1960 output the current or given revision of files
1959 </td></tr>
1961 </td></tr>
1960 <tr><td>
1962 <tr><td>
1961 <a href="/help/config">
1963 <a href="/help/config">
1962 config
1964 config
1963 </a>
1965 </a>
1964 </td><td>
1966 </td><td>
1965 show combined config settings from all hgrc files
1967 show combined config settings from all hgrc files
1966 </td></tr>
1968 </td></tr>
1967 <tr><td>
1969 <tr><td>
1968 <a href="/help/copy">
1970 <a href="/help/copy">
1969 copy
1971 copy
1970 </a>
1972 </a>
1971 </td><td>
1973 </td><td>
1972 mark files as copied for the next commit
1974 mark files as copied for the next commit
1973 </td></tr>
1975 </td></tr>
1974 <tr><td>
1976 <tr><td>
1975 <a href="/help/files">
1977 <a href="/help/files">
1976 files
1978 files
1977 </a>
1979 </a>
1978 </td><td>
1980 </td><td>
1979 list tracked files
1981 list tracked files
1980 </td></tr>
1982 </td></tr>
1981 <tr><td>
1983 <tr><td>
1982 <a href="/help/graft">
1984 <a href="/help/graft">
1983 graft
1985 graft
1984 </a>
1986 </a>
1985 </td><td>
1987 </td><td>
1986 copy changes from other branches onto the current branch
1988 copy changes from other branches onto the current branch
1987 </td></tr>
1989 </td></tr>
1988 <tr><td>
1990 <tr><td>
1989 <a href="/help/grep">
1991 <a href="/help/grep">
1990 grep
1992 grep
1991 </a>
1993 </a>
1992 </td><td>
1994 </td><td>
1993 search for a pattern in specified files and revisions
1995 search for a pattern in specified files and revisions
1994 </td></tr>
1996 </td></tr>
1995 <tr><td>
1997 <tr><td>
1996 <a href="/help/heads">
1998 <a href="/help/heads">
1997 heads
1999 heads
1998 </a>
2000 </a>
1999 </td><td>
2001 </td><td>
2000 show branch heads
2002 show branch heads
2001 </td></tr>
2003 </td></tr>
2002 <tr><td>
2004 <tr><td>
2003 <a href="/help/help">
2005 <a href="/help/help">
2004 help
2006 help
2005 </a>
2007 </a>
2006 </td><td>
2008 </td><td>
2007 show help for a given topic or a help overview
2009 show help for a given topic or a help overview
2008 </td></tr>
2010 </td></tr>
2009 <tr><td>
2011 <tr><td>
2010 <a href="/help/identify">
2012 <a href="/help/identify">
2011 identify
2013 identify
2012 </a>
2014 </a>
2013 </td><td>
2015 </td><td>
2014 identify the working directory or specified revision
2016 identify the working directory or specified revision
2015 </td></tr>
2017 </td></tr>
2016 <tr><td>
2018 <tr><td>
2017 <a href="/help/import">
2019 <a href="/help/import">
2018 import
2020 import
2019 </a>
2021 </a>
2020 </td><td>
2022 </td><td>
2021 import an ordered set of patches
2023 import an ordered set of patches
2022 </td></tr>
2024 </td></tr>
2023 <tr><td>
2025 <tr><td>
2024 <a href="/help/incoming">
2026 <a href="/help/incoming">
2025 incoming
2027 incoming
2026 </a>
2028 </a>
2027 </td><td>
2029 </td><td>
2028 show new changesets found in source
2030 show new changesets found in source
2029 </td></tr>
2031 </td></tr>
2030 <tr><td>
2032 <tr><td>
2031 <a href="/help/manifest">
2033 <a href="/help/manifest">
2032 manifest
2034 manifest
2033 </a>
2035 </a>
2034 </td><td>
2036 </td><td>
2035 output the current or given revision of the project manifest
2037 output the current or given revision of the project manifest
2036 </td></tr>
2038 </td></tr>
2037 <tr><td>
2039 <tr><td>
2038 <a href="/help/nohelp">
2040 <a href="/help/nohelp">
2039 nohelp
2041 nohelp
2040 </a>
2042 </a>
2041 </td><td>
2043 </td><td>
2042 (no help text available)
2044 (no help text available)
2043 </td></tr>
2045 </td></tr>
2044 <tr><td>
2046 <tr><td>
2045 <a href="/help/outgoing">
2047 <a href="/help/outgoing">
2046 outgoing
2048 outgoing
2047 </a>
2049 </a>
2048 </td><td>
2050 </td><td>
2049 show changesets not found in the destination
2051 show changesets not found in the destination
2050 </td></tr>
2052 </td></tr>
2051 <tr><td>
2053 <tr><td>
2052 <a href="/help/paths">
2054 <a href="/help/paths">
2053 paths
2055 paths
2054 </a>
2056 </a>
2055 </td><td>
2057 </td><td>
2056 show aliases for remote repositories
2058 show aliases for remote repositories
2057 </td></tr>
2059 </td></tr>
2058 <tr><td>
2060 <tr><td>
2059 <a href="/help/phase">
2061 <a href="/help/phase">
2060 phase
2062 phase
2061 </a>
2063 </a>
2062 </td><td>
2064 </td><td>
2063 set or show the current phase name
2065 set or show the current phase name
2064 </td></tr>
2066 </td></tr>
2065 <tr><td>
2067 <tr><td>
2066 <a href="/help/recover">
2068 <a href="/help/recover">
2067 recover
2069 recover
2068 </a>
2070 </a>
2069 </td><td>
2071 </td><td>
2070 roll back an interrupted transaction
2072 roll back an interrupted transaction
2071 </td></tr>
2073 </td></tr>
2072 <tr><td>
2074 <tr><td>
2073 <a href="/help/rename">
2075 <a href="/help/rename">
2074 rename
2076 rename
2075 </a>
2077 </a>
2076 </td><td>
2078 </td><td>
2077 rename files; equivalent of copy + remove
2079 rename files; equivalent of copy + remove
2078 </td></tr>
2080 </td></tr>
2079 <tr><td>
2081 <tr><td>
2080 <a href="/help/resolve">
2082 <a href="/help/resolve">
2081 resolve
2083 resolve
2082 </a>
2084 </a>
2083 </td><td>
2085 </td><td>
2084 redo merges or set/view the merge status of files
2086 redo merges or set/view the merge status of files
2085 </td></tr>
2087 </td></tr>
2086 <tr><td>
2088 <tr><td>
2087 <a href="/help/revert">
2089 <a href="/help/revert">
2088 revert
2090 revert
2089 </a>
2091 </a>
2090 </td><td>
2092 </td><td>
2091 restore files to their checkout state
2093 restore files to their checkout state
2092 </td></tr>
2094 </td></tr>
2093 <tr><td>
2095 <tr><td>
2094 <a href="/help/root">
2096 <a href="/help/root">
2095 root
2097 root
2096 </a>
2098 </a>
2097 </td><td>
2099 </td><td>
2098 print the root (top) of the current working directory
2100 print the root (top) of the current working directory
2099 </td></tr>
2101 </td></tr>
2100 <tr><td>
2102 <tr><td>
2101 <a href="/help/tag">
2103 <a href="/help/tag">
2102 tag
2104 tag
2103 </a>
2105 </a>
2104 </td><td>
2106 </td><td>
2105 add one or more tags for the current or given revision
2107 add one or more tags for the current or given revision
2106 </td></tr>
2108 </td></tr>
2107 <tr><td>
2109 <tr><td>
2108 <a href="/help/tags">
2110 <a href="/help/tags">
2109 tags
2111 tags
2110 </a>
2112 </a>
2111 </td><td>
2113 </td><td>
2112 list repository tags
2114 list repository tags
2113 </td></tr>
2115 </td></tr>
2114 <tr><td>
2116 <tr><td>
2115 <a href="/help/unbundle">
2117 <a href="/help/unbundle">
2116 unbundle
2118 unbundle
2117 </a>
2119 </a>
2118 </td><td>
2120 </td><td>
2119 apply one or more changegroup files
2121 apply one or more changegroup files
2120 </td></tr>
2122 </td></tr>
2121 <tr><td>
2123 <tr><td>
2122 <a href="/help/verify">
2124 <a href="/help/verify">
2123 verify
2125 verify
2124 </a>
2126 </a>
2125 </td><td>
2127 </td><td>
2126 verify the integrity of the repository
2128 verify the integrity of the repository
2127 </td></tr>
2129 </td></tr>
2128 <tr><td>
2130 <tr><td>
2129 <a href="/help/version">
2131 <a href="/help/version">
2130 version
2132 version
2131 </a>
2133 </a>
2132 </td><td>
2134 </td><td>
2133 output version and copyright information
2135 output version and copyright information
2134 </td></tr>
2136 </td></tr>
2135 </table>
2137 </table>
2136 </div>
2138 </div>
2137 </div>
2139 </div>
2138
2140
2139 <script type="text/javascript">process_dates()</script>
2141 <script type="text/javascript">process_dates()</script>
2140
2142
2141
2143
2142 </body>
2144 </body>
2143 </html>
2145 </html>
2144
2146
2145
2147
2146 $ get-with-headers.py 127.0.0.1:$HGPORT "help/add"
2148 $ get-with-headers.py 127.0.0.1:$HGPORT "help/add"
2147 200 Script output follows
2149 200 Script output follows
2148
2150
2149 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2151 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2150 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2152 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2151 <head>
2153 <head>
2152 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2154 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2153 <meta name="robots" content="index, nofollow" />
2155 <meta name="robots" content="index, nofollow" />
2154 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2156 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2155 <script type="text/javascript" src="/static/mercurial.js"></script>
2157 <script type="text/javascript" src="/static/mercurial.js"></script>
2156
2158
2157 <title>Help: add</title>
2159 <title>Help: add</title>
2158 </head>
2160 </head>
2159 <body>
2161 <body>
2160
2162
2161 <div class="container">
2163 <div class="container">
2162 <div class="menu">
2164 <div class="menu">
2163 <div class="logo">
2165 <div class="logo">
2164 <a href="https://mercurial-scm.org/">
2166 <a href="https://mercurial-scm.org/">
2165 <img src="/static/hglogo.png" alt="mercurial" /></a>
2167 <img src="/static/hglogo.png" alt="mercurial" /></a>
2166 </div>
2168 </div>
2167 <ul>
2169 <ul>
2168 <li><a href="/shortlog">log</a></li>
2170 <li><a href="/shortlog">log</a></li>
2169 <li><a href="/graph">graph</a></li>
2171 <li><a href="/graph">graph</a></li>
2170 <li><a href="/tags">tags</a></li>
2172 <li><a href="/tags">tags</a></li>
2171 <li><a href="/bookmarks">bookmarks</a></li>
2173 <li><a href="/bookmarks">bookmarks</a></li>
2172 <li><a href="/branches">branches</a></li>
2174 <li><a href="/branches">branches</a></li>
2173 </ul>
2175 </ul>
2174 <ul>
2176 <ul>
2175 <li class="active"><a href="/help">help</a></li>
2177 <li class="active"><a href="/help">help</a></li>
2176 </ul>
2178 </ul>
2177 </div>
2179 </div>
2178
2180
2179 <div class="main">
2181 <div class="main">
2180 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2182 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2181 <h3>Help: add</h3>
2183 <h3>Help: add</h3>
2182
2184
2183 <form class="search" action="/log">
2185 <form class="search" action="/log">
2184
2186
2185 <p><input name="rev" id="search1" type="text" size="30" /></p>
2187 <p><input name="rev" id="search1" type="text" size="30" /></p>
2186 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2188 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2187 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2189 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2188 </form>
2190 </form>
2189 <div id="doc">
2191 <div id="doc">
2190 <p>
2192 <p>
2191 hg add [OPTION]... [FILE]...
2193 hg add [OPTION]... [FILE]...
2192 </p>
2194 </p>
2193 <p>
2195 <p>
2194 add the specified files on the next commit
2196 add the specified files on the next commit
2195 </p>
2197 </p>
2196 <p>
2198 <p>
2197 Schedule files to be version controlled and added to the
2199 Schedule files to be version controlled and added to the
2198 repository.
2200 repository.
2199 </p>
2201 </p>
2200 <p>
2202 <p>
2201 The files will be added to the repository at the next commit. To
2203 The files will be added to the repository at the next commit. To
2202 undo an add before that, see &quot;hg forget&quot;.
2204 undo an add before that, see &quot;hg forget&quot;.
2203 </p>
2205 </p>
2204 <p>
2206 <p>
2205 If no names are given, add all files to the repository.
2207 If no names are given, add all files to the repository (except
2208 files matching &quot;.hgignore&quot;).
2206 </p>
2209 </p>
2207 <p>
2210 <p>
2208 Examples:
2211 Examples:
2209 </p>
2212 </p>
2210 <ul>
2213 <ul>
2211 <li> New (unknown) files are added automatically by &quot;hg add&quot;:
2214 <li> New (unknown) files are added automatically by &quot;hg add&quot;:
2212 <pre>
2215 <pre>
2213 \$ ls (re)
2216 \$ ls (re)
2214 foo.c
2217 foo.c
2215 \$ hg status (re)
2218 \$ hg status (re)
2216 ? foo.c
2219 ? foo.c
2217 \$ hg add (re)
2220 \$ hg add (re)
2218 adding foo.c
2221 adding foo.c
2219 \$ hg status (re)
2222 \$ hg status (re)
2220 A foo.c
2223 A foo.c
2221 </pre>
2224 </pre>
2222 <li> Specific files to be added can be specified:
2225 <li> Specific files to be added can be specified:
2223 <pre>
2226 <pre>
2224 \$ ls (re)
2227 \$ ls (re)
2225 bar.c foo.c
2228 bar.c foo.c
2226 \$ hg status (re)
2229 \$ hg status (re)
2227 ? bar.c
2230 ? bar.c
2228 ? foo.c
2231 ? foo.c
2229 \$ hg add bar.c (re)
2232 \$ hg add bar.c (re)
2230 \$ hg status (re)
2233 \$ hg status (re)
2231 A bar.c
2234 A bar.c
2232 ? foo.c
2235 ? foo.c
2233 </pre>
2236 </pre>
2234 </ul>
2237 </ul>
2235 <p>
2238 <p>
2236 Returns 0 if all files are successfully added.
2239 Returns 0 if all files are successfully added.
2237 </p>
2240 </p>
2238 <p>
2241 <p>
2239 options ([+] can be repeated):
2242 options ([+] can be repeated):
2240 </p>
2243 </p>
2241 <table>
2244 <table>
2242 <tr><td>-I</td>
2245 <tr><td>-I</td>
2243 <td>--include PATTERN [+]</td>
2246 <td>--include PATTERN [+]</td>
2244 <td>include names matching the given patterns</td></tr>
2247 <td>include names matching the given patterns</td></tr>
2245 <tr><td>-X</td>
2248 <tr><td>-X</td>
2246 <td>--exclude PATTERN [+]</td>
2249 <td>--exclude PATTERN [+]</td>
2247 <td>exclude names matching the given patterns</td></tr>
2250 <td>exclude names matching the given patterns</td></tr>
2248 <tr><td>-S</td>
2251 <tr><td>-S</td>
2249 <td>--subrepos</td>
2252 <td>--subrepos</td>
2250 <td>recurse into subrepositories</td></tr>
2253 <td>recurse into subrepositories</td></tr>
2251 <tr><td>-n</td>
2254 <tr><td>-n</td>
2252 <td>--dry-run</td>
2255 <td>--dry-run</td>
2253 <td>do not perform actions, just print output</td></tr>
2256 <td>do not perform actions, just print output</td></tr>
2254 </table>
2257 </table>
2255 <p>
2258 <p>
2256 global options ([+] can be repeated):
2259 global options ([+] can be repeated):
2257 </p>
2260 </p>
2258 <table>
2261 <table>
2259 <tr><td>-R</td>
2262 <tr><td>-R</td>
2260 <td>--repository REPO</td>
2263 <td>--repository REPO</td>
2261 <td>repository root directory or name of overlay bundle file</td></tr>
2264 <td>repository root directory or name of overlay bundle file</td></tr>
2262 <tr><td></td>
2265 <tr><td></td>
2263 <td>--cwd DIR</td>
2266 <td>--cwd DIR</td>
2264 <td>change working directory</td></tr>
2267 <td>change working directory</td></tr>
2265 <tr><td>-y</td>
2268 <tr><td>-y</td>
2266 <td>--noninteractive</td>
2269 <td>--noninteractive</td>
2267 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2270 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2268 <tr><td>-q</td>
2271 <tr><td>-q</td>
2269 <td>--quiet</td>
2272 <td>--quiet</td>
2270 <td>suppress output</td></tr>
2273 <td>suppress output</td></tr>
2271 <tr><td>-v</td>
2274 <tr><td>-v</td>
2272 <td>--verbose</td>
2275 <td>--verbose</td>
2273 <td>enable additional output</td></tr>
2276 <td>enable additional output</td></tr>
2274 <tr><td></td>
2277 <tr><td></td>
2275 <td>--config CONFIG [+]</td>
2278 <td>--config CONFIG [+]</td>
2276 <td>set/override config option (use 'section.name=value')</td></tr>
2279 <td>set/override config option (use 'section.name=value')</td></tr>
2277 <tr><td></td>
2280 <tr><td></td>
2278 <td>--debug</td>
2281 <td>--debug</td>
2279 <td>enable debugging output</td></tr>
2282 <td>enable debugging output</td></tr>
2280 <tr><td></td>
2283 <tr><td></td>
2281 <td>--debugger</td>
2284 <td>--debugger</td>
2282 <td>start debugger</td></tr>
2285 <td>start debugger</td></tr>
2283 <tr><td></td>
2286 <tr><td></td>
2284 <td>--encoding ENCODE</td>
2287 <td>--encoding ENCODE</td>
2285 <td>set the charset encoding (default: ascii)</td></tr>
2288 <td>set the charset encoding (default: ascii)</td></tr>
2286 <tr><td></td>
2289 <tr><td></td>
2287 <td>--encodingmode MODE</td>
2290 <td>--encodingmode MODE</td>
2288 <td>set the charset encoding mode (default: strict)</td></tr>
2291 <td>set the charset encoding mode (default: strict)</td></tr>
2289 <tr><td></td>
2292 <tr><td></td>
2290 <td>--traceback</td>
2293 <td>--traceback</td>
2291 <td>always print a traceback on exception</td></tr>
2294 <td>always print a traceback on exception</td></tr>
2292 <tr><td></td>
2295 <tr><td></td>
2293 <td>--time</td>
2296 <td>--time</td>
2294 <td>time how long the command takes</td></tr>
2297 <td>time how long the command takes</td></tr>
2295 <tr><td></td>
2298 <tr><td></td>
2296 <td>--profile</td>
2299 <td>--profile</td>
2297 <td>print command execution profile</td></tr>
2300 <td>print command execution profile</td></tr>
2298 <tr><td></td>
2301 <tr><td></td>
2299 <td>--version</td>
2302 <td>--version</td>
2300 <td>output version information and exit</td></tr>
2303 <td>output version information and exit</td></tr>
2301 <tr><td>-h</td>
2304 <tr><td>-h</td>
2302 <td>--help</td>
2305 <td>--help</td>
2303 <td>display help and exit</td></tr>
2306 <td>display help and exit</td></tr>
2304 <tr><td></td>
2307 <tr><td></td>
2305 <td>--hidden</td>
2308 <td>--hidden</td>
2306 <td>consider hidden changesets</td></tr>
2309 <td>consider hidden changesets</td></tr>
2307 </table>
2310 </table>
2308
2311
2309 </div>
2312 </div>
2310 </div>
2313 </div>
2311 </div>
2314 </div>
2312
2315
2313 <script type="text/javascript">process_dates()</script>
2316 <script type="text/javascript">process_dates()</script>
2314
2317
2315
2318
2316 </body>
2319 </body>
2317 </html>
2320 </html>
2318
2321
2319
2322
2320 $ get-with-headers.py 127.0.0.1:$HGPORT "help/remove"
2323 $ get-with-headers.py 127.0.0.1:$HGPORT "help/remove"
2321 200 Script output follows
2324 200 Script output follows
2322
2325
2323 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2326 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2324 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2327 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2325 <head>
2328 <head>
2326 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2329 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2327 <meta name="robots" content="index, nofollow" />
2330 <meta name="robots" content="index, nofollow" />
2328 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2331 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2329 <script type="text/javascript" src="/static/mercurial.js"></script>
2332 <script type="text/javascript" src="/static/mercurial.js"></script>
2330
2333
2331 <title>Help: remove</title>
2334 <title>Help: remove</title>
2332 </head>
2335 </head>
2333 <body>
2336 <body>
2334
2337
2335 <div class="container">
2338 <div class="container">
2336 <div class="menu">
2339 <div class="menu">
2337 <div class="logo">
2340 <div class="logo">
2338 <a href="https://mercurial-scm.org/">
2341 <a href="https://mercurial-scm.org/">
2339 <img src="/static/hglogo.png" alt="mercurial" /></a>
2342 <img src="/static/hglogo.png" alt="mercurial" /></a>
2340 </div>
2343 </div>
2341 <ul>
2344 <ul>
2342 <li><a href="/shortlog">log</a></li>
2345 <li><a href="/shortlog">log</a></li>
2343 <li><a href="/graph">graph</a></li>
2346 <li><a href="/graph">graph</a></li>
2344 <li><a href="/tags">tags</a></li>
2347 <li><a href="/tags">tags</a></li>
2345 <li><a href="/bookmarks">bookmarks</a></li>
2348 <li><a href="/bookmarks">bookmarks</a></li>
2346 <li><a href="/branches">branches</a></li>
2349 <li><a href="/branches">branches</a></li>
2347 </ul>
2350 </ul>
2348 <ul>
2351 <ul>
2349 <li class="active"><a href="/help">help</a></li>
2352 <li class="active"><a href="/help">help</a></li>
2350 </ul>
2353 </ul>
2351 </div>
2354 </div>
2352
2355
2353 <div class="main">
2356 <div class="main">
2354 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2357 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2355 <h3>Help: remove</h3>
2358 <h3>Help: remove</h3>
2356
2359
2357 <form class="search" action="/log">
2360 <form class="search" action="/log">
2358
2361
2359 <p><input name="rev" id="search1" type="text" size="30" /></p>
2362 <p><input name="rev" id="search1" type="text" size="30" /></p>
2360 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2363 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2361 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2364 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2362 </form>
2365 </form>
2363 <div id="doc">
2366 <div id="doc">
2364 <p>
2367 <p>
2365 hg remove [OPTION]... FILE...
2368 hg remove [OPTION]... FILE...
2366 </p>
2369 </p>
2367 <p>
2370 <p>
2368 aliases: rm
2371 aliases: rm
2369 </p>
2372 </p>
2370 <p>
2373 <p>
2371 remove the specified files on the next commit
2374 remove the specified files on the next commit
2372 </p>
2375 </p>
2373 <p>
2376 <p>
2374 Schedule the indicated files for removal from the current branch.
2377 Schedule the indicated files for removal from the current branch.
2375 </p>
2378 </p>
2376 <p>
2379 <p>
2377 This command schedules the files to be removed at the next commit.
2380 This command schedules the files to be removed at the next commit.
2378 To undo a remove before that, see &quot;hg revert&quot;. To undo added
2381 To undo a remove before that, see &quot;hg revert&quot;. To undo added
2379 files, see &quot;hg forget&quot;.
2382 files, see &quot;hg forget&quot;.
2380 </p>
2383 </p>
2381 <p>
2384 <p>
2382 -A/--after can be used to remove only files that have already
2385 -A/--after can be used to remove only files that have already
2383 been deleted, -f/--force can be used to force deletion, and -Af
2386 been deleted, -f/--force can be used to force deletion, and -Af
2384 can be used to remove files from the next revision without
2387 can be used to remove files from the next revision without
2385 deleting them from the working directory.
2388 deleting them from the working directory.
2386 </p>
2389 </p>
2387 <p>
2390 <p>
2388 The following table details the behavior of remove for different
2391 The following table details the behavior of remove for different
2389 file states (columns) and option combinations (rows). The file
2392 file states (columns) and option combinations (rows). The file
2390 states are Added [A], Clean [C], Modified [M] and Missing [!]
2393 states are Added [A], Clean [C], Modified [M] and Missing [!]
2391 (as reported by &quot;hg status&quot;). The actions are Warn, Remove
2394 (as reported by &quot;hg status&quot;). The actions are Warn, Remove
2392 (from branch) and Delete (from disk):
2395 (from branch) and Delete (from disk):
2393 </p>
2396 </p>
2394 <table>
2397 <table>
2395 <tr><td>opt/state</td>
2398 <tr><td>opt/state</td>
2396 <td>A</td>
2399 <td>A</td>
2397 <td>C</td>
2400 <td>C</td>
2398 <td>M</td>
2401 <td>M</td>
2399 <td>!</td></tr>
2402 <td>!</td></tr>
2400 <tr><td>none</td>
2403 <tr><td>none</td>
2401 <td>W</td>
2404 <td>W</td>
2402 <td>RD</td>
2405 <td>RD</td>
2403 <td>W</td>
2406 <td>W</td>
2404 <td>R</td></tr>
2407 <td>R</td></tr>
2405 <tr><td>-f</td>
2408 <tr><td>-f</td>
2406 <td>R</td>
2409 <td>R</td>
2407 <td>RD</td>
2410 <td>RD</td>
2408 <td>RD</td>
2411 <td>RD</td>
2409 <td>R</td></tr>
2412 <td>R</td></tr>
2410 <tr><td>-A</td>
2413 <tr><td>-A</td>
2411 <td>W</td>
2414 <td>W</td>
2412 <td>W</td>
2415 <td>W</td>
2413 <td>W</td>
2416 <td>W</td>
2414 <td>R</td></tr>
2417 <td>R</td></tr>
2415 <tr><td>-Af</td>
2418 <tr><td>-Af</td>
2416 <td>R</td>
2419 <td>R</td>
2417 <td>R</td>
2420 <td>R</td>
2418 <td>R</td>
2421 <td>R</td>
2419 <td>R</td></tr>
2422 <td>R</td></tr>
2420 </table>
2423 </table>
2421 <p>
2424 <p>
2422 Note that remove never deletes files in Added [A] state from the
2425 Note that remove never deletes files in Added [A] state from the
2423 working directory, not even if option --force is specified.
2426 working directory, not even if option --force is specified.
2424 </p>
2427 </p>
2425 <p>
2428 <p>
2426 Returns 0 on success, 1 if any warnings encountered.
2429 Returns 0 on success, 1 if any warnings encountered.
2427 </p>
2430 </p>
2428 <p>
2431 <p>
2429 options ([+] can be repeated):
2432 options ([+] can be repeated):
2430 </p>
2433 </p>
2431 <table>
2434 <table>
2432 <tr><td>-A</td>
2435 <tr><td>-A</td>
2433 <td>--after</td>
2436 <td>--after</td>
2434 <td>record delete for missing files</td></tr>
2437 <td>record delete for missing files</td></tr>
2435 <tr><td>-f</td>
2438 <tr><td>-f</td>
2436 <td>--force</td>
2439 <td>--force</td>
2437 <td>remove (and delete) file even if added or modified</td></tr>
2440 <td>remove (and delete) file even if added or modified</td></tr>
2438 <tr><td>-S</td>
2441 <tr><td>-S</td>
2439 <td>--subrepos</td>
2442 <td>--subrepos</td>
2440 <td>recurse into subrepositories</td></tr>
2443 <td>recurse into subrepositories</td></tr>
2441 <tr><td>-I</td>
2444 <tr><td>-I</td>
2442 <td>--include PATTERN [+]</td>
2445 <td>--include PATTERN [+]</td>
2443 <td>include names matching the given patterns</td></tr>
2446 <td>include names matching the given patterns</td></tr>
2444 <tr><td>-X</td>
2447 <tr><td>-X</td>
2445 <td>--exclude PATTERN [+]</td>
2448 <td>--exclude PATTERN [+]</td>
2446 <td>exclude names matching the given patterns</td></tr>
2449 <td>exclude names matching the given patterns</td></tr>
2447 </table>
2450 </table>
2448 <p>
2451 <p>
2449 global options ([+] can be repeated):
2452 global options ([+] can be repeated):
2450 </p>
2453 </p>
2451 <table>
2454 <table>
2452 <tr><td>-R</td>
2455 <tr><td>-R</td>
2453 <td>--repository REPO</td>
2456 <td>--repository REPO</td>
2454 <td>repository root directory or name of overlay bundle file</td></tr>
2457 <td>repository root directory or name of overlay bundle file</td></tr>
2455 <tr><td></td>
2458 <tr><td></td>
2456 <td>--cwd DIR</td>
2459 <td>--cwd DIR</td>
2457 <td>change working directory</td></tr>
2460 <td>change working directory</td></tr>
2458 <tr><td>-y</td>
2461 <tr><td>-y</td>
2459 <td>--noninteractive</td>
2462 <td>--noninteractive</td>
2460 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2463 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2461 <tr><td>-q</td>
2464 <tr><td>-q</td>
2462 <td>--quiet</td>
2465 <td>--quiet</td>
2463 <td>suppress output</td></tr>
2466 <td>suppress output</td></tr>
2464 <tr><td>-v</td>
2467 <tr><td>-v</td>
2465 <td>--verbose</td>
2468 <td>--verbose</td>
2466 <td>enable additional output</td></tr>
2469 <td>enable additional output</td></tr>
2467 <tr><td></td>
2470 <tr><td></td>
2468 <td>--config CONFIG [+]</td>
2471 <td>--config CONFIG [+]</td>
2469 <td>set/override config option (use 'section.name=value')</td></tr>
2472 <td>set/override config option (use 'section.name=value')</td></tr>
2470 <tr><td></td>
2473 <tr><td></td>
2471 <td>--debug</td>
2474 <td>--debug</td>
2472 <td>enable debugging output</td></tr>
2475 <td>enable debugging output</td></tr>
2473 <tr><td></td>
2476 <tr><td></td>
2474 <td>--debugger</td>
2477 <td>--debugger</td>
2475 <td>start debugger</td></tr>
2478 <td>start debugger</td></tr>
2476 <tr><td></td>
2479 <tr><td></td>
2477 <td>--encoding ENCODE</td>
2480 <td>--encoding ENCODE</td>
2478 <td>set the charset encoding (default: ascii)</td></tr>
2481 <td>set the charset encoding (default: ascii)</td></tr>
2479 <tr><td></td>
2482 <tr><td></td>
2480 <td>--encodingmode MODE</td>
2483 <td>--encodingmode MODE</td>
2481 <td>set the charset encoding mode (default: strict)</td></tr>
2484 <td>set the charset encoding mode (default: strict)</td></tr>
2482 <tr><td></td>
2485 <tr><td></td>
2483 <td>--traceback</td>
2486 <td>--traceback</td>
2484 <td>always print a traceback on exception</td></tr>
2487 <td>always print a traceback on exception</td></tr>
2485 <tr><td></td>
2488 <tr><td></td>
2486 <td>--time</td>
2489 <td>--time</td>
2487 <td>time how long the command takes</td></tr>
2490 <td>time how long the command takes</td></tr>
2488 <tr><td></td>
2491 <tr><td></td>
2489 <td>--profile</td>
2492 <td>--profile</td>
2490 <td>print command execution profile</td></tr>
2493 <td>print command execution profile</td></tr>
2491 <tr><td></td>
2494 <tr><td></td>
2492 <td>--version</td>
2495 <td>--version</td>
2493 <td>output version information and exit</td></tr>
2496 <td>output version information and exit</td></tr>
2494 <tr><td>-h</td>
2497 <tr><td>-h</td>
2495 <td>--help</td>
2498 <td>--help</td>
2496 <td>display help and exit</td></tr>
2499 <td>display help and exit</td></tr>
2497 <tr><td></td>
2500 <tr><td></td>
2498 <td>--hidden</td>
2501 <td>--hidden</td>
2499 <td>consider hidden changesets</td></tr>
2502 <td>consider hidden changesets</td></tr>
2500 </table>
2503 </table>
2501
2504
2502 </div>
2505 </div>
2503 </div>
2506 </div>
2504 </div>
2507 </div>
2505
2508
2506 <script type="text/javascript">process_dates()</script>
2509 <script type="text/javascript">process_dates()</script>
2507
2510
2508
2511
2509 </body>
2512 </body>
2510 </html>
2513 </html>
2511
2514
2512
2515
2513 $ get-with-headers.py 127.0.0.1:$HGPORT "help/revisions"
2516 $ get-with-headers.py 127.0.0.1:$HGPORT "help/revisions"
2514 200 Script output follows
2517 200 Script output follows
2515
2518
2516 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2519 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2517 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2520 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2518 <head>
2521 <head>
2519 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2522 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2520 <meta name="robots" content="index, nofollow" />
2523 <meta name="robots" content="index, nofollow" />
2521 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2524 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2522 <script type="text/javascript" src="/static/mercurial.js"></script>
2525 <script type="text/javascript" src="/static/mercurial.js"></script>
2523
2526
2524 <title>Help: revisions</title>
2527 <title>Help: revisions</title>
2525 </head>
2528 </head>
2526 <body>
2529 <body>
2527
2530
2528 <div class="container">
2531 <div class="container">
2529 <div class="menu">
2532 <div class="menu">
2530 <div class="logo">
2533 <div class="logo">
2531 <a href="https://mercurial-scm.org/">
2534 <a href="https://mercurial-scm.org/">
2532 <img src="/static/hglogo.png" alt="mercurial" /></a>
2535 <img src="/static/hglogo.png" alt="mercurial" /></a>
2533 </div>
2536 </div>
2534 <ul>
2537 <ul>
2535 <li><a href="/shortlog">log</a></li>
2538 <li><a href="/shortlog">log</a></li>
2536 <li><a href="/graph">graph</a></li>
2539 <li><a href="/graph">graph</a></li>
2537 <li><a href="/tags">tags</a></li>
2540 <li><a href="/tags">tags</a></li>
2538 <li><a href="/bookmarks">bookmarks</a></li>
2541 <li><a href="/bookmarks">bookmarks</a></li>
2539 <li><a href="/branches">branches</a></li>
2542 <li><a href="/branches">branches</a></li>
2540 </ul>
2543 </ul>
2541 <ul>
2544 <ul>
2542 <li class="active"><a href="/help">help</a></li>
2545 <li class="active"><a href="/help">help</a></li>
2543 </ul>
2546 </ul>
2544 </div>
2547 </div>
2545
2548
2546 <div class="main">
2549 <div class="main">
2547 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2550 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2548 <h3>Help: revisions</h3>
2551 <h3>Help: revisions</h3>
2549
2552
2550 <form class="search" action="/log">
2553 <form class="search" action="/log">
2551
2554
2552 <p><input name="rev" id="search1" type="text" size="30" /></p>
2555 <p><input name="rev" id="search1" type="text" size="30" /></p>
2553 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2556 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2554 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2557 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2555 </form>
2558 </form>
2556 <div id="doc">
2559 <div id="doc">
2557 <h1>Specifying Single Revisions</h1>
2560 <h1>Specifying Single Revisions</h1>
2558 <p>
2561 <p>
2559 Mercurial supports several ways to specify individual revisions.
2562 Mercurial supports several ways to specify individual revisions.
2560 </p>
2563 </p>
2561 <p>
2564 <p>
2562 A plain integer is treated as a revision number. Negative integers are
2565 A plain integer is treated as a revision number. Negative integers are
2563 treated as sequential offsets from the tip, with -1 denoting the tip,
2566 treated as sequential offsets from the tip, with -1 denoting the tip,
2564 -2 denoting the revision prior to the tip, and so forth.
2567 -2 denoting the revision prior to the tip, and so forth.
2565 </p>
2568 </p>
2566 <p>
2569 <p>
2567 A 40-digit hexadecimal string is treated as a unique revision
2570 A 40-digit hexadecimal string is treated as a unique revision
2568 identifier.
2571 identifier.
2569 </p>
2572 </p>
2570 <p>
2573 <p>
2571 A hexadecimal string less than 40 characters long is treated as a
2574 A hexadecimal string less than 40 characters long is treated as a
2572 unique revision identifier and is referred to as a short-form
2575 unique revision identifier and is referred to as a short-form
2573 identifier. A short-form identifier is only valid if it is the prefix
2576 identifier. A short-form identifier is only valid if it is the prefix
2574 of exactly one full-length identifier.
2577 of exactly one full-length identifier.
2575 </p>
2578 </p>
2576 <p>
2579 <p>
2577 Any other string is treated as a bookmark, tag, or branch name. A
2580 Any other string is treated as a bookmark, tag, or branch name. A
2578 bookmark is a movable pointer to a revision. A tag is a permanent name
2581 bookmark is a movable pointer to a revision. A tag is a permanent name
2579 associated with a revision. A branch name denotes the tipmost open branch head
2582 associated with a revision. A branch name denotes the tipmost open branch head
2580 of that branch - or if they are all closed, the tipmost closed head of the
2583 of that branch - or if they are all closed, the tipmost closed head of the
2581 branch. Bookmark, tag, and branch names must not contain the &quot;:&quot; character.
2584 branch. Bookmark, tag, and branch names must not contain the &quot;:&quot; character.
2582 </p>
2585 </p>
2583 <p>
2586 <p>
2584 The reserved name &quot;tip&quot; always identifies the most recent revision.
2587 The reserved name &quot;tip&quot; always identifies the most recent revision.
2585 </p>
2588 </p>
2586 <p>
2589 <p>
2587 The reserved name &quot;null&quot; indicates the null revision. This is the
2590 The reserved name &quot;null&quot; indicates the null revision. This is the
2588 revision of an empty repository, and the parent of revision 0.
2591 revision of an empty repository, and the parent of revision 0.
2589 </p>
2592 </p>
2590 <p>
2593 <p>
2591 The reserved name &quot;.&quot; indicates the working directory parent. If no
2594 The reserved name &quot;.&quot; indicates the working directory parent. If no
2592 working directory is checked out, it is equivalent to null. If an
2595 working directory is checked out, it is equivalent to null. If an
2593 uncommitted merge is in progress, &quot;.&quot; is the revision of the first
2596 uncommitted merge is in progress, &quot;.&quot; is the revision of the first
2594 parent.
2597 parent.
2595 </p>
2598 </p>
2596
2599
2597 </div>
2600 </div>
2598 </div>
2601 </div>
2599 </div>
2602 </div>
2600
2603
2601 <script type="text/javascript">process_dates()</script>
2604 <script type="text/javascript">process_dates()</script>
2602
2605
2603
2606
2604 </body>
2607 </body>
2605 </html>
2608 </html>
2606
2609
2607
2610
2608 $ killdaemons.py
2611 $ killdaemons.py
2609
2612
2610 #endif
2613 #endif
General Comments 0
You need to be logged in to leave comments. Login now