##// END OF EJS Templates
grep: make multiline mode the default (BC)...
Matt Mackall -
r15765:1ef46bcd stable
parent child Browse files
Show More
@@ -1,5673 +1,5673 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 merge as mergemod
16 import merge as mergemod
17 import minirst, revset, fileset
17 import minirst, revset, fileset
18 import dagparser, context, simplemerge
18 import dagparser, context, simplemerge
19 import random, setdiscovery, treediscovery, dagutil
19 import random, setdiscovery, treediscovery, dagutil
20
20
21 table = {}
21 table = {}
22
22
23 command = cmdutil.command(table)
23 command = cmdutil.command(table)
24
24
25 # common command options
25 # common command options
26
26
27 globalopts = [
27 globalopts = [
28 ('R', 'repository', '',
28 ('R', 'repository', '',
29 _('repository root directory or name of overlay bundle file'),
29 _('repository root directory or name of overlay bundle file'),
30 _('REPO')),
30 _('REPO')),
31 ('', 'cwd', '',
31 ('', 'cwd', '',
32 _('change working directory'), _('DIR')),
32 _('change working directory'), _('DIR')),
33 ('y', 'noninteractive', None,
33 ('y', 'noninteractive', None,
34 _('do not prompt, automatically pick the first choice for all prompts')),
34 _('do not prompt, automatically pick the first choice for all prompts')),
35 ('q', 'quiet', None, _('suppress output')),
35 ('q', 'quiet', None, _('suppress output')),
36 ('v', 'verbose', None, _('enable additional output')),
36 ('v', 'verbose', None, _('enable additional output')),
37 ('', 'config', [],
37 ('', 'config', [],
38 _('set/override config option (use \'section.name=value\')'),
38 _('set/override config option (use \'section.name=value\')'),
39 _('CONFIG')),
39 _('CONFIG')),
40 ('', 'debug', None, _('enable debugging output')),
40 ('', 'debug', None, _('enable debugging output')),
41 ('', 'debugger', None, _('start debugger')),
41 ('', 'debugger', None, _('start debugger')),
42 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
42 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
43 _('ENCODE')),
43 _('ENCODE')),
44 ('', 'encodingmode', encoding.encodingmode,
44 ('', 'encodingmode', encoding.encodingmode,
45 _('set the charset encoding mode'), _('MODE')),
45 _('set the charset encoding mode'), _('MODE')),
46 ('', 'traceback', None, _('always print a traceback on exception')),
46 ('', 'traceback', None, _('always print a traceback on exception')),
47 ('', 'time', None, _('time how long the command takes')),
47 ('', 'time', None, _('time how long the command takes')),
48 ('', 'profile', None, _('print command execution profile')),
48 ('', 'profile', None, _('print command execution profile')),
49 ('', 'version', None, _('output version information and exit')),
49 ('', 'version', None, _('output version information and exit')),
50 ('h', 'help', None, _('display help and exit')),
50 ('h', 'help', None, _('display help and exit')),
51 ]
51 ]
52
52
53 dryrunopts = [('n', 'dry-run', None,
53 dryrunopts = [('n', 'dry-run', None,
54 _('do not perform actions, just print output'))]
54 _('do not perform actions, just print output'))]
55
55
56 remoteopts = [
56 remoteopts = [
57 ('e', 'ssh', '',
57 ('e', 'ssh', '',
58 _('specify ssh command to use'), _('CMD')),
58 _('specify ssh command to use'), _('CMD')),
59 ('', 'remotecmd', '',
59 ('', 'remotecmd', '',
60 _('specify hg command to run on the remote side'), _('CMD')),
60 _('specify hg command to run on the remote side'), _('CMD')),
61 ('', 'insecure', None,
61 ('', 'insecure', None,
62 _('do not verify server certificate (ignoring web.cacerts config)')),
62 _('do not verify server certificate (ignoring web.cacerts config)')),
63 ]
63 ]
64
64
65 walkopts = [
65 walkopts = [
66 ('I', 'include', [],
66 ('I', 'include', [],
67 _('include names matching the given patterns'), _('PATTERN')),
67 _('include names matching the given patterns'), _('PATTERN')),
68 ('X', 'exclude', [],
68 ('X', 'exclude', [],
69 _('exclude names matching the given patterns'), _('PATTERN')),
69 _('exclude names matching the given patterns'), _('PATTERN')),
70 ]
70 ]
71
71
72 commitopts = [
72 commitopts = [
73 ('m', 'message', '',
73 ('m', 'message', '',
74 _('use text as commit message'), _('TEXT')),
74 _('use text as commit message'), _('TEXT')),
75 ('l', 'logfile', '',
75 ('l', 'logfile', '',
76 _('read commit message from file'), _('FILE')),
76 _('read commit message from file'), _('FILE')),
77 ]
77 ]
78
78
79 commitopts2 = [
79 commitopts2 = [
80 ('d', 'date', '',
80 ('d', 'date', '',
81 _('record the specified date as commit date'), _('DATE')),
81 _('record the specified date as commit date'), _('DATE')),
82 ('u', 'user', '',
82 ('u', 'user', '',
83 _('record the specified user as committer'), _('USER')),
83 _('record the specified user as committer'), _('USER')),
84 ]
84 ]
85
85
86 templateopts = [
86 templateopts = [
87 ('', 'style', '',
87 ('', 'style', '',
88 _('display using template map file'), _('STYLE')),
88 _('display using template map file'), _('STYLE')),
89 ('', 'template', '',
89 ('', 'template', '',
90 _('display with template'), _('TEMPLATE')),
90 _('display with template'), _('TEMPLATE')),
91 ]
91 ]
92
92
93 logopts = [
93 logopts = [
94 ('p', 'patch', None, _('show patch')),
94 ('p', 'patch', None, _('show patch')),
95 ('g', 'git', None, _('use git extended diff format')),
95 ('g', 'git', None, _('use git extended diff format')),
96 ('l', 'limit', '',
96 ('l', 'limit', '',
97 _('limit number of changes displayed'), _('NUM')),
97 _('limit number of changes displayed'), _('NUM')),
98 ('M', 'no-merges', None, _('do not show merges')),
98 ('M', 'no-merges', None, _('do not show merges')),
99 ('', 'stat', None, _('output diffstat-style summary of changes')),
99 ('', 'stat', None, _('output diffstat-style summary of changes')),
100 ] + templateopts
100 ] + templateopts
101
101
102 diffopts = [
102 diffopts = [
103 ('a', 'text', None, _('treat all files as text')),
103 ('a', 'text', None, _('treat all files as text')),
104 ('g', 'git', None, _('use git extended diff format')),
104 ('g', 'git', None, _('use git extended diff format')),
105 ('', 'nodates', None, _('omit dates from diff headers'))
105 ('', 'nodates', None, _('omit dates from diff headers'))
106 ]
106 ]
107
107
108 diffopts2 = [
108 diffopts2 = [
109 ('p', 'show-function', None, _('show which function each change is in')),
109 ('p', 'show-function', None, _('show which function each change is in')),
110 ('', 'reverse', None, _('produce a diff that undoes the changes')),
110 ('', 'reverse', None, _('produce a diff that undoes the changes')),
111 ('w', 'ignore-all-space', None,
111 ('w', 'ignore-all-space', None,
112 _('ignore white space when comparing lines')),
112 _('ignore white space when comparing lines')),
113 ('b', 'ignore-space-change', None,
113 ('b', 'ignore-space-change', None,
114 _('ignore changes in the amount of white space')),
114 _('ignore changes in the amount of white space')),
115 ('B', 'ignore-blank-lines', None,
115 ('B', 'ignore-blank-lines', None,
116 _('ignore changes whose lines are all blank')),
116 _('ignore changes whose lines are all blank')),
117 ('U', 'unified', '',
117 ('U', 'unified', '',
118 _('number of lines of context to show'), _('NUM')),
118 _('number of lines of context to show'), _('NUM')),
119 ('', 'stat', None, _('output diffstat-style summary of changes')),
119 ('', 'stat', None, _('output diffstat-style summary of changes')),
120 ]
120 ]
121
121
122 mergetoolopts = [
122 mergetoolopts = [
123 ('t', 'tool', '', _('specify merge tool')),
123 ('t', 'tool', '', _('specify merge tool')),
124 ]
124 ]
125
125
126 similarityopts = [
126 similarityopts = [
127 ('s', 'similarity', '',
127 ('s', 'similarity', '',
128 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
128 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
129 ]
129 ]
130
130
131 subrepoopts = [
131 subrepoopts = [
132 ('S', 'subrepos', None,
132 ('S', 'subrepos', None,
133 _('recurse into subrepositories'))
133 _('recurse into subrepositories'))
134 ]
134 ]
135
135
136 # Commands start here, listed alphabetically
136 # Commands start here, listed alphabetically
137
137
138 @command('^add',
138 @command('^add',
139 walkopts + subrepoopts + dryrunopts,
139 walkopts + subrepoopts + dryrunopts,
140 _('[OPTION]... [FILE]...'))
140 _('[OPTION]... [FILE]...'))
141 def add(ui, repo, *pats, **opts):
141 def add(ui, repo, *pats, **opts):
142 """add the specified files on the next commit
142 """add the specified files on the next commit
143
143
144 Schedule files to be version controlled and added to the
144 Schedule files to be version controlled and added to the
145 repository.
145 repository.
146
146
147 The files will be added to the repository at the next commit. To
147 The files will be added to the repository at the next commit. To
148 undo an add before that, see :hg:`forget`.
148 undo an add before that, see :hg:`forget`.
149
149
150 If no names are given, add all files to the repository.
150 If no names are given, add all files to the repository.
151
151
152 .. container:: verbose
152 .. container:: verbose
153
153
154 An example showing how new (unknown) files are added
154 An example showing how new (unknown) files are added
155 automatically by :hg:`add`::
155 automatically by :hg:`add`::
156
156
157 $ ls
157 $ ls
158 foo.c
158 foo.c
159 $ hg status
159 $ hg status
160 ? foo.c
160 ? foo.c
161 $ hg add
161 $ hg add
162 adding foo.c
162 adding foo.c
163 $ hg status
163 $ hg status
164 A foo.c
164 A foo.c
165
165
166 Returns 0 if all files are successfully added.
166 Returns 0 if all files are successfully added.
167 """
167 """
168
168
169 m = scmutil.match(repo[None], pats, opts)
169 m = scmutil.match(repo[None], pats, opts)
170 rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
170 rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
171 opts.get('subrepos'), prefix="")
171 opts.get('subrepos'), prefix="")
172 return rejected and 1 or 0
172 return rejected and 1 or 0
173
173
174 @command('addremove',
174 @command('addremove',
175 similarityopts + walkopts + dryrunopts,
175 similarityopts + walkopts + dryrunopts,
176 _('[OPTION]... [FILE]...'))
176 _('[OPTION]... [FILE]...'))
177 def addremove(ui, repo, *pats, **opts):
177 def addremove(ui, repo, *pats, **opts):
178 """add all new files, delete all missing files
178 """add all new files, delete all missing files
179
179
180 Add all new files and remove all missing files from the
180 Add all new files and remove all missing files from the
181 repository.
181 repository.
182
182
183 New files are ignored if they match any of the patterns in
183 New files are ignored if they match any of the patterns in
184 ``.hgignore``. As with add, these changes take effect at the next
184 ``.hgignore``. As with add, these changes take effect at the next
185 commit.
185 commit.
186
186
187 Use the -s/--similarity option to detect renamed files. With a
187 Use the -s/--similarity option to detect renamed files. With a
188 parameter greater than 0, this compares every removed file with
188 parameter greater than 0, this compares every removed file with
189 every added file and records those similar enough as renames. This
189 every added file and records those similar enough as renames. This
190 option takes a percentage between 0 (disabled) and 100 (files must
190 option takes a percentage between 0 (disabled) and 100 (files must
191 be identical) as its parameter. Detecting renamed files this way
191 be identical) as its parameter. Detecting renamed files this way
192 can be expensive. After using this option, :hg:`status -C` can be
192 can be expensive. After using this option, :hg:`status -C` can be
193 used to check which files were identified as moved or renamed.
193 used to check which files were identified as moved or renamed.
194
194
195 Returns 0 if all files are successfully added.
195 Returns 0 if all files are successfully added.
196 """
196 """
197 try:
197 try:
198 sim = float(opts.get('similarity') or 100)
198 sim = float(opts.get('similarity') or 100)
199 except ValueError:
199 except ValueError:
200 raise util.Abort(_('similarity must be a number'))
200 raise util.Abort(_('similarity must be a number'))
201 if sim < 0 or sim > 100:
201 if sim < 0 or sim > 100:
202 raise util.Abort(_('similarity must be between 0 and 100'))
202 raise util.Abort(_('similarity must be between 0 and 100'))
203 return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0)
203 return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0)
204
204
205 @command('^annotate|blame',
205 @command('^annotate|blame',
206 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
206 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
207 ('', 'follow', None,
207 ('', 'follow', None,
208 _('follow copies/renames and list the filename (DEPRECATED)')),
208 _('follow copies/renames and list the filename (DEPRECATED)')),
209 ('', 'no-follow', None, _("don't follow copies and renames")),
209 ('', 'no-follow', None, _("don't follow copies and renames")),
210 ('a', 'text', None, _('treat all files as text')),
210 ('a', 'text', None, _('treat all files as text')),
211 ('u', 'user', None, _('list the author (long with -v)')),
211 ('u', 'user', None, _('list the author (long with -v)')),
212 ('f', 'file', None, _('list the filename')),
212 ('f', 'file', None, _('list the filename')),
213 ('d', 'date', None, _('list the date (short with -q)')),
213 ('d', 'date', None, _('list the date (short with -q)')),
214 ('n', 'number', None, _('list the revision number (default)')),
214 ('n', 'number', None, _('list the revision number (default)')),
215 ('c', 'changeset', None, _('list the changeset')),
215 ('c', 'changeset', None, _('list the changeset')),
216 ('l', 'line-number', None, _('show line number at the first appearance'))
216 ('l', 'line-number', None, _('show line number at the first appearance'))
217 ] + walkopts,
217 ] + walkopts,
218 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'))
218 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'))
219 def annotate(ui, repo, *pats, **opts):
219 def annotate(ui, repo, *pats, **opts):
220 """show changeset information by line for each file
220 """show changeset information by line for each file
221
221
222 List changes in files, showing the revision id responsible for
222 List changes in files, showing the revision id responsible for
223 each line
223 each line
224
224
225 This command is useful for discovering when a change was made and
225 This command is useful for discovering when a change was made and
226 by whom.
226 by whom.
227
227
228 Without the -a/--text option, annotate will avoid processing files
228 Without the -a/--text option, annotate will avoid processing files
229 it detects as binary. With -a, annotate will annotate the file
229 it detects as binary. With -a, annotate will annotate the file
230 anyway, although the results will probably be neither useful
230 anyway, although the results will probably be neither useful
231 nor desirable.
231 nor desirable.
232
232
233 Returns 0 on success.
233 Returns 0 on success.
234 """
234 """
235 if opts.get('follow'):
235 if opts.get('follow'):
236 # --follow is deprecated and now just an alias for -f/--file
236 # --follow is deprecated and now just an alias for -f/--file
237 # to mimic the behavior of Mercurial before version 1.5
237 # to mimic the behavior of Mercurial before version 1.5
238 opts['file'] = True
238 opts['file'] = True
239
239
240 datefunc = ui.quiet and util.shortdate or util.datestr
240 datefunc = ui.quiet and util.shortdate or util.datestr
241 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
241 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
242
242
243 if not pats:
243 if not pats:
244 raise util.Abort(_('at least one filename or pattern is required'))
244 raise util.Abort(_('at least one filename or pattern is required'))
245
245
246 opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())),
246 opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())),
247 ('number', ' ', lambda x: str(x[0].rev())),
247 ('number', ' ', lambda x: str(x[0].rev())),
248 ('changeset', ' ', lambda x: short(x[0].node())),
248 ('changeset', ' ', lambda x: short(x[0].node())),
249 ('date', ' ', getdate),
249 ('date', ' ', getdate),
250 ('file', ' ', lambda x: x[0].path()),
250 ('file', ' ', lambda x: x[0].path()),
251 ('line_number', ':', lambda x: str(x[1])),
251 ('line_number', ':', lambda x: str(x[1])),
252 ]
252 ]
253
253
254 if (not opts.get('user') and not opts.get('changeset')
254 if (not opts.get('user') and not opts.get('changeset')
255 and not opts.get('date') and not opts.get('file')):
255 and not opts.get('date') and not opts.get('file')):
256 opts['number'] = True
256 opts['number'] = True
257
257
258 linenumber = opts.get('line_number') is not None
258 linenumber = opts.get('line_number') is not None
259 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
259 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
260 raise util.Abort(_('at least one of -n/-c is required for -l'))
260 raise util.Abort(_('at least one of -n/-c is required for -l'))
261
261
262 funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)]
262 funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)]
263 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
263 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
264
264
265 def bad(x, y):
265 def bad(x, y):
266 raise util.Abort("%s: %s" % (x, y))
266 raise util.Abort("%s: %s" % (x, y))
267
267
268 ctx = scmutil.revsingle(repo, opts.get('rev'))
268 ctx = scmutil.revsingle(repo, opts.get('rev'))
269 m = scmutil.match(ctx, pats, opts)
269 m = scmutil.match(ctx, pats, opts)
270 m.bad = bad
270 m.bad = bad
271 follow = not opts.get('no_follow')
271 follow = not opts.get('no_follow')
272 for abs in ctx.walk(m):
272 for abs in ctx.walk(m):
273 fctx = ctx[abs]
273 fctx = ctx[abs]
274 if not opts.get('text') and util.binary(fctx.data()):
274 if not opts.get('text') and util.binary(fctx.data()):
275 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
275 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
276 continue
276 continue
277
277
278 lines = fctx.annotate(follow=follow, linenumber=linenumber)
278 lines = fctx.annotate(follow=follow, linenumber=linenumber)
279 pieces = []
279 pieces = []
280
280
281 for f, sep in funcmap:
281 for f, sep in funcmap:
282 l = [f(n) for n, dummy in lines]
282 l = [f(n) for n, dummy in lines]
283 if l:
283 if l:
284 sized = [(x, encoding.colwidth(x)) for x in l]
284 sized = [(x, encoding.colwidth(x)) for x in l]
285 ml = max([w for x, w in sized])
285 ml = max([w for x, w in sized])
286 pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x)
286 pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x)
287 for x, w in sized])
287 for x, w in sized])
288
288
289 if pieces:
289 if pieces:
290 for p, l in zip(zip(*pieces), lines):
290 for p, l in zip(zip(*pieces), lines):
291 ui.write("%s: %s" % ("".join(p), l[1]))
291 ui.write("%s: %s" % ("".join(p), l[1]))
292
292
293 @command('archive',
293 @command('archive',
294 [('', 'no-decode', None, _('do not pass files through decoders')),
294 [('', 'no-decode', None, _('do not pass files through decoders')),
295 ('p', 'prefix', '', _('directory prefix for files in archive'),
295 ('p', 'prefix', '', _('directory prefix for files in archive'),
296 _('PREFIX')),
296 _('PREFIX')),
297 ('r', 'rev', '', _('revision to distribute'), _('REV')),
297 ('r', 'rev', '', _('revision to distribute'), _('REV')),
298 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
298 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
299 ] + subrepoopts + walkopts,
299 ] + subrepoopts + walkopts,
300 _('[OPTION]... DEST'))
300 _('[OPTION]... DEST'))
301 def archive(ui, repo, dest, **opts):
301 def archive(ui, repo, dest, **opts):
302 '''create an unversioned archive of a repository revision
302 '''create an unversioned archive of a repository revision
303
303
304 By default, the revision used is the parent of the working
304 By default, the revision used is the parent of the working
305 directory; use -r/--rev to specify a different revision.
305 directory; use -r/--rev to specify a different revision.
306
306
307 The archive type is automatically detected based on file
307 The archive type is automatically detected based on file
308 extension (or override using -t/--type).
308 extension (or override using -t/--type).
309
309
310 .. container:: verbose
310 .. container:: verbose
311
311
312 Examples:
312 Examples:
313
313
314 - create a zip file containing the 1.0 release::
314 - create a zip file containing the 1.0 release::
315
315
316 hg archive -r 1.0 project-1.0.zip
316 hg archive -r 1.0 project-1.0.zip
317
317
318 - create a tarball excluding .hg files::
318 - create a tarball excluding .hg files::
319
319
320 hg archive project.tar.gz -X ".hg*"
320 hg archive project.tar.gz -X ".hg*"
321
321
322 Valid types are:
322 Valid types are:
323
323
324 :``files``: a directory full of files (default)
324 :``files``: a directory full of files (default)
325 :``tar``: tar archive, uncompressed
325 :``tar``: tar archive, uncompressed
326 :``tbz2``: tar archive, compressed using bzip2
326 :``tbz2``: tar archive, compressed using bzip2
327 :``tgz``: tar archive, compressed using gzip
327 :``tgz``: tar archive, compressed using gzip
328 :``uzip``: zip archive, uncompressed
328 :``uzip``: zip archive, uncompressed
329 :``zip``: zip archive, compressed using deflate
329 :``zip``: zip archive, compressed using deflate
330
330
331 The exact name of the destination archive or directory is given
331 The exact name of the destination archive or directory is given
332 using a format string; see :hg:`help export` for details.
332 using a format string; see :hg:`help export` for details.
333
333
334 Each member added to an archive file has a directory prefix
334 Each member added to an archive file has a directory prefix
335 prepended. Use -p/--prefix to specify a format string for the
335 prepended. Use -p/--prefix to specify a format string for the
336 prefix. The default is the basename of the archive, with suffixes
336 prefix. The default is the basename of the archive, with suffixes
337 removed.
337 removed.
338
338
339 Returns 0 on success.
339 Returns 0 on success.
340 '''
340 '''
341
341
342 ctx = scmutil.revsingle(repo, opts.get('rev'))
342 ctx = scmutil.revsingle(repo, opts.get('rev'))
343 if not ctx:
343 if not ctx:
344 raise util.Abort(_('no working directory: please specify a revision'))
344 raise util.Abort(_('no working directory: please specify a revision'))
345 node = ctx.node()
345 node = ctx.node()
346 dest = cmdutil.makefilename(repo, dest, node)
346 dest = cmdutil.makefilename(repo, dest, node)
347 if os.path.realpath(dest) == repo.root:
347 if os.path.realpath(dest) == repo.root:
348 raise util.Abort(_('repository root cannot be destination'))
348 raise util.Abort(_('repository root cannot be destination'))
349
349
350 kind = opts.get('type') or archival.guesskind(dest) or 'files'
350 kind = opts.get('type') or archival.guesskind(dest) or 'files'
351 prefix = opts.get('prefix')
351 prefix = opts.get('prefix')
352
352
353 if dest == '-':
353 if dest == '-':
354 if kind == 'files':
354 if kind == 'files':
355 raise util.Abort(_('cannot archive plain files to stdout'))
355 raise util.Abort(_('cannot archive plain files to stdout'))
356 dest = cmdutil.makefileobj(repo, dest)
356 dest = cmdutil.makefileobj(repo, dest)
357 if not prefix:
357 if not prefix:
358 prefix = os.path.basename(repo.root) + '-%h'
358 prefix = os.path.basename(repo.root) + '-%h'
359
359
360 prefix = cmdutil.makefilename(repo, prefix, node)
360 prefix = cmdutil.makefilename(repo, prefix, node)
361 matchfn = scmutil.match(ctx, [], opts)
361 matchfn = scmutil.match(ctx, [], opts)
362 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
362 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
363 matchfn, prefix, subrepos=opts.get('subrepos'))
363 matchfn, prefix, subrepos=opts.get('subrepos'))
364
364
365 @command('backout',
365 @command('backout',
366 [('', 'merge', None, _('merge with old dirstate parent after backout')),
366 [('', 'merge', None, _('merge with old dirstate parent after backout')),
367 ('', 'parent', '',
367 ('', 'parent', '',
368 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
368 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
369 ('r', 'rev', '', _('revision to backout'), _('REV')),
369 ('r', 'rev', '', _('revision to backout'), _('REV')),
370 ] + mergetoolopts + walkopts + commitopts + commitopts2,
370 ] + mergetoolopts + walkopts + commitopts + commitopts2,
371 _('[OPTION]... [-r] REV'))
371 _('[OPTION]... [-r] REV'))
372 def backout(ui, repo, node=None, rev=None, **opts):
372 def backout(ui, repo, node=None, rev=None, **opts):
373 '''reverse effect of earlier changeset
373 '''reverse effect of earlier changeset
374
374
375 Prepare a new changeset with the effect of REV undone in the
375 Prepare a new changeset with the effect of REV undone in the
376 current working directory.
376 current working directory.
377
377
378 If REV is the parent of the working directory, then this new changeset
378 If REV is the parent of the working directory, then this new changeset
379 is committed automatically. Otherwise, hg needs to merge the
379 is committed automatically. Otherwise, hg needs to merge the
380 changes and the merged result is left uncommitted.
380 changes and the merged result is left uncommitted.
381
381
382 .. note::
382 .. note::
383 backout cannot be used to fix either an unwanted or
383 backout cannot be used to fix either an unwanted or
384 incorrect merge.
384 incorrect merge.
385
385
386 .. container:: verbose
386 .. container:: verbose
387
387
388 By default, the pending changeset will have one parent,
388 By default, the pending changeset will have one parent,
389 maintaining a linear history. With --merge, the pending
389 maintaining a linear history. With --merge, the pending
390 changeset will instead have two parents: the old parent of the
390 changeset will instead have two parents: the old parent of the
391 working directory and a new child of REV that simply undoes REV.
391 working directory and a new child of REV that simply undoes REV.
392
392
393 Before version 1.7, the behavior without --merge was equivalent
393 Before version 1.7, the behavior without --merge was equivalent
394 to specifying --merge followed by :hg:`update --clean .` to
394 to specifying --merge followed by :hg:`update --clean .` to
395 cancel the merge and leave the child of REV as a head to be
395 cancel the merge and leave the child of REV as a head to be
396 merged separately.
396 merged separately.
397
397
398 See :hg:`help dates` for a list of formats valid for -d/--date.
398 See :hg:`help dates` for a list of formats valid for -d/--date.
399
399
400 Returns 0 on success.
400 Returns 0 on success.
401 '''
401 '''
402 if rev and node:
402 if rev and node:
403 raise util.Abort(_("please specify just one revision"))
403 raise util.Abort(_("please specify just one revision"))
404
404
405 if not rev:
405 if not rev:
406 rev = node
406 rev = node
407
407
408 if not rev:
408 if not rev:
409 raise util.Abort(_("please specify a revision to backout"))
409 raise util.Abort(_("please specify a revision to backout"))
410
410
411 date = opts.get('date')
411 date = opts.get('date')
412 if date:
412 if date:
413 opts['date'] = util.parsedate(date)
413 opts['date'] = util.parsedate(date)
414
414
415 cmdutil.bailifchanged(repo)
415 cmdutil.bailifchanged(repo)
416 node = scmutil.revsingle(repo, rev).node()
416 node = scmutil.revsingle(repo, rev).node()
417
417
418 op1, op2 = repo.dirstate.parents()
418 op1, op2 = repo.dirstate.parents()
419 a = repo.changelog.ancestor(op1, node)
419 a = repo.changelog.ancestor(op1, node)
420 if a != node:
420 if a != node:
421 raise util.Abort(_('cannot backout change on a different branch'))
421 raise util.Abort(_('cannot backout change on a different branch'))
422
422
423 p1, p2 = repo.changelog.parents(node)
423 p1, p2 = repo.changelog.parents(node)
424 if p1 == nullid:
424 if p1 == nullid:
425 raise util.Abort(_('cannot backout a change with no parents'))
425 raise util.Abort(_('cannot backout a change with no parents'))
426 if p2 != nullid:
426 if p2 != nullid:
427 if not opts.get('parent'):
427 if not opts.get('parent'):
428 raise util.Abort(_('cannot backout a merge changeset'))
428 raise util.Abort(_('cannot backout a merge changeset'))
429 p = repo.lookup(opts['parent'])
429 p = repo.lookup(opts['parent'])
430 if p not in (p1, p2):
430 if p not in (p1, p2):
431 raise util.Abort(_('%s is not a parent of %s') %
431 raise util.Abort(_('%s is not a parent of %s') %
432 (short(p), short(node)))
432 (short(p), short(node)))
433 parent = p
433 parent = p
434 else:
434 else:
435 if opts.get('parent'):
435 if opts.get('parent'):
436 raise util.Abort(_('cannot use --parent on non-merge changeset'))
436 raise util.Abort(_('cannot use --parent on non-merge changeset'))
437 parent = p1
437 parent = p1
438
438
439 # the backout should appear on the same branch
439 # the backout should appear on the same branch
440 branch = repo.dirstate.branch()
440 branch = repo.dirstate.branch()
441 hg.clean(repo, node, show_stats=False)
441 hg.clean(repo, node, show_stats=False)
442 repo.dirstate.setbranch(branch)
442 repo.dirstate.setbranch(branch)
443 revert_opts = opts.copy()
443 revert_opts = opts.copy()
444 revert_opts['date'] = None
444 revert_opts['date'] = None
445 revert_opts['all'] = True
445 revert_opts['all'] = True
446 revert_opts['rev'] = hex(parent)
446 revert_opts['rev'] = hex(parent)
447 revert_opts['no_backup'] = None
447 revert_opts['no_backup'] = None
448 revert(ui, repo, **revert_opts)
448 revert(ui, repo, **revert_opts)
449 if not opts.get('merge') and op1 != node:
449 if not opts.get('merge') and op1 != node:
450 try:
450 try:
451 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
451 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
452 return hg.update(repo, op1)
452 return hg.update(repo, op1)
453 finally:
453 finally:
454 ui.setconfig('ui', 'forcemerge', '')
454 ui.setconfig('ui', 'forcemerge', '')
455
455
456 commit_opts = opts.copy()
456 commit_opts = opts.copy()
457 commit_opts['addremove'] = False
457 commit_opts['addremove'] = False
458 if not commit_opts['message'] and not commit_opts['logfile']:
458 if not commit_opts['message'] and not commit_opts['logfile']:
459 # we don't translate commit messages
459 # we don't translate commit messages
460 commit_opts['message'] = "Backed out changeset %s" % short(node)
460 commit_opts['message'] = "Backed out changeset %s" % short(node)
461 commit_opts['force_editor'] = True
461 commit_opts['force_editor'] = True
462 commit(ui, repo, **commit_opts)
462 commit(ui, repo, **commit_opts)
463 def nice(node):
463 def nice(node):
464 return '%d:%s' % (repo.changelog.rev(node), short(node))
464 return '%d:%s' % (repo.changelog.rev(node), short(node))
465 ui.status(_('changeset %s backs out changeset %s\n') %
465 ui.status(_('changeset %s backs out changeset %s\n') %
466 (nice(repo.changelog.tip()), nice(node)))
466 (nice(repo.changelog.tip()), nice(node)))
467 if opts.get('merge') and op1 != node:
467 if opts.get('merge') and op1 != node:
468 hg.clean(repo, op1, show_stats=False)
468 hg.clean(repo, op1, show_stats=False)
469 ui.status(_('merging with changeset %s\n')
469 ui.status(_('merging with changeset %s\n')
470 % nice(repo.changelog.tip()))
470 % nice(repo.changelog.tip()))
471 try:
471 try:
472 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
472 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
473 return hg.merge(repo, hex(repo.changelog.tip()))
473 return hg.merge(repo, hex(repo.changelog.tip()))
474 finally:
474 finally:
475 ui.setconfig('ui', 'forcemerge', '')
475 ui.setconfig('ui', 'forcemerge', '')
476 return 0
476 return 0
477
477
478 @command('bisect',
478 @command('bisect',
479 [('r', 'reset', False, _('reset bisect state')),
479 [('r', 'reset', False, _('reset bisect state')),
480 ('g', 'good', False, _('mark changeset good')),
480 ('g', 'good', False, _('mark changeset good')),
481 ('b', 'bad', False, _('mark changeset bad')),
481 ('b', 'bad', False, _('mark changeset bad')),
482 ('s', 'skip', False, _('skip testing changeset')),
482 ('s', 'skip', False, _('skip testing changeset')),
483 ('e', 'extend', False, _('extend the bisect range')),
483 ('e', 'extend', False, _('extend the bisect range')),
484 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
484 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
485 ('U', 'noupdate', False, _('do not update to target'))],
485 ('U', 'noupdate', False, _('do not update to target'))],
486 _("[-gbsr] [-U] [-c CMD] [REV]"))
486 _("[-gbsr] [-U] [-c CMD] [REV]"))
487 def bisect(ui, repo, rev=None, extra=None, command=None,
487 def bisect(ui, repo, rev=None, extra=None, command=None,
488 reset=None, good=None, bad=None, skip=None, extend=None,
488 reset=None, good=None, bad=None, skip=None, extend=None,
489 noupdate=None):
489 noupdate=None):
490 """subdivision search of changesets
490 """subdivision search of changesets
491
491
492 This command helps to find changesets which introduce problems. To
492 This command helps to find changesets which introduce problems. To
493 use, mark the earliest changeset you know exhibits the problem as
493 use, mark the earliest changeset you know exhibits the problem as
494 bad, then mark the latest changeset which is free from the problem
494 bad, then mark the latest changeset which is free from the problem
495 as good. Bisect will update your working directory to a revision
495 as good. Bisect will update your working directory to a revision
496 for testing (unless the -U/--noupdate option is specified). Once
496 for testing (unless the -U/--noupdate option is specified). Once
497 you have performed tests, mark the working directory as good or
497 you have performed tests, mark the working directory as good or
498 bad, and bisect will either update to another candidate changeset
498 bad, and bisect will either update to another candidate changeset
499 or announce that it has found the bad revision.
499 or announce that it has found the bad revision.
500
500
501 As a shortcut, you can also use the revision argument to mark a
501 As a shortcut, you can also use the revision argument to mark a
502 revision as good or bad without checking it out first.
502 revision as good or bad without checking it out first.
503
503
504 If you supply a command, it will be used for automatic bisection.
504 If you supply a command, it will be used for automatic bisection.
505 Its exit status will be used to mark revisions as good or bad:
505 Its exit status will be used to mark revisions as good or bad:
506 status 0 means good, 125 means to skip the revision, 127
506 status 0 means good, 125 means to skip the revision, 127
507 (command not found) will abort the bisection, and any other
507 (command not found) will abort the bisection, and any other
508 non-zero exit status means the revision is bad.
508 non-zero exit status means the revision is bad.
509
509
510 .. container:: verbose
510 .. container:: verbose
511
511
512 Some examples:
512 Some examples:
513
513
514 - start a bisection with known bad revision 12, and good revision 34::
514 - start a bisection with known bad revision 12, and good revision 34::
515
515
516 hg bisect --bad 34
516 hg bisect --bad 34
517 hg bisect --good 12
517 hg bisect --good 12
518
518
519 - advance the current bisection by marking current revision as good or
519 - advance the current bisection by marking current revision as good or
520 bad::
520 bad::
521
521
522 hg bisect --good
522 hg bisect --good
523 hg bisect --bad
523 hg bisect --bad
524
524
525 - mark the current revision, or a known revision, to be skipped (eg. if
525 - mark the current revision, or a known revision, to be skipped (eg. if
526 that revision is not usable because of another issue)::
526 that revision is not usable because of another issue)::
527
527
528 hg bisect --skip
528 hg bisect --skip
529 hg bisect --skip 23
529 hg bisect --skip 23
530
530
531 - forget the current bisection::
531 - forget the current bisection::
532
532
533 hg bisect --reset
533 hg bisect --reset
534
534
535 - use 'make && make tests' to automatically find the first broken
535 - use 'make && make tests' to automatically find the first broken
536 revision::
536 revision::
537
537
538 hg bisect --reset
538 hg bisect --reset
539 hg bisect --bad 34
539 hg bisect --bad 34
540 hg bisect --good 12
540 hg bisect --good 12
541 hg bisect --command 'make && make tests'
541 hg bisect --command 'make && make tests'
542
542
543 - see all changesets whose states are already known in the current
543 - see all changesets whose states are already known in the current
544 bisection::
544 bisection::
545
545
546 hg log -r "bisect(pruned)"
546 hg log -r "bisect(pruned)"
547
547
548 - see all changesets that took part in the current bisection::
548 - see all changesets that took part in the current bisection::
549
549
550 hg log -r "bisect(range)"
550 hg log -r "bisect(range)"
551
551
552 - with the graphlog extension, you can even get a nice graph::
552 - with the graphlog extension, you can even get a nice graph::
553
553
554 hg log --graph -r "bisect(range)"
554 hg log --graph -r "bisect(range)"
555
555
556 See :hg:`help revsets` for more about the `bisect()` keyword.
556 See :hg:`help revsets` for more about the `bisect()` keyword.
557
557
558 Returns 0 on success.
558 Returns 0 on success.
559 """
559 """
560 def extendbisectrange(nodes, good):
560 def extendbisectrange(nodes, good):
561 # bisect is incomplete when it ends on a merge node and
561 # bisect is incomplete when it ends on a merge node and
562 # one of the parent was not checked.
562 # one of the parent was not checked.
563 parents = repo[nodes[0]].parents()
563 parents = repo[nodes[0]].parents()
564 if len(parents) > 1:
564 if len(parents) > 1:
565 side = good and state['bad'] or state['good']
565 side = good and state['bad'] or state['good']
566 num = len(set(i.node() for i in parents) & set(side))
566 num = len(set(i.node() for i in parents) & set(side))
567 if num == 1:
567 if num == 1:
568 return parents[0].ancestor(parents[1])
568 return parents[0].ancestor(parents[1])
569 return None
569 return None
570
570
571 def print_result(nodes, good):
571 def print_result(nodes, good):
572 displayer = cmdutil.show_changeset(ui, repo, {})
572 displayer = cmdutil.show_changeset(ui, repo, {})
573 if len(nodes) == 1:
573 if len(nodes) == 1:
574 # narrowed it down to a single revision
574 # narrowed it down to a single revision
575 if good:
575 if good:
576 ui.write(_("The first good revision is:\n"))
576 ui.write(_("The first good revision is:\n"))
577 else:
577 else:
578 ui.write(_("The first bad revision is:\n"))
578 ui.write(_("The first bad revision is:\n"))
579 displayer.show(repo[nodes[0]])
579 displayer.show(repo[nodes[0]])
580 extendnode = extendbisectrange(nodes, good)
580 extendnode = extendbisectrange(nodes, good)
581 if extendnode is not None:
581 if extendnode is not None:
582 ui.write(_('Not all ancestors of this changeset have been'
582 ui.write(_('Not all ancestors of this changeset have been'
583 ' checked.\nUse bisect --extend to continue the '
583 ' checked.\nUse bisect --extend to continue the '
584 'bisection from\nthe common ancestor, %s.\n')
584 'bisection from\nthe common ancestor, %s.\n')
585 % extendnode)
585 % extendnode)
586 else:
586 else:
587 # multiple possible revisions
587 # multiple possible revisions
588 if good:
588 if good:
589 ui.write(_("Due to skipped revisions, the first "
589 ui.write(_("Due to skipped revisions, the first "
590 "good revision could be any of:\n"))
590 "good revision could be any of:\n"))
591 else:
591 else:
592 ui.write(_("Due to skipped revisions, the first "
592 ui.write(_("Due to skipped revisions, the first "
593 "bad revision could be any of:\n"))
593 "bad revision could be any of:\n"))
594 for n in nodes:
594 for n in nodes:
595 displayer.show(repo[n])
595 displayer.show(repo[n])
596 displayer.close()
596 displayer.close()
597
597
598 def check_state(state, interactive=True):
598 def check_state(state, interactive=True):
599 if not state['good'] or not state['bad']:
599 if not state['good'] or not state['bad']:
600 if (good or bad or skip or reset) and interactive:
600 if (good or bad or skip or reset) and interactive:
601 return
601 return
602 if not state['good']:
602 if not state['good']:
603 raise util.Abort(_('cannot bisect (no known good revisions)'))
603 raise util.Abort(_('cannot bisect (no known good revisions)'))
604 else:
604 else:
605 raise util.Abort(_('cannot bisect (no known bad revisions)'))
605 raise util.Abort(_('cannot bisect (no known bad revisions)'))
606 return True
606 return True
607
607
608 # backward compatibility
608 # backward compatibility
609 if rev in "good bad reset init".split():
609 if rev in "good bad reset init".split():
610 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
610 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
611 cmd, rev, extra = rev, extra, None
611 cmd, rev, extra = rev, extra, None
612 if cmd == "good":
612 if cmd == "good":
613 good = True
613 good = True
614 elif cmd == "bad":
614 elif cmd == "bad":
615 bad = True
615 bad = True
616 else:
616 else:
617 reset = True
617 reset = True
618 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
618 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
619 raise util.Abort(_('incompatible arguments'))
619 raise util.Abort(_('incompatible arguments'))
620
620
621 if reset:
621 if reset:
622 p = repo.join("bisect.state")
622 p = repo.join("bisect.state")
623 if os.path.exists(p):
623 if os.path.exists(p):
624 os.unlink(p)
624 os.unlink(p)
625 return
625 return
626
626
627 state = hbisect.load_state(repo)
627 state = hbisect.load_state(repo)
628
628
629 if command:
629 if command:
630 changesets = 1
630 changesets = 1
631 try:
631 try:
632 while changesets:
632 while changesets:
633 # update state
633 # update state
634 status = util.system(command, out=ui.fout)
634 status = util.system(command, out=ui.fout)
635 if status == 125:
635 if status == 125:
636 transition = "skip"
636 transition = "skip"
637 elif status == 0:
637 elif status == 0:
638 transition = "good"
638 transition = "good"
639 # status < 0 means process was killed
639 # status < 0 means process was killed
640 elif status == 127:
640 elif status == 127:
641 raise util.Abort(_("failed to execute %s") % command)
641 raise util.Abort(_("failed to execute %s") % command)
642 elif status < 0:
642 elif status < 0:
643 raise util.Abort(_("%s killed") % command)
643 raise util.Abort(_("%s killed") % command)
644 else:
644 else:
645 transition = "bad"
645 transition = "bad"
646 ctx = scmutil.revsingle(repo, rev)
646 ctx = scmutil.revsingle(repo, rev)
647 rev = None # clear for future iterations
647 rev = None # clear for future iterations
648 state[transition].append(ctx.node())
648 state[transition].append(ctx.node())
649 ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition))
649 ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition))
650 check_state(state, interactive=False)
650 check_state(state, interactive=False)
651 # bisect
651 # bisect
652 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
652 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
653 # update to next check
653 # update to next check
654 cmdutil.bailifchanged(repo)
654 cmdutil.bailifchanged(repo)
655 hg.clean(repo, nodes[0], show_stats=False)
655 hg.clean(repo, nodes[0], show_stats=False)
656 finally:
656 finally:
657 hbisect.save_state(repo, state)
657 hbisect.save_state(repo, state)
658 print_result(nodes, good)
658 print_result(nodes, good)
659 return
659 return
660
660
661 # update state
661 # update state
662
662
663 if rev:
663 if rev:
664 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
664 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
665 else:
665 else:
666 nodes = [repo.lookup('.')]
666 nodes = [repo.lookup('.')]
667
667
668 if good or bad or skip:
668 if good or bad or skip:
669 if good:
669 if good:
670 state['good'] += nodes
670 state['good'] += nodes
671 elif bad:
671 elif bad:
672 state['bad'] += nodes
672 state['bad'] += nodes
673 elif skip:
673 elif skip:
674 state['skip'] += nodes
674 state['skip'] += nodes
675 hbisect.save_state(repo, state)
675 hbisect.save_state(repo, state)
676
676
677 if not check_state(state):
677 if not check_state(state):
678 return
678 return
679
679
680 # actually bisect
680 # actually bisect
681 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
681 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
682 if extend:
682 if extend:
683 if not changesets:
683 if not changesets:
684 extendnode = extendbisectrange(nodes, good)
684 extendnode = extendbisectrange(nodes, good)
685 if extendnode is not None:
685 if extendnode is not None:
686 ui.write(_("Extending search to changeset %d:%s\n"
686 ui.write(_("Extending search to changeset %d:%s\n"
687 % (extendnode.rev(), extendnode)))
687 % (extendnode.rev(), extendnode)))
688 if noupdate:
688 if noupdate:
689 return
689 return
690 cmdutil.bailifchanged(repo)
690 cmdutil.bailifchanged(repo)
691 return hg.clean(repo, extendnode.node())
691 return hg.clean(repo, extendnode.node())
692 raise util.Abort(_("nothing to extend"))
692 raise util.Abort(_("nothing to extend"))
693
693
694 if changesets == 0:
694 if changesets == 0:
695 print_result(nodes, good)
695 print_result(nodes, good)
696 else:
696 else:
697 assert len(nodes) == 1 # only a single node can be tested next
697 assert len(nodes) == 1 # only a single node can be tested next
698 node = nodes[0]
698 node = nodes[0]
699 # compute the approximate number of remaining tests
699 # compute the approximate number of remaining tests
700 tests, size = 0, 2
700 tests, size = 0, 2
701 while size <= changesets:
701 while size <= changesets:
702 tests, size = tests + 1, size * 2
702 tests, size = tests + 1, size * 2
703 rev = repo.changelog.rev(node)
703 rev = repo.changelog.rev(node)
704 ui.write(_("Testing changeset %d:%s "
704 ui.write(_("Testing changeset %d:%s "
705 "(%d changesets remaining, ~%d tests)\n")
705 "(%d changesets remaining, ~%d tests)\n")
706 % (rev, short(node), changesets, tests))
706 % (rev, short(node), changesets, tests))
707 if not noupdate:
707 if not noupdate:
708 cmdutil.bailifchanged(repo)
708 cmdutil.bailifchanged(repo)
709 return hg.clean(repo, node)
709 return hg.clean(repo, node)
710
710
711 @command('bookmarks',
711 @command('bookmarks',
712 [('f', 'force', False, _('force')),
712 [('f', 'force', False, _('force')),
713 ('r', 'rev', '', _('revision'), _('REV')),
713 ('r', 'rev', '', _('revision'), _('REV')),
714 ('d', 'delete', False, _('delete a given bookmark')),
714 ('d', 'delete', False, _('delete a given bookmark')),
715 ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
715 ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
716 ('i', 'inactive', False, _('do not mark a new bookmark active'))],
716 ('i', 'inactive', False, _('do not mark a new bookmark active'))],
717 _('hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]'))
717 _('hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]'))
718 def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False,
718 def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False,
719 rename=None, inactive=False):
719 rename=None, inactive=False):
720 '''track a line of development with movable markers
720 '''track a line of development with movable markers
721
721
722 Bookmarks are pointers to certain commits that move when
722 Bookmarks are pointers to certain commits that move when
723 committing. Bookmarks are local. They can be renamed, copied and
723 committing. Bookmarks are local. They can be renamed, copied and
724 deleted. It is possible to use bookmark names in :hg:`merge` and
724 deleted. It is possible to use bookmark names in :hg:`merge` and
725 :hg:`update` to merge and update respectively to a given bookmark.
725 :hg:`update` to merge and update respectively to a given bookmark.
726
726
727 You can use :hg:`bookmark NAME` to set a bookmark on the working
727 You can use :hg:`bookmark NAME` to set a bookmark on the working
728 directory's parent revision with the given name. If you specify
728 directory's parent revision with the given name. If you specify
729 a revision using -r REV (where REV may be an existing bookmark),
729 a revision using -r REV (where REV may be an existing bookmark),
730 the bookmark is assigned to that revision.
730 the bookmark is assigned to that revision.
731
731
732 Bookmarks can be pushed and pulled between repositories (see :hg:`help
732 Bookmarks can be pushed and pulled between repositories (see :hg:`help
733 push` and :hg:`help pull`). This requires both the local and remote
733 push` and :hg:`help pull`). This requires both the local and remote
734 repositories to support bookmarks. For versions prior to 1.8, this means
734 repositories to support bookmarks. For versions prior to 1.8, this means
735 the bookmarks extension must be enabled.
735 the bookmarks extension must be enabled.
736 '''
736 '''
737 hexfn = ui.debugflag and hex or short
737 hexfn = ui.debugflag and hex or short
738 marks = repo._bookmarks
738 marks = repo._bookmarks
739 cur = repo.changectx('.').node()
739 cur = repo.changectx('.').node()
740
740
741 if rename:
741 if rename:
742 if rename not in marks:
742 if rename not in marks:
743 raise util.Abort(_("bookmark '%s' does not exist") % rename)
743 raise util.Abort(_("bookmark '%s' does not exist") % rename)
744 if mark in marks and not force:
744 if mark in marks and not force:
745 raise util.Abort(_("bookmark '%s' already exists "
745 raise util.Abort(_("bookmark '%s' already exists "
746 "(use -f to force)") % mark)
746 "(use -f to force)") % mark)
747 if mark is None:
747 if mark is None:
748 raise util.Abort(_("new bookmark name required"))
748 raise util.Abort(_("new bookmark name required"))
749 marks[mark] = marks[rename]
749 marks[mark] = marks[rename]
750 if repo._bookmarkcurrent == rename and not inactive:
750 if repo._bookmarkcurrent == rename and not inactive:
751 bookmarks.setcurrent(repo, mark)
751 bookmarks.setcurrent(repo, mark)
752 del marks[rename]
752 del marks[rename]
753 bookmarks.write(repo)
753 bookmarks.write(repo)
754 return
754 return
755
755
756 if delete:
756 if delete:
757 if mark is None:
757 if mark is None:
758 raise util.Abort(_("bookmark name required"))
758 raise util.Abort(_("bookmark name required"))
759 if mark not in marks:
759 if mark not in marks:
760 raise util.Abort(_("bookmark '%s' does not exist") % mark)
760 raise util.Abort(_("bookmark '%s' does not exist") % mark)
761 if mark == repo._bookmarkcurrent:
761 if mark == repo._bookmarkcurrent:
762 bookmarks.setcurrent(repo, None)
762 bookmarks.setcurrent(repo, None)
763 del marks[mark]
763 del marks[mark]
764 bookmarks.write(repo)
764 bookmarks.write(repo)
765 return
765 return
766
766
767 if mark is not None:
767 if mark is not None:
768 if "\n" in mark:
768 if "\n" in mark:
769 raise util.Abort(_("bookmark name cannot contain newlines"))
769 raise util.Abort(_("bookmark name cannot contain newlines"))
770 mark = mark.strip()
770 mark = mark.strip()
771 if not mark:
771 if not mark:
772 raise util.Abort(_("bookmark names cannot consist entirely of "
772 raise util.Abort(_("bookmark names cannot consist entirely of "
773 "whitespace"))
773 "whitespace"))
774 if inactive and mark == repo._bookmarkcurrent:
774 if inactive and mark == repo._bookmarkcurrent:
775 bookmarks.setcurrent(repo, None)
775 bookmarks.setcurrent(repo, None)
776 return
776 return
777 if mark in marks and not force:
777 if mark in marks and not force:
778 raise util.Abort(_("bookmark '%s' already exists "
778 raise util.Abort(_("bookmark '%s' already exists "
779 "(use -f to force)") % mark)
779 "(use -f to force)") % mark)
780 if ((mark in repo.branchtags() or mark == repo.dirstate.branch())
780 if ((mark in repo.branchtags() or mark == repo.dirstate.branch())
781 and not force):
781 and not force):
782 raise util.Abort(
782 raise util.Abort(
783 _("a bookmark cannot have the name of an existing branch"))
783 _("a bookmark cannot have the name of an existing branch"))
784 if rev:
784 if rev:
785 marks[mark] = repo.lookup(rev)
785 marks[mark] = repo.lookup(rev)
786 else:
786 else:
787 marks[mark] = repo.changectx('.').node()
787 marks[mark] = repo.changectx('.').node()
788 if not inactive and repo.changectx('.').node() == marks[mark]:
788 if not inactive and repo.changectx('.').node() == marks[mark]:
789 bookmarks.setcurrent(repo, mark)
789 bookmarks.setcurrent(repo, mark)
790 bookmarks.write(repo)
790 bookmarks.write(repo)
791 return
791 return
792
792
793 if mark is None:
793 if mark is None:
794 if rev:
794 if rev:
795 raise util.Abort(_("bookmark name required"))
795 raise util.Abort(_("bookmark name required"))
796 if len(marks) == 0:
796 if len(marks) == 0:
797 ui.status(_("no bookmarks set\n"))
797 ui.status(_("no bookmarks set\n"))
798 else:
798 else:
799 for bmark, n in sorted(marks.iteritems()):
799 for bmark, n in sorted(marks.iteritems()):
800 current = repo._bookmarkcurrent
800 current = repo._bookmarkcurrent
801 if bmark == current and n == cur:
801 if bmark == current and n == cur:
802 prefix, label = '*', 'bookmarks.current'
802 prefix, label = '*', 'bookmarks.current'
803 else:
803 else:
804 prefix, label = ' ', ''
804 prefix, label = ' ', ''
805
805
806 if ui.quiet:
806 if ui.quiet:
807 ui.write("%s\n" % bmark, label=label)
807 ui.write("%s\n" % bmark, label=label)
808 else:
808 else:
809 ui.write(" %s %-25s %d:%s\n" % (
809 ui.write(" %s %-25s %d:%s\n" % (
810 prefix, bmark, repo.changelog.rev(n), hexfn(n)),
810 prefix, bmark, repo.changelog.rev(n), hexfn(n)),
811 label=label)
811 label=label)
812 return
812 return
813
813
814 @command('branch',
814 @command('branch',
815 [('f', 'force', None,
815 [('f', 'force', None,
816 _('set branch name even if it shadows an existing branch')),
816 _('set branch name even if it shadows an existing branch')),
817 ('C', 'clean', None, _('reset branch name to parent branch name'))],
817 ('C', 'clean', None, _('reset branch name to parent branch name'))],
818 _('[-fC] [NAME]'))
818 _('[-fC] [NAME]'))
819 def branch(ui, repo, label=None, **opts):
819 def branch(ui, repo, label=None, **opts):
820 """set or show the current branch name
820 """set or show the current branch name
821
821
822 .. note::
822 .. note::
823 Branch names are permanent and global. Use :hg:`bookmark` to create a
823 Branch names are permanent and global. Use :hg:`bookmark` to create a
824 light-weight bookmark instead. See :hg:`help glossary` for more
824 light-weight bookmark instead. See :hg:`help glossary` for more
825 information about named branches and bookmarks.
825 information about named branches and bookmarks.
826
826
827 With no argument, show the current branch name. With one argument,
827 With no argument, show the current branch name. With one argument,
828 set the working directory branch name (the branch will not exist
828 set the working directory branch name (the branch will not exist
829 in the repository until the next commit). Standard practice
829 in the repository until the next commit). Standard practice
830 recommends that primary development take place on the 'default'
830 recommends that primary development take place on the 'default'
831 branch.
831 branch.
832
832
833 Unless -f/--force is specified, branch will not let you set a
833 Unless -f/--force is specified, branch will not let you set a
834 branch name that already exists, even if it's inactive.
834 branch name that already exists, even if it's inactive.
835
835
836 Use -C/--clean to reset the working directory branch to that of
836 Use -C/--clean to reset the working directory branch to that of
837 the parent of the working directory, negating a previous branch
837 the parent of the working directory, negating a previous branch
838 change.
838 change.
839
839
840 Use the command :hg:`update` to switch to an existing branch. Use
840 Use the command :hg:`update` to switch to an existing branch. Use
841 :hg:`commit --close-branch` to mark this branch as closed.
841 :hg:`commit --close-branch` to mark this branch as closed.
842
842
843 Returns 0 on success.
843 Returns 0 on success.
844 """
844 """
845
845
846 if opts.get('clean'):
846 if opts.get('clean'):
847 label = repo[None].p1().branch()
847 label = repo[None].p1().branch()
848 repo.dirstate.setbranch(label)
848 repo.dirstate.setbranch(label)
849 ui.status(_('reset working directory to branch %s\n') % label)
849 ui.status(_('reset working directory to branch %s\n') % label)
850 elif label:
850 elif label:
851 if not opts.get('force') and label in repo.branchtags():
851 if not opts.get('force') and label in repo.branchtags():
852 if label not in [p.branch() for p in repo.parents()]:
852 if label not in [p.branch() for p in repo.parents()]:
853 raise util.Abort(_('a branch of the same name already exists'),
853 raise util.Abort(_('a branch of the same name already exists'),
854 # i18n: "it" refers to an existing branch
854 # i18n: "it" refers to an existing branch
855 hint=_("use 'hg update' to switch to it"))
855 hint=_("use 'hg update' to switch to it"))
856 repo.dirstate.setbranch(label)
856 repo.dirstate.setbranch(label)
857 ui.status(_('marked working directory as branch %s\n') % label)
857 ui.status(_('marked working directory as branch %s\n') % label)
858 ui.status(_('(branches are permanent and global, '
858 ui.status(_('(branches are permanent and global, '
859 'did you want a bookmark?)\n'))
859 'did you want a bookmark?)\n'))
860 else:
860 else:
861 ui.write("%s\n" % repo.dirstate.branch())
861 ui.write("%s\n" % repo.dirstate.branch())
862
862
863 @command('branches',
863 @command('branches',
864 [('a', 'active', False, _('show only branches that have unmerged heads')),
864 [('a', 'active', False, _('show only branches that have unmerged heads')),
865 ('c', 'closed', False, _('show normal and closed branches'))],
865 ('c', 'closed', False, _('show normal and closed branches'))],
866 _('[-ac]'))
866 _('[-ac]'))
867 def branches(ui, repo, active=False, closed=False):
867 def branches(ui, repo, active=False, closed=False):
868 """list repository named branches
868 """list repository named branches
869
869
870 List the repository's named branches, indicating which ones are
870 List the repository's named branches, indicating which ones are
871 inactive. If -c/--closed is specified, also list branches which have
871 inactive. If -c/--closed is specified, also list branches which have
872 been marked closed (see :hg:`commit --close-branch`).
872 been marked closed (see :hg:`commit --close-branch`).
873
873
874 If -a/--active is specified, only show active branches. A branch
874 If -a/--active is specified, only show active branches. A branch
875 is considered active if it contains repository heads.
875 is considered active if it contains repository heads.
876
876
877 Use the command :hg:`update` to switch to an existing branch.
877 Use the command :hg:`update` to switch to an existing branch.
878
878
879 Returns 0.
879 Returns 0.
880 """
880 """
881
881
882 hexfunc = ui.debugflag and hex or short
882 hexfunc = ui.debugflag and hex or short
883 activebranches = [repo[n].branch() for n in repo.heads()]
883 activebranches = [repo[n].branch() for n in repo.heads()]
884 def testactive(tag, node):
884 def testactive(tag, node):
885 realhead = tag in activebranches
885 realhead = tag in activebranches
886 open = node in repo.branchheads(tag, closed=False)
886 open = node in repo.branchheads(tag, closed=False)
887 return realhead and open
887 return realhead and open
888 branches = sorted([(testactive(tag, node), repo.changelog.rev(node), tag)
888 branches = sorted([(testactive(tag, node), repo.changelog.rev(node), tag)
889 for tag, node in repo.branchtags().items()],
889 for tag, node in repo.branchtags().items()],
890 reverse=True)
890 reverse=True)
891
891
892 for isactive, node, tag in branches:
892 for isactive, node, tag in branches:
893 if (not active) or isactive:
893 if (not active) or isactive:
894 if ui.quiet:
894 if ui.quiet:
895 ui.write("%s\n" % tag)
895 ui.write("%s\n" % tag)
896 else:
896 else:
897 hn = repo.lookup(node)
897 hn = repo.lookup(node)
898 if isactive:
898 if isactive:
899 label = 'branches.active'
899 label = 'branches.active'
900 notice = ''
900 notice = ''
901 elif hn not in repo.branchheads(tag, closed=False):
901 elif hn not in repo.branchheads(tag, closed=False):
902 if not closed:
902 if not closed:
903 continue
903 continue
904 label = 'branches.closed'
904 label = 'branches.closed'
905 notice = _(' (closed)')
905 notice = _(' (closed)')
906 else:
906 else:
907 label = 'branches.inactive'
907 label = 'branches.inactive'
908 notice = _(' (inactive)')
908 notice = _(' (inactive)')
909 if tag == repo.dirstate.branch():
909 if tag == repo.dirstate.branch():
910 label = 'branches.current'
910 label = 'branches.current'
911 rev = str(node).rjust(31 - encoding.colwidth(tag))
911 rev = str(node).rjust(31 - encoding.colwidth(tag))
912 rev = ui.label('%s:%s' % (rev, hexfunc(hn)), 'log.changeset')
912 rev = ui.label('%s:%s' % (rev, hexfunc(hn)), 'log.changeset')
913 tag = ui.label(tag, label)
913 tag = ui.label(tag, label)
914 ui.write("%s %s%s\n" % (tag, rev, notice))
914 ui.write("%s %s%s\n" % (tag, rev, notice))
915
915
916 @command('bundle',
916 @command('bundle',
917 [('f', 'force', None, _('run even when the destination is unrelated')),
917 [('f', 'force', None, _('run even when the destination is unrelated')),
918 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
918 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
919 _('REV')),
919 _('REV')),
920 ('b', 'branch', [], _('a specific branch you would like to bundle'),
920 ('b', 'branch', [], _('a specific branch you would like to bundle'),
921 _('BRANCH')),
921 _('BRANCH')),
922 ('', 'base', [],
922 ('', 'base', [],
923 _('a base changeset assumed to be available at the destination'),
923 _('a base changeset assumed to be available at the destination'),
924 _('REV')),
924 _('REV')),
925 ('a', 'all', None, _('bundle all changesets in the repository')),
925 ('a', 'all', None, _('bundle all changesets in the repository')),
926 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
926 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
927 ] + remoteopts,
927 ] + remoteopts,
928 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
928 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
929 def bundle(ui, repo, fname, dest=None, **opts):
929 def bundle(ui, repo, fname, dest=None, **opts):
930 """create a changegroup file
930 """create a changegroup file
931
931
932 Generate a compressed changegroup file collecting changesets not
932 Generate a compressed changegroup file collecting changesets not
933 known to be in another repository.
933 known to be in another repository.
934
934
935 If you omit the destination repository, then hg assumes the
935 If you omit the destination repository, then hg assumes the
936 destination will have all the nodes you specify with --base
936 destination will have all the nodes you specify with --base
937 parameters. To create a bundle containing all changesets, use
937 parameters. To create a bundle containing all changesets, use
938 -a/--all (or --base null).
938 -a/--all (or --base null).
939
939
940 You can change compression method with the -t/--type option.
940 You can change compression method with the -t/--type option.
941 The available compression methods are: none, bzip2, and
941 The available compression methods are: none, bzip2, and
942 gzip (by default, bundles are compressed using bzip2).
942 gzip (by default, bundles are compressed using bzip2).
943
943
944 The bundle file can then be transferred using conventional means
944 The bundle file can then be transferred using conventional means
945 and applied to another repository with the unbundle or pull
945 and applied to another repository with the unbundle or pull
946 command. This is useful when direct push and pull are not
946 command. This is useful when direct push and pull are not
947 available or when exporting an entire repository is undesirable.
947 available or when exporting an entire repository is undesirable.
948
948
949 Applying bundles preserves all changeset contents including
949 Applying bundles preserves all changeset contents including
950 permissions, copy/rename information, and revision history.
950 permissions, copy/rename information, and revision history.
951
951
952 Returns 0 on success, 1 if no changes found.
952 Returns 0 on success, 1 if no changes found.
953 """
953 """
954 revs = None
954 revs = None
955 if 'rev' in opts:
955 if 'rev' in opts:
956 revs = scmutil.revrange(repo, opts['rev'])
956 revs = scmutil.revrange(repo, opts['rev'])
957
957
958 if opts.get('all'):
958 if opts.get('all'):
959 base = ['null']
959 base = ['null']
960 else:
960 else:
961 base = scmutil.revrange(repo, opts.get('base'))
961 base = scmutil.revrange(repo, opts.get('base'))
962 if base:
962 if base:
963 if dest:
963 if dest:
964 raise util.Abort(_("--base is incompatible with specifying "
964 raise util.Abort(_("--base is incompatible with specifying "
965 "a destination"))
965 "a destination"))
966 common = [repo.lookup(rev) for rev in base]
966 common = [repo.lookup(rev) for rev in base]
967 heads = revs and map(repo.lookup, revs) or revs
967 heads = revs and map(repo.lookup, revs) or revs
968 else:
968 else:
969 dest = ui.expandpath(dest or 'default-push', dest or 'default')
969 dest = ui.expandpath(dest or 'default-push', dest or 'default')
970 dest, branches = hg.parseurl(dest, opts.get('branch'))
970 dest, branches = hg.parseurl(dest, opts.get('branch'))
971 other = hg.peer(repo, opts, dest)
971 other = hg.peer(repo, opts, dest)
972 revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
972 revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
973 heads = revs and map(repo.lookup, revs) or revs
973 heads = revs and map(repo.lookup, revs) or revs
974 common, outheads = discovery.findcommonoutgoing(repo, other,
974 common, outheads = discovery.findcommonoutgoing(repo, other,
975 onlyheads=heads,
975 onlyheads=heads,
976 force=opts.get('force'))
976 force=opts.get('force'))
977
977
978 cg = repo.getbundle('bundle', common=common, heads=heads)
978 cg = repo.getbundle('bundle', common=common, heads=heads)
979 if not cg:
979 if not cg:
980 ui.status(_("no changes found\n"))
980 ui.status(_("no changes found\n"))
981 return 1
981 return 1
982
982
983 bundletype = opts.get('type', 'bzip2').lower()
983 bundletype = opts.get('type', 'bzip2').lower()
984 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
984 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
985 bundletype = btypes.get(bundletype)
985 bundletype = btypes.get(bundletype)
986 if bundletype not in changegroup.bundletypes:
986 if bundletype not in changegroup.bundletypes:
987 raise util.Abort(_('unknown bundle type specified with --type'))
987 raise util.Abort(_('unknown bundle type specified with --type'))
988
988
989 changegroup.writebundle(cg, fname, bundletype)
989 changegroup.writebundle(cg, fname, bundletype)
990
990
991 @command('cat',
991 @command('cat',
992 [('o', 'output', '',
992 [('o', 'output', '',
993 _('print output to file with formatted name'), _('FORMAT')),
993 _('print output to file with formatted name'), _('FORMAT')),
994 ('r', 'rev', '', _('print the given revision'), _('REV')),
994 ('r', 'rev', '', _('print the given revision'), _('REV')),
995 ('', 'decode', None, _('apply any matching decode filter')),
995 ('', 'decode', None, _('apply any matching decode filter')),
996 ] + walkopts,
996 ] + walkopts,
997 _('[OPTION]... FILE...'))
997 _('[OPTION]... FILE...'))
998 def cat(ui, repo, file1, *pats, **opts):
998 def cat(ui, repo, file1, *pats, **opts):
999 """output the current or given revision of files
999 """output the current or given revision of files
1000
1000
1001 Print the specified files as they were at the given revision. If
1001 Print the specified files as they were at the given revision. If
1002 no revision is given, the parent of the working directory is used,
1002 no revision is given, the parent of the working directory is used,
1003 or tip if no revision is checked out.
1003 or tip if no revision is checked out.
1004
1004
1005 Output may be to a file, in which case the name of the file is
1005 Output may be to a file, in which case the name of the file is
1006 given using a format string. The formatting rules are the same as
1006 given using a format string. The formatting rules are the same as
1007 for the export command, with the following additions:
1007 for the export command, with the following additions:
1008
1008
1009 :``%s``: basename of file being printed
1009 :``%s``: basename of file being printed
1010 :``%d``: dirname of file being printed, or '.' if in repository root
1010 :``%d``: dirname of file being printed, or '.' if in repository root
1011 :``%p``: root-relative path name of file being printed
1011 :``%p``: root-relative path name of file being printed
1012
1012
1013 Returns 0 on success.
1013 Returns 0 on success.
1014 """
1014 """
1015 ctx = scmutil.revsingle(repo, opts.get('rev'))
1015 ctx = scmutil.revsingle(repo, opts.get('rev'))
1016 err = 1
1016 err = 1
1017 m = scmutil.match(ctx, (file1,) + pats, opts)
1017 m = scmutil.match(ctx, (file1,) + pats, opts)
1018 for abs in ctx.walk(m):
1018 for abs in ctx.walk(m):
1019 fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(),
1019 fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(),
1020 pathname=abs)
1020 pathname=abs)
1021 data = ctx[abs].data()
1021 data = ctx[abs].data()
1022 if opts.get('decode'):
1022 if opts.get('decode'):
1023 data = repo.wwritedata(abs, data)
1023 data = repo.wwritedata(abs, data)
1024 fp.write(data)
1024 fp.write(data)
1025 fp.close()
1025 fp.close()
1026 err = 0
1026 err = 0
1027 return err
1027 return err
1028
1028
1029 @command('^clone',
1029 @command('^clone',
1030 [('U', 'noupdate', None,
1030 [('U', 'noupdate', None,
1031 _('the clone will include an empty working copy (only a repository)')),
1031 _('the clone will include an empty working copy (only a repository)')),
1032 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
1032 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
1033 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1033 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1034 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1034 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1035 ('', 'pull', None, _('use pull protocol to copy metadata')),
1035 ('', 'pull', None, _('use pull protocol to copy metadata')),
1036 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1036 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1037 ] + remoteopts,
1037 ] + remoteopts,
1038 _('[OPTION]... SOURCE [DEST]'))
1038 _('[OPTION]... SOURCE [DEST]'))
1039 def clone(ui, source, dest=None, **opts):
1039 def clone(ui, source, dest=None, **opts):
1040 """make a copy of an existing repository
1040 """make a copy of an existing repository
1041
1041
1042 Create a copy of an existing repository in a new directory.
1042 Create a copy of an existing repository in a new directory.
1043
1043
1044 If no destination directory name is specified, it defaults to the
1044 If no destination directory name is specified, it defaults to the
1045 basename of the source.
1045 basename of the source.
1046
1046
1047 The location of the source is added to the new repository's
1047 The location of the source is added to the new repository's
1048 ``.hg/hgrc`` file, as the default to be used for future pulls.
1048 ``.hg/hgrc`` file, as the default to be used for future pulls.
1049
1049
1050 Only local paths and ``ssh://`` URLs are supported as
1050 Only local paths and ``ssh://`` URLs are supported as
1051 destinations. For ``ssh://`` destinations, no working directory or
1051 destinations. For ``ssh://`` destinations, no working directory or
1052 ``.hg/hgrc`` will be created on the remote side.
1052 ``.hg/hgrc`` will be created on the remote side.
1053
1053
1054 To pull only a subset of changesets, specify one or more revisions
1054 To pull only a subset of changesets, specify one or more revisions
1055 identifiers with -r/--rev or branches with -b/--branch. The
1055 identifiers with -r/--rev or branches with -b/--branch. The
1056 resulting clone will contain only the specified changesets and
1056 resulting clone will contain only the specified changesets and
1057 their ancestors. These options (or 'clone src#rev dest') imply
1057 their ancestors. These options (or 'clone src#rev dest') imply
1058 --pull, even for local source repositories. Note that specifying a
1058 --pull, even for local source repositories. Note that specifying a
1059 tag will include the tagged changeset but not the changeset
1059 tag will include the tagged changeset but not the changeset
1060 containing the tag.
1060 containing the tag.
1061
1061
1062 To check out a particular version, use -u/--update, or
1062 To check out a particular version, use -u/--update, or
1063 -U/--noupdate to create a clone with no working directory.
1063 -U/--noupdate to create a clone with no working directory.
1064
1064
1065 .. container:: verbose
1065 .. container:: verbose
1066
1066
1067 For efficiency, hardlinks are used for cloning whenever the
1067 For efficiency, hardlinks are used for cloning whenever the
1068 source and destination are on the same filesystem (note this
1068 source and destination are on the same filesystem (note this
1069 applies only to the repository data, not to the working
1069 applies only to the repository data, not to the working
1070 directory). Some filesystems, such as AFS, implement hardlinking
1070 directory). Some filesystems, such as AFS, implement hardlinking
1071 incorrectly, but do not report errors. In these cases, use the
1071 incorrectly, but do not report errors. In these cases, use the
1072 --pull option to avoid hardlinking.
1072 --pull option to avoid hardlinking.
1073
1073
1074 In some cases, you can clone repositories and the working
1074 In some cases, you can clone repositories and the working
1075 directory using full hardlinks with ::
1075 directory using full hardlinks with ::
1076
1076
1077 $ cp -al REPO REPOCLONE
1077 $ cp -al REPO REPOCLONE
1078
1078
1079 This is the fastest way to clone, but it is not always safe. The
1079 This is the fastest way to clone, but it is not always safe. The
1080 operation is not atomic (making sure REPO is not modified during
1080 operation is not atomic (making sure REPO is not modified during
1081 the operation is up to you) and you have to make sure your
1081 the operation is up to you) and you have to make sure your
1082 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1082 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1083 so). Also, this is not compatible with certain extensions that
1083 so). Also, this is not compatible with certain extensions that
1084 place their metadata under the .hg directory, such as mq.
1084 place their metadata under the .hg directory, such as mq.
1085
1085
1086 Mercurial will update the working directory to the first applicable
1086 Mercurial will update the working directory to the first applicable
1087 revision from this list:
1087 revision from this list:
1088
1088
1089 a) null if -U or the source repository has no changesets
1089 a) null if -U or the source repository has no changesets
1090 b) if -u . and the source repository is local, the first parent of
1090 b) if -u . and the source repository is local, the first parent of
1091 the source repository's working directory
1091 the source repository's working directory
1092 c) the changeset specified with -u (if a branch name, this means the
1092 c) the changeset specified with -u (if a branch name, this means the
1093 latest head of that branch)
1093 latest head of that branch)
1094 d) the changeset specified with -r
1094 d) the changeset specified with -r
1095 e) the tipmost head specified with -b
1095 e) the tipmost head specified with -b
1096 f) the tipmost head specified with the url#branch source syntax
1096 f) the tipmost head specified with the url#branch source syntax
1097 g) the tipmost head of the default branch
1097 g) the tipmost head of the default branch
1098 h) tip
1098 h) tip
1099
1099
1100 Examples:
1100 Examples:
1101
1101
1102 - clone a remote repository to a new directory named hg/::
1102 - clone a remote repository to a new directory named hg/::
1103
1103
1104 hg clone http://selenic.com/hg
1104 hg clone http://selenic.com/hg
1105
1105
1106 - create a lightweight local clone::
1106 - create a lightweight local clone::
1107
1107
1108 hg clone project/ project-feature/
1108 hg clone project/ project-feature/
1109
1109
1110 - clone from an absolute path on an ssh server (note double-slash)::
1110 - clone from an absolute path on an ssh server (note double-slash)::
1111
1111
1112 hg clone ssh://user@server//home/projects/alpha/
1112 hg clone ssh://user@server//home/projects/alpha/
1113
1113
1114 - do a high-speed clone over a LAN while checking out a
1114 - do a high-speed clone over a LAN while checking out a
1115 specified version::
1115 specified version::
1116
1116
1117 hg clone --uncompressed http://server/repo -u 1.5
1117 hg clone --uncompressed http://server/repo -u 1.5
1118
1118
1119 - create a repository without changesets after a particular revision::
1119 - create a repository without changesets after a particular revision::
1120
1120
1121 hg clone -r 04e544 experimental/ good/
1121 hg clone -r 04e544 experimental/ good/
1122
1122
1123 - clone (and track) a particular named branch::
1123 - clone (and track) a particular named branch::
1124
1124
1125 hg clone http://selenic.com/hg#stable
1125 hg clone http://selenic.com/hg#stable
1126
1126
1127 See :hg:`help urls` for details on specifying URLs.
1127 See :hg:`help urls` for details on specifying URLs.
1128
1128
1129 Returns 0 on success.
1129 Returns 0 on success.
1130 """
1130 """
1131 if opts.get('noupdate') and opts.get('updaterev'):
1131 if opts.get('noupdate') and opts.get('updaterev'):
1132 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
1132 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
1133
1133
1134 r = hg.clone(ui, opts, source, dest,
1134 r = hg.clone(ui, opts, source, dest,
1135 pull=opts.get('pull'),
1135 pull=opts.get('pull'),
1136 stream=opts.get('uncompressed'),
1136 stream=opts.get('uncompressed'),
1137 rev=opts.get('rev'),
1137 rev=opts.get('rev'),
1138 update=opts.get('updaterev') or not opts.get('noupdate'),
1138 update=opts.get('updaterev') or not opts.get('noupdate'),
1139 branch=opts.get('branch'))
1139 branch=opts.get('branch'))
1140
1140
1141 return r is None
1141 return r is None
1142
1142
1143 @command('^commit|ci',
1143 @command('^commit|ci',
1144 [('A', 'addremove', None,
1144 [('A', 'addremove', None,
1145 _('mark new/missing files as added/removed before committing')),
1145 _('mark new/missing files as added/removed before committing')),
1146 ('', 'close-branch', None,
1146 ('', 'close-branch', None,
1147 _('mark a branch as closed, hiding it from the branch list')),
1147 _('mark a branch as closed, hiding it from the branch list')),
1148 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1148 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1149 _('[OPTION]... [FILE]...'))
1149 _('[OPTION]... [FILE]...'))
1150 def commit(ui, repo, *pats, **opts):
1150 def commit(ui, repo, *pats, **opts):
1151 """commit the specified files or all outstanding changes
1151 """commit the specified files or all outstanding changes
1152
1152
1153 Commit changes to the given files into the repository. Unlike a
1153 Commit changes to the given files into the repository. Unlike a
1154 centralized SCM, this operation is a local operation. See
1154 centralized SCM, this operation is a local operation. See
1155 :hg:`push` for a way to actively distribute your changes.
1155 :hg:`push` for a way to actively distribute your changes.
1156
1156
1157 If a list of files is omitted, all changes reported by :hg:`status`
1157 If a list of files is omitted, all changes reported by :hg:`status`
1158 will be committed.
1158 will be committed.
1159
1159
1160 If you are committing the result of a merge, do not provide any
1160 If you are committing the result of a merge, do not provide any
1161 filenames or -I/-X filters.
1161 filenames or -I/-X filters.
1162
1162
1163 If no commit message is specified, Mercurial starts your
1163 If no commit message is specified, Mercurial starts your
1164 configured editor where you can enter a message. In case your
1164 configured editor where you can enter a message. In case your
1165 commit fails, you will find a backup of your message in
1165 commit fails, you will find a backup of your message in
1166 ``.hg/last-message.txt``.
1166 ``.hg/last-message.txt``.
1167
1167
1168 See :hg:`help dates` for a list of formats valid for -d/--date.
1168 See :hg:`help dates` for a list of formats valid for -d/--date.
1169
1169
1170 Returns 0 on success, 1 if nothing changed.
1170 Returns 0 on success, 1 if nothing changed.
1171 """
1171 """
1172 if opts.get('subrepos'):
1172 if opts.get('subrepos'):
1173 # Let --subrepos on the command line overide config setting.
1173 # Let --subrepos on the command line overide config setting.
1174 ui.setconfig('ui', 'commitsubrepos', True)
1174 ui.setconfig('ui', 'commitsubrepos', True)
1175
1175
1176 extra = {}
1176 extra = {}
1177 if opts.get('close_branch'):
1177 if opts.get('close_branch'):
1178 if repo['.'].node() not in repo.branchheads():
1178 if repo['.'].node() not in repo.branchheads():
1179 # The topo heads set is included in the branch heads set of the
1179 # The topo heads set is included in the branch heads set of the
1180 # current branch, so it's sufficient to test branchheads
1180 # current branch, so it's sufficient to test branchheads
1181 raise util.Abort(_('can only close branch heads'))
1181 raise util.Abort(_('can only close branch heads'))
1182 extra['close'] = 1
1182 extra['close'] = 1
1183 e = cmdutil.commiteditor
1183 e = cmdutil.commiteditor
1184 if opts.get('force_editor'):
1184 if opts.get('force_editor'):
1185 e = cmdutil.commitforceeditor
1185 e = cmdutil.commitforceeditor
1186
1186
1187 def commitfunc(ui, repo, message, match, opts):
1187 def commitfunc(ui, repo, message, match, opts):
1188 return repo.commit(message, opts.get('user'), opts.get('date'), match,
1188 return repo.commit(message, opts.get('user'), opts.get('date'), match,
1189 editor=e, extra=extra)
1189 editor=e, extra=extra)
1190
1190
1191 branch = repo[None].branch()
1191 branch = repo[None].branch()
1192 bheads = repo.branchheads(branch)
1192 bheads = repo.branchheads(branch)
1193
1193
1194 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1194 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1195 if not node:
1195 if not node:
1196 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1196 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1197 if stat[3]:
1197 if stat[3]:
1198 ui.status(_("nothing changed (%d missing files, see 'hg status')\n")
1198 ui.status(_("nothing changed (%d missing files, see 'hg status')\n")
1199 % len(stat[3]))
1199 % len(stat[3]))
1200 else:
1200 else:
1201 ui.status(_("nothing changed\n"))
1201 ui.status(_("nothing changed\n"))
1202 return 1
1202 return 1
1203
1203
1204 ctx = repo[node]
1204 ctx = repo[node]
1205 parents = ctx.parents()
1205 parents = ctx.parents()
1206
1206
1207 if (bheads and node not in bheads and not
1207 if (bheads and node not in bheads and not
1208 [x for x in parents if x.node() in bheads and x.branch() == branch]):
1208 [x for x in parents if x.node() in bheads and x.branch() == branch]):
1209 ui.status(_('created new head\n'))
1209 ui.status(_('created new head\n'))
1210 # The message is not printed for initial roots. For the other
1210 # The message is not printed for initial roots. For the other
1211 # changesets, it is printed in the following situations:
1211 # changesets, it is printed in the following situations:
1212 #
1212 #
1213 # Par column: for the 2 parents with ...
1213 # Par column: for the 2 parents with ...
1214 # N: null or no parent
1214 # N: null or no parent
1215 # B: parent is on another named branch
1215 # B: parent is on another named branch
1216 # C: parent is a regular non head changeset
1216 # C: parent is a regular non head changeset
1217 # H: parent was a branch head of the current branch
1217 # H: parent was a branch head of the current branch
1218 # Msg column: whether we print "created new head" message
1218 # Msg column: whether we print "created new head" message
1219 # In the following, it is assumed that there already exists some
1219 # In the following, it is assumed that there already exists some
1220 # initial branch heads of the current branch, otherwise nothing is
1220 # initial branch heads of the current branch, otherwise nothing is
1221 # printed anyway.
1221 # printed anyway.
1222 #
1222 #
1223 # Par Msg Comment
1223 # Par Msg Comment
1224 # NN y additional topo root
1224 # NN y additional topo root
1225 #
1225 #
1226 # BN y additional branch root
1226 # BN y additional branch root
1227 # CN y additional topo head
1227 # CN y additional topo head
1228 # HN n usual case
1228 # HN n usual case
1229 #
1229 #
1230 # BB y weird additional branch root
1230 # BB y weird additional branch root
1231 # CB y branch merge
1231 # CB y branch merge
1232 # HB n merge with named branch
1232 # HB n merge with named branch
1233 #
1233 #
1234 # CC y additional head from merge
1234 # CC y additional head from merge
1235 # CH n merge with a head
1235 # CH n merge with a head
1236 #
1236 #
1237 # HH n head merge: head count decreases
1237 # HH n head merge: head count decreases
1238
1238
1239 if not opts.get('close_branch'):
1239 if not opts.get('close_branch'):
1240 for r in parents:
1240 for r in parents:
1241 if r.extra().get('close') and r.branch() == branch:
1241 if r.extra().get('close') and r.branch() == branch:
1242 ui.status(_('reopening closed branch head %d\n') % r)
1242 ui.status(_('reopening closed branch head %d\n') % r)
1243
1243
1244 if ui.debugflag:
1244 if ui.debugflag:
1245 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
1245 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
1246 elif ui.verbose:
1246 elif ui.verbose:
1247 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
1247 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
1248
1248
1249 @command('copy|cp',
1249 @command('copy|cp',
1250 [('A', 'after', None, _('record a copy that has already occurred')),
1250 [('A', 'after', None, _('record a copy that has already occurred')),
1251 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1251 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1252 ] + walkopts + dryrunopts,
1252 ] + walkopts + dryrunopts,
1253 _('[OPTION]... [SOURCE]... DEST'))
1253 _('[OPTION]... [SOURCE]... DEST'))
1254 def copy(ui, repo, *pats, **opts):
1254 def copy(ui, repo, *pats, **opts):
1255 """mark files as copied for the next commit
1255 """mark files as copied for the next commit
1256
1256
1257 Mark dest as having copies of source files. If dest is a
1257 Mark dest as having copies of source files. If dest is a
1258 directory, copies are put in that directory. If dest is a file,
1258 directory, copies are put in that directory. If dest is a file,
1259 the source must be a single file.
1259 the source must be a single file.
1260
1260
1261 By default, this command copies the contents of files as they
1261 By default, this command copies the contents of files as they
1262 exist in the working directory. If invoked with -A/--after, the
1262 exist in the working directory. If invoked with -A/--after, the
1263 operation is recorded, but no copying is performed.
1263 operation is recorded, but no copying is performed.
1264
1264
1265 This command takes effect with the next commit. To undo a copy
1265 This command takes effect with the next commit. To undo a copy
1266 before that, see :hg:`revert`.
1266 before that, see :hg:`revert`.
1267
1267
1268 Returns 0 on success, 1 if errors are encountered.
1268 Returns 0 on success, 1 if errors are encountered.
1269 """
1269 """
1270 wlock = repo.wlock(False)
1270 wlock = repo.wlock(False)
1271 try:
1271 try:
1272 return cmdutil.copy(ui, repo, pats, opts)
1272 return cmdutil.copy(ui, repo, pats, opts)
1273 finally:
1273 finally:
1274 wlock.release()
1274 wlock.release()
1275
1275
1276 @command('debugancestor', [], _('[INDEX] REV1 REV2'))
1276 @command('debugancestor', [], _('[INDEX] REV1 REV2'))
1277 def debugancestor(ui, repo, *args):
1277 def debugancestor(ui, repo, *args):
1278 """find the ancestor revision of two revisions in a given index"""
1278 """find the ancestor revision of two revisions in a given index"""
1279 if len(args) == 3:
1279 if len(args) == 3:
1280 index, rev1, rev2 = args
1280 index, rev1, rev2 = args
1281 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1281 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1282 lookup = r.lookup
1282 lookup = r.lookup
1283 elif len(args) == 2:
1283 elif len(args) == 2:
1284 if not repo:
1284 if not repo:
1285 raise util.Abort(_("there is no Mercurial repository here "
1285 raise util.Abort(_("there is no Mercurial repository here "
1286 "(.hg not found)"))
1286 "(.hg not found)"))
1287 rev1, rev2 = args
1287 rev1, rev2 = args
1288 r = repo.changelog
1288 r = repo.changelog
1289 lookup = repo.lookup
1289 lookup = repo.lookup
1290 else:
1290 else:
1291 raise util.Abort(_('either two or three arguments required'))
1291 raise util.Abort(_('either two or three arguments required'))
1292 a = r.ancestor(lookup(rev1), lookup(rev2))
1292 a = r.ancestor(lookup(rev1), lookup(rev2))
1293 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1293 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1294
1294
1295 @command('debugbuilddag',
1295 @command('debugbuilddag',
1296 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1296 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1297 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1297 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1298 ('n', 'new-file', None, _('add new file at each rev'))],
1298 ('n', 'new-file', None, _('add new file at each rev'))],
1299 _('[OPTION]... [TEXT]'))
1299 _('[OPTION]... [TEXT]'))
1300 def debugbuilddag(ui, repo, text=None,
1300 def debugbuilddag(ui, repo, text=None,
1301 mergeable_file=False,
1301 mergeable_file=False,
1302 overwritten_file=False,
1302 overwritten_file=False,
1303 new_file=False):
1303 new_file=False):
1304 """builds a repo with a given DAG from scratch in the current empty repo
1304 """builds a repo with a given DAG from scratch in the current empty repo
1305
1305
1306 The description of the DAG is read from stdin if not given on the
1306 The description of the DAG is read from stdin if not given on the
1307 command line.
1307 command line.
1308
1308
1309 Elements:
1309 Elements:
1310
1310
1311 - "+n" is a linear run of n nodes based on the current default parent
1311 - "+n" is a linear run of n nodes based on the current default parent
1312 - "." is a single node based on the current default parent
1312 - "." is a single node based on the current default parent
1313 - "$" resets the default parent to null (implied at the start);
1313 - "$" resets the default parent to null (implied at the start);
1314 otherwise the default parent is always the last node created
1314 otherwise the default parent is always the last node created
1315 - "<p" sets the default parent to the backref p
1315 - "<p" sets the default parent to the backref p
1316 - "*p" is a fork at parent p, which is a backref
1316 - "*p" is a fork at parent p, which is a backref
1317 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1317 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1318 - "/p2" is a merge of the preceding node and p2
1318 - "/p2" is a merge of the preceding node and p2
1319 - ":tag" defines a local tag for the preceding node
1319 - ":tag" defines a local tag for the preceding node
1320 - "@branch" sets the named branch for subsequent nodes
1320 - "@branch" sets the named branch for subsequent nodes
1321 - "#...\\n" is a comment up to the end of the line
1321 - "#...\\n" is a comment up to the end of the line
1322
1322
1323 Whitespace between the above elements is ignored.
1323 Whitespace between the above elements is ignored.
1324
1324
1325 A backref is either
1325 A backref is either
1326
1326
1327 - a number n, which references the node curr-n, where curr is the current
1327 - a number n, which references the node curr-n, where curr is the current
1328 node, or
1328 node, or
1329 - the name of a local tag you placed earlier using ":tag", or
1329 - the name of a local tag you placed earlier using ":tag", or
1330 - empty to denote the default parent.
1330 - empty to denote the default parent.
1331
1331
1332 All string valued-elements are either strictly alphanumeric, or must
1332 All string valued-elements are either strictly alphanumeric, or must
1333 be enclosed in double quotes ("..."), with "\\" as escape character.
1333 be enclosed in double quotes ("..."), with "\\" as escape character.
1334 """
1334 """
1335
1335
1336 if text is None:
1336 if text is None:
1337 ui.status(_("reading DAG from stdin\n"))
1337 ui.status(_("reading DAG from stdin\n"))
1338 text = ui.fin.read()
1338 text = ui.fin.read()
1339
1339
1340 cl = repo.changelog
1340 cl = repo.changelog
1341 if len(cl) > 0:
1341 if len(cl) > 0:
1342 raise util.Abort(_('repository is not empty'))
1342 raise util.Abort(_('repository is not empty'))
1343
1343
1344 # determine number of revs in DAG
1344 # determine number of revs in DAG
1345 total = 0
1345 total = 0
1346 for type, data in dagparser.parsedag(text):
1346 for type, data in dagparser.parsedag(text):
1347 if type == 'n':
1347 if type == 'n':
1348 total += 1
1348 total += 1
1349
1349
1350 if mergeable_file:
1350 if mergeable_file:
1351 linesperrev = 2
1351 linesperrev = 2
1352 # make a file with k lines per rev
1352 # make a file with k lines per rev
1353 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1353 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1354 initialmergedlines.append("")
1354 initialmergedlines.append("")
1355
1355
1356 tags = []
1356 tags = []
1357
1357
1358 tr = repo.transaction("builddag")
1358 tr = repo.transaction("builddag")
1359 try:
1359 try:
1360
1360
1361 at = -1
1361 at = -1
1362 atbranch = 'default'
1362 atbranch = 'default'
1363 nodeids = []
1363 nodeids = []
1364 ui.progress(_('building'), 0, unit=_('revisions'), total=total)
1364 ui.progress(_('building'), 0, unit=_('revisions'), total=total)
1365 for type, data in dagparser.parsedag(text):
1365 for type, data in dagparser.parsedag(text):
1366 if type == 'n':
1366 if type == 'n':
1367 ui.note('node %s\n' % str(data))
1367 ui.note('node %s\n' % str(data))
1368 id, ps = data
1368 id, ps = data
1369
1369
1370 files = []
1370 files = []
1371 fctxs = {}
1371 fctxs = {}
1372
1372
1373 p2 = None
1373 p2 = None
1374 if mergeable_file:
1374 if mergeable_file:
1375 fn = "mf"
1375 fn = "mf"
1376 p1 = repo[ps[0]]
1376 p1 = repo[ps[0]]
1377 if len(ps) > 1:
1377 if len(ps) > 1:
1378 p2 = repo[ps[1]]
1378 p2 = repo[ps[1]]
1379 pa = p1.ancestor(p2)
1379 pa = p1.ancestor(p2)
1380 base, local, other = [x[fn].data() for x in pa, p1, p2]
1380 base, local, other = [x[fn].data() for x in pa, p1, p2]
1381 m3 = simplemerge.Merge3Text(base, local, other)
1381 m3 = simplemerge.Merge3Text(base, local, other)
1382 ml = [l.strip() for l in m3.merge_lines()]
1382 ml = [l.strip() for l in m3.merge_lines()]
1383 ml.append("")
1383 ml.append("")
1384 elif at > 0:
1384 elif at > 0:
1385 ml = p1[fn].data().split("\n")
1385 ml = p1[fn].data().split("\n")
1386 else:
1386 else:
1387 ml = initialmergedlines
1387 ml = initialmergedlines
1388 ml[id * linesperrev] += " r%i" % id
1388 ml[id * linesperrev] += " r%i" % id
1389 mergedtext = "\n".join(ml)
1389 mergedtext = "\n".join(ml)
1390 files.append(fn)
1390 files.append(fn)
1391 fctxs[fn] = context.memfilectx(fn, mergedtext)
1391 fctxs[fn] = context.memfilectx(fn, mergedtext)
1392
1392
1393 if overwritten_file:
1393 if overwritten_file:
1394 fn = "of"
1394 fn = "of"
1395 files.append(fn)
1395 files.append(fn)
1396 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1396 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1397
1397
1398 if new_file:
1398 if new_file:
1399 fn = "nf%i" % id
1399 fn = "nf%i" % id
1400 files.append(fn)
1400 files.append(fn)
1401 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1401 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1402 if len(ps) > 1:
1402 if len(ps) > 1:
1403 if not p2:
1403 if not p2:
1404 p2 = repo[ps[1]]
1404 p2 = repo[ps[1]]
1405 for fn in p2:
1405 for fn in p2:
1406 if fn.startswith("nf"):
1406 if fn.startswith("nf"):
1407 files.append(fn)
1407 files.append(fn)
1408 fctxs[fn] = p2[fn]
1408 fctxs[fn] = p2[fn]
1409
1409
1410 def fctxfn(repo, cx, path):
1410 def fctxfn(repo, cx, path):
1411 return fctxs.get(path)
1411 return fctxs.get(path)
1412
1412
1413 if len(ps) == 0 or ps[0] < 0:
1413 if len(ps) == 0 or ps[0] < 0:
1414 pars = [None, None]
1414 pars = [None, None]
1415 elif len(ps) == 1:
1415 elif len(ps) == 1:
1416 pars = [nodeids[ps[0]], None]
1416 pars = [nodeids[ps[0]], None]
1417 else:
1417 else:
1418 pars = [nodeids[p] for p in ps]
1418 pars = [nodeids[p] for p in ps]
1419 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1419 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1420 date=(id, 0),
1420 date=(id, 0),
1421 user="debugbuilddag",
1421 user="debugbuilddag",
1422 extra={'branch': atbranch})
1422 extra={'branch': atbranch})
1423 nodeid = repo.commitctx(cx)
1423 nodeid = repo.commitctx(cx)
1424 nodeids.append(nodeid)
1424 nodeids.append(nodeid)
1425 at = id
1425 at = id
1426 elif type == 'l':
1426 elif type == 'l':
1427 id, name = data
1427 id, name = data
1428 ui.note('tag %s\n' % name)
1428 ui.note('tag %s\n' % name)
1429 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1429 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1430 elif type == 'a':
1430 elif type == 'a':
1431 ui.note('branch %s\n' % data)
1431 ui.note('branch %s\n' % data)
1432 atbranch = data
1432 atbranch = data
1433 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1433 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1434 tr.close()
1434 tr.close()
1435 finally:
1435 finally:
1436 ui.progress(_('building'), None)
1436 ui.progress(_('building'), None)
1437 tr.release()
1437 tr.release()
1438
1438
1439 if tags:
1439 if tags:
1440 repo.opener.write("localtags", "".join(tags))
1440 repo.opener.write("localtags", "".join(tags))
1441
1441
1442 @command('debugbundle', [('a', 'all', None, _('show all details'))], _('FILE'))
1442 @command('debugbundle', [('a', 'all', None, _('show all details'))], _('FILE'))
1443 def debugbundle(ui, bundlepath, all=None, **opts):
1443 def debugbundle(ui, bundlepath, all=None, **opts):
1444 """lists the contents of a bundle"""
1444 """lists the contents of a bundle"""
1445 f = url.open(ui, bundlepath)
1445 f = url.open(ui, bundlepath)
1446 try:
1446 try:
1447 gen = changegroup.readbundle(f, bundlepath)
1447 gen = changegroup.readbundle(f, bundlepath)
1448 if all:
1448 if all:
1449 ui.write("format: id, p1, p2, cset, delta base, len(delta)\n")
1449 ui.write("format: id, p1, p2, cset, delta base, len(delta)\n")
1450
1450
1451 def showchunks(named):
1451 def showchunks(named):
1452 ui.write("\n%s\n" % named)
1452 ui.write("\n%s\n" % named)
1453 chain = None
1453 chain = None
1454 while True:
1454 while True:
1455 chunkdata = gen.deltachunk(chain)
1455 chunkdata = gen.deltachunk(chain)
1456 if not chunkdata:
1456 if not chunkdata:
1457 break
1457 break
1458 node = chunkdata['node']
1458 node = chunkdata['node']
1459 p1 = chunkdata['p1']
1459 p1 = chunkdata['p1']
1460 p2 = chunkdata['p2']
1460 p2 = chunkdata['p2']
1461 cs = chunkdata['cs']
1461 cs = chunkdata['cs']
1462 deltabase = chunkdata['deltabase']
1462 deltabase = chunkdata['deltabase']
1463 delta = chunkdata['delta']
1463 delta = chunkdata['delta']
1464 ui.write("%s %s %s %s %s %s\n" %
1464 ui.write("%s %s %s %s %s %s\n" %
1465 (hex(node), hex(p1), hex(p2),
1465 (hex(node), hex(p1), hex(p2),
1466 hex(cs), hex(deltabase), len(delta)))
1466 hex(cs), hex(deltabase), len(delta)))
1467 chain = node
1467 chain = node
1468
1468
1469 chunkdata = gen.changelogheader()
1469 chunkdata = gen.changelogheader()
1470 showchunks("changelog")
1470 showchunks("changelog")
1471 chunkdata = gen.manifestheader()
1471 chunkdata = gen.manifestheader()
1472 showchunks("manifest")
1472 showchunks("manifest")
1473 while True:
1473 while True:
1474 chunkdata = gen.filelogheader()
1474 chunkdata = gen.filelogheader()
1475 if not chunkdata:
1475 if not chunkdata:
1476 break
1476 break
1477 fname = chunkdata['filename']
1477 fname = chunkdata['filename']
1478 showchunks(fname)
1478 showchunks(fname)
1479 else:
1479 else:
1480 chunkdata = gen.changelogheader()
1480 chunkdata = gen.changelogheader()
1481 chain = None
1481 chain = None
1482 while True:
1482 while True:
1483 chunkdata = gen.deltachunk(chain)
1483 chunkdata = gen.deltachunk(chain)
1484 if not chunkdata:
1484 if not chunkdata:
1485 break
1485 break
1486 node = chunkdata['node']
1486 node = chunkdata['node']
1487 ui.write("%s\n" % hex(node))
1487 ui.write("%s\n" % hex(node))
1488 chain = node
1488 chain = node
1489 finally:
1489 finally:
1490 f.close()
1490 f.close()
1491
1491
1492 @command('debugcheckstate', [], '')
1492 @command('debugcheckstate', [], '')
1493 def debugcheckstate(ui, repo):
1493 def debugcheckstate(ui, repo):
1494 """validate the correctness of the current dirstate"""
1494 """validate the correctness of the current dirstate"""
1495 parent1, parent2 = repo.dirstate.parents()
1495 parent1, parent2 = repo.dirstate.parents()
1496 m1 = repo[parent1].manifest()
1496 m1 = repo[parent1].manifest()
1497 m2 = repo[parent2].manifest()
1497 m2 = repo[parent2].manifest()
1498 errors = 0
1498 errors = 0
1499 for f in repo.dirstate:
1499 for f in repo.dirstate:
1500 state = repo.dirstate[f]
1500 state = repo.dirstate[f]
1501 if state in "nr" and f not in m1:
1501 if state in "nr" and f not in m1:
1502 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1502 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1503 errors += 1
1503 errors += 1
1504 if state in "a" and f in m1:
1504 if state in "a" and f in m1:
1505 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1505 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1506 errors += 1
1506 errors += 1
1507 if state in "m" and f not in m1 and f not in m2:
1507 if state in "m" and f not in m1 and f not in m2:
1508 ui.warn(_("%s in state %s, but not in either manifest\n") %
1508 ui.warn(_("%s in state %s, but not in either manifest\n") %
1509 (f, state))
1509 (f, state))
1510 errors += 1
1510 errors += 1
1511 for f in m1:
1511 for f in m1:
1512 state = repo.dirstate[f]
1512 state = repo.dirstate[f]
1513 if state not in "nrm":
1513 if state not in "nrm":
1514 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1514 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1515 errors += 1
1515 errors += 1
1516 if errors:
1516 if errors:
1517 error = _(".hg/dirstate inconsistent with current parent's manifest")
1517 error = _(".hg/dirstate inconsistent with current parent's manifest")
1518 raise util.Abort(error)
1518 raise util.Abort(error)
1519
1519
1520 @command('debugcommands', [], _('[COMMAND]'))
1520 @command('debugcommands', [], _('[COMMAND]'))
1521 def debugcommands(ui, cmd='', *args):
1521 def debugcommands(ui, cmd='', *args):
1522 """list all available commands and options"""
1522 """list all available commands and options"""
1523 for cmd, vals in sorted(table.iteritems()):
1523 for cmd, vals in sorted(table.iteritems()):
1524 cmd = cmd.split('|')[0].strip('^')
1524 cmd = cmd.split('|')[0].strip('^')
1525 opts = ', '.join([i[1] for i in vals[1]])
1525 opts = ', '.join([i[1] for i in vals[1]])
1526 ui.write('%s: %s\n' % (cmd, opts))
1526 ui.write('%s: %s\n' % (cmd, opts))
1527
1527
1528 @command('debugcomplete',
1528 @command('debugcomplete',
1529 [('o', 'options', None, _('show the command options'))],
1529 [('o', 'options', None, _('show the command options'))],
1530 _('[-o] CMD'))
1530 _('[-o] CMD'))
1531 def debugcomplete(ui, cmd='', **opts):
1531 def debugcomplete(ui, cmd='', **opts):
1532 """returns the completion list associated with the given command"""
1532 """returns the completion list associated with the given command"""
1533
1533
1534 if opts.get('options'):
1534 if opts.get('options'):
1535 options = []
1535 options = []
1536 otables = [globalopts]
1536 otables = [globalopts]
1537 if cmd:
1537 if cmd:
1538 aliases, entry = cmdutil.findcmd(cmd, table, False)
1538 aliases, entry = cmdutil.findcmd(cmd, table, False)
1539 otables.append(entry[1])
1539 otables.append(entry[1])
1540 for t in otables:
1540 for t in otables:
1541 for o in t:
1541 for o in t:
1542 if "(DEPRECATED)" in o[3]:
1542 if "(DEPRECATED)" in o[3]:
1543 continue
1543 continue
1544 if o[0]:
1544 if o[0]:
1545 options.append('-%s' % o[0])
1545 options.append('-%s' % o[0])
1546 options.append('--%s' % o[1])
1546 options.append('--%s' % o[1])
1547 ui.write("%s\n" % "\n".join(options))
1547 ui.write("%s\n" % "\n".join(options))
1548 return
1548 return
1549
1549
1550 cmdlist = cmdutil.findpossible(cmd, table)
1550 cmdlist = cmdutil.findpossible(cmd, table)
1551 if ui.verbose:
1551 if ui.verbose:
1552 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1552 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1553 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1553 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1554
1554
1555 @command('debugdag',
1555 @command('debugdag',
1556 [('t', 'tags', None, _('use tags as labels')),
1556 [('t', 'tags', None, _('use tags as labels')),
1557 ('b', 'branches', None, _('annotate with branch names')),
1557 ('b', 'branches', None, _('annotate with branch names')),
1558 ('', 'dots', None, _('use dots for runs')),
1558 ('', 'dots', None, _('use dots for runs')),
1559 ('s', 'spaces', None, _('separate elements by spaces'))],
1559 ('s', 'spaces', None, _('separate elements by spaces'))],
1560 _('[OPTION]... [FILE [REV]...]'))
1560 _('[OPTION]... [FILE [REV]...]'))
1561 def debugdag(ui, repo, file_=None, *revs, **opts):
1561 def debugdag(ui, repo, file_=None, *revs, **opts):
1562 """format the changelog or an index DAG as a concise textual description
1562 """format the changelog or an index DAG as a concise textual description
1563
1563
1564 If you pass a revlog index, the revlog's DAG is emitted. If you list
1564 If you pass a revlog index, the revlog's DAG is emitted. If you list
1565 revision numbers, they get labelled in the output as rN.
1565 revision numbers, they get labelled in the output as rN.
1566
1566
1567 Otherwise, the changelog DAG of the current repo is emitted.
1567 Otherwise, the changelog DAG of the current repo is emitted.
1568 """
1568 """
1569 spaces = opts.get('spaces')
1569 spaces = opts.get('spaces')
1570 dots = opts.get('dots')
1570 dots = opts.get('dots')
1571 if file_:
1571 if file_:
1572 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1572 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1573 revs = set((int(r) for r in revs))
1573 revs = set((int(r) for r in revs))
1574 def events():
1574 def events():
1575 for r in rlog:
1575 for r in rlog:
1576 yield 'n', (r, list(set(p for p in rlog.parentrevs(r) if p != -1)))
1576 yield 'n', (r, list(set(p for p in rlog.parentrevs(r) if p != -1)))
1577 if r in revs:
1577 if r in revs:
1578 yield 'l', (r, "r%i" % r)
1578 yield 'l', (r, "r%i" % r)
1579 elif repo:
1579 elif repo:
1580 cl = repo.changelog
1580 cl = repo.changelog
1581 tags = opts.get('tags')
1581 tags = opts.get('tags')
1582 branches = opts.get('branches')
1582 branches = opts.get('branches')
1583 if tags:
1583 if tags:
1584 labels = {}
1584 labels = {}
1585 for l, n in repo.tags().items():
1585 for l, n in repo.tags().items():
1586 labels.setdefault(cl.rev(n), []).append(l)
1586 labels.setdefault(cl.rev(n), []).append(l)
1587 def events():
1587 def events():
1588 b = "default"
1588 b = "default"
1589 for r in cl:
1589 for r in cl:
1590 if branches:
1590 if branches:
1591 newb = cl.read(cl.node(r))[5]['branch']
1591 newb = cl.read(cl.node(r))[5]['branch']
1592 if newb != b:
1592 if newb != b:
1593 yield 'a', newb
1593 yield 'a', newb
1594 b = newb
1594 b = newb
1595 yield 'n', (r, list(set(p for p in cl.parentrevs(r) if p != -1)))
1595 yield 'n', (r, list(set(p for p in cl.parentrevs(r) if p != -1)))
1596 if tags:
1596 if tags:
1597 ls = labels.get(r)
1597 ls = labels.get(r)
1598 if ls:
1598 if ls:
1599 for l in ls:
1599 for l in ls:
1600 yield 'l', (r, l)
1600 yield 'l', (r, l)
1601 else:
1601 else:
1602 raise util.Abort(_('need repo for changelog dag'))
1602 raise util.Abort(_('need repo for changelog dag'))
1603
1603
1604 for line in dagparser.dagtextlines(events(),
1604 for line in dagparser.dagtextlines(events(),
1605 addspaces=spaces,
1605 addspaces=spaces,
1606 wraplabels=True,
1606 wraplabels=True,
1607 wrapannotations=True,
1607 wrapannotations=True,
1608 wrapnonlinear=dots,
1608 wrapnonlinear=dots,
1609 usedots=dots,
1609 usedots=dots,
1610 maxlinewidth=70):
1610 maxlinewidth=70):
1611 ui.write(line)
1611 ui.write(line)
1612 ui.write("\n")
1612 ui.write("\n")
1613
1613
1614 @command('debugdata',
1614 @command('debugdata',
1615 [('c', 'changelog', False, _('open changelog')),
1615 [('c', 'changelog', False, _('open changelog')),
1616 ('m', 'manifest', False, _('open manifest'))],
1616 ('m', 'manifest', False, _('open manifest'))],
1617 _('-c|-m|FILE REV'))
1617 _('-c|-m|FILE REV'))
1618 def debugdata(ui, repo, file_, rev = None, **opts):
1618 def debugdata(ui, repo, file_, rev = None, **opts):
1619 """dump the contents of a data file revision"""
1619 """dump the contents of a data file revision"""
1620 if opts.get('changelog') or opts.get('manifest'):
1620 if opts.get('changelog') or opts.get('manifest'):
1621 file_, rev = None, file_
1621 file_, rev = None, file_
1622 elif rev is None:
1622 elif rev is None:
1623 raise error.CommandError('debugdata', _('invalid arguments'))
1623 raise error.CommandError('debugdata', _('invalid arguments'))
1624 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
1624 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
1625 try:
1625 try:
1626 ui.write(r.revision(r.lookup(rev)))
1626 ui.write(r.revision(r.lookup(rev)))
1627 except KeyError:
1627 except KeyError:
1628 raise util.Abort(_('invalid revision identifier %s') % rev)
1628 raise util.Abort(_('invalid revision identifier %s') % rev)
1629
1629
1630 @command('debugdate',
1630 @command('debugdate',
1631 [('e', 'extended', None, _('try extended date formats'))],
1631 [('e', 'extended', None, _('try extended date formats'))],
1632 _('[-e] DATE [RANGE]'))
1632 _('[-e] DATE [RANGE]'))
1633 def debugdate(ui, date, range=None, **opts):
1633 def debugdate(ui, date, range=None, **opts):
1634 """parse and display a date"""
1634 """parse and display a date"""
1635 if opts["extended"]:
1635 if opts["extended"]:
1636 d = util.parsedate(date, util.extendeddateformats)
1636 d = util.parsedate(date, util.extendeddateformats)
1637 else:
1637 else:
1638 d = util.parsedate(date)
1638 d = util.parsedate(date)
1639 ui.write("internal: %s %s\n" % d)
1639 ui.write("internal: %s %s\n" % d)
1640 ui.write("standard: %s\n" % util.datestr(d))
1640 ui.write("standard: %s\n" % util.datestr(d))
1641 if range:
1641 if range:
1642 m = util.matchdate(range)
1642 m = util.matchdate(range)
1643 ui.write("match: %s\n" % m(d[0]))
1643 ui.write("match: %s\n" % m(d[0]))
1644
1644
1645 @command('debugdiscovery',
1645 @command('debugdiscovery',
1646 [('', 'old', None, _('use old-style discovery')),
1646 [('', 'old', None, _('use old-style discovery')),
1647 ('', 'nonheads', None,
1647 ('', 'nonheads', None,
1648 _('use old-style discovery with non-heads included')),
1648 _('use old-style discovery with non-heads included')),
1649 ] + remoteopts,
1649 ] + remoteopts,
1650 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
1650 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
1651 def debugdiscovery(ui, repo, remoteurl="default", **opts):
1651 def debugdiscovery(ui, repo, remoteurl="default", **opts):
1652 """runs the changeset discovery protocol in isolation"""
1652 """runs the changeset discovery protocol in isolation"""
1653 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl), opts.get('branch'))
1653 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl), opts.get('branch'))
1654 remote = hg.peer(repo, opts, remoteurl)
1654 remote = hg.peer(repo, opts, remoteurl)
1655 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
1655 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
1656
1656
1657 # make sure tests are repeatable
1657 # make sure tests are repeatable
1658 random.seed(12323)
1658 random.seed(12323)
1659
1659
1660 def doit(localheads, remoteheads):
1660 def doit(localheads, remoteheads):
1661 if opts.get('old'):
1661 if opts.get('old'):
1662 if localheads:
1662 if localheads:
1663 raise util.Abort('cannot use localheads with old style discovery')
1663 raise util.Abort('cannot use localheads with old style discovery')
1664 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
1664 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
1665 force=True)
1665 force=True)
1666 common = set(common)
1666 common = set(common)
1667 if not opts.get('nonheads'):
1667 if not opts.get('nonheads'):
1668 ui.write("unpruned common: %s\n" % " ".join([short(n)
1668 ui.write("unpruned common: %s\n" % " ".join([short(n)
1669 for n in common]))
1669 for n in common]))
1670 dag = dagutil.revlogdag(repo.changelog)
1670 dag = dagutil.revlogdag(repo.changelog)
1671 all = dag.ancestorset(dag.internalizeall(common))
1671 all = dag.ancestorset(dag.internalizeall(common))
1672 common = dag.externalizeall(dag.headsetofconnecteds(all))
1672 common = dag.externalizeall(dag.headsetofconnecteds(all))
1673 else:
1673 else:
1674 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
1674 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
1675 common = set(common)
1675 common = set(common)
1676 rheads = set(hds)
1676 rheads = set(hds)
1677 lheads = set(repo.heads())
1677 lheads = set(repo.heads())
1678 ui.write("common heads: %s\n" % " ".join([short(n) for n in common]))
1678 ui.write("common heads: %s\n" % " ".join([short(n) for n in common]))
1679 if lheads <= common:
1679 if lheads <= common:
1680 ui.write("local is subset\n")
1680 ui.write("local is subset\n")
1681 elif rheads <= common:
1681 elif rheads <= common:
1682 ui.write("remote is subset\n")
1682 ui.write("remote is subset\n")
1683
1683
1684 serverlogs = opts.get('serverlog')
1684 serverlogs = opts.get('serverlog')
1685 if serverlogs:
1685 if serverlogs:
1686 for filename in serverlogs:
1686 for filename in serverlogs:
1687 logfile = open(filename, 'r')
1687 logfile = open(filename, 'r')
1688 try:
1688 try:
1689 line = logfile.readline()
1689 line = logfile.readline()
1690 while line:
1690 while line:
1691 parts = line.strip().split(';')
1691 parts = line.strip().split(';')
1692 op = parts[1]
1692 op = parts[1]
1693 if op == 'cg':
1693 if op == 'cg':
1694 pass
1694 pass
1695 elif op == 'cgss':
1695 elif op == 'cgss':
1696 doit(parts[2].split(' '), parts[3].split(' '))
1696 doit(parts[2].split(' '), parts[3].split(' '))
1697 elif op == 'unb':
1697 elif op == 'unb':
1698 doit(parts[3].split(' '), parts[2].split(' '))
1698 doit(parts[3].split(' '), parts[2].split(' '))
1699 line = logfile.readline()
1699 line = logfile.readline()
1700 finally:
1700 finally:
1701 logfile.close()
1701 logfile.close()
1702
1702
1703 else:
1703 else:
1704 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
1704 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
1705 opts.get('remote_head'))
1705 opts.get('remote_head'))
1706 localrevs = opts.get('local_head')
1706 localrevs = opts.get('local_head')
1707 doit(localrevs, remoterevs)
1707 doit(localrevs, remoterevs)
1708
1708
1709 @command('debugfileset', [], ('REVSPEC'))
1709 @command('debugfileset', [], ('REVSPEC'))
1710 def debugfileset(ui, repo, expr):
1710 def debugfileset(ui, repo, expr):
1711 '''parse and apply a fileset specification'''
1711 '''parse and apply a fileset specification'''
1712 if ui.verbose:
1712 if ui.verbose:
1713 tree = fileset.parse(expr)[0]
1713 tree = fileset.parse(expr)[0]
1714 ui.note(tree, "\n")
1714 ui.note(tree, "\n")
1715
1715
1716 for f in fileset.getfileset(repo[None], expr):
1716 for f in fileset.getfileset(repo[None], expr):
1717 ui.write("%s\n" % f)
1717 ui.write("%s\n" % f)
1718
1718
1719 @command('debugfsinfo', [], _('[PATH]'))
1719 @command('debugfsinfo', [], _('[PATH]'))
1720 def debugfsinfo(ui, path = "."):
1720 def debugfsinfo(ui, path = "."):
1721 """show information detected about current filesystem"""
1721 """show information detected about current filesystem"""
1722 util.writefile('.debugfsinfo', '')
1722 util.writefile('.debugfsinfo', '')
1723 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
1723 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
1724 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
1724 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
1725 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
1725 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
1726 and 'yes' or 'no'))
1726 and 'yes' or 'no'))
1727 os.unlink('.debugfsinfo')
1727 os.unlink('.debugfsinfo')
1728
1728
1729 @command('debuggetbundle',
1729 @command('debuggetbundle',
1730 [('H', 'head', [], _('id of head node'), _('ID')),
1730 [('H', 'head', [], _('id of head node'), _('ID')),
1731 ('C', 'common', [], _('id of common node'), _('ID')),
1731 ('C', 'common', [], _('id of common node'), _('ID')),
1732 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
1732 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
1733 _('REPO FILE [-H|-C ID]...'))
1733 _('REPO FILE [-H|-C ID]...'))
1734 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
1734 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
1735 """retrieves a bundle from a repo
1735 """retrieves a bundle from a repo
1736
1736
1737 Every ID must be a full-length hex node id string. Saves the bundle to the
1737 Every ID must be a full-length hex node id string. Saves the bundle to the
1738 given file.
1738 given file.
1739 """
1739 """
1740 repo = hg.peer(ui, opts, repopath)
1740 repo = hg.peer(ui, opts, repopath)
1741 if not repo.capable('getbundle'):
1741 if not repo.capable('getbundle'):
1742 raise util.Abort("getbundle() not supported by target repository")
1742 raise util.Abort("getbundle() not supported by target repository")
1743 args = {}
1743 args = {}
1744 if common:
1744 if common:
1745 args['common'] = [bin(s) for s in common]
1745 args['common'] = [bin(s) for s in common]
1746 if head:
1746 if head:
1747 args['heads'] = [bin(s) for s in head]
1747 args['heads'] = [bin(s) for s in head]
1748 bundle = repo.getbundle('debug', **args)
1748 bundle = repo.getbundle('debug', **args)
1749
1749
1750 bundletype = opts.get('type', 'bzip2').lower()
1750 bundletype = opts.get('type', 'bzip2').lower()
1751 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1751 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1752 bundletype = btypes.get(bundletype)
1752 bundletype = btypes.get(bundletype)
1753 if bundletype not in changegroup.bundletypes:
1753 if bundletype not in changegroup.bundletypes:
1754 raise util.Abort(_('unknown bundle type specified with --type'))
1754 raise util.Abort(_('unknown bundle type specified with --type'))
1755 changegroup.writebundle(bundle, bundlepath, bundletype)
1755 changegroup.writebundle(bundle, bundlepath, bundletype)
1756
1756
1757 @command('debugignore', [], '')
1757 @command('debugignore', [], '')
1758 def debugignore(ui, repo, *values, **opts):
1758 def debugignore(ui, repo, *values, **opts):
1759 """display the combined ignore pattern"""
1759 """display the combined ignore pattern"""
1760 ignore = repo.dirstate._ignore
1760 ignore = repo.dirstate._ignore
1761 includepat = getattr(ignore, 'includepat', None)
1761 includepat = getattr(ignore, 'includepat', None)
1762 if includepat is not None:
1762 if includepat is not None:
1763 ui.write("%s\n" % includepat)
1763 ui.write("%s\n" % includepat)
1764 else:
1764 else:
1765 raise util.Abort(_("no ignore patterns found"))
1765 raise util.Abort(_("no ignore patterns found"))
1766
1766
1767 @command('debugindex',
1767 @command('debugindex',
1768 [('c', 'changelog', False, _('open changelog')),
1768 [('c', 'changelog', False, _('open changelog')),
1769 ('m', 'manifest', False, _('open manifest')),
1769 ('m', 'manifest', False, _('open manifest')),
1770 ('f', 'format', 0, _('revlog format'), _('FORMAT'))],
1770 ('f', 'format', 0, _('revlog format'), _('FORMAT'))],
1771 _('[-f FORMAT] -c|-m|FILE'))
1771 _('[-f FORMAT] -c|-m|FILE'))
1772 def debugindex(ui, repo, file_ = None, **opts):
1772 def debugindex(ui, repo, file_ = None, **opts):
1773 """dump the contents of an index file"""
1773 """dump the contents of an index file"""
1774 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
1774 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
1775 format = opts.get('format', 0)
1775 format = opts.get('format', 0)
1776 if format not in (0, 1):
1776 if format not in (0, 1):
1777 raise util.Abort(_("unknown format %d") % format)
1777 raise util.Abort(_("unknown format %d") % format)
1778
1778
1779 generaldelta = r.version & revlog.REVLOGGENERALDELTA
1779 generaldelta = r.version & revlog.REVLOGGENERALDELTA
1780 if generaldelta:
1780 if generaldelta:
1781 basehdr = ' delta'
1781 basehdr = ' delta'
1782 else:
1782 else:
1783 basehdr = ' base'
1783 basehdr = ' base'
1784
1784
1785 if format == 0:
1785 if format == 0:
1786 ui.write(" rev offset length " + basehdr + " linkrev"
1786 ui.write(" rev offset length " + basehdr + " linkrev"
1787 " nodeid p1 p2\n")
1787 " nodeid p1 p2\n")
1788 elif format == 1:
1788 elif format == 1:
1789 ui.write(" rev flag offset length"
1789 ui.write(" rev flag offset length"
1790 " size " + basehdr + " link p1 p2 nodeid\n")
1790 " size " + basehdr + " link p1 p2 nodeid\n")
1791
1791
1792 for i in r:
1792 for i in r:
1793 node = r.node(i)
1793 node = r.node(i)
1794 if generaldelta:
1794 if generaldelta:
1795 base = r.deltaparent(i)
1795 base = r.deltaparent(i)
1796 else:
1796 else:
1797 base = r.chainbase(i)
1797 base = r.chainbase(i)
1798 if format == 0:
1798 if format == 0:
1799 try:
1799 try:
1800 pp = r.parents(node)
1800 pp = r.parents(node)
1801 except:
1801 except:
1802 pp = [nullid, nullid]
1802 pp = [nullid, nullid]
1803 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1803 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1804 i, r.start(i), r.length(i), base, r.linkrev(i),
1804 i, r.start(i), r.length(i), base, r.linkrev(i),
1805 short(node), short(pp[0]), short(pp[1])))
1805 short(node), short(pp[0]), short(pp[1])))
1806 elif format == 1:
1806 elif format == 1:
1807 pr = r.parentrevs(i)
1807 pr = r.parentrevs(i)
1808 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
1808 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
1809 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
1809 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
1810 base, r.linkrev(i), pr[0], pr[1], short(node)))
1810 base, r.linkrev(i), pr[0], pr[1], short(node)))
1811
1811
1812 @command('debugindexdot', [], _('FILE'))
1812 @command('debugindexdot', [], _('FILE'))
1813 def debugindexdot(ui, repo, file_):
1813 def debugindexdot(ui, repo, file_):
1814 """dump an index DAG as a graphviz dot file"""
1814 """dump an index DAG as a graphviz dot file"""
1815 r = None
1815 r = None
1816 if repo:
1816 if repo:
1817 filelog = repo.file(file_)
1817 filelog = repo.file(file_)
1818 if len(filelog):
1818 if len(filelog):
1819 r = filelog
1819 r = filelog
1820 if not r:
1820 if not r:
1821 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1821 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1822 ui.write("digraph G {\n")
1822 ui.write("digraph G {\n")
1823 for i in r:
1823 for i in r:
1824 node = r.node(i)
1824 node = r.node(i)
1825 pp = r.parents(node)
1825 pp = r.parents(node)
1826 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1826 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1827 if pp[1] != nullid:
1827 if pp[1] != nullid:
1828 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1828 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1829 ui.write("}\n")
1829 ui.write("}\n")
1830
1830
1831 @command('debuginstall', [], '')
1831 @command('debuginstall', [], '')
1832 def debuginstall(ui):
1832 def debuginstall(ui):
1833 '''test Mercurial installation
1833 '''test Mercurial installation
1834
1834
1835 Returns 0 on success.
1835 Returns 0 on success.
1836 '''
1836 '''
1837
1837
1838 def writetemp(contents):
1838 def writetemp(contents):
1839 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1839 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1840 f = os.fdopen(fd, "wb")
1840 f = os.fdopen(fd, "wb")
1841 f.write(contents)
1841 f.write(contents)
1842 f.close()
1842 f.close()
1843 return name
1843 return name
1844
1844
1845 problems = 0
1845 problems = 0
1846
1846
1847 # encoding
1847 # encoding
1848 ui.status(_("Checking encoding (%s)...\n") % encoding.encoding)
1848 ui.status(_("Checking encoding (%s)...\n") % encoding.encoding)
1849 try:
1849 try:
1850 encoding.fromlocal("test")
1850 encoding.fromlocal("test")
1851 except util.Abort, inst:
1851 except util.Abort, inst:
1852 ui.write(" %s\n" % inst)
1852 ui.write(" %s\n" % inst)
1853 ui.write(_(" (check that your locale is properly set)\n"))
1853 ui.write(_(" (check that your locale is properly set)\n"))
1854 problems += 1
1854 problems += 1
1855
1855
1856 # compiled modules
1856 # compiled modules
1857 ui.status(_("Checking installed modules (%s)...\n")
1857 ui.status(_("Checking installed modules (%s)...\n")
1858 % os.path.dirname(__file__))
1858 % os.path.dirname(__file__))
1859 try:
1859 try:
1860 import bdiff, mpatch, base85, osutil
1860 import bdiff, mpatch, base85, osutil
1861 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
1861 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
1862 except Exception, inst:
1862 except Exception, inst:
1863 ui.write(" %s\n" % inst)
1863 ui.write(" %s\n" % inst)
1864 ui.write(_(" One or more extensions could not be found"))
1864 ui.write(_(" One or more extensions could not be found"))
1865 ui.write(_(" (check that you compiled the extensions)\n"))
1865 ui.write(_(" (check that you compiled the extensions)\n"))
1866 problems += 1
1866 problems += 1
1867
1867
1868 # templates
1868 # templates
1869 import templater
1869 import templater
1870 p = templater.templatepath()
1870 p = templater.templatepath()
1871 ui.status(_("Checking templates (%s)...\n") % ' '.join(p))
1871 ui.status(_("Checking templates (%s)...\n") % ' '.join(p))
1872 try:
1872 try:
1873 templater.templater(templater.templatepath("map-cmdline.default"))
1873 templater.templater(templater.templatepath("map-cmdline.default"))
1874 except Exception, inst:
1874 except Exception, inst:
1875 ui.write(" %s\n" % inst)
1875 ui.write(" %s\n" % inst)
1876 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
1876 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
1877 problems += 1
1877 problems += 1
1878
1878
1879 # editor
1879 # editor
1880 ui.status(_("Checking commit editor...\n"))
1880 ui.status(_("Checking commit editor...\n"))
1881 editor = ui.geteditor()
1881 editor = ui.geteditor()
1882 cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
1882 cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
1883 if not cmdpath:
1883 if not cmdpath:
1884 if editor == 'vi':
1884 if editor == 'vi':
1885 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
1885 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
1886 ui.write(_(" (specify a commit editor in your configuration"
1886 ui.write(_(" (specify a commit editor in your configuration"
1887 " file)\n"))
1887 " file)\n"))
1888 else:
1888 else:
1889 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
1889 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
1890 ui.write(_(" (specify a commit editor in your configuration"
1890 ui.write(_(" (specify a commit editor in your configuration"
1891 " file)\n"))
1891 " file)\n"))
1892 problems += 1
1892 problems += 1
1893
1893
1894 # check username
1894 # check username
1895 ui.status(_("Checking username...\n"))
1895 ui.status(_("Checking username...\n"))
1896 try:
1896 try:
1897 ui.username()
1897 ui.username()
1898 except util.Abort, e:
1898 except util.Abort, e:
1899 ui.write(" %s\n" % e)
1899 ui.write(" %s\n" % e)
1900 ui.write(_(" (specify a username in your configuration file)\n"))
1900 ui.write(_(" (specify a username in your configuration file)\n"))
1901 problems += 1
1901 problems += 1
1902
1902
1903 if not problems:
1903 if not problems:
1904 ui.status(_("No problems detected\n"))
1904 ui.status(_("No problems detected\n"))
1905 else:
1905 else:
1906 ui.write(_("%s problems detected,"
1906 ui.write(_("%s problems detected,"
1907 " please check your install!\n") % problems)
1907 " please check your install!\n") % problems)
1908
1908
1909 return problems
1909 return problems
1910
1910
1911 @command('debugknown', [], _('REPO ID...'))
1911 @command('debugknown', [], _('REPO ID...'))
1912 def debugknown(ui, repopath, *ids, **opts):
1912 def debugknown(ui, repopath, *ids, **opts):
1913 """test whether node ids are known to a repo
1913 """test whether node ids are known to a repo
1914
1914
1915 Every ID must be a full-length hex node id string. Returns a list of 0s and 1s
1915 Every ID must be a full-length hex node id string. Returns a list of 0s and 1s
1916 indicating unknown/known.
1916 indicating unknown/known.
1917 """
1917 """
1918 repo = hg.peer(ui, opts, repopath)
1918 repo = hg.peer(ui, opts, repopath)
1919 if not repo.capable('known'):
1919 if not repo.capable('known'):
1920 raise util.Abort("known() not supported by target repository")
1920 raise util.Abort("known() not supported by target repository")
1921 flags = repo.known([bin(s) for s in ids])
1921 flags = repo.known([bin(s) for s in ids])
1922 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
1922 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
1923
1923
1924 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'))
1924 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'))
1925 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
1925 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
1926 '''access the pushkey key/value protocol
1926 '''access the pushkey key/value protocol
1927
1927
1928 With two args, list the keys in the given namespace.
1928 With two args, list the keys in the given namespace.
1929
1929
1930 With five args, set a key to new if it currently is set to old.
1930 With five args, set a key to new if it currently is set to old.
1931 Reports success or failure.
1931 Reports success or failure.
1932 '''
1932 '''
1933
1933
1934 target = hg.peer(ui, {}, repopath)
1934 target = hg.peer(ui, {}, repopath)
1935 if keyinfo:
1935 if keyinfo:
1936 key, old, new = keyinfo
1936 key, old, new = keyinfo
1937 r = target.pushkey(namespace, key, old, new)
1937 r = target.pushkey(namespace, key, old, new)
1938 ui.status(str(r) + '\n')
1938 ui.status(str(r) + '\n')
1939 return not r
1939 return not r
1940 else:
1940 else:
1941 for k, v in target.listkeys(namespace).iteritems():
1941 for k, v in target.listkeys(namespace).iteritems():
1942 ui.write("%s\t%s\n" % (k.encode('string-escape'),
1942 ui.write("%s\t%s\n" % (k.encode('string-escape'),
1943 v.encode('string-escape')))
1943 v.encode('string-escape')))
1944
1944
1945 @command('debugrebuildstate',
1945 @command('debugrebuildstate',
1946 [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
1946 [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
1947 _('[-r REV] [REV]'))
1947 _('[-r REV] [REV]'))
1948 def debugrebuildstate(ui, repo, rev="tip"):
1948 def debugrebuildstate(ui, repo, rev="tip"):
1949 """rebuild the dirstate as it would look like for the given revision"""
1949 """rebuild the dirstate as it would look like for the given revision"""
1950 ctx = scmutil.revsingle(repo, rev)
1950 ctx = scmutil.revsingle(repo, rev)
1951 wlock = repo.wlock()
1951 wlock = repo.wlock()
1952 try:
1952 try:
1953 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
1953 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
1954 finally:
1954 finally:
1955 wlock.release()
1955 wlock.release()
1956
1956
1957 @command('debugrename',
1957 @command('debugrename',
1958 [('r', 'rev', '', _('revision to debug'), _('REV'))],
1958 [('r', 'rev', '', _('revision to debug'), _('REV'))],
1959 _('[-r REV] FILE'))
1959 _('[-r REV] FILE'))
1960 def debugrename(ui, repo, file1, *pats, **opts):
1960 def debugrename(ui, repo, file1, *pats, **opts):
1961 """dump rename information"""
1961 """dump rename information"""
1962
1962
1963 ctx = scmutil.revsingle(repo, opts.get('rev'))
1963 ctx = scmutil.revsingle(repo, opts.get('rev'))
1964 m = scmutil.match(ctx, (file1,) + pats, opts)
1964 m = scmutil.match(ctx, (file1,) + pats, opts)
1965 for abs in ctx.walk(m):
1965 for abs in ctx.walk(m):
1966 fctx = ctx[abs]
1966 fctx = ctx[abs]
1967 o = fctx.filelog().renamed(fctx.filenode())
1967 o = fctx.filelog().renamed(fctx.filenode())
1968 rel = m.rel(abs)
1968 rel = m.rel(abs)
1969 if o:
1969 if o:
1970 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
1970 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
1971 else:
1971 else:
1972 ui.write(_("%s not renamed\n") % rel)
1972 ui.write(_("%s not renamed\n") % rel)
1973
1973
1974 @command('debugrevlog',
1974 @command('debugrevlog',
1975 [('c', 'changelog', False, _('open changelog')),
1975 [('c', 'changelog', False, _('open changelog')),
1976 ('m', 'manifest', False, _('open manifest')),
1976 ('m', 'manifest', False, _('open manifest')),
1977 ('d', 'dump', False, _('dump index data'))],
1977 ('d', 'dump', False, _('dump index data'))],
1978 _('-c|-m|FILE'))
1978 _('-c|-m|FILE'))
1979 def debugrevlog(ui, repo, file_ = None, **opts):
1979 def debugrevlog(ui, repo, file_ = None, **opts):
1980 """show data and statistics about a revlog"""
1980 """show data and statistics about a revlog"""
1981 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
1981 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
1982
1982
1983 if opts.get("dump"):
1983 if opts.get("dump"):
1984 numrevs = len(r)
1984 numrevs = len(r)
1985 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
1985 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
1986 " rawsize totalsize compression heads\n")
1986 " rawsize totalsize compression heads\n")
1987 ts = 0
1987 ts = 0
1988 heads = set()
1988 heads = set()
1989 for rev in xrange(numrevs):
1989 for rev in xrange(numrevs):
1990 dbase = r.deltaparent(rev)
1990 dbase = r.deltaparent(rev)
1991 if dbase == -1:
1991 if dbase == -1:
1992 dbase = rev
1992 dbase = rev
1993 cbase = r.chainbase(rev)
1993 cbase = r.chainbase(rev)
1994 p1, p2 = r.parentrevs(rev)
1994 p1, p2 = r.parentrevs(rev)
1995 rs = r.rawsize(rev)
1995 rs = r.rawsize(rev)
1996 ts = ts + rs
1996 ts = ts + rs
1997 heads -= set(r.parentrevs(rev))
1997 heads -= set(r.parentrevs(rev))
1998 heads.add(rev)
1998 heads.add(rev)
1999 ui.write("%d %d %d %d %d %d %d %d %d %d %d %d %d\n" %
1999 ui.write("%d %d %d %d %d %d %d %d %d %d %d %d %d\n" %
2000 (rev, p1, p2, r.start(rev), r.end(rev),
2000 (rev, p1, p2, r.start(rev), r.end(rev),
2001 r.start(dbase), r.start(cbase),
2001 r.start(dbase), r.start(cbase),
2002 r.start(p1), r.start(p2),
2002 r.start(p1), r.start(p2),
2003 rs, ts, ts / r.end(rev), len(heads)))
2003 rs, ts, ts / r.end(rev), len(heads)))
2004 return 0
2004 return 0
2005
2005
2006 v = r.version
2006 v = r.version
2007 format = v & 0xFFFF
2007 format = v & 0xFFFF
2008 flags = []
2008 flags = []
2009 gdelta = False
2009 gdelta = False
2010 if v & revlog.REVLOGNGINLINEDATA:
2010 if v & revlog.REVLOGNGINLINEDATA:
2011 flags.append('inline')
2011 flags.append('inline')
2012 if v & revlog.REVLOGGENERALDELTA:
2012 if v & revlog.REVLOGGENERALDELTA:
2013 gdelta = True
2013 gdelta = True
2014 flags.append('generaldelta')
2014 flags.append('generaldelta')
2015 if not flags:
2015 if not flags:
2016 flags = ['(none)']
2016 flags = ['(none)']
2017
2017
2018 nummerges = 0
2018 nummerges = 0
2019 numfull = 0
2019 numfull = 0
2020 numprev = 0
2020 numprev = 0
2021 nump1 = 0
2021 nump1 = 0
2022 nump2 = 0
2022 nump2 = 0
2023 numother = 0
2023 numother = 0
2024 nump1prev = 0
2024 nump1prev = 0
2025 nump2prev = 0
2025 nump2prev = 0
2026 chainlengths = []
2026 chainlengths = []
2027
2027
2028 datasize = [None, 0, 0L]
2028 datasize = [None, 0, 0L]
2029 fullsize = [None, 0, 0L]
2029 fullsize = [None, 0, 0L]
2030 deltasize = [None, 0, 0L]
2030 deltasize = [None, 0, 0L]
2031
2031
2032 def addsize(size, l):
2032 def addsize(size, l):
2033 if l[0] is None or size < l[0]:
2033 if l[0] is None or size < l[0]:
2034 l[0] = size
2034 l[0] = size
2035 if size > l[1]:
2035 if size > l[1]:
2036 l[1] = size
2036 l[1] = size
2037 l[2] += size
2037 l[2] += size
2038
2038
2039 numrevs = len(r)
2039 numrevs = len(r)
2040 for rev in xrange(numrevs):
2040 for rev in xrange(numrevs):
2041 p1, p2 = r.parentrevs(rev)
2041 p1, p2 = r.parentrevs(rev)
2042 delta = r.deltaparent(rev)
2042 delta = r.deltaparent(rev)
2043 if format > 0:
2043 if format > 0:
2044 addsize(r.rawsize(rev), datasize)
2044 addsize(r.rawsize(rev), datasize)
2045 if p2 != nullrev:
2045 if p2 != nullrev:
2046 nummerges += 1
2046 nummerges += 1
2047 size = r.length(rev)
2047 size = r.length(rev)
2048 if delta == nullrev:
2048 if delta == nullrev:
2049 chainlengths.append(0)
2049 chainlengths.append(0)
2050 numfull += 1
2050 numfull += 1
2051 addsize(size, fullsize)
2051 addsize(size, fullsize)
2052 else:
2052 else:
2053 chainlengths.append(chainlengths[delta] + 1)
2053 chainlengths.append(chainlengths[delta] + 1)
2054 addsize(size, deltasize)
2054 addsize(size, deltasize)
2055 if delta == rev - 1:
2055 if delta == rev - 1:
2056 numprev += 1
2056 numprev += 1
2057 if delta == p1:
2057 if delta == p1:
2058 nump1prev += 1
2058 nump1prev += 1
2059 elif delta == p2:
2059 elif delta == p2:
2060 nump2prev += 1
2060 nump2prev += 1
2061 elif delta == p1:
2061 elif delta == p1:
2062 nump1 += 1
2062 nump1 += 1
2063 elif delta == p2:
2063 elif delta == p2:
2064 nump2 += 1
2064 nump2 += 1
2065 elif delta != nullrev:
2065 elif delta != nullrev:
2066 numother += 1
2066 numother += 1
2067
2067
2068 numdeltas = numrevs - numfull
2068 numdeltas = numrevs - numfull
2069 numoprev = numprev - nump1prev - nump2prev
2069 numoprev = numprev - nump1prev - nump2prev
2070 totalrawsize = datasize[2]
2070 totalrawsize = datasize[2]
2071 datasize[2] /= numrevs
2071 datasize[2] /= numrevs
2072 fulltotal = fullsize[2]
2072 fulltotal = fullsize[2]
2073 fullsize[2] /= numfull
2073 fullsize[2] /= numfull
2074 deltatotal = deltasize[2]
2074 deltatotal = deltasize[2]
2075 deltasize[2] /= numrevs - numfull
2075 deltasize[2] /= numrevs - numfull
2076 totalsize = fulltotal + deltatotal
2076 totalsize = fulltotal + deltatotal
2077 avgchainlen = sum(chainlengths) / numrevs
2077 avgchainlen = sum(chainlengths) / numrevs
2078 compratio = totalrawsize / totalsize
2078 compratio = totalrawsize / totalsize
2079
2079
2080 basedfmtstr = '%%%dd\n'
2080 basedfmtstr = '%%%dd\n'
2081 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2081 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2082
2082
2083 def dfmtstr(max):
2083 def dfmtstr(max):
2084 return basedfmtstr % len(str(max))
2084 return basedfmtstr % len(str(max))
2085 def pcfmtstr(max, padding=0):
2085 def pcfmtstr(max, padding=0):
2086 return basepcfmtstr % (len(str(max)), ' ' * padding)
2086 return basepcfmtstr % (len(str(max)), ' ' * padding)
2087
2087
2088 def pcfmt(value, total):
2088 def pcfmt(value, total):
2089 return (value, 100 * float(value) / total)
2089 return (value, 100 * float(value) / total)
2090
2090
2091 ui.write('format : %d\n' % format)
2091 ui.write('format : %d\n' % format)
2092 ui.write('flags : %s\n' % ', '.join(flags))
2092 ui.write('flags : %s\n' % ', '.join(flags))
2093
2093
2094 ui.write('\n')
2094 ui.write('\n')
2095 fmt = pcfmtstr(totalsize)
2095 fmt = pcfmtstr(totalsize)
2096 fmt2 = dfmtstr(totalsize)
2096 fmt2 = dfmtstr(totalsize)
2097 ui.write('revisions : ' + fmt2 % numrevs)
2097 ui.write('revisions : ' + fmt2 % numrevs)
2098 ui.write(' merges : ' + fmt % pcfmt(nummerges, numrevs))
2098 ui.write(' merges : ' + fmt % pcfmt(nummerges, numrevs))
2099 ui.write(' normal : ' + fmt % pcfmt(numrevs - nummerges, numrevs))
2099 ui.write(' normal : ' + fmt % pcfmt(numrevs - nummerges, numrevs))
2100 ui.write('revisions : ' + fmt2 % numrevs)
2100 ui.write('revisions : ' + fmt2 % numrevs)
2101 ui.write(' full : ' + fmt % pcfmt(numfull, numrevs))
2101 ui.write(' full : ' + fmt % pcfmt(numfull, numrevs))
2102 ui.write(' deltas : ' + fmt % pcfmt(numdeltas, numrevs))
2102 ui.write(' deltas : ' + fmt % pcfmt(numdeltas, numrevs))
2103 ui.write('revision size : ' + fmt2 % totalsize)
2103 ui.write('revision size : ' + fmt2 % totalsize)
2104 ui.write(' full : ' + fmt % pcfmt(fulltotal, totalsize))
2104 ui.write(' full : ' + fmt % pcfmt(fulltotal, totalsize))
2105 ui.write(' deltas : ' + fmt % pcfmt(deltatotal, totalsize))
2105 ui.write(' deltas : ' + fmt % pcfmt(deltatotal, totalsize))
2106
2106
2107 ui.write('\n')
2107 ui.write('\n')
2108 fmt = dfmtstr(max(avgchainlen, compratio))
2108 fmt = dfmtstr(max(avgchainlen, compratio))
2109 ui.write('avg chain length : ' + fmt % avgchainlen)
2109 ui.write('avg chain length : ' + fmt % avgchainlen)
2110 ui.write('compression ratio : ' + fmt % compratio)
2110 ui.write('compression ratio : ' + fmt % compratio)
2111
2111
2112 if format > 0:
2112 if format > 0:
2113 ui.write('\n')
2113 ui.write('\n')
2114 ui.write('uncompressed data size (min/max/avg) : %d / %d / %d\n'
2114 ui.write('uncompressed data size (min/max/avg) : %d / %d / %d\n'
2115 % tuple(datasize))
2115 % tuple(datasize))
2116 ui.write('full revision size (min/max/avg) : %d / %d / %d\n'
2116 ui.write('full revision size (min/max/avg) : %d / %d / %d\n'
2117 % tuple(fullsize))
2117 % tuple(fullsize))
2118 ui.write('delta size (min/max/avg) : %d / %d / %d\n'
2118 ui.write('delta size (min/max/avg) : %d / %d / %d\n'
2119 % tuple(deltasize))
2119 % tuple(deltasize))
2120
2120
2121 if numdeltas > 0:
2121 if numdeltas > 0:
2122 ui.write('\n')
2122 ui.write('\n')
2123 fmt = pcfmtstr(numdeltas)
2123 fmt = pcfmtstr(numdeltas)
2124 fmt2 = pcfmtstr(numdeltas, 4)
2124 fmt2 = pcfmtstr(numdeltas, 4)
2125 ui.write('deltas against prev : ' + fmt % pcfmt(numprev, numdeltas))
2125 ui.write('deltas against prev : ' + fmt % pcfmt(numprev, numdeltas))
2126 if numprev > 0:
2126 if numprev > 0:
2127 ui.write(' where prev = p1 : ' + fmt2 % pcfmt(nump1prev, numprev))
2127 ui.write(' where prev = p1 : ' + fmt2 % pcfmt(nump1prev, numprev))
2128 ui.write(' where prev = p2 : ' + fmt2 % pcfmt(nump2prev, numprev))
2128 ui.write(' where prev = p2 : ' + fmt2 % pcfmt(nump2prev, numprev))
2129 ui.write(' other : ' + fmt2 % pcfmt(numoprev, numprev))
2129 ui.write(' other : ' + fmt2 % pcfmt(numoprev, numprev))
2130 if gdelta:
2130 if gdelta:
2131 ui.write('deltas against p1 : ' + fmt % pcfmt(nump1, numdeltas))
2131 ui.write('deltas against p1 : ' + fmt % pcfmt(nump1, numdeltas))
2132 ui.write('deltas against p2 : ' + fmt % pcfmt(nump2, numdeltas))
2132 ui.write('deltas against p2 : ' + fmt % pcfmt(nump2, numdeltas))
2133 ui.write('deltas against other : ' + fmt % pcfmt(numother, numdeltas))
2133 ui.write('deltas against other : ' + fmt % pcfmt(numother, numdeltas))
2134
2134
2135 @command('debugrevspec', [], ('REVSPEC'))
2135 @command('debugrevspec', [], ('REVSPEC'))
2136 def debugrevspec(ui, repo, expr):
2136 def debugrevspec(ui, repo, expr):
2137 '''parse and apply a revision specification'''
2137 '''parse and apply a revision specification'''
2138 if ui.verbose:
2138 if ui.verbose:
2139 tree = revset.parse(expr)[0]
2139 tree = revset.parse(expr)[0]
2140 ui.note(tree, "\n")
2140 ui.note(tree, "\n")
2141 newtree = revset.findaliases(ui, tree)
2141 newtree = revset.findaliases(ui, tree)
2142 if newtree != tree:
2142 if newtree != tree:
2143 ui.note(newtree, "\n")
2143 ui.note(newtree, "\n")
2144 func = revset.match(ui, expr)
2144 func = revset.match(ui, expr)
2145 for c in func(repo, range(len(repo))):
2145 for c in func(repo, range(len(repo))):
2146 ui.write("%s\n" % c)
2146 ui.write("%s\n" % c)
2147
2147
2148 @command('debugsetparents', [], _('REV1 [REV2]'))
2148 @command('debugsetparents', [], _('REV1 [REV2]'))
2149 def debugsetparents(ui, repo, rev1, rev2=None):
2149 def debugsetparents(ui, repo, rev1, rev2=None):
2150 """manually set the parents of the current working directory
2150 """manually set the parents of the current working directory
2151
2151
2152 This is useful for writing repository conversion tools, but should
2152 This is useful for writing repository conversion tools, but should
2153 be used with care.
2153 be used with care.
2154
2154
2155 Returns 0 on success.
2155 Returns 0 on success.
2156 """
2156 """
2157
2157
2158 r1 = scmutil.revsingle(repo, rev1).node()
2158 r1 = scmutil.revsingle(repo, rev1).node()
2159 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2159 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2160
2160
2161 wlock = repo.wlock()
2161 wlock = repo.wlock()
2162 try:
2162 try:
2163 repo.dirstate.setparents(r1, r2)
2163 repo.dirstate.setparents(r1, r2)
2164 finally:
2164 finally:
2165 wlock.release()
2165 wlock.release()
2166
2166
2167 @command('debugstate',
2167 @command('debugstate',
2168 [('', 'nodates', None, _('do not display the saved mtime')),
2168 [('', 'nodates', None, _('do not display the saved mtime')),
2169 ('', 'datesort', None, _('sort by saved mtime'))],
2169 ('', 'datesort', None, _('sort by saved mtime'))],
2170 _('[OPTION]...'))
2170 _('[OPTION]...'))
2171 def debugstate(ui, repo, nodates=None, datesort=None):
2171 def debugstate(ui, repo, nodates=None, datesort=None):
2172 """show the contents of the current dirstate"""
2172 """show the contents of the current dirstate"""
2173 timestr = ""
2173 timestr = ""
2174 showdate = not nodates
2174 showdate = not nodates
2175 if datesort:
2175 if datesort:
2176 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2176 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2177 else:
2177 else:
2178 keyfunc = None # sort by filename
2178 keyfunc = None # sort by filename
2179 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2179 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2180 if showdate:
2180 if showdate:
2181 if ent[3] == -1:
2181 if ent[3] == -1:
2182 # Pad or slice to locale representation
2182 # Pad or slice to locale representation
2183 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
2183 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
2184 time.localtime(0)))
2184 time.localtime(0)))
2185 timestr = 'unset'
2185 timestr = 'unset'
2186 timestr = (timestr[:locale_len] +
2186 timestr = (timestr[:locale_len] +
2187 ' ' * (locale_len - len(timestr)))
2187 ' ' * (locale_len - len(timestr)))
2188 else:
2188 else:
2189 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2189 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2190 time.localtime(ent[3]))
2190 time.localtime(ent[3]))
2191 if ent[1] & 020000:
2191 if ent[1] & 020000:
2192 mode = 'lnk'
2192 mode = 'lnk'
2193 else:
2193 else:
2194 mode = '%3o' % (ent[1] & 0777)
2194 mode = '%3o' % (ent[1] & 0777)
2195 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2195 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2196 for f in repo.dirstate.copies():
2196 for f in repo.dirstate.copies():
2197 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2197 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2198
2198
2199 @command('debugsub',
2199 @command('debugsub',
2200 [('r', 'rev', '',
2200 [('r', 'rev', '',
2201 _('revision to check'), _('REV'))],
2201 _('revision to check'), _('REV'))],
2202 _('[-r REV] [REV]'))
2202 _('[-r REV] [REV]'))
2203 def debugsub(ui, repo, rev=None):
2203 def debugsub(ui, repo, rev=None):
2204 ctx = scmutil.revsingle(repo, rev, None)
2204 ctx = scmutil.revsingle(repo, rev, None)
2205 for k, v in sorted(ctx.substate.items()):
2205 for k, v in sorted(ctx.substate.items()):
2206 ui.write('path %s\n' % k)
2206 ui.write('path %s\n' % k)
2207 ui.write(' source %s\n' % v[0])
2207 ui.write(' source %s\n' % v[0])
2208 ui.write(' revision %s\n' % v[1])
2208 ui.write(' revision %s\n' % v[1])
2209
2209
2210 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'))
2210 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'))
2211 def debugwalk(ui, repo, *pats, **opts):
2211 def debugwalk(ui, repo, *pats, **opts):
2212 """show how files match on given patterns"""
2212 """show how files match on given patterns"""
2213 m = scmutil.match(repo[None], pats, opts)
2213 m = scmutil.match(repo[None], pats, opts)
2214 items = list(repo.walk(m))
2214 items = list(repo.walk(m))
2215 if not items:
2215 if not items:
2216 return
2216 return
2217 fmt = 'f %%-%ds %%-%ds %%s' % (
2217 fmt = 'f %%-%ds %%-%ds %%s' % (
2218 max([len(abs) for abs in items]),
2218 max([len(abs) for abs in items]),
2219 max([len(m.rel(abs)) for abs in items]))
2219 max([len(m.rel(abs)) for abs in items]))
2220 for abs in items:
2220 for abs in items:
2221 line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '')
2221 line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '')
2222 ui.write("%s\n" % line.rstrip())
2222 ui.write("%s\n" % line.rstrip())
2223
2223
2224 @command('debugwireargs',
2224 @command('debugwireargs',
2225 [('', 'three', '', 'three'),
2225 [('', 'three', '', 'three'),
2226 ('', 'four', '', 'four'),
2226 ('', 'four', '', 'four'),
2227 ('', 'five', '', 'five'),
2227 ('', 'five', '', 'five'),
2228 ] + remoteopts,
2228 ] + remoteopts,
2229 _('REPO [OPTIONS]... [ONE [TWO]]'))
2229 _('REPO [OPTIONS]... [ONE [TWO]]'))
2230 def debugwireargs(ui, repopath, *vals, **opts):
2230 def debugwireargs(ui, repopath, *vals, **opts):
2231 repo = hg.peer(ui, opts, repopath)
2231 repo = hg.peer(ui, opts, repopath)
2232 for opt in remoteopts:
2232 for opt in remoteopts:
2233 del opts[opt[1]]
2233 del opts[opt[1]]
2234 args = {}
2234 args = {}
2235 for k, v in opts.iteritems():
2235 for k, v in opts.iteritems():
2236 if v:
2236 if v:
2237 args[k] = v
2237 args[k] = v
2238 # run twice to check that we don't mess up the stream for the next command
2238 # run twice to check that we don't mess up the stream for the next command
2239 res1 = repo.debugwireargs(*vals, **args)
2239 res1 = repo.debugwireargs(*vals, **args)
2240 res2 = repo.debugwireargs(*vals, **args)
2240 res2 = repo.debugwireargs(*vals, **args)
2241 ui.write("%s\n" % res1)
2241 ui.write("%s\n" % res1)
2242 if res1 != res2:
2242 if res1 != res2:
2243 ui.warn("%s\n" % res2)
2243 ui.warn("%s\n" % res2)
2244
2244
2245 @command('^diff',
2245 @command('^diff',
2246 [('r', 'rev', [], _('revision'), _('REV')),
2246 [('r', 'rev', [], _('revision'), _('REV')),
2247 ('c', 'change', '', _('change made by revision'), _('REV'))
2247 ('c', 'change', '', _('change made by revision'), _('REV'))
2248 ] + diffopts + diffopts2 + walkopts + subrepoopts,
2248 ] + diffopts + diffopts2 + walkopts + subrepoopts,
2249 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'))
2249 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'))
2250 def diff(ui, repo, *pats, **opts):
2250 def diff(ui, repo, *pats, **opts):
2251 """diff repository (or selected files)
2251 """diff repository (or selected files)
2252
2252
2253 Show differences between revisions for the specified files.
2253 Show differences between revisions for the specified files.
2254
2254
2255 Differences between files are shown using the unified diff format.
2255 Differences between files are shown using the unified diff format.
2256
2256
2257 .. note::
2257 .. note::
2258 diff may generate unexpected results for merges, as it will
2258 diff may generate unexpected results for merges, as it will
2259 default to comparing against the working directory's first
2259 default to comparing against the working directory's first
2260 parent changeset if no revisions are specified.
2260 parent changeset if no revisions are specified.
2261
2261
2262 When two revision arguments are given, then changes are shown
2262 When two revision arguments are given, then changes are shown
2263 between those revisions. If only one revision is specified then
2263 between those revisions. If only one revision is specified then
2264 that revision is compared to the working directory, and, when no
2264 that revision is compared to the working directory, and, when no
2265 revisions are specified, the working directory files are compared
2265 revisions are specified, the working directory files are compared
2266 to its parent.
2266 to its parent.
2267
2267
2268 Alternatively you can specify -c/--change with a revision to see
2268 Alternatively you can specify -c/--change with a revision to see
2269 the changes in that changeset relative to its first parent.
2269 the changes in that changeset relative to its first parent.
2270
2270
2271 Without the -a/--text option, diff will avoid generating diffs of
2271 Without the -a/--text option, diff will avoid generating diffs of
2272 files it detects as binary. With -a, diff will generate a diff
2272 files it detects as binary. With -a, diff will generate a diff
2273 anyway, probably with undesirable results.
2273 anyway, probably with undesirable results.
2274
2274
2275 Use the -g/--git option to generate diffs in the git extended diff
2275 Use the -g/--git option to generate diffs in the git extended diff
2276 format. For more information, read :hg:`help diffs`.
2276 format. For more information, read :hg:`help diffs`.
2277
2277
2278 .. container:: verbose
2278 .. container:: verbose
2279
2279
2280 Examples:
2280 Examples:
2281
2281
2282 - compare a file in the current working directory to its parent::
2282 - compare a file in the current working directory to its parent::
2283
2283
2284 hg diff foo.c
2284 hg diff foo.c
2285
2285
2286 - compare two historical versions of a directory, with rename info::
2286 - compare two historical versions of a directory, with rename info::
2287
2287
2288 hg diff --git -r 1.0:1.2 lib/
2288 hg diff --git -r 1.0:1.2 lib/
2289
2289
2290 - get change stats relative to the last change on some date::
2290 - get change stats relative to the last change on some date::
2291
2291
2292 hg diff --stat -r "date('may 2')"
2292 hg diff --stat -r "date('may 2')"
2293
2293
2294 - diff all newly-added files that contain a keyword::
2294 - diff all newly-added files that contain a keyword::
2295
2295
2296 hg diff "set:added() and grep(GNU)"
2296 hg diff "set:added() and grep(GNU)"
2297
2297
2298 - compare a revision and its parents::
2298 - compare a revision and its parents::
2299
2299
2300 hg diff -c 9353 # compare against first parent
2300 hg diff -c 9353 # compare against first parent
2301 hg diff -r 9353^:9353 # same using revset syntax
2301 hg diff -r 9353^:9353 # same using revset syntax
2302 hg diff -r 9353^2:9353 # compare against the second parent
2302 hg diff -r 9353^2:9353 # compare against the second parent
2303
2303
2304 Returns 0 on success.
2304 Returns 0 on success.
2305 """
2305 """
2306
2306
2307 revs = opts.get('rev')
2307 revs = opts.get('rev')
2308 change = opts.get('change')
2308 change = opts.get('change')
2309 stat = opts.get('stat')
2309 stat = opts.get('stat')
2310 reverse = opts.get('reverse')
2310 reverse = opts.get('reverse')
2311
2311
2312 if revs and change:
2312 if revs and change:
2313 msg = _('cannot specify --rev and --change at the same time')
2313 msg = _('cannot specify --rev and --change at the same time')
2314 raise util.Abort(msg)
2314 raise util.Abort(msg)
2315 elif change:
2315 elif change:
2316 node2 = scmutil.revsingle(repo, change, None).node()
2316 node2 = scmutil.revsingle(repo, change, None).node()
2317 node1 = repo[node2].p1().node()
2317 node1 = repo[node2].p1().node()
2318 else:
2318 else:
2319 node1, node2 = scmutil.revpair(repo, revs)
2319 node1, node2 = scmutil.revpair(repo, revs)
2320
2320
2321 if reverse:
2321 if reverse:
2322 node1, node2 = node2, node1
2322 node1, node2 = node2, node1
2323
2323
2324 diffopts = patch.diffopts(ui, opts)
2324 diffopts = patch.diffopts(ui, opts)
2325 m = scmutil.match(repo[node2], pats, opts)
2325 m = scmutil.match(repo[node2], pats, opts)
2326 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
2326 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
2327 listsubrepos=opts.get('subrepos'))
2327 listsubrepos=opts.get('subrepos'))
2328
2328
2329 @command('^export',
2329 @command('^export',
2330 [('o', 'output', '',
2330 [('o', 'output', '',
2331 _('print output to file with formatted name'), _('FORMAT')),
2331 _('print output to file with formatted name'), _('FORMAT')),
2332 ('', 'switch-parent', None, _('diff against the second parent')),
2332 ('', 'switch-parent', None, _('diff against the second parent')),
2333 ('r', 'rev', [], _('revisions to export'), _('REV')),
2333 ('r', 'rev', [], _('revisions to export'), _('REV')),
2334 ] + diffopts,
2334 ] + diffopts,
2335 _('[OPTION]... [-o OUTFILESPEC] REV...'))
2335 _('[OPTION]... [-o OUTFILESPEC] REV...'))
2336 def export(ui, repo, *changesets, **opts):
2336 def export(ui, repo, *changesets, **opts):
2337 """dump the header and diffs for one or more changesets
2337 """dump the header and diffs for one or more changesets
2338
2338
2339 Print the changeset header and diffs for one or more revisions.
2339 Print the changeset header and diffs for one or more revisions.
2340
2340
2341 The information shown in the changeset header is: author, date,
2341 The information shown in the changeset header is: author, date,
2342 branch name (if non-default), changeset hash, parent(s) and commit
2342 branch name (if non-default), changeset hash, parent(s) and commit
2343 comment.
2343 comment.
2344
2344
2345 .. note::
2345 .. note::
2346 export may generate unexpected diff output for merge
2346 export may generate unexpected diff output for merge
2347 changesets, as it will compare the merge changeset against its
2347 changesets, as it will compare the merge changeset against its
2348 first parent only.
2348 first parent only.
2349
2349
2350 Output may be to a file, in which case the name of the file is
2350 Output may be to a file, in which case the name of the file is
2351 given using a format string. The formatting rules are as follows:
2351 given using a format string. The formatting rules are as follows:
2352
2352
2353 :``%%``: literal "%" character
2353 :``%%``: literal "%" character
2354 :``%H``: changeset hash (40 hexadecimal digits)
2354 :``%H``: changeset hash (40 hexadecimal digits)
2355 :``%N``: number of patches being generated
2355 :``%N``: number of patches being generated
2356 :``%R``: changeset revision number
2356 :``%R``: changeset revision number
2357 :``%b``: basename of the exporting repository
2357 :``%b``: basename of the exporting repository
2358 :``%h``: short-form changeset hash (12 hexadecimal digits)
2358 :``%h``: short-form changeset hash (12 hexadecimal digits)
2359 :``%m``: first line of the commit message (only alphanumeric characters)
2359 :``%m``: first line of the commit message (only alphanumeric characters)
2360 :``%n``: zero-padded sequence number, starting at 1
2360 :``%n``: zero-padded sequence number, starting at 1
2361 :``%r``: zero-padded changeset revision number
2361 :``%r``: zero-padded changeset revision number
2362
2362
2363 Without the -a/--text option, export will avoid generating diffs
2363 Without the -a/--text option, export will avoid generating diffs
2364 of files it detects as binary. With -a, export will generate a
2364 of files it detects as binary. With -a, export will generate a
2365 diff anyway, probably with undesirable results.
2365 diff anyway, probably with undesirable results.
2366
2366
2367 Use the -g/--git option to generate diffs in the git extended diff
2367 Use the -g/--git option to generate diffs in the git extended diff
2368 format. See :hg:`help diffs` for more information.
2368 format. See :hg:`help diffs` for more information.
2369
2369
2370 With the --switch-parent option, the diff will be against the
2370 With the --switch-parent option, the diff will be against the
2371 second parent. It can be useful to review a merge.
2371 second parent. It can be useful to review a merge.
2372
2372
2373 .. container:: verbose
2373 .. container:: verbose
2374
2374
2375 Examples:
2375 Examples:
2376
2376
2377 - use export and import to transplant a bugfix to the current
2377 - use export and import to transplant a bugfix to the current
2378 branch::
2378 branch::
2379
2379
2380 hg export -r 9353 | hg import -
2380 hg export -r 9353 | hg import -
2381
2381
2382 - export all the changesets between two revisions to a file with
2382 - export all the changesets between two revisions to a file with
2383 rename information::
2383 rename information::
2384
2384
2385 hg export --git -r 123:150 > changes.txt
2385 hg export --git -r 123:150 > changes.txt
2386
2386
2387 - split outgoing changes into a series of patches with
2387 - split outgoing changes into a series of patches with
2388 descriptive names::
2388 descriptive names::
2389
2389
2390 hg export -r "outgoing()" -o "%n-%m.patch"
2390 hg export -r "outgoing()" -o "%n-%m.patch"
2391
2391
2392 Returns 0 on success.
2392 Returns 0 on success.
2393 """
2393 """
2394 changesets += tuple(opts.get('rev', []))
2394 changesets += tuple(opts.get('rev', []))
2395 if not changesets:
2395 if not changesets:
2396 raise util.Abort(_("export requires at least one changeset"))
2396 raise util.Abort(_("export requires at least one changeset"))
2397 revs = scmutil.revrange(repo, changesets)
2397 revs = scmutil.revrange(repo, changesets)
2398 if len(revs) > 1:
2398 if len(revs) > 1:
2399 ui.note(_('exporting patches:\n'))
2399 ui.note(_('exporting patches:\n'))
2400 else:
2400 else:
2401 ui.note(_('exporting patch:\n'))
2401 ui.note(_('exporting patch:\n'))
2402 cmdutil.export(repo, revs, template=opts.get('output'),
2402 cmdutil.export(repo, revs, template=opts.get('output'),
2403 switch_parent=opts.get('switch_parent'),
2403 switch_parent=opts.get('switch_parent'),
2404 opts=patch.diffopts(ui, opts))
2404 opts=patch.diffopts(ui, opts))
2405
2405
2406 @command('^forget', walkopts, _('[OPTION]... FILE...'))
2406 @command('^forget', walkopts, _('[OPTION]... FILE...'))
2407 def forget(ui, repo, *pats, **opts):
2407 def forget(ui, repo, *pats, **opts):
2408 """forget the specified files on the next commit
2408 """forget the specified files on the next commit
2409
2409
2410 Mark the specified files so they will no longer be tracked
2410 Mark the specified files so they will no longer be tracked
2411 after the next commit.
2411 after the next commit.
2412
2412
2413 This only removes files from the current branch, not from the
2413 This only removes files from the current branch, not from the
2414 entire project history, and it does not delete them from the
2414 entire project history, and it does not delete them from the
2415 working directory.
2415 working directory.
2416
2416
2417 To undo a forget before the next commit, see :hg:`add`.
2417 To undo a forget before the next commit, see :hg:`add`.
2418
2418
2419 .. container:: verbose
2419 .. container:: verbose
2420
2420
2421 Examples:
2421 Examples:
2422
2422
2423 - forget newly-added binary files::
2423 - forget newly-added binary files::
2424
2424
2425 hg forget "set:added() and binary()"
2425 hg forget "set:added() and binary()"
2426
2426
2427 - forget files that would be excluded by .hgignore::
2427 - forget files that would be excluded by .hgignore::
2428
2428
2429 hg forget "set:hgignore()"
2429 hg forget "set:hgignore()"
2430
2430
2431 Returns 0 on success.
2431 Returns 0 on success.
2432 """
2432 """
2433
2433
2434 if not pats:
2434 if not pats:
2435 raise util.Abort(_('no files specified'))
2435 raise util.Abort(_('no files specified'))
2436
2436
2437 m = scmutil.match(repo[None], pats, opts)
2437 m = scmutil.match(repo[None], 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 errs = 0
2440 errs = 0
2441
2441
2442 for f in m.files():
2442 for f in m.files():
2443 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
2443 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
2444 if os.path.exists(m.rel(f)):
2444 if os.path.exists(m.rel(f)):
2445 ui.warn(_('not removing %s: file is already untracked\n')
2445 ui.warn(_('not removing %s: file is already untracked\n')
2446 % m.rel(f))
2446 % m.rel(f))
2447 errs = 1
2447 errs = 1
2448
2448
2449 for f in forget:
2449 for f in forget:
2450 if ui.verbose or not m.exact(f):
2450 if ui.verbose or not m.exact(f):
2451 ui.status(_('removing %s\n') % m.rel(f))
2451 ui.status(_('removing %s\n') % m.rel(f))
2452
2452
2453 repo[None].forget(forget)
2453 repo[None].forget(forget)
2454 return errs
2454 return errs
2455
2455
2456 @command(
2456 @command(
2457 'graft',
2457 'graft',
2458 [('c', 'continue', False, _('resume interrupted graft')),
2458 [('c', 'continue', False, _('resume interrupted graft')),
2459 ('e', 'edit', False, _('invoke editor on commit messages')),
2459 ('e', 'edit', False, _('invoke editor on commit messages')),
2460 ('D', 'currentdate', False,
2460 ('D', 'currentdate', False,
2461 _('record the current date as commit date')),
2461 _('record the current date as commit date')),
2462 ('U', 'currentuser', False,
2462 ('U', 'currentuser', False,
2463 _('record the current user as committer'), _('DATE'))]
2463 _('record the current user as committer'), _('DATE'))]
2464 + commitopts2 + mergetoolopts,
2464 + commitopts2 + mergetoolopts,
2465 _('[OPTION]... REVISION...'))
2465 _('[OPTION]... REVISION...'))
2466 def graft(ui, repo, *revs, **opts):
2466 def graft(ui, repo, *revs, **opts):
2467 '''copy changes from other branches onto the current branch
2467 '''copy changes from other branches onto the current branch
2468
2468
2469 This command uses Mercurial's merge logic to copy individual
2469 This command uses Mercurial's merge logic to copy individual
2470 changes from other branches without merging branches in the
2470 changes from other branches without merging branches in the
2471 history graph. This is sometimes known as 'backporting' or
2471 history graph. This is sometimes known as 'backporting' or
2472 'cherry-picking'. By default, graft will copy user, date, and
2472 'cherry-picking'. By default, graft will copy user, date, and
2473 description from the source changesets.
2473 description from the source changesets.
2474
2474
2475 Changesets that are ancestors of the current revision, that have
2475 Changesets that are ancestors of the current revision, that have
2476 already been grafted, or that are merges will be skipped.
2476 already been grafted, or that are merges will be skipped.
2477
2477
2478 If a graft merge results in conflicts, the graft process is
2478 If a graft merge results in conflicts, the graft process is
2479 interrupted so that the current merge can be manually resolved.
2479 interrupted so that the current merge can be manually resolved.
2480 Once all conflicts are addressed, the graft process can be
2480 Once all conflicts are addressed, the graft process can be
2481 continued with the -c/--continue option.
2481 continued with the -c/--continue option.
2482
2482
2483 .. note::
2483 .. note::
2484 The -c/--continue option does not reapply earlier options.
2484 The -c/--continue option does not reapply earlier options.
2485
2485
2486 .. container:: verbose
2486 .. container:: verbose
2487
2487
2488 Examples:
2488 Examples:
2489
2489
2490 - copy a single change to the stable branch and edit its description::
2490 - copy a single change to the stable branch and edit its description::
2491
2491
2492 hg update stable
2492 hg update stable
2493 hg graft --edit 9393
2493 hg graft --edit 9393
2494
2494
2495 - graft a range of changesets with one exception, updating dates::
2495 - graft a range of changesets with one exception, updating dates::
2496
2496
2497 hg graft -D "2085::2093 and not 2091"
2497 hg graft -D "2085::2093 and not 2091"
2498
2498
2499 - continue a graft after resolving conflicts::
2499 - continue a graft after resolving conflicts::
2500
2500
2501 hg graft -c
2501 hg graft -c
2502
2502
2503 - show the source of a grafted changeset::
2503 - show the source of a grafted changeset::
2504
2504
2505 hg log --debug -r tip
2505 hg log --debug -r tip
2506
2506
2507 Returns 0 on successful completion.
2507 Returns 0 on successful completion.
2508 '''
2508 '''
2509
2509
2510 if not opts.get('user') and opts.get('currentuser'):
2510 if not opts.get('user') and opts.get('currentuser'):
2511 opts['user'] = ui.username()
2511 opts['user'] = ui.username()
2512 if not opts.get('date') and opts.get('currentdate'):
2512 if not opts.get('date') and opts.get('currentdate'):
2513 opts['date'] = "%d %d" % util.makedate()
2513 opts['date'] = "%d %d" % util.makedate()
2514
2514
2515 editor = None
2515 editor = None
2516 if opts.get('edit'):
2516 if opts.get('edit'):
2517 editor = cmdutil.commitforceeditor
2517 editor = cmdutil.commitforceeditor
2518
2518
2519 cont = False
2519 cont = False
2520 if opts['continue']:
2520 if opts['continue']:
2521 cont = True
2521 cont = True
2522 if revs:
2522 if revs:
2523 raise util.Abort(_("can't specify --continue and revisions"))
2523 raise util.Abort(_("can't specify --continue and revisions"))
2524 # read in unfinished revisions
2524 # read in unfinished revisions
2525 try:
2525 try:
2526 nodes = repo.opener.read('graftstate').splitlines()
2526 nodes = repo.opener.read('graftstate').splitlines()
2527 revs = [repo[node].rev() for node in nodes]
2527 revs = [repo[node].rev() for node in nodes]
2528 except IOError, inst:
2528 except IOError, inst:
2529 if inst.errno != errno.ENOENT:
2529 if inst.errno != errno.ENOENT:
2530 raise
2530 raise
2531 raise util.Abort(_("no graft state found, can't continue"))
2531 raise util.Abort(_("no graft state found, can't continue"))
2532 else:
2532 else:
2533 cmdutil.bailifchanged(repo)
2533 cmdutil.bailifchanged(repo)
2534 if not revs:
2534 if not revs:
2535 raise util.Abort(_('no revisions specified'))
2535 raise util.Abort(_('no revisions specified'))
2536 revs = scmutil.revrange(repo, revs)
2536 revs = scmutil.revrange(repo, revs)
2537
2537
2538 # check for merges
2538 # check for merges
2539 for ctx in repo.set('%ld and merge()', revs):
2539 for ctx in repo.set('%ld and merge()', revs):
2540 ui.warn(_('skipping ungraftable merge revision %s\n') % ctx.rev())
2540 ui.warn(_('skipping ungraftable merge revision %s\n') % ctx.rev())
2541 revs.remove(ctx.rev())
2541 revs.remove(ctx.rev())
2542 if not revs:
2542 if not revs:
2543 return -1
2543 return -1
2544
2544
2545 # check for ancestors of dest branch
2545 # check for ancestors of dest branch
2546 for ctx in repo.set('::. and %ld', revs):
2546 for ctx in repo.set('::. and %ld', revs):
2547 ui.warn(_('skipping ancestor revision %s\n') % ctx.rev())
2547 ui.warn(_('skipping ancestor revision %s\n') % ctx.rev())
2548 revs.remove(ctx.rev())
2548 revs.remove(ctx.rev())
2549 if not revs:
2549 if not revs:
2550 return -1
2550 return -1
2551
2551
2552 # analyze revs for earlier grafts
2552 # analyze revs for earlier grafts
2553 ids = {}
2553 ids = {}
2554 for ctx in repo.set("%ld", revs):
2554 for ctx in repo.set("%ld", revs):
2555 ids[ctx.hex()] = ctx.rev()
2555 ids[ctx.hex()] = ctx.rev()
2556 n = ctx.extra().get('source')
2556 n = ctx.extra().get('source')
2557 if n:
2557 if n:
2558 ids[n] = ctx.rev()
2558 ids[n] = ctx.rev()
2559
2559
2560 # check ancestors for earlier grafts
2560 # check ancestors for earlier grafts
2561 ui.debug('scanning for duplicate grafts\n')
2561 ui.debug('scanning for duplicate grafts\n')
2562 for ctx in repo.set("::. - ::%ld", revs):
2562 for ctx in repo.set("::. - ::%ld", revs):
2563 n = ctx.extra().get('source')
2563 n = ctx.extra().get('source')
2564 if n in ids:
2564 if n in ids:
2565 r = repo[n].rev()
2565 r = repo[n].rev()
2566 if r in revs:
2566 if r in revs:
2567 ui.warn(_('skipping already grafted revision %s\n') % r)
2567 ui.warn(_('skipping already grafted revision %s\n') % r)
2568 revs.remove(r)
2568 revs.remove(r)
2569 elif ids[n] in revs:
2569 elif ids[n] in revs:
2570 ui.warn(_('skipping already grafted revision %s '
2570 ui.warn(_('skipping already grafted revision %s '
2571 '(same origin %d)\n') % (ids[n], r))
2571 '(same origin %d)\n') % (ids[n], r))
2572 revs.remove(ids[n])
2572 revs.remove(ids[n])
2573 elif ctx.hex() in ids:
2573 elif ctx.hex() in ids:
2574 r = ids[ctx.hex()]
2574 r = ids[ctx.hex()]
2575 ui.warn(_('skipping already grafted revision %s '
2575 ui.warn(_('skipping already grafted revision %s '
2576 '(was grafted from %d)\n') % (r, ctx.rev()))
2576 '(was grafted from %d)\n') % (r, ctx.rev()))
2577 revs.remove(r)
2577 revs.remove(r)
2578 if not revs:
2578 if not revs:
2579 return -1
2579 return -1
2580
2580
2581 for pos, ctx in enumerate(repo.set("%ld", revs)):
2581 for pos, ctx in enumerate(repo.set("%ld", revs)):
2582 current = repo['.']
2582 current = repo['.']
2583 ui.status(_('grafting revision %s\n') % ctx.rev())
2583 ui.status(_('grafting revision %s\n') % ctx.rev())
2584
2584
2585 # we don't merge the first commit when continuing
2585 # we don't merge the first commit when continuing
2586 if not cont:
2586 if not cont:
2587 # perform the graft merge with p1(rev) as 'ancestor'
2587 # perform the graft merge with p1(rev) as 'ancestor'
2588 try:
2588 try:
2589 # ui.forcemerge is an internal variable, do not document
2589 # ui.forcemerge is an internal variable, do not document
2590 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
2590 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
2591 stats = mergemod.update(repo, ctx.node(), True, True, False,
2591 stats = mergemod.update(repo, ctx.node(), True, True, False,
2592 ctx.p1().node())
2592 ctx.p1().node())
2593 finally:
2593 finally:
2594 ui.setconfig('ui', 'forcemerge', '')
2594 ui.setconfig('ui', 'forcemerge', '')
2595 # drop the second merge parent
2595 # drop the second merge parent
2596 repo.dirstate.setparents(current.node(), nullid)
2596 repo.dirstate.setparents(current.node(), nullid)
2597 repo.dirstate.write()
2597 repo.dirstate.write()
2598 # fix up dirstate for copies and renames
2598 # fix up dirstate for copies and renames
2599 cmdutil.duplicatecopies(repo, ctx.rev(), current.node(), nullid)
2599 cmdutil.duplicatecopies(repo, ctx.rev(), current.node(), nullid)
2600 # report any conflicts
2600 # report any conflicts
2601 if stats and stats[3] > 0:
2601 if stats and stats[3] > 0:
2602 # write out state for --continue
2602 # write out state for --continue
2603 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2603 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2604 repo.opener.write('graftstate', ''.join(nodelines))
2604 repo.opener.write('graftstate', ''.join(nodelines))
2605 raise util.Abort(
2605 raise util.Abort(
2606 _("unresolved conflicts, can't continue"),
2606 _("unresolved conflicts, can't continue"),
2607 hint=_('use hg resolve and hg graft --continue'))
2607 hint=_('use hg resolve and hg graft --continue'))
2608 else:
2608 else:
2609 cont = False
2609 cont = False
2610
2610
2611 # commit
2611 # commit
2612 source = ctx.extra().get('source')
2612 source = ctx.extra().get('source')
2613 if not source:
2613 if not source:
2614 source = ctx.hex()
2614 source = ctx.hex()
2615 extra = {'source': source}
2615 extra = {'source': source}
2616 user = ctx.user()
2616 user = ctx.user()
2617 if opts.get('user'):
2617 if opts.get('user'):
2618 user = opts['user']
2618 user = opts['user']
2619 date = ctx.date()
2619 date = ctx.date()
2620 if opts.get('date'):
2620 if opts.get('date'):
2621 date = opts['date']
2621 date = opts['date']
2622 repo.commit(text=ctx.description(), user=user,
2622 repo.commit(text=ctx.description(), user=user,
2623 date=date, extra=extra, editor=editor)
2623 date=date, extra=extra, editor=editor)
2624
2624
2625 # remove state when we complete successfully
2625 # remove state when we complete successfully
2626 if os.path.exists(repo.join('graftstate')):
2626 if os.path.exists(repo.join('graftstate')):
2627 util.unlinkpath(repo.join('graftstate'))
2627 util.unlinkpath(repo.join('graftstate'))
2628
2628
2629 return 0
2629 return 0
2630
2630
2631 @command('grep',
2631 @command('grep',
2632 [('0', 'print0', None, _('end fields with NUL')),
2632 [('0', 'print0', None, _('end fields with NUL')),
2633 ('', 'all', None, _('print all revisions that match')),
2633 ('', 'all', None, _('print all revisions that match')),
2634 ('a', 'text', None, _('treat all files as text')),
2634 ('a', 'text', None, _('treat all files as text')),
2635 ('f', 'follow', None,
2635 ('f', 'follow', None,
2636 _('follow changeset history,'
2636 _('follow changeset history,'
2637 ' or file history across copies and renames')),
2637 ' or file history across copies and renames')),
2638 ('i', 'ignore-case', None, _('ignore case when matching')),
2638 ('i', 'ignore-case', None, _('ignore case when matching')),
2639 ('l', 'files-with-matches', None,
2639 ('l', 'files-with-matches', None,
2640 _('print only filenames and revisions that match')),
2640 _('print only filenames and revisions that match')),
2641 ('n', 'line-number', None, _('print matching line numbers')),
2641 ('n', 'line-number', None, _('print matching line numbers')),
2642 ('r', 'rev', [],
2642 ('r', 'rev', [],
2643 _('only search files changed within revision range'), _('REV')),
2643 _('only search files changed within revision range'), _('REV')),
2644 ('u', 'user', None, _('list the author (long with -v)')),
2644 ('u', 'user', None, _('list the author (long with -v)')),
2645 ('d', 'date', None, _('list the date (short with -q)')),
2645 ('d', 'date', None, _('list the date (short with -q)')),
2646 ] + walkopts,
2646 ] + walkopts,
2647 _('[OPTION]... PATTERN [FILE]...'))
2647 _('[OPTION]... PATTERN [FILE]...'))
2648 def grep(ui, repo, pattern, *pats, **opts):
2648 def grep(ui, repo, pattern, *pats, **opts):
2649 """search for a pattern in specified files and revisions
2649 """search for a pattern in specified files and revisions
2650
2650
2651 Search revisions of files for a regular expression.
2651 Search revisions of files for a regular expression.
2652
2652
2653 This command behaves differently than Unix grep. It only accepts
2653 This command behaves differently than Unix grep. It only accepts
2654 Python/Perl regexps. It searches repository history, not the
2654 Python/Perl regexps. It searches repository history, not the
2655 working directory. It always prints the revision number in which a
2655 working directory. It always prints the revision number in which a
2656 match appears.
2656 match appears.
2657
2657
2658 By default, grep only prints output for the first revision of a
2658 By default, grep only prints output for the first revision of a
2659 file in which it finds a match. To get it to print every revision
2659 file in which it finds a match. To get it to print every revision
2660 that contains a change in match status ("-" for a match that
2660 that contains a change in match status ("-" for a match that
2661 becomes a non-match, or "+" for a non-match that becomes a match),
2661 becomes a non-match, or "+" for a non-match that becomes a match),
2662 use the --all flag.
2662 use the --all flag.
2663
2663
2664 Returns 0 if a match is found, 1 otherwise.
2664 Returns 0 if a match is found, 1 otherwise.
2665 """
2665 """
2666 reflags = 0
2666 reflags = re.M
2667 if opts.get('ignore_case'):
2667 if opts.get('ignore_case'):
2668 reflags |= re.I
2668 reflags |= re.I
2669 try:
2669 try:
2670 regexp = re.compile(pattern, reflags)
2670 regexp = re.compile(pattern, reflags)
2671 except re.error, inst:
2671 except re.error, inst:
2672 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2672 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2673 return 1
2673 return 1
2674 sep, eol = ':', '\n'
2674 sep, eol = ':', '\n'
2675 if opts.get('print0'):
2675 if opts.get('print0'):
2676 sep = eol = '\0'
2676 sep = eol = '\0'
2677
2677
2678 getfile = util.lrucachefunc(repo.file)
2678 getfile = util.lrucachefunc(repo.file)
2679
2679
2680 def matchlines(body):
2680 def matchlines(body):
2681 begin = 0
2681 begin = 0
2682 linenum = 0
2682 linenum = 0
2683 while True:
2683 while True:
2684 match = regexp.search(body, begin)
2684 match = regexp.search(body, begin)
2685 if not match:
2685 if not match:
2686 break
2686 break
2687 mstart, mend = match.span()
2687 mstart, mend = match.span()
2688 linenum += body.count('\n', begin, mstart) + 1
2688 linenum += body.count('\n', begin, mstart) + 1
2689 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2689 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2690 begin = body.find('\n', mend) + 1 or len(body) + 1
2690 begin = body.find('\n', mend) + 1 or len(body) + 1
2691 lend = begin - 1
2691 lend = begin - 1
2692 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2692 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2693
2693
2694 class linestate(object):
2694 class linestate(object):
2695 def __init__(self, line, linenum, colstart, colend):
2695 def __init__(self, line, linenum, colstart, colend):
2696 self.line = line
2696 self.line = line
2697 self.linenum = linenum
2697 self.linenum = linenum
2698 self.colstart = colstart
2698 self.colstart = colstart
2699 self.colend = colend
2699 self.colend = colend
2700
2700
2701 def __hash__(self):
2701 def __hash__(self):
2702 return hash((self.linenum, self.line))
2702 return hash((self.linenum, self.line))
2703
2703
2704 def __eq__(self, other):
2704 def __eq__(self, other):
2705 return self.line == other.line
2705 return self.line == other.line
2706
2706
2707 matches = {}
2707 matches = {}
2708 copies = {}
2708 copies = {}
2709 def grepbody(fn, rev, body):
2709 def grepbody(fn, rev, body):
2710 matches[rev].setdefault(fn, [])
2710 matches[rev].setdefault(fn, [])
2711 m = matches[rev][fn]
2711 m = matches[rev][fn]
2712 for lnum, cstart, cend, line in matchlines(body):
2712 for lnum, cstart, cend, line in matchlines(body):
2713 s = linestate(line, lnum, cstart, cend)
2713 s = linestate(line, lnum, cstart, cend)
2714 m.append(s)
2714 m.append(s)
2715
2715
2716 def difflinestates(a, b):
2716 def difflinestates(a, b):
2717 sm = difflib.SequenceMatcher(None, a, b)
2717 sm = difflib.SequenceMatcher(None, a, b)
2718 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2718 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2719 if tag == 'insert':
2719 if tag == 'insert':
2720 for i in xrange(blo, bhi):
2720 for i in xrange(blo, bhi):
2721 yield ('+', b[i])
2721 yield ('+', b[i])
2722 elif tag == 'delete':
2722 elif tag == 'delete':
2723 for i in xrange(alo, ahi):
2723 for i in xrange(alo, ahi):
2724 yield ('-', a[i])
2724 yield ('-', a[i])
2725 elif tag == 'replace':
2725 elif tag == 'replace':
2726 for i in xrange(alo, ahi):
2726 for i in xrange(alo, ahi):
2727 yield ('-', a[i])
2727 yield ('-', a[i])
2728 for i in xrange(blo, bhi):
2728 for i in xrange(blo, bhi):
2729 yield ('+', b[i])
2729 yield ('+', b[i])
2730
2730
2731 def display(fn, ctx, pstates, states):
2731 def display(fn, ctx, pstates, states):
2732 rev = ctx.rev()
2732 rev = ctx.rev()
2733 datefunc = ui.quiet and util.shortdate or util.datestr
2733 datefunc = ui.quiet and util.shortdate or util.datestr
2734 found = False
2734 found = False
2735 filerevmatches = {}
2735 filerevmatches = {}
2736 def binary():
2736 def binary():
2737 flog = getfile(fn)
2737 flog = getfile(fn)
2738 return util.binary(flog.read(ctx.filenode(fn)))
2738 return util.binary(flog.read(ctx.filenode(fn)))
2739
2739
2740 if opts.get('all'):
2740 if opts.get('all'):
2741 iter = difflinestates(pstates, states)
2741 iter = difflinestates(pstates, states)
2742 else:
2742 else:
2743 iter = [('', l) for l in states]
2743 iter = [('', l) for l in states]
2744 for change, l in iter:
2744 for change, l in iter:
2745 cols = [fn, str(rev)]
2745 cols = [fn, str(rev)]
2746 before, match, after = None, None, None
2746 before, match, after = None, None, None
2747 if opts.get('line_number'):
2747 if opts.get('line_number'):
2748 cols.append(str(l.linenum))
2748 cols.append(str(l.linenum))
2749 if opts.get('all'):
2749 if opts.get('all'):
2750 cols.append(change)
2750 cols.append(change)
2751 if opts.get('user'):
2751 if opts.get('user'):
2752 cols.append(ui.shortuser(ctx.user()))
2752 cols.append(ui.shortuser(ctx.user()))
2753 if opts.get('date'):
2753 if opts.get('date'):
2754 cols.append(datefunc(ctx.date()))
2754 cols.append(datefunc(ctx.date()))
2755 if opts.get('files_with_matches'):
2755 if opts.get('files_with_matches'):
2756 c = (fn, rev)
2756 c = (fn, rev)
2757 if c in filerevmatches:
2757 if c in filerevmatches:
2758 continue
2758 continue
2759 filerevmatches[c] = 1
2759 filerevmatches[c] = 1
2760 else:
2760 else:
2761 before = l.line[:l.colstart]
2761 before = l.line[:l.colstart]
2762 match = l.line[l.colstart:l.colend]
2762 match = l.line[l.colstart:l.colend]
2763 after = l.line[l.colend:]
2763 after = l.line[l.colend:]
2764 ui.write(sep.join(cols))
2764 ui.write(sep.join(cols))
2765 if before is not None:
2765 if before is not None:
2766 if not opts.get('text') and binary():
2766 if not opts.get('text') and binary():
2767 ui.write(sep + " Binary file matches")
2767 ui.write(sep + " Binary file matches")
2768 else:
2768 else:
2769 ui.write(sep + before)
2769 ui.write(sep + before)
2770 ui.write(match, label='grep.match')
2770 ui.write(match, label='grep.match')
2771 ui.write(after)
2771 ui.write(after)
2772 ui.write(eol)
2772 ui.write(eol)
2773 found = True
2773 found = True
2774 return found
2774 return found
2775
2775
2776 skip = {}
2776 skip = {}
2777 revfiles = {}
2777 revfiles = {}
2778 matchfn = scmutil.match(repo[None], pats, opts)
2778 matchfn = scmutil.match(repo[None], pats, opts)
2779 found = False
2779 found = False
2780 follow = opts.get('follow')
2780 follow = opts.get('follow')
2781
2781
2782 def prep(ctx, fns):
2782 def prep(ctx, fns):
2783 rev = ctx.rev()
2783 rev = ctx.rev()
2784 pctx = ctx.p1()
2784 pctx = ctx.p1()
2785 parent = pctx.rev()
2785 parent = pctx.rev()
2786 matches.setdefault(rev, {})
2786 matches.setdefault(rev, {})
2787 matches.setdefault(parent, {})
2787 matches.setdefault(parent, {})
2788 files = revfiles.setdefault(rev, [])
2788 files = revfiles.setdefault(rev, [])
2789 for fn in fns:
2789 for fn in fns:
2790 flog = getfile(fn)
2790 flog = getfile(fn)
2791 try:
2791 try:
2792 fnode = ctx.filenode(fn)
2792 fnode = ctx.filenode(fn)
2793 except error.LookupError:
2793 except error.LookupError:
2794 continue
2794 continue
2795
2795
2796 copied = flog.renamed(fnode)
2796 copied = flog.renamed(fnode)
2797 copy = follow and copied and copied[0]
2797 copy = follow and copied and copied[0]
2798 if copy:
2798 if copy:
2799 copies.setdefault(rev, {})[fn] = copy
2799 copies.setdefault(rev, {})[fn] = copy
2800 if fn in skip:
2800 if fn in skip:
2801 if copy:
2801 if copy:
2802 skip[copy] = True
2802 skip[copy] = True
2803 continue
2803 continue
2804 files.append(fn)
2804 files.append(fn)
2805
2805
2806 if fn not in matches[rev]:
2806 if fn not in matches[rev]:
2807 grepbody(fn, rev, flog.read(fnode))
2807 grepbody(fn, rev, flog.read(fnode))
2808
2808
2809 pfn = copy or fn
2809 pfn = copy or fn
2810 if pfn not in matches[parent]:
2810 if pfn not in matches[parent]:
2811 try:
2811 try:
2812 fnode = pctx.filenode(pfn)
2812 fnode = pctx.filenode(pfn)
2813 grepbody(pfn, parent, flog.read(fnode))
2813 grepbody(pfn, parent, flog.read(fnode))
2814 except error.LookupError:
2814 except error.LookupError:
2815 pass
2815 pass
2816
2816
2817 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2817 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2818 rev = ctx.rev()
2818 rev = ctx.rev()
2819 parent = ctx.p1().rev()
2819 parent = ctx.p1().rev()
2820 for fn in sorted(revfiles.get(rev, [])):
2820 for fn in sorted(revfiles.get(rev, [])):
2821 states = matches[rev][fn]
2821 states = matches[rev][fn]
2822 copy = copies.get(rev, {}).get(fn)
2822 copy = copies.get(rev, {}).get(fn)
2823 if fn in skip:
2823 if fn in skip:
2824 if copy:
2824 if copy:
2825 skip[copy] = True
2825 skip[copy] = True
2826 continue
2826 continue
2827 pstates = matches.get(parent, {}).get(copy or fn, [])
2827 pstates = matches.get(parent, {}).get(copy or fn, [])
2828 if pstates or states:
2828 if pstates or states:
2829 r = display(fn, ctx, pstates, states)
2829 r = display(fn, ctx, pstates, states)
2830 found = found or r
2830 found = found or r
2831 if r and not opts.get('all'):
2831 if r and not opts.get('all'):
2832 skip[fn] = True
2832 skip[fn] = True
2833 if copy:
2833 if copy:
2834 skip[copy] = True
2834 skip[copy] = True
2835 del matches[rev]
2835 del matches[rev]
2836 del revfiles[rev]
2836 del revfiles[rev]
2837
2837
2838 return not found
2838 return not found
2839
2839
2840 @command('heads',
2840 @command('heads',
2841 [('r', 'rev', '',
2841 [('r', 'rev', '',
2842 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2842 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2843 ('t', 'topo', False, _('show topological heads only')),
2843 ('t', 'topo', False, _('show topological heads only')),
2844 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2844 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2845 ('c', 'closed', False, _('show normal and closed branch heads')),
2845 ('c', 'closed', False, _('show normal and closed branch heads')),
2846 ] + templateopts,
2846 ] + templateopts,
2847 _('[-ac] [-r STARTREV] [REV]...'))
2847 _('[-ac] [-r STARTREV] [REV]...'))
2848 def heads(ui, repo, *branchrevs, **opts):
2848 def heads(ui, repo, *branchrevs, **opts):
2849 """show current repository heads or show branch heads
2849 """show current repository heads or show branch heads
2850
2850
2851 With no arguments, show all repository branch heads.
2851 With no arguments, show all repository branch heads.
2852
2852
2853 Repository "heads" are changesets with no child changesets. They are
2853 Repository "heads" are changesets with no child changesets. They are
2854 where development generally takes place and are the usual targets
2854 where development generally takes place and are the usual targets
2855 for update and merge operations. Branch heads are changesets that have
2855 for update and merge operations. Branch heads are changesets that have
2856 no child changeset on the same branch.
2856 no child changeset on the same branch.
2857
2857
2858 If one or more REVs are given, only branch heads on the branches
2858 If one or more REVs are given, only branch heads on the branches
2859 associated with the specified changesets are shown. This means
2859 associated with the specified changesets are shown. This means
2860 that you can use :hg:`heads foo` to see the heads on a branch
2860 that you can use :hg:`heads foo` to see the heads on a branch
2861 named ``foo``.
2861 named ``foo``.
2862
2862
2863 If -c/--closed is specified, also show branch heads marked closed
2863 If -c/--closed is specified, also show branch heads marked closed
2864 (see :hg:`commit --close-branch`).
2864 (see :hg:`commit --close-branch`).
2865
2865
2866 If STARTREV is specified, only those heads that are descendants of
2866 If STARTREV is specified, only those heads that are descendants of
2867 STARTREV will be displayed.
2867 STARTREV will be displayed.
2868
2868
2869 If -t/--topo is specified, named branch mechanics will be ignored and only
2869 If -t/--topo is specified, named branch mechanics will be ignored and only
2870 changesets without children will be shown.
2870 changesets without children will be shown.
2871
2871
2872 Returns 0 if matching heads are found, 1 if not.
2872 Returns 0 if matching heads are found, 1 if not.
2873 """
2873 """
2874
2874
2875 start = None
2875 start = None
2876 if 'rev' in opts:
2876 if 'rev' in opts:
2877 start = scmutil.revsingle(repo, opts['rev'], None).node()
2877 start = scmutil.revsingle(repo, opts['rev'], None).node()
2878
2878
2879 if opts.get('topo'):
2879 if opts.get('topo'):
2880 heads = [repo[h] for h in repo.heads(start)]
2880 heads = [repo[h] for h in repo.heads(start)]
2881 else:
2881 else:
2882 heads = []
2882 heads = []
2883 for branch in repo.branchmap():
2883 for branch in repo.branchmap():
2884 heads += repo.branchheads(branch, start, opts.get('closed'))
2884 heads += repo.branchheads(branch, start, opts.get('closed'))
2885 heads = [repo[h] for h in heads]
2885 heads = [repo[h] for h in heads]
2886
2886
2887 if branchrevs:
2887 if branchrevs:
2888 branches = set(repo[br].branch() for br in branchrevs)
2888 branches = set(repo[br].branch() for br in branchrevs)
2889 heads = [h for h in heads if h.branch() in branches]
2889 heads = [h for h in heads if h.branch() in branches]
2890
2890
2891 if opts.get('active') and branchrevs:
2891 if opts.get('active') and branchrevs:
2892 dagheads = repo.heads(start)
2892 dagheads = repo.heads(start)
2893 heads = [h for h in heads if h.node() in dagheads]
2893 heads = [h for h in heads if h.node() in dagheads]
2894
2894
2895 if branchrevs:
2895 if branchrevs:
2896 haveheads = set(h.branch() for h in heads)
2896 haveheads = set(h.branch() for h in heads)
2897 if branches - haveheads:
2897 if branches - haveheads:
2898 headless = ', '.join(b for b in branches - haveheads)
2898 headless = ', '.join(b for b in branches - haveheads)
2899 msg = _('no open branch heads found on branches %s')
2899 msg = _('no open branch heads found on branches %s')
2900 if opts.get('rev'):
2900 if opts.get('rev'):
2901 msg += _(' (started at %s)' % opts['rev'])
2901 msg += _(' (started at %s)' % opts['rev'])
2902 ui.warn((msg + '\n') % headless)
2902 ui.warn((msg + '\n') % headless)
2903
2903
2904 if not heads:
2904 if not heads:
2905 return 1
2905 return 1
2906
2906
2907 heads = sorted(heads, key=lambda x: -x.rev())
2907 heads = sorted(heads, key=lambda x: -x.rev())
2908 displayer = cmdutil.show_changeset(ui, repo, opts)
2908 displayer = cmdutil.show_changeset(ui, repo, opts)
2909 for ctx in heads:
2909 for ctx in heads:
2910 displayer.show(ctx)
2910 displayer.show(ctx)
2911 displayer.close()
2911 displayer.close()
2912
2912
2913 @command('help',
2913 @command('help',
2914 [('e', 'extension', None, _('show only help for extensions')),
2914 [('e', 'extension', None, _('show only help for extensions')),
2915 ('c', 'command', None, _('show only help for commands'))],
2915 ('c', 'command', None, _('show only help for commands'))],
2916 _('[-ec] [TOPIC]'))
2916 _('[-ec] [TOPIC]'))
2917 def help_(ui, name=None, unknowncmd=False, full=True, **opts):
2917 def help_(ui, name=None, unknowncmd=False, full=True, **opts):
2918 """show help for a given topic or a help overview
2918 """show help for a given topic or a help overview
2919
2919
2920 With no arguments, print a list of commands with short help messages.
2920 With no arguments, print a list of commands with short help messages.
2921
2921
2922 Given a topic, extension, or command name, print help for that
2922 Given a topic, extension, or command name, print help for that
2923 topic.
2923 topic.
2924
2924
2925 Returns 0 if successful.
2925 Returns 0 if successful.
2926 """
2926 """
2927
2927
2928 textwidth = min(ui.termwidth(), 80) - 2
2928 textwidth = min(ui.termwidth(), 80) - 2
2929
2929
2930 def optrst(options):
2930 def optrst(options):
2931 data = []
2931 data = []
2932 multioccur = False
2932 multioccur = False
2933 for option in options:
2933 for option in options:
2934 if len(option) == 5:
2934 if len(option) == 5:
2935 shortopt, longopt, default, desc, optlabel = option
2935 shortopt, longopt, default, desc, optlabel = option
2936 else:
2936 else:
2937 shortopt, longopt, default, desc = option
2937 shortopt, longopt, default, desc = option
2938 optlabel = _("VALUE") # default label
2938 optlabel = _("VALUE") # default label
2939
2939
2940 if _("DEPRECATED") in desc and not ui.verbose:
2940 if _("DEPRECATED") in desc and not ui.verbose:
2941 continue
2941 continue
2942
2942
2943 so = ''
2943 so = ''
2944 if shortopt:
2944 if shortopt:
2945 so = '-' + shortopt
2945 so = '-' + shortopt
2946 lo = '--' + longopt
2946 lo = '--' + longopt
2947 if default:
2947 if default:
2948 desc += _(" (default: %s)") % default
2948 desc += _(" (default: %s)") % default
2949
2949
2950 if isinstance(default, list):
2950 if isinstance(default, list):
2951 lo += " %s [+]" % optlabel
2951 lo += " %s [+]" % optlabel
2952 multioccur = True
2952 multioccur = True
2953 elif (default is not None) and not isinstance(default, bool):
2953 elif (default is not None) and not isinstance(default, bool):
2954 lo += " %s" % optlabel
2954 lo += " %s" % optlabel
2955
2955
2956 data.append((so, lo, desc))
2956 data.append((so, lo, desc))
2957
2957
2958 rst = minirst.maketable(data, 1)
2958 rst = minirst.maketable(data, 1)
2959
2959
2960 if multioccur:
2960 if multioccur:
2961 rst += _("\n[+] marked option can be specified multiple times\n")
2961 rst += _("\n[+] marked option can be specified multiple times\n")
2962
2962
2963 return rst
2963 return rst
2964
2964
2965 # list all option lists
2965 # list all option lists
2966 def opttext(optlist, width):
2966 def opttext(optlist, width):
2967 rst = ''
2967 rst = ''
2968 if not optlist:
2968 if not optlist:
2969 return ''
2969 return ''
2970
2970
2971 for title, options in optlist:
2971 for title, options in optlist:
2972 rst += '\n%s\n' % title
2972 rst += '\n%s\n' % title
2973 if options:
2973 if options:
2974 rst += "\n"
2974 rst += "\n"
2975 rst += optrst(options)
2975 rst += optrst(options)
2976 rst += '\n'
2976 rst += '\n'
2977
2977
2978 return '\n' + minirst.format(rst, width)
2978 return '\n' + minirst.format(rst, width)
2979
2979
2980 def addglobalopts(optlist, aliases):
2980 def addglobalopts(optlist, aliases):
2981 if ui.quiet:
2981 if ui.quiet:
2982 return []
2982 return []
2983
2983
2984 if ui.verbose:
2984 if ui.verbose:
2985 optlist.append((_("global options:"), globalopts))
2985 optlist.append((_("global options:"), globalopts))
2986 if name == 'shortlist':
2986 if name == 'shortlist':
2987 optlist.append((_('use "hg help" for the full list '
2987 optlist.append((_('use "hg help" for the full list '
2988 'of commands'), ()))
2988 'of commands'), ()))
2989 else:
2989 else:
2990 if name == 'shortlist':
2990 if name == 'shortlist':
2991 msg = _('use "hg help" for the full list of commands '
2991 msg = _('use "hg help" for the full list of commands '
2992 'or "hg -v" for details')
2992 'or "hg -v" for details')
2993 elif name and not full:
2993 elif name and not full:
2994 msg = _('use "hg help %s" to show the full help text' % name)
2994 msg = _('use "hg help %s" to show the full help text' % name)
2995 elif aliases:
2995 elif aliases:
2996 msg = _('use "hg -v help%s" to show builtin aliases and '
2996 msg = _('use "hg -v help%s" to show builtin aliases and '
2997 'global options') % (name and " " + name or "")
2997 'global options') % (name and " " + name or "")
2998 else:
2998 else:
2999 msg = _('use "hg -v help %s" to show more info') % name
2999 msg = _('use "hg -v help %s" to show more info') % name
3000 optlist.append((msg, ()))
3000 optlist.append((msg, ()))
3001
3001
3002 def helpcmd(name):
3002 def helpcmd(name):
3003 try:
3003 try:
3004 aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd)
3004 aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd)
3005 except error.AmbiguousCommand, inst:
3005 except error.AmbiguousCommand, inst:
3006 # py3k fix: except vars can't be used outside the scope of the
3006 # py3k fix: except vars can't be used outside the scope of the
3007 # except block, nor can be used inside a lambda. python issue4617
3007 # except block, nor can be used inside a lambda. python issue4617
3008 prefix = inst.args[0]
3008 prefix = inst.args[0]
3009 select = lambda c: c.lstrip('^').startswith(prefix)
3009 select = lambda c: c.lstrip('^').startswith(prefix)
3010 helplist(select)
3010 helplist(select)
3011 return
3011 return
3012
3012
3013 # check if it's an invalid alias and display its error if it is
3013 # check if it's an invalid alias and display its error if it is
3014 if getattr(entry[0], 'badalias', False):
3014 if getattr(entry[0], 'badalias', False):
3015 if not unknowncmd:
3015 if not unknowncmd:
3016 entry[0](ui)
3016 entry[0](ui)
3017 return
3017 return
3018
3018
3019 rst = ""
3019 rst = ""
3020
3020
3021 # synopsis
3021 # synopsis
3022 if len(entry) > 2:
3022 if len(entry) > 2:
3023 if entry[2].startswith('hg'):
3023 if entry[2].startswith('hg'):
3024 rst += "%s\n" % entry[2]
3024 rst += "%s\n" % entry[2]
3025 else:
3025 else:
3026 rst += 'hg %s %s\n' % (aliases[0], entry[2])
3026 rst += 'hg %s %s\n' % (aliases[0], entry[2])
3027 else:
3027 else:
3028 rst += 'hg %s\n' % aliases[0]
3028 rst += 'hg %s\n' % aliases[0]
3029
3029
3030 # aliases
3030 # aliases
3031 if full and not ui.quiet and len(aliases) > 1:
3031 if full and not ui.quiet and len(aliases) > 1:
3032 rst += _("\naliases: %s\n") % ', '.join(aliases[1:])
3032 rst += _("\naliases: %s\n") % ', '.join(aliases[1:])
3033
3033
3034 # description
3034 # description
3035 doc = gettext(entry[0].__doc__)
3035 doc = gettext(entry[0].__doc__)
3036 if not doc:
3036 if not doc:
3037 doc = _("(no help text available)")
3037 doc = _("(no help text available)")
3038 if util.safehasattr(entry[0], 'definition'): # aliased command
3038 if util.safehasattr(entry[0], 'definition'): # aliased command
3039 if entry[0].definition.startswith('!'): # shell alias
3039 if entry[0].definition.startswith('!'): # shell alias
3040 doc = _('shell alias for::\n\n %s') % entry[0].definition[1:]
3040 doc = _('shell alias for::\n\n %s') % entry[0].definition[1:]
3041 else:
3041 else:
3042 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
3042 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
3043 if ui.quiet or not full:
3043 if ui.quiet or not full:
3044 doc = doc.splitlines()[0]
3044 doc = doc.splitlines()[0]
3045 rst += "\n" + doc + "\n"
3045 rst += "\n" + doc + "\n"
3046
3046
3047 # check if this command shadows a non-trivial (multi-line)
3047 # check if this command shadows a non-trivial (multi-line)
3048 # extension help text
3048 # extension help text
3049 try:
3049 try:
3050 mod = extensions.find(name)
3050 mod = extensions.find(name)
3051 doc = gettext(mod.__doc__) or ''
3051 doc = gettext(mod.__doc__) or ''
3052 if '\n' in doc.strip():
3052 if '\n' in doc.strip():
3053 msg = _('use "hg help -e %s" to show help for '
3053 msg = _('use "hg help -e %s" to show help for '
3054 'the %s extension') % (name, name)
3054 'the %s extension') % (name, name)
3055 rst += '\n%s\n' % msg
3055 rst += '\n%s\n' % msg
3056 except KeyError:
3056 except KeyError:
3057 pass
3057 pass
3058
3058
3059 # options
3059 # options
3060 if not ui.quiet and entry[1]:
3060 if not ui.quiet and entry[1]:
3061 rst += '\noptions:\n\n'
3061 rst += '\noptions:\n\n'
3062 rst += optrst(entry[1])
3062 rst += optrst(entry[1])
3063
3063
3064 if ui.verbose:
3064 if ui.verbose:
3065 rst += '\nglobal options:\n\n'
3065 rst += '\nglobal options:\n\n'
3066 rst += optrst(globalopts)
3066 rst += optrst(globalopts)
3067
3067
3068 keep = ui.verbose and ['verbose'] or []
3068 keep = ui.verbose and ['verbose'] or []
3069 formatted, pruned = minirst.format(rst, textwidth, keep=keep)
3069 formatted, pruned = minirst.format(rst, textwidth, keep=keep)
3070 ui.write(formatted)
3070 ui.write(formatted)
3071
3071
3072 if not ui.verbose:
3072 if not ui.verbose:
3073 if not full:
3073 if not full:
3074 ui.write(_('\nuse "hg help %s" to show the full help text\n')
3074 ui.write(_('\nuse "hg help %s" to show the full help text\n')
3075 % name)
3075 % name)
3076 elif not ui.quiet:
3076 elif not ui.quiet:
3077 ui.write(_('\nuse "hg -v help %s" to show more info\n') % name)
3077 ui.write(_('\nuse "hg -v help %s" to show more info\n') % name)
3078
3078
3079
3079
3080 def helplist(select=None):
3080 def helplist(select=None):
3081 # list of commands
3081 # list of commands
3082 if name == "shortlist":
3082 if name == "shortlist":
3083 header = _('basic commands:\n\n')
3083 header = _('basic commands:\n\n')
3084 else:
3084 else:
3085 header = _('list of commands:\n\n')
3085 header = _('list of commands:\n\n')
3086
3086
3087 h = {}
3087 h = {}
3088 cmds = {}
3088 cmds = {}
3089 for c, e in table.iteritems():
3089 for c, e in table.iteritems():
3090 f = c.split("|", 1)[0]
3090 f = c.split("|", 1)[0]
3091 if select and not select(f):
3091 if select and not select(f):
3092 continue
3092 continue
3093 if (not select and name != 'shortlist' and
3093 if (not select and name != 'shortlist' and
3094 e[0].__module__ != __name__):
3094 e[0].__module__ != __name__):
3095 continue
3095 continue
3096 if name == "shortlist" and not f.startswith("^"):
3096 if name == "shortlist" and not f.startswith("^"):
3097 continue
3097 continue
3098 f = f.lstrip("^")
3098 f = f.lstrip("^")
3099 if not ui.debugflag and f.startswith("debug"):
3099 if not ui.debugflag and f.startswith("debug"):
3100 continue
3100 continue
3101 doc = e[0].__doc__
3101 doc = e[0].__doc__
3102 if doc and 'DEPRECATED' in doc and not ui.verbose:
3102 if doc and 'DEPRECATED' in doc and not ui.verbose:
3103 continue
3103 continue
3104 doc = gettext(doc)
3104 doc = gettext(doc)
3105 if not doc:
3105 if not doc:
3106 doc = _("(no help text available)")
3106 doc = _("(no help text available)")
3107 h[f] = doc.splitlines()[0].rstrip()
3107 h[f] = doc.splitlines()[0].rstrip()
3108 cmds[f] = c.lstrip("^")
3108 cmds[f] = c.lstrip("^")
3109
3109
3110 if not h:
3110 if not h:
3111 ui.status(_('no commands defined\n'))
3111 ui.status(_('no commands defined\n'))
3112 return
3112 return
3113
3113
3114 ui.status(header)
3114 ui.status(header)
3115 fns = sorted(h)
3115 fns = sorted(h)
3116 m = max(map(len, fns))
3116 m = max(map(len, fns))
3117 for f in fns:
3117 for f in fns:
3118 if ui.verbose:
3118 if ui.verbose:
3119 commands = cmds[f].replace("|",", ")
3119 commands = cmds[f].replace("|",", ")
3120 ui.write(" %s:\n %s\n"%(commands, h[f]))
3120 ui.write(" %s:\n %s\n"%(commands, h[f]))
3121 else:
3121 else:
3122 ui.write('%s\n' % (util.wrap(h[f], textwidth,
3122 ui.write('%s\n' % (util.wrap(h[f], textwidth,
3123 initindent=' %-*s ' % (m, f),
3123 initindent=' %-*s ' % (m, f),
3124 hangindent=' ' * (m + 4))))
3124 hangindent=' ' * (m + 4))))
3125
3125
3126 if not name:
3126 if not name:
3127 text = help.listexts(_('enabled extensions:'), extensions.enabled())
3127 text = help.listexts(_('enabled extensions:'), extensions.enabled())
3128 if text:
3128 if text:
3129 ui.write("\n%s" % minirst.format(text, textwidth))
3129 ui.write("\n%s" % minirst.format(text, textwidth))
3130
3130
3131 ui.write(_("\nadditional help topics:\n\n"))
3131 ui.write(_("\nadditional help topics:\n\n"))
3132 topics = []
3132 topics = []
3133 for names, header, doc in help.helptable:
3133 for names, header, doc in help.helptable:
3134 topics.append((sorted(names, key=len, reverse=True)[0], header))
3134 topics.append((sorted(names, key=len, reverse=True)[0], header))
3135 topics_len = max([len(s[0]) for s in topics])
3135 topics_len = max([len(s[0]) for s in topics])
3136 for t, desc in topics:
3136 for t, desc in topics:
3137 ui.write(" %-*s %s\n" % (topics_len, t, desc))
3137 ui.write(" %-*s %s\n" % (topics_len, t, desc))
3138
3138
3139 optlist = []
3139 optlist = []
3140 addglobalopts(optlist, True)
3140 addglobalopts(optlist, True)
3141 ui.write(opttext(optlist, textwidth))
3141 ui.write(opttext(optlist, textwidth))
3142
3142
3143 def helptopic(name):
3143 def helptopic(name):
3144 for names, header, doc in help.helptable:
3144 for names, header, doc in help.helptable:
3145 if name in names:
3145 if name in names:
3146 break
3146 break
3147 else:
3147 else:
3148 raise error.UnknownCommand(name)
3148 raise error.UnknownCommand(name)
3149
3149
3150 # description
3150 # description
3151 if not doc:
3151 if not doc:
3152 doc = _("(no help text available)")
3152 doc = _("(no help text available)")
3153 if util.safehasattr(doc, '__call__'):
3153 if util.safehasattr(doc, '__call__'):
3154 doc = doc()
3154 doc = doc()
3155
3155
3156 ui.write("%s\n\n" % header)
3156 ui.write("%s\n\n" % header)
3157 ui.write("%s" % minirst.format(doc, textwidth, indent=4))
3157 ui.write("%s" % minirst.format(doc, textwidth, indent=4))
3158 try:
3158 try:
3159 cmdutil.findcmd(name, table)
3159 cmdutil.findcmd(name, table)
3160 ui.write(_('\nuse "hg help -c %s" to see help for '
3160 ui.write(_('\nuse "hg help -c %s" to see help for '
3161 'the %s command\n') % (name, name))
3161 'the %s command\n') % (name, name))
3162 except error.UnknownCommand:
3162 except error.UnknownCommand:
3163 pass
3163 pass
3164
3164
3165 def helpext(name):
3165 def helpext(name):
3166 try:
3166 try:
3167 mod = extensions.find(name)
3167 mod = extensions.find(name)
3168 doc = gettext(mod.__doc__) or _('no help text available')
3168 doc = gettext(mod.__doc__) or _('no help text available')
3169 except KeyError:
3169 except KeyError:
3170 mod = None
3170 mod = None
3171 doc = extensions.disabledext(name)
3171 doc = extensions.disabledext(name)
3172 if not doc:
3172 if not doc:
3173 raise error.UnknownCommand(name)
3173 raise error.UnknownCommand(name)
3174
3174
3175 if '\n' not in doc:
3175 if '\n' not in doc:
3176 head, tail = doc, ""
3176 head, tail = doc, ""
3177 else:
3177 else:
3178 head, tail = doc.split('\n', 1)
3178 head, tail = doc.split('\n', 1)
3179 ui.write(_('%s extension - %s\n\n') % (name.split('.')[-1], head))
3179 ui.write(_('%s extension - %s\n\n') % (name.split('.')[-1], head))
3180 if tail:
3180 if tail:
3181 ui.write(minirst.format(tail, textwidth))
3181 ui.write(minirst.format(tail, textwidth))
3182 ui.status('\n')
3182 ui.status('\n')
3183
3183
3184 if mod:
3184 if mod:
3185 try:
3185 try:
3186 ct = mod.cmdtable
3186 ct = mod.cmdtable
3187 except AttributeError:
3187 except AttributeError:
3188 ct = {}
3188 ct = {}
3189 modcmds = set([c.split('|', 1)[0] for c in ct])
3189 modcmds = set([c.split('|', 1)[0] for c in ct])
3190 helplist(modcmds.__contains__)
3190 helplist(modcmds.__contains__)
3191 else:
3191 else:
3192 ui.write(_('use "hg help extensions" for information on enabling '
3192 ui.write(_('use "hg help extensions" for information on enabling '
3193 'extensions\n'))
3193 'extensions\n'))
3194
3194
3195 def helpextcmd(name):
3195 def helpextcmd(name):
3196 cmd, ext, mod = extensions.disabledcmd(ui, name, ui.config('ui', 'strict'))
3196 cmd, ext, mod = extensions.disabledcmd(ui, name, ui.config('ui', 'strict'))
3197 doc = gettext(mod.__doc__).splitlines()[0]
3197 doc = gettext(mod.__doc__).splitlines()[0]
3198
3198
3199 msg = help.listexts(_("'%s' is provided by the following "
3199 msg = help.listexts(_("'%s' is provided by the following "
3200 "extension:") % cmd, {ext: doc}, indent=4)
3200 "extension:") % cmd, {ext: doc}, indent=4)
3201 ui.write(minirst.format(msg, textwidth))
3201 ui.write(minirst.format(msg, textwidth))
3202 ui.write('\n')
3202 ui.write('\n')
3203 ui.write(_('use "hg help extensions" for information on enabling '
3203 ui.write(_('use "hg help extensions" for information on enabling '
3204 'extensions\n'))
3204 'extensions\n'))
3205
3205
3206 if name and name != 'shortlist':
3206 if name and name != 'shortlist':
3207 i = None
3207 i = None
3208 if unknowncmd:
3208 if unknowncmd:
3209 queries = (helpextcmd,)
3209 queries = (helpextcmd,)
3210 elif opts.get('extension'):
3210 elif opts.get('extension'):
3211 queries = (helpext,)
3211 queries = (helpext,)
3212 elif opts.get('command'):
3212 elif opts.get('command'):
3213 queries = (helpcmd,)
3213 queries = (helpcmd,)
3214 else:
3214 else:
3215 queries = (helptopic, helpcmd, helpext, helpextcmd)
3215 queries = (helptopic, helpcmd, helpext, helpextcmd)
3216 for f in queries:
3216 for f in queries:
3217 try:
3217 try:
3218 f(name)
3218 f(name)
3219 i = None
3219 i = None
3220 break
3220 break
3221 except error.UnknownCommand, inst:
3221 except error.UnknownCommand, inst:
3222 i = inst
3222 i = inst
3223 if i:
3223 if i:
3224 raise i
3224 raise i
3225 else:
3225 else:
3226 # program name
3226 # program name
3227 ui.status(_("Mercurial Distributed SCM\n"))
3227 ui.status(_("Mercurial Distributed SCM\n"))
3228 ui.status('\n')
3228 ui.status('\n')
3229 helplist()
3229 helplist()
3230
3230
3231
3231
3232 @command('identify|id',
3232 @command('identify|id',
3233 [('r', 'rev', '',
3233 [('r', 'rev', '',
3234 _('identify the specified revision'), _('REV')),
3234 _('identify the specified revision'), _('REV')),
3235 ('n', 'num', None, _('show local revision number')),
3235 ('n', 'num', None, _('show local revision number')),
3236 ('i', 'id', None, _('show global revision id')),
3236 ('i', 'id', None, _('show global revision id')),
3237 ('b', 'branch', None, _('show branch')),
3237 ('b', 'branch', None, _('show branch')),
3238 ('t', 'tags', None, _('show tags')),
3238 ('t', 'tags', None, _('show tags')),
3239 ('B', 'bookmarks', None, _('show bookmarks'))],
3239 ('B', 'bookmarks', None, _('show bookmarks'))],
3240 _('[-nibtB] [-r REV] [SOURCE]'))
3240 _('[-nibtB] [-r REV] [SOURCE]'))
3241 def identify(ui, repo, source=None, rev=None,
3241 def identify(ui, repo, source=None, rev=None,
3242 num=None, id=None, branch=None, tags=None, bookmarks=None):
3242 num=None, id=None, branch=None, tags=None, bookmarks=None):
3243 """identify the working copy or specified revision
3243 """identify the working copy or specified revision
3244
3244
3245 Print a summary identifying the repository state at REV using one or
3245 Print a summary identifying the repository state at REV using one or
3246 two parent hash identifiers, followed by a "+" if the working
3246 two parent hash identifiers, followed by a "+" if the working
3247 directory has uncommitted changes, the branch name (if not default),
3247 directory has uncommitted changes, the branch name (if not default),
3248 a list of tags, and a list of bookmarks.
3248 a list of tags, and a list of bookmarks.
3249
3249
3250 When REV is not given, print a summary of the current state of the
3250 When REV is not given, print a summary of the current state of the
3251 repository.
3251 repository.
3252
3252
3253 Specifying a path to a repository root or Mercurial bundle will
3253 Specifying a path to a repository root or Mercurial bundle will
3254 cause lookup to operate on that repository/bundle.
3254 cause lookup to operate on that repository/bundle.
3255
3255
3256 .. container:: verbose
3256 .. container:: verbose
3257
3257
3258 Examples:
3258 Examples:
3259
3259
3260 - generate a build identifier for the working directory::
3260 - generate a build identifier for the working directory::
3261
3261
3262 hg id --id > build-id.dat
3262 hg id --id > build-id.dat
3263
3263
3264 - find the revision corresponding to a tag::
3264 - find the revision corresponding to a tag::
3265
3265
3266 hg id -n -r 1.3
3266 hg id -n -r 1.3
3267
3267
3268 - check the most recent revision of a remote repository::
3268 - check the most recent revision of a remote repository::
3269
3269
3270 hg id -r tip http://selenic.com/hg/
3270 hg id -r tip http://selenic.com/hg/
3271
3271
3272 Returns 0 if successful.
3272 Returns 0 if successful.
3273 """
3273 """
3274
3274
3275 if not repo and not source:
3275 if not repo and not source:
3276 raise util.Abort(_("there is no Mercurial repository here "
3276 raise util.Abort(_("there is no Mercurial repository here "
3277 "(.hg not found)"))
3277 "(.hg not found)"))
3278
3278
3279 hexfunc = ui.debugflag and hex or short
3279 hexfunc = ui.debugflag and hex or short
3280 default = not (num or id or branch or tags or bookmarks)
3280 default = not (num or id or branch or tags or bookmarks)
3281 output = []
3281 output = []
3282 revs = []
3282 revs = []
3283
3283
3284 if source:
3284 if source:
3285 source, branches = hg.parseurl(ui.expandpath(source))
3285 source, branches = hg.parseurl(ui.expandpath(source))
3286 repo = hg.peer(ui, {}, source)
3286 repo = hg.peer(ui, {}, source)
3287 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
3287 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
3288
3288
3289 if not repo.local():
3289 if not repo.local():
3290 if num or branch or tags:
3290 if num or branch or tags:
3291 raise util.Abort(
3291 raise util.Abort(
3292 _("can't query remote revision number, branch, or tags"))
3292 _("can't query remote revision number, branch, or tags"))
3293 if not rev and revs:
3293 if not rev and revs:
3294 rev = revs[0]
3294 rev = revs[0]
3295 if not rev:
3295 if not rev:
3296 rev = "tip"
3296 rev = "tip"
3297
3297
3298 remoterev = repo.lookup(rev)
3298 remoterev = repo.lookup(rev)
3299 if default or id:
3299 if default or id:
3300 output = [hexfunc(remoterev)]
3300 output = [hexfunc(remoterev)]
3301
3301
3302 def getbms():
3302 def getbms():
3303 bms = []
3303 bms = []
3304
3304
3305 if 'bookmarks' in repo.listkeys('namespaces'):
3305 if 'bookmarks' in repo.listkeys('namespaces'):
3306 hexremoterev = hex(remoterev)
3306 hexremoterev = hex(remoterev)
3307 bms = [bm for bm, bmr in repo.listkeys('bookmarks').iteritems()
3307 bms = [bm for bm, bmr in repo.listkeys('bookmarks').iteritems()
3308 if bmr == hexremoterev]
3308 if bmr == hexremoterev]
3309
3309
3310 return bms
3310 return bms
3311
3311
3312 if bookmarks:
3312 if bookmarks:
3313 output.extend(getbms())
3313 output.extend(getbms())
3314 elif default and not ui.quiet:
3314 elif default and not ui.quiet:
3315 # multiple bookmarks for a single parent separated by '/'
3315 # multiple bookmarks for a single parent separated by '/'
3316 bm = '/'.join(getbms())
3316 bm = '/'.join(getbms())
3317 if bm:
3317 if bm:
3318 output.append(bm)
3318 output.append(bm)
3319 else:
3319 else:
3320 if not rev:
3320 if not rev:
3321 ctx = repo[None]
3321 ctx = repo[None]
3322 parents = ctx.parents()
3322 parents = ctx.parents()
3323 changed = ""
3323 changed = ""
3324 if default or id or num:
3324 if default or id or num:
3325 changed = util.any(repo.status()) and "+" or ""
3325 changed = util.any(repo.status()) and "+" or ""
3326 if default or id:
3326 if default or id:
3327 output = ["%s%s" %
3327 output = ["%s%s" %
3328 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
3328 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
3329 if num:
3329 if num:
3330 output.append("%s%s" %
3330 output.append("%s%s" %
3331 ('+'.join([str(p.rev()) for p in parents]), changed))
3331 ('+'.join([str(p.rev()) for p in parents]), changed))
3332 else:
3332 else:
3333 ctx = scmutil.revsingle(repo, rev)
3333 ctx = scmutil.revsingle(repo, rev)
3334 if default or id:
3334 if default or id:
3335 output = [hexfunc(ctx.node())]
3335 output = [hexfunc(ctx.node())]
3336 if num:
3336 if num:
3337 output.append(str(ctx.rev()))
3337 output.append(str(ctx.rev()))
3338
3338
3339 if default and not ui.quiet:
3339 if default and not ui.quiet:
3340 b = ctx.branch()
3340 b = ctx.branch()
3341 if b != 'default':
3341 if b != 'default':
3342 output.append("(%s)" % b)
3342 output.append("(%s)" % b)
3343
3343
3344 # multiple tags for a single parent separated by '/'
3344 # multiple tags for a single parent separated by '/'
3345 t = '/'.join(ctx.tags())
3345 t = '/'.join(ctx.tags())
3346 if t:
3346 if t:
3347 output.append(t)
3347 output.append(t)
3348
3348
3349 # multiple bookmarks for a single parent separated by '/'
3349 # multiple bookmarks for a single parent separated by '/'
3350 bm = '/'.join(ctx.bookmarks())
3350 bm = '/'.join(ctx.bookmarks())
3351 if bm:
3351 if bm:
3352 output.append(bm)
3352 output.append(bm)
3353 else:
3353 else:
3354 if branch:
3354 if branch:
3355 output.append(ctx.branch())
3355 output.append(ctx.branch())
3356
3356
3357 if tags:
3357 if tags:
3358 output.extend(ctx.tags())
3358 output.extend(ctx.tags())
3359
3359
3360 if bookmarks:
3360 if bookmarks:
3361 output.extend(ctx.bookmarks())
3361 output.extend(ctx.bookmarks())
3362
3362
3363 ui.write("%s\n" % ' '.join(output))
3363 ui.write("%s\n" % ' '.join(output))
3364
3364
3365 @command('import|patch',
3365 @command('import|patch',
3366 [('p', 'strip', 1,
3366 [('p', 'strip', 1,
3367 _('directory strip option for patch. This has the same '
3367 _('directory strip option for patch. This has the same '
3368 'meaning as the corresponding patch option'), _('NUM')),
3368 'meaning as the corresponding patch option'), _('NUM')),
3369 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3369 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3370 ('e', 'edit', False, _('invoke editor on commit messages')),
3370 ('e', 'edit', False, _('invoke editor on commit messages')),
3371 ('f', 'force', None, _('skip check for outstanding uncommitted changes')),
3371 ('f', 'force', None, _('skip check for outstanding uncommitted changes')),
3372 ('', 'no-commit', None,
3372 ('', 'no-commit', None,
3373 _("don't commit, just update the working directory")),
3373 _("don't commit, just update the working directory")),
3374 ('', 'bypass', None,
3374 ('', 'bypass', None,
3375 _("apply patch without touching the working directory")),
3375 _("apply patch without touching the working directory")),
3376 ('', 'exact', None,
3376 ('', 'exact', None,
3377 _('apply patch to the nodes from which it was generated')),
3377 _('apply patch to the nodes from which it was generated')),
3378 ('', 'import-branch', None,
3378 ('', 'import-branch', None,
3379 _('use any branch information in patch (implied by --exact)'))] +
3379 _('use any branch information in patch (implied by --exact)'))] +
3380 commitopts + commitopts2 + similarityopts,
3380 commitopts + commitopts2 + similarityopts,
3381 _('[OPTION]... PATCH...'))
3381 _('[OPTION]... PATCH...'))
3382 def import_(ui, repo, patch1=None, *patches, **opts):
3382 def import_(ui, repo, patch1=None, *patches, **opts):
3383 """import an ordered set of patches
3383 """import an ordered set of patches
3384
3384
3385 Import a list of patches and commit them individually (unless
3385 Import a list of patches and commit them individually (unless
3386 --no-commit is specified).
3386 --no-commit is specified).
3387
3387
3388 If there are outstanding changes in the working directory, import
3388 If there are outstanding changes in the working directory, import
3389 will abort unless given the -f/--force flag.
3389 will abort unless given the -f/--force flag.
3390
3390
3391 You can import a patch straight from a mail message. Even patches
3391 You can import a patch straight from a mail message. Even patches
3392 as attachments work (to use the body part, it must have type
3392 as attachments work (to use the body part, it must have type
3393 text/plain or text/x-patch). From and Subject headers of email
3393 text/plain or text/x-patch). From and Subject headers of email
3394 message are used as default committer and commit message. All
3394 message are used as default committer and commit message. All
3395 text/plain body parts before first diff are added to commit
3395 text/plain body parts before first diff are added to commit
3396 message.
3396 message.
3397
3397
3398 If the imported patch was generated by :hg:`export`, user and
3398 If the imported patch was generated by :hg:`export`, user and
3399 description from patch override values from message headers and
3399 description from patch override values from message headers and
3400 body. Values given on command line with -m/--message and -u/--user
3400 body. Values given on command line with -m/--message and -u/--user
3401 override these.
3401 override these.
3402
3402
3403 If --exact is specified, import will set the working directory to
3403 If --exact is specified, import will set the working directory to
3404 the parent of each patch before applying it, and will abort if the
3404 the parent of each patch before applying it, and will abort if the
3405 resulting changeset has a different ID than the one recorded in
3405 resulting changeset has a different ID than the one recorded in
3406 the patch. This may happen due to character set problems or other
3406 the patch. This may happen due to character set problems or other
3407 deficiencies in the text patch format.
3407 deficiencies in the text patch format.
3408
3408
3409 Use --bypass to apply and commit patches directly to the
3409 Use --bypass to apply and commit patches directly to the
3410 repository, not touching the working directory. Without --exact,
3410 repository, not touching the working directory. Without --exact,
3411 patches will be applied on top of the working directory parent
3411 patches will be applied on top of the working directory parent
3412 revision.
3412 revision.
3413
3413
3414 With -s/--similarity, hg will attempt to discover renames and
3414 With -s/--similarity, hg will attempt to discover renames and
3415 copies in the patch in the same way as 'addremove'.
3415 copies in the patch in the same way as 'addremove'.
3416
3416
3417 To read a patch from standard input, use "-" as the patch name. If
3417 To read a patch from standard input, use "-" as the patch name. If
3418 a URL is specified, the patch will be downloaded from it.
3418 a URL is specified, the patch will be downloaded from it.
3419 See :hg:`help dates` for a list of formats valid for -d/--date.
3419 See :hg:`help dates` for a list of formats valid for -d/--date.
3420
3420
3421 .. container:: verbose
3421 .. container:: verbose
3422
3422
3423 Examples:
3423 Examples:
3424
3424
3425 - import a traditional patch from a website and detect renames::
3425 - import a traditional patch from a website and detect renames::
3426
3426
3427 hg import -s 80 http://example.com/bugfix.patch
3427 hg import -s 80 http://example.com/bugfix.patch
3428
3428
3429 - import a changeset from an hgweb server::
3429 - import a changeset from an hgweb server::
3430
3430
3431 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
3431 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
3432
3432
3433 - import all the patches in an Unix-style mbox::
3433 - import all the patches in an Unix-style mbox::
3434
3434
3435 hg import incoming-patches.mbox
3435 hg import incoming-patches.mbox
3436
3436
3437 - attempt to exactly restore an exported changeset (not always
3437 - attempt to exactly restore an exported changeset (not always
3438 possible)::
3438 possible)::
3439
3439
3440 hg import --exact proposed-fix.patch
3440 hg import --exact proposed-fix.patch
3441
3441
3442 Returns 0 on success.
3442 Returns 0 on success.
3443 """
3443 """
3444
3444
3445 if not patch1:
3445 if not patch1:
3446 raise util.Abort(_('need at least one patch to import'))
3446 raise util.Abort(_('need at least one patch to import'))
3447
3447
3448 patches = (patch1,) + patches
3448 patches = (patch1,) + patches
3449
3449
3450 date = opts.get('date')
3450 date = opts.get('date')
3451 if date:
3451 if date:
3452 opts['date'] = util.parsedate(date)
3452 opts['date'] = util.parsedate(date)
3453
3453
3454 editor = cmdutil.commiteditor
3454 editor = cmdutil.commiteditor
3455 if opts.get('edit'):
3455 if opts.get('edit'):
3456 editor = cmdutil.commitforceeditor
3456 editor = cmdutil.commitforceeditor
3457
3457
3458 update = not opts.get('bypass')
3458 update = not opts.get('bypass')
3459 if not update and opts.get('no_commit'):
3459 if not update and opts.get('no_commit'):
3460 raise util.Abort(_('cannot use --no-commit with --bypass'))
3460 raise util.Abort(_('cannot use --no-commit with --bypass'))
3461 try:
3461 try:
3462 sim = float(opts.get('similarity') or 0)
3462 sim = float(opts.get('similarity') or 0)
3463 except ValueError:
3463 except ValueError:
3464 raise util.Abort(_('similarity must be a number'))
3464 raise util.Abort(_('similarity must be a number'))
3465 if sim < 0 or sim > 100:
3465 if sim < 0 or sim > 100:
3466 raise util.Abort(_('similarity must be between 0 and 100'))
3466 raise util.Abort(_('similarity must be between 0 and 100'))
3467 if sim and not update:
3467 if sim and not update:
3468 raise util.Abort(_('cannot use --similarity with --bypass'))
3468 raise util.Abort(_('cannot use --similarity with --bypass'))
3469
3469
3470 if (opts.get('exact') or not opts.get('force')) and update:
3470 if (opts.get('exact') or not opts.get('force')) and update:
3471 cmdutil.bailifchanged(repo)
3471 cmdutil.bailifchanged(repo)
3472
3472
3473 base = opts["base"]
3473 base = opts["base"]
3474 strip = opts["strip"]
3474 strip = opts["strip"]
3475 wlock = lock = tr = None
3475 wlock = lock = tr = None
3476 msgs = []
3476 msgs = []
3477
3477
3478 def checkexact(repo, n, nodeid):
3478 def checkexact(repo, n, nodeid):
3479 if opts.get('exact') and hex(n) != nodeid:
3479 if opts.get('exact') and hex(n) != nodeid:
3480 repo.rollback()
3480 repo.rollback()
3481 raise util.Abort(_('patch is damaged or loses information'))
3481 raise util.Abort(_('patch is damaged or loses information'))
3482
3482
3483 def tryone(ui, hunk, parents):
3483 def tryone(ui, hunk, parents):
3484 tmpname, message, user, date, branch, nodeid, p1, p2 = \
3484 tmpname, message, user, date, branch, nodeid, p1, p2 = \
3485 patch.extract(ui, hunk)
3485 patch.extract(ui, hunk)
3486
3486
3487 if not tmpname:
3487 if not tmpname:
3488 return (None, None)
3488 return (None, None)
3489 msg = _('applied to working directory')
3489 msg = _('applied to working directory')
3490
3490
3491 try:
3491 try:
3492 cmdline_message = cmdutil.logmessage(ui, opts)
3492 cmdline_message = cmdutil.logmessage(ui, opts)
3493 if cmdline_message:
3493 if cmdline_message:
3494 # pickup the cmdline msg
3494 # pickup the cmdline msg
3495 message = cmdline_message
3495 message = cmdline_message
3496 elif message:
3496 elif message:
3497 # pickup the patch msg
3497 # pickup the patch msg
3498 message = message.strip()
3498 message = message.strip()
3499 else:
3499 else:
3500 # launch the editor
3500 # launch the editor
3501 message = None
3501 message = None
3502 ui.debug('message:\n%s\n' % message)
3502 ui.debug('message:\n%s\n' % message)
3503
3503
3504 if len(parents) == 1:
3504 if len(parents) == 1:
3505 parents.append(repo[nullid])
3505 parents.append(repo[nullid])
3506 if opts.get('exact'):
3506 if opts.get('exact'):
3507 if not nodeid or not p1:
3507 if not nodeid or not p1:
3508 raise util.Abort(_('not a Mercurial patch'))
3508 raise util.Abort(_('not a Mercurial patch'))
3509 p1 = repo[p1]
3509 p1 = repo[p1]
3510 p2 = repo[p2 or nullid]
3510 p2 = repo[p2 or nullid]
3511 elif p2:
3511 elif p2:
3512 try:
3512 try:
3513 p1 = repo[p1]
3513 p1 = repo[p1]
3514 p2 = repo[p2]
3514 p2 = repo[p2]
3515 # Without any options, consider p2 only if the
3515 # Without any options, consider p2 only if the
3516 # patch is being applied on top of the recorded
3516 # patch is being applied on top of the recorded
3517 # first parent.
3517 # first parent.
3518 if p1 != parents[0]:
3518 if p1 != parents[0]:
3519 p1 = parents[0]
3519 p1 = parents[0]
3520 p2 = repo[nullid]
3520 p2 = repo[nullid]
3521 except error.RepoError:
3521 except error.RepoError:
3522 p1, p2 = parents
3522 p1, p2 = parents
3523 else:
3523 else:
3524 p1, p2 = parents
3524 p1, p2 = parents
3525
3525
3526 n = None
3526 n = None
3527 if update:
3527 if update:
3528 if p1 != parents[0]:
3528 if p1 != parents[0]:
3529 hg.clean(repo, p1.node())
3529 hg.clean(repo, p1.node())
3530 if p2 != parents[1]:
3530 if p2 != parents[1]:
3531 repo.dirstate.setparents(p1.node(), p2.node())
3531 repo.dirstate.setparents(p1.node(), p2.node())
3532
3532
3533 if opts.get('exact') or opts.get('import_branch'):
3533 if opts.get('exact') or opts.get('import_branch'):
3534 repo.dirstate.setbranch(branch or 'default')
3534 repo.dirstate.setbranch(branch or 'default')
3535
3535
3536 files = set()
3536 files = set()
3537 patch.patch(ui, repo, tmpname, strip=strip, files=files,
3537 patch.patch(ui, repo, tmpname, strip=strip, files=files,
3538 eolmode=None, similarity=sim / 100.0)
3538 eolmode=None, similarity=sim / 100.0)
3539 files = list(files)
3539 files = list(files)
3540 if opts.get('no_commit'):
3540 if opts.get('no_commit'):
3541 if message:
3541 if message:
3542 msgs.append(message)
3542 msgs.append(message)
3543 else:
3543 else:
3544 if opts.get('exact') or p2:
3544 if opts.get('exact') or p2:
3545 # If you got here, you either use --force and know what
3545 # If you got here, you either use --force and know what
3546 # you are doing or used --exact or a merge patch while
3546 # you are doing or used --exact or a merge patch while
3547 # being updated to its first parent.
3547 # being updated to its first parent.
3548 m = None
3548 m = None
3549 else:
3549 else:
3550 m = scmutil.matchfiles(repo, files or [])
3550 m = scmutil.matchfiles(repo, files or [])
3551 n = repo.commit(message, opts.get('user') or user,
3551 n = repo.commit(message, opts.get('user') or user,
3552 opts.get('date') or date, match=m,
3552 opts.get('date') or date, match=m,
3553 editor=editor)
3553 editor=editor)
3554 checkexact(repo, n, nodeid)
3554 checkexact(repo, n, nodeid)
3555 else:
3555 else:
3556 if opts.get('exact') or opts.get('import_branch'):
3556 if opts.get('exact') or opts.get('import_branch'):
3557 branch = branch or 'default'
3557 branch = branch or 'default'
3558 else:
3558 else:
3559 branch = p1.branch()
3559 branch = p1.branch()
3560 store = patch.filestore()
3560 store = patch.filestore()
3561 try:
3561 try:
3562 files = set()
3562 files = set()
3563 try:
3563 try:
3564 patch.patchrepo(ui, repo, p1, store, tmpname, strip,
3564 patch.patchrepo(ui, repo, p1, store, tmpname, strip,
3565 files, eolmode=None)
3565 files, eolmode=None)
3566 except patch.PatchError, e:
3566 except patch.PatchError, e:
3567 raise util.Abort(str(e))
3567 raise util.Abort(str(e))
3568 memctx = patch.makememctx(repo, (p1.node(), p2.node()),
3568 memctx = patch.makememctx(repo, (p1.node(), p2.node()),
3569 message,
3569 message,
3570 opts.get('user') or user,
3570 opts.get('user') or user,
3571 opts.get('date') or date,
3571 opts.get('date') or date,
3572 branch, files, store,
3572 branch, files, store,
3573 editor=cmdutil.commiteditor)
3573 editor=cmdutil.commiteditor)
3574 repo.savecommitmessage(memctx.description())
3574 repo.savecommitmessage(memctx.description())
3575 n = memctx.commit()
3575 n = memctx.commit()
3576 checkexact(repo, n, nodeid)
3576 checkexact(repo, n, nodeid)
3577 finally:
3577 finally:
3578 store.close()
3578 store.close()
3579 if n:
3579 if n:
3580 # i18n: refers to a short changeset id
3580 # i18n: refers to a short changeset id
3581 msg = _('created %s') % short(n)
3581 msg = _('created %s') % short(n)
3582 return (msg, n)
3582 return (msg, n)
3583 finally:
3583 finally:
3584 os.unlink(tmpname)
3584 os.unlink(tmpname)
3585
3585
3586 try:
3586 try:
3587 try:
3587 try:
3588 wlock = repo.wlock()
3588 wlock = repo.wlock()
3589 lock = repo.lock()
3589 lock = repo.lock()
3590 tr = repo.transaction('import')
3590 tr = repo.transaction('import')
3591 parents = repo.parents()
3591 parents = repo.parents()
3592 for patchurl in patches:
3592 for patchurl in patches:
3593 if patchurl == '-':
3593 if patchurl == '-':
3594 ui.status(_('applying patch from stdin\n'))
3594 ui.status(_('applying patch from stdin\n'))
3595 patchfile = ui.fin
3595 patchfile = ui.fin
3596 patchurl = 'stdin' # for error message
3596 patchurl = 'stdin' # for error message
3597 else:
3597 else:
3598 patchurl = os.path.join(base, patchurl)
3598 patchurl = os.path.join(base, patchurl)
3599 ui.status(_('applying %s\n') % patchurl)
3599 ui.status(_('applying %s\n') % patchurl)
3600 patchfile = url.open(ui, patchurl)
3600 patchfile = url.open(ui, patchurl)
3601
3601
3602 haspatch = False
3602 haspatch = False
3603 for hunk in patch.split(patchfile):
3603 for hunk in patch.split(patchfile):
3604 (msg, node) = tryone(ui, hunk, parents)
3604 (msg, node) = tryone(ui, hunk, parents)
3605 if msg:
3605 if msg:
3606 haspatch = True
3606 haspatch = True
3607 ui.note(msg + '\n')
3607 ui.note(msg + '\n')
3608 if update or opts.get('exact'):
3608 if update or opts.get('exact'):
3609 parents = repo.parents()
3609 parents = repo.parents()
3610 else:
3610 else:
3611 parents = [repo[node]]
3611 parents = [repo[node]]
3612
3612
3613 if not haspatch:
3613 if not haspatch:
3614 raise util.Abort(_('%s: no diffs found') % patchurl)
3614 raise util.Abort(_('%s: no diffs found') % patchurl)
3615
3615
3616 tr.close()
3616 tr.close()
3617 if msgs:
3617 if msgs:
3618 repo.savecommitmessage('\n* * *\n'.join(msgs))
3618 repo.savecommitmessage('\n* * *\n'.join(msgs))
3619 except:
3619 except:
3620 # wlock.release() indirectly calls dirstate.write(): since
3620 # wlock.release() indirectly calls dirstate.write(): since
3621 # we're crashing, we do not want to change the working dir
3621 # we're crashing, we do not want to change the working dir
3622 # parent after all, so make sure it writes nothing
3622 # parent after all, so make sure it writes nothing
3623 repo.dirstate.invalidate()
3623 repo.dirstate.invalidate()
3624 raise
3624 raise
3625 finally:
3625 finally:
3626 if tr:
3626 if tr:
3627 tr.release()
3627 tr.release()
3628 release(lock, wlock)
3628 release(lock, wlock)
3629
3629
3630 @command('incoming|in',
3630 @command('incoming|in',
3631 [('f', 'force', None,
3631 [('f', 'force', None,
3632 _('run even if remote repository is unrelated')),
3632 _('run even if remote repository is unrelated')),
3633 ('n', 'newest-first', None, _('show newest record first')),
3633 ('n', 'newest-first', None, _('show newest record first')),
3634 ('', 'bundle', '',
3634 ('', 'bundle', '',
3635 _('file to store the bundles into'), _('FILE')),
3635 _('file to store the bundles into'), _('FILE')),
3636 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3636 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3637 ('B', 'bookmarks', False, _("compare bookmarks")),
3637 ('B', 'bookmarks', False, _("compare bookmarks")),
3638 ('b', 'branch', [],
3638 ('b', 'branch', [],
3639 _('a specific branch you would like to pull'), _('BRANCH')),
3639 _('a specific branch you would like to pull'), _('BRANCH')),
3640 ] + logopts + remoteopts + subrepoopts,
3640 ] + logopts + remoteopts + subrepoopts,
3641 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3641 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3642 def incoming(ui, repo, source="default", **opts):
3642 def incoming(ui, repo, source="default", **opts):
3643 """show new changesets found in source
3643 """show new changesets found in source
3644
3644
3645 Show new changesets found in the specified path/URL or the default
3645 Show new changesets found in the specified path/URL or the default
3646 pull location. These are the changesets that would have been pulled
3646 pull location. These are the changesets that would have been pulled
3647 if a pull at the time you issued this command.
3647 if a pull at the time you issued this command.
3648
3648
3649 For remote repository, using --bundle avoids downloading the
3649 For remote repository, using --bundle avoids downloading the
3650 changesets twice if the incoming is followed by a pull.
3650 changesets twice if the incoming is followed by a pull.
3651
3651
3652 See pull for valid source format details.
3652 See pull for valid source format details.
3653
3653
3654 Returns 0 if there are incoming changes, 1 otherwise.
3654 Returns 0 if there are incoming changes, 1 otherwise.
3655 """
3655 """
3656 if opts.get('bundle') and opts.get('subrepos'):
3656 if opts.get('bundle') and opts.get('subrepos'):
3657 raise util.Abort(_('cannot combine --bundle and --subrepos'))
3657 raise util.Abort(_('cannot combine --bundle and --subrepos'))
3658
3658
3659 if opts.get('bookmarks'):
3659 if opts.get('bookmarks'):
3660 source, branches = hg.parseurl(ui.expandpath(source),
3660 source, branches = hg.parseurl(ui.expandpath(source),
3661 opts.get('branch'))
3661 opts.get('branch'))
3662 other = hg.peer(repo, opts, source)
3662 other = hg.peer(repo, opts, source)
3663 if 'bookmarks' not in other.listkeys('namespaces'):
3663 if 'bookmarks' not in other.listkeys('namespaces'):
3664 ui.warn(_("remote doesn't support bookmarks\n"))
3664 ui.warn(_("remote doesn't support bookmarks\n"))
3665 return 0
3665 return 0
3666 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3666 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3667 return bookmarks.diff(ui, repo, other)
3667 return bookmarks.diff(ui, repo, other)
3668
3668
3669 repo._subtoppath = ui.expandpath(source)
3669 repo._subtoppath = ui.expandpath(source)
3670 try:
3670 try:
3671 return hg.incoming(ui, repo, source, opts)
3671 return hg.incoming(ui, repo, source, opts)
3672 finally:
3672 finally:
3673 del repo._subtoppath
3673 del repo._subtoppath
3674
3674
3675
3675
3676 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'))
3676 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'))
3677 def init(ui, dest=".", **opts):
3677 def init(ui, dest=".", **opts):
3678 """create a new repository in the given directory
3678 """create a new repository in the given directory
3679
3679
3680 Initialize a new repository in the given directory. If the given
3680 Initialize a new repository in the given directory. If the given
3681 directory does not exist, it will be created.
3681 directory does not exist, it will be created.
3682
3682
3683 If no directory is given, the current directory is used.
3683 If no directory is given, the current directory is used.
3684
3684
3685 It is possible to specify an ``ssh://`` URL as the destination.
3685 It is possible to specify an ``ssh://`` URL as the destination.
3686 See :hg:`help urls` for more information.
3686 See :hg:`help urls` for more information.
3687
3687
3688 Returns 0 on success.
3688 Returns 0 on success.
3689 """
3689 """
3690 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3690 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3691
3691
3692 @command('locate',
3692 @command('locate',
3693 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3693 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3694 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3694 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3695 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3695 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3696 ] + walkopts,
3696 ] + walkopts,
3697 _('[OPTION]... [PATTERN]...'))
3697 _('[OPTION]... [PATTERN]...'))
3698 def locate(ui, repo, *pats, **opts):
3698 def locate(ui, repo, *pats, **opts):
3699 """locate files matching specific patterns
3699 """locate files matching specific patterns
3700
3700
3701 Print files under Mercurial control in the working directory whose
3701 Print files under Mercurial control in the working directory whose
3702 names match the given patterns.
3702 names match the given patterns.
3703
3703
3704 By default, this command searches all directories in the working
3704 By default, this command searches all directories in the working
3705 directory. To search just the current directory and its
3705 directory. To search just the current directory and its
3706 subdirectories, use "--include .".
3706 subdirectories, use "--include .".
3707
3707
3708 If no patterns are given to match, this command prints the names
3708 If no patterns are given to match, this command prints the names
3709 of all files under Mercurial control in the working directory.
3709 of all files under Mercurial control in the working directory.
3710
3710
3711 If you want to feed the output of this command into the "xargs"
3711 If you want to feed the output of this command into the "xargs"
3712 command, use the -0 option to both this command and "xargs". This
3712 command, use the -0 option to both this command and "xargs". This
3713 will avoid the problem of "xargs" treating single filenames that
3713 will avoid the problem of "xargs" treating single filenames that
3714 contain whitespace as multiple filenames.
3714 contain whitespace as multiple filenames.
3715
3715
3716 Returns 0 if a match is found, 1 otherwise.
3716 Returns 0 if a match is found, 1 otherwise.
3717 """
3717 """
3718 end = opts.get('print0') and '\0' or '\n'
3718 end = opts.get('print0') and '\0' or '\n'
3719 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3719 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3720
3720
3721 ret = 1
3721 ret = 1
3722 m = scmutil.match(repo[rev], pats, opts, default='relglob')
3722 m = scmutil.match(repo[rev], pats, opts, default='relglob')
3723 m.bad = lambda x, y: False
3723 m.bad = lambda x, y: False
3724 for abs in repo[rev].walk(m):
3724 for abs in repo[rev].walk(m):
3725 if not rev and abs not in repo.dirstate:
3725 if not rev and abs not in repo.dirstate:
3726 continue
3726 continue
3727 if opts.get('fullpath'):
3727 if opts.get('fullpath'):
3728 ui.write(repo.wjoin(abs), end)
3728 ui.write(repo.wjoin(abs), end)
3729 else:
3729 else:
3730 ui.write(((pats and m.rel(abs)) or abs), end)
3730 ui.write(((pats and m.rel(abs)) or abs), end)
3731 ret = 0
3731 ret = 0
3732
3732
3733 return ret
3733 return ret
3734
3734
3735 @command('^log|history',
3735 @command('^log|history',
3736 [('f', 'follow', None,
3736 [('f', 'follow', None,
3737 _('follow changeset history, or file history across copies and renames')),
3737 _('follow changeset history, or file history across copies and renames')),
3738 ('', 'follow-first', None,
3738 ('', 'follow-first', None,
3739 _('only follow the first parent of merge changesets')),
3739 _('only follow the first parent of merge changesets')),
3740 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3740 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3741 ('C', 'copies', None, _('show copied files')),
3741 ('C', 'copies', None, _('show copied files')),
3742 ('k', 'keyword', [],
3742 ('k', 'keyword', [],
3743 _('do case-insensitive search for a given text'), _('TEXT')),
3743 _('do case-insensitive search for a given text'), _('TEXT')),
3744 ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
3744 ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
3745 ('', 'removed', None, _('include revisions where files were removed')),
3745 ('', 'removed', None, _('include revisions where files were removed')),
3746 ('m', 'only-merges', None, _('show only merges')),
3746 ('m', 'only-merges', None, _('show only merges')),
3747 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3747 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3748 ('', 'only-branch', [],
3748 ('', 'only-branch', [],
3749 _('show only changesets within the given named branch (DEPRECATED)'),
3749 _('show only changesets within the given named branch (DEPRECATED)'),
3750 _('BRANCH')),
3750 _('BRANCH')),
3751 ('b', 'branch', [],
3751 ('b', 'branch', [],
3752 _('show changesets within the given named branch'), _('BRANCH')),
3752 _('show changesets within the given named branch'), _('BRANCH')),
3753 ('P', 'prune', [],
3753 ('P', 'prune', [],
3754 _('do not display revision or any of its ancestors'), _('REV')),
3754 _('do not display revision or any of its ancestors'), _('REV')),
3755 ('', 'hidden', False, _('show hidden changesets')),
3755 ('', 'hidden', False, _('show hidden changesets')),
3756 ] + logopts + walkopts,
3756 ] + logopts + walkopts,
3757 _('[OPTION]... [FILE]'))
3757 _('[OPTION]... [FILE]'))
3758 def log(ui, repo, *pats, **opts):
3758 def log(ui, repo, *pats, **opts):
3759 """show revision history of entire repository or files
3759 """show revision history of entire repository or files
3760
3760
3761 Print the revision history of the specified files or the entire
3761 Print the revision history of the specified files or the entire
3762 project.
3762 project.
3763
3763
3764 If no revision range is specified, the default is ``tip:0`` unless
3764 If no revision range is specified, the default is ``tip:0`` unless
3765 --follow is set, in which case the working directory parent is
3765 --follow is set, in which case the working directory parent is
3766 used as the starting revision.
3766 used as the starting revision.
3767
3767
3768 File history is shown without following rename or copy history of
3768 File history is shown without following rename or copy history of
3769 files. Use -f/--follow with a filename to follow history across
3769 files. Use -f/--follow with a filename to follow history across
3770 renames and copies. --follow without a filename will only show
3770 renames and copies. --follow without a filename will only show
3771 ancestors or descendants of the starting revision.
3771 ancestors or descendants of the starting revision.
3772
3772
3773 By default this command prints revision number and changeset id,
3773 By default this command prints revision number and changeset id,
3774 tags, non-trivial parents, user, date and time, and a summary for
3774 tags, non-trivial parents, user, date and time, and a summary for
3775 each commit. When the -v/--verbose switch is used, the list of
3775 each commit. When the -v/--verbose switch is used, the list of
3776 changed files and full commit message are shown.
3776 changed files and full commit message are shown.
3777
3777
3778 .. note::
3778 .. note::
3779 log -p/--patch may generate unexpected diff output for merge
3779 log -p/--patch may generate unexpected diff output for merge
3780 changesets, as it will only compare the merge changeset against
3780 changesets, as it will only compare the merge changeset against
3781 its first parent. Also, only files different from BOTH parents
3781 its first parent. Also, only files different from BOTH parents
3782 will appear in files:.
3782 will appear in files:.
3783
3783
3784 .. note::
3784 .. note::
3785 for performance reasons, log FILE may omit duplicate changes
3785 for performance reasons, log FILE may omit duplicate changes
3786 made on branches and will not show deletions. To see all
3786 made on branches and will not show deletions. To see all
3787 changes including duplicates and deletions, use the --removed
3787 changes including duplicates and deletions, use the --removed
3788 switch.
3788 switch.
3789
3789
3790 .. container:: verbose
3790 .. container:: verbose
3791
3791
3792 Some examples:
3792 Some examples:
3793
3793
3794 - changesets with full descriptions and file lists::
3794 - changesets with full descriptions and file lists::
3795
3795
3796 hg log -v
3796 hg log -v
3797
3797
3798 - changesets ancestral to the working directory::
3798 - changesets ancestral to the working directory::
3799
3799
3800 hg log -f
3800 hg log -f
3801
3801
3802 - last 10 commits on the current branch::
3802 - last 10 commits on the current branch::
3803
3803
3804 hg log -l 10 -b .
3804 hg log -l 10 -b .
3805
3805
3806 - changesets showing all modifications of a file, including removals::
3806 - changesets showing all modifications of a file, including removals::
3807
3807
3808 hg log --removed file.c
3808 hg log --removed file.c
3809
3809
3810 - all changesets that touch a directory, with diffs, excluding merges::
3810 - all changesets that touch a directory, with diffs, excluding merges::
3811
3811
3812 hg log -Mp lib/
3812 hg log -Mp lib/
3813
3813
3814 - all revision numbers that match a keyword::
3814 - all revision numbers that match a keyword::
3815
3815
3816 hg log -k bug --template "{rev}\\n"
3816 hg log -k bug --template "{rev}\\n"
3817
3817
3818 - check if a given changeset is included is a tagged release::
3818 - check if a given changeset is included is a tagged release::
3819
3819
3820 hg log -r "a21ccf and ancestor(1.9)"
3820 hg log -r "a21ccf and ancestor(1.9)"
3821
3821
3822 - find all changesets by some user in a date range::
3822 - find all changesets by some user in a date range::
3823
3823
3824 hg log -k alice -d "may 2008 to jul 2008"
3824 hg log -k alice -d "may 2008 to jul 2008"
3825
3825
3826 - summary of all changesets after the last tag::
3826 - summary of all changesets after the last tag::
3827
3827
3828 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3828 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3829
3829
3830 See :hg:`help dates` for a list of formats valid for -d/--date.
3830 See :hg:`help dates` for a list of formats valid for -d/--date.
3831
3831
3832 See :hg:`help revisions` and :hg:`help revsets` for more about
3832 See :hg:`help revisions` and :hg:`help revsets` for more about
3833 specifying revisions.
3833 specifying revisions.
3834
3834
3835 Returns 0 on success.
3835 Returns 0 on success.
3836 """
3836 """
3837
3837
3838 matchfn = scmutil.match(repo[None], pats, opts)
3838 matchfn = scmutil.match(repo[None], pats, opts)
3839 limit = cmdutil.loglimit(opts)
3839 limit = cmdutil.loglimit(opts)
3840 count = 0
3840 count = 0
3841
3841
3842 endrev = None
3842 endrev = None
3843 if opts.get('copies') and opts.get('rev'):
3843 if opts.get('copies') and opts.get('rev'):
3844 endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
3844 endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
3845
3845
3846 df = False
3846 df = False
3847 if opts["date"]:
3847 if opts["date"]:
3848 df = util.matchdate(opts["date"])
3848 df = util.matchdate(opts["date"])
3849
3849
3850 branches = opts.get('branch', []) + opts.get('only_branch', [])
3850 branches = opts.get('branch', []) + opts.get('only_branch', [])
3851 opts['branch'] = [repo.lookupbranch(b) for b in branches]
3851 opts['branch'] = [repo.lookupbranch(b) for b in branches]
3852
3852
3853 displayer = cmdutil.show_changeset(ui, repo, opts, True)
3853 displayer = cmdutil.show_changeset(ui, repo, opts, True)
3854 def prep(ctx, fns):
3854 def prep(ctx, fns):
3855 rev = ctx.rev()
3855 rev = ctx.rev()
3856 parents = [p for p in repo.changelog.parentrevs(rev)
3856 parents = [p for p in repo.changelog.parentrevs(rev)
3857 if p != nullrev]
3857 if p != nullrev]
3858 if opts.get('no_merges') and len(parents) == 2:
3858 if opts.get('no_merges') and len(parents) == 2:
3859 return
3859 return
3860 if opts.get('only_merges') and len(parents) != 2:
3860 if opts.get('only_merges') and len(parents) != 2:
3861 return
3861 return
3862 if opts.get('branch') and ctx.branch() not in opts['branch']:
3862 if opts.get('branch') and ctx.branch() not in opts['branch']:
3863 return
3863 return
3864 if not opts.get('hidden') and ctx.hidden():
3864 if not opts.get('hidden') and ctx.hidden():
3865 return
3865 return
3866 if df and not df(ctx.date()[0]):
3866 if df and not df(ctx.date()[0]):
3867 return
3867 return
3868 if opts['user'] and not [k for k in opts['user']
3868 if opts['user'] and not [k for k in opts['user']
3869 if k.lower() in ctx.user().lower()]:
3869 if k.lower() in ctx.user().lower()]:
3870 return
3870 return
3871 if opts.get('keyword'):
3871 if opts.get('keyword'):
3872 for k in [kw.lower() for kw in opts['keyword']]:
3872 for k in [kw.lower() for kw in opts['keyword']]:
3873 if (k in ctx.user().lower() or
3873 if (k in ctx.user().lower() or
3874 k in ctx.description().lower() or
3874 k in ctx.description().lower() or
3875 k in " ".join(ctx.files()).lower()):
3875 k in " ".join(ctx.files()).lower()):
3876 break
3876 break
3877 else:
3877 else:
3878 return
3878 return
3879
3879
3880 copies = None
3880 copies = None
3881 if opts.get('copies') and rev:
3881 if opts.get('copies') and rev:
3882 copies = []
3882 copies = []
3883 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3883 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3884 for fn in ctx.files():
3884 for fn in ctx.files():
3885 rename = getrenamed(fn, rev)
3885 rename = getrenamed(fn, rev)
3886 if rename:
3886 if rename:
3887 copies.append((fn, rename[0]))
3887 copies.append((fn, rename[0]))
3888
3888
3889 revmatchfn = None
3889 revmatchfn = None
3890 if opts.get('patch') or opts.get('stat'):
3890 if opts.get('patch') or opts.get('stat'):
3891 if opts.get('follow') or opts.get('follow_first'):
3891 if opts.get('follow') or opts.get('follow_first'):
3892 # note: this might be wrong when following through merges
3892 # note: this might be wrong when following through merges
3893 revmatchfn = scmutil.match(repo[None], fns, default='path')
3893 revmatchfn = scmutil.match(repo[None], fns, default='path')
3894 else:
3894 else:
3895 revmatchfn = matchfn
3895 revmatchfn = matchfn
3896
3896
3897 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3897 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3898
3898
3899 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3899 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3900 if count == limit:
3900 if count == limit:
3901 break
3901 break
3902 if displayer.flush(ctx.rev()):
3902 if displayer.flush(ctx.rev()):
3903 count += 1
3903 count += 1
3904 displayer.close()
3904 displayer.close()
3905
3905
3906 @command('manifest',
3906 @command('manifest',
3907 [('r', 'rev', '', _('revision to display'), _('REV')),
3907 [('r', 'rev', '', _('revision to display'), _('REV')),
3908 ('', 'all', False, _("list files from all revisions"))],
3908 ('', 'all', False, _("list files from all revisions"))],
3909 _('[-r REV]'))
3909 _('[-r REV]'))
3910 def manifest(ui, repo, node=None, rev=None, **opts):
3910 def manifest(ui, repo, node=None, rev=None, **opts):
3911 """output the current or given revision of the project manifest
3911 """output the current or given revision of the project manifest
3912
3912
3913 Print a list of version controlled files for the given revision.
3913 Print a list of version controlled files for the given revision.
3914 If no revision is given, the first parent of the working directory
3914 If no revision is given, the first parent of the working directory
3915 is used, or the null revision if no revision is checked out.
3915 is used, or the null revision if no revision is checked out.
3916
3916
3917 With -v, print file permissions, symlink and executable bits.
3917 With -v, print file permissions, symlink and executable bits.
3918 With --debug, print file revision hashes.
3918 With --debug, print file revision hashes.
3919
3919
3920 If option --all is specified, the list of all files from all revisions
3920 If option --all is specified, the list of all files from all revisions
3921 is printed. This includes deleted and renamed files.
3921 is printed. This includes deleted and renamed files.
3922
3922
3923 Returns 0 on success.
3923 Returns 0 on success.
3924 """
3924 """
3925 if opts.get('all'):
3925 if opts.get('all'):
3926 if rev or node:
3926 if rev or node:
3927 raise util.Abort(_("can't specify a revision with --all"))
3927 raise util.Abort(_("can't specify a revision with --all"))
3928
3928
3929 res = []
3929 res = []
3930 prefix = "data/"
3930 prefix = "data/"
3931 suffix = ".i"
3931 suffix = ".i"
3932 plen = len(prefix)
3932 plen = len(prefix)
3933 slen = len(suffix)
3933 slen = len(suffix)
3934 lock = repo.lock()
3934 lock = repo.lock()
3935 try:
3935 try:
3936 for fn, b, size in repo.store.datafiles():
3936 for fn, b, size in repo.store.datafiles():
3937 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3937 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3938 res.append(fn[plen:-slen])
3938 res.append(fn[plen:-slen])
3939 finally:
3939 finally:
3940 lock.release()
3940 lock.release()
3941 for f in sorted(res):
3941 for f in sorted(res):
3942 ui.write("%s\n" % f)
3942 ui.write("%s\n" % f)
3943 return
3943 return
3944
3944
3945 if rev and node:
3945 if rev and node:
3946 raise util.Abort(_("please specify just one revision"))
3946 raise util.Abort(_("please specify just one revision"))
3947
3947
3948 if not node:
3948 if not node:
3949 node = rev
3949 node = rev
3950
3950
3951 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
3951 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
3952 ctx = scmutil.revsingle(repo, node)
3952 ctx = scmutil.revsingle(repo, node)
3953 for f in ctx:
3953 for f in ctx:
3954 if ui.debugflag:
3954 if ui.debugflag:
3955 ui.write("%40s " % hex(ctx.manifest()[f]))
3955 ui.write("%40s " % hex(ctx.manifest()[f]))
3956 if ui.verbose:
3956 if ui.verbose:
3957 ui.write(decor[ctx.flags(f)])
3957 ui.write(decor[ctx.flags(f)])
3958 ui.write("%s\n" % f)
3958 ui.write("%s\n" % f)
3959
3959
3960 @command('^merge',
3960 @command('^merge',
3961 [('f', 'force', None, _('force a merge with outstanding changes')),
3961 [('f', 'force', None, _('force a merge with outstanding changes')),
3962 ('r', 'rev', '', _('revision to merge'), _('REV')),
3962 ('r', 'rev', '', _('revision to merge'), _('REV')),
3963 ('P', 'preview', None,
3963 ('P', 'preview', None,
3964 _('review revisions to merge (no merge is performed)'))
3964 _('review revisions to merge (no merge is performed)'))
3965 ] + mergetoolopts,
3965 ] + mergetoolopts,
3966 _('[-P] [-f] [[-r] REV]'))
3966 _('[-P] [-f] [[-r] REV]'))
3967 def merge(ui, repo, node=None, **opts):
3967 def merge(ui, repo, node=None, **opts):
3968 """merge working directory with another revision
3968 """merge working directory with another revision
3969
3969
3970 The current working directory is updated with all changes made in
3970 The current working directory is updated with all changes made in
3971 the requested revision since the last common predecessor revision.
3971 the requested revision since the last common predecessor revision.
3972
3972
3973 Files that changed between either parent are marked as changed for
3973 Files that changed between either parent are marked as changed for
3974 the next commit and a commit must be performed before any further
3974 the next commit and a commit must be performed before any further
3975 updates to the repository are allowed. The next commit will have
3975 updates to the repository are allowed. The next commit will have
3976 two parents.
3976 two parents.
3977
3977
3978 ``--tool`` can be used to specify the merge tool used for file
3978 ``--tool`` can be used to specify the merge tool used for file
3979 merges. It overrides the HGMERGE environment variable and your
3979 merges. It overrides the HGMERGE environment variable and your
3980 configuration files. See :hg:`help merge-tools` for options.
3980 configuration files. See :hg:`help merge-tools` for options.
3981
3981
3982 If no revision is specified, the working directory's parent is a
3982 If no revision is specified, the working directory's parent is a
3983 head revision, and the current branch contains exactly one other
3983 head revision, and the current branch contains exactly one other
3984 head, the other head is merged with by default. Otherwise, an
3984 head, the other head is merged with by default. Otherwise, an
3985 explicit revision with which to merge with must be provided.
3985 explicit revision with which to merge with must be provided.
3986
3986
3987 :hg:`resolve` must be used to resolve unresolved files.
3987 :hg:`resolve` must be used to resolve unresolved files.
3988
3988
3989 To undo an uncommitted merge, use :hg:`update --clean .` which
3989 To undo an uncommitted merge, use :hg:`update --clean .` which
3990 will check out a clean copy of the original merge parent, losing
3990 will check out a clean copy of the original merge parent, losing
3991 all changes.
3991 all changes.
3992
3992
3993 Returns 0 on success, 1 if there are unresolved files.
3993 Returns 0 on success, 1 if there are unresolved files.
3994 """
3994 """
3995
3995
3996 if opts.get('rev') and node:
3996 if opts.get('rev') and node:
3997 raise util.Abort(_("please specify just one revision"))
3997 raise util.Abort(_("please specify just one revision"))
3998 if not node:
3998 if not node:
3999 node = opts.get('rev')
3999 node = opts.get('rev')
4000
4000
4001 if not node:
4001 if not node:
4002 branch = repo[None].branch()
4002 branch = repo[None].branch()
4003 bheads = repo.branchheads(branch)
4003 bheads = repo.branchheads(branch)
4004 if len(bheads) > 2:
4004 if len(bheads) > 2:
4005 raise util.Abort(_("branch '%s' has %d heads - "
4005 raise util.Abort(_("branch '%s' has %d heads - "
4006 "please merge with an explicit rev")
4006 "please merge with an explicit rev")
4007 % (branch, len(bheads)),
4007 % (branch, len(bheads)),
4008 hint=_("run 'hg heads .' to see heads"))
4008 hint=_("run 'hg heads .' to see heads"))
4009
4009
4010 parent = repo.dirstate.p1()
4010 parent = repo.dirstate.p1()
4011 if len(bheads) == 1:
4011 if len(bheads) == 1:
4012 if len(repo.heads()) > 1:
4012 if len(repo.heads()) > 1:
4013 raise util.Abort(_("branch '%s' has one head - "
4013 raise util.Abort(_("branch '%s' has one head - "
4014 "please merge with an explicit rev")
4014 "please merge with an explicit rev")
4015 % branch,
4015 % branch,
4016 hint=_("run 'hg heads' to see all heads"))
4016 hint=_("run 'hg heads' to see all heads"))
4017 msg = _('there is nothing to merge')
4017 msg = _('there is nothing to merge')
4018 if parent != repo.lookup(repo[None].branch()):
4018 if parent != repo.lookup(repo[None].branch()):
4019 msg = _('%s - use "hg update" instead') % msg
4019 msg = _('%s - use "hg update" instead') % msg
4020 raise util.Abort(msg)
4020 raise util.Abort(msg)
4021
4021
4022 if parent not in bheads:
4022 if parent not in bheads:
4023 raise util.Abort(_('working directory not at a head revision'),
4023 raise util.Abort(_('working directory not at a head revision'),
4024 hint=_("use 'hg update' or merge with an "
4024 hint=_("use 'hg update' or merge with an "
4025 "explicit revision"))
4025 "explicit revision"))
4026 node = parent == bheads[0] and bheads[-1] or bheads[0]
4026 node = parent == bheads[0] and bheads[-1] or bheads[0]
4027 else:
4027 else:
4028 node = scmutil.revsingle(repo, node).node()
4028 node = scmutil.revsingle(repo, node).node()
4029
4029
4030 if opts.get('preview'):
4030 if opts.get('preview'):
4031 # find nodes that are ancestors of p2 but not of p1
4031 # find nodes that are ancestors of p2 but not of p1
4032 p1 = repo.lookup('.')
4032 p1 = repo.lookup('.')
4033 p2 = repo.lookup(node)
4033 p2 = repo.lookup(node)
4034 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4034 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4035
4035
4036 displayer = cmdutil.show_changeset(ui, repo, opts)
4036 displayer = cmdutil.show_changeset(ui, repo, opts)
4037 for node in nodes:
4037 for node in nodes:
4038 displayer.show(repo[node])
4038 displayer.show(repo[node])
4039 displayer.close()
4039 displayer.close()
4040 return 0
4040 return 0
4041
4041
4042 try:
4042 try:
4043 # ui.forcemerge is an internal variable, do not document
4043 # ui.forcemerge is an internal variable, do not document
4044 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4044 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4045 return hg.merge(repo, node, force=opts.get('force'))
4045 return hg.merge(repo, node, force=opts.get('force'))
4046 finally:
4046 finally:
4047 ui.setconfig('ui', 'forcemerge', '')
4047 ui.setconfig('ui', 'forcemerge', '')
4048
4048
4049 @command('outgoing|out',
4049 @command('outgoing|out',
4050 [('f', 'force', None, _('run even when the destination is unrelated')),
4050 [('f', 'force', None, _('run even when the destination is unrelated')),
4051 ('r', 'rev', [],
4051 ('r', 'rev', [],
4052 _('a changeset intended to be included in the destination'), _('REV')),
4052 _('a changeset intended to be included in the destination'), _('REV')),
4053 ('n', 'newest-first', None, _('show newest record first')),
4053 ('n', 'newest-first', None, _('show newest record first')),
4054 ('B', 'bookmarks', False, _('compare bookmarks')),
4054 ('B', 'bookmarks', False, _('compare bookmarks')),
4055 ('b', 'branch', [], _('a specific branch you would like to push'),
4055 ('b', 'branch', [], _('a specific branch you would like to push'),
4056 _('BRANCH')),
4056 _('BRANCH')),
4057 ] + logopts + remoteopts + subrepoopts,
4057 ] + logopts + remoteopts + subrepoopts,
4058 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4058 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4059 def outgoing(ui, repo, dest=None, **opts):
4059 def outgoing(ui, repo, dest=None, **opts):
4060 """show changesets not found in the destination
4060 """show changesets not found in the destination
4061
4061
4062 Show changesets not found in the specified destination repository
4062 Show changesets not found in the specified destination repository
4063 or the default push location. These are the changesets that would
4063 or the default push location. These are the changesets that would
4064 be pushed if a push was requested.
4064 be pushed if a push was requested.
4065
4065
4066 See pull for details of valid destination formats.
4066 See pull for details of valid destination formats.
4067
4067
4068 Returns 0 if there are outgoing changes, 1 otherwise.
4068 Returns 0 if there are outgoing changes, 1 otherwise.
4069 """
4069 """
4070
4070
4071 if opts.get('bookmarks'):
4071 if opts.get('bookmarks'):
4072 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4072 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4073 dest, branches = hg.parseurl(dest, opts.get('branch'))
4073 dest, branches = hg.parseurl(dest, opts.get('branch'))
4074 other = hg.peer(repo, opts, dest)
4074 other = hg.peer(repo, opts, dest)
4075 if 'bookmarks' not in other.listkeys('namespaces'):
4075 if 'bookmarks' not in other.listkeys('namespaces'):
4076 ui.warn(_("remote doesn't support bookmarks\n"))
4076 ui.warn(_("remote doesn't support bookmarks\n"))
4077 return 0
4077 return 0
4078 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4078 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4079 return bookmarks.diff(ui, other, repo)
4079 return bookmarks.diff(ui, other, repo)
4080
4080
4081 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4081 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4082 try:
4082 try:
4083 return hg.outgoing(ui, repo, dest, opts)
4083 return hg.outgoing(ui, repo, dest, opts)
4084 finally:
4084 finally:
4085 del repo._subtoppath
4085 del repo._subtoppath
4086
4086
4087 @command('parents',
4087 @command('parents',
4088 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4088 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4089 ] + templateopts,
4089 ] + templateopts,
4090 _('[-r REV] [FILE]'))
4090 _('[-r REV] [FILE]'))
4091 def parents(ui, repo, file_=None, **opts):
4091 def parents(ui, repo, file_=None, **opts):
4092 """show the parents of the working directory or revision
4092 """show the parents of the working directory or revision
4093
4093
4094 Print the working directory's parent revisions. If a revision is
4094 Print the working directory's parent revisions. If a revision is
4095 given via -r/--rev, the parent of that revision will be printed.
4095 given via -r/--rev, the parent of that revision will be printed.
4096 If a file argument is given, the revision in which the file was
4096 If a file argument is given, the revision in which the file was
4097 last changed (before the working directory revision or the
4097 last changed (before the working directory revision or the
4098 argument to --rev if given) is printed.
4098 argument to --rev if given) is printed.
4099
4099
4100 Returns 0 on success.
4100 Returns 0 on success.
4101 """
4101 """
4102
4102
4103 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4103 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4104
4104
4105 if file_:
4105 if file_:
4106 m = scmutil.match(ctx, (file_,), opts)
4106 m = scmutil.match(ctx, (file_,), opts)
4107 if m.anypats() or len(m.files()) != 1:
4107 if m.anypats() or len(m.files()) != 1:
4108 raise util.Abort(_('can only specify an explicit filename'))
4108 raise util.Abort(_('can only specify an explicit filename'))
4109 file_ = m.files()[0]
4109 file_ = m.files()[0]
4110 filenodes = []
4110 filenodes = []
4111 for cp in ctx.parents():
4111 for cp in ctx.parents():
4112 if not cp:
4112 if not cp:
4113 continue
4113 continue
4114 try:
4114 try:
4115 filenodes.append(cp.filenode(file_))
4115 filenodes.append(cp.filenode(file_))
4116 except error.LookupError:
4116 except error.LookupError:
4117 pass
4117 pass
4118 if not filenodes:
4118 if not filenodes:
4119 raise util.Abort(_("'%s' not found in manifest!") % file_)
4119 raise util.Abort(_("'%s' not found in manifest!") % file_)
4120 fl = repo.file(file_)
4120 fl = repo.file(file_)
4121 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
4121 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
4122 else:
4122 else:
4123 p = [cp.node() for cp in ctx.parents()]
4123 p = [cp.node() for cp in ctx.parents()]
4124
4124
4125 displayer = cmdutil.show_changeset(ui, repo, opts)
4125 displayer = cmdutil.show_changeset(ui, repo, opts)
4126 for n in p:
4126 for n in p:
4127 if n != nullid:
4127 if n != nullid:
4128 displayer.show(repo[n])
4128 displayer.show(repo[n])
4129 displayer.close()
4129 displayer.close()
4130
4130
4131 @command('paths', [], _('[NAME]'))
4131 @command('paths', [], _('[NAME]'))
4132 def paths(ui, repo, search=None):
4132 def paths(ui, repo, search=None):
4133 """show aliases for remote repositories
4133 """show aliases for remote repositories
4134
4134
4135 Show definition of symbolic path name NAME. If no name is given,
4135 Show definition of symbolic path name NAME. If no name is given,
4136 show definition of all available names.
4136 show definition of all available names.
4137
4137
4138 Option -q/--quiet suppresses all output when searching for NAME
4138 Option -q/--quiet suppresses all output when searching for NAME
4139 and shows only the path names when listing all definitions.
4139 and shows only the path names when listing all definitions.
4140
4140
4141 Path names are defined in the [paths] section of your
4141 Path names are defined in the [paths] section of your
4142 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4142 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4143 repository, ``.hg/hgrc`` is used, too.
4143 repository, ``.hg/hgrc`` is used, too.
4144
4144
4145 The path names ``default`` and ``default-push`` have a special
4145 The path names ``default`` and ``default-push`` have a special
4146 meaning. When performing a push or pull operation, they are used
4146 meaning. When performing a push or pull operation, they are used
4147 as fallbacks if no location is specified on the command-line.
4147 as fallbacks if no location is specified on the command-line.
4148 When ``default-push`` is set, it will be used for push and
4148 When ``default-push`` is set, it will be used for push and
4149 ``default`` will be used for pull; otherwise ``default`` is used
4149 ``default`` will be used for pull; otherwise ``default`` is used
4150 as the fallback for both. When cloning a repository, the clone
4150 as the fallback for both. When cloning a repository, the clone
4151 source is written as ``default`` in ``.hg/hgrc``. Note that
4151 source is written as ``default`` in ``.hg/hgrc``. Note that
4152 ``default`` and ``default-push`` apply to all inbound (e.g.
4152 ``default`` and ``default-push`` apply to all inbound (e.g.
4153 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
4153 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
4154 :hg:`bundle`) operations.
4154 :hg:`bundle`) operations.
4155
4155
4156 See :hg:`help urls` for more information.
4156 See :hg:`help urls` for more information.
4157
4157
4158 Returns 0 on success.
4158 Returns 0 on success.
4159 """
4159 """
4160 if search:
4160 if search:
4161 for name, path in ui.configitems("paths"):
4161 for name, path in ui.configitems("paths"):
4162 if name == search:
4162 if name == search:
4163 ui.status("%s\n" % util.hidepassword(path))
4163 ui.status("%s\n" % util.hidepassword(path))
4164 return
4164 return
4165 if not ui.quiet:
4165 if not ui.quiet:
4166 ui.warn(_("not found!\n"))
4166 ui.warn(_("not found!\n"))
4167 return 1
4167 return 1
4168 else:
4168 else:
4169 for name, path in ui.configitems("paths"):
4169 for name, path in ui.configitems("paths"):
4170 if ui.quiet:
4170 if ui.quiet:
4171 ui.write("%s\n" % name)
4171 ui.write("%s\n" % name)
4172 else:
4172 else:
4173 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
4173 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
4174
4174
4175 def postincoming(ui, repo, modheads, optupdate, checkout):
4175 def postincoming(ui, repo, modheads, optupdate, checkout):
4176 if modheads == 0:
4176 if modheads == 0:
4177 return
4177 return
4178 if optupdate:
4178 if optupdate:
4179 try:
4179 try:
4180 return hg.update(repo, checkout)
4180 return hg.update(repo, checkout)
4181 except util.Abort, inst:
4181 except util.Abort, inst:
4182 ui.warn(_("not updating: %s\n" % str(inst)))
4182 ui.warn(_("not updating: %s\n" % str(inst)))
4183 return 0
4183 return 0
4184 if modheads > 1:
4184 if modheads > 1:
4185 currentbranchheads = len(repo.branchheads())
4185 currentbranchheads = len(repo.branchheads())
4186 if currentbranchheads == modheads:
4186 if currentbranchheads == modheads:
4187 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4187 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4188 elif currentbranchheads > 1:
4188 elif currentbranchheads > 1:
4189 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to merge)\n"))
4189 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to merge)\n"))
4190 else:
4190 else:
4191 ui.status(_("(run 'hg heads' to see heads)\n"))
4191 ui.status(_("(run 'hg heads' to see heads)\n"))
4192 else:
4192 else:
4193 ui.status(_("(run 'hg update' to get a working copy)\n"))
4193 ui.status(_("(run 'hg update' to get a working copy)\n"))
4194
4194
4195 @command('^pull',
4195 @command('^pull',
4196 [('u', 'update', None,
4196 [('u', 'update', None,
4197 _('update to new branch head if changesets were pulled')),
4197 _('update to new branch head if changesets were pulled')),
4198 ('f', 'force', None, _('run even when remote repository is unrelated')),
4198 ('f', 'force', None, _('run even when remote repository is unrelated')),
4199 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4199 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4200 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4200 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4201 ('b', 'branch', [], _('a specific branch you would like to pull'),
4201 ('b', 'branch', [], _('a specific branch you would like to pull'),
4202 _('BRANCH')),
4202 _('BRANCH')),
4203 ] + remoteopts,
4203 ] + remoteopts,
4204 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4204 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4205 def pull(ui, repo, source="default", **opts):
4205 def pull(ui, repo, source="default", **opts):
4206 """pull changes from the specified source
4206 """pull changes from the specified source
4207
4207
4208 Pull changes from a remote repository to a local one.
4208 Pull changes from a remote repository to a local one.
4209
4209
4210 This finds all changes from the repository at the specified path
4210 This finds all changes from the repository at the specified path
4211 or URL and adds them to a local repository (the current one unless
4211 or URL and adds them to a local repository (the current one unless
4212 -R is specified). By default, this does not update the copy of the
4212 -R is specified). By default, this does not update the copy of the
4213 project in the working directory.
4213 project in the working directory.
4214
4214
4215 Use :hg:`incoming` if you want to see what would have been added
4215 Use :hg:`incoming` if you want to see what would have been added
4216 by a pull at the time you issued this command. If you then decide
4216 by a pull at the time you issued this command. If you then decide
4217 to add those changes to the repository, you should use :hg:`pull
4217 to add those changes to the repository, you should use :hg:`pull
4218 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4218 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4219
4219
4220 If SOURCE is omitted, the 'default' path will be used.
4220 If SOURCE is omitted, the 'default' path will be used.
4221 See :hg:`help urls` for more information.
4221 See :hg:`help urls` for more information.
4222
4222
4223 Returns 0 on success, 1 if an update had unresolved files.
4223 Returns 0 on success, 1 if an update had unresolved files.
4224 """
4224 """
4225 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4225 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4226 other = hg.peer(repo, opts, source)
4226 other = hg.peer(repo, opts, source)
4227 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4227 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4228 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
4228 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
4229
4229
4230 if opts.get('bookmark'):
4230 if opts.get('bookmark'):
4231 if not revs:
4231 if not revs:
4232 revs = []
4232 revs = []
4233 rb = other.listkeys('bookmarks')
4233 rb = other.listkeys('bookmarks')
4234 for b in opts['bookmark']:
4234 for b in opts['bookmark']:
4235 if b not in rb:
4235 if b not in rb:
4236 raise util.Abort(_('remote bookmark %s not found!') % b)
4236 raise util.Abort(_('remote bookmark %s not found!') % b)
4237 revs.append(rb[b])
4237 revs.append(rb[b])
4238
4238
4239 if revs:
4239 if revs:
4240 try:
4240 try:
4241 revs = [other.lookup(rev) for rev in revs]
4241 revs = [other.lookup(rev) for rev in revs]
4242 except error.CapabilityError:
4242 except error.CapabilityError:
4243 err = _("other repository doesn't support revision lookup, "
4243 err = _("other repository doesn't support revision lookup, "
4244 "so a rev cannot be specified.")
4244 "so a rev cannot be specified.")
4245 raise util.Abort(err)
4245 raise util.Abort(err)
4246
4246
4247 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
4247 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
4248 bookmarks.updatefromremote(ui, repo, other)
4248 bookmarks.updatefromremote(ui, repo, other)
4249 if checkout:
4249 if checkout:
4250 checkout = str(repo.changelog.rev(other.lookup(checkout)))
4250 checkout = str(repo.changelog.rev(other.lookup(checkout)))
4251 repo._subtoppath = source
4251 repo._subtoppath = source
4252 try:
4252 try:
4253 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
4253 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
4254
4254
4255 finally:
4255 finally:
4256 del repo._subtoppath
4256 del repo._subtoppath
4257
4257
4258 # update specified bookmarks
4258 # update specified bookmarks
4259 if opts.get('bookmark'):
4259 if opts.get('bookmark'):
4260 for b in opts['bookmark']:
4260 for b in opts['bookmark']:
4261 # explicit pull overrides local bookmark if any
4261 # explicit pull overrides local bookmark if any
4262 ui.status(_("importing bookmark %s\n") % b)
4262 ui.status(_("importing bookmark %s\n") % b)
4263 repo._bookmarks[b] = repo[rb[b]].node()
4263 repo._bookmarks[b] = repo[rb[b]].node()
4264 bookmarks.write(repo)
4264 bookmarks.write(repo)
4265
4265
4266 return ret
4266 return ret
4267
4267
4268 @command('^push',
4268 @command('^push',
4269 [('f', 'force', None, _('force push')),
4269 [('f', 'force', None, _('force push')),
4270 ('r', 'rev', [],
4270 ('r', 'rev', [],
4271 _('a changeset intended to be included in the destination'),
4271 _('a changeset intended to be included in the destination'),
4272 _('REV')),
4272 _('REV')),
4273 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4273 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4274 ('b', 'branch', [],
4274 ('b', 'branch', [],
4275 _('a specific branch you would like to push'), _('BRANCH')),
4275 _('a specific branch you would like to push'), _('BRANCH')),
4276 ('', 'new-branch', False, _('allow pushing a new branch')),
4276 ('', 'new-branch', False, _('allow pushing a new branch')),
4277 ] + remoteopts,
4277 ] + remoteopts,
4278 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4278 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4279 def push(ui, repo, dest=None, **opts):
4279 def push(ui, repo, dest=None, **opts):
4280 """push changes to the specified destination
4280 """push changes to the specified destination
4281
4281
4282 Push changesets from the local repository to the specified
4282 Push changesets from the local repository to the specified
4283 destination.
4283 destination.
4284
4284
4285 This operation is symmetrical to pull: it is identical to a pull
4285 This operation is symmetrical to pull: it is identical to a pull
4286 in the destination repository from the current one.
4286 in the destination repository from the current one.
4287
4287
4288 By default, push will not allow creation of new heads at the
4288 By default, push will not allow creation of new heads at the
4289 destination, since multiple heads would make it unclear which head
4289 destination, since multiple heads would make it unclear which head
4290 to use. In this situation, it is recommended to pull and merge
4290 to use. In this situation, it is recommended to pull and merge
4291 before pushing.
4291 before pushing.
4292
4292
4293 Use --new-branch if you want to allow push to create a new named
4293 Use --new-branch if you want to allow push to create a new named
4294 branch that is not present at the destination. This allows you to
4294 branch that is not present at the destination. This allows you to
4295 only create a new branch without forcing other changes.
4295 only create a new branch without forcing other changes.
4296
4296
4297 Use -f/--force to override the default behavior and push all
4297 Use -f/--force to override the default behavior and push all
4298 changesets on all branches.
4298 changesets on all branches.
4299
4299
4300 If -r/--rev is used, the specified revision and all its ancestors
4300 If -r/--rev is used, the specified revision and all its ancestors
4301 will be pushed to the remote repository.
4301 will be pushed to the remote repository.
4302
4302
4303 Please see :hg:`help urls` for important details about ``ssh://``
4303 Please see :hg:`help urls` for important details about ``ssh://``
4304 URLs. If DESTINATION is omitted, a default path will be used.
4304 URLs. If DESTINATION is omitted, a default path will be used.
4305
4305
4306 Returns 0 if push was successful, 1 if nothing to push.
4306 Returns 0 if push was successful, 1 if nothing to push.
4307 """
4307 """
4308
4308
4309 if opts.get('bookmark'):
4309 if opts.get('bookmark'):
4310 for b in opts['bookmark']:
4310 for b in opts['bookmark']:
4311 # translate -B options to -r so changesets get pushed
4311 # translate -B options to -r so changesets get pushed
4312 if b in repo._bookmarks:
4312 if b in repo._bookmarks:
4313 opts.setdefault('rev', []).append(b)
4313 opts.setdefault('rev', []).append(b)
4314 else:
4314 else:
4315 # if we try to push a deleted bookmark, translate it to null
4315 # if we try to push a deleted bookmark, translate it to null
4316 # this lets simultaneous -r, -b options continue working
4316 # this lets simultaneous -r, -b options continue working
4317 opts.setdefault('rev', []).append("null")
4317 opts.setdefault('rev', []).append("null")
4318
4318
4319 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4319 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4320 dest, branches = hg.parseurl(dest, opts.get('branch'))
4320 dest, branches = hg.parseurl(dest, opts.get('branch'))
4321 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4321 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4322 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4322 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4323 other = hg.peer(repo, opts, dest)
4323 other = hg.peer(repo, opts, dest)
4324 if revs:
4324 if revs:
4325 revs = [repo.lookup(rev) for rev in revs]
4325 revs = [repo.lookup(rev) for rev in revs]
4326
4326
4327 repo._subtoppath = dest
4327 repo._subtoppath = dest
4328 try:
4328 try:
4329 # push subrepos depth-first for coherent ordering
4329 # push subrepos depth-first for coherent ordering
4330 c = repo['']
4330 c = repo['']
4331 subs = c.substate # only repos that are committed
4331 subs = c.substate # only repos that are committed
4332 for s in sorted(subs):
4332 for s in sorted(subs):
4333 if not c.sub(s).push(opts.get('force')):
4333 if not c.sub(s).push(opts.get('force')):
4334 return False
4334 return False
4335 finally:
4335 finally:
4336 del repo._subtoppath
4336 del repo._subtoppath
4337 result = repo.push(other, opts.get('force'), revs=revs,
4337 result = repo.push(other, opts.get('force'), revs=revs,
4338 newbranch=opts.get('new_branch'))
4338 newbranch=opts.get('new_branch'))
4339
4339
4340 result = (result == 0)
4340 result = (result == 0)
4341
4341
4342 if opts.get('bookmark'):
4342 if opts.get('bookmark'):
4343 rb = other.listkeys('bookmarks')
4343 rb = other.listkeys('bookmarks')
4344 for b in opts['bookmark']:
4344 for b in opts['bookmark']:
4345 # explicit push overrides remote bookmark if any
4345 # explicit push overrides remote bookmark if any
4346 if b in repo._bookmarks:
4346 if b in repo._bookmarks:
4347 ui.status(_("exporting bookmark %s\n") % b)
4347 ui.status(_("exporting bookmark %s\n") % b)
4348 new = repo[b].hex()
4348 new = repo[b].hex()
4349 elif b in rb:
4349 elif b in rb:
4350 ui.status(_("deleting remote bookmark %s\n") % b)
4350 ui.status(_("deleting remote bookmark %s\n") % b)
4351 new = '' # delete
4351 new = '' # delete
4352 else:
4352 else:
4353 ui.warn(_('bookmark %s does not exist on the local '
4353 ui.warn(_('bookmark %s does not exist on the local '
4354 'or remote repository!\n') % b)
4354 'or remote repository!\n') % b)
4355 return 2
4355 return 2
4356 old = rb.get(b, '')
4356 old = rb.get(b, '')
4357 r = other.pushkey('bookmarks', b, old, new)
4357 r = other.pushkey('bookmarks', b, old, new)
4358 if not r:
4358 if not r:
4359 ui.warn(_('updating bookmark %s failed!\n') % b)
4359 ui.warn(_('updating bookmark %s failed!\n') % b)
4360 if not result:
4360 if not result:
4361 result = 2
4361 result = 2
4362
4362
4363 return result
4363 return result
4364
4364
4365 @command('recover', [])
4365 @command('recover', [])
4366 def recover(ui, repo):
4366 def recover(ui, repo):
4367 """roll back an interrupted transaction
4367 """roll back an interrupted transaction
4368
4368
4369 Recover from an interrupted commit or pull.
4369 Recover from an interrupted commit or pull.
4370
4370
4371 This command tries to fix the repository status after an
4371 This command tries to fix the repository status after an
4372 interrupted operation. It should only be necessary when Mercurial
4372 interrupted operation. It should only be necessary when Mercurial
4373 suggests it.
4373 suggests it.
4374
4374
4375 Returns 0 if successful, 1 if nothing to recover or verify fails.
4375 Returns 0 if successful, 1 if nothing to recover or verify fails.
4376 """
4376 """
4377 if repo.recover():
4377 if repo.recover():
4378 return hg.verify(repo)
4378 return hg.verify(repo)
4379 return 1
4379 return 1
4380
4380
4381 @command('^remove|rm',
4381 @command('^remove|rm',
4382 [('A', 'after', None, _('record delete for missing files')),
4382 [('A', 'after', None, _('record delete for missing files')),
4383 ('f', 'force', None,
4383 ('f', 'force', None,
4384 _('remove (and delete) file even if added or modified')),
4384 _('remove (and delete) file even if added or modified')),
4385 ] + walkopts,
4385 ] + walkopts,
4386 _('[OPTION]... FILE...'))
4386 _('[OPTION]... FILE...'))
4387 def remove(ui, repo, *pats, **opts):
4387 def remove(ui, repo, *pats, **opts):
4388 """remove the specified files on the next commit
4388 """remove the specified files on the next commit
4389
4389
4390 Schedule the indicated files for removal from the current branch.
4390 Schedule the indicated files for removal from the current branch.
4391
4391
4392 This command schedules the files to be removed at the next commit.
4392 This command schedules the files to be removed at the next commit.
4393 To undo a remove before that, see :hg:`revert`. To undo added
4393 To undo a remove before that, see :hg:`revert`. To undo added
4394 files, see :hg:`forget`.
4394 files, see :hg:`forget`.
4395
4395
4396 .. container:: verbose
4396 .. container:: verbose
4397
4397
4398 -A/--after can be used to remove only files that have already
4398 -A/--after can be used to remove only files that have already
4399 been deleted, -f/--force can be used to force deletion, and -Af
4399 been deleted, -f/--force can be used to force deletion, and -Af
4400 can be used to remove files from the next revision without
4400 can be used to remove files from the next revision without
4401 deleting them from the working directory.
4401 deleting them from the working directory.
4402
4402
4403 The following table details the behavior of remove for different
4403 The following table details the behavior of remove for different
4404 file states (columns) and option combinations (rows). The file
4404 file states (columns) and option combinations (rows). The file
4405 states are Added [A], Clean [C], Modified [M] and Missing [!]
4405 states are Added [A], Clean [C], Modified [M] and Missing [!]
4406 (as reported by :hg:`status`). The actions are Warn, Remove
4406 (as reported by :hg:`status`). The actions are Warn, Remove
4407 (from branch) and Delete (from disk):
4407 (from branch) and Delete (from disk):
4408
4408
4409 ======= == == == ==
4409 ======= == == == ==
4410 A C M !
4410 A C M !
4411 ======= == == == ==
4411 ======= == == == ==
4412 none W RD W R
4412 none W RD W R
4413 -f R RD RD R
4413 -f R RD RD R
4414 -A W W W R
4414 -A W W W R
4415 -Af R R R R
4415 -Af R R R R
4416 ======= == == == ==
4416 ======= == == == ==
4417
4417
4418 Note that remove never deletes files in Added [A] state from the
4418 Note that remove never deletes files in Added [A] state from the
4419 working directory, not even if option --force is specified.
4419 working directory, not even if option --force is specified.
4420
4420
4421 Returns 0 on success, 1 if any warnings encountered.
4421 Returns 0 on success, 1 if any warnings encountered.
4422 """
4422 """
4423
4423
4424 ret = 0
4424 ret = 0
4425 after, force = opts.get('after'), opts.get('force')
4425 after, force = opts.get('after'), opts.get('force')
4426 if not pats and not after:
4426 if not pats and not after:
4427 raise util.Abort(_('no files specified'))
4427 raise util.Abort(_('no files specified'))
4428
4428
4429 m = scmutil.match(repo[None], pats, opts)
4429 m = scmutil.match(repo[None], pats, opts)
4430 s = repo.status(match=m, clean=True)
4430 s = repo.status(match=m, clean=True)
4431 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
4431 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
4432
4432
4433 for f in m.files():
4433 for f in m.files():
4434 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
4434 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
4435 if os.path.exists(m.rel(f)):
4435 if os.path.exists(m.rel(f)):
4436 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
4436 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
4437 ret = 1
4437 ret = 1
4438
4438
4439 if force:
4439 if force:
4440 list = modified + deleted + clean + added
4440 list = modified + deleted + clean + added
4441 elif after:
4441 elif after:
4442 list = deleted
4442 list = deleted
4443 for f in modified + added + clean:
4443 for f in modified + added + clean:
4444 ui.warn(_('not removing %s: file still exists (use -f'
4444 ui.warn(_('not removing %s: file still exists (use -f'
4445 ' to force removal)\n') % m.rel(f))
4445 ' to force removal)\n') % m.rel(f))
4446 ret = 1
4446 ret = 1
4447 else:
4447 else:
4448 list = deleted + clean
4448 list = deleted + clean
4449 for f in modified:
4449 for f in modified:
4450 ui.warn(_('not removing %s: file is modified (use -f'
4450 ui.warn(_('not removing %s: file is modified (use -f'
4451 ' to force removal)\n') % m.rel(f))
4451 ' to force removal)\n') % m.rel(f))
4452 ret = 1
4452 ret = 1
4453 for f in added:
4453 for f in added:
4454 ui.warn(_('not removing %s: file has been marked for add'
4454 ui.warn(_('not removing %s: file has been marked for add'
4455 ' (use forget to undo)\n') % m.rel(f))
4455 ' (use forget to undo)\n') % m.rel(f))
4456 ret = 1
4456 ret = 1
4457
4457
4458 for f in sorted(list):
4458 for f in sorted(list):
4459 if ui.verbose or not m.exact(f):
4459 if ui.verbose or not m.exact(f):
4460 ui.status(_('removing %s\n') % m.rel(f))
4460 ui.status(_('removing %s\n') % m.rel(f))
4461
4461
4462 wlock = repo.wlock()
4462 wlock = repo.wlock()
4463 try:
4463 try:
4464 if not after:
4464 if not after:
4465 for f in list:
4465 for f in list:
4466 if f in added:
4466 if f in added:
4467 continue # we never unlink added files on remove
4467 continue # we never unlink added files on remove
4468 try:
4468 try:
4469 util.unlinkpath(repo.wjoin(f))
4469 util.unlinkpath(repo.wjoin(f))
4470 except OSError, inst:
4470 except OSError, inst:
4471 if inst.errno != errno.ENOENT:
4471 if inst.errno != errno.ENOENT:
4472 raise
4472 raise
4473 repo[None].forget(list)
4473 repo[None].forget(list)
4474 finally:
4474 finally:
4475 wlock.release()
4475 wlock.release()
4476
4476
4477 return ret
4477 return ret
4478
4478
4479 @command('rename|move|mv',
4479 @command('rename|move|mv',
4480 [('A', 'after', None, _('record a rename that has already occurred')),
4480 [('A', 'after', None, _('record a rename that has already occurred')),
4481 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4481 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4482 ] + walkopts + dryrunopts,
4482 ] + walkopts + dryrunopts,
4483 _('[OPTION]... SOURCE... DEST'))
4483 _('[OPTION]... SOURCE... DEST'))
4484 def rename(ui, repo, *pats, **opts):
4484 def rename(ui, repo, *pats, **opts):
4485 """rename files; equivalent of copy + remove
4485 """rename files; equivalent of copy + remove
4486
4486
4487 Mark dest as copies of sources; mark sources for deletion. If dest
4487 Mark dest as copies of sources; mark sources for deletion. If dest
4488 is a directory, copies are put in that directory. If dest is a
4488 is a directory, copies are put in that directory. If dest is a
4489 file, there can only be one source.
4489 file, there can only be one source.
4490
4490
4491 By default, this command copies the contents of files as they
4491 By default, this command copies the contents of files as they
4492 exist in the working directory. If invoked with -A/--after, the
4492 exist in the working directory. If invoked with -A/--after, the
4493 operation is recorded, but no copying is performed.
4493 operation is recorded, but no copying is performed.
4494
4494
4495 This command takes effect at the next commit. To undo a rename
4495 This command takes effect at the next commit. To undo a rename
4496 before that, see :hg:`revert`.
4496 before that, see :hg:`revert`.
4497
4497
4498 Returns 0 on success, 1 if errors are encountered.
4498 Returns 0 on success, 1 if errors are encountered.
4499 """
4499 """
4500 wlock = repo.wlock(False)
4500 wlock = repo.wlock(False)
4501 try:
4501 try:
4502 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4502 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4503 finally:
4503 finally:
4504 wlock.release()
4504 wlock.release()
4505
4505
4506 @command('resolve',
4506 @command('resolve',
4507 [('a', 'all', None, _('select all unresolved files')),
4507 [('a', 'all', None, _('select all unresolved files')),
4508 ('l', 'list', None, _('list state of files needing merge')),
4508 ('l', 'list', None, _('list state of files needing merge')),
4509 ('m', 'mark', None, _('mark files as resolved')),
4509 ('m', 'mark', None, _('mark files as resolved')),
4510 ('u', 'unmark', None, _('mark files as unresolved')),
4510 ('u', 'unmark', None, _('mark files as unresolved')),
4511 ('n', 'no-status', None, _('hide status prefix'))]
4511 ('n', 'no-status', None, _('hide status prefix'))]
4512 + mergetoolopts + walkopts,
4512 + mergetoolopts + walkopts,
4513 _('[OPTION]... [FILE]...'))
4513 _('[OPTION]... [FILE]...'))
4514 def resolve(ui, repo, *pats, **opts):
4514 def resolve(ui, repo, *pats, **opts):
4515 """redo merges or set/view the merge status of files
4515 """redo merges or set/view the merge status of files
4516
4516
4517 Merges with unresolved conflicts are often the result of
4517 Merges with unresolved conflicts are often the result of
4518 non-interactive merging using the ``internal:merge`` configuration
4518 non-interactive merging using the ``internal:merge`` configuration
4519 setting, or a command-line merge tool like ``diff3``. The resolve
4519 setting, or a command-line merge tool like ``diff3``. The resolve
4520 command is used to manage the files involved in a merge, after
4520 command is used to manage the files involved in a merge, after
4521 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4521 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4522 working directory must have two parents).
4522 working directory must have two parents).
4523
4523
4524 The resolve command can be used in the following ways:
4524 The resolve command can be used in the following ways:
4525
4525
4526 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4526 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4527 files, discarding any previous merge attempts. Re-merging is not
4527 files, discarding any previous merge attempts. Re-merging is not
4528 performed for files already marked as resolved. Use ``--all/-a``
4528 performed for files already marked as resolved. Use ``--all/-a``
4529 to select all unresolved files. ``--tool`` can be used to specify
4529 to select all unresolved files. ``--tool`` can be used to specify
4530 the merge tool used for the given files. It overrides the HGMERGE
4530 the merge tool used for the given files. It overrides the HGMERGE
4531 environment variable and your configuration files. Previous file
4531 environment variable and your configuration files. Previous file
4532 contents are saved with a ``.orig`` suffix.
4532 contents are saved with a ``.orig`` suffix.
4533
4533
4534 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4534 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4535 (e.g. after having manually fixed-up the files). The default is
4535 (e.g. after having manually fixed-up the files). The default is
4536 to mark all unresolved files.
4536 to mark all unresolved files.
4537
4537
4538 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4538 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4539 default is to mark all resolved files.
4539 default is to mark all resolved files.
4540
4540
4541 - :hg:`resolve -l`: list files which had or still have conflicts.
4541 - :hg:`resolve -l`: list files which had or still have conflicts.
4542 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4542 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4543
4543
4544 Note that Mercurial will not let you commit files with unresolved
4544 Note that Mercurial will not let you commit files with unresolved
4545 merge conflicts. You must use :hg:`resolve -m ...` before you can
4545 merge conflicts. You must use :hg:`resolve -m ...` before you can
4546 commit after a conflicting merge.
4546 commit after a conflicting merge.
4547
4547
4548 Returns 0 on success, 1 if any files fail a resolve attempt.
4548 Returns 0 on success, 1 if any files fail a resolve attempt.
4549 """
4549 """
4550
4550
4551 all, mark, unmark, show, nostatus = \
4551 all, mark, unmark, show, nostatus = \
4552 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
4552 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
4553
4553
4554 if (show and (mark or unmark)) or (mark and unmark):
4554 if (show and (mark or unmark)) or (mark and unmark):
4555 raise util.Abort(_("too many options specified"))
4555 raise util.Abort(_("too many options specified"))
4556 if pats and all:
4556 if pats and all:
4557 raise util.Abort(_("can't specify --all and patterns"))
4557 raise util.Abort(_("can't specify --all and patterns"))
4558 if not (all or pats or show or mark or unmark):
4558 if not (all or pats or show or mark or unmark):
4559 raise util.Abort(_('no files or directories specified; '
4559 raise util.Abort(_('no files or directories specified; '
4560 'use --all to remerge all files'))
4560 'use --all to remerge all files'))
4561
4561
4562 ms = mergemod.mergestate(repo)
4562 ms = mergemod.mergestate(repo)
4563 m = scmutil.match(repo[None], pats, opts)
4563 m = scmutil.match(repo[None], pats, opts)
4564 ret = 0
4564 ret = 0
4565
4565
4566 for f in ms:
4566 for f in ms:
4567 if m(f):
4567 if m(f):
4568 if show:
4568 if show:
4569 if nostatus:
4569 if nostatus:
4570 ui.write("%s\n" % f)
4570 ui.write("%s\n" % f)
4571 else:
4571 else:
4572 ui.write("%s %s\n" % (ms[f].upper(), f),
4572 ui.write("%s %s\n" % (ms[f].upper(), f),
4573 label='resolve.' +
4573 label='resolve.' +
4574 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
4574 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
4575 elif mark:
4575 elif mark:
4576 ms.mark(f, "r")
4576 ms.mark(f, "r")
4577 elif unmark:
4577 elif unmark:
4578 ms.mark(f, "u")
4578 ms.mark(f, "u")
4579 else:
4579 else:
4580 wctx = repo[None]
4580 wctx = repo[None]
4581 mctx = wctx.parents()[-1]
4581 mctx = wctx.parents()[-1]
4582
4582
4583 # backup pre-resolve (merge uses .orig for its own purposes)
4583 # backup pre-resolve (merge uses .orig for its own purposes)
4584 a = repo.wjoin(f)
4584 a = repo.wjoin(f)
4585 util.copyfile(a, a + ".resolve")
4585 util.copyfile(a, a + ".resolve")
4586
4586
4587 try:
4587 try:
4588 # resolve file
4588 # resolve file
4589 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4589 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4590 if ms.resolve(f, wctx, mctx):
4590 if ms.resolve(f, wctx, mctx):
4591 ret = 1
4591 ret = 1
4592 finally:
4592 finally:
4593 ui.setconfig('ui', 'forcemerge', '')
4593 ui.setconfig('ui', 'forcemerge', '')
4594
4594
4595 # replace filemerge's .orig file with our resolve file
4595 # replace filemerge's .orig file with our resolve file
4596 util.rename(a + ".resolve", a + ".orig")
4596 util.rename(a + ".resolve", a + ".orig")
4597
4597
4598 ms.commit()
4598 ms.commit()
4599 return ret
4599 return ret
4600
4600
4601 @command('revert',
4601 @command('revert',
4602 [('a', 'all', None, _('revert all changes when no arguments given')),
4602 [('a', 'all', None, _('revert all changes when no arguments given')),
4603 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4603 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4604 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4604 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4605 ('C', 'no-backup', None, _('do not save backup copies of files')),
4605 ('C', 'no-backup', None, _('do not save backup copies of files')),
4606 ] + walkopts + dryrunopts,
4606 ] + walkopts + dryrunopts,
4607 _('[OPTION]... [-r REV] [NAME]...'))
4607 _('[OPTION]... [-r REV] [NAME]...'))
4608 def revert(ui, repo, *pats, **opts):
4608 def revert(ui, repo, *pats, **opts):
4609 """restore files to their checkout state
4609 """restore files to their checkout state
4610
4610
4611 .. note::
4611 .. note::
4612 To check out earlier revisions, you should use :hg:`update REV`.
4612 To check out earlier revisions, you should use :hg:`update REV`.
4613 To cancel a merge (and lose your changes), use :hg:`update --clean .`.
4613 To cancel a merge (and lose your changes), use :hg:`update --clean .`.
4614
4614
4615 With no revision specified, revert the specified files or directories
4615 With no revision specified, revert the specified files or directories
4616 to the contents they had in the parent of the working directory.
4616 to the contents they had in the parent of the working directory.
4617 This restores the contents of files to an unmodified
4617 This restores the contents of files to an unmodified
4618 state and unschedules adds, removes, copies, and renames. If the
4618 state and unschedules adds, removes, copies, and renames. If the
4619 working directory has two parents, you must explicitly specify a
4619 working directory has two parents, you must explicitly specify a
4620 revision.
4620 revision.
4621
4621
4622 Using the -r/--rev or -d/--date options, revert the given files or
4622 Using the -r/--rev or -d/--date options, revert the given files or
4623 directories to their states as of a specific revision. Because
4623 directories to their states as of a specific revision. Because
4624 revert does not change the working directory parents, this will
4624 revert does not change the working directory parents, this will
4625 cause these files to appear modified. This can be helpful to "back
4625 cause these files to appear modified. This can be helpful to "back
4626 out" some or all of an earlier change. See :hg:`backout` for a
4626 out" some or all of an earlier change. See :hg:`backout` for a
4627 related method.
4627 related method.
4628
4628
4629 Modified files are saved with a .orig suffix before reverting.
4629 Modified files are saved with a .orig suffix before reverting.
4630 To disable these backups, use --no-backup.
4630 To disable these backups, use --no-backup.
4631
4631
4632 See :hg:`help dates` for a list of formats valid for -d/--date.
4632 See :hg:`help dates` for a list of formats valid for -d/--date.
4633
4633
4634 Returns 0 on success.
4634 Returns 0 on success.
4635 """
4635 """
4636
4636
4637 if opts.get("date"):
4637 if opts.get("date"):
4638 if opts.get("rev"):
4638 if opts.get("rev"):
4639 raise util.Abort(_("you can't specify a revision and a date"))
4639 raise util.Abort(_("you can't specify a revision and a date"))
4640 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4640 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4641
4641
4642 parent, p2 = repo.dirstate.parents()
4642 parent, p2 = repo.dirstate.parents()
4643 if not opts.get('rev') and p2 != nullid:
4643 if not opts.get('rev') and p2 != nullid:
4644 # revert after merge is a trap for new users (issue2915)
4644 # revert after merge is a trap for new users (issue2915)
4645 raise util.Abort(_('uncommitted merge with no revision specified'),
4645 raise util.Abort(_('uncommitted merge with no revision specified'),
4646 hint=_('use "hg update" or see "hg help revert"'))
4646 hint=_('use "hg update" or see "hg help revert"'))
4647
4647
4648 ctx = scmutil.revsingle(repo, opts.get('rev'))
4648 ctx = scmutil.revsingle(repo, opts.get('rev'))
4649 node = ctx.node()
4649 node = ctx.node()
4650
4650
4651 if not pats and not opts.get('all'):
4651 if not pats and not opts.get('all'):
4652 msg = _("no files or directories specified")
4652 msg = _("no files or directories specified")
4653 if p2 != nullid:
4653 if p2 != nullid:
4654 hint = _("uncommitted merge, use --all to discard all changes,"
4654 hint = _("uncommitted merge, use --all to discard all changes,"
4655 " or 'hg update -C .' to abort the merge")
4655 " or 'hg update -C .' to abort the merge")
4656 raise util.Abort(msg, hint=hint)
4656 raise util.Abort(msg, hint=hint)
4657 dirty = util.any(repo.status())
4657 dirty = util.any(repo.status())
4658 if node != parent:
4658 if node != parent:
4659 if dirty:
4659 if dirty:
4660 hint = _("uncommitted changes, use --all to discard all"
4660 hint = _("uncommitted changes, use --all to discard all"
4661 " changes, or 'hg update %s' to update") % ctx.rev()
4661 " changes, or 'hg update %s' to update") % ctx.rev()
4662 else:
4662 else:
4663 hint = _("use --all to revert all files,"
4663 hint = _("use --all to revert all files,"
4664 " or 'hg update %s' to update") % ctx.rev()
4664 " or 'hg update %s' to update") % ctx.rev()
4665 elif dirty:
4665 elif dirty:
4666 hint = _("uncommitted changes, use --all to discard all changes")
4666 hint = _("uncommitted changes, use --all to discard all changes")
4667 else:
4667 else:
4668 hint = _("use --all to revert all files")
4668 hint = _("use --all to revert all files")
4669 raise util.Abort(msg, hint=hint)
4669 raise util.Abort(msg, hint=hint)
4670
4670
4671 mf = ctx.manifest()
4671 mf = ctx.manifest()
4672 if node == parent:
4672 if node == parent:
4673 pmf = mf
4673 pmf = mf
4674 else:
4674 else:
4675 pmf = None
4675 pmf = None
4676
4676
4677 # need all matching names in dirstate and manifest of target rev,
4677 # need all matching names in dirstate and manifest of target rev,
4678 # so have to walk both. do not print errors if files exist in one
4678 # so have to walk both. do not print errors if files exist in one
4679 # but not other.
4679 # but not other.
4680
4680
4681 names = {}
4681 names = {}
4682
4682
4683 wlock = repo.wlock()
4683 wlock = repo.wlock()
4684 try:
4684 try:
4685 # walk dirstate.
4685 # walk dirstate.
4686
4686
4687 m = scmutil.match(repo[None], pats, opts)
4687 m = scmutil.match(repo[None], pats, opts)
4688 m.bad = lambda x, y: False
4688 m.bad = lambda x, y: False
4689 for abs in repo.walk(m):
4689 for abs in repo.walk(m):
4690 names[abs] = m.rel(abs), m.exact(abs)
4690 names[abs] = m.rel(abs), m.exact(abs)
4691
4691
4692 # walk target manifest.
4692 # walk target manifest.
4693
4693
4694 def badfn(path, msg):
4694 def badfn(path, msg):
4695 if path in names:
4695 if path in names:
4696 return
4696 return
4697 if path in repo[node].substate:
4697 if path in repo[node].substate:
4698 ui.warn("%s: %s\n" % (m.rel(path),
4698 ui.warn("%s: %s\n" % (m.rel(path),
4699 'reverting subrepos is unsupported'))
4699 'reverting subrepos is unsupported'))
4700 return
4700 return
4701 path_ = path + '/'
4701 path_ = path + '/'
4702 for f in names:
4702 for f in names:
4703 if f.startswith(path_):
4703 if f.startswith(path_):
4704 return
4704 return
4705 ui.warn("%s: %s\n" % (m.rel(path), msg))
4705 ui.warn("%s: %s\n" % (m.rel(path), msg))
4706
4706
4707 m = scmutil.match(repo[node], pats, opts)
4707 m = scmutil.match(repo[node], pats, opts)
4708 m.bad = badfn
4708 m.bad = badfn
4709 for abs in repo[node].walk(m):
4709 for abs in repo[node].walk(m):
4710 if abs not in names:
4710 if abs not in names:
4711 names[abs] = m.rel(abs), m.exact(abs)
4711 names[abs] = m.rel(abs), m.exact(abs)
4712
4712
4713 m = scmutil.matchfiles(repo, names)
4713 m = scmutil.matchfiles(repo, names)
4714 changes = repo.status(match=m)[:4]
4714 changes = repo.status(match=m)[:4]
4715 modified, added, removed, deleted = map(set, changes)
4715 modified, added, removed, deleted = map(set, changes)
4716
4716
4717 # if f is a rename, also revert the source
4717 # if f is a rename, also revert the source
4718 cwd = repo.getcwd()
4718 cwd = repo.getcwd()
4719 for f in added:
4719 for f in added:
4720 src = repo.dirstate.copied(f)
4720 src = repo.dirstate.copied(f)
4721 if src and src not in names and repo.dirstate[src] == 'r':
4721 if src and src not in names and repo.dirstate[src] == 'r':
4722 removed.add(src)
4722 removed.add(src)
4723 names[src] = (repo.pathto(src, cwd), True)
4723 names[src] = (repo.pathto(src, cwd), True)
4724
4724
4725 def removeforget(abs):
4725 def removeforget(abs):
4726 if repo.dirstate[abs] == 'a':
4726 if repo.dirstate[abs] == 'a':
4727 return _('forgetting %s\n')
4727 return _('forgetting %s\n')
4728 return _('removing %s\n')
4728 return _('removing %s\n')
4729
4729
4730 revert = ([], _('reverting %s\n'))
4730 revert = ([], _('reverting %s\n'))
4731 add = ([], _('adding %s\n'))
4731 add = ([], _('adding %s\n'))
4732 remove = ([], removeforget)
4732 remove = ([], removeforget)
4733 undelete = ([], _('undeleting %s\n'))
4733 undelete = ([], _('undeleting %s\n'))
4734
4734
4735 disptable = (
4735 disptable = (
4736 # dispatch table:
4736 # dispatch table:
4737 # file state
4737 # file state
4738 # action if in target manifest
4738 # action if in target manifest
4739 # action if not in target manifest
4739 # action if not in target manifest
4740 # make backup if in target manifest
4740 # make backup if in target manifest
4741 # make backup if not in target manifest
4741 # make backup if not in target manifest
4742 (modified, revert, remove, True, True),
4742 (modified, revert, remove, True, True),
4743 (added, revert, remove, True, False),
4743 (added, revert, remove, True, False),
4744 (removed, undelete, None, False, False),
4744 (removed, undelete, None, False, False),
4745 (deleted, revert, remove, False, False),
4745 (deleted, revert, remove, False, False),
4746 )
4746 )
4747
4747
4748 for abs, (rel, exact) in sorted(names.items()):
4748 for abs, (rel, exact) in sorted(names.items()):
4749 mfentry = mf.get(abs)
4749 mfentry = mf.get(abs)
4750 target = repo.wjoin(abs)
4750 target = repo.wjoin(abs)
4751 def handle(xlist, dobackup):
4751 def handle(xlist, dobackup):
4752 xlist[0].append(abs)
4752 xlist[0].append(abs)
4753 if (dobackup and not opts.get('no_backup') and
4753 if (dobackup and not opts.get('no_backup') and
4754 os.path.lexists(target)):
4754 os.path.lexists(target)):
4755 bakname = "%s.orig" % rel
4755 bakname = "%s.orig" % rel
4756 ui.note(_('saving current version of %s as %s\n') %
4756 ui.note(_('saving current version of %s as %s\n') %
4757 (rel, bakname))
4757 (rel, bakname))
4758 if not opts.get('dry_run'):
4758 if not opts.get('dry_run'):
4759 util.rename(target, bakname)
4759 util.rename(target, bakname)
4760 if ui.verbose or not exact:
4760 if ui.verbose or not exact:
4761 msg = xlist[1]
4761 msg = xlist[1]
4762 if not isinstance(msg, basestring):
4762 if not isinstance(msg, basestring):
4763 msg = msg(abs)
4763 msg = msg(abs)
4764 ui.status(msg % rel)
4764 ui.status(msg % rel)
4765 for table, hitlist, misslist, backuphit, backupmiss in disptable:
4765 for table, hitlist, misslist, backuphit, backupmiss in disptable:
4766 if abs not in table:
4766 if abs not in table:
4767 continue
4767 continue
4768 # file has changed in dirstate
4768 # file has changed in dirstate
4769 if mfentry:
4769 if mfentry:
4770 handle(hitlist, backuphit)
4770 handle(hitlist, backuphit)
4771 elif misslist is not None:
4771 elif misslist is not None:
4772 handle(misslist, backupmiss)
4772 handle(misslist, backupmiss)
4773 break
4773 break
4774 else:
4774 else:
4775 if abs not in repo.dirstate:
4775 if abs not in repo.dirstate:
4776 if mfentry:
4776 if mfentry:
4777 handle(add, True)
4777 handle(add, True)
4778 elif exact:
4778 elif exact:
4779 ui.warn(_('file not managed: %s\n') % rel)
4779 ui.warn(_('file not managed: %s\n') % rel)
4780 continue
4780 continue
4781 # file has not changed in dirstate
4781 # file has not changed in dirstate
4782 if node == parent:
4782 if node == parent:
4783 if exact:
4783 if exact:
4784 ui.warn(_('no changes needed to %s\n') % rel)
4784 ui.warn(_('no changes needed to %s\n') % rel)
4785 continue
4785 continue
4786 if pmf is None:
4786 if pmf is None:
4787 # only need parent manifest in this unlikely case,
4787 # only need parent manifest in this unlikely case,
4788 # so do not read by default
4788 # so do not read by default
4789 pmf = repo[parent].manifest()
4789 pmf = repo[parent].manifest()
4790 if abs in pmf and mfentry:
4790 if abs in pmf and mfentry:
4791 # if version of file is same in parent and target
4791 # if version of file is same in parent and target
4792 # manifests, do nothing
4792 # manifests, do nothing
4793 if (pmf[abs] != mfentry or
4793 if (pmf[abs] != mfentry or
4794 pmf.flags(abs) != mf.flags(abs)):
4794 pmf.flags(abs) != mf.flags(abs)):
4795 handle(revert, False)
4795 handle(revert, False)
4796 else:
4796 else:
4797 handle(remove, False)
4797 handle(remove, False)
4798
4798
4799 if not opts.get('dry_run'):
4799 if not opts.get('dry_run'):
4800 def checkout(f):
4800 def checkout(f):
4801 fc = ctx[f]
4801 fc = ctx[f]
4802 repo.wwrite(f, fc.data(), fc.flags())
4802 repo.wwrite(f, fc.data(), fc.flags())
4803
4803
4804 audit_path = scmutil.pathauditor(repo.root)
4804 audit_path = scmutil.pathauditor(repo.root)
4805 for f in remove[0]:
4805 for f in remove[0]:
4806 if repo.dirstate[f] == 'a':
4806 if repo.dirstate[f] == 'a':
4807 repo.dirstate.drop(f)
4807 repo.dirstate.drop(f)
4808 continue
4808 continue
4809 audit_path(f)
4809 audit_path(f)
4810 try:
4810 try:
4811 util.unlinkpath(repo.wjoin(f))
4811 util.unlinkpath(repo.wjoin(f))
4812 except OSError:
4812 except OSError:
4813 pass
4813 pass
4814 repo.dirstate.remove(f)
4814 repo.dirstate.remove(f)
4815
4815
4816 normal = None
4816 normal = None
4817 if node == parent:
4817 if node == parent:
4818 # We're reverting to our parent. If possible, we'd like status
4818 # We're reverting to our parent. If possible, we'd like status
4819 # to report the file as clean. We have to use normallookup for
4819 # to report the file as clean. We have to use normallookup for
4820 # merges to avoid losing information about merged/dirty files.
4820 # merges to avoid losing information about merged/dirty files.
4821 if p2 != nullid:
4821 if p2 != nullid:
4822 normal = repo.dirstate.normallookup
4822 normal = repo.dirstate.normallookup
4823 else:
4823 else:
4824 normal = repo.dirstate.normal
4824 normal = repo.dirstate.normal
4825 for f in revert[0]:
4825 for f in revert[0]:
4826 checkout(f)
4826 checkout(f)
4827 if normal:
4827 if normal:
4828 normal(f)
4828 normal(f)
4829
4829
4830 for f in add[0]:
4830 for f in add[0]:
4831 checkout(f)
4831 checkout(f)
4832 repo.dirstate.add(f)
4832 repo.dirstate.add(f)
4833
4833
4834 normal = repo.dirstate.normallookup
4834 normal = repo.dirstate.normallookup
4835 if node == parent and p2 == nullid:
4835 if node == parent and p2 == nullid:
4836 normal = repo.dirstate.normal
4836 normal = repo.dirstate.normal
4837 for f in undelete[0]:
4837 for f in undelete[0]:
4838 checkout(f)
4838 checkout(f)
4839 normal(f)
4839 normal(f)
4840
4840
4841 finally:
4841 finally:
4842 wlock.release()
4842 wlock.release()
4843
4843
4844 @command('rollback', dryrunopts +
4844 @command('rollback', dryrunopts +
4845 [('f', 'force', False, _('ignore safety measures'))])
4845 [('f', 'force', False, _('ignore safety measures'))])
4846 def rollback(ui, repo, **opts):
4846 def rollback(ui, repo, **opts):
4847 """roll back the last transaction (dangerous)
4847 """roll back the last transaction (dangerous)
4848
4848
4849 This command should be used with care. There is only one level of
4849 This command should be used with care. There is only one level of
4850 rollback, and there is no way to undo a rollback. It will also
4850 rollback, and there is no way to undo a rollback. It will also
4851 restore the dirstate at the time of the last transaction, losing
4851 restore the dirstate at the time of the last transaction, losing
4852 any dirstate changes since that time. This command does not alter
4852 any dirstate changes since that time. This command does not alter
4853 the working directory.
4853 the working directory.
4854
4854
4855 Transactions are used to encapsulate the effects of all commands
4855 Transactions are used to encapsulate the effects of all commands
4856 that create new changesets or propagate existing changesets into a
4856 that create new changesets or propagate existing changesets into a
4857 repository. For example, the following commands are transactional,
4857 repository. For example, the following commands are transactional,
4858 and their effects can be rolled back:
4858 and their effects can be rolled back:
4859
4859
4860 - commit
4860 - commit
4861 - import
4861 - import
4862 - pull
4862 - pull
4863 - push (with this repository as the destination)
4863 - push (with this repository as the destination)
4864 - unbundle
4864 - unbundle
4865
4865
4866 To avoid permanent data loss, rollback will refuse to rollback a
4866 To avoid permanent data loss, rollback will refuse to rollback a
4867 commit transaction if it isn't checked out. Use --force to
4867 commit transaction if it isn't checked out. Use --force to
4868 override this protection.
4868 override this protection.
4869
4869
4870 This command is not intended for use on public repositories. Once
4870 This command is not intended for use on public repositories. Once
4871 changes are visible for pull by other users, rolling a transaction
4871 changes are visible for pull by other users, rolling a transaction
4872 back locally is ineffective (someone else may already have pulled
4872 back locally is ineffective (someone else may already have pulled
4873 the changes). Furthermore, a race is possible with readers of the
4873 the changes). Furthermore, a race is possible with readers of the
4874 repository; for example an in-progress pull from the repository
4874 repository; for example an in-progress pull from the repository
4875 may fail if a rollback is performed.
4875 may fail if a rollback is performed.
4876
4876
4877 Returns 0 on success, 1 if no rollback data is available.
4877 Returns 0 on success, 1 if no rollback data is available.
4878 """
4878 """
4879 return repo.rollback(dryrun=opts.get('dry_run'),
4879 return repo.rollback(dryrun=opts.get('dry_run'),
4880 force=opts.get('force'))
4880 force=opts.get('force'))
4881
4881
4882 @command('root', [])
4882 @command('root', [])
4883 def root(ui, repo):
4883 def root(ui, repo):
4884 """print the root (top) of the current working directory
4884 """print the root (top) of the current working directory
4885
4885
4886 Print the root directory of the current repository.
4886 Print the root directory of the current repository.
4887
4887
4888 Returns 0 on success.
4888 Returns 0 on success.
4889 """
4889 """
4890 ui.write(repo.root + "\n")
4890 ui.write(repo.root + "\n")
4891
4891
4892 @command('^serve',
4892 @command('^serve',
4893 [('A', 'accesslog', '', _('name of access log file to write to'),
4893 [('A', 'accesslog', '', _('name of access log file to write to'),
4894 _('FILE')),
4894 _('FILE')),
4895 ('d', 'daemon', None, _('run server in background')),
4895 ('d', 'daemon', None, _('run server in background')),
4896 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
4896 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
4897 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4897 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4898 # use string type, then we can check if something was passed
4898 # use string type, then we can check if something was passed
4899 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4899 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4900 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4900 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4901 _('ADDR')),
4901 _('ADDR')),
4902 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4902 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4903 _('PREFIX')),
4903 _('PREFIX')),
4904 ('n', 'name', '',
4904 ('n', 'name', '',
4905 _('name to show in web pages (default: working directory)'), _('NAME')),
4905 _('name to show in web pages (default: working directory)'), _('NAME')),
4906 ('', 'web-conf', '',
4906 ('', 'web-conf', '',
4907 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
4907 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
4908 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4908 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4909 _('FILE')),
4909 _('FILE')),
4910 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4910 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4911 ('', 'stdio', None, _('for remote clients')),
4911 ('', 'stdio', None, _('for remote clients')),
4912 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
4912 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
4913 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4913 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4914 ('', 'style', '', _('template style to use'), _('STYLE')),
4914 ('', 'style', '', _('template style to use'), _('STYLE')),
4915 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4915 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4916 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
4916 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
4917 _('[OPTION]...'))
4917 _('[OPTION]...'))
4918 def serve(ui, repo, **opts):
4918 def serve(ui, repo, **opts):
4919 """start stand-alone webserver
4919 """start stand-alone webserver
4920
4920
4921 Start a local HTTP repository browser and pull server. You can use
4921 Start a local HTTP repository browser and pull server. You can use
4922 this for ad-hoc sharing and browsing of repositories. It is
4922 this for ad-hoc sharing and browsing of repositories. It is
4923 recommended to use a real web server to serve a repository for
4923 recommended to use a real web server to serve a repository for
4924 longer periods of time.
4924 longer periods of time.
4925
4925
4926 Please note that the server does not implement access control.
4926 Please note that the server does not implement access control.
4927 This means that, by default, anybody can read from the server and
4927 This means that, by default, anybody can read from the server and
4928 nobody can write to it by default. Set the ``web.allow_push``
4928 nobody can write to it by default. Set the ``web.allow_push``
4929 option to ``*`` to allow everybody to push to the server. You
4929 option to ``*`` to allow everybody to push to the server. You
4930 should use a real web server if you need to authenticate users.
4930 should use a real web server if you need to authenticate users.
4931
4931
4932 By default, the server logs accesses to stdout and errors to
4932 By default, the server logs accesses to stdout and errors to
4933 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4933 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4934 files.
4934 files.
4935
4935
4936 To have the server choose a free port number to listen on, specify
4936 To have the server choose a free port number to listen on, specify
4937 a port number of 0; in this case, the server will print the port
4937 a port number of 0; in this case, the server will print the port
4938 number it uses.
4938 number it uses.
4939
4939
4940 Returns 0 on success.
4940 Returns 0 on success.
4941 """
4941 """
4942
4942
4943 if opts["stdio"] and opts["cmdserver"]:
4943 if opts["stdio"] and opts["cmdserver"]:
4944 raise util.Abort(_("cannot use --stdio with --cmdserver"))
4944 raise util.Abort(_("cannot use --stdio with --cmdserver"))
4945
4945
4946 def checkrepo():
4946 def checkrepo():
4947 if repo is None:
4947 if repo is None:
4948 raise error.RepoError(_("There is no Mercurial repository here"
4948 raise error.RepoError(_("There is no Mercurial repository here"
4949 " (.hg not found)"))
4949 " (.hg not found)"))
4950
4950
4951 if opts["stdio"]:
4951 if opts["stdio"]:
4952 checkrepo()
4952 checkrepo()
4953 s = sshserver.sshserver(ui, repo)
4953 s = sshserver.sshserver(ui, repo)
4954 s.serve_forever()
4954 s.serve_forever()
4955
4955
4956 if opts["cmdserver"]:
4956 if opts["cmdserver"]:
4957 checkrepo()
4957 checkrepo()
4958 s = commandserver.server(ui, repo, opts["cmdserver"])
4958 s = commandserver.server(ui, repo, opts["cmdserver"])
4959 return s.serve()
4959 return s.serve()
4960
4960
4961 # this way we can check if something was given in the command-line
4961 # this way we can check if something was given in the command-line
4962 if opts.get('port'):
4962 if opts.get('port'):
4963 opts['port'] = util.getport(opts.get('port'))
4963 opts['port'] = util.getport(opts.get('port'))
4964
4964
4965 baseui = repo and repo.baseui or ui
4965 baseui = repo and repo.baseui or ui
4966 optlist = ("name templates style address port prefix ipv6"
4966 optlist = ("name templates style address port prefix ipv6"
4967 " accesslog errorlog certificate encoding")
4967 " accesslog errorlog certificate encoding")
4968 for o in optlist.split():
4968 for o in optlist.split():
4969 val = opts.get(o, '')
4969 val = opts.get(o, '')
4970 if val in (None, ''): # should check against default options instead
4970 if val in (None, ''): # should check against default options instead
4971 continue
4971 continue
4972 baseui.setconfig("web", o, val)
4972 baseui.setconfig("web", o, val)
4973 if repo and repo.ui != baseui:
4973 if repo and repo.ui != baseui:
4974 repo.ui.setconfig("web", o, val)
4974 repo.ui.setconfig("web", o, val)
4975
4975
4976 o = opts.get('web_conf') or opts.get('webdir_conf')
4976 o = opts.get('web_conf') or opts.get('webdir_conf')
4977 if not o:
4977 if not o:
4978 if not repo:
4978 if not repo:
4979 raise error.RepoError(_("There is no Mercurial repository"
4979 raise error.RepoError(_("There is no Mercurial repository"
4980 " here (.hg not found)"))
4980 " here (.hg not found)"))
4981 o = repo.root
4981 o = repo.root
4982
4982
4983 app = hgweb.hgweb(o, baseui=ui)
4983 app = hgweb.hgweb(o, baseui=ui)
4984
4984
4985 class service(object):
4985 class service(object):
4986 def init(self):
4986 def init(self):
4987 util.setsignalhandler()
4987 util.setsignalhandler()
4988 self.httpd = hgweb.server.create_server(ui, app)
4988 self.httpd = hgweb.server.create_server(ui, app)
4989
4989
4990 if opts['port'] and not ui.verbose:
4990 if opts['port'] and not ui.verbose:
4991 return
4991 return
4992
4992
4993 if self.httpd.prefix:
4993 if self.httpd.prefix:
4994 prefix = self.httpd.prefix.strip('/') + '/'
4994 prefix = self.httpd.prefix.strip('/') + '/'
4995 else:
4995 else:
4996 prefix = ''
4996 prefix = ''
4997
4997
4998 port = ':%d' % self.httpd.port
4998 port = ':%d' % self.httpd.port
4999 if port == ':80':
4999 if port == ':80':
5000 port = ''
5000 port = ''
5001
5001
5002 bindaddr = self.httpd.addr
5002 bindaddr = self.httpd.addr
5003 if bindaddr == '0.0.0.0':
5003 if bindaddr == '0.0.0.0':
5004 bindaddr = '*'
5004 bindaddr = '*'
5005 elif ':' in bindaddr: # IPv6
5005 elif ':' in bindaddr: # IPv6
5006 bindaddr = '[%s]' % bindaddr
5006 bindaddr = '[%s]' % bindaddr
5007
5007
5008 fqaddr = self.httpd.fqaddr
5008 fqaddr = self.httpd.fqaddr
5009 if ':' in fqaddr:
5009 if ':' in fqaddr:
5010 fqaddr = '[%s]' % fqaddr
5010 fqaddr = '[%s]' % fqaddr
5011 if opts['port']:
5011 if opts['port']:
5012 write = ui.status
5012 write = ui.status
5013 else:
5013 else:
5014 write = ui.write
5014 write = ui.write
5015 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5015 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5016 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5016 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5017
5017
5018 def run(self):
5018 def run(self):
5019 self.httpd.serve_forever()
5019 self.httpd.serve_forever()
5020
5020
5021 service = service()
5021 service = service()
5022
5022
5023 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5023 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5024
5024
5025 @command('showconfig|debugconfig',
5025 @command('showconfig|debugconfig',
5026 [('u', 'untrusted', None, _('show untrusted configuration options'))],
5026 [('u', 'untrusted', None, _('show untrusted configuration options'))],
5027 _('[-u] [NAME]...'))
5027 _('[-u] [NAME]...'))
5028 def showconfig(ui, repo, *values, **opts):
5028 def showconfig(ui, repo, *values, **opts):
5029 """show combined config settings from all hgrc files
5029 """show combined config settings from all hgrc files
5030
5030
5031 With no arguments, print names and values of all config items.
5031 With no arguments, print names and values of all config items.
5032
5032
5033 With one argument of the form section.name, print just the value
5033 With one argument of the form section.name, print just the value
5034 of that config item.
5034 of that config item.
5035
5035
5036 With multiple arguments, print names and values of all config
5036 With multiple arguments, print names and values of all config
5037 items with matching section names.
5037 items with matching section names.
5038
5038
5039 With --debug, the source (filename and line number) is printed
5039 With --debug, the source (filename and line number) is printed
5040 for each config item.
5040 for each config item.
5041
5041
5042 Returns 0 on success.
5042 Returns 0 on success.
5043 """
5043 """
5044
5044
5045 for f in scmutil.rcpath():
5045 for f in scmutil.rcpath():
5046 ui.debug('read config from: %s\n' % f)
5046 ui.debug('read config from: %s\n' % f)
5047 untrusted = bool(opts.get('untrusted'))
5047 untrusted = bool(opts.get('untrusted'))
5048 if values:
5048 if values:
5049 sections = [v for v in values if '.' not in v]
5049 sections = [v for v in values if '.' not in v]
5050 items = [v for v in values if '.' in v]
5050 items = [v for v in values if '.' in v]
5051 if len(items) > 1 or items and sections:
5051 if len(items) > 1 or items and sections:
5052 raise util.Abort(_('only one config item permitted'))
5052 raise util.Abort(_('only one config item permitted'))
5053 for section, name, value in ui.walkconfig(untrusted=untrusted):
5053 for section, name, value in ui.walkconfig(untrusted=untrusted):
5054 value = str(value).replace('\n', '\\n')
5054 value = str(value).replace('\n', '\\n')
5055 sectname = section + '.' + name
5055 sectname = section + '.' + name
5056 if values:
5056 if values:
5057 for v in values:
5057 for v in values:
5058 if v == section:
5058 if v == section:
5059 ui.debug('%s: ' %
5059 ui.debug('%s: ' %
5060 ui.configsource(section, name, untrusted))
5060 ui.configsource(section, name, untrusted))
5061 ui.write('%s=%s\n' % (sectname, value))
5061 ui.write('%s=%s\n' % (sectname, value))
5062 elif v == sectname:
5062 elif v == sectname:
5063 ui.debug('%s: ' %
5063 ui.debug('%s: ' %
5064 ui.configsource(section, name, untrusted))
5064 ui.configsource(section, name, untrusted))
5065 ui.write(value, '\n')
5065 ui.write(value, '\n')
5066 else:
5066 else:
5067 ui.debug('%s: ' %
5067 ui.debug('%s: ' %
5068 ui.configsource(section, name, untrusted))
5068 ui.configsource(section, name, untrusted))
5069 ui.write('%s=%s\n' % (sectname, value))
5069 ui.write('%s=%s\n' % (sectname, value))
5070
5070
5071 @command('^status|st',
5071 @command('^status|st',
5072 [('A', 'all', None, _('show status of all files')),
5072 [('A', 'all', None, _('show status of all files')),
5073 ('m', 'modified', None, _('show only modified files')),
5073 ('m', 'modified', None, _('show only modified files')),
5074 ('a', 'added', None, _('show only added files')),
5074 ('a', 'added', None, _('show only added files')),
5075 ('r', 'removed', None, _('show only removed files')),
5075 ('r', 'removed', None, _('show only removed files')),
5076 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5076 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5077 ('c', 'clean', None, _('show only files without changes')),
5077 ('c', 'clean', None, _('show only files without changes')),
5078 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5078 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5079 ('i', 'ignored', None, _('show only ignored files')),
5079 ('i', 'ignored', None, _('show only ignored files')),
5080 ('n', 'no-status', None, _('hide status prefix')),
5080 ('n', 'no-status', None, _('hide status prefix')),
5081 ('C', 'copies', None, _('show source of copied files')),
5081 ('C', 'copies', None, _('show source of copied files')),
5082 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5082 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5083 ('', 'rev', [], _('show difference from revision'), _('REV')),
5083 ('', 'rev', [], _('show difference from revision'), _('REV')),
5084 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5084 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5085 ] + walkopts + subrepoopts,
5085 ] + walkopts + subrepoopts,
5086 _('[OPTION]... [FILE]...'))
5086 _('[OPTION]... [FILE]...'))
5087 def status(ui, repo, *pats, **opts):
5087 def status(ui, repo, *pats, **opts):
5088 """show changed files in the working directory
5088 """show changed files in the working directory
5089
5089
5090 Show status of files in the repository. If names are given, only
5090 Show status of files in the repository. If names are given, only
5091 files that match are shown. Files that are clean or ignored or
5091 files that match are shown. Files that are clean or ignored or
5092 the source of a copy/move operation, are not listed unless
5092 the source of a copy/move operation, are not listed unless
5093 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5093 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5094 Unless options described with "show only ..." are given, the
5094 Unless options described with "show only ..." are given, the
5095 options -mardu are used.
5095 options -mardu are used.
5096
5096
5097 Option -q/--quiet hides untracked (unknown and ignored) files
5097 Option -q/--quiet hides untracked (unknown and ignored) files
5098 unless explicitly requested with -u/--unknown or -i/--ignored.
5098 unless explicitly requested with -u/--unknown or -i/--ignored.
5099
5099
5100 .. note::
5100 .. note::
5101 status may appear to disagree with diff if permissions have
5101 status may appear to disagree with diff if permissions have
5102 changed or a merge has occurred. The standard diff format does
5102 changed or a merge has occurred. The standard diff format does
5103 not report permission changes and diff only reports changes
5103 not report permission changes and diff only reports changes
5104 relative to one merge parent.
5104 relative to one merge parent.
5105
5105
5106 If one revision is given, it is used as the base revision.
5106 If one revision is given, it is used as the base revision.
5107 If two revisions are given, the differences between them are
5107 If two revisions are given, the differences between them are
5108 shown. The --change option can also be used as a shortcut to list
5108 shown. The --change option can also be used as a shortcut to list
5109 the changed files of a revision from its first parent.
5109 the changed files of a revision from its first parent.
5110
5110
5111 The codes used to show the status of files are::
5111 The codes used to show the status of files are::
5112
5112
5113 M = modified
5113 M = modified
5114 A = added
5114 A = added
5115 R = removed
5115 R = removed
5116 C = clean
5116 C = clean
5117 ! = missing (deleted by non-hg command, but still tracked)
5117 ! = missing (deleted by non-hg command, but still tracked)
5118 ? = not tracked
5118 ? = not tracked
5119 I = ignored
5119 I = ignored
5120 = origin of the previous file listed as A (added)
5120 = origin of the previous file listed as A (added)
5121
5121
5122 .. container:: verbose
5122 .. container:: verbose
5123
5123
5124 Examples:
5124 Examples:
5125
5125
5126 - show changes in the working directory relative to a
5126 - show changes in the working directory relative to a
5127 changeset::
5127 changeset::
5128
5128
5129 hg status --rev 9353
5129 hg status --rev 9353
5130
5130
5131 - show all changes including copies in an existing changeset::
5131 - show all changes including copies in an existing changeset::
5132
5132
5133 hg status --copies --change 9353
5133 hg status --copies --change 9353
5134
5134
5135 - get a NUL separated list of added files, suitable for xargs::
5135 - get a NUL separated list of added files, suitable for xargs::
5136
5136
5137 hg status -an0
5137 hg status -an0
5138
5138
5139 Returns 0 on success.
5139 Returns 0 on success.
5140 """
5140 """
5141
5141
5142 revs = opts.get('rev')
5142 revs = opts.get('rev')
5143 change = opts.get('change')
5143 change = opts.get('change')
5144
5144
5145 if revs and change:
5145 if revs and change:
5146 msg = _('cannot specify --rev and --change at the same time')
5146 msg = _('cannot specify --rev and --change at the same time')
5147 raise util.Abort(msg)
5147 raise util.Abort(msg)
5148 elif change:
5148 elif change:
5149 node2 = repo.lookup(change)
5149 node2 = repo.lookup(change)
5150 node1 = repo[node2].p1().node()
5150 node1 = repo[node2].p1().node()
5151 else:
5151 else:
5152 node1, node2 = scmutil.revpair(repo, revs)
5152 node1, node2 = scmutil.revpair(repo, revs)
5153
5153
5154 cwd = (pats and repo.getcwd()) or ''
5154 cwd = (pats and repo.getcwd()) or ''
5155 end = opts.get('print0') and '\0' or '\n'
5155 end = opts.get('print0') and '\0' or '\n'
5156 copy = {}
5156 copy = {}
5157 states = 'modified added removed deleted unknown ignored clean'.split()
5157 states = 'modified added removed deleted unknown ignored clean'.split()
5158 show = [k for k in states if opts.get(k)]
5158 show = [k for k in states if opts.get(k)]
5159 if opts.get('all'):
5159 if opts.get('all'):
5160 show += ui.quiet and (states[:4] + ['clean']) or states
5160 show += ui.quiet and (states[:4] + ['clean']) or states
5161 if not show:
5161 if not show:
5162 show = ui.quiet and states[:4] or states[:5]
5162 show = ui.quiet and states[:4] or states[:5]
5163
5163
5164 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5164 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5165 'ignored' in show, 'clean' in show, 'unknown' in show,
5165 'ignored' in show, 'clean' in show, 'unknown' in show,
5166 opts.get('subrepos'))
5166 opts.get('subrepos'))
5167 changestates = zip(states, 'MAR!?IC', stat)
5167 changestates = zip(states, 'MAR!?IC', stat)
5168
5168
5169 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5169 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5170 ctxn = repo[nullid]
5170 ctxn = repo[nullid]
5171 ctx1 = repo[node1]
5171 ctx1 = repo[node1]
5172 ctx2 = repo[node2]
5172 ctx2 = repo[node2]
5173 added = stat[1]
5173 added = stat[1]
5174 if node2 is None:
5174 if node2 is None:
5175 added = stat[0] + stat[1] # merged?
5175 added = stat[0] + stat[1] # merged?
5176
5176
5177 for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].iteritems():
5177 for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].iteritems():
5178 if k in added:
5178 if k in added:
5179 copy[k] = v
5179 copy[k] = v
5180 elif v in added:
5180 elif v in added:
5181 copy[v] = k
5181 copy[v] = k
5182
5182
5183 for state, char, files in changestates:
5183 for state, char, files in changestates:
5184 if state in show:
5184 if state in show:
5185 format = "%s %%s%s" % (char, end)
5185 format = "%s %%s%s" % (char, end)
5186 if opts.get('no_status'):
5186 if opts.get('no_status'):
5187 format = "%%s%s" % end
5187 format = "%%s%s" % end
5188
5188
5189 for f in files:
5189 for f in files:
5190 ui.write(format % repo.pathto(f, cwd),
5190 ui.write(format % repo.pathto(f, cwd),
5191 label='status.' + state)
5191 label='status.' + state)
5192 if f in copy:
5192 if f in copy:
5193 ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end),
5193 ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end),
5194 label='status.copied')
5194 label='status.copied')
5195
5195
5196 @command('^summary|sum',
5196 @command('^summary|sum',
5197 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5197 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5198 def summary(ui, repo, **opts):
5198 def summary(ui, repo, **opts):
5199 """summarize working directory state
5199 """summarize working directory state
5200
5200
5201 This generates a brief summary of the working directory state,
5201 This generates a brief summary of the working directory state,
5202 including parents, branch, commit status, and available updates.
5202 including parents, branch, commit status, and available updates.
5203
5203
5204 With the --remote option, this will check the default paths for
5204 With the --remote option, this will check the default paths for
5205 incoming and outgoing changes. This can be time-consuming.
5205 incoming and outgoing changes. This can be time-consuming.
5206
5206
5207 Returns 0 on success.
5207 Returns 0 on success.
5208 """
5208 """
5209
5209
5210 ctx = repo[None]
5210 ctx = repo[None]
5211 parents = ctx.parents()
5211 parents = ctx.parents()
5212 pnode = parents[0].node()
5212 pnode = parents[0].node()
5213 marks = []
5213 marks = []
5214
5214
5215 for p in parents:
5215 for p in parents:
5216 # label with log.changeset (instead of log.parent) since this
5216 # label with log.changeset (instead of log.parent) since this
5217 # shows a working directory parent *changeset*:
5217 # shows a working directory parent *changeset*:
5218 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5218 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5219 label='log.changeset')
5219 label='log.changeset')
5220 ui.write(' '.join(p.tags()), label='log.tag')
5220 ui.write(' '.join(p.tags()), label='log.tag')
5221 if p.bookmarks():
5221 if p.bookmarks():
5222 marks.extend(p.bookmarks())
5222 marks.extend(p.bookmarks())
5223 if p.rev() == -1:
5223 if p.rev() == -1:
5224 if not len(repo):
5224 if not len(repo):
5225 ui.write(_(' (empty repository)'))
5225 ui.write(_(' (empty repository)'))
5226 else:
5226 else:
5227 ui.write(_(' (no revision checked out)'))
5227 ui.write(_(' (no revision checked out)'))
5228 ui.write('\n')
5228 ui.write('\n')
5229 if p.description():
5229 if p.description():
5230 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5230 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5231 label='log.summary')
5231 label='log.summary')
5232
5232
5233 branch = ctx.branch()
5233 branch = ctx.branch()
5234 bheads = repo.branchheads(branch)
5234 bheads = repo.branchheads(branch)
5235 m = _('branch: %s\n') % branch
5235 m = _('branch: %s\n') % branch
5236 if branch != 'default':
5236 if branch != 'default':
5237 ui.write(m, label='log.branch')
5237 ui.write(m, label='log.branch')
5238 else:
5238 else:
5239 ui.status(m, label='log.branch')
5239 ui.status(m, label='log.branch')
5240
5240
5241 if marks:
5241 if marks:
5242 current = repo._bookmarkcurrent
5242 current = repo._bookmarkcurrent
5243 ui.write(_('bookmarks:'), label='log.bookmark')
5243 ui.write(_('bookmarks:'), label='log.bookmark')
5244 if current is not None:
5244 if current is not None:
5245 try:
5245 try:
5246 marks.remove(current)
5246 marks.remove(current)
5247 ui.write(' *' + current, label='bookmarks.current')
5247 ui.write(' *' + current, label='bookmarks.current')
5248 except ValueError:
5248 except ValueError:
5249 # current bookmark not in parent ctx marks
5249 # current bookmark not in parent ctx marks
5250 pass
5250 pass
5251 for m in marks:
5251 for m in marks:
5252 ui.write(' ' + m, label='log.bookmark')
5252 ui.write(' ' + m, label='log.bookmark')
5253 ui.write('\n', label='log.bookmark')
5253 ui.write('\n', label='log.bookmark')
5254
5254
5255 st = list(repo.status(unknown=True))[:6]
5255 st = list(repo.status(unknown=True))[:6]
5256
5256
5257 c = repo.dirstate.copies()
5257 c = repo.dirstate.copies()
5258 copied, renamed = [], []
5258 copied, renamed = [], []
5259 for d, s in c.iteritems():
5259 for d, s in c.iteritems():
5260 if s in st[2]:
5260 if s in st[2]:
5261 st[2].remove(s)
5261 st[2].remove(s)
5262 renamed.append(d)
5262 renamed.append(d)
5263 else:
5263 else:
5264 copied.append(d)
5264 copied.append(d)
5265 if d in st[1]:
5265 if d in st[1]:
5266 st[1].remove(d)
5266 st[1].remove(d)
5267 st.insert(3, renamed)
5267 st.insert(3, renamed)
5268 st.insert(4, copied)
5268 st.insert(4, copied)
5269
5269
5270 ms = mergemod.mergestate(repo)
5270 ms = mergemod.mergestate(repo)
5271 st.append([f for f in ms if ms[f] == 'u'])
5271 st.append([f for f in ms if ms[f] == 'u'])
5272
5272
5273 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5273 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5274 st.append(subs)
5274 st.append(subs)
5275
5275
5276 labels = [ui.label(_('%d modified'), 'status.modified'),
5276 labels = [ui.label(_('%d modified'), 'status.modified'),
5277 ui.label(_('%d added'), 'status.added'),
5277 ui.label(_('%d added'), 'status.added'),
5278 ui.label(_('%d removed'), 'status.removed'),
5278 ui.label(_('%d removed'), 'status.removed'),
5279 ui.label(_('%d renamed'), 'status.copied'),
5279 ui.label(_('%d renamed'), 'status.copied'),
5280 ui.label(_('%d copied'), 'status.copied'),
5280 ui.label(_('%d copied'), 'status.copied'),
5281 ui.label(_('%d deleted'), 'status.deleted'),
5281 ui.label(_('%d deleted'), 'status.deleted'),
5282 ui.label(_('%d unknown'), 'status.unknown'),
5282 ui.label(_('%d unknown'), 'status.unknown'),
5283 ui.label(_('%d ignored'), 'status.ignored'),
5283 ui.label(_('%d ignored'), 'status.ignored'),
5284 ui.label(_('%d unresolved'), 'resolve.unresolved'),
5284 ui.label(_('%d unresolved'), 'resolve.unresolved'),
5285 ui.label(_('%d subrepos'), 'status.modified')]
5285 ui.label(_('%d subrepos'), 'status.modified')]
5286 t = []
5286 t = []
5287 for s, l in zip(st, labels):
5287 for s, l in zip(st, labels):
5288 if s:
5288 if s:
5289 t.append(l % len(s))
5289 t.append(l % len(s))
5290
5290
5291 t = ', '.join(t)
5291 t = ', '.join(t)
5292 cleanworkdir = False
5292 cleanworkdir = False
5293
5293
5294 if len(parents) > 1:
5294 if len(parents) > 1:
5295 t += _(' (merge)')
5295 t += _(' (merge)')
5296 elif branch != parents[0].branch():
5296 elif branch != parents[0].branch():
5297 t += _(' (new branch)')
5297 t += _(' (new branch)')
5298 elif (parents[0].extra().get('close') and
5298 elif (parents[0].extra().get('close') and
5299 pnode in repo.branchheads(branch, closed=True)):
5299 pnode in repo.branchheads(branch, closed=True)):
5300 t += _(' (head closed)')
5300 t += _(' (head closed)')
5301 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
5301 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
5302 t += _(' (clean)')
5302 t += _(' (clean)')
5303 cleanworkdir = True
5303 cleanworkdir = True
5304 elif pnode not in bheads:
5304 elif pnode not in bheads:
5305 t += _(' (new branch head)')
5305 t += _(' (new branch head)')
5306
5306
5307 if cleanworkdir:
5307 if cleanworkdir:
5308 ui.status(_('commit: %s\n') % t.strip())
5308 ui.status(_('commit: %s\n') % t.strip())
5309 else:
5309 else:
5310 ui.write(_('commit: %s\n') % t.strip())
5310 ui.write(_('commit: %s\n') % t.strip())
5311
5311
5312 # all ancestors of branch heads - all ancestors of parent = new csets
5312 # all ancestors of branch heads - all ancestors of parent = new csets
5313 new = [0] * len(repo)
5313 new = [0] * len(repo)
5314 cl = repo.changelog
5314 cl = repo.changelog
5315 for a in [cl.rev(n) for n in bheads]:
5315 for a in [cl.rev(n) for n in bheads]:
5316 new[a] = 1
5316 new[a] = 1
5317 for a in cl.ancestors(*[cl.rev(n) for n in bheads]):
5317 for a in cl.ancestors(*[cl.rev(n) for n in bheads]):
5318 new[a] = 1
5318 new[a] = 1
5319 for a in [p.rev() for p in parents]:
5319 for a in [p.rev() for p in parents]:
5320 if a >= 0:
5320 if a >= 0:
5321 new[a] = 0
5321 new[a] = 0
5322 for a in cl.ancestors(*[p.rev() for p in parents]):
5322 for a in cl.ancestors(*[p.rev() for p in parents]):
5323 new[a] = 0
5323 new[a] = 0
5324 new = sum(new)
5324 new = sum(new)
5325
5325
5326 if new == 0:
5326 if new == 0:
5327 ui.status(_('update: (current)\n'))
5327 ui.status(_('update: (current)\n'))
5328 elif pnode not in bheads:
5328 elif pnode not in bheads:
5329 ui.write(_('update: %d new changesets (update)\n') % new)
5329 ui.write(_('update: %d new changesets (update)\n') % new)
5330 else:
5330 else:
5331 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5331 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5332 (new, len(bheads)))
5332 (new, len(bheads)))
5333
5333
5334 if opts.get('remote'):
5334 if opts.get('remote'):
5335 t = []
5335 t = []
5336 source, branches = hg.parseurl(ui.expandpath('default'))
5336 source, branches = hg.parseurl(ui.expandpath('default'))
5337 other = hg.peer(repo, {}, source)
5337 other = hg.peer(repo, {}, source)
5338 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
5338 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
5339 ui.debug('comparing with %s\n' % util.hidepassword(source))
5339 ui.debug('comparing with %s\n' % util.hidepassword(source))
5340 repo.ui.pushbuffer()
5340 repo.ui.pushbuffer()
5341 commoninc = discovery.findcommonincoming(repo, other)
5341 commoninc = discovery.findcommonincoming(repo, other)
5342 _common, incoming, _rheads = commoninc
5342 _common, incoming, _rheads = commoninc
5343 repo.ui.popbuffer()
5343 repo.ui.popbuffer()
5344 if incoming:
5344 if incoming:
5345 t.append(_('1 or more incoming'))
5345 t.append(_('1 or more incoming'))
5346
5346
5347 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5347 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5348 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5348 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5349 if source != dest:
5349 if source != dest:
5350 other = hg.peer(repo, {}, dest)
5350 other = hg.peer(repo, {}, dest)
5351 commoninc = None
5351 commoninc = None
5352 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5352 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5353 repo.ui.pushbuffer()
5353 repo.ui.pushbuffer()
5354 common, outheads = discovery.findcommonoutgoing(repo, other,
5354 common, outheads = discovery.findcommonoutgoing(repo, other,
5355 commoninc=commoninc)
5355 commoninc=commoninc)
5356 repo.ui.popbuffer()
5356 repo.ui.popbuffer()
5357 o = repo.changelog.findmissing(common=common, heads=outheads)
5357 o = repo.changelog.findmissing(common=common, heads=outheads)
5358 if o:
5358 if o:
5359 t.append(_('%d outgoing') % len(o))
5359 t.append(_('%d outgoing') % len(o))
5360 if 'bookmarks' in other.listkeys('namespaces'):
5360 if 'bookmarks' in other.listkeys('namespaces'):
5361 lmarks = repo.listkeys('bookmarks')
5361 lmarks = repo.listkeys('bookmarks')
5362 rmarks = other.listkeys('bookmarks')
5362 rmarks = other.listkeys('bookmarks')
5363 diff = set(rmarks) - set(lmarks)
5363 diff = set(rmarks) - set(lmarks)
5364 if len(diff) > 0:
5364 if len(diff) > 0:
5365 t.append(_('%d incoming bookmarks') % len(diff))
5365 t.append(_('%d incoming bookmarks') % len(diff))
5366 diff = set(lmarks) - set(rmarks)
5366 diff = set(lmarks) - set(rmarks)
5367 if len(diff) > 0:
5367 if len(diff) > 0:
5368 t.append(_('%d outgoing bookmarks') % len(diff))
5368 t.append(_('%d outgoing bookmarks') % len(diff))
5369
5369
5370 if t:
5370 if t:
5371 ui.write(_('remote: %s\n') % (', '.join(t)))
5371 ui.write(_('remote: %s\n') % (', '.join(t)))
5372 else:
5372 else:
5373 ui.status(_('remote: (synced)\n'))
5373 ui.status(_('remote: (synced)\n'))
5374
5374
5375 @command('tag',
5375 @command('tag',
5376 [('f', 'force', None, _('force tag')),
5376 [('f', 'force', None, _('force tag')),
5377 ('l', 'local', None, _('make the tag local')),
5377 ('l', 'local', None, _('make the tag local')),
5378 ('r', 'rev', '', _('revision to tag'), _('REV')),
5378 ('r', 'rev', '', _('revision to tag'), _('REV')),
5379 ('', 'remove', None, _('remove a tag')),
5379 ('', 'remove', None, _('remove a tag')),
5380 # -l/--local is already there, commitopts cannot be used
5380 # -l/--local is already there, commitopts cannot be used
5381 ('e', 'edit', None, _('edit commit message')),
5381 ('e', 'edit', None, _('edit commit message')),
5382 ('m', 'message', '', _('use <text> as commit message'), _('TEXT')),
5382 ('m', 'message', '', _('use <text> as commit message'), _('TEXT')),
5383 ] + commitopts2,
5383 ] + commitopts2,
5384 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5384 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5385 def tag(ui, repo, name1, *names, **opts):
5385 def tag(ui, repo, name1, *names, **opts):
5386 """add one or more tags for the current or given revision
5386 """add one or more tags for the current or given revision
5387
5387
5388 Name a particular revision using <name>.
5388 Name a particular revision using <name>.
5389
5389
5390 Tags are used to name particular revisions of the repository and are
5390 Tags are used to name particular revisions of the repository and are
5391 very useful to compare different revisions, to go back to significant
5391 very useful to compare different revisions, to go back to significant
5392 earlier versions or to mark branch points as releases, etc. Changing
5392 earlier versions or to mark branch points as releases, etc. Changing
5393 an existing tag is normally disallowed; use -f/--force to override.
5393 an existing tag is normally disallowed; use -f/--force to override.
5394
5394
5395 If no revision is given, the parent of the working directory is
5395 If no revision is given, the parent of the working directory is
5396 used, or tip if no revision is checked out.
5396 used, or tip if no revision is checked out.
5397
5397
5398 To facilitate version control, distribution, and merging of tags,
5398 To facilitate version control, distribution, and merging of tags,
5399 they are stored as a file named ".hgtags" which is managed similarly
5399 they are stored as a file named ".hgtags" which is managed similarly
5400 to other project files and can be hand-edited if necessary. This
5400 to other project files and can be hand-edited if necessary. This
5401 also means that tagging creates a new commit. The file
5401 also means that tagging creates a new commit. The file
5402 ".hg/localtags" is used for local tags (not shared among
5402 ".hg/localtags" is used for local tags (not shared among
5403 repositories).
5403 repositories).
5404
5404
5405 Tag commits are usually made at the head of a branch. If the parent
5405 Tag commits are usually made at the head of a branch. If the parent
5406 of the working directory is not a branch head, :hg:`tag` aborts; use
5406 of the working directory is not a branch head, :hg:`tag` aborts; use
5407 -f/--force to force the tag commit to be based on a non-head
5407 -f/--force to force the tag commit to be based on a non-head
5408 changeset.
5408 changeset.
5409
5409
5410 See :hg:`help dates` for a list of formats valid for -d/--date.
5410 See :hg:`help dates` for a list of formats valid for -d/--date.
5411
5411
5412 Since tag names have priority over branch names during revision
5412 Since tag names have priority over branch names during revision
5413 lookup, using an existing branch name as a tag name is discouraged.
5413 lookup, using an existing branch name as a tag name is discouraged.
5414
5414
5415 Returns 0 on success.
5415 Returns 0 on success.
5416 """
5416 """
5417
5417
5418 rev_ = "."
5418 rev_ = "."
5419 names = [t.strip() for t in (name1,) + names]
5419 names = [t.strip() for t in (name1,) + names]
5420 if len(names) != len(set(names)):
5420 if len(names) != len(set(names)):
5421 raise util.Abort(_('tag names must be unique'))
5421 raise util.Abort(_('tag names must be unique'))
5422 for n in names:
5422 for n in names:
5423 if n in ['tip', '.', 'null']:
5423 if n in ['tip', '.', 'null']:
5424 raise util.Abort(_("the name '%s' is reserved") % n)
5424 raise util.Abort(_("the name '%s' is reserved") % n)
5425 if not n:
5425 if not n:
5426 raise util.Abort(_('tag names cannot consist entirely of whitespace'))
5426 raise util.Abort(_('tag names cannot consist entirely of whitespace'))
5427 if opts.get('rev') and opts.get('remove'):
5427 if opts.get('rev') and opts.get('remove'):
5428 raise util.Abort(_("--rev and --remove are incompatible"))
5428 raise util.Abort(_("--rev and --remove are incompatible"))
5429 if opts.get('rev'):
5429 if opts.get('rev'):
5430 rev_ = opts['rev']
5430 rev_ = opts['rev']
5431 message = opts.get('message')
5431 message = opts.get('message')
5432 if opts.get('remove'):
5432 if opts.get('remove'):
5433 expectedtype = opts.get('local') and 'local' or 'global'
5433 expectedtype = opts.get('local') and 'local' or 'global'
5434 for n in names:
5434 for n in names:
5435 if not repo.tagtype(n):
5435 if not repo.tagtype(n):
5436 raise util.Abort(_("tag '%s' does not exist") % n)
5436 raise util.Abort(_("tag '%s' does not exist") % n)
5437 if repo.tagtype(n) != expectedtype:
5437 if repo.tagtype(n) != expectedtype:
5438 if expectedtype == 'global':
5438 if expectedtype == 'global':
5439 raise util.Abort(_("tag '%s' is not a global tag") % n)
5439 raise util.Abort(_("tag '%s' is not a global tag") % n)
5440 else:
5440 else:
5441 raise util.Abort(_("tag '%s' is not a local tag") % n)
5441 raise util.Abort(_("tag '%s' is not a local tag") % n)
5442 rev_ = nullid
5442 rev_ = nullid
5443 if not message:
5443 if not message:
5444 # we don't translate commit messages
5444 # we don't translate commit messages
5445 message = 'Removed tag %s' % ', '.join(names)
5445 message = 'Removed tag %s' % ', '.join(names)
5446 elif not opts.get('force'):
5446 elif not opts.get('force'):
5447 for n in names:
5447 for n in names:
5448 if n in repo.tags():
5448 if n in repo.tags():
5449 raise util.Abort(_("tag '%s' already exists "
5449 raise util.Abort(_("tag '%s' already exists "
5450 "(use -f to force)") % n)
5450 "(use -f to force)") % n)
5451 if not opts.get('local'):
5451 if not opts.get('local'):
5452 p1, p2 = repo.dirstate.parents()
5452 p1, p2 = repo.dirstate.parents()
5453 if p2 != nullid:
5453 if p2 != nullid:
5454 raise util.Abort(_('uncommitted merge'))
5454 raise util.Abort(_('uncommitted merge'))
5455 bheads = repo.branchheads()
5455 bheads = repo.branchheads()
5456 if not opts.get('force') and bheads and p1 not in bheads:
5456 if not opts.get('force') and bheads and p1 not in bheads:
5457 raise util.Abort(_('not at a branch head (use -f to force)'))
5457 raise util.Abort(_('not at a branch head (use -f to force)'))
5458 r = scmutil.revsingle(repo, rev_).node()
5458 r = scmutil.revsingle(repo, rev_).node()
5459
5459
5460 if not message:
5460 if not message:
5461 # we don't translate commit messages
5461 # we don't translate commit messages
5462 message = ('Added tag %s for changeset %s' %
5462 message = ('Added tag %s for changeset %s' %
5463 (', '.join(names), short(r)))
5463 (', '.join(names), short(r)))
5464
5464
5465 date = opts.get('date')
5465 date = opts.get('date')
5466 if date:
5466 if date:
5467 date = util.parsedate(date)
5467 date = util.parsedate(date)
5468
5468
5469 if opts.get('edit'):
5469 if opts.get('edit'):
5470 message = ui.edit(message, ui.username())
5470 message = ui.edit(message, ui.username())
5471
5471
5472 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
5472 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
5473
5473
5474 @command('tags', [], '')
5474 @command('tags', [], '')
5475 def tags(ui, repo):
5475 def tags(ui, repo):
5476 """list repository tags
5476 """list repository tags
5477
5477
5478 This lists both regular and local tags. When the -v/--verbose
5478 This lists both regular and local tags. When the -v/--verbose
5479 switch is used, a third column "local" is printed for local tags.
5479 switch is used, a third column "local" is printed for local tags.
5480
5480
5481 Returns 0 on success.
5481 Returns 0 on success.
5482 """
5482 """
5483
5483
5484 hexfunc = ui.debugflag and hex or short
5484 hexfunc = ui.debugflag and hex or short
5485 tagtype = ""
5485 tagtype = ""
5486
5486
5487 for t, n in reversed(repo.tagslist()):
5487 for t, n in reversed(repo.tagslist()):
5488 if ui.quiet:
5488 if ui.quiet:
5489 ui.write("%s\n" % t, label='tags.normal')
5489 ui.write("%s\n" % t, label='tags.normal')
5490 continue
5490 continue
5491
5491
5492 hn = hexfunc(n)
5492 hn = hexfunc(n)
5493 r = "%5d:%s" % (repo.changelog.rev(n), hn)
5493 r = "%5d:%s" % (repo.changelog.rev(n), hn)
5494 rev = ui.label(r, 'log.changeset')
5494 rev = ui.label(r, 'log.changeset')
5495 spaces = " " * (30 - encoding.colwidth(t))
5495 spaces = " " * (30 - encoding.colwidth(t))
5496
5496
5497 tag = ui.label(t, 'tags.normal')
5497 tag = ui.label(t, 'tags.normal')
5498 if ui.verbose:
5498 if ui.verbose:
5499 if repo.tagtype(t) == 'local':
5499 if repo.tagtype(t) == 'local':
5500 tagtype = " local"
5500 tagtype = " local"
5501 tag = ui.label(t, 'tags.local')
5501 tag = ui.label(t, 'tags.local')
5502 else:
5502 else:
5503 tagtype = ""
5503 tagtype = ""
5504 ui.write("%s%s %s%s\n" % (tag, spaces, rev, tagtype))
5504 ui.write("%s%s %s%s\n" % (tag, spaces, rev, tagtype))
5505
5505
5506 @command('tip',
5506 @command('tip',
5507 [('p', 'patch', None, _('show patch')),
5507 [('p', 'patch', None, _('show patch')),
5508 ('g', 'git', None, _('use git extended diff format')),
5508 ('g', 'git', None, _('use git extended diff format')),
5509 ] + templateopts,
5509 ] + templateopts,
5510 _('[-p] [-g]'))
5510 _('[-p] [-g]'))
5511 def tip(ui, repo, **opts):
5511 def tip(ui, repo, **opts):
5512 """show the tip revision
5512 """show the tip revision
5513
5513
5514 The tip revision (usually just called the tip) is the changeset
5514 The tip revision (usually just called the tip) is the changeset
5515 most recently added to the repository (and therefore the most
5515 most recently added to the repository (and therefore the most
5516 recently changed head).
5516 recently changed head).
5517
5517
5518 If you have just made a commit, that commit will be the tip. If
5518 If you have just made a commit, that commit will be the tip. If
5519 you have just pulled changes from another repository, the tip of
5519 you have just pulled changes from another repository, the tip of
5520 that repository becomes the current tip. The "tip" tag is special
5520 that repository becomes the current tip. The "tip" tag is special
5521 and cannot be renamed or assigned to a different changeset.
5521 and cannot be renamed or assigned to a different changeset.
5522
5522
5523 Returns 0 on success.
5523 Returns 0 on success.
5524 """
5524 """
5525 displayer = cmdutil.show_changeset(ui, repo, opts)
5525 displayer = cmdutil.show_changeset(ui, repo, opts)
5526 displayer.show(repo[len(repo) - 1])
5526 displayer.show(repo[len(repo) - 1])
5527 displayer.close()
5527 displayer.close()
5528
5528
5529 @command('unbundle',
5529 @command('unbundle',
5530 [('u', 'update', None,
5530 [('u', 'update', None,
5531 _('update to new branch head if changesets were unbundled'))],
5531 _('update to new branch head if changesets were unbundled'))],
5532 _('[-u] FILE...'))
5532 _('[-u] FILE...'))
5533 def unbundle(ui, repo, fname1, *fnames, **opts):
5533 def unbundle(ui, repo, fname1, *fnames, **opts):
5534 """apply one or more changegroup files
5534 """apply one or more changegroup files
5535
5535
5536 Apply one or more compressed changegroup files generated by the
5536 Apply one or more compressed changegroup files generated by the
5537 bundle command.
5537 bundle command.
5538
5538
5539 Returns 0 on success, 1 if an update has unresolved files.
5539 Returns 0 on success, 1 if an update has unresolved files.
5540 """
5540 """
5541 fnames = (fname1,) + fnames
5541 fnames = (fname1,) + fnames
5542
5542
5543 lock = repo.lock()
5543 lock = repo.lock()
5544 wc = repo['.']
5544 wc = repo['.']
5545 try:
5545 try:
5546 for fname in fnames:
5546 for fname in fnames:
5547 f = url.open(ui, fname)
5547 f = url.open(ui, fname)
5548 gen = changegroup.readbundle(f, fname)
5548 gen = changegroup.readbundle(f, fname)
5549 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname,
5549 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname,
5550 lock=lock)
5550 lock=lock)
5551 bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
5551 bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
5552 finally:
5552 finally:
5553 lock.release()
5553 lock.release()
5554 return postincoming(ui, repo, modheads, opts.get('update'), None)
5554 return postincoming(ui, repo, modheads, opts.get('update'), None)
5555
5555
5556 @command('^update|up|checkout|co',
5556 @command('^update|up|checkout|co',
5557 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5557 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5558 ('c', 'check', None,
5558 ('c', 'check', None,
5559 _('update across branches if no uncommitted changes')),
5559 _('update across branches if no uncommitted changes')),
5560 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5560 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5561 ('r', 'rev', '', _('revision'), _('REV'))],
5561 ('r', 'rev', '', _('revision'), _('REV'))],
5562 _('[-c] [-C] [-d DATE] [[-r] REV]'))
5562 _('[-c] [-C] [-d DATE] [[-r] REV]'))
5563 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
5563 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
5564 """update working directory (or switch revisions)
5564 """update working directory (or switch revisions)
5565
5565
5566 Update the repository's working directory to the specified
5566 Update the repository's working directory to the specified
5567 changeset. If no changeset is specified, update to the tip of the
5567 changeset. If no changeset is specified, update to the tip of the
5568 current named branch.
5568 current named branch.
5569
5569
5570 If the changeset is not a descendant of the working directory's
5570 If the changeset is not a descendant of the working directory's
5571 parent, the update is aborted. With the -c/--check option, the
5571 parent, the update is aborted. With the -c/--check option, the
5572 working directory is checked for uncommitted changes; if none are
5572 working directory is checked for uncommitted changes; if none are
5573 found, the working directory is updated to the specified
5573 found, the working directory is updated to the specified
5574 changeset.
5574 changeset.
5575
5575
5576 Update sets the working directory's parent revison to the specified
5576 Update sets the working directory's parent revison to the specified
5577 changeset (see :hg:`help parents`).
5577 changeset (see :hg:`help parents`).
5578
5578
5579 The following rules apply when the working directory contains
5579 The following rules apply when the working directory contains
5580 uncommitted changes:
5580 uncommitted changes:
5581
5581
5582 1. If neither -c/--check nor -C/--clean is specified, and if
5582 1. If neither -c/--check nor -C/--clean is specified, and if
5583 the requested changeset is an ancestor or descendant of
5583 the requested changeset is an ancestor or descendant of
5584 the working directory's parent, the uncommitted changes
5584 the working directory's parent, the uncommitted changes
5585 are merged into the requested changeset and the merged
5585 are merged into the requested changeset and the merged
5586 result is left uncommitted. If the requested changeset is
5586 result is left uncommitted. If the requested changeset is
5587 not an ancestor or descendant (that is, it is on another
5587 not an ancestor or descendant (that is, it is on another
5588 branch), the update is aborted and the uncommitted changes
5588 branch), the update is aborted and the uncommitted changes
5589 are preserved.
5589 are preserved.
5590
5590
5591 2. With the -c/--check option, the update is aborted and the
5591 2. With the -c/--check option, the update is aborted and the
5592 uncommitted changes are preserved.
5592 uncommitted changes are preserved.
5593
5593
5594 3. With the -C/--clean option, uncommitted changes are discarded and
5594 3. With the -C/--clean option, uncommitted changes are discarded and
5595 the working directory is updated to the requested changeset.
5595 the working directory is updated to the requested changeset.
5596
5596
5597 Use null as the changeset to remove the working directory (like
5597 Use null as the changeset to remove the working directory (like
5598 :hg:`clone -U`).
5598 :hg:`clone -U`).
5599
5599
5600 If you want to revert just one file to an older revision, use
5600 If you want to revert just one file to an older revision, use
5601 :hg:`revert [-r REV] NAME`.
5601 :hg:`revert [-r REV] NAME`.
5602
5602
5603 See :hg:`help dates` for a list of formats valid for -d/--date.
5603 See :hg:`help dates` for a list of formats valid for -d/--date.
5604
5604
5605 Returns 0 on success, 1 if there are unresolved files.
5605 Returns 0 on success, 1 if there are unresolved files.
5606 """
5606 """
5607 if rev and node:
5607 if rev and node:
5608 raise util.Abort(_("please specify just one revision"))
5608 raise util.Abort(_("please specify just one revision"))
5609
5609
5610 if rev is None or rev == '':
5610 if rev is None or rev == '':
5611 rev = node
5611 rev = node
5612
5612
5613 # if we defined a bookmark, we have to remember the original bookmark name
5613 # if we defined a bookmark, we have to remember the original bookmark name
5614 brev = rev
5614 brev = rev
5615 rev = scmutil.revsingle(repo, rev, rev).rev()
5615 rev = scmutil.revsingle(repo, rev, rev).rev()
5616
5616
5617 if check and clean:
5617 if check and clean:
5618 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
5618 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
5619
5619
5620 if check:
5620 if check:
5621 # we could use dirty() but we can ignore merge and branch trivia
5621 # we could use dirty() but we can ignore merge and branch trivia
5622 c = repo[None]
5622 c = repo[None]
5623 if c.modified() or c.added() or c.removed():
5623 if c.modified() or c.added() or c.removed():
5624 raise util.Abort(_("uncommitted local changes"))
5624 raise util.Abort(_("uncommitted local changes"))
5625
5625
5626 if date:
5626 if date:
5627 if rev is not None:
5627 if rev is not None:
5628 raise util.Abort(_("you can't specify a revision and a date"))
5628 raise util.Abort(_("you can't specify a revision and a date"))
5629 rev = cmdutil.finddate(ui, repo, date)
5629 rev = cmdutil.finddate(ui, repo, date)
5630
5630
5631 if clean or check:
5631 if clean or check:
5632 ret = hg.clean(repo, rev)
5632 ret = hg.clean(repo, rev)
5633 else:
5633 else:
5634 ret = hg.update(repo, rev)
5634 ret = hg.update(repo, rev)
5635
5635
5636 if brev in repo._bookmarks:
5636 if brev in repo._bookmarks:
5637 bookmarks.setcurrent(repo, brev)
5637 bookmarks.setcurrent(repo, brev)
5638
5638
5639 return ret
5639 return ret
5640
5640
5641 @command('verify', [])
5641 @command('verify', [])
5642 def verify(ui, repo):
5642 def verify(ui, repo):
5643 """verify the integrity of the repository
5643 """verify the integrity of the repository
5644
5644
5645 Verify the integrity of the current repository.
5645 Verify the integrity of the current repository.
5646
5646
5647 This will perform an extensive check of the repository's
5647 This will perform an extensive check of the repository's
5648 integrity, validating the hashes and checksums of each entry in
5648 integrity, validating the hashes and checksums of each entry in
5649 the changelog, manifest, and tracked files, as well as the
5649 the changelog, manifest, and tracked files, as well as the
5650 integrity of their crosslinks and indices.
5650 integrity of their crosslinks and indices.
5651
5651
5652 Returns 0 on success, 1 if errors are encountered.
5652 Returns 0 on success, 1 if errors are encountered.
5653 """
5653 """
5654 return hg.verify(repo)
5654 return hg.verify(repo)
5655
5655
5656 @command('version', [])
5656 @command('version', [])
5657 def version_(ui):
5657 def version_(ui):
5658 """output version and copyright information"""
5658 """output version and copyright information"""
5659 ui.write(_("Mercurial Distributed SCM (version %s)\n")
5659 ui.write(_("Mercurial Distributed SCM (version %s)\n")
5660 % util.version())
5660 % util.version())
5661 ui.status(_(
5661 ui.status(_(
5662 "(see http://mercurial.selenic.com for more information)\n"
5662 "(see http://mercurial.selenic.com for more information)\n"
5663 "\nCopyright (C) 2005-2011 Matt Mackall and others\n"
5663 "\nCopyright (C) 2005-2011 Matt Mackall and others\n"
5664 "This is free software; see the source for copying conditions. "
5664 "This is free software; see the source for copying conditions. "
5665 "There is NO\nwarranty; "
5665 "There is NO\nwarranty; "
5666 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5666 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5667 ))
5667 ))
5668
5668
5669 norepo = ("clone init version help debugcommands debugcomplete"
5669 norepo = ("clone init version help debugcommands debugcomplete"
5670 " debugdate debuginstall debugfsinfo debugpushkey debugwireargs"
5670 " debugdate debuginstall debugfsinfo debugpushkey debugwireargs"
5671 " debugknown debuggetbundle debugbundle")
5671 " debugknown debuggetbundle debugbundle")
5672 optionalrepo = ("identify paths serve showconfig debugancestor debugdag"
5672 optionalrepo = ("identify paths serve showconfig debugancestor debugdag"
5673 " debugdata debugindex debugindexdot debugrevlog")
5673 " debugdata debugindex debugindexdot debugrevlog")
@@ -1,171 +1,172 b''
1 $ hg init t
1 $ hg init t
2 $ cd t
2 $ cd t
3 $ echo import > port
3 $ echo import > port
4 $ hg add port
4 $ hg add port
5 $ hg commit -m 0 -u spam -d '0 0'
5 $ hg commit -m 0 -u spam -d '0 0'
6 $ echo export >> port
6 $ echo export >> port
7 $ hg commit -m 1 -u eggs -d '1 0'
7 $ hg commit -m 1 -u eggs -d '1 0'
8 $ echo export > port
8 $ echo export > port
9 $ echo vaportight >> port
9 $ echo vaportight >> port
10 $ echo 'import/export' >> port
10 $ echo 'import/export' >> port
11 $ hg commit -m 2 -u spam -d '2 0'
11 $ hg commit -m 2 -u spam -d '2 0'
12 $ echo 'import/export' >> port
12 $ echo 'import/export' >> port
13 $ hg commit -m 3 -u eggs -d '3 0'
13 $ hg commit -m 3 -u eggs -d '3 0'
14 $ head -n 3 port > port1
14 $ head -n 3 port > port1
15 $ mv port1 port
15 $ mv port1 port
16 $ hg commit -m 4 -u spam -d '4 0'
16 $ hg commit -m 4 -u spam -d '4 0'
17
17
18 pattern error
18 pattern error
19
19
20 $ hg grep '**test**'
20 $ hg grep '**test**'
21 grep: invalid match pattern: nothing to repeat
21 grep: invalid match pattern: nothing to repeat
22 [1]
22 [1]
23
23
24 simple
24 simple
25
25
26 $ hg grep port port
26 $ hg grep port port
27 port:4:export
27 port:4:export
28 port:4:vaportight
28 port:4:vaportight
29 port:4:import/export
29 port:4:import/export
30
30
31 simple with color
31 simple with color
32
32
33 $ hg --config extensions.color= grep --config color.mode=ansi \
33 $ hg --config extensions.color= grep --config color.mode=ansi \
34 > --color=always port port
34 > --color=always port port
35 port:4:ex\x1b[0;31;1mport\x1b[0m (esc)
35 port:4:ex\x1b[0;31;1mport\x1b[0m (esc)
36 port:4:va\x1b[0;31;1mport\x1b[0might (esc)
36 port:4:va\x1b[0;31;1mport\x1b[0might (esc)
37 port:4:im\x1b[0;31;1mport\x1b[0m/export (esc)
37 port:4:im\x1b[0;31;1mport\x1b[0m/export (esc)
38
38
39 all
39 all
40
40
41 $ hg grep --traceback --all -nu port port
41 $ hg grep --traceback --all -nu port port
42 port:4:4:-:spam:import/export
42 port:4:4:-:spam:import/export
43 port:3:4:+:eggs:import/export
43 port:3:4:+:eggs:import/export
44 port:2:1:-:spam:import
44 port:2:1:-:spam:import
45 port:2:2:-:spam:export
45 port:2:2:-:spam:export
46 port:2:1:+:spam:export
46 port:2:1:+:spam:export
47 port:2:2:+:spam:vaportight
47 port:2:2:+:spam:vaportight
48 port:2:3:+:spam:import/export
48 port:2:3:+:spam:import/export
49 port:1:2:+:eggs:export
49 port:1:2:+:eggs:export
50 port:0:1:+:spam:import
50 port:0:1:+:spam:import
51
51
52 other
52 other
53
53
54 $ hg grep import port
54 $ hg grep import port
55 port:4:import/export
55 port:4:import/export
56
56
57 $ hg cp port port2
57 $ hg cp port port2
58 $ hg commit -m 4 -u spam -d '5 0'
58 $ hg commit -m 4 -u spam -d '5 0'
59
59
60 follow
60 follow
61
61
62 $ hg grep --traceback -f 'import$' port2
62 $ hg grep --traceback -f 'import\n\Z' port2
63 port:0:import
63 port:0:import
64
64 $ echo deport >> port2
65 $ echo deport >> port2
65 $ hg commit -m 5 -u eggs -d '6 0'
66 $ hg commit -m 5 -u eggs -d '6 0'
66 $ hg grep -f --all -nu port port2
67 $ hg grep -f --all -nu port port2
67 port2:6:4:+:eggs:deport
68 port2:6:4:+:eggs:deport
68 port:4:4:-:spam:import/export
69 port:4:4:-:spam:import/export
69 port:3:4:+:eggs:import/export
70 port:3:4:+:eggs:import/export
70 port:2:1:-:spam:import
71 port:2:1:-:spam:import
71 port:2:2:-:spam:export
72 port:2:2:-:spam:export
72 port:2:1:+:spam:export
73 port:2:1:+:spam:export
73 port:2:2:+:spam:vaportight
74 port:2:2:+:spam:vaportight
74 port:2:3:+:spam:import/export
75 port:2:3:+:spam:import/export
75 port:1:2:+:eggs:export
76 port:1:2:+:eggs:export
76 port:0:1:+:spam:import
77 port:0:1:+:spam:import
77
78
78 $ cd ..
79 $ cd ..
79 $ hg init t2
80 $ hg init t2
80 $ cd t2
81 $ cd t2
81 $ hg grep foobar foo
82 $ hg grep foobar foo
82 [1]
83 [1]
83 $ hg grep foobar
84 $ hg grep foobar
84 [1]
85 [1]
85 $ echo blue >> color
86 $ echo blue >> color
86 $ echo black >> color
87 $ echo black >> color
87 $ hg add color
88 $ hg add color
88 $ hg ci -m 0
89 $ hg ci -m 0
89 $ echo orange >> color
90 $ echo orange >> color
90 $ hg ci -m 1
91 $ hg ci -m 1
91 $ echo black > color
92 $ echo black > color
92 $ hg ci -m 2
93 $ hg ci -m 2
93 $ echo orange >> color
94 $ echo orange >> color
94 $ echo blue >> color
95 $ echo blue >> color
95 $ hg ci -m 3
96 $ hg ci -m 3
96 $ hg grep orange
97 $ hg grep orange
97 color:3:orange
98 color:3:orange
98 $ hg grep --all orange
99 $ hg grep --all orange
99 color:3:+:orange
100 color:3:+:orange
100 color:2:-:orange
101 color:2:-:orange
101 color:1:+:orange
102 color:1:+:orange
102
103
103
104
104 match in last "line" without newline
105 match in last "line" without newline
105
106
106 $ python -c 'fp = open("noeol", "wb"); fp.write("no infinite loop"); fp.close();'
107 $ python -c 'fp = open("noeol", "wb"); fp.write("no infinite loop"); fp.close();'
107 $ hg ci -Amnoeol
108 $ hg ci -Amnoeol
108 adding noeol
109 adding noeol
109 $ hg grep loop
110 $ hg grep loop
110 noeol:4:no infinite loop
111 noeol:4:no infinite loop
111
112
112 $ cd ..
113 $ cd ..
113
114
114 Issue685: trackback in grep -r after rename
115 Issue685: trackback in grep -r after rename
115
116
116 Got a traceback when using grep on a single
117 Got a traceback when using grep on a single
117 revision with renamed files.
118 revision with renamed files.
118
119
119 $ hg init issue685
120 $ hg init issue685
120 $ cd issue685
121 $ cd issue685
121 $ echo octarine > color
122 $ echo octarine > color
122 $ hg ci -Amcolor
123 $ hg ci -Amcolor
123 adding color
124 adding color
124 $ hg rename color colour
125 $ hg rename color colour
125 $ hg ci -Am rename
126 $ hg ci -Am rename
126 $ hg grep octarine
127 $ hg grep octarine
127 colour:1:octarine
128 colour:1:octarine
128 color:0:octarine
129 color:0:octarine
129
130
130 Used to crash here
131 Used to crash here
131
132
132 $ hg grep -r 1 octarine
133 $ hg grep -r 1 octarine
133 colour:1:octarine
134 colour:1:octarine
134 $ cd ..
135 $ cd ..
135
136
136
137
137 Issue337: test that grep follows parent-child relationships instead
138 Issue337: test that grep follows parent-child relationships instead
138 of just using revision numbers.
139 of just using revision numbers.
139
140
140 $ hg init issue337
141 $ hg init issue337
141 $ cd issue337
142 $ cd issue337
142
143
143 $ echo white > color
144 $ echo white > color
144 $ hg commit -A -m "0 white"
145 $ hg commit -A -m "0 white"
145 adding color
146 adding color
146
147
147 $ echo red > color
148 $ echo red > color
148 $ hg commit -A -m "1 red"
149 $ hg commit -A -m "1 red"
149
150
150 $ hg update 0
151 $ hg update 0
151 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
152 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
152 $ echo black > color
153 $ echo black > color
153 $ hg commit -A -m "2 black"
154 $ hg commit -A -m "2 black"
154 created new head
155 created new head
155
156
156 $ hg update --clean 1
157 $ hg update --clean 1
157 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
158 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
158 $ echo blue > color
159 $ echo blue > color
159 $ hg commit -A -m "3 blue"
160 $ hg commit -A -m "3 blue"
160
161
161 $ hg grep --all red
162 $ hg grep --all red
162 color:3:-:red
163 color:3:-:red
163 color:1:+:red
164 color:1:+:red
164
165
165 $ hg init a
166 $ hg init a
166 $ cd a
167 $ cd a
167 $ cp $TESTDIR/binfile.bin .
168 $ cp $TESTDIR/binfile.bin .
168 $ hg add binfile.bin
169 $ hg add binfile.bin
169 $ hg ci -m 'add binfile.bin'
170 $ hg ci -m 'add binfile.bin'
170 $ hg grep "MaCam" --all
171 $ hg grep "MaCam" --all
171 binfile.bin:0:+: Binary file matches
172 binfile.bin:0:+: Binary file matches
General Comments 0
You need to be logged in to leave comments. Login now