##// END OF EJS Templates
bookmark: remove excess creation of changectx's
Kevin Bullock -
r15491:c0e42b47 default
parent child Browse files
Show More
@@ -1,5666 +1,5666 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, nullid, nullrev, short
8 from node import hex, bin, nullid, nullrev, short
9 from lock import release
9 from lock import release
10 from i18n import _, gettext
10 from i18n import _, gettext
11 import os, re, difflib, time, tempfile, errno
11 import os, re, difflib, time, tempfile, errno
12 import hg, scmutil, util, revlog, extensions, copies, error, bookmarks
12 import hg, scmutil, util, revlog, extensions, copies, error, bookmarks
13 import patch, help, url, encoding, templatekw, discovery
13 import patch, help, url, encoding, templatekw, discovery
14 import archival, changegroup, cmdutil, hbisect
14 import archival, changegroup, cmdutil, hbisect
15 import sshserver, hgweb, hgweb.server, commandserver
15 import sshserver, hgweb, hgweb.server, commandserver
16 import match as matchmod
16 import match as matchmod
17 import merge as mergemod
17 import merge as mergemod
18 import minirst, revset, fileset
18 import minirst, revset, fileset
19 import dagparser, context, simplemerge
19 import dagparser, context, simplemerge
20 import random, setdiscovery, treediscovery, dagutil
20 import random, setdiscovery, treediscovery, dagutil
21
21
22 table = {}
22 table = {}
23
23
24 command = cmdutil.command(table)
24 command = cmdutil.command(table)
25
25
26 # common command options
26 # common command options
27
27
28 globalopts = [
28 globalopts = [
29 ('R', 'repository', '',
29 ('R', 'repository', '',
30 _('repository root directory or name of overlay bundle file'),
30 _('repository root directory or name of overlay bundle file'),
31 _('REPO')),
31 _('REPO')),
32 ('', 'cwd', '',
32 ('', 'cwd', '',
33 _('change working directory'), _('DIR')),
33 _('change working directory'), _('DIR')),
34 ('y', 'noninteractive', None,
34 ('y', 'noninteractive', None,
35 _('do not prompt, automatically pick the first choice for all prompts')),
35 _('do not prompt, automatically pick the first choice for all prompts')),
36 ('q', 'quiet', None, _('suppress output')),
36 ('q', 'quiet', None, _('suppress output')),
37 ('v', 'verbose', None, _('enable additional output')),
37 ('v', 'verbose', None, _('enable additional output')),
38 ('', 'config', [],
38 ('', 'config', [],
39 _('set/override config option (use \'section.name=value\')'),
39 _('set/override config option (use \'section.name=value\')'),
40 _('CONFIG')),
40 _('CONFIG')),
41 ('', 'debug', None, _('enable debugging output')),
41 ('', 'debug', None, _('enable debugging output')),
42 ('', 'debugger', None, _('start debugger')),
42 ('', 'debugger', None, _('start debugger')),
43 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
43 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
44 _('ENCODE')),
44 _('ENCODE')),
45 ('', 'encodingmode', encoding.encodingmode,
45 ('', 'encodingmode', encoding.encodingmode,
46 _('set the charset encoding mode'), _('MODE')),
46 _('set the charset encoding mode'), _('MODE')),
47 ('', 'traceback', None, _('always print a traceback on exception')),
47 ('', 'traceback', None, _('always print a traceback on exception')),
48 ('', 'time', None, _('time how long the command takes')),
48 ('', 'time', None, _('time how long the command takes')),
49 ('', 'profile', None, _('print command execution profile')),
49 ('', 'profile', None, _('print command execution profile')),
50 ('', 'version', None, _('output version information and exit')),
50 ('', 'version', None, _('output version information and exit')),
51 ('h', 'help', None, _('display help and exit')),
51 ('h', 'help', None, _('display help and exit')),
52 ]
52 ]
53
53
54 dryrunopts = [('n', 'dry-run', None,
54 dryrunopts = [('n', 'dry-run', None,
55 _('do not perform actions, just print output'))]
55 _('do not perform actions, just print output'))]
56
56
57 remoteopts = [
57 remoteopts = [
58 ('e', 'ssh', '',
58 ('e', 'ssh', '',
59 _('specify ssh command to use'), _('CMD')),
59 _('specify ssh command to use'), _('CMD')),
60 ('', 'remotecmd', '',
60 ('', 'remotecmd', '',
61 _('specify hg command to run on the remote side'), _('CMD')),
61 _('specify hg command to run on the remote side'), _('CMD')),
62 ('', 'insecure', None,
62 ('', 'insecure', None,
63 _('do not verify server certificate (ignoring web.cacerts config)')),
63 _('do not verify server certificate (ignoring web.cacerts config)')),
64 ]
64 ]
65
65
66 walkopts = [
66 walkopts = [
67 ('I', 'include', [],
67 ('I', 'include', [],
68 _('include names matching the given patterns'), _('PATTERN')),
68 _('include names matching the given patterns'), _('PATTERN')),
69 ('X', 'exclude', [],
69 ('X', 'exclude', [],
70 _('exclude names matching the given patterns'), _('PATTERN')),
70 _('exclude names matching the given patterns'), _('PATTERN')),
71 ]
71 ]
72
72
73 commitopts = [
73 commitopts = [
74 ('m', 'message', '',
74 ('m', 'message', '',
75 _('use text as commit message'), _('TEXT')),
75 _('use text as commit message'), _('TEXT')),
76 ('l', 'logfile', '',
76 ('l', 'logfile', '',
77 _('read commit message from file'), _('FILE')),
77 _('read commit message from file'), _('FILE')),
78 ]
78 ]
79
79
80 commitopts2 = [
80 commitopts2 = [
81 ('d', 'date', '',
81 ('d', 'date', '',
82 _('record the specified date as commit date'), _('DATE')),
82 _('record the specified date as commit date'), _('DATE')),
83 ('u', 'user', '',
83 ('u', 'user', '',
84 _('record the specified user as committer'), _('USER')),
84 _('record the specified user as committer'), _('USER')),
85 ]
85 ]
86
86
87 templateopts = [
87 templateopts = [
88 ('', 'style', '',
88 ('', 'style', '',
89 _('display using template map file'), _('STYLE')),
89 _('display using template map file'), _('STYLE')),
90 ('', 'template', '',
90 ('', 'template', '',
91 _('display with template'), _('TEMPLATE')),
91 _('display with template'), _('TEMPLATE')),
92 ]
92 ]
93
93
94 logopts = [
94 logopts = [
95 ('p', 'patch', None, _('show patch')),
95 ('p', 'patch', None, _('show patch')),
96 ('g', 'git', None, _('use git extended diff format')),
96 ('g', 'git', None, _('use git extended diff format')),
97 ('l', 'limit', '',
97 ('l', 'limit', '',
98 _('limit number of changes displayed'), _('NUM')),
98 _('limit number of changes displayed'), _('NUM')),
99 ('M', 'no-merges', None, _('do not show merges')),
99 ('M', 'no-merges', None, _('do not show merges')),
100 ('', 'stat', None, _('output diffstat-style summary of changes')),
100 ('', 'stat', None, _('output diffstat-style summary of changes')),
101 ] + templateopts
101 ] + templateopts
102
102
103 diffopts = [
103 diffopts = [
104 ('a', 'text', None, _('treat all files as text')),
104 ('a', 'text', None, _('treat all files as text')),
105 ('g', 'git', None, _('use git extended diff format')),
105 ('g', 'git', None, _('use git extended diff format')),
106 ('', 'nodates', None, _('omit dates from diff headers'))
106 ('', 'nodates', None, _('omit dates from diff headers'))
107 ]
107 ]
108
108
109 diffopts2 = [
109 diffopts2 = [
110 ('p', 'show-function', None, _('show which function each change is in')),
110 ('p', 'show-function', None, _('show which function each change is in')),
111 ('', 'reverse', None, _('produce a diff that undoes the changes')),
111 ('', 'reverse', None, _('produce a diff that undoes the changes')),
112 ('w', 'ignore-all-space', None,
112 ('w', 'ignore-all-space', None,
113 _('ignore white space when comparing lines')),
113 _('ignore white space when comparing lines')),
114 ('b', 'ignore-space-change', None,
114 ('b', 'ignore-space-change', None,
115 _('ignore changes in the amount of white space')),
115 _('ignore changes in the amount of white space')),
116 ('B', 'ignore-blank-lines', None,
116 ('B', 'ignore-blank-lines', None,
117 _('ignore changes whose lines are all blank')),
117 _('ignore changes whose lines are all blank')),
118 ('U', 'unified', '',
118 ('U', 'unified', '',
119 _('number of lines of context to show'), _('NUM')),
119 _('number of lines of context to show'), _('NUM')),
120 ('', 'stat', None, _('output diffstat-style summary of changes')),
120 ('', 'stat', None, _('output diffstat-style summary of changes')),
121 ]
121 ]
122
122
123 mergetoolopts = [
123 mergetoolopts = [
124 ('t', 'tool', '', _('specify merge tool')),
124 ('t', 'tool', '', _('specify merge tool')),
125 ]
125 ]
126
126
127 similarityopts = [
127 similarityopts = [
128 ('s', 'similarity', '',
128 ('s', 'similarity', '',
129 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
129 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
130 ]
130 ]
131
131
132 subrepoopts = [
132 subrepoopts = [
133 ('S', 'subrepos', None,
133 ('S', 'subrepos', None,
134 _('recurse into subrepositories'))
134 _('recurse into subrepositories'))
135 ]
135 ]
136
136
137 # Commands start here, listed alphabetically
137 # Commands start here, listed alphabetically
138
138
139 @command('^add',
139 @command('^add',
140 walkopts + subrepoopts + dryrunopts,
140 walkopts + subrepoopts + dryrunopts,
141 _('[OPTION]... [FILE]...'))
141 _('[OPTION]... [FILE]...'))
142 def add(ui, repo, *pats, **opts):
142 def add(ui, repo, *pats, **opts):
143 """add the specified files on the next commit
143 """add the specified files on the next commit
144
144
145 Schedule files to be version controlled and added to the
145 Schedule files to be version controlled and added to the
146 repository.
146 repository.
147
147
148 The files will be added to the repository at the next commit. To
148 The files will be added to the repository at the next commit. To
149 undo an add before that, see :hg:`forget`.
149 undo an add before that, see :hg:`forget`.
150
150
151 If no names are given, add all files to the repository.
151 If no names are given, add all files to the repository.
152
152
153 .. container:: verbose
153 .. container:: verbose
154
154
155 An example showing how new (unknown) files are added
155 An example showing how new (unknown) files are added
156 automatically by :hg:`add`::
156 automatically by :hg:`add`::
157
157
158 $ ls
158 $ ls
159 foo.c
159 foo.c
160 $ hg status
160 $ hg status
161 ? foo.c
161 ? foo.c
162 $ hg add
162 $ hg add
163 adding foo.c
163 adding foo.c
164 $ hg status
164 $ hg status
165 A foo.c
165 A foo.c
166
166
167 Returns 0 if all files are successfully added.
167 Returns 0 if all files are successfully added.
168 """
168 """
169
169
170 m = scmutil.match(repo[None], pats, opts)
170 m = scmutil.match(repo[None], pats, opts)
171 rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
171 rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
172 opts.get('subrepos'), prefix="")
172 opts.get('subrepos'), prefix="")
173 return rejected and 1 or 0
173 return rejected and 1 or 0
174
174
175 @command('addremove',
175 @command('addremove',
176 similarityopts + walkopts + dryrunopts,
176 similarityopts + walkopts + dryrunopts,
177 _('[OPTION]... [FILE]...'))
177 _('[OPTION]... [FILE]...'))
178 def addremove(ui, repo, *pats, **opts):
178 def addremove(ui, repo, *pats, **opts):
179 """add all new files, delete all missing files
179 """add all new files, delete all missing files
180
180
181 Add all new files and remove all missing files from the
181 Add all new files and remove all missing files from the
182 repository.
182 repository.
183
183
184 New files are ignored if they match any of the patterns in
184 New files are ignored if they match any of the patterns in
185 ``.hgignore``. As with add, these changes take effect at the next
185 ``.hgignore``. As with add, these changes take effect at the next
186 commit.
186 commit.
187
187
188 Use the -s/--similarity option to detect renamed files. With a
188 Use the -s/--similarity option to detect renamed files. With a
189 parameter greater than 0, this compares every removed file with
189 parameter greater than 0, this compares every removed file with
190 every added file and records those similar enough as renames. This
190 every added file and records those similar enough as renames. This
191 option takes a percentage between 0 (disabled) and 100 (files must
191 option takes a percentage between 0 (disabled) and 100 (files must
192 be identical) as its parameter. Detecting renamed files this way
192 be identical) as its parameter. Detecting renamed files this way
193 can be expensive. After using this option, :hg:`status -C` can be
193 can be expensive. After using this option, :hg:`status -C` can be
194 used to check which files were identified as moved or renamed.
194 used to check which files were identified as moved or renamed.
195
195
196 Returns 0 if all files are successfully added.
196 Returns 0 if all files are successfully added.
197 """
197 """
198 try:
198 try:
199 sim = float(opts.get('similarity') or 100)
199 sim = float(opts.get('similarity') or 100)
200 except ValueError:
200 except ValueError:
201 raise util.Abort(_('similarity must be a number'))
201 raise util.Abort(_('similarity must be a number'))
202 if sim < 0 or sim > 100:
202 if sim < 0 or sim > 100:
203 raise util.Abort(_('similarity must be between 0 and 100'))
203 raise util.Abort(_('similarity must be between 0 and 100'))
204 return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0)
204 return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0)
205
205
206 @command('^annotate|blame',
206 @command('^annotate|blame',
207 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
207 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
208 ('', 'follow', None,
208 ('', 'follow', None,
209 _('follow copies/renames and list the filename (DEPRECATED)')),
209 _('follow copies/renames and list the filename (DEPRECATED)')),
210 ('', 'no-follow', None, _("don't follow copies and renames")),
210 ('', 'no-follow', None, _("don't follow copies and renames")),
211 ('a', 'text', None, _('treat all files as text')),
211 ('a', 'text', None, _('treat all files as text')),
212 ('u', 'user', None, _('list the author (long with -v)')),
212 ('u', 'user', None, _('list the author (long with -v)')),
213 ('f', 'file', None, _('list the filename')),
213 ('f', 'file', None, _('list the filename')),
214 ('d', 'date', None, _('list the date (short with -q)')),
214 ('d', 'date', None, _('list the date (short with -q)')),
215 ('n', 'number', None, _('list the revision number (default)')),
215 ('n', 'number', None, _('list the revision number (default)')),
216 ('c', 'changeset', None, _('list the changeset')),
216 ('c', 'changeset', None, _('list the changeset')),
217 ('l', 'line-number', None, _('show line number at the first appearance'))
217 ('l', 'line-number', None, _('show line number at the first appearance'))
218 ] + walkopts,
218 ] + walkopts,
219 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'))
219 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'))
220 def annotate(ui, repo, *pats, **opts):
220 def annotate(ui, repo, *pats, **opts):
221 """show changeset information by line for each file
221 """show changeset information by line for each file
222
222
223 List changes in files, showing the revision id responsible for
223 List changes in files, showing the revision id responsible for
224 each line
224 each line
225
225
226 This command is useful for discovering when a change was made and
226 This command is useful for discovering when a change was made and
227 by whom.
227 by whom.
228
228
229 Without the -a/--text option, annotate will avoid processing files
229 Without the -a/--text option, annotate will avoid processing files
230 it detects as binary. With -a, annotate will annotate the file
230 it detects as binary. With -a, annotate will annotate the file
231 anyway, although the results will probably be neither useful
231 anyway, although the results will probably be neither useful
232 nor desirable.
232 nor desirable.
233
233
234 Returns 0 on success.
234 Returns 0 on success.
235 """
235 """
236 if opts.get('follow'):
236 if opts.get('follow'):
237 # --follow is deprecated and now just an alias for -f/--file
237 # --follow is deprecated and now just an alias for -f/--file
238 # to mimic the behavior of Mercurial before version 1.5
238 # to mimic the behavior of Mercurial before version 1.5
239 opts['file'] = True
239 opts['file'] = True
240
240
241 datefunc = ui.quiet and util.shortdate or util.datestr
241 datefunc = ui.quiet and util.shortdate or util.datestr
242 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
242 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
243
243
244 if not pats:
244 if not pats:
245 raise util.Abort(_('at least one filename or pattern is required'))
245 raise util.Abort(_('at least one filename or pattern is required'))
246
246
247 opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())),
247 opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())),
248 ('number', ' ', lambda x: str(x[0].rev())),
248 ('number', ' ', lambda x: str(x[0].rev())),
249 ('changeset', ' ', lambda x: short(x[0].node())),
249 ('changeset', ' ', lambda x: short(x[0].node())),
250 ('date', ' ', getdate),
250 ('date', ' ', getdate),
251 ('file', ' ', lambda x: x[0].path()),
251 ('file', ' ', lambda x: x[0].path()),
252 ('line_number', ':', lambda x: str(x[1])),
252 ('line_number', ':', lambda x: str(x[1])),
253 ]
253 ]
254
254
255 if (not opts.get('user') and not opts.get('changeset')
255 if (not opts.get('user') and not opts.get('changeset')
256 and not opts.get('date') and not opts.get('file')):
256 and not opts.get('date') and not opts.get('file')):
257 opts['number'] = True
257 opts['number'] = True
258
258
259 linenumber = opts.get('line_number') is not None
259 linenumber = opts.get('line_number') is not None
260 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
260 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
261 raise util.Abort(_('at least one of -n/-c is required for -l'))
261 raise util.Abort(_('at least one of -n/-c is required for -l'))
262
262
263 funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)]
263 funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)]
264 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
264 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
265
265
266 def bad(x, y):
266 def bad(x, y):
267 raise util.Abort("%s: %s" % (x, y))
267 raise util.Abort("%s: %s" % (x, y))
268
268
269 ctx = scmutil.revsingle(repo, opts.get('rev'))
269 ctx = scmutil.revsingle(repo, opts.get('rev'))
270 m = scmutil.match(ctx, pats, opts)
270 m = scmutil.match(ctx, pats, opts)
271 m.bad = bad
271 m.bad = bad
272 follow = not opts.get('no_follow')
272 follow = not opts.get('no_follow')
273 for abs in ctx.walk(m):
273 for abs in ctx.walk(m):
274 fctx = ctx[abs]
274 fctx = ctx[abs]
275 if not opts.get('text') and util.binary(fctx.data()):
275 if not opts.get('text') and util.binary(fctx.data()):
276 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
276 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
277 continue
277 continue
278
278
279 lines = fctx.annotate(follow=follow, linenumber=linenumber)
279 lines = fctx.annotate(follow=follow, linenumber=linenumber)
280 pieces = []
280 pieces = []
281
281
282 for f, sep in funcmap:
282 for f, sep in funcmap:
283 l = [f(n) for n, dummy in lines]
283 l = [f(n) for n, dummy in lines]
284 if l:
284 if l:
285 sized = [(x, encoding.colwidth(x)) for x in l]
285 sized = [(x, encoding.colwidth(x)) for x in l]
286 ml = max([w for x, w in sized])
286 ml = max([w for x, w in sized])
287 pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x)
287 pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x)
288 for x, w in sized])
288 for x, w in sized])
289
289
290 if pieces:
290 if pieces:
291 for p, l in zip(zip(*pieces), lines):
291 for p, l in zip(zip(*pieces), lines):
292 ui.write("%s: %s" % ("".join(p), l[1]))
292 ui.write("%s: %s" % ("".join(p), l[1]))
293
293
294 @command('archive',
294 @command('archive',
295 [('', 'no-decode', None, _('do not pass files through decoders')),
295 [('', 'no-decode', None, _('do not pass files through decoders')),
296 ('p', 'prefix', '', _('directory prefix for files in archive'),
296 ('p', 'prefix', '', _('directory prefix for files in archive'),
297 _('PREFIX')),
297 _('PREFIX')),
298 ('r', 'rev', '', _('revision to distribute'), _('REV')),
298 ('r', 'rev', '', _('revision to distribute'), _('REV')),
299 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
299 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
300 ] + subrepoopts + walkopts,
300 ] + subrepoopts + walkopts,
301 _('[OPTION]... DEST'))
301 _('[OPTION]... DEST'))
302 def archive(ui, repo, dest, **opts):
302 def archive(ui, repo, dest, **opts):
303 '''create an unversioned archive of a repository revision
303 '''create an unversioned archive of a repository revision
304
304
305 By default, the revision used is the parent of the working
305 By default, the revision used is the parent of the working
306 directory; use -r/--rev to specify a different revision.
306 directory; use -r/--rev to specify a different revision.
307
307
308 The archive type is automatically detected based on file
308 The archive type is automatically detected based on file
309 extension (or override using -t/--type).
309 extension (or override using -t/--type).
310
310
311 .. container:: verbose
311 .. container:: verbose
312
312
313 Examples:
313 Examples:
314
314
315 - create a zip file containing the 1.0 release::
315 - create a zip file containing the 1.0 release::
316
316
317 hg archive -r 1.0 project-1.0.zip
317 hg archive -r 1.0 project-1.0.zip
318
318
319 - create a tarball excluding .hg files::
319 - create a tarball excluding .hg files::
320
320
321 hg archive project.tar.gz -X ".hg*"
321 hg archive project.tar.gz -X ".hg*"
322
322
323 Valid types are:
323 Valid types are:
324
324
325 :``files``: a directory full of files (default)
325 :``files``: a directory full of files (default)
326 :``tar``: tar archive, uncompressed
326 :``tar``: tar archive, uncompressed
327 :``tbz2``: tar archive, compressed using bzip2
327 :``tbz2``: tar archive, compressed using bzip2
328 :``tgz``: tar archive, compressed using gzip
328 :``tgz``: tar archive, compressed using gzip
329 :``uzip``: zip archive, uncompressed
329 :``uzip``: zip archive, uncompressed
330 :``zip``: zip archive, compressed using deflate
330 :``zip``: zip archive, compressed using deflate
331
331
332 The exact name of the destination archive or directory is given
332 The exact name of the destination archive or directory is given
333 using a format string; see :hg:`help export` for details.
333 using a format string; see :hg:`help export` for details.
334
334
335 Each member added to an archive file has a directory prefix
335 Each member added to an archive file has a directory prefix
336 prepended. Use -p/--prefix to specify a format string for the
336 prepended. Use -p/--prefix to specify a format string for the
337 prefix. The default is the basename of the archive, with suffixes
337 prefix. The default is the basename of the archive, with suffixes
338 removed.
338 removed.
339
339
340 Returns 0 on success.
340 Returns 0 on success.
341 '''
341 '''
342
342
343 ctx = scmutil.revsingle(repo, opts.get('rev'))
343 ctx = scmutil.revsingle(repo, opts.get('rev'))
344 if not ctx:
344 if not ctx:
345 raise util.Abort(_('no working directory: please specify a revision'))
345 raise util.Abort(_('no working directory: please specify a revision'))
346 node = ctx.node()
346 node = ctx.node()
347 dest = cmdutil.makefilename(repo, dest, node)
347 dest = cmdutil.makefilename(repo, dest, node)
348 if os.path.realpath(dest) == repo.root:
348 if os.path.realpath(dest) == repo.root:
349 raise util.Abort(_('repository root cannot be destination'))
349 raise util.Abort(_('repository root cannot be destination'))
350
350
351 kind = opts.get('type') or archival.guesskind(dest) or 'files'
351 kind = opts.get('type') or archival.guesskind(dest) or 'files'
352 prefix = opts.get('prefix')
352 prefix = opts.get('prefix')
353
353
354 if dest == '-':
354 if dest == '-':
355 if kind == 'files':
355 if kind == 'files':
356 raise util.Abort(_('cannot archive plain files to stdout'))
356 raise util.Abort(_('cannot archive plain files to stdout'))
357 dest = cmdutil.makefileobj(repo, dest)
357 dest = cmdutil.makefileobj(repo, dest)
358 if not prefix:
358 if not prefix:
359 prefix = os.path.basename(repo.root) + '-%h'
359 prefix = os.path.basename(repo.root) + '-%h'
360
360
361 prefix = cmdutil.makefilename(repo, prefix, node)
361 prefix = cmdutil.makefilename(repo, prefix, node)
362 matchfn = scmutil.match(ctx, [], opts)
362 matchfn = scmutil.match(ctx, [], opts)
363 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
363 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
364 matchfn, prefix, subrepos=opts.get('subrepos'))
364 matchfn, prefix, subrepos=opts.get('subrepos'))
365
365
366 @command('backout',
366 @command('backout',
367 [('', 'merge', None, _('merge with old dirstate parent after backout')),
367 [('', 'merge', None, _('merge with old dirstate parent after backout')),
368 ('', 'parent', '',
368 ('', 'parent', '',
369 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
369 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
370 ('r', 'rev', '', _('revision to backout'), _('REV')),
370 ('r', 'rev', '', _('revision to backout'), _('REV')),
371 ] + mergetoolopts + walkopts + commitopts + commitopts2,
371 ] + mergetoolopts + walkopts + commitopts + commitopts2,
372 _('[OPTION]... [-r] REV'))
372 _('[OPTION]... [-r] REV'))
373 def backout(ui, repo, node=None, rev=None, **opts):
373 def backout(ui, repo, node=None, rev=None, **opts):
374 '''reverse effect of earlier changeset
374 '''reverse effect of earlier changeset
375
375
376 Prepare a new changeset with the effect of REV undone in the
376 Prepare a new changeset with the effect of REV undone in the
377 current working directory.
377 current working directory.
378
378
379 If REV is the parent of the working directory, then this new changeset
379 If REV is the parent of the working directory, then this new changeset
380 is committed automatically. Otherwise, hg needs to merge the
380 is committed automatically. Otherwise, hg needs to merge the
381 changes and the merged result is left uncommitted.
381 changes and the merged result is left uncommitted.
382
382
383 .. note::
383 .. note::
384 backout cannot be used to fix either an unwanted or
384 backout cannot be used to fix either an unwanted or
385 incorrect merge.
385 incorrect merge.
386
386
387 .. container:: verbose
387 .. container:: verbose
388
388
389 By default, the pending changeset will have one parent,
389 By default, the pending changeset will have one parent,
390 maintaining a linear history. With --merge, the pending
390 maintaining a linear history. With --merge, the pending
391 changeset will instead have two parents: the old parent of the
391 changeset will instead have two parents: the old parent of the
392 working directory and a new child of REV that simply undoes REV.
392 working directory and a new child of REV that simply undoes REV.
393
393
394 Before version 1.7, the behavior without --merge was equivalent
394 Before version 1.7, the behavior without --merge was equivalent
395 to specifying --merge followed by :hg:`update --clean .` to
395 to specifying --merge followed by :hg:`update --clean .` to
396 cancel the merge and leave the child of REV as a head to be
396 cancel the merge and leave the child of REV as a head to be
397 merged separately.
397 merged separately.
398
398
399 See :hg:`help dates` for a list of formats valid for -d/--date.
399 See :hg:`help dates` for a list of formats valid for -d/--date.
400
400
401 Returns 0 on success.
401 Returns 0 on success.
402 '''
402 '''
403 if rev and node:
403 if rev and node:
404 raise util.Abort(_("please specify just one revision"))
404 raise util.Abort(_("please specify just one revision"))
405
405
406 if not rev:
406 if not rev:
407 rev = node
407 rev = node
408
408
409 if not rev:
409 if not rev:
410 raise util.Abort(_("please specify a revision to backout"))
410 raise util.Abort(_("please specify a revision to backout"))
411
411
412 date = opts.get('date')
412 date = opts.get('date')
413 if date:
413 if date:
414 opts['date'] = util.parsedate(date)
414 opts['date'] = util.parsedate(date)
415
415
416 cmdutil.bailifchanged(repo)
416 cmdutil.bailifchanged(repo)
417 node = scmutil.revsingle(repo, rev).node()
417 node = scmutil.revsingle(repo, rev).node()
418
418
419 op1, op2 = repo.dirstate.parents()
419 op1, op2 = repo.dirstate.parents()
420 a = repo.changelog.ancestor(op1, node)
420 a = repo.changelog.ancestor(op1, node)
421 if a != node:
421 if a != node:
422 raise util.Abort(_('cannot backout change on a different branch'))
422 raise util.Abort(_('cannot backout change on a different branch'))
423
423
424 p1, p2 = repo.changelog.parents(node)
424 p1, p2 = repo.changelog.parents(node)
425 if p1 == nullid:
425 if p1 == nullid:
426 raise util.Abort(_('cannot backout a change with no parents'))
426 raise util.Abort(_('cannot backout a change with no parents'))
427 if p2 != nullid:
427 if p2 != nullid:
428 if not opts.get('parent'):
428 if not opts.get('parent'):
429 raise util.Abort(_('cannot backout a merge changeset'))
429 raise util.Abort(_('cannot backout a merge changeset'))
430 p = repo.lookup(opts['parent'])
430 p = repo.lookup(opts['parent'])
431 if p not in (p1, p2):
431 if p not in (p1, p2):
432 raise util.Abort(_('%s is not a parent of %s') %
432 raise util.Abort(_('%s is not a parent of %s') %
433 (short(p), short(node)))
433 (short(p), short(node)))
434 parent = p
434 parent = p
435 else:
435 else:
436 if opts.get('parent'):
436 if opts.get('parent'):
437 raise util.Abort(_('cannot use --parent on non-merge changeset'))
437 raise util.Abort(_('cannot use --parent on non-merge changeset'))
438 parent = p1
438 parent = p1
439
439
440 # the backout should appear on the same branch
440 # the backout should appear on the same branch
441 branch = repo.dirstate.branch()
441 branch = repo.dirstate.branch()
442 hg.clean(repo, node, show_stats=False)
442 hg.clean(repo, node, show_stats=False)
443 repo.dirstate.setbranch(branch)
443 repo.dirstate.setbranch(branch)
444 revert_opts = opts.copy()
444 revert_opts = opts.copy()
445 revert_opts['date'] = None
445 revert_opts['date'] = None
446 revert_opts['all'] = True
446 revert_opts['all'] = True
447 revert_opts['rev'] = hex(parent)
447 revert_opts['rev'] = hex(parent)
448 revert_opts['no_backup'] = None
448 revert_opts['no_backup'] = None
449 revert(ui, repo, **revert_opts)
449 revert(ui, repo, **revert_opts)
450 if not opts.get('merge') and op1 != node:
450 if not opts.get('merge') and op1 != node:
451 try:
451 try:
452 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
452 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
453 return hg.update(repo, op1)
453 return hg.update(repo, op1)
454 finally:
454 finally:
455 ui.setconfig('ui', 'forcemerge', '')
455 ui.setconfig('ui', 'forcemerge', '')
456
456
457 commit_opts = opts.copy()
457 commit_opts = opts.copy()
458 commit_opts['addremove'] = False
458 commit_opts['addremove'] = False
459 if not commit_opts['message'] and not commit_opts['logfile']:
459 if not commit_opts['message'] and not commit_opts['logfile']:
460 # we don't translate commit messages
460 # we don't translate commit messages
461 commit_opts['message'] = "Backed out changeset %s" % short(node)
461 commit_opts['message'] = "Backed out changeset %s" % short(node)
462 commit_opts['force_editor'] = True
462 commit_opts['force_editor'] = True
463 commit(ui, repo, **commit_opts)
463 commit(ui, repo, **commit_opts)
464 def nice(node):
464 def nice(node):
465 return '%d:%s' % (repo.changelog.rev(node), short(node))
465 return '%d:%s' % (repo.changelog.rev(node), short(node))
466 ui.status(_('changeset %s backs out changeset %s\n') %
466 ui.status(_('changeset %s backs out changeset %s\n') %
467 (nice(repo.changelog.tip()), nice(node)))
467 (nice(repo.changelog.tip()), nice(node)))
468 if opts.get('merge') and op1 != node:
468 if opts.get('merge') and op1 != node:
469 hg.clean(repo, op1, show_stats=False)
469 hg.clean(repo, op1, show_stats=False)
470 ui.status(_('merging with changeset %s\n')
470 ui.status(_('merging with changeset %s\n')
471 % nice(repo.changelog.tip()))
471 % nice(repo.changelog.tip()))
472 try:
472 try:
473 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
473 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
474 return hg.merge(repo, hex(repo.changelog.tip()))
474 return hg.merge(repo, hex(repo.changelog.tip()))
475 finally:
475 finally:
476 ui.setconfig('ui', 'forcemerge', '')
476 ui.setconfig('ui', 'forcemerge', '')
477 return 0
477 return 0
478
478
479 @command('bisect',
479 @command('bisect',
480 [('r', 'reset', False, _('reset bisect state')),
480 [('r', 'reset', False, _('reset bisect state')),
481 ('g', 'good', False, _('mark changeset good')),
481 ('g', 'good', False, _('mark changeset good')),
482 ('b', 'bad', False, _('mark changeset bad')),
482 ('b', 'bad', False, _('mark changeset bad')),
483 ('s', 'skip', False, _('skip testing changeset')),
483 ('s', 'skip', False, _('skip testing changeset')),
484 ('e', 'extend', False, _('extend the bisect range')),
484 ('e', 'extend', False, _('extend the bisect range')),
485 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
485 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
486 ('U', 'noupdate', False, _('do not update to target'))],
486 ('U', 'noupdate', False, _('do not update to target'))],
487 _("[-gbsr] [-U] [-c CMD] [REV]"))
487 _("[-gbsr] [-U] [-c CMD] [REV]"))
488 def bisect(ui, repo, rev=None, extra=None, command=None,
488 def bisect(ui, repo, rev=None, extra=None, command=None,
489 reset=None, good=None, bad=None, skip=None, extend=None,
489 reset=None, good=None, bad=None, skip=None, extend=None,
490 noupdate=None):
490 noupdate=None):
491 """subdivision search of changesets
491 """subdivision search of changesets
492
492
493 This command helps to find changesets which introduce problems. To
493 This command helps to find changesets which introduce problems. To
494 use, mark the earliest changeset you know exhibits the problem as
494 use, mark the earliest changeset you know exhibits the problem as
495 bad, then mark the latest changeset which is free from the problem
495 bad, then mark the latest changeset which is free from the problem
496 as good. Bisect will update your working directory to a revision
496 as good. Bisect will update your working directory to a revision
497 for testing (unless the -U/--noupdate option is specified). Once
497 for testing (unless the -U/--noupdate option is specified). Once
498 you have performed tests, mark the working directory as good or
498 you have performed tests, mark the working directory as good or
499 bad, and bisect will either update to another candidate changeset
499 bad, and bisect will either update to another candidate changeset
500 or announce that it has found the bad revision.
500 or announce that it has found the bad revision.
501
501
502 As a shortcut, you can also use the revision argument to mark a
502 As a shortcut, you can also use the revision argument to mark a
503 revision as good or bad without checking it out first.
503 revision as good or bad without checking it out first.
504
504
505 If you supply a command, it will be used for automatic bisection.
505 If you supply a command, it will be used for automatic bisection.
506 Its exit status will be used to mark revisions as good or bad:
506 Its exit status will be used to mark revisions as good or bad:
507 status 0 means good, 125 means to skip the revision, 127
507 status 0 means good, 125 means to skip the revision, 127
508 (command not found) will abort the bisection, and any other
508 (command not found) will abort the bisection, and any other
509 non-zero exit status means the revision is bad.
509 non-zero exit status means the revision is bad.
510
510
511 .. container:: verbose
511 .. container:: verbose
512
512
513 Some examples:
513 Some examples:
514
514
515 - start a bisection with known bad revision 12, and good revision 34::
515 - start a bisection with known bad revision 12, and good revision 34::
516
516
517 hg bisect --bad 34
517 hg bisect --bad 34
518 hg bisect --good 12
518 hg bisect --good 12
519
519
520 - advance the current bisection by marking current revision as good or
520 - advance the current bisection by marking current revision as good or
521 bad::
521 bad::
522
522
523 hg bisect --good
523 hg bisect --good
524 hg bisect --bad
524 hg bisect --bad
525
525
526 - mark the current revision, or a known revision, to be skipped (eg. if
526 - mark the current revision, or a known revision, to be skipped (eg. if
527 that revision is not usable because of another issue)::
527 that revision is not usable because of another issue)::
528
528
529 hg bisect --skip
529 hg bisect --skip
530 hg bisect --skip 23
530 hg bisect --skip 23
531
531
532 - forget the current bisection::
532 - forget the current bisection::
533
533
534 hg bisect --reset
534 hg bisect --reset
535
535
536 - use 'make && make tests' to automatically find the first broken
536 - use 'make && make tests' to automatically find the first broken
537 revision::
537 revision::
538
538
539 hg bisect --reset
539 hg bisect --reset
540 hg bisect --bad 34
540 hg bisect --bad 34
541 hg bisect --good 12
541 hg bisect --good 12
542 hg bisect --command 'make && make tests'
542 hg bisect --command 'make && make tests'
543
543
544 - see all changesets whose states are already known in the current
544 - see all changesets whose states are already known in the current
545 bisection::
545 bisection::
546
546
547 hg log -r "bisect(pruned)"
547 hg log -r "bisect(pruned)"
548
548
549 - see all changesets that took part in the current bisection::
549 - see all changesets that took part in the current bisection::
550
550
551 hg log -r "bisect(range)"
551 hg log -r "bisect(range)"
552
552
553 - with the graphlog extension, you can even get a nice graph::
553 - with the graphlog extension, you can even get a nice graph::
554
554
555 hg log --graph -r "bisect(range)"
555 hg log --graph -r "bisect(range)"
556
556
557 See :hg:`help revsets` for more about the `bisect()` keyword.
557 See :hg:`help revsets` for more about the `bisect()` keyword.
558
558
559 Returns 0 on success.
559 Returns 0 on success.
560 """
560 """
561 def extendbisectrange(nodes, good):
561 def extendbisectrange(nodes, good):
562 # bisect is incomplete when it ends on a merge node and
562 # bisect is incomplete when it ends on a merge node and
563 # one of the parent was not checked.
563 # one of the parent was not checked.
564 parents = repo[nodes[0]].parents()
564 parents = repo[nodes[0]].parents()
565 if len(parents) > 1:
565 if len(parents) > 1:
566 side = good and state['bad'] or state['good']
566 side = good and state['bad'] or state['good']
567 num = len(set(i.node() for i in parents) & set(side))
567 num = len(set(i.node() for i in parents) & set(side))
568 if num == 1:
568 if num == 1:
569 return parents[0].ancestor(parents[1])
569 return parents[0].ancestor(parents[1])
570 return None
570 return None
571
571
572 def print_result(nodes, good):
572 def print_result(nodes, good):
573 displayer = cmdutil.show_changeset(ui, repo, {})
573 displayer = cmdutil.show_changeset(ui, repo, {})
574 if len(nodes) == 1:
574 if len(nodes) == 1:
575 # narrowed it down to a single revision
575 # narrowed it down to a single revision
576 if good:
576 if good:
577 ui.write(_("The first good revision is:\n"))
577 ui.write(_("The first good revision is:\n"))
578 else:
578 else:
579 ui.write(_("The first bad revision is:\n"))
579 ui.write(_("The first bad revision is:\n"))
580 displayer.show(repo[nodes[0]])
580 displayer.show(repo[nodes[0]])
581 extendnode = extendbisectrange(nodes, good)
581 extendnode = extendbisectrange(nodes, good)
582 if extendnode is not None:
582 if extendnode is not None:
583 ui.write(_('Not all ancestors of this changeset have been'
583 ui.write(_('Not all ancestors of this changeset have been'
584 ' checked.\nUse bisect --extend to continue the '
584 ' checked.\nUse bisect --extend to continue the '
585 'bisection from\nthe common ancestor, %s.\n')
585 'bisection from\nthe common ancestor, %s.\n')
586 % extendnode)
586 % extendnode)
587 else:
587 else:
588 # multiple possible revisions
588 # multiple possible revisions
589 if good:
589 if good:
590 ui.write(_("Due to skipped revisions, the first "
590 ui.write(_("Due to skipped revisions, the first "
591 "good revision could be any of:\n"))
591 "good revision could be any of:\n"))
592 else:
592 else:
593 ui.write(_("Due to skipped revisions, the first "
593 ui.write(_("Due to skipped revisions, the first "
594 "bad revision could be any of:\n"))
594 "bad revision could be any of:\n"))
595 for n in nodes:
595 for n in nodes:
596 displayer.show(repo[n])
596 displayer.show(repo[n])
597 displayer.close()
597 displayer.close()
598
598
599 def check_state(state, interactive=True):
599 def check_state(state, interactive=True):
600 if not state['good'] or not state['bad']:
600 if not state['good'] or not state['bad']:
601 if (good or bad or skip or reset) and interactive:
601 if (good or bad or skip or reset) and interactive:
602 return
602 return
603 if not state['good']:
603 if not state['good']:
604 raise util.Abort(_('cannot bisect (no known good revisions)'))
604 raise util.Abort(_('cannot bisect (no known good revisions)'))
605 else:
605 else:
606 raise util.Abort(_('cannot bisect (no known bad revisions)'))
606 raise util.Abort(_('cannot bisect (no known bad revisions)'))
607 return True
607 return True
608
608
609 # backward compatibility
609 # backward compatibility
610 if rev in "good bad reset init".split():
610 if rev in "good bad reset init".split():
611 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
611 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
612 cmd, rev, extra = rev, extra, None
612 cmd, rev, extra = rev, extra, None
613 if cmd == "good":
613 if cmd == "good":
614 good = True
614 good = True
615 elif cmd == "bad":
615 elif cmd == "bad":
616 bad = True
616 bad = True
617 else:
617 else:
618 reset = True
618 reset = True
619 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
619 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
620 raise util.Abort(_('incompatible arguments'))
620 raise util.Abort(_('incompatible arguments'))
621
621
622 if reset:
622 if reset:
623 p = repo.join("bisect.state")
623 p = repo.join("bisect.state")
624 if os.path.exists(p):
624 if os.path.exists(p):
625 os.unlink(p)
625 os.unlink(p)
626 return
626 return
627
627
628 state = hbisect.load_state(repo)
628 state = hbisect.load_state(repo)
629
629
630 if command:
630 if command:
631 changesets = 1
631 changesets = 1
632 try:
632 try:
633 while changesets:
633 while changesets:
634 # update state
634 # update state
635 status = util.system(command, out=ui.fout)
635 status = util.system(command, out=ui.fout)
636 if status == 125:
636 if status == 125:
637 transition = "skip"
637 transition = "skip"
638 elif status == 0:
638 elif status == 0:
639 transition = "good"
639 transition = "good"
640 # status < 0 means process was killed
640 # status < 0 means process was killed
641 elif status == 127:
641 elif status == 127:
642 raise util.Abort(_("failed to execute %s") % command)
642 raise util.Abort(_("failed to execute %s") % command)
643 elif status < 0:
643 elif status < 0:
644 raise util.Abort(_("%s killed") % command)
644 raise util.Abort(_("%s killed") % command)
645 else:
645 else:
646 transition = "bad"
646 transition = "bad"
647 ctx = scmutil.revsingle(repo, rev)
647 ctx = scmutil.revsingle(repo, rev)
648 rev = None # clear for future iterations
648 rev = None # clear for future iterations
649 state[transition].append(ctx.node())
649 state[transition].append(ctx.node())
650 ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition))
650 ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition))
651 check_state(state, interactive=False)
651 check_state(state, interactive=False)
652 # bisect
652 # bisect
653 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
653 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
654 # update to next check
654 # update to next check
655 cmdutil.bailifchanged(repo)
655 cmdutil.bailifchanged(repo)
656 hg.clean(repo, nodes[0], show_stats=False)
656 hg.clean(repo, nodes[0], show_stats=False)
657 finally:
657 finally:
658 hbisect.save_state(repo, state)
658 hbisect.save_state(repo, state)
659 print_result(nodes, good)
659 print_result(nodes, good)
660 return
660 return
661
661
662 # update state
662 # update state
663
663
664 if rev:
664 if rev:
665 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
665 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
666 else:
666 else:
667 nodes = [repo.lookup('.')]
667 nodes = [repo.lookup('.')]
668
668
669 if good or bad or skip:
669 if good or bad or skip:
670 if good:
670 if good:
671 state['good'] += nodes
671 state['good'] += nodes
672 elif bad:
672 elif bad:
673 state['bad'] += nodes
673 state['bad'] += nodes
674 elif skip:
674 elif skip:
675 state['skip'] += nodes
675 state['skip'] += nodes
676 hbisect.save_state(repo, state)
676 hbisect.save_state(repo, state)
677
677
678 if not check_state(state):
678 if not check_state(state):
679 return
679 return
680
680
681 # actually bisect
681 # actually bisect
682 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
682 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
683 if extend:
683 if extend:
684 if not changesets:
684 if not changesets:
685 extendnode = extendbisectrange(nodes, good)
685 extendnode = extendbisectrange(nodes, good)
686 if extendnode is not None:
686 if extendnode is not None:
687 ui.write(_("Extending search to changeset %d:%s\n"
687 ui.write(_("Extending search to changeset %d:%s\n"
688 % (extendnode.rev(), extendnode)))
688 % (extendnode.rev(), extendnode)))
689 if noupdate:
689 if noupdate:
690 return
690 return
691 cmdutil.bailifchanged(repo)
691 cmdutil.bailifchanged(repo)
692 return hg.clean(repo, extendnode.node())
692 return hg.clean(repo, extendnode.node())
693 raise util.Abort(_("nothing to extend"))
693 raise util.Abort(_("nothing to extend"))
694
694
695 if changesets == 0:
695 if changesets == 0:
696 print_result(nodes, good)
696 print_result(nodes, good)
697 else:
697 else:
698 assert len(nodes) == 1 # only a single node can be tested next
698 assert len(nodes) == 1 # only a single node can be tested next
699 node = nodes[0]
699 node = nodes[0]
700 # compute the approximate number of remaining tests
700 # compute the approximate number of remaining tests
701 tests, size = 0, 2
701 tests, size = 0, 2
702 while size <= changesets:
702 while size <= changesets:
703 tests, size = tests + 1, size * 2
703 tests, size = tests + 1, size * 2
704 rev = repo.changelog.rev(node)
704 rev = repo.changelog.rev(node)
705 ui.write(_("Testing changeset %d:%s "
705 ui.write(_("Testing changeset %d:%s "
706 "(%d changesets remaining, ~%d tests)\n")
706 "(%d changesets remaining, ~%d tests)\n")
707 % (rev, short(node), changesets, tests))
707 % (rev, short(node), changesets, tests))
708 if not noupdate:
708 if not noupdate:
709 cmdutil.bailifchanged(repo)
709 cmdutil.bailifchanged(repo)
710 return hg.clean(repo, node)
710 return hg.clean(repo, node)
711
711
712 @command('bookmarks',
712 @command('bookmarks',
713 [('f', 'force', False, _('force')),
713 [('f', 'force', False, _('force')),
714 ('r', 'rev', '', _('revision'), _('REV')),
714 ('r', 'rev', '', _('revision'), _('REV')),
715 ('d', 'delete', False, _('delete a given bookmark')),
715 ('d', 'delete', False, _('delete a given bookmark')),
716 ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
716 ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
717 ('i', 'inactive', False, _('do not mark a new bookmark active'))],
717 ('i', 'inactive', False, _('do not mark a new bookmark active'))],
718 _('hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]'))
718 _('hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]'))
719 def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False,
719 def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False,
720 rename=None, inactive=False):
720 rename=None, inactive=False):
721 '''track a line of development with movable markers
721 '''track a line of development with movable markers
722
722
723 Bookmarks are pointers to certain commits that move when
723 Bookmarks are pointers to certain commits that move when
724 committing. Bookmarks are local. They can be renamed, copied and
724 committing. Bookmarks are local. They can be renamed, copied and
725 deleted. It is possible to use bookmark names in :hg:`merge` and
725 deleted. It is possible to use bookmark names in :hg:`merge` and
726 :hg:`update` to merge and update respectively to a given bookmark.
726 :hg:`update` to merge and update respectively to a given bookmark.
727
727
728 You can use :hg:`bookmark NAME` to set a bookmark on the working
728 You can use :hg:`bookmark NAME` to set a bookmark on the working
729 directory's parent revision with the given name. If you specify
729 directory's parent revision with the given name. If you specify
730 a revision using -r REV (where REV may be an existing bookmark),
730 a revision using -r REV (where REV may be an existing bookmark),
731 the bookmark is assigned to that revision.
731 the bookmark is assigned to that revision.
732
732
733 Bookmarks can be pushed and pulled between repositories (see :hg:`help
733 Bookmarks can be pushed and pulled between repositories (see :hg:`help
734 push` and :hg:`help pull`). This requires both the local and remote
734 push` and :hg:`help pull`). This requires both the local and remote
735 repositories to support bookmarks. For versions prior to 1.8, this means
735 repositories to support bookmarks. For versions prior to 1.8, this means
736 the bookmarks extension must be enabled.
736 the bookmarks extension must be enabled.
737 '''
737 '''
738 hexfn = ui.debugflag and hex or short
738 hexfn = ui.debugflag and hex or short
739 marks = repo._bookmarks
739 marks = repo._bookmarks
740 cur = repo.changectx('.').node()
740 cur = repo.changectx('.').node()
741
741
742 if delete:
742 if delete:
743 if mark is None:
743 if mark is None:
744 raise util.Abort(_("bookmark name required"))
744 raise util.Abort(_("bookmark name required"))
745 if mark not in marks:
745 if mark not in marks:
746 raise util.Abort(_("bookmark '%s' does not exist") % mark)
746 raise util.Abort(_("bookmark '%s' does not exist") % mark)
747 if mark == repo._bookmarkcurrent:
747 if mark == repo._bookmarkcurrent:
748 bookmarks.setcurrent(repo, None)
748 bookmarks.setcurrent(repo, None)
749 del marks[mark]
749 del marks[mark]
750 bookmarks.write(repo)
750 bookmarks.write(repo)
751 return
751 return
752
752
753 if rename:
753 if rename:
754 if rename not in marks:
754 if rename not in marks:
755 raise util.Abort(_("bookmark '%s' does not exist") % rename)
755 raise util.Abort(_("bookmark '%s' does not exist") % rename)
756 if mark in marks and not force:
756 if mark in marks and not force:
757 raise util.Abort(_("bookmark '%s' already exists "
757 raise util.Abort(_("bookmark '%s' already exists "
758 "(use -f to force)") % mark)
758 "(use -f to force)") % mark)
759 if mark is None:
759 if mark is None:
760 raise util.Abort(_("new bookmark name required"))
760 raise util.Abort(_("new bookmark name required"))
761 marks[mark] = marks[rename]
761 marks[mark] = marks[rename]
762 if repo._bookmarkcurrent == rename and not inactive:
762 if repo._bookmarkcurrent == rename and not inactive:
763 bookmarks.setcurrent(repo, mark)
763 bookmarks.setcurrent(repo, mark)
764 del marks[rename]
764 del marks[rename]
765 bookmarks.write(repo)
765 bookmarks.write(repo)
766 return
766 return
767
767
768 if mark is not None:
768 if mark is not None:
769 if "\n" in mark:
769 if "\n" in mark:
770 raise util.Abort(_("bookmark name cannot contain newlines"))
770 raise util.Abort(_("bookmark name cannot contain newlines"))
771 mark = mark.strip()
771 mark = mark.strip()
772 if not mark:
772 if not mark:
773 raise util.Abort(_("bookmark names cannot consist entirely of "
773 raise util.Abort(_("bookmark names cannot consist entirely of "
774 "whitespace"))
774 "whitespace"))
775 if inactive and mark == repo._bookmarkcurrent:
775 if inactive and mark == repo._bookmarkcurrent:
776 bookmarks.setcurrent(repo, None)
776 bookmarks.setcurrent(repo, None)
777 return
777 return
778 if mark in marks and not force:
778 if mark in marks and not force:
779 raise util.Abort(_("bookmark '%s' already exists "
779 raise util.Abort(_("bookmark '%s' already exists "
780 "(use -f to force)") % mark)
780 "(use -f to force)") % mark)
781 if ((mark in repo.branchtags() or mark == repo.dirstate.branch())
781 if ((mark in repo.branchtags() or mark == repo.dirstate.branch())
782 and not force):
782 and not force):
783 raise util.Abort(
783 raise util.Abort(
784 _("a bookmark cannot have the name of an existing branch"))
784 _("a bookmark cannot have the name of an existing branch"))
785 if rev:
785 if rev:
786 marks[mark] = repo.lookup(rev)
786 marks[mark] = repo.lookup(rev)
787 else:
787 else:
788 marks[mark] = repo.changectx('.').node()
788 marks[mark] = cur
789 if not inactive and repo.changectx('.').node() == marks[mark]:
789 if not inactive and cur == marks[mark]:
790 bookmarks.setcurrent(repo, mark)
790 bookmarks.setcurrent(repo, mark)
791 bookmarks.write(repo)
791 bookmarks.write(repo)
792 return
792 return
793
793
794 if mark is None:
794 if mark is None:
795 if rev:
795 if rev:
796 raise util.Abort(_("bookmark name required"))
796 raise util.Abort(_("bookmark name required"))
797 if len(marks) == 0:
797 if len(marks) == 0:
798 ui.status(_("no bookmarks set\n"))
798 ui.status(_("no bookmarks set\n"))
799 else:
799 else:
800 for bmark, n in sorted(marks.iteritems()):
800 for bmark, n in sorted(marks.iteritems()):
801 current = repo._bookmarkcurrent
801 current = repo._bookmarkcurrent
802 if bmark == current and n == cur:
802 if bmark == current and n == cur:
803 prefix, label = '*', 'bookmarks.current'
803 prefix, label = '*', 'bookmarks.current'
804 else:
804 else:
805 prefix, label = ' ', ''
805 prefix, label = ' ', ''
806
806
807 if ui.quiet:
807 if ui.quiet:
808 ui.write("%s\n" % bmark, label=label)
808 ui.write("%s\n" % bmark, label=label)
809 else:
809 else:
810 ui.write(" %s %-25s %d:%s\n" % (
810 ui.write(" %s %-25s %d:%s\n" % (
811 prefix, bmark, repo.changelog.rev(n), hexfn(n)),
811 prefix, bmark, repo.changelog.rev(n), hexfn(n)),
812 label=label)
812 label=label)
813 return
813 return
814
814
815 @command('branch',
815 @command('branch',
816 [('f', 'force', None,
816 [('f', 'force', None,
817 _('set branch name even if it shadows an existing branch')),
817 _('set branch name even if it shadows an existing branch')),
818 ('C', 'clean', None, _('reset branch name to parent branch name'))],
818 ('C', 'clean', None, _('reset branch name to parent branch name'))],
819 _('[-fC] [NAME]'))
819 _('[-fC] [NAME]'))
820 def branch(ui, repo, label=None, **opts):
820 def branch(ui, repo, label=None, **opts):
821 """set or show the current branch name
821 """set or show the current branch name
822
822
823 With no argument, show the current branch name. With one argument,
823 With no argument, show the current branch name. With one argument,
824 set the working directory branch name (the branch will not exist
824 set the working directory branch name (the branch will not exist
825 in the repository until the next commit). Standard practice
825 in the repository until the next commit). Standard practice
826 recommends that primary development take place on the 'default'
826 recommends that primary development take place on the 'default'
827 branch.
827 branch.
828
828
829 Unless -f/--force is specified, branch will not let you set a
829 Unless -f/--force is specified, branch will not let you set a
830 branch name that already exists, even if it's inactive.
830 branch name that already exists, even if it's inactive.
831
831
832 Use -C/--clean to reset the working directory branch to that of
832 Use -C/--clean to reset the working directory branch to that of
833 the parent of the working directory, negating a previous branch
833 the parent of the working directory, negating a previous branch
834 change.
834 change.
835
835
836 Use the command :hg:`update` to switch to an existing branch. Use
836 Use the command :hg:`update` to switch to an existing branch. Use
837 :hg:`commit --close-branch` to mark this branch as closed.
837 :hg:`commit --close-branch` to mark this branch as closed.
838
838
839 .. note::
839 .. note::
840 Branch names are permanent. Use :hg:`bookmark` to create a
840 Branch names are permanent. Use :hg:`bookmark` to create a
841 light-weight bookmark instead. See :hg:`help glossary` for more
841 light-weight bookmark instead. See :hg:`help glossary` for more
842 information about named branches and bookmarks.
842 information about named branches and bookmarks.
843
843
844 Returns 0 on success.
844 Returns 0 on success.
845 """
845 """
846
846
847 if opts.get('clean'):
847 if opts.get('clean'):
848 label = repo[None].p1().branch()
848 label = repo[None].p1().branch()
849 repo.dirstate.setbranch(label)
849 repo.dirstate.setbranch(label)
850 ui.status(_('reset working directory to branch %s\n') % label)
850 ui.status(_('reset working directory to branch %s\n') % label)
851 elif label:
851 elif label:
852 if not opts.get('force') and label in repo.branchtags():
852 if not opts.get('force') and label in repo.branchtags():
853 if label not in [p.branch() for p in repo.parents()]:
853 if label not in [p.branch() for p in repo.parents()]:
854 raise util.Abort(_('a branch of the same name already exists'),
854 raise util.Abort(_('a branch of the same name already exists'),
855 # i18n: "it" refers to an existing branch
855 # i18n: "it" refers to an existing branch
856 hint=_("use 'hg update' to switch to it"))
856 hint=_("use 'hg update' to switch to it"))
857 repo.dirstate.setbranch(label)
857 repo.dirstate.setbranch(label)
858 ui.status(_('marked working directory as branch %s\n') % label)
858 ui.status(_('marked working directory as branch %s\n') % label)
859 else:
859 else:
860 ui.write("%s\n" % repo.dirstate.branch())
860 ui.write("%s\n" % repo.dirstate.branch())
861
861
862 @command('branches',
862 @command('branches',
863 [('a', 'active', False, _('show only branches that have unmerged heads')),
863 [('a', 'active', False, _('show only branches that have unmerged heads')),
864 ('c', 'closed', False, _('show normal and closed branches'))],
864 ('c', 'closed', False, _('show normal and closed branches'))],
865 _('[-ac]'))
865 _('[-ac]'))
866 def branches(ui, repo, active=False, closed=False):
866 def branches(ui, repo, active=False, closed=False):
867 """list repository named branches
867 """list repository named branches
868
868
869 List the repository's named branches, indicating which ones are
869 List the repository's named branches, indicating which ones are
870 inactive. If -c/--closed is specified, also list branches which have
870 inactive. If -c/--closed is specified, also list branches which have
871 been marked closed (see :hg:`commit --close-branch`).
871 been marked closed (see :hg:`commit --close-branch`).
872
872
873 If -a/--active is specified, only show active branches. A branch
873 If -a/--active is specified, only show active branches. A branch
874 is considered active if it contains repository heads.
874 is considered active if it contains repository heads.
875
875
876 Use the command :hg:`update` to switch to an existing branch.
876 Use the command :hg:`update` to switch to an existing branch.
877
877
878 Returns 0.
878 Returns 0.
879 """
879 """
880
880
881 hexfunc = ui.debugflag and hex or short
881 hexfunc = ui.debugflag and hex or short
882 activebranches = [repo[n].branch() for n in repo.heads()]
882 activebranches = [repo[n].branch() for n in repo.heads()]
883 def testactive(tag, node):
883 def testactive(tag, node):
884 realhead = tag in activebranches
884 realhead = tag in activebranches
885 open = node in repo.branchheads(tag, closed=False)
885 open = node in repo.branchheads(tag, closed=False)
886 return realhead and open
886 return realhead and open
887 branches = sorted([(testactive(tag, node), repo.changelog.rev(node), tag)
887 branches = sorted([(testactive(tag, node), repo.changelog.rev(node), tag)
888 for tag, node in repo.branchtags().items()],
888 for tag, node in repo.branchtags().items()],
889 reverse=True)
889 reverse=True)
890
890
891 for isactive, node, tag in branches:
891 for isactive, node, tag in branches:
892 if (not active) or isactive:
892 if (not active) or isactive:
893 if ui.quiet:
893 if ui.quiet:
894 ui.write("%s\n" % tag)
894 ui.write("%s\n" % tag)
895 else:
895 else:
896 hn = repo.lookup(node)
896 hn = repo.lookup(node)
897 if isactive:
897 if isactive:
898 label = 'branches.active'
898 label = 'branches.active'
899 notice = ''
899 notice = ''
900 elif hn not in repo.branchheads(tag, closed=False):
900 elif hn not in repo.branchheads(tag, closed=False):
901 if not closed:
901 if not closed:
902 continue
902 continue
903 label = 'branches.closed'
903 label = 'branches.closed'
904 notice = _(' (closed)')
904 notice = _(' (closed)')
905 else:
905 else:
906 label = 'branches.inactive'
906 label = 'branches.inactive'
907 notice = _(' (inactive)')
907 notice = _(' (inactive)')
908 if tag == repo.dirstate.branch():
908 if tag == repo.dirstate.branch():
909 label = 'branches.current'
909 label = 'branches.current'
910 rev = str(node).rjust(31 - encoding.colwidth(tag))
910 rev = str(node).rjust(31 - encoding.colwidth(tag))
911 rev = ui.label('%s:%s' % (rev, hexfunc(hn)), 'log.changeset')
911 rev = ui.label('%s:%s' % (rev, hexfunc(hn)), 'log.changeset')
912 tag = ui.label(tag, label)
912 tag = ui.label(tag, label)
913 ui.write("%s %s%s\n" % (tag, rev, notice))
913 ui.write("%s %s%s\n" % (tag, rev, notice))
914
914
915 @command('bundle',
915 @command('bundle',
916 [('f', 'force', None, _('run even when the destination is unrelated')),
916 [('f', 'force', None, _('run even when the destination is unrelated')),
917 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
917 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
918 _('REV')),
918 _('REV')),
919 ('b', 'branch', [], _('a specific branch you would like to bundle'),
919 ('b', 'branch', [], _('a specific branch you would like to bundle'),
920 _('BRANCH')),
920 _('BRANCH')),
921 ('', 'base', [],
921 ('', 'base', [],
922 _('a base changeset assumed to be available at the destination'),
922 _('a base changeset assumed to be available at the destination'),
923 _('REV')),
923 _('REV')),
924 ('a', 'all', None, _('bundle all changesets in the repository')),
924 ('a', 'all', None, _('bundle all changesets in the repository')),
925 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
925 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
926 ] + remoteopts,
926 ] + remoteopts,
927 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
927 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
928 def bundle(ui, repo, fname, dest=None, **opts):
928 def bundle(ui, repo, fname, dest=None, **opts):
929 """create a changegroup file
929 """create a changegroup file
930
930
931 Generate a compressed changegroup file collecting changesets not
931 Generate a compressed changegroup file collecting changesets not
932 known to be in another repository.
932 known to be in another repository.
933
933
934 If you omit the destination repository, then hg assumes the
934 If you omit the destination repository, then hg assumes the
935 destination will have all the nodes you specify with --base
935 destination will have all the nodes you specify with --base
936 parameters. To create a bundle containing all changesets, use
936 parameters. To create a bundle containing all changesets, use
937 -a/--all (or --base null).
937 -a/--all (or --base null).
938
938
939 You can change compression method with the -t/--type option.
939 You can change compression method with the -t/--type option.
940 The available compression methods are: none, bzip2, and
940 The available compression methods are: none, bzip2, and
941 gzip (by default, bundles are compressed using bzip2).
941 gzip (by default, bundles are compressed using bzip2).
942
942
943 The bundle file can then be transferred using conventional means
943 The bundle file can then be transferred using conventional means
944 and applied to another repository with the unbundle or pull
944 and applied to another repository with the unbundle or pull
945 command. This is useful when direct push and pull are not
945 command. This is useful when direct push and pull are not
946 available or when exporting an entire repository is undesirable.
946 available or when exporting an entire repository is undesirable.
947
947
948 Applying bundles preserves all changeset contents including
948 Applying bundles preserves all changeset contents including
949 permissions, copy/rename information, and revision history.
949 permissions, copy/rename information, and revision history.
950
950
951 Returns 0 on success, 1 if no changes found.
951 Returns 0 on success, 1 if no changes found.
952 """
952 """
953 revs = None
953 revs = None
954 if 'rev' in opts:
954 if 'rev' in opts:
955 revs = scmutil.revrange(repo, opts['rev'])
955 revs = scmutil.revrange(repo, opts['rev'])
956
956
957 if opts.get('all'):
957 if opts.get('all'):
958 base = ['null']
958 base = ['null']
959 else:
959 else:
960 base = scmutil.revrange(repo, opts.get('base'))
960 base = scmutil.revrange(repo, opts.get('base'))
961 if base:
961 if base:
962 if dest:
962 if dest:
963 raise util.Abort(_("--base is incompatible with specifying "
963 raise util.Abort(_("--base is incompatible with specifying "
964 "a destination"))
964 "a destination"))
965 common = [repo.lookup(rev) for rev in base]
965 common = [repo.lookup(rev) for rev in base]
966 heads = revs and map(repo.lookup, revs) or revs
966 heads = revs and map(repo.lookup, revs) or revs
967 else:
967 else:
968 dest = ui.expandpath(dest or 'default-push', dest or 'default')
968 dest = ui.expandpath(dest or 'default-push', dest or 'default')
969 dest, branches = hg.parseurl(dest, opts.get('branch'))
969 dest, branches = hg.parseurl(dest, opts.get('branch'))
970 other = hg.peer(repo, opts, dest)
970 other = hg.peer(repo, opts, dest)
971 revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
971 revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
972 heads = revs and map(repo.lookup, revs) or revs
972 heads = revs and map(repo.lookup, revs) or revs
973 common, outheads = discovery.findcommonoutgoing(repo, other,
973 common, outheads = discovery.findcommonoutgoing(repo, other,
974 onlyheads=heads,
974 onlyheads=heads,
975 force=opts.get('force'))
975 force=opts.get('force'))
976
976
977 cg = repo.getbundle('bundle', common=common, heads=heads)
977 cg = repo.getbundle('bundle', common=common, heads=heads)
978 if not cg:
978 if not cg:
979 ui.status(_("no changes found\n"))
979 ui.status(_("no changes found\n"))
980 return 1
980 return 1
981
981
982 bundletype = opts.get('type', 'bzip2').lower()
982 bundletype = opts.get('type', 'bzip2').lower()
983 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
983 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
984 bundletype = btypes.get(bundletype)
984 bundletype = btypes.get(bundletype)
985 if bundletype not in changegroup.bundletypes:
985 if bundletype not in changegroup.bundletypes:
986 raise util.Abort(_('unknown bundle type specified with --type'))
986 raise util.Abort(_('unknown bundle type specified with --type'))
987
987
988 changegroup.writebundle(cg, fname, bundletype)
988 changegroup.writebundle(cg, fname, bundletype)
989
989
990 @command('cat',
990 @command('cat',
991 [('o', 'output', '',
991 [('o', 'output', '',
992 _('print output to file with formatted name'), _('FORMAT')),
992 _('print output to file with formatted name'), _('FORMAT')),
993 ('r', 'rev', '', _('print the given revision'), _('REV')),
993 ('r', 'rev', '', _('print the given revision'), _('REV')),
994 ('', 'decode', None, _('apply any matching decode filter')),
994 ('', 'decode', None, _('apply any matching decode filter')),
995 ] + walkopts,
995 ] + walkopts,
996 _('[OPTION]... FILE...'))
996 _('[OPTION]... FILE...'))
997 def cat(ui, repo, file1, *pats, **opts):
997 def cat(ui, repo, file1, *pats, **opts):
998 """output the current or given revision of files
998 """output the current or given revision of files
999
999
1000 Print the specified files as they were at the given revision. If
1000 Print the specified files as they were at the given revision. If
1001 no revision is given, the parent of the working directory is used,
1001 no revision is given, the parent of the working directory is used,
1002 or tip if no revision is checked out.
1002 or tip if no revision is checked out.
1003
1003
1004 Output may be to a file, in which case the name of the file is
1004 Output may be to a file, in which case the name of the file is
1005 given using a format string. The formatting rules are the same as
1005 given using a format string. The formatting rules are the same as
1006 for the export command, with the following additions:
1006 for the export command, with the following additions:
1007
1007
1008 :``%s``: basename of file being printed
1008 :``%s``: basename of file being printed
1009 :``%d``: dirname of file being printed, or '.' if in repository root
1009 :``%d``: dirname of file being printed, or '.' if in repository root
1010 :``%p``: root-relative path name of file being printed
1010 :``%p``: root-relative path name of file being printed
1011
1011
1012 Returns 0 on success.
1012 Returns 0 on success.
1013 """
1013 """
1014 ctx = scmutil.revsingle(repo, opts.get('rev'))
1014 ctx = scmutil.revsingle(repo, opts.get('rev'))
1015 err = 1
1015 err = 1
1016 m = scmutil.match(ctx, (file1,) + pats, opts)
1016 m = scmutil.match(ctx, (file1,) + pats, opts)
1017 for abs in ctx.walk(m):
1017 for abs in ctx.walk(m):
1018 fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(),
1018 fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(),
1019 pathname=abs)
1019 pathname=abs)
1020 data = ctx[abs].data()
1020 data = ctx[abs].data()
1021 if opts.get('decode'):
1021 if opts.get('decode'):
1022 data = repo.wwritedata(abs, data)
1022 data = repo.wwritedata(abs, data)
1023 fp.write(data)
1023 fp.write(data)
1024 fp.close()
1024 fp.close()
1025 err = 0
1025 err = 0
1026 return err
1026 return err
1027
1027
1028 @command('^clone',
1028 @command('^clone',
1029 [('U', 'noupdate', None,
1029 [('U', 'noupdate', None,
1030 _('the clone will include an empty working copy (only a repository)')),
1030 _('the clone will include an empty working copy (only a repository)')),
1031 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
1031 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
1032 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1032 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1033 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1033 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1034 ('', 'pull', None, _('use pull protocol to copy metadata')),
1034 ('', 'pull', None, _('use pull protocol to copy metadata')),
1035 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1035 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1036 ] + remoteopts,
1036 ] + remoteopts,
1037 _('[OPTION]... SOURCE [DEST]'))
1037 _('[OPTION]... SOURCE [DEST]'))
1038 def clone(ui, source, dest=None, **opts):
1038 def clone(ui, source, dest=None, **opts):
1039 """make a copy of an existing repository
1039 """make a copy of an existing repository
1040
1040
1041 Create a copy of an existing repository in a new directory.
1041 Create a copy of an existing repository in a new directory.
1042
1042
1043 If no destination directory name is specified, it defaults to the
1043 If no destination directory name is specified, it defaults to the
1044 basename of the source.
1044 basename of the source.
1045
1045
1046 The location of the source is added to the new repository's
1046 The location of the source is added to the new repository's
1047 ``.hg/hgrc`` file, as the default to be used for future pulls.
1047 ``.hg/hgrc`` file, as the default to be used for future pulls.
1048
1048
1049 Only local paths and ``ssh://`` URLs are supported as
1049 Only local paths and ``ssh://`` URLs are supported as
1050 destinations. For ``ssh://`` destinations, no working directory or
1050 destinations. For ``ssh://`` destinations, no working directory or
1051 ``.hg/hgrc`` will be created on the remote side.
1051 ``.hg/hgrc`` will be created on the remote side.
1052
1052
1053 To pull only a subset of changesets, specify one or more revisions
1053 To pull only a subset of changesets, specify one or more revisions
1054 identifiers with -r/--rev or branches with -b/--branch. The
1054 identifiers with -r/--rev or branches with -b/--branch. The
1055 resulting clone will contain only the specified changesets and
1055 resulting clone will contain only the specified changesets and
1056 their ancestors. These options (or 'clone src#rev dest') imply
1056 their ancestors. These options (or 'clone src#rev dest') imply
1057 --pull, even for local source repositories. Note that specifying a
1057 --pull, even for local source repositories. Note that specifying a
1058 tag will include the tagged changeset but not the changeset
1058 tag will include the tagged changeset but not the changeset
1059 containing the tag.
1059 containing the tag.
1060
1060
1061 To check out a particular version, use -u/--update, or
1061 To check out a particular version, use -u/--update, or
1062 -U/--noupdate to create a clone with no working directory.
1062 -U/--noupdate to create a clone with no working directory.
1063
1063
1064 .. container:: verbose
1064 .. container:: verbose
1065
1065
1066 For efficiency, hardlinks are used for cloning whenever the
1066 For efficiency, hardlinks are used for cloning whenever the
1067 source and destination are on the same filesystem (note this
1067 source and destination are on the same filesystem (note this
1068 applies only to the repository data, not to the working
1068 applies only to the repository data, not to the working
1069 directory). Some filesystems, such as AFS, implement hardlinking
1069 directory). Some filesystems, such as AFS, implement hardlinking
1070 incorrectly, but do not report errors. In these cases, use the
1070 incorrectly, but do not report errors. In these cases, use the
1071 --pull option to avoid hardlinking.
1071 --pull option to avoid hardlinking.
1072
1072
1073 In some cases, you can clone repositories and the working
1073 In some cases, you can clone repositories and the working
1074 directory using full hardlinks with ::
1074 directory using full hardlinks with ::
1075
1075
1076 $ cp -al REPO REPOCLONE
1076 $ cp -al REPO REPOCLONE
1077
1077
1078 This is the fastest way to clone, but it is not always safe. The
1078 This is the fastest way to clone, but it is not always safe. The
1079 operation is not atomic (making sure REPO is not modified during
1079 operation is not atomic (making sure REPO is not modified during
1080 the operation is up to you) and you have to make sure your
1080 the operation is up to you) and you have to make sure your
1081 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1081 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1082 so). Also, this is not compatible with certain extensions that
1082 so). Also, this is not compatible with certain extensions that
1083 place their metadata under the .hg directory, such as mq.
1083 place their metadata under the .hg directory, such as mq.
1084
1084
1085 Mercurial will update the working directory to the first applicable
1085 Mercurial will update the working directory to the first applicable
1086 revision from this list:
1086 revision from this list:
1087
1087
1088 a) null if -U or the source repository has no changesets
1088 a) null if -U or the source repository has no changesets
1089 b) if -u . and the source repository is local, the first parent of
1089 b) if -u . and the source repository is local, the first parent of
1090 the source repository's working directory
1090 the source repository's working directory
1091 c) the changeset specified with -u (if a branch name, this means the
1091 c) the changeset specified with -u (if a branch name, this means the
1092 latest head of that branch)
1092 latest head of that branch)
1093 d) the changeset specified with -r
1093 d) the changeset specified with -r
1094 e) the tipmost head specified with -b
1094 e) the tipmost head specified with -b
1095 f) the tipmost head specified with the url#branch source syntax
1095 f) the tipmost head specified with the url#branch source syntax
1096 g) the tipmost head of the default branch
1096 g) the tipmost head of the default branch
1097 h) tip
1097 h) tip
1098
1098
1099 Examples:
1099 Examples:
1100
1100
1101 - clone a remote repository to a new directory named hg/::
1101 - clone a remote repository to a new directory named hg/::
1102
1102
1103 hg clone http://selenic.com/hg
1103 hg clone http://selenic.com/hg
1104
1104
1105 - create a lightweight local clone::
1105 - create a lightweight local clone::
1106
1106
1107 hg clone project/ project-feature/
1107 hg clone project/ project-feature/
1108
1108
1109 - clone from an absolute path on an ssh server (note double-slash)::
1109 - clone from an absolute path on an ssh server (note double-slash)::
1110
1110
1111 hg clone ssh://user@server//home/projects/alpha/
1111 hg clone ssh://user@server//home/projects/alpha/
1112
1112
1113 - do a high-speed clone over a LAN while checking out a
1113 - do a high-speed clone over a LAN while checking out a
1114 specified version::
1114 specified version::
1115
1115
1116 hg clone --uncompressed http://server/repo -u 1.5
1116 hg clone --uncompressed http://server/repo -u 1.5
1117
1117
1118 - create a repository without changesets after a particular revision::
1118 - create a repository without changesets after a particular revision::
1119
1119
1120 hg clone -r 04e544 experimental/ good/
1120 hg clone -r 04e544 experimental/ good/
1121
1121
1122 - clone (and track) a particular named branch::
1122 - clone (and track) a particular named branch::
1123
1123
1124 hg clone http://selenic.com/hg#stable
1124 hg clone http://selenic.com/hg#stable
1125
1125
1126 See :hg:`help urls` for details on specifying URLs.
1126 See :hg:`help urls` for details on specifying URLs.
1127
1127
1128 Returns 0 on success.
1128 Returns 0 on success.
1129 """
1129 """
1130 if opts.get('noupdate') and opts.get('updaterev'):
1130 if opts.get('noupdate') and opts.get('updaterev'):
1131 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
1131 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
1132
1132
1133 r = hg.clone(ui, opts, source, dest,
1133 r = hg.clone(ui, opts, source, dest,
1134 pull=opts.get('pull'),
1134 pull=opts.get('pull'),
1135 stream=opts.get('uncompressed'),
1135 stream=opts.get('uncompressed'),
1136 rev=opts.get('rev'),
1136 rev=opts.get('rev'),
1137 update=opts.get('updaterev') or not opts.get('noupdate'),
1137 update=opts.get('updaterev') or not opts.get('noupdate'),
1138 branch=opts.get('branch'))
1138 branch=opts.get('branch'))
1139
1139
1140 return r is None
1140 return r is None
1141
1141
1142 @command('^commit|ci',
1142 @command('^commit|ci',
1143 [('A', 'addremove', None,
1143 [('A', 'addremove', None,
1144 _('mark new/missing files as added/removed before committing')),
1144 _('mark new/missing files as added/removed before committing')),
1145 ('', 'close-branch', None,
1145 ('', 'close-branch', None,
1146 _('mark a branch as closed, hiding it from the branch list')),
1146 _('mark a branch as closed, hiding it from the branch list')),
1147 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1147 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1148 _('[OPTION]... [FILE]...'))
1148 _('[OPTION]... [FILE]...'))
1149 def commit(ui, repo, *pats, **opts):
1149 def commit(ui, repo, *pats, **opts):
1150 """commit the specified files or all outstanding changes
1150 """commit the specified files or all outstanding changes
1151
1151
1152 Commit changes to the given files into the repository. Unlike a
1152 Commit changes to the given files into the repository. Unlike a
1153 centralized SCM, this operation is a local operation. See
1153 centralized SCM, this operation is a local operation. See
1154 :hg:`push` for a way to actively distribute your changes.
1154 :hg:`push` for a way to actively distribute your changes.
1155
1155
1156 If a list of files is omitted, all changes reported by :hg:`status`
1156 If a list of files is omitted, all changes reported by :hg:`status`
1157 will be committed.
1157 will be committed.
1158
1158
1159 If you are committing the result of a merge, do not provide any
1159 If you are committing the result of a merge, do not provide any
1160 filenames or -I/-X filters.
1160 filenames or -I/-X filters.
1161
1161
1162 If no commit message is specified, Mercurial starts your
1162 If no commit message is specified, Mercurial starts your
1163 configured editor where you can enter a message. In case your
1163 configured editor where you can enter a message. In case your
1164 commit fails, you will find a backup of your message in
1164 commit fails, you will find a backup of your message in
1165 ``.hg/last-message.txt``.
1165 ``.hg/last-message.txt``.
1166
1166
1167 See :hg:`help dates` for a list of formats valid for -d/--date.
1167 See :hg:`help dates` for a list of formats valid for -d/--date.
1168
1168
1169 Returns 0 on success, 1 if nothing changed.
1169 Returns 0 on success, 1 if nothing changed.
1170 """
1170 """
1171 if opts.get('subrepos'):
1171 if opts.get('subrepos'):
1172 # Let --subrepos on the command line overide config setting.
1172 # Let --subrepos on the command line overide config setting.
1173 ui.setconfig('ui', 'commitsubrepos', True)
1173 ui.setconfig('ui', 'commitsubrepos', True)
1174
1174
1175 extra = {}
1175 extra = {}
1176 if opts.get('close_branch'):
1176 if opts.get('close_branch'):
1177 if repo['.'].node() not in repo.branchheads():
1177 if repo['.'].node() not in repo.branchheads():
1178 # The topo heads set is included in the branch heads set of the
1178 # The topo heads set is included in the branch heads set of the
1179 # current branch, so it's sufficient to test branchheads
1179 # current branch, so it's sufficient to test branchheads
1180 raise util.Abort(_('can only close branch heads'))
1180 raise util.Abort(_('can only close branch heads'))
1181 extra['close'] = 1
1181 extra['close'] = 1
1182 e = cmdutil.commiteditor
1182 e = cmdutil.commiteditor
1183 if opts.get('force_editor'):
1183 if opts.get('force_editor'):
1184 e = cmdutil.commitforceeditor
1184 e = cmdutil.commitforceeditor
1185
1185
1186 def commitfunc(ui, repo, message, match, opts):
1186 def commitfunc(ui, repo, message, match, opts):
1187 return repo.commit(message, opts.get('user'), opts.get('date'), match,
1187 return repo.commit(message, opts.get('user'), opts.get('date'), match,
1188 editor=e, extra=extra)
1188 editor=e, extra=extra)
1189
1189
1190 branch = repo[None].branch()
1190 branch = repo[None].branch()
1191 bheads = repo.branchheads(branch)
1191 bheads = repo.branchheads(branch)
1192
1192
1193 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1193 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1194 if not node:
1194 if not node:
1195 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1195 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1196 if stat[3]:
1196 if stat[3]:
1197 ui.status(_("nothing changed (%d missing files, see 'hg status')\n")
1197 ui.status(_("nothing changed (%d missing files, see 'hg status')\n")
1198 % len(stat[3]))
1198 % len(stat[3]))
1199 else:
1199 else:
1200 ui.status(_("nothing changed\n"))
1200 ui.status(_("nothing changed\n"))
1201 return 1
1201 return 1
1202
1202
1203 ctx = repo[node]
1203 ctx = repo[node]
1204 parents = ctx.parents()
1204 parents = ctx.parents()
1205
1205
1206 if (bheads and node not in bheads and not
1206 if (bheads and node not in bheads and not
1207 [x for x in parents if x.node() in bheads and x.branch() == branch]):
1207 [x for x in parents if x.node() in bheads and x.branch() == branch]):
1208 ui.status(_('created new head\n'))
1208 ui.status(_('created new head\n'))
1209 # The message is not printed for initial roots. For the other
1209 # The message is not printed for initial roots. For the other
1210 # changesets, it is printed in the following situations:
1210 # changesets, it is printed in the following situations:
1211 #
1211 #
1212 # Par column: for the 2 parents with ...
1212 # Par column: for the 2 parents with ...
1213 # N: null or no parent
1213 # N: null or no parent
1214 # B: parent is on another named branch
1214 # B: parent is on another named branch
1215 # C: parent is a regular non head changeset
1215 # C: parent is a regular non head changeset
1216 # H: parent was a branch head of the current branch
1216 # H: parent was a branch head of the current branch
1217 # Msg column: whether we print "created new head" message
1217 # Msg column: whether we print "created new head" message
1218 # In the following, it is assumed that there already exists some
1218 # In the following, it is assumed that there already exists some
1219 # initial branch heads of the current branch, otherwise nothing is
1219 # initial branch heads of the current branch, otherwise nothing is
1220 # printed anyway.
1220 # printed anyway.
1221 #
1221 #
1222 # Par Msg Comment
1222 # Par Msg Comment
1223 # NN y additional topo root
1223 # NN y additional topo root
1224 #
1224 #
1225 # BN y additional branch root
1225 # BN y additional branch root
1226 # CN y additional topo head
1226 # CN y additional topo head
1227 # HN n usual case
1227 # HN n usual case
1228 #
1228 #
1229 # BB y weird additional branch root
1229 # BB y weird additional branch root
1230 # CB y branch merge
1230 # CB y branch merge
1231 # HB n merge with named branch
1231 # HB n merge with named branch
1232 #
1232 #
1233 # CC y additional head from merge
1233 # CC y additional head from merge
1234 # CH n merge with a head
1234 # CH n merge with a head
1235 #
1235 #
1236 # HH n head merge: head count decreases
1236 # HH n head merge: head count decreases
1237
1237
1238 if not opts.get('close_branch'):
1238 if not opts.get('close_branch'):
1239 for r in parents:
1239 for r in parents:
1240 if r.extra().get('close') and r.branch() == branch:
1240 if r.extra().get('close') and r.branch() == branch:
1241 ui.status(_('reopening closed branch head %d\n') % r)
1241 ui.status(_('reopening closed branch head %d\n') % r)
1242
1242
1243 if ui.debugflag:
1243 if ui.debugflag:
1244 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
1244 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
1245 elif ui.verbose:
1245 elif ui.verbose:
1246 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
1246 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
1247
1247
1248 @command('copy|cp',
1248 @command('copy|cp',
1249 [('A', 'after', None, _('record a copy that has already occurred')),
1249 [('A', 'after', None, _('record a copy that has already occurred')),
1250 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1250 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1251 ] + walkopts + dryrunopts,
1251 ] + walkopts + dryrunopts,
1252 _('[OPTION]... [SOURCE]... DEST'))
1252 _('[OPTION]... [SOURCE]... DEST'))
1253 def copy(ui, repo, *pats, **opts):
1253 def copy(ui, repo, *pats, **opts):
1254 """mark files as copied for the next commit
1254 """mark files as copied for the next commit
1255
1255
1256 Mark dest as having copies of source files. If dest is a
1256 Mark dest as having copies of source files. If dest is a
1257 directory, copies are put in that directory. If dest is a file,
1257 directory, copies are put in that directory. If dest is a file,
1258 the source must be a single file.
1258 the source must be a single file.
1259
1259
1260 By default, this command copies the contents of files as they
1260 By default, this command copies the contents of files as they
1261 exist in the working directory. If invoked with -A/--after, the
1261 exist in the working directory. If invoked with -A/--after, the
1262 operation is recorded, but no copying is performed.
1262 operation is recorded, but no copying is performed.
1263
1263
1264 This command takes effect with the next commit. To undo a copy
1264 This command takes effect with the next commit. To undo a copy
1265 before that, see :hg:`revert`.
1265 before that, see :hg:`revert`.
1266
1266
1267 Returns 0 on success, 1 if errors are encountered.
1267 Returns 0 on success, 1 if errors are encountered.
1268 """
1268 """
1269 wlock = repo.wlock(False)
1269 wlock = repo.wlock(False)
1270 try:
1270 try:
1271 return cmdutil.copy(ui, repo, pats, opts)
1271 return cmdutil.copy(ui, repo, pats, opts)
1272 finally:
1272 finally:
1273 wlock.release()
1273 wlock.release()
1274
1274
1275 @command('debugancestor', [], _('[INDEX] REV1 REV2'))
1275 @command('debugancestor', [], _('[INDEX] REV1 REV2'))
1276 def debugancestor(ui, repo, *args):
1276 def debugancestor(ui, repo, *args):
1277 """find the ancestor revision of two revisions in a given index"""
1277 """find the ancestor revision of two revisions in a given index"""
1278 if len(args) == 3:
1278 if len(args) == 3:
1279 index, rev1, rev2 = args
1279 index, rev1, rev2 = args
1280 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1280 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1281 lookup = r.lookup
1281 lookup = r.lookup
1282 elif len(args) == 2:
1282 elif len(args) == 2:
1283 if not repo:
1283 if not repo:
1284 raise util.Abort(_("there is no Mercurial repository here "
1284 raise util.Abort(_("there is no Mercurial repository here "
1285 "(.hg not found)"))
1285 "(.hg not found)"))
1286 rev1, rev2 = args
1286 rev1, rev2 = args
1287 r = repo.changelog
1287 r = repo.changelog
1288 lookup = repo.lookup
1288 lookup = repo.lookup
1289 else:
1289 else:
1290 raise util.Abort(_('either two or three arguments required'))
1290 raise util.Abort(_('either two or three arguments required'))
1291 a = r.ancestor(lookup(rev1), lookup(rev2))
1291 a = r.ancestor(lookup(rev1), lookup(rev2))
1292 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1292 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1293
1293
1294 @command('debugbuilddag',
1294 @command('debugbuilddag',
1295 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1295 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1296 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1296 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1297 ('n', 'new-file', None, _('add new file at each rev'))],
1297 ('n', 'new-file', None, _('add new file at each rev'))],
1298 _('[OPTION]... [TEXT]'))
1298 _('[OPTION]... [TEXT]'))
1299 def debugbuilddag(ui, repo, text=None,
1299 def debugbuilddag(ui, repo, text=None,
1300 mergeable_file=False,
1300 mergeable_file=False,
1301 overwritten_file=False,
1301 overwritten_file=False,
1302 new_file=False):
1302 new_file=False):
1303 """builds a repo with a given DAG from scratch in the current empty repo
1303 """builds a repo with a given DAG from scratch in the current empty repo
1304
1304
1305 The description of the DAG is read from stdin if not given on the
1305 The description of the DAG is read from stdin if not given on the
1306 command line.
1306 command line.
1307
1307
1308 Elements:
1308 Elements:
1309
1309
1310 - "+n" is a linear run of n nodes based on the current default parent
1310 - "+n" is a linear run of n nodes based on the current default parent
1311 - "." is a single node based on the current default parent
1311 - "." is a single node based on the current default parent
1312 - "$" resets the default parent to null (implied at the start);
1312 - "$" resets the default parent to null (implied at the start);
1313 otherwise the default parent is always the last node created
1313 otherwise the default parent is always the last node created
1314 - "<p" sets the default parent to the backref p
1314 - "<p" sets the default parent to the backref p
1315 - "*p" is a fork at parent p, which is a backref
1315 - "*p" is a fork at parent p, which is a backref
1316 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1316 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1317 - "/p2" is a merge of the preceding node and p2
1317 - "/p2" is a merge of the preceding node and p2
1318 - ":tag" defines a local tag for the preceding node
1318 - ":tag" defines a local tag for the preceding node
1319 - "@branch" sets the named branch for subsequent nodes
1319 - "@branch" sets the named branch for subsequent nodes
1320 - "#...\\n" is a comment up to the end of the line
1320 - "#...\\n" is a comment up to the end of the line
1321
1321
1322 Whitespace between the above elements is ignored.
1322 Whitespace between the above elements is ignored.
1323
1323
1324 A backref is either
1324 A backref is either
1325
1325
1326 - a number n, which references the node curr-n, where curr is the current
1326 - a number n, which references the node curr-n, where curr is the current
1327 node, or
1327 node, or
1328 - the name of a local tag you placed earlier using ":tag", or
1328 - the name of a local tag you placed earlier using ":tag", or
1329 - empty to denote the default parent.
1329 - empty to denote the default parent.
1330
1330
1331 All string valued-elements are either strictly alphanumeric, or must
1331 All string valued-elements are either strictly alphanumeric, or must
1332 be enclosed in double quotes ("..."), with "\\" as escape character.
1332 be enclosed in double quotes ("..."), with "\\" as escape character.
1333 """
1333 """
1334
1334
1335 if text is None:
1335 if text is None:
1336 ui.status(_("reading DAG from stdin\n"))
1336 ui.status(_("reading DAG from stdin\n"))
1337 text = ui.fin.read()
1337 text = ui.fin.read()
1338
1338
1339 cl = repo.changelog
1339 cl = repo.changelog
1340 if len(cl) > 0:
1340 if len(cl) > 0:
1341 raise util.Abort(_('repository is not empty'))
1341 raise util.Abort(_('repository is not empty'))
1342
1342
1343 # determine number of revs in DAG
1343 # determine number of revs in DAG
1344 total = 0
1344 total = 0
1345 for type, data in dagparser.parsedag(text):
1345 for type, data in dagparser.parsedag(text):
1346 if type == 'n':
1346 if type == 'n':
1347 total += 1
1347 total += 1
1348
1348
1349 if mergeable_file:
1349 if mergeable_file:
1350 linesperrev = 2
1350 linesperrev = 2
1351 # make a file with k lines per rev
1351 # make a file with k lines per rev
1352 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1352 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1353 initialmergedlines.append("")
1353 initialmergedlines.append("")
1354
1354
1355 tags = []
1355 tags = []
1356
1356
1357 tr = repo.transaction("builddag")
1357 tr = repo.transaction("builddag")
1358 try:
1358 try:
1359
1359
1360 at = -1
1360 at = -1
1361 atbranch = 'default'
1361 atbranch = 'default'
1362 nodeids = []
1362 nodeids = []
1363 ui.progress(_('building'), 0, unit=_('revisions'), total=total)
1363 ui.progress(_('building'), 0, unit=_('revisions'), total=total)
1364 for type, data in dagparser.parsedag(text):
1364 for type, data in dagparser.parsedag(text):
1365 if type == 'n':
1365 if type == 'n':
1366 ui.note('node %s\n' % str(data))
1366 ui.note('node %s\n' % str(data))
1367 id, ps = data
1367 id, ps = data
1368
1368
1369 files = []
1369 files = []
1370 fctxs = {}
1370 fctxs = {}
1371
1371
1372 p2 = None
1372 p2 = None
1373 if mergeable_file:
1373 if mergeable_file:
1374 fn = "mf"
1374 fn = "mf"
1375 p1 = repo[ps[0]]
1375 p1 = repo[ps[0]]
1376 if len(ps) > 1:
1376 if len(ps) > 1:
1377 p2 = repo[ps[1]]
1377 p2 = repo[ps[1]]
1378 pa = p1.ancestor(p2)
1378 pa = p1.ancestor(p2)
1379 base, local, other = [x[fn].data() for x in pa, p1, p2]
1379 base, local, other = [x[fn].data() for x in pa, p1, p2]
1380 m3 = simplemerge.Merge3Text(base, local, other)
1380 m3 = simplemerge.Merge3Text(base, local, other)
1381 ml = [l.strip() for l in m3.merge_lines()]
1381 ml = [l.strip() for l in m3.merge_lines()]
1382 ml.append("")
1382 ml.append("")
1383 elif at > 0:
1383 elif at > 0:
1384 ml = p1[fn].data().split("\n")
1384 ml = p1[fn].data().split("\n")
1385 else:
1385 else:
1386 ml = initialmergedlines
1386 ml = initialmergedlines
1387 ml[id * linesperrev] += " r%i" % id
1387 ml[id * linesperrev] += " r%i" % id
1388 mergedtext = "\n".join(ml)
1388 mergedtext = "\n".join(ml)
1389 files.append(fn)
1389 files.append(fn)
1390 fctxs[fn] = context.memfilectx(fn, mergedtext)
1390 fctxs[fn] = context.memfilectx(fn, mergedtext)
1391
1391
1392 if overwritten_file:
1392 if overwritten_file:
1393 fn = "of"
1393 fn = "of"
1394 files.append(fn)
1394 files.append(fn)
1395 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1395 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1396
1396
1397 if new_file:
1397 if new_file:
1398 fn = "nf%i" % id
1398 fn = "nf%i" % id
1399 files.append(fn)
1399 files.append(fn)
1400 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1400 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1401 if len(ps) > 1:
1401 if len(ps) > 1:
1402 if not p2:
1402 if not p2:
1403 p2 = repo[ps[1]]
1403 p2 = repo[ps[1]]
1404 for fn in p2:
1404 for fn in p2:
1405 if fn.startswith("nf"):
1405 if fn.startswith("nf"):
1406 files.append(fn)
1406 files.append(fn)
1407 fctxs[fn] = p2[fn]
1407 fctxs[fn] = p2[fn]
1408
1408
1409 def fctxfn(repo, cx, path):
1409 def fctxfn(repo, cx, path):
1410 return fctxs.get(path)
1410 return fctxs.get(path)
1411
1411
1412 if len(ps) == 0 or ps[0] < 0:
1412 if len(ps) == 0 or ps[0] < 0:
1413 pars = [None, None]
1413 pars = [None, None]
1414 elif len(ps) == 1:
1414 elif len(ps) == 1:
1415 pars = [nodeids[ps[0]], None]
1415 pars = [nodeids[ps[0]], None]
1416 else:
1416 else:
1417 pars = [nodeids[p] for p in ps]
1417 pars = [nodeids[p] for p in ps]
1418 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1418 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1419 date=(id, 0),
1419 date=(id, 0),
1420 user="debugbuilddag",
1420 user="debugbuilddag",
1421 extra={'branch': atbranch})
1421 extra={'branch': atbranch})
1422 nodeid = repo.commitctx(cx)
1422 nodeid = repo.commitctx(cx)
1423 nodeids.append(nodeid)
1423 nodeids.append(nodeid)
1424 at = id
1424 at = id
1425 elif type == 'l':
1425 elif type == 'l':
1426 id, name = data
1426 id, name = data
1427 ui.note('tag %s\n' % name)
1427 ui.note('tag %s\n' % name)
1428 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1428 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1429 elif type == 'a':
1429 elif type == 'a':
1430 ui.note('branch %s\n' % data)
1430 ui.note('branch %s\n' % data)
1431 atbranch = data
1431 atbranch = data
1432 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1432 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1433 tr.close()
1433 tr.close()
1434 finally:
1434 finally:
1435 ui.progress(_('building'), None)
1435 ui.progress(_('building'), None)
1436 tr.release()
1436 tr.release()
1437
1437
1438 if tags:
1438 if tags:
1439 repo.opener.write("localtags", "".join(tags))
1439 repo.opener.write("localtags", "".join(tags))
1440
1440
1441 @command('debugbundle', [('a', 'all', None, _('show all details'))], _('FILE'))
1441 @command('debugbundle', [('a', 'all', None, _('show all details'))], _('FILE'))
1442 def debugbundle(ui, bundlepath, all=None, **opts):
1442 def debugbundle(ui, bundlepath, all=None, **opts):
1443 """lists the contents of a bundle"""
1443 """lists the contents of a bundle"""
1444 f = url.open(ui, bundlepath)
1444 f = url.open(ui, bundlepath)
1445 try:
1445 try:
1446 gen = changegroup.readbundle(f, bundlepath)
1446 gen = changegroup.readbundle(f, bundlepath)
1447 if all:
1447 if all:
1448 ui.write("format: id, p1, p2, cset, delta base, len(delta)\n")
1448 ui.write("format: id, p1, p2, cset, delta base, len(delta)\n")
1449
1449
1450 def showchunks(named):
1450 def showchunks(named):
1451 ui.write("\n%s\n" % named)
1451 ui.write("\n%s\n" % named)
1452 chain = None
1452 chain = None
1453 while True:
1453 while True:
1454 chunkdata = gen.deltachunk(chain)
1454 chunkdata = gen.deltachunk(chain)
1455 if not chunkdata:
1455 if not chunkdata:
1456 break
1456 break
1457 node = chunkdata['node']
1457 node = chunkdata['node']
1458 p1 = chunkdata['p1']
1458 p1 = chunkdata['p1']
1459 p2 = chunkdata['p2']
1459 p2 = chunkdata['p2']
1460 cs = chunkdata['cs']
1460 cs = chunkdata['cs']
1461 deltabase = chunkdata['deltabase']
1461 deltabase = chunkdata['deltabase']
1462 delta = chunkdata['delta']
1462 delta = chunkdata['delta']
1463 ui.write("%s %s %s %s %s %s\n" %
1463 ui.write("%s %s %s %s %s %s\n" %
1464 (hex(node), hex(p1), hex(p2),
1464 (hex(node), hex(p1), hex(p2),
1465 hex(cs), hex(deltabase), len(delta)))
1465 hex(cs), hex(deltabase), len(delta)))
1466 chain = node
1466 chain = node
1467
1467
1468 chunkdata = gen.changelogheader()
1468 chunkdata = gen.changelogheader()
1469 showchunks("changelog")
1469 showchunks("changelog")
1470 chunkdata = gen.manifestheader()
1470 chunkdata = gen.manifestheader()
1471 showchunks("manifest")
1471 showchunks("manifest")
1472 while True:
1472 while True:
1473 chunkdata = gen.filelogheader()
1473 chunkdata = gen.filelogheader()
1474 if not chunkdata:
1474 if not chunkdata:
1475 break
1475 break
1476 fname = chunkdata['filename']
1476 fname = chunkdata['filename']
1477 showchunks(fname)
1477 showchunks(fname)
1478 else:
1478 else:
1479 chunkdata = gen.changelogheader()
1479 chunkdata = gen.changelogheader()
1480 chain = None
1480 chain = None
1481 while True:
1481 while True:
1482 chunkdata = gen.deltachunk(chain)
1482 chunkdata = gen.deltachunk(chain)
1483 if not chunkdata:
1483 if not chunkdata:
1484 break
1484 break
1485 node = chunkdata['node']
1485 node = chunkdata['node']
1486 ui.write("%s\n" % hex(node))
1486 ui.write("%s\n" % hex(node))
1487 chain = node
1487 chain = node
1488 finally:
1488 finally:
1489 f.close()
1489 f.close()
1490
1490
1491 @command('debugcheckstate', [], '')
1491 @command('debugcheckstate', [], '')
1492 def debugcheckstate(ui, repo):
1492 def debugcheckstate(ui, repo):
1493 """validate the correctness of the current dirstate"""
1493 """validate the correctness of the current dirstate"""
1494 parent1, parent2 = repo.dirstate.parents()
1494 parent1, parent2 = repo.dirstate.parents()
1495 m1 = repo[parent1].manifest()
1495 m1 = repo[parent1].manifest()
1496 m2 = repo[parent2].manifest()
1496 m2 = repo[parent2].manifest()
1497 errors = 0
1497 errors = 0
1498 for f in repo.dirstate:
1498 for f in repo.dirstate:
1499 state = repo.dirstate[f]
1499 state = repo.dirstate[f]
1500 if state in "nr" and f not in m1:
1500 if state in "nr" and f not in m1:
1501 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1501 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1502 errors += 1
1502 errors += 1
1503 if state in "a" and f in m1:
1503 if state in "a" and f in m1:
1504 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1504 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1505 errors += 1
1505 errors += 1
1506 if state in "m" and f not in m1 and f not in m2:
1506 if state in "m" and f not in m1 and f not in m2:
1507 ui.warn(_("%s in state %s, but not in either manifest\n") %
1507 ui.warn(_("%s in state %s, but not in either manifest\n") %
1508 (f, state))
1508 (f, state))
1509 errors += 1
1509 errors += 1
1510 for f in m1:
1510 for f in m1:
1511 state = repo.dirstate[f]
1511 state = repo.dirstate[f]
1512 if state not in "nrm":
1512 if state not in "nrm":
1513 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1513 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1514 errors += 1
1514 errors += 1
1515 if errors:
1515 if errors:
1516 error = _(".hg/dirstate inconsistent with current parent's manifest")
1516 error = _(".hg/dirstate inconsistent with current parent's manifest")
1517 raise util.Abort(error)
1517 raise util.Abort(error)
1518
1518
1519 @command('debugcommands', [], _('[COMMAND]'))
1519 @command('debugcommands', [], _('[COMMAND]'))
1520 def debugcommands(ui, cmd='', *args):
1520 def debugcommands(ui, cmd='', *args):
1521 """list all available commands and options"""
1521 """list all available commands and options"""
1522 for cmd, vals in sorted(table.iteritems()):
1522 for cmd, vals in sorted(table.iteritems()):
1523 cmd = cmd.split('|')[0].strip('^')
1523 cmd = cmd.split('|')[0].strip('^')
1524 opts = ', '.join([i[1] for i in vals[1]])
1524 opts = ', '.join([i[1] for i in vals[1]])
1525 ui.write('%s: %s\n' % (cmd, opts))
1525 ui.write('%s: %s\n' % (cmd, opts))
1526
1526
1527 @command('debugcomplete',
1527 @command('debugcomplete',
1528 [('o', 'options', None, _('show the command options'))],
1528 [('o', 'options', None, _('show the command options'))],
1529 _('[-o] CMD'))
1529 _('[-o] CMD'))
1530 def debugcomplete(ui, cmd='', **opts):
1530 def debugcomplete(ui, cmd='', **opts):
1531 """returns the completion list associated with the given command"""
1531 """returns the completion list associated with the given command"""
1532
1532
1533 if opts.get('options'):
1533 if opts.get('options'):
1534 options = []
1534 options = []
1535 otables = [globalopts]
1535 otables = [globalopts]
1536 if cmd:
1536 if cmd:
1537 aliases, entry = cmdutil.findcmd(cmd, table, False)
1537 aliases, entry = cmdutil.findcmd(cmd, table, False)
1538 otables.append(entry[1])
1538 otables.append(entry[1])
1539 for t in otables:
1539 for t in otables:
1540 for o in t:
1540 for o in t:
1541 if "(DEPRECATED)" in o[3]:
1541 if "(DEPRECATED)" in o[3]:
1542 continue
1542 continue
1543 if o[0]:
1543 if o[0]:
1544 options.append('-%s' % o[0])
1544 options.append('-%s' % o[0])
1545 options.append('--%s' % o[1])
1545 options.append('--%s' % o[1])
1546 ui.write("%s\n" % "\n".join(options))
1546 ui.write("%s\n" % "\n".join(options))
1547 return
1547 return
1548
1548
1549 cmdlist = cmdutil.findpossible(cmd, table)
1549 cmdlist = cmdutil.findpossible(cmd, table)
1550 if ui.verbose:
1550 if ui.verbose:
1551 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1551 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1552 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1552 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1553
1553
1554 @command('debugdag',
1554 @command('debugdag',
1555 [('t', 'tags', None, _('use tags as labels')),
1555 [('t', 'tags', None, _('use tags as labels')),
1556 ('b', 'branches', None, _('annotate with branch names')),
1556 ('b', 'branches', None, _('annotate with branch names')),
1557 ('', 'dots', None, _('use dots for runs')),
1557 ('', 'dots', None, _('use dots for runs')),
1558 ('s', 'spaces', None, _('separate elements by spaces'))],
1558 ('s', 'spaces', None, _('separate elements by spaces'))],
1559 _('[OPTION]... [FILE [REV]...]'))
1559 _('[OPTION]... [FILE [REV]...]'))
1560 def debugdag(ui, repo, file_=None, *revs, **opts):
1560 def debugdag(ui, repo, file_=None, *revs, **opts):
1561 """format the changelog or an index DAG as a concise textual description
1561 """format the changelog or an index DAG as a concise textual description
1562
1562
1563 If you pass a revlog index, the revlog's DAG is emitted. If you list
1563 If you pass a revlog index, the revlog's DAG is emitted. If you list
1564 revision numbers, they get labelled in the output as rN.
1564 revision numbers, they get labelled in the output as rN.
1565
1565
1566 Otherwise, the changelog DAG of the current repo is emitted.
1566 Otherwise, the changelog DAG of the current repo is emitted.
1567 """
1567 """
1568 spaces = opts.get('spaces')
1568 spaces = opts.get('spaces')
1569 dots = opts.get('dots')
1569 dots = opts.get('dots')
1570 if file_:
1570 if file_:
1571 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1571 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1572 revs = set((int(r) for r in revs))
1572 revs = set((int(r) for r in revs))
1573 def events():
1573 def events():
1574 for r in rlog:
1574 for r in rlog:
1575 yield 'n', (r, list(set(p for p in rlog.parentrevs(r) if p != -1)))
1575 yield 'n', (r, list(set(p for p in rlog.parentrevs(r) if p != -1)))
1576 if r in revs:
1576 if r in revs:
1577 yield 'l', (r, "r%i" % r)
1577 yield 'l', (r, "r%i" % r)
1578 elif repo:
1578 elif repo:
1579 cl = repo.changelog
1579 cl = repo.changelog
1580 tags = opts.get('tags')
1580 tags = opts.get('tags')
1581 branches = opts.get('branches')
1581 branches = opts.get('branches')
1582 if tags:
1582 if tags:
1583 labels = {}
1583 labels = {}
1584 for l, n in repo.tags().items():
1584 for l, n in repo.tags().items():
1585 labels.setdefault(cl.rev(n), []).append(l)
1585 labels.setdefault(cl.rev(n), []).append(l)
1586 def events():
1586 def events():
1587 b = "default"
1587 b = "default"
1588 for r in cl:
1588 for r in cl:
1589 if branches:
1589 if branches:
1590 newb = cl.read(cl.node(r))[5]['branch']
1590 newb = cl.read(cl.node(r))[5]['branch']
1591 if newb != b:
1591 if newb != b:
1592 yield 'a', newb
1592 yield 'a', newb
1593 b = newb
1593 b = newb
1594 yield 'n', (r, list(set(p for p in cl.parentrevs(r) if p != -1)))
1594 yield 'n', (r, list(set(p for p in cl.parentrevs(r) if p != -1)))
1595 if tags:
1595 if tags:
1596 ls = labels.get(r)
1596 ls = labels.get(r)
1597 if ls:
1597 if ls:
1598 for l in ls:
1598 for l in ls:
1599 yield 'l', (r, l)
1599 yield 'l', (r, l)
1600 else:
1600 else:
1601 raise util.Abort(_('need repo for changelog dag'))
1601 raise util.Abort(_('need repo for changelog dag'))
1602
1602
1603 for line in dagparser.dagtextlines(events(),
1603 for line in dagparser.dagtextlines(events(),
1604 addspaces=spaces,
1604 addspaces=spaces,
1605 wraplabels=True,
1605 wraplabels=True,
1606 wrapannotations=True,
1606 wrapannotations=True,
1607 wrapnonlinear=dots,
1607 wrapnonlinear=dots,
1608 usedots=dots,
1608 usedots=dots,
1609 maxlinewidth=70):
1609 maxlinewidth=70):
1610 ui.write(line)
1610 ui.write(line)
1611 ui.write("\n")
1611 ui.write("\n")
1612
1612
1613 @command('debugdata',
1613 @command('debugdata',
1614 [('c', 'changelog', False, _('open changelog')),
1614 [('c', 'changelog', False, _('open changelog')),
1615 ('m', 'manifest', False, _('open manifest'))],
1615 ('m', 'manifest', False, _('open manifest'))],
1616 _('-c|-m|FILE REV'))
1616 _('-c|-m|FILE REV'))
1617 def debugdata(ui, repo, file_, rev = None, **opts):
1617 def debugdata(ui, repo, file_, rev = None, **opts):
1618 """dump the contents of a data file revision"""
1618 """dump the contents of a data file revision"""
1619 if opts.get('changelog') or opts.get('manifest'):
1619 if opts.get('changelog') or opts.get('manifest'):
1620 file_, rev = None, file_
1620 file_, rev = None, file_
1621 elif rev is None:
1621 elif rev is None:
1622 raise error.CommandError('debugdata', _('invalid arguments'))
1622 raise error.CommandError('debugdata', _('invalid arguments'))
1623 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
1623 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
1624 try:
1624 try:
1625 ui.write(r.revision(r.lookup(rev)))
1625 ui.write(r.revision(r.lookup(rev)))
1626 except KeyError:
1626 except KeyError:
1627 raise util.Abort(_('invalid revision identifier %s') % rev)
1627 raise util.Abort(_('invalid revision identifier %s') % rev)
1628
1628
1629 @command('debugdate',
1629 @command('debugdate',
1630 [('e', 'extended', None, _('try extended date formats'))],
1630 [('e', 'extended', None, _('try extended date formats'))],
1631 _('[-e] DATE [RANGE]'))
1631 _('[-e] DATE [RANGE]'))
1632 def debugdate(ui, date, range=None, **opts):
1632 def debugdate(ui, date, range=None, **opts):
1633 """parse and display a date"""
1633 """parse and display a date"""
1634 if opts["extended"]:
1634 if opts["extended"]:
1635 d = util.parsedate(date, util.extendeddateformats)
1635 d = util.parsedate(date, util.extendeddateformats)
1636 else:
1636 else:
1637 d = util.parsedate(date)
1637 d = util.parsedate(date)
1638 ui.write("internal: %s %s\n" % d)
1638 ui.write("internal: %s %s\n" % d)
1639 ui.write("standard: %s\n" % util.datestr(d))
1639 ui.write("standard: %s\n" % util.datestr(d))
1640 if range:
1640 if range:
1641 m = util.matchdate(range)
1641 m = util.matchdate(range)
1642 ui.write("match: %s\n" % m(d[0]))
1642 ui.write("match: %s\n" % m(d[0]))
1643
1643
1644 @command('debugdiscovery',
1644 @command('debugdiscovery',
1645 [('', 'old', None, _('use old-style discovery')),
1645 [('', 'old', None, _('use old-style discovery')),
1646 ('', 'nonheads', None,
1646 ('', 'nonheads', None,
1647 _('use old-style discovery with non-heads included')),
1647 _('use old-style discovery with non-heads included')),
1648 ] + remoteopts,
1648 ] + remoteopts,
1649 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
1649 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
1650 def debugdiscovery(ui, repo, remoteurl="default", **opts):
1650 def debugdiscovery(ui, repo, remoteurl="default", **opts):
1651 """runs the changeset discovery protocol in isolation"""
1651 """runs the changeset discovery protocol in isolation"""
1652 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl), opts.get('branch'))
1652 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl), opts.get('branch'))
1653 remote = hg.peer(repo, opts, remoteurl)
1653 remote = hg.peer(repo, opts, remoteurl)
1654 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
1654 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
1655
1655
1656 # make sure tests are repeatable
1656 # make sure tests are repeatable
1657 random.seed(12323)
1657 random.seed(12323)
1658
1658
1659 def doit(localheads, remoteheads):
1659 def doit(localheads, remoteheads):
1660 if opts.get('old'):
1660 if opts.get('old'):
1661 if localheads:
1661 if localheads:
1662 raise util.Abort('cannot use localheads with old style discovery')
1662 raise util.Abort('cannot use localheads with old style discovery')
1663 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
1663 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
1664 force=True)
1664 force=True)
1665 common = set(common)
1665 common = set(common)
1666 if not opts.get('nonheads'):
1666 if not opts.get('nonheads'):
1667 ui.write("unpruned common: %s\n" % " ".join([short(n)
1667 ui.write("unpruned common: %s\n" % " ".join([short(n)
1668 for n in common]))
1668 for n in common]))
1669 dag = dagutil.revlogdag(repo.changelog)
1669 dag = dagutil.revlogdag(repo.changelog)
1670 all = dag.ancestorset(dag.internalizeall(common))
1670 all = dag.ancestorset(dag.internalizeall(common))
1671 common = dag.externalizeall(dag.headsetofconnecteds(all))
1671 common = dag.externalizeall(dag.headsetofconnecteds(all))
1672 else:
1672 else:
1673 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
1673 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
1674 common = set(common)
1674 common = set(common)
1675 rheads = set(hds)
1675 rheads = set(hds)
1676 lheads = set(repo.heads())
1676 lheads = set(repo.heads())
1677 ui.write("common heads: %s\n" % " ".join([short(n) for n in common]))
1677 ui.write("common heads: %s\n" % " ".join([short(n) for n in common]))
1678 if lheads <= common:
1678 if lheads <= common:
1679 ui.write("local is subset\n")
1679 ui.write("local is subset\n")
1680 elif rheads <= common:
1680 elif rheads <= common:
1681 ui.write("remote is subset\n")
1681 ui.write("remote is subset\n")
1682
1682
1683 serverlogs = opts.get('serverlog')
1683 serverlogs = opts.get('serverlog')
1684 if serverlogs:
1684 if serverlogs:
1685 for filename in serverlogs:
1685 for filename in serverlogs:
1686 logfile = open(filename, 'r')
1686 logfile = open(filename, 'r')
1687 try:
1687 try:
1688 line = logfile.readline()
1688 line = logfile.readline()
1689 while line:
1689 while line:
1690 parts = line.strip().split(';')
1690 parts = line.strip().split(';')
1691 op = parts[1]
1691 op = parts[1]
1692 if op == 'cg':
1692 if op == 'cg':
1693 pass
1693 pass
1694 elif op == 'cgss':
1694 elif op == 'cgss':
1695 doit(parts[2].split(' '), parts[3].split(' '))
1695 doit(parts[2].split(' '), parts[3].split(' '))
1696 elif op == 'unb':
1696 elif op == 'unb':
1697 doit(parts[3].split(' '), parts[2].split(' '))
1697 doit(parts[3].split(' '), parts[2].split(' '))
1698 line = logfile.readline()
1698 line = logfile.readline()
1699 finally:
1699 finally:
1700 logfile.close()
1700 logfile.close()
1701
1701
1702 else:
1702 else:
1703 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
1703 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
1704 opts.get('remote_head'))
1704 opts.get('remote_head'))
1705 localrevs = opts.get('local_head')
1705 localrevs = opts.get('local_head')
1706 doit(localrevs, remoterevs)
1706 doit(localrevs, remoterevs)
1707
1707
1708 @command('debugfileset', [], ('REVSPEC'))
1708 @command('debugfileset', [], ('REVSPEC'))
1709 def debugfileset(ui, repo, expr):
1709 def debugfileset(ui, repo, expr):
1710 '''parse and apply a fileset specification'''
1710 '''parse and apply a fileset specification'''
1711 if ui.verbose:
1711 if ui.verbose:
1712 tree = fileset.parse(expr)[0]
1712 tree = fileset.parse(expr)[0]
1713 ui.note(tree, "\n")
1713 ui.note(tree, "\n")
1714
1714
1715 for f in fileset.getfileset(repo[None], expr):
1715 for f in fileset.getfileset(repo[None], expr):
1716 ui.write("%s\n" % f)
1716 ui.write("%s\n" % f)
1717
1717
1718 @command('debugfsinfo', [], _('[PATH]'))
1718 @command('debugfsinfo', [], _('[PATH]'))
1719 def debugfsinfo(ui, path = "."):
1719 def debugfsinfo(ui, path = "."):
1720 """show information detected about current filesystem"""
1720 """show information detected about current filesystem"""
1721 util.writefile('.debugfsinfo', '')
1721 util.writefile('.debugfsinfo', '')
1722 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
1722 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
1723 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
1723 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
1724 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
1724 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
1725 and 'yes' or 'no'))
1725 and 'yes' or 'no'))
1726 os.unlink('.debugfsinfo')
1726 os.unlink('.debugfsinfo')
1727
1727
1728 @command('debuggetbundle',
1728 @command('debuggetbundle',
1729 [('H', 'head', [], _('id of head node'), _('ID')),
1729 [('H', 'head', [], _('id of head node'), _('ID')),
1730 ('C', 'common', [], _('id of common node'), _('ID')),
1730 ('C', 'common', [], _('id of common node'), _('ID')),
1731 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
1731 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
1732 _('REPO FILE [-H|-C ID]...'))
1732 _('REPO FILE [-H|-C ID]...'))
1733 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
1733 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
1734 """retrieves a bundle from a repo
1734 """retrieves a bundle from a repo
1735
1735
1736 Every ID must be a full-length hex node id string. Saves the bundle to the
1736 Every ID must be a full-length hex node id string. Saves the bundle to the
1737 given file.
1737 given file.
1738 """
1738 """
1739 repo = hg.peer(ui, opts, repopath)
1739 repo = hg.peer(ui, opts, repopath)
1740 if not repo.capable('getbundle'):
1740 if not repo.capable('getbundle'):
1741 raise util.Abort("getbundle() not supported by target repository")
1741 raise util.Abort("getbundle() not supported by target repository")
1742 args = {}
1742 args = {}
1743 if common:
1743 if common:
1744 args['common'] = [bin(s) for s in common]
1744 args['common'] = [bin(s) for s in common]
1745 if head:
1745 if head:
1746 args['heads'] = [bin(s) for s in head]
1746 args['heads'] = [bin(s) for s in head]
1747 bundle = repo.getbundle('debug', **args)
1747 bundle = repo.getbundle('debug', **args)
1748
1748
1749 bundletype = opts.get('type', 'bzip2').lower()
1749 bundletype = opts.get('type', 'bzip2').lower()
1750 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1750 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1751 bundletype = btypes.get(bundletype)
1751 bundletype = btypes.get(bundletype)
1752 if bundletype not in changegroup.bundletypes:
1752 if bundletype not in changegroup.bundletypes:
1753 raise util.Abort(_('unknown bundle type specified with --type'))
1753 raise util.Abort(_('unknown bundle type specified with --type'))
1754 changegroup.writebundle(bundle, bundlepath, bundletype)
1754 changegroup.writebundle(bundle, bundlepath, bundletype)
1755
1755
1756 @command('debugignore', [], '')
1756 @command('debugignore', [], '')
1757 def debugignore(ui, repo, *values, **opts):
1757 def debugignore(ui, repo, *values, **opts):
1758 """display the combined ignore pattern"""
1758 """display the combined ignore pattern"""
1759 ignore = repo.dirstate._ignore
1759 ignore = repo.dirstate._ignore
1760 includepat = getattr(ignore, 'includepat', None)
1760 includepat = getattr(ignore, 'includepat', None)
1761 if includepat is not None:
1761 if includepat is not None:
1762 ui.write("%s\n" % includepat)
1762 ui.write("%s\n" % includepat)
1763 else:
1763 else:
1764 raise util.Abort(_("no ignore patterns found"))
1764 raise util.Abort(_("no ignore patterns found"))
1765
1765
1766 @command('debugindex',
1766 @command('debugindex',
1767 [('c', 'changelog', False, _('open changelog')),
1767 [('c', 'changelog', False, _('open changelog')),
1768 ('m', 'manifest', False, _('open manifest')),
1768 ('m', 'manifest', False, _('open manifest')),
1769 ('f', 'format', 0, _('revlog format'), _('FORMAT'))],
1769 ('f', 'format', 0, _('revlog format'), _('FORMAT'))],
1770 _('[-f FORMAT] -c|-m|FILE'))
1770 _('[-f FORMAT] -c|-m|FILE'))
1771 def debugindex(ui, repo, file_ = None, **opts):
1771 def debugindex(ui, repo, file_ = None, **opts):
1772 """dump the contents of an index file"""
1772 """dump the contents of an index file"""
1773 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
1773 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
1774 format = opts.get('format', 0)
1774 format = opts.get('format', 0)
1775 if format not in (0, 1):
1775 if format not in (0, 1):
1776 raise util.Abort(_("unknown format %d") % format)
1776 raise util.Abort(_("unknown format %d") % format)
1777
1777
1778 generaldelta = r.version & revlog.REVLOGGENERALDELTA
1778 generaldelta = r.version & revlog.REVLOGGENERALDELTA
1779 if generaldelta:
1779 if generaldelta:
1780 basehdr = ' delta'
1780 basehdr = ' delta'
1781 else:
1781 else:
1782 basehdr = ' base'
1782 basehdr = ' base'
1783
1783
1784 if format == 0:
1784 if format == 0:
1785 ui.write(" rev offset length " + basehdr + " linkrev"
1785 ui.write(" rev offset length " + basehdr + " linkrev"
1786 " nodeid p1 p2\n")
1786 " nodeid p1 p2\n")
1787 elif format == 1:
1787 elif format == 1:
1788 ui.write(" rev flag offset length"
1788 ui.write(" rev flag offset length"
1789 " size " + basehdr + " link p1 p2 nodeid\n")
1789 " size " + basehdr + " link p1 p2 nodeid\n")
1790
1790
1791 for i in r:
1791 for i in r:
1792 node = r.node(i)
1792 node = r.node(i)
1793 if generaldelta:
1793 if generaldelta:
1794 base = r.deltaparent(i)
1794 base = r.deltaparent(i)
1795 else:
1795 else:
1796 base = r.chainbase(i)
1796 base = r.chainbase(i)
1797 if format == 0:
1797 if format == 0:
1798 try:
1798 try:
1799 pp = r.parents(node)
1799 pp = r.parents(node)
1800 except:
1800 except:
1801 pp = [nullid, nullid]
1801 pp = [nullid, nullid]
1802 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1802 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1803 i, r.start(i), r.length(i), base, r.linkrev(i),
1803 i, r.start(i), r.length(i), base, r.linkrev(i),
1804 short(node), short(pp[0]), short(pp[1])))
1804 short(node), short(pp[0]), short(pp[1])))
1805 elif format == 1:
1805 elif format == 1:
1806 pr = r.parentrevs(i)
1806 pr = r.parentrevs(i)
1807 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
1807 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
1808 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
1808 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
1809 base, r.linkrev(i), pr[0], pr[1], short(node)))
1809 base, r.linkrev(i), pr[0], pr[1], short(node)))
1810
1810
1811 @command('debugindexdot', [], _('FILE'))
1811 @command('debugindexdot', [], _('FILE'))
1812 def debugindexdot(ui, repo, file_):
1812 def debugindexdot(ui, repo, file_):
1813 """dump an index DAG as a graphviz dot file"""
1813 """dump an index DAG as a graphviz dot file"""
1814 r = None
1814 r = None
1815 if repo:
1815 if repo:
1816 filelog = repo.file(file_)
1816 filelog = repo.file(file_)
1817 if len(filelog):
1817 if len(filelog):
1818 r = filelog
1818 r = filelog
1819 if not r:
1819 if not r:
1820 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1820 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1821 ui.write("digraph G {\n")
1821 ui.write("digraph G {\n")
1822 for i in r:
1822 for i in r:
1823 node = r.node(i)
1823 node = r.node(i)
1824 pp = r.parents(node)
1824 pp = r.parents(node)
1825 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1825 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1826 if pp[1] != nullid:
1826 if pp[1] != nullid:
1827 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1827 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1828 ui.write("}\n")
1828 ui.write("}\n")
1829
1829
1830 @command('debuginstall', [], '')
1830 @command('debuginstall', [], '')
1831 def debuginstall(ui):
1831 def debuginstall(ui):
1832 '''test Mercurial installation
1832 '''test Mercurial installation
1833
1833
1834 Returns 0 on success.
1834 Returns 0 on success.
1835 '''
1835 '''
1836
1836
1837 def writetemp(contents):
1837 def writetemp(contents):
1838 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1838 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1839 f = os.fdopen(fd, "wb")
1839 f = os.fdopen(fd, "wb")
1840 f.write(contents)
1840 f.write(contents)
1841 f.close()
1841 f.close()
1842 return name
1842 return name
1843
1843
1844 problems = 0
1844 problems = 0
1845
1845
1846 # encoding
1846 # encoding
1847 ui.status(_("Checking encoding (%s)...\n") % encoding.encoding)
1847 ui.status(_("Checking encoding (%s)...\n") % encoding.encoding)
1848 try:
1848 try:
1849 encoding.fromlocal("test")
1849 encoding.fromlocal("test")
1850 except util.Abort, inst:
1850 except util.Abort, inst:
1851 ui.write(" %s\n" % inst)
1851 ui.write(" %s\n" % inst)
1852 ui.write(_(" (check that your locale is properly set)\n"))
1852 ui.write(_(" (check that your locale is properly set)\n"))
1853 problems += 1
1853 problems += 1
1854
1854
1855 # compiled modules
1855 # compiled modules
1856 ui.status(_("Checking installed modules (%s)...\n")
1856 ui.status(_("Checking installed modules (%s)...\n")
1857 % os.path.dirname(__file__))
1857 % os.path.dirname(__file__))
1858 try:
1858 try:
1859 import bdiff, mpatch, base85, osutil
1859 import bdiff, mpatch, base85, osutil
1860 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
1860 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
1861 except Exception, inst:
1861 except Exception, inst:
1862 ui.write(" %s\n" % inst)
1862 ui.write(" %s\n" % inst)
1863 ui.write(_(" One or more extensions could not be found"))
1863 ui.write(_(" One or more extensions could not be found"))
1864 ui.write(_(" (check that you compiled the extensions)\n"))
1864 ui.write(_(" (check that you compiled the extensions)\n"))
1865 problems += 1
1865 problems += 1
1866
1866
1867 # templates
1867 # templates
1868 import templater
1868 import templater
1869 p = templater.templatepath()
1869 p = templater.templatepath()
1870 ui.status(_("Checking templates (%s)...\n") % ' '.join(p))
1870 ui.status(_("Checking templates (%s)...\n") % ' '.join(p))
1871 try:
1871 try:
1872 templater.templater(templater.templatepath("map-cmdline.default"))
1872 templater.templater(templater.templatepath("map-cmdline.default"))
1873 except Exception, inst:
1873 except Exception, inst:
1874 ui.write(" %s\n" % inst)
1874 ui.write(" %s\n" % inst)
1875 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
1875 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
1876 problems += 1
1876 problems += 1
1877
1877
1878 # editor
1878 # editor
1879 ui.status(_("Checking commit editor...\n"))
1879 ui.status(_("Checking commit editor...\n"))
1880 editor = ui.geteditor()
1880 editor = ui.geteditor()
1881 cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
1881 cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
1882 if not cmdpath:
1882 if not cmdpath:
1883 if editor == 'vi':
1883 if editor == 'vi':
1884 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
1884 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
1885 ui.write(_(" (specify a commit editor in your configuration"
1885 ui.write(_(" (specify a commit editor in your configuration"
1886 " file)\n"))
1886 " file)\n"))
1887 else:
1887 else:
1888 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
1888 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
1889 ui.write(_(" (specify a commit editor in your configuration"
1889 ui.write(_(" (specify a commit editor in your configuration"
1890 " file)\n"))
1890 " file)\n"))
1891 problems += 1
1891 problems += 1
1892
1892
1893 # check username
1893 # check username
1894 ui.status(_("Checking username...\n"))
1894 ui.status(_("Checking username...\n"))
1895 try:
1895 try:
1896 ui.username()
1896 ui.username()
1897 except util.Abort, e:
1897 except util.Abort, e:
1898 ui.write(" %s\n" % e)
1898 ui.write(" %s\n" % e)
1899 ui.write(_(" (specify a username in your configuration file)\n"))
1899 ui.write(_(" (specify a username in your configuration file)\n"))
1900 problems += 1
1900 problems += 1
1901
1901
1902 if not problems:
1902 if not problems:
1903 ui.status(_("No problems detected\n"))
1903 ui.status(_("No problems detected\n"))
1904 else:
1904 else:
1905 ui.write(_("%s problems detected,"
1905 ui.write(_("%s problems detected,"
1906 " please check your install!\n") % problems)
1906 " please check your install!\n") % problems)
1907
1907
1908 return problems
1908 return problems
1909
1909
1910 @command('debugknown', [], _('REPO ID...'))
1910 @command('debugknown', [], _('REPO ID...'))
1911 def debugknown(ui, repopath, *ids, **opts):
1911 def debugknown(ui, repopath, *ids, **opts):
1912 """test whether node ids are known to a repo
1912 """test whether node ids are known to a repo
1913
1913
1914 Every ID must be a full-length hex node id string. Returns a list of 0s and 1s
1914 Every ID must be a full-length hex node id string. Returns a list of 0s and 1s
1915 indicating unknown/known.
1915 indicating unknown/known.
1916 """
1916 """
1917 repo = hg.peer(ui, opts, repopath)
1917 repo = hg.peer(ui, opts, repopath)
1918 if not repo.capable('known'):
1918 if not repo.capable('known'):
1919 raise util.Abort("known() not supported by target repository")
1919 raise util.Abort("known() not supported by target repository")
1920 flags = repo.known([bin(s) for s in ids])
1920 flags = repo.known([bin(s) for s in ids])
1921 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
1921 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
1922
1922
1923 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'))
1923 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'))
1924 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
1924 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
1925 '''access the pushkey key/value protocol
1925 '''access the pushkey key/value protocol
1926
1926
1927 With two args, list the keys in the given namespace.
1927 With two args, list the keys in the given namespace.
1928
1928
1929 With five args, set a key to new if it currently is set to old.
1929 With five args, set a key to new if it currently is set to old.
1930 Reports success or failure.
1930 Reports success or failure.
1931 '''
1931 '''
1932
1932
1933 target = hg.peer(ui, {}, repopath)
1933 target = hg.peer(ui, {}, repopath)
1934 if keyinfo:
1934 if keyinfo:
1935 key, old, new = keyinfo
1935 key, old, new = keyinfo
1936 r = target.pushkey(namespace, key, old, new)
1936 r = target.pushkey(namespace, key, old, new)
1937 ui.status(str(r) + '\n')
1937 ui.status(str(r) + '\n')
1938 return not r
1938 return not r
1939 else:
1939 else:
1940 for k, v in target.listkeys(namespace).iteritems():
1940 for k, v in target.listkeys(namespace).iteritems():
1941 ui.write("%s\t%s\n" % (k.encode('string-escape'),
1941 ui.write("%s\t%s\n" % (k.encode('string-escape'),
1942 v.encode('string-escape')))
1942 v.encode('string-escape')))
1943
1943
1944 @command('debugrebuildstate',
1944 @command('debugrebuildstate',
1945 [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
1945 [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
1946 _('[-r REV] [REV]'))
1946 _('[-r REV] [REV]'))
1947 def debugrebuildstate(ui, repo, rev="tip"):
1947 def debugrebuildstate(ui, repo, rev="tip"):
1948 """rebuild the dirstate as it would look like for the given revision"""
1948 """rebuild the dirstate as it would look like for the given revision"""
1949 ctx = scmutil.revsingle(repo, rev)
1949 ctx = scmutil.revsingle(repo, rev)
1950 wlock = repo.wlock()
1950 wlock = repo.wlock()
1951 try:
1951 try:
1952 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
1952 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
1953 finally:
1953 finally:
1954 wlock.release()
1954 wlock.release()
1955
1955
1956 @command('debugrename',
1956 @command('debugrename',
1957 [('r', 'rev', '', _('revision to debug'), _('REV'))],
1957 [('r', 'rev', '', _('revision to debug'), _('REV'))],
1958 _('[-r REV] FILE'))
1958 _('[-r REV] FILE'))
1959 def debugrename(ui, repo, file1, *pats, **opts):
1959 def debugrename(ui, repo, file1, *pats, **opts):
1960 """dump rename information"""
1960 """dump rename information"""
1961
1961
1962 ctx = scmutil.revsingle(repo, opts.get('rev'))
1962 ctx = scmutil.revsingle(repo, opts.get('rev'))
1963 m = scmutil.match(ctx, (file1,) + pats, opts)
1963 m = scmutil.match(ctx, (file1,) + pats, opts)
1964 for abs in ctx.walk(m):
1964 for abs in ctx.walk(m):
1965 fctx = ctx[abs]
1965 fctx = ctx[abs]
1966 o = fctx.filelog().renamed(fctx.filenode())
1966 o = fctx.filelog().renamed(fctx.filenode())
1967 rel = m.rel(abs)
1967 rel = m.rel(abs)
1968 if o:
1968 if o:
1969 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
1969 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
1970 else:
1970 else:
1971 ui.write(_("%s not renamed\n") % rel)
1971 ui.write(_("%s not renamed\n") % rel)
1972
1972
1973 @command('debugrevlog',
1973 @command('debugrevlog',
1974 [('c', 'changelog', False, _('open changelog')),
1974 [('c', 'changelog', False, _('open changelog')),
1975 ('m', 'manifest', False, _('open manifest')),
1975 ('m', 'manifest', False, _('open manifest')),
1976 ('d', 'dump', False, _('dump index data'))],
1976 ('d', 'dump', False, _('dump index data'))],
1977 _('-c|-m|FILE'))
1977 _('-c|-m|FILE'))
1978 def debugrevlog(ui, repo, file_ = None, **opts):
1978 def debugrevlog(ui, repo, file_ = None, **opts):
1979 """show data and statistics about a revlog"""
1979 """show data and statistics about a revlog"""
1980 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
1980 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
1981
1981
1982 if opts.get("dump"):
1982 if opts.get("dump"):
1983 numrevs = len(r)
1983 numrevs = len(r)
1984 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
1984 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
1985 " rawsize totalsize compression heads\n")
1985 " rawsize totalsize compression heads\n")
1986 ts = 0
1986 ts = 0
1987 heads = set()
1987 heads = set()
1988 for rev in xrange(numrevs):
1988 for rev in xrange(numrevs):
1989 dbase = r.deltaparent(rev)
1989 dbase = r.deltaparent(rev)
1990 if dbase == -1:
1990 if dbase == -1:
1991 dbase = rev
1991 dbase = rev
1992 cbase = r.chainbase(rev)
1992 cbase = r.chainbase(rev)
1993 p1, p2 = r.parentrevs(rev)
1993 p1, p2 = r.parentrevs(rev)
1994 rs = r.rawsize(rev)
1994 rs = r.rawsize(rev)
1995 ts = ts + rs
1995 ts = ts + rs
1996 heads -= set(r.parentrevs(rev))
1996 heads -= set(r.parentrevs(rev))
1997 heads.add(rev)
1997 heads.add(rev)
1998 ui.write("%d %d %d %d %d %d %d %d %d %d %d %d %d\n" %
1998 ui.write("%d %d %d %d %d %d %d %d %d %d %d %d %d\n" %
1999 (rev, p1, p2, r.start(rev), r.end(rev),
1999 (rev, p1, p2, r.start(rev), r.end(rev),
2000 r.start(dbase), r.start(cbase),
2000 r.start(dbase), r.start(cbase),
2001 r.start(p1), r.start(p2),
2001 r.start(p1), r.start(p2),
2002 rs, ts, ts / r.end(rev), len(heads)))
2002 rs, ts, ts / r.end(rev), len(heads)))
2003 return 0
2003 return 0
2004
2004
2005 v = r.version
2005 v = r.version
2006 format = v & 0xFFFF
2006 format = v & 0xFFFF
2007 flags = []
2007 flags = []
2008 gdelta = False
2008 gdelta = False
2009 if v & revlog.REVLOGNGINLINEDATA:
2009 if v & revlog.REVLOGNGINLINEDATA:
2010 flags.append('inline')
2010 flags.append('inline')
2011 if v & revlog.REVLOGGENERALDELTA:
2011 if v & revlog.REVLOGGENERALDELTA:
2012 gdelta = True
2012 gdelta = True
2013 flags.append('generaldelta')
2013 flags.append('generaldelta')
2014 if not flags:
2014 if not flags:
2015 flags = ['(none)']
2015 flags = ['(none)']
2016
2016
2017 nummerges = 0
2017 nummerges = 0
2018 numfull = 0
2018 numfull = 0
2019 numprev = 0
2019 numprev = 0
2020 nump1 = 0
2020 nump1 = 0
2021 nump2 = 0
2021 nump2 = 0
2022 numother = 0
2022 numother = 0
2023 nump1prev = 0
2023 nump1prev = 0
2024 nump2prev = 0
2024 nump2prev = 0
2025 chainlengths = []
2025 chainlengths = []
2026
2026
2027 datasize = [None, 0, 0L]
2027 datasize = [None, 0, 0L]
2028 fullsize = [None, 0, 0L]
2028 fullsize = [None, 0, 0L]
2029 deltasize = [None, 0, 0L]
2029 deltasize = [None, 0, 0L]
2030
2030
2031 def addsize(size, l):
2031 def addsize(size, l):
2032 if l[0] is None or size < l[0]:
2032 if l[0] is None or size < l[0]:
2033 l[0] = size
2033 l[0] = size
2034 if size > l[1]:
2034 if size > l[1]:
2035 l[1] = size
2035 l[1] = size
2036 l[2] += size
2036 l[2] += size
2037
2037
2038 numrevs = len(r)
2038 numrevs = len(r)
2039 for rev in xrange(numrevs):
2039 for rev in xrange(numrevs):
2040 p1, p2 = r.parentrevs(rev)
2040 p1, p2 = r.parentrevs(rev)
2041 delta = r.deltaparent(rev)
2041 delta = r.deltaparent(rev)
2042 if format > 0:
2042 if format > 0:
2043 addsize(r.rawsize(rev), datasize)
2043 addsize(r.rawsize(rev), datasize)
2044 if p2 != nullrev:
2044 if p2 != nullrev:
2045 nummerges += 1
2045 nummerges += 1
2046 size = r.length(rev)
2046 size = r.length(rev)
2047 if delta == nullrev:
2047 if delta == nullrev:
2048 chainlengths.append(0)
2048 chainlengths.append(0)
2049 numfull += 1
2049 numfull += 1
2050 addsize(size, fullsize)
2050 addsize(size, fullsize)
2051 else:
2051 else:
2052 chainlengths.append(chainlengths[delta] + 1)
2052 chainlengths.append(chainlengths[delta] + 1)
2053 addsize(size, deltasize)
2053 addsize(size, deltasize)
2054 if delta == rev - 1:
2054 if delta == rev - 1:
2055 numprev += 1
2055 numprev += 1
2056 if delta == p1:
2056 if delta == p1:
2057 nump1prev += 1
2057 nump1prev += 1
2058 elif delta == p2:
2058 elif delta == p2:
2059 nump2prev += 1
2059 nump2prev += 1
2060 elif delta == p1:
2060 elif delta == p1:
2061 nump1 += 1
2061 nump1 += 1
2062 elif delta == p2:
2062 elif delta == p2:
2063 nump2 += 1
2063 nump2 += 1
2064 elif delta != nullrev:
2064 elif delta != nullrev:
2065 numother += 1
2065 numother += 1
2066
2066
2067 numdeltas = numrevs - numfull
2067 numdeltas = numrevs - numfull
2068 numoprev = numprev - nump1prev - nump2prev
2068 numoprev = numprev - nump1prev - nump2prev
2069 totalrawsize = datasize[2]
2069 totalrawsize = datasize[2]
2070 datasize[2] /= numrevs
2070 datasize[2] /= numrevs
2071 fulltotal = fullsize[2]
2071 fulltotal = fullsize[2]
2072 fullsize[2] /= numfull
2072 fullsize[2] /= numfull
2073 deltatotal = deltasize[2]
2073 deltatotal = deltasize[2]
2074 deltasize[2] /= numrevs - numfull
2074 deltasize[2] /= numrevs - numfull
2075 totalsize = fulltotal + deltatotal
2075 totalsize = fulltotal + deltatotal
2076 avgchainlen = sum(chainlengths) / numrevs
2076 avgchainlen = sum(chainlengths) / numrevs
2077 compratio = totalrawsize / totalsize
2077 compratio = totalrawsize / totalsize
2078
2078
2079 basedfmtstr = '%%%dd\n'
2079 basedfmtstr = '%%%dd\n'
2080 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2080 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2081
2081
2082 def dfmtstr(max):
2082 def dfmtstr(max):
2083 return basedfmtstr % len(str(max))
2083 return basedfmtstr % len(str(max))
2084 def pcfmtstr(max, padding=0):
2084 def pcfmtstr(max, padding=0):
2085 return basepcfmtstr % (len(str(max)), ' ' * padding)
2085 return basepcfmtstr % (len(str(max)), ' ' * padding)
2086
2086
2087 def pcfmt(value, total):
2087 def pcfmt(value, total):
2088 return (value, 100 * float(value) / total)
2088 return (value, 100 * float(value) / total)
2089
2089
2090 ui.write('format : %d\n' % format)
2090 ui.write('format : %d\n' % format)
2091 ui.write('flags : %s\n' % ', '.join(flags))
2091 ui.write('flags : %s\n' % ', '.join(flags))
2092
2092
2093 ui.write('\n')
2093 ui.write('\n')
2094 fmt = pcfmtstr(totalsize)
2094 fmt = pcfmtstr(totalsize)
2095 fmt2 = dfmtstr(totalsize)
2095 fmt2 = dfmtstr(totalsize)
2096 ui.write('revisions : ' + fmt2 % numrevs)
2096 ui.write('revisions : ' + fmt2 % numrevs)
2097 ui.write(' merges : ' + fmt % pcfmt(nummerges, numrevs))
2097 ui.write(' merges : ' + fmt % pcfmt(nummerges, numrevs))
2098 ui.write(' normal : ' + fmt % pcfmt(numrevs - nummerges, numrevs))
2098 ui.write(' normal : ' + fmt % pcfmt(numrevs - nummerges, numrevs))
2099 ui.write('revisions : ' + fmt2 % numrevs)
2099 ui.write('revisions : ' + fmt2 % numrevs)
2100 ui.write(' full : ' + fmt % pcfmt(numfull, numrevs))
2100 ui.write(' full : ' + fmt % pcfmt(numfull, numrevs))
2101 ui.write(' deltas : ' + fmt % pcfmt(numdeltas, numrevs))
2101 ui.write(' deltas : ' + fmt % pcfmt(numdeltas, numrevs))
2102 ui.write('revision size : ' + fmt2 % totalsize)
2102 ui.write('revision size : ' + fmt2 % totalsize)
2103 ui.write(' full : ' + fmt % pcfmt(fulltotal, totalsize))
2103 ui.write(' full : ' + fmt % pcfmt(fulltotal, totalsize))
2104 ui.write(' deltas : ' + fmt % pcfmt(deltatotal, totalsize))
2104 ui.write(' deltas : ' + fmt % pcfmt(deltatotal, totalsize))
2105
2105
2106 ui.write('\n')
2106 ui.write('\n')
2107 fmt = dfmtstr(max(avgchainlen, compratio))
2107 fmt = dfmtstr(max(avgchainlen, compratio))
2108 ui.write('avg chain length : ' + fmt % avgchainlen)
2108 ui.write('avg chain length : ' + fmt % avgchainlen)
2109 ui.write('compression ratio : ' + fmt % compratio)
2109 ui.write('compression ratio : ' + fmt % compratio)
2110
2110
2111 if format > 0:
2111 if format > 0:
2112 ui.write('\n')
2112 ui.write('\n')
2113 ui.write('uncompressed data size (min/max/avg) : %d / %d / %d\n'
2113 ui.write('uncompressed data size (min/max/avg) : %d / %d / %d\n'
2114 % tuple(datasize))
2114 % tuple(datasize))
2115 ui.write('full revision size (min/max/avg) : %d / %d / %d\n'
2115 ui.write('full revision size (min/max/avg) : %d / %d / %d\n'
2116 % tuple(fullsize))
2116 % tuple(fullsize))
2117 ui.write('delta size (min/max/avg) : %d / %d / %d\n'
2117 ui.write('delta size (min/max/avg) : %d / %d / %d\n'
2118 % tuple(deltasize))
2118 % tuple(deltasize))
2119
2119
2120 if numdeltas > 0:
2120 if numdeltas > 0:
2121 ui.write('\n')
2121 ui.write('\n')
2122 fmt = pcfmtstr(numdeltas)
2122 fmt = pcfmtstr(numdeltas)
2123 fmt2 = pcfmtstr(numdeltas, 4)
2123 fmt2 = pcfmtstr(numdeltas, 4)
2124 ui.write('deltas against prev : ' + fmt % pcfmt(numprev, numdeltas))
2124 ui.write('deltas against prev : ' + fmt % pcfmt(numprev, numdeltas))
2125 if numprev > 0:
2125 if numprev > 0:
2126 ui.write(' where prev = p1 : ' + fmt2 % pcfmt(nump1prev, numprev))
2126 ui.write(' where prev = p1 : ' + fmt2 % pcfmt(nump1prev, numprev))
2127 ui.write(' where prev = p2 : ' + fmt2 % pcfmt(nump2prev, numprev))
2127 ui.write(' where prev = p2 : ' + fmt2 % pcfmt(nump2prev, numprev))
2128 ui.write(' other : ' + fmt2 % pcfmt(numoprev, numprev))
2128 ui.write(' other : ' + fmt2 % pcfmt(numoprev, numprev))
2129 if gdelta:
2129 if gdelta:
2130 ui.write('deltas against p1 : ' + fmt % pcfmt(nump1, numdeltas))
2130 ui.write('deltas against p1 : ' + fmt % pcfmt(nump1, numdeltas))
2131 ui.write('deltas against p2 : ' + fmt % pcfmt(nump2, numdeltas))
2131 ui.write('deltas against p2 : ' + fmt % pcfmt(nump2, numdeltas))
2132 ui.write('deltas against other : ' + fmt % pcfmt(numother, numdeltas))
2132 ui.write('deltas against other : ' + fmt % pcfmt(numother, numdeltas))
2133
2133
2134 @command('debugrevspec', [], ('REVSPEC'))
2134 @command('debugrevspec', [], ('REVSPEC'))
2135 def debugrevspec(ui, repo, expr):
2135 def debugrevspec(ui, repo, expr):
2136 '''parse and apply a revision specification'''
2136 '''parse and apply a revision specification'''
2137 if ui.verbose:
2137 if ui.verbose:
2138 tree = revset.parse(expr)[0]
2138 tree = revset.parse(expr)[0]
2139 ui.note(tree, "\n")
2139 ui.note(tree, "\n")
2140 newtree = revset.findaliases(ui, tree)
2140 newtree = revset.findaliases(ui, tree)
2141 if newtree != tree:
2141 if newtree != tree:
2142 ui.note(newtree, "\n")
2142 ui.note(newtree, "\n")
2143 func = revset.match(ui, expr)
2143 func = revset.match(ui, expr)
2144 for c in func(repo, range(len(repo))):
2144 for c in func(repo, range(len(repo))):
2145 ui.write("%s\n" % c)
2145 ui.write("%s\n" % c)
2146
2146
2147 @command('debugsetparents', [], _('REV1 [REV2]'))
2147 @command('debugsetparents', [], _('REV1 [REV2]'))
2148 def debugsetparents(ui, repo, rev1, rev2=None):
2148 def debugsetparents(ui, repo, rev1, rev2=None):
2149 """manually set the parents of the current working directory
2149 """manually set the parents of the current working directory
2150
2150
2151 This is useful for writing repository conversion tools, but should
2151 This is useful for writing repository conversion tools, but should
2152 be used with care.
2152 be used with care.
2153
2153
2154 Returns 0 on success.
2154 Returns 0 on success.
2155 """
2155 """
2156
2156
2157 r1 = scmutil.revsingle(repo, rev1).node()
2157 r1 = scmutil.revsingle(repo, rev1).node()
2158 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2158 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2159
2159
2160 wlock = repo.wlock()
2160 wlock = repo.wlock()
2161 try:
2161 try:
2162 repo.dirstate.setparents(r1, r2)
2162 repo.dirstate.setparents(r1, r2)
2163 finally:
2163 finally:
2164 wlock.release()
2164 wlock.release()
2165
2165
2166 @command('debugstate',
2166 @command('debugstate',
2167 [('', 'nodates', None, _('do not display the saved mtime')),
2167 [('', 'nodates', None, _('do not display the saved mtime')),
2168 ('', 'datesort', None, _('sort by saved mtime'))],
2168 ('', 'datesort', None, _('sort by saved mtime'))],
2169 _('[OPTION]...'))
2169 _('[OPTION]...'))
2170 def debugstate(ui, repo, nodates=None, datesort=None):
2170 def debugstate(ui, repo, nodates=None, datesort=None):
2171 """show the contents of the current dirstate"""
2171 """show the contents of the current dirstate"""
2172 timestr = ""
2172 timestr = ""
2173 showdate = not nodates
2173 showdate = not nodates
2174 if datesort:
2174 if datesort:
2175 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2175 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2176 else:
2176 else:
2177 keyfunc = None # sort by filename
2177 keyfunc = None # sort by filename
2178 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2178 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2179 if showdate:
2179 if showdate:
2180 if ent[3] == -1:
2180 if ent[3] == -1:
2181 # Pad or slice to locale representation
2181 # Pad or slice to locale representation
2182 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
2182 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
2183 time.localtime(0)))
2183 time.localtime(0)))
2184 timestr = 'unset'
2184 timestr = 'unset'
2185 timestr = (timestr[:locale_len] +
2185 timestr = (timestr[:locale_len] +
2186 ' ' * (locale_len - len(timestr)))
2186 ' ' * (locale_len - len(timestr)))
2187 else:
2187 else:
2188 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2188 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2189 time.localtime(ent[3]))
2189 time.localtime(ent[3]))
2190 if ent[1] & 020000:
2190 if ent[1] & 020000:
2191 mode = 'lnk'
2191 mode = 'lnk'
2192 else:
2192 else:
2193 mode = '%3o' % (ent[1] & 0777 & ~util.umask)
2193 mode = '%3o' % (ent[1] & 0777 & ~util.umask)
2194 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2194 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2195 for f in repo.dirstate.copies():
2195 for f in repo.dirstate.copies():
2196 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2196 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2197
2197
2198 @command('debugsub',
2198 @command('debugsub',
2199 [('r', 'rev', '',
2199 [('r', 'rev', '',
2200 _('revision to check'), _('REV'))],
2200 _('revision to check'), _('REV'))],
2201 _('[-r REV] [REV]'))
2201 _('[-r REV] [REV]'))
2202 def debugsub(ui, repo, rev=None):
2202 def debugsub(ui, repo, rev=None):
2203 ctx = scmutil.revsingle(repo, rev, None)
2203 ctx = scmutil.revsingle(repo, rev, None)
2204 for k, v in sorted(ctx.substate.items()):
2204 for k, v in sorted(ctx.substate.items()):
2205 ui.write('path %s\n' % k)
2205 ui.write('path %s\n' % k)
2206 ui.write(' source %s\n' % v[0])
2206 ui.write(' source %s\n' % v[0])
2207 ui.write(' revision %s\n' % v[1])
2207 ui.write(' revision %s\n' % v[1])
2208
2208
2209 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'))
2209 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'))
2210 def debugwalk(ui, repo, *pats, **opts):
2210 def debugwalk(ui, repo, *pats, **opts):
2211 """show how files match on given patterns"""
2211 """show how files match on given patterns"""
2212 m = scmutil.match(repo[None], pats, opts)
2212 m = scmutil.match(repo[None], pats, opts)
2213 items = list(repo.walk(m))
2213 items = list(repo.walk(m))
2214 if not items:
2214 if not items:
2215 return
2215 return
2216 fmt = 'f %%-%ds %%-%ds %%s' % (
2216 fmt = 'f %%-%ds %%-%ds %%s' % (
2217 max([len(abs) for abs in items]),
2217 max([len(abs) for abs in items]),
2218 max([len(m.rel(abs)) for abs in items]))
2218 max([len(m.rel(abs)) for abs in items]))
2219 for abs in items:
2219 for abs in items:
2220 line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '')
2220 line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '')
2221 ui.write("%s\n" % line.rstrip())
2221 ui.write("%s\n" % line.rstrip())
2222
2222
2223 @command('debugwireargs',
2223 @command('debugwireargs',
2224 [('', 'three', '', 'three'),
2224 [('', 'three', '', 'three'),
2225 ('', 'four', '', 'four'),
2225 ('', 'four', '', 'four'),
2226 ('', 'five', '', 'five'),
2226 ('', 'five', '', 'five'),
2227 ] + remoteopts,
2227 ] + remoteopts,
2228 _('REPO [OPTIONS]... [ONE [TWO]]'))
2228 _('REPO [OPTIONS]... [ONE [TWO]]'))
2229 def debugwireargs(ui, repopath, *vals, **opts):
2229 def debugwireargs(ui, repopath, *vals, **opts):
2230 repo = hg.peer(ui, opts, repopath)
2230 repo = hg.peer(ui, opts, repopath)
2231 for opt in remoteopts:
2231 for opt in remoteopts:
2232 del opts[opt[1]]
2232 del opts[opt[1]]
2233 args = {}
2233 args = {}
2234 for k, v in opts.iteritems():
2234 for k, v in opts.iteritems():
2235 if v:
2235 if v:
2236 args[k] = v
2236 args[k] = v
2237 # run twice to check that we don't mess up the stream for the next command
2237 # run twice to check that we don't mess up the stream for the next command
2238 res1 = repo.debugwireargs(*vals, **args)
2238 res1 = repo.debugwireargs(*vals, **args)
2239 res2 = repo.debugwireargs(*vals, **args)
2239 res2 = repo.debugwireargs(*vals, **args)
2240 ui.write("%s\n" % res1)
2240 ui.write("%s\n" % res1)
2241 if res1 != res2:
2241 if res1 != res2:
2242 ui.warn("%s\n" % res2)
2242 ui.warn("%s\n" % res2)
2243
2243
2244 @command('^diff',
2244 @command('^diff',
2245 [('r', 'rev', [], _('revision'), _('REV')),
2245 [('r', 'rev', [], _('revision'), _('REV')),
2246 ('c', 'change', '', _('change made by revision'), _('REV'))
2246 ('c', 'change', '', _('change made by revision'), _('REV'))
2247 ] + diffopts + diffopts2 + walkopts + subrepoopts,
2247 ] + diffopts + diffopts2 + walkopts + subrepoopts,
2248 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'))
2248 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'))
2249 def diff(ui, repo, *pats, **opts):
2249 def diff(ui, repo, *pats, **opts):
2250 """diff repository (or selected files)
2250 """diff repository (or selected files)
2251
2251
2252 Show differences between revisions for the specified files.
2252 Show differences between revisions for the specified files.
2253
2253
2254 Differences between files are shown using the unified diff format.
2254 Differences between files are shown using the unified diff format.
2255
2255
2256 .. note::
2256 .. note::
2257 diff may generate unexpected results for merges, as it will
2257 diff may generate unexpected results for merges, as it will
2258 default to comparing against the working directory's first
2258 default to comparing against the working directory's first
2259 parent changeset if no revisions are specified.
2259 parent changeset if no revisions are specified.
2260
2260
2261 When two revision arguments are given, then changes are shown
2261 When two revision arguments are given, then changes are shown
2262 between those revisions. If only one revision is specified then
2262 between those revisions. If only one revision is specified then
2263 that revision is compared to the working directory, and, when no
2263 that revision is compared to the working directory, and, when no
2264 revisions are specified, the working directory files are compared
2264 revisions are specified, the working directory files are compared
2265 to its parent.
2265 to its parent.
2266
2266
2267 Alternatively you can specify -c/--change with a revision to see
2267 Alternatively you can specify -c/--change with a revision to see
2268 the changes in that changeset relative to its first parent.
2268 the changes in that changeset relative to its first parent.
2269
2269
2270 Without the -a/--text option, diff will avoid generating diffs of
2270 Without the -a/--text option, diff will avoid generating diffs of
2271 files it detects as binary. With -a, diff will generate a diff
2271 files it detects as binary. With -a, diff will generate a diff
2272 anyway, probably with undesirable results.
2272 anyway, probably with undesirable results.
2273
2273
2274 Use the -g/--git option to generate diffs in the git extended diff
2274 Use the -g/--git option to generate diffs in the git extended diff
2275 format. For more information, read :hg:`help diffs`.
2275 format. For more information, read :hg:`help diffs`.
2276
2276
2277 .. container:: verbose
2277 .. container:: verbose
2278
2278
2279 Examples:
2279 Examples:
2280
2280
2281 - compare a file in the current working directory to its parent::
2281 - compare a file in the current working directory to its parent::
2282
2282
2283 hg diff foo.c
2283 hg diff foo.c
2284
2284
2285 - compare two historical versions of a directory, with rename info::
2285 - compare two historical versions of a directory, with rename info::
2286
2286
2287 hg diff --git -r 1.0:1.2 lib/
2287 hg diff --git -r 1.0:1.2 lib/
2288
2288
2289 - get change stats relative to the last change on some date::
2289 - get change stats relative to the last change on some date::
2290
2290
2291 hg diff --stat -r "date('may 2')"
2291 hg diff --stat -r "date('may 2')"
2292
2292
2293 - diff all newly-added files that contain a keyword::
2293 - diff all newly-added files that contain a keyword::
2294
2294
2295 hg diff "set:added() and grep(GNU)"
2295 hg diff "set:added() and grep(GNU)"
2296
2296
2297 - compare a revision and its parents::
2297 - compare a revision and its parents::
2298
2298
2299 hg diff -c 9353 # compare against first parent
2299 hg diff -c 9353 # compare against first parent
2300 hg diff -r 9353^:9353 # same using revset syntax
2300 hg diff -r 9353^:9353 # same using revset syntax
2301 hg diff -r 9353^2:9353 # compare against the second parent
2301 hg diff -r 9353^2:9353 # compare against the second parent
2302
2302
2303 Returns 0 on success.
2303 Returns 0 on success.
2304 """
2304 """
2305
2305
2306 revs = opts.get('rev')
2306 revs = opts.get('rev')
2307 change = opts.get('change')
2307 change = opts.get('change')
2308 stat = opts.get('stat')
2308 stat = opts.get('stat')
2309 reverse = opts.get('reverse')
2309 reverse = opts.get('reverse')
2310
2310
2311 if revs and change:
2311 if revs and change:
2312 msg = _('cannot specify --rev and --change at the same time')
2312 msg = _('cannot specify --rev and --change at the same time')
2313 raise util.Abort(msg)
2313 raise util.Abort(msg)
2314 elif change:
2314 elif change:
2315 node2 = scmutil.revsingle(repo, change, None).node()
2315 node2 = scmutil.revsingle(repo, change, None).node()
2316 node1 = repo[node2].p1().node()
2316 node1 = repo[node2].p1().node()
2317 else:
2317 else:
2318 node1, node2 = scmutil.revpair(repo, revs)
2318 node1, node2 = scmutil.revpair(repo, revs)
2319
2319
2320 if reverse:
2320 if reverse:
2321 node1, node2 = node2, node1
2321 node1, node2 = node2, node1
2322
2322
2323 diffopts = patch.diffopts(ui, opts)
2323 diffopts = patch.diffopts(ui, opts)
2324 m = scmutil.match(repo[node2], pats, opts)
2324 m = scmutil.match(repo[node2], pats, opts)
2325 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
2325 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
2326 listsubrepos=opts.get('subrepos'))
2326 listsubrepos=opts.get('subrepos'))
2327
2327
2328 @command('^export',
2328 @command('^export',
2329 [('o', 'output', '',
2329 [('o', 'output', '',
2330 _('print output to file with formatted name'), _('FORMAT')),
2330 _('print output to file with formatted name'), _('FORMAT')),
2331 ('', 'switch-parent', None, _('diff against the second parent')),
2331 ('', 'switch-parent', None, _('diff against the second parent')),
2332 ('r', 'rev', [], _('revisions to export'), _('REV')),
2332 ('r', 'rev', [], _('revisions to export'), _('REV')),
2333 ] + diffopts,
2333 ] + diffopts,
2334 _('[OPTION]... [-o OUTFILESPEC] REV...'))
2334 _('[OPTION]... [-o OUTFILESPEC] REV...'))
2335 def export(ui, repo, *changesets, **opts):
2335 def export(ui, repo, *changesets, **opts):
2336 """dump the header and diffs for one or more changesets
2336 """dump the header and diffs for one or more changesets
2337
2337
2338 Print the changeset header and diffs for one or more revisions.
2338 Print the changeset header and diffs for one or more revisions.
2339
2339
2340 The information shown in the changeset header is: author, date,
2340 The information shown in the changeset header is: author, date,
2341 branch name (if non-default), changeset hash, parent(s) and commit
2341 branch name (if non-default), changeset hash, parent(s) and commit
2342 comment.
2342 comment.
2343
2343
2344 .. note::
2344 .. note::
2345 export may generate unexpected diff output for merge
2345 export may generate unexpected diff output for merge
2346 changesets, as it will compare the merge changeset against its
2346 changesets, as it will compare the merge changeset against its
2347 first parent only.
2347 first parent only.
2348
2348
2349 Output may be to a file, in which case the name of the file is
2349 Output may be to a file, in which case the name of the file is
2350 given using a format string. The formatting rules are as follows:
2350 given using a format string. The formatting rules are as follows:
2351
2351
2352 :``%%``: literal "%" character
2352 :``%%``: literal "%" character
2353 :``%H``: changeset hash (40 hexadecimal digits)
2353 :``%H``: changeset hash (40 hexadecimal digits)
2354 :``%N``: number of patches being generated
2354 :``%N``: number of patches being generated
2355 :``%R``: changeset revision number
2355 :``%R``: changeset revision number
2356 :``%b``: basename of the exporting repository
2356 :``%b``: basename of the exporting repository
2357 :``%h``: short-form changeset hash (12 hexadecimal digits)
2357 :``%h``: short-form changeset hash (12 hexadecimal digits)
2358 :``%m``: first line of the commit message (only alphanumeric characters)
2358 :``%m``: first line of the commit message (only alphanumeric characters)
2359 :``%n``: zero-padded sequence number, starting at 1
2359 :``%n``: zero-padded sequence number, starting at 1
2360 :``%r``: zero-padded changeset revision number
2360 :``%r``: zero-padded changeset revision number
2361
2361
2362 Without the -a/--text option, export will avoid generating diffs
2362 Without the -a/--text option, export will avoid generating diffs
2363 of files it detects as binary. With -a, export will generate a
2363 of files it detects as binary. With -a, export will generate a
2364 diff anyway, probably with undesirable results.
2364 diff anyway, probably with undesirable results.
2365
2365
2366 Use the -g/--git option to generate diffs in the git extended diff
2366 Use the -g/--git option to generate diffs in the git extended diff
2367 format. See :hg:`help diffs` for more information.
2367 format. See :hg:`help diffs` for more information.
2368
2368
2369 With the --switch-parent option, the diff will be against the
2369 With the --switch-parent option, the diff will be against the
2370 second parent. It can be useful to review a merge.
2370 second parent. It can be useful to review a merge.
2371
2371
2372 .. container:: verbose
2372 .. container:: verbose
2373
2373
2374 Examples:
2374 Examples:
2375
2375
2376 - use export and import to transplant a bugfix to the current
2376 - use export and import to transplant a bugfix to the current
2377 branch::
2377 branch::
2378
2378
2379 hg export -r 9353 | hg import -
2379 hg export -r 9353 | hg import -
2380
2380
2381 - export all the changesets between two revisions to a file with
2381 - export all the changesets between two revisions to a file with
2382 rename information::
2382 rename information::
2383
2383
2384 hg export --git -r 123:150 > changes.txt
2384 hg export --git -r 123:150 > changes.txt
2385
2385
2386 - split outgoing changes into a series of patches with
2386 - split outgoing changes into a series of patches with
2387 descriptive names::
2387 descriptive names::
2388
2388
2389 hg export -r "outgoing()" -o "%n-%m.patch"
2389 hg export -r "outgoing()" -o "%n-%m.patch"
2390
2390
2391 Returns 0 on success.
2391 Returns 0 on success.
2392 """
2392 """
2393 changesets += tuple(opts.get('rev', []))
2393 changesets += tuple(opts.get('rev', []))
2394 if not changesets:
2394 if not changesets:
2395 raise util.Abort(_("export requires at least one changeset"))
2395 raise util.Abort(_("export requires at least one changeset"))
2396 revs = scmutil.revrange(repo, changesets)
2396 revs = scmutil.revrange(repo, changesets)
2397 if len(revs) > 1:
2397 if len(revs) > 1:
2398 ui.note(_('exporting patches:\n'))
2398 ui.note(_('exporting patches:\n'))
2399 else:
2399 else:
2400 ui.note(_('exporting patch:\n'))
2400 ui.note(_('exporting patch:\n'))
2401 cmdutil.export(repo, revs, template=opts.get('output'),
2401 cmdutil.export(repo, revs, template=opts.get('output'),
2402 switch_parent=opts.get('switch_parent'),
2402 switch_parent=opts.get('switch_parent'),
2403 opts=patch.diffopts(ui, opts))
2403 opts=patch.diffopts(ui, opts))
2404
2404
2405 @command('^forget', walkopts, _('[OPTION]... FILE...'))
2405 @command('^forget', walkopts, _('[OPTION]... FILE...'))
2406 def forget(ui, repo, *pats, **opts):
2406 def forget(ui, repo, *pats, **opts):
2407 """forget the specified files on the next commit
2407 """forget the specified files on the next commit
2408
2408
2409 Mark the specified files so they will no longer be tracked
2409 Mark the specified files so they will no longer be tracked
2410 after the next commit.
2410 after the next commit.
2411
2411
2412 This only removes files from the current branch, not from the
2412 This only removes files from the current branch, not from the
2413 entire project history, and it does not delete them from the
2413 entire project history, and it does not delete them from the
2414 working directory.
2414 working directory.
2415
2415
2416 To undo a forget before the next commit, see :hg:`add`.
2416 To undo a forget before the next commit, see :hg:`add`.
2417
2417
2418 .. container:: verbose
2418 .. container:: verbose
2419
2419
2420 Examples:
2420 Examples:
2421
2421
2422 - forget newly-added binary files::
2422 - forget newly-added binary files::
2423
2423
2424 hg forget "set:added() and binary()"
2424 hg forget "set:added() and binary()"
2425
2425
2426 - forget files that would be excluded by .hgignore::
2426 - forget files that would be excluded by .hgignore::
2427
2427
2428 hg forget "set:hgignore()"
2428 hg forget "set:hgignore()"
2429
2429
2430 Returns 0 on success.
2430 Returns 0 on success.
2431 """
2431 """
2432
2432
2433 if not pats:
2433 if not pats:
2434 raise util.Abort(_('no files specified'))
2434 raise util.Abort(_('no files specified'))
2435
2435
2436 wctx = repo[None]
2436 wctx = repo[None]
2437 m = scmutil.match(wctx, pats, opts)
2437 m = scmutil.match(wctx, pats, opts)
2438 s = repo.status(match=m, clean=True)
2438 s = repo.status(match=m, clean=True)
2439 forget = sorted(s[0] + s[1] + s[3] + s[6])
2439 forget = sorted(s[0] + s[1] + s[3] + s[6])
2440 subforget = {}
2440 subforget = {}
2441 errs = 0
2441 errs = 0
2442
2442
2443 for subpath in wctx.substate:
2443 for subpath in wctx.substate:
2444 sub = wctx.sub(subpath)
2444 sub = wctx.sub(subpath)
2445 try:
2445 try:
2446 submatch = matchmod.narrowmatcher(subpath, m)
2446 submatch = matchmod.narrowmatcher(subpath, m)
2447 for fsub in sub.walk(submatch):
2447 for fsub in sub.walk(submatch):
2448 if submatch.exact(fsub):
2448 if submatch.exact(fsub):
2449 subforget[os.path.join(subpath, fsub)] = (fsub, sub)
2449 subforget[os.path.join(subpath, fsub)] = (fsub, sub)
2450 except error.LookupError:
2450 except error.LookupError:
2451 ui.status(_("skipping missing subrepository: %s\n") % subpath)
2451 ui.status(_("skipping missing subrepository: %s\n") % subpath)
2452
2452
2453 for f in m.files():
2453 for f in m.files():
2454 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
2454 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
2455 if f not in subforget:
2455 if f not in subforget:
2456 if os.path.exists(m.rel(f)):
2456 if os.path.exists(m.rel(f)):
2457 ui.warn(_('not removing %s: file is already untracked\n')
2457 ui.warn(_('not removing %s: file is already untracked\n')
2458 % m.rel(f))
2458 % m.rel(f))
2459 errs = 1
2459 errs = 1
2460
2460
2461 for f in forget:
2461 for f in forget:
2462 if ui.verbose or not m.exact(f):
2462 if ui.verbose or not m.exact(f):
2463 ui.status(_('removing %s\n') % m.rel(f))
2463 ui.status(_('removing %s\n') % m.rel(f))
2464
2464
2465 if ui.verbose:
2465 if ui.verbose:
2466 for f in sorted(subforget.keys()):
2466 for f in sorted(subforget.keys()):
2467 ui.status(_('removing %s\n') % m.rel(f))
2467 ui.status(_('removing %s\n') % m.rel(f))
2468
2468
2469 wctx.forget(forget)
2469 wctx.forget(forget)
2470
2470
2471 for f in sorted(subforget.keys()):
2471 for f in sorted(subforget.keys()):
2472 fsub, sub = subforget[f]
2472 fsub, sub = subforget[f]
2473 sub.forget([fsub])
2473 sub.forget([fsub])
2474
2474
2475 return errs
2475 return errs
2476
2476
2477 @command(
2477 @command(
2478 'graft',
2478 'graft',
2479 [('c', 'continue', False, _('resume interrupted graft')),
2479 [('c', 'continue', False, _('resume interrupted graft')),
2480 ('e', 'edit', False, _('invoke editor on commit messages')),
2480 ('e', 'edit', False, _('invoke editor on commit messages')),
2481 ('D', 'currentdate', False,
2481 ('D', 'currentdate', False,
2482 _('record the current date as commit date')),
2482 _('record the current date as commit date')),
2483 ('U', 'currentuser', False,
2483 ('U', 'currentuser', False,
2484 _('record the current user as committer'), _('DATE'))]
2484 _('record the current user as committer'), _('DATE'))]
2485 + commitopts2 + mergetoolopts,
2485 + commitopts2 + mergetoolopts,
2486 _('[OPTION]... REVISION...'))
2486 _('[OPTION]... REVISION...'))
2487 def graft(ui, repo, *revs, **opts):
2487 def graft(ui, repo, *revs, **opts):
2488 '''copy changes from other branches onto the current branch
2488 '''copy changes from other branches onto the current branch
2489
2489
2490 This command uses Mercurial's merge logic to copy individual
2490 This command uses Mercurial's merge logic to copy individual
2491 changes from other branches without merging branches in the
2491 changes from other branches without merging branches in the
2492 history graph. This is sometimes known as 'backporting' or
2492 history graph. This is sometimes known as 'backporting' or
2493 'cherry-picking'. By default, graft will copy user, date, and
2493 'cherry-picking'. By default, graft will copy user, date, and
2494 description from the source changesets.
2494 description from the source changesets.
2495
2495
2496 Changesets that are ancestors of the current revision, that have
2496 Changesets that are ancestors of the current revision, that have
2497 already been grafted, or that are merges will be skipped.
2497 already been grafted, or that are merges will be skipped.
2498
2498
2499 If a graft merge results in conflicts, the graft process is
2499 If a graft merge results in conflicts, the graft process is
2500 aborted so that the current merge can be manually resolved. Once
2500 aborted so that the current merge can be manually resolved. Once
2501 all conflicts are addressed, the graft process can be continued
2501 all conflicts are addressed, the graft process can be continued
2502 with the -c/--continue option.
2502 with the -c/--continue option.
2503
2503
2504 .. note::
2504 .. note::
2505 The -c/--continue option does not reapply earlier options.
2505 The -c/--continue option does not reapply earlier options.
2506
2506
2507 .. container:: verbose
2507 .. container:: verbose
2508
2508
2509 Examples:
2509 Examples:
2510
2510
2511 - copy a single change to the stable branch and edit its description::
2511 - copy a single change to the stable branch and edit its description::
2512
2512
2513 hg update stable
2513 hg update stable
2514 hg graft --edit 9393
2514 hg graft --edit 9393
2515
2515
2516 - graft a range of changesets with one exception, updating dates::
2516 - graft a range of changesets with one exception, updating dates::
2517
2517
2518 hg graft -D "2085::2093 and not 2091"
2518 hg graft -D "2085::2093 and not 2091"
2519
2519
2520 - continue a graft after resolving conflicts::
2520 - continue a graft after resolving conflicts::
2521
2521
2522 hg graft -c
2522 hg graft -c
2523
2523
2524 - show the source of a grafted changeset::
2524 - show the source of a grafted changeset::
2525
2525
2526 hg log --debug -r tip
2526 hg log --debug -r tip
2527
2527
2528 Returns 0 on successful completion.
2528 Returns 0 on successful completion.
2529 '''
2529 '''
2530
2530
2531 if not opts.get('user') and opts.get('currentuser'):
2531 if not opts.get('user') and opts.get('currentuser'):
2532 opts['user'] = ui.username()
2532 opts['user'] = ui.username()
2533 if not opts.get('date') and opts.get('currentdate'):
2533 if not opts.get('date') and opts.get('currentdate'):
2534 opts['date'] = "%d %d" % util.makedate()
2534 opts['date'] = "%d %d" % util.makedate()
2535
2535
2536 editor = None
2536 editor = None
2537 if opts.get('edit'):
2537 if opts.get('edit'):
2538 editor = cmdutil.commitforceeditor
2538 editor = cmdutil.commitforceeditor
2539
2539
2540 cont = False
2540 cont = False
2541 if opts['continue']:
2541 if opts['continue']:
2542 cont = True
2542 cont = True
2543 if revs:
2543 if revs:
2544 raise util.Abort(_("can't specify --continue and revisions"))
2544 raise util.Abort(_("can't specify --continue and revisions"))
2545 # read in unfinished revisions
2545 # read in unfinished revisions
2546 try:
2546 try:
2547 nodes = repo.opener.read('graftstate').splitlines()
2547 nodes = repo.opener.read('graftstate').splitlines()
2548 revs = [repo[node].rev() for node in nodes]
2548 revs = [repo[node].rev() for node in nodes]
2549 except IOError, inst:
2549 except IOError, inst:
2550 if inst.errno != errno.ENOENT:
2550 if inst.errno != errno.ENOENT:
2551 raise
2551 raise
2552 raise util.Abort(_("no graft state found, can't continue"))
2552 raise util.Abort(_("no graft state found, can't continue"))
2553 else:
2553 else:
2554 cmdutil.bailifchanged(repo)
2554 cmdutil.bailifchanged(repo)
2555 if not revs:
2555 if not revs:
2556 raise util.Abort(_('no revisions specified'))
2556 raise util.Abort(_('no revisions specified'))
2557 revs = scmutil.revrange(repo, revs)
2557 revs = scmutil.revrange(repo, revs)
2558
2558
2559 # check for merges
2559 # check for merges
2560 for rev in repo.revs('%ld and merge()', revs):
2560 for rev in repo.revs('%ld and merge()', revs):
2561 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2561 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2562 revs.remove(rev)
2562 revs.remove(rev)
2563 if not revs:
2563 if not revs:
2564 return -1
2564 return -1
2565
2565
2566 # check for ancestors of dest branch
2566 # check for ancestors of dest branch
2567 for rev in repo.revs('::. and %ld', revs):
2567 for rev in repo.revs('::. and %ld', revs):
2568 ui.warn(_('skipping ancestor revision %s\n') % rev)
2568 ui.warn(_('skipping ancestor revision %s\n') % rev)
2569 revs.remove(rev)
2569 revs.remove(rev)
2570 if not revs:
2570 if not revs:
2571 return -1
2571 return -1
2572
2572
2573 # check ancestors for earlier grafts
2573 # check ancestors for earlier grafts
2574 ui.debug('scanning for duplicate grafts\n')
2574 ui.debug('scanning for duplicate grafts\n')
2575 for ctx in repo.set("::. - ::%ld", revs):
2575 for ctx in repo.set("::. - ::%ld", revs):
2576 n = ctx.extra().get('source')
2576 n = ctx.extra().get('source')
2577 if n and n in repo:
2577 if n and n in repo:
2578 r = repo[n].rev()
2578 r = repo[n].rev()
2579 if r in revs:
2579 if r in revs:
2580 ui.warn(_('skipping already grafted revision %s\n') % r)
2580 ui.warn(_('skipping already grafted revision %s\n') % r)
2581 revs.remove(r)
2581 revs.remove(r)
2582 if not revs:
2582 if not revs:
2583 return -1
2583 return -1
2584
2584
2585 for pos, ctx in enumerate(repo.set("%ld", revs)):
2585 for pos, ctx in enumerate(repo.set("%ld", revs)):
2586 current = repo['.']
2586 current = repo['.']
2587 ui.status(_('grafting revision %s\n') % ctx.rev())
2587 ui.status(_('grafting revision %s\n') % ctx.rev())
2588
2588
2589 # we don't merge the first commit when continuing
2589 # we don't merge the first commit when continuing
2590 if not cont:
2590 if not cont:
2591 # perform the graft merge with p1(rev) as 'ancestor'
2591 # perform the graft merge with p1(rev) as 'ancestor'
2592 try:
2592 try:
2593 # ui.forcemerge is an internal variable, do not document
2593 # ui.forcemerge is an internal variable, do not document
2594 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
2594 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
2595 stats = mergemod.update(repo, ctx.node(), True, True, False,
2595 stats = mergemod.update(repo, ctx.node(), True, True, False,
2596 ctx.p1().node())
2596 ctx.p1().node())
2597 finally:
2597 finally:
2598 ui.setconfig('ui', 'forcemerge', '')
2598 ui.setconfig('ui', 'forcemerge', '')
2599 # drop the second merge parent
2599 # drop the second merge parent
2600 repo.dirstate.setparents(current.node(), nullid)
2600 repo.dirstate.setparents(current.node(), nullid)
2601 repo.dirstate.write()
2601 repo.dirstate.write()
2602 # fix up dirstate for copies and renames
2602 # fix up dirstate for copies and renames
2603 cmdutil.duplicatecopies(repo, ctx.rev(), current.node(), nullid)
2603 cmdutil.duplicatecopies(repo, ctx.rev(), current.node(), nullid)
2604 # report any conflicts
2604 # report any conflicts
2605 if stats and stats[3] > 0:
2605 if stats and stats[3] > 0:
2606 # write out state for --continue
2606 # write out state for --continue
2607 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2607 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2608 repo.opener.write('graftstate', ''.join(nodelines))
2608 repo.opener.write('graftstate', ''.join(nodelines))
2609 raise util.Abort(
2609 raise util.Abort(
2610 _("unresolved conflicts, can't continue"),
2610 _("unresolved conflicts, can't continue"),
2611 hint=_('use hg resolve and hg graft --continue'))
2611 hint=_('use hg resolve and hg graft --continue'))
2612 else:
2612 else:
2613 cont = False
2613 cont = False
2614
2614
2615 # commit
2615 # commit
2616 extra = {'source': ctx.hex()}
2616 extra = {'source': ctx.hex()}
2617 user = ctx.user()
2617 user = ctx.user()
2618 if opts.get('user'):
2618 if opts.get('user'):
2619 user = opts['user']
2619 user = opts['user']
2620 date = ctx.date()
2620 date = ctx.date()
2621 if opts.get('date'):
2621 if opts.get('date'):
2622 date = opts['date']
2622 date = opts['date']
2623 repo.commit(text=ctx.description(), user=user,
2623 repo.commit(text=ctx.description(), user=user,
2624 date=date, extra=extra, editor=editor)
2624 date=date, extra=extra, editor=editor)
2625
2625
2626 # remove state when we complete successfully
2626 # remove state when we complete successfully
2627 if os.path.exists(repo.join('graftstate')):
2627 if os.path.exists(repo.join('graftstate')):
2628 util.unlinkpath(repo.join('graftstate'))
2628 util.unlinkpath(repo.join('graftstate'))
2629
2629
2630 return 0
2630 return 0
2631
2631
2632 @command('grep',
2632 @command('grep',
2633 [('0', 'print0', None, _('end fields with NUL')),
2633 [('0', 'print0', None, _('end fields with NUL')),
2634 ('', 'all', None, _('print all revisions that match')),
2634 ('', 'all', None, _('print all revisions that match')),
2635 ('a', 'text', None, _('treat all files as text')),
2635 ('a', 'text', None, _('treat all files as text')),
2636 ('f', 'follow', None,
2636 ('f', 'follow', None,
2637 _('follow changeset history,'
2637 _('follow changeset history,'
2638 ' or file history across copies and renames')),
2638 ' or file history across copies and renames')),
2639 ('i', 'ignore-case', None, _('ignore case when matching')),
2639 ('i', 'ignore-case', None, _('ignore case when matching')),
2640 ('l', 'files-with-matches', None,
2640 ('l', 'files-with-matches', None,
2641 _('print only filenames and revisions that match')),
2641 _('print only filenames and revisions that match')),
2642 ('n', 'line-number', None, _('print matching line numbers')),
2642 ('n', 'line-number', None, _('print matching line numbers')),
2643 ('r', 'rev', [],
2643 ('r', 'rev', [],
2644 _('only search files changed within revision range'), _('REV')),
2644 _('only search files changed within revision range'), _('REV')),
2645 ('u', 'user', None, _('list the author (long with -v)')),
2645 ('u', 'user', None, _('list the author (long with -v)')),
2646 ('d', 'date', None, _('list the date (short with -q)')),
2646 ('d', 'date', None, _('list the date (short with -q)')),
2647 ] + walkopts,
2647 ] + walkopts,
2648 _('[OPTION]... PATTERN [FILE]...'))
2648 _('[OPTION]... PATTERN [FILE]...'))
2649 def grep(ui, repo, pattern, *pats, **opts):
2649 def grep(ui, repo, pattern, *pats, **opts):
2650 """search for a pattern in specified files and revisions
2650 """search for a pattern in specified files and revisions
2651
2651
2652 Search revisions of files for a regular expression.
2652 Search revisions of files for a regular expression.
2653
2653
2654 This command behaves differently than Unix grep. It only accepts
2654 This command behaves differently than Unix grep. It only accepts
2655 Python/Perl regexps. It searches repository history, not the
2655 Python/Perl regexps. It searches repository history, not the
2656 working directory. It always prints the revision number in which a
2656 working directory. It always prints the revision number in which a
2657 match appears.
2657 match appears.
2658
2658
2659 By default, grep only prints output for the first revision of a
2659 By default, grep only prints output for the first revision of a
2660 file in which it finds a match. To get it to print every revision
2660 file in which it finds a match. To get it to print every revision
2661 that contains a change in match status ("-" for a match that
2661 that contains a change in match status ("-" for a match that
2662 becomes a non-match, or "+" for a non-match that becomes a match),
2662 becomes a non-match, or "+" for a non-match that becomes a match),
2663 use the --all flag.
2663 use the --all flag.
2664
2664
2665 Returns 0 if a match is found, 1 otherwise.
2665 Returns 0 if a match is found, 1 otherwise.
2666 """
2666 """
2667 reflags = 0
2667 reflags = 0
2668 if opts.get('ignore_case'):
2668 if opts.get('ignore_case'):
2669 reflags |= re.I
2669 reflags |= re.I
2670 try:
2670 try:
2671 regexp = re.compile(pattern, reflags)
2671 regexp = re.compile(pattern, reflags)
2672 except re.error, inst:
2672 except re.error, inst:
2673 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2673 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2674 return 1
2674 return 1
2675 sep, eol = ':', '\n'
2675 sep, eol = ':', '\n'
2676 if opts.get('print0'):
2676 if opts.get('print0'):
2677 sep = eol = '\0'
2677 sep = eol = '\0'
2678
2678
2679 getfile = util.lrucachefunc(repo.file)
2679 getfile = util.lrucachefunc(repo.file)
2680
2680
2681 def matchlines(body):
2681 def matchlines(body):
2682 begin = 0
2682 begin = 0
2683 linenum = 0
2683 linenum = 0
2684 while True:
2684 while True:
2685 match = regexp.search(body, begin)
2685 match = regexp.search(body, begin)
2686 if not match:
2686 if not match:
2687 break
2687 break
2688 mstart, mend = match.span()
2688 mstart, mend = match.span()
2689 linenum += body.count('\n', begin, mstart) + 1
2689 linenum += body.count('\n', begin, mstart) + 1
2690 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2690 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2691 begin = body.find('\n', mend) + 1 or len(body) + 1
2691 begin = body.find('\n', mend) + 1 or len(body) + 1
2692 lend = begin - 1
2692 lend = begin - 1
2693 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2693 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2694
2694
2695 class linestate(object):
2695 class linestate(object):
2696 def __init__(self, line, linenum, colstart, colend):
2696 def __init__(self, line, linenum, colstart, colend):
2697 self.line = line
2697 self.line = line
2698 self.linenum = linenum
2698 self.linenum = linenum
2699 self.colstart = colstart
2699 self.colstart = colstart
2700 self.colend = colend
2700 self.colend = colend
2701
2701
2702 def __hash__(self):
2702 def __hash__(self):
2703 return hash((self.linenum, self.line))
2703 return hash((self.linenum, self.line))
2704
2704
2705 def __eq__(self, other):
2705 def __eq__(self, other):
2706 return self.line == other.line
2706 return self.line == other.line
2707
2707
2708 matches = {}
2708 matches = {}
2709 copies = {}
2709 copies = {}
2710 def grepbody(fn, rev, body):
2710 def grepbody(fn, rev, body):
2711 matches[rev].setdefault(fn, [])
2711 matches[rev].setdefault(fn, [])
2712 m = matches[rev][fn]
2712 m = matches[rev][fn]
2713 for lnum, cstart, cend, line in matchlines(body):
2713 for lnum, cstart, cend, line in matchlines(body):
2714 s = linestate(line, lnum, cstart, cend)
2714 s = linestate(line, lnum, cstart, cend)
2715 m.append(s)
2715 m.append(s)
2716
2716
2717 def difflinestates(a, b):
2717 def difflinestates(a, b):
2718 sm = difflib.SequenceMatcher(None, a, b)
2718 sm = difflib.SequenceMatcher(None, a, b)
2719 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2719 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2720 if tag == 'insert':
2720 if tag == 'insert':
2721 for i in xrange(blo, bhi):
2721 for i in xrange(blo, bhi):
2722 yield ('+', b[i])
2722 yield ('+', b[i])
2723 elif tag == 'delete':
2723 elif tag == 'delete':
2724 for i in xrange(alo, ahi):
2724 for i in xrange(alo, ahi):
2725 yield ('-', a[i])
2725 yield ('-', a[i])
2726 elif tag == 'replace':
2726 elif tag == 'replace':
2727 for i in xrange(alo, ahi):
2727 for i in xrange(alo, ahi):
2728 yield ('-', a[i])
2728 yield ('-', a[i])
2729 for i in xrange(blo, bhi):
2729 for i in xrange(blo, bhi):
2730 yield ('+', b[i])
2730 yield ('+', b[i])
2731
2731
2732 def display(fn, ctx, pstates, states):
2732 def display(fn, ctx, pstates, states):
2733 rev = ctx.rev()
2733 rev = ctx.rev()
2734 datefunc = ui.quiet and util.shortdate or util.datestr
2734 datefunc = ui.quiet and util.shortdate or util.datestr
2735 found = False
2735 found = False
2736 filerevmatches = {}
2736 filerevmatches = {}
2737 def binary():
2737 def binary():
2738 flog = getfile(fn)
2738 flog = getfile(fn)
2739 return util.binary(flog.read(ctx.filenode(fn)))
2739 return util.binary(flog.read(ctx.filenode(fn)))
2740
2740
2741 if opts.get('all'):
2741 if opts.get('all'):
2742 iter = difflinestates(pstates, states)
2742 iter = difflinestates(pstates, states)
2743 else:
2743 else:
2744 iter = [('', l) for l in states]
2744 iter = [('', l) for l in states]
2745 for change, l in iter:
2745 for change, l in iter:
2746 cols = [fn, str(rev)]
2746 cols = [fn, str(rev)]
2747 before, match, after = None, None, None
2747 before, match, after = None, None, None
2748 if opts.get('line_number'):
2748 if opts.get('line_number'):
2749 cols.append(str(l.linenum))
2749 cols.append(str(l.linenum))
2750 if opts.get('all'):
2750 if opts.get('all'):
2751 cols.append(change)
2751 cols.append(change)
2752 if opts.get('user'):
2752 if opts.get('user'):
2753 cols.append(ui.shortuser(ctx.user()))
2753 cols.append(ui.shortuser(ctx.user()))
2754 if opts.get('date'):
2754 if opts.get('date'):
2755 cols.append(datefunc(ctx.date()))
2755 cols.append(datefunc(ctx.date()))
2756 if opts.get('files_with_matches'):
2756 if opts.get('files_with_matches'):
2757 c = (fn, rev)
2757 c = (fn, rev)
2758 if c in filerevmatches:
2758 if c in filerevmatches:
2759 continue
2759 continue
2760 filerevmatches[c] = 1
2760 filerevmatches[c] = 1
2761 else:
2761 else:
2762 before = l.line[:l.colstart]
2762 before = l.line[:l.colstart]
2763 match = l.line[l.colstart:l.colend]
2763 match = l.line[l.colstart:l.colend]
2764 after = l.line[l.colend:]
2764 after = l.line[l.colend:]
2765 ui.write(sep.join(cols))
2765 ui.write(sep.join(cols))
2766 if before is not None:
2766 if before is not None:
2767 if not opts.get('text') and binary():
2767 if not opts.get('text') and binary():
2768 ui.write(sep + " Binary file matches")
2768 ui.write(sep + " Binary file matches")
2769 else:
2769 else:
2770 ui.write(sep + before)
2770 ui.write(sep + before)
2771 ui.write(match, label='grep.match')
2771 ui.write(match, label='grep.match')
2772 ui.write(after)
2772 ui.write(after)
2773 ui.write(eol)
2773 ui.write(eol)
2774 found = True
2774 found = True
2775 return found
2775 return found
2776
2776
2777 skip = {}
2777 skip = {}
2778 revfiles = {}
2778 revfiles = {}
2779 matchfn = scmutil.match(repo[None], pats, opts)
2779 matchfn = scmutil.match(repo[None], pats, opts)
2780 found = False
2780 found = False
2781 follow = opts.get('follow')
2781 follow = opts.get('follow')
2782
2782
2783 def prep(ctx, fns):
2783 def prep(ctx, fns):
2784 rev = ctx.rev()
2784 rev = ctx.rev()
2785 pctx = ctx.p1()
2785 pctx = ctx.p1()
2786 parent = pctx.rev()
2786 parent = pctx.rev()
2787 matches.setdefault(rev, {})
2787 matches.setdefault(rev, {})
2788 matches.setdefault(parent, {})
2788 matches.setdefault(parent, {})
2789 files = revfiles.setdefault(rev, [])
2789 files = revfiles.setdefault(rev, [])
2790 for fn in fns:
2790 for fn in fns:
2791 flog = getfile(fn)
2791 flog = getfile(fn)
2792 try:
2792 try:
2793 fnode = ctx.filenode(fn)
2793 fnode = ctx.filenode(fn)
2794 except error.LookupError:
2794 except error.LookupError:
2795 continue
2795 continue
2796
2796
2797 copied = flog.renamed(fnode)
2797 copied = flog.renamed(fnode)
2798 copy = follow and copied and copied[0]
2798 copy = follow and copied and copied[0]
2799 if copy:
2799 if copy:
2800 copies.setdefault(rev, {})[fn] = copy
2800 copies.setdefault(rev, {})[fn] = copy
2801 if fn in skip:
2801 if fn in skip:
2802 if copy:
2802 if copy:
2803 skip[copy] = True
2803 skip[copy] = True
2804 continue
2804 continue
2805 files.append(fn)
2805 files.append(fn)
2806
2806
2807 if fn not in matches[rev]:
2807 if fn not in matches[rev]:
2808 grepbody(fn, rev, flog.read(fnode))
2808 grepbody(fn, rev, flog.read(fnode))
2809
2809
2810 pfn = copy or fn
2810 pfn = copy or fn
2811 if pfn not in matches[parent]:
2811 if pfn not in matches[parent]:
2812 try:
2812 try:
2813 fnode = pctx.filenode(pfn)
2813 fnode = pctx.filenode(pfn)
2814 grepbody(pfn, parent, flog.read(fnode))
2814 grepbody(pfn, parent, flog.read(fnode))
2815 except error.LookupError:
2815 except error.LookupError:
2816 pass
2816 pass
2817
2817
2818 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2818 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2819 rev = ctx.rev()
2819 rev = ctx.rev()
2820 parent = ctx.p1().rev()
2820 parent = ctx.p1().rev()
2821 for fn in sorted(revfiles.get(rev, [])):
2821 for fn in sorted(revfiles.get(rev, [])):
2822 states = matches[rev][fn]
2822 states = matches[rev][fn]
2823 copy = copies.get(rev, {}).get(fn)
2823 copy = copies.get(rev, {}).get(fn)
2824 if fn in skip:
2824 if fn in skip:
2825 if copy:
2825 if copy:
2826 skip[copy] = True
2826 skip[copy] = True
2827 continue
2827 continue
2828 pstates = matches.get(parent, {}).get(copy or fn, [])
2828 pstates = matches.get(parent, {}).get(copy or fn, [])
2829 if pstates or states:
2829 if pstates or states:
2830 r = display(fn, ctx, pstates, states)
2830 r = display(fn, ctx, pstates, states)
2831 found = found or r
2831 found = found or r
2832 if r and not opts.get('all'):
2832 if r and not opts.get('all'):
2833 skip[fn] = True
2833 skip[fn] = True
2834 if copy:
2834 if copy:
2835 skip[copy] = True
2835 skip[copy] = True
2836 del matches[rev]
2836 del matches[rev]
2837 del revfiles[rev]
2837 del revfiles[rev]
2838
2838
2839 return not found
2839 return not found
2840
2840
2841 @command('heads',
2841 @command('heads',
2842 [('r', 'rev', '',
2842 [('r', 'rev', '',
2843 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2843 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2844 ('t', 'topo', False, _('show topological heads only')),
2844 ('t', 'topo', False, _('show topological heads only')),
2845 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2845 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2846 ('c', 'closed', False, _('show normal and closed branch heads')),
2846 ('c', 'closed', False, _('show normal and closed branch heads')),
2847 ] + templateopts,
2847 ] + templateopts,
2848 _('[-ac] [-r STARTREV] [REV]...'))
2848 _('[-ac] [-r STARTREV] [REV]...'))
2849 def heads(ui, repo, *branchrevs, **opts):
2849 def heads(ui, repo, *branchrevs, **opts):
2850 """show current repository heads or show branch heads
2850 """show current repository heads or show branch heads
2851
2851
2852 With no arguments, show all repository branch heads.
2852 With no arguments, show all repository branch heads.
2853
2853
2854 Repository "heads" are changesets with no child changesets. They are
2854 Repository "heads" are changesets with no child changesets. They are
2855 where development generally takes place and are the usual targets
2855 where development generally takes place and are the usual targets
2856 for update and merge operations. Branch heads are changesets that have
2856 for update and merge operations. Branch heads are changesets that have
2857 no child changeset on the same branch.
2857 no child changeset on the same branch.
2858
2858
2859 If one or more REVs are given, only branch heads on the branches
2859 If one or more REVs are given, only branch heads on the branches
2860 associated with the specified changesets are shown. This means
2860 associated with the specified changesets are shown. This means
2861 that you can use :hg:`heads foo` to see the heads on a branch
2861 that you can use :hg:`heads foo` to see the heads on a branch
2862 named ``foo``.
2862 named ``foo``.
2863
2863
2864 If -c/--closed is specified, also show branch heads marked closed
2864 If -c/--closed is specified, also show branch heads marked closed
2865 (see :hg:`commit --close-branch`).
2865 (see :hg:`commit --close-branch`).
2866
2866
2867 If STARTREV is specified, only those heads that are descendants of
2867 If STARTREV is specified, only those heads that are descendants of
2868 STARTREV will be displayed.
2868 STARTREV will be displayed.
2869
2869
2870 If -t/--topo is specified, named branch mechanics will be ignored and only
2870 If -t/--topo is specified, named branch mechanics will be ignored and only
2871 changesets without children will be shown.
2871 changesets without children will be shown.
2872
2872
2873 Returns 0 if matching heads are found, 1 if not.
2873 Returns 0 if matching heads are found, 1 if not.
2874 """
2874 """
2875
2875
2876 start = None
2876 start = None
2877 if 'rev' in opts:
2877 if 'rev' in opts:
2878 start = scmutil.revsingle(repo, opts['rev'], None).node()
2878 start = scmutil.revsingle(repo, opts['rev'], None).node()
2879
2879
2880 if opts.get('topo'):
2880 if opts.get('topo'):
2881 heads = [repo[h] for h in repo.heads(start)]
2881 heads = [repo[h] for h in repo.heads(start)]
2882 else:
2882 else:
2883 heads = []
2883 heads = []
2884 for branch in repo.branchmap():
2884 for branch in repo.branchmap():
2885 heads += repo.branchheads(branch, start, opts.get('closed'))
2885 heads += repo.branchheads(branch, start, opts.get('closed'))
2886 heads = [repo[h] for h in heads]
2886 heads = [repo[h] for h in heads]
2887
2887
2888 if branchrevs:
2888 if branchrevs:
2889 branches = set(repo[br].branch() for br in branchrevs)
2889 branches = set(repo[br].branch() for br in branchrevs)
2890 heads = [h for h in heads if h.branch() in branches]
2890 heads = [h for h in heads if h.branch() in branches]
2891
2891
2892 if opts.get('active') and branchrevs:
2892 if opts.get('active') and branchrevs:
2893 dagheads = repo.heads(start)
2893 dagheads = repo.heads(start)
2894 heads = [h for h in heads if h.node() in dagheads]
2894 heads = [h for h in heads if h.node() in dagheads]
2895
2895
2896 if branchrevs:
2896 if branchrevs:
2897 haveheads = set(h.branch() for h in heads)
2897 haveheads = set(h.branch() for h in heads)
2898 if branches - haveheads:
2898 if branches - haveheads:
2899 headless = ', '.join(b for b in branches - haveheads)
2899 headless = ', '.join(b for b in branches - haveheads)
2900 msg = _('no open branch heads found on branches %s')
2900 msg = _('no open branch heads found on branches %s')
2901 if opts.get('rev'):
2901 if opts.get('rev'):
2902 msg += _(' (started at %s)' % opts['rev'])
2902 msg += _(' (started at %s)' % opts['rev'])
2903 ui.warn((msg + '\n') % headless)
2903 ui.warn((msg + '\n') % headless)
2904
2904
2905 if not heads:
2905 if not heads:
2906 return 1
2906 return 1
2907
2907
2908 heads = sorted(heads, key=lambda x: -x.rev())
2908 heads = sorted(heads, key=lambda x: -x.rev())
2909 displayer = cmdutil.show_changeset(ui, repo, opts)
2909 displayer = cmdutil.show_changeset(ui, repo, opts)
2910 for ctx in heads:
2910 for ctx in heads:
2911 displayer.show(ctx)
2911 displayer.show(ctx)
2912 displayer.close()
2912 displayer.close()
2913
2913
2914 @command('help',
2914 @command('help',
2915 [('e', 'extension', None, _('show only help for extensions')),
2915 [('e', 'extension', None, _('show only help for extensions')),
2916 ('c', 'command', None, _('show only help for commands'))],
2916 ('c', 'command', None, _('show only help for commands'))],
2917 _('[-ec] [TOPIC]'))
2917 _('[-ec] [TOPIC]'))
2918 def help_(ui, name=None, unknowncmd=False, full=True, **opts):
2918 def help_(ui, name=None, unknowncmd=False, full=True, **opts):
2919 """show help for a given topic or a help overview
2919 """show help for a given topic or a help overview
2920
2920
2921 With no arguments, print a list of commands with short help messages.
2921 With no arguments, print a list of commands with short help messages.
2922
2922
2923 Given a topic, extension, or command name, print help for that
2923 Given a topic, extension, or command name, print help for that
2924 topic.
2924 topic.
2925
2925
2926 Returns 0 if successful.
2926 Returns 0 if successful.
2927 """
2927 """
2928
2928
2929 textwidth = min(ui.termwidth(), 80) - 2
2929 textwidth = min(ui.termwidth(), 80) - 2
2930
2930
2931 def optrst(options):
2931 def optrst(options):
2932 data = []
2932 data = []
2933 multioccur = False
2933 multioccur = False
2934 for option in options:
2934 for option in options:
2935 if len(option) == 5:
2935 if len(option) == 5:
2936 shortopt, longopt, default, desc, optlabel = option
2936 shortopt, longopt, default, desc, optlabel = option
2937 else:
2937 else:
2938 shortopt, longopt, default, desc = option
2938 shortopt, longopt, default, desc = option
2939 optlabel = _("VALUE") # default label
2939 optlabel = _("VALUE") # default label
2940
2940
2941 if _("DEPRECATED") in desc and not ui.verbose:
2941 if _("DEPRECATED") in desc and not ui.verbose:
2942 continue
2942 continue
2943
2943
2944 so = ''
2944 so = ''
2945 if shortopt:
2945 if shortopt:
2946 so = '-' + shortopt
2946 so = '-' + shortopt
2947 lo = '--' + longopt
2947 lo = '--' + longopt
2948 if default:
2948 if default:
2949 desc += _(" (default: %s)") % default
2949 desc += _(" (default: %s)") % default
2950
2950
2951 if isinstance(default, list):
2951 if isinstance(default, list):
2952 lo += " %s [+]" % optlabel
2952 lo += " %s [+]" % optlabel
2953 multioccur = True
2953 multioccur = True
2954 elif (default is not None) and not isinstance(default, bool):
2954 elif (default is not None) and not isinstance(default, bool):
2955 lo += " %s" % optlabel
2955 lo += " %s" % optlabel
2956
2956
2957 data.append((so, lo, desc))
2957 data.append((so, lo, desc))
2958
2958
2959 rst = minirst.maketable(data, 1)
2959 rst = minirst.maketable(data, 1)
2960
2960
2961 if multioccur:
2961 if multioccur:
2962 rst += _("\n[+] marked option can be specified multiple times\n")
2962 rst += _("\n[+] marked option can be specified multiple times\n")
2963
2963
2964 return rst
2964 return rst
2965
2965
2966 # list all option lists
2966 # list all option lists
2967 def opttext(optlist, width):
2967 def opttext(optlist, width):
2968 rst = ''
2968 rst = ''
2969 if not optlist:
2969 if not optlist:
2970 return ''
2970 return ''
2971
2971
2972 for title, options in optlist:
2972 for title, options in optlist:
2973 rst += '\n%s\n' % title
2973 rst += '\n%s\n' % title
2974 if options:
2974 if options:
2975 rst += "\n"
2975 rst += "\n"
2976 rst += optrst(options)
2976 rst += optrst(options)
2977 rst += '\n'
2977 rst += '\n'
2978
2978
2979 return '\n' + minirst.format(rst, width)
2979 return '\n' + minirst.format(rst, width)
2980
2980
2981 def addglobalopts(optlist, aliases):
2981 def addglobalopts(optlist, aliases):
2982 if ui.quiet:
2982 if ui.quiet:
2983 return []
2983 return []
2984
2984
2985 if ui.verbose:
2985 if ui.verbose:
2986 optlist.append((_("global options:"), globalopts))
2986 optlist.append((_("global options:"), globalopts))
2987 if name == 'shortlist':
2987 if name == 'shortlist':
2988 optlist.append((_('use "hg help" for the full list '
2988 optlist.append((_('use "hg help" for the full list '
2989 'of commands'), ()))
2989 'of commands'), ()))
2990 else:
2990 else:
2991 if name == 'shortlist':
2991 if name == 'shortlist':
2992 msg = _('use "hg help" for the full list of commands '
2992 msg = _('use "hg help" for the full list of commands '
2993 'or "hg -v" for details')
2993 'or "hg -v" for details')
2994 elif name and not full:
2994 elif name and not full:
2995 msg = _('use "hg help %s" to show the full help text' % name)
2995 msg = _('use "hg help %s" to show the full help text' % name)
2996 elif aliases:
2996 elif aliases:
2997 msg = _('use "hg -v help%s" to show builtin aliases and '
2997 msg = _('use "hg -v help%s" to show builtin aliases and '
2998 'global options') % (name and " " + name or "")
2998 'global options') % (name and " " + name or "")
2999 else:
2999 else:
3000 msg = _('use "hg -v help %s" to show more info') % name
3000 msg = _('use "hg -v help %s" to show more info') % name
3001 optlist.append((msg, ()))
3001 optlist.append((msg, ()))
3002
3002
3003 def helpcmd(name):
3003 def helpcmd(name):
3004 try:
3004 try:
3005 aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd)
3005 aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd)
3006 except error.AmbiguousCommand, inst:
3006 except error.AmbiguousCommand, inst:
3007 # py3k fix: except vars can't be used outside the scope of the
3007 # py3k fix: except vars can't be used outside the scope of the
3008 # except block, nor can be used inside a lambda. python issue4617
3008 # except block, nor can be used inside a lambda. python issue4617
3009 prefix = inst.args[0]
3009 prefix = inst.args[0]
3010 select = lambda c: c.lstrip('^').startswith(prefix)
3010 select = lambda c: c.lstrip('^').startswith(prefix)
3011 helplist(select)
3011 helplist(select)
3012 return
3012 return
3013
3013
3014 # check if it's an invalid alias and display its error if it is
3014 # check if it's an invalid alias and display its error if it is
3015 if getattr(entry[0], 'badalias', False):
3015 if getattr(entry[0], 'badalias', False):
3016 if not unknowncmd:
3016 if not unknowncmd:
3017 entry[0](ui)
3017 entry[0](ui)
3018 return
3018 return
3019
3019
3020 rst = ""
3020 rst = ""
3021
3021
3022 # synopsis
3022 # synopsis
3023 if len(entry) > 2:
3023 if len(entry) > 2:
3024 if entry[2].startswith('hg'):
3024 if entry[2].startswith('hg'):
3025 rst += "%s\n" % entry[2]
3025 rst += "%s\n" % entry[2]
3026 else:
3026 else:
3027 rst += 'hg %s %s\n' % (aliases[0], entry[2])
3027 rst += 'hg %s %s\n' % (aliases[0], entry[2])
3028 else:
3028 else:
3029 rst += 'hg %s\n' % aliases[0]
3029 rst += 'hg %s\n' % aliases[0]
3030
3030
3031 # aliases
3031 # aliases
3032 if full and not ui.quiet and len(aliases) > 1:
3032 if full and not ui.quiet and len(aliases) > 1:
3033 rst += _("\naliases: %s\n") % ', '.join(aliases[1:])
3033 rst += _("\naliases: %s\n") % ', '.join(aliases[1:])
3034
3034
3035 # description
3035 # description
3036 doc = gettext(entry[0].__doc__)
3036 doc = gettext(entry[0].__doc__)
3037 if not doc:
3037 if not doc:
3038 doc = _("(no help text available)")
3038 doc = _("(no help text available)")
3039 if util.safehasattr(entry[0], 'definition'): # aliased command
3039 if util.safehasattr(entry[0], 'definition'): # aliased command
3040 if entry[0].definition.startswith('!'): # shell alias
3040 if entry[0].definition.startswith('!'): # shell alias
3041 doc = _('shell alias for::\n\n %s') % entry[0].definition[1:]
3041 doc = _('shell alias for::\n\n %s') % entry[0].definition[1:]
3042 else:
3042 else:
3043 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
3043 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
3044 if ui.quiet or not full:
3044 if ui.quiet or not full:
3045 doc = doc.splitlines()[0]
3045 doc = doc.splitlines()[0]
3046 rst += "\n" + doc + "\n"
3046 rst += "\n" + doc + "\n"
3047
3047
3048 # check if this command shadows a non-trivial (multi-line)
3048 # check if this command shadows a non-trivial (multi-line)
3049 # extension help text
3049 # extension help text
3050 try:
3050 try:
3051 mod = extensions.find(name)
3051 mod = extensions.find(name)
3052 doc = gettext(mod.__doc__) or ''
3052 doc = gettext(mod.__doc__) or ''
3053 if '\n' in doc.strip():
3053 if '\n' in doc.strip():
3054 msg = _('use "hg help -e %s" to show help for '
3054 msg = _('use "hg help -e %s" to show help for '
3055 'the %s extension') % (name, name)
3055 'the %s extension') % (name, name)
3056 rst += '\n%s\n' % msg
3056 rst += '\n%s\n' % msg
3057 except KeyError:
3057 except KeyError:
3058 pass
3058 pass
3059
3059
3060 # options
3060 # options
3061 if not ui.quiet and entry[1]:
3061 if not ui.quiet and entry[1]:
3062 rst += '\noptions:\n\n'
3062 rst += '\noptions:\n\n'
3063 rst += optrst(entry[1])
3063 rst += optrst(entry[1])
3064
3064
3065 if ui.verbose:
3065 if ui.verbose:
3066 rst += '\nglobal options:\n\n'
3066 rst += '\nglobal options:\n\n'
3067 rst += optrst(globalopts)
3067 rst += optrst(globalopts)
3068
3068
3069 keep = ui.verbose and ['verbose'] or []
3069 keep = ui.verbose and ['verbose'] or []
3070 formatted, pruned = minirst.format(rst, textwidth, keep=keep)
3070 formatted, pruned = minirst.format(rst, textwidth, keep=keep)
3071 ui.write(formatted)
3071 ui.write(formatted)
3072
3072
3073 if not ui.verbose:
3073 if not ui.verbose:
3074 if not full:
3074 if not full:
3075 ui.write(_('\nuse "hg help %s" to show the full help text\n')
3075 ui.write(_('\nuse "hg help %s" to show the full help text\n')
3076 % name)
3076 % name)
3077 elif not ui.quiet:
3077 elif not ui.quiet:
3078 ui.write(_('\nuse "hg -v help %s" to show more info\n') % name)
3078 ui.write(_('\nuse "hg -v help %s" to show more info\n') % name)
3079
3079
3080
3080
3081 def helplist(select=None):
3081 def helplist(select=None):
3082 # list of commands
3082 # list of commands
3083 if name == "shortlist":
3083 if name == "shortlist":
3084 header = _('basic commands:\n\n')
3084 header = _('basic commands:\n\n')
3085 else:
3085 else:
3086 header = _('list of commands:\n\n')
3086 header = _('list of commands:\n\n')
3087
3087
3088 h = {}
3088 h = {}
3089 cmds = {}
3089 cmds = {}
3090 for c, e in table.iteritems():
3090 for c, e in table.iteritems():
3091 f = c.split("|", 1)[0]
3091 f = c.split("|", 1)[0]
3092 if select and not select(f):
3092 if select and not select(f):
3093 continue
3093 continue
3094 if (not select and name != 'shortlist' and
3094 if (not select and name != 'shortlist' and
3095 e[0].__module__ != __name__):
3095 e[0].__module__ != __name__):
3096 continue
3096 continue
3097 if name == "shortlist" and not f.startswith("^"):
3097 if name == "shortlist" and not f.startswith("^"):
3098 continue
3098 continue
3099 f = f.lstrip("^")
3099 f = f.lstrip("^")
3100 if not ui.debugflag and f.startswith("debug"):
3100 if not ui.debugflag and f.startswith("debug"):
3101 continue
3101 continue
3102 doc = e[0].__doc__
3102 doc = e[0].__doc__
3103 if doc and 'DEPRECATED' in doc and not ui.verbose:
3103 if doc and 'DEPRECATED' in doc and not ui.verbose:
3104 continue
3104 continue
3105 doc = gettext(doc)
3105 doc = gettext(doc)
3106 if not doc:
3106 if not doc:
3107 doc = _("(no help text available)")
3107 doc = _("(no help text available)")
3108 h[f] = doc.splitlines()[0].rstrip()
3108 h[f] = doc.splitlines()[0].rstrip()
3109 cmds[f] = c.lstrip("^")
3109 cmds[f] = c.lstrip("^")
3110
3110
3111 if not h:
3111 if not h:
3112 ui.status(_('no commands defined\n'))
3112 ui.status(_('no commands defined\n'))
3113 return
3113 return
3114
3114
3115 ui.status(header)
3115 ui.status(header)
3116 fns = sorted(h)
3116 fns = sorted(h)
3117 m = max(map(len, fns))
3117 m = max(map(len, fns))
3118 for f in fns:
3118 for f in fns:
3119 if ui.verbose:
3119 if ui.verbose:
3120 commands = cmds[f].replace("|",", ")
3120 commands = cmds[f].replace("|",", ")
3121 ui.write(" %s:\n %s\n"%(commands, h[f]))
3121 ui.write(" %s:\n %s\n"%(commands, h[f]))
3122 else:
3122 else:
3123 ui.write('%s\n' % (util.wrap(h[f], textwidth,
3123 ui.write('%s\n' % (util.wrap(h[f], textwidth,
3124 initindent=' %-*s ' % (m, f),
3124 initindent=' %-*s ' % (m, f),
3125 hangindent=' ' * (m + 4))))
3125 hangindent=' ' * (m + 4))))
3126
3126
3127 if not name:
3127 if not name:
3128 text = help.listexts(_('enabled extensions:'), extensions.enabled())
3128 text = help.listexts(_('enabled extensions:'), extensions.enabled())
3129 if text:
3129 if text:
3130 ui.write("\n%s" % minirst.format(text, textwidth))
3130 ui.write("\n%s" % minirst.format(text, textwidth))
3131
3131
3132 ui.write(_("\nadditional help topics:\n\n"))
3132 ui.write(_("\nadditional help topics:\n\n"))
3133 topics = []
3133 topics = []
3134 for names, header, doc in help.helptable:
3134 for names, header, doc in help.helptable:
3135 topics.append((sorted(names, key=len, reverse=True)[0], header))
3135 topics.append((sorted(names, key=len, reverse=True)[0], header))
3136 topics_len = max([len(s[0]) for s in topics])
3136 topics_len = max([len(s[0]) for s in topics])
3137 for t, desc in topics:
3137 for t, desc in topics:
3138 ui.write(" %-*s %s\n" % (topics_len, t, desc))
3138 ui.write(" %-*s %s\n" % (topics_len, t, desc))
3139
3139
3140 optlist = []
3140 optlist = []
3141 addglobalopts(optlist, True)
3141 addglobalopts(optlist, True)
3142 ui.write(opttext(optlist, textwidth))
3142 ui.write(opttext(optlist, textwidth))
3143
3143
3144 def helptopic(name):
3144 def helptopic(name):
3145 for names, header, doc in help.helptable:
3145 for names, header, doc in help.helptable:
3146 if name in names:
3146 if name in names:
3147 break
3147 break
3148 else:
3148 else:
3149 raise error.UnknownCommand(name)
3149 raise error.UnknownCommand(name)
3150
3150
3151 # description
3151 # description
3152 if not doc:
3152 if not doc:
3153 doc = _("(no help text available)")
3153 doc = _("(no help text available)")
3154 if util.safehasattr(doc, '__call__'):
3154 if util.safehasattr(doc, '__call__'):
3155 doc = doc()
3155 doc = doc()
3156
3156
3157 ui.write("%s\n\n" % header)
3157 ui.write("%s\n\n" % header)
3158 ui.write("%s" % minirst.format(doc, textwidth, indent=4))
3158 ui.write("%s" % minirst.format(doc, textwidth, indent=4))
3159 try:
3159 try:
3160 cmdutil.findcmd(name, table)
3160 cmdutil.findcmd(name, table)
3161 ui.write(_('\nuse "hg help -c %s" to see help for '
3161 ui.write(_('\nuse "hg help -c %s" to see help for '
3162 'the %s command\n') % (name, name))
3162 'the %s command\n') % (name, name))
3163 except error.UnknownCommand:
3163 except error.UnknownCommand:
3164 pass
3164 pass
3165
3165
3166 def helpext(name):
3166 def helpext(name):
3167 try:
3167 try:
3168 mod = extensions.find(name)
3168 mod = extensions.find(name)
3169 doc = gettext(mod.__doc__) or _('no help text available')
3169 doc = gettext(mod.__doc__) or _('no help text available')
3170 except KeyError:
3170 except KeyError:
3171 mod = None
3171 mod = None
3172 doc = extensions.disabledext(name)
3172 doc = extensions.disabledext(name)
3173 if not doc:
3173 if not doc:
3174 raise error.UnknownCommand(name)
3174 raise error.UnknownCommand(name)
3175
3175
3176 if '\n' not in doc:
3176 if '\n' not in doc:
3177 head, tail = doc, ""
3177 head, tail = doc, ""
3178 else:
3178 else:
3179 head, tail = doc.split('\n', 1)
3179 head, tail = doc.split('\n', 1)
3180 ui.write(_('%s extension - %s\n\n') % (name.split('.')[-1], head))
3180 ui.write(_('%s extension - %s\n\n') % (name.split('.')[-1], head))
3181 if tail:
3181 if tail:
3182 ui.write(minirst.format(tail, textwidth))
3182 ui.write(minirst.format(tail, textwidth))
3183 ui.status('\n')
3183 ui.status('\n')
3184
3184
3185 if mod:
3185 if mod:
3186 try:
3186 try:
3187 ct = mod.cmdtable
3187 ct = mod.cmdtable
3188 except AttributeError:
3188 except AttributeError:
3189 ct = {}
3189 ct = {}
3190 modcmds = set([c.split('|', 1)[0] for c in ct])
3190 modcmds = set([c.split('|', 1)[0] for c in ct])
3191 helplist(modcmds.__contains__)
3191 helplist(modcmds.__contains__)
3192 else:
3192 else:
3193 ui.write(_('use "hg help extensions" for information on enabling '
3193 ui.write(_('use "hg help extensions" for information on enabling '
3194 'extensions\n'))
3194 'extensions\n'))
3195
3195
3196 def helpextcmd(name):
3196 def helpextcmd(name):
3197 cmd, ext, mod = extensions.disabledcmd(ui, name, ui.config('ui', 'strict'))
3197 cmd, ext, mod = extensions.disabledcmd(ui, name, ui.config('ui', 'strict'))
3198 doc = gettext(mod.__doc__).splitlines()[0]
3198 doc = gettext(mod.__doc__).splitlines()[0]
3199
3199
3200 msg = help.listexts(_("'%s' is provided by the following "
3200 msg = help.listexts(_("'%s' is provided by the following "
3201 "extension:") % cmd, {ext: doc}, indent=4)
3201 "extension:") % cmd, {ext: doc}, indent=4)
3202 ui.write(minirst.format(msg, textwidth))
3202 ui.write(minirst.format(msg, textwidth))
3203 ui.write('\n')
3203 ui.write('\n')
3204 ui.write(_('use "hg help extensions" for information on enabling '
3204 ui.write(_('use "hg help extensions" for information on enabling '
3205 'extensions\n'))
3205 'extensions\n'))
3206
3206
3207 if name and name != 'shortlist':
3207 if name and name != 'shortlist':
3208 i = None
3208 i = None
3209 if unknowncmd:
3209 if unknowncmd:
3210 queries = (helpextcmd,)
3210 queries = (helpextcmd,)
3211 elif opts.get('extension'):
3211 elif opts.get('extension'):
3212 queries = (helpext,)
3212 queries = (helpext,)
3213 elif opts.get('command'):
3213 elif opts.get('command'):
3214 queries = (helpcmd,)
3214 queries = (helpcmd,)
3215 else:
3215 else:
3216 queries = (helptopic, helpcmd, helpext, helpextcmd)
3216 queries = (helptopic, helpcmd, helpext, helpextcmd)
3217 for f in queries:
3217 for f in queries:
3218 try:
3218 try:
3219 f(name)
3219 f(name)
3220 i = None
3220 i = None
3221 break
3221 break
3222 except error.UnknownCommand, inst:
3222 except error.UnknownCommand, inst:
3223 i = inst
3223 i = inst
3224 if i:
3224 if i:
3225 raise i
3225 raise i
3226 else:
3226 else:
3227 # program name
3227 # program name
3228 ui.status(_("Mercurial Distributed SCM\n"))
3228 ui.status(_("Mercurial Distributed SCM\n"))
3229 ui.status('\n')
3229 ui.status('\n')
3230 helplist()
3230 helplist()
3231
3231
3232
3232
3233 @command('identify|id',
3233 @command('identify|id',
3234 [('r', 'rev', '',
3234 [('r', 'rev', '',
3235 _('identify the specified revision'), _('REV')),
3235 _('identify the specified revision'), _('REV')),
3236 ('n', 'num', None, _('show local revision number')),
3236 ('n', 'num', None, _('show local revision number')),
3237 ('i', 'id', None, _('show global revision id')),
3237 ('i', 'id', None, _('show global revision id')),
3238 ('b', 'branch', None, _('show branch')),
3238 ('b', 'branch', None, _('show branch')),
3239 ('t', 'tags', None, _('show tags')),
3239 ('t', 'tags', None, _('show tags')),
3240 ('B', 'bookmarks', None, _('show bookmarks'))],
3240 ('B', 'bookmarks', None, _('show bookmarks'))],
3241 _('[-nibtB] [-r REV] [SOURCE]'))
3241 _('[-nibtB] [-r REV] [SOURCE]'))
3242 def identify(ui, repo, source=None, rev=None,
3242 def identify(ui, repo, source=None, rev=None,
3243 num=None, id=None, branch=None, tags=None, bookmarks=None):
3243 num=None, id=None, branch=None, tags=None, bookmarks=None):
3244 """identify the working copy or specified revision
3244 """identify the working copy or specified revision
3245
3245
3246 Print a summary identifying the repository state at REV using one or
3246 Print a summary identifying the repository state at REV using one or
3247 two parent hash identifiers, followed by a "+" if the working
3247 two parent hash identifiers, followed by a "+" if the working
3248 directory has uncommitted changes, the branch name (if not default),
3248 directory has uncommitted changes, the branch name (if not default),
3249 a list of tags, and a list of bookmarks.
3249 a list of tags, and a list of bookmarks.
3250
3250
3251 When REV is not given, print a summary of the current state of the
3251 When REV is not given, print a summary of the current state of the
3252 repository.
3252 repository.
3253
3253
3254 Specifying a path to a repository root or Mercurial bundle will
3254 Specifying a path to a repository root or Mercurial bundle will
3255 cause lookup to operate on that repository/bundle.
3255 cause lookup to operate on that repository/bundle.
3256
3256
3257 .. container:: verbose
3257 .. container:: verbose
3258
3258
3259 Examples:
3259 Examples:
3260
3260
3261 - generate a build identifier for the working directory::
3261 - generate a build identifier for the working directory::
3262
3262
3263 hg id --id > build-id.dat
3263 hg id --id > build-id.dat
3264
3264
3265 - find the revision corresponding to a tag::
3265 - find the revision corresponding to a tag::
3266
3266
3267 hg id -n -r 1.3
3267 hg id -n -r 1.3
3268
3268
3269 - check the most recent revision of a remote repository::
3269 - check the most recent revision of a remote repository::
3270
3270
3271 hg id -r tip http://selenic.com/hg/
3271 hg id -r tip http://selenic.com/hg/
3272
3272
3273 Returns 0 if successful.
3273 Returns 0 if successful.
3274 """
3274 """
3275
3275
3276 if not repo and not source:
3276 if not repo and not source:
3277 raise util.Abort(_("there is no Mercurial repository here "
3277 raise util.Abort(_("there is no Mercurial repository here "
3278 "(.hg not found)"))
3278 "(.hg not found)"))
3279
3279
3280 hexfunc = ui.debugflag and hex or short
3280 hexfunc = ui.debugflag and hex or short
3281 default = not (num or id or branch or tags or bookmarks)
3281 default = not (num or id or branch or tags or bookmarks)
3282 output = []
3282 output = []
3283 revs = []
3283 revs = []
3284
3284
3285 if source:
3285 if source:
3286 source, branches = hg.parseurl(ui.expandpath(source))
3286 source, branches = hg.parseurl(ui.expandpath(source))
3287 repo = hg.peer(ui, {}, source)
3287 repo = hg.peer(ui, {}, source)
3288 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
3288 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
3289
3289
3290 if not repo.local():
3290 if not repo.local():
3291 if num or branch or tags:
3291 if num or branch or tags:
3292 raise util.Abort(
3292 raise util.Abort(
3293 _("can't query remote revision number, branch, or tags"))
3293 _("can't query remote revision number, branch, or tags"))
3294 if not rev and revs:
3294 if not rev and revs:
3295 rev = revs[0]
3295 rev = revs[0]
3296 if not rev:
3296 if not rev:
3297 rev = "tip"
3297 rev = "tip"
3298
3298
3299 remoterev = repo.lookup(rev)
3299 remoterev = repo.lookup(rev)
3300 if default or id:
3300 if default or id:
3301 output = [hexfunc(remoterev)]
3301 output = [hexfunc(remoterev)]
3302
3302
3303 def getbms():
3303 def getbms():
3304 bms = []
3304 bms = []
3305
3305
3306 if 'bookmarks' in repo.listkeys('namespaces'):
3306 if 'bookmarks' in repo.listkeys('namespaces'):
3307 hexremoterev = hex(remoterev)
3307 hexremoterev = hex(remoterev)
3308 bms = [bm for bm, bmr in repo.listkeys('bookmarks').iteritems()
3308 bms = [bm for bm, bmr in repo.listkeys('bookmarks').iteritems()
3309 if bmr == hexremoterev]
3309 if bmr == hexremoterev]
3310
3310
3311 return bms
3311 return bms
3312
3312
3313 if bookmarks:
3313 if bookmarks:
3314 output.extend(getbms())
3314 output.extend(getbms())
3315 elif default and not ui.quiet:
3315 elif default and not ui.quiet:
3316 # multiple bookmarks for a single parent separated by '/'
3316 # multiple bookmarks for a single parent separated by '/'
3317 bm = '/'.join(getbms())
3317 bm = '/'.join(getbms())
3318 if bm:
3318 if bm:
3319 output.append(bm)
3319 output.append(bm)
3320 else:
3320 else:
3321 if not rev:
3321 if not rev:
3322 ctx = repo[None]
3322 ctx = repo[None]
3323 parents = ctx.parents()
3323 parents = ctx.parents()
3324 changed = ""
3324 changed = ""
3325 if default or id or num:
3325 if default or id or num:
3326 changed = util.any(repo.status()) and "+" or ""
3326 changed = util.any(repo.status()) and "+" or ""
3327 if default or id:
3327 if default or id:
3328 output = ["%s%s" %
3328 output = ["%s%s" %
3329 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
3329 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
3330 if num:
3330 if num:
3331 output.append("%s%s" %
3331 output.append("%s%s" %
3332 ('+'.join([str(p.rev()) for p in parents]), changed))
3332 ('+'.join([str(p.rev()) for p in parents]), changed))
3333 else:
3333 else:
3334 ctx = scmutil.revsingle(repo, rev)
3334 ctx = scmutil.revsingle(repo, rev)
3335 if default or id:
3335 if default or id:
3336 output = [hexfunc(ctx.node())]
3336 output = [hexfunc(ctx.node())]
3337 if num:
3337 if num:
3338 output.append(str(ctx.rev()))
3338 output.append(str(ctx.rev()))
3339
3339
3340 if default and not ui.quiet:
3340 if default and not ui.quiet:
3341 b = ctx.branch()
3341 b = ctx.branch()
3342 if b != 'default':
3342 if b != 'default':
3343 output.append("(%s)" % b)
3343 output.append("(%s)" % b)
3344
3344
3345 # multiple tags for a single parent separated by '/'
3345 # multiple tags for a single parent separated by '/'
3346 t = '/'.join(ctx.tags())
3346 t = '/'.join(ctx.tags())
3347 if t:
3347 if t:
3348 output.append(t)
3348 output.append(t)
3349
3349
3350 # multiple bookmarks for a single parent separated by '/'
3350 # multiple bookmarks for a single parent separated by '/'
3351 bm = '/'.join(ctx.bookmarks())
3351 bm = '/'.join(ctx.bookmarks())
3352 if bm:
3352 if bm:
3353 output.append(bm)
3353 output.append(bm)
3354 else:
3354 else:
3355 if branch:
3355 if branch:
3356 output.append(ctx.branch())
3356 output.append(ctx.branch())
3357
3357
3358 if tags:
3358 if tags:
3359 output.extend(ctx.tags())
3359 output.extend(ctx.tags())
3360
3360
3361 if bookmarks:
3361 if bookmarks:
3362 output.extend(ctx.bookmarks())
3362 output.extend(ctx.bookmarks())
3363
3363
3364 ui.write("%s\n" % ' '.join(output))
3364 ui.write("%s\n" % ' '.join(output))
3365
3365
3366 @command('import|patch',
3366 @command('import|patch',
3367 [('p', 'strip', 1,
3367 [('p', 'strip', 1,
3368 _('directory strip option for patch. This has the same '
3368 _('directory strip option for patch. This has the same '
3369 'meaning as the corresponding patch option'), _('NUM')),
3369 'meaning as the corresponding patch option'), _('NUM')),
3370 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3370 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3371 ('e', 'edit', False, _('invoke editor on commit messages')),
3371 ('e', 'edit', False, _('invoke editor on commit messages')),
3372 ('f', 'force', None, _('skip check for outstanding uncommitted changes')),
3372 ('f', 'force', None, _('skip check for outstanding uncommitted changes')),
3373 ('', 'no-commit', None,
3373 ('', 'no-commit', None,
3374 _("don't commit, just update the working directory")),
3374 _("don't commit, just update the working directory")),
3375 ('', 'bypass', None,
3375 ('', 'bypass', None,
3376 _("apply patch without touching the working directory")),
3376 _("apply patch without touching the working directory")),
3377 ('', 'exact', None,
3377 ('', 'exact', None,
3378 _('apply patch to the nodes from which it was generated')),
3378 _('apply patch to the nodes from which it was generated')),
3379 ('', 'import-branch', None,
3379 ('', 'import-branch', None,
3380 _('use any branch information in patch (implied by --exact)'))] +
3380 _('use any branch information in patch (implied by --exact)'))] +
3381 commitopts + commitopts2 + similarityopts,
3381 commitopts + commitopts2 + similarityopts,
3382 _('[OPTION]... PATCH...'))
3382 _('[OPTION]... PATCH...'))
3383 def import_(ui, repo, patch1=None, *patches, **opts):
3383 def import_(ui, repo, patch1=None, *patches, **opts):
3384 """import an ordered set of patches
3384 """import an ordered set of patches
3385
3385
3386 Import a list of patches and commit them individually (unless
3386 Import a list of patches and commit them individually (unless
3387 --no-commit is specified).
3387 --no-commit is specified).
3388
3388
3389 If there are outstanding changes in the working directory, import
3389 If there are outstanding changes in the working directory, import
3390 will abort unless given the -f/--force flag.
3390 will abort unless given the -f/--force flag.
3391
3391
3392 You can import a patch straight from a mail message. Even patches
3392 You can import a patch straight from a mail message. Even patches
3393 as attachments work (to use the body part, it must have type
3393 as attachments work (to use the body part, it must have type
3394 text/plain or text/x-patch). From and Subject headers of email
3394 text/plain or text/x-patch). From and Subject headers of email
3395 message are used as default committer and commit message. All
3395 message are used as default committer and commit message. All
3396 text/plain body parts before first diff are added to commit
3396 text/plain body parts before first diff are added to commit
3397 message.
3397 message.
3398
3398
3399 If the imported patch was generated by :hg:`export`, user and
3399 If the imported patch was generated by :hg:`export`, user and
3400 description from patch override values from message headers and
3400 description from patch override values from message headers and
3401 body. Values given on command line with -m/--message and -u/--user
3401 body. Values given on command line with -m/--message and -u/--user
3402 override these.
3402 override these.
3403
3403
3404 If --exact is specified, import will set the working directory to
3404 If --exact is specified, import will set the working directory to
3405 the parent of each patch before applying it, and will abort if the
3405 the parent of each patch before applying it, and will abort if the
3406 resulting changeset has a different ID than the one recorded in
3406 resulting changeset has a different ID than the one recorded in
3407 the patch. This may happen due to character set problems or other
3407 the patch. This may happen due to character set problems or other
3408 deficiencies in the text patch format.
3408 deficiencies in the text patch format.
3409
3409
3410 Use --bypass to apply and commit patches directly to the
3410 Use --bypass to apply and commit patches directly to the
3411 repository, not touching the working directory. Without --exact,
3411 repository, not touching the working directory. Without --exact,
3412 patches will be applied on top of the working directory parent
3412 patches will be applied on top of the working directory parent
3413 revision.
3413 revision.
3414
3414
3415 With -s/--similarity, hg will attempt to discover renames and
3415 With -s/--similarity, hg will attempt to discover renames and
3416 copies in the patch in the same way as 'addremove'.
3416 copies in the patch in the same way as 'addremove'.
3417
3417
3418 To read a patch from standard input, use "-" as the patch name. If
3418 To read a patch from standard input, use "-" as the patch name. If
3419 a URL is specified, the patch will be downloaded from it.
3419 a URL is specified, the patch will be downloaded from it.
3420 See :hg:`help dates` for a list of formats valid for -d/--date.
3420 See :hg:`help dates` for a list of formats valid for -d/--date.
3421
3421
3422 .. container:: verbose
3422 .. container:: verbose
3423
3423
3424 Examples:
3424 Examples:
3425
3425
3426 - import a traditional patch from a website and detect renames::
3426 - import a traditional patch from a website and detect renames::
3427
3427
3428 hg import -s 80 http://example.com/bugfix.patch
3428 hg import -s 80 http://example.com/bugfix.patch
3429
3429
3430 - import a changeset from an hgweb server::
3430 - import a changeset from an hgweb server::
3431
3431
3432 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
3432 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
3433
3433
3434 - import all the patches in an Unix-style mbox::
3434 - import all the patches in an Unix-style mbox::
3435
3435
3436 hg import incoming-patches.mbox
3436 hg import incoming-patches.mbox
3437
3437
3438 - attempt to exactly restore an exported changeset (not always
3438 - attempt to exactly restore an exported changeset (not always
3439 possible)::
3439 possible)::
3440
3440
3441 hg import --exact proposed-fix.patch
3441 hg import --exact proposed-fix.patch
3442
3442
3443 Returns 0 on success.
3443 Returns 0 on success.
3444 """
3444 """
3445
3445
3446 if not patch1:
3446 if not patch1:
3447 raise util.Abort(_('need at least one patch to import'))
3447 raise util.Abort(_('need at least one patch to import'))
3448
3448
3449 patches = (patch1,) + patches
3449 patches = (patch1,) + patches
3450
3450
3451 date = opts.get('date')
3451 date = opts.get('date')
3452 if date:
3452 if date:
3453 opts['date'] = util.parsedate(date)
3453 opts['date'] = util.parsedate(date)
3454
3454
3455 editor = cmdutil.commiteditor
3455 editor = cmdutil.commiteditor
3456 if opts.get('edit'):
3456 if opts.get('edit'):
3457 editor = cmdutil.commitforceeditor
3457 editor = cmdutil.commitforceeditor
3458
3458
3459 update = not opts.get('bypass')
3459 update = not opts.get('bypass')
3460 if not update and opts.get('no_commit'):
3460 if not update and opts.get('no_commit'):
3461 raise util.Abort(_('cannot use --no-commit with --bypass'))
3461 raise util.Abort(_('cannot use --no-commit with --bypass'))
3462 try:
3462 try:
3463 sim = float(opts.get('similarity') or 0)
3463 sim = float(opts.get('similarity') or 0)
3464 except ValueError:
3464 except ValueError:
3465 raise util.Abort(_('similarity must be a number'))
3465 raise util.Abort(_('similarity must be a number'))
3466 if sim < 0 or sim > 100:
3466 if sim < 0 or sim > 100:
3467 raise util.Abort(_('similarity must be between 0 and 100'))
3467 raise util.Abort(_('similarity must be between 0 and 100'))
3468 if sim and not update:
3468 if sim and not update:
3469 raise util.Abort(_('cannot use --similarity with --bypass'))
3469 raise util.Abort(_('cannot use --similarity with --bypass'))
3470
3470
3471 if (opts.get('exact') or not opts.get('force')) and update:
3471 if (opts.get('exact') or not opts.get('force')) and update:
3472 cmdutil.bailifchanged(repo)
3472 cmdutil.bailifchanged(repo)
3473
3473
3474 base = opts["base"]
3474 base = opts["base"]
3475 strip = opts["strip"]
3475 strip = opts["strip"]
3476 wlock = lock = tr = None
3476 wlock = lock = tr = None
3477 msgs = []
3477 msgs = []
3478
3478
3479 def checkexact(repo, n, nodeid):
3479 def checkexact(repo, n, nodeid):
3480 if opts.get('exact') and hex(n) != nodeid:
3480 if opts.get('exact') and hex(n) != nodeid:
3481 repo.rollback()
3481 repo.rollback()
3482 raise util.Abort(_('patch is damaged or loses information'))
3482 raise util.Abort(_('patch is damaged or loses information'))
3483
3483
3484 def tryone(ui, hunk, parents):
3484 def tryone(ui, hunk, parents):
3485 tmpname, message, user, date, branch, nodeid, p1, p2 = \
3485 tmpname, message, user, date, branch, nodeid, p1, p2 = \
3486 patch.extract(ui, hunk)
3486 patch.extract(ui, hunk)
3487
3487
3488 if not tmpname:
3488 if not tmpname:
3489 return (None, None)
3489 return (None, None)
3490 msg = _('applied to working directory')
3490 msg = _('applied to working directory')
3491
3491
3492 try:
3492 try:
3493 cmdline_message = cmdutil.logmessage(ui, opts)
3493 cmdline_message = cmdutil.logmessage(ui, opts)
3494 if cmdline_message:
3494 if cmdline_message:
3495 # pickup the cmdline msg
3495 # pickup the cmdline msg
3496 message = cmdline_message
3496 message = cmdline_message
3497 elif message:
3497 elif message:
3498 # pickup the patch msg
3498 # pickup the patch msg
3499 message = message.strip()
3499 message = message.strip()
3500 else:
3500 else:
3501 # launch the editor
3501 # launch the editor
3502 message = None
3502 message = None
3503 ui.debug('message:\n%s\n' % message)
3503 ui.debug('message:\n%s\n' % message)
3504
3504
3505 if len(parents) == 1:
3505 if len(parents) == 1:
3506 parents.append(repo[nullid])
3506 parents.append(repo[nullid])
3507 if opts.get('exact'):
3507 if opts.get('exact'):
3508 if not nodeid or not p1:
3508 if not nodeid or not p1:
3509 raise util.Abort(_('not a Mercurial patch'))
3509 raise util.Abort(_('not a Mercurial patch'))
3510 p1 = repo[p1]
3510 p1 = repo[p1]
3511 p2 = repo[p2 or nullid]
3511 p2 = repo[p2 or nullid]
3512 elif p2:
3512 elif p2:
3513 try:
3513 try:
3514 p1 = repo[p1]
3514 p1 = repo[p1]
3515 p2 = repo[p2]
3515 p2 = repo[p2]
3516 except error.RepoError:
3516 except error.RepoError:
3517 p1, p2 = parents
3517 p1, p2 = parents
3518 else:
3518 else:
3519 p1, p2 = parents
3519 p1, p2 = parents
3520
3520
3521 n = None
3521 n = None
3522 if update:
3522 if update:
3523 if opts.get('exact') and p1 != parents[0]:
3523 if opts.get('exact') and p1 != parents[0]:
3524 hg.clean(repo, p1.node())
3524 hg.clean(repo, p1.node())
3525 if p1 != parents[0] and p2 != parents[1]:
3525 if p1 != parents[0] and p2 != parents[1]:
3526 repo.dirstate.setparents(p1.node(), p2.node())
3526 repo.dirstate.setparents(p1.node(), p2.node())
3527
3527
3528 if opts.get('exact') or opts.get('import_branch'):
3528 if opts.get('exact') or opts.get('import_branch'):
3529 repo.dirstate.setbranch(branch or 'default')
3529 repo.dirstate.setbranch(branch or 'default')
3530
3530
3531 files = set()
3531 files = set()
3532 patch.patch(ui, repo, tmpname, strip=strip, files=files,
3532 patch.patch(ui, repo, tmpname, strip=strip, files=files,
3533 eolmode=None, similarity=sim / 100.0)
3533 eolmode=None, similarity=sim / 100.0)
3534 files = list(files)
3534 files = list(files)
3535 if opts.get('no_commit'):
3535 if opts.get('no_commit'):
3536 if message:
3536 if message:
3537 msgs.append(message)
3537 msgs.append(message)
3538 else:
3538 else:
3539 if opts.get('exact'):
3539 if opts.get('exact'):
3540 m = None
3540 m = None
3541 else:
3541 else:
3542 m = scmutil.matchfiles(repo, files or [])
3542 m = scmutil.matchfiles(repo, files or [])
3543 n = repo.commit(message, opts.get('user') or user,
3543 n = repo.commit(message, opts.get('user') or user,
3544 opts.get('date') or date, match=m,
3544 opts.get('date') or date, match=m,
3545 editor=editor)
3545 editor=editor)
3546 checkexact(repo, n, nodeid)
3546 checkexact(repo, n, nodeid)
3547 else:
3547 else:
3548 if opts.get('exact') or opts.get('import_branch'):
3548 if opts.get('exact') or opts.get('import_branch'):
3549 branch = branch or 'default'
3549 branch = branch or 'default'
3550 else:
3550 else:
3551 branch = p1.branch()
3551 branch = p1.branch()
3552 store = patch.filestore()
3552 store = patch.filestore()
3553 try:
3553 try:
3554 files = set()
3554 files = set()
3555 try:
3555 try:
3556 patch.patchrepo(ui, repo, p1, store, tmpname, strip,
3556 patch.patchrepo(ui, repo, p1, store, tmpname, strip,
3557 files, eolmode=None)
3557 files, eolmode=None)
3558 except patch.PatchError, e:
3558 except patch.PatchError, e:
3559 raise util.Abort(str(e))
3559 raise util.Abort(str(e))
3560 memctx = patch.makememctx(repo, (p1.node(), p2.node()),
3560 memctx = patch.makememctx(repo, (p1.node(), p2.node()),
3561 message,
3561 message,
3562 opts.get('user') or user,
3562 opts.get('user') or user,
3563 opts.get('date') or date,
3563 opts.get('date') or date,
3564 branch, files, store,
3564 branch, files, store,
3565 editor=cmdutil.commiteditor)
3565 editor=cmdutil.commiteditor)
3566 repo.savecommitmessage(memctx.description())
3566 repo.savecommitmessage(memctx.description())
3567 n = memctx.commit()
3567 n = memctx.commit()
3568 checkexact(repo, n, nodeid)
3568 checkexact(repo, n, nodeid)
3569 finally:
3569 finally:
3570 store.close()
3570 store.close()
3571 if n:
3571 if n:
3572 # i18n: refers to a short changeset id
3572 # i18n: refers to a short changeset id
3573 msg = _('created %s') % short(n)
3573 msg = _('created %s') % short(n)
3574 return (msg, n)
3574 return (msg, n)
3575 finally:
3575 finally:
3576 os.unlink(tmpname)
3576 os.unlink(tmpname)
3577
3577
3578 try:
3578 try:
3579 try:
3579 try:
3580 wlock = repo.wlock()
3580 wlock = repo.wlock()
3581 lock = repo.lock()
3581 lock = repo.lock()
3582 tr = repo.transaction('import')
3582 tr = repo.transaction('import')
3583 parents = repo.parents()
3583 parents = repo.parents()
3584 for patchurl in patches:
3584 for patchurl in patches:
3585 if patchurl == '-':
3585 if patchurl == '-':
3586 ui.status(_('applying patch from stdin\n'))
3586 ui.status(_('applying patch from stdin\n'))
3587 patchfile = ui.fin
3587 patchfile = ui.fin
3588 patchurl = 'stdin' # for error message
3588 patchurl = 'stdin' # for error message
3589 else:
3589 else:
3590 patchurl = os.path.join(base, patchurl)
3590 patchurl = os.path.join(base, patchurl)
3591 ui.status(_('applying %s\n') % patchurl)
3591 ui.status(_('applying %s\n') % patchurl)
3592 patchfile = url.open(ui, patchurl)
3592 patchfile = url.open(ui, patchurl)
3593
3593
3594 haspatch = False
3594 haspatch = False
3595 for hunk in patch.split(patchfile):
3595 for hunk in patch.split(patchfile):
3596 (msg, node) = tryone(ui, hunk, parents)
3596 (msg, node) = tryone(ui, hunk, parents)
3597 if msg:
3597 if msg:
3598 haspatch = True
3598 haspatch = True
3599 ui.note(msg + '\n')
3599 ui.note(msg + '\n')
3600 if update or opts.get('exact'):
3600 if update or opts.get('exact'):
3601 parents = repo.parents()
3601 parents = repo.parents()
3602 else:
3602 else:
3603 parents = [repo[node]]
3603 parents = [repo[node]]
3604
3604
3605 if not haspatch:
3605 if not haspatch:
3606 raise util.Abort(_('%s: no diffs found') % patchurl)
3606 raise util.Abort(_('%s: no diffs found') % patchurl)
3607
3607
3608 tr.close()
3608 tr.close()
3609 if msgs:
3609 if msgs:
3610 repo.savecommitmessage('\n* * *\n'.join(msgs))
3610 repo.savecommitmessage('\n* * *\n'.join(msgs))
3611 except:
3611 except:
3612 # wlock.release() indirectly calls dirstate.write(): since
3612 # wlock.release() indirectly calls dirstate.write(): since
3613 # we're crashing, we do not want to change the working dir
3613 # we're crashing, we do not want to change the working dir
3614 # parent after all, so make sure it writes nothing
3614 # parent after all, so make sure it writes nothing
3615 repo.dirstate.invalidate()
3615 repo.dirstate.invalidate()
3616 raise
3616 raise
3617 finally:
3617 finally:
3618 if tr:
3618 if tr:
3619 tr.release()
3619 tr.release()
3620 release(lock, wlock)
3620 release(lock, wlock)
3621
3621
3622 @command('incoming|in',
3622 @command('incoming|in',
3623 [('f', 'force', None,
3623 [('f', 'force', None,
3624 _('run even if remote repository is unrelated')),
3624 _('run even if remote repository is unrelated')),
3625 ('n', 'newest-first', None, _('show newest record first')),
3625 ('n', 'newest-first', None, _('show newest record first')),
3626 ('', 'bundle', '',
3626 ('', 'bundle', '',
3627 _('file to store the bundles into'), _('FILE')),
3627 _('file to store the bundles into'), _('FILE')),
3628 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3628 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3629 ('B', 'bookmarks', False, _("compare bookmarks")),
3629 ('B', 'bookmarks', False, _("compare bookmarks")),
3630 ('b', 'branch', [],
3630 ('b', 'branch', [],
3631 _('a specific branch you would like to pull'), _('BRANCH')),
3631 _('a specific branch you would like to pull'), _('BRANCH')),
3632 ] + logopts + remoteopts + subrepoopts,
3632 ] + logopts + remoteopts + subrepoopts,
3633 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3633 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3634 def incoming(ui, repo, source="default", **opts):
3634 def incoming(ui, repo, source="default", **opts):
3635 """show new changesets found in source
3635 """show new changesets found in source
3636
3636
3637 Show new changesets found in the specified path/URL or the default
3637 Show new changesets found in the specified path/URL or the default
3638 pull location. These are the changesets that would have been pulled
3638 pull location. These are the changesets that would have been pulled
3639 if a pull at the time you issued this command.
3639 if a pull at the time you issued this command.
3640
3640
3641 For remote repository, using --bundle avoids downloading the
3641 For remote repository, using --bundle avoids downloading the
3642 changesets twice if the incoming is followed by a pull.
3642 changesets twice if the incoming is followed by a pull.
3643
3643
3644 See pull for valid source format details.
3644 See pull for valid source format details.
3645
3645
3646 Returns 0 if there are incoming changes, 1 otherwise.
3646 Returns 0 if there are incoming changes, 1 otherwise.
3647 """
3647 """
3648 if opts.get('bundle') and opts.get('subrepos'):
3648 if opts.get('bundle') and opts.get('subrepos'):
3649 raise util.Abort(_('cannot combine --bundle and --subrepos'))
3649 raise util.Abort(_('cannot combine --bundle and --subrepos'))
3650
3650
3651 if opts.get('bookmarks'):
3651 if opts.get('bookmarks'):
3652 source, branches = hg.parseurl(ui.expandpath(source),
3652 source, branches = hg.parseurl(ui.expandpath(source),
3653 opts.get('branch'))
3653 opts.get('branch'))
3654 other = hg.peer(repo, opts, source)
3654 other = hg.peer(repo, opts, source)
3655 if 'bookmarks' not in other.listkeys('namespaces'):
3655 if 'bookmarks' not in other.listkeys('namespaces'):
3656 ui.warn(_("remote doesn't support bookmarks\n"))
3656 ui.warn(_("remote doesn't support bookmarks\n"))
3657 return 0
3657 return 0
3658 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3658 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3659 return bookmarks.diff(ui, repo, other)
3659 return bookmarks.diff(ui, repo, other)
3660
3660
3661 repo._subtoppath = ui.expandpath(source)
3661 repo._subtoppath = ui.expandpath(source)
3662 try:
3662 try:
3663 return hg.incoming(ui, repo, source, opts)
3663 return hg.incoming(ui, repo, source, opts)
3664 finally:
3664 finally:
3665 del repo._subtoppath
3665 del repo._subtoppath
3666
3666
3667
3667
3668 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'))
3668 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'))
3669 def init(ui, dest=".", **opts):
3669 def init(ui, dest=".", **opts):
3670 """create a new repository in the given directory
3670 """create a new repository in the given directory
3671
3671
3672 Initialize a new repository in the given directory. If the given
3672 Initialize a new repository in the given directory. If the given
3673 directory does not exist, it will be created.
3673 directory does not exist, it will be created.
3674
3674
3675 If no directory is given, the current directory is used.
3675 If no directory is given, the current directory is used.
3676
3676
3677 It is possible to specify an ``ssh://`` URL as the destination.
3677 It is possible to specify an ``ssh://`` URL as the destination.
3678 See :hg:`help urls` for more information.
3678 See :hg:`help urls` for more information.
3679
3679
3680 Returns 0 on success.
3680 Returns 0 on success.
3681 """
3681 """
3682 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3682 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3683
3683
3684 @command('locate',
3684 @command('locate',
3685 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3685 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3686 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3686 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3687 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3687 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3688 ] + walkopts,
3688 ] + walkopts,
3689 _('[OPTION]... [PATTERN]...'))
3689 _('[OPTION]... [PATTERN]...'))
3690 def locate(ui, repo, *pats, **opts):
3690 def locate(ui, repo, *pats, **opts):
3691 """locate files matching specific patterns
3691 """locate files matching specific patterns
3692
3692
3693 Print files under Mercurial control in the working directory whose
3693 Print files under Mercurial control in the working directory whose
3694 names match the given patterns.
3694 names match the given patterns.
3695
3695
3696 By default, this command searches all directories in the working
3696 By default, this command searches all directories in the working
3697 directory. To search just the current directory and its
3697 directory. To search just the current directory and its
3698 subdirectories, use "--include .".
3698 subdirectories, use "--include .".
3699
3699
3700 If no patterns are given to match, this command prints the names
3700 If no patterns are given to match, this command prints the names
3701 of all files under Mercurial control in the working directory.
3701 of all files under Mercurial control in the working directory.
3702
3702
3703 If you want to feed the output of this command into the "xargs"
3703 If you want to feed the output of this command into the "xargs"
3704 command, use the -0 option to both this command and "xargs". This
3704 command, use the -0 option to both this command and "xargs". This
3705 will avoid the problem of "xargs" treating single filenames that
3705 will avoid the problem of "xargs" treating single filenames that
3706 contain whitespace as multiple filenames.
3706 contain whitespace as multiple filenames.
3707
3707
3708 Returns 0 if a match is found, 1 otherwise.
3708 Returns 0 if a match is found, 1 otherwise.
3709 """
3709 """
3710 end = opts.get('print0') and '\0' or '\n'
3710 end = opts.get('print0') and '\0' or '\n'
3711 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3711 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3712
3712
3713 ret = 1
3713 ret = 1
3714 m = scmutil.match(repo[rev], pats, opts, default='relglob')
3714 m = scmutil.match(repo[rev], pats, opts, default='relglob')
3715 m.bad = lambda x, y: False
3715 m.bad = lambda x, y: False
3716 for abs in repo[rev].walk(m):
3716 for abs in repo[rev].walk(m):
3717 if not rev and abs not in repo.dirstate:
3717 if not rev and abs not in repo.dirstate:
3718 continue
3718 continue
3719 if opts.get('fullpath'):
3719 if opts.get('fullpath'):
3720 ui.write(repo.wjoin(abs), end)
3720 ui.write(repo.wjoin(abs), end)
3721 else:
3721 else:
3722 ui.write(((pats and m.rel(abs)) or abs), end)
3722 ui.write(((pats and m.rel(abs)) or abs), end)
3723 ret = 0
3723 ret = 0
3724
3724
3725 return ret
3725 return ret
3726
3726
3727 @command('^log|history',
3727 @command('^log|history',
3728 [('f', 'follow', None,
3728 [('f', 'follow', None,
3729 _('follow changeset history, or file history across copies and renames')),
3729 _('follow changeset history, or file history across copies and renames')),
3730 ('', 'follow-first', None,
3730 ('', 'follow-first', None,
3731 _('only follow the first parent of merge changesets (DEPRECATED)')),
3731 _('only follow the first parent of merge changesets (DEPRECATED)')),
3732 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3732 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3733 ('C', 'copies', None, _('show copied files')),
3733 ('C', 'copies', None, _('show copied files')),
3734 ('k', 'keyword', [],
3734 ('k', 'keyword', [],
3735 _('do case-insensitive search for a given text'), _('TEXT')),
3735 _('do case-insensitive search for a given text'), _('TEXT')),
3736 ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
3736 ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
3737 ('', 'removed', None, _('include revisions where files were removed')),
3737 ('', 'removed', None, _('include revisions where files were removed')),
3738 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3738 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3739 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3739 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3740 ('', 'only-branch', [],
3740 ('', 'only-branch', [],
3741 _('show only changesets within the given named branch (DEPRECATED)'),
3741 _('show only changesets within the given named branch (DEPRECATED)'),
3742 _('BRANCH')),
3742 _('BRANCH')),
3743 ('b', 'branch', [],
3743 ('b', 'branch', [],
3744 _('show changesets within the given named branch'), _('BRANCH')),
3744 _('show changesets within the given named branch'), _('BRANCH')),
3745 ('P', 'prune', [],
3745 ('P', 'prune', [],
3746 _('do not display revision or any of its ancestors'), _('REV')),
3746 _('do not display revision or any of its ancestors'), _('REV')),
3747 ('', 'hidden', False, _('show hidden changesets (DEPRECATED)')),
3747 ('', 'hidden', False, _('show hidden changesets (DEPRECATED)')),
3748 ] + logopts + walkopts,
3748 ] + logopts + walkopts,
3749 _('[OPTION]... [FILE]'))
3749 _('[OPTION]... [FILE]'))
3750 def log(ui, repo, *pats, **opts):
3750 def log(ui, repo, *pats, **opts):
3751 """show revision history of entire repository or files
3751 """show revision history of entire repository or files
3752
3752
3753 Print the revision history of the specified files or the entire
3753 Print the revision history of the specified files or the entire
3754 project.
3754 project.
3755
3755
3756 If no revision range is specified, the default is ``tip:0`` unless
3756 If no revision range is specified, the default is ``tip:0`` unless
3757 --follow is set, in which case the working directory parent is
3757 --follow is set, in which case the working directory parent is
3758 used as the starting revision.
3758 used as the starting revision.
3759
3759
3760 File history is shown without following rename or copy history of
3760 File history is shown without following rename or copy history of
3761 files. Use -f/--follow with a filename to follow history across
3761 files. Use -f/--follow with a filename to follow history across
3762 renames and copies. --follow without a filename will only show
3762 renames and copies. --follow without a filename will only show
3763 ancestors or descendants of the starting revision.
3763 ancestors or descendants of the starting revision.
3764
3764
3765 By default this command prints revision number and changeset id,
3765 By default this command prints revision number and changeset id,
3766 tags, non-trivial parents, user, date and time, and a summary for
3766 tags, non-trivial parents, user, date and time, and a summary for
3767 each commit. When the -v/--verbose switch is used, the list of
3767 each commit. When the -v/--verbose switch is used, the list of
3768 changed files and full commit message are shown.
3768 changed files and full commit message are shown.
3769
3769
3770 .. note::
3770 .. note::
3771 log -p/--patch may generate unexpected diff output for merge
3771 log -p/--patch may generate unexpected diff output for merge
3772 changesets, as it will only compare the merge changeset against
3772 changesets, as it will only compare the merge changeset against
3773 its first parent. Also, only files different from BOTH parents
3773 its first parent. Also, only files different from BOTH parents
3774 will appear in files:.
3774 will appear in files:.
3775
3775
3776 .. note::
3776 .. note::
3777 for performance reasons, log FILE may omit duplicate changes
3777 for performance reasons, log FILE may omit duplicate changes
3778 made on branches and will not show deletions. To see all
3778 made on branches and will not show deletions. To see all
3779 changes including duplicates and deletions, use the --removed
3779 changes including duplicates and deletions, use the --removed
3780 switch.
3780 switch.
3781
3781
3782 .. container:: verbose
3782 .. container:: verbose
3783
3783
3784 Some examples:
3784 Some examples:
3785
3785
3786 - changesets with full descriptions and file lists::
3786 - changesets with full descriptions and file lists::
3787
3787
3788 hg log -v
3788 hg log -v
3789
3789
3790 - changesets ancestral to the working directory::
3790 - changesets ancestral to the working directory::
3791
3791
3792 hg log -f
3792 hg log -f
3793
3793
3794 - last 10 commits on the current branch::
3794 - last 10 commits on the current branch::
3795
3795
3796 hg log -l 10 -b .
3796 hg log -l 10 -b .
3797
3797
3798 - changesets showing all modifications of a file, including removals::
3798 - changesets showing all modifications of a file, including removals::
3799
3799
3800 hg log --removed file.c
3800 hg log --removed file.c
3801
3801
3802 - all changesets that touch a directory, with diffs, excluding merges::
3802 - all changesets that touch a directory, with diffs, excluding merges::
3803
3803
3804 hg log -Mp lib/
3804 hg log -Mp lib/
3805
3805
3806 - all revision numbers that match a keyword::
3806 - all revision numbers that match a keyword::
3807
3807
3808 hg log -k bug --template "{rev}\\n"
3808 hg log -k bug --template "{rev}\\n"
3809
3809
3810 - check if a given changeset is included is a tagged release::
3810 - check if a given changeset is included is a tagged release::
3811
3811
3812 hg log -r "a21ccf and ancestor(1.9)"
3812 hg log -r "a21ccf and ancestor(1.9)"
3813
3813
3814 - find all changesets by some user in a date range::
3814 - find all changesets by some user in a date range::
3815
3815
3816 hg log -k alice -d "may 2008 to jul 2008"
3816 hg log -k alice -d "may 2008 to jul 2008"
3817
3817
3818 - summary of all changesets after the last tag::
3818 - summary of all changesets after the last tag::
3819
3819
3820 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3820 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3821
3821
3822 See :hg:`help dates` for a list of formats valid for -d/--date.
3822 See :hg:`help dates` for a list of formats valid for -d/--date.
3823
3823
3824 See :hg:`help revisions` and :hg:`help revsets` for more about
3824 See :hg:`help revisions` and :hg:`help revsets` for more about
3825 specifying revisions.
3825 specifying revisions.
3826
3826
3827 Returns 0 on success.
3827 Returns 0 on success.
3828 """
3828 """
3829
3829
3830 matchfn = scmutil.match(repo[None], pats, opts)
3830 matchfn = scmutil.match(repo[None], pats, opts)
3831 limit = cmdutil.loglimit(opts)
3831 limit = cmdutil.loglimit(opts)
3832 count = 0
3832 count = 0
3833
3833
3834 endrev = None
3834 endrev = None
3835 if opts.get('copies') and opts.get('rev'):
3835 if opts.get('copies') and opts.get('rev'):
3836 endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
3836 endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
3837
3837
3838 df = False
3838 df = False
3839 if opts["date"]:
3839 if opts["date"]:
3840 df = util.matchdate(opts["date"])
3840 df = util.matchdate(opts["date"])
3841
3841
3842 branches = opts.get('branch', []) + opts.get('only_branch', [])
3842 branches = opts.get('branch', []) + opts.get('only_branch', [])
3843 opts['branch'] = [repo.lookupbranch(b) for b in branches]
3843 opts['branch'] = [repo.lookupbranch(b) for b in branches]
3844
3844
3845 displayer = cmdutil.show_changeset(ui, repo, opts, True)
3845 displayer = cmdutil.show_changeset(ui, repo, opts, True)
3846 def prep(ctx, fns):
3846 def prep(ctx, fns):
3847 rev = ctx.rev()
3847 rev = ctx.rev()
3848 parents = [p for p in repo.changelog.parentrevs(rev)
3848 parents = [p for p in repo.changelog.parentrevs(rev)
3849 if p != nullrev]
3849 if p != nullrev]
3850 if opts.get('no_merges') and len(parents) == 2:
3850 if opts.get('no_merges') and len(parents) == 2:
3851 return
3851 return
3852 if opts.get('only_merges') and len(parents) != 2:
3852 if opts.get('only_merges') and len(parents) != 2:
3853 return
3853 return
3854 if opts.get('branch') and ctx.branch() not in opts['branch']:
3854 if opts.get('branch') and ctx.branch() not in opts['branch']:
3855 return
3855 return
3856 if not opts.get('hidden') and ctx.hidden():
3856 if not opts.get('hidden') and ctx.hidden():
3857 return
3857 return
3858 if df and not df(ctx.date()[0]):
3858 if df and not df(ctx.date()[0]):
3859 return
3859 return
3860 if opts['user'] and not [k for k in opts['user']
3860 if opts['user'] and not [k for k in opts['user']
3861 if k.lower() in ctx.user().lower()]:
3861 if k.lower() in ctx.user().lower()]:
3862 return
3862 return
3863 if opts.get('keyword'):
3863 if opts.get('keyword'):
3864 for k in [kw.lower() for kw in opts['keyword']]:
3864 for k in [kw.lower() for kw in opts['keyword']]:
3865 if (k in ctx.user().lower() or
3865 if (k in ctx.user().lower() or
3866 k in ctx.description().lower() or
3866 k in ctx.description().lower() or
3867 k in " ".join(ctx.files()).lower()):
3867 k in " ".join(ctx.files()).lower()):
3868 break
3868 break
3869 else:
3869 else:
3870 return
3870 return
3871
3871
3872 copies = None
3872 copies = None
3873 if opts.get('copies') and rev:
3873 if opts.get('copies') and rev:
3874 copies = []
3874 copies = []
3875 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3875 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3876 for fn in ctx.files():
3876 for fn in ctx.files():
3877 rename = getrenamed(fn, rev)
3877 rename = getrenamed(fn, rev)
3878 if rename:
3878 if rename:
3879 copies.append((fn, rename[0]))
3879 copies.append((fn, rename[0]))
3880
3880
3881 revmatchfn = None
3881 revmatchfn = None
3882 if opts.get('patch') or opts.get('stat'):
3882 if opts.get('patch') or opts.get('stat'):
3883 if opts.get('follow') or opts.get('follow_first'):
3883 if opts.get('follow') or opts.get('follow_first'):
3884 # note: this might be wrong when following through merges
3884 # note: this might be wrong when following through merges
3885 revmatchfn = scmutil.match(repo[None], fns, default='path')
3885 revmatchfn = scmutil.match(repo[None], fns, default='path')
3886 else:
3886 else:
3887 revmatchfn = matchfn
3887 revmatchfn = matchfn
3888
3888
3889 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3889 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3890
3890
3891 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3891 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3892 if count == limit:
3892 if count == limit:
3893 break
3893 break
3894 if displayer.flush(ctx.rev()):
3894 if displayer.flush(ctx.rev()):
3895 count += 1
3895 count += 1
3896 displayer.close()
3896 displayer.close()
3897
3897
3898 @command('manifest',
3898 @command('manifest',
3899 [('r', 'rev', '', _('revision to display'), _('REV')),
3899 [('r', 'rev', '', _('revision to display'), _('REV')),
3900 ('', 'all', False, _("list files from all revisions"))],
3900 ('', 'all', False, _("list files from all revisions"))],
3901 _('[-r REV]'))
3901 _('[-r REV]'))
3902 def manifest(ui, repo, node=None, rev=None, **opts):
3902 def manifest(ui, repo, node=None, rev=None, **opts):
3903 """output the current or given revision of the project manifest
3903 """output the current or given revision of the project manifest
3904
3904
3905 Print a list of version controlled files for the given revision.
3905 Print a list of version controlled files for the given revision.
3906 If no revision is given, the first parent of the working directory
3906 If no revision is given, the first parent of the working directory
3907 is used, or the null revision if no revision is checked out.
3907 is used, or the null revision if no revision is checked out.
3908
3908
3909 With -v, print file permissions, symlink and executable bits.
3909 With -v, print file permissions, symlink and executable bits.
3910 With --debug, print file revision hashes.
3910 With --debug, print file revision hashes.
3911
3911
3912 If option --all is specified, the list of all files from all revisions
3912 If option --all is specified, the list of all files from all revisions
3913 is printed. This includes deleted and renamed files.
3913 is printed. This includes deleted and renamed files.
3914
3914
3915 Returns 0 on success.
3915 Returns 0 on success.
3916 """
3916 """
3917 if opts.get('all'):
3917 if opts.get('all'):
3918 if rev or node:
3918 if rev or node:
3919 raise util.Abort(_("can't specify a revision with --all"))
3919 raise util.Abort(_("can't specify a revision with --all"))
3920
3920
3921 res = []
3921 res = []
3922 prefix = "data/"
3922 prefix = "data/"
3923 suffix = ".i"
3923 suffix = ".i"
3924 plen = len(prefix)
3924 plen = len(prefix)
3925 slen = len(suffix)
3925 slen = len(suffix)
3926 lock = repo.lock()
3926 lock = repo.lock()
3927 try:
3927 try:
3928 for fn, b, size in repo.store.datafiles():
3928 for fn, b, size in repo.store.datafiles():
3929 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3929 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3930 res.append(fn[plen:-slen])
3930 res.append(fn[plen:-slen])
3931 finally:
3931 finally:
3932 lock.release()
3932 lock.release()
3933 for f in sorted(res):
3933 for f in sorted(res):
3934 ui.write("%s\n" % f)
3934 ui.write("%s\n" % f)
3935 return
3935 return
3936
3936
3937 if rev and node:
3937 if rev and node:
3938 raise util.Abort(_("please specify just one revision"))
3938 raise util.Abort(_("please specify just one revision"))
3939
3939
3940 if not node:
3940 if not node:
3941 node = rev
3941 node = rev
3942
3942
3943 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
3943 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
3944 ctx = scmutil.revsingle(repo, node)
3944 ctx = scmutil.revsingle(repo, node)
3945 for f in ctx:
3945 for f in ctx:
3946 if ui.debugflag:
3946 if ui.debugflag:
3947 ui.write("%40s " % hex(ctx.manifest()[f]))
3947 ui.write("%40s " % hex(ctx.manifest()[f]))
3948 if ui.verbose:
3948 if ui.verbose:
3949 ui.write(decor[ctx.flags(f)])
3949 ui.write(decor[ctx.flags(f)])
3950 ui.write("%s\n" % f)
3950 ui.write("%s\n" % f)
3951
3951
3952 @command('^merge',
3952 @command('^merge',
3953 [('f', 'force', None, _('force a merge with outstanding changes')),
3953 [('f', 'force', None, _('force a merge with outstanding changes')),
3954 ('r', 'rev', '', _('revision to merge'), _('REV')),
3954 ('r', 'rev', '', _('revision to merge'), _('REV')),
3955 ('P', 'preview', None,
3955 ('P', 'preview', None,
3956 _('review revisions to merge (no merge is performed)'))
3956 _('review revisions to merge (no merge is performed)'))
3957 ] + mergetoolopts,
3957 ] + mergetoolopts,
3958 _('[-P] [-f] [[-r] REV]'))
3958 _('[-P] [-f] [[-r] REV]'))
3959 def merge(ui, repo, node=None, **opts):
3959 def merge(ui, repo, node=None, **opts):
3960 """merge working directory with another revision
3960 """merge working directory with another revision
3961
3961
3962 The current working directory is updated with all changes made in
3962 The current working directory is updated with all changes made in
3963 the requested revision since the last common predecessor revision.
3963 the requested revision since the last common predecessor revision.
3964
3964
3965 Files that changed between either parent are marked as changed for
3965 Files that changed between either parent are marked as changed for
3966 the next commit and a commit must be performed before any further
3966 the next commit and a commit must be performed before any further
3967 updates to the repository are allowed. The next commit will have
3967 updates to the repository are allowed. The next commit will have
3968 two parents.
3968 two parents.
3969
3969
3970 ``--tool`` can be used to specify the merge tool used for file
3970 ``--tool`` can be used to specify the merge tool used for file
3971 merges. It overrides the HGMERGE environment variable and your
3971 merges. It overrides the HGMERGE environment variable and your
3972 configuration files. See :hg:`help merge-tools` for options.
3972 configuration files. See :hg:`help merge-tools` for options.
3973
3973
3974 If no revision is specified, the working directory's parent is a
3974 If no revision is specified, the working directory's parent is a
3975 head revision, and the current branch contains exactly one other
3975 head revision, and the current branch contains exactly one other
3976 head, the other head is merged with by default. Otherwise, an
3976 head, the other head is merged with by default. Otherwise, an
3977 explicit revision with which to merge with must be provided.
3977 explicit revision with which to merge with must be provided.
3978
3978
3979 :hg:`resolve` must be used to resolve unresolved files.
3979 :hg:`resolve` must be used to resolve unresolved files.
3980
3980
3981 To undo an uncommitted merge, use :hg:`update --clean .` which
3981 To undo an uncommitted merge, use :hg:`update --clean .` which
3982 will check out a clean copy of the original merge parent, losing
3982 will check out a clean copy of the original merge parent, losing
3983 all changes.
3983 all changes.
3984
3984
3985 Returns 0 on success, 1 if there are unresolved files.
3985 Returns 0 on success, 1 if there are unresolved files.
3986 """
3986 """
3987
3987
3988 if opts.get('rev') and node:
3988 if opts.get('rev') and node:
3989 raise util.Abort(_("please specify just one revision"))
3989 raise util.Abort(_("please specify just one revision"))
3990 if not node:
3990 if not node:
3991 node = opts.get('rev')
3991 node = opts.get('rev')
3992
3992
3993 if not node:
3993 if not node:
3994 branch = repo[None].branch()
3994 branch = repo[None].branch()
3995 bheads = repo.branchheads(branch)
3995 bheads = repo.branchheads(branch)
3996 if len(bheads) > 2:
3996 if len(bheads) > 2:
3997 raise util.Abort(_("branch '%s' has %d heads - "
3997 raise util.Abort(_("branch '%s' has %d heads - "
3998 "please merge with an explicit rev")
3998 "please merge with an explicit rev")
3999 % (branch, len(bheads)),
3999 % (branch, len(bheads)),
4000 hint=_("run 'hg heads .' to see heads"))
4000 hint=_("run 'hg heads .' to see heads"))
4001
4001
4002 parent = repo.dirstate.p1()
4002 parent = repo.dirstate.p1()
4003 if len(bheads) == 1:
4003 if len(bheads) == 1:
4004 if len(repo.heads()) > 1:
4004 if len(repo.heads()) > 1:
4005 raise util.Abort(_("branch '%s' has one head - "
4005 raise util.Abort(_("branch '%s' has one head - "
4006 "please merge with an explicit rev")
4006 "please merge with an explicit rev")
4007 % branch,
4007 % branch,
4008 hint=_("run 'hg heads' to see all heads"))
4008 hint=_("run 'hg heads' to see all heads"))
4009 msg = _('there is nothing to merge')
4009 msg = _('there is nothing to merge')
4010 if parent != repo.lookup(repo[None].branch()):
4010 if parent != repo.lookup(repo[None].branch()):
4011 msg = _('%s - use "hg update" instead') % msg
4011 msg = _('%s - use "hg update" instead') % msg
4012 raise util.Abort(msg)
4012 raise util.Abort(msg)
4013
4013
4014 if parent not in bheads:
4014 if parent not in bheads:
4015 raise util.Abort(_('working directory not at a head revision'),
4015 raise util.Abort(_('working directory not at a head revision'),
4016 hint=_("use 'hg update' or merge with an "
4016 hint=_("use 'hg update' or merge with an "
4017 "explicit revision"))
4017 "explicit revision"))
4018 node = parent == bheads[0] and bheads[-1] or bheads[0]
4018 node = parent == bheads[0] and bheads[-1] or bheads[0]
4019 else:
4019 else:
4020 node = scmutil.revsingle(repo, node).node()
4020 node = scmutil.revsingle(repo, node).node()
4021
4021
4022 if opts.get('preview'):
4022 if opts.get('preview'):
4023 # find nodes that are ancestors of p2 but not of p1
4023 # find nodes that are ancestors of p2 but not of p1
4024 p1 = repo.lookup('.')
4024 p1 = repo.lookup('.')
4025 p2 = repo.lookup(node)
4025 p2 = repo.lookup(node)
4026 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4026 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4027
4027
4028 displayer = cmdutil.show_changeset(ui, repo, opts)
4028 displayer = cmdutil.show_changeset(ui, repo, opts)
4029 for node in nodes:
4029 for node in nodes:
4030 displayer.show(repo[node])
4030 displayer.show(repo[node])
4031 displayer.close()
4031 displayer.close()
4032 return 0
4032 return 0
4033
4033
4034 try:
4034 try:
4035 # ui.forcemerge is an internal variable, do not document
4035 # ui.forcemerge is an internal variable, do not document
4036 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4036 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4037 return hg.merge(repo, node, force=opts.get('force'))
4037 return hg.merge(repo, node, force=opts.get('force'))
4038 finally:
4038 finally:
4039 ui.setconfig('ui', 'forcemerge', '')
4039 ui.setconfig('ui', 'forcemerge', '')
4040
4040
4041 @command('outgoing|out',
4041 @command('outgoing|out',
4042 [('f', 'force', None, _('run even when the destination is unrelated')),
4042 [('f', 'force', None, _('run even when the destination is unrelated')),
4043 ('r', 'rev', [],
4043 ('r', 'rev', [],
4044 _('a changeset intended to be included in the destination'), _('REV')),
4044 _('a changeset intended to be included in the destination'), _('REV')),
4045 ('n', 'newest-first', None, _('show newest record first')),
4045 ('n', 'newest-first', None, _('show newest record first')),
4046 ('B', 'bookmarks', False, _('compare bookmarks')),
4046 ('B', 'bookmarks', False, _('compare bookmarks')),
4047 ('b', 'branch', [], _('a specific branch you would like to push'),
4047 ('b', 'branch', [], _('a specific branch you would like to push'),
4048 _('BRANCH')),
4048 _('BRANCH')),
4049 ] + logopts + remoteopts + subrepoopts,
4049 ] + logopts + remoteopts + subrepoopts,
4050 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4050 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4051 def outgoing(ui, repo, dest=None, **opts):
4051 def outgoing(ui, repo, dest=None, **opts):
4052 """show changesets not found in the destination
4052 """show changesets not found in the destination
4053
4053
4054 Show changesets not found in the specified destination repository
4054 Show changesets not found in the specified destination repository
4055 or the default push location. These are the changesets that would
4055 or the default push location. These are the changesets that would
4056 be pushed if a push was requested.
4056 be pushed if a push was requested.
4057
4057
4058 See pull for details of valid destination formats.
4058 See pull for details of valid destination formats.
4059
4059
4060 Returns 0 if there are outgoing changes, 1 otherwise.
4060 Returns 0 if there are outgoing changes, 1 otherwise.
4061 """
4061 """
4062
4062
4063 if opts.get('bookmarks'):
4063 if opts.get('bookmarks'):
4064 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4064 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4065 dest, branches = hg.parseurl(dest, opts.get('branch'))
4065 dest, branches = hg.parseurl(dest, opts.get('branch'))
4066 other = hg.peer(repo, opts, dest)
4066 other = hg.peer(repo, opts, dest)
4067 if 'bookmarks' not in other.listkeys('namespaces'):
4067 if 'bookmarks' not in other.listkeys('namespaces'):
4068 ui.warn(_("remote doesn't support bookmarks\n"))
4068 ui.warn(_("remote doesn't support bookmarks\n"))
4069 return 0
4069 return 0
4070 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4070 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4071 return bookmarks.diff(ui, other, repo)
4071 return bookmarks.diff(ui, other, repo)
4072
4072
4073 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4073 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4074 try:
4074 try:
4075 return hg.outgoing(ui, repo, dest, opts)
4075 return hg.outgoing(ui, repo, dest, opts)
4076 finally:
4076 finally:
4077 del repo._subtoppath
4077 del repo._subtoppath
4078
4078
4079 @command('parents',
4079 @command('parents',
4080 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4080 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4081 ] + templateopts,
4081 ] + templateopts,
4082 _('[-r REV] [FILE]'))
4082 _('[-r REV] [FILE]'))
4083 def parents(ui, repo, file_=None, **opts):
4083 def parents(ui, repo, file_=None, **opts):
4084 """show the parents of the working directory or revision
4084 """show the parents of the working directory or revision
4085
4085
4086 Print the working directory's parent revisions. If a revision is
4086 Print the working directory's parent revisions. If a revision is
4087 given via -r/--rev, the parent of that revision will be printed.
4087 given via -r/--rev, the parent of that revision will be printed.
4088 If a file argument is given, the revision in which the file was
4088 If a file argument is given, the revision in which the file was
4089 last changed (before the working directory revision or the
4089 last changed (before the working directory revision or the
4090 argument to --rev if given) is printed.
4090 argument to --rev if given) is printed.
4091
4091
4092 Returns 0 on success.
4092 Returns 0 on success.
4093 """
4093 """
4094
4094
4095 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4095 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4096
4096
4097 if file_:
4097 if file_:
4098 m = scmutil.match(ctx, (file_,), opts)
4098 m = scmutil.match(ctx, (file_,), opts)
4099 if m.anypats() or len(m.files()) != 1:
4099 if m.anypats() or len(m.files()) != 1:
4100 raise util.Abort(_('can only specify an explicit filename'))
4100 raise util.Abort(_('can only specify an explicit filename'))
4101 file_ = m.files()[0]
4101 file_ = m.files()[0]
4102 filenodes = []
4102 filenodes = []
4103 for cp in ctx.parents():
4103 for cp in ctx.parents():
4104 if not cp:
4104 if not cp:
4105 continue
4105 continue
4106 try:
4106 try:
4107 filenodes.append(cp.filenode(file_))
4107 filenodes.append(cp.filenode(file_))
4108 except error.LookupError:
4108 except error.LookupError:
4109 pass
4109 pass
4110 if not filenodes:
4110 if not filenodes:
4111 raise util.Abort(_("'%s' not found in manifest!") % file_)
4111 raise util.Abort(_("'%s' not found in manifest!") % file_)
4112 fl = repo.file(file_)
4112 fl = repo.file(file_)
4113 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
4113 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
4114 else:
4114 else:
4115 p = [cp.node() for cp in ctx.parents()]
4115 p = [cp.node() for cp in ctx.parents()]
4116
4116
4117 displayer = cmdutil.show_changeset(ui, repo, opts)
4117 displayer = cmdutil.show_changeset(ui, repo, opts)
4118 for n in p:
4118 for n in p:
4119 if n != nullid:
4119 if n != nullid:
4120 displayer.show(repo[n])
4120 displayer.show(repo[n])
4121 displayer.close()
4121 displayer.close()
4122
4122
4123 @command('paths', [], _('[NAME]'))
4123 @command('paths', [], _('[NAME]'))
4124 def paths(ui, repo, search=None):
4124 def paths(ui, repo, search=None):
4125 """show aliases for remote repositories
4125 """show aliases for remote repositories
4126
4126
4127 Show definition of symbolic path name NAME. If no name is given,
4127 Show definition of symbolic path name NAME. If no name is given,
4128 show definition of all available names.
4128 show definition of all available names.
4129
4129
4130 Option -q/--quiet suppresses all output when searching for NAME
4130 Option -q/--quiet suppresses all output when searching for NAME
4131 and shows only the path names when listing all definitions.
4131 and shows only the path names when listing all definitions.
4132
4132
4133 Path names are defined in the [paths] section of your
4133 Path names are defined in the [paths] section of your
4134 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4134 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4135 repository, ``.hg/hgrc`` is used, too.
4135 repository, ``.hg/hgrc`` is used, too.
4136
4136
4137 The path names ``default`` and ``default-push`` have a special
4137 The path names ``default`` and ``default-push`` have a special
4138 meaning. When performing a push or pull operation, they are used
4138 meaning. When performing a push or pull operation, they are used
4139 as fallbacks if no location is specified on the command-line.
4139 as fallbacks if no location is specified on the command-line.
4140 When ``default-push`` is set, it will be used for push and
4140 When ``default-push`` is set, it will be used for push and
4141 ``default`` will be used for pull; otherwise ``default`` is used
4141 ``default`` will be used for pull; otherwise ``default`` is used
4142 as the fallback for both. When cloning a repository, the clone
4142 as the fallback for both. When cloning a repository, the clone
4143 source is written as ``default`` in ``.hg/hgrc``. Note that
4143 source is written as ``default`` in ``.hg/hgrc``. Note that
4144 ``default`` and ``default-push`` apply to all inbound (e.g.
4144 ``default`` and ``default-push`` apply to all inbound (e.g.
4145 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
4145 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
4146 :hg:`bundle`) operations.
4146 :hg:`bundle`) operations.
4147
4147
4148 See :hg:`help urls` for more information.
4148 See :hg:`help urls` for more information.
4149
4149
4150 Returns 0 on success.
4150 Returns 0 on success.
4151 """
4151 """
4152 if search:
4152 if search:
4153 for name, path in ui.configitems("paths"):
4153 for name, path in ui.configitems("paths"):
4154 if name == search:
4154 if name == search:
4155 ui.status("%s\n" % util.hidepassword(path))
4155 ui.status("%s\n" % util.hidepassword(path))
4156 return
4156 return
4157 if not ui.quiet:
4157 if not ui.quiet:
4158 ui.warn(_("not found!\n"))
4158 ui.warn(_("not found!\n"))
4159 return 1
4159 return 1
4160 else:
4160 else:
4161 for name, path in ui.configitems("paths"):
4161 for name, path in ui.configitems("paths"):
4162 if ui.quiet:
4162 if ui.quiet:
4163 ui.write("%s\n" % name)
4163 ui.write("%s\n" % name)
4164 else:
4164 else:
4165 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
4165 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
4166
4166
4167 def postincoming(ui, repo, modheads, optupdate, checkout):
4167 def postincoming(ui, repo, modheads, optupdate, checkout):
4168 if modheads == 0:
4168 if modheads == 0:
4169 return
4169 return
4170 if optupdate:
4170 if optupdate:
4171 try:
4171 try:
4172 return hg.update(repo, checkout)
4172 return hg.update(repo, checkout)
4173 except util.Abort, inst:
4173 except util.Abort, inst:
4174 ui.warn(_("not updating: %s\n" % str(inst)))
4174 ui.warn(_("not updating: %s\n" % str(inst)))
4175 return 0
4175 return 0
4176 if modheads > 1:
4176 if modheads > 1:
4177 currentbranchheads = len(repo.branchheads())
4177 currentbranchheads = len(repo.branchheads())
4178 if currentbranchheads == modheads:
4178 if currentbranchheads == modheads:
4179 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4179 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4180 elif currentbranchheads > 1:
4180 elif currentbranchheads > 1:
4181 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to merge)\n"))
4181 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to merge)\n"))
4182 else:
4182 else:
4183 ui.status(_("(run 'hg heads' to see heads)\n"))
4183 ui.status(_("(run 'hg heads' to see heads)\n"))
4184 else:
4184 else:
4185 ui.status(_("(run 'hg update' to get a working copy)\n"))
4185 ui.status(_("(run 'hg update' to get a working copy)\n"))
4186
4186
4187 @command('^pull',
4187 @command('^pull',
4188 [('u', 'update', None,
4188 [('u', 'update', None,
4189 _('update to new branch head if changesets were pulled')),
4189 _('update to new branch head if changesets were pulled')),
4190 ('f', 'force', None, _('run even when remote repository is unrelated')),
4190 ('f', 'force', None, _('run even when remote repository is unrelated')),
4191 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4191 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4192 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4192 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4193 ('b', 'branch', [], _('a specific branch you would like to pull'),
4193 ('b', 'branch', [], _('a specific branch you would like to pull'),
4194 _('BRANCH')),
4194 _('BRANCH')),
4195 ] + remoteopts,
4195 ] + remoteopts,
4196 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4196 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4197 def pull(ui, repo, source="default", **opts):
4197 def pull(ui, repo, source="default", **opts):
4198 """pull changes from the specified source
4198 """pull changes from the specified source
4199
4199
4200 Pull changes from a remote repository to a local one.
4200 Pull changes from a remote repository to a local one.
4201
4201
4202 This finds all changes from the repository at the specified path
4202 This finds all changes from the repository at the specified path
4203 or URL and adds them to a local repository (the current one unless
4203 or URL and adds them to a local repository (the current one unless
4204 -R is specified). By default, this does not update the copy of the
4204 -R is specified). By default, this does not update the copy of the
4205 project in the working directory.
4205 project in the working directory.
4206
4206
4207 Use :hg:`incoming` if you want to see what would have been added
4207 Use :hg:`incoming` if you want to see what would have been added
4208 by a pull at the time you issued this command. If you then decide
4208 by a pull at the time you issued this command. If you then decide
4209 to add those changes to the repository, you should use :hg:`pull
4209 to add those changes to the repository, you should use :hg:`pull
4210 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4210 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4211
4211
4212 If SOURCE is omitted, the 'default' path will be used.
4212 If SOURCE is omitted, the 'default' path will be used.
4213 See :hg:`help urls` for more information.
4213 See :hg:`help urls` for more information.
4214
4214
4215 Returns 0 on success, 1 if an update had unresolved files.
4215 Returns 0 on success, 1 if an update had unresolved files.
4216 """
4216 """
4217 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4217 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4218 other = hg.peer(repo, opts, source)
4218 other = hg.peer(repo, opts, source)
4219 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4219 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4220 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
4220 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
4221
4221
4222 if opts.get('bookmark'):
4222 if opts.get('bookmark'):
4223 if not revs:
4223 if not revs:
4224 revs = []
4224 revs = []
4225 rb = other.listkeys('bookmarks')
4225 rb = other.listkeys('bookmarks')
4226 for b in opts['bookmark']:
4226 for b in opts['bookmark']:
4227 if b not in rb:
4227 if b not in rb:
4228 raise util.Abort(_('remote bookmark %s not found!') % b)
4228 raise util.Abort(_('remote bookmark %s not found!') % b)
4229 revs.append(rb[b])
4229 revs.append(rb[b])
4230
4230
4231 if revs:
4231 if revs:
4232 try:
4232 try:
4233 revs = [other.lookup(rev) for rev in revs]
4233 revs = [other.lookup(rev) for rev in revs]
4234 except error.CapabilityError:
4234 except error.CapabilityError:
4235 err = _("other repository doesn't support revision lookup, "
4235 err = _("other repository doesn't support revision lookup, "
4236 "so a rev cannot be specified.")
4236 "so a rev cannot be specified.")
4237 raise util.Abort(err)
4237 raise util.Abort(err)
4238
4238
4239 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
4239 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
4240 bookmarks.updatefromremote(ui, repo, other)
4240 bookmarks.updatefromremote(ui, repo, other)
4241 if checkout:
4241 if checkout:
4242 checkout = str(repo.changelog.rev(other.lookup(checkout)))
4242 checkout = str(repo.changelog.rev(other.lookup(checkout)))
4243 repo._subtoppath = source
4243 repo._subtoppath = source
4244 try:
4244 try:
4245 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
4245 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
4246
4246
4247 finally:
4247 finally:
4248 del repo._subtoppath
4248 del repo._subtoppath
4249
4249
4250 # update specified bookmarks
4250 # update specified bookmarks
4251 if opts.get('bookmark'):
4251 if opts.get('bookmark'):
4252 for b in opts['bookmark']:
4252 for b in opts['bookmark']:
4253 # explicit pull overrides local bookmark if any
4253 # explicit pull overrides local bookmark if any
4254 ui.status(_("importing bookmark %s\n") % b)
4254 ui.status(_("importing bookmark %s\n") % b)
4255 repo._bookmarks[b] = repo[rb[b]].node()
4255 repo._bookmarks[b] = repo[rb[b]].node()
4256 bookmarks.write(repo)
4256 bookmarks.write(repo)
4257
4257
4258 return ret
4258 return ret
4259
4259
4260 @command('^push',
4260 @command('^push',
4261 [('f', 'force', None, _('force push')),
4261 [('f', 'force', None, _('force push')),
4262 ('r', 'rev', [],
4262 ('r', 'rev', [],
4263 _('a changeset intended to be included in the destination'),
4263 _('a changeset intended to be included in the destination'),
4264 _('REV')),
4264 _('REV')),
4265 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4265 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4266 ('b', 'branch', [],
4266 ('b', 'branch', [],
4267 _('a specific branch you would like to push'), _('BRANCH')),
4267 _('a specific branch you would like to push'), _('BRANCH')),
4268 ('', 'new-branch', False, _('allow pushing a new branch')),
4268 ('', 'new-branch', False, _('allow pushing a new branch')),
4269 ] + remoteopts,
4269 ] + remoteopts,
4270 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4270 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4271 def push(ui, repo, dest=None, **opts):
4271 def push(ui, repo, dest=None, **opts):
4272 """push changes to the specified destination
4272 """push changes to the specified destination
4273
4273
4274 Push changesets from the local repository to the specified
4274 Push changesets from the local repository to the specified
4275 destination.
4275 destination.
4276
4276
4277 This operation is symmetrical to pull: it is identical to a pull
4277 This operation is symmetrical to pull: it is identical to a pull
4278 in the destination repository from the current one.
4278 in the destination repository from the current one.
4279
4279
4280 By default, push will not allow creation of new heads at the
4280 By default, push will not allow creation of new heads at the
4281 destination, since multiple heads would make it unclear which head
4281 destination, since multiple heads would make it unclear which head
4282 to use. In this situation, it is recommended to pull and merge
4282 to use. In this situation, it is recommended to pull and merge
4283 before pushing.
4283 before pushing.
4284
4284
4285 Use --new-branch if you want to allow push to create a new named
4285 Use --new-branch if you want to allow push to create a new named
4286 branch that is not present at the destination. This allows you to
4286 branch that is not present at the destination. This allows you to
4287 only create a new branch without forcing other changes.
4287 only create a new branch without forcing other changes.
4288
4288
4289 Use -f/--force to override the default behavior and push all
4289 Use -f/--force to override the default behavior and push all
4290 changesets on all branches.
4290 changesets on all branches.
4291
4291
4292 If -r/--rev is used, the specified revision and all its ancestors
4292 If -r/--rev is used, the specified revision and all its ancestors
4293 will be pushed to the remote repository.
4293 will be pushed to the remote repository.
4294
4294
4295 Please see :hg:`help urls` for important details about ``ssh://``
4295 Please see :hg:`help urls` for important details about ``ssh://``
4296 URLs. If DESTINATION is omitted, a default path will be used.
4296 URLs. If DESTINATION is omitted, a default path will be used.
4297
4297
4298 Returns 0 if push was successful, 1 if nothing to push.
4298 Returns 0 if push was successful, 1 if nothing to push.
4299 """
4299 """
4300
4300
4301 if opts.get('bookmark'):
4301 if opts.get('bookmark'):
4302 for b in opts['bookmark']:
4302 for b in opts['bookmark']:
4303 # translate -B options to -r so changesets get pushed
4303 # translate -B options to -r so changesets get pushed
4304 if b in repo._bookmarks:
4304 if b in repo._bookmarks:
4305 opts.setdefault('rev', []).append(b)
4305 opts.setdefault('rev', []).append(b)
4306 else:
4306 else:
4307 # if we try to push a deleted bookmark, translate it to null
4307 # if we try to push a deleted bookmark, translate it to null
4308 # this lets simultaneous -r, -b options continue working
4308 # this lets simultaneous -r, -b options continue working
4309 opts.setdefault('rev', []).append("null")
4309 opts.setdefault('rev', []).append("null")
4310
4310
4311 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4311 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4312 dest, branches = hg.parseurl(dest, opts.get('branch'))
4312 dest, branches = hg.parseurl(dest, opts.get('branch'))
4313 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4313 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4314 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4314 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4315 other = hg.peer(repo, opts, dest)
4315 other = hg.peer(repo, opts, dest)
4316 if revs:
4316 if revs:
4317 revs = [repo.lookup(rev) for rev in revs]
4317 revs = [repo.lookup(rev) for rev in revs]
4318
4318
4319 repo._subtoppath = dest
4319 repo._subtoppath = dest
4320 try:
4320 try:
4321 # push subrepos depth-first for coherent ordering
4321 # push subrepos depth-first for coherent ordering
4322 c = repo['']
4322 c = repo['']
4323 subs = c.substate # only repos that are committed
4323 subs = c.substate # only repos that are committed
4324 for s in sorted(subs):
4324 for s in sorted(subs):
4325 if not c.sub(s).push(opts.get('force')):
4325 if not c.sub(s).push(opts.get('force')):
4326 return False
4326 return False
4327 finally:
4327 finally:
4328 del repo._subtoppath
4328 del repo._subtoppath
4329 result = repo.push(other, opts.get('force'), revs=revs,
4329 result = repo.push(other, opts.get('force'), revs=revs,
4330 newbranch=opts.get('new_branch'))
4330 newbranch=opts.get('new_branch'))
4331
4331
4332 result = (result == 0)
4332 result = (result == 0)
4333
4333
4334 if opts.get('bookmark'):
4334 if opts.get('bookmark'):
4335 rb = other.listkeys('bookmarks')
4335 rb = other.listkeys('bookmarks')
4336 for b in opts['bookmark']:
4336 for b in opts['bookmark']:
4337 # explicit push overrides remote bookmark if any
4337 # explicit push overrides remote bookmark if any
4338 if b in repo._bookmarks:
4338 if b in repo._bookmarks:
4339 ui.status(_("exporting bookmark %s\n") % b)
4339 ui.status(_("exporting bookmark %s\n") % b)
4340 new = repo[b].hex()
4340 new = repo[b].hex()
4341 elif b in rb:
4341 elif b in rb:
4342 ui.status(_("deleting remote bookmark %s\n") % b)
4342 ui.status(_("deleting remote bookmark %s\n") % b)
4343 new = '' # delete
4343 new = '' # delete
4344 else:
4344 else:
4345 ui.warn(_('bookmark %s does not exist on the local '
4345 ui.warn(_('bookmark %s does not exist on the local '
4346 'or remote repository!\n') % b)
4346 'or remote repository!\n') % b)
4347 return 2
4347 return 2
4348 old = rb.get(b, '')
4348 old = rb.get(b, '')
4349 r = other.pushkey('bookmarks', b, old, new)
4349 r = other.pushkey('bookmarks', b, old, new)
4350 if not r:
4350 if not r:
4351 ui.warn(_('updating bookmark %s failed!\n') % b)
4351 ui.warn(_('updating bookmark %s failed!\n') % b)
4352 if not result:
4352 if not result:
4353 result = 2
4353 result = 2
4354
4354
4355 return result
4355 return result
4356
4356
4357 @command('recover', [])
4357 @command('recover', [])
4358 def recover(ui, repo):
4358 def recover(ui, repo):
4359 """roll back an interrupted transaction
4359 """roll back an interrupted transaction
4360
4360
4361 Recover from an interrupted commit or pull.
4361 Recover from an interrupted commit or pull.
4362
4362
4363 This command tries to fix the repository status after an
4363 This command tries to fix the repository status after an
4364 interrupted operation. It should only be necessary when Mercurial
4364 interrupted operation. It should only be necessary when Mercurial
4365 suggests it.
4365 suggests it.
4366
4366
4367 Returns 0 if successful, 1 if nothing to recover or verify fails.
4367 Returns 0 if successful, 1 if nothing to recover or verify fails.
4368 """
4368 """
4369 if repo.recover():
4369 if repo.recover():
4370 return hg.verify(repo)
4370 return hg.verify(repo)
4371 return 1
4371 return 1
4372
4372
4373 @command('^remove|rm',
4373 @command('^remove|rm',
4374 [('A', 'after', None, _('record delete for missing files')),
4374 [('A', 'after', None, _('record delete for missing files')),
4375 ('f', 'force', None,
4375 ('f', 'force', None,
4376 _('remove (and delete) file even if added or modified')),
4376 _('remove (and delete) file even if added or modified')),
4377 ] + walkopts,
4377 ] + walkopts,
4378 _('[OPTION]... FILE...'))
4378 _('[OPTION]... FILE...'))
4379 def remove(ui, repo, *pats, **opts):
4379 def remove(ui, repo, *pats, **opts):
4380 """remove the specified files on the next commit
4380 """remove the specified files on the next commit
4381
4381
4382 Schedule the indicated files for removal from the current branch.
4382 Schedule the indicated files for removal from the current branch.
4383
4383
4384 This command schedules the files to be removed at the next commit.
4384 This command schedules the files to be removed at the next commit.
4385 To undo a remove before that, see :hg:`revert`. To undo added
4385 To undo a remove before that, see :hg:`revert`. To undo added
4386 files, see :hg:`forget`.
4386 files, see :hg:`forget`.
4387
4387
4388 .. container:: verbose
4388 .. container:: verbose
4389
4389
4390 -A/--after can be used to remove only files that have already
4390 -A/--after can be used to remove only files that have already
4391 been deleted, -f/--force can be used to force deletion, and -Af
4391 been deleted, -f/--force can be used to force deletion, and -Af
4392 can be used to remove files from the next revision without
4392 can be used to remove files from the next revision without
4393 deleting them from the working directory.
4393 deleting them from the working directory.
4394
4394
4395 The following table details the behavior of remove for different
4395 The following table details the behavior of remove for different
4396 file states (columns) and option combinations (rows). The file
4396 file states (columns) and option combinations (rows). The file
4397 states are Added [A], Clean [C], Modified [M] and Missing [!]
4397 states are Added [A], Clean [C], Modified [M] and Missing [!]
4398 (as reported by :hg:`status`). The actions are Warn, Remove
4398 (as reported by :hg:`status`). The actions are Warn, Remove
4399 (from branch) and Delete (from disk):
4399 (from branch) and Delete (from disk):
4400
4400
4401 ======= == == == ==
4401 ======= == == == ==
4402 A C M !
4402 A C M !
4403 ======= == == == ==
4403 ======= == == == ==
4404 none W RD W R
4404 none W RD W R
4405 -f R RD RD R
4405 -f R RD RD R
4406 -A W W W R
4406 -A W W W R
4407 -Af R R R R
4407 -Af R R R R
4408 ======= == == == ==
4408 ======= == == == ==
4409
4409
4410 Note that remove never deletes files in Added [A] state from the
4410 Note that remove never deletes files in Added [A] state from the
4411 working directory, not even if option --force is specified.
4411 working directory, not even if option --force is specified.
4412
4412
4413 Returns 0 on success, 1 if any warnings encountered.
4413 Returns 0 on success, 1 if any warnings encountered.
4414 """
4414 """
4415
4415
4416 ret = 0
4416 ret = 0
4417 after, force = opts.get('after'), opts.get('force')
4417 after, force = opts.get('after'), opts.get('force')
4418 if not pats and not after:
4418 if not pats and not after:
4419 raise util.Abort(_('no files specified'))
4419 raise util.Abort(_('no files specified'))
4420
4420
4421 m = scmutil.match(repo[None], pats, opts)
4421 m = scmutil.match(repo[None], pats, opts)
4422 s = repo.status(match=m, clean=True)
4422 s = repo.status(match=m, clean=True)
4423 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
4423 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
4424
4424
4425 for f in m.files():
4425 for f in m.files():
4426 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
4426 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
4427 if os.path.exists(m.rel(f)):
4427 if os.path.exists(m.rel(f)):
4428 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
4428 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
4429 ret = 1
4429 ret = 1
4430
4430
4431 if force:
4431 if force:
4432 list = modified + deleted + clean + added
4432 list = modified + deleted + clean + added
4433 elif after:
4433 elif after:
4434 list = deleted
4434 list = deleted
4435 for f in modified + added + clean:
4435 for f in modified + added + clean:
4436 ui.warn(_('not removing %s: file still exists (use -f'
4436 ui.warn(_('not removing %s: file still exists (use -f'
4437 ' to force removal)\n') % m.rel(f))
4437 ' to force removal)\n') % m.rel(f))
4438 ret = 1
4438 ret = 1
4439 else:
4439 else:
4440 list = deleted + clean
4440 list = deleted + clean
4441 for f in modified:
4441 for f in modified:
4442 ui.warn(_('not removing %s: file is modified (use -f'
4442 ui.warn(_('not removing %s: file is modified (use -f'
4443 ' to force removal)\n') % m.rel(f))
4443 ' to force removal)\n') % m.rel(f))
4444 ret = 1
4444 ret = 1
4445 for f in added:
4445 for f in added:
4446 ui.warn(_('not removing %s: file has been marked for add'
4446 ui.warn(_('not removing %s: file has been marked for add'
4447 ' (use forget to undo)\n') % m.rel(f))
4447 ' (use forget to undo)\n') % m.rel(f))
4448 ret = 1
4448 ret = 1
4449
4449
4450 for f in sorted(list):
4450 for f in sorted(list):
4451 if ui.verbose or not m.exact(f):
4451 if ui.verbose or not m.exact(f):
4452 ui.status(_('removing %s\n') % m.rel(f))
4452 ui.status(_('removing %s\n') % m.rel(f))
4453
4453
4454 wlock = repo.wlock()
4454 wlock = repo.wlock()
4455 try:
4455 try:
4456 if not after:
4456 if not after:
4457 for f in list:
4457 for f in list:
4458 if f in added:
4458 if f in added:
4459 continue # we never unlink added files on remove
4459 continue # we never unlink added files on remove
4460 try:
4460 try:
4461 util.unlinkpath(repo.wjoin(f))
4461 util.unlinkpath(repo.wjoin(f))
4462 except OSError, inst:
4462 except OSError, inst:
4463 if inst.errno != errno.ENOENT:
4463 if inst.errno != errno.ENOENT:
4464 raise
4464 raise
4465 repo[None].forget(list)
4465 repo[None].forget(list)
4466 finally:
4466 finally:
4467 wlock.release()
4467 wlock.release()
4468
4468
4469 return ret
4469 return ret
4470
4470
4471 @command('rename|move|mv',
4471 @command('rename|move|mv',
4472 [('A', 'after', None, _('record a rename that has already occurred')),
4472 [('A', 'after', None, _('record a rename that has already occurred')),
4473 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4473 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4474 ] + walkopts + dryrunopts,
4474 ] + walkopts + dryrunopts,
4475 _('[OPTION]... SOURCE... DEST'))
4475 _('[OPTION]... SOURCE... DEST'))
4476 def rename(ui, repo, *pats, **opts):
4476 def rename(ui, repo, *pats, **opts):
4477 """rename files; equivalent of copy + remove
4477 """rename files; equivalent of copy + remove
4478
4478
4479 Mark dest as copies of sources; mark sources for deletion. If dest
4479 Mark dest as copies of sources; mark sources for deletion. If dest
4480 is a directory, copies are put in that directory. If dest is a
4480 is a directory, copies are put in that directory. If dest is a
4481 file, there can only be one source.
4481 file, there can only be one source.
4482
4482
4483 By default, this command copies the contents of files as they
4483 By default, this command copies the contents of files as they
4484 exist in the working directory. If invoked with -A/--after, the
4484 exist in the working directory. If invoked with -A/--after, the
4485 operation is recorded, but no copying is performed.
4485 operation is recorded, but no copying is performed.
4486
4486
4487 This command takes effect at the next commit. To undo a rename
4487 This command takes effect at the next commit. To undo a rename
4488 before that, see :hg:`revert`.
4488 before that, see :hg:`revert`.
4489
4489
4490 Returns 0 on success, 1 if errors are encountered.
4490 Returns 0 on success, 1 if errors are encountered.
4491 """
4491 """
4492 wlock = repo.wlock(False)
4492 wlock = repo.wlock(False)
4493 try:
4493 try:
4494 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4494 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4495 finally:
4495 finally:
4496 wlock.release()
4496 wlock.release()
4497
4497
4498 @command('resolve',
4498 @command('resolve',
4499 [('a', 'all', None, _('select all unresolved files')),
4499 [('a', 'all', None, _('select all unresolved files')),
4500 ('l', 'list', None, _('list state of files needing merge')),
4500 ('l', 'list', None, _('list state of files needing merge')),
4501 ('m', 'mark', None, _('mark files as resolved')),
4501 ('m', 'mark', None, _('mark files as resolved')),
4502 ('u', 'unmark', None, _('mark files as unresolved')),
4502 ('u', 'unmark', None, _('mark files as unresolved')),
4503 ('n', 'no-status', None, _('hide status prefix'))]
4503 ('n', 'no-status', None, _('hide status prefix'))]
4504 + mergetoolopts + walkopts,
4504 + mergetoolopts + walkopts,
4505 _('[OPTION]... [FILE]...'))
4505 _('[OPTION]... [FILE]...'))
4506 def resolve(ui, repo, *pats, **opts):
4506 def resolve(ui, repo, *pats, **opts):
4507 """redo merges or set/view the merge status of files
4507 """redo merges or set/view the merge status of files
4508
4508
4509 Merges with unresolved conflicts are often the result of
4509 Merges with unresolved conflicts are often the result of
4510 non-interactive merging using the ``internal:merge`` configuration
4510 non-interactive merging using the ``internal:merge`` configuration
4511 setting, or a command-line merge tool like ``diff3``. The resolve
4511 setting, or a command-line merge tool like ``diff3``. The resolve
4512 command is used to manage the files involved in a merge, after
4512 command is used to manage the files involved in a merge, after
4513 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4513 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4514 working directory must have two parents).
4514 working directory must have two parents).
4515
4515
4516 The resolve command can be used in the following ways:
4516 The resolve command can be used in the following ways:
4517
4517
4518 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4518 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4519 files, discarding any previous merge attempts. Re-merging is not
4519 files, discarding any previous merge attempts. Re-merging is not
4520 performed for files already marked as resolved. Use ``--all/-a``
4520 performed for files already marked as resolved. Use ``--all/-a``
4521 to select all unresolved files. ``--tool`` can be used to specify
4521 to select all unresolved files. ``--tool`` can be used to specify
4522 the merge tool used for the given files. It overrides the HGMERGE
4522 the merge tool used for the given files. It overrides the HGMERGE
4523 environment variable and your configuration files. Previous file
4523 environment variable and your configuration files. Previous file
4524 contents are saved with a ``.orig`` suffix.
4524 contents are saved with a ``.orig`` suffix.
4525
4525
4526 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4526 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4527 (e.g. after having manually fixed-up the files). The default is
4527 (e.g. after having manually fixed-up the files). The default is
4528 to mark all unresolved files.
4528 to mark all unresolved files.
4529
4529
4530 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4530 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4531 default is to mark all resolved files.
4531 default is to mark all resolved files.
4532
4532
4533 - :hg:`resolve -l`: list files which had or still have conflicts.
4533 - :hg:`resolve -l`: list files which had or still have conflicts.
4534 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4534 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4535
4535
4536 Note that Mercurial will not let you commit files with unresolved
4536 Note that Mercurial will not let you commit files with unresolved
4537 merge conflicts. You must use :hg:`resolve -m ...` before you can
4537 merge conflicts. You must use :hg:`resolve -m ...` before you can
4538 commit after a conflicting merge.
4538 commit after a conflicting merge.
4539
4539
4540 Returns 0 on success, 1 if any files fail a resolve attempt.
4540 Returns 0 on success, 1 if any files fail a resolve attempt.
4541 """
4541 """
4542
4542
4543 all, mark, unmark, show, nostatus = \
4543 all, mark, unmark, show, nostatus = \
4544 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
4544 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
4545
4545
4546 if (show and (mark or unmark)) or (mark and unmark):
4546 if (show and (mark or unmark)) or (mark and unmark):
4547 raise util.Abort(_("too many options specified"))
4547 raise util.Abort(_("too many options specified"))
4548 if pats and all:
4548 if pats and all:
4549 raise util.Abort(_("can't specify --all and patterns"))
4549 raise util.Abort(_("can't specify --all and patterns"))
4550 if not (all or pats or show or mark or unmark):
4550 if not (all or pats or show or mark or unmark):
4551 raise util.Abort(_('no files or directories specified; '
4551 raise util.Abort(_('no files or directories specified; '
4552 'use --all to remerge all files'))
4552 'use --all to remerge all files'))
4553
4553
4554 ms = mergemod.mergestate(repo)
4554 ms = mergemod.mergestate(repo)
4555 m = scmutil.match(repo[None], pats, opts)
4555 m = scmutil.match(repo[None], pats, opts)
4556 ret = 0
4556 ret = 0
4557
4557
4558 for f in ms:
4558 for f in ms:
4559 if m(f):
4559 if m(f):
4560 if show:
4560 if show:
4561 if nostatus:
4561 if nostatus:
4562 ui.write("%s\n" % f)
4562 ui.write("%s\n" % f)
4563 else:
4563 else:
4564 ui.write("%s %s\n" % (ms[f].upper(), f),
4564 ui.write("%s %s\n" % (ms[f].upper(), f),
4565 label='resolve.' +
4565 label='resolve.' +
4566 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
4566 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
4567 elif mark:
4567 elif mark:
4568 ms.mark(f, "r")
4568 ms.mark(f, "r")
4569 elif unmark:
4569 elif unmark:
4570 ms.mark(f, "u")
4570 ms.mark(f, "u")
4571 else:
4571 else:
4572 wctx = repo[None]
4572 wctx = repo[None]
4573 mctx = wctx.parents()[-1]
4573 mctx = wctx.parents()[-1]
4574
4574
4575 # backup pre-resolve (merge uses .orig for its own purposes)
4575 # backup pre-resolve (merge uses .orig for its own purposes)
4576 a = repo.wjoin(f)
4576 a = repo.wjoin(f)
4577 util.copyfile(a, a + ".resolve")
4577 util.copyfile(a, a + ".resolve")
4578
4578
4579 try:
4579 try:
4580 # resolve file
4580 # resolve file
4581 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4581 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4582 if ms.resolve(f, wctx, mctx):
4582 if ms.resolve(f, wctx, mctx):
4583 ret = 1
4583 ret = 1
4584 finally:
4584 finally:
4585 ui.setconfig('ui', 'forcemerge', '')
4585 ui.setconfig('ui', 'forcemerge', '')
4586
4586
4587 # replace filemerge's .orig file with our resolve file
4587 # replace filemerge's .orig file with our resolve file
4588 util.rename(a + ".resolve", a + ".orig")
4588 util.rename(a + ".resolve", a + ".orig")
4589
4589
4590 ms.commit()
4590 ms.commit()
4591 return ret
4591 return ret
4592
4592
4593 @command('revert',
4593 @command('revert',
4594 [('a', 'all', None, _('revert all changes when no arguments given')),
4594 [('a', 'all', None, _('revert all changes when no arguments given')),
4595 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4595 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4596 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4596 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4597 ('C', 'no-backup', None, _('do not save backup copies of files')),
4597 ('C', 'no-backup', None, _('do not save backup copies of files')),
4598 ] + walkopts + dryrunopts,
4598 ] + walkopts + dryrunopts,
4599 _('[OPTION]... [-r REV] [NAME]...'))
4599 _('[OPTION]... [-r REV] [NAME]...'))
4600 def revert(ui, repo, *pats, **opts):
4600 def revert(ui, repo, *pats, **opts):
4601 """restore files to their checkout state
4601 """restore files to their checkout state
4602
4602
4603 .. note::
4603 .. note::
4604 To check out earlier revisions, you should use :hg:`update REV`.
4604 To check out earlier revisions, you should use :hg:`update REV`.
4605 To cancel a merge (and lose your changes), use :hg:`update --clean .`.
4605 To cancel a merge (and lose your changes), use :hg:`update --clean .`.
4606
4606
4607 With no revision specified, revert the specified files or directories
4607 With no revision specified, revert the specified files or directories
4608 to the contents they had in the parent of the working directory.
4608 to the contents they had in the parent of the working directory.
4609 This restores the contents of files to an unmodified
4609 This restores the contents of files to an unmodified
4610 state and unschedules adds, removes, copies, and renames. If the
4610 state and unschedules adds, removes, copies, and renames. If the
4611 working directory has two parents, you must explicitly specify a
4611 working directory has two parents, you must explicitly specify a
4612 revision.
4612 revision.
4613
4613
4614 Using the -r/--rev or -d/--date options, revert the given files or
4614 Using the -r/--rev or -d/--date options, revert the given files or
4615 directories to their states as of a specific revision. Because
4615 directories to their states as of a specific revision. Because
4616 revert does not change the working directory parents, this will
4616 revert does not change the working directory parents, this will
4617 cause these files to appear modified. This can be helpful to "back
4617 cause these files to appear modified. This can be helpful to "back
4618 out" some or all of an earlier change. See :hg:`backout` for a
4618 out" some or all of an earlier change. See :hg:`backout` for a
4619 related method.
4619 related method.
4620
4620
4621 Modified files are saved with a .orig suffix before reverting.
4621 Modified files are saved with a .orig suffix before reverting.
4622 To disable these backups, use --no-backup.
4622 To disable these backups, use --no-backup.
4623
4623
4624 See :hg:`help dates` for a list of formats valid for -d/--date.
4624 See :hg:`help dates` for a list of formats valid for -d/--date.
4625
4625
4626 Returns 0 on success.
4626 Returns 0 on success.
4627 """
4627 """
4628
4628
4629 if opts.get("date"):
4629 if opts.get("date"):
4630 if opts.get("rev"):
4630 if opts.get("rev"):
4631 raise util.Abort(_("you can't specify a revision and a date"))
4631 raise util.Abort(_("you can't specify a revision and a date"))
4632 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4632 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4633
4633
4634 parent, p2 = repo.dirstate.parents()
4634 parent, p2 = repo.dirstate.parents()
4635 if not opts.get('rev') and p2 != nullid:
4635 if not opts.get('rev') and p2 != nullid:
4636 # revert after merge is a trap for new users (issue2915)
4636 # revert after merge is a trap for new users (issue2915)
4637 raise util.Abort(_('uncommitted merge with no revision specified'),
4637 raise util.Abort(_('uncommitted merge with no revision specified'),
4638 hint=_('use "hg update" or see "hg help revert"'))
4638 hint=_('use "hg update" or see "hg help revert"'))
4639
4639
4640 ctx = scmutil.revsingle(repo, opts.get('rev'))
4640 ctx = scmutil.revsingle(repo, opts.get('rev'))
4641 node = ctx.node()
4641 node = ctx.node()
4642
4642
4643 if not pats and not opts.get('all'):
4643 if not pats and not opts.get('all'):
4644 msg = _("no files or directories specified")
4644 msg = _("no files or directories specified")
4645 if p2 != nullid:
4645 if p2 != nullid:
4646 hint = _("uncommitted merge, use --all to discard all changes,"
4646 hint = _("uncommitted merge, use --all to discard all changes,"
4647 " or 'hg update -C .' to abort the merge")
4647 " or 'hg update -C .' to abort the merge")
4648 raise util.Abort(msg, hint=hint)
4648 raise util.Abort(msg, hint=hint)
4649 dirty = util.any(repo.status())
4649 dirty = util.any(repo.status())
4650 if node != parent:
4650 if node != parent:
4651 if dirty:
4651 if dirty:
4652 hint = _("uncommitted changes, use --all to discard all"
4652 hint = _("uncommitted changes, use --all to discard all"
4653 " changes, or 'hg update %s' to update") % ctx.rev()
4653 " changes, or 'hg update %s' to update") % ctx.rev()
4654 else:
4654 else:
4655 hint = _("use --all to revert all files,"
4655 hint = _("use --all to revert all files,"
4656 " or 'hg update %s' to update") % ctx.rev()
4656 " or 'hg update %s' to update") % ctx.rev()
4657 elif dirty:
4657 elif dirty:
4658 hint = _("uncommitted changes, use --all to discard all changes")
4658 hint = _("uncommitted changes, use --all to discard all changes")
4659 else:
4659 else:
4660 hint = _("use --all to revert all files")
4660 hint = _("use --all to revert all files")
4661 raise util.Abort(msg, hint=hint)
4661 raise util.Abort(msg, hint=hint)
4662
4662
4663 mf = ctx.manifest()
4663 mf = ctx.manifest()
4664 if node == parent:
4664 if node == parent:
4665 pmf = mf
4665 pmf = mf
4666 else:
4666 else:
4667 pmf = None
4667 pmf = None
4668
4668
4669 # need all matching names in dirstate and manifest of target rev,
4669 # need all matching names in dirstate and manifest of target rev,
4670 # so have to walk both. do not print errors if files exist in one
4670 # so have to walk both. do not print errors if files exist in one
4671 # but not other.
4671 # but not other.
4672
4672
4673 names = {}
4673 names = {}
4674
4674
4675 wlock = repo.wlock()
4675 wlock = repo.wlock()
4676 try:
4676 try:
4677 # walk dirstate.
4677 # walk dirstate.
4678
4678
4679 m = scmutil.match(repo[None], pats, opts)
4679 m = scmutil.match(repo[None], pats, opts)
4680 m.bad = lambda x, y: False
4680 m.bad = lambda x, y: False
4681 for abs in repo.walk(m):
4681 for abs in repo.walk(m):
4682 names[abs] = m.rel(abs), m.exact(abs)
4682 names[abs] = m.rel(abs), m.exact(abs)
4683
4683
4684 # walk target manifest.
4684 # walk target manifest.
4685
4685
4686 def badfn(path, msg):
4686 def badfn(path, msg):
4687 if path in names:
4687 if path in names:
4688 return
4688 return
4689 if path in repo[node].substate:
4689 if path in repo[node].substate:
4690 ui.warn("%s: %s\n" % (m.rel(path),
4690 ui.warn("%s: %s\n" % (m.rel(path),
4691 'reverting subrepos is unsupported'))
4691 'reverting subrepos is unsupported'))
4692 return
4692 return
4693 path_ = path + '/'
4693 path_ = path + '/'
4694 for f in names:
4694 for f in names:
4695 if f.startswith(path_):
4695 if f.startswith(path_):
4696 return
4696 return
4697 ui.warn("%s: %s\n" % (m.rel(path), msg))
4697 ui.warn("%s: %s\n" % (m.rel(path), msg))
4698
4698
4699 m = scmutil.match(repo[node], pats, opts)
4699 m = scmutil.match(repo[node], pats, opts)
4700 m.bad = badfn
4700 m.bad = badfn
4701 for abs in repo[node].walk(m):
4701 for abs in repo[node].walk(m):
4702 if abs not in names:
4702 if abs not in names:
4703 names[abs] = m.rel(abs), m.exact(abs)
4703 names[abs] = m.rel(abs), m.exact(abs)
4704
4704
4705 m = scmutil.matchfiles(repo, names)
4705 m = scmutil.matchfiles(repo, names)
4706 changes = repo.status(match=m)[:4]
4706 changes = repo.status(match=m)[:4]
4707 modified, added, removed, deleted = map(set, changes)
4707 modified, added, removed, deleted = map(set, changes)
4708
4708
4709 # if f is a rename, also revert the source
4709 # if f is a rename, also revert the source
4710 cwd = repo.getcwd()
4710 cwd = repo.getcwd()
4711 for f in added:
4711 for f in added:
4712 src = repo.dirstate.copied(f)
4712 src = repo.dirstate.copied(f)
4713 if src and src not in names and repo.dirstate[src] == 'r':
4713 if src and src not in names and repo.dirstate[src] == 'r':
4714 removed.add(src)
4714 removed.add(src)
4715 names[src] = (repo.pathto(src, cwd), True)
4715 names[src] = (repo.pathto(src, cwd), True)
4716
4716
4717 def removeforget(abs):
4717 def removeforget(abs):
4718 if repo.dirstate[abs] == 'a':
4718 if repo.dirstate[abs] == 'a':
4719 return _('forgetting %s\n')
4719 return _('forgetting %s\n')
4720 return _('removing %s\n')
4720 return _('removing %s\n')
4721
4721
4722 revert = ([], _('reverting %s\n'))
4722 revert = ([], _('reverting %s\n'))
4723 add = ([], _('adding %s\n'))
4723 add = ([], _('adding %s\n'))
4724 remove = ([], removeforget)
4724 remove = ([], removeforget)
4725 undelete = ([], _('undeleting %s\n'))
4725 undelete = ([], _('undeleting %s\n'))
4726
4726
4727 disptable = (
4727 disptable = (
4728 # dispatch table:
4728 # dispatch table:
4729 # file state
4729 # file state
4730 # action if in target manifest
4730 # action if in target manifest
4731 # action if not in target manifest
4731 # action if not in target manifest
4732 # make backup if in target manifest
4732 # make backup if in target manifest
4733 # make backup if not in target manifest
4733 # make backup if not in target manifest
4734 (modified, revert, remove, True, True),
4734 (modified, revert, remove, True, True),
4735 (added, revert, remove, True, False),
4735 (added, revert, remove, True, False),
4736 (removed, undelete, None, False, False),
4736 (removed, undelete, None, False, False),
4737 (deleted, revert, remove, False, False),
4737 (deleted, revert, remove, False, False),
4738 )
4738 )
4739
4739
4740 for abs, (rel, exact) in sorted(names.items()):
4740 for abs, (rel, exact) in sorted(names.items()):
4741 mfentry = mf.get(abs)
4741 mfentry = mf.get(abs)
4742 target = repo.wjoin(abs)
4742 target = repo.wjoin(abs)
4743 def handle(xlist, dobackup):
4743 def handle(xlist, dobackup):
4744 xlist[0].append(abs)
4744 xlist[0].append(abs)
4745 if (dobackup and not opts.get('no_backup') and
4745 if (dobackup and not opts.get('no_backup') and
4746 os.path.lexists(target)):
4746 os.path.lexists(target)):
4747 bakname = "%s.orig" % rel
4747 bakname = "%s.orig" % rel
4748 ui.note(_('saving current version of %s as %s\n') %
4748 ui.note(_('saving current version of %s as %s\n') %
4749 (rel, bakname))
4749 (rel, bakname))
4750 if not opts.get('dry_run'):
4750 if not opts.get('dry_run'):
4751 util.rename(target, bakname)
4751 util.rename(target, bakname)
4752 if ui.verbose or not exact:
4752 if ui.verbose or not exact:
4753 msg = xlist[1]
4753 msg = xlist[1]
4754 if not isinstance(msg, basestring):
4754 if not isinstance(msg, basestring):
4755 msg = msg(abs)
4755 msg = msg(abs)
4756 ui.status(msg % rel)
4756 ui.status(msg % rel)
4757 for table, hitlist, misslist, backuphit, backupmiss in disptable:
4757 for table, hitlist, misslist, backuphit, backupmiss in disptable:
4758 if abs not in table:
4758 if abs not in table:
4759 continue
4759 continue
4760 # file has changed in dirstate
4760 # file has changed in dirstate
4761 if mfentry:
4761 if mfentry:
4762 handle(hitlist, backuphit)
4762 handle(hitlist, backuphit)
4763 elif misslist is not None:
4763 elif misslist is not None:
4764 handle(misslist, backupmiss)
4764 handle(misslist, backupmiss)
4765 break
4765 break
4766 else:
4766 else:
4767 if abs not in repo.dirstate:
4767 if abs not in repo.dirstate:
4768 if mfentry:
4768 if mfentry:
4769 handle(add, True)
4769 handle(add, True)
4770 elif exact:
4770 elif exact:
4771 ui.warn(_('file not managed: %s\n') % rel)
4771 ui.warn(_('file not managed: %s\n') % rel)
4772 continue
4772 continue
4773 # file has not changed in dirstate
4773 # file has not changed in dirstate
4774 if node == parent:
4774 if node == parent:
4775 if exact:
4775 if exact:
4776 ui.warn(_('no changes needed to %s\n') % rel)
4776 ui.warn(_('no changes needed to %s\n') % rel)
4777 continue
4777 continue
4778 if pmf is None:
4778 if pmf is None:
4779 # only need parent manifest in this unlikely case,
4779 # only need parent manifest in this unlikely case,
4780 # so do not read by default
4780 # so do not read by default
4781 pmf = repo[parent].manifest()
4781 pmf = repo[parent].manifest()
4782 if abs in pmf and mfentry:
4782 if abs in pmf and mfentry:
4783 # if version of file is same in parent and target
4783 # if version of file is same in parent and target
4784 # manifests, do nothing
4784 # manifests, do nothing
4785 if (pmf[abs] != mfentry or
4785 if (pmf[abs] != mfentry or
4786 pmf.flags(abs) != mf.flags(abs)):
4786 pmf.flags(abs) != mf.flags(abs)):
4787 handle(revert, False)
4787 handle(revert, False)
4788 else:
4788 else:
4789 handle(remove, False)
4789 handle(remove, False)
4790
4790
4791 if not opts.get('dry_run'):
4791 if not opts.get('dry_run'):
4792 def checkout(f):
4792 def checkout(f):
4793 fc = ctx[f]
4793 fc = ctx[f]
4794 repo.wwrite(f, fc.data(), fc.flags())
4794 repo.wwrite(f, fc.data(), fc.flags())
4795
4795
4796 audit_path = scmutil.pathauditor(repo.root)
4796 audit_path = scmutil.pathauditor(repo.root)
4797 for f in remove[0]:
4797 for f in remove[0]:
4798 if repo.dirstate[f] == 'a':
4798 if repo.dirstate[f] == 'a':
4799 repo.dirstate.drop(f)
4799 repo.dirstate.drop(f)
4800 continue
4800 continue
4801 audit_path(f)
4801 audit_path(f)
4802 try:
4802 try:
4803 util.unlinkpath(repo.wjoin(f))
4803 util.unlinkpath(repo.wjoin(f))
4804 except OSError:
4804 except OSError:
4805 pass
4805 pass
4806 repo.dirstate.remove(f)
4806 repo.dirstate.remove(f)
4807
4807
4808 normal = None
4808 normal = None
4809 if node == parent:
4809 if node == parent:
4810 # We're reverting to our parent. If possible, we'd like status
4810 # We're reverting to our parent. If possible, we'd like status
4811 # to report the file as clean. We have to use normallookup for
4811 # to report the file as clean. We have to use normallookup for
4812 # merges to avoid losing information about merged/dirty files.
4812 # merges to avoid losing information about merged/dirty files.
4813 if p2 != nullid:
4813 if p2 != nullid:
4814 normal = repo.dirstate.normallookup
4814 normal = repo.dirstate.normallookup
4815 else:
4815 else:
4816 normal = repo.dirstate.normal
4816 normal = repo.dirstate.normal
4817 for f in revert[0]:
4817 for f in revert[0]:
4818 checkout(f)
4818 checkout(f)
4819 if normal:
4819 if normal:
4820 normal(f)
4820 normal(f)
4821
4821
4822 for f in add[0]:
4822 for f in add[0]:
4823 checkout(f)
4823 checkout(f)
4824 repo.dirstate.add(f)
4824 repo.dirstate.add(f)
4825
4825
4826 normal = repo.dirstate.normallookup
4826 normal = repo.dirstate.normallookup
4827 if node == parent and p2 == nullid:
4827 if node == parent and p2 == nullid:
4828 normal = repo.dirstate.normal
4828 normal = repo.dirstate.normal
4829 for f in undelete[0]:
4829 for f in undelete[0]:
4830 checkout(f)
4830 checkout(f)
4831 normal(f)
4831 normal(f)
4832
4832
4833 finally:
4833 finally:
4834 wlock.release()
4834 wlock.release()
4835
4835
4836 @command('rollback', dryrunopts +
4836 @command('rollback', dryrunopts +
4837 [('f', 'force', False, _('ignore safety measures'))])
4837 [('f', 'force', False, _('ignore safety measures'))])
4838 def rollback(ui, repo, **opts):
4838 def rollback(ui, repo, **opts):
4839 """roll back the last transaction (dangerous)
4839 """roll back the last transaction (dangerous)
4840
4840
4841 This command should be used with care. There is only one level of
4841 This command should be used with care. There is only one level of
4842 rollback, and there is no way to undo a rollback. It will also
4842 rollback, and there is no way to undo a rollback. It will also
4843 restore the dirstate at the time of the last transaction, losing
4843 restore the dirstate at the time of the last transaction, losing
4844 any dirstate changes since that time. This command does not alter
4844 any dirstate changes since that time. This command does not alter
4845 the working directory.
4845 the working directory.
4846
4846
4847 Transactions are used to encapsulate the effects of all commands
4847 Transactions are used to encapsulate the effects of all commands
4848 that create new changesets or propagate existing changesets into a
4848 that create new changesets or propagate existing changesets into a
4849 repository. For example, the following commands are transactional,
4849 repository. For example, the following commands are transactional,
4850 and their effects can be rolled back:
4850 and their effects can be rolled back:
4851
4851
4852 - commit
4852 - commit
4853 - import
4853 - import
4854 - pull
4854 - pull
4855 - push (with this repository as the destination)
4855 - push (with this repository as the destination)
4856 - unbundle
4856 - unbundle
4857
4857
4858 It's possible to lose data with rollback: commit, update back to
4858 It's possible to lose data with rollback: commit, update back to
4859 an older changeset, and then rollback. The update removes the
4859 an older changeset, and then rollback. The update removes the
4860 changes you committed from the working directory, and rollback
4860 changes you committed from the working directory, and rollback
4861 removes them from history. To avoid data loss, you must pass
4861 removes them from history. To avoid data loss, you must pass
4862 --force in this case.
4862 --force in this case.
4863
4863
4864 This command is not intended for use on public repositories. Once
4864 This command is not intended for use on public repositories. Once
4865 changes are visible for pull by other users, rolling a transaction
4865 changes are visible for pull by other users, rolling a transaction
4866 back locally is ineffective (someone else may already have pulled
4866 back locally is ineffective (someone else may already have pulled
4867 the changes). Furthermore, a race is possible with readers of the
4867 the changes). Furthermore, a race is possible with readers of the
4868 repository; for example an in-progress pull from the repository
4868 repository; for example an in-progress pull from the repository
4869 may fail if a rollback is performed.
4869 may fail if a rollback is performed.
4870
4870
4871 Returns 0 on success, 1 if no rollback data is available.
4871 Returns 0 on success, 1 if no rollback data is available.
4872 """
4872 """
4873 return repo.rollback(dryrun=opts.get('dry_run'),
4873 return repo.rollback(dryrun=opts.get('dry_run'),
4874 force=opts.get('force'))
4874 force=opts.get('force'))
4875
4875
4876 @command('root', [])
4876 @command('root', [])
4877 def root(ui, repo):
4877 def root(ui, repo):
4878 """print the root (top) of the current working directory
4878 """print the root (top) of the current working directory
4879
4879
4880 Print the root directory of the current repository.
4880 Print the root directory of the current repository.
4881
4881
4882 Returns 0 on success.
4882 Returns 0 on success.
4883 """
4883 """
4884 ui.write(repo.root + "\n")
4884 ui.write(repo.root + "\n")
4885
4885
4886 @command('^serve',
4886 @command('^serve',
4887 [('A', 'accesslog', '', _('name of access log file to write to'),
4887 [('A', 'accesslog', '', _('name of access log file to write to'),
4888 _('FILE')),
4888 _('FILE')),
4889 ('d', 'daemon', None, _('run server in background')),
4889 ('d', 'daemon', None, _('run server in background')),
4890 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
4890 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
4891 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4891 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4892 # use string type, then we can check if something was passed
4892 # use string type, then we can check if something was passed
4893 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4893 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4894 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4894 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4895 _('ADDR')),
4895 _('ADDR')),
4896 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4896 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4897 _('PREFIX')),
4897 _('PREFIX')),
4898 ('n', 'name', '',
4898 ('n', 'name', '',
4899 _('name to show in web pages (default: working directory)'), _('NAME')),
4899 _('name to show in web pages (default: working directory)'), _('NAME')),
4900 ('', 'web-conf', '',
4900 ('', 'web-conf', '',
4901 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
4901 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
4902 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4902 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4903 _('FILE')),
4903 _('FILE')),
4904 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4904 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4905 ('', 'stdio', None, _('for remote clients')),
4905 ('', 'stdio', None, _('for remote clients')),
4906 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
4906 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
4907 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4907 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4908 ('', 'style', '', _('template style to use'), _('STYLE')),
4908 ('', 'style', '', _('template style to use'), _('STYLE')),
4909 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4909 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4910 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
4910 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
4911 _('[OPTION]...'))
4911 _('[OPTION]...'))
4912 def serve(ui, repo, **opts):
4912 def serve(ui, repo, **opts):
4913 """start stand-alone webserver
4913 """start stand-alone webserver
4914
4914
4915 Start a local HTTP repository browser and pull server. You can use
4915 Start a local HTTP repository browser and pull server. You can use
4916 this for ad-hoc sharing and browsing of repositories. It is
4916 this for ad-hoc sharing and browsing of repositories. It is
4917 recommended to use a real web server to serve a repository for
4917 recommended to use a real web server to serve a repository for
4918 longer periods of time.
4918 longer periods of time.
4919
4919
4920 Please note that the server does not implement access control.
4920 Please note that the server does not implement access control.
4921 This means that, by default, anybody can read from the server and
4921 This means that, by default, anybody can read from the server and
4922 nobody can write to it by default. Set the ``web.allow_push``
4922 nobody can write to it by default. Set the ``web.allow_push``
4923 option to ``*`` to allow everybody to push to the server. You
4923 option to ``*`` to allow everybody to push to the server. You
4924 should use a real web server if you need to authenticate users.
4924 should use a real web server if you need to authenticate users.
4925
4925
4926 By default, the server logs accesses to stdout and errors to
4926 By default, the server logs accesses to stdout and errors to
4927 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4927 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4928 files.
4928 files.
4929
4929
4930 To have the server choose a free port number to listen on, specify
4930 To have the server choose a free port number to listen on, specify
4931 a port number of 0; in this case, the server will print the port
4931 a port number of 0; in this case, the server will print the port
4932 number it uses.
4932 number it uses.
4933
4933
4934 Returns 0 on success.
4934 Returns 0 on success.
4935 """
4935 """
4936
4936
4937 if opts["stdio"] and opts["cmdserver"]:
4937 if opts["stdio"] and opts["cmdserver"]:
4938 raise util.Abort(_("cannot use --stdio with --cmdserver"))
4938 raise util.Abort(_("cannot use --stdio with --cmdserver"))
4939
4939
4940 def checkrepo():
4940 def checkrepo():
4941 if repo is None:
4941 if repo is None:
4942 raise error.RepoError(_("There is no Mercurial repository here"
4942 raise error.RepoError(_("There is no Mercurial repository here"
4943 " (.hg not found)"))
4943 " (.hg not found)"))
4944
4944
4945 if opts["stdio"]:
4945 if opts["stdio"]:
4946 checkrepo()
4946 checkrepo()
4947 s = sshserver.sshserver(ui, repo)
4947 s = sshserver.sshserver(ui, repo)
4948 s.serve_forever()
4948 s.serve_forever()
4949
4949
4950 if opts["cmdserver"]:
4950 if opts["cmdserver"]:
4951 checkrepo()
4951 checkrepo()
4952 s = commandserver.server(ui, repo, opts["cmdserver"])
4952 s = commandserver.server(ui, repo, opts["cmdserver"])
4953 return s.serve()
4953 return s.serve()
4954
4954
4955 # this way we can check if something was given in the command-line
4955 # this way we can check if something was given in the command-line
4956 if opts.get('port'):
4956 if opts.get('port'):
4957 opts['port'] = util.getport(opts.get('port'))
4957 opts['port'] = util.getport(opts.get('port'))
4958
4958
4959 baseui = repo and repo.baseui or ui
4959 baseui = repo and repo.baseui or ui
4960 optlist = ("name templates style address port prefix ipv6"
4960 optlist = ("name templates style address port prefix ipv6"
4961 " accesslog errorlog certificate encoding")
4961 " accesslog errorlog certificate encoding")
4962 for o in optlist.split():
4962 for o in optlist.split():
4963 val = opts.get(o, '')
4963 val = opts.get(o, '')
4964 if val in (None, ''): # should check against default options instead
4964 if val in (None, ''): # should check against default options instead
4965 continue
4965 continue
4966 baseui.setconfig("web", o, val)
4966 baseui.setconfig("web", o, val)
4967 if repo and repo.ui != baseui:
4967 if repo and repo.ui != baseui:
4968 repo.ui.setconfig("web", o, val)
4968 repo.ui.setconfig("web", o, val)
4969
4969
4970 o = opts.get('web_conf') or opts.get('webdir_conf')
4970 o = opts.get('web_conf') or opts.get('webdir_conf')
4971 if not o:
4971 if not o:
4972 if not repo:
4972 if not repo:
4973 raise error.RepoError(_("There is no Mercurial repository"
4973 raise error.RepoError(_("There is no Mercurial repository"
4974 " here (.hg not found)"))
4974 " here (.hg not found)"))
4975 o = repo.root
4975 o = repo.root
4976
4976
4977 app = hgweb.hgweb(o, baseui=ui)
4977 app = hgweb.hgweb(o, baseui=ui)
4978
4978
4979 class service(object):
4979 class service(object):
4980 def init(self):
4980 def init(self):
4981 util.setsignalhandler()
4981 util.setsignalhandler()
4982 self.httpd = hgweb.server.create_server(ui, app)
4982 self.httpd = hgweb.server.create_server(ui, app)
4983
4983
4984 if opts['port'] and not ui.verbose:
4984 if opts['port'] and not ui.verbose:
4985 return
4985 return
4986
4986
4987 if self.httpd.prefix:
4987 if self.httpd.prefix:
4988 prefix = self.httpd.prefix.strip('/') + '/'
4988 prefix = self.httpd.prefix.strip('/') + '/'
4989 else:
4989 else:
4990 prefix = ''
4990 prefix = ''
4991
4991
4992 port = ':%d' % self.httpd.port
4992 port = ':%d' % self.httpd.port
4993 if port == ':80':
4993 if port == ':80':
4994 port = ''
4994 port = ''
4995
4995
4996 bindaddr = self.httpd.addr
4996 bindaddr = self.httpd.addr
4997 if bindaddr == '0.0.0.0':
4997 if bindaddr == '0.0.0.0':
4998 bindaddr = '*'
4998 bindaddr = '*'
4999 elif ':' in bindaddr: # IPv6
4999 elif ':' in bindaddr: # IPv6
5000 bindaddr = '[%s]' % bindaddr
5000 bindaddr = '[%s]' % bindaddr
5001
5001
5002 fqaddr = self.httpd.fqaddr
5002 fqaddr = self.httpd.fqaddr
5003 if ':' in fqaddr:
5003 if ':' in fqaddr:
5004 fqaddr = '[%s]' % fqaddr
5004 fqaddr = '[%s]' % fqaddr
5005 if opts['port']:
5005 if opts['port']:
5006 write = ui.status
5006 write = ui.status
5007 else:
5007 else:
5008 write = ui.write
5008 write = ui.write
5009 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5009 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5010 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5010 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5011
5011
5012 def run(self):
5012 def run(self):
5013 self.httpd.serve_forever()
5013 self.httpd.serve_forever()
5014
5014
5015 service = service()
5015 service = service()
5016
5016
5017 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5017 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5018
5018
5019 @command('showconfig|debugconfig',
5019 @command('showconfig|debugconfig',
5020 [('u', 'untrusted', None, _('show untrusted configuration options'))],
5020 [('u', 'untrusted', None, _('show untrusted configuration options'))],
5021 _('[-u] [NAME]...'))
5021 _('[-u] [NAME]...'))
5022 def showconfig(ui, repo, *values, **opts):
5022 def showconfig(ui, repo, *values, **opts):
5023 """show combined config settings from all hgrc files
5023 """show combined config settings from all hgrc files
5024
5024
5025 With no arguments, print names and values of all config items.
5025 With no arguments, print names and values of all config items.
5026
5026
5027 With one argument of the form section.name, print just the value
5027 With one argument of the form section.name, print just the value
5028 of that config item.
5028 of that config item.
5029
5029
5030 With multiple arguments, print names and values of all config
5030 With multiple arguments, print names and values of all config
5031 items with matching section names.
5031 items with matching section names.
5032
5032
5033 With --debug, the source (filename and line number) is printed
5033 With --debug, the source (filename and line number) is printed
5034 for each config item.
5034 for each config item.
5035
5035
5036 Returns 0 on success.
5036 Returns 0 on success.
5037 """
5037 """
5038
5038
5039 for f in scmutil.rcpath():
5039 for f in scmutil.rcpath():
5040 ui.debug('read config from: %s\n' % f)
5040 ui.debug('read config from: %s\n' % f)
5041 untrusted = bool(opts.get('untrusted'))
5041 untrusted = bool(opts.get('untrusted'))
5042 if values:
5042 if values:
5043 sections = [v for v in values if '.' not in v]
5043 sections = [v for v in values if '.' not in v]
5044 items = [v for v in values if '.' in v]
5044 items = [v for v in values if '.' in v]
5045 if len(items) > 1 or items and sections:
5045 if len(items) > 1 or items and sections:
5046 raise util.Abort(_('only one config item permitted'))
5046 raise util.Abort(_('only one config item permitted'))
5047 for section, name, value in ui.walkconfig(untrusted=untrusted):
5047 for section, name, value in ui.walkconfig(untrusted=untrusted):
5048 value = str(value).replace('\n', '\\n')
5048 value = str(value).replace('\n', '\\n')
5049 sectname = section + '.' + name
5049 sectname = section + '.' + name
5050 if values:
5050 if values:
5051 for v in values:
5051 for v in values:
5052 if v == section:
5052 if v == section:
5053 ui.debug('%s: ' %
5053 ui.debug('%s: ' %
5054 ui.configsource(section, name, untrusted))
5054 ui.configsource(section, name, untrusted))
5055 ui.write('%s=%s\n' % (sectname, value))
5055 ui.write('%s=%s\n' % (sectname, value))
5056 elif v == sectname:
5056 elif v == sectname:
5057 ui.debug('%s: ' %
5057 ui.debug('%s: ' %
5058 ui.configsource(section, name, untrusted))
5058 ui.configsource(section, name, untrusted))
5059 ui.write(value, '\n')
5059 ui.write(value, '\n')
5060 else:
5060 else:
5061 ui.debug('%s: ' %
5061 ui.debug('%s: ' %
5062 ui.configsource(section, name, untrusted))
5062 ui.configsource(section, name, untrusted))
5063 ui.write('%s=%s\n' % (sectname, value))
5063 ui.write('%s=%s\n' % (sectname, value))
5064
5064
5065 @command('^status|st',
5065 @command('^status|st',
5066 [('A', 'all', None, _('show status of all files')),
5066 [('A', 'all', None, _('show status of all files')),
5067 ('m', 'modified', None, _('show only modified files')),
5067 ('m', 'modified', None, _('show only modified files')),
5068 ('a', 'added', None, _('show only added files')),
5068 ('a', 'added', None, _('show only added files')),
5069 ('r', 'removed', None, _('show only removed files')),
5069 ('r', 'removed', None, _('show only removed files')),
5070 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5070 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5071 ('c', 'clean', None, _('show only files without changes')),
5071 ('c', 'clean', None, _('show only files without changes')),
5072 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5072 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5073 ('i', 'ignored', None, _('show only ignored files')),
5073 ('i', 'ignored', None, _('show only ignored files')),
5074 ('n', 'no-status', None, _('hide status prefix')),
5074 ('n', 'no-status', None, _('hide status prefix')),
5075 ('C', 'copies', None, _('show source of copied files')),
5075 ('C', 'copies', None, _('show source of copied files')),
5076 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5076 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5077 ('', 'rev', [], _('show difference from revision'), _('REV')),
5077 ('', 'rev', [], _('show difference from revision'), _('REV')),
5078 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5078 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5079 ] + walkopts + subrepoopts,
5079 ] + walkopts + subrepoopts,
5080 _('[OPTION]... [FILE]...'))
5080 _('[OPTION]... [FILE]...'))
5081 def status(ui, repo, *pats, **opts):
5081 def status(ui, repo, *pats, **opts):
5082 """show changed files in the working directory
5082 """show changed files in the working directory
5083
5083
5084 Show status of files in the repository. If names are given, only
5084 Show status of files in the repository. If names are given, only
5085 files that match are shown. Files that are clean or ignored or
5085 files that match are shown. Files that are clean or ignored or
5086 the source of a copy/move operation, are not listed unless
5086 the source of a copy/move operation, are not listed unless
5087 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5087 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5088 Unless options described with "show only ..." are given, the
5088 Unless options described with "show only ..." are given, the
5089 options -mardu are used.
5089 options -mardu are used.
5090
5090
5091 Option -q/--quiet hides untracked (unknown and ignored) files
5091 Option -q/--quiet hides untracked (unknown and ignored) files
5092 unless explicitly requested with -u/--unknown or -i/--ignored.
5092 unless explicitly requested with -u/--unknown or -i/--ignored.
5093
5093
5094 .. note::
5094 .. note::
5095 status may appear to disagree with diff if permissions have
5095 status may appear to disagree with diff if permissions have
5096 changed or a merge has occurred. The standard diff format does
5096 changed or a merge has occurred. The standard diff format does
5097 not report permission changes and diff only reports changes
5097 not report permission changes and diff only reports changes
5098 relative to one merge parent.
5098 relative to one merge parent.
5099
5099
5100 If one revision is given, it is used as the base revision.
5100 If one revision is given, it is used as the base revision.
5101 If two revisions are given, the differences between them are
5101 If two revisions are given, the differences between them are
5102 shown. The --change option can also be used as a shortcut to list
5102 shown. The --change option can also be used as a shortcut to list
5103 the changed files of a revision from its first parent.
5103 the changed files of a revision from its first parent.
5104
5104
5105 The codes used to show the status of files are::
5105 The codes used to show the status of files are::
5106
5106
5107 M = modified
5107 M = modified
5108 A = added
5108 A = added
5109 R = removed
5109 R = removed
5110 C = clean
5110 C = clean
5111 ! = missing (deleted by non-hg command, but still tracked)
5111 ! = missing (deleted by non-hg command, but still tracked)
5112 ? = not tracked
5112 ? = not tracked
5113 I = ignored
5113 I = ignored
5114 = origin of the previous file listed as A (added)
5114 = origin of the previous file listed as A (added)
5115
5115
5116 .. container:: verbose
5116 .. container:: verbose
5117
5117
5118 Examples:
5118 Examples:
5119
5119
5120 - show changes in the working directory relative to a changeset:
5120 - show changes in the working directory relative to a changeset:
5121
5121
5122 hg status --rev 9353
5122 hg status --rev 9353
5123
5123
5124 - show all changes including copies in an existing changeset::
5124 - show all changes including copies in an existing changeset::
5125
5125
5126 hg status --copies --change 9353
5126 hg status --copies --change 9353
5127
5127
5128 - get a NUL separated list of added files, suitable for xargs::
5128 - get a NUL separated list of added files, suitable for xargs::
5129
5129
5130 hg status -an0
5130 hg status -an0
5131
5131
5132 Returns 0 on success.
5132 Returns 0 on success.
5133 """
5133 """
5134
5134
5135 revs = opts.get('rev')
5135 revs = opts.get('rev')
5136 change = opts.get('change')
5136 change = opts.get('change')
5137
5137
5138 if revs and change:
5138 if revs and change:
5139 msg = _('cannot specify --rev and --change at the same time')
5139 msg = _('cannot specify --rev and --change at the same time')
5140 raise util.Abort(msg)
5140 raise util.Abort(msg)
5141 elif change:
5141 elif change:
5142 node2 = repo.lookup(change)
5142 node2 = repo.lookup(change)
5143 node1 = repo[node2].p1().node()
5143 node1 = repo[node2].p1().node()
5144 else:
5144 else:
5145 node1, node2 = scmutil.revpair(repo, revs)
5145 node1, node2 = scmutil.revpair(repo, revs)
5146
5146
5147 cwd = (pats and repo.getcwd()) or ''
5147 cwd = (pats and repo.getcwd()) or ''
5148 end = opts.get('print0') and '\0' or '\n'
5148 end = opts.get('print0') and '\0' or '\n'
5149 copy = {}
5149 copy = {}
5150 states = 'modified added removed deleted unknown ignored clean'.split()
5150 states = 'modified added removed deleted unknown ignored clean'.split()
5151 show = [k for k in states if opts.get(k)]
5151 show = [k for k in states if opts.get(k)]
5152 if opts.get('all'):
5152 if opts.get('all'):
5153 show += ui.quiet and (states[:4] + ['clean']) or states
5153 show += ui.quiet and (states[:4] + ['clean']) or states
5154 if not show:
5154 if not show:
5155 show = ui.quiet and states[:4] or states[:5]
5155 show = ui.quiet and states[:4] or states[:5]
5156
5156
5157 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5157 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5158 'ignored' in show, 'clean' in show, 'unknown' in show,
5158 'ignored' in show, 'clean' in show, 'unknown' in show,
5159 opts.get('subrepos'))
5159 opts.get('subrepos'))
5160 changestates = zip(states, 'MAR!?IC', stat)
5160 changestates = zip(states, 'MAR!?IC', stat)
5161
5161
5162 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5162 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5163 ctxn = repo[nullid]
5163 ctxn = repo[nullid]
5164 ctx1 = repo[node1]
5164 ctx1 = repo[node1]
5165 ctx2 = repo[node2]
5165 ctx2 = repo[node2]
5166 added = stat[1]
5166 added = stat[1]
5167 if node2 is None:
5167 if node2 is None:
5168 added = stat[0] + stat[1] # merged?
5168 added = stat[0] + stat[1] # merged?
5169
5169
5170 for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].iteritems():
5170 for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].iteritems():
5171 if k in added:
5171 if k in added:
5172 copy[k] = v
5172 copy[k] = v
5173 elif v in added:
5173 elif v in added:
5174 copy[v] = k
5174 copy[v] = k
5175
5175
5176 for state, char, files in changestates:
5176 for state, char, files in changestates:
5177 if state in show:
5177 if state in show:
5178 format = "%s %%s%s" % (char, end)
5178 format = "%s %%s%s" % (char, end)
5179 if opts.get('no_status'):
5179 if opts.get('no_status'):
5180 format = "%%s%s" % end
5180 format = "%%s%s" % end
5181
5181
5182 for f in files:
5182 for f in files:
5183 ui.write(format % repo.pathto(f, cwd),
5183 ui.write(format % repo.pathto(f, cwd),
5184 label='status.' + state)
5184 label='status.' + state)
5185 if f in copy:
5185 if f in copy:
5186 ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end),
5186 ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end),
5187 label='status.copied')
5187 label='status.copied')
5188
5188
5189 @command('^summary|sum',
5189 @command('^summary|sum',
5190 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5190 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5191 def summary(ui, repo, **opts):
5191 def summary(ui, repo, **opts):
5192 """summarize working directory state
5192 """summarize working directory state
5193
5193
5194 This generates a brief summary of the working directory state,
5194 This generates a brief summary of the working directory state,
5195 including parents, branch, commit status, and available updates.
5195 including parents, branch, commit status, and available updates.
5196
5196
5197 With the --remote option, this will check the default paths for
5197 With the --remote option, this will check the default paths for
5198 incoming and outgoing changes. This can be time-consuming.
5198 incoming and outgoing changes. This can be time-consuming.
5199
5199
5200 Returns 0 on success.
5200 Returns 0 on success.
5201 """
5201 """
5202
5202
5203 ctx = repo[None]
5203 ctx = repo[None]
5204 parents = ctx.parents()
5204 parents = ctx.parents()
5205 pnode = parents[0].node()
5205 pnode = parents[0].node()
5206 marks = []
5206 marks = []
5207
5207
5208 for p in parents:
5208 for p in parents:
5209 # label with log.changeset (instead of log.parent) since this
5209 # label with log.changeset (instead of log.parent) since this
5210 # shows a working directory parent *changeset*:
5210 # shows a working directory parent *changeset*:
5211 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5211 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5212 label='log.changeset')
5212 label='log.changeset')
5213 ui.write(' '.join(p.tags()), label='log.tag')
5213 ui.write(' '.join(p.tags()), label='log.tag')
5214 if p.bookmarks():
5214 if p.bookmarks():
5215 marks.extend(p.bookmarks())
5215 marks.extend(p.bookmarks())
5216 if p.rev() == -1:
5216 if p.rev() == -1:
5217 if not len(repo):
5217 if not len(repo):
5218 ui.write(_(' (empty repository)'))
5218 ui.write(_(' (empty repository)'))
5219 else:
5219 else:
5220 ui.write(_(' (no revision checked out)'))
5220 ui.write(_(' (no revision checked out)'))
5221 ui.write('\n')
5221 ui.write('\n')
5222 if p.description():
5222 if p.description():
5223 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5223 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5224 label='log.summary')
5224 label='log.summary')
5225
5225
5226 branch = ctx.branch()
5226 branch = ctx.branch()
5227 bheads = repo.branchheads(branch)
5227 bheads = repo.branchheads(branch)
5228 m = _('branch: %s\n') % branch
5228 m = _('branch: %s\n') % branch
5229 if branch != 'default':
5229 if branch != 'default':
5230 ui.write(m, label='log.branch')
5230 ui.write(m, label='log.branch')
5231 else:
5231 else:
5232 ui.status(m, label='log.branch')
5232 ui.status(m, label='log.branch')
5233
5233
5234 if marks:
5234 if marks:
5235 current = repo._bookmarkcurrent
5235 current = repo._bookmarkcurrent
5236 ui.write(_('bookmarks:'), label='log.bookmark')
5236 ui.write(_('bookmarks:'), label='log.bookmark')
5237 if current is not None:
5237 if current is not None:
5238 try:
5238 try:
5239 marks.remove(current)
5239 marks.remove(current)
5240 ui.write(' *' + current, label='bookmarks.current')
5240 ui.write(' *' + current, label='bookmarks.current')
5241 except ValueError:
5241 except ValueError:
5242 # current bookmark not in parent ctx marks
5242 # current bookmark not in parent ctx marks
5243 pass
5243 pass
5244 for m in marks:
5244 for m in marks:
5245 ui.write(' ' + m, label='log.bookmark')
5245 ui.write(' ' + m, label='log.bookmark')
5246 ui.write('\n', label='log.bookmark')
5246 ui.write('\n', label='log.bookmark')
5247
5247
5248 st = list(repo.status(unknown=True))[:6]
5248 st = list(repo.status(unknown=True))[:6]
5249
5249
5250 c = repo.dirstate.copies()
5250 c = repo.dirstate.copies()
5251 copied, renamed = [], []
5251 copied, renamed = [], []
5252 for d, s in c.iteritems():
5252 for d, s in c.iteritems():
5253 if s in st[2]:
5253 if s in st[2]:
5254 st[2].remove(s)
5254 st[2].remove(s)
5255 renamed.append(d)
5255 renamed.append(d)
5256 else:
5256 else:
5257 copied.append(d)
5257 copied.append(d)
5258 if d in st[1]:
5258 if d in st[1]:
5259 st[1].remove(d)
5259 st[1].remove(d)
5260 st.insert(3, renamed)
5260 st.insert(3, renamed)
5261 st.insert(4, copied)
5261 st.insert(4, copied)
5262
5262
5263 ms = mergemod.mergestate(repo)
5263 ms = mergemod.mergestate(repo)
5264 st.append([f for f in ms if ms[f] == 'u'])
5264 st.append([f for f in ms if ms[f] == 'u'])
5265
5265
5266 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5266 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5267 st.append(subs)
5267 st.append(subs)
5268
5268
5269 labels = [ui.label(_('%d modified'), 'status.modified'),
5269 labels = [ui.label(_('%d modified'), 'status.modified'),
5270 ui.label(_('%d added'), 'status.added'),
5270 ui.label(_('%d added'), 'status.added'),
5271 ui.label(_('%d removed'), 'status.removed'),
5271 ui.label(_('%d removed'), 'status.removed'),
5272 ui.label(_('%d renamed'), 'status.copied'),
5272 ui.label(_('%d renamed'), 'status.copied'),
5273 ui.label(_('%d copied'), 'status.copied'),
5273 ui.label(_('%d copied'), 'status.copied'),
5274 ui.label(_('%d deleted'), 'status.deleted'),
5274 ui.label(_('%d deleted'), 'status.deleted'),
5275 ui.label(_('%d unknown'), 'status.unknown'),
5275 ui.label(_('%d unknown'), 'status.unknown'),
5276 ui.label(_('%d ignored'), 'status.ignored'),
5276 ui.label(_('%d ignored'), 'status.ignored'),
5277 ui.label(_('%d unresolved'), 'resolve.unresolved'),
5277 ui.label(_('%d unresolved'), 'resolve.unresolved'),
5278 ui.label(_('%d subrepos'), 'status.modified')]
5278 ui.label(_('%d subrepos'), 'status.modified')]
5279 t = []
5279 t = []
5280 for s, l in zip(st, labels):
5280 for s, l in zip(st, labels):
5281 if s:
5281 if s:
5282 t.append(l % len(s))
5282 t.append(l % len(s))
5283
5283
5284 t = ', '.join(t)
5284 t = ', '.join(t)
5285 cleanworkdir = False
5285 cleanworkdir = False
5286
5286
5287 if len(parents) > 1:
5287 if len(parents) > 1:
5288 t += _(' (merge)')
5288 t += _(' (merge)')
5289 elif branch != parents[0].branch():
5289 elif branch != parents[0].branch():
5290 t += _(' (new branch)')
5290 t += _(' (new branch)')
5291 elif (parents[0].extra().get('close') and
5291 elif (parents[0].extra().get('close') and
5292 pnode in repo.branchheads(branch, closed=True)):
5292 pnode in repo.branchheads(branch, closed=True)):
5293 t += _(' (head closed)')
5293 t += _(' (head closed)')
5294 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
5294 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
5295 t += _(' (clean)')
5295 t += _(' (clean)')
5296 cleanworkdir = True
5296 cleanworkdir = True
5297 elif pnode not in bheads:
5297 elif pnode not in bheads:
5298 t += _(' (new branch head)')
5298 t += _(' (new branch head)')
5299
5299
5300 if cleanworkdir:
5300 if cleanworkdir:
5301 ui.status(_('commit: %s\n') % t.strip())
5301 ui.status(_('commit: %s\n') % t.strip())
5302 else:
5302 else:
5303 ui.write(_('commit: %s\n') % t.strip())
5303 ui.write(_('commit: %s\n') % t.strip())
5304
5304
5305 # all ancestors of branch heads - all ancestors of parent = new csets
5305 # all ancestors of branch heads - all ancestors of parent = new csets
5306 new = [0] * len(repo)
5306 new = [0] * len(repo)
5307 cl = repo.changelog
5307 cl = repo.changelog
5308 for a in [cl.rev(n) for n in bheads]:
5308 for a in [cl.rev(n) for n in bheads]:
5309 new[a] = 1
5309 new[a] = 1
5310 for a in cl.ancestors(*[cl.rev(n) for n in bheads]):
5310 for a in cl.ancestors(*[cl.rev(n) for n in bheads]):
5311 new[a] = 1
5311 new[a] = 1
5312 for a in [p.rev() for p in parents]:
5312 for a in [p.rev() for p in parents]:
5313 if a >= 0:
5313 if a >= 0:
5314 new[a] = 0
5314 new[a] = 0
5315 for a in cl.ancestors(*[p.rev() for p in parents]):
5315 for a in cl.ancestors(*[p.rev() for p in parents]):
5316 new[a] = 0
5316 new[a] = 0
5317 new = sum(new)
5317 new = sum(new)
5318
5318
5319 if new == 0:
5319 if new == 0:
5320 ui.status(_('update: (current)\n'))
5320 ui.status(_('update: (current)\n'))
5321 elif pnode not in bheads:
5321 elif pnode not in bheads:
5322 ui.write(_('update: %d new changesets (update)\n') % new)
5322 ui.write(_('update: %d new changesets (update)\n') % new)
5323 else:
5323 else:
5324 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5324 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5325 (new, len(bheads)))
5325 (new, len(bheads)))
5326
5326
5327 if opts.get('remote'):
5327 if opts.get('remote'):
5328 t = []
5328 t = []
5329 source, branches = hg.parseurl(ui.expandpath('default'))
5329 source, branches = hg.parseurl(ui.expandpath('default'))
5330 other = hg.peer(repo, {}, source)
5330 other = hg.peer(repo, {}, source)
5331 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
5331 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
5332 ui.debug('comparing with %s\n' % util.hidepassword(source))
5332 ui.debug('comparing with %s\n' % util.hidepassword(source))
5333 repo.ui.pushbuffer()
5333 repo.ui.pushbuffer()
5334 commoninc = discovery.findcommonincoming(repo, other)
5334 commoninc = discovery.findcommonincoming(repo, other)
5335 _common, incoming, _rheads = commoninc
5335 _common, incoming, _rheads = commoninc
5336 repo.ui.popbuffer()
5336 repo.ui.popbuffer()
5337 if incoming:
5337 if incoming:
5338 t.append(_('1 or more incoming'))
5338 t.append(_('1 or more incoming'))
5339
5339
5340 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5340 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5341 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5341 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5342 if source != dest:
5342 if source != dest:
5343 other = hg.peer(repo, {}, dest)
5343 other = hg.peer(repo, {}, dest)
5344 commoninc = None
5344 commoninc = None
5345 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5345 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5346 repo.ui.pushbuffer()
5346 repo.ui.pushbuffer()
5347 common, outheads = discovery.findcommonoutgoing(repo, other,
5347 common, outheads = discovery.findcommonoutgoing(repo, other,
5348 commoninc=commoninc)
5348 commoninc=commoninc)
5349 repo.ui.popbuffer()
5349 repo.ui.popbuffer()
5350 o = repo.changelog.findmissing(common=common, heads=outheads)
5350 o = repo.changelog.findmissing(common=common, heads=outheads)
5351 if o:
5351 if o:
5352 t.append(_('%d outgoing') % len(o))
5352 t.append(_('%d outgoing') % len(o))
5353 if 'bookmarks' in other.listkeys('namespaces'):
5353 if 'bookmarks' in other.listkeys('namespaces'):
5354 lmarks = repo.listkeys('bookmarks')
5354 lmarks = repo.listkeys('bookmarks')
5355 rmarks = other.listkeys('bookmarks')
5355 rmarks = other.listkeys('bookmarks')
5356 diff = set(rmarks) - set(lmarks)
5356 diff = set(rmarks) - set(lmarks)
5357 if len(diff) > 0:
5357 if len(diff) > 0:
5358 t.append(_('%d incoming bookmarks') % len(diff))
5358 t.append(_('%d incoming bookmarks') % len(diff))
5359 diff = set(lmarks) - set(rmarks)
5359 diff = set(lmarks) - set(rmarks)
5360 if len(diff) > 0:
5360 if len(diff) > 0:
5361 t.append(_('%d outgoing bookmarks') % len(diff))
5361 t.append(_('%d outgoing bookmarks') % len(diff))
5362
5362
5363 if t:
5363 if t:
5364 ui.write(_('remote: %s\n') % (', '.join(t)))
5364 ui.write(_('remote: %s\n') % (', '.join(t)))
5365 else:
5365 else:
5366 ui.status(_('remote: (synced)\n'))
5366 ui.status(_('remote: (synced)\n'))
5367
5367
5368 @command('tag',
5368 @command('tag',
5369 [('f', 'force', None, _('force tag')),
5369 [('f', 'force', None, _('force tag')),
5370 ('l', 'local', None, _('make the tag local')),
5370 ('l', 'local', None, _('make the tag local')),
5371 ('r', 'rev', '', _('revision to tag'), _('REV')),
5371 ('r', 'rev', '', _('revision to tag'), _('REV')),
5372 ('', 'remove', None, _('remove a tag')),
5372 ('', 'remove', None, _('remove a tag')),
5373 # -l/--local is already there, commitopts cannot be used
5373 # -l/--local is already there, commitopts cannot be used
5374 ('e', 'edit', None, _('edit commit message')),
5374 ('e', 'edit', None, _('edit commit message')),
5375 ('m', 'message', '', _('use <text> as commit message'), _('TEXT')),
5375 ('m', 'message', '', _('use <text> as commit message'), _('TEXT')),
5376 ] + commitopts2,
5376 ] + commitopts2,
5377 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5377 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5378 def tag(ui, repo, name1, *names, **opts):
5378 def tag(ui, repo, name1, *names, **opts):
5379 """add one or more tags for the current or given revision
5379 """add one or more tags for the current or given revision
5380
5380
5381 Name a particular revision using <name>.
5381 Name a particular revision using <name>.
5382
5382
5383 Tags are used to name particular revisions of the repository and are
5383 Tags are used to name particular revisions of the repository and are
5384 very useful to compare different revisions, to go back to significant
5384 very useful to compare different revisions, to go back to significant
5385 earlier versions or to mark branch points as releases, etc. Changing
5385 earlier versions or to mark branch points as releases, etc. Changing
5386 an existing tag is normally disallowed; use -f/--force to override.
5386 an existing tag is normally disallowed; use -f/--force to override.
5387
5387
5388 If no revision is given, the parent of the working directory is
5388 If no revision is given, the parent of the working directory is
5389 used, or tip if no revision is checked out.
5389 used, or tip if no revision is checked out.
5390
5390
5391 To facilitate version control, distribution, and merging of tags,
5391 To facilitate version control, distribution, and merging of tags,
5392 they are stored as a file named ".hgtags" which is managed similarly
5392 they are stored as a file named ".hgtags" which is managed similarly
5393 to other project files and can be hand-edited if necessary. This
5393 to other project files and can be hand-edited if necessary. This
5394 also means that tagging creates a new commit. The file
5394 also means that tagging creates a new commit. The file
5395 ".hg/localtags" is used for local tags (not shared among
5395 ".hg/localtags" is used for local tags (not shared among
5396 repositories).
5396 repositories).
5397
5397
5398 Tag commits are usually made at the head of a branch. If the parent
5398 Tag commits are usually made at the head of a branch. If the parent
5399 of the working directory is not a branch head, :hg:`tag` aborts; use
5399 of the working directory is not a branch head, :hg:`tag` aborts; use
5400 -f/--force to force the tag commit to be based on a non-head
5400 -f/--force to force the tag commit to be based on a non-head
5401 changeset.
5401 changeset.
5402
5402
5403 See :hg:`help dates` for a list of formats valid for -d/--date.
5403 See :hg:`help dates` for a list of formats valid for -d/--date.
5404
5404
5405 Since tag names have priority over branch names during revision
5405 Since tag names have priority over branch names during revision
5406 lookup, using an existing branch name as a tag name is discouraged.
5406 lookup, using an existing branch name as a tag name is discouraged.
5407
5407
5408 Returns 0 on success.
5408 Returns 0 on success.
5409 """
5409 """
5410
5410
5411 rev_ = "."
5411 rev_ = "."
5412 names = [t.strip() for t in (name1,) + names]
5412 names = [t.strip() for t in (name1,) + names]
5413 if len(names) != len(set(names)):
5413 if len(names) != len(set(names)):
5414 raise util.Abort(_('tag names must be unique'))
5414 raise util.Abort(_('tag names must be unique'))
5415 for n in names:
5415 for n in names:
5416 if n in ['tip', '.', 'null']:
5416 if n in ['tip', '.', 'null']:
5417 raise util.Abort(_("the name '%s' is reserved") % n)
5417 raise util.Abort(_("the name '%s' is reserved") % n)
5418 if not n:
5418 if not n:
5419 raise util.Abort(_('tag names cannot consist entirely of whitespace'))
5419 raise util.Abort(_('tag names cannot consist entirely of whitespace'))
5420 if opts.get('rev') and opts.get('remove'):
5420 if opts.get('rev') and opts.get('remove'):
5421 raise util.Abort(_("--rev and --remove are incompatible"))
5421 raise util.Abort(_("--rev and --remove are incompatible"))
5422 if opts.get('rev'):
5422 if opts.get('rev'):
5423 rev_ = opts['rev']
5423 rev_ = opts['rev']
5424 message = opts.get('message')
5424 message = opts.get('message')
5425 if opts.get('remove'):
5425 if opts.get('remove'):
5426 expectedtype = opts.get('local') and 'local' or 'global'
5426 expectedtype = opts.get('local') and 'local' or 'global'
5427 for n in names:
5427 for n in names:
5428 if not repo.tagtype(n):
5428 if not repo.tagtype(n):
5429 raise util.Abort(_("tag '%s' does not exist") % n)
5429 raise util.Abort(_("tag '%s' does not exist") % n)
5430 if repo.tagtype(n) != expectedtype:
5430 if repo.tagtype(n) != expectedtype:
5431 if expectedtype == 'global':
5431 if expectedtype == 'global':
5432 raise util.Abort(_("tag '%s' is not a global tag") % n)
5432 raise util.Abort(_("tag '%s' is not a global tag") % n)
5433 else:
5433 else:
5434 raise util.Abort(_("tag '%s' is not a local tag") % n)
5434 raise util.Abort(_("tag '%s' is not a local tag") % n)
5435 rev_ = nullid
5435 rev_ = nullid
5436 if not message:
5436 if not message:
5437 # we don't translate commit messages
5437 # we don't translate commit messages
5438 message = 'Removed tag %s' % ', '.join(names)
5438 message = 'Removed tag %s' % ', '.join(names)
5439 elif not opts.get('force'):
5439 elif not opts.get('force'):
5440 for n in names:
5440 for n in names:
5441 if n in repo.tags():
5441 if n in repo.tags():
5442 raise util.Abort(_("tag '%s' already exists "
5442 raise util.Abort(_("tag '%s' already exists "
5443 "(use -f to force)") % n)
5443 "(use -f to force)") % n)
5444 if not opts.get('local'):
5444 if not opts.get('local'):
5445 p1, p2 = repo.dirstate.parents()
5445 p1, p2 = repo.dirstate.parents()
5446 if p2 != nullid:
5446 if p2 != nullid:
5447 raise util.Abort(_('uncommitted merge'))
5447 raise util.Abort(_('uncommitted merge'))
5448 bheads = repo.branchheads()
5448 bheads = repo.branchheads()
5449 if not opts.get('force') and bheads and p1 not in bheads:
5449 if not opts.get('force') and bheads and p1 not in bheads:
5450 raise util.Abort(_('not at a branch head (use -f to force)'))
5450 raise util.Abort(_('not at a branch head (use -f to force)'))
5451 r = scmutil.revsingle(repo, rev_).node()
5451 r = scmutil.revsingle(repo, rev_).node()
5452
5452
5453 if not message:
5453 if not message:
5454 # we don't translate commit messages
5454 # we don't translate commit messages
5455 message = ('Added tag %s for changeset %s' %
5455 message = ('Added tag %s for changeset %s' %
5456 (', '.join(names), short(r)))
5456 (', '.join(names), short(r)))
5457
5457
5458 date = opts.get('date')
5458 date = opts.get('date')
5459 if date:
5459 if date:
5460 date = util.parsedate(date)
5460 date = util.parsedate(date)
5461
5461
5462 if opts.get('edit'):
5462 if opts.get('edit'):
5463 message = ui.edit(message, ui.username())
5463 message = ui.edit(message, ui.username())
5464
5464
5465 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
5465 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
5466
5466
5467 @command('tags', [], '')
5467 @command('tags', [], '')
5468 def tags(ui, repo):
5468 def tags(ui, repo):
5469 """list repository tags
5469 """list repository tags
5470
5470
5471 This lists both regular and local tags. When the -v/--verbose
5471 This lists both regular and local tags. When the -v/--verbose
5472 switch is used, a third column "local" is printed for local tags.
5472 switch is used, a third column "local" is printed for local tags.
5473
5473
5474 Returns 0 on success.
5474 Returns 0 on success.
5475 """
5475 """
5476
5476
5477 hexfunc = ui.debugflag and hex or short
5477 hexfunc = ui.debugflag and hex or short
5478 tagtype = ""
5478 tagtype = ""
5479
5479
5480 for t, n in reversed(repo.tagslist()):
5480 for t, n in reversed(repo.tagslist()):
5481 if ui.quiet:
5481 if ui.quiet:
5482 ui.write("%s\n" % t, label='tags.normal')
5482 ui.write("%s\n" % t, label='tags.normal')
5483 continue
5483 continue
5484
5484
5485 hn = hexfunc(n)
5485 hn = hexfunc(n)
5486 r = "%5d:%s" % (repo.changelog.rev(n), hn)
5486 r = "%5d:%s" % (repo.changelog.rev(n), hn)
5487 rev = ui.label(r, 'log.changeset')
5487 rev = ui.label(r, 'log.changeset')
5488 spaces = " " * (30 - encoding.colwidth(t))
5488 spaces = " " * (30 - encoding.colwidth(t))
5489
5489
5490 tag = ui.label(t, 'tags.normal')
5490 tag = ui.label(t, 'tags.normal')
5491 if ui.verbose:
5491 if ui.verbose:
5492 if repo.tagtype(t) == 'local':
5492 if repo.tagtype(t) == 'local':
5493 tagtype = " local"
5493 tagtype = " local"
5494 tag = ui.label(t, 'tags.local')
5494 tag = ui.label(t, 'tags.local')
5495 else:
5495 else:
5496 tagtype = ""
5496 tagtype = ""
5497 ui.write("%s%s %s%s\n" % (tag, spaces, rev, tagtype))
5497 ui.write("%s%s %s%s\n" % (tag, spaces, rev, tagtype))
5498
5498
5499 @command('tip',
5499 @command('tip',
5500 [('p', 'patch', None, _('show patch')),
5500 [('p', 'patch', None, _('show patch')),
5501 ('g', 'git', None, _('use git extended diff format')),
5501 ('g', 'git', None, _('use git extended diff format')),
5502 ] + templateopts,
5502 ] + templateopts,
5503 _('[-p] [-g]'))
5503 _('[-p] [-g]'))
5504 def tip(ui, repo, **opts):
5504 def tip(ui, repo, **opts):
5505 """show the tip revision
5505 """show the tip revision
5506
5506
5507 The tip revision (usually just called the tip) is the changeset
5507 The tip revision (usually just called the tip) is the changeset
5508 most recently added to the repository (and therefore the most
5508 most recently added to the repository (and therefore the most
5509 recently changed head).
5509 recently changed head).
5510
5510
5511 If you have just made a commit, that commit will be the tip. If
5511 If you have just made a commit, that commit will be the tip. If
5512 you have just pulled changes from another repository, the tip of
5512 you have just pulled changes from another repository, the tip of
5513 that repository becomes the current tip. The "tip" tag is special
5513 that repository becomes the current tip. The "tip" tag is special
5514 and cannot be renamed or assigned to a different changeset.
5514 and cannot be renamed or assigned to a different changeset.
5515
5515
5516 Returns 0 on success.
5516 Returns 0 on success.
5517 """
5517 """
5518 displayer = cmdutil.show_changeset(ui, repo, opts)
5518 displayer = cmdutil.show_changeset(ui, repo, opts)
5519 displayer.show(repo[len(repo) - 1])
5519 displayer.show(repo[len(repo) - 1])
5520 displayer.close()
5520 displayer.close()
5521
5521
5522 @command('unbundle',
5522 @command('unbundle',
5523 [('u', 'update', None,
5523 [('u', 'update', None,
5524 _('update to new branch head if changesets were unbundled'))],
5524 _('update to new branch head if changesets were unbundled'))],
5525 _('[-u] FILE...'))
5525 _('[-u] FILE...'))
5526 def unbundle(ui, repo, fname1, *fnames, **opts):
5526 def unbundle(ui, repo, fname1, *fnames, **opts):
5527 """apply one or more changegroup files
5527 """apply one or more changegroup files
5528
5528
5529 Apply one or more compressed changegroup files generated by the
5529 Apply one or more compressed changegroup files generated by the
5530 bundle command.
5530 bundle command.
5531
5531
5532 Returns 0 on success, 1 if an update has unresolved files.
5532 Returns 0 on success, 1 if an update has unresolved files.
5533 """
5533 """
5534 fnames = (fname1,) + fnames
5534 fnames = (fname1,) + fnames
5535
5535
5536 lock = repo.lock()
5536 lock = repo.lock()
5537 wc = repo['.']
5537 wc = repo['.']
5538 try:
5538 try:
5539 for fname in fnames:
5539 for fname in fnames:
5540 f = url.open(ui, fname)
5540 f = url.open(ui, fname)
5541 gen = changegroup.readbundle(f, fname)
5541 gen = changegroup.readbundle(f, fname)
5542 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname,
5542 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname,
5543 lock=lock)
5543 lock=lock)
5544 bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
5544 bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
5545 finally:
5545 finally:
5546 lock.release()
5546 lock.release()
5547 return postincoming(ui, repo, modheads, opts.get('update'), None)
5547 return postincoming(ui, repo, modheads, opts.get('update'), None)
5548
5548
5549 @command('^update|up|checkout|co',
5549 @command('^update|up|checkout|co',
5550 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5550 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5551 ('c', 'check', None,
5551 ('c', 'check', None,
5552 _('update across branches if no uncommitted changes')),
5552 _('update across branches if no uncommitted changes')),
5553 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5553 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5554 ('r', 'rev', '', _('revision'), _('REV'))],
5554 ('r', 'rev', '', _('revision'), _('REV'))],
5555 _('[-c] [-C] [-d DATE] [[-r] REV]'))
5555 _('[-c] [-C] [-d DATE] [[-r] REV]'))
5556 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
5556 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
5557 """update working directory (or switch revisions)
5557 """update working directory (or switch revisions)
5558
5558
5559 Update the repository's working directory to the specified
5559 Update the repository's working directory to the specified
5560 changeset. If no changeset is specified, update to the tip of the
5560 changeset. If no changeset is specified, update to the tip of the
5561 current named branch.
5561 current named branch.
5562
5562
5563 If the changeset is not a descendant of the working directory's
5563 If the changeset is not a descendant of the working directory's
5564 parent, the update is aborted. With the -c/--check option, the
5564 parent, the update is aborted. With the -c/--check option, the
5565 working directory is checked for uncommitted changes; if none are
5565 working directory is checked for uncommitted changes; if none are
5566 found, the working directory is updated to the specified
5566 found, the working directory is updated to the specified
5567 changeset.
5567 changeset.
5568
5568
5569 Update sets the working directory's parent revison to the specified
5569 Update sets the working directory's parent revison to the specified
5570 changeset (see :hg:`help parents`).
5570 changeset (see :hg:`help parents`).
5571
5571
5572 The following rules apply when the working directory contains
5572 The following rules apply when the working directory contains
5573 uncommitted changes:
5573 uncommitted changes:
5574
5574
5575 1. If neither -c/--check nor -C/--clean is specified, and if
5575 1. If neither -c/--check nor -C/--clean is specified, and if
5576 the requested changeset is an ancestor or descendant of
5576 the requested changeset is an ancestor or descendant of
5577 the working directory's parent, the uncommitted changes
5577 the working directory's parent, the uncommitted changes
5578 are merged into the requested changeset and the merged
5578 are merged into the requested changeset and the merged
5579 result is left uncommitted. If the requested changeset is
5579 result is left uncommitted. If the requested changeset is
5580 not an ancestor or descendant (that is, it is on another
5580 not an ancestor or descendant (that is, it is on another
5581 branch), the update is aborted and the uncommitted changes
5581 branch), the update is aborted and the uncommitted changes
5582 are preserved.
5582 are preserved.
5583
5583
5584 2. With the -c/--check option, the update is aborted and the
5584 2. With the -c/--check option, the update is aborted and the
5585 uncommitted changes are preserved.
5585 uncommitted changes are preserved.
5586
5586
5587 3. With the -C/--clean option, uncommitted changes are discarded and
5587 3. With the -C/--clean option, uncommitted changes are discarded and
5588 the working directory is updated to the requested changeset.
5588 the working directory is updated to the requested changeset.
5589
5589
5590 Use null as the changeset to remove the working directory (like
5590 Use null as the changeset to remove the working directory (like
5591 :hg:`clone -U`).
5591 :hg:`clone -U`).
5592
5592
5593 If you want to revert just one file to an older revision, use
5593 If you want to revert just one file to an older revision, use
5594 :hg:`revert [-r REV] NAME`.
5594 :hg:`revert [-r REV] NAME`.
5595
5595
5596 See :hg:`help dates` for a list of formats valid for -d/--date.
5596 See :hg:`help dates` for a list of formats valid for -d/--date.
5597
5597
5598 Returns 0 on success, 1 if there are unresolved files.
5598 Returns 0 on success, 1 if there are unresolved files.
5599 """
5599 """
5600 if rev and node:
5600 if rev and node:
5601 raise util.Abort(_("please specify just one revision"))
5601 raise util.Abort(_("please specify just one revision"))
5602
5602
5603 if rev is None or rev == '':
5603 if rev is None or rev == '':
5604 rev = node
5604 rev = node
5605
5605
5606 # if we defined a bookmark, we have to remember the original bookmark name
5606 # if we defined a bookmark, we have to remember the original bookmark name
5607 brev = rev
5607 brev = rev
5608 rev = scmutil.revsingle(repo, rev, rev).rev()
5608 rev = scmutil.revsingle(repo, rev, rev).rev()
5609
5609
5610 if check and clean:
5610 if check and clean:
5611 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
5611 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
5612
5612
5613 if check:
5613 if check:
5614 # we could use dirty() but we can ignore merge and branch trivia
5614 # we could use dirty() but we can ignore merge and branch trivia
5615 c = repo[None]
5615 c = repo[None]
5616 if c.modified() or c.added() or c.removed():
5616 if c.modified() or c.added() or c.removed():
5617 raise util.Abort(_("uncommitted local changes"))
5617 raise util.Abort(_("uncommitted local changes"))
5618
5618
5619 if date:
5619 if date:
5620 if rev is not None:
5620 if rev is not None:
5621 raise util.Abort(_("you can't specify a revision and a date"))
5621 raise util.Abort(_("you can't specify a revision and a date"))
5622 rev = cmdutil.finddate(ui, repo, date)
5622 rev = cmdutil.finddate(ui, repo, date)
5623
5623
5624 if clean or check:
5624 if clean or check:
5625 ret = hg.clean(repo, rev)
5625 ret = hg.clean(repo, rev)
5626 else:
5626 else:
5627 ret = hg.update(repo, rev)
5627 ret = hg.update(repo, rev)
5628
5628
5629 if brev in repo._bookmarks:
5629 if brev in repo._bookmarks:
5630 bookmarks.setcurrent(repo, brev)
5630 bookmarks.setcurrent(repo, brev)
5631
5631
5632 return ret
5632 return ret
5633
5633
5634 @command('verify', [])
5634 @command('verify', [])
5635 def verify(ui, repo):
5635 def verify(ui, repo):
5636 """verify the integrity of the repository
5636 """verify the integrity of the repository
5637
5637
5638 Verify the integrity of the current repository.
5638 Verify the integrity of the current repository.
5639
5639
5640 This will perform an extensive check of the repository's
5640 This will perform an extensive check of the repository's
5641 integrity, validating the hashes and checksums of each entry in
5641 integrity, validating the hashes and checksums of each entry in
5642 the changelog, manifest, and tracked files, as well as the
5642 the changelog, manifest, and tracked files, as well as the
5643 integrity of their crosslinks and indices.
5643 integrity of their crosslinks and indices.
5644
5644
5645 Returns 0 on success, 1 if errors are encountered.
5645 Returns 0 on success, 1 if errors are encountered.
5646 """
5646 """
5647 return hg.verify(repo)
5647 return hg.verify(repo)
5648
5648
5649 @command('version', [])
5649 @command('version', [])
5650 def version_(ui):
5650 def version_(ui):
5651 """output version and copyright information"""
5651 """output version and copyright information"""
5652 ui.write(_("Mercurial Distributed SCM (version %s)\n")
5652 ui.write(_("Mercurial Distributed SCM (version %s)\n")
5653 % util.version())
5653 % util.version())
5654 ui.status(_(
5654 ui.status(_(
5655 "(see http://mercurial.selenic.com for more information)\n"
5655 "(see http://mercurial.selenic.com for more information)\n"
5656 "\nCopyright (C) 2005-2011 Matt Mackall and others\n"
5656 "\nCopyright (C) 2005-2011 Matt Mackall and others\n"
5657 "This is free software; see the source for copying conditions. "
5657 "This is free software; see the source for copying conditions. "
5658 "There is NO\nwarranty; "
5658 "There is NO\nwarranty; "
5659 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5659 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5660 ))
5660 ))
5661
5661
5662 norepo = ("clone init version help debugcommands debugcomplete"
5662 norepo = ("clone init version help debugcommands debugcomplete"
5663 " debugdate debuginstall debugfsinfo debugpushkey debugwireargs"
5663 " debugdate debuginstall debugfsinfo debugpushkey debugwireargs"
5664 " debugknown debuggetbundle debugbundle")
5664 " debugknown debuggetbundle debugbundle")
5665 optionalrepo = ("identify paths serve showconfig debugancestor debugdag"
5665 optionalrepo = ("identify paths serve showconfig debugancestor debugdag"
5666 " debugdata debugindex debugindexdot debugrevlog")
5666 " debugdata debugindex debugindexdot debugrevlog")
General Comments 0
You need to be logged in to leave comments. Login now