##// END OF EJS Templates
remove: quote --force in never deletes note...
timeless -
r27489:51aff98d default
parent child Browse files
Show More
@@ -1,6995 +1,6997 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 (except
196 If no names are given, add all files to the repository (except
197 files matching ``.hgignore``).
197 files matching ``.hgignore``).
198
198
199 .. container:: verbose
199 .. container:: verbose
200
200
201 Examples:
201 Examples:
202
202
203 - New (unknown) files are added
203 - New (unknown) files are added
204 automatically by :hg:`add`::
204 automatically by :hg:`add`::
205
205
206 $ ls
206 $ ls
207 foo.c
207 foo.c
208 $ hg status
208 $ hg status
209 ? foo.c
209 ? foo.c
210 $ hg add
210 $ hg add
211 adding foo.c
211 adding foo.c
212 $ hg status
212 $ hg status
213 A foo.c
213 A foo.c
214
214
215 - Specific files to be added can be specified::
215 - Specific files to be added can be specified::
216
216
217 $ ls
217 $ ls
218 bar.c foo.c
218 bar.c foo.c
219 $ hg status
219 $ hg status
220 ? bar.c
220 ? bar.c
221 ? foo.c
221 ? foo.c
222 $ hg add bar.c
222 $ hg add bar.c
223 $ hg status
223 $ hg status
224 A bar.c
224 A bar.c
225 ? foo.c
225 ? foo.c
226
226
227 Returns 0 if all files are successfully added.
227 Returns 0 if all files are successfully added.
228 """
228 """
229
229
230 m = scmutil.match(repo[None], pats, opts)
230 m = scmutil.match(repo[None], pats, opts)
231 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
231 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
232 return rejected and 1 or 0
232 return rejected and 1 or 0
233
233
234 @command('addremove',
234 @command('addremove',
235 similarityopts + subrepoopts + walkopts + dryrunopts,
235 similarityopts + subrepoopts + walkopts + dryrunopts,
236 _('[OPTION]... [FILE]...'),
236 _('[OPTION]... [FILE]...'),
237 inferrepo=True)
237 inferrepo=True)
238 def addremove(ui, repo, *pats, **opts):
238 def addremove(ui, repo, *pats, **opts):
239 """add all new files, delete all missing files
239 """add all new files, delete all missing files
240
240
241 Add all new files and remove all missing files from the
241 Add all new files and remove all missing files from the
242 repository.
242 repository.
243
243
244 Unless names are given, new files are ignored if they match any of
244 Unless names are given, new files are ignored if they match any of
245 the patterns in ``.hgignore``. As with add, these changes take
245 the patterns in ``.hgignore``. As with add, these changes take
246 effect at the next commit.
246 effect at the next commit.
247
247
248 Use the -s/--similarity option to detect renamed files. This
248 Use the -s/--similarity option to detect renamed files. This
249 option takes a percentage between 0 (disabled) and 100 (files must
249 option takes a percentage between 0 (disabled) and 100 (files must
250 be identical) as its parameter. With a parameter greater than 0,
250 be identical) as its parameter. With a parameter greater than 0,
251 this compares every removed file with every added file and records
251 this compares every removed file with every added file and records
252 those similar enough as renames. Detecting renamed files this way
252 those similar enough as renames. Detecting renamed files this way
253 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
254 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
255 not specified, -s/--similarity defaults to 100 and only renames of
255 not specified, -s/--similarity defaults to 100 and only renames of
256 identical files are detected.
256 identical files are detected.
257
257
258 .. container:: verbose
258 .. container:: verbose
259
259
260 Examples:
260 Examples:
261
261
262 - A number of files (bar.c and foo.c) are new,
262 - A number of files (bar.c and foo.c) are new,
263 while foobar.c has been removed (without using :hg:`remove`)
263 while foobar.c has been removed (without using :hg:`remove`)
264 from the repository::
264 from the repository::
265
265
266 $ ls
266 $ ls
267 bar.c foo.c
267 bar.c foo.c
268 $ hg status
268 $ hg status
269 ! foobar.c
269 ! foobar.c
270 ? bar.c
270 ? bar.c
271 ? foo.c
271 ? foo.c
272 $ hg addremove
272 $ hg addremove
273 adding bar.c
273 adding bar.c
274 adding foo.c
274 adding foo.c
275 removing foobar.c
275 removing foobar.c
276 $ hg status
276 $ hg status
277 A bar.c
277 A bar.c
278 A foo.c
278 A foo.c
279 R foobar.c
279 R foobar.c
280
280
281 - 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`.
282 Afterwards, it was edited slightly::
282 Afterwards, it was edited slightly::
283
283
284 $ ls
284 $ ls
285 foo.c
285 foo.c
286 $ hg status
286 $ hg status
287 ! foobar.c
287 ! foobar.c
288 ? foo.c
288 ? foo.c
289 $ hg addremove --similarity 90
289 $ hg addremove --similarity 90
290 removing foobar.c
290 removing foobar.c
291 adding foo.c
291 adding foo.c
292 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)
293 $ hg status -C
293 $ hg status -C
294 A foo.c
294 A foo.c
295 foobar.c
295 foobar.c
296 R foobar.c
296 R foobar.c
297
297
298 Returns 0 if all files are successfully added.
298 Returns 0 if all files are successfully added.
299 """
299 """
300 try:
300 try:
301 sim = float(opts.get('similarity') or 100)
301 sim = float(opts.get('similarity') or 100)
302 except ValueError:
302 except ValueError:
303 raise error.Abort(_('similarity must be a number'))
303 raise error.Abort(_('similarity must be a number'))
304 if sim < 0 or sim > 100:
304 if sim < 0 or sim > 100:
305 raise error.Abort(_('similarity must be between 0 and 100'))
305 raise error.Abort(_('similarity must be between 0 and 100'))
306 matcher = scmutil.match(repo[None], pats, opts)
306 matcher = scmutil.match(repo[None], pats, opts)
307 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
307 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
308
308
309 @command('^annotate|blame',
309 @command('^annotate|blame',
310 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
310 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
311 ('', 'follow', None,
311 ('', 'follow', None,
312 _('follow copies/renames and list the filename (DEPRECATED)')),
312 _('follow copies/renames and list the filename (DEPRECATED)')),
313 ('', 'no-follow', None, _("don't follow copies and renames")),
313 ('', 'no-follow', None, _("don't follow copies and renames")),
314 ('a', 'text', None, _('treat all files as text')),
314 ('a', 'text', None, _('treat all files as text')),
315 ('u', 'user', None, _('list the author (long with -v)')),
315 ('u', 'user', None, _('list the author (long with -v)')),
316 ('f', 'file', None, _('list the filename')),
316 ('f', 'file', None, _('list the filename')),
317 ('d', 'date', None, _('list the date (short with -q)')),
317 ('d', 'date', None, _('list the date (short with -q)')),
318 ('n', 'number', None, _('list the revision number (default)')),
318 ('n', 'number', None, _('list the revision number (default)')),
319 ('c', 'changeset', None, _('list the changeset')),
319 ('c', 'changeset', None, _('list the changeset')),
320 ('l', 'line-number', None, _('show line number at the first appearance'))
320 ('l', 'line-number', None, _('show line number at the first appearance'))
321 ] + diffwsopts + walkopts + formatteropts,
321 ] + diffwsopts + walkopts + formatteropts,
322 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
322 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
323 inferrepo=True)
323 inferrepo=True)
324 def annotate(ui, repo, *pats, **opts):
324 def annotate(ui, repo, *pats, **opts):
325 """show changeset information by line for each file
325 """show changeset information by line for each file
326
326
327 List changes in files, showing the revision id responsible for
327 List changes in files, showing the revision id responsible for
328 each line.
328 each line.
329
329
330 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
331 by whom.
331 by whom.
332
332
333 Without the -a/--text option, annotate will avoid processing files
333 Without the -a/--text option, annotate will avoid processing files
334 it detects as binary. With -a, annotate will annotate the file
334 it detects as binary. With -a, annotate will annotate the file
335 anyway, although the results will probably be neither useful
335 anyway, although the results will probably be neither useful
336 nor desirable.
336 nor desirable.
337
337
338 Returns 0 on success.
338 Returns 0 on success.
339 """
339 """
340 if not pats:
340 if not pats:
341 raise error.Abort(_('at least one filename or pattern is required'))
341 raise error.Abort(_('at least one filename or pattern is required'))
342
342
343 if opts.get('follow'):
343 if opts.get('follow'):
344 # --follow is deprecated and now just an alias for -f/--file
344 # --follow is deprecated and now just an alias for -f/--file
345 # to mimic the behavior of Mercurial before version 1.5
345 # to mimic the behavior of Mercurial before version 1.5
346 opts['file'] = True
346 opts['file'] = True
347
347
348 ctx = scmutil.revsingle(repo, opts.get('rev'))
348 ctx = scmutil.revsingle(repo, opts.get('rev'))
349
349
350 fm = ui.formatter('annotate', opts)
350 fm = ui.formatter('annotate', opts)
351 if ui.quiet:
351 if ui.quiet:
352 datefunc = util.shortdate
352 datefunc = util.shortdate
353 else:
353 else:
354 datefunc = util.datestr
354 datefunc = util.datestr
355 if ctx.rev() is None:
355 if ctx.rev() is None:
356 def hexfn(node):
356 def hexfn(node):
357 if node is None:
357 if node is None:
358 return None
358 return None
359 else:
359 else:
360 return fm.hexfunc(node)
360 return fm.hexfunc(node)
361 if opts.get('changeset'):
361 if opts.get('changeset'):
362 # omit "+" suffix which is appended to node hex
362 # omit "+" suffix which is appended to node hex
363 def formatrev(rev):
363 def formatrev(rev):
364 if rev is None:
364 if rev is None:
365 return '%d' % ctx.p1().rev()
365 return '%d' % ctx.p1().rev()
366 else:
366 else:
367 return '%d' % rev
367 return '%d' % rev
368 else:
368 else:
369 def formatrev(rev):
369 def formatrev(rev):
370 if rev is None:
370 if rev is None:
371 return '%d+' % ctx.p1().rev()
371 return '%d+' % ctx.p1().rev()
372 else:
372 else:
373 return '%d ' % rev
373 return '%d ' % rev
374 def formathex(hex):
374 def formathex(hex):
375 if hex is None:
375 if hex is None:
376 return '%s+' % fm.hexfunc(ctx.p1().node())
376 return '%s+' % fm.hexfunc(ctx.p1().node())
377 else:
377 else:
378 return '%s ' % hex
378 return '%s ' % hex
379 else:
379 else:
380 hexfn = fm.hexfunc
380 hexfn = fm.hexfunc
381 formatrev = formathex = str
381 formatrev = formathex = str
382
382
383 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
383 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
384 ('number', ' ', lambda x: x[0].rev(), formatrev),
384 ('number', ' ', lambda x: x[0].rev(), formatrev),
385 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
385 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
386 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
386 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
387 ('file', ' ', lambda x: x[0].path(), str),
387 ('file', ' ', lambda x: x[0].path(), str),
388 ('line_number', ':', lambda x: x[1], str),
388 ('line_number', ':', lambda x: x[1], str),
389 ]
389 ]
390 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
390 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
391
391
392 if (not opts.get('user') and not opts.get('changeset')
392 if (not opts.get('user') and not opts.get('changeset')
393 and not opts.get('date') and not opts.get('file')):
393 and not opts.get('date') and not opts.get('file')):
394 opts['number'] = True
394 opts['number'] = True
395
395
396 linenumber = opts.get('line_number') is not None
396 linenumber = opts.get('line_number') is not None
397 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')):
398 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'))
399
399
400 if fm:
400 if fm:
401 def makefunc(get, fmt):
401 def makefunc(get, fmt):
402 return get
402 return get
403 else:
403 else:
404 def makefunc(get, fmt):
404 def makefunc(get, fmt):
405 return lambda x: fmt(get(x))
405 return lambda x: fmt(get(x))
406 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
407 if opts.get(op)]
407 if opts.get(op)]
408 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
409 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
410 if opts.get(op))
410 if opts.get(op))
411
411
412 def bad(x, y):
412 def bad(x, y):
413 raise error.Abort("%s: %s" % (x, y))
413 raise error.Abort("%s: %s" % (x, y))
414
414
415 m = scmutil.match(ctx, pats, opts, badfn=bad)
415 m = scmutil.match(ctx, pats, opts, badfn=bad)
416
416
417 follow = not opts.get('no_follow')
417 follow = not opts.get('no_follow')
418 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
418 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
419 whitespace=True)
419 whitespace=True)
420 for abs in ctx.walk(m):
420 for abs in ctx.walk(m):
421 fctx = ctx[abs]
421 fctx = ctx[abs]
422 if not opts.get('text') and util.binary(fctx.data()):
422 if not opts.get('text') and util.binary(fctx.data()):
423 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))
424 continue
424 continue
425
425
426 lines = fctx.annotate(follow=follow, linenumber=linenumber,
426 lines = fctx.annotate(follow=follow, linenumber=linenumber,
427 diffopts=diffopts)
427 diffopts=diffopts)
428 formats = []
428 formats = []
429 pieces = []
429 pieces = []
430
430
431 for f, sep in funcmap:
431 for f, sep in funcmap:
432 l = [f(n) for n, dummy in lines]
432 l = [f(n) for n, dummy in lines]
433 if l:
433 if l:
434 if fm:
434 if fm:
435 formats.append(['%s' for x in l])
435 formats.append(['%s' for x in l])
436 else:
436 else:
437 sizes = [encoding.colwidth(x) for x in l]
437 sizes = [encoding.colwidth(x) for x in l]
438 ml = max(sizes)
438 ml = max(sizes)
439 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
439 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
440 pieces.append(l)
440 pieces.append(l)
441
441
442 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
442 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
443 fm.startitem()
443 fm.startitem()
444 fm.write(fields, "".join(f), *p)
444 fm.write(fields, "".join(f), *p)
445 fm.write('line', ": %s", l[1])
445 fm.write('line', ": %s", l[1])
446
446
447 if lines and not lines[-1][1].endswith('\n'):
447 if lines and not lines[-1][1].endswith('\n'):
448 fm.plain('\n')
448 fm.plain('\n')
449
449
450 fm.end()
450 fm.end()
451
451
452 @command('archive',
452 @command('archive',
453 [('', 'no-decode', None, _('do not pass files through decoders')),
453 [('', 'no-decode', None, _('do not pass files through decoders')),
454 ('p', 'prefix', '', _('directory prefix for files in archive'),
454 ('p', 'prefix', '', _('directory prefix for files in archive'),
455 _('PREFIX')),
455 _('PREFIX')),
456 ('r', 'rev', '', _('revision to distribute'), _('REV')),
456 ('r', 'rev', '', _('revision to distribute'), _('REV')),
457 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
457 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
458 ] + subrepoopts + walkopts,
458 ] + subrepoopts + walkopts,
459 _('[OPTION]... DEST'))
459 _('[OPTION]... DEST'))
460 def archive(ui, repo, dest, **opts):
460 def archive(ui, repo, dest, **opts):
461 '''create an unversioned archive of a repository revision
461 '''create an unversioned archive of a repository revision
462
462
463 By default, the revision used is the parent of the working
463 By default, the revision used is the parent of the working
464 directory; use -r/--rev to specify a different revision.
464 directory; use -r/--rev to specify a different revision.
465
465
466 The archive type is automatically detected based on file
466 The archive type is automatically detected based on file
467 extension (to override, use -t/--type).
467 extension (to override, use -t/--type).
468
468
469 .. container:: verbose
469 .. container:: verbose
470
470
471 Examples:
471 Examples:
472
472
473 - create a zip file containing the 1.0 release::
473 - create a zip file containing the 1.0 release::
474
474
475 hg archive -r 1.0 project-1.0.zip
475 hg archive -r 1.0 project-1.0.zip
476
476
477 - create a tarball excluding .hg files::
477 - create a tarball excluding .hg files::
478
478
479 hg archive project.tar.gz -X ".hg*"
479 hg archive project.tar.gz -X ".hg*"
480
480
481 Valid types are:
481 Valid types are:
482
482
483 :``files``: a directory full of files (default)
483 :``files``: a directory full of files (default)
484 :``tar``: tar archive, uncompressed
484 :``tar``: tar archive, uncompressed
485 :``tbz2``: tar archive, compressed using bzip2
485 :``tbz2``: tar archive, compressed using bzip2
486 :``tgz``: tar archive, compressed using gzip
486 :``tgz``: tar archive, compressed using gzip
487 :``uzip``: zip archive, uncompressed
487 :``uzip``: zip archive, uncompressed
488 :``zip``: zip archive, compressed using deflate
488 :``zip``: zip archive, compressed using deflate
489
489
490 The exact name of the destination archive or directory is given
490 The exact name of the destination archive or directory is given
491 using a format string; see :hg:`help export` for details.
491 using a format string; see :hg:`help export` for details.
492
492
493 Each member added to an archive file has a directory prefix
493 Each member added to an archive file has a directory prefix
494 prepended. Use -p/--prefix to specify a format string for the
494 prepended. Use -p/--prefix to specify a format string for the
495 prefix. The default is the basename of the archive, with suffixes
495 prefix. The default is the basename of the archive, with suffixes
496 removed.
496 removed.
497
497
498 Returns 0 on success.
498 Returns 0 on success.
499 '''
499 '''
500
500
501 ctx = scmutil.revsingle(repo, opts.get('rev'))
501 ctx = scmutil.revsingle(repo, opts.get('rev'))
502 if not ctx:
502 if not ctx:
503 raise error.Abort(_('no working directory: please specify a revision'))
503 raise error.Abort(_('no working directory: please specify a revision'))
504 node = ctx.node()
504 node = ctx.node()
505 dest = cmdutil.makefilename(repo, dest, node)
505 dest = cmdutil.makefilename(repo, dest, node)
506 if os.path.realpath(dest) == repo.root:
506 if os.path.realpath(dest) == repo.root:
507 raise error.Abort(_('repository root cannot be destination'))
507 raise error.Abort(_('repository root cannot be destination'))
508
508
509 kind = opts.get('type') or archival.guesskind(dest) or 'files'
509 kind = opts.get('type') or archival.guesskind(dest) or 'files'
510 prefix = opts.get('prefix')
510 prefix = opts.get('prefix')
511
511
512 if dest == '-':
512 if dest == '-':
513 if kind == 'files':
513 if kind == 'files':
514 raise error.Abort(_('cannot archive plain files to stdout'))
514 raise error.Abort(_('cannot archive plain files to stdout'))
515 dest = cmdutil.makefileobj(repo, dest)
515 dest = cmdutil.makefileobj(repo, dest)
516 if not prefix:
516 if not prefix:
517 prefix = os.path.basename(repo.root) + '-%h'
517 prefix = os.path.basename(repo.root) + '-%h'
518
518
519 prefix = cmdutil.makefilename(repo, prefix, node)
519 prefix = cmdutil.makefilename(repo, prefix, node)
520 matchfn = scmutil.match(ctx, [], opts)
520 matchfn = scmutil.match(ctx, [], opts)
521 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
521 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
522 matchfn, prefix, subrepos=opts.get('subrepos'))
522 matchfn, prefix, subrepos=opts.get('subrepos'))
523
523
524 @command('backout',
524 @command('backout',
525 [('', 'merge', None, _('merge with old dirstate parent after backout')),
525 [('', 'merge', None, _('merge with old dirstate parent after backout')),
526 ('', 'commit', None, _('commit if no conflicts were encountered')),
526 ('', 'commit', None, _('commit if no conflicts were encountered')),
527 ('', 'parent', '',
527 ('', 'parent', '',
528 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
528 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
529 ('r', 'rev', '', _('revision to backout'), _('REV')),
529 ('r', 'rev', '', _('revision to backout'), _('REV')),
530 ('e', 'edit', False, _('invoke editor on commit messages')),
530 ('e', 'edit', False, _('invoke editor on commit messages')),
531 ] + mergetoolopts + walkopts + commitopts + commitopts2,
531 ] + mergetoolopts + walkopts + commitopts + commitopts2,
532 _('[OPTION]... [-r] REV'))
532 _('[OPTION]... [-r] REV'))
533 def backout(ui, repo, node=None, rev=None, commit=False, **opts):
533 def backout(ui, repo, node=None, rev=None, commit=False, **opts):
534 '''reverse effect of earlier changeset
534 '''reverse effect of earlier changeset
535
535
536 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
537 current working directory.
537 current working directory.
538
538
539 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
540 is committed automatically. Otherwise, hg needs to merge the
540 is committed automatically. Otherwise, hg needs to merge the
541 changes and the merged result is left uncommitted.
541 changes and the merged result is left uncommitted.
542
542
543 .. note::
543 .. note::
544
544
545 :hg:`backout` cannot be used to fix either an unwanted or
545 :hg:`backout` cannot be used to fix either an unwanted or
546 incorrect merge.
546 incorrect merge.
547
547
548 .. container:: verbose
548 .. container:: verbose
549
549
550 Examples:
550 Examples:
551
551
552 - Reverse the effect of the parent of the working directory.
552 - Reverse the effect of the parent of the working directory.
553 This backout will be committed immediately::
553 This backout will be committed immediately::
554
554
555 hg backout -r .
555 hg backout -r .
556
556
557 - Reverse the effect of previous bad revision 23::
557 - Reverse the effect of previous bad revision 23::
558
558
559 hg backout -r 23
559 hg backout -r 23
560 hg commit -m "Backout revision 23"
560 hg commit -m "Backout revision 23"
561
561
562 - Reverse the effect of previous bad revision 23 and
562 - Reverse the effect of previous bad revision 23 and
563 commit the backout immediately::
563 commit the backout immediately::
564
564
565 hg backout -r 23 --commit
565 hg backout -r 23 --commit
566
566
567 By default, the pending changeset will have one parent,
567 By default, the pending changeset will have one parent,
568 maintaining a linear history. With --merge, the pending
568 maintaining a linear history. With --merge, the pending
569 changeset will instead have two parents: the old parent of the
569 changeset will instead have two parents: the old parent of the
570 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.
571
571
572 Before version 1.7, the behavior without --merge was equivalent
572 Before version 1.7, the behavior without --merge was equivalent
573 to specifying --merge followed by :hg:`update --clean .` to
573 to specifying --merge followed by :hg:`update --clean .` to
574 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
575 merged separately.
575 merged separately.
576
576
577 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.
578
578
579 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
580 of another revision.
580 of another revision.
581
581
582 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
583 files.
583 files.
584 '''
584 '''
585 wlock = lock = None
585 wlock = lock = None
586 try:
586 try:
587 wlock = repo.wlock()
587 wlock = repo.wlock()
588 lock = repo.lock()
588 lock = repo.lock()
589 return _dobackout(ui, repo, node, rev, commit, **opts)
589 return _dobackout(ui, repo, node, rev, commit, **opts)
590 finally:
590 finally:
591 release(lock, wlock)
591 release(lock, wlock)
592
592
593 def _dobackout(ui, repo, node=None, rev=None, commit=False, **opts):
593 def _dobackout(ui, repo, node=None, rev=None, commit=False, **opts):
594 if rev and node:
594 if rev and node:
595 raise error.Abort(_("please specify just one revision"))
595 raise error.Abort(_("please specify just one revision"))
596
596
597 if not rev:
597 if not rev:
598 rev = node
598 rev = node
599
599
600 if not rev:
600 if not rev:
601 raise error.Abort(_("please specify a revision to backout"))
601 raise error.Abort(_("please specify a revision to backout"))
602
602
603 date = opts.get('date')
603 date = opts.get('date')
604 if date:
604 if date:
605 opts['date'] = util.parsedate(date)
605 opts['date'] = util.parsedate(date)
606
606
607 cmdutil.checkunfinished(repo)
607 cmdutil.checkunfinished(repo)
608 cmdutil.bailifchanged(repo)
608 cmdutil.bailifchanged(repo)
609 node = scmutil.revsingle(repo, rev).node()
609 node = scmutil.revsingle(repo, rev).node()
610
610
611 op1, op2 = repo.dirstate.parents()
611 op1, op2 = repo.dirstate.parents()
612 if not repo.changelog.isancestor(node, op1):
612 if not repo.changelog.isancestor(node, op1):
613 raise error.Abort(_('cannot backout change that is not an ancestor'))
613 raise error.Abort(_('cannot backout change that is not an ancestor'))
614
614
615 p1, p2 = repo.changelog.parents(node)
615 p1, p2 = repo.changelog.parents(node)
616 if p1 == nullid:
616 if p1 == nullid:
617 raise error.Abort(_('cannot backout a change with no parents'))
617 raise error.Abort(_('cannot backout a change with no parents'))
618 if p2 != nullid:
618 if p2 != nullid:
619 if not opts.get('parent'):
619 if not opts.get('parent'):
620 raise error.Abort(_('cannot backout a merge changeset'))
620 raise error.Abort(_('cannot backout a merge changeset'))
621 p = repo.lookup(opts['parent'])
621 p = repo.lookup(opts['parent'])
622 if p not in (p1, p2):
622 if p not in (p1, p2):
623 raise error.Abort(_('%s is not a parent of %s') %
623 raise error.Abort(_('%s is not a parent of %s') %
624 (short(p), short(node)))
624 (short(p), short(node)))
625 parent = p
625 parent = p
626 else:
626 else:
627 if opts.get('parent'):
627 if opts.get('parent'):
628 raise error.Abort(_('cannot use --parent on non-merge changeset'))
628 raise error.Abort(_('cannot use --parent on non-merge changeset'))
629 parent = p1
629 parent = p1
630
630
631 # the backout should appear on the same branch
631 # the backout should appear on the same branch
632 try:
632 try:
633 branch = repo.dirstate.branch()
633 branch = repo.dirstate.branch()
634 bheads = repo.branchheads(branch)
634 bheads = repo.branchheads(branch)
635 rctx = scmutil.revsingle(repo, hex(parent))
635 rctx = scmutil.revsingle(repo, hex(parent))
636 if not opts.get('merge') and op1 != node:
636 if not opts.get('merge') and op1 != node:
637 dsguard = cmdutil.dirstateguard(repo, 'backout')
637 dsguard = cmdutil.dirstateguard(repo, 'backout')
638 try:
638 try:
639 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
639 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
640 'backout')
640 'backout')
641 stats = mergemod.update(repo, parent, True, True, node, False)
641 stats = mergemod.update(repo, parent, True, True, node, False)
642 repo.setparents(op1, op2)
642 repo.setparents(op1, op2)
643 dsguard.close()
643 dsguard.close()
644 hg._showstats(repo, stats)
644 hg._showstats(repo, stats)
645 if stats[3]:
645 if stats[3]:
646 repo.ui.status(_("use 'hg resolve' to retry unresolved "
646 repo.ui.status(_("use 'hg resolve' to retry unresolved "
647 "file merges\n"))
647 "file merges\n"))
648 return 1
648 return 1
649 elif not commit:
649 elif not commit:
650 msg = _("changeset %s backed out, "
650 msg = _("changeset %s backed out, "
651 "don't forget to commit.\n")
651 "don't forget to commit.\n")
652 ui.status(msg % short(node))
652 ui.status(msg % short(node))
653 return 0
653 return 0
654 finally:
654 finally:
655 ui.setconfig('ui', 'forcemerge', '', '')
655 ui.setconfig('ui', 'forcemerge', '', '')
656 lockmod.release(dsguard)
656 lockmod.release(dsguard)
657 else:
657 else:
658 hg.clean(repo, node, show_stats=False)
658 hg.clean(repo, node, show_stats=False)
659 repo.dirstate.setbranch(branch)
659 repo.dirstate.setbranch(branch)
660 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
660 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
661
661
662
662
663 def commitfunc(ui, repo, message, match, opts):
663 def commitfunc(ui, repo, message, match, opts):
664 editform = 'backout'
664 editform = 'backout'
665 e = cmdutil.getcommiteditor(editform=editform, **opts)
665 e = cmdutil.getcommiteditor(editform=editform, **opts)
666 if not message:
666 if not message:
667 # we don't translate commit messages
667 # we don't translate commit messages
668 message = "Backed out changeset %s" % short(node)
668 message = "Backed out changeset %s" % short(node)
669 e = cmdutil.getcommiteditor(edit=True, editform=editform)
669 e = cmdutil.getcommiteditor(edit=True, editform=editform)
670 return repo.commit(message, opts.get('user'), opts.get('date'),
670 return repo.commit(message, opts.get('user'), opts.get('date'),
671 match, editor=e)
671 match, editor=e)
672 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
672 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
673 if not newnode:
673 if not newnode:
674 ui.status(_("nothing changed\n"))
674 ui.status(_("nothing changed\n"))
675 return 1
675 return 1
676 cmdutil.commitstatus(repo, newnode, branch, bheads)
676 cmdutil.commitstatus(repo, newnode, branch, bheads)
677
677
678 def nice(node):
678 def nice(node):
679 return '%d:%s' % (repo.changelog.rev(node), short(node))
679 return '%d:%s' % (repo.changelog.rev(node), short(node))
680 ui.status(_('changeset %s backs out changeset %s\n') %
680 ui.status(_('changeset %s backs out changeset %s\n') %
681 (nice(repo.changelog.tip()), nice(node)))
681 (nice(repo.changelog.tip()), nice(node)))
682 if opts.get('merge') and op1 != node:
682 if opts.get('merge') and op1 != node:
683 hg.clean(repo, op1, show_stats=False)
683 hg.clean(repo, op1, show_stats=False)
684 ui.status(_('merging with changeset %s\n')
684 ui.status(_('merging with changeset %s\n')
685 % nice(repo.changelog.tip()))
685 % nice(repo.changelog.tip()))
686 try:
686 try:
687 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
687 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
688 'backout')
688 'backout')
689 return hg.merge(repo, hex(repo.changelog.tip()))
689 return hg.merge(repo, hex(repo.changelog.tip()))
690 finally:
690 finally:
691 ui.setconfig('ui', 'forcemerge', '', '')
691 ui.setconfig('ui', 'forcemerge', '', '')
692 finally:
692 finally:
693 # TODO: get rid of this meaningless try/finally enclosing.
693 # TODO: get rid of this meaningless try/finally enclosing.
694 # this is kept only to reduce changes in a patch.
694 # this is kept only to reduce changes in a patch.
695 pass
695 pass
696 return 0
696 return 0
697
697
698 @command('bisect',
698 @command('bisect',
699 [('r', 'reset', False, _('reset bisect state')),
699 [('r', 'reset', False, _('reset bisect state')),
700 ('g', 'good', False, _('mark changeset good')),
700 ('g', 'good', False, _('mark changeset good')),
701 ('b', 'bad', False, _('mark changeset bad')),
701 ('b', 'bad', False, _('mark changeset bad')),
702 ('s', 'skip', False, _('skip testing changeset')),
702 ('s', 'skip', False, _('skip testing changeset')),
703 ('e', 'extend', False, _('extend the bisect range')),
703 ('e', 'extend', False, _('extend the bisect range')),
704 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
704 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
705 ('U', 'noupdate', False, _('do not update to target'))],
705 ('U', 'noupdate', False, _('do not update to target'))],
706 _("[-gbsr] [-U] [-c CMD] [REV]"))
706 _("[-gbsr] [-U] [-c CMD] [REV]"))
707 def bisect(ui, repo, rev=None, extra=None, command=None,
707 def bisect(ui, repo, rev=None, extra=None, command=None,
708 reset=None, good=None, bad=None, skip=None, extend=None,
708 reset=None, good=None, bad=None, skip=None, extend=None,
709 noupdate=None):
709 noupdate=None):
710 """subdivision search of changesets
710 """subdivision search of changesets
711
711
712 This command helps to find changesets which introduce problems. To
712 This command helps to find changesets which introduce problems. To
713 use, mark the earliest changeset you know exhibits the problem as
713 use, mark the earliest changeset you know exhibits the problem as
714 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
715 as good. Bisect will update your working directory to a revision
715 as good. Bisect will update your working directory to a revision
716 for testing (unless the -U/--noupdate option is specified). Once
716 for testing (unless the -U/--noupdate option is specified). Once
717 you have performed tests, mark the working directory as good or
717 you have performed tests, mark the working directory as good or
718 bad, and bisect will either update to another candidate changeset
718 bad, and bisect will either update to another candidate changeset
719 or announce that it has found the bad revision.
719 or announce that it has found the bad revision.
720
720
721 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
722 revision as good or bad without checking it out first.
722 revision as good or bad without checking it out first.
723
723
724 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.
725 The environment variable HG_NODE will contain the ID of the
725 The environment variable HG_NODE will contain the ID of the
726 changeset being tested. The exit status of the command will be
726 changeset being tested. The exit status of the command will be
727 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
728 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
729 bisection, and any other non-zero exit status means the revision
729 bisection, and any other non-zero exit status means the revision
730 is bad.
730 is bad.
731
731
732 .. container:: verbose
732 .. container:: verbose
733
733
734 Some examples:
734 Some examples:
735
735
736 - 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::
737
737
738 hg bisect --bad 34
738 hg bisect --bad 34
739 hg bisect --good 12
739 hg bisect --good 12
740
740
741 - advance the current bisection by marking current revision as good or
741 - advance the current bisection by marking current revision as good or
742 bad::
742 bad::
743
743
744 hg bisect --good
744 hg bisect --good
745 hg bisect --bad
745 hg bisect --bad
746
746
747 - 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
748 that revision is not usable because of another issue)::
748 that revision is not usable because of another issue)::
749
749
750 hg bisect --skip
750 hg bisect --skip
751 hg bisect --skip 23
751 hg bisect --skip 23
752
752
753 - skip all revisions that do not touch directories ``foo`` or ``bar``::
753 - skip all revisions that do not touch directories ``foo`` or ``bar``::
754
754
755 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
755 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
756
756
757 - forget the current bisection::
757 - forget the current bisection::
758
758
759 hg bisect --reset
759 hg bisect --reset
760
760
761 - use 'make && make tests' to automatically find the first broken
761 - use 'make && make tests' to automatically find the first broken
762 revision::
762 revision::
763
763
764 hg bisect --reset
764 hg bisect --reset
765 hg bisect --bad 34
765 hg bisect --bad 34
766 hg bisect --good 12
766 hg bisect --good 12
767 hg bisect --command "make && make tests"
767 hg bisect --command "make && make tests"
768
768
769 - see all changesets whose states are already known in the current
769 - see all changesets whose states are already known in the current
770 bisection::
770 bisection::
771
771
772 hg log -r "bisect(pruned)"
772 hg log -r "bisect(pruned)"
773
773
774 - see the changeset currently being bisected (especially useful
774 - see the changeset currently being bisected (especially useful
775 if running with -U/--noupdate)::
775 if running with -U/--noupdate)::
776
776
777 hg log -r "bisect(current)"
777 hg log -r "bisect(current)"
778
778
779 - see all changesets that took part in the current bisection::
779 - see all changesets that took part in the current bisection::
780
780
781 hg log -r "bisect(range)"
781 hg log -r "bisect(range)"
782
782
783 - you can even get a nice graph::
783 - you can even get a nice graph::
784
784
785 hg log --graph -r "bisect(range)"
785 hg log --graph -r "bisect(range)"
786
786
787 See :hg:`help revsets` for more about the `bisect()` keyword.
787 See :hg:`help revsets` for more about the `bisect()` keyword.
788
788
789 Returns 0 on success.
789 Returns 0 on success.
790 """
790 """
791 def extendbisectrange(nodes, good):
791 def extendbisectrange(nodes, good):
792 # bisect is incomplete when it ends on a merge node and
792 # bisect is incomplete when it ends on a merge node and
793 # one of the parent was not checked.
793 # one of the parent was not checked.
794 parents = repo[nodes[0]].parents()
794 parents = repo[nodes[0]].parents()
795 if len(parents) > 1:
795 if len(parents) > 1:
796 if good:
796 if good:
797 side = state['bad']
797 side = state['bad']
798 else:
798 else:
799 side = state['good']
799 side = state['good']
800 num = len(set(i.node() for i in parents) & set(side))
800 num = len(set(i.node() for i in parents) & set(side))
801 if num == 1:
801 if num == 1:
802 return parents[0].ancestor(parents[1])
802 return parents[0].ancestor(parents[1])
803 return None
803 return None
804
804
805 def print_result(nodes, good):
805 def print_result(nodes, good):
806 displayer = cmdutil.show_changeset(ui, repo, {})
806 displayer = cmdutil.show_changeset(ui, repo, {})
807 if len(nodes) == 1:
807 if len(nodes) == 1:
808 # narrowed it down to a single revision
808 # narrowed it down to a single revision
809 if good:
809 if good:
810 ui.write(_("The first good revision is:\n"))
810 ui.write(_("The first good revision is:\n"))
811 else:
811 else:
812 ui.write(_("The first bad revision is:\n"))
812 ui.write(_("The first bad revision is:\n"))
813 displayer.show(repo[nodes[0]])
813 displayer.show(repo[nodes[0]])
814 extendnode = extendbisectrange(nodes, good)
814 extendnode = extendbisectrange(nodes, good)
815 if extendnode is not None:
815 if extendnode is not None:
816 ui.write(_('Not all ancestors of this changeset have been'
816 ui.write(_('Not all ancestors of this changeset have been'
817 ' checked.\nUse bisect --extend to continue the '
817 ' checked.\nUse bisect --extend to continue the '
818 'bisection from\nthe common ancestor, %s.\n')
818 'bisection from\nthe common ancestor, %s.\n')
819 % extendnode)
819 % extendnode)
820 else:
820 else:
821 # multiple possible revisions
821 # multiple possible revisions
822 if good:
822 if good:
823 ui.write(_("Due to skipped revisions, the first "
823 ui.write(_("Due to skipped revisions, the first "
824 "good revision could be any of:\n"))
824 "good revision could be any of:\n"))
825 else:
825 else:
826 ui.write(_("Due to skipped revisions, the first "
826 ui.write(_("Due to skipped revisions, the first "
827 "bad revision could be any of:\n"))
827 "bad revision could be any of:\n"))
828 for n in nodes:
828 for n in nodes:
829 displayer.show(repo[n])
829 displayer.show(repo[n])
830 displayer.close()
830 displayer.close()
831
831
832 def check_state(state, interactive=True):
832 def check_state(state, interactive=True):
833 if not state['good'] or not state['bad']:
833 if not state['good'] or not state['bad']:
834 if (good or bad or skip or reset) and interactive:
834 if (good or bad or skip or reset) and interactive:
835 return
835 return
836 if not state['good']:
836 if not state['good']:
837 raise error.Abort(_('cannot bisect (no known good revisions)'))
837 raise error.Abort(_('cannot bisect (no known good revisions)'))
838 else:
838 else:
839 raise error.Abort(_('cannot bisect (no known bad revisions)'))
839 raise error.Abort(_('cannot bisect (no known bad revisions)'))
840 return True
840 return True
841
841
842 # backward compatibility
842 # backward compatibility
843 if rev in "good bad reset init".split():
843 if rev in "good bad reset init".split():
844 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
844 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
845 cmd, rev, extra = rev, extra, None
845 cmd, rev, extra = rev, extra, None
846 if cmd == "good":
846 if cmd == "good":
847 good = True
847 good = True
848 elif cmd == "bad":
848 elif cmd == "bad":
849 bad = True
849 bad = True
850 else:
850 else:
851 reset = True
851 reset = True
852 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
852 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
853 raise error.Abort(_('incompatible arguments'))
853 raise error.Abort(_('incompatible arguments'))
854
854
855 cmdutil.checkunfinished(repo)
855 cmdutil.checkunfinished(repo)
856
856
857 if reset:
857 if reset:
858 p = repo.join("bisect.state")
858 p = repo.join("bisect.state")
859 if os.path.exists(p):
859 if os.path.exists(p):
860 os.unlink(p)
860 os.unlink(p)
861 return
861 return
862
862
863 state = hbisect.load_state(repo)
863 state = hbisect.load_state(repo)
864
864
865 if command:
865 if command:
866 changesets = 1
866 changesets = 1
867 if noupdate:
867 if noupdate:
868 try:
868 try:
869 node = state['current'][0]
869 node = state['current'][0]
870 except LookupError:
870 except LookupError:
871 raise error.Abort(_('current bisect revision is unknown - '
871 raise error.Abort(_('current bisect revision is unknown - '
872 'start a new bisect to fix'))
872 'start a new bisect to fix'))
873 else:
873 else:
874 node, p2 = repo.dirstate.parents()
874 node, p2 = repo.dirstate.parents()
875 if p2 != nullid:
875 if p2 != nullid:
876 raise error.Abort(_('current bisect revision is a merge'))
876 raise error.Abort(_('current bisect revision is a merge'))
877 try:
877 try:
878 while changesets:
878 while changesets:
879 # update state
879 # update state
880 state['current'] = [node]
880 state['current'] = [node]
881 hbisect.save_state(repo, state)
881 hbisect.save_state(repo, state)
882 status = ui.system(command, environ={'HG_NODE': hex(node)})
882 status = ui.system(command, environ={'HG_NODE': hex(node)})
883 if status == 125:
883 if status == 125:
884 transition = "skip"
884 transition = "skip"
885 elif status == 0:
885 elif status == 0:
886 transition = "good"
886 transition = "good"
887 # status < 0 means process was killed
887 # status < 0 means process was killed
888 elif status == 127:
888 elif status == 127:
889 raise error.Abort(_("failed to execute %s") % command)
889 raise error.Abort(_("failed to execute %s") % command)
890 elif status < 0:
890 elif status < 0:
891 raise error.Abort(_("%s killed") % command)
891 raise error.Abort(_("%s killed") % command)
892 else:
892 else:
893 transition = "bad"
893 transition = "bad"
894 ctx = scmutil.revsingle(repo, rev, node)
894 ctx = scmutil.revsingle(repo, rev, node)
895 rev = None # clear for future iterations
895 rev = None # clear for future iterations
896 state[transition].append(ctx.node())
896 state[transition].append(ctx.node())
897 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
897 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
898 check_state(state, interactive=False)
898 check_state(state, interactive=False)
899 # bisect
899 # bisect
900 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
900 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
901 # update to next check
901 # update to next check
902 node = nodes[0]
902 node = nodes[0]
903 if not noupdate:
903 if not noupdate:
904 cmdutil.bailifchanged(repo)
904 cmdutil.bailifchanged(repo)
905 hg.clean(repo, node, show_stats=False)
905 hg.clean(repo, node, show_stats=False)
906 finally:
906 finally:
907 state['current'] = [node]
907 state['current'] = [node]
908 hbisect.save_state(repo, state)
908 hbisect.save_state(repo, state)
909 print_result(nodes, bgood)
909 print_result(nodes, bgood)
910 return
910 return
911
911
912 # update state
912 # update state
913
913
914 if rev:
914 if rev:
915 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
915 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
916 else:
916 else:
917 nodes = [repo.lookup('.')]
917 nodes = [repo.lookup('.')]
918
918
919 if good or bad or skip:
919 if good or bad or skip:
920 if good:
920 if good:
921 state['good'] += nodes
921 state['good'] += nodes
922 elif bad:
922 elif bad:
923 state['bad'] += nodes
923 state['bad'] += nodes
924 elif skip:
924 elif skip:
925 state['skip'] += nodes
925 state['skip'] += nodes
926 hbisect.save_state(repo, state)
926 hbisect.save_state(repo, state)
927
927
928 if not check_state(state):
928 if not check_state(state):
929 return
929 return
930
930
931 # actually bisect
931 # actually bisect
932 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
932 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
933 if extend:
933 if extend:
934 if not changesets:
934 if not changesets:
935 extendnode = extendbisectrange(nodes, good)
935 extendnode = extendbisectrange(nodes, good)
936 if extendnode is not None:
936 if extendnode is not None:
937 ui.write(_("Extending search to changeset %d:%s\n")
937 ui.write(_("Extending search to changeset %d:%s\n")
938 % (extendnode.rev(), extendnode))
938 % (extendnode.rev(), extendnode))
939 state['current'] = [extendnode.node()]
939 state['current'] = [extendnode.node()]
940 hbisect.save_state(repo, state)
940 hbisect.save_state(repo, state)
941 if noupdate:
941 if noupdate:
942 return
942 return
943 cmdutil.bailifchanged(repo)
943 cmdutil.bailifchanged(repo)
944 return hg.clean(repo, extendnode.node())
944 return hg.clean(repo, extendnode.node())
945 raise error.Abort(_("nothing to extend"))
945 raise error.Abort(_("nothing to extend"))
946
946
947 if changesets == 0:
947 if changesets == 0:
948 print_result(nodes, good)
948 print_result(nodes, good)
949 else:
949 else:
950 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
951 node = nodes[0]
951 node = nodes[0]
952 # compute the approximate number of remaining tests
952 # compute the approximate number of remaining tests
953 tests, size = 0, 2
953 tests, size = 0, 2
954 while size <= changesets:
954 while size <= changesets:
955 tests, size = tests + 1, size * 2
955 tests, size = tests + 1, size * 2
956 rev = repo.changelog.rev(node)
956 rev = repo.changelog.rev(node)
957 ui.write(_("Testing changeset %d:%s "
957 ui.write(_("Testing changeset %d:%s "
958 "(%d changesets remaining, ~%d tests)\n")
958 "(%d changesets remaining, ~%d tests)\n")
959 % (rev, short(node), changesets, tests))
959 % (rev, short(node), changesets, tests))
960 state['current'] = [node]
960 state['current'] = [node]
961 hbisect.save_state(repo, state)
961 hbisect.save_state(repo, state)
962 if not noupdate:
962 if not noupdate:
963 cmdutil.bailifchanged(repo)
963 cmdutil.bailifchanged(repo)
964 return hg.clean(repo, node)
964 return hg.clean(repo, node)
965
965
966 @command('bookmarks|bookmark',
966 @command('bookmarks|bookmark',
967 [('f', 'force', False, _('force')),
967 [('f', 'force', False, _('force')),
968 ('r', 'rev', '', _('revision'), _('REV')),
968 ('r', 'rev', '', _('revision'), _('REV')),
969 ('d', 'delete', False, _('delete a given bookmark')),
969 ('d', 'delete', False, _('delete a given bookmark')),
970 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
970 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
971 ('i', 'inactive', False, _('mark a bookmark inactive')),
971 ('i', 'inactive', False, _('mark a bookmark inactive')),
972 ] + formatteropts,
972 ] + formatteropts,
973 _('hg bookmarks [OPTIONS]... [NAME]...'))
973 _('hg bookmarks [OPTIONS]... [NAME]...'))
974 def bookmark(ui, repo, *names, **opts):
974 def bookmark(ui, repo, *names, **opts):
975 '''create a new bookmark or list existing bookmarks
975 '''create a new bookmark or list existing bookmarks
976
976
977 Bookmarks are labels on changesets to help track lines of development.
977 Bookmarks are labels on changesets to help track lines of development.
978 Bookmarks are unversioned and can be moved, renamed and deleted.
978 Bookmarks are unversioned and can be moved, renamed and deleted.
979 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.
980
980
981 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'.
982 The active bookmark is indicated with a '*'.
982 The active bookmark is indicated with a '*'.
983 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.
984 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.
985 Updating away from a bookmark will cause it to be deactivated.
985 Updating away from a bookmark will cause it to be deactivated.
986
986
987 Bookmarks can be pushed and pulled between repositories (see
987 Bookmarks can be pushed and pulled between repositories (see
988 :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
989 diverged, a new 'divergent bookmark' of the form 'name@path' will
989 diverged, a new 'divergent bookmark' of the form 'name@path' will
990 be created. Using :hg:`merge` will resolve the divergence.
990 be created. Using :hg:`merge` will resolve the divergence.
991
991
992 A bookmark named '@' has the special property that :hg:`clone` will
992 A bookmark named '@' has the special property that :hg:`clone` will
993 check it out by default if it exists.
993 check it out by default if it exists.
994
994
995 .. container:: verbose
995 .. container:: verbose
996
996
997 Examples:
997 Examples:
998
998
999 - create an active bookmark for a new line of development::
999 - create an active bookmark for a new line of development::
1000
1000
1001 hg book new-feature
1001 hg book new-feature
1002
1002
1003 - create an inactive bookmark as a place marker::
1003 - create an inactive bookmark as a place marker::
1004
1004
1005 hg book -i reviewed
1005 hg book -i reviewed
1006
1006
1007 - create an inactive bookmark on another changeset::
1007 - create an inactive bookmark on another changeset::
1008
1008
1009 hg book -r .^ tested
1009 hg book -r .^ tested
1010
1010
1011 - rename bookmark turkey to dinner::
1011 - rename bookmark turkey to dinner::
1012
1012
1013 hg book -m turkey dinner
1013 hg book -m turkey dinner
1014
1014
1015 - move the '@' bookmark from another branch::
1015 - move the '@' bookmark from another branch::
1016
1016
1017 hg book -f @
1017 hg book -f @
1018 '''
1018 '''
1019 force = opts.get('force')
1019 force = opts.get('force')
1020 rev = opts.get('rev')
1020 rev = opts.get('rev')
1021 delete = opts.get('delete')
1021 delete = opts.get('delete')
1022 rename = opts.get('rename')
1022 rename = opts.get('rename')
1023 inactive = opts.get('inactive')
1023 inactive = opts.get('inactive')
1024
1024
1025 def checkformat(mark):
1025 def checkformat(mark):
1026 mark = mark.strip()
1026 mark = mark.strip()
1027 if not mark:
1027 if not mark:
1028 raise error.Abort(_("bookmark names cannot consist entirely of "
1028 raise error.Abort(_("bookmark names cannot consist entirely of "
1029 "whitespace"))
1029 "whitespace"))
1030 scmutil.checknewlabel(repo, mark, 'bookmark')
1030 scmutil.checknewlabel(repo, mark, 'bookmark')
1031 return mark
1031 return mark
1032
1032
1033 def checkconflict(repo, mark, cur, force=False, target=None):
1033 def checkconflict(repo, mark, cur, force=False, target=None):
1034 if mark in marks and not force:
1034 if mark in marks and not force:
1035 if target:
1035 if target:
1036 if marks[mark] == target and target == cur:
1036 if marks[mark] == target and target == cur:
1037 # re-activating a bookmark
1037 # re-activating a bookmark
1038 return
1038 return
1039 anc = repo.changelog.ancestors([repo[target].rev()])
1039 anc = repo.changelog.ancestors([repo[target].rev()])
1040 bmctx = repo[marks[mark]]
1040 bmctx = repo[marks[mark]]
1041 divs = [repo[b].node() for b in marks
1041 divs = [repo[b].node() for b in marks
1042 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1042 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1043
1043
1044 # allow resolving a single divergent bookmark even if moving
1044 # allow resolving a single divergent bookmark even if moving
1045 # the bookmark across branches when a revision is specified
1045 # the bookmark across branches when a revision is specified
1046 # that contains a divergent bookmark
1046 # that contains a divergent bookmark
1047 if bmctx.rev() not in anc and target in divs:
1047 if bmctx.rev() not in anc and target in divs:
1048 bookmarks.deletedivergent(repo, [target], mark)
1048 bookmarks.deletedivergent(repo, [target], mark)
1049 return
1049 return
1050
1050
1051 deletefrom = [b for b in divs
1051 deletefrom = [b for b in divs
1052 if repo[b].rev() in anc or b == target]
1052 if repo[b].rev() in anc or b == target]
1053 bookmarks.deletedivergent(repo, deletefrom, mark)
1053 bookmarks.deletedivergent(repo, deletefrom, mark)
1054 if bookmarks.validdest(repo, bmctx, repo[target]):
1054 if bookmarks.validdest(repo, bmctx, repo[target]):
1055 ui.status(_("moving bookmark '%s' forward from %s\n") %
1055 ui.status(_("moving bookmark '%s' forward from %s\n") %
1056 (mark, short(bmctx.node())))
1056 (mark, short(bmctx.node())))
1057 return
1057 return
1058 raise error.Abort(_("bookmark '%s' already exists "
1058 raise error.Abort(_("bookmark '%s' already exists "
1059 "(use -f to force)") % mark)
1059 "(use -f to force)") % mark)
1060 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1060 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1061 and not force):
1061 and not force):
1062 raise error.Abort(
1062 raise error.Abort(
1063 _("a bookmark cannot have the name of an existing branch"))
1063 _("a bookmark cannot have the name of an existing branch"))
1064
1064
1065 if delete and rename:
1065 if delete and rename:
1066 raise error.Abort(_("--delete and --rename are incompatible"))
1066 raise error.Abort(_("--delete and --rename are incompatible"))
1067 if delete and rev:
1067 if delete and rev:
1068 raise error.Abort(_("--rev is incompatible with --delete"))
1068 raise error.Abort(_("--rev is incompatible with --delete"))
1069 if rename and rev:
1069 if rename and rev:
1070 raise error.Abort(_("--rev is incompatible with --rename"))
1070 raise error.Abort(_("--rev is incompatible with --rename"))
1071 if not names and (delete or rev):
1071 if not names and (delete or rev):
1072 raise error.Abort(_("bookmark name required"))
1072 raise error.Abort(_("bookmark name required"))
1073
1073
1074 if delete or rename or names or inactive:
1074 if delete or rename or names or inactive:
1075 wlock = lock = tr = None
1075 wlock = lock = tr = None
1076 try:
1076 try:
1077 wlock = repo.wlock()
1077 wlock = repo.wlock()
1078 lock = repo.lock()
1078 lock = repo.lock()
1079 cur = repo.changectx('.').node()
1079 cur = repo.changectx('.').node()
1080 marks = repo._bookmarks
1080 marks = repo._bookmarks
1081 if delete:
1081 if delete:
1082 tr = repo.transaction('bookmark')
1082 tr = repo.transaction('bookmark')
1083 for mark in names:
1083 for mark in names:
1084 if mark not in marks:
1084 if mark not in marks:
1085 raise error.Abort(_("bookmark '%s' does not exist") %
1085 raise error.Abort(_("bookmark '%s' does not exist") %
1086 mark)
1086 mark)
1087 if mark == repo._activebookmark:
1087 if mark == repo._activebookmark:
1088 bookmarks.deactivate(repo)
1088 bookmarks.deactivate(repo)
1089 del marks[mark]
1089 del marks[mark]
1090
1090
1091 elif rename:
1091 elif rename:
1092 tr = repo.transaction('bookmark')
1092 tr = repo.transaction('bookmark')
1093 if not names:
1093 if not names:
1094 raise error.Abort(_("new bookmark name required"))
1094 raise error.Abort(_("new bookmark name required"))
1095 elif len(names) > 1:
1095 elif len(names) > 1:
1096 raise error.Abort(_("only one new bookmark name allowed"))
1096 raise error.Abort(_("only one new bookmark name allowed"))
1097 mark = checkformat(names[0])
1097 mark = checkformat(names[0])
1098 if rename not in marks:
1098 if rename not in marks:
1099 raise error.Abort(_("bookmark '%s' does not exist")
1099 raise error.Abort(_("bookmark '%s' does not exist")
1100 % rename)
1100 % rename)
1101 checkconflict(repo, mark, cur, force)
1101 checkconflict(repo, mark, cur, force)
1102 marks[mark] = marks[rename]
1102 marks[mark] = marks[rename]
1103 if repo._activebookmark == rename and not inactive:
1103 if repo._activebookmark == rename and not inactive:
1104 bookmarks.activate(repo, mark)
1104 bookmarks.activate(repo, mark)
1105 del marks[rename]
1105 del marks[rename]
1106 elif names:
1106 elif names:
1107 tr = repo.transaction('bookmark')
1107 tr = repo.transaction('bookmark')
1108 newact = None
1108 newact = None
1109 for mark in names:
1109 for mark in names:
1110 mark = checkformat(mark)
1110 mark = checkformat(mark)
1111 if newact is None:
1111 if newact is None:
1112 newact = mark
1112 newact = mark
1113 if inactive and mark == repo._activebookmark:
1113 if inactive and mark == repo._activebookmark:
1114 bookmarks.deactivate(repo)
1114 bookmarks.deactivate(repo)
1115 return
1115 return
1116 tgt = cur
1116 tgt = cur
1117 if rev:
1117 if rev:
1118 tgt = scmutil.revsingle(repo, rev).node()
1118 tgt = scmutil.revsingle(repo, rev).node()
1119 checkconflict(repo, mark, cur, force, tgt)
1119 checkconflict(repo, mark, cur, force, tgt)
1120 marks[mark] = tgt
1120 marks[mark] = tgt
1121 if not inactive and cur == marks[newact] and not rev:
1121 if not inactive and cur == marks[newact] and not rev:
1122 bookmarks.activate(repo, newact)
1122 bookmarks.activate(repo, newact)
1123 elif cur != tgt and newact == repo._activebookmark:
1123 elif cur != tgt and newact == repo._activebookmark:
1124 bookmarks.deactivate(repo)
1124 bookmarks.deactivate(repo)
1125 elif inactive:
1125 elif inactive:
1126 if len(marks) == 0:
1126 if len(marks) == 0:
1127 ui.status(_("no bookmarks set\n"))
1127 ui.status(_("no bookmarks set\n"))
1128 elif not repo._activebookmark:
1128 elif not repo._activebookmark:
1129 ui.status(_("no active bookmark\n"))
1129 ui.status(_("no active bookmark\n"))
1130 else:
1130 else:
1131 bookmarks.deactivate(repo)
1131 bookmarks.deactivate(repo)
1132 if tr is not None:
1132 if tr is not None:
1133 marks.recordchange(tr)
1133 marks.recordchange(tr)
1134 tr.close()
1134 tr.close()
1135 finally:
1135 finally:
1136 lockmod.release(tr, lock, wlock)
1136 lockmod.release(tr, lock, wlock)
1137 else: # show bookmarks
1137 else: # show bookmarks
1138 fm = ui.formatter('bookmarks', opts)
1138 fm = ui.formatter('bookmarks', opts)
1139 hexfn = fm.hexfunc
1139 hexfn = fm.hexfunc
1140 marks = repo._bookmarks
1140 marks = repo._bookmarks
1141 if len(marks) == 0 and not fm:
1141 if len(marks) == 0 and not fm:
1142 ui.status(_("no bookmarks set\n"))
1142 ui.status(_("no bookmarks set\n"))
1143 for bmark, n in sorted(marks.iteritems()):
1143 for bmark, n in sorted(marks.iteritems()):
1144 active = repo._activebookmark
1144 active = repo._activebookmark
1145 if bmark == active:
1145 if bmark == active:
1146 prefix, label = '*', activebookmarklabel
1146 prefix, label = '*', activebookmarklabel
1147 else:
1147 else:
1148 prefix, label = ' ', ''
1148 prefix, label = ' ', ''
1149
1149
1150 fm.startitem()
1150 fm.startitem()
1151 if not ui.quiet:
1151 if not ui.quiet:
1152 fm.plain(' %s ' % prefix, label=label)
1152 fm.plain(' %s ' % prefix, label=label)
1153 fm.write('bookmark', '%s', bmark, label=label)
1153 fm.write('bookmark', '%s', bmark, label=label)
1154 pad = " " * (25 - encoding.colwidth(bmark))
1154 pad = " " * (25 - encoding.colwidth(bmark))
1155 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1155 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1156 repo.changelog.rev(n), hexfn(n), label=label)
1156 repo.changelog.rev(n), hexfn(n), label=label)
1157 fm.data(active=(bmark == active))
1157 fm.data(active=(bmark == active))
1158 fm.plain('\n')
1158 fm.plain('\n')
1159 fm.end()
1159 fm.end()
1160
1160
1161 @command('branch',
1161 @command('branch',
1162 [('f', 'force', None,
1162 [('f', 'force', None,
1163 _('set branch name even if it shadows an existing branch')),
1163 _('set branch name even if it shadows an existing branch')),
1164 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1164 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1165 _('[-fC] [NAME]'))
1165 _('[-fC] [NAME]'))
1166 def branch(ui, repo, label=None, **opts):
1166 def branch(ui, repo, label=None, **opts):
1167 """set or show the current branch name
1167 """set or show the current branch name
1168
1168
1169 .. note::
1169 .. note::
1170
1170
1171 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
1172 light-weight bookmark instead. See :hg:`help glossary` for more
1172 light-weight bookmark instead. See :hg:`help glossary` for more
1173 information about named branches and bookmarks.
1173 information about named branches and bookmarks.
1174
1174
1175 With no argument, show the current branch name. With one argument,
1175 With no argument, show the current branch name. With one argument,
1176 set the working directory branch name (the branch will not exist
1176 set the working directory branch name (the branch will not exist
1177 in the repository until the next commit). Standard practice
1177 in the repository until the next commit). Standard practice
1178 recommends that primary development take place on the 'default'
1178 recommends that primary development take place on the 'default'
1179 branch.
1179 branch.
1180
1180
1181 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
1182 branch name that already exists.
1182 branch name that already exists.
1183
1183
1184 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
1185 the parent of the working directory, negating a previous branch
1185 the parent of the working directory, negating a previous branch
1186 change.
1186 change.
1187
1187
1188 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
1189 :hg:`commit --close-branch` to mark this branch head as closed.
1189 :hg:`commit --close-branch` to mark this branch head as closed.
1190 When all heads of a branch are closed, the branch will be
1190 When all heads of a branch are closed, the branch will be
1191 considered closed.
1191 considered closed.
1192
1192
1193 Returns 0 on success.
1193 Returns 0 on success.
1194 """
1194 """
1195 if label:
1195 if label:
1196 label = label.strip()
1196 label = label.strip()
1197
1197
1198 if not opts.get('clean') and not label:
1198 if not opts.get('clean') and not label:
1199 ui.write("%s\n" % repo.dirstate.branch())
1199 ui.write("%s\n" % repo.dirstate.branch())
1200 return
1200 return
1201
1201
1202 wlock = repo.wlock()
1202 wlock = repo.wlock()
1203 try:
1203 try:
1204 if opts.get('clean'):
1204 if opts.get('clean'):
1205 label = repo[None].p1().branch()
1205 label = repo[None].p1().branch()
1206 repo.dirstate.setbranch(label)
1206 repo.dirstate.setbranch(label)
1207 ui.status(_('reset working directory to branch %s\n') % label)
1207 ui.status(_('reset working directory to branch %s\n') % label)
1208 elif label:
1208 elif label:
1209 if not opts.get('force') and label in repo.branchmap():
1209 if not opts.get('force') and label in repo.branchmap():
1210 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()]:
1211 raise error.Abort(_('a branch of the same name already'
1211 raise error.Abort(_('a branch of the same name already'
1212 ' exists'),
1212 ' exists'),
1213 # i18n: "it" refers to an existing branch
1213 # i18n: "it" refers to an existing branch
1214 hint=_("use 'hg update' to switch to it"))
1214 hint=_("use 'hg update' to switch to it"))
1215 scmutil.checknewlabel(repo, label, 'branch')
1215 scmutil.checknewlabel(repo, label, 'branch')
1216 repo.dirstate.setbranch(label)
1216 repo.dirstate.setbranch(label)
1217 ui.status(_('marked working directory as branch %s\n') % label)
1217 ui.status(_('marked working directory as branch %s\n') % label)
1218
1218
1219 # find any open named branches aside from default
1219 # find any open named branches aside from default
1220 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1220 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1221 if n != "default" and not c]
1221 if n != "default" and not c]
1222 if not others:
1222 if not others:
1223 ui.status(_('(branches are permanent and global, '
1223 ui.status(_('(branches are permanent and global, '
1224 'did you want a bookmark?)\n'))
1224 'did you want a bookmark?)\n'))
1225 finally:
1225 finally:
1226 wlock.release()
1226 wlock.release()
1227
1227
1228 @command('branches',
1228 @command('branches',
1229 [('a', 'active', False,
1229 [('a', 'active', False,
1230 _('show only branches that have unmerged heads (DEPRECATED)')),
1230 _('show only branches that have unmerged heads (DEPRECATED)')),
1231 ('c', 'closed', False, _('show normal and closed branches')),
1231 ('c', 'closed', False, _('show normal and closed branches')),
1232 ] + formatteropts,
1232 ] + formatteropts,
1233 _('[-ac]'))
1233 _('[-ac]'))
1234 def branches(ui, repo, active=False, closed=False, **opts):
1234 def branches(ui, repo, active=False, closed=False, **opts):
1235 """list repository named branches
1235 """list repository named branches
1236
1236
1237 List the repository's named branches, indicating which ones are
1237 List the repository's named branches, indicating which ones are
1238 inactive. If -c/--closed is specified, also list branches which have
1238 inactive. If -c/--closed is specified, also list branches which have
1239 been marked closed (see :hg:`commit --close-branch`).
1239 been marked closed (see :hg:`commit --close-branch`).
1240
1240
1241 Use the command :hg:`update` to switch to an existing branch.
1241 Use the command :hg:`update` to switch to an existing branch.
1242
1242
1243 Returns 0.
1243 Returns 0.
1244 """
1244 """
1245
1245
1246 fm = ui.formatter('branches', opts)
1246 fm = ui.formatter('branches', opts)
1247 hexfunc = fm.hexfunc
1247 hexfunc = fm.hexfunc
1248
1248
1249 allheads = set(repo.heads())
1249 allheads = set(repo.heads())
1250 branches = []
1250 branches = []
1251 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1251 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1252 isactive = not isclosed and bool(set(heads) & allheads)
1252 isactive = not isclosed and bool(set(heads) & allheads)
1253 branches.append((tag, repo[tip], isactive, not isclosed))
1253 branches.append((tag, repo[tip], isactive, not isclosed))
1254 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]),
1255 reverse=True)
1255 reverse=True)
1256
1256
1257 for tag, ctx, isactive, isopen in branches:
1257 for tag, ctx, isactive, isopen in branches:
1258 if active and not isactive:
1258 if active and not isactive:
1259 continue
1259 continue
1260 if isactive:
1260 if isactive:
1261 label = 'branches.active'
1261 label = 'branches.active'
1262 notice = ''
1262 notice = ''
1263 elif not isopen:
1263 elif not isopen:
1264 if not closed:
1264 if not closed:
1265 continue
1265 continue
1266 label = 'branches.closed'
1266 label = 'branches.closed'
1267 notice = _(' (closed)')
1267 notice = _(' (closed)')
1268 else:
1268 else:
1269 label = 'branches.inactive'
1269 label = 'branches.inactive'
1270 notice = _(' (inactive)')
1270 notice = _(' (inactive)')
1271 current = (tag == repo.dirstate.branch())
1271 current = (tag == repo.dirstate.branch())
1272 if current:
1272 if current:
1273 label = 'branches.current'
1273 label = 'branches.current'
1274
1274
1275 fm.startitem()
1275 fm.startitem()
1276 fm.write('branch', '%s', tag, label=label)
1276 fm.write('branch', '%s', tag, label=label)
1277 rev = ctx.rev()
1277 rev = ctx.rev()
1278 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1278 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1279 fmt = ' ' * padsize + ' %d:%s'
1279 fmt = ' ' * padsize + ' %d:%s'
1280 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()),
1281 label='log.changeset changeset.%s' % ctx.phasestr())
1281 label='log.changeset changeset.%s' % ctx.phasestr())
1282 fm.data(active=isactive, closed=not isopen, current=current)
1282 fm.data(active=isactive, closed=not isopen, current=current)
1283 if not ui.quiet:
1283 if not ui.quiet:
1284 fm.plain(notice)
1284 fm.plain(notice)
1285 fm.plain('\n')
1285 fm.plain('\n')
1286 fm.end()
1286 fm.end()
1287
1287
1288 @command('bundle',
1288 @command('bundle',
1289 [('f', 'force', None, _('run even when the destination is unrelated')),
1289 [('f', 'force', None, _('run even when the destination is unrelated')),
1290 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1290 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1291 _('REV')),
1291 _('REV')),
1292 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1292 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1293 _('BRANCH')),
1293 _('BRANCH')),
1294 ('', 'base', [],
1294 ('', 'base', [],
1295 _('a base changeset assumed to be available at the destination'),
1295 _('a base changeset assumed to be available at the destination'),
1296 _('REV')),
1296 _('REV')),
1297 ('a', 'all', None, _('bundle all changesets in the repository')),
1297 ('a', 'all', None, _('bundle all changesets in the repository')),
1298 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1298 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1299 ] + remoteopts,
1299 ] + remoteopts,
1300 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1300 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1301 def bundle(ui, repo, fname, dest=None, **opts):
1301 def bundle(ui, repo, fname, dest=None, **opts):
1302 """create a changegroup file
1302 """create a changegroup file
1303
1303
1304 Generate a changegroup file collecting changesets to be added
1304 Generate a changegroup file collecting changesets to be added
1305 to a repository.
1305 to a repository.
1306
1306
1307 To create a bundle containing all changesets, use -a/--all
1307 To create a bundle containing all changesets, use -a/--all
1308 (or --base null). Otherwise, hg assumes the destination will have
1308 (or --base null). Otherwise, hg assumes the destination will have
1309 all the nodes you specify with --base parameters. Otherwise, hg
1309 all the nodes you specify with --base parameters. Otherwise, hg
1310 will assume the repository has all the nodes in destination, or
1310 will assume the repository has all the nodes in destination, or
1311 default-push/default if no destination is specified.
1311 default-push/default if no destination is specified.
1312
1312
1313 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
1314 specify a compression, a bundle version or both using a dash
1314 specify a compression, a bundle version or both using a dash
1315 (comp-version). The available compression methods are: none, bzip2,
1315 (comp-version). The available compression methods are: none, bzip2,
1316 and gzip (by default, bundles are compressed using bzip2). The
1316 and gzip (by default, bundles are compressed using bzip2). The
1317 available formats are: v1, v2 (default to most suitable).
1317 available formats are: v1, v2 (default to most suitable).
1318
1318
1319 The bundle file can then be transferred using conventional means
1319 The bundle file can then be transferred using conventional means
1320 and applied to another repository with the unbundle or pull
1320 and applied to another repository with the unbundle or pull
1321 command. This is useful when direct push and pull are not
1321 command. This is useful when direct push and pull are not
1322 available or when exporting an entire repository is undesirable.
1322 available or when exporting an entire repository is undesirable.
1323
1323
1324 Applying bundles preserves all changeset contents including
1324 Applying bundles preserves all changeset contents including
1325 permissions, copy/rename information, and revision history.
1325 permissions, copy/rename information, and revision history.
1326
1326
1327 Returns 0 on success, 1 if no changes found.
1327 Returns 0 on success, 1 if no changes found.
1328 """
1328 """
1329 revs = None
1329 revs = None
1330 if 'rev' in opts:
1330 if 'rev' in opts:
1331 revs = scmutil.revrange(repo, opts['rev'])
1331 revs = scmutil.revrange(repo, opts['rev'])
1332
1332
1333 bundletype = opts.get('type', 'bzip2').lower()
1333 bundletype = opts.get('type', 'bzip2').lower()
1334 try:
1334 try:
1335 bcompression, cgversion, params = exchange.parsebundlespec(
1335 bcompression, cgversion, params = exchange.parsebundlespec(
1336 repo, bundletype, strict=False)
1336 repo, bundletype, strict=False)
1337 except error.UnsupportedBundleSpecification as e:
1337 except error.UnsupportedBundleSpecification as e:
1338 raise error.Abort(str(e),
1338 raise error.Abort(str(e),
1339 hint=_('see "hg help bundle" for supported '
1339 hint=_('see "hg help bundle" for supported '
1340 'values for --type'))
1340 'values for --type'))
1341
1341
1342 # Packed bundles are a pseudo bundle format for now.
1342 # Packed bundles are a pseudo bundle format for now.
1343 if cgversion == 's1':
1343 if cgversion == 's1':
1344 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1344 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1345 hint=_('use "hg debugcreatestreamclonebundle"'))
1345 hint=_('use "hg debugcreatestreamclonebundle"'))
1346
1346
1347 if opts.get('all'):
1347 if opts.get('all'):
1348 if dest:
1348 if dest:
1349 raise error.Abort(_("--all is incompatible with specifying "
1349 raise error.Abort(_("--all is incompatible with specifying "
1350 "a destination"))
1350 "a destination"))
1351 if opts.get('base'):
1351 if opts.get('base'):
1352 ui.warn(_("ignoring --base because --all was specified\n"))
1352 ui.warn(_("ignoring --base because --all was specified\n"))
1353 base = ['null']
1353 base = ['null']
1354 else:
1354 else:
1355 base = scmutil.revrange(repo, opts.get('base'))
1355 base = scmutil.revrange(repo, opts.get('base'))
1356 # TODO: get desired bundlecaps from command line.
1356 # TODO: get desired bundlecaps from command line.
1357 bundlecaps = None
1357 bundlecaps = None
1358 if base:
1358 if base:
1359 if dest:
1359 if dest:
1360 raise error.Abort(_("--base is incompatible with specifying "
1360 raise error.Abort(_("--base is incompatible with specifying "
1361 "a destination"))
1361 "a destination"))
1362 common = [repo.lookup(rev) for rev in base]
1362 common = [repo.lookup(rev) for rev in base]
1363 heads = revs and map(repo.lookup, revs) or revs
1363 heads = revs and map(repo.lookup, revs) or revs
1364 cg = changegroup.getchangegroup(repo, 'bundle', heads=heads,
1364 cg = changegroup.getchangegroup(repo, 'bundle', heads=heads,
1365 common=common, bundlecaps=bundlecaps,
1365 common=common, bundlecaps=bundlecaps,
1366 version=cgversion)
1366 version=cgversion)
1367 outgoing = None
1367 outgoing = None
1368 else:
1368 else:
1369 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1369 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1370 dest, branches = hg.parseurl(dest, opts.get('branch'))
1370 dest, branches = hg.parseurl(dest, opts.get('branch'))
1371 other = hg.peer(repo, opts, dest)
1371 other = hg.peer(repo, opts, dest)
1372 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1372 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1373 heads = revs and map(repo.lookup, revs) or revs
1373 heads = revs and map(repo.lookup, revs) or revs
1374 outgoing = discovery.findcommonoutgoing(repo, other,
1374 outgoing = discovery.findcommonoutgoing(repo, other,
1375 onlyheads=heads,
1375 onlyheads=heads,
1376 force=opts.get('force'),
1376 force=opts.get('force'),
1377 portable=True)
1377 portable=True)
1378 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1378 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1379 bundlecaps, version=cgversion)
1379 bundlecaps, version=cgversion)
1380 if not cg:
1380 if not cg:
1381 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1381 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1382 return 1
1382 return 1
1383
1383
1384 if cgversion == '01': #bundle1
1384 if cgversion == '01': #bundle1
1385 if bcompression is None:
1385 if bcompression is None:
1386 bcompression = 'UN'
1386 bcompression = 'UN'
1387 bversion = 'HG10' + bcompression
1387 bversion = 'HG10' + bcompression
1388 bcompression = None
1388 bcompression = None
1389 else:
1389 else:
1390 assert cgversion == '02'
1390 assert cgversion == '02'
1391 bversion = 'HG20'
1391 bversion = 'HG20'
1392
1392
1393
1393
1394 changegroup.writebundle(ui, cg, fname, bversion, compression=bcompression)
1394 changegroup.writebundle(ui, cg, fname, bversion, compression=bcompression)
1395
1395
1396 @command('cat',
1396 @command('cat',
1397 [('o', 'output', '',
1397 [('o', 'output', '',
1398 _('print output to file with formatted name'), _('FORMAT')),
1398 _('print output to file with formatted name'), _('FORMAT')),
1399 ('r', 'rev', '', _('print the given revision'), _('REV')),
1399 ('r', 'rev', '', _('print the given revision'), _('REV')),
1400 ('', 'decode', None, _('apply any matching decode filter')),
1400 ('', 'decode', None, _('apply any matching decode filter')),
1401 ] + walkopts,
1401 ] + walkopts,
1402 _('[OPTION]... FILE...'),
1402 _('[OPTION]... FILE...'),
1403 inferrepo=True)
1403 inferrepo=True)
1404 def cat(ui, repo, file1, *pats, **opts):
1404 def cat(ui, repo, file1, *pats, **opts):
1405 """output the current or given revision of files
1405 """output the current or given revision of files
1406
1406
1407 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
1408 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.
1409
1409
1410 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
1411 given using a format string. The formatting rules as follows:
1411 given using a format string. The formatting rules as follows:
1412
1412
1413 :``%%``: literal "%" character
1413 :``%%``: literal "%" character
1414 :``%s``: basename of file being printed
1414 :``%s``: basename of file being printed
1415 :``%d``: dirname of file being printed, or '.' if in repository root
1415 :``%d``: dirname of file being printed, or '.' if in repository root
1416 :``%p``: root-relative path name of file being printed
1416 :``%p``: root-relative path name of file being printed
1417 :``%H``: changeset hash (40 hexadecimal digits)
1417 :``%H``: changeset hash (40 hexadecimal digits)
1418 :``%R``: changeset revision number
1418 :``%R``: changeset revision number
1419 :``%h``: short-form changeset hash (12 hexadecimal digits)
1419 :``%h``: short-form changeset hash (12 hexadecimal digits)
1420 :``%r``: zero-padded changeset revision number
1420 :``%r``: zero-padded changeset revision number
1421 :``%b``: basename of the exporting repository
1421 :``%b``: basename of the exporting repository
1422
1422
1423 Returns 0 on success.
1423 Returns 0 on success.
1424 """
1424 """
1425 ctx = scmutil.revsingle(repo, opts.get('rev'))
1425 ctx = scmutil.revsingle(repo, opts.get('rev'))
1426 m = scmutil.match(ctx, (file1,) + pats, opts)
1426 m = scmutil.match(ctx, (file1,) + pats, opts)
1427
1427
1428 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1428 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1429
1429
1430 @command('^clone',
1430 @command('^clone',
1431 [('U', 'noupdate', None, _('the clone will include an empty working '
1431 [('U', 'noupdate', None, _('the clone will include an empty working '
1432 'directory (only a repository)')),
1432 'directory (only a repository)')),
1433 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1433 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1434 _('REV')),
1434 _('REV')),
1435 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1435 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1436 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1436 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1437 ('', 'pull', None, _('use pull protocol to copy metadata')),
1437 ('', 'pull', None, _('use pull protocol to copy metadata')),
1438 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1438 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1439 ] + remoteopts,
1439 ] + remoteopts,
1440 _('[OPTION]... SOURCE [DEST]'),
1440 _('[OPTION]... SOURCE [DEST]'),
1441 norepo=True)
1441 norepo=True)
1442 def clone(ui, source, dest=None, **opts):
1442 def clone(ui, source, dest=None, **opts):
1443 """make a copy of an existing repository
1443 """make a copy of an existing repository
1444
1444
1445 Create a copy of an existing repository in a new directory.
1445 Create a copy of an existing repository in a new directory.
1446
1446
1447 If no destination directory name is specified, it defaults to the
1447 If no destination directory name is specified, it defaults to the
1448 basename of the source.
1448 basename of the source.
1449
1449
1450 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
1451 ``.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.
1452
1452
1453 Only local paths and ``ssh://`` URLs are supported as
1453 Only local paths and ``ssh://`` URLs are supported as
1454 destinations. For ``ssh://`` destinations, no working directory or
1454 destinations. For ``ssh://`` destinations, no working directory or
1455 ``.hg/hgrc`` will be created on the remote side.
1455 ``.hg/hgrc`` will be created on the remote side.
1456
1456
1457 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
1458 identifiers with -r/--rev or branches with -b/--branch. The
1458 identifiers with -r/--rev or branches with -b/--branch. The
1459 resulting clone will contain only the specified changesets and
1459 resulting clone will contain only the specified changesets and
1460 their ancestors. These options (or 'clone src#rev dest') imply
1460 their ancestors. These options (or 'clone src#rev dest') imply
1461 --pull, even for local source repositories. Note that specifying a
1461 --pull, even for local source repositories. Note that specifying a
1462 tag will include the tagged changeset but not the changeset
1462 tag will include the tagged changeset but not the changeset
1463 containing the tag.
1463 containing the tag.
1464
1464
1465 If the source repository has a bookmark called '@' set, that
1465 If the source repository has a bookmark called '@' set, that
1466 revision will be checked out in the new repository by default.
1466 revision will be checked out in the new repository by default.
1467
1467
1468 To check out a particular version, use -u/--update, or
1468 To check out a particular version, use -u/--update, or
1469 -U/--noupdate to create a clone with no working directory.
1469 -U/--noupdate to create a clone with no working directory.
1470
1470
1471 .. container:: verbose
1471 .. container:: verbose
1472
1472
1473 For efficiency, hardlinks are used for cloning whenever the
1473 For efficiency, hardlinks are used for cloning whenever the
1474 source and destination are on the same filesystem (note this
1474 source and destination are on the same filesystem (note this
1475 applies only to the repository data, not to the working
1475 applies only to the repository data, not to the working
1476 directory). Some filesystems, such as AFS, implement hardlinking
1476 directory). Some filesystems, such as AFS, implement hardlinking
1477 incorrectly, but do not report errors. In these cases, use the
1477 incorrectly, but do not report errors. In these cases, use the
1478 --pull option to avoid hardlinking.
1478 --pull option to avoid hardlinking.
1479
1479
1480 In some cases, you can clone repositories and the working
1480 In some cases, you can clone repositories and the working
1481 directory using full hardlinks with ::
1481 directory using full hardlinks with ::
1482
1482
1483 $ cp -al REPO REPOCLONE
1483 $ cp -al REPO REPOCLONE
1484
1484
1485 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
1486 operation is not atomic (making sure REPO is not modified during
1486 operation is not atomic (making sure REPO is not modified during
1487 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
1488 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1488 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1489 so). Also, this is not compatible with certain extensions that
1489 so). Also, this is not compatible with certain extensions that
1490 place their metadata under the .hg directory, such as mq.
1490 place their metadata under the .hg directory, such as mq.
1491
1491
1492 Mercurial will update the working directory to the first applicable
1492 Mercurial will update the working directory to the first applicable
1493 revision from this list:
1493 revision from this list:
1494
1494
1495 a) null if -U or the source repository has no changesets
1495 a) null if -U or the source repository has no changesets
1496 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
1497 the source repository's working directory
1497 the source repository's working directory
1498 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
1499 latest head of that branch)
1499 latest head of that branch)
1500 d) the changeset specified with -r
1500 d) the changeset specified with -r
1501 e) the tipmost head specified with -b
1501 e) the tipmost head specified with -b
1502 f) the tipmost head specified with the url#branch source syntax
1502 f) the tipmost head specified with the url#branch source syntax
1503 g) the revision marked with the '@' bookmark, if present
1503 g) the revision marked with the '@' bookmark, if present
1504 h) the tipmost head of the default branch
1504 h) the tipmost head of the default branch
1505 i) tip
1505 i) tip
1506
1506
1507 Examples:
1507 Examples:
1508
1508
1509 - clone a remote repository to a new directory named hg/::
1509 - clone a remote repository to a new directory named hg/::
1510
1510
1511 hg clone http://selenic.com/hg
1511 hg clone http://selenic.com/hg
1512
1512
1513 - create a lightweight local clone::
1513 - create a lightweight local clone::
1514
1514
1515 hg clone project/ project-feature/
1515 hg clone project/ project-feature/
1516
1516
1517 - 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)::
1518
1518
1519 hg clone ssh://user@server//home/projects/alpha/
1519 hg clone ssh://user@server//home/projects/alpha/
1520
1520
1521 - 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
1522 specified version::
1522 specified version::
1523
1523
1524 hg clone --uncompressed http://server/repo -u 1.5
1524 hg clone --uncompressed http://server/repo -u 1.5
1525
1525
1526 - create a repository without changesets after a particular revision::
1526 - create a repository without changesets after a particular revision::
1527
1527
1528 hg clone -r 04e544 experimental/ good/
1528 hg clone -r 04e544 experimental/ good/
1529
1529
1530 - clone (and track) a particular named branch::
1530 - clone (and track) a particular named branch::
1531
1531
1532 hg clone http://selenic.com/hg#stable
1532 hg clone http://selenic.com/hg#stable
1533
1533
1534 See :hg:`help urls` for details on specifying URLs.
1534 See :hg:`help urls` for details on specifying URLs.
1535
1535
1536 Returns 0 on success.
1536 Returns 0 on success.
1537 """
1537 """
1538 if opts.get('noupdate') and opts.get('updaterev'):
1538 if opts.get('noupdate') and opts.get('updaterev'):
1539 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1539 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1540
1540
1541 r = hg.clone(ui, opts, source, dest,
1541 r = hg.clone(ui, opts, source, dest,
1542 pull=opts.get('pull'),
1542 pull=opts.get('pull'),
1543 stream=opts.get('uncompressed'),
1543 stream=opts.get('uncompressed'),
1544 rev=opts.get('rev'),
1544 rev=opts.get('rev'),
1545 update=opts.get('updaterev') or not opts.get('noupdate'),
1545 update=opts.get('updaterev') or not opts.get('noupdate'),
1546 branch=opts.get('branch'),
1546 branch=opts.get('branch'),
1547 shareopts=opts.get('shareopts'))
1547 shareopts=opts.get('shareopts'))
1548
1548
1549 return r is None
1549 return r is None
1550
1550
1551 @command('^commit|ci',
1551 @command('^commit|ci',
1552 [('A', 'addremove', None,
1552 [('A', 'addremove', None,
1553 _('mark new/missing files as added/removed before committing')),
1553 _('mark new/missing files as added/removed before committing')),
1554 ('', 'close-branch', None,
1554 ('', 'close-branch', None,
1555 _('mark a branch head as closed')),
1555 _('mark a branch head as closed')),
1556 ('', 'amend', None, _('amend the parent of the working directory')),
1556 ('', 'amend', None, _('amend the parent of the working directory')),
1557 ('s', 'secret', None, _('use the secret phase for committing')),
1557 ('s', 'secret', None, _('use the secret phase for committing')),
1558 ('e', 'edit', None, _('invoke editor on commit messages')),
1558 ('e', 'edit', None, _('invoke editor on commit messages')),
1559 ('i', 'interactive', None, _('use interactive mode')),
1559 ('i', 'interactive', None, _('use interactive mode')),
1560 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1560 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1561 _('[OPTION]... [FILE]...'),
1561 _('[OPTION]... [FILE]...'),
1562 inferrepo=True)
1562 inferrepo=True)
1563 def commit(ui, repo, *pats, **opts):
1563 def commit(ui, repo, *pats, **opts):
1564 """commit the specified files or all outstanding changes
1564 """commit the specified files or all outstanding changes
1565
1565
1566 Commit changes to the given files into the repository. Unlike a
1566 Commit changes to the given files into the repository. Unlike a
1567 centralized SCM, this operation is a local operation. See
1567 centralized SCM, this operation is a local operation. See
1568 :hg:`push` for a way to actively distribute your changes.
1568 :hg:`push` for a way to actively distribute your changes.
1569
1569
1570 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`
1571 will be committed.
1571 will be committed.
1572
1572
1573 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
1574 filenames or -I/-X filters.
1574 filenames or -I/-X filters.
1575
1575
1576 If no commit message is specified, Mercurial starts your
1576 If no commit message is specified, Mercurial starts your
1577 configured editor where you can enter a message. In case your
1577 configured editor where you can enter a message. In case your
1578 commit fails, you will find a backup of your message in
1578 commit fails, you will find a backup of your message in
1579 ``.hg/last-message.txt``.
1579 ``.hg/last-message.txt``.
1580
1580
1581 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
1582 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
1583 will be considered closed and no longer listed.
1583 will be considered closed and no longer listed.
1584
1584
1585 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
1586 working directory with a new commit that contains the changes
1586 working directory with a new commit that contains the changes
1587 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`,
1588 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
1589 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1589 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1590 on how to restore it).
1590 on how to restore it).
1591
1591
1592 Message, user and date are taken from the amended commit unless
1592 Message, user and date are taken from the amended commit unless
1593 specified. When a message isn't specified on the command line,
1593 specified. When a message isn't specified on the command line,
1594 the editor will open with the message of the amended commit.
1594 the editor will open with the message of the amended commit.
1595
1595
1596 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`)
1597 or changesets that have children.
1597 or changesets that have children.
1598
1598
1599 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.
1600
1600
1601 Returns 0 on success, 1 if nothing changed.
1601 Returns 0 on success, 1 if nothing changed.
1602
1602
1603 .. container:: verbose
1603 .. container:: verbose
1604
1604
1605 Examples:
1605 Examples:
1606
1606
1607 - commit all files ending in .py::
1607 - commit all files ending in .py::
1608
1608
1609 hg commit --include "set:**.py"
1609 hg commit --include "set:**.py"
1610
1610
1611 - commit all non-binary files::
1611 - commit all non-binary files::
1612
1612
1613 hg commit --exclude "set:binary()"
1613 hg commit --exclude "set:binary()"
1614
1614
1615 - amend the current commit and set the date to now::
1615 - amend the current commit and set the date to now::
1616
1616
1617 hg commit --amend --date now
1617 hg commit --amend --date now
1618 """
1618 """
1619 wlock = lock = None
1619 wlock = lock = None
1620 try:
1620 try:
1621 wlock = repo.wlock()
1621 wlock = repo.wlock()
1622 lock = repo.lock()
1622 lock = repo.lock()
1623 return _docommit(ui, repo, *pats, **opts)
1623 return _docommit(ui, repo, *pats, **opts)
1624 finally:
1624 finally:
1625 release(lock, wlock)
1625 release(lock, wlock)
1626
1626
1627 def _docommit(ui, repo, *pats, **opts):
1627 def _docommit(ui, repo, *pats, **opts):
1628 if opts.get('interactive'):
1628 if opts.get('interactive'):
1629 opts.pop('interactive')
1629 opts.pop('interactive')
1630 cmdutil.dorecord(ui, repo, commit, None, False,
1630 cmdutil.dorecord(ui, repo, commit, None, False,
1631 cmdutil.recordfilter, *pats, **opts)
1631 cmdutil.recordfilter, *pats, **opts)
1632 return
1632 return
1633
1633
1634 if opts.get('subrepos'):
1634 if opts.get('subrepos'):
1635 if opts.get('amend'):
1635 if opts.get('amend'):
1636 raise error.Abort(_('cannot amend with --subrepos'))
1636 raise error.Abort(_('cannot amend with --subrepos'))
1637 # Let --subrepos on the command line override config setting.
1637 # Let --subrepos on the command line override config setting.
1638 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1638 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1639
1639
1640 cmdutil.checkunfinished(repo, commit=True)
1640 cmdutil.checkunfinished(repo, commit=True)
1641
1641
1642 branch = repo[None].branch()
1642 branch = repo[None].branch()
1643 bheads = repo.branchheads(branch)
1643 bheads = repo.branchheads(branch)
1644
1644
1645 extra = {}
1645 extra = {}
1646 if opts.get('close_branch'):
1646 if opts.get('close_branch'):
1647 extra['close'] = 1
1647 extra['close'] = 1
1648
1648
1649 if not bheads:
1649 if not bheads:
1650 raise error.Abort(_('can only close branch heads'))
1650 raise error.Abort(_('can only close branch heads'))
1651 elif opts.get('amend'):
1651 elif opts.get('amend'):
1652 if repo[None].parents()[0].p1().branch() != branch and \
1652 if repo[None].parents()[0].p1().branch() != branch and \
1653 repo[None].parents()[0].p2().branch() != branch:
1653 repo[None].parents()[0].p2().branch() != branch:
1654 raise error.Abort(_('can only close branch heads'))
1654 raise error.Abort(_('can only close branch heads'))
1655
1655
1656 if opts.get('amend'):
1656 if opts.get('amend'):
1657 if ui.configbool('ui', 'commitsubrepos'):
1657 if ui.configbool('ui', 'commitsubrepos'):
1658 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1658 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1659
1659
1660 old = repo['.']
1660 old = repo['.']
1661 if not old.mutable():
1661 if not old.mutable():
1662 raise error.Abort(_('cannot amend public changesets'))
1662 raise error.Abort(_('cannot amend public changesets'))
1663 if len(repo[None].parents()) > 1:
1663 if len(repo[None].parents()) > 1:
1664 raise error.Abort(_('cannot amend while merging'))
1664 raise error.Abort(_('cannot amend while merging'))
1665 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1665 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1666 if not allowunstable and old.children():
1666 if not allowunstable and old.children():
1667 raise error.Abort(_('cannot amend changeset with children'))
1667 raise error.Abort(_('cannot amend changeset with children'))
1668
1668
1669 newextra = extra.copy()
1669 newextra = extra.copy()
1670 newextra['branch'] = branch
1670 newextra['branch'] = branch
1671 extra = newextra
1671 extra = newextra
1672 # commitfunc is used only for temporary amend commit by cmdutil.amend
1672 # commitfunc is used only for temporary amend commit by cmdutil.amend
1673 def commitfunc(ui, repo, message, match, opts):
1673 def commitfunc(ui, repo, message, match, opts):
1674 return repo.commit(message,
1674 return repo.commit(message,
1675 opts.get('user') or old.user(),
1675 opts.get('user') or old.user(),
1676 opts.get('date') or old.date(),
1676 opts.get('date') or old.date(),
1677 match,
1677 match,
1678 extra=extra)
1678 extra=extra)
1679
1679
1680 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1680 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1681 if node == old.node():
1681 if node == old.node():
1682 ui.status(_("nothing changed\n"))
1682 ui.status(_("nothing changed\n"))
1683 return 1
1683 return 1
1684 else:
1684 else:
1685 def commitfunc(ui, repo, message, match, opts):
1685 def commitfunc(ui, repo, message, match, opts):
1686 backup = ui.backupconfig('phases', 'new-commit')
1686 backup = ui.backupconfig('phases', 'new-commit')
1687 baseui = repo.baseui
1687 baseui = repo.baseui
1688 basebackup = baseui.backupconfig('phases', 'new-commit')
1688 basebackup = baseui.backupconfig('phases', 'new-commit')
1689 try:
1689 try:
1690 if opts.get('secret'):
1690 if opts.get('secret'):
1691 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1691 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1692 # Propagate to subrepos
1692 # Propagate to subrepos
1693 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1693 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1694
1694
1695 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1695 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1696 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1696 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1697 return repo.commit(message, opts.get('user'), opts.get('date'),
1697 return repo.commit(message, opts.get('user'), opts.get('date'),
1698 match,
1698 match,
1699 editor=editor,
1699 editor=editor,
1700 extra=extra)
1700 extra=extra)
1701 finally:
1701 finally:
1702 ui.restoreconfig(backup)
1702 ui.restoreconfig(backup)
1703 repo.baseui.restoreconfig(basebackup)
1703 repo.baseui.restoreconfig(basebackup)
1704
1704
1705
1705
1706 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1706 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1707
1707
1708 if not node:
1708 if not node:
1709 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1709 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1710 if stat[3]:
1710 if stat[3]:
1711 ui.status(_("nothing changed (%d missing files, see "
1711 ui.status(_("nothing changed (%d missing files, see "
1712 "'hg status')\n") % len(stat[3]))
1712 "'hg status')\n") % len(stat[3]))
1713 else:
1713 else:
1714 ui.status(_("nothing changed\n"))
1714 ui.status(_("nothing changed\n"))
1715 return 1
1715 return 1
1716
1716
1717 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1717 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1718
1718
1719 @command('config|showconfig|debugconfig',
1719 @command('config|showconfig|debugconfig',
1720 [('u', 'untrusted', None, _('show untrusted configuration options')),
1720 [('u', 'untrusted', None, _('show untrusted configuration options')),
1721 ('e', 'edit', None, _('edit user config')),
1721 ('e', 'edit', None, _('edit user config')),
1722 ('l', 'local', None, _('edit repository config')),
1722 ('l', 'local', None, _('edit repository config')),
1723 ('g', 'global', None, _('edit global config'))],
1723 ('g', 'global', None, _('edit global config'))],
1724 _('[-u] [NAME]...'),
1724 _('[-u] [NAME]...'),
1725 optionalrepo=True)
1725 optionalrepo=True)
1726 def config(ui, repo, *values, **opts):
1726 def config(ui, repo, *values, **opts):
1727 """show combined config settings from all hgrc files
1727 """show combined config settings from all hgrc files
1728
1728
1729 With no arguments, print names and values of all config items.
1729 With no arguments, print names and values of all config items.
1730
1730
1731 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
1732 of that config item.
1732 of that config item.
1733
1733
1734 With multiple arguments, print names and values of all config
1734 With multiple arguments, print names and values of all config
1735 items with matching section names.
1735 items with matching section names.
1736
1736
1737 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
1738 --global, edit the system-wide config file. With --local, edit the
1738 --global, edit the system-wide config file. With --local, edit the
1739 repository-level config file.
1739 repository-level config file.
1740
1740
1741 With --debug, the source (filename and line number) is printed
1741 With --debug, the source (filename and line number) is printed
1742 for each config item.
1742 for each config item.
1743
1743
1744 See :hg:`help config` for more information about config files.
1744 See :hg:`help config` for more information about config files.
1745
1745
1746 Returns 0 on success, 1 if NAME does not exist.
1746 Returns 0 on success, 1 if NAME does not exist.
1747
1747
1748 """
1748 """
1749
1749
1750 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'):
1751 if opts.get('local') and opts.get('global'):
1751 if opts.get('local') and opts.get('global'):
1752 raise error.Abort(_("can't use --local and --global together"))
1752 raise error.Abort(_("can't use --local and --global together"))
1753
1753
1754 if opts.get('local'):
1754 if opts.get('local'):
1755 if not repo:
1755 if not repo:
1756 raise error.Abort(_("can't use --local outside a repository"))
1756 raise error.Abort(_("can't use --local outside a repository"))
1757 paths = [repo.join('hgrc')]
1757 paths = [repo.join('hgrc')]
1758 elif opts.get('global'):
1758 elif opts.get('global'):
1759 paths = scmutil.systemrcpath()
1759 paths = scmutil.systemrcpath()
1760 else:
1760 else:
1761 paths = scmutil.userrcpath()
1761 paths = scmutil.userrcpath()
1762
1762
1763 for f in paths:
1763 for f in paths:
1764 if os.path.exists(f):
1764 if os.path.exists(f):
1765 break
1765 break
1766 else:
1766 else:
1767 if opts.get('global'):
1767 if opts.get('global'):
1768 samplehgrc = uimod.samplehgrcs['global']
1768 samplehgrc = uimod.samplehgrcs['global']
1769 elif opts.get('local'):
1769 elif opts.get('local'):
1770 samplehgrc = uimod.samplehgrcs['local']
1770 samplehgrc = uimod.samplehgrcs['local']
1771 else:
1771 else:
1772 samplehgrc = uimod.samplehgrcs['user']
1772 samplehgrc = uimod.samplehgrcs['user']
1773
1773
1774 f = paths[0]
1774 f = paths[0]
1775 fp = open(f, "w")
1775 fp = open(f, "w")
1776 fp.write(samplehgrc)
1776 fp.write(samplehgrc)
1777 fp.close()
1777 fp.close()
1778
1778
1779 editor = ui.geteditor()
1779 editor = ui.geteditor()
1780 ui.system("%s \"%s\"" % (editor, f),
1780 ui.system("%s \"%s\"" % (editor, f),
1781 onerr=error.Abort, errprefix=_("edit failed"))
1781 onerr=error.Abort, errprefix=_("edit failed"))
1782 return
1782 return
1783
1783
1784 for f in scmutil.rcpath():
1784 for f in scmutil.rcpath():
1785 ui.debug('read config from: %s\n' % f)
1785 ui.debug('read config from: %s\n' % f)
1786 untrusted = bool(opts.get('untrusted'))
1786 untrusted = bool(opts.get('untrusted'))
1787 if values:
1787 if values:
1788 sections = [v for v in values if '.' not in v]
1788 sections = [v for v in values if '.' not in v]
1789 items = [v for v in values if '.' in v]
1789 items = [v for v in values if '.' in v]
1790 if len(items) > 1 or items and sections:
1790 if len(items) > 1 or items and sections:
1791 raise error.Abort(_('only one config item permitted'))
1791 raise error.Abort(_('only one config item permitted'))
1792 matched = False
1792 matched = False
1793 for section, name, value in ui.walkconfig(untrusted=untrusted):
1793 for section, name, value in ui.walkconfig(untrusted=untrusted):
1794 value = str(value).replace('\n', '\\n')
1794 value = str(value).replace('\n', '\\n')
1795 sectname = section + '.' + name
1795 sectname = section + '.' + name
1796 if values:
1796 if values:
1797 for v in values:
1797 for v in values:
1798 if v == section:
1798 if v == section:
1799 ui.debug('%s: ' %
1799 ui.debug('%s: ' %
1800 ui.configsource(section, name, untrusted))
1800 ui.configsource(section, name, untrusted))
1801 ui.write('%s=%s\n' % (sectname, value))
1801 ui.write('%s=%s\n' % (sectname, value))
1802 matched = True
1802 matched = True
1803 elif v == sectname:
1803 elif v == sectname:
1804 ui.debug('%s: ' %
1804 ui.debug('%s: ' %
1805 ui.configsource(section, name, untrusted))
1805 ui.configsource(section, name, untrusted))
1806 ui.write(value, '\n')
1806 ui.write(value, '\n')
1807 matched = True
1807 matched = True
1808 else:
1808 else:
1809 ui.debug('%s: ' %
1809 ui.debug('%s: ' %
1810 ui.configsource(section, name, untrusted))
1810 ui.configsource(section, name, untrusted))
1811 ui.write('%s=%s\n' % (sectname, value))
1811 ui.write('%s=%s\n' % (sectname, value))
1812 matched = True
1812 matched = True
1813 if matched:
1813 if matched:
1814 return 0
1814 return 0
1815 return 1
1815 return 1
1816
1816
1817 @command('copy|cp',
1817 @command('copy|cp',
1818 [('A', 'after', None, _('record a copy that has already occurred')),
1818 [('A', 'after', None, _('record a copy that has already occurred')),
1819 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1819 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1820 ] + walkopts + dryrunopts,
1820 ] + walkopts + dryrunopts,
1821 _('[OPTION]... [SOURCE]... DEST'))
1821 _('[OPTION]... [SOURCE]... DEST'))
1822 def copy(ui, repo, *pats, **opts):
1822 def copy(ui, repo, *pats, **opts):
1823 """mark files as copied for the next commit
1823 """mark files as copied for the next commit
1824
1824
1825 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
1826 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,
1827 the source must be a single file.
1827 the source must be a single file.
1828
1828
1829 By default, this command copies the contents of files as they
1829 By default, this command copies the contents of files as they
1830 exist in the working directory. If invoked with -A/--after, the
1830 exist in the working directory. If invoked with -A/--after, the
1831 operation is recorded, but no copying is performed.
1831 operation is recorded, but no copying is performed.
1832
1832
1833 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
1834 before that, see :hg:`revert`.
1834 before that, see :hg:`revert`.
1835
1835
1836 Returns 0 on success, 1 if errors are encountered.
1836 Returns 0 on success, 1 if errors are encountered.
1837 """
1837 """
1838 wlock = repo.wlock(False)
1838 wlock = repo.wlock(False)
1839 try:
1839 try:
1840 return cmdutil.copy(ui, repo, pats, opts)
1840 return cmdutil.copy(ui, repo, pats, opts)
1841 finally:
1841 finally:
1842 wlock.release()
1842 wlock.release()
1843
1843
1844 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1844 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1845 def debugancestor(ui, repo, *args):
1845 def debugancestor(ui, repo, *args):
1846 """find the ancestor revision of two revisions in a given index"""
1846 """find the ancestor revision of two revisions in a given index"""
1847 if len(args) == 3:
1847 if len(args) == 3:
1848 index, rev1, rev2 = args
1848 index, rev1, rev2 = args
1849 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1849 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1850 lookup = r.lookup
1850 lookup = r.lookup
1851 elif len(args) == 2:
1851 elif len(args) == 2:
1852 if not repo:
1852 if not repo:
1853 raise error.Abort(_("there is no Mercurial repository here "
1853 raise error.Abort(_("there is no Mercurial repository here "
1854 "(.hg not found)"))
1854 "(.hg not found)"))
1855 rev1, rev2 = args
1855 rev1, rev2 = args
1856 r = repo.changelog
1856 r = repo.changelog
1857 lookup = repo.lookup
1857 lookup = repo.lookup
1858 else:
1858 else:
1859 raise error.Abort(_('either two or three arguments required'))
1859 raise error.Abort(_('either two or three arguments required'))
1860 a = r.ancestor(lookup(rev1), lookup(rev2))
1860 a = r.ancestor(lookup(rev1), lookup(rev2))
1861 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1861 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1862
1862
1863 @command('debugbuilddag',
1863 @command('debugbuilddag',
1864 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1864 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1865 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1865 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1866 ('n', 'new-file', None, _('add new file at each rev'))],
1866 ('n', 'new-file', None, _('add new file at each rev'))],
1867 _('[OPTION]... [TEXT]'))
1867 _('[OPTION]... [TEXT]'))
1868 def debugbuilddag(ui, repo, text=None,
1868 def debugbuilddag(ui, repo, text=None,
1869 mergeable_file=False,
1869 mergeable_file=False,
1870 overwritten_file=False,
1870 overwritten_file=False,
1871 new_file=False):
1871 new_file=False):
1872 """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
1873
1873
1874 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
1875 command line.
1875 command line.
1876
1876
1877 Elements:
1877 Elements:
1878
1878
1879 - "+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
1880 - "." is a single node based on the current default parent
1880 - "." is a single node based on the current default parent
1881 - "$" resets the default parent to null (implied at the start);
1881 - "$" resets the default parent to null (implied at the start);
1882 otherwise the default parent is always the last node created
1882 otherwise the default parent is always the last node created
1883 - "<p" sets the default parent to the backref p
1883 - "<p" sets the default parent to the backref p
1884 - "*p" is a fork at parent p, which is a backref
1884 - "*p" is a fork at parent p, which is a backref
1885 - "*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
1886 - "/p2" is a merge of the preceding node and p2
1886 - "/p2" is a merge of the preceding node and p2
1887 - ":tag" defines a local tag for the preceding node
1887 - ":tag" defines a local tag for the preceding node
1888 - "@branch" sets the named branch for subsequent nodes
1888 - "@branch" sets the named branch for subsequent nodes
1889 - "#...\\n" is a comment up to the end of the line
1889 - "#...\\n" is a comment up to the end of the line
1890
1890
1891 Whitespace between the above elements is ignored.
1891 Whitespace between the above elements is ignored.
1892
1892
1893 A backref is either
1893 A backref is either
1894
1894
1895 - 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
1896 node, or
1896 node, or
1897 - 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
1898 - empty to denote the default parent.
1898 - empty to denote the default parent.
1899
1899
1900 All string valued-elements are either strictly alphanumeric, or must
1900 All string valued-elements are either strictly alphanumeric, or must
1901 be enclosed in double quotes ("..."), with "\\" as escape character.
1901 be enclosed in double quotes ("..."), with "\\" as escape character.
1902 """
1902 """
1903
1903
1904 if text is None:
1904 if text is None:
1905 ui.status(_("reading DAG from stdin\n"))
1905 ui.status(_("reading DAG from stdin\n"))
1906 text = ui.fin.read()
1906 text = ui.fin.read()
1907
1907
1908 cl = repo.changelog
1908 cl = repo.changelog
1909 if len(cl) > 0:
1909 if len(cl) > 0:
1910 raise error.Abort(_('repository is not empty'))
1910 raise error.Abort(_('repository is not empty'))
1911
1911
1912 # determine number of revs in DAG
1912 # determine number of revs in DAG
1913 total = 0
1913 total = 0
1914 for type, data in dagparser.parsedag(text):
1914 for type, data in dagparser.parsedag(text):
1915 if type == 'n':
1915 if type == 'n':
1916 total += 1
1916 total += 1
1917
1917
1918 if mergeable_file:
1918 if mergeable_file:
1919 linesperrev = 2
1919 linesperrev = 2
1920 # make a file with k lines per rev
1920 # make a file with k lines per rev
1921 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1921 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1922 initialmergedlines.append("")
1922 initialmergedlines.append("")
1923
1923
1924 tags = []
1924 tags = []
1925
1925
1926 lock = tr = None
1926 lock = tr = None
1927 try:
1927 try:
1928 lock = repo.lock()
1928 lock = repo.lock()
1929 tr = repo.transaction("builddag")
1929 tr = repo.transaction("builddag")
1930
1930
1931 at = -1
1931 at = -1
1932 atbranch = 'default'
1932 atbranch = 'default'
1933 nodeids = []
1933 nodeids = []
1934 id = 0
1934 id = 0
1935 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1935 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1936 for type, data in dagparser.parsedag(text):
1936 for type, data in dagparser.parsedag(text):
1937 if type == 'n':
1937 if type == 'n':
1938 ui.note(('node %s\n' % str(data)))
1938 ui.note(('node %s\n' % str(data)))
1939 id, ps = data
1939 id, ps = data
1940
1940
1941 files = []
1941 files = []
1942 fctxs = {}
1942 fctxs = {}
1943
1943
1944 p2 = None
1944 p2 = None
1945 if mergeable_file:
1945 if mergeable_file:
1946 fn = "mf"
1946 fn = "mf"
1947 p1 = repo[ps[0]]
1947 p1 = repo[ps[0]]
1948 if len(ps) > 1:
1948 if len(ps) > 1:
1949 p2 = repo[ps[1]]
1949 p2 = repo[ps[1]]
1950 pa = p1.ancestor(p2)
1950 pa = p1.ancestor(p2)
1951 base, local, other = [x[fn].data() for x in (pa, p1,
1951 base, local, other = [x[fn].data() for x in (pa, p1,
1952 p2)]
1952 p2)]
1953 m3 = simplemerge.Merge3Text(base, local, other)
1953 m3 = simplemerge.Merge3Text(base, local, other)
1954 ml = [l.strip() for l in m3.merge_lines()]
1954 ml = [l.strip() for l in m3.merge_lines()]
1955 ml.append("")
1955 ml.append("")
1956 elif at > 0:
1956 elif at > 0:
1957 ml = p1[fn].data().split("\n")
1957 ml = p1[fn].data().split("\n")
1958 else:
1958 else:
1959 ml = initialmergedlines
1959 ml = initialmergedlines
1960 ml[id * linesperrev] += " r%i" % id
1960 ml[id * linesperrev] += " r%i" % id
1961 mergedtext = "\n".join(ml)
1961 mergedtext = "\n".join(ml)
1962 files.append(fn)
1962 files.append(fn)
1963 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
1963 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
1964
1964
1965 if overwritten_file:
1965 if overwritten_file:
1966 fn = "of"
1966 fn = "of"
1967 files.append(fn)
1967 files.append(fn)
1968 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1968 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1969
1969
1970 if new_file:
1970 if new_file:
1971 fn = "nf%i" % id
1971 fn = "nf%i" % id
1972 files.append(fn)
1972 files.append(fn)
1973 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1973 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1974 if len(ps) > 1:
1974 if len(ps) > 1:
1975 if not p2:
1975 if not p2:
1976 p2 = repo[ps[1]]
1976 p2 = repo[ps[1]]
1977 for fn in p2:
1977 for fn in p2:
1978 if fn.startswith("nf"):
1978 if fn.startswith("nf"):
1979 files.append(fn)
1979 files.append(fn)
1980 fctxs[fn] = p2[fn]
1980 fctxs[fn] = p2[fn]
1981
1981
1982 def fctxfn(repo, cx, path):
1982 def fctxfn(repo, cx, path):
1983 return fctxs.get(path)
1983 return fctxs.get(path)
1984
1984
1985 if len(ps) == 0 or ps[0] < 0:
1985 if len(ps) == 0 or ps[0] < 0:
1986 pars = [None, None]
1986 pars = [None, None]
1987 elif len(ps) == 1:
1987 elif len(ps) == 1:
1988 pars = [nodeids[ps[0]], None]
1988 pars = [nodeids[ps[0]], None]
1989 else:
1989 else:
1990 pars = [nodeids[p] for p in ps]
1990 pars = [nodeids[p] for p in ps]
1991 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1991 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1992 date=(id, 0),
1992 date=(id, 0),
1993 user="debugbuilddag",
1993 user="debugbuilddag",
1994 extra={'branch': atbranch})
1994 extra={'branch': atbranch})
1995 nodeid = repo.commitctx(cx)
1995 nodeid = repo.commitctx(cx)
1996 nodeids.append(nodeid)
1996 nodeids.append(nodeid)
1997 at = id
1997 at = id
1998 elif type == 'l':
1998 elif type == 'l':
1999 id, name = data
1999 id, name = data
2000 ui.note(('tag %s\n' % name))
2000 ui.note(('tag %s\n' % name))
2001 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
2001 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
2002 elif type == 'a':
2002 elif type == 'a':
2003 ui.note(('branch %s\n' % data))
2003 ui.note(('branch %s\n' % data))
2004 atbranch = data
2004 atbranch = data
2005 ui.progress(_('building'), id, unit=_('revisions'), total=total)
2005 ui.progress(_('building'), id, unit=_('revisions'), total=total)
2006 tr.close()
2006 tr.close()
2007
2007
2008 if tags:
2008 if tags:
2009 repo.vfs.write("localtags", "".join(tags))
2009 repo.vfs.write("localtags", "".join(tags))
2010 finally:
2010 finally:
2011 ui.progress(_('building'), None)
2011 ui.progress(_('building'), None)
2012 release(tr, lock)
2012 release(tr, lock)
2013
2013
2014 @command('debugbundle',
2014 @command('debugbundle',
2015 [('a', 'all', None, _('show all details'))],
2015 [('a', 'all', None, _('show all details'))],
2016 _('FILE'),
2016 _('FILE'),
2017 norepo=True)
2017 norepo=True)
2018 def debugbundle(ui, bundlepath, all=None, **opts):
2018 def debugbundle(ui, bundlepath, all=None, **opts):
2019 """lists the contents of a bundle"""
2019 """lists the contents of a bundle"""
2020 f = hg.openpath(ui, bundlepath)
2020 f = hg.openpath(ui, bundlepath)
2021 try:
2021 try:
2022 gen = exchange.readbundle(ui, f, bundlepath)
2022 gen = exchange.readbundle(ui, f, bundlepath)
2023 if isinstance(gen, bundle2.unbundle20):
2023 if isinstance(gen, bundle2.unbundle20):
2024 return _debugbundle2(ui, gen, all=all, **opts)
2024 return _debugbundle2(ui, gen, all=all, **opts)
2025 if all:
2025 if all:
2026 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"))
2027
2027
2028 def showchunks(named):
2028 def showchunks(named):
2029 ui.write("\n%s\n" % named)
2029 ui.write("\n%s\n" % named)
2030 chain = None
2030 chain = None
2031 while True:
2031 while True:
2032 chunkdata = gen.deltachunk(chain)
2032 chunkdata = gen.deltachunk(chain)
2033 if not chunkdata:
2033 if not chunkdata:
2034 break
2034 break
2035 node = chunkdata['node']
2035 node = chunkdata['node']
2036 p1 = chunkdata['p1']
2036 p1 = chunkdata['p1']
2037 p2 = chunkdata['p2']
2037 p2 = chunkdata['p2']
2038 cs = chunkdata['cs']
2038 cs = chunkdata['cs']
2039 deltabase = chunkdata['deltabase']
2039 deltabase = chunkdata['deltabase']
2040 delta = chunkdata['delta']
2040 delta = chunkdata['delta']
2041 ui.write("%s %s %s %s %s %s\n" %
2041 ui.write("%s %s %s %s %s %s\n" %
2042 (hex(node), hex(p1), hex(p2),
2042 (hex(node), hex(p1), hex(p2),
2043 hex(cs), hex(deltabase), len(delta)))
2043 hex(cs), hex(deltabase), len(delta)))
2044 chain = node
2044 chain = node
2045
2045
2046 chunkdata = gen.changelogheader()
2046 chunkdata = gen.changelogheader()
2047 showchunks("changelog")
2047 showchunks("changelog")
2048 chunkdata = gen.manifestheader()
2048 chunkdata = gen.manifestheader()
2049 showchunks("manifest")
2049 showchunks("manifest")
2050 while True:
2050 while True:
2051 chunkdata = gen.filelogheader()
2051 chunkdata = gen.filelogheader()
2052 if not chunkdata:
2052 if not chunkdata:
2053 break
2053 break
2054 fname = chunkdata['filename']
2054 fname = chunkdata['filename']
2055 showchunks(fname)
2055 showchunks(fname)
2056 else:
2056 else:
2057 if isinstance(gen, bundle2.unbundle20):
2057 if isinstance(gen, bundle2.unbundle20):
2058 raise error.Abort(_('use debugbundle2 for this file'))
2058 raise error.Abort(_('use debugbundle2 for this file'))
2059 chunkdata = gen.changelogheader()
2059 chunkdata = gen.changelogheader()
2060 chain = None
2060 chain = None
2061 while True:
2061 while True:
2062 chunkdata = gen.deltachunk(chain)
2062 chunkdata = gen.deltachunk(chain)
2063 if not chunkdata:
2063 if not chunkdata:
2064 break
2064 break
2065 node = chunkdata['node']
2065 node = chunkdata['node']
2066 ui.write("%s\n" % hex(node))
2066 ui.write("%s\n" % hex(node))
2067 chain = node
2067 chain = node
2068 finally:
2068 finally:
2069 f.close()
2069 f.close()
2070
2070
2071 def _debugbundle2(ui, gen, **opts):
2071 def _debugbundle2(ui, gen, **opts):
2072 """lists the contents of a bundle2"""
2072 """lists the contents of a bundle2"""
2073 if not isinstance(gen, bundle2.unbundle20):
2073 if not isinstance(gen, bundle2.unbundle20):
2074 raise error.Abort(_('not a bundle2 file'))
2074 raise error.Abort(_('not a bundle2 file'))
2075 ui.write(('Stream params: %s\n' % repr(gen.params)))
2075 ui.write(('Stream params: %s\n' % repr(gen.params)))
2076 for part in gen.iterparts():
2076 for part in gen.iterparts():
2077 ui.write('%s -- %r\n' % (part.type, repr(part.params)))
2077 ui.write('%s -- %r\n' % (part.type, repr(part.params)))
2078 if part.type == 'changegroup':
2078 if part.type == 'changegroup':
2079 version = part.params.get('version', '01')
2079 version = part.params.get('version', '01')
2080 cg = changegroup.packermap[version][1](part, 'UN')
2080 cg = changegroup.packermap[version][1](part, 'UN')
2081 chunkdata = cg.changelogheader()
2081 chunkdata = cg.changelogheader()
2082 chain = None
2082 chain = None
2083 while True:
2083 while True:
2084 chunkdata = cg.deltachunk(chain)
2084 chunkdata = cg.deltachunk(chain)
2085 if not chunkdata:
2085 if not chunkdata:
2086 break
2086 break
2087 node = chunkdata['node']
2087 node = chunkdata['node']
2088 ui.write(" %s\n" % hex(node))
2088 ui.write(" %s\n" % hex(node))
2089 chain = node
2089 chain = node
2090
2090
2091 @command('debugcreatestreamclonebundle', [], 'FILE')
2091 @command('debugcreatestreamclonebundle', [], 'FILE')
2092 def debugcreatestreamclonebundle(ui, repo, fname):
2092 def debugcreatestreamclonebundle(ui, repo, fname):
2093 """create a stream clone bundle file
2093 """create a stream clone bundle file
2094
2094
2095 Stream bundles are special bundles that are essentially archives of
2095 Stream bundles are special bundles that are essentially archives of
2096 revlog files. They are commonly used for cloning very quickly.
2096 revlog files. They are commonly used for cloning very quickly.
2097 """
2097 """
2098 requirements, gen = streamclone.generatebundlev1(repo)
2098 requirements, gen = streamclone.generatebundlev1(repo)
2099 changegroup.writechunks(ui, gen, fname)
2099 changegroup.writechunks(ui, gen, fname)
2100
2100
2101 ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements)))
2101 ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements)))
2102
2102
2103 @command('debugapplystreamclonebundle', [], 'FILE')
2103 @command('debugapplystreamclonebundle', [], 'FILE')
2104 def debugapplystreamclonebundle(ui, repo, fname):
2104 def debugapplystreamclonebundle(ui, repo, fname):
2105 """apply a stream clone bundle file"""
2105 """apply a stream clone bundle file"""
2106 f = hg.openpath(ui, fname)
2106 f = hg.openpath(ui, fname)
2107 gen = exchange.readbundle(ui, f, fname)
2107 gen = exchange.readbundle(ui, f, fname)
2108 gen.apply(repo)
2108 gen.apply(repo)
2109
2109
2110 @command('debugcheckstate', [], '')
2110 @command('debugcheckstate', [], '')
2111 def debugcheckstate(ui, repo):
2111 def debugcheckstate(ui, repo):
2112 """validate the correctness of the current dirstate"""
2112 """validate the correctness of the current dirstate"""
2113 parent1, parent2 = repo.dirstate.parents()
2113 parent1, parent2 = repo.dirstate.parents()
2114 m1 = repo[parent1].manifest()
2114 m1 = repo[parent1].manifest()
2115 m2 = repo[parent2].manifest()
2115 m2 = repo[parent2].manifest()
2116 errors = 0
2116 errors = 0
2117 for f in repo.dirstate:
2117 for f in repo.dirstate:
2118 state = repo.dirstate[f]
2118 state = repo.dirstate[f]
2119 if state in "nr" and f not in m1:
2119 if state in "nr" and f not in m1:
2120 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))
2121 errors += 1
2121 errors += 1
2122 if state in "a" and f in m1:
2122 if state in "a" and f in m1:
2123 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))
2124 errors += 1
2124 errors += 1
2125 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:
2126 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") %
2127 (f, state))
2127 (f, state))
2128 errors += 1
2128 errors += 1
2129 for f in m1:
2129 for f in m1:
2130 state = repo.dirstate[f]
2130 state = repo.dirstate[f]
2131 if state not in "nrm":
2131 if state not in "nrm":
2132 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))
2133 errors += 1
2133 errors += 1
2134 if errors:
2134 if errors:
2135 error = _(".hg/dirstate inconsistent with current parent's manifest")
2135 error = _(".hg/dirstate inconsistent with current parent's manifest")
2136 raise error.Abort(error)
2136 raise error.Abort(error)
2137
2137
2138 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
2138 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
2139 def debugcommands(ui, cmd='', *args):
2139 def debugcommands(ui, cmd='', *args):
2140 """list all available commands and options"""
2140 """list all available commands and options"""
2141 for cmd, vals in sorted(table.iteritems()):
2141 for cmd, vals in sorted(table.iteritems()):
2142 cmd = cmd.split('|')[0].strip('^')
2142 cmd = cmd.split('|')[0].strip('^')
2143 opts = ', '.join([i[1] for i in vals[1]])
2143 opts = ', '.join([i[1] for i in vals[1]])
2144 ui.write('%s: %s\n' % (cmd, opts))
2144 ui.write('%s: %s\n' % (cmd, opts))
2145
2145
2146 @command('debugcomplete',
2146 @command('debugcomplete',
2147 [('o', 'options', None, _('show the command options'))],
2147 [('o', 'options', None, _('show the command options'))],
2148 _('[-o] CMD'),
2148 _('[-o] CMD'),
2149 norepo=True)
2149 norepo=True)
2150 def debugcomplete(ui, cmd='', **opts):
2150 def debugcomplete(ui, cmd='', **opts):
2151 """returns the completion list associated with the given command"""
2151 """returns the completion list associated with the given command"""
2152
2152
2153 if opts.get('options'):
2153 if opts.get('options'):
2154 options = []
2154 options = []
2155 otables = [globalopts]
2155 otables = [globalopts]
2156 if cmd:
2156 if cmd:
2157 aliases, entry = cmdutil.findcmd(cmd, table, False)
2157 aliases, entry = cmdutil.findcmd(cmd, table, False)
2158 otables.append(entry[1])
2158 otables.append(entry[1])
2159 for t in otables:
2159 for t in otables:
2160 for o in t:
2160 for o in t:
2161 if "(DEPRECATED)" in o[3]:
2161 if "(DEPRECATED)" in o[3]:
2162 continue
2162 continue
2163 if o[0]:
2163 if o[0]:
2164 options.append('-%s' % o[0])
2164 options.append('-%s' % o[0])
2165 options.append('--%s' % o[1])
2165 options.append('--%s' % o[1])
2166 ui.write("%s\n" % "\n".join(options))
2166 ui.write("%s\n" % "\n".join(options))
2167 return
2167 return
2168
2168
2169 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2169 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2170 if ui.verbose:
2170 if ui.verbose:
2171 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
2171 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
2172 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
2172 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
2173
2173
2174 @command('debugdag',
2174 @command('debugdag',
2175 [('t', 'tags', None, _('use tags as labels')),
2175 [('t', 'tags', None, _('use tags as labels')),
2176 ('b', 'branches', None, _('annotate with branch names')),
2176 ('b', 'branches', None, _('annotate with branch names')),
2177 ('', 'dots', None, _('use dots for runs')),
2177 ('', 'dots', None, _('use dots for runs')),
2178 ('s', 'spaces', None, _('separate elements by spaces'))],
2178 ('s', 'spaces', None, _('separate elements by spaces'))],
2179 _('[OPTION]... [FILE [REV]...]'),
2179 _('[OPTION]... [FILE [REV]...]'),
2180 optionalrepo=True)
2180 optionalrepo=True)
2181 def debugdag(ui, repo, file_=None, *revs, **opts):
2181 def debugdag(ui, repo, file_=None, *revs, **opts):
2182 """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
2183
2183
2184 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
2185 revision numbers, they get labeled in the output as rN.
2185 revision numbers, they get labeled in the output as rN.
2186
2186
2187 Otherwise, the changelog DAG of the current repo is emitted.
2187 Otherwise, the changelog DAG of the current repo is emitted.
2188 """
2188 """
2189 spaces = opts.get('spaces')
2189 spaces = opts.get('spaces')
2190 dots = opts.get('dots')
2190 dots = opts.get('dots')
2191 if file_:
2191 if file_:
2192 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2192 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2193 revs = set((int(r) for r in revs))
2193 revs = set((int(r) for r in revs))
2194 def events():
2194 def events():
2195 for r in rlog:
2195 for r in rlog:
2196 yield 'n', (r, list(p for p in rlog.parentrevs(r)
2196 yield 'n', (r, list(p for p in rlog.parentrevs(r)
2197 if p != -1))
2197 if p != -1))
2198 if r in revs:
2198 if r in revs:
2199 yield 'l', (r, "r%i" % r)
2199 yield 'l', (r, "r%i" % r)
2200 elif repo:
2200 elif repo:
2201 cl = repo.changelog
2201 cl = repo.changelog
2202 tags = opts.get('tags')
2202 tags = opts.get('tags')
2203 branches = opts.get('branches')
2203 branches = opts.get('branches')
2204 if tags:
2204 if tags:
2205 labels = {}
2205 labels = {}
2206 for l, n in repo.tags().items():
2206 for l, n in repo.tags().items():
2207 labels.setdefault(cl.rev(n), []).append(l)
2207 labels.setdefault(cl.rev(n), []).append(l)
2208 def events():
2208 def events():
2209 b = "default"
2209 b = "default"
2210 for r in cl:
2210 for r in cl:
2211 if branches:
2211 if branches:
2212 newb = cl.read(cl.node(r))[5]['branch']
2212 newb = cl.read(cl.node(r))[5]['branch']
2213 if newb != b:
2213 if newb != b:
2214 yield 'a', newb
2214 yield 'a', newb
2215 b = newb
2215 b = newb
2216 yield 'n', (r, list(p for p in cl.parentrevs(r)
2216 yield 'n', (r, list(p for p in cl.parentrevs(r)
2217 if p != -1))
2217 if p != -1))
2218 if tags:
2218 if tags:
2219 ls = labels.get(r)
2219 ls = labels.get(r)
2220 if ls:
2220 if ls:
2221 for l in ls:
2221 for l in ls:
2222 yield 'l', (r, l)
2222 yield 'l', (r, l)
2223 else:
2223 else:
2224 raise error.Abort(_('need repo for changelog dag'))
2224 raise error.Abort(_('need repo for changelog dag'))
2225
2225
2226 for line in dagparser.dagtextlines(events(),
2226 for line in dagparser.dagtextlines(events(),
2227 addspaces=spaces,
2227 addspaces=spaces,
2228 wraplabels=True,
2228 wraplabels=True,
2229 wrapannotations=True,
2229 wrapannotations=True,
2230 wrapnonlinear=dots,
2230 wrapnonlinear=dots,
2231 usedots=dots,
2231 usedots=dots,
2232 maxlinewidth=70):
2232 maxlinewidth=70):
2233 ui.write(line)
2233 ui.write(line)
2234 ui.write("\n")
2234 ui.write("\n")
2235
2235
2236 @command('debugdata', debugrevlogopts, _('-c|-m|FILE REV'))
2236 @command('debugdata', debugrevlogopts, _('-c|-m|FILE REV'))
2237 def debugdata(ui, repo, file_, rev=None, **opts):
2237 def debugdata(ui, repo, file_, rev=None, **opts):
2238 """dump the contents of a data file revision"""
2238 """dump the contents of a data file revision"""
2239 if opts.get('changelog') or opts.get('manifest'):
2239 if opts.get('changelog') or opts.get('manifest'):
2240 file_, rev = None, file_
2240 file_, rev = None, file_
2241 elif rev is None:
2241 elif rev is None:
2242 raise error.CommandError('debugdata', _('invalid arguments'))
2242 raise error.CommandError('debugdata', _('invalid arguments'))
2243 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
2243 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
2244 try:
2244 try:
2245 ui.write(r.revision(r.lookup(rev)))
2245 ui.write(r.revision(r.lookup(rev)))
2246 except KeyError:
2246 except KeyError:
2247 raise error.Abort(_('invalid revision identifier %s') % rev)
2247 raise error.Abort(_('invalid revision identifier %s') % rev)
2248
2248
2249 @command('debugdate',
2249 @command('debugdate',
2250 [('e', 'extended', None, _('try extended date formats'))],
2250 [('e', 'extended', None, _('try extended date formats'))],
2251 _('[-e] DATE [RANGE]'),
2251 _('[-e] DATE [RANGE]'),
2252 norepo=True, optionalrepo=True)
2252 norepo=True, optionalrepo=True)
2253 def debugdate(ui, date, range=None, **opts):
2253 def debugdate(ui, date, range=None, **opts):
2254 """parse and display a date"""
2254 """parse and display a date"""
2255 if opts["extended"]:
2255 if opts["extended"]:
2256 d = util.parsedate(date, util.extendeddateformats)
2256 d = util.parsedate(date, util.extendeddateformats)
2257 else:
2257 else:
2258 d = util.parsedate(date)
2258 d = util.parsedate(date)
2259 ui.write(("internal: %s %s\n") % d)
2259 ui.write(("internal: %s %s\n") % d)
2260 ui.write(("standard: %s\n") % util.datestr(d))
2260 ui.write(("standard: %s\n") % util.datestr(d))
2261 if range:
2261 if range:
2262 m = util.matchdate(range)
2262 m = util.matchdate(range)
2263 ui.write(("match: %s\n") % m(d[0]))
2263 ui.write(("match: %s\n") % m(d[0]))
2264
2264
2265 @command('debugdiscovery',
2265 @command('debugdiscovery',
2266 [('', 'old', None, _('use old-style discovery')),
2266 [('', 'old', None, _('use old-style discovery')),
2267 ('', 'nonheads', None,
2267 ('', 'nonheads', None,
2268 _('use old-style discovery with non-heads included')),
2268 _('use old-style discovery with non-heads included')),
2269 ] + remoteopts,
2269 ] + remoteopts,
2270 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2270 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2271 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2271 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2272 """runs the changeset discovery protocol in isolation"""
2272 """runs the changeset discovery protocol in isolation"""
2273 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2273 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2274 opts.get('branch'))
2274 opts.get('branch'))
2275 remote = hg.peer(repo, opts, remoteurl)
2275 remote = hg.peer(repo, opts, remoteurl)
2276 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2276 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2277
2277
2278 # make sure tests are repeatable
2278 # make sure tests are repeatable
2279 random.seed(12323)
2279 random.seed(12323)
2280
2280
2281 def doit(localheads, remoteheads, remote=remote):
2281 def doit(localheads, remoteheads, remote=remote):
2282 if opts.get('old'):
2282 if opts.get('old'):
2283 if localheads:
2283 if localheads:
2284 raise error.Abort('cannot use localheads with old style '
2284 raise error.Abort('cannot use localheads with old style '
2285 'discovery')
2285 'discovery')
2286 if not util.safehasattr(remote, 'branches'):
2286 if not util.safehasattr(remote, 'branches'):
2287 # enable in-client legacy support
2287 # enable in-client legacy support
2288 remote = localrepo.locallegacypeer(remote.local())
2288 remote = localrepo.locallegacypeer(remote.local())
2289 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2289 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2290 force=True)
2290 force=True)
2291 common = set(common)
2291 common = set(common)
2292 if not opts.get('nonheads'):
2292 if not opts.get('nonheads'):
2293 ui.write(("unpruned common: %s\n") %
2293 ui.write(("unpruned common: %s\n") %
2294 " ".join(sorted(short(n) for n in common)))
2294 " ".join(sorted(short(n) for n in common)))
2295 dag = dagutil.revlogdag(repo.changelog)
2295 dag = dagutil.revlogdag(repo.changelog)
2296 all = dag.ancestorset(dag.internalizeall(common))
2296 all = dag.ancestorset(dag.internalizeall(common))
2297 common = dag.externalizeall(dag.headsetofconnecteds(all))
2297 common = dag.externalizeall(dag.headsetofconnecteds(all))
2298 else:
2298 else:
2299 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2299 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2300 common = set(common)
2300 common = set(common)
2301 rheads = set(hds)
2301 rheads = set(hds)
2302 lheads = set(repo.heads())
2302 lheads = set(repo.heads())
2303 ui.write(("common heads: %s\n") %
2303 ui.write(("common heads: %s\n") %
2304 " ".join(sorted(short(n) for n in common)))
2304 " ".join(sorted(short(n) for n in common)))
2305 if lheads <= common:
2305 if lheads <= common:
2306 ui.write(("local is subset\n"))
2306 ui.write(("local is subset\n"))
2307 elif rheads <= common:
2307 elif rheads <= common:
2308 ui.write(("remote is subset\n"))
2308 ui.write(("remote is subset\n"))
2309
2309
2310 serverlogs = opts.get('serverlog')
2310 serverlogs = opts.get('serverlog')
2311 if serverlogs:
2311 if serverlogs:
2312 for filename in serverlogs:
2312 for filename in serverlogs:
2313 logfile = open(filename, 'r')
2313 logfile = open(filename, 'r')
2314 try:
2314 try:
2315 line = logfile.readline()
2315 line = logfile.readline()
2316 while line:
2316 while line:
2317 parts = line.strip().split(';')
2317 parts = line.strip().split(';')
2318 op = parts[1]
2318 op = parts[1]
2319 if op == 'cg':
2319 if op == 'cg':
2320 pass
2320 pass
2321 elif op == 'cgss':
2321 elif op == 'cgss':
2322 doit(parts[2].split(' '), parts[3].split(' '))
2322 doit(parts[2].split(' '), parts[3].split(' '))
2323 elif op == 'unb':
2323 elif op == 'unb':
2324 doit(parts[3].split(' '), parts[2].split(' '))
2324 doit(parts[3].split(' '), parts[2].split(' '))
2325 line = logfile.readline()
2325 line = logfile.readline()
2326 finally:
2326 finally:
2327 logfile.close()
2327 logfile.close()
2328
2328
2329 else:
2329 else:
2330 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2330 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2331 opts.get('remote_head'))
2331 opts.get('remote_head'))
2332 localrevs = opts.get('local_head')
2332 localrevs = opts.get('local_head')
2333 doit(localrevs, remoterevs)
2333 doit(localrevs, remoterevs)
2334
2334
2335 @command('debugextensions', formatteropts, [], norepo=True)
2335 @command('debugextensions', formatteropts, [], norepo=True)
2336 def debugextensions(ui, **opts):
2336 def debugextensions(ui, **opts):
2337 '''show information about active extensions'''
2337 '''show information about active extensions'''
2338 exts = extensions.extensions(ui)
2338 exts = extensions.extensions(ui)
2339 fm = ui.formatter('debugextensions', opts)
2339 fm = ui.formatter('debugextensions', opts)
2340 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
2340 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
2341 extsource = extmod.__file__
2341 extsource = extmod.__file__
2342 exttestedwith = getattr(extmod, 'testedwith', None)
2342 exttestedwith = getattr(extmod, 'testedwith', None)
2343 if exttestedwith is not None:
2343 if exttestedwith is not None:
2344 exttestedwith = exttestedwith.split()
2344 exttestedwith = exttestedwith.split()
2345 extbuglink = getattr(extmod, 'buglink', None)
2345 extbuglink = getattr(extmod, 'buglink', None)
2346
2346
2347 fm.startitem()
2347 fm.startitem()
2348
2348
2349 if ui.quiet or ui.verbose:
2349 if ui.quiet or ui.verbose:
2350 fm.write('name', '%s\n', extname)
2350 fm.write('name', '%s\n', extname)
2351 else:
2351 else:
2352 fm.write('name', '%s', extname)
2352 fm.write('name', '%s', extname)
2353 if not exttestedwith:
2353 if not exttestedwith:
2354 fm.plain(_(' (untested!)\n'))
2354 fm.plain(_(' (untested!)\n'))
2355 else:
2355 else:
2356 if exttestedwith == ['internal'] or \
2356 if exttestedwith == ['internal'] or \
2357 util.version() in exttestedwith:
2357 util.version() in exttestedwith:
2358 fm.plain('\n')
2358 fm.plain('\n')
2359 else:
2359 else:
2360 lasttestedversion = exttestedwith[-1]
2360 lasttestedversion = exttestedwith[-1]
2361 fm.plain(' (%s!)\n' % lasttestedversion)
2361 fm.plain(' (%s!)\n' % lasttestedversion)
2362
2362
2363 fm.condwrite(ui.verbose and extsource, 'source',
2363 fm.condwrite(ui.verbose and extsource, 'source',
2364 _(' location: %s\n'), extsource or "")
2364 _(' location: %s\n'), extsource or "")
2365
2365
2366 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
2366 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
2367 _(' tested with: %s\n'), ' '.join(exttestedwith or []))
2367 _(' tested with: %s\n'), ' '.join(exttestedwith or []))
2368
2368
2369 fm.condwrite(ui.verbose and extbuglink, 'buglink',
2369 fm.condwrite(ui.verbose and extbuglink, 'buglink',
2370 _(' bug reporting: %s\n'), extbuglink or "")
2370 _(' bug reporting: %s\n'), extbuglink or "")
2371
2371
2372 fm.end()
2372 fm.end()
2373
2373
2374 @command('debugfileset',
2374 @command('debugfileset',
2375 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2375 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2376 _('[-r REV] FILESPEC'))
2376 _('[-r REV] FILESPEC'))
2377 def debugfileset(ui, repo, expr, **opts):
2377 def debugfileset(ui, repo, expr, **opts):
2378 '''parse and apply a fileset specification'''
2378 '''parse and apply a fileset specification'''
2379 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2379 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2380 if ui.verbose:
2380 if ui.verbose:
2381 tree = fileset.parse(expr)
2381 tree = fileset.parse(expr)
2382 ui.note(fileset.prettyformat(tree), "\n")
2382 ui.note(fileset.prettyformat(tree), "\n")
2383
2383
2384 for f in ctx.getfileset(expr):
2384 for f in ctx.getfileset(expr):
2385 ui.write("%s\n" % f)
2385 ui.write("%s\n" % f)
2386
2386
2387 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2387 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2388 def debugfsinfo(ui, path="."):
2388 def debugfsinfo(ui, path="."):
2389 """show information detected about current filesystem"""
2389 """show information detected about current filesystem"""
2390 util.writefile('.debugfsinfo', '')
2390 util.writefile('.debugfsinfo', '')
2391 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'))
2392 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'))
2393 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'))
2394 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
2394 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
2395 and 'yes' or 'no'))
2395 and 'yes' or 'no'))
2396 os.unlink('.debugfsinfo')
2396 os.unlink('.debugfsinfo')
2397
2397
2398 @command('debuggetbundle',
2398 @command('debuggetbundle',
2399 [('H', 'head', [], _('id of head node'), _('ID')),
2399 [('H', 'head', [], _('id of head node'), _('ID')),
2400 ('C', 'common', [], _('id of common node'), _('ID')),
2400 ('C', 'common', [], _('id of common node'), _('ID')),
2401 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2401 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2402 _('REPO FILE [-H|-C ID]...'),
2402 _('REPO FILE [-H|-C ID]...'),
2403 norepo=True)
2403 norepo=True)
2404 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2404 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2405 """retrieves a bundle from a repo
2405 """retrieves a bundle from a repo
2406
2406
2407 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
2408 given file.
2408 given file.
2409 """
2409 """
2410 repo = hg.peer(ui, opts, repopath)
2410 repo = hg.peer(ui, opts, repopath)
2411 if not repo.capable('getbundle'):
2411 if not repo.capable('getbundle'):
2412 raise error.Abort("getbundle() not supported by target repository")
2412 raise error.Abort("getbundle() not supported by target repository")
2413 args = {}
2413 args = {}
2414 if common:
2414 if common:
2415 args['common'] = [bin(s) for s in common]
2415 args['common'] = [bin(s) for s in common]
2416 if head:
2416 if head:
2417 args['heads'] = [bin(s) for s in head]
2417 args['heads'] = [bin(s) for s in head]
2418 # TODO: get desired bundlecaps from command line.
2418 # TODO: get desired bundlecaps from command line.
2419 args['bundlecaps'] = None
2419 args['bundlecaps'] = None
2420 bundle = repo.getbundle('debug', **args)
2420 bundle = repo.getbundle('debug', **args)
2421
2421
2422 bundletype = opts.get('type', 'bzip2').lower()
2422 bundletype = opts.get('type', 'bzip2').lower()
2423 btypes = {'none': 'HG10UN',
2423 btypes = {'none': 'HG10UN',
2424 'bzip2': 'HG10BZ',
2424 'bzip2': 'HG10BZ',
2425 'gzip': 'HG10GZ',
2425 'gzip': 'HG10GZ',
2426 'bundle2': 'HG20'}
2426 'bundle2': 'HG20'}
2427 bundletype = btypes.get(bundletype)
2427 bundletype = btypes.get(bundletype)
2428 if bundletype not in changegroup.bundletypes:
2428 if bundletype not in changegroup.bundletypes:
2429 raise error.Abort(_('unknown bundle type specified with --type'))
2429 raise error.Abort(_('unknown bundle type specified with --type'))
2430 changegroup.writebundle(ui, bundle, bundlepath, bundletype)
2430 changegroup.writebundle(ui, bundle, bundlepath, bundletype)
2431
2431
2432 @command('debugignore', [], '')
2432 @command('debugignore', [], '')
2433 def debugignore(ui, repo, *values, **opts):
2433 def debugignore(ui, repo, *values, **opts):
2434 """display the combined ignore pattern"""
2434 """display the combined ignore pattern"""
2435 ignore = repo.dirstate._ignore
2435 ignore = repo.dirstate._ignore
2436 includepat = getattr(ignore, 'includepat', None)
2436 includepat = getattr(ignore, 'includepat', None)
2437 if includepat is not None:
2437 if includepat is not None:
2438 ui.write("%s\n" % includepat)
2438 ui.write("%s\n" % includepat)
2439 else:
2439 else:
2440 raise error.Abort(_("no ignore patterns found"))
2440 raise error.Abort(_("no ignore patterns found"))
2441
2441
2442 @command('debugindex', debugrevlogopts +
2442 @command('debugindex', debugrevlogopts +
2443 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2443 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2444 _('[-f FORMAT] -c|-m|FILE'),
2444 _('[-f FORMAT] -c|-m|FILE'),
2445 optionalrepo=True)
2445 optionalrepo=True)
2446 def debugindex(ui, repo, file_=None, **opts):
2446 def debugindex(ui, repo, file_=None, **opts):
2447 """dump the contents of an index file"""
2447 """dump the contents of an index file"""
2448 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2448 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2449 format = opts.get('format', 0)
2449 format = opts.get('format', 0)
2450 if format not in (0, 1):
2450 if format not in (0, 1):
2451 raise error.Abort(_("unknown format %d") % format)
2451 raise error.Abort(_("unknown format %d") % format)
2452
2452
2453 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2453 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2454 if generaldelta:
2454 if generaldelta:
2455 basehdr = ' delta'
2455 basehdr = ' delta'
2456 else:
2456 else:
2457 basehdr = ' base'
2457 basehdr = ' base'
2458
2458
2459 if ui.debugflag:
2459 if ui.debugflag:
2460 shortfn = hex
2460 shortfn = hex
2461 else:
2461 else:
2462 shortfn = short
2462 shortfn = short
2463
2463
2464 # 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
2465 idlen = 12
2465 idlen = 12
2466 for i in r:
2466 for i in r:
2467 idlen = len(shortfn(r.node(i)))
2467 idlen = len(shortfn(r.node(i)))
2468 break
2468 break
2469
2469
2470 if format == 0:
2470 if format == 0:
2471 ui.write(" rev offset length " + basehdr + " linkrev"
2471 ui.write(" rev offset length " + basehdr + " linkrev"
2472 " %s %s p2\n" % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2472 " %s %s p2\n" % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2473 elif format == 1:
2473 elif format == 1:
2474 ui.write(" rev flag offset length"
2474 ui.write(" rev flag offset length"
2475 " size " + basehdr + " link p1 p2"
2475 " size " + basehdr + " link p1 p2"
2476 " %s\n" % "nodeid".rjust(idlen))
2476 " %s\n" % "nodeid".rjust(idlen))
2477
2477
2478 for i in r:
2478 for i in r:
2479 node = r.node(i)
2479 node = r.node(i)
2480 if generaldelta:
2480 if generaldelta:
2481 base = r.deltaparent(i)
2481 base = r.deltaparent(i)
2482 else:
2482 else:
2483 base = r.chainbase(i)
2483 base = r.chainbase(i)
2484 if format == 0:
2484 if format == 0:
2485 try:
2485 try:
2486 pp = r.parents(node)
2486 pp = r.parents(node)
2487 except Exception:
2487 except Exception:
2488 pp = [nullid, nullid]
2488 pp = [nullid, nullid]
2489 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2489 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2490 i, r.start(i), r.length(i), base, r.linkrev(i),
2490 i, r.start(i), r.length(i), base, r.linkrev(i),
2491 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2491 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2492 elif format == 1:
2492 elif format == 1:
2493 pr = r.parentrevs(i)
2493 pr = r.parentrevs(i)
2494 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" % (
2495 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),
2496 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2496 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2497
2497
2498 @command('debugindexdot', debugrevlogopts,
2498 @command('debugindexdot', debugrevlogopts,
2499 _('-c|-m|FILE'), optionalrepo=True)
2499 _('-c|-m|FILE'), optionalrepo=True)
2500 def debugindexdot(ui, repo, file_=None, **opts):
2500 def debugindexdot(ui, repo, file_=None, **opts):
2501 """dump an index DAG as a graphviz dot file"""
2501 """dump an index DAG as a graphviz dot file"""
2502 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
2502 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
2503 ui.write(("digraph G {\n"))
2503 ui.write(("digraph G {\n"))
2504 for i in r:
2504 for i in r:
2505 node = r.node(i)
2505 node = r.node(i)
2506 pp = r.parents(node)
2506 pp = r.parents(node)
2507 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2507 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2508 if pp[1] != nullid:
2508 if pp[1] != nullid:
2509 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2509 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2510 ui.write("}\n")
2510 ui.write("}\n")
2511
2511
2512 @command('debugdeltachain',
2512 @command('debugdeltachain',
2513 debugrevlogopts + formatteropts,
2513 debugrevlogopts + formatteropts,
2514 _('-c|-m|FILE'),
2514 _('-c|-m|FILE'),
2515 optionalrepo=True)
2515 optionalrepo=True)
2516 def debugdeltachain(ui, repo, file_=None, **opts):
2516 def debugdeltachain(ui, repo, file_=None, **opts):
2517 """dump information about delta chains in a revlog
2517 """dump information about delta chains in a revlog
2518
2518
2519 Output can be templatized. Available template keywords are:
2519 Output can be templatized. Available template keywords are:
2520
2520
2521 rev revision number
2521 rev revision number
2522 chainid delta chain identifier (numbered by unique base)
2522 chainid delta chain identifier (numbered by unique base)
2523 chainlen delta chain length to this revision
2523 chainlen delta chain length to this revision
2524 prevrev previous revision in delta chain
2524 prevrev previous revision in delta chain
2525 deltatype role of delta / how it was computed
2525 deltatype role of delta / how it was computed
2526 compsize compressed size of revision
2526 compsize compressed size of revision
2527 uncompsize uncompressed size of revision
2527 uncompsize uncompressed size of revision
2528 chainsize total size of compressed revisions in chain
2528 chainsize total size of compressed revisions in chain
2529 chainratio total chain size divided by uncompressed revision size
2529 chainratio total chain size divided by uncompressed revision size
2530 (new delta chains typically start at ratio 2.00)
2530 (new delta chains typically start at ratio 2.00)
2531 lindist linear distance from base revision in delta chain to end
2531 lindist linear distance from base revision in delta chain to end
2532 of this revision
2532 of this revision
2533 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
2534 base of delta chain to end of this revision; a measurement
2534 base of delta chain to end of this revision; a measurement
2535 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
2536 the delta chain for this revision
2536 the delta chain for this revision
2537 extraratio extradist divided by chainsize; another representation of
2537 extraratio extradist divided by chainsize; another representation of
2538 how much unrelated data is needed to load this delta chain
2538 how much unrelated data is needed to load this delta chain
2539 """
2539 """
2540 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
2540 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
2541 index = r.index
2541 index = r.index
2542 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2542 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2543
2543
2544 def revinfo(rev):
2544 def revinfo(rev):
2545 e = index[rev]
2545 e = index[rev]
2546 compsize = e[1]
2546 compsize = e[1]
2547 uncompsize = e[2]
2547 uncompsize = e[2]
2548 chainsize = 0
2548 chainsize = 0
2549
2549
2550 if generaldelta:
2550 if generaldelta:
2551 if e[3] == e[5]:
2551 if e[3] == e[5]:
2552 deltatype = 'p1'
2552 deltatype = 'p1'
2553 elif e[3] == e[6]:
2553 elif e[3] == e[6]:
2554 deltatype = 'p2'
2554 deltatype = 'p2'
2555 elif e[3] == rev - 1:
2555 elif e[3] == rev - 1:
2556 deltatype = 'prev'
2556 deltatype = 'prev'
2557 elif e[3] == rev:
2557 elif e[3] == rev:
2558 deltatype = 'base'
2558 deltatype = 'base'
2559 else:
2559 else:
2560 deltatype = 'other'
2560 deltatype = 'other'
2561 else:
2561 else:
2562 if e[3] == rev:
2562 if e[3] == rev:
2563 deltatype = 'base'
2563 deltatype = 'base'
2564 else:
2564 else:
2565 deltatype = 'prev'
2565 deltatype = 'prev'
2566
2566
2567 chain = r._deltachain(rev)[0]
2567 chain = r._deltachain(rev)[0]
2568 for iterrev in chain:
2568 for iterrev in chain:
2569 e = index[iterrev]
2569 e = index[iterrev]
2570 chainsize += e[1]
2570 chainsize += e[1]
2571
2571
2572 return compsize, uncompsize, deltatype, chain, chainsize
2572 return compsize, uncompsize, deltatype, chain, chainsize
2573
2573
2574 fm = ui.formatter('debugdeltachain', opts)
2574 fm = ui.formatter('debugdeltachain', opts)
2575
2575
2576 fm.plain(' rev chain# chainlen prev delta '
2576 fm.plain(' rev chain# chainlen prev delta '
2577 'size rawsize chainsize ratio lindist extradist '
2577 'size rawsize chainsize ratio lindist extradist '
2578 'extraratio\n')
2578 'extraratio\n')
2579
2579
2580 chainbases = {}
2580 chainbases = {}
2581 for rev in r:
2581 for rev in r:
2582 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
2582 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
2583 chainbase = chain[0]
2583 chainbase = chain[0]
2584 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
2584 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
2585 basestart = r.start(chainbase)
2585 basestart = r.start(chainbase)
2586 revstart = r.start(rev)
2586 revstart = r.start(rev)
2587 lineardist = revstart + comp - basestart
2587 lineardist = revstart + comp - basestart
2588 extradist = lineardist - chainsize
2588 extradist = lineardist - chainsize
2589 try:
2589 try:
2590 prevrev = chain[-2]
2590 prevrev = chain[-2]
2591 except IndexError:
2591 except IndexError:
2592 prevrev = -1
2592 prevrev = -1
2593
2593
2594 chainratio = float(chainsize) / float(uncomp)
2594 chainratio = float(chainsize) / float(uncomp)
2595 extraratio = float(extradist) / float(chainsize)
2595 extraratio = float(extradist) / float(chainsize)
2596
2596
2597 fm.startitem()
2597 fm.startitem()
2598 fm.write('rev chainid chainlen prevrev deltatype compsize '
2598 fm.write('rev chainid chainlen prevrev deltatype compsize '
2599 'uncompsize chainsize chainratio lindist extradist '
2599 'uncompsize chainsize chainratio lindist extradist '
2600 'extraratio',
2600 'extraratio',
2601 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f\n',
2601 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f\n',
2602 rev, chainid, len(chain), prevrev, deltatype, comp,
2602 rev, chainid, len(chain), prevrev, deltatype, comp,
2603 uncomp, chainsize, chainratio, lineardist, extradist,
2603 uncomp, chainsize, chainratio, lineardist, extradist,
2604 extraratio,
2604 extraratio,
2605 rev=rev, chainid=chainid, chainlen=len(chain),
2605 rev=rev, chainid=chainid, chainlen=len(chain),
2606 prevrev=prevrev, deltatype=deltatype, compsize=comp,
2606 prevrev=prevrev, deltatype=deltatype, compsize=comp,
2607 uncompsize=uncomp, chainsize=chainsize,
2607 uncompsize=uncomp, chainsize=chainsize,
2608 chainratio=chainratio, lindist=lineardist,
2608 chainratio=chainratio, lindist=lineardist,
2609 extradist=extradist, extraratio=extraratio)
2609 extradist=extradist, extraratio=extraratio)
2610
2610
2611 fm.end()
2611 fm.end()
2612
2612
2613 @command('debuginstall', [], '', norepo=True)
2613 @command('debuginstall', [], '', norepo=True)
2614 def debuginstall(ui):
2614 def debuginstall(ui):
2615 '''test Mercurial installation
2615 '''test Mercurial installation
2616
2616
2617 Returns 0 on success.
2617 Returns 0 on success.
2618 '''
2618 '''
2619
2619
2620 def writetemp(contents):
2620 def writetemp(contents):
2621 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2621 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2622 f = os.fdopen(fd, "wb")
2622 f = os.fdopen(fd, "wb")
2623 f.write(contents)
2623 f.write(contents)
2624 f.close()
2624 f.close()
2625 return name
2625 return name
2626
2626
2627 problems = 0
2627 problems = 0
2628
2628
2629 # encoding
2629 # encoding
2630 ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
2630 ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
2631 try:
2631 try:
2632 encoding.fromlocal("test")
2632 encoding.fromlocal("test")
2633 except error.Abort as inst:
2633 except error.Abort as inst:
2634 ui.write(" %s\n" % inst)
2634 ui.write(" %s\n" % inst)
2635 ui.write(_(" (check that your locale is properly set)\n"))
2635 ui.write(_(" (check that your locale is properly set)\n"))
2636 problems += 1
2636 problems += 1
2637
2637
2638 # Python
2638 # Python
2639 ui.status(_("checking Python executable (%s)\n") % sys.executable)
2639 ui.status(_("checking Python executable (%s)\n") % sys.executable)
2640 ui.status(_("checking Python version (%s)\n")
2640 ui.status(_("checking Python version (%s)\n")
2641 % ("%s.%s.%s" % sys.version_info[:3]))
2641 % ("%s.%s.%s" % sys.version_info[:3]))
2642 ui.status(_("checking Python lib (%s)...\n")
2642 ui.status(_("checking Python lib (%s)...\n")
2643 % os.path.dirname(os.__file__))
2643 % os.path.dirname(os.__file__))
2644
2644
2645 # compiled modules
2645 # compiled modules
2646 ui.status(_("checking installed modules (%s)...\n")
2646 ui.status(_("checking installed modules (%s)...\n")
2647 % os.path.dirname(__file__))
2647 % os.path.dirname(__file__))
2648 try:
2648 try:
2649 import bdiff, mpatch, base85, osutil
2649 import bdiff, mpatch, base85, osutil
2650 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2650 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2651 except Exception as inst:
2651 except Exception as inst:
2652 ui.write(" %s\n" % inst)
2652 ui.write(" %s\n" % inst)
2653 ui.write(_(" One or more extensions could not be found"))
2653 ui.write(_(" One or more extensions could not be found"))
2654 ui.write(_(" (check that you compiled the extensions)\n"))
2654 ui.write(_(" (check that you compiled the extensions)\n"))
2655 problems += 1
2655 problems += 1
2656
2656
2657 # templates
2657 # templates
2658 import templater
2658 import templater
2659 p = templater.templatepaths()
2659 p = templater.templatepaths()
2660 ui.status(_("checking templates (%s)...\n") % ' '.join(p))
2660 ui.status(_("checking templates (%s)...\n") % ' '.join(p))
2661 if p:
2661 if p:
2662 m = templater.templatepath("map-cmdline.default")
2662 m = templater.templatepath("map-cmdline.default")
2663 if m:
2663 if m:
2664 # template found, check if it is working
2664 # template found, check if it is working
2665 try:
2665 try:
2666 templater.templater(m)
2666 templater.templater(m)
2667 except Exception as inst:
2667 except Exception as inst:
2668 ui.write(" %s\n" % inst)
2668 ui.write(" %s\n" % inst)
2669 p = None
2669 p = None
2670 else:
2670 else:
2671 ui.write(_(" template 'default' not found\n"))
2671 ui.write(_(" template 'default' not found\n"))
2672 p = None
2672 p = None
2673 else:
2673 else:
2674 ui.write(_(" no template directories found\n"))
2674 ui.write(_(" no template directories found\n"))
2675 if not p:
2675 if not p:
2676 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
2676 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
2677 problems += 1
2677 problems += 1
2678
2678
2679 # editor
2679 # editor
2680 ui.status(_("checking commit editor...\n"))
2680 ui.status(_("checking commit editor...\n"))
2681 editor = ui.geteditor()
2681 editor = ui.geteditor()
2682 editor = util.expandpath(editor)
2682 editor = util.expandpath(editor)
2683 cmdpath = util.findexe(shlex.split(editor)[0])
2683 cmdpath = util.findexe(shlex.split(editor)[0])
2684 if not cmdpath:
2684 if not cmdpath:
2685 if editor == 'vi':
2685 if editor == 'vi':
2686 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2686 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2687 ui.write(_(" (specify a commit editor in your configuration"
2687 ui.write(_(" (specify a commit editor in your configuration"
2688 " file)\n"))
2688 " file)\n"))
2689 else:
2689 else:
2690 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2690 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2691 ui.write(_(" (specify a commit editor in your configuration"
2691 ui.write(_(" (specify a commit editor in your configuration"
2692 " file)\n"))
2692 " file)\n"))
2693 problems += 1
2693 problems += 1
2694
2694
2695 # check username
2695 # check username
2696 ui.status(_("checking username...\n"))
2696 ui.status(_("checking username...\n"))
2697 try:
2697 try:
2698 ui.username()
2698 ui.username()
2699 except error.Abort as e:
2699 except error.Abort as e:
2700 ui.write(" %s\n" % e)
2700 ui.write(" %s\n" % e)
2701 ui.write(_(" (specify a username in your configuration file)\n"))
2701 ui.write(_(" (specify a username in your configuration file)\n"))
2702 problems += 1
2702 problems += 1
2703
2703
2704 if not problems:
2704 if not problems:
2705 ui.status(_("no problems detected\n"))
2705 ui.status(_("no problems detected\n"))
2706 else:
2706 else:
2707 ui.write(_("%s problems detected,"
2707 ui.write(_("%s problems detected,"
2708 " please check your install!\n") % problems)
2708 " please check your install!\n") % problems)
2709
2709
2710 return problems
2710 return problems
2711
2711
2712 @command('debugknown', [], _('REPO ID...'), norepo=True)
2712 @command('debugknown', [], _('REPO ID...'), norepo=True)
2713 def debugknown(ui, repopath, *ids, **opts):
2713 def debugknown(ui, repopath, *ids, **opts):
2714 """test whether node ids are known to a repo
2714 """test whether node ids are known to a repo
2715
2715
2716 Every ID must be a full-length hex node id string. Returns a list of 0s
2716 Every ID must be a full-length hex node id string. Returns a list of 0s
2717 and 1s indicating unknown/known.
2717 and 1s indicating unknown/known.
2718 """
2718 """
2719 repo = hg.peer(ui, opts, repopath)
2719 repo = hg.peer(ui, opts, repopath)
2720 if not repo.capable('known'):
2720 if not repo.capable('known'):
2721 raise error.Abort("known() not supported by target repository")
2721 raise error.Abort("known() not supported by target repository")
2722 flags = repo.known([bin(s) for s in ids])
2722 flags = repo.known([bin(s) for s in ids])
2723 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2723 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2724
2724
2725 @command('debuglabelcomplete', [], _('LABEL...'))
2725 @command('debuglabelcomplete', [], _('LABEL...'))
2726 def debuglabelcomplete(ui, repo, *args):
2726 def debuglabelcomplete(ui, repo, *args):
2727 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2727 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2728 debugnamecomplete(ui, repo, *args)
2728 debugnamecomplete(ui, repo, *args)
2729
2729
2730 @command('debugmergestate', [], '')
2730 @command('debugmergestate', [], '')
2731 def debugmergestate(ui, repo, *args):
2731 def debugmergestate(ui, repo, *args):
2732 """print merge state
2732 """print merge state
2733
2733
2734 Use --verbose to print out information about whether v1 or v2 merge state
2734 Use --verbose to print out information about whether v1 or v2 merge state
2735 was chosen."""
2735 was chosen."""
2736 def _hashornull(h):
2736 def _hashornull(h):
2737 if h == nullhex:
2737 if h == nullhex:
2738 return 'null'
2738 return 'null'
2739 else:
2739 else:
2740 return h
2740 return h
2741
2741
2742 def printrecords(version):
2742 def printrecords(version):
2743 ui.write(('* version %s records\n') % version)
2743 ui.write(('* version %s records\n') % version)
2744 if version == 1:
2744 if version == 1:
2745 records = v1records
2745 records = v1records
2746 else:
2746 else:
2747 records = v2records
2747 records = v2records
2748
2748
2749 for rtype, record in records:
2749 for rtype, record in records:
2750 # pretty print some record types
2750 # pretty print some record types
2751 if rtype == 'L':
2751 if rtype == 'L':
2752 ui.write(('local: %s\n') % record)
2752 ui.write(('local: %s\n') % record)
2753 elif rtype == 'O':
2753 elif rtype == 'O':
2754 ui.write(('other: %s\n') % record)
2754 ui.write(('other: %s\n') % record)
2755 elif rtype == 'm':
2755 elif rtype == 'm':
2756 driver, mdstate = record.split('\0', 1)
2756 driver, mdstate = record.split('\0', 1)
2757 ui.write(('merge driver: %s (state "%s")\n')
2757 ui.write(('merge driver: %s (state "%s")\n')
2758 % (driver, mdstate))
2758 % (driver, mdstate))
2759 elif rtype in 'FDC':
2759 elif rtype in 'FDC':
2760 r = record.split('\0')
2760 r = record.split('\0')
2761 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2761 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2762 if version == 1:
2762 if version == 1:
2763 onode = 'not stored in v1 format'
2763 onode = 'not stored in v1 format'
2764 flags = r[7]
2764 flags = r[7]
2765 else:
2765 else:
2766 onode, flags = r[7:9]
2766 onode, flags = r[7:9]
2767 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2767 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2768 % (f, rtype, state, _hashornull(hash)))
2768 % (f, rtype, state, _hashornull(hash)))
2769 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2769 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2770 ui.write((' ancestor path: %s (node %s)\n')
2770 ui.write((' ancestor path: %s (node %s)\n')
2771 % (afile, _hashornull(anode)))
2771 % (afile, _hashornull(anode)))
2772 ui.write((' other path: %s (node %s)\n')
2772 ui.write((' other path: %s (node %s)\n')
2773 % (ofile, _hashornull(onode)))
2773 % (ofile, _hashornull(onode)))
2774 else:
2774 else:
2775 ui.write(('unrecognized entry: %s\t%s\n')
2775 ui.write(('unrecognized entry: %s\t%s\n')
2776 % (rtype, record.replace('\0', '\t')))
2776 % (rtype, record.replace('\0', '\t')))
2777
2777
2778 # Avoid mergestate.read() since it may raise an exception for unsupported
2778 # Avoid mergestate.read() since it may raise an exception for unsupported
2779 # merge state records. We shouldn't be doing this, but this is OK since this
2779 # merge state records. We shouldn't be doing this, but this is OK since this
2780 # command is pretty low-level.
2780 # command is pretty low-level.
2781 ms = mergemod.mergestate(repo)
2781 ms = mergemod.mergestate(repo)
2782
2782
2783 # sort so that reasonable information is on top
2783 # sort so that reasonable information is on top
2784 v1records = ms._readrecordsv1()
2784 v1records = ms._readrecordsv1()
2785 v2records = ms._readrecordsv2()
2785 v2records = ms._readrecordsv2()
2786 order = 'LOm'
2786 order = 'LOm'
2787 def key(r):
2787 def key(r):
2788 idx = order.find(r[0])
2788 idx = order.find(r[0])
2789 if idx == -1:
2789 if idx == -1:
2790 return (1, r[1])
2790 return (1, r[1])
2791 else:
2791 else:
2792 return (0, idx)
2792 return (0, idx)
2793 v1records.sort(key=key)
2793 v1records.sort(key=key)
2794 v2records.sort(key=key)
2794 v2records.sort(key=key)
2795
2795
2796 if not v1records and not v2records:
2796 if not v1records and not v2records:
2797 ui.write(('no merge state found\n'))
2797 ui.write(('no merge state found\n'))
2798 elif not v2records:
2798 elif not v2records:
2799 ui.note(('no version 2 merge state\n'))
2799 ui.note(('no version 2 merge state\n'))
2800 printrecords(1)
2800 printrecords(1)
2801 elif ms._v1v2match(v1records, v2records):
2801 elif ms._v1v2match(v1records, v2records):
2802 ui.note(('v1 and v2 states match: using v2\n'))
2802 ui.note(('v1 and v2 states match: using v2\n'))
2803 printrecords(2)
2803 printrecords(2)
2804 else:
2804 else:
2805 ui.note(('v1 and v2 states mismatch: using v1\n'))
2805 ui.note(('v1 and v2 states mismatch: using v1\n'))
2806 printrecords(1)
2806 printrecords(1)
2807 if ui.verbose:
2807 if ui.verbose:
2808 printrecords(2)
2808 printrecords(2)
2809
2809
2810 @command('debugnamecomplete', [], _('NAME...'))
2810 @command('debugnamecomplete', [], _('NAME...'))
2811 def debugnamecomplete(ui, repo, *args):
2811 def debugnamecomplete(ui, repo, *args):
2812 '''complete "names" - tags, open branch names, bookmark names'''
2812 '''complete "names" - tags, open branch names, bookmark names'''
2813
2813
2814 names = set()
2814 names = set()
2815 # since we previously only listed open branches, we will handle that
2815 # since we previously only listed open branches, we will handle that
2816 # specially (after this for loop)
2816 # specially (after this for loop)
2817 for name, ns in repo.names.iteritems():
2817 for name, ns in repo.names.iteritems():
2818 if name != 'branches':
2818 if name != 'branches':
2819 names.update(ns.listnames(repo))
2819 names.update(ns.listnames(repo))
2820 names.update(tag for (tag, heads, tip, closed)
2820 names.update(tag for (tag, heads, tip, closed)
2821 in repo.branchmap().iterbranches() if not closed)
2821 in repo.branchmap().iterbranches() if not closed)
2822 completions = set()
2822 completions = set()
2823 if not args:
2823 if not args:
2824 args = ['']
2824 args = ['']
2825 for a in args:
2825 for a in args:
2826 completions.update(n for n in names if n.startswith(a))
2826 completions.update(n for n in names if n.startswith(a))
2827 ui.write('\n'.join(sorted(completions)))
2827 ui.write('\n'.join(sorted(completions)))
2828 ui.write('\n')
2828 ui.write('\n')
2829
2829
2830 @command('debuglocks',
2830 @command('debuglocks',
2831 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2831 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2832 ('W', 'force-wlock', None,
2832 ('W', 'force-wlock', None,
2833 _('free the working state lock (DANGEROUS)'))],
2833 _('free the working state lock (DANGEROUS)'))],
2834 _('[OPTION]...'))
2834 _('[OPTION]...'))
2835 def debuglocks(ui, repo, **opts):
2835 def debuglocks(ui, repo, **opts):
2836 """show or modify state of locks
2836 """show or modify state of locks
2837
2837
2838 By default, this command will show which locks are held. This
2838 By default, this command will show which locks are held. This
2839 includes the user and process holding the lock, the amount of time
2839 includes the user and process holding the lock, the amount of time
2840 the lock has been held, and the machine name where the process is
2840 the lock has been held, and the machine name where the process is
2841 running if it's not local.
2841 running if it's not local.
2842
2842
2843 Locks protect the integrity of Mercurial's data, so should be
2843 Locks protect the integrity of Mercurial's data, so should be
2844 treated with care. System crashes or other interruptions may cause
2844 treated with care. System crashes or other interruptions may cause
2845 locks to not be properly released, though Mercurial will usually
2845 locks to not be properly released, though Mercurial will usually
2846 detect and remove such stale locks automatically.
2846 detect and remove such stale locks automatically.
2847
2847
2848 However, detecting stale locks may not always be possible (for
2848 However, detecting stale locks may not always be possible (for
2849 instance, on a shared filesystem). Removing locks may also be
2849 instance, on a shared filesystem). Removing locks may also be
2850 blocked by filesystem permissions.
2850 blocked by filesystem permissions.
2851
2851
2852 Returns 0 if no locks are held.
2852 Returns 0 if no locks are held.
2853
2853
2854 """
2854 """
2855
2855
2856 if opts.get('force_lock'):
2856 if opts.get('force_lock'):
2857 repo.svfs.unlink('lock')
2857 repo.svfs.unlink('lock')
2858 if opts.get('force_wlock'):
2858 if opts.get('force_wlock'):
2859 repo.vfs.unlink('wlock')
2859 repo.vfs.unlink('wlock')
2860 if opts.get('force_lock') or opts.get('force_lock'):
2860 if opts.get('force_lock') or opts.get('force_lock'):
2861 return 0
2861 return 0
2862
2862
2863 now = time.time()
2863 now = time.time()
2864 held = 0
2864 held = 0
2865
2865
2866 def report(vfs, name, method):
2866 def report(vfs, name, method):
2867 # this causes stale locks to get reaped for more accurate reporting
2867 # this causes stale locks to get reaped for more accurate reporting
2868 try:
2868 try:
2869 l = method(False)
2869 l = method(False)
2870 except error.LockHeld:
2870 except error.LockHeld:
2871 l = None
2871 l = None
2872
2872
2873 if l:
2873 if l:
2874 l.release()
2874 l.release()
2875 else:
2875 else:
2876 try:
2876 try:
2877 stat = vfs.lstat(name)
2877 stat = vfs.lstat(name)
2878 age = now - stat.st_mtime
2878 age = now - stat.st_mtime
2879 user = util.username(stat.st_uid)
2879 user = util.username(stat.st_uid)
2880 locker = vfs.readlock(name)
2880 locker = vfs.readlock(name)
2881 if ":" in locker:
2881 if ":" in locker:
2882 host, pid = locker.split(':')
2882 host, pid = locker.split(':')
2883 if host == socket.gethostname():
2883 if host == socket.gethostname():
2884 locker = 'user %s, process %s' % (user, pid)
2884 locker = 'user %s, process %s' % (user, pid)
2885 else:
2885 else:
2886 locker = 'user %s, process %s, host %s' \
2886 locker = 'user %s, process %s, host %s' \
2887 % (user, pid, host)
2887 % (user, pid, host)
2888 ui.write("%-6s %s (%ds)\n" % (name + ":", locker, age))
2888 ui.write("%-6s %s (%ds)\n" % (name + ":", locker, age))
2889 return 1
2889 return 1
2890 except OSError as e:
2890 except OSError as e:
2891 if e.errno != errno.ENOENT:
2891 if e.errno != errno.ENOENT:
2892 raise
2892 raise
2893
2893
2894 ui.write("%-6s free\n" % (name + ":"))
2894 ui.write("%-6s free\n" % (name + ":"))
2895 return 0
2895 return 0
2896
2896
2897 held += report(repo.svfs, "lock", repo.lock)
2897 held += report(repo.svfs, "lock", repo.lock)
2898 held += report(repo.vfs, "wlock", repo.wlock)
2898 held += report(repo.vfs, "wlock", repo.wlock)
2899
2899
2900 return held
2900 return held
2901
2901
2902 @command('debugobsolete',
2902 @command('debugobsolete',
2903 [('', 'flags', 0, _('markers flag')),
2903 [('', 'flags', 0, _('markers flag')),
2904 ('', 'record-parents', False,
2904 ('', 'record-parents', False,
2905 _('record parent information for the precursor')),
2905 _('record parent information for the precursor')),
2906 ('r', 'rev', [], _('display markers relevant to REV')),
2906 ('r', 'rev', [], _('display markers relevant to REV')),
2907 ] + commitopts2,
2907 ] + commitopts2,
2908 _('[OBSOLETED [REPLACEMENT ...]]'))
2908 _('[OBSOLETED [REPLACEMENT ...]]'))
2909 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2909 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2910 """create arbitrary obsolete marker
2910 """create arbitrary obsolete marker
2911
2911
2912 With no arguments, displays the list of obsolescence markers."""
2912 With no arguments, displays the list of obsolescence markers."""
2913
2913
2914 def parsenodeid(s):
2914 def parsenodeid(s):
2915 try:
2915 try:
2916 # We do not use revsingle/revrange functions here to accept
2916 # We do not use revsingle/revrange functions here to accept
2917 # arbitrary node identifiers, possibly not present in the
2917 # arbitrary node identifiers, possibly not present in the
2918 # local repository.
2918 # local repository.
2919 n = bin(s)
2919 n = bin(s)
2920 if len(n) != len(nullid):
2920 if len(n) != len(nullid):
2921 raise TypeError()
2921 raise TypeError()
2922 return n
2922 return n
2923 except TypeError:
2923 except TypeError:
2924 raise error.Abort('changeset references must be full hexadecimal '
2924 raise error.Abort('changeset references must be full hexadecimal '
2925 'node identifiers')
2925 'node identifiers')
2926
2926
2927 if precursor is not None:
2927 if precursor is not None:
2928 if opts['rev']:
2928 if opts['rev']:
2929 raise error.Abort('cannot select revision when creating marker')
2929 raise error.Abort('cannot select revision when creating marker')
2930 metadata = {}
2930 metadata = {}
2931 metadata['user'] = opts['user'] or ui.username()
2931 metadata['user'] = opts['user'] or ui.username()
2932 succs = tuple(parsenodeid(succ) for succ in successors)
2932 succs = tuple(parsenodeid(succ) for succ in successors)
2933 l = repo.lock()
2933 l = repo.lock()
2934 try:
2934 try:
2935 tr = repo.transaction('debugobsolete')
2935 tr = repo.transaction('debugobsolete')
2936 try:
2936 try:
2937 date = opts.get('date')
2937 date = opts.get('date')
2938 if date:
2938 if date:
2939 date = util.parsedate(date)
2939 date = util.parsedate(date)
2940 else:
2940 else:
2941 date = None
2941 date = None
2942 prec = parsenodeid(precursor)
2942 prec = parsenodeid(precursor)
2943 parents = None
2943 parents = None
2944 if opts['record_parents']:
2944 if opts['record_parents']:
2945 if prec not in repo.unfiltered():
2945 if prec not in repo.unfiltered():
2946 raise error.Abort('cannot used --record-parents on '
2946 raise error.Abort('cannot used --record-parents on '
2947 'unknown changesets')
2947 'unknown changesets')
2948 parents = repo.unfiltered()[prec].parents()
2948 parents = repo.unfiltered()[prec].parents()
2949 parents = tuple(p.node() for p in parents)
2949 parents = tuple(p.node() for p in parents)
2950 repo.obsstore.create(tr, prec, succs, opts['flags'],
2950 repo.obsstore.create(tr, prec, succs, opts['flags'],
2951 parents=parents, date=date,
2951 parents=parents, date=date,
2952 metadata=metadata)
2952 metadata=metadata)
2953 tr.close()
2953 tr.close()
2954 except ValueError as exc:
2954 except ValueError as exc:
2955 raise error.Abort(_('bad obsmarker input: %s') % exc)
2955 raise error.Abort(_('bad obsmarker input: %s') % exc)
2956 finally:
2956 finally:
2957 tr.release()
2957 tr.release()
2958 finally:
2958 finally:
2959 l.release()
2959 l.release()
2960 else:
2960 else:
2961 if opts['rev']:
2961 if opts['rev']:
2962 revs = scmutil.revrange(repo, opts['rev'])
2962 revs = scmutil.revrange(repo, opts['rev'])
2963 nodes = [repo[r].node() for r in revs]
2963 nodes = [repo[r].node() for r in revs]
2964 markers = list(obsolete.getmarkers(repo, nodes=nodes))
2964 markers = list(obsolete.getmarkers(repo, nodes=nodes))
2965 markers.sort(key=lambda x: x._data)
2965 markers.sort(key=lambda x: x._data)
2966 else:
2966 else:
2967 markers = obsolete.getmarkers(repo)
2967 markers = obsolete.getmarkers(repo)
2968
2968
2969 for m in markers:
2969 for m in markers:
2970 cmdutil.showmarker(ui, m)
2970 cmdutil.showmarker(ui, m)
2971
2971
2972 @command('debugpathcomplete',
2972 @command('debugpathcomplete',
2973 [('f', 'full', None, _('complete an entire path')),
2973 [('f', 'full', None, _('complete an entire path')),
2974 ('n', 'normal', None, _('show only normal files')),
2974 ('n', 'normal', None, _('show only normal files')),
2975 ('a', 'added', None, _('show only added files')),
2975 ('a', 'added', None, _('show only added files')),
2976 ('r', 'removed', None, _('show only removed files'))],
2976 ('r', 'removed', None, _('show only removed files'))],
2977 _('FILESPEC...'))
2977 _('FILESPEC...'))
2978 def debugpathcomplete(ui, repo, *specs, **opts):
2978 def debugpathcomplete(ui, repo, *specs, **opts):
2979 '''complete part or all of a tracked path
2979 '''complete part or all of a tracked path
2980
2980
2981 This command supports shells that offer path name completion. It
2981 This command supports shells that offer path name completion. It
2982 currently completes only files already known to the dirstate.
2982 currently completes only files already known to the dirstate.
2983
2983
2984 Completion extends only to the next path segment unless
2984 Completion extends only to the next path segment unless
2985 --full is specified, in which case entire paths are used.'''
2985 --full is specified, in which case entire paths are used.'''
2986
2986
2987 def complete(path, acceptable):
2987 def complete(path, acceptable):
2988 dirstate = repo.dirstate
2988 dirstate = repo.dirstate
2989 spec = os.path.normpath(os.path.join(os.getcwd(), path))
2989 spec = os.path.normpath(os.path.join(os.getcwd(), path))
2990 rootdir = repo.root + os.sep
2990 rootdir = repo.root + os.sep
2991 if spec != repo.root and not spec.startswith(rootdir):
2991 if spec != repo.root and not spec.startswith(rootdir):
2992 return [], []
2992 return [], []
2993 if os.path.isdir(spec):
2993 if os.path.isdir(spec):
2994 spec += '/'
2994 spec += '/'
2995 spec = spec[len(rootdir):]
2995 spec = spec[len(rootdir):]
2996 fixpaths = os.sep != '/'
2996 fixpaths = os.sep != '/'
2997 if fixpaths:
2997 if fixpaths:
2998 spec = spec.replace(os.sep, '/')
2998 spec = spec.replace(os.sep, '/')
2999 speclen = len(spec)
2999 speclen = len(spec)
3000 fullpaths = opts['full']
3000 fullpaths = opts['full']
3001 files, dirs = set(), set()
3001 files, dirs = set(), set()
3002 adddir, addfile = dirs.add, files.add
3002 adddir, addfile = dirs.add, files.add
3003 for f, st in dirstate.iteritems():
3003 for f, st in dirstate.iteritems():
3004 if f.startswith(spec) and st[0] in acceptable:
3004 if f.startswith(spec) and st[0] in acceptable:
3005 if fixpaths:
3005 if fixpaths:
3006 f = f.replace('/', os.sep)
3006 f = f.replace('/', os.sep)
3007 if fullpaths:
3007 if fullpaths:
3008 addfile(f)
3008 addfile(f)
3009 continue
3009 continue
3010 s = f.find(os.sep, speclen)
3010 s = f.find(os.sep, speclen)
3011 if s >= 0:
3011 if s >= 0:
3012 adddir(f[:s])
3012 adddir(f[:s])
3013 else:
3013 else:
3014 addfile(f)
3014 addfile(f)
3015 return files, dirs
3015 return files, dirs
3016
3016
3017 acceptable = ''
3017 acceptable = ''
3018 if opts['normal']:
3018 if opts['normal']:
3019 acceptable += 'nm'
3019 acceptable += 'nm'
3020 if opts['added']:
3020 if opts['added']:
3021 acceptable += 'a'
3021 acceptable += 'a'
3022 if opts['removed']:
3022 if opts['removed']:
3023 acceptable += 'r'
3023 acceptable += 'r'
3024 cwd = repo.getcwd()
3024 cwd = repo.getcwd()
3025 if not specs:
3025 if not specs:
3026 specs = ['.']
3026 specs = ['.']
3027
3027
3028 files, dirs = set(), set()
3028 files, dirs = set(), set()
3029 for spec in specs:
3029 for spec in specs:
3030 f, d = complete(spec, acceptable or 'nmar')
3030 f, d = complete(spec, acceptable or 'nmar')
3031 files.update(f)
3031 files.update(f)
3032 dirs.update(d)
3032 dirs.update(d)
3033 files.update(dirs)
3033 files.update(dirs)
3034 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3034 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3035 ui.write('\n')
3035 ui.write('\n')
3036
3036
3037 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3037 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3038 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3038 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3039 '''access the pushkey key/value protocol
3039 '''access the pushkey key/value protocol
3040
3040
3041 With two args, list the keys in the given namespace.
3041 With two args, list the keys in the given namespace.
3042
3042
3043 With five args, set a key to new if it currently is set to old.
3043 With five args, set a key to new if it currently is set to old.
3044 Reports success or failure.
3044 Reports success or failure.
3045 '''
3045 '''
3046
3046
3047 target = hg.peer(ui, {}, repopath)
3047 target = hg.peer(ui, {}, repopath)
3048 if keyinfo:
3048 if keyinfo:
3049 key, old, new = keyinfo
3049 key, old, new = keyinfo
3050 r = target.pushkey(namespace, key, old, new)
3050 r = target.pushkey(namespace, key, old, new)
3051 ui.status(str(r) + '\n')
3051 ui.status(str(r) + '\n')
3052 return not r
3052 return not r
3053 else:
3053 else:
3054 for k, v in sorted(target.listkeys(namespace).iteritems()):
3054 for k, v in sorted(target.listkeys(namespace).iteritems()):
3055 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3055 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3056 v.encode('string-escape')))
3056 v.encode('string-escape')))
3057
3057
3058 @command('debugpvec', [], _('A B'))
3058 @command('debugpvec', [], _('A B'))
3059 def debugpvec(ui, repo, a, b=None):
3059 def debugpvec(ui, repo, a, b=None):
3060 ca = scmutil.revsingle(repo, a)
3060 ca = scmutil.revsingle(repo, a)
3061 cb = scmutil.revsingle(repo, b)
3061 cb = scmutil.revsingle(repo, b)
3062 pa = pvec.ctxpvec(ca)
3062 pa = pvec.ctxpvec(ca)
3063 pb = pvec.ctxpvec(cb)
3063 pb = pvec.ctxpvec(cb)
3064 if pa == pb:
3064 if pa == pb:
3065 rel = "="
3065 rel = "="
3066 elif pa > pb:
3066 elif pa > pb:
3067 rel = ">"
3067 rel = ">"
3068 elif pa < pb:
3068 elif pa < pb:
3069 rel = "<"
3069 rel = "<"
3070 elif pa | pb:
3070 elif pa | pb:
3071 rel = "|"
3071 rel = "|"
3072 ui.write(_("a: %s\n") % pa)
3072 ui.write(_("a: %s\n") % pa)
3073 ui.write(_("b: %s\n") % pb)
3073 ui.write(_("b: %s\n") % pb)
3074 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3074 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3075 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3075 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3076 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3076 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3077 pa.distance(pb), rel))
3077 pa.distance(pb), rel))
3078
3078
3079 @command('debugrebuilddirstate|debugrebuildstate',
3079 @command('debugrebuilddirstate|debugrebuildstate',
3080 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3080 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3081 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3081 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3082 'the working copy parent')),
3082 'the working copy parent')),
3083 ],
3083 ],
3084 _('[-r REV]'))
3084 _('[-r REV]'))
3085 def debugrebuilddirstate(ui, repo, rev, **opts):
3085 def debugrebuilddirstate(ui, repo, rev, **opts):
3086 """rebuild the dirstate as it would look like for the given revision
3086 """rebuild the dirstate as it would look like for the given revision
3087
3087
3088 If no revision is specified the first current parent will be used.
3088 If no revision is specified the first current parent will be used.
3089
3089
3090 The dirstate will be set to the files of the given revision.
3090 The dirstate will be set to the files of the given revision.
3091 The actual working directory content or existing dirstate
3091 The actual working directory content or existing dirstate
3092 information such as adds or removes is not considered.
3092 information such as adds or removes is not considered.
3093
3093
3094 ``minimal`` will only rebuild the dirstate status for files that claim to be
3094 ``minimal`` will only rebuild the dirstate status for files that claim to be
3095 tracked but are not in the parent manifest, or that exist in the parent
3095 tracked but are not in the parent manifest, or that exist in the parent
3096 manifest but are not in the dirstate. It will not change adds, removes, or
3096 manifest but are not in the dirstate. It will not change adds, removes, or
3097 modified files that are in the working copy parent.
3097 modified files that are in the working copy parent.
3098
3098
3099 One use of this command is to make the next :hg:`status` invocation
3099 One use of this command is to make the next :hg:`status` invocation
3100 check the actual file content.
3100 check the actual file content.
3101 """
3101 """
3102 ctx = scmutil.revsingle(repo, rev)
3102 ctx = scmutil.revsingle(repo, rev)
3103 wlock = repo.wlock()
3103 wlock = repo.wlock()
3104 try:
3104 try:
3105 dirstate = repo.dirstate
3105 dirstate = repo.dirstate
3106 changedfiles = None
3106 changedfiles = None
3107 # See command doc for what minimal does.
3107 # See command doc for what minimal does.
3108 if opts.get('minimal'):
3108 if opts.get('minimal'):
3109 manifestfiles = set(ctx.manifest().keys())
3109 manifestfiles = set(ctx.manifest().keys())
3110 dirstatefiles = set(dirstate)
3110 dirstatefiles = set(dirstate)
3111 manifestonly = manifestfiles - dirstatefiles
3111 manifestonly = manifestfiles - dirstatefiles
3112 dsonly = dirstatefiles - manifestfiles
3112 dsonly = dirstatefiles - manifestfiles
3113 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3113 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3114 changedfiles = manifestonly | dsnotadded
3114 changedfiles = manifestonly | dsnotadded
3115
3115
3116 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3116 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3117 finally:
3117 finally:
3118 wlock.release()
3118 wlock.release()
3119
3119
3120 @command('debugrebuildfncache', [], '')
3120 @command('debugrebuildfncache', [], '')
3121 def debugrebuildfncache(ui, repo):
3121 def debugrebuildfncache(ui, repo):
3122 """rebuild the fncache file"""
3122 """rebuild the fncache file"""
3123 repair.rebuildfncache(ui, repo)
3123 repair.rebuildfncache(ui, repo)
3124
3124
3125 @command('debugrename',
3125 @command('debugrename',
3126 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3126 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3127 _('[-r REV] FILE'))
3127 _('[-r REV] FILE'))
3128 def debugrename(ui, repo, file1, *pats, **opts):
3128 def debugrename(ui, repo, file1, *pats, **opts):
3129 """dump rename information"""
3129 """dump rename information"""
3130
3130
3131 ctx = scmutil.revsingle(repo, opts.get('rev'))
3131 ctx = scmutil.revsingle(repo, opts.get('rev'))
3132 m = scmutil.match(ctx, (file1,) + pats, opts)
3132 m = scmutil.match(ctx, (file1,) + pats, opts)
3133 for abs in ctx.walk(m):
3133 for abs in ctx.walk(m):
3134 fctx = ctx[abs]
3134 fctx = ctx[abs]
3135 o = fctx.filelog().renamed(fctx.filenode())
3135 o = fctx.filelog().renamed(fctx.filenode())
3136 rel = m.rel(abs)
3136 rel = m.rel(abs)
3137 if o:
3137 if o:
3138 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3138 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3139 else:
3139 else:
3140 ui.write(_("%s not renamed\n") % rel)
3140 ui.write(_("%s not renamed\n") % rel)
3141
3141
3142 @command('debugrevlog', debugrevlogopts +
3142 @command('debugrevlog', debugrevlogopts +
3143 [('d', 'dump', False, _('dump index data'))],
3143 [('d', 'dump', False, _('dump index data'))],
3144 _('-c|-m|FILE'),
3144 _('-c|-m|FILE'),
3145 optionalrepo=True)
3145 optionalrepo=True)
3146 def debugrevlog(ui, repo, file_=None, **opts):
3146 def debugrevlog(ui, repo, file_=None, **opts):
3147 """show data and statistics about a revlog"""
3147 """show data and statistics about a revlog"""
3148 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3148 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3149
3149
3150 if opts.get("dump"):
3150 if opts.get("dump"):
3151 numrevs = len(r)
3151 numrevs = len(r)
3152 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
3152 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
3153 " rawsize totalsize compression heads chainlen\n")
3153 " rawsize totalsize compression heads chainlen\n")
3154 ts = 0
3154 ts = 0
3155 heads = set()
3155 heads = set()
3156
3156
3157 for rev in xrange(numrevs):
3157 for rev in xrange(numrevs):
3158 dbase = r.deltaparent(rev)
3158 dbase = r.deltaparent(rev)
3159 if dbase == -1:
3159 if dbase == -1:
3160 dbase = rev
3160 dbase = rev
3161 cbase = r.chainbase(rev)
3161 cbase = r.chainbase(rev)
3162 clen = r.chainlen(rev)
3162 clen = r.chainlen(rev)
3163 p1, p2 = r.parentrevs(rev)
3163 p1, p2 = r.parentrevs(rev)
3164 rs = r.rawsize(rev)
3164 rs = r.rawsize(rev)
3165 ts = ts + rs
3165 ts = ts + rs
3166 heads -= set(r.parentrevs(rev))
3166 heads -= set(r.parentrevs(rev))
3167 heads.add(rev)
3167 heads.add(rev)
3168 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3168 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3169 "%11d %5d %8d\n" %
3169 "%11d %5d %8d\n" %
3170 (rev, p1, p2, r.start(rev), r.end(rev),
3170 (rev, p1, p2, r.start(rev), r.end(rev),
3171 r.start(dbase), r.start(cbase),
3171 r.start(dbase), r.start(cbase),
3172 r.start(p1), r.start(p2),
3172 r.start(p1), r.start(p2),
3173 rs, ts, ts / r.end(rev), len(heads), clen))
3173 rs, ts, ts / r.end(rev), len(heads), clen))
3174 return 0
3174 return 0
3175
3175
3176 v = r.version
3176 v = r.version
3177 format = v & 0xFFFF
3177 format = v & 0xFFFF
3178 flags = []
3178 flags = []
3179 gdelta = False
3179 gdelta = False
3180 if v & revlog.REVLOGNGINLINEDATA:
3180 if v & revlog.REVLOGNGINLINEDATA:
3181 flags.append('inline')
3181 flags.append('inline')
3182 if v & revlog.REVLOGGENERALDELTA:
3182 if v & revlog.REVLOGGENERALDELTA:
3183 gdelta = True
3183 gdelta = True
3184 flags.append('generaldelta')
3184 flags.append('generaldelta')
3185 if not flags:
3185 if not flags:
3186 flags = ['(none)']
3186 flags = ['(none)']
3187
3187
3188 nummerges = 0
3188 nummerges = 0
3189 numfull = 0
3189 numfull = 0
3190 numprev = 0
3190 numprev = 0
3191 nump1 = 0
3191 nump1 = 0
3192 nump2 = 0
3192 nump2 = 0
3193 numother = 0
3193 numother = 0
3194 nump1prev = 0
3194 nump1prev = 0
3195 nump2prev = 0
3195 nump2prev = 0
3196 chainlengths = []
3196 chainlengths = []
3197
3197
3198 datasize = [None, 0, 0L]
3198 datasize = [None, 0, 0L]
3199 fullsize = [None, 0, 0L]
3199 fullsize = [None, 0, 0L]
3200 deltasize = [None, 0, 0L]
3200 deltasize = [None, 0, 0L]
3201
3201
3202 def addsize(size, l):
3202 def addsize(size, l):
3203 if l[0] is None or size < l[0]:
3203 if l[0] is None or size < l[0]:
3204 l[0] = size
3204 l[0] = size
3205 if size > l[1]:
3205 if size > l[1]:
3206 l[1] = size
3206 l[1] = size
3207 l[2] += size
3207 l[2] += size
3208
3208
3209 numrevs = len(r)
3209 numrevs = len(r)
3210 for rev in xrange(numrevs):
3210 for rev in xrange(numrevs):
3211 p1, p2 = r.parentrevs(rev)
3211 p1, p2 = r.parentrevs(rev)
3212 delta = r.deltaparent(rev)
3212 delta = r.deltaparent(rev)
3213 if format > 0:
3213 if format > 0:
3214 addsize(r.rawsize(rev), datasize)
3214 addsize(r.rawsize(rev), datasize)
3215 if p2 != nullrev:
3215 if p2 != nullrev:
3216 nummerges += 1
3216 nummerges += 1
3217 size = r.length(rev)
3217 size = r.length(rev)
3218 if delta == nullrev:
3218 if delta == nullrev:
3219 chainlengths.append(0)
3219 chainlengths.append(0)
3220 numfull += 1
3220 numfull += 1
3221 addsize(size, fullsize)
3221 addsize(size, fullsize)
3222 else:
3222 else:
3223 chainlengths.append(chainlengths[delta] + 1)
3223 chainlengths.append(chainlengths[delta] + 1)
3224 addsize(size, deltasize)
3224 addsize(size, deltasize)
3225 if delta == rev - 1:
3225 if delta == rev - 1:
3226 numprev += 1
3226 numprev += 1
3227 if delta == p1:
3227 if delta == p1:
3228 nump1prev += 1
3228 nump1prev += 1
3229 elif delta == p2:
3229 elif delta == p2:
3230 nump2prev += 1
3230 nump2prev += 1
3231 elif delta == p1:
3231 elif delta == p1:
3232 nump1 += 1
3232 nump1 += 1
3233 elif delta == p2:
3233 elif delta == p2:
3234 nump2 += 1
3234 nump2 += 1
3235 elif delta != nullrev:
3235 elif delta != nullrev:
3236 numother += 1
3236 numother += 1
3237
3237
3238 # Adjust size min value for empty cases
3238 # Adjust size min value for empty cases
3239 for size in (datasize, fullsize, deltasize):
3239 for size in (datasize, fullsize, deltasize):
3240 if size[0] is None:
3240 if size[0] is None:
3241 size[0] = 0
3241 size[0] = 0
3242
3242
3243 numdeltas = numrevs - numfull
3243 numdeltas = numrevs - numfull
3244 numoprev = numprev - nump1prev - nump2prev
3244 numoprev = numprev - nump1prev - nump2prev
3245 totalrawsize = datasize[2]
3245 totalrawsize = datasize[2]
3246 datasize[2] /= numrevs
3246 datasize[2] /= numrevs
3247 fulltotal = fullsize[2]
3247 fulltotal = fullsize[2]
3248 fullsize[2] /= numfull
3248 fullsize[2] /= numfull
3249 deltatotal = deltasize[2]
3249 deltatotal = deltasize[2]
3250 if numrevs - numfull > 0:
3250 if numrevs - numfull > 0:
3251 deltasize[2] /= numrevs - numfull
3251 deltasize[2] /= numrevs - numfull
3252 totalsize = fulltotal + deltatotal
3252 totalsize = fulltotal + deltatotal
3253 avgchainlen = sum(chainlengths) / numrevs
3253 avgchainlen = sum(chainlengths) / numrevs
3254 maxchainlen = max(chainlengths)
3254 maxchainlen = max(chainlengths)
3255 compratio = 1
3255 compratio = 1
3256 if totalsize:
3256 if totalsize:
3257 compratio = totalrawsize / totalsize
3257 compratio = totalrawsize / totalsize
3258
3258
3259 basedfmtstr = '%%%dd\n'
3259 basedfmtstr = '%%%dd\n'
3260 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3260 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3261
3261
3262 def dfmtstr(max):
3262 def dfmtstr(max):
3263 return basedfmtstr % len(str(max))
3263 return basedfmtstr % len(str(max))
3264 def pcfmtstr(max, padding=0):
3264 def pcfmtstr(max, padding=0):
3265 return basepcfmtstr % (len(str(max)), ' ' * padding)
3265 return basepcfmtstr % (len(str(max)), ' ' * padding)
3266
3266
3267 def pcfmt(value, total):
3267 def pcfmt(value, total):
3268 if total:
3268 if total:
3269 return (value, 100 * float(value) / total)
3269 return (value, 100 * float(value) / total)
3270 else:
3270 else:
3271 return value, 100.0
3271 return value, 100.0
3272
3272
3273 ui.write(('format : %d\n') % format)
3273 ui.write(('format : %d\n') % format)
3274 ui.write(('flags : %s\n') % ', '.join(flags))
3274 ui.write(('flags : %s\n') % ', '.join(flags))
3275
3275
3276 ui.write('\n')
3276 ui.write('\n')
3277 fmt = pcfmtstr(totalsize)
3277 fmt = pcfmtstr(totalsize)
3278 fmt2 = dfmtstr(totalsize)
3278 fmt2 = dfmtstr(totalsize)
3279 ui.write(('revisions : ') + fmt2 % numrevs)
3279 ui.write(('revisions : ') + fmt2 % numrevs)
3280 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3280 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3281 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3281 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3282 ui.write(('revisions : ') + fmt2 % numrevs)
3282 ui.write(('revisions : ') + fmt2 % numrevs)
3283 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3283 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3284 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3284 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3285 ui.write(('revision size : ') + fmt2 % totalsize)
3285 ui.write(('revision size : ') + fmt2 % totalsize)
3286 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3286 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3287 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3287 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3288
3288
3289 ui.write('\n')
3289 ui.write('\n')
3290 fmt = dfmtstr(max(avgchainlen, compratio))
3290 fmt = dfmtstr(max(avgchainlen, compratio))
3291 ui.write(('avg chain length : ') + fmt % avgchainlen)
3291 ui.write(('avg chain length : ') + fmt % avgchainlen)
3292 ui.write(('max chain length : ') + fmt % maxchainlen)
3292 ui.write(('max chain length : ') + fmt % maxchainlen)
3293 ui.write(('compression ratio : ') + fmt % compratio)
3293 ui.write(('compression ratio : ') + fmt % compratio)
3294
3294
3295 if format > 0:
3295 if format > 0:
3296 ui.write('\n')
3296 ui.write('\n')
3297 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3297 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3298 % tuple(datasize))
3298 % tuple(datasize))
3299 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3299 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3300 % tuple(fullsize))
3300 % tuple(fullsize))
3301 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3301 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3302 % tuple(deltasize))
3302 % tuple(deltasize))
3303
3303
3304 if numdeltas > 0:
3304 if numdeltas > 0:
3305 ui.write('\n')
3305 ui.write('\n')
3306 fmt = pcfmtstr(numdeltas)
3306 fmt = pcfmtstr(numdeltas)
3307 fmt2 = pcfmtstr(numdeltas, 4)
3307 fmt2 = pcfmtstr(numdeltas, 4)
3308 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3308 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3309 if numprev > 0:
3309 if numprev > 0:
3310 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3310 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3311 numprev))
3311 numprev))
3312 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3312 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3313 numprev))
3313 numprev))
3314 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3314 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3315 numprev))
3315 numprev))
3316 if gdelta:
3316 if gdelta:
3317 ui.write(('deltas against p1 : ')
3317 ui.write(('deltas against p1 : ')
3318 + fmt % pcfmt(nump1, numdeltas))
3318 + fmt % pcfmt(nump1, numdeltas))
3319 ui.write(('deltas against p2 : ')
3319 ui.write(('deltas against p2 : ')
3320 + fmt % pcfmt(nump2, numdeltas))
3320 + fmt % pcfmt(nump2, numdeltas))
3321 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3321 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3322 numdeltas))
3322 numdeltas))
3323
3323
3324 @command('debugrevspec',
3324 @command('debugrevspec',
3325 [('', 'optimize', None, _('print parsed tree after optimizing'))],
3325 [('', 'optimize', None, _('print parsed tree after optimizing'))],
3326 ('REVSPEC'))
3326 ('REVSPEC'))
3327 def debugrevspec(ui, repo, expr, **opts):
3327 def debugrevspec(ui, repo, expr, **opts):
3328 """parse and apply a revision specification
3328 """parse and apply a revision specification
3329
3329
3330 Use --verbose to print the parsed tree before and after aliases
3330 Use --verbose to print the parsed tree before and after aliases
3331 expansion.
3331 expansion.
3332 """
3332 """
3333 if ui.verbose:
3333 if ui.verbose:
3334 tree = revset.parse(expr, lookup=repo.__contains__)
3334 tree = revset.parse(expr, lookup=repo.__contains__)
3335 ui.note(revset.prettyformat(tree), "\n")
3335 ui.note(revset.prettyformat(tree), "\n")
3336 newtree = revset.findaliases(ui, tree)
3336 newtree = revset.findaliases(ui, tree)
3337 if newtree != tree:
3337 if newtree != tree:
3338 ui.note(revset.prettyformat(newtree), "\n")
3338 ui.note(revset.prettyformat(newtree), "\n")
3339 tree = newtree
3339 tree = newtree
3340 newtree = revset.foldconcat(tree)
3340 newtree = revset.foldconcat(tree)
3341 if newtree != tree:
3341 if newtree != tree:
3342 ui.note(revset.prettyformat(newtree), "\n")
3342 ui.note(revset.prettyformat(newtree), "\n")
3343 if opts["optimize"]:
3343 if opts["optimize"]:
3344 weight, optimizedtree = revset.optimize(newtree, True)
3344 weight, optimizedtree = revset.optimize(newtree, True)
3345 ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n")
3345 ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n")
3346 func = revset.match(ui, expr, repo)
3346 func = revset.match(ui, expr, repo)
3347 revs = func(repo)
3347 revs = func(repo)
3348 if ui.verbose:
3348 if ui.verbose:
3349 ui.note("* set:\n", revset.prettyformatset(revs), "\n")
3349 ui.note("* set:\n", revset.prettyformatset(revs), "\n")
3350 for c in revs:
3350 for c in revs:
3351 ui.write("%s\n" % c)
3351 ui.write("%s\n" % c)
3352
3352
3353 @command('debugsetparents', [], _('REV1 [REV2]'))
3353 @command('debugsetparents', [], _('REV1 [REV2]'))
3354 def debugsetparents(ui, repo, rev1, rev2=None):
3354 def debugsetparents(ui, repo, rev1, rev2=None):
3355 """manually set the parents of the current working directory
3355 """manually set the parents of the current working directory
3356
3356
3357 This is useful for writing repository conversion tools, but should
3357 This is useful for writing repository conversion tools, but should
3358 be used with care. For example, neither the working directory nor the
3358 be used with care. For example, neither the working directory nor the
3359 dirstate is updated, so file status may be incorrect after running this
3359 dirstate is updated, so file status may be incorrect after running this
3360 command.
3360 command.
3361
3361
3362 Returns 0 on success.
3362 Returns 0 on success.
3363 """
3363 """
3364
3364
3365 r1 = scmutil.revsingle(repo, rev1).node()
3365 r1 = scmutil.revsingle(repo, rev1).node()
3366 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3366 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3367
3367
3368 wlock = repo.wlock()
3368 wlock = repo.wlock()
3369 try:
3369 try:
3370 repo.dirstate.beginparentchange()
3370 repo.dirstate.beginparentchange()
3371 repo.setparents(r1, r2)
3371 repo.setparents(r1, r2)
3372 repo.dirstate.endparentchange()
3372 repo.dirstate.endparentchange()
3373 finally:
3373 finally:
3374 wlock.release()
3374 wlock.release()
3375
3375
3376 @command('debugdirstate|debugstate',
3376 @command('debugdirstate|debugstate',
3377 [('', 'nodates', None, _('do not display the saved mtime')),
3377 [('', 'nodates', None, _('do not display the saved mtime')),
3378 ('', 'datesort', None, _('sort by saved mtime'))],
3378 ('', 'datesort', None, _('sort by saved mtime'))],
3379 _('[OPTION]...'))
3379 _('[OPTION]...'))
3380 def debugstate(ui, repo, **opts):
3380 def debugstate(ui, repo, **opts):
3381 """show the contents of the current dirstate"""
3381 """show the contents of the current dirstate"""
3382
3382
3383 nodates = opts.get('nodates')
3383 nodates = opts.get('nodates')
3384 datesort = opts.get('datesort')
3384 datesort = opts.get('datesort')
3385
3385
3386 timestr = ""
3386 timestr = ""
3387 if datesort:
3387 if datesort:
3388 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3388 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3389 else:
3389 else:
3390 keyfunc = None # sort by filename
3390 keyfunc = None # sort by filename
3391 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3391 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3392 if ent[3] == -1:
3392 if ent[3] == -1:
3393 timestr = 'unset '
3393 timestr = 'unset '
3394 elif nodates:
3394 elif nodates:
3395 timestr = 'set '
3395 timestr = 'set '
3396 else:
3396 else:
3397 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3397 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3398 time.localtime(ent[3]))
3398 time.localtime(ent[3]))
3399 if ent[1] & 0o20000:
3399 if ent[1] & 0o20000:
3400 mode = 'lnk'
3400 mode = 'lnk'
3401 else:
3401 else:
3402 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3402 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3403 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3403 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3404 for f in repo.dirstate.copies():
3404 for f in repo.dirstate.copies():
3405 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3405 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3406
3406
3407 @command('debugsub',
3407 @command('debugsub',
3408 [('r', 'rev', '',
3408 [('r', 'rev', '',
3409 _('revision to check'), _('REV'))],
3409 _('revision to check'), _('REV'))],
3410 _('[-r REV] [REV]'))
3410 _('[-r REV] [REV]'))
3411 def debugsub(ui, repo, rev=None):
3411 def debugsub(ui, repo, rev=None):
3412 ctx = scmutil.revsingle(repo, rev, None)
3412 ctx = scmutil.revsingle(repo, rev, None)
3413 for k, v in sorted(ctx.substate.items()):
3413 for k, v in sorted(ctx.substate.items()):
3414 ui.write(('path %s\n') % k)
3414 ui.write(('path %s\n') % k)
3415 ui.write((' source %s\n') % v[0])
3415 ui.write((' source %s\n') % v[0])
3416 ui.write((' revision %s\n') % v[1])
3416 ui.write((' revision %s\n') % v[1])
3417
3417
3418 @command('debugsuccessorssets',
3418 @command('debugsuccessorssets',
3419 [],
3419 [],
3420 _('[REV]'))
3420 _('[REV]'))
3421 def debugsuccessorssets(ui, repo, *revs):
3421 def debugsuccessorssets(ui, repo, *revs):
3422 """show set of successors for revision
3422 """show set of successors for revision
3423
3423
3424 A successors set of changeset A is a consistent group of revisions that
3424 A successors set of changeset A is a consistent group of revisions that
3425 succeed A. It contains non-obsolete changesets only.
3425 succeed A. It contains non-obsolete changesets only.
3426
3426
3427 In most cases a changeset A has a single successors set containing a single
3427 In most cases a changeset A has a single successors set containing a single
3428 successor (changeset A replaced by A').
3428 successor (changeset A replaced by A').
3429
3429
3430 A changeset that is made obsolete with no successors are called "pruned".
3430 A changeset that is made obsolete with no successors are called "pruned".
3431 Such changesets have no successors sets at all.
3431 Such changesets have no successors sets at all.
3432
3432
3433 A changeset that has been "split" will have a successors set containing
3433 A changeset that has been "split" will have a successors set containing
3434 more than one successor.
3434 more than one successor.
3435
3435
3436 A changeset that has been rewritten in multiple different ways is called
3436 A changeset that has been rewritten in multiple different ways is called
3437 "divergent". Such changesets have multiple successor sets (each of which
3437 "divergent". Such changesets have multiple successor sets (each of which
3438 may also be split, i.e. have multiple successors).
3438 may also be split, i.e. have multiple successors).
3439
3439
3440 Results are displayed as follows::
3440 Results are displayed as follows::
3441
3441
3442 <rev1>
3442 <rev1>
3443 <successors-1A>
3443 <successors-1A>
3444 <rev2>
3444 <rev2>
3445 <successors-2A>
3445 <successors-2A>
3446 <successors-2B1> <successors-2B2> <successors-2B3>
3446 <successors-2B1> <successors-2B2> <successors-2B3>
3447
3447
3448 Here rev2 has two possible (i.e. divergent) successors sets. The first
3448 Here rev2 has two possible (i.e. divergent) successors sets. The first
3449 holds one element, whereas the second holds three (i.e. the changeset has
3449 holds one element, whereas the second holds three (i.e. the changeset has
3450 been split).
3450 been split).
3451 """
3451 """
3452 # passed to successorssets caching computation from one call to another
3452 # passed to successorssets caching computation from one call to another
3453 cache = {}
3453 cache = {}
3454 ctx2str = str
3454 ctx2str = str
3455 node2str = short
3455 node2str = short
3456 if ui.debug():
3456 if ui.debug():
3457 def ctx2str(ctx):
3457 def ctx2str(ctx):
3458 return ctx.hex()
3458 return ctx.hex()
3459 node2str = hex
3459 node2str = hex
3460 for rev in scmutil.revrange(repo, revs):
3460 for rev in scmutil.revrange(repo, revs):
3461 ctx = repo[rev]
3461 ctx = repo[rev]
3462 ui.write('%s\n'% ctx2str(ctx))
3462 ui.write('%s\n'% ctx2str(ctx))
3463 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3463 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3464 if succsset:
3464 if succsset:
3465 ui.write(' ')
3465 ui.write(' ')
3466 ui.write(node2str(succsset[0]))
3466 ui.write(node2str(succsset[0]))
3467 for node in succsset[1:]:
3467 for node in succsset[1:]:
3468 ui.write(' ')
3468 ui.write(' ')
3469 ui.write(node2str(node))
3469 ui.write(node2str(node))
3470 ui.write('\n')
3470 ui.write('\n')
3471
3471
3472 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3472 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3473 def debugwalk(ui, repo, *pats, **opts):
3473 def debugwalk(ui, repo, *pats, **opts):
3474 """show how files match on given patterns"""
3474 """show how files match on given patterns"""
3475 m = scmutil.match(repo[None], pats, opts)
3475 m = scmutil.match(repo[None], pats, opts)
3476 items = list(repo.walk(m))
3476 items = list(repo.walk(m))
3477 if not items:
3477 if not items:
3478 return
3478 return
3479 f = lambda fn: fn
3479 f = lambda fn: fn
3480 if ui.configbool('ui', 'slash') and os.sep != '/':
3480 if ui.configbool('ui', 'slash') and os.sep != '/':
3481 f = lambda fn: util.normpath(fn)
3481 f = lambda fn: util.normpath(fn)
3482 fmt = 'f %%-%ds %%-%ds %%s' % (
3482 fmt = 'f %%-%ds %%-%ds %%s' % (
3483 max([len(abs) for abs in items]),
3483 max([len(abs) for abs in items]),
3484 max([len(m.rel(abs)) for abs in items]))
3484 max([len(m.rel(abs)) for abs in items]))
3485 for abs in items:
3485 for abs in items:
3486 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3486 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3487 ui.write("%s\n" % line.rstrip())
3487 ui.write("%s\n" % line.rstrip())
3488
3488
3489 @command('debugwireargs',
3489 @command('debugwireargs',
3490 [('', 'three', '', 'three'),
3490 [('', 'three', '', 'three'),
3491 ('', 'four', '', 'four'),
3491 ('', 'four', '', 'four'),
3492 ('', 'five', '', 'five'),
3492 ('', 'five', '', 'five'),
3493 ] + remoteopts,
3493 ] + remoteopts,
3494 _('REPO [OPTIONS]... [ONE [TWO]]'),
3494 _('REPO [OPTIONS]... [ONE [TWO]]'),
3495 norepo=True)
3495 norepo=True)
3496 def debugwireargs(ui, repopath, *vals, **opts):
3496 def debugwireargs(ui, repopath, *vals, **opts):
3497 repo = hg.peer(ui, opts, repopath)
3497 repo = hg.peer(ui, opts, repopath)
3498 for opt in remoteopts:
3498 for opt in remoteopts:
3499 del opts[opt[1]]
3499 del opts[opt[1]]
3500 args = {}
3500 args = {}
3501 for k, v in opts.iteritems():
3501 for k, v in opts.iteritems():
3502 if v:
3502 if v:
3503 args[k] = v
3503 args[k] = v
3504 # run twice to check that we don't mess up the stream for the next command
3504 # run twice to check that we don't mess up the stream for the next command
3505 res1 = repo.debugwireargs(*vals, **args)
3505 res1 = repo.debugwireargs(*vals, **args)
3506 res2 = repo.debugwireargs(*vals, **args)
3506 res2 = repo.debugwireargs(*vals, **args)
3507 ui.write("%s\n" % res1)
3507 ui.write("%s\n" % res1)
3508 if res1 != res2:
3508 if res1 != res2:
3509 ui.warn("%s\n" % res2)
3509 ui.warn("%s\n" % res2)
3510
3510
3511 @command('^diff',
3511 @command('^diff',
3512 [('r', 'rev', [], _('revision'), _('REV')),
3512 [('r', 'rev', [], _('revision'), _('REV')),
3513 ('c', 'change', '', _('change made by revision'), _('REV'))
3513 ('c', 'change', '', _('change made by revision'), _('REV'))
3514 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3514 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3515 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3515 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3516 inferrepo=True)
3516 inferrepo=True)
3517 def diff(ui, repo, *pats, **opts):
3517 def diff(ui, repo, *pats, **opts):
3518 """diff repository (or selected files)
3518 """diff repository (or selected files)
3519
3519
3520 Show differences between revisions for the specified files.
3520 Show differences between revisions for the specified files.
3521
3521
3522 Differences between files are shown using the unified diff format.
3522 Differences between files are shown using the unified diff format.
3523
3523
3524 .. note::
3524 .. note::
3525
3525
3526 :hg:`diff` may generate unexpected results for merges, as it will
3526 :hg:`diff` may generate unexpected results for merges, as it will
3527 default to comparing against the working directory's first
3527 default to comparing against the working directory's first
3528 parent changeset if no revisions are specified.
3528 parent changeset if no revisions are specified.
3529
3529
3530 When two revision arguments are given, then changes are shown
3530 When two revision arguments are given, then changes are shown
3531 between those revisions. If only one revision is specified then
3531 between those revisions. If only one revision is specified then
3532 that revision is compared to the working directory, and, when no
3532 that revision is compared to the working directory, and, when no
3533 revisions are specified, the working directory files are compared
3533 revisions are specified, the working directory files are compared
3534 to its first parent.
3534 to its first parent.
3535
3535
3536 Alternatively you can specify -c/--change with a revision to see
3536 Alternatively you can specify -c/--change with a revision to see
3537 the changes in that changeset relative to its first parent.
3537 the changes in that changeset relative to its first parent.
3538
3538
3539 Without the -a/--text option, diff will avoid generating diffs of
3539 Without the -a/--text option, diff will avoid generating diffs of
3540 files it detects as binary. With -a, diff will generate a diff
3540 files it detects as binary. With -a, diff will generate a diff
3541 anyway, probably with undesirable results.
3541 anyway, probably with undesirable results.
3542
3542
3543 Use the -g/--git option to generate diffs in the git extended diff
3543 Use the -g/--git option to generate diffs in the git extended diff
3544 format. For more information, read :hg:`help diffs`.
3544 format. For more information, read :hg:`help diffs`.
3545
3545
3546 .. container:: verbose
3546 .. container:: verbose
3547
3547
3548 Examples:
3548 Examples:
3549
3549
3550 - compare a file in the current working directory to its parent::
3550 - compare a file in the current working directory to its parent::
3551
3551
3552 hg diff foo.c
3552 hg diff foo.c
3553
3553
3554 - compare two historical versions of a directory, with rename info::
3554 - compare two historical versions of a directory, with rename info::
3555
3555
3556 hg diff --git -r 1.0:1.2 lib/
3556 hg diff --git -r 1.0:1.2 lib/
3557
3557
3558 - get change stats relative to the last change on some date::
3558 - get change stats relative to the last change on some date::
3559
3559
3560 hg diff --stat -r "date('may 2')"
3560 hg diff --stat -r "date('may 2')"
3561
3561
3562 - diff all newly-added files that contain a keyword::
3562 - diff all newly-added files that contain a keyword::
3563
3563
3564 hg diff "set:added() and grep(GNU)"
3564 hg diff "set:added() and grep(GNU)"
3565
3565
3566 - compare a revision and its parents::
3566 - compare a revision and its parents::
3567
3567
3568 hg diff -c 9353 # compare against first parent
3568 hg diff -c 9353 # compare against first parent
3569 hg diff -r 9353^:9353 # same using revset syntax
3569 hg diff -r 9353^:9353 # same using revset syntax
3570 hg diff -r 9353^2:9353 # compare against the second parent
3570 hg diff -r 9353^2:9353 # compare against the second parent
3571
3571
3572 Returns 0 on success.
3572 Returns 0 on success.
3573 """
3573 """
3574
3574
3575 revs = opts.get('rev')
3575 revs = opts.get('rev')
3576 change = opts.get('change')
3576 change = opts.get('change')
3577 stat = opts.get('stat')
3577 stat = opts.get('stat')
3578 reverse = opts.get('reverse')
3578 reverse = opts.get('reverse')
3579
3579
3580 if revs and change:
3580 if revs and change:
3581 msg = _('cannot specify --rev and --change at the same time')
3581 msg = _('cannot specify --rev and --change at the same time')
3582 raise error.Abort(msg)
3582 raise error.Abort(msg)
3583 elif change:
3583 elif change:
3584 node2 = scmutil.revsingle(repo, change, None).node()
3584 node2 = scmutil.revsingle(repo, change, None).node()
3585 node1 = repo[node2].p1().node()
3585 node1 = repo[node2].p1().node()
3586 else:
3586 else:
3587 node1, node2 = scmutil.revpair(repo, revs)
3587 node1, node2 = scmutil.revpair(repo, revs)
3588
3588
3589 if reverse:
3589 if reverse:
3590 node1, node2 = node2, node1
3590 node1, node2 = node2, node1
3591
3591
3592 diffopts = patch.diffallopts(ui, opts)
3592 diffopts = patch.diffallopts(ui, opts)
3593 m = scmutil.match(repo[node2], pats, opts)
3593 m = scmutil.match(repo[node2], pats, opts)
3594 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3594 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3595 listsubrepos=opts.get('subrepos'),
3595 listsubrepos=opts.get('subrepos'),
3596 root=opts.get('root'))
3596 root=opts.get('root'))
3597
3597
3598 @command('^export',
3598 @command('^export',
3599 [('o', 'output', '',
3599 [('o', 'output', '',
3600 _('print output to file with formatted name'), _('FORMAT')),
3600 _('print output to file with formatted name'), _('FORMAT')),
3601 ('', 'switch-parent', None, _('diff against the second parent')),
3601 ('', 'switch-parent', None, _('diff against the second parent')),
3602 ('r', 'rev', [], _('revisions to export'), _('REV')),
3602 ('r', 'rev', [], _('revisions to export'), _('REV')),
3603 ] + diffopts,
3603 ] + diffopts,
3604 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3604 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3605 def export(ui, repo, *changesets, **opts):
3605 def export(ui, repo, *changesets, **opts):
3606 """dump the header and diffs for one or more changesets
3606 """dump the header and diffs for one or more changesets
3607
3607
3608 Print the changeset header and diffs for one or more revisions.
3608 Print the changeset header and diffs for one or more revisions.
3609 If no revision is given, the parent of the working directory is used.
3609 If no revision is given, the parent of the working directory is used.
3610
3610
3611 The information shown in the changeset header is: author, date,
3611 The information shown in the changeset header is: author, date,
3612 branch name (if non-default), changeset hash, parent(s) and commit
3612 branch name (if non-default), changeset hash, parent(s) and commit
3613 comment.
3613 comment.
3614
3614
3615 .. note::
3615 .. note::
3616
3616
3617 :hg:`export` may generate unexpected diff output for merge
3617 :hg:`export` may generate unexpected diff output for merge
3618 changesets, as it will compare the merge changeset against its
3618 changesets, as it will compare the merge changeset against its
3619 first parent only.
3619 first parent only.
3620
3620
3621 Output may be to a file, in which case the name of the file is
3621 Output may be to a file, in which case the name of the file is
3622 given using a format string. The formatting rules are as follows:
3622 given using a format string. The formatting rules are as follows:
3623
3623
3624 :``%%``: literal "%" character
3624 :``%%``: literal "%" character
3625 :``%H``: changeset hash (40 hexadecimal digits)
3625 :``%H``: changeset hash (40 hexadecimal digits)
3626 :``%N``: number of patches being generated
3626 :``%N``: number of patches being generated
3627 :``%R``: changeset revision number
3627 :``%R``: changeset revision number
3628 :``%b``: basename of the exporting repository
3628 :``%b``: basename of the exporting repository
3629 :``%h``: short-form changeset hash (12 hexadecimal digits)
3629 :``%h``: short-form changeset hash (12 hexadecimal digits)
3630 :``%m``: first line of the commit message (only alphanumeric characters)
3630 :``%m``: first line of the commit message (only alphanumeric characters)
3631 :``%n``: zero-padded sequence number, starting at 1
3631 :``%n``: zero-padded sequence number, starting at 1
3632 :``%r``: zero-padded changeset revision number
3632 :``%r``: zero-padded changeset revision number
3633
3633
3634 Without the -a/--text option, export will avoid generating diffs
3634 Without the -a/--text option, export will avoid generating diffs
3635 of files it detects as binary. With -a, export will generate a
3635 of files it detects as binary. With -a, export will generate a
3636 diff anyway, probably with undesirable results.
3636 diff anyway, probably with undesirable results.
3637
3637
3638 Use the -g/--git option to generate diffs in the git extended diff
3638 Use the -g/--git option to generate diffs in the git extended diff
3639 format. See :hg:`help diffs` for more information.
3639 format. See :hg:`help diffs` for more information.
3640
3640
3641 With the --switch-parent option, the diff will be against the
3641 With the --switch-parent option, the diff will be against the
3642 second parent. It can be useful to review a merge.
3642 second parent. It can be useful to review a merge.
3643
3643
3644 .. container:: verbose
3644 .. container:: verbose
3645
3645
3646 Examples:
3646 Examples:
3647
3647
3648 - use export and import to transplant a bugfix to the current
3648 - use export and import to transplant a bugfix to the current
3649 branch::
3649 branch::
3650
3650
3651 hg export -r 9353 | hg import -
3651 hg export -r 9353 | hg import -
3652
3652
3653 - export all the changesets between two revisions to a file with
3653 - export all the changesets between two revisions to a file with
3654 rename information::
3654 rename information::
3655
3655
3656 hg export --git -r 123:150 > changes.txt
3656 hg export --git -r 123:150 > changes.txt
3657
3657
3658 - split outgoing changes into a series of patches with
3658 - split outgoing changes into a series of patches with
3659 descriptive names::
3659 descriptive names::
3660
3660
3661 hg export -r "outgoing()" -o "%n-%m.patch"
3661 hg export -r "outgoing()" -o "%n-%m.patch"
3662
3662
3663 Returns 0 on success.
3663 Returns 0 on success.
3664 """
3664 """
3665 changesets += tuple(opts.get('rev', []))
3665 changesets += tuple(opts.get('rev', []))
3666 if not changesets:
3666 if not changesets:
3667 changesets = ['.']
3667 changesets = ['.']
3668 revs = scmutil.revrange(repo, changesets)
3668 revs = scmutil.revrange(repo, changesets)
3669 if not revs:
3669 if not revs:
3670 raise error.Abort(_("export requires at least one changeset"))
3670 raise error.Abort(_("export requires at least one changeset"))
3671 if len(revs) > 1:
3671 if len(revs) > 1:
3672 ui.note(_('exporting patches:\n'))
3672 ui.note(_('exporting patches:\n'))
3673 else:
3673 else:
3674 ui.note(_('exporting patch:\n'))
3674 ui.note(_('exporting patch:\n'))
3675 cmdutil.export(repo, revs, template=opts.get('output'),
3675 cmdutil.export(repo, revs, template=opts.get('output'),
3676 switch_parent=opts.get('switch_parent'),
3676 switch_parent=opts.get('switch_parent'),
3677 opts=patch.diffallopts(ui, opts))
3677 opts=patch.diffallopts(ui, opts))
3678
3678
3679 @command('files',
3679 @command('files',
3680 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3680 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3681 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3681 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3682 ] + walkopts + formatteropts + subrepoopts,
3682 ] + walkopts + formatteropts + subrepoopts,
3683 _('[OPTION]... [PATTERN]...'))
3683 _('[OPTION]... [PATTERN]...'))
3684 def files(ui, repo, *pats, **opts):
3684 def files(ui, repo, *pats, **opts):
3685 """list tracked files
3685 """list tracked files
3686
3686
3687 Print files under Mercurial control in the working directory or
3687 Print files under Mercurial control in the working directory or
3688 specified revision whose names match the given patterns (excluding
3688 specified revision whose names match the given patterns (excluding
3689 removed files).
3689 removed files).
3690
3690
3691 If no patterns are given to match, this command prints the names
3691 If no patterns are given to match, this command prints the names
3692 of all files under Mercurial control in the working directory.
3692 of all files under Mercurial control in the working directory.
3693
3693
3694 .. container:: verbose
3694 .. container:: verbose
3695
3695
3696 Examples:
3696 Examples:
3697
3697
3698 - list all files under the current directory::
3698 - list all files under the current directory::
3699
3699
3700 hg files .
3700 hg files .
3701
3701
3702 - shows sizes and flags for current revision::
3702 - shows sizes and flags for current revision::
3703
3703
3704 hg files -vr .
3704 hg files -vr .
3705
3705
3706 - list all files named README::
3706 - list all files named README::
3707
3707
3708 hg files -I "**/README"
3708 hg files -I "**/README"
3709
3709
3710 - list all binary files::
3710 - list all binary files::
3711
3711
3712 hg files "set:binary()"
3712 hg files "set:binary()"
3713
3713
3714 - find files containing a regular expression::
3714 - find files containing a regular expression::
3715
3715
3716 hg files "set:grep('bob')"
3716 hg files "set:grep('bob')"
3717
3717
3718 - search tracked file contents with xargs and grep::
3718 - search tracked file contents with xargs and grep::
3719
3719
3720 hg files -0 | xargs -0 grep foo
3720 hg files -0 | xargs -0 grep foo
3721
3721
3722 See :hg:`help patterns` and :hg:`help filesets` for more information
3722 See :hg:`help patterns` and :hg:`help filesets` for more information
3723 on specifying file patterns.
3723 on specifying file patterns.
3724
3724
3725 Returns 0 if a match is found, 1 otherwise.
3725 Returns 0 if a match is found, 1 otherwise.
3726
3726
3727 """
3727 """
3728 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3728 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3729
3729
3730 end = '\n'
3730 end = '\n'
3731 if opts.get('print0'):
3731 if opts.get('print0'):
3732 end = '\0'
3732 end = '\0'
3733 fm = ui.formatter('files', opts)
3733 fm = ui.formatter('files', opts)
3734 fmt = '%s' + end
3734 fmt = '%s' + end
3735
3735
3736 m = scmutil.match(ctx, pats, opts)
3736 m = scmutil.match(ctx, pats, opts)
3737 ret = cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3737 ret = cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3738
3738
3739 fm.end()
3739 fm.end()
3740
3740
3741 return ret
3741 return ret
3742
3742
3743 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3743 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3744 def forget(ui, repo, *pats, **opts):
3744 def forget(ui, repo, *pats, **opts):
3745 """forget the specified files on the next commit
3745 """forget the specified files on the next commit
3746
3746
3747 Mark the specified files so they will no longer be tracked
3747 Mark the specified files so they will no longer be tracked
3748 after the next commit.
3748 after the next commit.
3749
3749
3750 This only removes files from the current branch, not from the
3750 This only removes files from the current branch, not from the
3751 entire project history, and it does not delete them from the
3751 entire project history, and it does not delete them from the
3752 working directory.
3752 working directory.
3753
3753
3754 To delete the file from the working directory, see :hg:`remove`.
3754 To delete the file from the working directory, see :hg:`remove`.
3755
3755
3756 To undo a forget before the next commit, see :hg:`add`.
3756 To undo a forget before the next commit, see :hg:`add`.
3757
3757
3758 .. container:: verbose
3758 .. container:: verbose
3759
3759
3760 Examples:
3760 Examples:
3761
3761
3762 - forget newly-added binary files::
3762 - forget newly-added binary files::
3763
3763
3764 hg forget "set:added() and binary()"
3764 hg forget "set:added() and binary()"
3765
3765
3766 - forget files that would be excluded by .hgignore::
3766 - forget files that would be excluded by .hgignore::
3767
3767
3768 hg forget "set:hgignore()"
3768 hg forget "set:hgignore()"
3769
3769
3770 Returns 0 on success.
3770 Returns 0 on success.
3771 """
3771 """
3772
3772
3773 if not pats:
3773 if not pats:
3774 raise error.Abort(_('no files specified'))
3774 raise error.Abort(_('no files specified'))
3775
3775
3776 m = scmutil.match(repo[None], pats, opts)
3776 m = scmutil.match(repo[None], pats, opts)
3777 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
3777 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
3778 return rejected and 1 or 0
3778 return rejected and 1 or 0
3779
3779
3780 @command(
3780 @command(
3781 'graft',
3781 'graft',
3782 [('r', 'rev', [], _('revisions to graft'), _('REV')),
3782 [('r', 'rev', [], _('revisions to graft'), _('REV')),
3783 ('c', 'continue', False, _('resume interrupted graft')),
3783 ('c', 'continue', False, _('resume interrupted graft')),
3784 ('e', 'edit', False, _('invoke editor on commit messages')),
3784 ('e', 'edit', False, _('invoke editor on commit messages')),
3785 ('', 'log', None, _('append graft info to log message')),
3785 ('', 'log', None, _('append graft info to log message')),
3786 ('f', 'force', False, _('force graft')),
3786 ('f', 'force', False, _('force graft')),
3787 ('D', 'currentdate', False,
3787 ('D', 'currentdate', False,
3788 _('record the current date as commit date')),
3788 _('record the current date as commit date')),
3789 ('U', 'currentuser', False,
3789 ('U', 'currentuser', False,
3790 _('record the current user as committer'), _('DATE'))]
3790 _('record the current user as committer'), _('DATE'))]
3791 + commitopts2 + mergetoolopts + dryrunopts,
3791 + commitopts2 + mergetoolopts + dryrunopts,
3792 _('[OPTION]... [-r] REV...'))
3792 _('[OPTION]... [-r] REV...'))
3793 def graft(ui, repo, *revs, **opts):
3793 def graft(ui, repo, *revs, **opts):
3794 '''copy changes from other branches onto the current branch
3794 '''copy changes from other branches onto the current branch
3795
3795
3796 This command uses Mercurial's merge logic to copy individual
3796 This command uses Mercurial's merge logic to copy individual
3797 changes from other branches without merging branches in the
3797 changes from other branches without merging branches in the
3798 history graph. This is sometimes known as 'backporting' or
3798 history graph. This is sometimes known as 'backporting' or
3799 'cherry-picking'. By default, graft will copy user, date, and
3799 'cherry-picking'. By default, graft will copy user, date, and
3800 description from the source changesets.
3800 description from the source changesets.
3801
3801
3802 Changesets that are ancestors of the current revision, that have
3802 Changesets that are ancestors of the current revision, that have
3803 already been grafted, or that are merges will be skipped.
3803 already been grafted, or that are merges will be skipped.
3804
3804
3805 If --log is specified, log messages will have a comment appended
3805 If --log is specified, log messages will have a comment appended
3806 of the form::
3806 of the form::
3807
3807
3808 (grafted from CHANGESETHASH)
3808 (grafted from CHANGESETHASH)
3809
3809
3810 If --force is specified, revisions will be grafted even if they
3810 If --force is specified, revisions will be grafted even if they
3811 are already ancestors of or have been grafted to the destination.
3811 are already ancestors of or have been grafted to the destination.
3812 This is useful when the revisions have since been backed out.
3812 This is useful when the revisions have since been backed out.
3813
3813
3814 If a graft merge results in conflicts, the graft process is
3814 If a graft merge results in conflicts, the graft process is
3815 interrupted so that the current merge can be manually resolved.
3815 interrupted so that the current merge can be manually resolved.
3816 Once all conflicts are addressed, the graft process can be
3816 Once all conflicts are addressed, the graft process can be
3817 continued with the -c/--continue option.
3817 continued with the -c/--continue option.
3818
3818
3819 .. note::
3819 .. note::
3820
3820
3821 The -c/--continue option does not reapply earlier options, except
3821 The -c/--continue option does not reapply earlier options, except
3822 for --force.
3822 for --force.
3823
3823
3824 .. container:: verbose
3824 .. container:: verbose
3825
3825
3826 Examples:
3826 Examples:
3827
3827
3828 - copy a single change to the stable branch and edit its description::
3828 - copy a single change to the stable branch and edit its description::
3829
3829
3830 hg update stable
3830 hg update stable
3831 hg graft --edit 9393
3831 hg graft --edit 9393
3832
3832
3833 - graft a range of changesets with one exception, updating dates::
3833 - graft a range of changesets with one exception, updating dates::
3834
3834
3835 hg graft -D "2085::2093 and not 2091"
3835 hg graft -D "2085::2093 and not 2091"
3836
3836
3837 - continue a graft after resolving conflicts::
3837 - continue a graft after resolving conflicts::
3838
3838
3839 hg graft -c
3839 hg graft -c
3840
3840
3841 - show the source of a grafted changeset::
3841 - show the source of a grafted changeset::
3842
3842
3843 hg log --debug -r .
3843 hg log --debug -r .
3844
3844
3845 See :hg:`help revisions` and :hg:`help revsets` for more about
3845 See :hg:`help revisions` and :hg:`help revsets` for more about
3846 specifying revisions.
3846 specifying revisions.
3847
3847
3848 Returns 0 on successful completion.
3848 Returns 0 on successful completion.
3849 '''
3849 '''
3850 wlock = None
3850 wlock = None
3851 try:
3851 try:
3852 wlock = repo.wlock()
3852 wlock = repo.wlock()
3853 return _dograft(ui, repo, *revs, **opts)
3853 return _dograft(ui, repo, *revs, **opts)
3854 finally:
3854 finally:
3855 release(wlock)
3855 release(wlock)
3856
3856
3857 def _dograft(ui, repo, *revs, **opts):
3857 def _dograft(ui, repo, *revs, **opts):
3858 revs = list(revs)
3858 revs = list(revs)
3859 revs.extend(opts['rev'])
3859 revs.extend(opts['rev'])
3860
3860
3861 if not opts.get('user') and opts.get('currentuser'):
3861 if not opts.get('user') and opts.get('currentuser'):
3862 opts['user'] = ui.username()
3862 opts['user'] = ui.username()
3863 if not opts.get('date') and opts.get('currentdate'):
3863 if not opts.get('date') and opts.get('currentdate'):
3864 opts['date'] = "%d %d" % util.makedate()
3864 opts['date'] = "%d %d" % util.makedate()
3865
3865
3866 editor = cmdutil.getcommiteditor(editform='graft', **opts)
3866 editor = cmdutil.getcommiteditor(editform='graft', **opts)
3867
3867
3868 cont = False
3868 cont = False
3869 if opts['continue']:
3869 if opts['continue']:
3870 cont = True
3870 cont = True
3871 if revs:
3871 if revs:
3872 raise error.Abort(_("can't specify --continue and revisions"))
3872 raise error.Abort(_("can't specify --continue and revisions"))
3873 # read in unfinished revisions
3873 # read in unfinished revisions
3874 try:
3874 try:
3875 nodes = repo.vfs.read('graftstate').splitlines()
3875 nodes = repo.vfs.read('graftstate').splitlines()
3876 revs = [repo[node].rev() for node in nodes]
3876 revs = [repo[node].rev() for node in nodes]
3877 except IOError as inst:
3877 except IOError as inst:
3878 if inst.errno != errno.ENOENT:
3878 if inst.errno != errno.ENOENT:
3879 raise
3879 raise
3880 raise error.Abort(_("no graft state found, can't continue"))
3880 raise error.Abort(_("no graft state found, can't continue"))
3881 else:
3881 else:
3882 cmdutil.checkunfinished(repo)
3882 cmdutil.checkunfinished(repo)
3883 cmdutil.bailifchanged(repo)
3883 cmdutil.bailifchanged(repo)
3884 if not revs:
3884 if not revs:
3885 raise error.Abort(_('no revisions specified'))
3885 raise error.Abort(_('no revisions specified'))
3886 revs = scmutil.revrange(repo, revs)
3886 revs = scmutil.revrange(repo, revs)
3887
3887
3888 skipped = set()
3888 skipped = set()
3889 # check for merges
3889 # check for merges
3890 for rev in repo.revs('%ld and merge()', revs):
3890 for rev in repo.revs('%ld and merge()', revs):
3891 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
3891 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
3892 skipped.add(rev)
3892 skipped.add(rev)
3893 revs = [r for r in revs if r not in skipped]
3893 revs = [r for r in revs if r not in skipped]
3894 if not revs:
3894 if not revs:
3895 return -1
3895 return -1
3896
3896
3897 # Don't check in the --continue case, in effect retaining --force across
3897 # Don't check in the --continue case, in effect retaining --force across
3898 # --continues. That's because without --force, any revisions we decided to
3898 # --continues. That's because without --force, any revisions we decided to
3899 # skip would have been filtered out here, so they wouldn't have made their
3899 # skip would have been filtered out here, so they wouldn't have made their
3900 # way to the graftstate. With --force, any revisions we would have otherwise
3900 # way to the graftstate. With --force, any revisions we would have otherwise
3901 # skipped would not have been filtered out, and if they hadn't been applied
3901 # skipped would not have been filtered out, and if they hadn't been applied
3902 # already, they'd have been in the graftstate.
3902 # already, they'd have been in the graftstate.
3903 if not (cont or opts.get('force')):
3903 if not (cont or opts.get('force')):
3904 # check for ancestors of dest branch
3904 # check for ancestors of dest branch
3905 crev = repo['.'].rev()
3905 crev = repo['.'].rev()
3906 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3906 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3907 # Cannot use x.remove(y) on smart set, this has to be a list.
3907 # Cannot use x.remove(y) on smart set, this has to be a list.
3908 # XXX make this lazy in the future
3908 # XXX make this lazy in the future
3909 revs = list(revs)
3909 revs = list(revs)
3910 # don't mutate while iterating, create a copy
3910 # don't mutate while iterating, create a copy
3911 for rev in list(revs):
3911 for rev in list(revs):
3912 if rev in ancestors:
3912 if rev in ancestors:
3913 ui.warn(_('skipping ancestor revision %d:%s\n') %
3913 ui.warn(_('skipping ancestor revision %d:%s\n') %
3914 (rev, repo[rev]))
3914 (rev, repo[rev]))
3915 # XXX remove on list is slow
3915 # XXX remove on list is slow
3916 revs.remove(rev)
3916 revs.remove(rev)
3917 if not revs:
3917 if not revs:
3918 return -1
3918 return -1
3919
3919
3920 # analyze revs for earlier grafts
3920 # analyze revs for earlier grafts
3921 ids = {}
3921 ids = {}
3922 for ctx in repo.set("%ld", revs):
3922 for ctx in repo.set("%ld", revs):
3923 ids[ctx.hex()] = ctx.rev()
3923 ids[ctx.hex()] = ctx.rev()
3924 n = ctx.extra().get('source')
3924 n = ctx.extra().get('source')
3925 if n:
3925 if n:
3926 ids[n] = ctx.rev()
3926 ids[n] = ctx.rev()
3927
3927
3928 # check ancestors for earlier grafts
3928 # check ancestors for earlier grafts
3929 ui.debug('scanning for duplicate grafts\n')
3929 ui.debug('scanning for duplicate grafts\n')
3930
3930
3931 for rev in repo.changelog.findmissingrevs(revs, [crev]):
3931 for rev in repo.changelog.findmissingrevs(revs, [crev]):
3932 ctx = repo[rev]
3932 ctx = repo[rev]
3933 n = ctx.extra().get('source')
3933 n = ctx.extra().get('source')
3934 if n in ids:
3934 if n in ids:
3935 try:
3935 try:
3936 r = repo[n].rev()
3936 r = repo[n].rev()
3937 except error.RepoLookupError:
3937 except error.RepoLookupError:
3938 r = None
3938 r = None
3939 if r in revs:
3939 if r in revs:
3940 ui.warn(_('skipping revision %d:%s '
3940 ui.warn(_('skipping revision %d:%s '
3941 '(already grafted to %d:%s)\n')
3941 '(already grafted to %d:%s)\n')
3942 % (r, repo[r], rev, ctx))
3942 % (r, repo[r], rev, ctx))
3943 revs.remove(r)
3943 revs.remove(r)
3944 elif ids[n] in revs:
3944 elif ids[n] in revs:
3945 if r is None:
3945 if r is None:
3946 ui.warn(_('skipping already grafted revision %d:%s '
3946 ui.warn(_('skipping already grafted revision %d:%s '
3947 '(%d:%s also has unknown origin %s)\n')
3947 '(%d:%s also has unknown origin %s)\n')
3948 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
3948 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
3949 else:
3949 else:
3950 ui.warn(_('skipping already grafted revision %d:%s '
3950 ui.warn(_('skipping already grafted revision %d:%s '
3951 '(%d:%s also has origin %d:%s)\n')
3951 '(%d:%s also has origin %d:%s)\n')
3952 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
3952 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
3953 revs.remove(ids[n])
3953 revs.remove(ids[n])
3954 elif ctx.hex() in ids:
3954 elif ctx.hex() in ids:
3955 r = ids[ctx.hex()]
3955 r = ids[ctx.hex()]
3956 ui.warn(_('skipping already grafted revision %d:%s '
3956 ui.warn(_('skipping already grafted revision %d:%s '
3957 '(was grafted from %d:%s)\n') %
3957 '(was grafted from %d:%s)\n') %
3958 (r, repo[r], rev, ctx))
3958 (r, repo[r], rev, ctx))
3959 revs.remove(r)
3959 revs.remove(r)
3960 if not revs:
3960 if not revs:
3961 return -1
3961 return -1
3962
3962
3963 try:
3963 try:
3964 for pos, ctx in enumerate(repo.set("%ld", revs)):
3964 for pos, ctx in enumerate(repo.set("%ld", revs)):
3965 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
3965 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
3966 ctx.description().split('\n', 1)[0])
3966 ctx.description().split('\n', 1)[0])
3967 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3967 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3968 if names:
3968 if names:
3969 desc += ' (%s)' % ' '.join(names)
3969 desc += ' (%s)' % ' '.join(names)
3970 ui.status(_('grafting %s\n') % desc)
3970 ui.status(_('grafting %s\n') % desc)
3971 if opts.get('dry_run'):
3971 if opts.get('dry_run'):
3972 continue
3972 continue
3973
3973
3974 extra = ctx.extra().copy()
3974 extra = ctx.extra().copy()
3975 del extra['branch']
3975 del extra['branch']
3976 source = extra.get('source')
3976 source = extra.get('source')
3977 if source:
3977 if source:
3978 extra['intermediate-source'] = ctx.hex()
3978 extra['intermediate-source'] = ctx.hex()
3979 else:
3979 else:
3980 extra['source'] = ctx.hex()
3980 extra['source'] = ctx.hex()
3981 user = ctx.user()
3981 user = ctx.user()
3982 if opts.get('user'):
3982 if opts.get('user'):
3983 user = opts['user']
3983 user = opts['user']
3984 date = ctx.date()
3984 date = ctx.date()
3985 if opts.get('date'):
3985 if opts.get('date'):
3986 date = opts['date']
3986 date = opts['date']
3987 message = ctx.description()
3987 message = ctx.description()
3988 if opts.get('log'):
3988 if opts.get('log'):
3989 message += '\n(grafted from %s)' % ctx.hex()
3989 message += '\n(grafted from %s)' % ctx.hex()
3990
3990
3991 # we don't merge the first commit when continuing
3991 # we don't merge the first commit when continuing
3992 if not cont:
3992 if not cont:
3993 # perform the graft merge with p1(rev) as 'ancestor'
3993 # perform the graft merge with p1(rev) as 'ancestor'
3994 try:
3994 try:
3995 # ui.forcemerge is an internal variable, do not document
3995 # ui.forcemerge is an internal variable, do not document
3996 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
3996 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
3997 'graft')
3997 'graft')
3998 stats = mergemod.graft(repo, ctx, ctx.p1(),
3998 stats = mergemod.graft(repo, ctx, ctx.p1(),
3999 ['local', 'graft'])
3999 ['local', 'graft'])
4000 finally:
4000 finally:
4001 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4001 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4002 # report any conflicts
4002 # report any conflicts
4003 if stats and stats[3] > 0:
4003 if stats and stats[3] > 0:
4004 # write out state for --continue
4004 # write out state for --continue
4005 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4005 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4006 repo.vfs.write('graftstate', ''.join(nodelines))
4006 repo.vfs.write('graftstate', ''.join(nodelines))
4007 extra = ''
4007 extra = ''
4008 if opts.get('user'):
4008 if opts.get('user'):
4009 extra += ' --user %s' % opts['user']
4009 extra += ' --user %s' % opts['user']
4010 if opts.get('date'):
4010 if opts.get('date'):
4011 extra += ' --date %s' % opts['date']
4011 extra += ' --date %s' % opts['date']
4012 if opts.get('log'):
4012 if opts.get('log'):
4013 extra += ' --log'
4013 extra += ' --log'
4014 hint=_('use hg resolve and hg graft --continue%s') % extra
4014 hint=_('use hg resolve and hg graft --continue%s') % extra
4015 raise error.Abort(
4015 raise error.Abort(
4016 _("unresolved conflicts, can't continue"),
4016 _("unresolved conflicts, can't continue"),
4017 hint=hint)
4017 hint=hint)
4018 else:
4018 else:
4019 cont = False
4019 cont = False
4020
4020
4021 # commit
4021 # commit
4022 node = repo.commit(text=message, user=user,
4022 node = repo.commit(text=message, user=user,
4023 date=date, extra=extra, editor=editor)
4023 date=date, extra=extra, editor=editor)
4024 if node is None:
4024 if node is None:
4025 ui.warn(
4025 ui.warn(
4026 _('note: graft of %d:%s created no changes to commit\n') %
4026 _('note: graft of %d:%s created no changes to commit\n') %
4027 (ctx.rev(), ctx))
4027 (ctx.rev(), ctx))
4028 finally:
4028 finally:
4029 # TODO: get rid of this meaningless try/finally enclosing.
4029 # TODO: get rid of this meaningless try/finally enclosing.
4030 # this is kept only to reduce changes in a patch.
4030 # this is kept only to reduce changes in a patch.
4031 pass
4031 pass
4032
4032
4033 # remove state when we complete successfully
4033 # remove state when we complete successfully
4034 if not opts.get('dry_run'):
4034 if not opts.get('dry_run'):
4035 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4035 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4036
4036
4037 return 0
4037 return 0
4038
4038
4039 @command('grep',
4039 @command('grep',
4040 [('0', 'print0', None, _('end fields with NUL')),
4040 [('0', 'print0', None, _('end fields with NUL')),
4041 ('', 'all', None, _('print all revisions that match')),
4041 ('', 'all', None, _('print all revisions that match')),
4042 ('a', 'text', None, _('treat all files as text')),
4042 ('a', 'text', None, _('treat all files as text')),
4043 ('f', 'follow', None,
4043 ('f', 'follow', None,
4044 _('follow changeset history,'
4044 _('follow changeset history,'
4045 ' or file history across copies and renames')),
4045 ' or file history across copies and renames')),
4046 ('i', 'ignore-case', None, _('ignore case when matching')),
4046 ('i', 'ignore-case', None, _('ignore case when matching')),
4047 ('l', 'files-with-matches', None,
4047 ('l', 'files-with-matches', None,
4048 _('print only filenames and revisions that match')),
4048 _('print only filenames and revisions that match')),
4049 ('n', 'line-number', None, _('print matching line numbers')),
4049 ('n', 'line-number', None, _('print matching line numbers')),
4050 ('r', 'rev', [],
4050 ('r', 'rev', [],
4051 _('only search files changed within revision range'), _('REV')),
4051 _('only search files changed within revision range'), _('REV')),
4052 ('u', 'user', None, _('list the author (long with -v)')),
4052 ('u', 'user', None, _('list the author (long with -v)')),
4053 ('d', 'date', None, _('list the date (short with -q)')),
4053 ('d', 'date', None, _('list the date (short with -q)')),
4054 ] + walkopts,
4054 ] + walkopts,
4055 _('[OPTION]... PATTERN [FILE]...'),
4055 _('[OPTION]... PATTERN [FILE]...'),
4056 inferrepo=True)
4056 inferrepo=True)
4057 def grep(ui, repo, pattern, *pats, **opts):
4057 def grep(ui, repo, pattern, *pats, **opts):
4058 """search for a pattern in specified files and revisions
4058 """search for a pattern in specified files and revisions
4059
4059
4060 Search revisions of files for a regular expression.
4060 Search revisions of files for a regular expression.
4061
4061
4062 This command behaves differently than Unix grep. It only accepts
4062 This command behaves differently than Unix grep. It only accepts
4063 Python/Perl regexps. It searches repository history, not the
4063 Python/Perl regexps. It searches repository history, not the
4064 working directory. It always prints the revision number in which a
4064 working directory. It always prints the revision number in which a
4065 match appears.
4065 match appears.
4066
4066
4067 By default, grep only prints output for the first revision of a
4067 By default, grep only prints output for the first revision of a
4068 file in which it finds a match. To get it to print every revision
4068 file in which it finds a match. To get it to print every revision
4069 that contains a change in match status ("-" for a match that
4069 that contains a change in match status ("-" for a match that
4070 becomes a non-match, or "+" for a non-match that becomes a match),
4070 becomes a non-match, or "+" for a non-match that becomes a match),
4071 use the --all flag.
4071 use the --all flag.
4072
4072
4073 Returns 0 if a match is found, 1 otherwise.
4073 Returns 0 if a match is found, 1 otherwise.
4074 """
4074 """
4075 reflags = re.M
4075 reflags = re.M
4076 if opts.get('ignore_case'):
4076 if opts.get('ignore_case'):
4077 reflags |= re.I
4077 reflags |= re.I
4078 try:
4078 try:
4079 regexp = util.re.compile(pattern, reflags)
4079 regexp = util.re.compile(pattern, reflags)
4080 except re.error as inst:
4080 except re.error as inst:
4081 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4081 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4082 return 1
4082 return 1
4083 sep, eol = ':', '\n'
4083 sep, eol = ':', '\n'
4084 if opts.get('print0'):
4084 if opts.get('print0'):
4085 sep = eol = '\0'
4085 sep = eol = '\0'
4086
4086
4087 getfile = util.lrucachefunc(repo.file)
4087 getfile = util.lrucachefunc(repo.file)
4088
4088
4089 def matchlines(body):
4089 def matchlines(body):
4090 begin = 0
4090 begin = 0
4091 linenum = 0
4091 linenum = 0
4092 while begin < len(body):
4092 while begin < len(body):
4093 match = regexp.search(body, begin)
4093 match = regexp.search(body, begin)
4094 if not match:
4094 if not match:
4095 break
4095 break
4096 mstart, mend = match.span()
4096 mstart, mend = match.span()
4097 linenum += body.count('\n', begin, mstart) + 1
4097 linenum += body.count('\n', begin, mstart) + 1
4098 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4098 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4099 begin = body.find('\n', mend) + 1 or len(body) + 1
4099 begin = body.find('\n', mend) + 1 or len(body) + 1
4100 lend = begin - 1
4100 lend = begin - 1
4101 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4101 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4102
4102
4103 class linestate(object):
4103 class linestate(object):
4104 def __init__(self, line, linenum, colstart, colend):
4104 def __init__(self, line, linenum, colstart, colend):
4105 self.line = line
4105 self.line = line
4106 self.linenum = linenum
4106 self.linenum = linenum
4107 self.colstart = colstart
4107 self.colstart = colstart
4108 self.colend = colend
4108 self.colend = colend
4109
4109
4110 def __hash__(self):
4110 def __hash__(self):
4111 return hash((self.linenum, self.line))
4111 return hash((self.linenum, self.line))
4112
4112
4113 def __eq__(self, other):
4113 def __eq__(self, other):
4114 return self.line == other.line
4114 return self.line == other.line
4115
4115
4116 def __iter__(self):
4116 def __iter__(self):
4117 yield (self.line[:self.colstart], '')
4117 yield (self.line[:self.colstart], '')
4118 yield (self.line[self.colstart:self.colend], 'grep.match')
4118 yield (self.line[self.colstart:self.colend], 'grep.match')
4119 rest = self.line[self.colend:]
4119 rest = self.line[self.colend:]
4120 while rest != '':
4120 while rest != '':
4121 match = regexp.search(rest)
4121 match = regexp.search(rest)
4122 if not match:
4122 if not match:
4123 yield (rest, '')
4123 yield (rest, '')
4124 break
4124 break
4125 mstart, mend = match.span()
4125 mstart, mend = match.span()
4126 yield (rest[:mstart], '')
4126 yield (rest[:mstart], '')
4127 yield (rest[mstart:mend], 'grep.match')
4127 yield (rest[mstart:mend], 'grep.match')
4128 rest = rest[mend:]
4128 rest = rest[mend:]
4129
4129
4130 matches = {}
4130 matches = {}
4131 copies = {}
4131 copies = {}
4132 def grepbody(fn, rev, body):
4132 def grepbody(fn, rev, body):
4133 matches[rev].setdefault(fn, [])
4133 matches[rev].setdefault(fn, [])
4134 m = matches[rev][fn]
4134 m = matches[rev][fn]
4135 for lnum, cstart, cend, line in matchlines(body):
4135 for lnum, cstart, cend, line in matchlines(body):
4136 s = linestate(line, lnum, cstart, cend)
4136 s = linestate(line, lnum, cstart, cend)
4137 m.append(s)
4137 m.append(s)
4138
4138
4139 def difflinestates(a, b):
4139 def difflinestates(a, b):
4140 sm = difflib.SequenceMatcher(None, a, b)
4140 sm = difflib.SequenceMatcher(None, a, b)
4141 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4141 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4142 if tag == 'insert':
4142 if tag == 'insert':
4143 for i in xrange(blo, bhi):
4143 for i in xrange(blo, bhi):
4144 yield ('+', b[i])
4144 yield ('+', b[i])
4145 elif tag == 'delete':
4145 elif tag == 'delete':
4146 for i in xrange(alo, ahi):
4146 for i in xrange(alo, ahi):
4147 yield ('-', a[i])
4147 yield ('-', a[i])
4148 elif tag == 'replace':
4148 elif tag == 'replace':
4149 for i in xrange(alo, ahi):
4149 for i in xrange(alo, ahi):
4150 yield ('-', a[i])
4150 yield ('-', a[i])
4151 for i in xrange(blo, bhi):
4151 for i in xrange(blo, bhi):
4152 yield ('+', b[i])
4152 yield ('+', b[i])
4153
4153
4154 def display(fn, ctx, pstates, states):
4154 def display(fn, ctx, pstates, states):
4155 rev = ctx.rev()
4155 rev = ctx.rev()
4156 if ui.quiet:
4156 if ui.quiet:
4157 datefunc = util.shortdate
4157 datefunc = util.shortdate
4158 else:
4158 else:
4159 datefunc = util.datestr
4159 datefunc = util.datestr
4160 found = False
4160 found = False
4161 @util.cachefunc
4161 @util.cachefunc
4162 def binary():
4162 def binary():
4163 flog = getfile(fn)
4163 flog = getfile(fn)
4164 return util.binary(flog.read(ctx.filenode(fn)))
4164 return util.binary(flog.read(ctx.filenode(fn)))
4165
4165
4166 if opts.get('all'):
4166 if opts.get('all'):
4167 iter = difflinestates(pstates, states)
4167 iter = difflinestates(pstates, states)
4168 else:
4168 else:
4169 iter = [('', l) for l in states]
4169 iter = [('', l) for l in states]
4170 for change, l in iter:
4170 for change, l in iter:
4171 cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
4171 cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
4172
4172
4173 if opts.get('line_number'):
4173 if opts.get('line_number'):
4174 cols.append((str(l.linenum), 'grep.linenumber'))
4174 cols.append((str(l.linenum), 'grep.linenumber'))
4175 if opts.get('all'):
4175 if opts.get('all'):
4176 cols.append((change, 'grep.change'))
4176 cols.append((change, 'grep.change'))
4177 if opts.get('user'):
4177 if opts.get('user'):
4178 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
4178 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
4179 if opts.get('date'):
4179 if opts.get('date'):
4180 cols.append((datefunc(ctx.date()), 'grep.date'))
4180 cols.append((datefunc(ctx.date()), 'grep.date'))
4181 for col, label in cols[:-1]:
4181 for col, label in cols[:-1]:
4182 ui.write(col, label=label)
4182 ui.write(col, label=label)
4183 ui.write(sep, label='grep.sep')
4183 ui.write(sep, label='grep.sep')
4184 ui.write(cols[-1][0], label=cols[-1][1])
4184 ui.write(cols[-1][0], label=cols[-1][1])
4185 if not opts.get('files_with_matches'):
4185 if not opts.get('files_with_matches'):
4186 ui.write(sep, label='grep.sep')
4186 ui.write(sep, label='grep.sep')
4187 if not opts.get('text') and binary():
4187 if not opts.get('text') and binary():
4188 ui.write(" Binary file matches")
4188 ui.write(" Binary file matches")
4189 else:
4189 else:
4190 for s, label in l:
4190 for s, label in l:
4191 ui.write(s, label=label)
4191 ui.write(s, label=label)
4192 ui.write(eol)
4192 ui.write(eol)
4193 found = True
4193 found = True
4194 if opts.get('files_with_matches'):
4194 if opts.get('files_with_matches'):
4195 break
4195 break
4196 return found
4196 return found
4197
4197
4198 skip = {}
4198 skip = {}
4199 revfiles = {}
4199 revfiles = {}
4200 matchfn = scmutil.match(repo[None], pats, opts)
4200 matchfn = scmutil.match(repo[None], pats, opts)
4201 found = False
4201 found = False
4202 follow = opts.get('follow')
4202 follow = opts.get('follow')
4203
4203
4204 def prep(ctx, fns):
4204 def prep(ctx, fns):
4205 rev = ctx.rev()
4205 rev = ctx.rev()
4206 pctx = ctx.p1()
4206 pctx = ctx.p1()
4207 parent = pctx.rev()
4207 parent = pctx.rev()
4208 matches.setdefault(rev, {})
4208 matches.setdefault(rev, {})
4209 matches.setdefault(parent, {})
4209 matches.setdefault(parent, {})
4210 files = revfiles.setdefault(rev, [])
4210 files = revfiles.setdefault(rev, [])
4211 for fn in fns:
4211 for fn in fns:
4212 flog = getfile(fn)
4212 flog = getfile(fn)
4213 try:
4213 try:
4214 fnode = ctx.filenode(fn)
4214 fnode = ctx.filenode(fn)
4215 except error.LookupError:
4215 except error.LookupError:
4216 continue
4216 continue
4217
4217
4218 copied = flog.renamed(fnode)
4218 copied = flog.renamed(fnode)
4219 copy = follow and copied and copied[0]
4219 copy = follow and copied and copied[0]
4220 if copy:
4220 if copy:
4221 copies.setdefault(rev, {})[fn] = copy
4221 copies.setdefault(rev, {})[fn] = copy
4222 if fn in skip:
4222 if fn in skip:
4223 if copy:
4223 if copy:
4224 skip[copy] = True
4224 skip[copy] = True
4225 continue
4225 continue
4226 files.append(fn)
4226 files.append(fn)
4227
4227
4228 if fn not in matches[rev]:
4228 if fn not in matches[rev]:
4229 grepbody(fn, rev, flog.read(fnode))
4229 grepbody(fn, rev, flog.read(fnode))
4230
4230
4231 pfn = copy or fn
4231 pfn = copy or fn
4232 if pfn not in matches[parent]:
4232 if pfn not in matches[parent]:
4233 try:
4233 try:
4234 fnode = pctx.filenode(pfn)
4234 fnode = pctx.filenode(pfn)
4235 grepbody(pfn, parent, flog.read(fnode))
4235 grepbody(pfn, parent, flog.read(fnode))
4236 except error.LookupError:
4236 except error.LookupError:
4237 pass
4237 pass
4238
4238
4239 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4239 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4240 rev = ctx.rev()
4240 rev = ctx.rev()
4241 parent = ctx.p1().rev()
4241 parent = ctx.p1().rev()
4242 for fn in sorted(revfiles.get(rev, [])):
4242 for fn in sorted(revfiles.get(rev, [])):
4243 states = matches[rev][fn]
4243 states = matches[rev][fn]
4244 copy = copies.get(rev, {}).get(fn)
4244 copy = copies.get(rev, {}).get(fn)
4245 if fn in skip:
4245 if fn in skip:
4246 if copy:
4246 if copy:
4247 skip[copy] = True
4247 skip[copy] = True
4248 continue
4248 continue
4249 pstates = matches.get(parent, {}).get(copy or fn, [])
4249 pstates = matches.get(parent, {}).get(copy or fn, [])
4250 if pstates or states:
4250 if pstates or states:
4251 r = display(fn, ctx, pstates, states)
4251 r = display(fn, ctx, pstates, states)
4252 found = found or r
4252 found = found or r
4253 if r and not opts.get('all'):
4253 if r and not opts.get('all'):
4254 skip[fn] = True
4254 skip[fn] = True
4255 if copy:
4255 if copy:
4256 skip[copy] = True
4256 skip[copy] = True
4257 del matches[rev]
4257 del matches[rev]
4258 del revfiles[rev]
4258 del revfiles[rev]
4259
4259
4260 return not found
4260 return not found
4261
4261
4262 @command('heads',
4262 @command('heads',
4263 [('r', 'rev', '',
4263 [('r', 'rev', '',
4264 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4264 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4265 ('t', 'topo', False, _('show topological heads only')),
4265 ('t', 'topo', False, _('show topological heads only')),
4266 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4266 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4267 ('c', 'closed', False, _('show normal and closed branch heads')),
4267 ('c', 'closed', False, _('show normal and closed branch heads')),
4268 ] + templateopts,
4268 ] + templateopts,
4269 _('[-ct] [-r STARTREV] [REV]...'))
4269 _('[-ct] [-r STARTREV] [REV]...'))
4270 def heads(ui, repo, *branchrevs, **opts):
4270 def heads(ui, repo, *branchrevs, **opts):
4271 """show branch heads
4271 """show branch heads
4272
4272
4273 With no arguments, show all open branch heads in the repository.
4273 With no arguments, show all open branch heads in the repository.
4274 Branch heads are changesets that have no descendants on the
4274 Branch heads are changesets that have no descendants on the
4275 same branch. They are where development generally takes place and
4275 same branch. They are where development generally takes place and
4276 are the usual targets for update and merge operations.
4276 are the usual targets for update and merge operations.
4277
4277
4278 If one or more REVs are given, only open branch heads on the
4278 If one or more REVs are given, only open branch heads on the
4279 branches associated with the specified changesets are shown. This
4279 branches associated with the specified changesets are shown. This
4280 means that you can use :hg:`heads .` to see the heads on the
4280 means that you can use :hg:`heads .` to see the heads on the
4281 currently checked-out branch.
4281 currently checked-out branch.
4282
4282
4283 If -c/--closed is specified, also show branch heads marked closed
4283 If -c/--closed is specified, also show branch heads marked closed
4284 (see :hg:`commit --close-branch`).
4284 (see :hg:`commit --close-branch`).
4285
4285
4286 If STARTREV is specified, only those heads that are descendants of
4286 If STARTREV is specified, only those heads that are descendants of
4287 STARTREV will be displayed.
4287 STARTREV will be displayed.
4288
4288
4289 If -t/--topo is specified, named branch mechanics will be ignored and only
4289 If -t/--topo is specified, named branch mechanics will be ignored and only
4290 topological heads (changesets with no children) will be shown.
4290 topological heads (changesets with no children) will be shown.
4291
4291
4292 Returns 0 if matching heads are found, 1 if not.
4292 Returns 0 if matching heads are found, 1 if not.
4293 """
4293 """
4294
4294
4295 start = None
4295 start = None
4296 if 'rev' in opts:
4296 if 'rev' in opts:
4297 start = scmutil.revsingle(repo, opts['rev'], None).node()
4297 start = scmutil.revsingle(repo, opts['rev'], None).node()
4298
4298
4299 if opts.get('topo'):
4299 if opts.get('topo'):
4300 heads = [repo[h] for h in repo.heads(start)]
4300 heads = [repo[h] for h in repo.heads(start)]
4301 else:
4301 else:
4302 heads = []
4302 heads = []
4303 for branch in repo.branchmap():
4303 for branch in repo.branchmap():
4304 heads += repo.branchheads(branch, start, opts.get('closed'))
4304 heads += repo.branchheads(branch, start, opts.get('closed'))
4305 heads = [repo[h] for h in heads]
4305 heads = [repo[h] for h in heads]
4306
4306
4307 if branchrevs:
4307 if branchrevs:
4308 branches = set(repo[br].branch() for br in branchrevs)
4308 branches = set(repo[br].branch() for br in branchrevs)
4309 heads = [h for h in heads if h.branch() in branches]
4309 heads = [h for h in heads if h.branch() in branches]
4310
4310
4311 if opts.get('active') and branchrevs:
4311 if opts.get('active') and branchrevs:
4312 dagheads = repo.heads(start)
4312 dagheads = repo.heads(start)
4313 heads = [h for h in heads if h.node() in dagheads]
4313 heads = [h for h in heads if h.node() in dagheads]
4314
4314
4315 if branchrevs:
4315 if branchrevs:
4316 haveheads = set(h.branch() for h in heads)
4316 haveheads = set(h.branch() for h in heads)
4317 if branches - haveheads:
4317 if branches - haveheads:
4318 headless = ', '.join(b for b in branches - haveheads)
4318 headless = ', '.join(b for b in branches - haveheads)
4319 msg = _('no open branch heads found on branches %s')
4319 msg = _('no open branch heads found on branches %s')
4320 if opts.get('rev'):
4320 if opts.get('rev'):
4321 msg += _(' (started at %s)') % opts['rev']
4321 msg += _(' (started at %s)') % opts['rev']
4322 ui.warn((msg + '\n') % headless)
4322 ui.warn((msg + '\n') % headless)
4323
4323
4324 if not heads:
4324 if not heads:
4325 return 1
4325 return 1
4326
4326
4327 heads = sorted(heads, key=lambda x: -x.rev())
4327 heads = sorted(heads, key=lambda x: -x.rev())
4328 displayer = cmdutil.show_changeset(ui, repo, opts)
4328 displayer = cmdutil.show_changeset(ui, repo, opts)
4329 for ctx in heads:
4329 for ctx in heads:
4330 displayer.show(ctx)
4330 displayer.show(ctx)
4331 displayer.close()
4331 displayer.close()
4332
4332
4333 @command('help',
4333 @command('help',
4334 [('e', 'extension', None, _('show only help for extensions')),
4334 [('e', 'extension', None, _('show only help for extensions')),
4335 ('c', 'command', None, _('show only help for commands')),
4335 ('c', 'command', None, _('show only help for commands')),
4336 ('k', 'keyword', None, _('show topics matching keyword')),
4336 ('k', 'keyword', None, _('show topics matching keyword')),
4337 ],
4337 ],
4338 _('[-eck] [TOPIC]'),
4338 _('[-eck] [TOPIC]'),
4339 norepo=True)
4339 norepo=True)
4340 def help_(ui, name=None, **opts):
4340 def help_(ui, name=None, **opts):
4341 """show help for a given topic or a help overview
4341 """show help for a given topic or a help overview
4342
4342
4343 With no arguments, print a list of commands with short help messages.
4343 With no arguments, print a list of commands with short help messages.
4344
4344
4345 Given a topic, extension, or command name, print help for that
4345 Given a topic, extension, or command name, print help for that
4346 topic.
4346 topic.
4347
4347
4348 Returns 0 if successful.
4348 Returns 0 if successful.
4349 """
4349 """
4350
4350
4351 textwidth = min(ui.termwidth(), 80) - 2
4351 textwidth = min(ui.termwidth(), 80) - 2
4352
4352
4353 keep = []
4353 keep = []
4354 if ui.verbose:
4354 if ui.verbose:
4355 keep.append('verbose')
4355 keep.append('verbose')
4356 if sys.platform.startswith('win'):
4356 if sys.platform.startswith('win'):
4357 keep.append('windows')
4357 keep.append('windows')
4358 elif sys.platform == 'OpenVMS':
4358 elif sys.platform == 'OpenVMS':
4359 keep.append('vms')
4359 keep.append('vms')
4360 elif sys.platform == 'plan9':
4360 elif sys.platform == 'plan9':
4361 keep.append('plan9')
4361 keep.append('plan9')
4362 else:
4362 else:
4363 keep.append('unix')
4363 keep.append('unix')
4364 keep.append(sys.platform.lower())
4364 keep.append(sys.platform.lower())
4365
4365
4366 section = None
4366 section = None
4367 subtopic = None
4367 subtopic = None
4368 if name and '.' in name:
4368 if name and '.' in name:
4369 name, section = name.split('.', 1)
4369 name, section = name.split('.', 1)
4370 section = section.lower()
4370 section = section.lower()
4371 if '.' in section:
4371 if '.' in section:
4372 subtopic, section = section.split('.', 1)
4372 subtopic, section = section.split('.', 1)
4373 else:
4373 else:
4374 subtopic = section
4374 subtopic = section
4375
4375
4376 text = help.help_(ui, name, subtopic=subtopic, **opts)
4376 text = help.help_(ui, name, subtopic=subtopic, **opts)
4377
4377
4378 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4378 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4379 section=section)
4379 section=section)
4380
4380
4381 # We could have been given a weird ".foo" section without a name
4381 # We could have been given a weird ".foo" section without a name
4382 # to look for, or we could have simply failed to found "foo.bar"
4382 # to look for, or we could have simply failed to found "foo.bar"
4383 # because bar isn't a section of foo
4383 # because bar isn't a section of foo
4384 if section and not (formatted and name):
4384 if section and not (formatted and name):
4385 raise error.Abort(_("help section not found"))
4385 raise error.Abort(_("help section not found"))
4386
4386
4387 if 'verbose' in pruned:
4387 if 'verbose' in pruned:
4388 keep.append('omitted')
4388 keep.append('omitted')
4389 else:
4389 else:
4390 keep.append('notomitted')
4390 keep.append('notomitted')
4391 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4391 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4392 section=section)
4392 section=section)
4393 ui.write(formatted)
4393 ui.write(formatted)
4394
4394
4395
4395
4396 @command('identify|id',
4396 @command('identify|id',
4397 [('r', 'rev', '',
4397 [('r', 'rev', '',
4398 _('identify the specified revision'), _('REV')),
4398 _('identify the specified revision'), _('REV')),
4399 ('n', 'num', None, _('show local revision number')),
4399 ('n', 'num', None, _('show local revision number')),
4400 ('i', 'id', None, _('show global revision id')),
4400 ('i', 'id', None, _('show global revision id')),
4401 ('b', 'branch', None, _('show branch')),
4401 ('b', 'branch', None, _('show branch')),
4402 ('t', 'tags', None, _('show tags')),
4402 ('t', 'tags', None, _('show tags')),
4403 ('B', 'bookmarks', None, _('show bookmarks')),
4403 ('B', 'bookmarks', None, _('show bookmarks')),
4404 ] + remoteopts,
4404 ] + remoteopts,
4405 _('[-nibtB] [-r REV] [SOURCE]'),
4405 _('[-nibtB] [-r REV] [SOURCE]'),
4406 optionalrepo=True)
4406 optionalrepo=True)
4407 def identify(ui, repo, source=None, rev=None,
4407 def identify(ui, repo, source=None, rev=None,
4408 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4408 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4409 """identify the working directory or specified revision
4409 """identify the working directory or specified revision
4410
4410
4411 Print a summary identifying the repository state at REV using one or
4411 Print a summary identifying the repository state at REV using one or
4412 two parent hash identifiers, followed by a "+" if the working
4412 two parent hash identifiers, followed by a "+" if the working
4413 directory has uncommitted changes, the branch name (if not default),
4413 directory has uncommitted changes, the branch name (if not default),
4414 a list of tags, and a list of bookmarks.
4414 a list of tags, and a list of bookmarks.
4415
4415
4416 When REV is not given, print a summary of the current state of the
4416 When REV is not given, print a summary of the current state of the
4417 repository.
4417 repository.
4418
4418
4419 Specifying a path to a repository root or Mercurial bundle will
4419 Specifying a path to a repository root or Mercurial bundle will
4420 cause lookup to operate on that repository/bundle.
4420 cause lookup to operate on that repository/bundle.
4421
4421
4422 .. container:: verbose
4422 .. container:: verbose
4423
4423
4424 Examples:
4424 Examples:
4425
4425
4426 - generate a build identifier for the working directory::
4426 - generate a build identifier for the working directory::
4427
4427
4428 hg id --id > build-id.dat
4428 hg id --id > build-id.dat
4429
4429
4430 - find the revision corresponding to a tag::
4430 - find the revision corresponding to a tag::
4431
4431
4432 hg id -n -r 1.3
4432 hg id -n -r 1.3
4433
4433
4434 - check the most recent revision of a remote repository::
4434 - check the most recent revision of a remote repository::
4435
4435
4436 hg id -r tip http://selenic.com/hg/
4436 hg id -r tip http://selenic.com/hg/
4437
4437
4438 See :hg:`log` for generating more information about specific revisions,
4438 See :hg:`log` for generating more information about specific revisions,
4439 including full hash identifiers.
4439 including full hash identifiers.
4440
4440
4441 Returns 0 if successful.
4441 Returns 0 if successful.
4442 """
4442 """
4443
4443
4444 if not repo and not source:
4444 if not repo and not source:
4445 raise error.Abort(_("there is no Mercurial repository here "
4445 raise error.Abort(_("there is no Mercurial repository here "
4446 "(.hg not found)"))
4446 "(.hg not found)"))
4447
4447
4448 if ui.debugflag:
4448 if ui.debugflag:
4449 hexfunc = hex
4449 hexfunc = hex
4450 else:
4450 else:
4451 hexfunc = short
4451 hexfunc = short
4452 default = not (num or id or branch or tags or bookmarks)
4452 default = not (num or id or branch or tags or bookmarks)
4453 output = []
4453 output = []
4454 revs = []
4454 revs = []
4455
4455
4456 if source:
4456 if source:
4457 source, branches = hg.parseurl(ui.expandpath(source))
4457 source, branches = hg.parseurl(ui.expandpath(source))
4458 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4458 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4459 repo = peer.local()
4459 repo = peer.local()
4460 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4460 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4461
4461
4462 if not repo:
4462 if not repo:
4463 if num or branch or tags:
4463 if num or branch or tags:
4464 raise error.Abort(
4464 raise error.Abort(
4465 _("can't query remote revision number, branch, or tags"))
4465 _("can't query remote revision number, branch, or tags"))
4466 if not rev and revs:
4466 if not rev and revs:
4467 rev = revs[0]
4467 rev = revs[0]
4468 if not rev:
4468 if not rev:
4469 rev = "tip"
4469 rev = "tip"
4470
4470
4471 remoterev = peer.lookup(rev)
4471 remoterev = peer.lookup(rev)
4472 if default or id:
4472 if default or id:
4473 output = [hexfunc(remoterev)]
4473 output = [hexfunc(remoterev)]
4474
4474
4475 def getbms():
4475 def getbms():
4476 bms = []
4476 bms = []
4477
4477
4478 if 'bookmarks' in peer.listkeys('namespaces'):
4478 if 'bookmarks' in peer.listkeys('namespaces'):
4479 hexremoterev = hex(remoterev)
4479 hexremoterev = hex(remoterev)
4480 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4480 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4481 if bmr == hexremoterev]
4481 if bmr == hexremoterev]
4482
4482
4483 return sorted(bms)
4483 return sorted(bms)
4484
4484
4485 if bookmarks:
4485 if bookmarks:
4486 output.extend(getbms())
4486 output.extend(getbms())
4487 elif default and not ui.quiet:
4487 elif default and not ui.quiet:
4488 # multiple bookmarks for a single parent separated by '/'
4488 # multiple bookmarks for a single parent separated by '/'
4489 bm = '/'.join(getbms())
4489 bm = '/'.join(getbms())
4490 if bm:
4490 if bm:
4491 output.append(bm)
4491 output.append(bm)
4492 else:
4492 else:
4493 ctx = scmutil.revsingle(repo, rev, None)
4493 ctx = scmutil.revsingle(repo, rev, None)
4494
4494
4495 if ctx.rev() is None:
4495 if ctx.rev() is None:
4496 ctx = repo[None]
4496 ctx = repo[None]
4497 parents = ctx.parents()
4497 parents = ctx.parents()
4498 taglist = []
4498 taglist = []
4499 for p in parents:
4499 for p in parents:
4500 taglist.extend(p.tags())
4500 taglist.extend(p.tags())
4501
4501
4502 changed = ""
4502 changed = ""
4503 if default or id or num:
4503 if default or id or num:
4504 if (any(repo.status())
4504 if (any(repo.status())
4505 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4505 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4506 changed = '+'
4506 changed = '+'
4507 if default or id:
4507 if default or id:
4508 output = ["%s%s" %
4508 output = ["%s%s" %
4509 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4509 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4510 if num:
4510 if num:
4511 output.append("%s%s" %
4511 output.append("%s%s" %
4512 ('+'.join([str(p.rev()) for p in parents]), changed))
4512 ('+'.join([str(p.rev()) for p in parents]), changed))
4513 else:
4513 else:
4514 if default or id:
4514 if default or id:
4515 output = [hexfunc(ctx.node())]
4515 output = [hexfunc(ctx.node())]
4516 if num:
4516 if num:
4517 output.append(str(ctx.rev()))
4517 output.append(str(ctx.rev()))
4518 taglist = ctx.tags()
4518 taglist = ctx.tags()
4519
4519
4520 if default and not ui.quiet:
4520 if default and not ui.quiet:
4521 b = ctx.branch()
4521 b = ctx.branch()
4522 if b != 'default':
4522 if b != 'default':
4523 output.append("(%s)" % b)
4523 output.append("(%s)" % b)
4524
4524
4525 # multiple tags for a single parent separated by '/'
4525 # multiple tags for a single parent separated by '/'
4526 t = '/'.join(taglist)
4526 t = '/'.join(taglist)
4527 if t:
4527 if t:
4528 output.append(t)
4528 output.append(t)
4529
4529
4530 # multiple bookmarks for a single parent separated by '/'
4530 # multiple bookmarks for a single parent separated by '/'
4531 bm = '/'.join(ctx.bookmarks())
4531 bm = '/'.join(ctx.bookmarks())
4532 if bm:
4532 if bm:
4533 output.append(bm)
4533 output.append(bm)
4534 else:
4534 else:
4535 if branch:
4535 if branch:
4536 output.append(ctx.branch())
4536 output.append(ctx.branch())
4537
4537
4538 if tags:
4538 if tags:
4539 output.extend(taglist)
4539 output.extend(taglist)
4540
4540
4541 if bookmarks:
4541 if bookmarks:
4542 output.extend(ctx.bookmarks())
4542 output.extend(ctx.bookmarks())
4543
4543
4544 ui.write("%s\n" % ' '.join(output))
4544 ui.write("%s\n" % ' '.join(output))
4545
4545
4546 @command('import|patch',
4546 @command('import|patch',
4547 [('p', 'strip', 1,
4547 [('p', 'strip', 1,
4548 _('directory strip option for patch. This has the same '
4548 _('directory strip option for patch. This has the same '
4549 'meaning as the corresponding patch option'), _('NUM')),
4549 'meaning as the corresponding patch option'), _('NUM')),
4550 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4550 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4551 ('e', 'edit', False, _('invoke editor on commit messages')),
4551 ('e', 'edit', False, _('invoke editor on commit messages')),
4552 ('f', 'force', None,
4552 ('f', 'force', None,
4553 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4553 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4554 ('', 'no-commit', None,
4554 ('', 'no-commit', None,
4555 _("don't commit, just update the working directory")),
4555 _("don't commit, just update the working directory")),
4556 ('', 'bypass', None,
4556 ('', 'bypass', None,
4557 _("apply patch without touching the working directory")),
4557 _("apply patch without touching the working directory")),
4558 ('', 'partial', None,
4558 ('', 'partial', None,
4559 _('commit even if some hunks fail')),
4559 _('commit even if some hunks fail')),
4560 ('', 'exact', None,
4560 ('', 'exact', None,
4561 _('apply patch to the nodes from which it was generated')),
4561 _('apply patch to the nodes from which it was generated')),
4562 ('', 'prefix', '',
4562 ('', 'prefix', '',
4563 _('apply patch to subdirectory'), _('DIR')),
4563 _('apply patch to subdirectory'), _('DIR')),
4564 ('', 'import-branch', None,
4564 ('', 'import-branch', None,
4565 _('use any branch information in patch (implied by --exact)'))] +
4565 _('use any branch information in patch (implied by --exact)'))] +
4566 commitopts + commitopts2 + similarityopts,
4566 commitopts + commitopts2 + similarityopts,
4567 _('[OPTION]... PATCH...'))
4567 _('[OPTION]... PATCH...'))
4568 def import_(ui, repo, patch1=None, *patches, **opts):
4568 def import_(ui, repo, patch1=None, *patches, **opts):
4569 """import an ordered set of patches
4569 """import an ordered set of patches
4570
4570
4571 Import a list of patches and commit them individually (unless
4571 Import a list of patches and commit them individually (unless
4572 --no-commit is specified).
4572 --no-commit is specified).
4573
4573
4574 To read a patch from standard input, use "-" as the patch name. If
4574 To read a patch from standard input, use "-" as the patch name. If
4575 a URL is specified, the patch will be downloaded from there.
4575 a URL is specified, the patch will be downloaded from there.
4576
4576
4577 Import first applies changes to the working directory (unless
4577 Import first applies changes to the working directory (unless
4578 --bypass is specified), import will abort if there are outstanding
4578 --bypass is specified), import will abort if there are outstanding
4579 changes.
4579 changes.
4580
4580
4581 Use --bypass to apply and commit patches directly to the
4581 Use --bypass to apply and commit patches directly to the
4582 repository, without affecting the working directory. Without
4582 repository, without affecting the working directory. Without
4583 --exact, patches will be applied on top of the working directory
4583 --exact, patches will be applied on top of the working directory
4584 parent revision.
4584 parent revision.
4585
4585
4586 You can import a patch straight from a mail message. Even patches
4586 You can import a patch straight from a mail message. Even patches
4587 as attachments work (to use the body part, it must have type
4587 as attachments work (to use the body part, it must have type
4588 text/plain or text/x-patch). From and Subject headers of email
4588 text/plain or text/x-patch). From and Subject headers of email
4589 message are used as default committer and commit message. All
4589 message are used as default committer and commit message. All
4590 text/plain body parts before first diff are added to the commit
4590 text/plain body parts before first diff are added to the commit
4591 message.
4591 message.
4592
4592
4593 If the imported patch was generated by :hg:`export`, user and
4593 If the imported patch was generated by :hg:`export`, user and
4594 description from patch override values from message headers and
4594 description from patch override values from message headers and
4595 body. Values given on command line with -m/--message and -u/--user
4595 body. Values given on command line with -m/--message and -u/--user
4596 override these.
4596 override these.
4597
4597
4598 If --exact is specified, import will set the working directory to
4598 If --exact is specified, import will set the working directory to
4599 the parent of each patch before applying it, and will abort if the
4599 the parent of each patch before applying it, and will abort if the
4600 resulting changeset has a different ID than the one recorded in
4600 resulting changeset has a different ID than the one recorded in
4601 the patch. This may happen due to character set problems or other
4601 the patch. This may happen due to character set problems or other
4602 deficiencies in the text patch format.
4602 deficiencies in the text patch format.
4603
4603
4604 Use --partial to ensure a changeset will be created from the patch
4604 Use --partial to ensure a changeset will be created from the patch
4605 even if some hunks fail to apply. Hunks that fail to apply will be
4605 even if some hunks fail to apply. Hunks that fail to apply will be
4606 written to a <target-file>.rej file. Conflicts can then be resolved
4606 written to a <target-file>.rej file. Conflicts can then be resolved
4607 by hand before :hg:`commit --amend` is run to update the created
4607 by hand before :hg:`commit --amend` is run to update the created
4608 changeset. This flag exists to let people import patches that
4608 changeset. This flag exists to let people import patches that
4609 partially apply without losing the associated metadata (author,
4609 partially apply without losing the associated metadata (author,
4610 date, description, ...).
4610 date, description, ...).
4611
4611
4612 .. note::
4612 .. note::
4613
4613
4614 When no hunks apply cleanly, :hg:`import --partial` will create
4614 When no hunks apply cleanly, :hg:`import --partial` will create
4615 an empty changeset, importing only the patch metadata.
4615 an empty changeset, importing only the patch metadata.
4616
4616
4617 With -s/--similarity, hg will attempt to discover renames and
4617 With -s/--similarity, hg will attempt to discover renames and
4618 copies in the patch in the same way as :hg:`addremove`.
4618 copies in the patch in the same way as :hg:`addremove`.
4619
4619
4620 It is possible to use external patch programs to perform the patch
4620 It is possible to use external patch programs to perform the patch
4621 by setting the ``ui.patch`` configuration option. For the default
4621 by setting the ``ui.patch`` configuration option. For the default
4622 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4622 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4623 See :hg:`help config` for more information about configuration
4623 See :hg:`help config` for more information about configuration
4624 files and how to use these options.
4624 files and how to use these options.
4625
4625
4626 See :hg:`help dates` for a list of formats valid for -d/--date.
4626 See :hg:`help dates` for a list of formats valid for -d/--date.
4627
4627
4628 .. container:: verbose
4628 .. container:: verbose
4629
4629
4630 Examples:
4630 Examples:
4631
4631
4632 - import a traditional patch from a website and detect renames::
4632 - import a traditional patch from a website and detect renames::
4633
4633
4634 hg import -s 80 http://example.com/bugfix.patch
4634 hg import -s 80 http://example.com/bugfix.patch
4635
4635
4636 - import a changeset from an hgweb server::
4636 - import a changeset from an hgweb server::
4637
4637
4638 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4638 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4639
4639
4640 - import all the patches in an Unix-style mbox::
4640 - import all the patches in an Unix-style mbox::
4641
4641
4642 hg import incoming-patches.mbox
4642 hg import incoming-patches.mbox
4643
4643
4644 - attempt to exactly restore an exported changeset (not always
4644 - attempt to exactly restore an exported changeset (not always
4645 possible)::
4645 possible)::
4646
4646
4647 hg import --exact proposed-fix.patch
4647 hg import --exact proposed-fix.patch
4648
4648
4649 - use an external tool to apply a patch which is too fuzzy for
4649 - use an external tool to apply a patch which is too fuzzy for
4650 the default internal tool.
4650 the default internal tool.
4651
4651
4652 hg import --config ui.patch="patch --merge" fuzzy.patch
4652 hg import --config ui.patch="patch --merge" fuzzy.patch
4653
4653
4654 - change the default fuzzing from 2 to a less strict 7
4654 - change the default fuzzing from 2 to a less strict 7
4655
4655
4656 hg import --config ui.fuzz=7 fuzz.patch
4656 hg import --config ui.fuzz=7 fuzz.patch
4657
4657
4658 Returns 0 on success, 1 on partial success (see --partial).
4658 Returns 0 on success, 1 on partial success (see --partial).
4659 """
4659 """
4660
4660
4661 if not patch1:
4661 if not patch1:
4662 raise error.Abort(_('need at least one patch to import'))
4662 raise error.Abort(_('need at least one patch to import'))
4663
4663
4664 patches = (patch1,) + patches
4664 patches = (patch1,) + patches
4665
4665
4666 date = opts.get('date')
4666 date = opts.get('date')
4667 if date:
4667 if date:
4668 opts['date'] = util.parsedate(date)
4668 opts['date'] = util.parsedate(date)
4669
4669
4670 exact = opts.get('exact')
4670 exact = opts.get('exact')
4671 update = not opts.get('bypass')
4671 update = not opts.get('bypass')
4672 if not update and opts.get('no_commit'):
4672 if not update and opts.get('no_commit'):
4673 raise error.Abort(_('cannot use --no-commit with --bypass'))
4673 raise error.Abort(_('cannot use --no-commit with --bypass'))
4674 try:
4674 try:
4675 sim = float(opts.get('similarity') or 0)
4675 sim = float(opts.get('similarity') or 0)
4676 except ValueError:
4676 except ValueError:
4677 raise error.Abort(_('similarity must be a number'))
4677 raise error.Abort(_('similarity must be a number'))
4678 if sim < 0 or sim > 100:
4678 if sim < 0 or sim > 100:
4679 raise error.Abort(_('similarity must be between 0 and 100'))
4679 raise error.Abort(_('similarity must be between 0 and 100'))
4680 if sim and not update:
4680 if sim and not update:
4681 raise error.Abort(_('cannot use --similarity with --bypass'))
4681 raise error.Abort(_('cannot use --similarity with --bypass'))
4682 if exact:
4682 if exact:
4683 if opts.get('edit'):
4683 if opts.get('edit'):
4684 raise error.Abort(_('cannot use --exact with --edit'))
4684 raise error.Abort(_('cannot use --exact with --edit'))
4685 if opts.get('prefix'):
4685 if opts.get('prefix'):
4686 raise error.Abort(_('cannot use --exact with --prefix'))
4686 raise error.Abort(_('cannot use --exact with --prefix'))
4687
4687
4688 base = opts["base"]
4688 base = opts["base"]
4689 wlock = dsguard = lock = tr = None
4689 wlock = dsguard = lock = tr = None
4690 msgs = []
4690 msgs = []
4691 ret = 0
4691 ret = 0
4692
4692
4693
4693
4694 try:
4694 try:
4695 try:
4695 try:
4696 wlock = repo.wlock()
4696 wlock = repo.wlock()
4697
4697
4698 if update:
4698 if update:
4699 cmdutil.checkunfinished(repo)
4699 cmdutil.checkunfinished(repo)
4700 if (exact or not opts.get('force')):
4700 if (exact or not opts.get('force')):
4701 cmdutil.bailifchanged(repo)
4701 cmdutil.bailifchanged(repo)
4702
4702
4703 if not opts.get('no_commit'):
4703 if not opts.get('no_commit'):
4704 lock = repo.lock()
4704 lock = repo.lock()
4705 tr = repo.transaction('import')
4705 tr = repo.transaction('import')
4706 else:
4706 else:
4707 dsguard = cmdutil.dirstateguard(repo, 'import')
4707 dsguard = cmdutil.dirstateguard(repo, 'import')
4708 parents = repo[None].parents()
4708 parents = repo[None].parents()
4709 for patchurl in patches:
4709 for patchurl in patches:
4710 if patchurl == '-':
4710 if patchurl == '-':
4711 ui.status(_('applying patch from stdin\n'))
4711 ui.status(_('applying patch from stdin\n'))
4712 patchfile = ui.fin
4712 patchfile = ui.fin
4713 patchurl = 'stdin' # for error message
4713 patchurl = 'stdin' # for error message
4714 else:
4714 else:
4715 patchurl = os.path.join(base, patchurl)
4715 patchurl = os.path.join(base, patchurl)
4716 ui.status(_('applying %s\n') % patchurl)
4716 ui.status(_('applying %s\n') % patchurl)
4717 patchfile = hg.openpath(ui, patchurl)
4717 patchfile = hg.openpath(ui, patchurl)
4718
4718
4719 haspatch = False
4719 haspatch = False
4720 for hunk in patch.split(patchfile):
4720 for hunk in patch.split(patchfile):
4721 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4721 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4722 parents, opts,
4722 parents, opts,
4723 msgs, hg.clean)
4723 msgs, hg.clean)
4724 if msg:
4724 if msg:
4725 haspatch = True
4725 haspatch = True
4726 ui.note(msg + '\n')
4726 ui.note(msg + '\n')
4727 if update or exact:
4727 if update or exact:
4728 parents = repo[None].parents()
4728 parents = repo[None].parents()
4729 else:
4729 else:
4730 parents = [repo[node]]
4730 parents = [repo[node]]
4731 if rej:
4731 if rej:
4732 ui.write_err(_("patch applied partially\n"))
4732 ui.write_err(_("patch applied partially\n"))
4733 ui.write_err(_("(fix the .rej files and run "
4733 ui.write_err(_("(fix the .rej files and run "
4734 "`hg commit --amend`)\n"))
4734 "`hg commit --amend`)\n"))
4735 ret = 1
4735 ret = 1
4736 break
4736 break
4737
4737
4738 if not haspatch:
4738 if not haspatch:
4739 raise error.Abort(_('%s: no diffs found') % patchurl)
4739 raise error.Abort(_('%s: no diffs found') % patchurl)
4740
4740
4741 if tr:
4741 if tr:
4742 tr.close()
4742 tr.close()
4743 if msgs:
4743 if msgs:
4744 repo.savecommitmessage('\n* * *\n'.join(msgs))
4744 repo.savecommitmessage('\n* * *\n'.join(msgs))
4745 if dsguard:
4745 if dsguard:
4746 dsguard.close()
4746 dsguard.close()
4747 return ret
4747 return ret
4748 finally:
4748 finally:
4749 # TODO: get rid of this meaningless try/finally enclosing.
4749 # TODO: get rid of this meaningless try/finally enclosing.
4750 # this is kept only to reduce changes in a patch.
4750 # this is kept only to reduce changes in a patch.
4751 pass
4751 pass
4752 finally:
4752 finally:
4753 if tr:
4753 if tr:
4754 tr.release()
4754 tr.release()
4755 release(lock, dsguard, wlock)
4755 release(lock, dsguard, wlock)
4756
4756
4757 @command('incoming|in',
4757 @command('incoming|in',
4758 [('f', 'force', None,
4758 [('f', 'force', None,
4759 _('run even if remote repository is unrelated')),
4759 _('run even if remote repository is unrelated')),
4760 ('n', 'newest-first', None, _('show newest record first')),
4760 ('n', 'newest-first', None, _('show newest record first')),
4761 ('', 'bundle', '',
4761 ('', 'bundle', '',
4762 _('file to store the bundles into'), _('FILE')),
4762 _('file to store the bundles into'), _('FILE')),
4763 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4763 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4764 ('B', 'bookmarks', False, _("compare bookmarks")),
4764 ('B', 'bookmarks', False, _("compare bookmarks")),
4765 ('b', 'branch', [],
4765 ('b', 'branch', [],
4766 _('a specific branch you would like to pull'), _('BRANCH')),
4766 _('a specific branch you would like to pull'), _('BRANCH')),
4767 ] + logopts + remoteopts + subrepoopts,
4767 ] + logopts + remoteopts + subrepoopts,
4768 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
4768 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
4769 def incoming(ui, repo, source="default", **opts):
4769 def incoming(ui, repo, source="default", **opts):
4770 """show new changesets found in source
4770 """show new changesets found in source
4771
4771
4772 Show new changesets found in the specified path/URL or the default
4772 Show new changesets found in the specified path/URL or the default
4773 pull location. These are the changesets that would have been pulled
4773 pull location. These are the changesets that would have been pulled
4774 if a pull at the time you issued this command.
4774 if a pull at the time you issued this command.
4775
4775
4776 See pull for valid source format details.
4776 See pull for valid source format details.
4777
4777
4778 .. container:: verbose
4778 .. container:: verbose
4779
4779
4780 With -B/--bookmarks, the result of bookmark comparison between
4780 With -B/--bookmarks, the result of bookmark comparison between
4781 local and remote repositories is displayed. With -v/--verbose,
4781 local and remote repositories is displayed. With -v/--verbose,
4782 status is also displayed for each bookmark like below::
4782 status is also displayed for each bookmark like below::
4783
4783
4784 BM1 01234567890a added
4784 BM1 01234567890a added
4785 BM2 1234567890ab advanced
4785 BM2 1234567890ab advanced
4786 BM3 234567890abc diverged
4786 BM3 234567890abc diverged
4787 BM4 34567890abcd changed
4787 BM4 34567890abcd changed
4788
4788
4789 The action taken locally when pulling depends on the
4789 The action taken locally when pulling depends on the
4790 status of each bookmark:
4790 status of each bookmark:
4791
4791
4792 :``added``: pull will create it
4792 :``added``: pull will create it
4793 :``advanced``: pull will update it
4793 :``advanced``: pull will update it
4794 :``diverged``: pull will create a divergent bookmark
4794 :``diverged``: pull will create a divergent bookmark
4795 :``changed``: result depends on remote changesets
4795 :``changed``: result depends on remote changesets
4796
4796
4797 From the point of view of pulling behavior, bookmark
4797 From the point of view of pulling behavior, bookmark
4798 existing only in the remote repository are treated as ``added``,
4798 existing only in the remote repository are treated as ``added``,
4799 even if it is in fact locally deleted.
4799 even if it is in fact locally deleted.
4800
4800
4801 .. container:: verbose
4801 .. container:: verbose
4802
4802
4803 For remote repository, using --bundle avoids downloading the
4803 For remote repository, using --bundle avoids downloading the
4804 changesets twice if the incoming is followed by a pull.
4804 changesets twice if the incoming is followed by a pull.
4805
4805
4806 Examples:
4806 Examples:
4807
4807
4808 - show incoming changes with patches and full description::
4808 - show incoming changes with patches and full description::
4809
4809
4810 hg incoming -vp
4810 hg incoming -vp
4811
4811
4812 - show incoming changes excluding merges, store a bundle::
4812 - show incoming changes excluding merges, store a bundle::
4813
4813
4814 hg in -vpM --bundle incoming.hg
4814 hg in -vpM --bundle incoming.hg
4815 hg pull incoming.hg
4815 hg pull incoming.hg
4816
4816
4817 - briefly list changes inside a bundle::
4817 - briefly list changes inside a bundle::
4818
4818
4819 hg in changes.hg -T "{desc|firstline}\\n"
4819 hg in changes.hg -T "{desc|firstline}\\n"
4820
4820
4821 Returns 0 if there are incoming changes, 1 otherwise.
4821 Returns 0 if there are incoming changes, 1 otherwise.
4822 """
4822 """
4823 if opts.get('graph'):
4823 if opts.get('graph'):
4824 cmdutil.checkunsupportedgraphflags([], opts)
4824 cmdutil.checkunsupportedgraphflags([], opts)
4825 def display(other, chlist, displayer):
4825 def display(other, chlist, displayer):
4826 revdag = cmdutil.graphrevs(other, chlist, opts)
4826 revdag = cmdutil.graphrevs(other, chlist, opts)
4827 cmdutil.displaygraph(ui, repo, revdag, displayer,
4827 cmdutil.displaygraph(ui, repo, revdag, displayer,
4828 graphmod.asciiedges)
4828 graphmod.asciiedges)
4829
4829
4830 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4830 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4831 return 0
4831 return 0
4832
4832
4833 if opts.get('bundle') and opts.get('subrepos'):
4833 if opts.get('bundle') and opts.get('subrepos'):
4834 raise error.Abort(_('cannot combine --bundle and --subrepos'))
4834 raise error.Abort(_('cannot combine --bundle and --subrepos'))
4835
4835
4836 if opts.get('bookmarks'):
4836 if opts.get('bookmarks'):
4837 source, branches = hg.parseurl(ui.expandpath(source),
4837 source, branches = hg.parseurl(ui.expandpath(source),
4838 opts.get('branch'))
4838 opts.get('branch'))
4839 other = hg.peer(repo, opts, source)
4839 other = hg.peer(repo, opts, source)
4840 if 'bookmarks' not in other.listkeys('namespaces'):
4840 if 'bookmarks' not in other.listkeys('namespaces'):
4841 ui.warn(_("remote doesn't support bookmarks\n"))
4841 ui.warn(_("remote doesn't support bookmarks\n"))
4842 return 0
4842 return 0
4843 ui.status(_('comparing with %s\n') % util.hidepassword(source))
4843 ui.status(_('comparing with %s\n') % util.hidepassword(source))
4844 return bookmarks.incoming(ui, repo, other)
4844 return bookmarks.incoming(ui, repo, other)
4845
4845
4846 repo._subtoppath = ui.expandpath(source)
4846 repo._subtoppath = ui.expandpath(source)
4847 try:
4847 try:
4848 return hg.incoming(ui, repo, source, opts)
4848 return hg.incoming(ui, repo, source, opts)
4849 finally:
4849 finally:
4850 del repo._subtoppath
4850 del repo._subtoppath
4851
4851
4852
4852
4853 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
4853 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
4854 norepo=True)
4854 norepo=True)
4855 def init(ui, dest=".", **opts):
4855 def init(ui, dest=".", **opts):
4856 """create a new repository in the given directory
4856 """create a new repository in the given directory
4857
4857
4858 Initialize a new repository in the given directory. If the given
4858 Initialize a new repository in the given directory. If the given
4859 directory does not exist, it will be created.
4859 directory does not exist, it will be created.
4860
4860
4861 If no directory is given, the current directory is used.
4861 If no directory is given, the current directory is used.
4862
4862
4863 It is possible to specify an ``ssh://`` URL as the destination.
4863 It is possible to specify an ``ssh://`` URL as the destination.
4864 See :hg:`help urls` for more information.
4864 See :hg:`help urls` for more information.
4865
4865
4866 Returns 0 on success.
4866 Returns 0 on success.
4867 """
4867 """
4868 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4868 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4869
4869
4870 @command('locate',
4870 @command('locate',
4871 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
4871 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
4872 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4872 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4873 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
4873 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
4874 ] + walkopts,
4874 ] + walkopts,
4875 _('[OPTION]... [PATTERN]...'))
4875 _('[OPTION]... [PATTERN]...'))
4876 def locate(ui, repo, *pats, **opts):
4876 def locate(ui, repo, *pats, **opts):
4877 """locate files matching specific patterns (DEPRECATED)
4877 """locate files matching specific patterns (DEPRECATED)
4878
4878
4879 Print files under Mercurial control in the working directory whose
4879 Print files under Mercurial control in the working directory whose
4880 names match the given patterns.
4880 names match the given patterns.
4881
4881
4882 By default, this command searches all directories in the working
4882 By default, this command searches all directories in the working
4883 directory. To search just the current directory and its
4883 directory. To search just the current directory and its
4884 subdirectories, use "--include .".
4884 subdirectories, use "--include .".
4885
4885
4886 If no patterns are given to match, this command prints the names
4886 If no patterns are given to match, this command prints the names
4887 of all files under Mercurial control in the working directory.
4887 of all files under Mercurial control in the working directory.
4888
4888
4889 If you want to feed the output of this command into the "xargs"
4889 If you want to feed the output of this command into the "xargs"
4890 command, use the -0 option to both this command and "xargs". This
4890 command, use the -0 option to both this command and "xargs". This
4891 will avoid the problem of "xargs" treating single filenames that
4891 will avoid the problem of "xargs" treating single filenames that
4892 contain whitespace as multiple filenames.
4892 contain whitespace as multiple filenames.
4893
4893
4894 See :hg:`help files` for a more versatile command.
4894 See :hg:`help files` for a more versatile command.
4895
4895
4896 Returns 0 if a match is found, 1 otherwise.
4896 Returns 0 if a match is found, 1 otherwise.
4897 """
4897 """
4898 if opts.get('print0'):
4898 if opts.get('print0'):
4899 end = '\0'
4899 end = '\0'
4900 else:
4900 else:
4901 end = '\n'
4901 end = '\n'
4902 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
4902 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
4903
4903
4904 ret = 1
4904 ret = 1
4905 ctx = repo[rev]
4905 ctx = repo[rev]
4906 m = scmutil.match(ctx, pats, opts, default='relglob',
4906 m = scmutil.match(ctx, pats, opts, default='relglob',
4907 badfn=lambda x, y: False)
4907 badfn=lambda x, y: False)
4908
4908
4909 for abs in ctx.matches(m):
4909 for abs in ctx.matches(m):
4910 if opts.get('fullpath'):
4910 if opts.get('fullpath'):
4911 ui.write(repo.wjoin(abs), end)
4911 ui.write(repo.wjoin(abs), end)
4912 else:
4912 else:
4913 ui.write(((pats and m.rel(abs)) or abs), end)
4913 ui.write(((pats and m.rel(abs)) or abs), end)
4914 ret = 0
4914 ret = 0
4915
4915
4916 return ret
4916 return ret
4917
4917
4918 @command('^log|history',
4918 @command('^log|history',
4919 [('f', 'follow', None,
4919 [('f', 'follow', None,
4920 _('follow changeset history, or file history across copies and renames')),
4920 _('follow changeset history, or file history across copies and renames')),
4921 ('', 'follow-first', None,
4921 ('', 'follow-first', None,
4922 _('only follow the first parent of merge changesets (DEPRECATED)')),
4922 _('only follow the first parent of merge changesets (DEPRECATED)')),
4923 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
4923 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
4924 ('C', 'copies', None, _('show copied files')),
4924 ('C', 'copies', None, _('show copied files')),
4925 ('k', 'keyword', [],
4925 ('k', 'keyword', [],
4926 _('do case-insensitive search for a given text'), _('TEXT')),
4926 _('do case-insensitive search for a given text'), _('TEXT')),
4927 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
4927 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
4928 ('', 'removed', None, _('include revisions where files were removed')),
4928 ('', 'removed', None, _('include revisions where files were removed')),
4929 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
4929 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
4930 ('u', 'user', [], _('revisions committed by user'), _('USER')),
4930 ('u', 'user', [], _('revisions committed by user'), _('USER')),
4931 ('', 'only-branch', [],
4931 ('', 'only-branch', [],
4932 _('show only changesets within the given named branch (DEPRECATED)'),
4932 _('show only changesets within the given named branch (DEPRECATED)'),
4933 _('BRANCH')),
4933 _('BRANCH')),
4934 ('b', 'branch', [],
4934 ('b', 'branch', [],
4935 _('show changesets within the given named branch'), _('BRANCH')),
4935 _('show changesets within the given named branch'), _('BRANCH')),
4936 ('P', 'prune', [],
4936 ('P', 'prune', [],
4937 _('do not display revision or any of its ancestors'), _('REV')),
4937 _('do not display revision or any of its ancestors'), _('REV')),
4938 ] + logopts + walkopts,
4938 ] + logopts + walkopts,
4939 _('[OPTION]... [FILE]'),
4939 _('[OPTION]... [FILE]'),
4940 inferrepo=True)
4940 inferrepo=True)
4941 def log(ui, repo, *pats, **opts):
4941 def log(ui, repo, *pats, **opts):
4942 """show revision history of entire repository or files
4942 """show revision history of entire repository or files
4943
4943
4944 Print the revision history of the specified files or the entire
4944 Print the revision history of the specified files or the entire
4945 project.
4945 project.
4946
4946
4947 If no revision range is specified, the default is ``tip:0`` unless
4947 If no revision range is specified, the default is ``tip:0`` unless
4948 --follow is set, in which case the working directory parent is
4948 --follow is set, in which case the working directory parent is
4949 used as the starting revision.
4949 used as the starting revision.
4950
4950
4951 File history is shown without following rename or copy history of
4951 File history is shown without following rename or copy history of
4952 files. Use -f/--follow with a filename to follow history across
4952 files. Use -f/--follow with a filename to follow history across
4953 renames and copies. --follow without a filename will only show
4953 renames and copies. --follow without a filename will only show
4954 ancestors or descendants of the starting revision.
4954 ancestors or descendants of the starting revision.
4955
4955
4956 By default this command prints revision number and changeset id,
4956 By default this command prints revision number and changeset id,
4957 tags, non-trivial parents, user, date and time, and a summary for
4957 tags, non-trivial parents, user, date and time, and a summary for
4958 each commit. When the -v/--verbose switch is used, the list of
4958 each commit. When the -v/--verbose switch is used, the list of
4959 changed files and full commit message are shown.
4959 changed files and full commit message are shown.
4960
4960
4961 With --graph the revisions are shown as an ASCII art DAG with the most
4961 With --graph the revisions are shown as an ASCII art DAG with the most
4962 recent changeset at the top.
4962 recent changeset at the top.
4963 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
4963 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
4964 and '+' represents a fork where the changeset from the lines below is a
4964 and '+' represents a fork where the changeset from the lines below is a
4965 parent of the 'o' merge on the same line.
4965 parent of the 'o' merge on the same line.
4966
4966
4967 .. note::
4967 .. note::
4968
4968
4969 :hg:`log --patch` may generate unexpected diff output for merge
4969 :hg:`log --patch` may generate unexpected diff output for merge
4970 changesets, as it will only compare the merge changeset against
4970 changesets, as it will only compare the merge changeset against
4971 its first parent. Also, only files different from BOTH parents
4971 its first parent. Also, only files different from BOTH parents
4972 will appear in files:.
4972 will appear in files:.
4973
4973
4974 .. note::
4974 .. note::
4975
4975
4976 For performance reasons, :hg:`log FILE` may omit duplicate changes
4976 For performance reasons, :hg:`log FILE` may omit duplicate changes
4977 made on branches and will not show removals or mode changes. To
4977 made on branches and will not show removals or mode changes. To
4978 see all such changes, use the --removed switch.
4978 see all such changes, use the --removed switch.
4979
4979
4980 .. container:: verbose
4980 .. container:: verbose
4981
4981
4982 Some examples:
4982 Some examples:
4983
4983
4984 - changesets with full descriptions and file lists::
4984 - changesets with full descriptions and file lists::
4985
4985
4986 hg log -v
4986 hg log -v
4987
4987
4988 - changesets ancestral to the working directory::
4988 - changesets ancestral to the working directory::
4989
4989
4990 hg log -f
4990 hg log -f
4991
4991
4992 - last 10 commits on the current branch::
4992 - last 10 commits on the current branch::
4993
4993
4994 hg log -l 10 -b .
4994 hg log -l 10 -b .
4995
4995
4996 - changesets showing all modifications of a file, including removals::
4996 - changesets showing all modifications of a file, including removals::
4997
4997
4998 hg log --removed file.c
4998 hg log --removed file.c
4999
4999
5000 - all changesets that touch a directory, with diffs, excluding merges::
5000 - all changesets that touch a directory, with diffs, excluding merges::
5001
5001
5002 hg log -Mp lib/
5002 hg log -Mp lib/
5003
5003
5004 - all revision numbers that match a keyword::
5004 - all revision numbers that match a keyword::
5005
5005
5006 hg log -k bug --template "{rev}\\n"
5006 hg log -k bug --template "{rev}\\n"
5007
5007
5008 - the full hash identifier of the working directory parent::
5008 - the full hash identifier of the working directory parent::
5009
5009
5010 hg log -r . --template "{node}\\n"
5010 hg log -r . --template "{node}\\n"
5011
5011
5012 - list available log templates::
5012 - list available log templates::
5013
5013
5014 hg log -T list
5014 hg log -T list
5015
5015
5016 - check if a given changeset is included in a tagged release::
5016 - check if a given changeset is included in a tagged release::
5017
5017
5018 hg log -r "a21ccf and ancestor(1.9)"
5018 hg log -r "a21ccf and ancestor(1.9)"
5019
5019
5020 - find all changesets by some user in a date range::
5020 - find all changesets by some user in a date range::
5021
5021
5022 hg log -k alice -d "may 2008 to jul 2008"
5022 hg log -k alice -d "may 2008 to jul 2008"
5023
5023
5024 - summary of all changesets after the last tag::
5024 - summary of all changesets after the last tag::
5025
5025
5026 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5026 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5027
5027
5028 See :hg:`help dates` for a list of formats valid for -d/--date.
5028 See :hg:`help dates` for a list of formats valid for -d/--date.
5029
5029
5030 See :hg:`help revisions` and :hg:`help revsets` for more about
5030 See :hg:`help revisions` and :hg:`help revsets` for more about
5031 specifying revisions.
5031 specifying revisions.
5032
5032
5033 See :hg:`help templates` for more about pre-packaged styles and
5033 See :hg:`help templates` for more about pre-packaged styles and
5034 specifying custom templates.
5034 specifying custom templates.
5035
5035
5036 Returns 0 on success.
5036 Returns 0 on success.
5037
5037
5038 """
5038 """
5039 if opts.get('follow') and opts.get('rev'):
5039 if opts.get('follow') and opts.get('rev'):
5040 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5040 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5041 del opts['follow']
5041 del opts['follow']
5042
5042
5043 if opts.get('graph'):
5043 if opts.get('graph'):
5044 return cmdutil.graphlog(ui, repo, *pats, **opts)
5044 return cmdutil.graphlog(ui, repo, *pats, **opts)
5045
5045
5046 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5046 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5047 limit = cmdutil.loglimit(opts)
5047 limit = cmdutil.loglimit(opts)
5048 count = 0
5048 count = 0
5049
5049
5050 getrenamed = None
5050 getrenamed = None
5051 if opts.get('copies'):
5051 if opts.get('copies'):
5052 endrev = None
5052 endrev = None
5053 if opts.get('rev'):
5053 if opts.get('rev'):
5054 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5054 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5055 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5055 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5056
5056
5057 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5057 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5058 for rev in revs:
5058 for rev in revs:
5059 if count == limit:
5059 if count == limit:
5060 break
5060 break
5061 ctx = repo[rev]
5061 ctx = repo[rev]
5062 copies = None
5062 copies = None
5063 if getrenamed is not None and rev:
5063 if getrenamed is not None and rev:
5064 copies = []
5064 copies = []
5065 for fn in ctx.files():
5065 for fn in ctx.files():
5066 rename = getrenamed(fn, rev)
5066 rename = getrenamed(fn, rev)
5067 if rename:
5067 if rename:
5068 copies.append((fn, rename[0]))
5068 copies.append((fn, rename[0]))
5069 if filematcher:
5069 if filematcher:
5070 revmatchfn = filematcher(ctx.rev())
5070 revmatchfn = filematcher(ctx.rev())
5071 else:
5071 else:
5072 revmatchfn = None
5072 revmatchfn = None
5073 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5073 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5074 if displayer.flush(ctx):
5074 if displayer.flush(ctx):
5075 count += 1
5075 count += 1
5076
5076
5077 displayer.close()
5077 displayer.close()
5078
5078
5079 @command('manifest',
5079 @command('manifest',
5080 [('r', 'rev', '', _('revision to display'), _('REV')),
5080 [('r', 'rev', '', _('revision to display'), _('REV')),
5081 ('', 'all', False, _("list files from all revisions"))]
5081 ('', 'all', False, _("list files from all revisions"))]
5082 + formatteropts,
5082 + formatteropts,
5083 _('[-r REV]'))
5083 _('[-r REV]'))
5084 def manifest(ui, repo, node=None, rev=None, **opts):
5084 def manifest(ui, repo, node=None, rev=None, **opts):
5085 """output the current or given revision of the project manifest
5085 """output the current or given revision of the project manifest
5086
5086
5087 Print a list of version controlled files for the given revision.
5087 Print a list of version controlled files for the given revision.
5088 If no revision is given, the first parent of the working directory
5088 If no revision is given, the first parent of the working directory
5089 is used, or the null revision if no revision is checked out.
5089 is used, or the null revision if no revision is checked out.
5090
5090
5091 With -v, print file permissions, symlink and executable bits.
5091 With -v, print file permissions, symlink and executable bits.
5092 With --debug, print file revision hashes.
5092 With --debug, print file revision hashes.
5093
5093
5094 If option --all is specified, the list of all files from all revisions
5094 If option --all is specified, the list of all files from all revisions
5095 is printed. This includes deleted and renamed files.
5095 is printed. This includes deleted and renamed files.
5096
5096
5097 Returns 0 on success.
5097 Returns 0 on success.
5098 """
5098 """
5099
5099
5100 fm = ui.formatter('manifest', opts)
5100 fm = ui.formatter('manifest', opts)
5101
5101
5102 if opts.get('all'):
5102 if opts.get('all'):
5103 if rev or node:
5103 if rev or node:
5104 raise error.Abort(_("can't specify a revision with --all"))
5104 raise error.Abort(_("can't specify a revision with --all"))
5105
5105
5106 res = []
5106 res = []
5107 prefix = "data/"
5107 prefix = "data/"
5108 suffix = ".i"
5108 suffix = ".i"
5109 plen = len(prefix)
5109 plen = len(prefix)
5110 slen = len(suffix)
5110 slen = len(suffix)
5111 lock = repo.lock()
5111 lock = repo.lock()
5112 try:
5112 try:
5113 for fn, b, size in repo.store.datafiles():
5113 for fn, b, size in repo.store.datafiles():
5114 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5114 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5115 res.append(fn[plen:-slen])
5115 res.append(fn[plen:-slen])
5116 finally:
5116 finally:
5117 lock.release()
5117 lock.release()
5118 for f in res:
5118 for f in res:
5119 fm.startitem()
5119 fm.startitem()
5120 fm.write("path", '%s\n', f)
5120 fm.write("path", '%s\n', f)
5121 fm.end()
5121 fm.end()
5122 return
5122 return
5123
5123
5124 if rev and node:
5124 if rev and node:
5125 raise error.Abort(_("please specify just one revision"))
5125 raise error.Abort(_("please specify just one revision"))
5126
5126
5127 if not node:
5127 if not node:
5128 node = rev
5128 node = rev
5129
5129
5130 char = {'l': '@', 'x': '*', '': ''}
5130 char = {'l': '@', 'x': '*', '': ''}
5131 mode = {'l': '644', 'x': '755', '': '644'}
5131 mode = {'l': '644', 'x': '755', '': '644'}
5132 ctx = scmutil.revsingle(repo, node)
5132 ctx = scmutil.revsingle(repo, node)
5133 mf = ctx.manifest()
5133 mf = ctx.manifest()
5134 for f in ctx:
5134 for f in ctx:
5135 fm.startitem()
5135 fm.startitem()
5136 fl = ctx[f].flags()
5136 fl = ctx[f].flags()
5137 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5137 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5138 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5138 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5139 fm.write('path', '%s\n', f)
5139 fm.write('path', '%s\n', f)
5140 fm.end()
5140 fm.end()
5141
5141
5142 @command('^merge',
5142 @command('^merge',
5143 [('f', 'force', None,
5143 [('f', 'force', None,
5144 _('force a merge including outstanding changes (DEPRECATED)')),
5144 _('force a merge including outstanding changes (DEPRECATED)')),
5145 ('r', 'rev', '', _('revision to merge'), _('REV')),
5145 ('r', 'rev', '', _('revision to merge'), _('REV')),
5146 ('P', 'preview', None,
5146 ('P', 'preview', None,
5147 _('review revisions to merge (no merge is performed)'))
5147 _('review revisions to merge (no merge is performed)'))
5148 ] + mergetoolopts,
5148 ] + mergetoolopts,
5149 _('[-P] [-f] [[-r] REV]'))
5149 _('[-P] [-f] [[-r] REV]'))
5150 def merge(ui, repo, node=None, **opts):
5150 def merge(ui, repo, node=None, **opts):
5151 """merge another revision into working directory
5151 """merge another revision into working directory
5152
5152
5153 The current working directory is updated with all changes made in
5153 The current working directory is updated with all changes made in
5154 the requested revision since the last common predecessor revision.
5154 the requested revision since the last common predecessor revision.
5155
5155
5156 Files that changed between either parent are marked as changed for
5156 Files that changed between either parent are marked as changed for
5157 the next commit and a commit must be performed before any further
5157 the next commit and a commit must be performed before any further
5158 updates to the repository are allowed. The next commit will have
5158 updates to the repository are allowed. The next commit will have
5159 two parents.
5159 two parents.
5160
5160
5161 ``--tool`` can be used to specify the merge tool used for file
5161 ``--tool`` can be used to specify the merge tool used for file
5162 merges. It overrides the HGMERGE environment variable and your
5162 merges. It overrides the HGMERGE environment variable and your
5163 configuration files. See :hg:`help merge-tools` for options.
5163 configuration files. See :hg:`help merge-tools` for options.
5164
5164
5165 If no revision is specified, the working directory's parent is a
5165 If no revision is specified, the working directory's parent is a
5166 head revision, and the current branch contains exactly one other
5166 head revision, and the current branch contains exactly one other
5167 head, the other head is merged with by default. Otherwise, an
5167 head, the other head is merged with by default. Otherwise, an
5168 explicit revision with which to merge with must be provided.
5168 explicit revision with which to merge with must be provided.
5169
5169
5170 See :hg:`help resolve` for information on handling file conflicts.
5170 See :hg:`help resolve` for information on handling file conflicts.
5171
5171
5172 To undo an uncommitted merge, use :hg:`update --clean .` which
5172 To undo an uncommitted merge, use :hg:`update --clean .` which
5173 will check out a clean copy of the original merge parent, losing
5173 will check out a clean copy of the original merge parent, losing
5174 all changes.
5174 all changes.
5175
5175
5176 Returns 0 on success, 1 if there are unresolved files.
5176 Returns 0 on success, 1 if there are unresolved files.
5177 """
5177 """
5178
5178
5179 if opts.get('rev') and node:
5179 if opts.get('rev') and node:
5180 raise error.Abort(_("please specify just one revision"))
5180 raise error.Abort(_("please specify just one revision"))
5181 if not node:
5181 if not node:
5182 node = opts.get('rev')
5182 node = opts.get('rev')
5183
5183
5184 if node:
5184 if node:
5185 node = scmutil.revsingle(repo, node).node()
5185 node = scmutil.revsingle(repo, node).node()
5186
5186
5187 if not node:
5187 if not node:
5188 node = repo[destutil.destmerge(repo)].node()
5188 node = repo[destutil.destmerge(repo)].node()
5189
5189
5190 if opts.get('preview'):
5190 if opts.get('preview'):
5191 # find nodes that are ancestors of p2 but not of p1
5191 # find nodes that are ancestors of p2 but not of p1
5192 p1 = repo.lookup('.')
5192 p1 = repo.lookup('.')
5193 p2 = repo.lookup(node)
5193 p2 = repo.lookup(node)
5194 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5194 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5195
5195
5196 displayer = cmdutil.show_changeset(ui, repo, opts)
5196 displayer = cmdutil.show_changeset(ui, repo, opts)
5197 for node in nodes:
5197 for node in nodes:
5198 displayer.show(repo[node])
5198 displayer.show(repo[node])
5199 displayer.close()
5199 displayer.close()
5200 return 0
5200 return 0
5201
5201
5202 try:
5202 try:
5203 # ui.forcemerge is an internal variable, do not document
5203 # ui.forcemerge is an internal variable, do not document
5204 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5204 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5205 return hg.merge(repo, node, force=opts.get('force'))
5205 return hg.merge(repo, node, force=opts.get('force'))
5206 finally:
5206 finally:
5207 ui.setconfig('ui', 'forcemerge', '', 'merge')
5207 ui.setconfig('ui', 'forcemerge', '', 'merge')
5208
5208
5209 @command('outgoing|out',
5209 @command('outgoing|out',
5210 [('f', 'force', None, _('run even when the destination is unrelated')),
5210 [('f', 'force', None, _('run even when the destination is unrelated')),
5211 ('r', 'rev', [],
5211 ('r', 'rev', [],
5212 _('a changeset intended to be included in the destination'), _('REV')),
5212 _('a changeset intended to be included in the destination'), _('REV')),
5213 ('n', 'newest-first', None, _('show newest record first')),
5213 ('n', 'newest-first', None, _('show newest record first')),
5214 ('B', 'bookmarks', False, _('compare bookmarks')),
5214 ('B', 'bookmarks', False, _('compare bookmarks')),
5215 ('b', 'branch', [], _('a specific branch you would like to push'),
5215 ('b', 'branch', [], _('a specific branch you would like to push'),
5216 _('BRANCH')),
5216 _('BRANCH')),
5217 ] + logopts + remoteopts + subrepoopts,
5217 ] + logopts + remoteopts + subrepoopts,
5218 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5218 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5219 def outgoing(ui, repo, dest=None, **opts):
5219 def outgoing(ui, repo, dest=None, **opts):
5220 """show changesets not found in the destination
5220 """show changesets not found in the destination
5221
5221
5222 Show changesets not found in the specified destination repository
5222 Show changesets not found in the specified destination repository
5223 or the default push location. These are the changesets that would
5223 or the default push location. These are the changesets that would
5224 be pushed if a push was requested.
5224 be pushed if a push was requested.
5225
5225
5226 See pull for details of valid destination formats.
5226 See pull for details of valid destination formats.
5227
5227
5228 .. container:: verbose
5228 .. container:: verbose
5229
5229
5230 With -B/--bookmarks, the result of bookmark comparison between
5230 With -B/--bookmarks, the result of bookmark comparison between
5231 local and remote repositories is displayed. With -v/--verbose,
5231 local and remote repositories is displayed. With -v/--verbose,
5232 status is also displayed for each bookmark like below::
5232 status is also displayed for each bookmark like below::
5233
5233
5234 BM1 01234567890a added
5234 BM1 01234567890a added
5235 BM2 deleted
5235 BM2 deleted
5236 BM3 234567890abc advanced
5236 BM3 234567890abc advanced
5237 BM4 34567890abcd diverged
5237 BM4 34567890abcd diverged
5238 BM5 4567890abcde changed
5238 BM5 4567890abcde changed
5239
5239
5240 The action taken when pushing depends on the
5240 The action taken when pushing depends on the
5241 status of each bookmark:
5241 status of each bookmark:
5242
5242
5243 :``added``: push with ``-B`` will create it
5243 :``added``: push with ``-B`` will create it
5244 :``deleted``: push with ``-B`` will delete it
5244 :``deleted``: push with ``-B`` will delete it
5245 :``advanced``: push will update it
5245 :``advanced``: push will update it
5246 :``diverged``: push with ``-B`` will update it
5246 :``diverged``: push with ``-B`` will update it
5247 :``changed``: push with ``-B`` will update it
5247 :``changed``: push with ``-B`` will update it
5248
5248
5249 From the point of view of pushing behavior, bookmarks
5249 From the point of view of pushing behavior, bookmarks
5250 existing only in the remote repository are treated as
5250 existing only in the remote repository are treated as
5251 ``deleted``, even if it is in fact added remotely.
5251 ``deleted``, even if it is in fact added remotely.
5252
5252
5253 Returns 0 if there are outgoing changes, 1 otherwise.
5253 Returns 0 if there are outgoing changes, 1 otherwise.
5254 """
5254 """
5255 if opts.get('graph'):
5255 if opts.get('graph'):
5256 cmdutil.checkunsupportedgraphflags([], opts)
5256 cmdutil.checkunsupportedgraphflags([], opts)
5257 o, other = hg._outgoing(ui, repo, dest, opts)
5257 o, other = hg._outgoing(ui, repo, dest, opts)
5258 if not o:
5258 if not o:
5259 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5259 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5260 return
5260 return
5261
5261
5262 revdag = cmdutil.graphrevs(repo, o, opts)
5262 revdag = cmdutil.graphrevs(repo, o, opts)
5263 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5263 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5264 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5264 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5265 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5265 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5266 return 0
5266 return 0
5267
5267
5268 if opts.get('bookmarks'):
5268 if opts.get('bookmarks'):
5269 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5269 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5270 dest, branches = hg.parseurl(dest, opts.get('branch'))
5270 dest, branches = hg.parseurl(dest, opts.get('branch'))
5271 other = hg.peer(repo, opts, dest)
5271 other = hg.peer(repo, opts, dest)
5272 if 'bookmarks' not in other.listkeys('namespaces'):
5272 if 'bookmarks' not in other.listkeys('namespaces'):
5273 ui.warn(_("remote doesn't support bookmarks\n"))
5273 ui.warn(_("remote doesn't support bookmarks\n"))
5274 return 0
5274 return 0
5275 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5275 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5276 return bookmarks.outgoing(ui, repo, other)
5276 return bookmarks.outgoing(ui, repo, other)
5277
5277
5278 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5278 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5279 try:
5279 try:
5280 return hg.outgoing(ui, repo, dest, opts)
5280 return hg.outgoing(ui, repo, dest, opts)
5281 finally:
5281 finally:
5282 del repo._subtoppath
5282 del repo._subtoppath
5283
5283
5284 @command('parents',
5284 @command('parents',
5285 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5285 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5286 ] + templateopts,
5286 ] + templateopts,
5287 _('[-r REV] [FILE]'),
5287 _('[-r REV] [FILE]'),
5288 inferrepo=True)
5288 inferrepo=True)
5289 def parents(ui, repo, file_=None, **opts):
5289 def parents(ui, repo, file_=None, **opts):
5290 """show the parents of the working directory or revision (DEPRECATED)
5290 """show the parents of the working directory or revision (DEPRECATED)
5291
5291
5292 Print the working directory's parent revisions. If a revision is
5292 Print the working directory's parent revisions. If a revision is
5293 given via -r/--rev, the parent of that revision will be printed.
5293 given via -r/--rev, the parent of that revision will be printed.
5294 If a file argument is given, the revision in which the file was
5294 If a file argument is given, the revision in which the file was
5295 last changed (before the working directory revision or the
5295 last changed (before the working directory revision or the
5296 argument to --rev if given) is printed.
5296 argument to --rev if given) is printed.
5297
5297
5298 This command is equivalent to::
5298 This command is equivalent to::
5299
5299
5300 hg log -r "parents()" or
5300 hg log -r "parents()" or
5301 hg log -r "parents(REV)" or
5301 hg log -r "parents(REV)" or
5302 hg log -r "max(file(FILE))" or
5302 hg log -r "max(file(FILE))" or
5303 hg log -r "max(::REV and file(FILE))"
5303 hg log -r "max(::REV and file(FILE))"
5304
5304
5305 See :hg:`summary` and :hg:`help revsets` for related information.
5305 See :hg:`summary` and :hg:`help revsets` for related information.
5306
5306
5307 Returns 0 on success.
5307 Returns 0 on success.
5308 """
5308 """
5309
5309
5310 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5310 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5311
5311
5312 if file_:
5312 if file_:
5313 m = scmutil.match(ctx, (file_,), opts)
5313 m = scmutil.match(ctx, (file_,), opts)
5314 if m.anypats() or len(m.files()) != 1:
5314 if m.anypats() or len(m.files()) != 1:
5315 raise error.Abort(_('can only specify an explicit filename'))
5315 raise error.Abort(_('can only specify an explicit filename'))
5316 file_ = m.files()[0]
5316 file_ = m.files()[0]
5317 filenodes = []
5317 filenodes = []
5318 for cp in ctx.parents():
5318 for cp in ctx.parents():
5319 if not cp:
5319 if not cp:
5320 continue
5320 continue
5321 try:
5321 try:
5322 filenodes.append(cp.filenode(file_))
5322 filenodes.append(cp.filenode(file_))
5323 except error.LookupError:
5323 except error.LookupError:
5324 pass
5324 pass
5325 if not filenodes:
5325 if not filenodes:
5326 raise error.Abort(_("'%s' not found in manifest!") % file_)
5326 raise error.Abort(_("'%s' not found in manifest!") % file_)
5327 p = []
5327 p = []
5328 for fn in filenodes:
5328 for fn in filenodes:
5329 fctx = repo.filectx(file_, fileid=fn)
5329 fctx = repo.filectx(file_, fileid=fn)
5330 p.append(fctx.node())
5330 p.append(fctx.node())
5331 else:
5331 else:
5332 p = [cp.node() for cp in ctx.parents()]
5332 p = [cp.node() for cp in ctx.parents()]
5333
5333
5334 displayer = cmdutil.show_changeset(ui, repo, opts)
5334 displayer = cmdutil.show_changeset(ui, repo, opts)
5335 for n in p:
5335 for n in p:
5336 if n != nullid:
5336 if n != nullid:
5337 displayer.show(repo[n])
5337 displayer.show(repo[n])
5338 displayer.close()
5338 displayer.close()
5339
5339
5340 @command('paths', [], _('[NAME]'), optionalrepo=True)
5340 @command('paths', [], _('[NAME]'), optionalrepo=True)
5341 def paths(ui, repo, search=None):
5341 def paths(ui, repo, search=None):
5342 """show aliases for remote repositories
5342 """show aliases for remote repositories
5343
5343
5344 Show definition of symbolic path name NAME. If no name is given,
5344 Show definition of symbolic path name NAME. If no name is given,
5345 show definition of all available names.
5345 show definition of all available names.
5346
5346
5347 Option -q/--quiet suppresses all output when searching for NAME
5347 Option -q/--quiet suppresses all output when searching for NAME
5348 and shows only the path names when listing all definitions.
5348 and shows only the path names when listing all definitions.
5349
5349
5350 Path names are defined in the [paths] section of your
5350 Path names are defined in the [paths] section of your
5351 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5351 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5352 repository, ``.hg/hgrc`` is used, too.
5352 repository, ``.hg/hgrc`` is used, too.
5353
5353
5354 The path names ``default`` and ``default-push`` have a special
5354 The path names ``default`` and ``default-push`` have a special
5355 meaning. When performing a push or pull operation, they are used
5355 meaning. When performing a push or pull operation, they are used
5356 as fallbacks if no location is specified on the command-line.
5356 as fallbacks if no location is specified on the command-line.
5357 When ``default-push`` is set, it will be used for push and
5357 When ``default-push`` is set, it will be used for push and
5358 ``default`` will be used for pull; otherwise ``default`` is used
5358 ``default`` will be used for pull; otherwise ``default`` is used
5359 as the fallback for both. When cloning a repository, the clone
5359 as the fallback for both. When cloning a repository, the clone
5360 source is written as ``default`` in ``.hg/hgrc``. Note that
5360 source is written as ``default`` in ``.hg/hgrc``. Note that
5361 ``default`` and ``default-push`` apply to all inbound (e.g.
5361 ``default`` and ``default-push`` apply to all inbound (e.g.
5362 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
5362 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
5363 :hg:`bundle`) operations.
5363 :hg:`bundle`) operations.
5364
5364
5365 See :hg:`help urls` for more information.
5365 See :hg:`help urls` for more information.
5366
5366
5367 Returns 0 on success.
5367 Returns 0 on success.
5368 """
5368 """
5369 if search:
5369 if search:
5370 for name, path in sorted(ui.paths.iteritems()):
5370 for name, path in sorted(ui.paths.iteritems()):
5371 if name == search:
5371 if name == search:
5372 ui.status("%s\n" % util.hidepassword(path.rawloc))
5372 ui.status("%s\n" % util.hidepassword(path.rawloc))
5373 return
5373 return
5374 if not ui.quiet:
5374 if not ui.quiet:
5375 ui.warn(_("not found!\n"))
5375 ui.warn(_("not found!\n"))
5376 return 1
5376 return 1
5377 else:
5377 else:
5378 for name, path in sorted(ui.paths.iteritems()):
5378 for name, path in sorted(ui.paths.iteritems()):
5379 if ui.quiet:
5379 if ui.quiet:
5380 ui.write("%s\n" % name)
5380 ui.write("%s\n" % name)
5381 else:
5381 else:
5382 ui.write("%s = %s\n" % (name,
5382 ui.write("%s = %s\n" % (name,
5383 util.hidepassword(path.rawloc)))
5383 util.hidepassword(path.rawloc)))
5384 for subopt, value in sorted(path.suboptions.items()):
5384 for subopt, value in sorted(path.suboptions.items()):
5385 ui.write('%s:%s = %s\n' % (name, subopt, value))
5385 ui.write('%s:%s = %s\n' % (name, subopt, value))
5386
5386
5387 @command('phase',
5387 @command('phase',
5388 [('p', 'public', False, _('set changeset phase to public')),
5388 [('p', 'public', False, _('set changeset phase to public')),
5389 ('d', 'draft', False, _('set changeset phase to draft')),
5389 ('d', 'draft', False, _('set changeset phase to draft')),
5390 ('s', 'secret', False, _('set changeset phase to secret')),
5390 ('s', 'secret', False, _('set changeset phase to secret')),
5391 ('f', 'force', False, _('allow to move boundary backward')),
5391 ('f', 'force', False, _('allow to move boundary backward')),
5392 ('r', 'rev', [], _('target revision'), _('REV')),
5392 ('r', 'rev', [], _('target revision'), _('REV')),
5393 ],
5393 ],
5394 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5394 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5395 def phase(ui, repo, *revs, **opts):
5395 def phase(ui, repo, *revs, **opts):
5396 """set or show the current phase name
5396 """set or show the current phase name
5397
5397
5398 With no argument, show the phase name of the current revision(s).
5398 With no argument, show the phase name of the current revision(s).
5399
5399
5400 With one of -p/--public, -d/--draft or -s/--secret, change the
5400 With one of -p/--public, -d/--draft or -s/--secret, change the
5401 phase value of the specified revisions.
5401 phase value of the specified revisions.
5402
5402
5403 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5403 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5404 lower phase to an higher phase. Phases are ordered as follows::
5404 lower phase to an higher phase. Phases are ordered as follows::
5405
5405
5406 public < draft < secret
5406 public < draft < secret
5407
5407
5408 Returns 0 on success, 1 if some phases could not be changed.
5408 Returns 0 on success, 1 if some phases could not be changed.
5409
5409
5410 (For more information about the phases concept, see :hg:`help phases`.)
5410 (For more information about the phases concept, see :hg:`help phases`.)
5411 """
5411 """
5412 # search for a unique phase argument
5412 # search for a unique phase argument
5413 targetphase = None
5413 targetphase = None
5414 for idx, name in enumerate(phases.phasenames):
5414 for idx, name in enumerate(phases.phasenames):
5415 if opts[name]:
5415 if opts[name]:
5416 if targetphase is not None:
5416 if targetphase is not None:
5417 raise error.Abort(_('only one phase can be specified'))
5417 raise error.Abort(_('only one phase can be specified'))
5418 targetphase = idx
5418 targetphase = idx
5419
5419
5420 # look for specified revision
5420 # look for specified revision
5421 revs = list(revs)
5421 revs = list(revs)
5422 revs.extend(opts['rev'])
5422 revs.extend(opts['rev'])
5423 if not revs:
5423 if not revs:
5424 # display both parents as the second parent phase can influence
5424 # display both parents as the second parent phase can influence
5425 # the phase of a merge commit
5425 # the phase of a merge commit
5426 revs = [c.rev() for c in repo[None].parents()]
5426 revs = [c.rev() for c in repo[None].parents()]
5427
5427
5428 revs = scmutil.revrange(repo, revs)
5428 revs = scmutil.revrange(repo, revs)
5429
5429
5430 lock = None
5430 lock = None
5431 ret = 0
5431 ret = 0
5432 if targetphase is None:
5432 if targetphase is None:
5433 # display
5433 # display
5434 for r in revs:
5434 for r in revs:
5435 ctx = repo[r]
5435 ctx = repo[r]
5436 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5436 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5437 else:
5437 else:
5438 tr = None
5438 tr = None
5439 lock = repo.lock()
5439 lock = repo.lock()
5440 try:
5440 try:
5441 tr = repo.transaction("phase")
5441 tr = repo.transaction("phase")
5442 # set phase
5442 # set phase
5443 if not revs:
5443 if not revs:
5444 raise error.Abort(_('empty revision set'))
5444 raise error.Abort(_('empty revision set'))
5445 nodes = [repo[r].node() for r in revs]
5445 nodes = [repo[r].node() for r in revs]
5446 # moving revision from public to draft may hide them
5446 # moving revision from public to draft may hide them
5447 # We have to check result on an unfiltered repository
5447 # We have to check result on an unfiltered repository
5448 unfi = repo.unfiltered()
5448 unfi = repo.unfiltered()
5449 getphase = unfi._phasecache.phase
5449 getphase = unfi._phasecache.phase
5450 olddata = [getphase(unfi, r) for r in unfi]
5450 olddata = [getphase(unfi, r) for r in unfi]
5451 phases.advanceboundary(repo, tr, targetphase, nodes)
5451 phases.advanceboundary(repo, tr, targetphase, nodes)
5452 if opts['force']:
5452 if opts['force']:
5453 phases.retractboundary(repo, tr, targetphase, nodes)
5453 phases.retractboundary(repo, tr, targetphase, nodes)
5454 tr.close()
5454 tr.close()
5455 finally:
5455 finally:
5456 if tr is not None:
5456 if tr is not None:
5457 tr.release()
5457 tr.release()
5458 lock.release()
5458 lock.release()
5459 getphase = unfi._phasecache.phase
5459 getphase = unfi._phasecache.phase
5460 newdata = [getphase(unfi, r) for r in unfi]
5460 newdata = [getphase(unfi, r) for r in unfi]
5461 changes = sum(newdata[r] != olddata[r] for r in unfi)
5461 changes = sum(newdata[r] != olddata[r] for r in unfi)
5462 cl = unfi.changelog
5462 cl = unfi.changelog
5463 rejected = [n for n in nodes
5463 rejected = [n for n in nodes
5464 if newdata[cl.rev(n)] < targetphase]
5464 if newdata[cl.rev(n)] < targetphase]
5465 if rejected:
5465 if rejected:
5466 ui.warn(_('cannot move %i changesets to a higher '
5466 ui.warn(_('cannot move %i changesets to a higher '
5467 'phase, use --force\n') % len(rejected))
5467 'phase, use --force\n') % len(rejected))
5468 ret = 1
5468 ret = 1
5469 if changes:
5469 if changes:
5470 msg = _('phase changed for %i changesets\n') % changes
5470 msg = _('phase changed for %i changesets\n') % changes
5471 if ret:
5471 if ret:
5472 ui.status(msg)
5472 ui.status(msg)
5473 else:
5473 else:
5474 ui.note(msg)
5474 ui.note(msg)
5475 else:
5475 else:
5476 ui.warn(_('no phases changed\n'))
5476 ui.warn(_('no phases changed\n'))
5477 return ret
5477 return ret
5478
5478
5479 def postincoming(ui, repo, modheads, optupdate, checkout):
5479 def postincoming(ui, repo, modheads, optupdate, checkout):
5480 if modheads == 0:
5480 if modheads == 0:
5481 return
5481 return
5482 if optupdate:
5482 if optupdate:
5483 try:
5483 try:
5484 brev = checkout
5484 brev = checkout
5485 movemarkfrom = None
5485 movemarkfrom = None
5486 if not checkout:
5486 if not checkout:
5487 updata = destutil.destupdate(repo)
5487 updata = destutil.destupdate(repo)
5488 checkout, movemarkfrom, brev = updata
5488 checkout, movemarkfrom, brev = updata
5489 ret = hg.update(repo, checkout)
5489 ret = hg.update(repo, checkout)
5490 except error.UpdateAbort as inst:
5490 except error.UpdateAbort as inst:
5491 msg = _("not updating: %s") % str(inst)
5491 msg = _("not updating: %s") % str(inst)
5492 hint = inst.hint
5492 hint = inst.hint
5493 raise error.UpdateAbort(msg, hint=hint)
5493 raise error.UpdateAbort(msg, hint=hint)
5494 if not ret and not checkout:
5494 if not ret and not checkout:
5495 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5495 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5496 ui.status(_("updating bookmark %s\n") % repo._activebookmark)
5496 ui.status(_("updating bookmark %s\n") % repo._activebookmark)
5497 return ret
5497 return ret
5498 if modheads > 1:
5498 if modheads > 1:
5499 currentbranchheads = len(repo.branchheads())
5499 currentbranchheads = len(repo.branchheads())
5500 if currentbranchheads == modheads:
5500 if currentbranchheads == modheads:
5501 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5501 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5502 elif currentbranchheads > 1:
5502 elif currentbranchheads > 1:
5503 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5503 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5504 "merge)\n"))
5504 "merge)\n"))
5505 else:
5505 else:
5506 ui.status(_("(run 'hg heads' to see heads)\n"))
5506 ui.status(_("(run 'hg heads' to see heads)\n"))
5507 else:
5507 else:
5508 ui.status(_("(run 'hg update' to get a working copy)\n"))
5508 ui.status(_("(run 'hg update' to get a working copy)\n"))
5509
5509
5510 @command('^pull',
5510 @command('^pull',
5511 [('u', 'update', None,
5511 [('u', 'update', None,
5512 _('update to new branch head if changesets were pulled')),
5512 _('update to new branch head if changesets were pulled')),
5513 ('f', 'force', None, _('run even when remote repository is unrelated')),
5513 ('f', 'force', None, _('run even when remote repository is unrelated')),
5514 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5514 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5515 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5515 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5516 ('b', 'branch', [], _('a specific branch you would like to pull'),
5516 ('b', 'branch', [], _('a specific branch you would like to pull'),
5517 _('BRANCH')),
5517 _('BRANCH')),
5518 ] + remoteopts,
5518 ] + remoteopts,
5519 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5519 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5520 def pull(ui, repo, source="default", **opts):
5520 def pull(ui, repo, source="default", **opts):
5521 """pull changes from the specified source
5521 """pull changes from the specified source
5522
5522
5523 Pull changes from a remote repository to a local one.
5523 Pull changes from a remote repository to a local one.
5524
5524
5525 This finds all changes from the repository at the specified path
5525 This finds all changes from the repository at the specified path
5526 or URL and adds them to a local repository (the current one unless
5526 or URL and adds them to a local repository (the current one unless
5527 -R is specified). By default, this does not update the copy of the
5527 -R is specified). By default, this does not update the copy of the
5528 project in the working directory.
5528 project in the working directory.
5529
5529
5530 Use :hg:`incoming` if you want to see what would have been added
5530 Use :hg:`incoming` if you want to see what would have been added
5531 by a pull at the time you issued this command. If you then decide
5531 by a pull at the time you issued this command. If you then decide
5532 to add those changes to the repository, you should use :hg:`pull
5532 to add those changes to the repository, you should use :hg:`pull
5533 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5533 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5534
5534
5535 If SOURCE is omitted, the 'default' path will be used.
5535 If SOURCE is omitted, the 'default' path will be used.
5536 See :hg:`help urls` for more information.
5536 See :hg:`help urls` for more information.
5537
5537
5538 Returns 0 on success, 1 if an update had unresolved files.
5538 Returns 0 on success, 1 if an update had unresolved files.
5539 """
5539 """
5540 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5540 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5541 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5541 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5542 other = hg.peer(repo, opts, source)
5542 other = hg.peer(repo, opts, source)
5543 try:
5543 try:
5544 revs, checkout = hg.addbranchrevs(repo, other, branches,
5544 revs, checkout = hg.addbranchrevs(repo, other, branches,
5545 opts.get('rev'))
5545 opts.get('rev'))
5546
5546
5547
5547
5548 pullopargs = {}
5548 pullopargs = {}
5549 if opts.get('bookmark'):
5549 if opts.get('bookmark'):
5550 if not revs:
5550 if not revs:
5551 revs = []
5551 revs = []
5552 # The list of bookmark used here is not the one used to actually
5552 # The list of bookmark used here is not the one used to actually
5553 # update the bookmark name. This can result in the revision pulled
5553 # update the bookmark name. This can result in the revision pulled
5554 # not ending up with the name of the bookmark because of a race
5554 # not ending up with the name of the bookmark because of a race
5555 # condition on the server. (See issue 4689 for details)
5555 # condition on the server. (See issue 4689 for details)
5556 remotebookmarks = other.listkeys('bookmarks')
5556 remotebookmarks = other.listkeys('bookmarks')
5557 pullopargs['remotebookmarks'] = remotebookmarks
5557 pullopargs['remotebookmarks'] = remotebookmarks
5558 for b in opts['bookmark']:
5558 for b in opts['bookmark']:
5559 if b not in remotebookmarks:
5559 if b not in remotebookmarks:
5560 raise error.Abort(_('remote bookmark %s not found!') % b)
5560 raise error.Abort(_('remote bookmark %s not found!') % b)
5561 revs.append(remotebookmarks[b])
5561 revs.append(remotebookmarks[b])
5562
5562
5563 if revs:
5563 if revs:
5564 try:
5564 try:
5565 # When 'rev' is a bookmark name, we cannot guarantee that it
5565 # When 'rev' is a bookmark name, we cannot guarantee that it
5566 # will be updated with that name because of a race condition
5566 # will be updated with that name because of a race condition
5567 # server side. (See issue 4689 for details)
5567 # server side. (See issue 4689 for details)
5568 oldrevs = revs
5568 oldrevs = revs
5569 revs = [] # actually, nodes
5569 revs = [] # actually, nodes
5570 for r in oldrevs:
5570 for r in oldrevs:
5571 node = other.lookup(r)
5571 node = other.lookup(r)
5572 revs.append(node)
5572 revs.append(node)
5573 if r == checkout:
5573 if r == checkout:
5574 checkout = node
5574 checkout = node
5575 except error.CapabilityError:
5575 except error.CapabilityError:
5576 err = _("other repository doesn't support revision lookup, "
5576 err = _("other repository doesn't support revision lookup, "
5577 "so a rev cannot be specified.")
5577 "so a rev cannot be specified.")
5578 raise error.Abort(err)
5578 raise error.Abort(err)
5579
5579
5580 pullopargs.update(opts.get('opargs', {}))
5580 pullopargs.update(opts.get('opargs', {}))
5581 modheads = exchange.pull(repo, other, heads=revs,
5581 modheads = exchange.pull(repo, other, heads=revs,
5582 force=opts.get('force'),
5582 force=opts.get('force'),
5583 bookmarks=opts.get('bookmark', ()),
5583 bookmarks=opts.get('bookmark', ()),
5584 opargs=pullopargs).cgresult
5584 opargs=pullopargs).cgresult
5585 if checkout:
5585 if checkout:
5586 checkout = str(repo.changelog.rev(checkout))
5586 checkout = str(repo.changelog.rev(checkout))
5587 repo._subtoppath = source
5587 repo._subtoppath = source
5588 try:
5588 try:
5589 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
5589 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
5590
5590
5591 finally:
5591 finally:
5592 del repo._subtoppath
5592 del repo._subtoppath
5593
5593
5594 finally:
5594 finally:
5595 other.close()
5595 other.close()
5596 return ret
5596 return ret
5597
5597
5598 @command('^push',
5598 @command('^push',
5599 [('f', 'force', None, _('force push')),
5599 [('f', 'force', None, _('force push')),
5600 ('r', 'rev', [],
5600 ('r', 'rev', [],
5601 _('a changeset intended to be included in the destination'),
5601 _('a changeset intended to be included in the destination'),
5602 _('REV')),
5602 _('REV')),
5603 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5603 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5604 ('b', 'branch', [],
5604 ('b', 'branch', [],
5605 _('a specific branch you would like to push'), _('BRANCH')),
5605 _('a specific branch you would like to push'), _('BRANCH')),
5606 ('', 'new-branch', False, _('allow pushing a new branch')),
5606 ('', 'new-branch', False, _('allow pushing a new branch')),
5607 ] + remoteopts,
5607 ] + remoteopts,
5608 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5608 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5609 def push(ui, repo, dest=None, **opts):
5609 def push(ui, repo, dest=None, **opts):
5610 """push changes to the specified destination
5610 """push changes to the specified destination
5611
5611
5612 Push changesets from the local repository to the specified
5612 Push changesets from the local repository to the specified
5613 destination.
5613 destination.
5614
5614
5615 This operation is symmetrical to pull: it is identical to a pull
5615 This operation is symmetrical to pull: it is identical to a pull
5616 in the destination repository from the current one.
5616 in the destination repository from the current one.
5617
5617
5618 By default, push will not allow creation of new heads at the
5618 By default, push will not allow creation of new heads at the
5619 destination, since multiple heads would make it unclear which head
5619 destination, since multiple heads would make it unclear which head
5620 to use. In this situation, it is recommended to pull and merge
5620 to use. In this situation, it is recommended to pull and merge
5621 before pushing.
5621 before pushing.
5622
5622
5623 Use --new-branch if you want to allow push to create a new named
5623 Use --new-branch if you want to allow push to create a new named
5624 branch that is not present at the destination. This allows you to
5624 branch that is not present at the destination. This allows you to
5625 only create a new branch without forcing other changes.
5625 only create a new branch without forcing other changes.
5626
5626
5627 .. note::
5627 .. note::
5628
5628
5629 Extra care should be taken with the -f/--force option,
5629 Extra care should be taken with the -f/--force option,
5630 which will push all new heads on all branches, an action which will
5630 which will push all new heads on all branches, an action which will
5631 almost always cause confusion for collaborators.
5631 almost always cause confusion for collaborators.
5632
5632
5633 If -r/--rev is used, the specified revision and all its ancestors
5633 If -r/--rev is used, the specified revision and all its ancestors
5634 will be pushed to the remote repository.
5634 will be pushed to the remote repository.
5635
5635
5636 If -B/--bookmark is used, the specified bookmarked revision, its
5636 If -B/--bookmark is used, the specified bookmarked revision, its
5637 ancestors, and the bookmark will be pushed to the remote
5637 ancestors, and the bookmark will be pushed to the remote
5638 repository.
5638 repository.
5639
5639
5640 Please see :hg:`help urls` for important details about ``ssh://``
5640 Please see :hg:`help urls` for important details about ``ssh://``
5641 URLs. If DESTINATION is omitted, a default path will be used.
5641 URLs. If DESTINATION is omitted, a default path will be used.
5642
5642
5643 Returns 0 if push was successful, 1 if nothing to push.
5643 Returns 0 if push was successful, 1 if nothing to push.
5644 """
5644 """
5645
5645
5646 if opts.get('bookmark'):
5646 if opts.get('bookmark'):
5647 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5647 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5648 for b in opts['bookmark']:
5648 for b in opts['bookmark']:
5649 # translate -B options to -r so changesets get pushed
5649 # translate -B options to -r so changesets get pushed
5650 if b in repo._bookmarks:
5650 if b in repo._bookmarks:
5651 opts.setdefault('rev', []).append(b)
5651 opts.setdefault('rev', []).append(b)
5652 else:
5652 else:
5653 # if we try to push a deleted bookmark, translate it to null
5653 # if we try to push a deleted bookmark, translate it to null
5654 # this lets simultaneous -r, -b options continue working
5654 # this lets simultaneous -r, -b options continue working
5655 opts.setdefault('rev', []).append("null")
5655 opts.setdefault('rev', []).append("null")
5656
5656
5657 path = ui.paths.getpath(dest, default='default')
5657 path = ui.paths.getpath(dest, default='default')
5658 if not path:
5658 if not path:
5659 raise error.Abort(_('default repository not configured!'),
5659 raise error.Abort(_('default repository not configured!'),
5660 hint=_('see the "path" section in "hg help config"'))
5660 hint=_('see the "path" section in "hg help config"'))
5661 dest = path.pushloc or path.loc
5661 dest = path.pushloc or path.loc
5662 branches = (path.branch, opts.get('branch') or [])
5662 branches = (path.branch, opts.get('branch') or [])
5663 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5663 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5664 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5664 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5665 other = hg.peer(repo, opts, dest)
5665 other = hg.peer(repo, opts, dest)
5666
5666
5667 if revs:
5667 if revs:
5668 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5668 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5669 if not revs:
5669 if not revs:
5670 raise error.Abort(_("specified revisions evaluate to an empty set"),
5670 raise error.Abort(_("specified revisions evaluate to an empty set"),
5671 hint=_("use different revision arguments"))
5671 hint=_("use different revision arguments"))
5672
5672
5673 repo._subtoppath = dest
5673 repo._subtoppath = dest
5674 try:
5674 try:
5675 # push subrepos depth-first for coherent ordering
5675 # push subrepos depth-first for coherent ordering
5676 c = repo['']
5676 c = repo['']
5677 subs = c.substate # only repos that are committed
5677 subs = c.substate # only repos that are committed
5678 for s in sorted(subs):
5678 for s in sorted(subs):
5679 result = c.sub(s).push(opts)
5679 result = c.sub(s).push(opts)
5680 if result == 0:
5680 if result == 0:
5681 return not result
5681 return not result
5682 finally:
5682 finally:
5683 del repo._subtoppath
5683 del repo._subtoppath
5684 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5684 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5685 newbranch=opts.get('new_branch'),
5685 newbranch=opts.get('new_branch'),
5686 bookmarks=opts.get('bookmark', ()),
5686 bookmarks=opts.get('bookmark', ()),
5687 opargs=opts.get('opargs'))
5687 opargs=opts.get('opargs'))
5688
5688
5689 result = not pushop.cgresult
5689 result = not pushop.cgresult
5690
5690
5691 if pushop.bkresult is not None:
5691 if pushop.bkresult is not None:
5692 if pushop.bkresult == 2:
5692 if pushop.bkresult == 2:
5693 result = 2
5693 result = 2
5694 elif not result and pushop.bkresult:
5694 elif not result and pushop.bkresult:
5695 result = 2
5695 result = 2
5696
5696
5697 return result
5697 return result
5698
5698
5699 @command('recover', [])
5699 @command('recover', [])
5700 def recover(ui, repo):
5700 def recover(ui, repo):
5701 """roll back an interrupted transaction
5701 """roll back an interrupted transaction
5702
5702
5703 Recover from an interrupted commit or pull.
5703 Recover from an interrupted commit or pull.
5704
5704
5705 This command tries to fix the repository status after an
5705 This command tries to fix the repository status after an
5706 interrupted operation. It should only be necessary when Mercurial
5706 interrupted operation. It should only be necessary when Mercurial
5707 suggests it.
5707 suggests it.
5708
5708
5709 Returns 0 if successful, 1 if nothing to recover or verify fails.
5709 Returns 0 if successful, 1 if nothing to recover or verify fails.
5710 """
5710 """
5711 if repo.recover():
5711 if repo.recover():
5712 return hg.verify(repo)
5712 return hg.verify(repo)
5713 return 1
5713 return 1
5714
5714
5715 @command('^remove|rm',
5715 @command('^remove|rm',
5716 [('A', 'after', None, _('record delete for missing files')),
5716 [('A', 'after', None, _('record delete for missing files')),
5717 ('f', 'force', None,
5717 ('f', 'force', None,
5718 _('remove (and delete) file even if added or modified')),
5718 _('remove (and delete) file even if added or modified')),
5719 ] + subrepoopts + walkopts,
5719 ] + subrepoopts + walkopts,
5720 _('[OPTION]... FILE...'),
5720 _('[OPTION]... FILE...'),
5721 inferrepo=True)
5721 inferrepo=True)
5722 def remove(ui, repo, *pats, **opts):
5722 def remove(ui, repo, *pats, **opts):
5723 """remove the specified files on the next commit
5723 """remove the specified files on the next commit
5724
5724
5725 Schedule the indicated files for removal from the current branch.
5725 Schedule the indicated files for removal from the current branch.
5726
5726
5727 This command schedules the files to be removed at the next commit.
5727 This command schedules the files to be removed at the next commit.
5728 To undo a remove before that, see :hg:`revert`. To undo added
5728 To undo a remove before that, see :hg:`revert`. To undo added
5729 files, see :hg:`forget`.
5729 files, see :hg:`forget`.
5730
5730
5731 .. container:: verbose
5731 .. container:: verbose
5732
5732
5733 -A/--after can be used to remove only files that have already
5733 -A/--after can be used to remove only files that have already
5734 been deleted, -f/--force can be used to force deletion, and -Af
5734 been deleted, -f/--force can be used to force deletion, and -Af
5735 can be used to remove files from the next revision without
5735 can be used to remove files from the next revision without
5736 deleting them from the working directory.
5736 deleting them from the working directory.
5737
5737
5738 The following table details the behavior of remove for different
5738 The following table details the behavior of remove for different
5739 file states (columns) and option combinations (rows). The file
5739 file states (columns) and option combinations (rows). The file
5740 states are Added [A], Clean [C], Modified [M] and Missing [!]
5740 states are Added [A], Clean [C], Modified [M] and Missing [!]
5741 (as reported by :hg:`status`). The actions are Warn, Remove
5741 (as reported by :hg:`status`). The actions are Warn, Remove
5742 (from branch) and Delete (from disk):
5742 (from branch) and Delete (from disk):
5743
5743
5744 ========= == == == ==
5744 ========= == == == ==
5745 opt/state A C M !
5745 opt/state A C M !
5746 ========= == == == ==
5746 ========= == == == ==
5747 none W RD W R
5747 none W RD W R
5748 -f R RD RD R
5748 -f R RD RD R
5749 -A W W W R
5749 -A W W W R
5750 -Af R R R R
5750 -Af R R R R
5751 ========= == == == ==
5751 ========= == == == ==
5752
5752
5753 Note that remove never deletes files in Added [A] state from the
5753 .. note::
5754 working directory, not even if option --force is specified.
5754
5755 :hg:`remove` never deletes files in Added [A] state from the
5756 working directory, not even if ``--force`` is specified.
5755
5757
5756 Returns 0 on success, 1 if any warnings encountered.
5758 Returns 0 on success, 1 if any warnings encountered.
5757 """
5759 """
5758
5760
5759 after, force = opts.get('after'), opts.get('force')
5761 after, force = opts.get('after'), opts.get('force')
5760 if not pats and not after:
5762 if not pats and not after:
5761 raise error.Abort(_('no files specified'))
5763 raise error.Abort(_('no files specified'))
5762
5764
5763 m = scmutil.match(repo[None], pats, opts)
5765 m = scmutil.match(repo[None], pats, opts)
5764 subrepos = opts.get('subrepos')
5766 subrepos = opts.get('subrepos')
5765 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
5767 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
5766
5768
5767 @command('rename|move|mv',
5769 @command('rename|move|mv',
5768 [('A', 'after', None, _('record a rename that has already occurred')),
5770 [('A', 'after', None, _('record a rename that has already occurred')),
5769 ('f', 'force', None, _('forcibly copy over an existing managed file')),
5771 ('f', 'force', None, _('forcibly copy over an existing managed file')),
5770 ] + walkopts + dryrunopts,
5772 ] + walkopts + dryrunopts,
5771 _('[OPTION]... SOURCE... DEST'))
5773 _('[OPTION]... SOURCE... DEST'))
5772 def rename(ui, repo, *pats, **opts):
5774 def rename(ui, repo, *pats, **opts):
5773 """rename files; equivalent of copy + remove
5775 """rename files; equivalent of copy + remove
5774
5776
5775 Mark dest as copies of sources; mark sources for deletion. If dest
5777 Mark dest as copies of sources; mark sources for deletion. If dest
5776 is a directory, copies are put in that directory. If dest is a
5778 is a directory, copies are put in that directory. If dest is a
5777 file, there can only be one source.
5779 file, there can only be one source.
5778
5780
5779 By default, this command copies the contents of files as they
5781 By default, this command copies the contents of files as they
5780 exist in the working directory. If invoked with -A/--after, the
5782 exist in the working directory. If invoked with -A/--after, the
5781 operation is recorded, but no copying is performed.
5783 operation is recorded, but no copying is performed.
5782
5784
5783 This command takes effect at the next commit. To undo a rename
5785 This command takes effect at the next commit. To undo a rename
5784 before that, see :hg:`revert`.
5786 before that, see :hg:`revert`.
5785
5787
5786 Returns 0 on success, 1 if errors are encountered.
5788 Returns 0 on success, 1 if errors are encountered.
5787 """
5789 """
5788 wlock = repo.wlock(False)
5790 wlock = repo.wlock(False)
5789 try:
5791 try:
5790 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5792 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5791 finally:
5793 finally:
5792 wlock.release()
5794 wlock.release()
5793
5795
5794 @command('resolve',
5796 @command('resolve',
5795 [('a', 'all', None, _('select all unresolved files')),
5797 [('a', 'all', None, _('select all unresolved files')),
5796 ('l', 'list', None, _('list state of files needing merge')),
5798 ('l', 'list', None, _('list state of files needing merge')),
5797 ('m', 'mark', None, _('mark files as resolved')),
5799 ('m', 'mark', None, _('mark files as resolved')),
5798 ('u', 'unmark', None, _('mark files as unresolved')),
5800 ('u', 'unmark', None, _('mark files as unresolved')),
5799 ('n', 'no-status', None, _('hide status prefix'))]
5801 ('n', 'no-status', None, _('hide status prefix'))]
5800 + mergetoolopts + walkopts + formatteropts,
5802 + mergetoolopts + walkopts + formatteropts,
5801 _('[OPTION]... [FILE]...'),
5803 _('[OPTION]... [FILE]...'),
5802 inferrepo=True)
5804 inferrepo=True)
5803 def resolve(ui, repo, *pats, **opts):
5805 def resolve(ui, repo, *pats, **opts):
5804 """redo merges or set/view the merge status of files
5806 """redo merges or set/view the merge status of files
5805
5807
5806 Merges with unresolved conflicts are often the result of
5808 Merges with unresolved conflicts are often the result of
5807 non-interactive merging using the ``internal:merge`` configuration
5809 non-interactive merging using the ``internal:merge`` configuration
5808 setting, or a command-line merge tool like ``diff3``. The resolve
5810 setting, or a command-line merge tool like ``diff3``. The resolve
5809 command is used to manage the files involved in a merge, after
5811 command is used to manage the files involved in a merge, after
5810 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5812 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5811 working directory must have two parents). See :hg:`help
5813 working directory must have two parents). See :hg:`help
5812 merge-tools` for information on configuring merge tools.
5814 merge-tools` for information on configuring merge tools.
5813
5815
5814 The resolve command can be used in the following ways:
5816 The resolve command can be used in the following ways:
5815
5817
5816 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
5818 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
5817 files, discarding any previous merge attempts. Re-merging is not
5819 files, discarding any previous merge attempts. Re-merging is not
5818 performed for files already marked as resolved. Use ``--all/-a``
5820 performed for files already marked as resolved. Use ``--all/-a``
5819 to select all unresolved files. ``--tool`` can be used to specify
5821 to select all unresolved files. ``--tool`` can be used to specify
5820 the merge tool used for the given files. It overrides the HGMERGE
5822 the merge tool used for the given files. It overrides the HGMERGE
5821 environment variable and your configuration files. Previous file
5823 environment variable and your configuration files. Previous file
5822 contents are saved with a ``.orig`` suffix.
5824 contents are saved with a ``.orig`` suffix.
5823
5825
5824 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5826 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5825 (e.g. after having manually fixed-up the files). The default is
5827 (e.g. after having manually fixed-up the files). The default is
5826 to mark all unresolved files.
5828 to mark all unresolved files.
5827
5829
5828 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5830 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5829 default is to mark all resolved files.
5831 default is to mark all resolved files.
5830
5832
5831 - :hg:`resolve -l`: list files which had or still have conflicts.
5833 - :hg:`resolve -l`: list files which had or still have conflicts.
5832 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5834 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5833
5835
5834 Note that Mercurial will not let you commit files with unresolved
5836 Note that Mercurial will not let you commit files with unresolved
5835 merge conflicts. You must use :hg:`resolve -m ...` before you can
5837 merge conflicts. You must use :hg:`resolve -m ...` before you can
5836 commit after a conflicting merge.
5838 commit after a conflicting merge.
5837
5839
5838 Returns 0 on success, 1 if any files fail a resolve attempt.
5840 Returns 0 on success, 1 if any files fail a resolve attempt.
5839 """
5841 """
5840
5842
5841 all, mark, unmark, show, nostatus = \
5843 all, mark, unmark, show, nostatus = \
5842 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
5844 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
5843
5845
5844 if (show and (mark or unmark)) or (mark and unmark):
5846 if (show and (mark or unmark)) or (mark and unmark):
5845 raise error.Abort(_("too many options specified"))
5847 raise error.Abort(_("too many options specified"))
5846 if pats and all:
5848 if pats and all:
5847 raise error.Abort(_("can't specify --all and patterns"))
5849 raise error.Abort(_("can't specify --all and patterns"))
5848 if not (all or pats or show or mark or unmark):
5850 if not (all or pats or show or mark or unmark):
5849 raise error.Abort(_('no files or directories specified'),
5851 raise error.Abort(_('no files or directories specified'),
5850 hint=('use --all to re-merge all unresolved files'))
5852 hint=('use --all to re-merge all unresolved files'))
5851
5853
5852 if show:
5854 if show:
5853 fm = ui.formatter('resolve', opts)
5855 fm = ui.formatter('resolve', opts)
5854 ms = mergemod.mergestate.read(repo)
5856 ms = mergemod.mergestate.read(repo)
5855 m = scmutil.match(repo[None], pats, opts)
5857 m = scmutil.match(repo[None], pats, opts)
5856 for f in ms:
5858 for f in ms:
5857 if not m(f):
5859 if not m(f):
5858 continue
5860 continue
5859 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
5861 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
5860 'd': 'driverresolved'}[ms[f]]
5862 'd': 'driverresolved'}[ms[f]]
5861 fm.startitem()
5863 fm.startitem()
5862 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
5864 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
5863 fm.write('path', '%s\n', f, label=l)
5865 fm.write('path', '%s\n', f, label=l)
5864 fm.end()
5866 fm.end()
5865 return 0
5867 return 0
5866
5868
5867 wlock = repo.wlock()
5869 wlock = repo.wlock()
5868 try:
5870 try:
5869 ms = mergemod.mergestate.read(repo)
5871 ms = mergemod.mergestate.read(repo)
5870
5872
5871 if not (ms.active() or repo.dirstate.p2() != nullid):
5873 if not (ms.active() or repo.dirstate.p2() != nullid):
5872 raise error.Abort(
5874 raise error.Abort(
5873 _('resolve command not applicable when not merging'))
5875 _('resolve command not applicable when not merging'))
5874
5876
5875 wctx = repo[None]
5877 wctx = repo[None]
5876
5878
5877 if ms.mergedriver and ms.mdstate() == 'u':
5879 if ms.mergedriver and ms.mdstate() == 'u':
5878 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5880 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5879 ms.commit()
5881 ms.commit()
5880 # allow mark and unmark to go through
5882 # allow mark and unmark to go through
5881 if not mark and not unmark and not proceed:
5883 if not mark and not unmark and not proceed:
5882 return 1
5884 return 1
5883
5885
5884 m = scmutil.match(wctx, pats, opts)
5886 m = scmutil.match(wctx, pats, opts)
5885 ret = 0
5887 ret = 0
5886 didwork = False
5888 didwork = False
5887 runconclude = False
5889 runconclude = False
5888
5890
5889 tocomplete = []
5891 tocomplete = []
5890 for f in ms:
5892 for f in ms:
5891 if not m(f):
5893 if not m(f):
5892 continue
5894 continue
5893
5895
5894 didwork = True
5896 didwork = True
5895
5897
5896 # don't let driver-resolved files be marked, and run the conclude
5898 # don't let driver-resolved files be marked, and run the conclude
5897 # step if asked to resolve
5899 # step if asked to resolve
5898 if ms[f] == "d":
5900 if ms[f] == "d":
5899 exact = m.exact(f)
5901 exact = m.exact(f)
5900 if mark:
5902 if mark:
5901 if exact:
5903 if exact:
5902 ui.warn(_('not marking %s as it is driver-resolved\n')
5904 ui.warn(_('not marking %s as it is driver-resolved\n')
5903 % f)
5905 % f)
5904 elif unmark:
5906 elif unmark:
5905 if exact:
5907 if exact:
5906 ui.warn(_('not unmarking %s as it is driver-resolved\n')
5908 ui.warn(_('not unmarking %s as it is driver-resolved\n')
5907 % f)
5909 % f)
5908 else:
5910 else:
5909 runconclude = True
5911 runconclude = True
5910 continue
5912 continue
5911
5913
5912 if mark:
5914 if mark:
5913 ms.mark(f, "r")
5915 ms.mark(f, "r")
5914 elif unmark:
5916 elif unmark:
5915 ms.mark(f, "u")
5917 ms.mark(f, "u")
5916 else:
5918 else:
5917 # backup pre-resolve (merge uses .orig for its own purposes)
5919 # backup pre-resolve (merge uses .orig for its own purposes)
5918 a = repo.wjoin(f)
5920 a = repo.wjoin(f)
5919 try:
5921 try:
5920 util.copyfile(a, a + ".resolve")
5922 util.copyfile(a, a + ".resolve")
5921 except (IOError, OSError) as inst:
5923 except (IOError, OSError) as inst:
5922 if inst.errno != errno.ENOENT:
5924 if inst.errno != errno.ENOENT:
5923 raise
5925 raise
5924
5926
5925 try:
5927 try:
5926 # preresolve file
5928 # preresolve file
5927 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5929 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5928 'resolve')
5930 'resolve')
5929 complete, r = ms.preresolve(f, wctx)
5931 complete, r = ms.preresolve(f, wctx)
5930 if not complete:
5932 if not complete:
5931 tocomplete.append(f)
5933 tocomplete.append(f)
5932 elif r:
5934 elif r:
5933 ret = 1
5935 ret = 1
5934 finally:
5936 finally:
5935 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5937 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5936 ms.commit()
5938 ms.commit()
5937
5939
5938 # replace filemerge's .orig file with our resolve file, but only
5940 # replace filemerge's .orig file with our resolve file, but only
5939 # for merges that are complete
5941 # for merges that are complete
5940 if complete:
5942 if complete:
5941 try:
5943 try:
5942 util.rename(a + ".resolve",
5944 util.rename(a + ".resolve",
5943 cmdutil.origpath(ui, repo, a))
5945 cmdutil.origpath(ui, repo, a))
5944 except OSError as inst:
5946 except OSError as inst:
5945 if inst.errno != errno.ENOENT:
5947 if inst.errno != errno.ENOENT:
5946 raise
5948 raise
5947
5949
5948 for f in tocomplete:
5950 for f in tocomplete:
5949 try:
5951 try:
5950 # resolve file
5952 # resolve file
5951 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5953 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5952 'resolve')
5954 'resolve')
5953 r = ms.resolve(f, wctx)
5955 r = ms.resolve(f, wctx)
5954 if r:
5956 if r:
5955 ret = 1
5957 ret = 1
5956 finally:
5958 finally:
5957 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5959 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5958 ms.commit()
5960 ms.commit()
5959
5961
5960 # replace filemerge's .orig file with our resolve file
5962 # replace filemerge's .orig file with our resolve file
5961 a = repo.wjoin(f)
5963 a = repo.wjoin(f)
5962 try:
5964 try:
5963 util.rename(a + ".resolve", cmdutil.origpath(ui, repo, a))
5965 util.rename(a + ".resolve", cmdutil.origpath(ui, repo, a))
5964 except OSError as inst:
5966 except OSError as inst:
5965 if inst.errno != errno.ENOENT:
5967 if inst.errno != errno.ENOENT:
5966 raise
5968 raise
5967
5969
5968 ms.commit()
5970 ms.commit()
5969 ms.recordactions()
5971 ms.recordactions()
5970
5972
5971 if not didwork and pats:
5973 if not didwork and pats:
5972 ui.warn(_("arguments do not match paths that need resolving\n"))
5974 ui.warn(_("arguments do not match paths that need resolving\n"))
5973 elif ms.mergedriver and ms.mdstate() != 's':
5975 elif ms.mergedriver and ms.mdstate() != 's':
5974 # run conclude step when either a driver-resolved file is requested
5976 # run conclude step when either a driver-resolved file is requested
5975 # or there are no driver-resolved files
5977 # or there are no driver-resolved files
5976 # we can't use 'ret' to determine whether any files are unresolved
5978 # we can't use 'ret' to determine whether any files are unresolved
5977 # because we might not have tried to resolve some
5979 # because we might not have tried to resolve some
5978 if ((runconclude or not list(ms.driverresolved()))
5980 if ((runconclude or not list(ms.driverresolved()))
5979 and not list(ms.unresolved())):
5981 and not list(ms.unresolved())):
5980 proceed = mergemod.driverconclude(repo, ms, wctx)
5982 proceed = mergemod.driverconclude(repo, ms, wctx)
5981 ms.commit()
5983 ms.commit()
5982 if not proceed:
5984 if not proceed:
5983 return 1
5985 return 1
5984
5986
5985 finally:
5987 finally:
5986 wlock.release()
5988 wlock.release()
5987
5989
5988 # Nudge users into finishing an unfinished operation
5990 # Nudge users into finishing an unfinished operation
5989 unresolvedf = list(ms.unresolved())
5991 unresolvedf = list(ms.unresolved())
5990 driverresolvedf = list(ms.driverresolved())
5992 driverresolvedf = list(ms.driverresolved())
5991 if not unresolvedf and not driverresolvedf:
5993 if not unresolvedf and not driverresolvedf:
5992 ui.status(_('(no more unresolved files)\n'))
5994 ui.status(_('(no more unresolved files)\n'))
5993 elif not unresolvedf:
5995 elif not unresolvedf:
5994 ui.status(_('(no more unresolved files -- '
5996 ui.status(_('(no more unresolved files -- '
5995 'run "hg resolve --all" to conclude)\n'))
5997 'run "hg resolve --all" to conclude)\n'))
5996
5998
5997 return ret
5999 return ret
5998
6000
5999 @command('revert',
6001 @command('revert',
6000 [('a', 'all', None, _('revert all changes when no arguments given')),
6002 [('a', 'all', None, _('revert all changes when no arguments given')),
6001 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6003 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6002 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6004 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6003 ('C', 'no-backup', None, _('do not save backup copies of files')),
6005 ('C', 'no-backup', None, _('do not save backup copies of files')),
6004 ('i', 'interactive', None,
6006 ('i', 'interactive', None,
6005 _('interactively select the changes (EXPERIMENTAL)')),
6007 _('interactively select the changes (EXPERIMENTAL)')),
6006 ] + walkopts + dryrunopts,
6008 ] + walkopts + dryrunopts,
6007 _('[OPTION]... [-r REV] [NAME]...'))
6009 _('[OPTION]... [-r REV] [NAME]...'))
6008 def revert(ui, repo, *pats, **opts):
6010 def revert(ui, repo, *pats, **opts):
6009 """restore files to their checkout state
6011 """restore files to their checkout state
6010
6012
6011 .. note::
6013 .. note::
6012
6014
6013 To check out earlier revisions, you should use :hg:`update REV`.
6015 To check out earlier revisions, you should use :hg:`update REV`.
6014 To cancel an uncommitted merge (and lose your changes),
6016 To cancel an uncommitted merge (and lose your changes),
6015 use :hg:`update --clean .`.
6017 use :hg:`update --clean .`.
6016
6018
6017 With no revision specified, revert the specified files or directories
6019 With no revision specified, revert the specified files or directories
6018 to the contents they had in the parent of the working directory.
6020 to the contents they had in the parent of the working directory.
6019 This restores the contents of files to an unmodified
6021 This restores the contents of files to an unmodified
6020 state and unschedules adds, removes, copies, and renames. If the
6022 state and unschedules adds, removes, copies, and renames. If the
6021 working directory has two parents, you must explicitly specify a
6023 working directory has two parents, you must explicitly specify a
6022 revision.
6024 revision.
6023
6025
6024 Using the -r/--rev or -d/--date options, revert the given files or
6026 Using the -r/--rev or -d/--date options, revert the given files or
6025 directories to their states as of a specific revision. Because
6027 directories to their states as of a specific revision. Because
6026 revert does not change the working directory parents, this will
6028 revert does not change the working directory parents, this will
6027 cause these files to appear modified. This can be helpful to "back
6029 cause these files to appear modified. This can be helpful to "back
6028 out" some or all of an earlier change. See :hg:`backout` for a
6030 out" some or all of an earlier change. See :hg:`backout` for a
6029 related method.
6031 related method.
6030
6032
6031 Modified files are saved with a .orig suffix before reverting.
6033 Modified files are saved with a .orig suffix before reverting.
6032 To disable these backups, use --no-backup.
6034 To disable these backups, use --no-backup.
6033
6035
6034 See :hg:`help dates` for a list of formats valid for -d/--date.
6036 See :hg:`help dates` for a list of formats valid for -d/--date.
6035
6037
6036 See :hg:`help backout` for a way to reverse the effect of an
6038 See :hg:`help backout` for a way to reverse the effect of an
6037 earlier changeset.
6039 earlier changeset.
6038
6040
6039 Returns 0 on success.
6041 Returns 0 on success.
6040 """
6042 """
6041
6043
6042 if opts.get("date"):
6044 if opts.get("date"):
6043 if opts.get("rev"):
6045 if opts.get("rev"):
6044 raise error.Abort(_("you can't specify a revision and a date"))
6046 raise error.Abort(_("you can't specify a revision and a date"))
6045 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6047 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6046
6048
6047 parent, p2 = repo.dirstate.parents()
6049 parent, p2 = repo.dirstate.parents()
6048 if not opts.get('rev') and p2 != nullid:
6050 if not opts.get('rev') and p2 != nullid:
6049 # revert after merge is a trap for new users (issue2915)
6051 # revert after merge is a trap for new users (issue2915)
6050 raise error.Abort(_('uncommitted merge with no revision specified'),
6052 raise error.Abort(_('uncommitted merge with no revision specified'),
6051 hint=_('use "hg update" or see "hg help revert"'))
6053 hint=_('use "hg update" or see "hg help revert"'))
6052
6054
6053 ctx = scmutil.revsingle(repo, opts.get('rev'))
6055 ctx = scmutil.revsingle(repo, opts.get('rev'))
6054
6056
6055 if (not (pats or opts.get('include') or opts.get('exclude') or
6057 if (not (pats or opts.get('include') or opts.get('exclude') or
6056 opts.get('all') or opts.get('interactive'))):
6058 opts.get('all') or opts.get('interactive'))):
6057 msg = _("no files or directories specified")
6059 msg = _("no files or directories specified")
6058 if p2 != nullid:
6060 if p2 != nullid:
6059 hint = _("uncommitted merge, use --all to discard all changes,"
6061 hint = _("uncommitted merge, use --all to discard all changes,"
6060 " or 'hg update -C .' to abort the merge")
6062 " or 'hg update -C .' to abort the merge")
6061 raise error.Abort(msg, hint=hint)
6063 raise error.Abort(msg, hint=hint)
6062 dirty = any(repo.status())
6064 dirty = any(repo.status())
6063 node = ctx.node()
6065 node = ctx.node()
6064 if node != parent:
6066 if node != parent:
6065 if dirty:
6067 if dirty:
6066 hint = _("uncommitted changes, use --all to discard all"
6068 hint = _("uncommitted changes, use --all to discard all"
6067 " changes, or 'hg update %s' to update") % ctx.rev()
6069 " changes, or 'hg update %s' to update") % ctx.rev()
6068 else:
6070 else:
6069 hint = _("use --all to revert all files,"
6071 hint = _("use --all to revert all files,"
6070 " or 'hg update %s' to update") % ctx.rev()
6072 " or 'hg update %s' to update") % ctx.rev()
6071 elif dirty:
6073 elif dirty:
6072 hint = _("uncommitted changes, use --all to discard all changes")
6074 hint = _("uncommitted changes, use --all to discard all changes")
6073 else:
6075 else:
6074 hint = _("use --all to revert all files")
6076 hint = _("use --all to revert all files")
6075 raise error.Abort(msg, hint=hint)
6077 raise error.Abort(msg, hint=hint)
6076
6078
6077 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6079 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6078
6080
6079 @command('rollback', dryrunopts +
6081 @command('rollback', dryrunopts +
6080 [('f', 'force', False, _('ignore safety measures'))])
6082 [('f', 'force', False, _('ignore safety measures'))])
6081 def rollback(ui, repo, **opts):
6083 def rollback(ui, repo, **opts):
6082 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6084 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6083
6085
6084 Please use :hg:`commit --amend` instead of rollback to correct
6086 Please use :hg:`commit --amend` instead of rollback to correct
6085 mistakes in the last commit.
6087 mistakes in the last commit.
6086
6088
6087 This command should be used with care. There is only one level of
6089 This command should be used with care. There is only one level of
6088 rollback, and there is no way to undo a rollback. It will also
6090 rollback, and there is no way to undo a rollback. It will also
6089 restore the dirstate at the time of the last transaction, losing
6091 restore the dirstate at the time of the last transaction, losing
6090 any dirstate changes since that time. This command does not alter
6092 any dirstate changes since that time. This command does not alter
6091 the working directory.
6093 the working directory.
6092
6094
6093 Transactions are used to encapsulate the effects of all commands
6095 Transactions are used to encapsulate the effects of all commands
6094 that create new changesets or propagate existing changesets into a
6096 that create new changesets or propagate existing changesets into a
6095 repository.
6097 repository.
6096
6098
6097 .. container:: verbose
6099 .. container:: verbose
6098
6100
6099 For example, the following commands are transactional, and their
6101 For example, the following commands are transactional, and their
6100 effects can be rolled back:
6102 effects can be rolled back:
6101
6103
6102 - commit
6104 - commit
6103 - import
6105 - import
6104 - pull
6106 - pull
6105 - push (with this repository as the destination)
6107 - push (with this repository as the destination)
6106 - unbundle
6108 - unbundle
6107
6109
6108 To avoid permanent data loss, rollback will refuse to rollback a
6110 To avoid permanent data loss, rollback will refuse to rollback a
6109 commit transaction if it isn't checked out. Use --force to
6111 commit transaction if it isn't checked out. Use --force to
6110 override this protection.
6112 override this protection.
6111
6113
6112 This command is not intended for use on public repositories. Once
6114 This command is not intended for use on public repositories. Once
6113 changes are visible for pull by other users, rolling a transaction
6115 changes are visible for pull by other users, rolling a transaction
6114 back locally is ineffective (someone else may already have pulled
6116 back locally is ineffective (someone else may already have pulled
6115 the changes). Furthermore, a race is possible with readers of the
6117 the changes). Furthermore, a race is possible with readers of the
6116 repository; for example an in-progress pull from the repository
6118 repository; for example an in-progress pull from the repository
6117 may fail if a rollback is performed.
6119 may fail if a rollback is performed.
6118
6120
6119 Returns 0 on success, 1 if no rollback data is available.
6121 Returns 0 on success, 1 if no rollback data is available.
6120 """
6122 """
6121 return repo.rollback(dryrun=opts.get('dry_run'),
6123 return repo.rollback(dryrun=opts.get('dry_run'),
6122 force=opts.get('force'))
6124 force=opts.get('force'))
6123
6125
6124 @command('root', [])
6126 @command('root', [])
6125 def root(ui, repo):
6127 def root(ui, repo):
6126 """print the root (top) of the current working directory
6128 """print the root (top) of the current working directory
6127
6129
6128 Print the root directory of the current repository.
6130 Print the root directory of the current repository.
6129
6131
6130 Returns 0 on success.
6132 Returns 0 on success.
6131 """
6133 """
6132 ui.write(repo.root + "\n")
6134 ui.write(repo.root + "\n")
6133
6135
6134 @command('^serve',
6136 @command('^serve',
6135 [('A', 'accesslog', '', _('name of access log file to write to'),
6137 [('A', 'accesslog', '', _('name of access log file to write to'),
6136 _('FILE')),
6138 _('FILE')),
6137 ('d', 'daemon', None, _('run server in background')),
6139 ('d', 'daemon', None, _('run server in background')),
6138 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('FILE')),
6140 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('FILE')),
6139 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6141 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6140 # use string type, then we can check if something was passed
6142 # use string type, then we can check if something was passed
6141 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6143 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6142 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6144 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6143 _('ADDR')),
6145 _('ADDR')),
6144 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6146 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6145 _('PREFIX')),
6147 _('PREFIX')),
6146 ('n', 'name', '',
6148 ('n', 'name', '',
6147 _('name to show in web pages (default: working directory)'), _('NAME')),
6149 _('name to show in web pages (default: working directory)'), _('NAME')),
6148 ('', 'web-conf', '',
6150 ('', 'web-conf', '',
6149 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6151 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6150 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6152 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6151 _('FILE')),
6153 _('FILE')),
6152 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6154 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6153 ('', 'stdio', None, _('for remote clients')),
6155 ('', 'stdio', None, _('for remote clients')),
6154 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6156 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6155 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6157 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6156 ('', 'style', '', _('template style to use'), _('STYLE')),
6158 ('', 'style', '', _('template style to use'), _('STYLE')),
6157 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6159 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6158 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6160 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6159 _('[OPTION]...'),
6161 _('[OPTION]...'),
6160 optionalrepo=True)
6162 optionalrepo=True)
6161 def serve(ui, repo, **opts):
6163 def serve(ui, repo, **opts):
6162 """start stand-alone webserver
6164 """start stand-alone webserver
6163
6165
6164 Start a local HTTP repository browser and pull server. You can use
6166 Start a local HTTP repository browser and pull server. You can use
6165 this for ad-hoc sharing and browsing of repositories. It is
6167 this for ad-hoc sharing and browsing of repositories. It is
6166 recommended to use a real web server to serve a repository for
6168 recommended to use a real web server to serve a repository for
6167 longer periods of time.
6169 longer periods of time.
6168
6170
6169 Please note that the server does not implement access control.
6171 Please note that the server does not implement access control.
6170 This means that, by default, anybody can read from the server and
6172 This means that, by default, anybody can read from the server and
6171 nobody can write to it by default. Set the ``web.allow_push``
6173 nobody can write to it by default. Set the ``web.allow_push``
6172 option to ``*`` to allow everybody to push to the server. You
6174 option to ``*`` to allow everybody to push to the server. You
6173 should use a real web server if you need to authenticate users.
6175 should use a real web server if you need to authenticate users.
6174
6176
6175 By default, the server logs accesses to stdout and errors to
6177 By default, the server logs accesses to stdout and errors to
6176 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6178 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6177 files.
6179 files.
6178
6180
6179 To have the server choose a free port number to listen on, specify
6181 To have the server choose a free port number to listen on, specify
6180 a port number of 0; in this case, the server will print the port
6182 a port number of 0; in this case, the server will print the port
6181 number it uses.
6183 number it uses.
6182
6184
6183 Returns 0 on success.
6185 Returns 0 on success.
6184 """
6186 """
6185
6187
6186 if opts["stdio"] and opts["cmdserver"]:
6188 if opts["stdio"] and opts["cmdserver"]:
6187 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6189 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6188
6190
6189 if opts["stdio"]:
6191 if opts["stdio"]:
6190 if repo is None:
6192 if repo is None:
6191 raise error.RepoError(_("there is no Mercurial repository here"
6193 raise error.RepoError(_("there is no Mercurial repository here"
6192 " (.hg not found)"))
6194 " (.hg not found)"))
6193 s = sshserver.sshserver(ui, repo)
6195 s = sshserver.sshserver(ui, repo)
6194 s.serve_forever()
6196 s.serve_forever()
6195
6197
6196 if opts["cmdserver"]:
6198 if opts["cmdserver"]:
6197 service = commandserver.createservice(ui, repo, opts)
6199 service = commandserver.createservice(ui, repo, opts)
6198 else:
6200 else:
6199 service = hgweb.createservice(ui, repo, opts)
6201 service = hgweb.createservice(ui, repo, opts)
6200 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6202 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6201
6203
6202 @command('^status|st',
6204 @command('^status|st',
6203 [('A', 'all', None, _('show status of all files')),
6205 [('A', 'all', None, _('show status of all files')),
6204 ('m', 'modified', None, _('show only modified files')),
6206 ('m', 'modified', None, _('show only modified files')),
6205 ('a', 'added', None, _('show only added files')),
6207 ('a', 'added', None, _('show only added files')),
6206 ('r', 'removed', None, _('show only removed files')),
6208 ('r', 'removed', None, _('show only removed files')),
6207 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6209 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6208 ('c', 'clean', None, _('show only files without changes')),
6210 ('c', 'clean', None, _('show only files without changes')),
6209 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6211 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6210 ('i', 'ignored', None, _('show only ignored files')),
6212 ('i', 'ignored', None, _('show only ignored files')),
6211 ('n', 'no-status', None, _('hide status prefix')),
6213 ('n', 'no-status', None, _('hide status prefix')),
6212 ('C', 'copies', None, _('show source of copied files')),
6214 ('C', 'copies', None, _('show source of copied files')),
6213 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6215 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6214 ('', 'rev', [], _('show difference from revision'), _('REV')),
6216 ('', 'rev', [], _('show difference from revision'), _('REV')),
6215 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6217 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6216 ] + walkopts + subrepoopts + formatteropts,
6218 ] + walkopts + subrepoopts + formatteropts,
6217 _('[OPTION]... [FILE]...'),
6219 _('[OPTION]... [FILE]...'),
6218 inferrepo=True)
6220 inferrepo=True)
6219 def status(ui, repo, *pats, **opts):
6221 def status(ui, repo, *pats, **opts):
6220 """show changed files in the working directory
6222 """show changed files in the working directory
6221
6223
6222 Show status of files in the repository. If names are given, only
6224 Show status of files in the repository. If names are given, only
6223 files that match are shown. Files that are clean or ignored or
6225 files that match are shown. Files that are clean or ignored or
6224 the source of a copy/move operation, are not listed unless
6226 the source of a copy/move operation, are not listed unless
6225 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6227 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6226 Unless options described with "show only ..." are given, the
6228 Unless options described with "show only ..." are given, the
6227 options -mardu are used.
6229 options -mardu are used.
6228
6230
6229 Option -q/--quiet hides untracked (unknown and ignored) files
6231 Option -q/--quiet hides untracked (unknown and ignored) files
6230 unless explicitly requested with -u/--unknown or -i/--ignored.
6232 unless explicitly requested with -u/--unknown or -i/--ignored.
6231
6233
6232 .. note::
6234 .. note::
6233
6235
6234 :hg:`status` may appear to disagree with diff if permissions have
6236 :hg:`status` may appear to disagree with diff if permissions have
6235 changed or a merge has occurred. The standard diff format does
6237 changed or a merge has occurred. The standard diff format does
6236 not report permission changes and diff only reports changes
6238 not report permission changes and diff only reports changes
6237 relative to one merge parent.
6239 relative to one merge parent.
6238
6240
6239 If one revision is given, it is used as the base revision.
6241 If one revision is given, it is used as the base revision.
6240 If two revisions are given, the differences between them are
6242 If two revisions are given, the differences between them are
6241 shown. The --change option can also be used as a shortcut to list
6243 shown. The --change option can also be used as a shortcut to list
6242 the changed files of a revision from its first parent.
6244 the changed files of a revision from its first parent.
6243
6245
6244 The codes used to show the status of files are::
6246 The codes used to show the status of files are::
6245
6247
6246 M = modified
6248 M = modified
6247 A = added
6249 A = added
6248 R = removed
6250 R = removed
6249 C = clean
6251 C = clean
6250 ! = missing (deleted by non-hg command, but still tracked)
6252 ! = missing (deleted by non-hg command, but still tracked)
6251 ? = not tracked
6253 ? = not tracked
6252 I = ignored
6254 I = ignored
6253 = origin of the previous file (with --copies)
6255 = origin of the previous file (with --copies)
6254
6256
6255 .. container:: verbose
6257 .. container:: verbose
6256
6258
6257 Examples:
6259 Examples:
6258
6260
6259 - show changes in the working directory relative to a
6261 - show changes in the working directory relative to a
6260 changeset::
6262 changeset::
6261
6263
6262 hg status --rev 9353
6264 hg status --rev 9353
6263
6265
6264 - show changes in the working directory relative to the
6266 - show changes in the working directory relative to the
6265 current directory (see :hg:`help patterns` for more information)::
6267 current directory (see :hg:`help patterns` for more information)::
6266
6268
6267 hg status re:
6269 hg status re:
6268
6270
6269 - show all changes including copies in an existing changeset::
6271 - show all changes including copies in an existing changeset::
6270
6272
6271 hg status --copies --change 9353
6273 hg status --copies --change 9353
6272
6274
6273 - get a NUL separated list of added files, suitable for xargs::
6275 - get a NUL separated list of added files, suitable for xargs::
6274
6276
6275 hg status -an0
6277 hg status -an0
6276
6278
6277 Returns 0 on success.
6279 Returns 0 on success.
6278 """
6280 """
6279
6281
6280 revs = opts.get('rev')
6282 revs = opts.get('rev')
6281 change = opts.get('change')
6283 change = opts.get('change')
6282
6284
6283 if revs and change:
6285 if revs and change:
6284 msg = _('cannot specify --rev and --change at the same time')
6286 msg = _('cannot specify --rev and --change at the same time')
6285 raise error.Abort(msg)
6287 raise error.Abort(msg)
6286 elif change:
6288 elif change:
6287 node2 = scmutil.revsingle(repo, change, None).node()
6289 node2 = scmutil.revsingle(repo, change, None).node()
6288 node1 = repo[node2].p1().node()
6290 node1 = repo[node2].p1().node()
6289 else:
6291 else:
6290 node1, node2 = scmutil.revpair(repo, revs)
6292 node1, node2 = scmutil.revpair(repo, revs)
6291
6293
6292 if pats:
6294 if pats:
6293 cwd = repo.getcwd()
6295 cwd = repo.getcwd()
6294 else:
6296 else:
6295 cwd = ''
6297 cwd = ''
6296
6298
6297 if opts.get('print0'):
6299 if opts.get('print0'):
6298 end = '\0'
6300 end = '\0'
6299 else:
6301 else:
6300 end = '\n'
6302 end = '\n'
6301 copy = {}
6303 copy = {}
6302 states = 'modified added removed deleted unknown ignored clean'.split()
6304 states = 'modified added removed deleted unknown ignored clean'.split()
6303 show = [k for k in states if opts.get(k)]
6305 show = [k for k in states if opts.get(k)]
6304 if opts.get('all'):
6306 if opts.get('all'):
6305 show += ui.quiet and (states[:4] + ['clean']) or states
6307 show += ui.quiet and (states[:4] + ['clean']) or states
6306 if not show:
6308 if not show:
6307 if ui.quiet:
6309 if ui.quiet:
6308 show = states[:4]
6310 show = states[:4]
6309 else:
6311 else:
6310 show = states[:5]
6312 show = states[:5]
6311
6313
6312 m = scmutil.match(repo[node2], pats, opts)
6314 m = scmutil.match(repo[node2], pats, opts)
6313 stat = repo.status(node1, node2, m,
6315 stat = repo.status(node1, node2, m,
6314 'ignored' in show, 'clean' in show, 'unknown' in show,
6316 'ignored' in show, 'clean' in show, 'unknown' in show,
6315 opts.get('subrepos'))
6317 opts.get('subrepos'))
6316 changestates = zip(states, 'MAR!?IC', stat)
6318 changestates = zip(states, 'MAR!?IC', stat)
6317
6319
6318 if (opts.get('all') or opts.get('copies')
6320 if (opts.get('all') or opts.get('copies')
6319 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6321 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6320 copy = copies.pathcopies(repo[node1], repo[node2], m)
6322 copy = copies.pathcopies(repo[node1], repo[node2], m)
6321
6323
6322 fm = ui.formatter('status', opts)
6324 fm = ui.formatter('status', opts)
6323 fmt = '%s' + end
6325 fmt = '%s' + end
6324 showchar = not opts.get('no_status')
6326 showchar = not opts.get('no_status')
6325
6327
6326 for state, char, files in changestates:
6328 for state, char, files in changestates:
6327 if state in show:
6329 if state in show:
6328 label = 'status.' + state
6330 label = 'status.' + state
6329 for f in files:
6331 for f in files:
6330 fm.startitem()
6332 fm.startitem()
6331 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6333 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6332 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6334 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6333 if f in copy:
6335 if f in copy:
6334 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6336 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6335 label='status.copied')
6337 label='status.copied')
6336 fm.end()
6338 fm.end()
6337
6339
6338 @command('^summary|sum',
6340 @command('^summary|sum',
6339 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6341 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6340 def summary(ui, repo, **opts):
6342 def summary(ui, repo, **opts):
6341 """summarize working directory state
6343 """summarize working directory state
6342
6344
6343 This generates a brief summary of the working directory state,
6345 This generates a brief summary of the working directory state,
6344 including parents, branch, commit status, phase and available updates.
6346 including parents, branch, commit status, phase and available updates.
6345
6347
6346 With the --remote option, this will check the default paths for
6348 With the --remote option, this will check the default paths for
6347 incoming and outgoing changes. This can be time-consuming.
6349 incoming and outgoing changes. This can be time-consuming.
6348
6350
6349 Returns 0 on success.
6351 Returns 0 on success.
6350 """
6352 """
6351
6353
6352 ctx = repo[None]
6354 ctx = repo[None]
6353 parents = ctx.parents()
6355 parents = ctx.parents()
6354 pnode = parents[0].node()
6356 pnode = parents[0].node()
6355 marks = []
6357 marks = []
6356
6358
6357 for p in parents:
6359 for p in parents:
6358 # label with log.changeset (instead of log.parent) since this
6360 # label with log.changeset (instead of log.parent) since this
6359 # shows a working directory parent *changeset*:
6361 # shows a working directory parent *changeset*:
6360 # i18n: column positioning for "hg summary"
6362 # i18n: column positioning for "hg summary"
6361 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6363 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6362 label='log.changeset changeset.%s' % p.phasestr())
6364 label='log.changeset changeset.%s' % p.phasestr())
6363 ui.write(' '.join(p.tags()), label='log.tag')
6365 ui.write(' '.join(p.tags()), label='log.tag')
6364 if p.bookmarks():
6366 if p.bookmarks():
6365 marks.extend(p.bookmarks())
6367 marks.extend(p.bookmarks())
6366 if p.rev() == -1:
6368 if p.rev() == -1:
6367 if not len(repo):
6369 if not len(repo):
6368 ui.write(_(' (empty repository)'))
6370 ui.write(_(' (empty repository)'))
6369 else:
6371 else:
6370 ui.write(_(' (no revision checked out)'))
6372 ui.write(_(' (no revision checked out)'))
6371 ui.write('\n')
6373 ui.write('\n')
6372 if p.description():
6374 if p.description():
6373 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6375 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6374 label='log.summary')
6376 label='log.summary')
6375
6377
6376 branch = ctx.branch()
6378 branch = ctx.branch()
6377 bheads = repo.branchheads(branch)
6379 bheads = repo.branchheads(branch)
6378 # i18n: column positioning for "hg summary"
6380 # i18n: column positioning for "hg summary"
6379 m = _('branch: %s\n') % branch
6381 m = _('branch: %s\n') % branch
6380 if branch != 'default':
6382 if branch != 'default':
6381 ui.write(m, label='log.branch')
6383 ui.write(m, label='log.branch')
6382 else:
6384 else:
6383 ui.status(m, label='log.branch')
6385 ui.status(m, label='log.branch')
6384
6386
6385 if marks:
6387 if marks:
6386 active = repo._activebookmark
6388 active = repo._activebookmark
6387 # i18n: column positioning for "hg summary"
6389 # i18n: column positioning for "hg summary"
6388 ui.write(_('bookmarks:'), label='log.bookmark')
6390 ui.write(_('bookmarks:'), label='log.bookmark')
6389 if active is not None:
6391 if active is not None:
6390 if active in marks:
6392 if active in marks:
6391 ui.write(' *' + active, label=activebookmarklabel)
6393 ui.write(' *' + active, label=activebookmarklabel)
6392 marks.remove(active)
6394 marks.remove(active)
6393 else:
6395 else:
6394 ui.write(' [%s]' % active, label=activebookmarklabel)
6396 ui.write(' [%s]' % active, label=activebookmarklabel)
6395 for m in marks:
6397 for m in marks:
6396 ui.write(' ' + m, label='log.bookmark')
6398 ui.write(' ' + m, label='log.bookmark')
6397 ui.write('\n', label='log.bookmark')
6399 ui.write('\n', label='log.bookmark')
6398
6400
6399 status = repo.status(unknown=True)
6401 status = repo.status(unknown=True)
6400
6402
6401 c = repo.dirstate.copies()
6403 c = repo.dirstate.copies()
6402 copied, renamed = [], []
6404 copied, renamed = [], []
6403 for d, s in c.iteritems():
6405 for d, s in c.iteritems():
6404 if s in status.removed:
6406 if s in status.removed:
6405 status.removed.remove(s)
6407 status.removed.remove(s)
6406 renamed.append(d)
6408 renamed.append(d)
6407 else:
6409 else:
6408 copied.append(d)
6410 copied.append(d)
6409 if d in status.added:
6411 if d in status.added:
6410 status.added.remove(d)
6412 status.added.remove(d)
6411
6413
6412 try:
6414 try:
6413 ms = mergemod.mergestate.read(repo)
6415 ms = mergemod.mergestate.read(repo)
6414 except error.UnsupportedMergeRecords as e:
6416 except error.UnsupportedMergeRecords as e:
6415 s = ' '.join(e.recordtypes)
6417 s = ' '.join(e.recordtypes)
6416 ui.warn(
6418 ui.warn(
6417 _('warning: merge state has unsupported record types: %s\n') % s)
6419 _('warning: merge state has unsupported record types: %s\n') % s)
6418 unresolved = 0
6420 unresolved = 0
6419 else:
6421 else:
6420 unresolved = [f for f in ms if ms[f] == 'u']
6422 unresolved = [f for f in ms if ms[f] == 'u']
6421
6423
6422 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6424 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6423
6425
6424 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6426 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6425 (ui.label(_('%d added'), 'status.added'), status.added),
6427 (ui.label(_('%d added'), 'status.added'), status.added),
6426 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6428 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6427 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6429 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6428 (ui.label(_('%d copied'), 'status.copied'), copied),
6430 (ui.label(_('%d copied'), 'status.copied'), copied),
6429 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6431 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6430 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6432 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6431 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6433 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6432 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6434 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6433 t = []
6435 t = []
6434 for l, s in labels:
6436 for l, s in labels:
6435 if s:
6437 if s:
6436 t.append(l % len(s))
6438 t.append(l % len(s))
6437
6439
6438 t = ', '.join(t)
6440 t = ', '.join(t)
6439 cleanworkdir = False
6441 cleanworkdir = False
6440
6442
6441 if repo.vfs.exists('graftstate'):
6443 if repo.vfs.exists('graftstate'):
6442 t += _(' (graft in progress)')
6444 t += _(' (graft in progress)')
6443 if repo.vfs.exists('updatestate'):
6445 if repo.vfs.exists('updatestate'):
6444 t += _(' (interrupted update)')
6446 t += _(' (interrupted update)')
6445 elif len(parents) > 1:
6447 elif len(parents) > 1:
6446 t += _(' (merge)')
6448 t += _(' (merge)')
6447 elif branch != parents[0].branch():
6449 elif branch != parents[0].branch():
6448 t += _(' (new branch)')
6450 t += _(' (new branch)')
6449 elif (parents[0].closesbranch() and
6451 elif (parents[0].closesbranch() and
6450 pnode in repo.branchheads(branch, closed=True)):
6452 pnode in repo.branchheads(branch, closed=True)):
6451 t += _(' (head closed)')
6453 t += _(' (head closed)')
6452 elif not (status.modified or status.added or status.removed or renamed or
6454 elif not (status.modified or status.added or status.removed or renamed or
6453 copied or subs):
6455 copied or subs):
6454 t += _(' (clean)')
6456 t += _(' (clean)')
6455 cleanworkdir = True
6457 cleanworkdir = True
6456 elif pnode not in bheads:
6458 elif pnode not in bheads:
6457 t += _(' (new branch head)')
6459 t += _(' (new branch head)')
6458
6460
6459 if parents:
6461 if parents:
6460 pendingphase = max(p.phase() for p in parents)
6462 pendingphase = max(p.phase() for p in parents)
6461 else:
6463 else:
6462 pendingphase = phases.public
6464 pendingphase = phases.public
6463
6465
6464 if pendingphase > phases.newcommitphase(ui):
6466 if pendingphase > phases.newcommitphase(ui):
6465 t += ' (%s)' % phases.phasenames[pendingphase]
6467 t += ' (%s)' % phases.phasenames[pendingphase]
6466
6468
6467 if cleanworkdir:
6469 if cleanworkdir:
6468 # i18n: column positioning for "hg summary"
6470 # i18n: column positioning for "hg summary"
6469 ui.status(_('commit: %s\n') % t.strip())
6471 ui.status(_('commit: %s\n') % t.strip())
6470 else:
6472 else:
6471 # i18n: column positioning for "hg summary"
6473 # i18n: column positioning for "hg summary"
6472 ui.write(_('commit: %s\n') % t.strip())
6474 ui.write(_('commit: %s\n') % t.strip())
6473
6475
6474 # all ancestors of branch heads - all ancestors of parent = new csets
6476 # all ancestors of branch heads - all ancestors of parent = new csets
6475 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6477 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6476 bheads))
6478 bheads))
6477
6479
6478 if new == 0:
6480 if new == 0:
6479 # i18n: column positioning for "hg summary"
6481 # i18n: column positioning for "hg summary"
6480 ui.status(_('update: (current)\n'))
6482 ui.status(_('update: (current)\n'))
6481 elif pnode not in bheads:
6483 elif pnode not in bheads:
6482 # i18n: column positioning for "hg summary"
6484 # i18n: column positioning for "hg summary"
6483 ui.write(_('update: %d new changesets (update)\n') % new)
6485 ui.write(_('update: %d new changesets (update)\n') % new)
6484 else:
6486 else:
6485 # i18n: column positioning for "hg summary"
6487 # i18n: column positioning for "hg summary"
6486 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6488 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6487 (new, len(bheads)))
6489 (new, len(bheads)))
6488
6490
6489 t = []
6491 t = []
6490 draft = len(repo.revs('draft()'))
6492 draft = len(repo.revs('draft()'))
6491 if draft:
6493 if draft:
6492 t.append(_('%d draft') % draft)
6494 t.append(_('%d draft') % draft)
6493 secret = len(repo.revs('secret()'))
6495 secret = len(repo.revs('secret()'))
6494 if secret:
6496 if secret:
6495 t.append(_('%d secret') % secret)
6497 t.append(_('%d secret') % secret)
6496
6498
6497 if draft or secret:
6499 if draft or secret:
6498 ui.status(_('phases: %s\n') % ', '.join(t))
6500 ui.status(_('phases: %s\n') % ', '.join(t))
6499
6501
6500 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6502 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6501 for trouble in ("unstable", "divergent", "bumped"):
6503 for trouble in ("unstable", "divergent", "bumped"):
6502 numtrouble = len(repo.revs(trouble + "()"))
6504 numtrouble = len(repo.revs(trouble + "()"))
6503 # We write all the possibilities to ease translation
6505 # We write all the possibilities to ease translation
6504 troublemsg = {
6506 troublemsg = {
6505 "unstable": _("unstable: %d changeset"),
6507 "unstable": _("unstable: %d changeset"),
6506 "divergent": _("divergent: %d changeset"),
6508 "divergent": _("divergent: %d changeset"),
6507 "bumped": _("bumped: %d changeset"),
6509 "bumped": _("bumped: %d changeset"),
6508 }
6510 }
6509 if numtrouble > 0:
6511 if numtrouble > 0:
6510 ui.status(troublemsg[trouble] % numtrouble + "\n")
6512 ui.status(troublemsg[trouble] % numtrouble + "\n")
6511
6513
6512 cmdutil.summaryhooks(ui, repo)
6514 cmdutil.summaryhooks(ui, repo)
6513
6515
6514 if opts.get('remote'):
6516 if opts.get('remote'):
6515 needsincoming, needsoutgoing = True, True
6517 needsincoming, needsoutgoing = True, True
6516 else:
6518 else:
6517 needsincoming, needsoutgoing = False, False
6519 needsincoming, needsoutgoing = False, False
6518 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6520 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6519 if i:
6521 if i:
6520 needsincoming = True
6522 needsincoming = True
6521 if o:
6523 if o:
6522 needsoutgoing = True
6524 needsoutgoing = True
6523 if not needsincoming and not needsoutgoing:
6525 if not needsincoming and not needsoutgoing:
6524 return
6526 return
6525
6527
6526 def getincoming():
6528 def getincoming():
6527 source, branches = hg.parseurl(ui.expandpath('default'))
6529 source, branches = hg.parseurl(ui.expandpath('default'))
6528 sbranch = branches[0]
6530 sbranch = branches[0]
6529 try:
6531 try:
6530 other = hg.peer(repo, {}, source)
6532 other = hg.peer(repo, {}, source)
6531 except error.RepoError:
6533 except error.RepoError:
6532 if opts.get('remote'):
6534 if opts.get('remote'):
6533 raise
6535 raise
6534 return source, sbranch, None, None, None
6536 return source, sbranch, None, None, None
6535 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6537 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6536 if revs:
6538 if revs:
6537 revs = [other.lookup(rev) for rev in revs]
6539 revs = [other.lookup(rev) for rev in revs]
6538 ui.debug('comparing with %s\n' % util.hidepassword(source))
6540 ui.debug('comparing with %s\n' % util.hidepassword(source))
6539 repo.ui.pushbuffer()
6541 repo.ui.pushbuffer()
6540 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6542 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6541 repo.ui.popbuffer()
6543 repo.ui.popbuffer()
6542 return source, sbranch, other, commoninc, commoninc[1]
6544 return source, sbranch, other, commoninc, commoninc[1]
6543
6545
6544 if needsincoming:
6546 if needsincoming:
6545 source, sbranch, sother, commoninc, incoming = getincoming()
6547 source, sbranch, sother, commoninc, incoming = getincoming()
6546 else:
6548 else:
6547 source = sbranch = sother = commoninc = incoming = None
6549 source = sbranch = sother = commoninc = incoming = None
6548
6550
6549 def getoutgoing():
6551 def getoutgoing():
6550 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6552 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6551 dbranch = branches[0]
6553 dbranch = branches[0]
6552 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6554 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6553 if source != dest:
6555 if source != dest:
6554 try:
6556 try:
6555 dother = hg.peer(repo, {}, dest)
6557 dother = hg.peer(repo, {}, dest)
6556 except error.RepoError:
6558 except error.RepoError:
6557 if opts.get('remote'):
6559 if opts.get('remote'):
6558 raise
6560 raise
6559 return dest, dbranch, None, None
6561 return dest, dbranch, None, None
6560 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6562 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6561 elif sother is None:
6563 elif sother is None:
6562 # there is no explicit destination peer, but source one is invalid
6564 # there is no explicit destination peer, but source one is invalid
6563 return dest, dbranch, None, None
6565 return dest, dbranch, None, None
6564 else:
6566 else:
6565 dother = sother
6567 dother = sother
6566 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6568 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6567 common = None
6569 common = None
6568 else:
6570 else:
6569 common = commoninc
6571 common = commoninc
6570 if revs:
6572 if revs:
6571 revs = [repo.lookup(rev) for rev in revs]
6573 revs = [repo.lookup(rev) for rev in revs]
6572 repo.ui.pushbuffer()
6574 repo.ui.pushbuffer()
6573 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6575 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6574 commoninc=common)
6576 commoninc=common)
6575 repo.ui.popbuffer()
6577 repo.ui.popbuffer()
6576 return dest, dbranch, dother, outgoing
6578 return dest, dbranch, dother, outgoing
6577
6579
6578 if needsoutgoing:
6580 if needsoutgoing:
6579 dest, dbranch, dother, outgoing = getoutgoing()
6581 dest, dbranch, dother, outgoing = getoutgoing()
6580 else:
6582 else:
6581 dest = dbranch = dother = outgoing = None
6583 dest = dbranch = dother = outgoing = None
6582
6584
6583 if opts.get('remote'):
6585 if opts.get('remote'):
6584 t = []
6586 t = []
6585 if incoming:
6587 if incoming:
6586 t.append(_('1 or more incoming'))
6588 t.append(_('1 or more incoming'))
6587 o = outgoing.missing
6589 o = outgoing.missing
6588 if o:
6590 if o:
6589 t.append(_('%d outgoing') % len(o))
6591 t.append(_('%d outgoing') % len(o))
6590 other = dother or sother
6592 other = dother or sother
6591 if 'bookmarks' in other.listkeys('namespaces'):
6593 if 'bookmarks' in other.listkeys('namespaces'):
6592 counts = bookmarks.summary(repo, other)
6594 counts = bookmarks.summary(repo, other)
6593 if counts[0] > 0:
6595 if counts[0] > 0:
6594 t.append(_('%d incoming bookmarks') % counts[0])
6596 t.append(_('%d incoming bookmarks') % counts[0])
6595 if counts[1] > 0:
6597 if counts[1] > 0:
6596 t.append(_('%d outgoing bookmarks') % counts[1])
6598 t.append(_('%d outgoing bookmarks') % counts[1])
6597
6599
6598 if t:
6600 if t:
6599 # i18n: column positioning for "hg summary"
6601 # i18n: column positioning for "hg summary"
6600 ui.write(_('remote: %s\n') % (', '.join(t)))
6602 ui.write(_('remote: %s\n') % (', '.join(t)))
6601 else:
6603 else:
6602 # i18n: column positioning for "hg summary"
6604 # i18n: column positioning for "hg summary"
6603 ui.status(_('remote: (synced)\n'))
6605 ui.status(_('remote: (synced)\n'))
6604
6606
6605 cmdutil.summaryremotehooks(ui, repo, opts,
6607 cmdutil.summaryremotehooks(ui, repo, opts,
6606 ((source, sbranch, sother, commoninc),
6608 ((source, sbranch, sother, commoninc),
6607 (dest, dbranch, dother, outgoing)))
6609 (dest, dbranch, dother, outgoing)))
6608
6610
6609 @command('tag',
6611 @command('tag',
6610 [('f', 'force', None, _('force tag')),
6612 [('f', 'force', None, _('force tag')),
6611 ('l', 'local', None, _('make the tag local')),
6613 ('l', 'local', None, _('make the tag local')),
6612 ('r', 'rev', '', _('revision to tag'), _('REV')),
6614 ('r', 'rev', '', _('revision to tag'), _('REV')),
6613 ('', 'remove', None, _('remove a tag')),
6615 ('', 'remove', None, _('remove a tag')),
6614 # -l/--local is already there, commitopts cannot be used
6616 # -l/--local is already there, commitopts cannot be used
6615 ('e', 'edit', None, _('invoke editor on commit messages')),
6617 ('e', 'edit', None, _('invoke editor on commit messages')),
6616 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6618 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6617 ] + commitopts2,
6619 ] + commitopts2,
6618 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6620 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6619 def tag(ui, repo, name1, *names, **opts):
6621 def tag(ui, repo, name1, *names, **opts):
6620 """add one or more tags for the current or given revision
6622 """add one or more tags for the current or given revision
6621
6623
6622 Name a particular revision using <name>.
6624 Name a particular revision using <name>.
6623
6625
6624 Tags are used to name particular revisions of the repository and are
6626 Tags are used to name particular revisions of the repository and are
6625 very useful to compare different revisions, to go back to significant
6627 very useful to compare different revisions, to go back to significant
6626 earlier versions or to mark branch points as releases, etc. Changing
6628 earlier versions or to mark branch points as releases, etc. Changing
6627 an existing tag is normally disallowed; use -f/--force to override.
6629 an existing tag is normally disallowed; use -f/--force to override.
6628
6630
6629 If no revision is given, the parent of the working directory is
6631 If no revision is given, the parent of the working directory is
6630 used.
6632 used.
6631
6633
6632 To facilitate version control, distribution, and merging of tags,
6634 To facilitate version control, distribution, and merging of tags,
6633 they are stored as a file named ".hgtags" which is managed similarly
6635 they are stored as a file named ".hgtags" which is managed similarly
6634 to other project files and can be hand-edited if necessary. This
6636 to other project files and can be hand-edited if necessary. This
6635 also means that tagging creates a new commit. The file
6637 also means that tagging creates a new commit. The file
6636 ".hg/localtags" is used for local tags (not shared among
6638 ".hg/localtags" is used for local tags (not shared among
6637 repositories).
6639 repositories).
6638
6640
6639 Tag commits are usually made at the head of a branch. If the parent
6641 Tag commits are usually made at the head of a branch. If the parent
6640 of the working directory is not a branch head, :hg:`tag` aborts; use
6642 of the working directory is not a branch head, :hg:`tag` aborts; use
6641 -f/--force to force the tag commit to be based on a non-head
6643 -f/--force to force the tag commit to be based on a non-head
6642 changeset.
6644 changeset.
6643
6645
6644 See :hg:`help dates` for a list of formats valid for -d/--date.
6646 See :hg:`help dates` for a list of formats valid for -d/--date.
6645
6647
6646 Since tag names have priority over branch names during revision
6648 Since tag names have priority over branch names during revision
6647 lookup, using an existing branch name as a tag name is discouraged.
6649 lookup, using an existing branch name as a tag name is discouraged.
6648
6650
6649 Returns 0 on success.
6651 Returns 0 on success.
6650 """
6652 """
6651 wlock = lock = None
6653 wlock = lock = None
6652 try:
6654 try:
6653 wlock = repo.wlock()
6655 wlock = repo.wlock()
6654 lock = repo.lock()
6656 lock = repo.lock()
6655 rev_ = "."
6657 rev_ = "."
6656 names = [t.strip() for t in (name1,) + names]
6658 names = [t.strip() for t in (name1,) + names]
6657 if len(names) != len(set(names)):
6659 if len(names) != len(set(names)):
6658 raise error.Abort(_('tag names must be unique'))
6660 raise error.Abort(_('tag names must be unique'))
6659 for n in names:
6661 for n in names:
6660 scmutil.checknewlabel(repo, n, 'tag')
6662 scmutil.checknewlabel(repo, n, 'tag')
6661 if not n:
6663 if not n:
6662 raise error.Abort(_('tag names cannot consist entirely of '
6664 raise error.Abort(_('tag names cannot consist entirely of '
6663 'whitespace'))
6665 'whitespace'))
6664 if opts.get('rev') and opts.get('remove'):
6666 if opts.get('rev') and opts.get('remove'):
6665 raise error.Abort(_("--rev and --remove are incompatible"))
6667 raise error.Abort(_("--rev and --remove are incompatible"))
6666 if opts.get('rev'):
6668 if opts.get('rev'):
6667 rev_ = opts['rev']
6669 rev_ = opts['rev']
6668 message = opts.get('message')
6670 message = opts.get('message')
6669 if opts.get('remove'):
6671 if opts.get('remove'):
6670 if opts.get('local'):
6672 if opts.get('local'):
6671 expectedtype = 'local'
6673 expectedtype = 'local'
6672 else:
6674 else:
6673 expectedtype = 'global'
6675 expectedtype = 'global'
6674
6676
6675 for n in names:
6677 for n in names:
6676 if not repo.tagtype(n):
6678 if not repo.tagtype(n):
6677 raise error.Abort(_("tag '%s' does not exist") % n)
6679 raise error.Abort(_("tag '%s' does not exist") % n)
6678 if repo.tagtype(n) != expectedtype:
6680 if repo.tagtype(n) != expectedtype:
6679 if expectedtype == 'global':
6681 if expectedtype == 'global':
6680 raise error.Abort(_("tag '%s' is not a global tag") % n)
6682 raise error.Abort(_("tag '%s' is not a global tag") % n)
6681 else:
6683 else:
6682 raise error.Abort(_("tag '%s' is not a local tag") % n)
6684 raise error.Abort(_("tag '%s' is not a local tag") % n)
6683 rev_ = 'null'
6685 rev_ = 'null'
6684 if not message:
6686 if not message:
6685 # we don't translate commit messages
6687 # we don't translate commit messages
6686 message = 'Removed tag %s' % ', '.join(names)
6688 message = 'Removed tag %s' % ', '.join(names)
6687 elif not opts.get('force'):
6689 elif not opts.get('force'):
6688 for n in names:
6690 for n in names:
6689 if n in repo.tags():
6691 if n in repo.tags():
6690 raise error.Abort(_("tag '%s' already exists "
6692 raise error.Abort(_("tag '%s' already exists "
6691 "(use -f to force)") % n)
6693 "(use -f to force)") % n)
6692 if not opts.get('local'):
6694 if not opts.get('local'):
6693 p1, p2 = repo.dirstate.parents()
6695 p1, p2 = repo.dirstate.parents()
6694 if p2 != nullid:
6696 if p2 != nullid:
6695 raise error.Abort(_('uncommitted merge'))
6697 raise error.Abort(_('uncommitted merge'))
6696 bheads = repo.branchheads()
6698 bheads = repo.branchheads()
6697 if not opts.get('force') and bheads and p1 not in bheads:
6699 if not opts.get('force') and bheads and p1 not in bheads:
6698 raise error.Abort(_('not at a branch head (use -f to force)'))
6700 raise error.Abort(_('not at a branch head (use -f to force)'))
6699 r = scmutil.revsingle(repo, rev_).node()
6701 r = scmutil.revsingle(repo, rev_).node()
6700
6702
6701 if not message:
6703 if not message:
6702 # we don't translate commit messages
6704 # we don't translate commit messages
6703 message = ('Added tag %s for changeset %s' %
6705 message = ('Added tag %s for changeset %s' %
6704 (', '.join(names), short(r)))
6706 (', '.join(names), short(r)))
6705
6707
6706 date = opts.get('date')
6708 date = opts.get('date')
6707 if date:
6709 if date:
6708 date = util.parsedate(date)
6710 date = util.parsedate(date)
6709
6711
6710 if opts.get('remove'):
6712 if opts.get('remove'):
6711 editform = 'tag.remove'
6713 editform = 'tag.remove'
6712 else:
6714 else:
6713 editform = 'tag.add'
6715 editform = 'tag.add'
6714 editor = cmdutil.getcommiteditor(editform=editform, **opts)
6716 editor = cmdutil.getcommiteditor(editform=editform, **opts)
6715
6717
6716 # don't allow tagging the null rev
6718 # don't allow tagging the null rev
6717 if (not opts.get('remove') and
6719 if (not opts.get('remove') and
6718 scmutil.revsingle(repo, rev_).rev() == nullrev):
6720 scmutil.revsingle(repo, rev_).rev() == nullrev):
6719 raise error.Abort(_("cannot tag null revision"))
6721 raise error.Abort(_("cannot tag null revision"))
6720
6722
6721 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
6723 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
6722 editor=editor)
6724 editor=editor)
6723 finally:
6725 finally:
6724 release(lock, wlock)
6726 release(lock, wlock)
6725
6727
6726 @command('tags', formatteropts, '')
6728 @command('tags', formatteropts, '')
6727 def tags(ui, repo, **opts):
6729 def tags(ui, repo, **opts):
6728 """list repository tags
6730 """list repository tags
6729
6731
6730 This lists both regular and local tags. When the -v/--verbose
6732 This lists both regular and local tags. When the -v/--verbose
6731 switch is used, a third column "local" is printed for local tags.
6733 switch is used, a third column "local" is printed for local tags.
6732 When the -q/--quiet switch is used, only the tag name is printed.
6734 When the -q/--quiet switch is used, only the tag name is printed.
6733
6735
6734 Returns 0 on success.
6736 Returns 0 on success.
6735 """
6737 """
6736
6738
6737 fm = ui.formatter('tags', opts)
6739 fm = ui.formatter('tags', opts)
6738 hexfunc = fm.hexfunc
6740 hexfunc = fm.hexfunc
6739 tagtype = ""
6741 tagtype = ""
6740
6742
6741 for t, n in reversed(repo.tagslist()):
6743 for t, n in reversed(repo.tagslist()):
6742 hn = hexfunc(n)
6744 hn = hexfunc(n)
6743 label = 'tags.normal'
6745 label = 'tags.normal'
6744 tagtype = ''
6746 tagtype = ''
6745 if repo.tagtype(t) == 'local':
6747 if repo.tagtype(t) == 'local':
6746 label = 'tags.local'
6748 label = 'tags.local'
6747 tagtype = 'local'
6749 tagtype = 'local'
6748
6750
6749 fm.startitem()
6751 fm.startitem()
6750 fm.write('tag', '%s', t, label=label)
6752 fm.write('tag', '%s', t, label=label)
6751 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
6753 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
6752 fm.condwrite(not ui.quiet, 'rev node', fmt,
6754 fm.condwrite(not ui.quiet, 'rev node', fmt,
6753 repo.changelog.rev(n), hn, label=label)
6755 repo.changelog.rev(n), hn, label=label)
6754 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
6756 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
6755 tagtype, label=label)
6757 tagtype, label=label)
6756 fm.plain('\n')
6758 fm.plain('\n')
6757 fm.end()
6759 fm.end()
6758
6760
6759 @command('tip',
6761 @command('tip',
6760 [('p', 'patch', None, _('show patch')),
6762 [('p', 'patch', None, _('show patch')),
6761 ('g', 'git', None, _('use git extended diff format')),
6763 ('g', 'git', None, _('use git extended diff format')),
6762 ] + templateopts,
6764 ] + templateopts,
6763 _('[-p] [-g]'))
6765 _('[-p] [-g]'))
6764 def tip(ui, repo, **opts):
6766 def tip(ui, repo, **opts):
6765 """show the tip revision (DEPRECATED)
6767 """show the tip revision (DEPRECATED)
6766
6768
6767 The tip revision (usually just called the tip) is the changeset
6769 The tip revision (usually just called the tip) is the changeset
6768 most recently added to the repository (and therefore the most
6770 most recently added to the repository (and therefore the most
6769 recently changed head).
6771 recently changed head).
6770
6772
6771 If you have just made a commit, that commit will be the tip. If
6773 If you have just made a commit, that commit will be the tip. If
6772 you have just pulled changes from another repository, the tip of
6774 you have just pulled changes from another repository, the tip of
6773 that repository becomes the current tip. The "tip" tag is special
6775 that repository becomes the current tip. The "tip" tag is special
6774 and cannot be renamed or assigned to a different changeset.
6776 and cannot be renamed or assigned to a different changeset.
6775
6777
6776 This command is deprecated, please use :hg:`heads` instead.
6778 This command is deprecated, please use :hg:`heads` instead.
6777
6779
6778 Returns 0 on success.
6780 Returns 0 on success.
6779 """
6781 """
6780 displayer = cmdutil.show_changeset(ui, repo, opts)
6782 displayer = cmdutil.show_changeset(ui, repo, opts)
6781 displayer.show(repo['tip'])
6783 displayer.show(repo['tip'])
6782 displayer.close()
6784 displayer.close()
6783
6785
6784 @command('unbundle',
6786 @command('unbundle',
6785 [('u', 'update', None,
6787 [('u', 'update', None,
6786 _('update to new branch head if changesets were unbundled'))],
6788 _('update to new branch head if changesets were unbundled'))],
6787 _('[-u] FILE...'))
6789 _('[-u] FILE...'))
6788 def unbundle(ui, repo, fname1, *fnames, **opts):
6790 def unbundle(ui, repo, fname1, *fnames, **opts):
6789 """apply one or more changegroup files
6791 """apply one or more changegroup files
6790
6792
6791 Apply one or more compressed changegroup files generated by the
6793 Apply one or more compressed changegroup files generated by the
6792 bundle command.
6794 bundle command.
6793
6795
6794 Returns 0 on success, 1 if an update has unresolved files.
6796 Returns 0 on success, 1 if an update has unresolved files.
6795 """
6797 """
6796 fnames = (fname1,) + fnames
6798 fnames = (fname1,) + fnames
6797
6799
6798 lock = repo.lock()
6800 lock = repo.lock()
6799 try:
6801 try:
6800 for fname in fnames:
6802 for fname in fnames:
6801 f = hg.openpath(ui, fname)
6803 f = hg.openpath(ui, fname)
6802 gen = exchange.readbundle(ui, f, fname)
6804 gen = exchange.readbundle(ui, f, fname)
6803 if isinstance(gen, bundle2.unbundle20):
6805 if isinstance(gen, bundle2.unbundle20):
6804 tr = repo.transaction('unbundle')
6806 tr = repo.transaction('unbundle')
6805 try:
6807 try:
6806 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
6808 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
6807 url='bundle:' + fname)
6809 url='bundle:' + fname)
6808 tr.close()
6810 tr.close()
6809 except error.BundleUnknownFeatureError as exc:
6811 except error.BundleUnknownFeatureError as exc:
6810 raise error.Abort(_('%s: unknown bundle feature, %s')
6812 raise error.Abort(_('%s: unknown bundle feature, %s')
6811 % (fname, exc),
6813 % (fname, exc),
6812 hint=_("see https://mercurial-scm.org/"
6814 hint=_("see https://mercurial-scm.org/"
6813 "wiki/BundleFeature for more "
6815 "wiki/BundleFeature for more "
6814 "information"))
6816 "information"))
6815 finally:
6817 finally:
6816 if tr:
6818 if tr:
6817 tr.release()
6819 tr.release()
6818 changes = [r.get('return', 0)
6820 changes = [r.get('return', 0)
6819 for r in op.records['changegroup']]
6821 for r in op.records['changegroup']]
6820 modheads = changegroup.combineresults(changes)
6822 modheads = changegroup.combineresults(changes)
6821 elif isinstance(gen, streamclone.streamcloneapplier):
6823 elif isinstance(gen, streamclone.streamcloneapplier):
6822 raise error.Abort(
6824 raise error.Abort(
6823 _('packed bundles cannot be applied with '
6825 _('packed bundles cannot be applied with '
6824 '"hg unbundle"'),
6826 '"hg unbundle"'),
6825 hint=_('use "hg debugapplystreamclonebundle"'))
6827 hint=_('use "hg debugapplystreamclonebundle"'))
6826 else:
6828 else:
6827 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
6829 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
6828 finally:
6830 finally:
6829 lock.release()
6831 lock.release()
6830
6832
6831 return postincoming(ui, repo, modheads, opts.get('update'), None)
6833 return postincoming(ui, repo, modheads, opts.get('update'), None)
6832
6834
6833 @command('^update|up|checkout|co',
6835 @command('^update|up|checkout|co',
6834 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6836 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6835 ('c', 'check', None,
6837 ('c', 'check', None,
6836 _('update across branches if no uncommitted changes')),
6838 _('update across branches if no uncommitted changes')),
6837 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6839 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6838 ('r', 'rev', '', _('revision'), _('REV'))
6840 ('r', 'rev', '', _('revision'), _('REV'))
6839 ] + mergetoolopts,
6841 ] + mergetoolopts,
6840 _('[-c] [-C] [-d DATE] [[-r] REV]'))
6842 _('[-c] [-C] [-d DATE] [[-r] REV]'))
6841 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
6843 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
6842 tool=None):
6844 tool=None):
6843 """update working directory (or switch revisions)
6845 """update working directory (or switch revisions)
6844
6846
6845 Update the repository's working directory to the specified
6847 Update the repository's working directory to the specified
6846 changeset. If no changeset is specified, update to the tip of the
6848 changeset. If no changeset is specified, update to the tip of the
6847 current named branch and move the active bookmark (see :hg:`help
6849 current named branch and move the active bookmark (see :hg:`help
6848 bookmarks`).
6850 bookmarks`).
6849
6851
6850 Update sets the working directory's parent revision to the specified
6852 Update sets the working directory's parent revision to the specified
6851 changeset (see :hg:`help parents`).
6853 changeset (see :hg:`help parents`).
6852
6854
6853 If the changeset is not a descendant or ancestor of the working
6855 If the changeset is not a descendant or ancestor of the working
6854 directory's parent, the update is aborted. With the -c/--check
6856 directory's parent, the update is aborted. With the -c/--check
6855 option, the working directory is checked for uncommitted changes; if
6857 option, the working directory is checked for uncommitted changes; if
6856 none are found, the working directory is updated to the specified
6858 none are found, the working directory is updated to the specified
6857 changeset.
6859 changeset.
6858
6860
6859 .. container:: verbose
6861 .. container:: verbose
6860
6862
6861 The following rules apply when the working directory contains
6863 The following rules apply when the working directory contains
6862 uncommitted changes:
6864 uncommitted changes:
6863
6865
6864 1. If neither -c/--check nor -C/--clean is specified, and if
6866 1. If neither -c/--check nor -C/--clean is specified, and if
6865 the requested changeset is an ancestor or descendant of
6867 the requested changeset is an ancestor or descendant of
6866 the working directory's parent, the uncommitted changes
6868 the working directory's parent, the uncommitted changes
6867 are merged into the requested changeset and the merged
6869 are merged into the requested changeset and the merged
6868 result is left uncommitted. If the requested changeset is
6870 result is left uncommitted. If the requested changeset is
6869 not an ancestor or descendant (that is, it is on another
6871 not an ancestor or descendant (that is, it is on another
6870 branch), the update is aborted and the uncommitted changes
6872 branch), the update is aborted and the uncommitted changes
6871 are preserved.
6873 are preserved.
6872
6874
6873 2. With the -c/--check option, the update is aborted and the
6875 2. With the -c/--check option, the update is aborted and the
6874 uncommitted changes are preserved.
6876 uncommitted changes are preserved.
6875
6877
6876 3. With the -C/--clean option, uncommitted changes are discarded and
6878 3. With the -C/--clean option, uncommitted changes are discarded and
6877 the working directory is updated to the requested changeset.
6879 the working directory is updated to the requested changeset.
6878
6880
6879 To cancel an uncommitted merge (and lose your changes), use
6881 To cancel an uncommitted merge (and lose your changes), use
6880 :hg:`update --clean .`.
6882 :hg:`update --clean .`.
6881
6883
6882 Use null as the changeset to remove the working directory (like
6884 Use null as the changeset to remove the working directory (like
6883 :hg:`clone -U`).
6885 :hg:`clone -U`).
6884
6886
6885 If you want to revert just one file to an older revision, use
6887 If you want to revert just one file to an older revision, use
6886 :hg:`revert [-r REV] NAME`.
6888 :hg:`revert [-r REV] NAME`.
6887
6889
6888 See :hg:`help dates` for a list of formats valid for -d/--date.
6890 See :hg:`help dates` for a list of formats valid for -d/--date.
6889
6891
6890 Returns 0 on success, 1 if there are unresolved files.
6892 Returns 0 on success, 1 if there are unresolved files.
6891 """
6893 """
6892 movemarkfrom = None
6894 movemarkfrom = None
6893 if rev and node:
6895 if rev and node:
6894 raise error.Abort(_("please specify just one revision"))
6896 raise error.Abort(_("please specify just one revision"))
6895
6897
6896 if rev is None or rev == '':
6898 if rev is None or rev == '':
6897 rev = node
6899 rev = node
6898
6900
6899 wlock = repo.wlock()
6901 wlock = repo.wlock()
6900 try:
6902 try:
6901 cmdutil.clearunfinished(repo)
6903 cmdutil.clearunfinished(repo)
6902
6904
6903 if date:
6905 if date:
6904 if rev is not None:
6906 if rev is not None:
6905 raise error.Abort(_("you can't specify a revision and a date"))
6907 raise error.Abort(_("you can't specify a revision and a date"))
6906 rev = cmdutil.finddate(ui, repo, date)
6908 rev = cmdutil.finddate(ui, repo, date)
6907
6909
6908 # if we defined a bookmark, we have to remember the original name
6910 # if we defined a bookmark, we have to remember the original name
6909 brev = rev
6911 brev = rev
6910 rev = scmutil.revsingle(repo, rev, rev).rev()
6912 rev = scmutil.revsingle(repo, rev, rev).rev()
6911
6913
6912 if check and clean:
6914 if check and clean:
6913 raise error.Abort(_("cannot specify both -c/--check and -C/--clean")
6915 raise error.Abort(_("cannot specify both -c/--check and -C/--clean")
6914 )
6916 )
6915
6917
6916 if check:
6918 if check:
6917 cmdutil.bailifchanged(repo, merge=False)
6919 cmdutil.bailifchanged(repo, merge=False)
6918 if rev is None:
6920 if rev is None:
6919 updata = destutil.destupdate(repo, clean=clean, check=check)
6921 updata = destutil.destupdate(repo, clean=clean, check=check)
6920 rev, movemarkfrom, brev = updata
6922 rev, movemarkfrom, brev = updata
6921
6923
6922 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
6924 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
6923
6925
6924 if clean:
6926 if clean:
6925 ret = hg.clean(repo, rev)
6927 ret = hg.clean(repo, rev)
6926 else:
6928 else:
6927 ret = hg.update(repo, rev)
6929 ret = hg.update(repo, rev)
6928
6930
6929 if not ret and movemarkfrom:
6931 if not ret and movemarkfrom:
6930 if movemarkfrom == repo['.'].node():
6932 if movemarkfrom == repo['.'].node():
6931 pass # no-op update
6933 pass # no-op update
6932 elif bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
6934 elif bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
6933 ui.status(_("updating bookmark %s\n") % repo._activebookmark)
6935 ui.status(_("updating bookmark %s\n") % repo._activebookmark)
6934 else:
6936 else:
6935 # this can happen with a non-linear update
6937 # this can happen with a non-linear update
6936 ui.status(_("(leaving bookmark %s)\n") %
6938 ui.status(_("(leaving bookmark %s)\n") %
6937 repo._activebookmark)
6939 repo._activebookmark)
6938 bookmarks.deactivate(repo)
6940 bookmarks.deactivate(repo)
6939 elif brev in repo._bookmarks:
6941 elif brev in repo._bookmarks:
6940 bookmarks.activate(repo, brev)
6942 bookmarks.activate(repo, brev)
6941 ui.status(_("(activating bookmark %s)\n") % brev)
6943 ui.status(_("(activating bookmark %s)\n") % brev)
6942 elif brev:
6944 elif brev:
6943 if repo._activebookmark:
6945 if repo._activebookmark:
6944 ui.status(_("(leaving bookmark %s)\n") %
6946 ui.status(_("(leaving bookmark %s)\n") %
6945 repo._activebookmark)
6947 repo._activebookmark)
6946 bookmarks.deactivate(repo)
6948 bookmarks.deactivate(repo)
6947 finally:
6949 finally:
6948 wlock.release()
6950 wlock.release()
6949
6951
6950 return ret
6952 return ret
6951
6953
6952 @command('verify', [])
6954 @command('verify', [])
6953 def verify(ui, repo):
6955 def verify(ui, repo):
6954 """verify the integrity of the repository
6956 """verify the integrity of the repository
6955
6957
6956 Verify the integrity of the current repository.
6958 Verify the integrity of the current repository.
6957
6959
6958 This will perform an extensive check of the repository's
6960 This will perform an extensive check of the repository's
6959 integrity, validating the hashes and checksums of each entry in
6961 integrity, validating the hashes and checksums of each entry in
6960 the changelog, manifest, and tracked files, as well as the
6962 the changelog, manifest, and tracked files, as well as the
6961 integrity of their crosslinks and indices.
6963 integrity of their crosslinks and indices.
6962
6964
6963 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
6965 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
6964 for more information about recovery from corruption of the
6966 for more information about recovery from corruption of the
6965 repository.
6967 repository.
6966
6968
6967 Returns 0 on success, 1 if errors are encountered.
6969 Returns 0 on success, 1 if errors are encountered.
6968 """
6970 """
6969 return hg.verify(repo)
6971 return hg.verify(repo)
6970
6972
6971 @command('version', [], norepo=True)
6973 @command('version', [], norepo=True)
6972 def version_(ui):
6974 def version_(ui):
6973 """output version and copyright information"""
6975 """output version and copyright information"""
6974 ui.write(_("Mercurial Distributed SCM (version %s)\n")
6976 ui.write(_("Mercurial Distributed SCM (version %s)\n")
6975 % util.version())
6977 % util.version())
6976 ui.status(_(
6978 ui.status(_(
6977 "(see https://mercurial-scm.org for more information)\n"
6979 "(see https://mercurial-scm.org for more information)\n"
6978 "\nCopyright (C) 2005-2015 Matt Mackall and others\n"
6980 "\nCopyright (C) 2005-2015 Matt Mackall and others\n"
6979 "This is free software; see the source for copying conditions. "
6981 "This is free software; see the source for copying conditions. "
6980 "There is NO\nwarranty; "
6982 "There is NO\nwarranty; "
6981 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6983 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6982 ))
6984 ))
6983
6985
6984 ui.note(_("\nEnabled extensions:\n\n"))
6986 ui.note(_("\nEnabled extensions:\n\n"))
6985 if ui.verbose:
6987 if ui.verbose:
6986 # format names and versions into columns
6988 # format names and versions into columns
6987 names = []
6989 names = []
6988 vers = []
6990 vers = []
6989 for name, module in extensions.extensions():
6991 for name, module in extensions.extensions():
6990 names.append(name)
6992 names.append(name)
6991 vers.append(extensions.moduleversion(module))
6993 vers.append(extensions.moduleversion(module))
6992 if names:
6994 if names:
6993 maxnamelen = max(len(n) for n in names)
6995 maxnamelen = max(len(n) for n in names)
6994 for i, name in enumerate(names):
6996 for i, name in enumerate(names):
6995 ui.write(" %-*s %s\n" % (maxnamelen, name, vers[i]))
6997 ui.write(" %-*s %s\n" % (maxnamelen, name, vers[i]))
@@ -1,2628 +1,2631 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 (except files
350 If no names are given, add all files to the repository (except files
351 matching ".hgignore").
351 matching ".hgignore").
352
352
353 Returns 0 if all files are successfully added.
353 Returns 0 if all files are successfully added.
354
354
355 options ([+] can be repeated):
355 options ([+] can be repeated):
356
356
357 -I --include PATTERN [+] include names matching the given patterns
357 -I --include PATTERN [+] include names matching the given patterns
358 -X --exclude PATTERN [+] exclude names matching the given patterns
358 -X --exclude PATTERN [+] exclude names matching the given patterns
359 -S --subrepos recurse into subrepositories
359 -S --subrepos recurse into subrepositories
360 -n --dry-run do not perform actions, just print output
360 -n --dry-run do not perform actions, just print output
361
361
362 (some details hidden, use --verbose to show complete help)
362 (some details hidden, use --verbose to show complete help)
363
363
364 Verbose help for add
364 Verbose help for add
365
365
366 $ hg add -hv
366 $ hg add -hv
367 hg add [OPTION]... [FILE]...
367 hg add [OPTION]... [FILE]...
368
368
369 add the specified files on the next commit
369 add the specified files on the next commit
370
370
371 Schedule files to be version controlled and added to the repository.
371 Schedule files to be version controlled and added to the repository.
372
372
373 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
374 add before that, see "hg forget".
374 add before that, see "hg forget".
375
375
376 If no names are given, add all files to the repository (except files
376 If no names are given, add all files to the repository (except files
377 matching ".hgignore").
377 matching ".hgignore").
378
378
379 Examples:
379 Examples:
380
380
381 - New (unknown) files are added automatically by "hg add":
381 - New (unknown) files are added automatically by "hg add":
382
382
383 $ ls
383 $ ls
384 foo.c
384 foo.c
385 $ hg status
385 $ hg status
386 ? foo.c
386 ? foo.c
387 $ hg add
387 $ hg add
388 adding foo.c
388 adding foo.c
389 $ hg status
389 $ hg status
390 A foo.c
390 A foo.c
391
391
392 - Specific files to be added can be specified:
392 - Specific files to be added can be specified:
393
393
394 $ ls
394 $ ls
395 bar.c foo.c
395 bar.c foo.c
396 $ hg status
396 $ hg status
397 ? bar.c
397 ? bar.c
398 ? foo.c
398 ? foo.c
399 $ hg add bar.c
399 $ hg add bar.c
400 $ hg status
400 $ hg status
401 A bar.c
401 A bar.c
402 ? foo.c
402 ? foo.c
403
403
404 Returns 0 if all files are successfully added.
404 Returns 0 if all files are successfully added.
405
405
406 options ([+] can be repeated):
406 options ([+] can be repeated):
407
407
408 -I --include PATTERN [+] include names matching the given patterns
408 -I --include PATTERN [+] include names matching the given patterns
409 -X --exclude PATTERN [+] exclude names matching the given patterns
409 -X --exclude PATTERN [+] exclude names matching the given patterns
410 -S --subrepos recurse into subrepositories
410 -S --subrepos recurse into subrepositories
411 -n --dry-run do not perform actions, just print output
411 -n --dry-run do not perform actions, just print output
412
412
413 global options ([+] can be repeated):
413 global options ([+] can be repeated):
414
414
415 -R --repository REPO repository root directory or name of overlay bundle
415 -R --repository REPO repository root directory or name of overlay bundle
416 file
416 file
417 --cwd DIR change working directory
417 --cwd DIR change working directory
418 -y --noninteractive do not prompt, automatically pick the first choice for
418 -y --noninteractive do not prompt, automatically pick the first choice for
419 all prompts
419 all prompts
420 -q --quiet suppress output
420 -q --quiet suppress output
421 -v --verbose enable additional output
421 -v --verbose enable additional output
422 --config CONFIG [+] set/override config option (use 'section.name=value')
422 --config CONFIG [+] set/override config option (use 'section.name=value')
423 --debug enable debugging output
423 --debug enable debugging output
424 --debugger start debugger
424 --debugger start debugger
425 --encoding ENCODE set the charset encoding (default: ascii)
425 --encoding ENCODE set the charset encoding (default: ascii)
426 --encodingmode MODE set the charset encoding mode (default: strict)
426 --encodingmode MODE set the charset encoding mode (default: strict)
427 --traceback always print a traceback on exception
427 --traceback always print a traceback on exception
428 --time time how long the command takes
428 --time time how long the command takes
429 --profile print command execution profile
429 --profile print command execution profile
430 --version output version information and exit
430 --version output version information and exit
431 -h --help display help and exit
431 -h --help display help and exit
432 --hidden consider hidden changesets
432 --hidden consider hidden changesets
433
433
434 Test help option with version option
434 Test help option with version option
435
435
436 $ hg add -h --version
436 $ hg add -h --version
437 Mercurial Distributed SCM (version *) (glob)
437 Mercurial Distributed SCM (version *) (glob)
438 (see https://mercurial-scm.org for more information)
438 (see https://mercurial-scm.org for more information)
439
439
440 Copyright (C) 2005-2015 Matt Mackall and others
440 Copyright (C) 2005-2015 Matt Mackall and others
441 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
442 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
442 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
443
443
444 $ hg add --skjdfks
444 $ hg add --skjdfks
445 hg add: option --skjdfks not recognized
445 hg add: option --skjdfks not recognized
446 hg add [OPTION]... [FILE]...
446 hg add [OPTION]... [FILE]...
447
447
448 add the specified files on the next commit
448 add the specified files on the next commit
449
449
450 options ([+] can be repeated):
450 options ([+] can be repeated):
451
451
452 -I --include PATTERN [+] include names matching the given patterns
452 -I --include PATTERN [+] include names matching the given patterns
453 -X --exclude PATTERN [+] exclude names matching the given patterns
453 -X --exclude PATTERN [+] exclude names matching the given patterns
454 -S --subrepos recurse into subrepositories
454 -S --subrepos recurse into subrepositories
455 -n --dry-run do not perform actions, just print output
455 -n --dry-run do not perform actions, just print output
456
456
457 (use "hg add -h" to show more help)
457 (use "hg add -h" to show more help)
458 [255]
458 [255]
459
459
460 Test ambiguous command help
460 Test ambiguous command help
461
461
462 $ hg help ad
462 $ hg help ad
463 list of commands:
463 list of commands:
464
464
465 add add the specified files on the next commit
465 add add the specified files on the next commit
466 addremove add all new files, delete all missing files
466 addremove add all new files, delete all missing files
467
467
468 (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)
469
469
470 Test command without options
470 Test command without options
471
471
472 $ hg help verify
472 $ hg help verify
473 hg verify
473 hg verify
474
474
475 verify the integrity of the repository
475 verify the integrity of the repository
476
476
477 Verify the integrity of the current repository.
477 Verify the integrity of the current repository.
478
478
479 This will perform an extensive check of the repository's integrity,
479 This will perform an extensive check of the repository's integrity,
480 validating the hashes and checksums of each entry in the changelog,
480 validating the hashes and checksums of each entry in the changelog,
481 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
482 and indices.
482 and indices.
483
483
484 Please see https://mercurial-scm.org/wiki/RepositoryCorruption for more
484 Please see https://mercurial-scm.org/wiki/RepositoryCorruption for more
485 information about recovery from corruption of the repository.
485 information about recovery from corruption of the repository.
486
486
487 Returns 0 on success, 1 if errors are encountered.
487 Returns 0 on success, 1 if errors are encountered.
488
488
489 (some details hidden, use --verbose to show complete help)
489 (some details hidden, use --verbose to show complete help)
490
490
491 $ hg help diff
491 $ hg help diff
492 hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...
492 hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...
493
493
494 diff repository (or selected files)
494 diff repository (or selected files)
495
495
496 Show differences between revisions for the specified files.
496 Show differences between revisions for the specified files.
497
497
498 Differences between files are shown using the unified diff format.
498 Differences between files are shown using the unified diff format.
499
499
500 Note:
500 Note:
501 "hg diff" may generate unexpected results for merges, as it will
501 "hg diff" may generate unexpected results for merges, as it will
502 default to comparing against the working directory's first parent
502 default to comparing against the working directory's first parent
503 changeset if no revisions are specified.
503 changeset if no revisions are specified.
504
504
505 When two revision arguments are given, then changes are shown between
505 When two revision arguments are given, then changes are shown between
506 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
507 compared to the working directory, and, when no revisions are specified,
507 compared to the working directory, and, when no revisions are specified,
508 the working directory files are compared to its first parent.
508 the working directory files are compared to its first parent.
509
509
510 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
511 changes in that changeset relative to its first parent.
511 changes in that changeset relative to its first parent.
512
512
513 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
514 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
515 with undesirable results.
515 with undesirable results.
516
516
517 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.
518 For more information, read "hg help diffs".
518 For more information, read "hg help diffs".
519
519
520 Returns 0 on success.
520 Returns 0 on success.
521
521
522 options ([+] can be repeated):
522 options ([+] can be repeated):
523
523
524 -r --rev REV [+] revision
524 -r --rev REV [+] revision
525 -c --change REV change made by revision
525 -c --change REV change made by revision
526 -a --text treat all files as text
526 -a --text treat all files as text
527 -g --git use git extended diff format
527 -g --git use git extended diff format
528 --nodates omit dates from diff headers
528 --nodates omit dates from diff headers
529 --noprefix omit a/ and b/ prefixes from filenames
529 --noprefix omit a/ and b/ prefixes from filenames
530 -p --show-function show which function each change is in
530 -p --show-function show which function each change is in
531 --reverse produce a diff that undoes the changes
531 --reverse produce a diff that undoes the changes
532 -w --ignore-all-space ignore white space when comparing lines
532 -w --ignore-all-space ignore white space when comparing lines
533 -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
534 -B --ignore-blank-lines ignore changes whose lines are all blank
534 -B --ignore-blank-lines ignore changes whose lines are all blank
535 -U --unified NUM number of lines of context to show
535 -U --unified NUM number of lines of context to show
536 --stat output diffstat-style summary of changes
536 --stat output diffstat-style summary of changes
537 --root DIR produce diffs relative to subdirectory
537 --root DIR produce diffs relative to subdirectory
538 -I --include PATTERN [+] include names matching the given patterns
538 -I --include PATTERN [+] include names matching the given patterns
539 -X --exclude PATTERN [+] exclude names matching the given patterns
539 -X --exclude PATTERN [+] exclude names matching the given patterns
540 -S --subrepos recurse into subrepositories
540 -S --subrepos recurse into subrepositories
541
541
542 (some details hidden, use --verbose to show complete help)
542 (some details hidden, use --verbose to show complete help)
543
543
544 $ hg help status
544 $ hg help status
545 hg status [OPTION]... [FILE]...
545 hg status [OPTION]... [FILE]...
546
546
547 aliases: st
547 aliases: st
548
548
549 show changed files in the working directory
549 show changed files in the working directory
550
550
551 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
552 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
553 copy/move operation, are not listed unless -c/--clean, -i/--ignored,
553 copy/move operation, are not listed unless -c/--clean, -i/--ignored,
554 -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
555 only ..." are given, the options -mardu are used.
555 only ..." are given, the options -mardu are used.
556
556
557 Option -q/--quiet hides untracked (unknown and ignored) files unless
557 Option -q/--quiet hides untracked (unknown and ignored) files unless
558 explicitly requested with -u/--unknown or -i/--ignored.
558 explicitly requested with -u/--unknown or -i/--ignored.
559
559
560 Note:
560 Note:
561 "hg status" may appear to disagree with diff if permissions have
561 "hg status" may appear to disagree with diff if permissions have
562 changed or a merge has occurred. The standard diff format does not
562 changed or a merge has occurred. The standard diff format does not
563 report permission changes and diff only reports changes relative to one
563 report permission changes and diff only reports changes relative to one
564 merge parent.
564 merge parent.
565
565
566 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
567 revisions are given, the differences between them are shown. The --change
567 revisions are given, the differences between them are shown. The --change
568 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
569 revision from its first parent.
569 revision from its first parent.
570
570
571 The codes used to show the status of files are:
571 The codes used to show the status of files are:
572
572
573 M = modified
573 M = modified
574 A = added
574 A = added
575 R = removed
575 R = removed
576 C = clean
576 C = clean
577 ! = missing (deleted by non-hg command, but still tracked)
577 ! = missing (deleted by non-hg command, but still tracked)
578 ? = not tracked
578 ? = not tracked
579 I = ignored
579 I = ignored
580 = origin of the previous file (with --copies)
580 = origin of the previous file (with --copies)
581
581
582 Returns 0 on success.
582 Returns 0 on success.
583
583
584 options ([+] can be repeated):
584 options ([+] can be repeated):
585
585
586 -A --all show status of all files
586 -A --all show status of all files
587 -m --modified show only modified files
587 -m --modified show only modified files
588 -a --added show only added files
588 -a --added show only added files
589 -r --removed show only removed files
589 -r --removed show only removed files
590 -d --deleted show only deleted (but tracked) files
590 -d --deleted show only deleted (but tracked) files
591 -c --clean show only files without changes
591 -c --clean show only files without changes
592 -u --unknown show only unknown (not tracked) files
592 -u --unknown show only unknown (not tracked) files
593 -i --ignored show only ignored files
593 -i --ignored show only ignored files
594 -n --no-status hide status prefix
594 -n --no-status hide status prefix
595 -C --copies show source of copied files
595 -C --copies show source of copied files
596 -0 --print0 end filenames with NUL, for use with xargs
596 -0 --print0 end filenames with NUL, for use with xargs
597 --rev REV [+] show difference from revision
597 --rev REV [+] show difference from revision
598 --change REV list the changed files of a revision
598 --change REV list the changed files of a revision
599 -I --include PATTERN [+] include names matching the given patterns
599 -I --include PATTERN [+] include names matching the given patterns
600 -X --exclude PATTERN [+] exclude names matching the given patterns
600 -X --exclude PATTERN [+] exclude names matching the given patterns
601 -S --subrepos recurse into subrepositories
601 -S --subrepos recurse into subrepositories
602
602
603 (some details hidden, use --verbose to show complete help)
603 (some details hidden, use --verbose to show complete help)
604
604
605 $ hg -q help status
605 $ hg -q help status
606 hg status [OPTION]... [FILE]...
606 hg status [OPTION]... [FILE]...
607
607
608 show changed files in the working directory
608 show changed files in the working directory
609
609
610 $ hg help foo
610 $ hg help foo
611 abort: no such help topic: foo
611 abort: no such help topic: foo
612 (try "hg help --keyword foo")
612 (try "hg help --keyword foo")
613 [255]
613 [255]
614
614
615 $ hg skjdfks
615 $ hg skjdfks
616 hg: unknown command 'skjdfks'
616 hg: unknown command 'skjdfks'
617 Mercurial Distributed SCM
617 Mercurial Distributed SCM
618
618
619 basic commands:
619 basic commands:
620
620
621 add add the specified files on the next commit
621 add add the specified files on the next commit
622 annotate show changeset information by line for each file
622 annotate show changeset information by line for each file
623 clone make a copy of an existing repository
623 clone make a copy of an existing repository
624 commit commit the specified files or all outstanding changes
624 commit commit the specified files or all outstanding changes
625 diff diff repository (or selected files)
625 diff diff repository (or selected files)
626 export dump the header and diffs for one or more changesets
626 export dump the header and diffs for one or more changesets
627 forget forget the specified files on the next commit
627 forget forget the specified files on the next commit
628 init create a new repository in the given directory
628 init create a new repository in the given directory
629 log show revision history of entire repository or files
629 log show revision history of entire repository or files
630 merge merge another revision into working directory
630 merge merge another revision into working directory
631 pull pull changes from the specified source
631 pull pull changes from the specified source
632 push push changes to the specified destination
632 push push changes to the specified destination
633 remove remove the specified files on the next commit
633 remove remove the specified files on the next commit
634 serve start stand-alone webserver
634 serve start stand-alone webserver
635 status show changed files in the working directory
635 status show changed files in the working directory
636 summary summarize working directory state
636 summary summarize working directory state
637 update update working directory (or switch revisions)
637 update update working directory (or switch revisions)
638
638
639 (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)
640 [255]
640 [255]
641
641
642
642
643 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
644 this is a section and erroring out weirdly.
644 this is a section and erroring out weirdly.
645
645
646 $ hg .log
646 $ hg .log
647 hg: unknown command '.log'
647 hg: unknown command '.log'
648 (did you mean one of log?)
648 (did you mean one of log?)
649 [255]
649 [255]
650
650
651 $ hg log.
651 $ hg log.
652 hg: unknown command 'log.'
652 hg: unknown command 'log.'
653 (did you mean one of log?)
653 (did you mean one of log?)
654 [255]
654 [255]
655 $ hg pu.lh
655 $ hg pu.lh
656 hg: unknown command 'pu.lh'
656 hg: unknown command 'pu.lh'
657 (did you mean one of pull, push?)
657 (did you mean one of pull, push?)
658 [255]
658 [255]
659
659
660 $ cat > helpext.py <<EOF
660 $ cat > helpext.py <<EOF
661 > import os
661 > import os
662 > from mercurial import cmdutil, commands
662 > from mercurial import cmdutil, commands
663 >
663 >
664 > cmdtable = {}
664 > cmdtable = {}
665 > command = cmdutil.command(cmdtable)
665 > command = cmdutil.command(cmdtable)
666 >
666 >
667 > @command('nohelp',
667 > @command('nohelp',
668 > [('', 'longdesc', 3, 'x'*90),
668 > [('', 'longdesc', 3, 'x'*90),
669 > ('n', '', None, 'normal desc'),
669 > ('n', '', None, 'normal desc'),
670 > ('', 'newline', '', 'line1\nline2')],
670 > ('', 'newline', '', 'line1\nline2')],
671 > 'hg nohelp',
671 > 'hg nohelp',
672 > norepo=True)
672 > norepo=True)
673 > @command('debugoptDEP', [('', 'dopt', None, 'option is (DEPRECATED)')])
673 > @command('debugoptDEP', [('', 'dopt', None, 'option is (DEPRECATED)')])
674 > @command('debugoptEXP', [('', 'eopt', None, 'option is (EXPERIMENTAL)')])
674 > @command('debugoptEXP', [('', 'eopt', None, 'option is (EXPERIMENTAL)')])
675 > def nohelp(ui, *args, **kwargs):
675 > def nohelp(ui, *args, **kwargs):
676 > pass
676 > pass
677 >
677 >
678 > EOF
678 > EOF
679 $ echo '[extensions]' >> $HGRCPATH
679 $ echo '[extensions]' >> $HGRCPATH
680 $ echo "helpext = `pwd`/helpext.py" >> $HGRCPATH
680 $ echo "helpext = `pwd`/helpext.py" >> $HGRCPATH
681
681
682 Test command with no help text
682 Test command with no help text
683
683
684 $ hg help nohelp
684 $ hg help nohelp
685 hg nohelp
685 hg nohelp
686
686
687 (no help text available)
687 (no help text available)
688
688
689 options:
689 options:
690
690
691 --longdesc VALUE xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
691 --longdesc VALUE xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
692 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx (default: 3)
692 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx (default: 3)
693 -n -- normal desc
693 -n -- normal desc
694 --newline VALUE line1 line2
694 --newline VALUE line1 line2
695
695
696 (some details hidden, use --verbose to show complete help)
696 (some details hidden, use --verbose to show complete help)
697
697
698 $ hg help -k nohelp
698 $ hg help -k nohelp
699 Commands:
699 Commands:
700
700
701 nohelp hg nohelp
701 nohelp hg nohelp
702
702
703 Extension Commands:
703 Extension Commands:
704
704
705 nohelp (no help text available)
705 nohelp (no help text available)
706
706
707 Test that default list of commands omits extension commands
707 Test that default list of commands omits extension commands
708
708
709 $ hg help
709 $ hg help
710 Mercurial Distributed SCM
710 Mercurial Distributed SCM
711
711
712 list of commands:
712 list of commands:
713
713
714 add add the specified files on the next commit
714 add add the specified files on the next commit
715 addremove add all new files, delete all missing files
715 addremove add all new files, delete all missing files
716 annotate show changeset information by line for each file
716 annotate show changeset information by line for each file
717 archive create an unversioned archive of a repository revision
717 archive create an unversioned archive of a repository revision
718 backout reverse effect of earlier changeset
718 backout reverse effect of earlier changeset
719 bisect subdivision search of changesets
719 bisect subdivision search of changesets
720 bookmarks create a new bookmark or list existing bookmarks
720 bookmarks create a new bookmark or list existing bookmarks
721 branch set or show the current branch name
721 branch set or show the current branch name
722 branches list repository named branches
722 branches list repository named branches
723 bundle create a changegroup file
723 bundle create a changegroup file
724 cat output the current or given revision of files
724 cat output the current or given revision of files
725 clone make a copy of an existing repository
725 clone make a copy of an existing repository
726 commit commit the specified files or all outstanding changes
726 commit commit the specified files or all outstanding changes
727 config show combined config settings from all hgrc files
727 config show combined config settings from all hgrc files
728 copy mark files as copied for the next commit
728 copy mark files as copied for the next commit
729 diff diff repository (or selected files)
729 diff diff repository (or selected files)
730 export dump the header and diffs for one or more changesets
730 export dump the header and diffs for one or more changesets
731 files list tracked files
731 files list tracked files
732 forget forget the specified files on the next commit
732 forget forget the specified files on the next commit
733 graft copy changes from other branches onto the current branch
733 graft copy changes from other branches onto the current branch
734 grep search for a pattern in specified files and revisions
734 grep search for a pattern in specified files and revisions
735 heads show branch heads
735 heads show branch heads
736 help show help for a given topic or a help overview
736 help show help for a given topic or a help overview
737 identify identify the working directory or specified revision
737 identify identify the working directory or specified revision
738 import import an ordered set of patches
738 import import an ordered set of patches
739 incoming show new changesets found in source
739 incoming show new changesets found in source
740 init create a new repository in the given directory
740 init create a new repository in the given directory
741 log show revision history of entire repository or files
741 log show revision history of entire repository or files
742 manifest output the current or given revision of the project manifest
742 manifest output the current or given revision of the project manifest
743 merge merge another revision into working directory
743 merge merge another revision into working directory
744 outgoing show changesets not found in the destination
744 outgoing show changesets not found in the destination
745 paths show aliases for remote repositories
745 paths show aliases for remote repositories
746 phase set or show the current phase name
746 phase set or show the current phase name
747 pull pull changes from the specified source
747 pull pull changes from the specified source
748 push push changes to the specified destination
748 push push changes to the specified destination
749 recover roll back an interrupted transaction
749 recover roll back an interrupted transaction
750 remove remove the specified files on the next commit
750 remove remove the specified files on the next commit
751 rename rename files; equivalent of copy + remove
751 rename rename files; equivalent of copy + remove
752 resolve redo merges or set/view the merge status of files
752 resolve redo merges or set/view the merge status of files
753 revert restore files to their checkout state
753 revert restore files to their checkout state
754 root print the root (top) of the current working directory
754 root print the root (top) of the current working directory
755 serve start stand-alone webserver
755 serve start stand-alone webserver
756 status show changed files in the working directory
756 status show changed files in the working directory
757 summary summarize working directory state
757 summary summarize working directory state
758 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
759 tags list repository tags
759 tags list repository tags
760 unbundle apply one or more changegroup files
760 unbundle apply one or more changegroup files
761 update update working directory (or switch revisions)
761 update update working directory (or switch revisions)
762 verify verify the integrity of the repository
762 verify verify the integrity of the repository
763 version output version and copyright information
763 version output version and copyright information
764
764
765 enabled extensions:
765 enabled extensions:
766
766
767 helpext (no help text available)
767 helpext (no help text available)
768
768
769 additional help topics:
769 additional help topics:
770
770
771 config Configuration Files
771 config Configuration Files
772 dates Date Formats
772 dates Date Formats
773 diffs Diff Formats
773 diffs Diff Formats
774 environment Environment Variables
774 environment Environment Variables
775 extensions Using Additional Features
775 extensions Using Additional Features
776 filesets Specifying File Sets
776 filesets Specifying File Sets
777 glossary Glossary
777 glossary Glossary
778 hgignore Syntax for Mercurial Ignore Files
778 hgignore Syntax for Mercurial Ignore Files
779 hgweb Configuring hgweb
779 hgweb Configuring hgweb
780 internals Technical implementation topics
780 internals Technical implementation topics
781 merge-tools Merge Tools
781 merge-tools Merge Tools
782 multirevs Specifying Multiple Revisions
782 multirevs Specifying Multiple Revisions
783 patterns File Name Patterns
783 patterns File Name Patterns
784 phases Working with Phases
784 phases Working with Phases
785 revisions Specifying Single Revisions
785 revisions Specifying Single Revisions
786 revsets Specifying Revision Sets
786 revsets Specifying Revision Sets
787 scripting Using Mercurial from scripts and automation
787 scripting Using Mercurial from scripts and automation
788 subrepos Subrepositories
788 subrepos Subrepositories
789 templating Template Usage
789 templating Template Usage
790 urls URL Paths
790 urls URL Paths
791
791
792 (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)
793
793
794
794
795 Test list of internal help commands
795 Test list of internal help commands
796
796
797 $ hg help debug
797 $ hg help debug
798 debug commands (internal and unsupported):
798 debug commands (internal and unsupported):
799
799
800 debugancestor
800 debugancestor
801 find the ancestor revision of two revisions in a given index
801 find the ancestor revision of two revisions in a given index
802 debugapplystreamclonebundle
802 debugapplystreamclonebundle
803 apply a stream clone bundle file
803 apply a stream clone bundle file
804 debugbuilddag
804 debugbuilddag
805 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
806 empty repo
806 empty repo
807 debugbundle lists the contents of a bundle
807 debugbundle lists the contents of a bundle
808 debugcheckstate
808 debugcheckstate
809 validate the correctness of the current dirstate
809 validate the correctness of the current dirstate
810 debugcommands
810 debugcommands
811 list all available commands and options
811 list all available commands and options
812 debugcomplete
812 debugcomplete
813 returns the completion list associated with the given command
813 returns the completion list associated with the given command
814 debugcreatestreamclonebundle
814 debugcreatestreamclonebundle
815 create a stream clone bundle file
815 create a stream clone bundle file
816 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
817 description
817 description
818 debugdata dump the contents of a data file revision
818 debugdata dump the contents of a data file revision
819 debugdate parse and display a date
819 debugdate parse and display a date
820 debugdeltachain
820 debugdeltachain
821 dump information about delta chains in a revlog
821 dump information about delta chains in a revlog
822 debugdirstate
822 debugdirstate
823 show the contents of the current dirstate
823 show the contents of the current dirstate
824 debugdiscovery
824 debugdiscovery
825 runs the changeset discovery protocol in isolation
825 runs the changeset discovery protocol in isolation
826 debugextensions
826 debugextensions
827 show information about active extensions
827 show information about active extensions
828 debugfileset parse and apply a fileset specification
828 debugfileset parse and apply a fileset specification
829 debugfsinfo show information detected about current filesystem
829 debugfsinfo show information detected about current filesystem
830 debuggetbundle
830 debuggetbundle
831 retrieves a bundle from a repo
831 retrieves a bundle from a repo
832 debugignore display the combined ignore pattern
832 debugignore display the combined ignore pattern
833 debugindex dump the contents of an index file
833 debugindex dump the contents of an index file
834 debugindexdot
834 debugindexdot
835 dump an index DAG as a graphviz dot file
835 dump an index DAG as a graphviz dot file
836 debuginstall test Mercurial installation
836 debuginstall test Mercurial installation
837 debugknown test whether node ids are known to a repo
837 debugknown test whether node ids are known to a repo
838 debuglocks show or modify state of locks
838 debuglocks show or modify state of locks
839 debugmergestate
839 debugmergestate
840 print merge state
840 print merge state
841 debugnamecomplete
841 debugnamecomplete
842 complete "names" - tags, open branch names, bookmark names
842 complete "names" - tags, open branch names, bookmark names
843 debugobsolete
843 debugobsolete
844 create arbitrary obsolete marker
844 create arbitrary obsolete marker
845 debugoptDEP (no help text available)
845 debugoptDEP (no help text available)
846 debugoptEXP (no help text available)
846 debugoptEXP (no help text available)
847 debugpathcomplete
847 debugpathcomplete
848 complete part or all of a tracked path
848 complete part or all of a tracked path
849 debugpushkey access the pushkey key/value protocol
849 debugpushkey access the pushkey key/value protocol
850 debugpvec (no help text available)
850 debugpvec (no help text available)
851 debugrebuilddirstate
851 debugrebuilddirstate
852 rebuild the dirstate as it would look like for the given
852 rebuild the dirstate as it would look like for the given
853 revision
853 revision
854 debugrebuildfncache
854 debugrebuildfncache
855 rebuild the fncache file
855 rebuild the fncache file
856 debugrename dump rename information
856 debugrename dump rename information
857 debugrevlog show data and statistics about a revlog
857 debugrevlog show data and statistics about a revlog
858 debugrevspec parse and apply a revision specification
858 debugrevspec parse and apply a revision specification
859 debugsetparents
859 debugsetparents
860 manually set the parents of the current working directory
860 manually set the parents of the current working directory
861 debugsub (no help text available)
861 debugsub (no help text available)
862 debugsuccessorssets
862 debugsuccessorssets
863 show set of successors for revision
863 show set of successors for revision
864 debugwalk show how files match on given patterns
864 debugwalk show how files match on given patterns
865 debugwireargs
865 debugwireargs
866 (no help text available)
866 (no help text available)
867
867
868 (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)
869
869
870 internals topic renders index of available sub-topics
870 internals topic renders index of available sub-topics
871
871
872 $ hg help internals
872 $ hg help internals
873 Technical implementation topics
873 Technical implementation topics
874 """""""""""""""""""""""""""""""
874 """""""""""""""""""""""""""""""
875
875
876 bundles container for exchange of repository data
876 bundles container for exchange of repository data
877 changegroups representation of revlog data
877 changegroups representation of revlog data
878
878
879 sub-topics can be accessed
879 sub-topics can be accessed
880
880
881 $ hg help internals.changegroups
881 $ hg help internals.changegroups
882 Changegroups
882 Changegroups
883 ============
883 ============
884
884
885 Changegroups are representations of repository revlog data, specifically
885 Changegroups are representations of repository revlog data, specifically
886 the changelog, manifest, and filelogs.
886 the changelog, manifest, and filelogs.
887
887
888 There are 3 versions of changegroups: "1", "2", and "3". From a high-
888 There are 3 versions of changegroups: "1", "2", and "3". From a high-
889 level, versions "1" and "2" are almost exactly the same, with the only
889 level, versions "1" and "2" are almost exactly the same, with the only
890 difference being a header on entries in the changeset segment. Version "3"
890 difference being a header on entries in the changeset segment. Version "3"
891 adds support for exchanging treemanifests and includes revlog flags in the
891 adds support for exchanging treemanifests and includes revlog flags in the
892 delta header.
892 delta header.
893
893
894 Changegroups consists of 3 logical segments:
894 Changegroups consists of 3 logical segments:
895
895
896 +---------------------------------+
896 +---------------------------------+
897 | | | |
897 | | | |
898 | changeset | manifest | filelogs |
898 | changeset | manifest | filelogs |
899 | | | |
899 | | | |
900 +---------------------------------+
900 +---------------------------------+
901
901
902 The principle building block of each segment is a *chunk*. A *chunk* is a
902 The principle building block of each segment is a *chunk*. A *chunk* is a
903 framed piece of data:
903 framed piece of data:
904
904
905 +---------------------------------------+
905 +---------------------------------------+
906 | | |
906 | | |
907 | length | data |
907 | length | data |
908 | (32 bits) | <length> bytes |
908 | (32 bits) | <length> bytes |
909 | | |
909 | | |
910 +---------------------------------------+
910 +---------------------------------------+
911
911
912 Each chunk starts with a 32-bit big-endian signed integer indicating the
912 Each chunk starts with a 32-bit big-endian signed integer indicating the
913 length of the raw data that follows.
913 length of the raw data that follows.
914
914
915 There is a special case chunk that has 0 length ("0x00000000"). We call
915 There is a special case chunk that has 0 length ("0x00000000"). We call
916 this an *empty chunk*.
916 this an *empty chunk*.
917
917
918 Delta Groups
918 Delta Groups
919 ------------
919 ------------
920
920
921 A *delta group* expresses the content of a revlog as a series of deltas,
921 A *delta group* expresses the content of a revlog as a series of deltas,
922 or patches against previous revisions.
922 or patches against previous revisions.
923
923
924 Delta groups consist of 0 or more *chunks* followed by the *empty chunk*
924 Delta groups consist of 0 or more *chunks* followed by the *empty chunk*
925 to signal the end of the delta group:
925 to signal the end of the delta group:
926
926
927 +------------------------------------------------------------------------+
927 +------------------------------------------------------------------------+
928 | | | | | |
928 | | | | | |
929 | chunk0 length | chunk0 data | chunk1 length | chunk1 data | 0x0 |
929 | chunk0 length | chunk0 data | chunk1 length | chunk1 data | 0x0 |
930 | (32 bits) | (various) | (32 bits) | (various) | (32 bits) |
930 | (32 bits) | (various) | (32 bits) | (various) | (32 bits) |
931 | | | | | |
931 | | | | | |
932 +------------------------------------------------------------+-----------+
932 +------------------------------------------------------------+-----------+
933
933
934 Each *chunk*'s data consists of the following:
934 Each *chunk*'s data consists of the following:
935
935
936 +-----------------------------------------+
936 +-----------------------------------------+
937 | | | |
937 | | | |
938 | delta header | mdiff header | delta |
938 | delta header | mdiff header | delta |
939 | (various) | (12 bytes) | (various) |
939 | (various) | (12 bytes) | (various) |
940 | | | |
940 | | | |
941 +-----------------------------------------+
941 +-----------------------------------------+
942
942
943 The *length* field is the byte length of the remaining 3 logical pieces of
943 The *length* field is the byte length of the remaining 3 logical pieces of
944 data. The *delta* is a diff from an existing entry in the changelog.
944 data. The *delta* is a diff from an existing entry in the changelog.
945
945
946 The *delta header* is different between versions "1", "2", and "3" of the
946 The *delta header* is different between versions "1", "2", and "3" of the
947 changegroup format.
947 changegroup format.
948
948
949 Version 1:
949 Version 1:
950
950
951 +------------------------------------------------------+
951 +------------------------------------------------------+
952 | | | | |
952 | | | | |
953 | node | p1 node | p2 node | link node |
953 | node | p1 node | p2 node | link node |
954 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
954 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
955 | | | | |
955 | | | | |
956 +------------------------------------------------------+
956 +------------------------------------------------------+
957
957
958 Version 2:
958 Version 2:
959
959
960 +------------------------------------------------------------------+
960 +------------------------------------------------------------------+
961 | | | | | |
961 | | | | | |
962 | node | p1 node | p2 node | base node | link node |
962 | node | p1 node | p2 node | base node | link node |
963 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
963 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
964 | | | | | |
964 | | | | | |
965 +------------------------------------------------------------------+
965 +------------------------------------------------------------------+
966
966
967 Version 3:
967 Version 3:
968
968
969 +------------------------------------------------------------------------------+
969 +------------------------------------------------------------------------------+
970 | | | | | | |
970 | | | | | | |
971 | node | p1 node | p2 node | base node | link node | flags |
971 | node | p1 node | p2 node | base node | link node | flags |
972 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (2 bytes) |
972 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (2 bytes) |
973 | | | | | | |
973 | | | | | | |
974 +------------------------------------------------------------------------------+
974 +------------------------------------------------------------------------------+
975
975
976 The *mdiff header* consists of 3 32-bit big-endian signed integers
976 The *mdiff header* consists of 3 32-bit big-endian signed integers
977 describing offsets at which to apply the following delta content:
977 describing offsets at which to apply the following delta content:
978
978
979 +-------------------------------------+
979 +-------------------------------------+
980 | | | |
980 | | | |
981 | offset | old length | new length |
981 | offset | old length | new length |
982 | (32 bits) | (32 bits) | (32 bits) |
982 | (32 bits) | (32 bits) | (32 bits) |
983 | | | |
983 | | | |
984 +-------------------------------------+
984 +-------------------------------------+
985
985
986 In version 1, the delta is always applied against the previous node from
986 In version 1, the delta is always applied against the previous node from
987 the changegroup or the first parent if this is the first entry in the
987 the changegroup or the first parent if this is the first entry in the
988 changegroup.
988 changegroup.
989
989
990 In version 2, the delta base node is encoded in the entry in the
990 In version 2, the delta base node is encoded in the entry in the
991 changegroup. This allows the delta to be expressed against any parent,
991 changegroup. This allows the delta to be expressed against any parent,
992 which can result in smaller deltas and more efficient encoding of data.
992 which can result in smaller deltas and more efficient encoding of data.
993
993
994 Changeset Segment
994 Changeset Segment
995 -----------------
995 -----------------
996
996
997 The *changeset segment* consists of a single *delta group* holding
997 The *changeset segment* consists of a single *delta group* holding
998 changelog data. It is followed by an *empty chunk* to denote the boundary
998 changelog data. It is followed by an *empty chunk* to denote the boundary
999 to the *manifests segment*.
999 to the *manifests segment*.
1000
1000
1001 Manifest Segment
1001 Manifest Segment
1002 ----------------
1002 ----------------
1003
1003
1004 The *manifest segment* consists of a single *delta group* holding manifest
1004 The *manifest segment* consists of a single *delta group* holding manifest
1005 data. It is followed by an *empty chunk* to denote the boundary to the
1005 data. It is followed by an *empty chunk* to denote the boundary to the
1006 *filelogs segment*.
1006 *filelogs segment*.
1007
1007
1008 Filelogs Segment
1008 Filelogs Segment
1009 ----------------
1009 ----------------
1010
1010
1011 The *filelogs* segment consists of multiple sub-segments, each
1011 The *filelogs* segment consists of multiple sub-segments, each
1012 corresponding to an individual file whose data is being described:
1012 corresponding to an individual file whose data is being described:
1013
1013
1014 +--------------------------------------+
1014 +--------------------------------------+
1015 | | | | |
1015 | | | | |
1016 | filelog0 | filelog1 | filelog2 | ... |
1016 | filelog0 | filelog1 | filelog2 | ... |
1017 | | | | |
1017 | | | | |
1018 +--------------------------------------+
1018 +--------------------------------------+
1019
1019
1020 In version "3" of the changegroup format, filelogs may include directory
1020 In version "3" of the changegroup format, filelogs may include directory
1021 logs when treemanifests are in use. directory logs are identified by
1021 logs when treemanifests are in use. directory logs are identified by
1022 having a trailing '/' on their filename (see below).
1022 having a trailing '/' on their filename (see below).
1023
1023
1024 The final filelog sub-segment is followed by an *empty chunk* to denote
1024 The final filelog sub-segment is followed by an *empty chunk* to denote
1025 the end of the segment and the overall changegroup.
1025 the end of the segment and the overall changegroup.
1026
1026
1027 Each filelog sub-segment consists of the following:
1027 Each filelog sub-segment consists of the following:
1028
1028
1029 +------------------------------------------+
1029 +------------------------------------------+
1030 | | | |
1030 | | | |
1031 | filename size | filename | delta group |
1031 | filename size | filename | delta group |
1032 | (32 bits) | (various) | (various) |
1032 | (32 bits) | (various) | (various) |
1033 | | | |
1033 | | | |
1034 +------------------------------------------+
1034 +------------------------------------------+
1035
1035
1036 That is, a *chunk* consisting of the filename (not terminated or padded)
1036 That is, a *chunk* consisting of the filename (not terminated or padded)
1037 followed by N chunks constituting the *delta group* for this file.
1037 followed by N chunks constituting the *delta group* for this file.
1038
1038
1039 Test list of commands with command with no help text
1039 Test list of commands with command with no help text
1040
1040
1041 $ hg help helpext
1041 $ hg help helpext
1042 helpext extension - no help text available
1042 helpext extension - no help text available
1043
1043
1044 list of commands:
1044 list of commands:
1045
1045
1046 nohelp (no help text available)
1046 nohelp (no help text available)
1047
1047
1048 (use "hg help -v helpext" to show built-in aliases and global options)
1048 (use "hg help -v helpext" to show built-in aliases and global options)
1049
1049
1050
1050
1051 test deprecated and experimental options are hidden in command help
1051 test deprecated and experimental options are hidden in command help
1052 $ hg help debugoptDEP
1052 $ hg help debugoptDEP
1053 hg debugoptDEP
1053 hg debugoptDEP
1054
1054
1055 (no help text available)
1055 (no help text available)
1056
1056
1057 options:
1057 options:
1058
1058
1059 (some details hidden, use --verbose to show complete help)
1059 (some details hidden, use --verbose to show complete help)
1060
1060
1061 $ hg help debugoptEXP
1061 $ hg help debugoptEXP
1062 hg debugoptEXP
1062 hg debugoptEXP
1063
1063
1064 (no help text available)
1064 (no help text available)
1065
1065
1066 options:
1066 options:
1067
1067
1068 (some details hidden, use --verbose to show complete help)
1068 (some details hidden, use --verbose to show complete help)
1069
1069
1070 test deprecated and experimental options is shown with -v
1070 test deprecated and experimental options is shown with -v
1071 $ hg help -v debugoptDEP | grep dopt
1071 $ hg help -v debugoptDEP | grep dopt
1072 --dopt option is (DEPRECATED)
1072 --dopt option is (DEPRECATED)
1073 $ hg help -v debugoptEXP | grep eopt
1073 $ hg help -v debugoptEXP | grep eopt
1074 --eopt option is (EXPERIMENTAL)
1074 --eopt option is (EXPERIMENTAL)
1075
1075
1076 #if gettext
1076 #if gettext
1077 test deprecated option is hidden with translation with untranslated description
1077 test deprecated option is hidden with translation with untranslated description
1078 (use many globy for not failing on changed transaction)
1078 (use many globy for not failing on changed transaction)
1079 $ LANGUAGE=sv hg help debugoptDEP
1079 $ LANGUAGE=sv hg help debugoptDEP
1080 hg debugoptDEP
1080 hg debugoptDEP
1081
1081
1082 (*) (glob)
1082 (*) (glob)
1083
1083
1084 options:
1084 options:
1085
1085
1086 (some details hidden, use --verbose to show complete help)
1086 (some details hidden, use --verbose to show complete help)
1087 #endif
1087 #endif
1088
1088
1089 Test commands that collide with topics (issue4240)
1089 Test commands that collide with topics (issue4240)
1090
1090
1091 $ hg config -hq
1091 $ hg config -hq
1092 hg config [-u] [NAME]...
1092 hg config [-u] [NAME]...
1093
1093
1094 show combined config settings from all hgrc files
1094 show combined config settings from all hgrc files
1095 $ hg showconfig -hq
1095 $ hg showconfig -hq
1096 hg config [-u] [NAME]...
1096 hg config [-u] [NAME]...
1097
1097
1098 show combined config settings from all hgrc files
1098 show combined config settings from all hgrc files
1099
1099
1100 Test a help topic
1100 Test a help topic
1101
1101
1102 $ hg help revs
1102 $ hg help revs
1103 Specifying Single Revisions
1103 Specifying Single Revisions
1104 """""""""""""""""""""""""""
1104 """""""""""""""""""""""""""
1105
1105
1106 Mercurial supports several ways to specify individual revisions.
1106 Mercurial supports several ways to specify individual revisions.
1107
1107
1108 A plain integer is treated as a revision number. Negative integers are
1108 A plain integer is treated as a revision number. Negative integers are
1109 treated as sequential offsets from the tip, with -1 denoting the tip, -2
1109 treated as sequential offsets from the tip, with -1 denoting the tip, -2
1110 denoting the revision prior to the tip, and so forth.
1110 denoting the revision prior to the tip, and so forth.
1111
1111
1112 A 40-digit hexadecimal string is treated as a unique revision identifier.
1112 A 40-digit hexadecimal string is treated as a unique revision identifier.
1113
1113
1114 A hexadecimal string less than 40 characters long is treated as a unique
1114 A hexadecimal string less than 40 characters long is treated as a unique
1115 revision identifier and is referred to as a short-form identifier. A
1115 revision identifier and is referred to as a short-form identifier. A
1116 short-form identifier is only valid if it is the prefix of exactly one
1116 short-form identifier is only valid if it is the prefix of exactly one
1117 full-length identifier.
1117 full-length identifier.
1118
1118
1119 Any other string is treated as a bookmark, tag, or branch name. A bookmark
1119 Any other string is treated as a bookmark, tag, or branch name. A bookmark
1120 is a movable pointer to a revision. A tag is a permanent name associated
1120 is a movable pointer to a revision. A tag is a permanent name associated
1121 with a revision. A branch name denotes the tipmost open branch head of
1121 with a revision. A branch name denotes the tipmost open branch head of
1122 that branch - or if they are all closed, the tipmost closed head of the
1122 that branch - or if they are all closed, the tipmost closed head of the
1123 branch. Bookmark, tag, and branch names must not contain the ":"
1123 branch. Bookmark, tag, and branch names must not contain the ":"
1124 character.
1124 character.
1125
1125
1126 The reserved name "tip" always identifies the most recent revision.
1126 The reserved name "tip" always identifies the most recent revision.
1127
1127
1128 The reserved name "null" indicates the null revision. This is the revision
1128 The reserved name "null" indicates the null revision. This is the revision
1129 of an empty repository, and the parent of revision 0.
1129 of an empty repository, and the parent of revision 0.
1130
1130
1131 The reserved name "." indicates the working directory parent. If no
1131 The reserved name "." indicates the working directory parent. If no
1132 working directory is checked out, it is equivalent to null. If an
1132 working directory is checked out, it is equivalent to null. If an
1133 uncommitted merge is in progress, "." is the revision of the first parent.
1133 uncommitted merge is in progress, "." is the revision of the first parent.
1134
1134
1135 Test repeated config section name
1135 Test repeated config section name
1136
1136
1137 $ hg help config.host
1137 $ hg help config.host
1138 "http_proxy.host"
1138 "http_proxy.host"
1139 Host name and (optional) port of the proxy server, for example
1139 Host name and (optional) port of the proxy server, for example
1140 "myproxy:8000".
1140 "myproxy:8000".
1141
1141
1142 "smtp.host"
1142 "smtp.host"
1143 Host name of mail server, e.g. "mail.example.com".
1143 Host name of mail server, e.g. "mail.example.com".
1144
1144
1145 Unrelated trailing paragraphs shouldn't be included
1145 Unrelated trailing paragraphs shouldn't be included
1146
1146
1147 $ hg help config.extramsg | grep '^$'
1147 $ hg help config.extramsg | grep '^$'
1148
1148
1149
1149
1150 Test capitalized section name
1150 Test capitalized section name
1151
1151
1152 $ hg help scripting.HGPLAIN > /dev/null
1152 $ hg help scripting.HGPLAIN > /dev/null
1153
1153
1154 Help subsection:
1154 Help subsection:
1155
1155
1156 $ hg help config.charsets |grep "Email example:" > /dev/null
1156 $ hg help config.charsets |grep "Email example:" > /dev/null
1157 [1]
1157 [1]
1158
1158
1159 Show nested definitions
1159 Show nested definitions
1160 ("profiling.type"[break]"ls"[break]"stat"[break])
1160 ("profiling.type"[break]"ls"[break]"stat"[break])
1161
1161
1162 $ hg help config.type | egrep '^$'|wc -l
1162 $ hg help config.type | egrep '^$'|wc -l
1163 \s*3 (re)
1163 \s*3 (re)
1164
1164
1165 Last item in help config.*:
1165 Last item in help config.*:
1166
1166
1167 $ hg help config.`hg help config|grep '^ "'| \
1167 $ hg help config.`hg help config|grep '^ "'| \
1168 > tail -1|sed 's![ "]*!!g'`| \
1168 > tail -1|sed 's![ "]*!!g'`| \
1169 > grep "hg help -c config" > /dev/null
1169 > grep "hg help -c config" > /dev/null
1170 [1]
1170 [1]
1171
1171
1172 note to use help -c for general hg help config:
1172 note to use help -c for general hg help config:
1173
1173
1174 $ hg help config |grep "hg help -c config" > /dev/null
1174 $ hg help config |grep "hg help -c config" > /dev/null
1175
1175
1176 Test templating help
1176 Test templating help
1177
1177
1178 $ hg help templating | egrep '(desc|diffstat|firstline|nonempty) '
1178 $ hg help templating | egrep '(desc|diffstat|firstline|nonempty) '
1179 desc String. The text of the changeset description.
1179 desc String. The text of the changeset description.
1180 diffstat String. Statistics of changes with the following format:
1180 diffstat String. Statistics of changes with the following format:
1181 firstline Any text. Returns the first line of text.
1181 firstline Any text. Returns the first line of text.
1182 nonempty Any text. Returns '(none)' if the string is empty.
1182 nonempty Any text. Returns '(none)' if the string is empty.
1183
1183
1184 Test deprecated items
1184 Test deprecated items
1185
1185
1186 $ hg help -v templating | grep currentbookmark
1186 $ hg help -v templating | grep currentbookmark
1187 currentbookmark
1187 currentbookmark
1188 $ hg help templating | (grep currentbookmark || true)
1188 $ hg help templating | (grep currentbookmark || true)
1189
1189
1190 Test help hooks
1190 Test help hooks
1191
1191
1192 $ cat > helphook1.py <<EOF
1192 $ cat > helphook1.py <<EOF
1193 > from mercurial import help
1193 > from mercurial import help
1194 >
1194 >
1195 > def rewrite(ui, topic, doc):
1195 > def rewrite(ui, topic, doc):
1196 > return doc + '\nhelphook1\n'
1196 > return doc + '\nhelphook1\n'
1197 >
1197 >
1198 > def extsetup(ui):
1198 > def extsetup(ui):
1199 > help.addtopichook('revsets', rewrite)
1199 > help.addtopichook('revsets', rewrite)
1200 > EOF
1200 > EOF
1201 $ cat > helphook2.py <<EOF
1201 $ cat > helphook2.py <<EOF
1202 > from mercurial import help
1202 > from mercurial import help
1203 >
1203 >
1204 > def rewrite(ui, topic, doc):
1204 > def rewrite(ui, topic, doc):
1205 > return doc + '\nhelphook2\n'
1205 > return doc + '\nhelphook2\n'
1206 >
1206 >
1207 > def extsetup(ui):
1207 > def extsetup(ui):
1208 > help.addtopichook('revsets', rewrite)
1208 > help.addtopichook('revsets', rewrite)
1209 > EOF
1209 > EOF
1210 $ echo '[extensions]' >> $HGRCPATH
1210 $ echo '[extensions]' >> $HGRCPATH
1211 $ echo "helphook1 = `pwd`/helphook1.py" >> $HGRCPATH
1211 $ echo "helphook1 = `pwd`/helphook1.py" >> $HGRCPATH
1212 $ echo "helphook2 = `pwd`/helphook2.py" >> $HGRCPATH
1212 $ echo "helphook2 = `pwd`/helphook2.py" >> $HGRCPATH
1213 $ hg help revsets | grep helphook
1213 $ hg help revsets | grep helphook
1214 helphook1
1214 helphook1
1215 helphook2
1215 helphook2
1216
1216
1217 help -c should only show debug --debug
1217 help -c should only show debug --debug
1218
1218
1219 $ hg help -c --debug|egrep debug|wc -l|egrep '^\s*0\s*$'
1219 $ hg help -c --debug|egrep debug|wc -l|egrep '^\s*0\s*$'
1220 [1]
1220 [1]
1221
1221
1222 help -c should only show deprecated for -v
1222 help -c should only show deprecated for -v
1223
1223
1224 $ hg help -c -v|egrep DEPRECATED|wc -l|egrep '^\s*0\s*$'
1224 $ hg help -c -v|egrep DEPRECATED|wc -l|egrep '^\s*0\s*$'
1225 [1]
1225 [1]
1226
1226
1227 Test -e / -c / -k combinations
1227 Test -e / -c / -k combinations
1228
1228
1229 $ hg help -c|egrep '^[A-Z].*:|^ debug'
1229 $ hg help -c|egrep '^[A-Z].*:|^ debug'
1230 Commands:
1230 Commands:
1231 $ hg help -e|egrep '^[A-Z].*:|^ debug'
1231 $ hg help -e|egrep '^[A-Z].*:|^ debug'
1232 Extensions:
1232 Extensions:
1233 $ hg help -k|egrep '^[A-Z].*:|^ debug'
1233 $ hg help -k|egrep '^[A-Z].*:|^ debug'
1234 Topics:
1234 Topics:
1235 Commands:
1235 Commands:
1236 Extensions:
1236 Extensions:
1237 Extension Commands:
1237 Extension Commands:
1238 $ hg help -c schemes
1238 $ hg help -c schemes
1239 abort: no such help topic: schemes
1239 abort: no such help topic: schemes
1240 (try "hg help --keyword schemes")
1240 (try "hg help --keyword schemes")
1241 [255]
1241 [255]
1242 $ hg help -e schemes |head -1
1242 $ hg help -e schemes |head -1
1243 schemes extension - extend schemes with shortcuts to repository swarms
1243 schemes extension - extend schemes with shortcuts to repository swarms
1244 $ hg help -c -k dates |egrep '^(Topics|Extensions|Commands):'
1244 $ hg help -c -k dates |egrep '^(Topics|Extensions|Commands):'
1245 Commands:
1245 Commands:
1246 $ hg help -e -k a |egrep '^(Topics|Extensions|Commands):'
1246 $ hg help -e -k a |egrep '^(Topics|Extensions|Commands):'
1247 Extensions:
1247 Extensions:
1248 $ hg help -e -c -k date |egrep '^(Topics|Extensions|Commands):'
1248 $ hg help -e -c -k date |egrep '^(Topics|Extensions|Commands):'
1249 Extensions:
1249 Extensions:
1250 Commands:
1250 Commands:
1251 $ hg help -c commit > /dev/null
1251 $ hg help -c commit > /dev/null
1252 $ hg help -e -c commit > /dev/null
1252 $ hg help -e -c commit > /dev/null
1253 $ hg help -e commit > /dev/null
1253 $ hg help -e commit > /dev/null
1254 abort: no such help topic: commit
1254 abort: no such help topic: commit
1255 (try "hg help --keyword commit")
1255 (try "hg help --keyword commit")
1256 [255]
1256 [255]
1257
1257
1258 Test keyword search help
1258 Test keyword search help
1259
1259
1260 $ cat > prefixedname.py <<EOF
1260 $ cat > prefixedname.py <<EOF
1261 > '''matched against word "clone"
1261 > '''matched against word "clone"
1262 > '''
1262 > '''
1263 > EOF
1263 > EOF
1264 $ echo '[extensions]' >> $HGRCPATH
1264 $ echo '[extensions]' >> $HGRCPATH
1265 $ echo "dot.dot.prefixedname = `pwd`/prefixedname.py" >> $HGRCPATH
1265 $ echo "dot.dot.prefixedname = `pwd`/prefixedname.py" >> $HGRCPATH
1266 $ hg help -k clone
1266 $ hg help -k clone
1267 Topics:
1267 Topics:
1268
1268
1269 config Configuration Files
1269 config Configuration Files
1270 extensions Using Additional Features
1270 extensions Using Additional Features
1271 glossary Glossary
1271 glossary Glossary
1272 phases Working with Phases
1272 phases Working with Phases
1273 subrepos Subrepositories
1273 subrepos Subrepositories
1274 urls URL Paths
1274 urls URL Paths
1275
1275
1276 Commands:
1276 Commands:
1277
1277
1278 bookmarks create a new bookmark or list existing bookmarks
1278 bookmarks create a new bookmark or list existing bookmarks
1279 clone make a copy of an existing repository
1279 clone make a copy of an existing repository
1280 paths show aliases for remote repositories
1280 paths show aliases for remote repositories
1281 update update working directory (or switch revisions)
1281 update update working directory (or switch revisions)
1282
1282
1283 Extensions:
1283 Extensions:
1284
1284
1285 clonebundles advertise pre-generated bundles to seed clones (experimental)
1285 clonebundles advertise pre-generated bundles to seed clones (experimental)
1286 prefixedname matched against word "clone"
1286 prefixedname matched against word "clone"
1287 relink recreates hardlinks between repository clones
1287 relink recreates hardlinks between repository clones
1288
1288
1289 Extension Commands:
1289 Extension Commands:
1290
1290
1291 qclone clone main and patch repository at same time
1291 qclone clone main and patch repository at same time
1292
1292
1293 Test unfound topic
1293 Test unfound topic
1294
1294
1295 $ hg help nonexistingtopicthatwillneverexisteverever
1295 $ hg help nonexistingtopicthatwillneverexisteverever
1296 abort: no such help topic: nonexistingtopicthatwillneverexisteverever
1296 abort: no such help topic: nonexistingtopicthatwillneverexisteverever
1297 (try "hg help --keyword nonexistingtopicthatwillneverexisteverever")
1297 (try "hg help --keyword nonexistingtopicthatwillneverexisteverever")
1298 [255]
1298 [255]
1299
1299
1300 Test unfound keyword
1300 Test unfound keyword
1301
1301
1302 $ hg help --keyword nonexistingwordthatwillneverexisteverever
1302 $ hg help --keyword nonexistingwordthatwillneverexisteverever
1303 abort: no matches
1303 abort: no matches
1304 (try "hg help" for a list of topics)
1304 (try "hg help" for a list of topics)
1305 [255]
1305 [255]
1306
1306
1307 Test omit indicating for help
1307 Test omit indicating for help
1308
1308
1309 $ cat > addverboseitems.py <<EOF
1309 $ cat > addverboseitems.py <<EOF
1310 > '''extension to test omit indicating.
1310 > '''extension to test omit indicating.
1311 >
1311 >
1312 > This paragraph is never omitted (for extension)
1312 > This paragraph is never omitted (for extension)
1313 >
1313 >
1314 > .. container:: verbose
1314 > .. container:: verbose
1315 >
1315 >
1316 > This paragraph is omitted,
1316 > This paragraph is omitted,
1317 > if :hg:\`help\` is invoked without \`\`-v\`\` (for extension)
1317 > if :hg:\`help\` is invoked without \`\`-v\`\` (for extension)
1318 >
1318 >
1319 > This paragraph is never omitted, too (for extension)
1319 > This paragraph is never omitted, too (for extension)
1320 > '''
1320 > '''
1321 >
1321 >
1322 > from mercurial import help, commands
1322 > from mercurial import help, commands
1323 > testtopic = """This paragraph is never omitted (for topic).
1323 > testtopic = """This paragraph is never omitted (for topic).
1324 >
1324 >
1325 > .. container:: verbose
1325 > .. container:: verbose
1326 >
1326 >
1327 > This paragraph is omitted,
1327 > This paragraph is omitted,
1328 > if :hg:\`help\` is invoked without \`\`-v\`\` (for topic)
1328 > if :hg:\`help\` is invoked without \`\`-v\`\` (for topic)
1329 >
1329 >
1330 > This paragraph is never omitted, too (for topic)
1330 > This paragraph is never omitted, too (for topic)
1331 > """
1331 > """
1332 > def extsetup(ui):
1332 > def extsetup(ui):
1333 > help.helptable.append((["topic-containing-verbose"],
1333 > help.helptable.append((["topic-containing-verbose"],
1334 > "This is the topic to test omit indicating.",
1334 > "This is the topic to test omit indicating.",
1335 > lambda ui: testtopic))
1335 > lambda ui: testtopic))
1336 > EOF
1336 > EOF
1337 $ echo '[extensions]' >> $HGRCPATH
1337 $ echo '[extensions]' >> $HGRCPATH
1338 $ echo "addverboseitems = `pwd`/addverboseitems.py" >> $HGRCPATH
1338 $ echo "addverboseitems = `pwd`/addverboseitems.py" >> $HGRCPATH
1339 $ hg help addverboseitems
1339 $ hg help addverboseitems
1340 addverboseitems extension - extension to test omit indicating.
1340 addverboseitems extension - extension to test omit indicating.
1341
1341
1342 This paragraph is never omitted (for extension)
1342 This paragraph is never omitted (for extension)
1343
1343
1344 This paragraph is never omitted, too (for extension)
1344 This paragraph is never omitted, too (for extension)
1345
1345
1346 (some details hidden, use --verbose to show complete help)
1346 (some details hidden, use --verbose to show complete help)
1347
1347
1348 no commands defined
1348 no commands defined
1349 $ hg help -v addverboseitems
1349 $ hg help -v addverboseitems
1350 addverboseitems extension - extension to test omit indicating.
1350 addverboseitems extension - extension to test omit indicating.
1351
1351
1352 This paragraph is never omitted (for extension)
1352 This paragraph is never omitted (for extension)
1353
1353
1354 This paragraph is omitted, if "hg help" is invoked without "-v" (for
1354 This paragraph is omitted, if "hg help" is invoked without "-v" (for
1355 extension)
1355 extension)
1356
1356
1357 This paragraph is never omitted, too (for extension)
1357 This paragraph is never omitted, too (for extension)
1358
1358
1359 no commands defined
1359 no commands defined
1360 $ hg help topic-containing-verbose
1360 $ hg help topic-containing-verbose
1361 This is the topic to test omit indicating.
1361 This is the topic to test omit indicating.
1362 """"""""""""""""""""""""""""""""""""""""""
1362 """"""""""""""""""""""""""""""""""""""""""
1363
1363
1364 This paragraph is never omitted (for topic).
1364 This paragraph is never omitted (for topic).
1365
1365
1366 This paragraph is never omitted, too (for topic)
1366 This paragraph is never omitted, too (for topic)
1367
1367
1368 (some details hidden, use --verbose to show complete help)
1368 (some details hidden, use --verbose to show complete help)
1369 $ hg help -v topic-containing-verbose
1369 $ hg help -v topic-containing-verbose
1370 This is the topic to test omit indicating.
1370 This is the topic to test omit indicating.
1371 """"""""""""""""""""""""""""""""""""""""""
1371 """"""""""""""""""""""""""""""""""""""""""
1372
1372
1373 This paragraph is never omitted (for topic).
1373 This paragraph is never omitted (for topic).
1374
1374
1375 This paragraph is omitted, if "hg help" is invoked without "-v" (for
1375 This paragraph is omitted, if "hg help" is invoked without "-v" (for
1376 topic)
1376 topic)
1377
1377
1378 This paragraph is never omitted, too (for topic)
1378 This paragraph is never omitted, too (for topic)
1379
1379
1380 Test section lookup
1380 Test section lookup
1381
1381
1382 $ hg help revset.merge
1382 $ hg help revset.merge
1383 "merge()"
1383 "merge()"
1384 Changeset is a merge changeset.
1384 Changeset is a merge changeset.
1385
1385
1386 $ hg help glossary.dag
1386 $ hg help glossary.dag
1387 DAG
1387 DAG
1388 The repository of changesets of a distributed version control system
1388 The repository of changesets of a distributed version control system
1389 (DVCS) can be described as a directed acyclic graph (DAG), consisting
1389 (DVCS) can be described as a directed acyclic graph (DAG), consisting
1390 of nodes and edges, where nodes correspond to changesets and edges
1390 of nodes and edges, where nodes correspond to changesets and edges
1391 imply a parent -> child relation. This graph can be visualized by
1391 imply a parent -> child relation. This graph can be visualized by
1392 graphical tools such as "hg log --graph". In Mercurial, the DAG is
1392 graphical tools such as "hg log --graph". In Mercurial, the DAG is
1393 limited by the requirement for children to have at most two parents.
1393 limited by the requirement for children to have at most two parents.
1394
1394
1395
1395
1396 $ hg help hgrc.paths
1396 $ hg help hgrc.paths
1397 "paths"
1397 "paths"
1398 -------
1398 -------
1399
1399
1400 Assigns symbolic names and behavior to repositories.
1400 Assigns symbolic names and behavior to repositories.
1401
1401
1402 Options are symbolic names defining the URL or directory that is the
1402 Options are symbolic names defining the URL or directory that is the
1403 location of the repository. Example:
1403 location of the repository. Example:
1404
1404
1405 [paths]
1405 [paths]
1406 my_server = https://example.com/my_repo
1406 my_server = https://example.com/my_repo
1407 local_path = /home/me/repo
1407 local_path = /home/me/repo
1408
1408
1409 These symbolic names can be used from the command line. To pull from
1409 These symbolic names can be used from the command line. To pull from
1410 "my_server": "hg pull my_server". To push to "local_path": "hg push
1410 "my_server": "hg pull my_server". To push to "local_path": "hg push
1411 local_path".
1411 local_path".
1412
1412
1413 Options containing colons (":") denote sub-options that can influence
1413 Options containing colons (":") denote sub-options that can influence
1414 behavior for that specific path. Example:
1414 behavior for that specific path. Example:
1415
1415
1416 [paths]
1416 [paths]
1417 my_server = https://example.com/my_path
1417 my_server = https://example.com/my_path
1418 my_server:pushurl = ssh://example.com/my_path
1418 my_server:pushurl = ssh://example.com/my_path
1419
1419
1420 The following sub-options can be defined:
1420 The following sub-options can be defined:
1421
1421
1422 "pushurl"
1422 "pushurl"
1423 The URL to use for push operations. If not defined, the location
1423 The URL to use for push operations. If not defined, the location
1424 defined by the path's main entry is used.
1424 defined by the path's main entry is used.
1425
1425
1426 The following special named paths exist:
1426 The following special named paths exist:
1427
1427
1428 "default"
1428 "default"
1429 The URL or directory to use when no source or remote is specified.
1429 The URL or directory to use when no source or remote is specified.
1430
1430
1431 "hg clone" will automatically define this path to the location the
1431 "hg clone" will automatically define this path to the location the
1432 repository was cloned from.
1432 repository was cloned from.
1433
1433
1434 "default-push"
1434 "default-push"
1435 (deprecated) The URL or directory for the default "hg push" location.
1435 (deprecated) The URL or directory for the default "hg push" location.
1436 "default:pushurl" should be used instead.
1436 "default:pushurl" should be used instead.
1437
1437
1438 $ hg help glossary.mcguffin
1438 $ hg help glossary.mcguffin
1439 abort: help section not found
1439 abort: help section not found
1440 [255]
1440 [255]
1441
1441
1442 $ hg help glossary.mc.guffin
1442 $ hg help glossary.mc.guffin
1443 abort: help section not found
1443 abort: help section not found
1444 [255]
1444 [255]
1445
1445
1446 $ hg help template.files
1446 $ hg help template.files
1447 files List of strings. All files modified, added, or removed by
1447 files List of strings. All files modified, added, or removed by
1448 this changeset.
1448 this changeset.
1449
1449
1450 Test dynamic list of merge tools only shows up once
1450 Test dynamic list of merge tools only shows up once
1451 $ hg help merge-tools
1451 $ hg help merge-tools
1452 Merge Tools
1452 Merge Tools
1453 """""""""""
1453 """""""""""
1454
1454
1455 To merge files Mercurial uses merge tools.
1455 To merge files Mercurial uses merge tools.
1456
1456
1457 A merge tool combines two different versions of a file into a merged file.
1457 A merge tool combines two different versions of a file into a merged file.
1458 Merge tools are given the two files and the greatest common ancestor of
1458 Merge tools are given the two files and the greatest common ancestor of
1459 the two file versions, so they can determine the changes made on both
1459 the two file versions, so they can determine the changes made on both
1460 branches.
1460 branches.
1461
1461
1462 Merge tools are used both for "hg resolve", "hg merge", "hg update", "hg
1462 Merge tools are used both for "hg resolve", "hg merge", "hg update", "hg
1463 backout" and in several extensions.
1463 backout" and in several extensions.
1464
1464
1465 Usually, the merge tool tries to automatically reconcile the files by
1465 Usually, the merge tool tries to automatically reconcile the files by
1466 combining all non-overlapping changes that occurred separately in the two
1466 combining all non-overlapping changes that occurred separately in the two
1467 different evolutions of the same initial base file. Furthermore, some
1467 different evolutions of the same initial base file. Furthermore, some
1468 interactive merge programs make it easier to manually resolve conflicting
1468 interactive merge programs make it easier to manually resolve conflicting
1469 merges, either in a graphical way, or by inserting some conflict markers.
1469 merges, either in a graphical way, or by inserting some conflict markers.
1470 Mercurial does not include any interactive merge programs but relies on
1470 Mercurial does not include any interactive merge programs but relies on
1471 external tools for that.
1471 external tools for that.
1472
1472
1473 Available merge tools
1473 Available merge tools
1474 =====================
1474 =====================
1475
1475
1476 External merge tools and their properties are configured in the merge-
1476 External merge tools and their properties are configured in the merge-
1477 tools configuration section - see hgrc(5) - but they can often just be
1477 tools configuration section - see hgrc(5) - but they can often just be
1478 named by their executable.
1478 named by their executable.
1479
1479
1480 A merge tool is generally usable if its executable can be found on the
1480 A merge tool is generally usable if its executable can be found on the
1481 system and if it can handle the merge. The executable is found if it is an
1481 system and if it can handle the merge. The executable is found if it is an
1482 absolute or relative executable path or the name of an application in the
1482 absolute or relative executable path or the name of an application in the
1483 executable search path. The tool is assumed to be able to handle the merge
1483 executable search path. The tool is assumed to be able to handle the merge
1484 if it can handle symlinks if the file is a symlink, if it can handle
1484 if it can handle symlinks if the file is a symlink, if it can handle
1485 binary files if the file is binary, and if a GUI is available if the tool
1485 binary files if the file is binary, and if a GUI is available if the tool
1486 requires a GUI.
1486 requires a GUI.
1487
1487
1488 There are some internal merge tools which can be used. The internal merge
1488 There are some internal merge tools which can be used. The internal merge
1489 tools are:
1489 tools are:
1490
1490
1491 ":dump"
1491 ":dump"
1492 Creates three versions of the files to merge, containing the contents of
1492 Creates three versions of the files to merge, containing the contents of
1493 local, other and base. These files can then be used to perform a merge
1493 local, other and base. These files can then be used to perform a merge
1494 manually. If the file to be merged is named "a.txt", these files will
1494 manually. If the file to be merged is named "a.txt", these files will
1495 accordingly be named "a.txt.local", "a.txt.other" and "a.txt.base" and
1495 accordingly be named "a.txt.local", "a.txt.other" and "a.txt.base" and
1496 they will be placed in the same directory as "a.txt".
1496 they will be placed in the same directory as "a.txt".
1497
1497
1498 ":fail"
1498 ":fail"
1499 Rather than attempting to merge files that were modified on both
1499 Rather than attempting to merge files that were modified on both
1500 branches, it marks them as unresolved. The resolve command must be used
1500 branches, it marks them as unresolved. The resolve command must be used
1501 to resolve these conflicts.
1501 to resolve these conflicts.
1502
1502
1503 ":local"
1503 ":local"
1504 Uses the local version of files as the merged version.
1504 Uses the local version of files as the merged version.
1505
1505
1506 ":merge"
1506 ":merge"
1507 Uses the internal non-interactive simple merge algorithm for merging
1507 Uses the internal non-interactive simple merge algorithm for merging
1508 files. It will fail if there are any conflicts and leave markers in the
1508 files. It will fail if there are any conflicts and leave markers in the
1509 partially merged file. Markers will have two sections, one for each side
1509 partially merged file. Markers will have two sections, one for each side
1510 of merge.
1510 of merge.
1511
1511
1512 ":merge-local"
1512 ":merge-local"
1513 Like :merge, but resolve all conflicts non-interactively in favor of the
1513 Like :merge, but resolve all conflicts non-interactively in favor of the
1514 local changes.
1514 local changes.
1515
1515
1516 ":merge-other"
1516 ":merge-other"
1517 Like :merge, but resolve all conflicts non-interactively in favor of the
1517 Like :merge, but resolve all conflicts non-interactively in favor of the
1518 other changes.
1518 other changes.
1519
1519
1520 ":merge3"
1520 ":merge3"
1521 Uses the internal non-interactive simple merge algorithm for merging
1521 Uses the internal non-interactive simple merge algorithm for merging
1522 files. It will fail if there are any conflicts and leave markers in the
1522 files. It will fail if there are any conflicts and leave markers in the
1523 partially merged file. Marker will have three sections, one from each
1523 partially merged file. Marker will have three sections, one from each
1524 side of the merge and one for the base content.
1524 side of the merge and one for the base content.
1525
1525
1526 ":other"
1526 ":other"
1527 Uses the other version of files as the merged version.
1527 Uses the other version of files as the merged version.
1528
1528
1529 ":prompt"
1529 ":prompt"
1530 Asks the user which of the local or the other version to keep as the
1530 Asks the user which of the local or the other version to keep as the
1531 merged version.
1531 merged version.
1532
1532
1533 ":tagmerge"
1533 ":tagmerge"
1534 Uses the internal tag merge algorithm (experimental).
1534 Uses the internal tag merge algorithm (experimental).
1535
1535
1536 ":union"
1536 ":union"
1537 Uses the internal non-interactive simple merge algorithm for merging
1537 Uses the internal non-interactive simple merge algorithm for merging
1538 files. It will use both left and right sides for conflict regions. No
1538 files. It will use both left and right sides for conflict regions. No
1539 markers are inserted.
1539 markers are inserted.
1540
1540
1541 Internal tools are always available and do not require a GUI but will by
1541 Internal tools are always available and do not require a GUI but will by
1542 default not handle symlinks or binary files.
1542 default not handle symlinks or binary files.
1543
1543
1544 Choosing a merge tool
1544 Choosing a merge tool
1545 =====================
1545 =====================
1546
1546
1547 Mercurial uses these rules when deciding which merge tool to use:
1547 Mercurial uses these rules when deciding which merge tool to use:
1548
1548
1549 1. If a tool has been specified with the --tool option to merge or
1549 1. If a tool has been specified with the --tool option to merge or
1550 resolve, it is used. If it is the name of a tool in the merge-tools
1550 resolve, it is used. If it is the name of a tool in the merge-tools
1551 configuration, its configuration is used. Otherwise the specified tool
1551 configuration, its configuration is used. Otherwise the specified tool
1552 must be executable by the shell.
1552 must be executable by the shell.
1553 2. If the "HGMERGE" environment variable is present, its value is used and
1553 2. If the "HGMERGE" environment variable is present, its value is used and
1554 must be executable by the shell.
1554 must be executable by the shell.
1555 3. If the filename of the file to be merged matches any of the patterns in
1555 3. If the filename of the file to be merged matches any of the patterns in
1556 the merge-patterns configuration section, the first usable merge tool
1556 the merge-patterns configuration section, the first usable merge tool
1557 corresponding to a matching pattern is used. Here, binary capabilities
1557 corresponding to a matching pattern is used. Here, binary capabilities
1558 of the merge tool are not considered.
1558 of the merge tool are not considered.
1559 4. If ui.merge is set it will be considered next. If the value is not the
1559 4. If ui.merge is set it will be considered next. If the value is not the
1560 name of a configured tool, the specified value is used and must be
1560 name of a configured tool, the specified value is used and must be
1561 executable by the shell. Otherwise the named tool is used if it is
1561 executable by the shell. Otherwise the named tool is used if it is
1562 usable.
1562 usable.
1563 5. If any usable merge tools are present in the merge-tools configuration
1563 5. If any usable merge tools are present in the merge-tools configuration
1564 section, the one with the highest priority is used.
1564 section, the one with the highest priority is used.
1565 6. If a program named "hgmerge" can be found on the system, it is used -
1565 6. If a program named "hgmerge" can be found on the system, it is used -
1566 but it will by default not be used for symlinks and binary files.
1566 but it will by default not be used for symlinks and binary files.
1567 7. If the file to be merged is not binary and is not a symlink, then
1567 7. If the file to be merged is not binary and is not a symlink, then
1568 internal ":merge" is used.
1568 internal ":merge" is used.
1569 8. The merge of the file fails and must be resolved before commit.
1569 8. The merge of the file fails and must be resolved before commit.
1570
1570
1571 Note:
1571 Note:
1572 After selecting a merge program, Mercurial will by default attempt to
1572 After selecting a merge program, Mercurial will by default attempt to
1573 merge the files using a simple merge algorithm first. Only if it
1573 merge the files using a simple merge algorithm first. Only if it
1574 doesn't succeed because of conflicting changes Mercurial will actually
1574 doesn't succeed because of conflicting changes Mercurial will actually
1575 execute the merge program. Whether to use the simple merge algorithm
1575 execute the merge program. Whether to use the simple merge algorithm
1576 first can be controlled by the premerge setting of the merge tool.
1576 first can be controlled by the premerge setting of the merge tool.
1577 Premerge is enabled by default unless the file is binary or a symlink.
1577 Premerge is enabled by default unless the file is binary or a symlink.
1578
1578
1579 See the merge-tools and ui sections of hgrc(5) for details on the
1579 See the merge-tools and ui sections of hgrc(5) for details on the
1580 configuration of merge tools.
1580 configuration of merge tools.
1581
1581
1582 Test usage of section marks in help documents
1582 Test usage of section marks in help documents
1583
1583
1584 $ cd "$TESTDIR"/../doc
1584 $ cd "$TESTDIR"/../doc
1585 $ python check-seclevel.py
1585 $ python check-seclevel.py
1586 $ cd $TESTTMP
1586 $ cd $TESTTMP
1587
1587
1588 #if serve
1588 #if serve
1589
1589
1590 Test the help pages in hgweb.
1590 Test the help pages in hgweb.
1591
1591
1592 Dish up an empty repo; serve it cold.
1592 Dish up an empty repo; serve it cold.
1593
1593
1594 $ hg init "$TESTTMP/test"
1594 $ hg init "$TESTTMP/test"
1595 $ hg serve -R "$TESTTMP/test" -n test -p $HGPORT -d --pid-file=hg.pid
1595 $ hg serve -R "$TESTTMP/test" -n test -p $HGPORT -d --pid-file=hg.pid
1596 $ cat hg.pid >> $DAEMON_PIDS
1596 $ cat hg.pid >> $DAEMON_PIDS
1597
1597
1598 $ get-with-headers.py 127.0.0.1:$HGPORT "help"
1598 $ get-with-headers.py 127.0.0.1:$HGPORT "help"
1599 200 Script output follows
1599 200 Script output follows
1600
1600
1601 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
1601 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
1602 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
1602 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
1603 <head>
1603 <head>
1604 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1604 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1605 <meta name="robots" content="index, nofollow" />
1605 <meta name="robots" content="index, nofollow" />
1606 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1606 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1607 <script type="text/javascript" src="/static/mercurial.js"></script>
1607 <script type="text/javascript" src="/static/mercurial.js"></script>
1608
1608
1609 <title>Help: Index</title>
1609 <title>Help: Index</title>
1610 </head>
1610 </head>
1611 <body>
1611 <body>
1612
1612
1613 <div class="container">
1613 <div class="container">
1614 <div class="menu">
1614 <div class="menu">
1615 <div class="logo">
1615 <div class="logo">
1616 <a href="https://mercurial-scm.org/">
1616 <a href="https://mercurial-scm.org/">
1617 <img src="/static/hglogo.png" alt="mercurial" /></a>
1617 <img src="/static/hglogo.png" alt="mercurial" /></a>
1618 </div>
1618 </div>
1619 <ul>
1619 <ul>
1620 <li><a href="/shortlog">log</a></li>
1620 <li><a href="/shortlog">log</a></li>
1621 <li><a href="/graph">graph</a></li>
1621 <li><a href="/graph">graph</a></li>
1622 <li><a href="/tags">tags</a></li>
1622 <li><a href="/tags">tags</a></li>
1623 <li><a href="/bookmarks">bookmarks</a></li>
1623 <li><a href="/bookmarks">bookmarks</a></li>
1624 <li><a href="/branches">branches</a></li>
1624 <li><a href="/branches">branches</a></li>
1625 </ul>
1625 </ul>
1626 <ul>
1626 <ul>
1627 <li class="active">help</li>
1627 <li class="active">help</li>
1628 </ul>
1628 </ul>
1629 </div>
1629 </div>
1630
1630
1631 <div class="main">
1631 <div class="main">
1632 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
1632 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
1633 <form class="search" action="/log">
1633 <form class="search" action="/log">
1634
1634
1635 <p><input name="rev" id="search1" type="text" size="30" /></p>
1635 <p><input name="rev" id="search1" type="text" size="30" /></p>
1636 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
1636 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
1637 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
1637 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
1638 </form>
1638 </form>
1639 <table class="bigtable">
1639 <table class="bigtable">
1640 <tr><td colspan="2"><h2><a name="main" href="#topics">Topics</a></h2></td></tr>
1640 <tr><td colspan="2"><h2><a name="main" href="#topics">Topics</a></h2></td></tr>
1641
1641
1642 <tr><td>
1642 <tr><td>
1643 <a href="/help/config">
1643 <a href="/help/config">
1644 config
1644 config
1645 </a>
1645 </a>
1646 </td><td>
1646 </td><td>
1647 Configuration Files
1647 Configuration Files
1648 </td></tr>
1648 </td></tr>
1649 <tr><td>
1649 <tr><td>
1650 <a href="/help/dates">
1650 <a href="/help/dates">
1651 dates
1651 dates
1652 </a>
1652 </a>
1653 </td><td>
1653 </td><td>
1654 Date Formats
1654 Date Formats
1655 </td></tr>
1655 </td></tr>
1656 <tr><td>
1656 <tr><td>
1657 <a href="/help/diffs">
1657 <a href="/help/diffs">
1658 diffs
1658 diffs
1659 </a>
1659 </a>
1660 </td><td>
1660 </td><td>
1661 Diff Formats
1661 Diff Formats
1662 </td></tr>
1662 </td></tr>
1663 <tr><td>
1663 <tr><td>
1664 <a href="/help/environment">
1664 <a href="/help/environment">
1665 environment
1665 environment
1666 </a>
1666 </a>
1667 </td><td>
1667 </td><td>
1668 Environment Variables
1668 Environment Variables
1669 </td></tr>
1669 </td></tr>
1670 <tr><td>
1670 <tr><td>
1671 <a href="/help/extensions">
1671 <a href="/help/extensions">
1672 extensions
1672 extensions
1673 </a>
1673 </a>
1674 </td><td>
1674 </td><td>
1675 Using Additional Features
1675 Using Additional Features
1676 </td></tr>
1676 </td></tr>
1677 <tr><td>
1677 <tr><td>
1678 <a href="/help/filesets">
1678 <a href="/help/filesets">
1679 filesets
1679 filesets
1680 </a>
1680 </a>
1681 </td><td>
1681 </td><td>
1682 Specifying File Sets
1682 Specifying File Sets
1683 </td></tr>
1683 </td></tr>
1684 <tr><td>
1684 <tr><td>
1685 <a href="/help/glossary">
1685 <a href="/help/glossary">
1686 glossary
1686 glossary
1687 </a>
1687 </a>
1688 </td><td>
1688 </td><td>
1689 Glossary
1689 Glossary
1690 </td></tr>
1690 </td></tr>
1691 <tr><td>
1691 <tr><td>
1692 <a href="/help/hgignore">
1692 <a href="/help/hgignore">
1693 hgignore
1693 hgignore
1694 </a>
1694 </a>
1695 </td><td>
1695 </td><td>
1696 Syntax for Mercurial Ignore Files
1696 Syntax for Mercurial Ignore Files
1697 </td></tr>
1697 </td></tr>
1698 <tr><td>
1698 <tr><td>
1699 <a href="/help/hgweb">
1699 <a href="/help/hgweb">
1700 hgweb
1700 hgweb
1701 </a>
1701 </a>
1702 </td><td>
1702 </td><td>
1703 Configuring hgweb
1703 Configuring hgweb
1704 </td></tr>
1704 </td></tr>
1705 <tr><td>
1705 <tr><td>
1706 <a href="/help/internals">
1706 <a href="/help/internals">
1707 internals
1707 internals
1708 </a>
1708 </a>
1709 </td><td>
1709 </td><td>
1710 Technical implementation topics
1710 Technical implementation topics
1711 </td></tr>
1711 </td></tr>
1712 <tr><td>
1712 <tr><td>
1713 <a href="/help/merge-tools">
1713 <a href="/help/merge-tools">
1714 merge-tools
1714 merge-tools
1715 </a>
1715 </a>
1716 </td><td>
1716 </td><td>
1717 Merge Tools
1717 Merge Tools
1718 </td></tr>
1718 </td></tr>
1719 <tr><td>
1719 <tr><td>
1720 <a href="/help/multirevs">
1720 <a href="/help/multirevs">
1721 multirevs
1721 multirevs
1722 </a>
1722 </a>
1723 </td><td>
1723 </td><td>
1724 Specifying Multiple Revisions
1724 Specifying Multiple Revisions
1725 </td></tr>
1725 </td></tr>
1726 <tr><td>
1726 <tr><td>
1727 <a href="/help/patterns">
1727 <a href="/help/patterns">
1728 patterns
1728 patterns
1729 </a>
1729 </a>
1730 </td><td>
1730 </td><td>
1731 File Name Patterns
1731 File Name Patterns
1732 </td></tr>
1732 </td></tr>
1733 <tr><td>
1733 <tr><td>
1734 <a href="/help/phases">
1734 <a href="/help/phases">
1735 phases
1735 phases
1736 </a>
1736 </a>
1737 </td><td>
1737 </td><td>
1738 Working with Phases
1738 Working with Phases
1739 </td></tr>
1739 </td></tr>
1740 <tr><td>
1740 <tr><td>
1741 <a href="/help/revisions">
1741 <a href="/help/revisions">
1742 revisions
1742 revisions
1743 </a>
1743 </a>
1744 </td><td>
1744 </td><td>
1745 Specifying Single Revisions
1745 Specifying Single Revisions
1746 </td></tr>
1746 </td></tr>
1747 <tr><td>
1747 <tr><td>
1748 <a href="/help/revsets">
1748 <a href="/help/revsets">
1749 revsets
1749 revsets
1750 </a>
1750 </a>
1751 </td><td>
1751 </td><td>
1752 Specifying Revision Sets
1752 Specifying Revision Sets
1753 </td></tr>
1753 </td></tr>
1754 <tr><td>
1754 <tr><td>
1755 <a href="/help/scripting">
1755 <a href="/help/scripting">
1756 scripting
1756 scripting
1757 </a>
1757 </a>
1758 </td><td>
1758 </td><td>
1759 Using Mercurial from scripts and automation
1759 Using Mercurial from scripts and automation
1760 </td></tr>
1760 </td></tr>
1761 <tr><td>
1761 <tr><td>
1762 <a href="/help/subrepos">
1762 <a href="/help/subrepos">
1763 subrepos
1763 subrepos
1764 </a>
1764 </a>
1765 </td><td>
1765 </td><td>
1766 Subrepositories
1766 Subrepositories
1767 </td></tr>
1767 </td></tr>
1768 <tr><td>
1768 <tr><td>
1769 <a href="/help/templating">
1769 <a href="/help/templating">
1770 templating
1770 templating
1771 </a>
1771 </a>
1772 </td><td>
1772 </td><td>
1773 Template Usage
1773 Template Usage
1774 </td></tr>
1774 </td></tr>
1775 <tr><td>
1775 <tr><td>
1776 <a href="/help/urls">
1776 <a href="/help/urls">
1777 urls
1777 urls
1778 </a>
1778 </a>
1779 </td><td>
1779 </td><td>
1780 URL Paths
1780 URL Paths
1781 </td></tr>
1781 </td></tr>
1782 <tr><td>
1782 <tr><td>
1783 <a href="/help/topic-containing-verbose">
1783 <a href="/help/topic-containing-verbose">
1784 topic-containing-verbose
1784 topic-containing-verbose
1785 </a>
1785 </a>
1786 </td><td>
1786 </td><td>
1787 This is the topic to test omit indicating.
1787 This is the topic to test omit indicating.
1788 </td></tr>
1788 </td></tr>
1789
1789
1790 <tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
1790 <tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
1791
1791
1792 <tr><td>
1792 <tr><td>
1793 <a href="/help/add">
1793 <a href="/help/add">
1794 add
1794 add
1795 </a>
1795 </a>
1796 </td><td>
1796 </td><td>
1797 add the specified files on the next commit
1797 add the specified files on the next commit
1798 </td></tr>
1798 </td></tr>
1799 <tr><td>
1799 <tr><td>
1800 <a href="/help/annotate">
1800 <a href="/help/annotate">
1801 annotate
1801 annotate
1802 </a>
1802 </a>
1803 </td><td>
1803 </td><td>
1804 show changeset information by line for each file
1804 show changeset information by line for each file
1805 </td></tr>
1805 </td></tr>
1806 <tr><td>
1806 <tr><td>
1807 <a href="/help/clone">
1807 <a href="/help/clone">
1808 clone
1808 clone
1809 </a>
1809 </a>
1810 </td><td>
1810 </td><td>
1811 make a copy of an existing repository
1811 make a copy of an existing repository
1812 </td></tr>
1812 </td></tr>
1813 <tr><td>
1813 <tr><td>
1814 <a href="/help/commit">
1814 <a href="/help/commit">
1815 commit
1815 commit
1816 </a>
1816 </a>
1817 </td><td>
1817 </td><td>
1818 commit the specified files or all outstanding changes
1818 commit the specified files or all outstanding changes
1819 </td></tr>
1819 </td></tr>
1820 <tr><td>
1820 <tr><td>
1821 <a href="/help/diff">
1821 <a href="/help/diff">
1822 diff
1822 diff
1823 </a>
1823 </a>
1824 </td><td>
1824 </td><td>
1825 diff repository (or selected files)
1825 diff repository (or selected files)
1826 </td></tr>
1826 </td></tr>
1827 <tr><td>
1827 <tr><td>
1828 <a href="/help/export">
1828 <a href="/help/export">
1829 export
1829 export
1830 </a>
1830 </a>
1831 </td><td>
1831 </td><td>
1832 dump the header and diffs for one or more changesets
1832 dump the header and diffs for one or more changesets
1833 </td></tr>
1833 </td></tr>
1834 <tr><td>
1834 <tr><td>
1835 <a href="/help/forget">
1835 <a href="/help/forget">
1836 forget
1836 forget
1837 </a>
1837 </a>
1838 </td><td>
1838 </td><td>
1839 forget the specified files on the next commit
1839 forget the specified files on the next commit
1840 </td></tr>
1840 </td></tr>
1841 <tr><td>
1841 <tr><td>
1842 <a href="/help/init">
1842 <a href="/help/init">
1843 init
1843 init
1844 </a>
1844 </a>
1845 </td><td>
1845 </td><td>
1846 create a new repository in the given directory
1846 create a new repository in the given directory
1847 </td></tr>
1847 </td></tr>
1848 <tr><td>
1848 <tr><td>
1849 <a href="/help/log">
1849 <a href="/help/log">
1850 log
1850 log
1851 </a>
1851 </a>
1852 </td><td>
1852 </td><td>
1853 show revision history of entire repository or files
1853 show revision history of entire repository or files
1854 </td></tr>
1854 </td></tr>
1855 <tr><td>
1855 <tr><td>
1856 <a href="/help/merge">
1856 <a href="/help/merge">
1857 merge
1857 merge
1858 </a>
1858 </a>
1859 </td><td>
1859 </td><td>
1860 merge another revision into working directory
1860 merge another revision into working directory
1861 </td></tr>
1861 </td></tr>
1862 <tr><td>
1862 <tr><td>
1863 <a href="/help/pull">
1863 <a href="/help/pull">
1864 pull
1864 pull
1865 </a>
1865 </a>
1866 </td><td>
1866 </td><td>
1867 pull changes from the specified source
1867 pull changes from the specified source
1868 </td></tr>
1868 </td></tr>
1869 <tr><td>
1869 <tr><td>
1870 <a href="/help/push">
1870 <a href="/help/push">
1871 push
1871 push
1872 </a>
1872 </a>
1873 </td><td>
1873 </td><td>
1874 push changes to the specified destination
1874 push changes to the specified destination
1875 </td></tr>
1875 </td></tr>
1876 <tr><td>
1876 <tr><td>
1877 <a href="/help/remove">
1877 <a href="/help/remove">
1878 remove
1878 remove
1879 </a>
1879 </a>
1880 </td><td>
1880 </td><td>
1881 remove the specified files on the next commit
1881 remove the specified files on the next commit
1882 </td></tr>
1882 </td></tr>
1883 <tr><td>
1883 <tr><td>
1884 <a href="/help/serve">
1884 <a href="/help/serve">
1885 serve
1885 serve
1886 </a>
1886 </a>
1887 </td><td>
1887 </td><td>
1888 start stand-alone webserver
1888 start stand-alone webserver
1889 </td></tr>
1889 </td></tr>
1890 <tr><td>
1890 <tr><td>
1891 <a href="/help/status">
1891 <a href="/help/status">
1892 status
1892 status
1893 </a>
1893 </a>
1894 </td><td>
1894 </td><td>
1895 show changed files in the working directory
1895 show changed files in the working directory
1896 </td></tr>
1896 </td></tr>
1897 <tr><td>
1897 <tr><td>
1898 <a href="/help/summary">
1898 <a href="/help/summary">
1899 summary
1899 summary
1900 </a>
1900 </a>
1901 </td><td>
1901 </td><td>
1902 summarize working directory state
1902 summarize working directory state
1903 </td></tr>
1903 </td></tr>
1904 <tr><td>
1904 <tr><td>
1905 <a href="/help/update">
1905 <a href="/help/update">
1906 update
1906 update
1907 </a>
1907 </a>
1908 </td><td>
1908 </td><td>
1909 update working directory (or switch revisions)
1909 update working directory (or switch revisions)
1910 </td></tr>
1910 </td></tr>
1911
1911
1912 <tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
1912 <tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
1913
1913
1914 <tr><td>
1914 <tr><td>
1915 <a href="/help/addremove">
1915 <a href="/help/addremove">
1916 addremove
1916 addremove
1917 </a>
1917 </a>
1918 </td><td>
1918 </td><td>
1919 add all new files, delete all missing files
1919 add all new files, delete all missing files
1920 </td></tr>
1920 </td></tr>
1921 <tr><td>
1921 <tr><td>
1922 <a href="/help/archive">
1922 <a href="/help/archive">
1923 archive
1923 archive
1924 </a>
1924 </a>
1925 </td><td>
1925 </td><td>
1926 create an unversioned archive of a repository revision
1926 create an unversioned archive of a repository revision
1927 </td></tr>
1927 </td></tr>
1928 <tr><td>
1928 <tr><td>
1929 <a href="/help/backout">
1929 <a href="/help/backout">
1930 backout
1930 backout
1931 </a>
1931 </a>
1932 </td><td>
1932 </td><td>
1933 reverse effect of earlier changeset
1933 reverse effect of earlier changeset
1934 </td></tr>
1934 </td></tr>
1935 <tr><td>
1935 <tr><td>
1936 <a href="/help/bisect">
1936 <a href="/help/bisect">
1937 bisect
1937 bisect
1938 </a>
1938 </a>
1939 </td><td>
1939 </td><td>
1940 subdivision search of changesets
1940 subdivision search of changesets
1941 </td></tr>
1941 </td></tr>
1942 <tr><td>
1942 <tr><td>
1943 <a href="/help/bookmarks">
1943 <a href="/help/bookmarks">
1944 bookmarks
1944 bookmarks
1945 </a>
1945 </a>
1946 </td><td>
1946 </td><td>
1947 create a new bookmark or list existing bookmarks
1947 create a new bookmark or list existing bookmarks
1948 </td></tr>
1948 </td></tr>
1949 <tr><td>
1949 <tr><td>
1950 <a href="/help/branch">
1950 <a href="/help/branch">
1951 branch
1951 branch
1952 </a>
1952 </a>
1953 </td><td>
1953 </td><td>
1954 set or show the current branch name
1954 set or show the current branch name
1955 </td></tr>
1955 </td></tr>
1956 <tr><td>
1956 <tr><td>
1957 <a href="/help/branches">
1957 <a href="/help/branches">
1958 branches
1958 branches
1959 </a>
1959 </a>
1960 </td><td>
1960 </td><td>
1961 list repository named branches
1961 list repository named branches
1962 </td></tr>
1962 </td></tr>
1963 <tr><td>
1963 <tr><td>
1964 <a href="/help/bundle">
1964 <a href="/help/bundle">
1965 bundle
1965 bundle
1966 </a>
1966 </a>
1967 </td><td>
1967 </td><td>
1968 create a changegroup file
1968 create a changegroup file
1969 </td></tr>
1969 </td></tr>
1970 <tr><td>
1970 <tr><td>
1971 <a href="/help/cat">
1971 <a href="/help/cat">
1972 cat
1972 cat
1973 </a>
1973 </a>
1974 </td><td>
1974 </td><td>
1975 output the current or given revision of files
1975 output the current or given revision of files
1976 </td></tr>
1976 </td></tr>
1977 <tr><td>
1977 <tr><td>
1978 <a href="/help/config">
1978 <a href="/help/config">
1979 config
1979 config
1980 </a>
1980 </a>
1981 </td><td>
1981 </td><td>
1982 show combined config settings from all hgrc files
1982 show combined config settings from all hgrc files
1983 </td></tr>
1983 </td></tr>
1984 <tr><td>
1984 <tr><td>
1985 <a href="/help/copy">
1985 <a href="/help/copy">
1986 copy
1986 copy
1987 </a>
1987 </a>
1988 </td><td>
1988 </td><td>
1989 mark files as copied for the next commit
1989 mark files as copied for the next commit
1990 </td></tr>
1990 </td></tr>
1991 <tr><td>
1991 <tr><td>
1992 <a href="/help/files">
1992 <a href="/help/files">
1993 files
1993 files
1994 </a>
1994 </a>
1995 </td><td>
1995 </td><td>
1996 list tracked files
1996 list tracked files
1997 </td></tr>
1997 </td></tr>
1998 <tr><td>
1998 <tr><td>
1999 <a href="/help/graft">
1999 <a href="/help/graft">
2000 graft
2000 graft
2001 </a>
2001 </a>
2002 </td><td>
2002 </td><td>
2003 copy changes from other branches onto the current branch
2003 copy changes from other branches onto the current branch
2004 </td></tr>
2004 </td></tr>
2005 <tr><td>
2005 <tr><td>
2006 <a href="/help/grep">
2006 <a href="/help/grep">
2007 grep
2007 grep
2008 </a>
2008 </a>
2009 </td><td>
2009 </td><td>
2010 search for a pattern in specified files and revisions
2010 search for a pattern in specified files and revisions
2011 </td></tr>
2011 </td></tr>
2012 <tr><td>
2012 <tr><td>
2013 <a href="/help/heads">
2013 <a href="/help/heads">
2014 heads
2014 heads
2015 </a>
2015 </a>
2016 </td><td>
2016 </td><td>
2017 show branch heads
2017 show branch heads
2018 </td></tr>
2018 </td></tr>
2019 <tr><td>
2019 <tr><td>
2020 <a href="/help/help">
2020 <a href="/help/help">
2021 help
2021 help
2022 </a>
2022 </a>
2023 </td><td>
2023 </td><td>
2024 show help for a given topic or a help overview
2024 show help for a given topic or a help overview
2025 </td></tr>
2025 </td></tr>
2026 <tr><td>
2026 <tr><td>
2027 <a href="/help/identify">
2027 <a href="/help/identify">
2028 identify
2028 identify
2029 </a>
2029 </a>
2030 </td><td>
2030 </td><td>
2031 identify the working directory or specified revision
2031 identify the working directory or specified revision
2032 </td></tr>
2032 </td></tr>
2033 <tr><td>
2033 <tr><td>
2034 <a href="/help/import">
2034 <a href="/help/import">
2035 import
2035 import
2036 </a>
2036 </a>
2037 </td><td>
2037 </td><td>
2038 import an ordered set of patches
2038 import an ordered set of patches
2039 </td></tr>
2039 </td></tr>
2040 <tr><td>
2040 <tr><td>
2041 <a href="/help/incoming">
2041 <a href="/help/incoming">
2042 incoming
2042 incoming
2043 </a>
2043 </a>
2044 </td><td>
2044 </td><td>
2045 show new changesets found in source
2045 show new changesets found in source
2046 </td></tr>
2046 </td></tr>
2047 <tr><td>
2047 <tr><td>
2048 <a href="/help/manifest">
2048 <a href="/help/manifest">
2049 manifest
2049 manifest
2050 </a>
2050 </a>
2051 </td><td>
2051 </td><td>
2052 output the current or given revision of the project manifest
2052 output the current or given revision of the project manifest
2053 </td></tr>
2053 </td></tr>
2054 <tr><td>
2054 <tr><td>
2055 <a href="/help/nohelp">
2055 <a href="/help/nohelp">
2056 nohelp
2056 nohelp
2057 </a>
2057 </a>
2058 </td><td>
2058 </td><td>
2059 (no help text available)
2059 (no help text available)
2060 </td></tr>
2060 </td></tr>
2061 <tr><td>
2061 <tr><td>
2062 <a href="/help/outgoing">
2062 <a href="/help/outgoing">
2063 outgoing
2063 outgoing
2064 </a>
2064 </a>
2065 </td><td>
2065 </td><td>
2066 show changesets not found in the destination
2066 show changesets not found in the destination
2067 </td></tr>
2067 </td></tr>
2068 <tr><td>
2068 <tr><td>
2069 <a href="/help/paths">
2069 <a href="/help/paths">
2070 paths
2070 paths
2071 </a>
2071 </a>
2072 </td><td>
2072 </td><td>
2073 show aliases for remote repositories
2073 show aliases for remote repositories
2074 </td></tr>
2074 </td></tr>
2075 <tr><td>
2075 <tr><td>
2076 <a href="/help/phase">
2076 <a href="/help/phase">
2077 phase
2077 phase
2078 </a>
2078 </a>
2079 </td><td>
2079 </td><td>
2080 set or show the current phase name
2080 set or show the current phase name
2081 </td></tr>
2081 </td></tr>
2082 <tr><td>
2082 <tr><td>
2083 <a href="/help/recover">
2083 <a href="/help/recover">
2084 recover
2084 recover
2085 </a>
2085 </a>
2086 </td><td>
2086 </td><td>
2087 roll back an interrupted transaction
2087 roll back an interrupted transaction
2088 </td></tr>
2088 </td></tr>
2089 <tr><td>
2089 <tr><td>
2090 <a href="/help/rename">
2090 <a href="/help/rename">
2091 rename
2091 rename
2092 </a>
2092 </a>
2093 </td><td>
2093 </td><td>
2094 rename files; equivalent of copy + remove
2094 rename files; equivalent of copy + remove
2095 </td></tr>
2095 </td></tr>
2096 <tr><td>
2096 <tr><td>
2097 <a href="/help/resolve">
2097 <a href="/help/resolve">
2098 resolve
2098 resolve
2099 </a>
2099 </a>
2100 </td><td>
2100 </td><td>
2101 redo merges or set/view the merge status of files
2101 redo merges or set/view the merge status of files
2102 </td></tr>
2102 </td></tr>
2103 <tr><td>
2103 <tr><td>
2104 <a href="/help/revert">
2104 <a href="/help/revert">
2105 revert
2105 revert
2106 </a>
2106 </a>
2107 </td><td>
2107 </td><td>
2108 restore files to their checkout state
2108 restore files to their checkout state
2109 </td></tr>
2109 </td></tr>
2110 <tr><td>
2110 <tr><td>
2111 <a href="/help/root">
2111 <a href="/help/root">
2112 root
2112 root
2113 </a>
2113 </a>
2114 </td><td>
2114 </td><td>
2115 print the root (top) of the current working directory
2115 print the root (top) of the current working directory
2116 </td></tr>
2116 </td></tr>
2117 <tr><td>
2117 <tr><td>
2118 <a href="/help/tag">
2118 <a href="/help/tag">
2119 tag
2119 tag
2120 </a>
2120 </a>
2121 </td><td>
2121 </td><td>
2122 add one or more tags for the current or given revision
2122 add one or more tags for the current or given revision
2123 </td></tr>
2123 </td></tr>
2124 <tr><td>
2124 <tr><td>
2125 <a href="/help/tags">
2125 <a href="/help/tags">
2126 tags
2126 tags
2127 </a>
2127 </a>
2128 </td><td>
2128 </td><td>
2129 list repository tags
2129 list repository tags
2130 </td></tr>
2130 </td></tr>
2131 <tr><td>
2131 <tr><td>
2132 <a href="/help/unbundle">
2132 <a href="/help/unbundle">
2133 unbundle
2133 unbundle
2134 </a>
2134 </a>
2135 </td><td>
2135 </td><td>
2136 apply one or more changegroup files
2136 apply one or more changegroup files
2137 </td></tr>
2137 </td></tr>
2138 <tr><td>
2138 <tr><td>
2139 <a href="/help/verify">
2139 <a href="/help/verify">
2140 verify
2140 verify
2141 </a>
2141 </a>
2142 </td><td>
2142 </td><td>
2143 verify the integrity of the repository
2143 verify the integrity of the repository
2144 </td></tr>
2144 </td></tr>
2145 <tr><td>
2145 <tr><td>
2146 <a href="/help/version">
2146 <a href="/help/version">
2147 version
2147 version
2148 </a>
2148 </a>
2149 </td><td>
2149 </td><td>
2150 output version and copyright information
2150 output version and copyright information
2151 </td></tr>
2151 </td></tr>
2152 </table>
2152 </table>
2153 </div>
2153 </div>
2154 </div>
2154 </div>
2155
2155
2156 <script type="text/javascript">process_dates()</script>
2156 <script type="text/javascript">process_dates()</script>
2157
2157
2158
2158
2159 </body>
2159 </body>
2160 </html>
2160 </html>
2161
2161
2162
2162
2163 $ get-with-headers.py 127.0.0.1:$HGPORT "help/add"
2163 $ get-with-headers.py 127.0.0.1:$HGPORT "help/add"
2164 200 Script output follows
2164 200 Script output follows
2165
2165
2166 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2166 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2167 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2167 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2168 <head>
2168 <head>
2169 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2169 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2170 <meta name="robots" content="index, nofollow" />
2170 <meta name="robots" content="index, nofollow" />
2171 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2171 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2172 <script type="text/javascript" src="/static/mercurial.js"></script>
2172 <script type="text/javascript" src="/static/mercurial.js"></script>
2173
2173
2174 <title>Help: add</title>
2174 <title>Help: add</title>
2175 </head>
2175 </head>
2176 <body>
2176 <body>
2177
2177
2178 <div class="container">
2178 <div class="container">
2179 <div class="menu">
2179 <div class="menu">
2180 <div class="logo">
2180 <div class="logo">
2181 <a href="https://mercurial-scm.org/">
2181 <a href="https://mercurial-scm.org/">
2182 <img src="/static/hglogo.png" alt="mercurial" /></a>
2182 <img src="/static/hglogo.png" alt="mercurial" /></a>
2183 </div>
2183 </div>
2184 <ul>
2184 <ul>
2185 <li><a href="/shortlog">log</a></li>
2185 <li><a href="/shortlog">log</a></li>
2186 <li><a href="/graph">graph</a></li>
2186 <li><a href="/graph">graph</a></li>
2187 <li><a href="/tags">tags</a></li>
2187 <li><a href="/tags">tags</a></li>
2188 <li><a href="/bookmarks">bookmarks</a></li>
2188 <li><a href="/bookmarks">bookmarks</a></li>
2189 <li><a href="/branches">branches</a></li>
2189 <li><a href="/branches">branches</a></li>
2190 </ul>
2190 </ul>
2191 <ul>
2191 <ul>
2192 <li class="active"><a href="/help">help</a></li>
2192 <li class="active"><a href="/help">help</a></li>
2193 </ul>
2193 </ul>
2194 </div>
2194 </div>
2195
2195
2196 <div class="main">
2196 <div class="main">
2197 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2197 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2198 <h3>Help: add</h3>
2198 <h3>Help: add</h3>
2199
2199
2200 <form class="search" action="/log">
2200 <form class="search" action="/log">
2201
2201
2202 <p><input name="rev" id="search1" type="text" size="30" /></p>
2202 <p><input name="rev" id="search1" type="text" size="30" /></p>
2203 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2203 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2204 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2204 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2205 </form>
2205 </form>
2206 <div id="doc">
2206 <div id="doc">
2207 <p>
2207 <p>
2208 hg add [OPTION]... [FILE]...
2208 hg add [OPTION]... [FILE]...
2209 </p>
2209 </p>
2210 <p>
2210 <p>
2211 add the specified files on the next commit
2211 add the specified files on the next commit
2212 </p>
2212 </p>
2213 <p>
2213 <p>
2214 Schedule files to be version controlled and added to the
2214 Schedule files to be version controlled and added to the
2215 repository.
2215 repository.
2216 </p>
2216 </p>
2217 <p>
2217 <p>
2218 The files will be added to the repository at the next commit. To
2218 The files will be added to the repository at the next commit. To
2219 undo an add before that, see &quot;hg forget&quot;.
2219 undo an add before that, see &quot;hg forget&quot;.
2220 </p>
2220 </p>
2221 <p>
2221 <p>
2222 If no names are given, add all files to the repository (except
2222 If no names are given, add all files to the repository (except
2223 files matching &quot;.hgignore&quot;).
2223 files matching &quot;.hgignore&quot;).
2224 </p>
2224 </p>
2225 <p>
2225 <p>
2226 Examples:
2226 Examples:
2227 </p>
2227 </p>
2228 <ul>
2228 <ul>
2229 <li> New (unknown) files are added automatically by &quot;hg add&quot;:
2229 <li> New (unknown) files are added automatically by &quot;hg add&quot;:
2230 <pre>
2230 <pre>
2231 \$ ls (re)
2231 \$ ls (re)
2232 foo.c
2232 foo.c
2233 \$ hg status (re)
2233 \$ hg status (re)
2234 ? foo.c
2234 ? foo.c
2235 \$ hg add (re)
2235 \$ hg add (re)
2236 adding foo.c
2236 adding foo.c
2237 \$ hg status (re)
2237 \$ hg status (re)
2238 A foo.c
2238 A foo.c
2239 </pre>
2239 </pre>
2240 <li> Specific files to be added can be specified:
2240 <li> Specific files to be added can be specified:
2241 <pre>
2241 <pre>
2242 \$ ls (re)
2242 \$ ls (re)
2243 bar.c foo.c
2243 bar.c foo.c
2244 \$ hg status (re)
2244 \$ hg status (re)
2245 ? bar.c
2245 ? bar.c
2246 ? foo.c
2246 ? foo.c
2247 \$ hg add bar.c (re)
2247 \$ hg add bar.c (re)
2248 \$ hg status (re)
2248 \$ hg status (re)
2249 A bar.c
2249 A bar.c
2250 ? foo.c
2250 ? foo.c
2251 </pre>
2251 </pre>
2252 </ul>
2252 </ul>
2253 <p>
2253 <p>
2254 Returns 0 if all files are successfully added.
2254 Returns 0 if all files are successfully added.
2255 </p>
2255 </p>
2256 <p>
2256 <p>
2257 options ([+] can be repeated):
2257 options ([+] can be repeated):
2258 </p>
2258 </p>
2259 <table>
2259 <table>
2260 <tr><td>-I</td>
2260 <tr><td>-I</td>
2261 <td>--include PATTERN [+]</td>
2261 <td>--include PATTERN [+]</td>
2262 <td>include names matching the given patterns</td></tr>
2262 <td>include names matching the given patterns</td></tr>
2263 <tr><td>-X</td>
2263 <tr><td>-X</td>
2264 <td>--exclude PATTERN [+]</td>
2264 <td>--exclude PATTERN [+]</td>
2265 <td>exclude names matching the given patterns</td></tr>
2265 <td>exclude names matching the given patterns</td></tr>
2266 <tr><td>-S</td>
2266 <tr><td>-S</td>
2267 <td>--subrepos</td>
2267 <td>--subrepos</td>
2268 <td>recurse into subrepositories</td></tr>
2268 <td>recurse into subrepositories</td></tr>
2269 <tr><td>-n</td>
2269 <tr><td>-n</td>
2270 <td>--dry-run</td>
2270 <td>--dry-run</td>
2271 <td>do not perform actions, just print output</td></tr>
2271 <td>do not perform actions, just print output</td></tr>
2272 </table>
2272 </table>
2273 <p>
2273 <p>
2274 global options ([+] can be repeated):
2274 global options ([+] can be repeated):
2275 </p>
2275 </p>
2276 <table>
2276 <table>
2277 <tr><td>-R</td>
2277 <tr><td>-R</td>
2278 <td>--repository REPO</td>
2278 <td>--repository REPO</td>
2279 <td>repository root directory or name of overlay bundle file</td></tr>
2279 <td>repository root directory or name of overlay bundle file</td></tr>
2280 <tr><td></td>
2280 <tr><td></td>
2281 <td>--cwd DIR</td>
2281 <td>--cwd DIR</td>
2282 <td>change working directory</td></tr>
2282 <td>change working directory</td></tr>
2283 <tr><td>-y</td>
2283 <tr><td>-y</td>
2284 <td>--noninteractive</td>
2284 <td>--noninteractive</td>
2285 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2285 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2286 <tr><td>-q</td>
2286 <tr><td>-q</td>
2287 <td>--quiet</td>
2287 <td>--quiet</td>
2288 <td>suppress output</td></tr>
2288 <td>suppress output</td></tr>
2289 <tr><td>-v</td>
2289 <tr><td>-v</td>
2290 <td>--verbose</td>
2290 <td>--verbose</td>
2291 <td>enable additional output</td></tr>
2291 <td>enable additional output</td></tr>
2292 <tr><td></td>
2292 <tr><td></td>
2293 <td>--config CONFIG [+]</td>
2293 <td>--config CONFIG [+]</td>
2294 <td>set/override config option (use 'section.name=value')</td></tr>
2294 <td>set/override config option (use 'section.name=value')</td></tr>
2295 <tr><td></td>
2295 <tr><td></td>
2296 <td>--debug</td>
2296 <td>--debug</td>
2297 <td>enable debugging output</td></tr>
2297 <td>enable debugging output</td></tr>
2298 <tr><td></td>
2298 <tr><td></td>
2299 <td>--debugger</td>
2299 <td>--debugger</td>
2300 <td>start debugger</td></tr>
2300 <td>start debugger</td></tr>
2301 <tr><td></td>
2301 <tr><td></td>
2302 <td>--encoding ENCODE</td>
2302 <td>--encoding ENCODE</td>
2303 <td>set the charset encoding (default: ascii)</td></tr>
2303 <td>set the charset encoding (default: ascii)</td></tr>
2304 <tr><td></td>
2304 <tr><td></td>
2305 <td>--encodingmode MODE</td>
2305 <td>--encodingmode MODE</td>
2306 <td>set the charset encoding mode (default: strict)</td></tr>
2306 <td>set the charset encoding mode (default: strict)</td></tr>
2307 <tr><td></td>
2307 <tr><td></td>
2308 <td>--traceback</td>
2308 <td>--traceback</td>
2309 <td>always print a traceback on exception</td></tr>
2309 <td>always print a traceback on exception</td></tr>
2310 <tr><td></td>
2310 <tr><td></td>
2311 <td>--time</td>
2311 <td>--time</td>
2312 <td>time how long the command takes</td></tr>
2312 <td>time how long the command takes</td></tr>
2313 <tr><td></td>
2313 <tr><td></td>
2314 <td>--profile</td>
2314 <td>--profile</td>
2315 <td>print command execution profile</td></tr>
2315 <td>print command execution profile</td></tr>
2316 <tr><td></td>
2316 <tr><td></td>
2317 <td>--version</td>
2317 <td>--version</td>
2318 <td>output version information and exit</td></tr>
2318 <td>output version information and exit</td></tr>
2319 <tr><td>-h</td>
2319 <tr><td>-h</td>
2320 <td>--help</td>
2320 <td>--help</td>
2321 <td>display help and exit</td></tr>
2321 <td>display help and exit</td></tr>
2322 <tr><td></td>
2322 <tr><td></td>
2323 <td>--hidden</td>
2323 <td>--hidden</td>
2324 <td>consider hidden changesets</td></tr>
2324 <td>consider hidden changesets</td></tr>
2325 </table>
2325 </table>
2326
2326
2327 </div>
2327 </div>
2328 </div>
2328 </div>
2329 </div>
2329 </div>
2330
2330
2331 <script type="text/javascript">process_dates()</script>
2331 <script type="text/javascript">process_dates()</script>
2332
2332
2333
2333
2334 </body>
2334 </body>
2335 </html>
2335 </html>
2336
2336
2337
2337
2338 $ get-with-headers.py 127.0.0.1:$HGPORT "help/remove"
2338 $ get-with-headers.py 127.0.0.1:$HGPORT "help/remove"
2339 200 Script output follows
2339 200 Script output follows
2340
2340
2341 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2341 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2342 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2342 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2343 <head>
2343 <head>
2344 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2344 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2345 <meta name="robots" content="index, nofollow" />
2345 <meta name="robots" content="index, nofollow" />
2346 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2346 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2347 <script type="text/javascript" src="/static/mercurial.js"></script>
2347 <script type="text/javascript" src="/static/mercurial.js"></script>
2348
2348
2349 <title>Help: remove</title>
2349 <title>Help: remove</title>
2350 </head>
2350 </head>
2351 <body>
2351 <body>
2352
2352
2353 <div class="container">
2353 <div class="container">
2354 <div class="menu">
2354 <div class="menu">
2355 <div class="logo">
2355 <div class="logo">
2356 <a href="https://mercurial-scm.org/">
2356 <a href="https://mercurial-scm.org/">
2357 <img src="/static/hglogo.png" alt="mercurial" /></a>
2357 <img src="/static/hglogo.png" alt="mercurial" /></a>
2358 </div>
2358 </div>
2359 <ul>
2359 <ul>
2360 <li><a href="/shortlog">log</a></li>
2360 <li><a href="/shortlog">log</a></li>
2361 <li><a href="/graph">graph</a></li>
2361 <li><a href="/graph">graph</a></li>
2362 <li><a href="/tags">tags</a></li>
2362 <li><a href="/tags">tags</a></li>
2363 <li><a href="/bookmarks">bookmarks</a></li>
2363 <li><a href="/bookmarks">bookmarks</a></li>
2364 <li><a href="/branches">branches</a></li>
2364 <li><a href="/branches">branches</a></li>
2365 </ul>
2365 </ul>
2366 <ul>
2366 <ul>
2367 <li class="active"><a href="/help">help</a></li>
2367 <li class="active"><a href="/help">help</a></li>
2368 </ul>
2368 </ul>
2369 </div>
2369 </div>
2370
2370
2371 <div class="main">
2371 <div class="main">
2372 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2372 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2373 <h3>Help: remove</h3>
2373 <h3>Help: remove</h3>
2374
2374
2375 <form class="search" action="/log">
2375 <form class="search" action="/log">
2376
2376
2377 <p><input name="rev" id="search1" type="text" size="30" /></p>
2377 <p><input name="rev" id="search1" type="text" size="30" /></p>
2378 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2378 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2379 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2379 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2380 </form>
2380 </form>
2381 <div id="doc">
2381 <div id="doc">
2382 <p>
2382 <p>
2383 hg remove [OPTION]... FILE...
2383 hg remove [OPTION]... FILE...
2384 </p>
2384 </p>
2385 <p>
2385 <p>
2386 aliases: rm
2386 aliases: rm
2387 </p>
2387 </p>
2388 <p>
2388 <p>
2389 remove the specified files on the next commit
2389 remove the specified files on the next commit
2390 </p>
2390 </p>
2391 <p>
2391 <p>
2392 Schedule the indicated files for removal from the current branch.
2392 Schedule the indicated files for removal from the current branch.
2393 </p>
2393 </p>
2394 <p>
2394 <p>
2395 This command schedules the files to be removed at the next commit.
2395 This command schedules the files to be removed at the next commit.
2396 To undo a remove before that, see &quot;hg revert&quot;. To undo added
2396 To undo a remove before that, see &quot;hg revert&quot;. To undo added
2397 files, see &quot;hg forget&quot;.
2397 files, see &quot;hg forget&quot;.
2398 </p>
2398 </p>
2399 <p>
2399 <p>
2400 -A/--after can be used to remove only files that have already
2400 -A/--after can be used to remove only files that have already
2401 been deleted, -f/--force can be used to force deletion, and -Af
2401 been deleted, -f/--force can be used to force deletion, and -Af
2402 can be used to remove files from the next revision without
2402 can be used to remove files from the next revision without
2403 deleting them from the working directory.
2403 deleting them from the working directory.
2404 </p>
2404 </p>
2405 <p>
2405 <p>
2406 The following table details the behavior of remove for different
2406 The following table details the behavior of remove for different
2407 file states (columns) and option combinations (rows). The file
2407 file states (columns) and option combinations (rows). The file
2408 states are Added [A], Clean [C], Modified [M] and Missing [!]
2408 states are Added [A], Clean [C], Modified [M] and Missing [!]
2409 (as reported by &quot;hg status&quot;). The actions are Warn, Remove
2409 (as reported by &quot;hg status&quot;). The actions are Warn, Remove
2410 (from branch) and Delete (from disk):
2410 (from branch) and Delete (from disk):
2411 </p>
2411 </p>
2412 <table>
2412 <table>
2413 <tr><td>opt/state</td>
2413 <tr><td>opt/state</td>
2414 <td>A</td>
2414 <td>A</td>
2415 <td>C</td>
2415 <td>C</td>
2416 <td>M</td>
2416 <td>M</td>
2417 <td>!</td></tr>
2417 <td>!</td></tr>
2418 <tr><td>none</td>
2418 <tr><td>none</td>
2419 <td>W</td>
2419 <td>W</td>
2420 <td>RD</td>
2420 <td>RD</td>
2421 <td>W</td>
2421 <td>W</td>
2422 <td>R</td></tr>
2422 <td>R</td></tr>
2423 <tr><td>-f</td>
2423 <tr><td>-f</td>
2424 <td>R</td>
2424 <td>R</td>
2425 <td>RD</td>
2425 <td>RD</td>
2426 <td>RD</td>
2426 <td>RD</td>
2427 <td>R</td></tr>
2427 <td>R</td></tr>
2428 <tr><td>-A</td>
2428 <tr><td>-A</td>
2429 <td>W</td>
2429 <td>W</td>
2430 <td>W</td>
2430 <td>W</td>
2431 <td>W</td>
2431 <td>W</td>
2432 <td>R</td></tr>
2432 <td>R</td></tr>
2433 <tr><td>-Af</td>
2433 <tr><td>-Af</td>
2434 <td>R</td>
2434 <td>R</td>
2435 <td>R</td>
2435 <td>R</td>
2436 <td>R</td>
2436 <td>R</td>
2437 <td>R</td></tr>
2437 <td>R</td></tr>
2438 </table>
2438 </table>
2439 <p>
2439 <p>
2440 Note that remove never deletes files in Added [A] state from the
2440 <b>Note:</b>
2441 working directory, not even if option --force is specified.
2441 </p>
2442 <p>
2443 &quot;hg remove&quot; never deletes files in Added [A] state from the
2444 working directory, not even if &quot;--force&quot; is specified.
2442 </p>
2445 </p>
2443 <p>
2446 <p>
2444 Returns 0 on success, 1 if any warnings encountered.
2447 Returns 0 on success, 1 if any warnings encountered.
2445 </p>
2448 </p>
2446 <p>
2449 <p>
2447 options ([+] can be repeated):
2450 options ([+] can be repeated):
2448 </p>
2451 </p>
2449 <table>
2452 <table>
2450 <tr><td>-A</td>
2453 <tr><td>-A</td>
2451 <td>--after</td>
2454 <td>--after</td>
2452 <td>record delete for missing files</td></tr>
2455 <td>record delete for missing files</td></tr>
2453 <tr><td>-f</td>
2456 <tr><td>-f</td>
2454 <td>--force</td>
2457 <td>--force</td>
2455 <td>remove (and delete) file even if added or modified</td></tr>
2458 <td>remove (and delete) file even if added or modified</td></tr>
2456 <tr><td>-S</td>
2459 <tr><td>-S</td>
2457 <td>--subrepos</td>
2460 <td>--subrepos</td>
2458 <td>recurse into subrepositories</td></tr>
2461 <td>recurse into subrepositories</td></tr>
2459 <tr><td>-I</td>
2462 <tr><td>-I</td>
2460 <td>--include PATTERN [+]</td>
2463 <td>--include PATTERN [+]</td>
2461 <td>include names matching the given patterns</td></tr>
2464 <td>include names matching the given patterns</td></tr>
2462 <tr><td>-X</td>
2465 <tr><td>-X</td>
2463 <td>--exclude PATTERN [+]</td>
2466 <td>--exclude PATTERN [+]</td>
2464 <td>exclude names matching the given patterns</td></tr>
2467 <td>exclude names matching the given patterns</td></tr>
2465 </table>
2468 </table>
2466 <p>
2469 <p>
2467 global options ([+] can be repeated):
2470 global options ([+] can be repeated):
2468 </p>
2471 </p>
2469 <table>
2472 <table>
2470 <tr><td>-R</td>
2473 <tr><td>-R</td>
2471 <td>--repository REPO</td>
2474 <td>--repository REPO</td>
2472 <td>repository root directory or name of overlay bundle file</td></tr>
2475 <td>repository root directory or name of overlay bundle file</td></tr>
2473 <tr><td></td>
2476 <tr><td></td>
2474 <td>--cwd DIR</td>
2477 <td>--cwd DIR</td>
2475 <td>change working directory</td></tr>
2478 <td>change working directory</td></tr>
2476 <tr><td>-y</td>
2479 <tr><td>-y</td>
2477 <td>--noninteractive</td>
2480 <td>--noninteractive</td>
2478 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2481 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2479 <tr><td>-q</td>
2482 <tr><td>-q</td>
2480 <td>--quiet</td>
2483 <td>--quiet</td>
2481 <td>suppress output</td></tr>
2484 <td>suppress output</td></tr>
2482 <tr><td>-v</td>
2485 <tr><td>-v</td>
2483 <td>--verbose</td>
2486 <td>--verbose</td>
2484 <td>enable additional output</td></tr>
2487 <td>enable additional output</td></tr>
2485 <tr><td></td>
2488 <tr><td></td>
2486 <td>--config CONFIG [+]</td>
2489 <td>--config CONFIG [+]</td>
2487 <td>set/override config option (use 'section.name=value')</td></tr>
2490 <td>set/override config option (use 'section.name=value')</td></tr>
2488 <tr><td></td>
2491 <tr><td></td>
2489 <td>--debug</td>
2492 <td>--debug</td>
2490 <td>enable debugging output</td></tr>
2493 <td>enable debugging output</td></tr>
2491 <tr><td></td>
2494 <tr><td></td>
2492 <td>--debugger</td>
2495 <td>--debugger</td>
2493 <td>start debugger</td></tr>
2496 <td>start debugger</td></tr>
2494 <tr><td></td>
2497 <tr><td></td>
2495 <td>--encoding ENCODE</td>
2498 <td>--encoding ENCODE</td>
2496 <td>set the charset encoding (default: ascii)</td></tr>
2499 <td>set the charset encoding (default: ascii)</td></tr>
2497 <tr><td></td>
2500 <tr><td></td>
2498 <td>--encodingmode MODE</td>
2501 <td>--encodingmode MODE</td>
2499 <td>set the charset encoding mode (default: strict)</td></tr>
2502 <td>set the charset encoding mode (default: strict)</td></tr>
2500 <tr><td></td>
2503 <tr><td></td>
2501 <td>--traceback</td>
2504 <td>--traceback</td>
2502 <td>always print a traceback on exception</td></tr>
2505 <td>always print a traceback on exception</td></tr>
2503 <tr><td></td>
2506 <tr><td></td>
2504 <td>--time</td>
2507 <td>--time</td>
2505 <td>time how long the command takes</td></tr>
2508 <td>time how long the command takes</td></tr>
2506 <tr><td></td>
2509 <tr><td></td>
2507 <td>--profile</td>
2510 <td>--profile</td>
2508 <td>print command execution profile</td></tr>
2511 <td>print command execution profile</td></tr>
2509 <tr><td></td>
2512 <tr><td></td>
2510 <td>--version</td>
2513 <td>--version</td>
2511 <td>output version information and exit</td></tr>
2514 <td>output version information and exit</td></tr>
2512 <tr><td>-h</td>
2515 <tr><td>-h</td>
2513 <td>--help</td>
2516 <td>--help</td>
2514 <td>display help and exit</td></tr>
2517 <td>display help and exit</td></tr>
2515 <tr><td></td>
2518 <tr><td></td>
2516 <td>--hidden</td>
2519 <td>--hidden</td>
2517 <td>consider hidden changesets</td></tr>
2520 <td>consider hidden changesets</td></tr>
2518 </table>
2521 </table>
2519
2522
2520 </div>
2523 </div>
2521 </div>
2524 </div>
2522 </div>
2525 </div>
2523
2526
2524 <script type="text/javascript">process_dates()</script>
2527 <script type="text/javascript">process_dates()</script>
2525
2528
2526
2529
2527 </body>
2530 </body>
2528 </html>
2531 </html>
2529
2532
2530
2533
2531 $ get-with-headers.py 127.0.0.1:$HGPORT "help/revisions"
2534 $ get-with-headers.py 127.0.0.1:$HGPORT "help/revisions"
2532 200 Script output follows
2535 200 Script output follows
2533
2536
2534 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2537 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2535 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2538 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2536 <head>
2539 <head>
2537 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2540 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2538 <meta name="robots" content="index, nofollow" />
2541 <meta name="robots" content="index, nofollow" />
2539 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2542 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2540 <script type="text/javascript" src="/static/mercurial.js"></script>
2543 <script type="text/javascript" src="/static/mercurial.js"></script>
2541
2544
2542 <title>Help: revisions</title>
2545 <title>Help: revisions</title>
2543 </head>
2546 </head>
2544 <body>
2547 <body>
2545
2548
2546 <div class="container">
2549 <div class="container">
2547 <div class="menu">
2550 <div class="menu">
2548 <div class="logo">
2551 <div class="logo">
2549 <a href="https://mercurial-scm.org/">
2552 <a href="https://mercurial-scm.org/">
2550 <img src="/static/hglogo.png" alt="mercurial" /></a>
2553 <img src="/static/hglogo.png" alt="mercurial" /></a>
2551 </div>
2554 </div>
2552 <ul>
2555 <ul>
2553 <li><a href="/shortlog">log</a></li>
2556 <li><a href="/shortlog">log</a></li>
2554 <li><a href="/graph">graph</a></li>
2557 <li><a href="/graph">graph</a></li>
2555 <li><a href="/tags">tags</a></li>
2558 <li><a href="/tags">tags</a></li>
2556 <li><a href="/bookmarks">bookmarks</a></li>
2559 <li><a href="/bookmarks">bookmarks</a></li>
2557 <li><a href="/branches">branches</a></li>
2560 <li><a href="/branches">branches</a></li>
2558 </ul>
2561 </ul>
2559 <ul>
2562 <ul>
2560 <li class="active"><a href="/help">help</a></li>
2563 <li class="active"><a href="/help">help</a></li>
2561 </ul>
2564 </ul>
2562 </div>
2565 </div>
2563
2566
2564 <div class="main">
2567 <div class="main">
2565 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2568 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2566 <h3>Help: revisions</h3>
2569 <h3>Help: revisions</h3>
2567
2570
2568 <form class="search" action="/log">
2571 <form class="search" action="/log">
2569
2572
2570 <p><input name="rev" id="search1" type="text" size="30" /></p>
2573 <p><input name="rev" id="search1" type="text" size="30" /></p>
2571 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2574 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2572 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2575 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2573 </form>
2576 </form>
2574 <div id="doc">
2577 <div id="doc">
2575 <h1>Specifying Single Revisions</h1>
2578 <h1>Specifying Single Revisions</h1>
2576 <p>
2579 <p>
2577 Mercurial supports several ways to specify individual revisions.
2580 Mercurial supports several ways to specify individual revisions.
2578 </p>
2581 </p>
2579 <p>
2582 <p>
2580 A plain integer is treated as a revision number. Negative integers are
2583 A plain integer is treated as a revision number. Negative integers are
2581 treated as sequential offsets from the tip, with -1 denoting the tip,
2584 treated as sequential offsets from the tip, with -1 denoting the tip,
2582 -2 denoting the revision prior to the tip, and so forth.
2585 -2 denoting the revision prior to the tip, and so forth.
2583 </p>
2586 </p>
2584 <p>
2587 <p>
2585 A 40-digit hexadecimal string is treated as a unique revision
2588 A 40-digit hexadecimal string is treated as a unique revision
2586 identifier.
2589 identifier.
2587 </p>
2590 </p>
2588 <p>
2591 <p>
2589 A hexadecimal string less than 40 characters long is treated as a
2592 A hexadecimal string less than 40 characters long is treated as a
2590 unique revision identifier and is referred to as a short-form
2593 unique revision identifier and is referred to as a short-form
2591 identifier. A short-form identifier is only valid if it is the prefix
2594 identifier. A short-form identifier is only valid if it is the prefix
2592 of exactly one full-length identifier.
2595 of exactly one full-length identifier.
2593 </p>
2596 </p>
2594 <p>
2597 <p>
2595 Any other string is treated as a bookmark, tag, or branch name. A
2598 Any other string is treated as a bookmark, tag, or branch name. A
2596 bookmark is a movable pointer to a revision. A tag is a permanent name
2599 bookmark is a movable pointer to a revision. A tag is a permanent name
2597 associated with a revision. A branch name denotes the tipmost open branch head
2600 associated with a revision. A branch name denotes the tipmost open branch head
2598 of that branch - or if they are all closed, the tipmost closed head of the
2601 of that branch - or if they are all closed, the tipmost closed head of the
2599 branch. Bookmark, tag, and branch names must not contain the &quot;:&quot; character.
2602 branch. Bookmark, tag, and branch names must not contain the &quot;:&quot; character.
2600 </p>
2603 </p>
2601 <p>
2604 <p>
2602 The reserved name &quot;tip&quot; always identifies the most recent revision.
2605 The reserved name &quot;tip&quot; always identifies the most recent revision.
2603 </p>
2606 </p>
2604 <p>
2607 <p>
2605 The reserved name &quot;null&quot; indicates the null revision. This is the
2608 The reserved name &quot;null&quot; indicates the null revision. This is the
2606 revision of an empty repository, and the parent of revision 0.
2609 revision of an empty repository, and the parent of revision 0.
2607 </p>
2610 </p>
2608 <p>
2611 <p>
2609 The reserved name &quot;.&quot; indicates the working directory parent. If no
2612 The reserved name &quot;.&quot; indicates the working directory parent. If no
2610 working directory is checked out, it is equivalent to null. If an
2613 working directory is checked out, it is equivalent to null. If an
2611 uncommitted merge is in progress, &quot;.&quot; is the revision of the first
2614 uncommitted merge is in progress, &quot;.&quot; is the revision of the first
2612 parent.
2615 parent.
2613 </p>
2616 </p>
2614
2617
2615 </div>
2618 </div>
2616 </div>
2619 </div>
2617 </div>
2620 </div>
2618
2621
2619 <script type="text/javascript">process_dates()</script>
2622 <script type="text/javascript">process_dates()</script>
2620
2623
2621
2624
2622 </body>
2625 </body>
2623 </html>
2626 </html>
2624
2627
2625
2628
2626 $ killdaemons.py
2629 $ killdaemons.py
2627
2630
2628 #endif
2631 #endif
General Comments 0
You need to be logged in to leave comments. Login now