##// END OF EJS Templates
formatter: convert status command
Matt Mackall -
r16136:68007f05 default
parent child Browse files
Show More
@@ -1,5787 +1,5791 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 import phases
20 import phases
21
21
22 table = {}
22 table = {}
23
23
24 command = cmdutil.command(table)
24 command = cmdutil.command(table)
25
25
26 # common command options
26 # common command options
27
27
28 globalopts = [
28 globalopts = [
29 ('R', 'repository', '',
29 ('R', 'repository', '',
30 _('repository root directory or name of overlay bundle file'),
30 _('repository root directory or name of overlay bundle file'),
31 _('REPO')),
31 _('REPO')),
32 ('', 'cwd', '',
32 ('', 'cwd', '',
33 _('change working directory'), _('DIR')),
33 _('change working directory'), _('DIR')),
34 ('y', 'noninteractive', None,
34 ('y', 'noninteractive', None,
35 _('do not prompt, automatically pick the first choice for all prompts')),
35 _('do not prompt, automatically pick the first choice for all prompts')),
36 ('q', 'quiet', None, _('suppress output')),
36 ('q', 'quiet', None, _('suppress output')),
37 ('v', 'verbose', None, _('enable additional output')),
37 ('v', 'verbose', None, _('enable additional output')),
38 ('', 'config', [],
38 ('', 'config', [],
39 _('set/override config option (use \'section.name=value\')'),
39 _('set/override config option (use \'section.name=value\')'),
40 _('CONFIG')),
40 _('CONFIG')),
41 ('', 'debug', None, _('enable debugging output')),
41 ('', 'debug', None, _('enable debugging output')),
42 ('', 'debugger', None, _('start debugger')),
42 ('', 'debugger', None, _('start debugger')),
43 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
43 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
44 _('ENCODE')),
44 _('ENCODE')),
45 ('', 'encodingmode', encoding.encodingmode,
45 ('', 'encodingmode', encoding.encodingmode,
46 _('set the charset encoding mode'), _('MODE')),
46 _('set the charset encoding mode'), _('MODE')),
47 ('', 'traceback', None, _('always print a traceback on exception')),
47 ('', 'traceback', None, _('always print a traceback on exception')),
48 ('', 'time', None, _('time how long the command takes')),
48 ('', 'time', None, _('time how long the command takes')),
49 ('', 'profile', None, _('print command execution profile')),
49 ('', 'profile', None, _('print command execution profile')),
50 ('', 'version', None, _('output version information and exit')),
50 ('', 'version', None, _('output version information and exit')),
51 ('h', 'help', None, _('display help and exit')),
51 ('h', 'help', None, _('display help and exit')),
52 ]
52 ]
53
53
54 dryrunopts = [('n', 'dry-run', None,
54 dryrunopts = [('n', 'dry-run', None,
55 _('do not perform actions, just print output'))]
55 _('do not perform actions, just print output'))]
56
56
57 remoteopts = [
57 remoteopts = [
58 ('e', 'ssh', '',
58 ('e', 'ssh', '',
59 _('specify ssh command to use'), _('CMD')),
59 _('specify ssh command to use'), _('CMD')),
60 ('', 'remotecmd', '',
60 ('', 'remotecmd', '',
61 _('specify hg command to run on the remote side'), _('CMD')),
61 _('specify hg command to run on the remote side'), _('CMD')),
62 ('', 'insecure', None,
62 ('', 'insecure', None,
63 _('do not verify server certificate (ignoring web.cacerts config)')),
63 _('do not verify server certificate (ignoring web.cacerts config)')),
64 ]
64 ]
65
65
66 walkopts = [
66 walkopts = [
67 ('I', 'include', [],
67 ('I', 'include', [],
68 _('include names matching the given patterns'), _('PATTERN')),
68 _('include names matching the given patterns'), _('PATTERN')),
69 ('X', 'exclude', [],
69 ('X', 'exclude', [],
70 _('exclude names matching the given patterns'), _('PATTERN')),
70 _('exclude names matching the given patterns'), _('PATTERN')),
71 ]
71 ]
72
72
73 commitopts = [
73 commitopts = [
74 ('m', 'message', '',
74 ('m', 'message', '',
75 _('use text as commit message'), _('TEXT')),
75 _('use text as commit message'), _('TEXT')),
76 ('l', 'logfile', '',
76 ('l', 'logfile', '',
77 _('read commit message from file'), _('FILE')),
77 _('read commit message from file'), _('FILE')),
78 ]
78 ]
79
79
80 commitopts2 = [
80 commitopts2 = [
81 ('d', 'date', '',
81 ('d', 'date', '',
82 _('record the specified date as commit date'), _('DATE')),
82 _('record the specified date as commit date'), _('DATE')),
83 ('u', 'user', '',
83 ('u', 'user', '',
84 _('record the specified user as committer'), _('USER')),
84 _('record the specified user as committer'), _('USER')),
85 ]
85 ]
86
86
87 templateopts = [
87 templateopts = [
88 ('', 'style', '',
88 ('', 'style', '',
89 _('display using template map file'), _('STYLE')),
89 _('display using template map file'), _('STYLE')),
90 ('', 'template', '',
90 ('', 'template', '',
91 _('display with template'), _('TEMPLATE')),
91 _('display with template'), _('TEMPLATE')),
92 ]
92 ]
93
93
94 logopts = [
94 logopts = [
95 ('p', 'patch', None, _('show patch')),
95 ('p', 'patch', None, _('show patch')),
96 ('g', 'git', None, _('use git extended diff format')),
96 ('g', 'git', None, _('use git extended diff format')),
97 ('l', 'limit', '',
97 ('l', 'limit', '',
98 _('limit number of changes displayed'), _('NUM')),
98 _('limit number of changes displayed'), _('NUM')),
99 ('M', 'no-merges', None, _('do not show merges')),
99 ('M', 'no-merges', None, _('do not show merges')),
100 ('', 'stat', None, _('output diffstat-style summary of changes')),
100 ('', 'stat', None, _('output diffstat-style summary of changes')),
101 ] + templateopts
101 ] + templateopts
102
102
103 diffopts = [
103 diffopts = [
104 ('a', 'text', None, _('treat all files as text')),
104 ('a', 'text', None, _('treat all files as text')),
105 ('g', 'git', None, _('use git extended diff format')),
105 ('g', 'git', None, _('use git extended diff format')),
106 ('', 'nodates', None, _('omit dates from diff headers'))
106 ('', 'nodates', None, _('omit dates from diff headers'))
107 ]
107 ]
108
108
109 diffwsopts = [
109 diffwsopts = [
110 ('w', 'ignore-all-space', None,
110 ('w', 'ignore-all-space', None,
111 _('ignore white space when comparing lines')),
111 _('ignore white space when comparing lines')),
112 ('b', 'ignore-space-change', None,
112 ('b', 'ignore-space-change', None,
113 _('ignore changes in the amount of white space')),
113 _('ignore changes in the amount of white space')),
114 ('B', 'ignore-blank-lines', None,
114 ('B', 'ignore-blank-lines', None,
115 _('ignore changes whose lines are all blank')),
115 _('ignore changes whose lines are all blank')),
116 ]
116 ]
117
117
118 diffopts2 = [
118 diffopts2 = [
119 ('p', 'show-function', None, _('show which function each change is in')),
119 ('p', 'show-function', None, _('show which function each change is in')),
120 ('', 'reverse', None, _('produce a diff that undoes the changes')),
120 ('', 'reverse', None, _('produce a diff that undoes the changes')),
121 ] + diffwsopts + [
121 ] + diffwsopts + [
122 ('U', 'unified', '',
122 ('U', 'unified', '',
123 _('number of lines of context to show'), _('NUM')),
123 _('number of lines of context to show'), _('NUM')),
124 ('', 'stat', None, _('output diffstat-style summary of changes')),
124 ('', 'stat', None, _('output diffstat-style summary of changes')),
125 ]
125 ]
126
126
127 mergetoolopts = [
127 mergetoolopts = [
128 ('t', 'tool', '', _('specify merge tool')),
128 ('t', 'tool', '', _('specify merge tool')),
129 ]
129 ]
130
130
131 similarityopts = [
131 similarityopts = [
132 ('s', 'similarity', '',
132 ('s', 'similarity', '',
133 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
133 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
134 ]
134 ]
135
135
136 subrepoopts = [
136 subrepoopts = [
137 ('S', 'subrepos', None,
137 ('S', 'subrepos', None,
138 _('recurse into subrepositories'))
138 _('recurse into subrepositories'))
139 ]
139 ]
140
140
141 # Commands start here, listed alphabetically
141 # Commands start here, listed alphabetically
142
142
143 @command('^add',
143 @command('^add',
144 walkopts + subrepoopts + dryrunopts,
144 walkopts + subrepoopts + dryrunopts,
145 _('[OPTION]... [FILE]...'))
145 _('[OPTION]... [FILE]...'))
146 def add(ui, repo, *pats, **opts):
146 def add(ui, repo, *pats, **opts):
147 """add the specified files on the next commit
147 """add the specified files on the next commit
148
148
149 Schedule files to be version controlled and added to the
149 Schedule files to be version controlled and added to the
150 repository.
150 repository.
151
151
152 The files will be added to the repository at the next commit. To
152 The files will be added to the repository at the next commit. To
153 undo an add before that, see :hg:`forget`.
153 undo an add before that, see :hg:`forget`.
154
154
155 If no names are given, add all files to the repository.
155 If no names are given, add all files to the repository.
156
156
157 .. container:: verbose
157 .. container:: verbose
158
158
159 An example showing how new (unknown) files are added
159 An example showing how new (unknown) files are added
160 automatically by :hg:`add`::
160 automatically by :hg:`add`::
161
161
162 $ ls
162 $ ls
163 foo.c
163 foo.c
164 $ hg status
164 $ hg status
165 ? foo.c
165 ? foo.c
166 $ hg add
166 $ hg add
167 adding foo.c
167 adding foo.c
168 $ hg status
168 $ hg status
169 A foo.c
169 A foo.c
170
170
171 Returns 0 if all files are successfully added.
171 Returns 0 if all files are successfully added.
172 """
172 """
173
173
174 m = scmutil.match(repo[None], pats, opts)
174 m = scmutil.match(repo[None], pats, opts)
175 rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
175 rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
176 opts.get('subrepos'), prefix="", explicitonly=False)
176 opts.get('subrepos'), prefix="", explicitonly=False)
177 return rejected and 1 or 0
177 return rejected and 1 or 0
178
178
179 @command('addremove',
179 @command('addremove',
180 similarityopts + walkopts + dryrunopts,
180 similarityopts + walkopts + dryrunopts,
181 _('[OPTION]... [FILE]...'))
181 _('[OPTION]... [FILE]...'))
182 def addremove(ui, repo, *pats, **opts):
182 def addremove(ui, repo, *pats, **opts):
183 """add all new files, delete all missing files
183 """add all new files, delete all missing files
184
184
185 Add all new files and remove all missing files from the
185 Add all new files and remove all missing files from the
186 repository.
186 repository.
187
187
188 New files are ignored if they match any of the patterns in
188 New files are ignored if they match any of the patterns in
189 ``.hgignore``. As with add, these changes take effect at the next
189 ``.hgignore``. As with add, these changes take effect at the next
190 commit.
190 commit.
191
191
192 Use the -s/--similarity option to detect renamed files. With a
192 Use the -s/--similarity option to detect renamed files. With a
193 parameter greater than 0, this compares every removed file with
193 parameter greater than 0, this compares every removed file with
194 every added file and records those similar enough as renames. This
194 every added file and records those similar enough as renames. This
195 option takes a percentage between 0 (disabled) and 100 (files must
195 option takes a percentage between 0 (disabled) and 100 (files must
196 be identical) as its parameter. Detecting renamed files this way
196 be identical) as its parameter. Detecting renamed files this way
197 can be expensive. After using this option, :hg:`status -C` can be
197 can be expensive. After using this option, :hg:`status -C` can be
198 used to check which files were identified as moved or renamed.
198 used to check which files were identified as moved or renamed.
199
199
200 Returns 0 if all files are successfully added.
200 Returns 0 if all files are successfully added.
201 """
201 """
202 try:
202 try:
203 sim = float(opts.get('similarity') or 100)
203 sim = float(opts.get('similarity') or 100)
204 except ValueError:
204 except ValueError:
205 raise util.Abort(_('similarity must be a number'))
205 raise util.Abort(_('similarity must be a number'))
206 if sim < 0 or sim > 100:
206 if sim < 0 or sim > 100:
207 raise util.Abort(_('similarity must be between 0 and 100'))
207 raise util.Abort(_('similarity must be between 0 and 100'))
208 return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0)
208 return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0)
209
209
210 @command('^annotate|blame',
210 @command('^annotate|blame',
211 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
211 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
212 ('', 'follow', None,
212 ('', 'follow', None,
213 _('follow copies/renames and list the filename (DEPRECATED)')),
213 _('follow copies/renames and list the filename (DEPRECATED)')),
214 ('', 'no-follow', None, _("don't follow copies and renames")),
214 ('', 'no-follow', None, _("don't follow copies and renames")),
215 ('a', 'text', None, _('treat all files as text')),
215 ('a', 'text', None, _('treat all files as text')),
216 ('u', 'user', None, _('list the author (long with -v)')),
216 ('u', 'user', None, _('list the author (long with -v)')),
217 ('f', 'file', None, _('list the filename')),
217 ('f', 'file', None, _('list the filename')),
218 ('d', 'date', None, _('list the date (short with -q)')),
218 ('d', 'date', None, _('list the date (short with -q)')),
219 ('n', 'number', None, _('list the revision number (default)')),
219 ('n', 'number', None, _('list the revision number (default)')),
220 ('c', 'changeset', None, _('list the changeset')),
220 ('c', 'changeset', None, _('list the changeset')),
221 ('l', 'line-number', None, _('show line number at the first appearance'))
221 ('l', 'line-number', None, _('show line number at the first appearance'))
222 ] + diffwsopts + walkopts,
222 ] + diffwsopts + walkopts,
223 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'))
223 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'))
224 def annotate(ui, repo, *pats, **opts):
224 def annotate(ui, repo, *pats, **opts):
225 """show changeset information by line for each file
225 """show changeset information by line for each file
226
226
227 List changes in files, showing the revision id responsible for
227 List changes in files, showing the revision id responsible for
228 each line
228 each line
229
229
230 This command is useful for discovering when a change was made and
230 This command is useful for discovering when a change was made and
231 by whom.
231 by whom.
232
232
233 Without the -a/--text option, annotate will avoid processing files
233 Without the -a/--text option, annotate will avoid processing files
234 it detects as binary. With -a, annotate will annotate the file
234 it detects as binary. With -a, annotate will annotate the file
235 anyway, although the results will probably be neither useful
235 anyway, although the results will probably be neither useful
236 nor desirable.
236 nor desirable.
237
237
238 Returns 0 on success.
238 Returns 0 on success.
239 """
239 """
240 if opts.get('follow'):
240 if opts.get('follow'):
241 # --follow is deprecated and now just an alias for -f/--file
241 # --follow is deprecated and now just an alias for -f/--file
242 # to mimic the behavior of Mercurial before version 1.5
242 # to mimic the behavior of Mercurial before version 1.5
243 opts['file'] = True
243 opts['file'] = True
244
244
245 datefunc = ui.quiet and util.shortdate or util.datestr
245 datefunc = ui.quiet and util.shortdate or util.datestr
246 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
246 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
247
247
248 if not pats:
248 if not pats:
249 raise util.Abort(_('at least one filename or pattern is required'))
249 raise util.Abort(_('at least one filename or pattern is required'))
250
250
251 hexfn = ui.debugflag and hex or short
251 hexfn = ui.debugflag and hex or short
252
252
253 opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())),
253 opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())),
254 ('number', ' ', lambda x: str(x[0].rev())),
254 ('number', ' ', lambda x: str(x[0].rev())),
255 ('changeset', ' ', lambda x: hexfn(x[0].node())),
255 ('changeset', ' ', lambda x: hexfn(x[0].node())),
256 ('date', ' ', getdate),
256 ('date', ' ', getdate),
257 ('file', ' ', lambda x: x[0].path()),
257 ('file', ' ', lambda x: x[0].path()),
258 ('line_number', ':', lambda x: str(x[1])),
258 ('line_number', ':', lambda x: str(x[1])),
259 ]
259 ]
260
260
261 if (not opts.get('user') and not opts.get('changeset')
261 if (not opts.get('user') and not opts.get('changeset')
262 and not opts.get('date') and not opts.get('file')):
262 and not opts.get('date') and not opts.get('file')):
263 opts['number'] = True
263 opts['number'] = True
264
264
265 linenumber = opts.get('line_number') is not None
265 linenumber = opts.get('line_number') is not None
266 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
266 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
267 raise util.Abort(_('at least one of -n/-c is required for -l'))
267 raise util.Abort(_('at least one of -n/-c is required for -l'))
268
268
269 funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)]
269 funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)]
270 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
270 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
271
271
272 def bad(x, y):
272 def bad(x, y):
273 raise util.Abort("%s: %s" % (x, y))
273 raise util.Abort("%s: %s" % (x, y))
274
274
275 ctx = scmutil.revsingle(repo, opts.get('rev'))
275 ctx = scmutil.revsingle(repo, opts.get('rev'))
276 m = scmutil.match(ctx, pats, opts)
276 m = scmutil.match(ctx, pats, opts)
277 m.bad = bad
277 m.bad = bad
278 follow = not opts.get('no_follow')
278 follow = not opts.get('no_follow')
279 diffopts = patch.diffopts(ui, opts, section='annotate')
279 diffopts = patch.diffopts(ui, opts, section='annotate')
280 for abs in ctx.walk(m):
280 for abs in ctx.walk(m):
281 fctx = ctx[abs]
281 fctx = ctx[abs]
282 if not opts.get('text') and util.binary(fctx.data()):
282 if not opts.get('text') and util.binary(fctx.data()):
283 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
283 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
284 continue
284 continue
285
285
286 lines = fctx.annotate(follow=follow, linenumber=linenumber,
286 lines = fctx.annotate(follow=follow, linenumber=linenumber,
287 diffopts=diffopts)
287 diffopts=diffopts)
288 pieces = []
288 pieces = []
289
289
290 for f, sep in funcmap:
290 for f, sep in funcmap:
291 l = [f(n) for n, dummy in lines]
291 l = [f(n) for n, dummy in lines]
292 if l:
292 if l:
293 sized = [(x, encoding.colwidth(x)) for x in l]
293 sized = [(x, encoding.colwidth(x)) for x in l]
294 ml = max([w for x, w in sized])
294 ml = max([w for x, w in sized])
295 pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x)
295 pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x)
296 for x, w in sized])
296 for x, w in sized])
297
297
298 if pieces:
298 if pieces:
299 for p, l in zip(zip(*pieces), lines):
299 for p, l in zip(zip(*pieces), lines):
300 ui.write("%s: %s" % ("".join(p), l[1]))
300 ui.write("%s: %s" % ("".join(p), l[1]))
301
301
302 if lines and not lines[-1][1].endswith('\n'):
302 if lines and not lines[-1][1].endswith('\n'):
303 ui.write('\n')
303 ui.write('\n')
304
304
305 @command('archive',
305 @command('archive',
306 [('', 'no-decode', None, _('do not pass files through decoders')),
306 [('', 'no-decode', None, _('do not pass files through decoders')),
307 ('p', 'prefix', '', _('directory prefix for files in archive'),
307 ('p', 'prefix', '', _('directory prefix for files in archive'),
308 _('PREFIX')),
308 _('PREFIX')),
309 ('r', 'rev', '', _('revision to distribute'), _('REV')),
309 ('r', 'rev', '', _('revision to distribute'), _('REV')),
310 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
310 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
311 ] + subrepoopts + walkopts,
311 ] + subrepoopts + walkopts,
312 _('[OPTION]... DEST'))
312 _('[OPTION]... DEST'))
313 def archive(ui, repo, dest, **opts):
313 def archive(ui, repo, dest, **opts):
314 '''create an unversioned archive of a repository revision
314 '''create an unversioned archive of a repository revision
315
315
316 By default, the revision used is the parent of the working
316 By default, the revision used is the parent of the working
317 directory; use -r/--rev to specify a different revision.
317 directory; use -r/--rev to specify a different revision.
318
318
319 The archive type is automatically detected based on file
319 The archive type is automatically detected based on file
320 extension (or override using -t/--type).
320 extension (or override using -t/--type).
321
321
322 .. container:: verbose
322 .. container:: verbose
323
323
324 Examples:
324 Examples:
325
325
326 - create a zip file containing the 1.0 release::
326 - create a zip file containing the 1.0 release::
327
327
328 hg archive -r 1.0 project-1.0.zip
328 hg archive -r 1.0 project-1.0.zip
329
329
330 - create a tarball excluding .hg files::
330 - create a tarball excluding .hg files::
331
331
332 hg archive project.tar.gz -X ".hg*"
332 hg archive project.tar.gz -X ".hg*"
333
333
334 Valid types are:
334 Valid types are:
335
335
336 :``files``: a directory full of files (default)
336 :``files``: a directory full of files (default)
337 :``tar``: tar archive, uncompressed
337 :``tar``: tar archive, uncompressed
338 :``tbz2``: tar archive, compressed using bzip2
338 :``tbz2``: tar archive, compressed using bzip2
339 :``tgz``: tar archive, compressed using gzip
339 :``tgz``: tar archive, compressed using gzip
340 :``uzip``: zip archive, uncompressed
340 :``uzip``: zip archive, uncompressed
341 :``zip``: zip archive, compressed using deflate
341 :``zip``: zip archive, compressed using deflate
342
342
343 The exact name of the destination archive or directory is given
343 The exact name of the destination archive or directory is given
344 using a format string; see :hg:`help export` for details.
344 using a format string; see :hg:`help export` for details.
345
345
346 Each member added to an archive file has a directory prefix
346 Each member added to an archive file has a directory prefix
347 prepended. Use -p/--prefix to specify a format string for the
347 prepended. Use -p/--prefix to specify a format string for the
348 prefix. The default is the basename of the archive, with suffixes
348 prefix. The default is the basename of the archive, with suffixes
349 removed.
349 removed.
350
350
351 Returns 0 on success.
351 Returns 0 on success.
352 '''
352 '''
353
353
354 ctx = scmutil.revsingle(repo, opts.get('rev'))
354 ctx = scmutil.revsingle(repo, opts.get('rev'))
355 if not ctx:
355 if not ctx:
356 raise util.Abort(_('no working directory: please specify a revision'))
356 raise util.Abort(_('no working directory: please specify a revision'))
357 node = ctx.node()
357 node = ctx.node()
358 dest = cmdutil.makefilename(repo, dest, node)
358 dest = cmdutil.makefilename(repo, dest, node)
359 if os.path.realpath(dest) == repo.root:
359 if os.path.realpath(dest) == repo.root:
360 raise util.Abort(_('repository root cannot be destination'))
360 raise util.Abort(_('repository root cannot be destination'))
361
361
362 kind = opts.get('type') or archival.guesskind(dest) or 'files'
362 kind = opts.get('type') or archival.guesskind(dest) or 'files'
363 prefix = opts.get('prefix')
363 prefix = opts.get('prefix')
364
364
365 if dest == '-':
365 if dest == '-':
366 if kind == 'files':
366 if kind == 'files':
367 raise util.Abort(_('cannot archive plain files to stdout'))
367 raise util.Abort(_('cannot archive plain files to stdout'))
368 dest = cmdutil.makefileobj(repo, dest)
368 dest = cmdutil.makefileobj(repo, dest)
369 if not prefix:
369 if not prefix:
370 prefix = os.path.basename(repo.root) + '-%h'
370 prefix = os.path.basename(repo.root) + '-%h'
371
371
372 prefix = cmdutil.makefilename(repo, prefix, node)
372 prefix = cmdutil.makefilename(repo, prefix, node)
373 matchfn = scmutil.match(ctx, [], opts)
373 matchfn = scmutil.match(ctx, [], opts)
374 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
374 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
375 matchfn, prefix, subrepos=opts.get('subrepos'))
375 matchfn, prefix, subrepos=opts.get('subrepos'))
376
376
377 @command('backout',
377 @command('backout',
378 [('', 'merge', None, _('merge with old dirstate parent after backout')),
378 [('', 'merge', None, _('merge with old dirstate parent after backout')),
379 ('', 'parent', '',
379 ('', 'parent', '',
380 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
380 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
381 ('r', 'rev', '', _('revision to backout'), _('REV')),
381 ('r', 'rev', '', _('revision to backout'), _('REV')),
382 ] + mergetoolopts + walkopts + commitopts + commitopts2,
382 ] + mergetoolopts + walkopts + commitopts + commitopts2,
383 _('[OPTION]... [-r] REV'))
383 _('[OPTION]... [-r] REV'))
384 def backout(ui, repo, node=None, rev=None, **opts):
384 def backout(ui, repo, node=None, rev=None, **opts):
385 '''reverse effect of earlier changeset
385 '''reverse effect of earlier changeset
386
386
387 Prepare a new changeset with the effect of REV undone in the
387 Prepare a new changeset with the effect of REV undone in the
388 current working directory.
388 current working directory.
389
389
390 If REV is the parent of the working directory, then this new changeset
390 If REV is the parent of the working directory, then this new changeset
391 is committed automatically. Otherwise, hg needs to merge the
391 is committed automatically. Otherwise, hg needs to merge the
392 changes and the merged result is left uncommitted.
392 changes and the merged result is left uncommitted.
393
393
394 .. note::
394 .. note::
395 backout cannot be used to fix either an unwanted or
395 backout cannot be used to fix either an unwanted or
396 incorrect merge.
396 incorrect merge.
397
397
398 .. container:: verbose
398 .. container:: verbose
399
399
400 By default, the pending changeset will have one parent,
400 By default, the pending changeset will have one parent,
401 maintaining a linear history. With --merge, the pending
401 maintaining a linear history. With --merge, the pending
402 changeset will instead have two parents: the old parent of the
402 changeset will instead have two parents: the old parent of the
403 working directory and a new child of REV that simply undoes REV.
403 working directory and a new child of REV that simply undoes REV.
404
404
405 Before version 1.7, the behavior without --merge was equivalent
405 Before version 1.7, the behavior without --merge was equivalent
406 to specifying --merge followed by :hg:`update --clean .` to
406 to specifying --merge followed by :hg:`update --clean .` to
407 cancel the merge and leave the child of REV as a head to be
407 cancel the merge and leave the child of REV as a head to be
408 merged separately.
408 merged separately.
409
409
410 See :hg:`help dates` for a list of formats valid for -d/--date.
410 See :hg:`help dates` for a list of formats valid for -d/--date.
411
411
412 Returns 0 on success.
412 Returns 0 on success.
413 '''
413 '''
414 if rev and node:
414 if rev and node:
415 raise util.Abort(_("please specify just one revision"))
415 raise util.Abort(_("please specify just one revision"))
416
416
417 if not rev:
417 if not rev:
418 rev = node
418 rev = node
419
419
420 if not rev:
420 if not rev:
421 raise util.Abort(_("please specify a revision to backout"))
421 raise util.Abort(_("please specify a revision to backout"))
422
422
423 date = opts.get('date')
423 date = opts.get('date')
424 if date:
424 if date:
425 opts['date'] = util.parsedate(date)
425 opts['date'] = util.parsedate(date)
426
426
427 cmdutil.bailifchanged(repo)
427 cmdutil.bailifchanged(repo)
428 node = scmutil.revsingle(repo, rev).node()
428 node = scmutil.revsingle(repo, rev).node()
429
429
430 op1, op2 = repo.dirstate.parents()
430 op1, op2 = repo.dirstate.parents()
431 a = repo.changelog.ancestor(op1, node)
431 a = repo.changelog.ancestor(op1, node)
432 if a != node:
432 if a != node:
433 raise util.Abort(_('cannot backout change on a different branch'))
433 raise util.Abort(_('cannot backout change on a different branch'))
434
434
435 p1, p2 = repo.changelog.parents(node)
435 p1, p2 = repo.changelog.parents(node)
436 if p1 == nullid:
436 if p1 == nullid:
437 raise util.Abort(_('cannot backout a change with no parents'))
437 raise util.Abort(_('cannot backout a change with no parents'))
438 if p2 != nullid:
438 if p2 != nullid:
439 if not opts.get('parent'):
439 if not opts.get('parent'):
440 raise util.Abort(_('cannot backout a merge changeset'))
440 raise util.Abort(_('cannot backout a merge changeset'))
441 p = repo.lookup(opts['parent'])
441 p = repo.lookup(opts['parent'])
442 if p not in (p1, p2):
442 if p not in (p1, p2):
443 raise util.Abort(_('%s is not a parent of %s') %
443 raise util.Abort(_('%s is not a parent of %s') %
444 (short(p), short(node)))
444 (short(p), short(node)))
445 parent = p
445 parent = p
446 else:
446 else:
447 if opts.get('parent'):
447 if opts.get('parent'):
448 raise util.Abort(_('cannot use --parent on non-merge changeset'))
448 raise util.Abort(_('cannot use --parent on non-merge changeset'))
449 parent = p1
449 parent = p1
450
450
451 # the backout should appear on the same branch
451 # the backout should appear on the same branch
452 branch = repo.dirstate.branch()
452 branch = repo.dirstate.branch()
453 hg.clean(repo, node, show_stats=False)
453 hg.clean(repo, node, show_stats=False)
454 repo.dirstate.setbranch(branch)
454 repo.dirstate.setbranch(branch)
455 revert_opts = opts.copy()
455 revert_opts = opts.copy()
456 revert_opts['date'] = None
456 revert_opts['date'] = None
457 revert_opts['all'] = True
457 revert_opts['all'] = True
458 revert_opts['rev'] = hex(parent)
458 revert_opts['rev'] = hex(parent)
459 revert_opts['no_backup'] = None
459 revert_opts['no_backup'] = None
460 revert(ui, repo, **revert_opts)
460 revert(ui, repo, **revert_opts)
461 if not opts.get('merge') and op1 != node:
461 if not opts.get('merge') and op1 != node:
462 try:
462 try:
463 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
463 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
464 return hg.update(repo, op1)
464 return hg.update(repo, op1)
465 finally:
465 finally:
466 ui.setconfig('ui', 'forcemerge', '')
466 ui.setconfig('ui', 'forcemerge', '')
467
467
468 commit_opts = opts.copy()
468 commit_opts = opts.copy()
469 commit_opts['addremove'] = False
469 commit_opts['addremove'] = False
470 if not commit_opts['message'] and not commit_opts['logfile']:
470 if not commit_opts['message'] and not commit_opts['logfile']:
471 # we don't translate commit messages
471 # we don't translate commit messages
472 commit_opts['message'] = "Backed out changeset %s" % short(node)
472 commit_opts['message'] = "Backed out changeset %s" % short(node)
473 commit_opts['force_editor'] = True
473 commit_opts['force_editor'] = True
474 commit(ui, repo, **commit_opts)
474 commit(ui, repo, **commit_opts)
475 def nice(node):
475 def nice(node):
476 return '%d:%s' % (repo.changelog.rev(node), short(node))
476 return '%d:%s' % (repo.changelog.rev(node), short(node))
477 ui.status(_('changeset %s backs out changeset %s\n') %
477 ui.status(_('changeset %s backs out changeset %s\n') %
478 (nice(repo.changelog.tip()), nice(node)))
478 (nice(repo.changelog.tip()), nice(node)))
479 if opts.get('merge') and op1 != node:
479 if opts.get('merge') and op1 != node:
480 hg.clean(repo, op1, show_stats=False)
480 hg.clean(repo, op1, show_stats=False)
481 ui.status(_('merging with changeset %s\n')
481 ui.status(_('merging with changeset %s\n')
482 % nice(repo.changelog.tip()))
482 % nice(repo.changelog.tip()))
483 try:
483 try:
484 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
484 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
485 return hg.merge(repo, hex(repo.changelog.tip()))
485 return hg.merge(repo, hex(repo.changelog.tip()))
486 finally:
486 finally:
487 ui.setconfig('ui', 'forcemerge', '')
487 ui.setconfig('ui', 'forcemerge', '')
488 return 0
488 return 0
489
489
490 @command('bisect',
490 @command('bisect',
491 [('r', 'reset', False, _('reset bisect state')),
491 [('r', 'reset', False, _('reset bisect state')),
492 ('g', 'good', False, _('mark changeset good')),
492 ('g', 'good', False, _('mark changeset good')),
493 ('b', 'bad', False, _('mark changeset bad')),
493 ('b', 'bad', False, _('mark changeset bad')),
494 ('s', 'skip', False, _('skip testing changeset')),
494 ('s', 'skip', False, _('skip testing changeset')),
495 ('e', 'extend', False, _('extend the bisect range')),
495 ('e', 'extend', False, _('extend the bisect range')),
496 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
496 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
497 ('U', 'noupdate', False, _('do not update to target'))],
497 ('U', 'noupdate', False, _('do not update to target'))],
498 _("[-gbsr] [-U] [-c CMD] [REV]"))
498 _("[-gbsr] [-U] [-c CMD] [REV]"))
499 def bisect(ui, repo, rev=None, extra=None, command=None,
499 def bisect(ui, repo, rev=None, extra=None, command=None,
500 reset=None, good=None, bad=None, skip=None, extend=None,
500 reset=None, good=None, bad=None, skip=None, extend=None,
501 noupdate=None):
501 noupdate=None):
502 """subdivision search of changesets
502 """subdivision search of changesets
503
503
504 This command helps to find changesets which introduce problems. To
504 This command helps to find changesets which introduce problems. To
505 use, mark the earliest changeset you know exhibits the problem as
505 use, mark the earliest changeset you know exhibits the problem as
506 bad, then mark the latest changeset which is free from the problem
506 bad, then mark the latest changeset which is free from the problem
507 as good. Bisect will update your working directory to a revision
507 as good. Bisect will update your working directory to a revision
508 for testing (unless the -U/--noupdate option is specified). Once
508 for testing (unless the -U/--noupdate option is specified). Once
509 you have performed tests, mark the working directory as good or
509 you have performed tests, mark the working directory as good or
510 bad, and bisect will either update to another candidate changeset
510 bad, and bisect will either update to another candidate changeset
511 or announce that it has found the bad revision.
511 or announce that it has found the bad revision.
512
512
513 As a shortcut, you can also use the revision argument to mark a
513 As a shortcut, you can also use the revision argument to mark a
514 revision as good or bad without checking it out first.
514 revision as good or bad without checking it out first.
515
515
516 If you supply a command, it will be used for automatic bisection.
516 If you supply a command, it will be used for automatic bisection.
517 Its exit status will be used to mark revisions as good or bad:
517 Its exit status will be used to mark revisions as good or bad:
518 status 0 means good, 125 means to skip the revision, 127
518 status 0 means good, 125 means to skip the revision, 127
519 (command not found) will abort the bisection, and any other
519 (command not found) will abort the bisection, and any other
520 non-zero exit status means the revision is bad.
520 non-zero exit status means the revision is bad.
521
521
522 .. container:: verbose
522 .. container:: verbose
523
523
524 Some examples:
524 Some examples:
525
525
526 - start a bisection with known bad revision 12, and good revision 34::
526 - start a bisection with known bad revision 12, and good revision 34::
527
527
528 hg bisect --bad 34
528 hg bisect --bad 34
529 hg bisect --good 12
529 hg bisect --good 12
530
530
531 - advance the current bisection by marking current revision as good or
531 - advance the current bisection by marking current revision as good or
532 bad::
532 bad::
533
533
534 hg bisect --good
534 hg bisect --good
535 hg bisect --bad
535 hg bisect --bad
536
536
537 - mark the current revision, or a known revision, to be skipped (eg. if
537 - mark the current revision, or a known revision, to be skipped (eg. if
538 that revision is not usable because of another issue)::
538 that revision is not usable because of another issue)::
539
539
540 hg bisect --skip
540 hg bisect --skip
541 hg bisect --skip 23
541 hg bisect --skip 23
542
542
543 - forget the current bisection::
543 - forget the current bisection::
544
544
545 hg bisect --reset
545 hg bisect --reset
546
546
547 - use 'make && make tests' to automatically find the first broken
547 - use 'make && make tests' to automatically find the first broken
548 revision::
548 revision::
549
549
550 hg bisect --reset
550 hg bisect --reset
551 hg bisect --bad 34
551 hg bisect --bad 34
552 hg bisect --good 12
552 hg bisect --good 12
553 hg bisect --command 'make && make tests'
553 hg bisect --command 'make && make tests'
554
554
555 - see all changesets whose states are already known in the current
555 - see all changesets whose states are already known in the current
556 bisection::
556 bisection::
557
557
558 hg log -r "bisect(pruned)"
558 hg log -r "bisect(pruned)"
559
559
560 - see all changesets that took part in the current bisection::
560 - see all changesets that took part in the current bisection::
561
561
562 hg log -r "bisect(range)"
562 hg log -r "bisect(range)"
563
563
564 - with the graphlog extension, you can even get a nice graph::
564 - with the graphlog extension, you can even get a nice graph::
565
565
566 hg log --graph -r "bisect(range)"
566 hg log --graph -r "bisect(range)"
567
567
568 See :hg:`help revsets` for more about the `bisect()` keyword.
568 See :hg:`help revsets` for more about the `bisect()` keyword.
569
569
570 Returns 0 on success.
570 Returns 0 on success.
571 """
571 """
572 def extendbisectrange(nodes, good):
572 def extendbisectrange(nodes, good):
573 # bisect is incomplete when it ends on a merge node and
573 # bisect is incomplete when it ends on a merge node and
574 # one of the parent was not checked.
574 # one of the parent was not checked.
575 parents = repo[nodes[0]].parents()
575 parents = repo[nodes[0]].parents()
576 if len(parents) > 1:
576 if len(parents) > 1:
577 side = good and state['bad'] or state['good']
577 side = good and state['bad'] or state['good']
578 num = len(set(i.node() for i in parents) & set(side))
578 num = len(set(i.node() for i in parents) & set(side))
579 if num == 1:
579 if num == 1:
580 return parents[0].ancestor(parents[1])
580 return parents[0].ancestor(parents[1])
581 return None
581 return None
582
582
583 def print_result(nodes, good):
583 def print_result(nodes, good):
584 displayer = cmdutil.show_changeset(ui, repo, {})
584 displayer = cmdutil.show_changeset(ui, repo, {})
585 if len(nodes) == 1:
585 if len(nodes) == 1:
586 # narrowed it down to a single revision
586 # narrowed it down to a single revision
587 if good:
587 if good:
588 ui.write(_("The first good revision is:\n"))
588 ui.write(_("The first good revision is:\n"))
589 else:
589 else:
590 ui.write(_("The first bad revision is:\n"))
590 ui.write(_("The first bad revision is:\n"))
591 displayer.show(repo[nodes[0]])
591 displayer.show(repo[nodes[0]])
592 extendnode = extendbisectrange(nodes, good)
592 extendnode = extendbisectrange(nodes, good)
593 if extendnode is not None:
593 if extendnode is not None:
594 ui.write(_('Not all ancestors of this changeset have been'
594 ui.write(_('Not all ancestors of this changeset have been'
595 ' checked.\nUse bisect --extend to continue the '
595 ' checked.\nUse bisect --extend to continue the '
596 'bisection from\nthe common ancestor, %s.\n')
596 'bisection from\nthe common ancestor, %s.\n')
597 % extendnode)
597 % extendnode)
598 else:
598 else:
599 # multiple possible revisions
599 # multiple possible revisions
600 if good:
600 if good:
601 ui.write(_("Due to skipped revisions, the first "
601 ui.write(_("Due to skipped revisions, the first "
602 "good revision could be any of:\n"))
602 "good revision could be any of:\n"))
603 else:
603 else:
604 ui.write(_("Due to skipped revisions, the first "
604 ui.write(_("Due to skipped revisions, the first "
605 "bad revision could be any of:\n"))
605 "bad revision could be any of:\n"))
606 for n in nodes:
606 for n in nodes:
607 displayer.show(repo[n])
607 displayer.show(repo[n])
608 displayer.close()
608 displayer.close()
609
609
610 def check_state(state, interactive=True):
610 def check_state(state, interactive=True):
611 if not state['good'] or not state['bad']:
611 if not state['good'] or not state['bad']:
612 if (good or bad or skip or reset) and interactive:
612 if (good or bad or skip or reset) and interactive:
613 return
613 return
614 if not state['good']:
614 if not state['good']:
615 raise util.Abort(_('cannot bisect (no known good revisions)'))
615 raise util.Abort(_('cannot bisect (no known good revisions)'))
616 else:
616 else:
617 raise util.Abort(_('cannot bisect (no known bad revisions)'))
617 raise util.Abort(_('cannot bisect (no known bad revisions)'))
618 return True
618 return True
619
619
620 # backward compatibility
620 # backward compatibility
621 if rev in "good bad reset init".split():
621 if rev in "good bad reset init".split():
622 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
622 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
623 cmd, rev, extra = rev, extra, None
623 cmd, rev, extra = rev, extra, None
624 if cmd == "good":
624 if cmd == "good":
625 good = True
625 good = True
626 elif cmd == "bad":
626 elif cmd == "bad":
627 bad = True
627 bad = True
628 else:
628 else:
629 reset = True
629 reset = True
630 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
630 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
631 raise util.Abort(_('incompatible arguments'))
631 raise util.Abort(_('incompatible arguments'))
632
632
633 if reset:
633 if reset:
634 p = repo.join("bisect.state")
634 p = repo.join("bisect.state")
635 if os.path.exists(p):
635 if os.path.exists(p):
636 os.unlink(p)
636 os.unlink(p)
637 return
637 return
638
638
639 state = hbisect.load_state(repo)
639 state = hbisect.load_state(repo)
640
640
641 if command:
641 if command:
642 changesets = 1
642 changesets = 1
643 try:
643 try:
644 while changesets:
644 while changesets:
645 # update state
645 # update state
646 status = util.system(command, out=ui.fout)
646 status = util.system(command, out=ui.fout)
647 if status == 125:
647 if status == 125:
648 transition = "skip"
648 transition = "skip"
649 elif status == 0:
649 elif status == 0:
650 transition = "good"
650 transition = "good"
651 # status < 0 means process was killed
651 # status < 0 means process was killed
652 elif status == 127:
652 elif status == 127:
653 raise util.Abort(_("failed to execute %s") % command)
653 raise util.Abort(_("failed to execute %s") % command)
654 elif status < 0:
654 elif status < 0:
655 raise util.Abort(_("%s killed") % command)
655 raise util.Abort(_("%s killed") % command)
656 else:
656 else:
657 transition = "bad"
657 transition = "bad"
658 ctx = scmutil.revsingle(repo, rev)
658 ctx = scmutil.revsingle(repo, rev)
659 rev = None # clear for future iterations
659 rev = None # clear for future iterations
660 state[transition].append(ctx.node())
660 state[transition].append(ctx.node())
661 ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition))
661 ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition))
662 check_state(state, interactive=False)
662 check_state(state, interactive=False)
663 # bisect
663 # bisect
664 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
664 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
665 # update to next check
665 # update to next check
666 cmdutil.bailifchanged(repo)
666 cmdutil.bailifchanged(repo)
667 hg.clean(repo, nodes[0], show_stats=False)
667 hg.clean(repo, nodes[0], show_stats=False)
668 finally:
668 finally:
669 hbisect.save_state(repo, state)
669 hbisect.save_state(repo, state)
670 print_result(nodes, good)
670 print_result(nodes, good)
671 return
671 return
672
672
673 # update state
673 # update state
674
674
675 if rev:
675 if rev:
676 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
676 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
677 else:
677 else:
678 nodes = [repo.lookup('.')]
678 nodes = [repo.lookup('.')]
679
679
680 if good or bad or skip:
680 if good or bad or skip:
681 if good:
681 if good:
682 state['good'] += nodes
682 state['good'] += nodes
683 elif bad:
683 elif bad:
684 state['bad'] += nodes
684 state['bad'] += nodes
685 elif skip:
685 elif skip:
686 state['skip'] += nodes
686 state['skip'] += nodes
687 hbisect.save_state(repo, state)
687 hbisect.save_state(repo, state)
688
688
689 if not check_state(state):
689 if not check_state(state):
690 return
690 return
691
691
692 # actually bisect
692 # actually bisect
693 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
693 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
694 if extend:
694 if extend:
695 if not changesets:
695 if not changesets:
696 extendnode = extendbisectrange(nodes, good)
696 extendnode = extendbisectrange(nodes, good)
697 if extendnode is not None:
697 if extendnode is not None:
698 ui.write(_("Extending search to changeset %d:%s\n"
698 ui.write(_("Extending search to changeset %d:%s\n"
699 % (extendnode.rev(), extendnode)))
699 % (extendnode.rev(), extendnode)))
700 if noupdate:
700 if noupdate:
701 return
701 return
702 cmdutil.bailifchanged(repo)
702 cmdutil.bailifchanged(repo)
703 return hg.clean(repo, extendnode.node())
703 return hg.clean(repo, extendnode.node())
704 raise util.Abort(_("nothing to extend"))
704 raise util.Abort(_("nothing to extend"))
705
705
706 if changesets == 0:
706 if changesets == 0:
707 print_result(nodes, good)
707 print_result(nodes, good)
708 else:
708 else:
709 assert len(nodes) == 1 # only a single node can be tested next
709 assert len(nodes) == 1 # only a single node can be tested next
710 node = nodes[0]
710 node = nodes[0]
711 # compute the approximate number of remaining tests
711 # compute the approximate number of remaining tests
712 tests, size = 0, 2
712 tests, size = 0, 2
713 while size <= changesets:
713 while size <= changesets:
714 tests, size = tests + 1, size * 2
714 tests, size = tests + 1, size * 2
715 rev = repo.changelog.rev(node)
715 rev = repo.changelog.rev(node)
716 ui.write(_("Testing changeset %d:%s "
716 ui.write(_("Testing changeset %d:%s "
717 "(%d changesets remaining, ~%d tests)\n")
717 "(%d changesets remaining, ~%d tests)\n")
718 % (rev, short(node), changesets, tests))
718 % (rev, short(node), changesets, tests))
719 if not noupdate:
719 if not noupdate:
720 cmdutil.bailifchanged(repo)
720 cmdutil.bailifchanged(repo)
721 return hg.clean(repo, node)
721 return hg.clean(repo, node)
722
722
723 @command('bookmarks',
723 @command('bookmarks',
724 [('f', 'force', False, _('force')),
724 [('f', 'force', False, _('force')),
725 ('r', 'rev', '', _('revision'), _('REV')),
725 ('r', 'rev', '', _('revision'), _('REV')),
726 ('d', 'delete', False, _('delete a given bookmark')),
726 ('d', 'delete', False, _('delete a given bookmark')),
727 ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
727 ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
728 ('i', 'inactive', False, _('mark a bookmark inactive'))],
728 ('i', 'inactive', False, _('mark a bookmark inactive'))],
729 _('hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]'))
729 _('hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]'))
730 def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False,
730 def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False,
731 rename=None, inactive=False):
731 rename=None, inactive=False):
732 '''track a line of development with movable markers
732 '''track a line of development with movable markers
733
733
734 Bookmarks are pointers to certain commits that move when committing.
734 Bookmarks are pointers to certain commits that move when committing.
735 Bookmarks are local. They can be renamed, copied and deleted. It is
735 Bookmarks are local. They can be renamed, copied and deleted. It is
736 possible to use :hg:`merge NAME` to merge from a given bookmark, and
736 possible to use :hg:`merge NAME` to merge from a given bookmark, and
737 :hg:`update NAME` to update to a given bookmark.
737 :hg:`update NAME` to update to a given bookmark.
738
738
739 You can use :hg:`bookmark NAME` to set a bookmark on the working
739 You can use :hg:`bookmark NAME` to set a bookmark on the working
740 directory's parent revision with the given name. If you specify
740 directory's parent revision with the given name. If you specify
741 a revision using -r REV (where REV may be an existing bookmark),
741 a revision using -r REV (where REV may be an existing bookmark),
742 the bookmark is assigned to that revision.
742 the bookmark is assigned to that revision.
743
743
744 Bookmarks can be pushed and pulled between repositories (see :hg:`help
744 Bookmarks can be pushed and pulled between repositories (see :hg:`help
745 push` and :hg:`help pull`). This requires both the local and remote
745 push` and :hg:`help pull`). This requires both the local and remote
746 repositories to support bookmarks. For versions prior to 1.8, this means
746 repositories to support bookmarks. For versions prior to 1.8, this means
747 the bookmarks extension must be enabled.
747 the bookmarks extension must be enabled.
748
748
749 With -i/--inactive, the new bookmark will not be made the active
749 With -i/--inactive, the new bookmark will not be made the active
750 bookmark. If -r/--rev is given, the new bookmark will not be made
750 bookmark. If -r/--rev is given, the new bookmark will not be made
751 active even if -i/--inactive is not given. If no NAME is given, the
751 active even if -i/--inactive is not given. If no NAME is given, the
752 current active bookmark will be marked inactive.
752 current active bookmark will be marked inactive.
753 '''
753 '''
754 hexfn = ui.debugflag and hex or short
754 hexfn = ui.debugflag and hex or short
755 marks = repo._bookmarks
755 marks = repo._bookmarks
756 cur = repo.changectx('.').node()
756 cur = repo.changectx('.').node()
757
757
758 if delete:
758 if delete:
759 if mark is None:
759 if mark is None:
760 raise util.Abort(_("bookmark name required"))
760 raise util.Abort(_("bookmark name required"))
761 if mark not in marks:
761 if mark not in marks:
762 raise util.Abort(_("bookmark '%s' does not exist") % mark)
762 raise util.Abort(_("bookmark '%s' does not exist") % mark)
763 if mark == repo._bookmarkcurrent:
763 if mark == repo._bookmarkcurrent:
764 bookmarks.setcurrent(repo, None)
764 bookmarks.setcurrent(repo, None)
765 del marks[mark]
765 del marks[mark]
766 bookmarks.write(repo)
766 bookmarks.write(repo)
767 return
767 return
768
768
769 if rename:
769 if rename:
770 if rename not in marks:
770 if rename not in marks:
771 raise util.Abort(_("bookmark '%s' does not exist") % rename)
771 raise util.Abort(_("bookmark '%s' does not exist") % rename)
772 if mark in marks and not force:
772 if mark in marks and not force:
773 raise util.Abort(_("bookmark '%s' already exists "
773 raise util.Abort(_("bookmark '%s' already exists "
774 "(use -f to force)") % mark)
774 "(use -f to force)") % mark)
775 if mark is None:
775 if mark is None:
776 raise util.Abort(_("new bookmark name required"))
776 raise util.Abort(_("new bookmark name required"))
777 marks[mark] = marks[rename]
777 marks[mark] = marks[rename]
778 if repo._bookmarkcurrent == rename and not inactive:
778 if repo._bookmarkcurrent == rename and not inactive:
779 bookmarks.setcurrent(repo, mark)
779 bookmarks.setcurrent(repo, mark)
780 del marks[rename]
780 del marks[rename]
781 bookmarks.write(repo)
781 bookmarks.write(repo)
782 return
782 return
783
783
784 if mark is not None:
784 if mark is not None:
785 if "\n" in mark:
785 if "\n" in mark:
786 raise util.Abort(_("bookmark name cannot contain newlines"))
786 raise util.Abort(_("bookmark name cannot contain newlines"))
787 mark = mark.strip()
787 mark = mark.strip()
788 if not mark:
788 if not mark:
789 raise util.Abort(_("bookmark names cannot consist entirely of "
789 raise util.Abort(_("bookmark names cannot consist entirely of "
790 "whitespace"))
790 "whitespace"))
791 if inactive and mark == repo._bookmarkcurrent:
791 if inactive and mark == repo._bookmarkcurrent:
792 bookmarks.setcurrent(repo, None)
792 bookmarks.setcurrent(repo, None)
793 return
793 return
794 if mark in marks and not force:
794 if mark in marks and not force:
795 raise util.Abort(_("bookmark '%s' already exists "
795 raise util.Abort(_("bookmark '%s' already exists "
796 "(use -f to force)") % mark)
796 "(use -f to force)") % mark)
797 if ((mark in repo.branchtags() or mark == repo.dirstate.branch())
797 if ((mark in repo.branchtags() or mark == repo.dirstate.branch())
798 and not force):
798 and not force):
799 raise util.Abort(
799 raise util.Abort(
800 _("a bookmark cannot have the name of an existing branch"))
800 _("a bookmark cannot have the name of an existing branch"))
801 if rev:
801 if rev:
802 marks[mark] = repo.lookup(rev)
802 marks[mark] = repo.lookup(rev)
803 else:
803 else:
804 marks[mark] = cur
804 marks[mark] = cur
805 if not inactive and cur == marks[mark]:
805 if not inactive and cur == marks[mark]:
806 bookmarks.setcurrent(repo, mark)
806 bookmarks.setcurrent(repo, mark)
807 bookmarks.write(repo)
807 bookmarks.write(repo)
808 return
808 return
809
809
810 if mark is None:
810 if mark is None:
811 if rev:
811 if rev:
812 raise util.Abort(_("bookmark name required"))
812 raise util.Abort(_("bookmark name required"))
813 if len(marks) == 0:
813 if len(marks) == 0:
814 ui.status(_("no bookmarks set\n"))
814 ui.status(_("no bookmarks set\n"))
815 else:
815 else:
816 for bmark, n in sorted(marks.iteritems()):
816 for bmark, n in sorted(marks.iteritems()):
817 current = repo._bookmarkcurrent
817 current = repo._bookmarkcurrent
818 if bmark == current and n == cur:
818 if bmark == current and n == cur:
819 prefix, label = '*', 'bookmarks.current'
819 prefix, label = '*', 'bookmarks.current'
820 else:
820 else:
821 prefix, label = ' ', ''
821 prefix, label = ' ', ''
822
822
823 if ui.quiet:
823 if ui.quiet:
824 ui.write("%s\n" % bmark, label=label)
824 ui.write("%s\n" % bmark, label=label)
825 else:
825 else:
826 ui.write(" %s %-25s %d:%s\n" % (
826 ui.write(" %s %-25s %d:%s\n" % (
827 prefix, bmark, repo.changelog.rev(n), hexfn(n)),
827 prefix, bmark, repo.changelog.rev(n), hexfn(n)),
828 label=label)
828 label=label)
829 return
829 return
830
830
831 @command('branch',
831 @command('branch',
832 [('f', 'force', None,
832 [('f', 'force', None,
833 _('set branch name even if it shadows an existing branch')),
833 _('set branch name even if it shadows an existing branch')),
834 ('C', 'clean', None, _('reset branch name to parent branch name'))],
834 ('C', 'clean', None, _('reset branch name to parent branch name'))],
835 _('[-fC] [NAME]'))
835 _('[-fC] [NAME]'))
836 def branch(ui, repo, label=None, **opts):
836 def branch(ui, repo, label=None, **opts):
837 """set or show the current branch name
837 """set or show the current branch name
838
838
839 .. note::
839 .. note::
840 Branch names are permanent and global. Use :hg:`bookmark` to create a
840 Branch names are permanent and global. Use :hg:`bookmark` to create a
841 light-weight bookmark instead. See :hg:`help glossary` for more
841 light-weight bookmark instead. See :hg:`help glossary` for more
842 information about named branches and bookmarks.
842 information about named branches and bookmarks.
843
843
844 With no argument, show the current branch name. With one argument,
844 With no argument, show the current branch name. With one argument,
845 set the working directory branch name (the branch will not exist
845 set the working directory branch name (the branch will not exist
846 in the repository until the next commit). Standard practice
846 in the repository until the next commit). Standard practice
847 recommends that primary development take place on the 'default'
847 recommends that primary development take place on the 'default'
848 branch.
848 branch.
849
849
850 Unless -f/--force is specified, branch will not let you set a
850 Unless -f/--force is specified, branch will not let you set a
851 branch name that already exists, even if it's inactive.
851 branch name that already exists, even if it's inactive.
852
852
853 Use -C/--clean to reset the working directory branch to that of
853 Use -C/--clean to reset the working directory branch to that of
854 the parent of the working directory, negating a previous branch
854 the parent of the working directory, negating a previous branch
855 change.
855 change.
856
856
857 Use the command :hg:`update` to switch to an existing branch. Use
857 Use the command :hg:`update` to switch to an existing branch. Use
858 :hg:`commit --close-branch` to mark this branch as closed.
858 :hg:`commit --close-branch` to mark this branch as closed.
859
859
860 Returns 0 on success.
860 Returns 0 on success.
861 """
861 """
862
862
863 if opts.get('clean'):
863 if opts.get('clean'):
864 label = repo[None].p1().branch()
864 label = repo[None].p1().branch()
865 repo.dirstate.setbranch(label)
865 repo.dirstate.setbranch(label)
866 ui.status(_('reset working directory to branch %s\n') % label)
866 ui.status(_('reset working directory to branch %s\n') % label)
867 elif label:
867 elif label:
868 if not opts.get('force') and label in repo.branchtags():
868 if not opts.get('force') and label in repo.branchtags():
869 if label not in [p.branch() for p in repo.parents()]:
869 if label not in [p.branch() for p in repo.parents()]:
870 raise util.Abort(_('a branch of the same name already exists'),
870 raise util.Abort(_('a branch of the same name already exists'),
871 # i18n: "it" refers to an existing branch
871 # i18n: "it" refers to an existing branch
872 hint=_("use 'hg update' to switch to it"))
872 hint=_("use 'hg update' to switch to it"))
873 repo.dirstate.setbranch(label)
873 repo.dirstate.setbranch(label)
874 ui.status(_('marked working directory as branch %s\n') % label)
874 ui.status(_('marked working directory as branch %s\n') % label)
875 ui.status(_('(branches are permanent and global, '
875 ui.status(_('(branches are permanent and global, '
876 'did you want a bookmark?)\n'))
876 'did you want a bookmark?)\n'))
877 else:
877 else:
878 ui.write("%s\n" % repo.dirstate.branch())
878 ui.write("%s\n" % repo.dirstate.branch())
879
879
880 @command('branches',
880 @command('branches',
881 [('a', 'active', False, _('show only branches that have unmerged heads')),
881 [('a', 'active', False, _('show only branches that have unmerged heads')),
882 ('c', 'closed', False, _('show normal and closed branches'))],
882 ('c', 'closed', False, _('show normal and closed branches'))],
883 _('[-ac]'))
883 _('[-ac]'))
884 def branches(ui, repo, active=False, closed=False):
884 def branches(ui, repo, active=False, closed=False):
885 """list repository named branches
885 """list repository named branches
886
886
887 List the repository's named branches, indicating which ones are
887 List the repository's named branches, indicating which ones are
888 inactive. If -c/--closed is specified, also list branches which have
888 inactive. If -c/--closed is specified, also list branches which have
889 been marked closed (see :hg:`commit --close-branch`).
889 been marked closed (see :hg:`commit --close-branch`).
890
890
891 If -a/--active is specified, only show active branches. A branch
891 If -a/--active is specified, only show active branches. A branch
892 is considered active if it contains repository heads.
892 is considered active if it contains repository heads.
893
893
894 Use the command :hg:`update` to switch to an existing branch.
894 Use the command :hg:`update` to switch to an existing branch.
895
895
896 Returns 0.
896 Returns 0.
897 """
897 """
898
898
899 hexfunc = ui.debugflag and hex or short
899 hexfunc = ui.debugflag and hex or short
900 activebranches = [repo[n].branch() for n in repo.heads()]
900 activebranches = [repo[n].branch() for n in repo.heads()]
901 def testactive(tag, node):
901 def testactive(tag, node):
902 realhead = tag in activebranches
902 realhead = tag in activebranches
903 open = node in repo.branchheads(tag, closed=False)
903 open = node in repo.branchheads(tag, closed=False)
904 return realhead and open
904 return realhead and open
905 branches = sorted([(testactive(tag, node), repo.changelog.rev(node), tag)
905 branches = sorted([(testactive(tag, node), repo.changelog.rev(node), tag)
906 for tag, node in repo.branchtags().items()],
906 for tag, node in repo.branchtags().items()],
907 reverse=True)
907 reverse=True)
908
908
909 for isactive, node, tag in branches:
909 for isactive, node, tag in branches:
910 if (not active) or isactive:
910 if (not active) or isactive:
911 if ui.quiet:
911 if ui.quiet:
912 ui.write("%s\n" % tag)
912 ui.write("%s\n" % tag)
913 else:
913 else:
914 hn = repo.lookup(node)
914 hn = repo.lookup(node)
915 if isactive:
915 if isactive:
916 label = 'branches.active'
916 label = 'branches.active'
917 notice = ''
917 notice = ''
918 elif hn not in repo.branchheads(tag, closed=False):
918 elif hn not in repo.branchheads(tag, closed=False):
919 if not closed:
919 if not closed:
920 continue
920 continue
921 label = 'branches.closed'
921 label = 'branches.closed'
922 notice = _(' (closed)')
922 notice = _(' (closed)')
923 else:
923 else:
924 label = 'branches.inactive'
924 label = 'branches.inactive'
925 notice = _(' (inactive)')
925 notice = _(' (inactive)')
926 if tag == repo.dirstate.branch():
926 if tag == repo.dirstate.branch():
927 label = 'branches.current'
927 label = 'branches.current'
928 rev = str(node).rjust(31 - encoding.colwidth(tag))
928 rev = str(node).rjust(31 - encoding.colwidth(tag))
929 rev = ui.label('%s:%s' % (rev, hexfunc(hn)), 'log.changeset')
929 rev = ui.label('%s:%s' % (rev, hexfunc(hn)), 'log.changeset')
930 tag = ui.label(tag, label)
930 tag = ui.label(tag, label)
931 ui.write("%s %s%s\n" % (tag, rev, notice))
931 ui.write("%s %s%s\n" % (tag, rev, notice))
932
932
933 @command('bundle',
933 @command('bundle',
934 [('f', 'force', None, _('run even when the destination is unrelated')),
934 [('f', 'force', None, _('run even when the destination is unrelated')),
935 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
935 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
936 _('REV')),
936 _('REV')),
937 ('b', 'branch', [], _('a specific branch you would like to bundle'),
937 ('b', 'branch', [], _('a specific branch you would like to bundle'),
938 _('BRANCH')),
938 _('BRANCH')),
939 ('', 'base', [],
939 ('', 'base', [],
940 _('a base changeset assumed to be available at the destination'),
940 _('a base changeset assumed to be available at the destination'),
941 _('REV')),
941 _('REV')),
942 ('a', 'all', None, _('bundle all changesets in the repository')),
942 ('a', 'all', None, _('bundle all changesets in the repository')),
943 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
943 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
944 ] + remoteopts,
944 ] + remoteopts,
945 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
945 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
946 def bundle(ui, repo, fname, dest=None, **opts):
946 def bundle(ui, repo, fname, dest=None, **opts):
947 """create a changegroup file
947 """create a changegroup file
948
948
949 Generate a compressed changegroup file collecting changesets not
949 Generate a compressed changegroup file collecting changesets not
950 known to be in another repository.
950 known to be in another repository.
951
951
952 If you omit the destination repository, then hg assumes the
952 If you omit the destination repository, then hg assumes the
953 destination will have all the nodes you specify with --base
953 destination will have all the nodes you specify with --base
954 parameters. To create a bundle containing all changesets, use
954 parameters. To create a bundle containing all changesets, use
955 -a/--all (or --base null).
955 -a/--all (or --base null).
956
956
957 You can change compression method with the -t/--type option.
957 You can change compression method with the -t/--type option.
958 The available compression methods are: none, bzip2, and
958 The available compression methods are: none, bzip2, and
959 gzip (by default, bundles are compressed using bzip2).
959 gzip (by default, bundles are compressed using bzip2).
960
960
961 The bundle file can then be transferred using conventional means
961 The bundle file can then be transferred using conventional means
962 and applied to another repository with the unbundle or pull
962 and applied to another repository with the unbundle or pull
963 command. This is useful when direct push and pull are not
963 command. This is useful when direct push and pull are not
964 available or when exporting an entire repository is undesirable.
964 available or when exporting an entire repository is undesirable.
965
965
966 Applying bundles preserves all changeset contents including
966 Applying bundles preserves all changeset contents including
967 permissions, copy/rename information, and revision history.
967 permissions, copy/rename information, and revision history.
968
968
969 Returns 0 on success, 1 if no changes found.
969 Returns 0 on success, 1 if no changes found.
970 """
970 """
971 revs = None
971 revs = None
972 if 'rev' in opts:
972 if 'rev' in opts:
973 revs = scmutil.revrange(repo, opts['rev'])
973 revs = scmutil.revrange(repo, opts['rev'])
974
974
975 if opts.get('all'):
975 if opts.get('all'):
976 base = ['null']
976 base = ['null']
977 else:
977 else:
978 base = scmutil.revrange(repo, opts.get('base'))
978 base = scmutil.revrange(repo, opts.get('base'))
979 if base:
979 if base:
980 if dest:
980 if dest:
981 raise util.Abort(_("--base is incompatible with specifying "
981 raise util.Abort(_("--base is incompatible with specifying "
982 "a destination"))
982 "a destination"))
983 common = [repo.lookup(rev) for rev in base]
983 common = [repo.lookup(rev) for rev in base]
984 heads = revs and map(repo.lookup, revs) or revs
984 heads = revs and map(repo.lookup, revs) or revs
985 cg = repo.getbundle('bundle', heads=heads, common=common)
985 cg = repo.getbundle('bundle', heads=heads, common=common)
986 outgoing = None
986 outgoing = None
987 else:
987 else:
988 dest = ui.expandpath(dest or 'default-push', dest or 'default')
988 dest = ui.expandpath(dest or 'default-push', dest or 'default')
989 dest, branches = hg.parseurl(dest, opts.get('branch'))
989 dest, branches = hg.parseurl(dest, opts.get('branch'))
990 other = hg.peer(repo, opts, dest)
990 other = hg.peer(repo, opts, dest)
991 revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
991 revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
992 heads = revs and map(repo.lookup, revs) or revs
992 heads = revs and map(repo.lookup, revs) or revs
993 outgoing = discovery.findcommonoutgoing(repo, other,
993 outgoing = discovery.findcommonoutgoing(repo, other,
994 onlyheads=heads,
994 onlyheads=heads,
995 force=opts.get('force'))
995 force=opts.get('force'))
996 cg = repo.getlocalbundle('bundle', outgoing)
996 cg = repo.getlocalbundle('bundle', outgoing)
997 if not cg:
997 if not cg:
998 scmutil.nochangesfound(ui, outgoing and outgoing.excluded)
998 scmutil.nochangesfound(ui, outgoing and outgoing.excluded)
999 return 1
999 return 1
1000
1000
1001 bundletype = opts.get('type', 'bzip2').lower()
1001 bundletype = opts.get('type', 'bzip2').lower()
1002 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1002 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1003 bundletype = btypes.get(bundletype)
1003 bundletype = btypes.get(bundletype)
1004 if bundletype not in changegroup.bundletypes:
1004 if bundletype not in changegroup.bundletypes:
1005 raise util.Abort(_('unknown bundle type specified with --type'))
1005 raise util.Abort(_('unknown bundle type specified with --type'))
1006
1006
1007 changegroup.writebundle(cg, fname, bundletype)
1007 changegroup.writebundle(cg, fname, bundletype)
1008
1008
1009 @command('cat',
1009 @command('cat',
1010 [('o', 'output', '',
1010 [('o', 'output', '',
1011 _('print output to file with formatted name'), _('FORMAT')),
1011 _('print output to file with formatted name'), _('FORMAT')),
1012 ('r', 'rev', '', _('print the given revision'), _('REV')),
1012 ('r', 'rev', '', _('print the given revision'), _('REV')),
1013 ('', 'decode', None, _('apply any matching decode filter')),
1013 ('', 'decode', None, _('apply any matching decode filter')),
1014 ] + walkopts,
1014 ] + walkopts,
1015 _('[OPTION]... FILE...'))
1015 _('[OPTION]... FILE...'))
1016 def cat(ui, repo, file1, *pats, **opts):
1016 def cat(ui, repo, file1, *pats, **opts):
1017 """output the current or given revision of files
1017 """output the current or given revision of files
1018
1018
1019 Print the specified files as they were at the given revision. If
1019 Print the specified files as they were at the given revision. If
1020 no revision is given, the parent of the working directory is used,
1020 no revision is given, the parent of the working directory is used,
1021 or tip if no revision is checked out.
1021 or tip if no revision is checked out.
1022
1022
1023 Output may be to a file, in which case the name of the file is
1023 Output may be to a file, in which case the name of the file is
1024 given using a format string. The formatting rules are the same as
1024 given using a format string. The formatting rules are the same as
1025 for the export command, with the following additions:
1025 for the export command, with the following additions:
1026
1026
1027 :``%s``: basename of file being printed
1027 :``%s``: basename of file being printed
1028 :``%d``: dirname of file being printed, or '.' if in repository root
1028 :``%d``: dirname of file being printed, or '.' if in repository root
1029 :``%p``: root-relative path name of file being printed
1029 :``%p``: root-relative path name of file being printed
1030
1030
1031 Returns 0 on success.
1031 Returns 0 on success.
1032 """
1032 """
1033 ctx = scmutil.revsingle(repo, opts.get('rev'))
1033 ctx = scmutil.revsingle(repo, opts.get('rev'))
1034 err = 1
1034 err = 1
1035 m = scmutil.match(ctx, (file1,) + pats, opts)
1035 m = scmutil.match(ctx, (file1,) + pats, opts)
1036 for abs in ctx.walk(m):
1036 for abs in ctx.walk(m):
1037 fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(),
1037 fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(),
1038 pathname=abs)
1038 pathname=abs)
1039 data = ctx[abs].data()
1039 data = ctx[abs].data()
1040 if opts.get('decode'):
1040 if opts.get('decode'):
1041 data = repo.wwritedata(abs, data)
1041 data = repo.wwritedata(abs, data)
1042 fp.write(data)
1042 fp.write(data)
1043 fp.close()
1043 fp.close()
1044 err = 0
1044 err = 0
1045 return err
1045 return err
1046
1046
1047 @command('^clone',
1047 @command('^clone',
1048 [('U', 'noupdate', None,
1048 [('U', 'noupdate', None,
1049 _('the clone will include an empty working copy (only a repository)')),
1049 _('the clone will include an empty working copy (only a repository)')),
1050 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
1050 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
1051 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1051 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1052 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1052 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1053 ('', 'pull', None, _('use pull protocol to copy metadata')),
1053 ('', 'pull', None, _('use pull protocol to copy metadata')),
1054 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1054 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1055 ] + remoteopts,
1055 ] + remoteopts,
1056 _('[OPTION]... SOURCE [DEST]'))
1056 _('[OPTION]... SOURCE [DEST]'))
1057 def clone(ui, source, dest=None, **opts):
1057 def clone(ui, source, dest=None, **opts):
1058 """make a copy of an existing repository
1058 """make a copy of an existing repository
1059
1059
1060 Create a copy of an existing repository in a new directory.
1060 Create a copy of an existing repository in a new directory.
1061
1061
1062 If no destination directory name is specified, it defaults to the
1062 If no destination directory name is specified, it defaults to the
1063 basename of the source.
1063 basename of the source.
1064
1064
1065 The location of the source is added to the new repository's
1065 The location of the source is added to the new repository's
1066 ``.hg/hgrc`` file, as the default to be used for future pulls.
1066 ``.hg/hgrc`` file, as the default to be used for future pulls.
1067
1067
1068 Only local paths and ``ssh://`` URLs are supported as
1068 Only local paths and ``ssh://`` URLs are supported as
1069 destinations. For ``ssh://`` destinations, no working directory or
1069 destinations. For ``ssh://`` destinations, no working directory or
1070 ``.hg/hgrc`` will be created on the remote side.
1070 ``.hg/hgrc`` will be created on the remote side.
1071
1071
1072 To pull only a subset of changesets, specify one or more revisions
1072 To pull only a subset of changesets, specify one or more revisions
1073 identifiers with -r/--rev or branches with -b/--branch. The
1073 identifiers with -r/--rev or branches with -b/--branch. The
1074 resulting clone will contain only the specified changesets and
1074 resulting clone will contain only the specified changesets and
1075 their ancestors. These options (or 'clone src#rev dest') imply
1075 their ancestors. These options (or 'clone src#rev dest') imply
1076 --pull, even for local source repositories. Note that specifying a
1076 --pull, even for local source repositories. Note that specifying a
1077 tag will include the tagged changeset but not the changeset
1077 tag will include the tagged changeset but not the changeset
1078 containing the tag.
1078 containing the tag.
1079
1079
1080 To check out a particular version, use -u/--update, or
1080 To check out a particular version, use -u/--update, or
1081 -U/--noupdate to create a clone with no working directory.
1081 -U/--noupdate to create a clone with no working directory.
1082
1082
1083 .. container:: verbose
1083 .. container:: verbose
1084
1084
1085 For efficiency, hardlinks are used for cloning whenever the
1085 For efficiency, hardlinks are used for cloning whenever the
1086 source and destination are on the same filesystem (note this
1086 source and destination are on the same filesystem (note this
1087 applies only to the repository data, not to the working
1087 applies only to the repository data, not to the working
1088 directory). Some filesystems, such as AFS, implement hardlinking
1088 directory). Some filesystems, such as AFS, implement hardlinking
1089 incorrectly, but do not report errors. In these cases, use the
1089 incorrectly, but do not report errors. In these cases, use the
1090 --pull option to avoid hardlinking.
1090 --pull option to avoid hardlinking.
1091
1091
1092 In some cases, you can clone repositories and the working
1092 In some cases, you can clone repositories and the working
1093 directory using full hardlinks with ::
1093 directory using full hardlinks with ::
1094
1094
1095 $ cp -al REPO REPOCLONE
1095 $ cp -al REPO REPOCLONE
1096
1096
1097 This is the fastest way to clone, but it is not always safe. The
1097 This is the fastest way to clone, but it is not always safe. The
1098 operation is not atomic (making sure REPO is not modified during
1098 operation is not atomic (making sure REPO is not modified during
1099 the operation is up to you) and you have to make sure your
1099 the operation is up to you) and you have to make sure your
1100 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1100 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1101 so). Also, this is not compatible with certain extensions that
1101 so). Also, this is not compatible with certain extensions that
1102 place their metadata under the .hg directory, such as mq.
1102 place their metadata under the .hg directory, such as mq.
1103
1103
1104 Mercurial will update the working directory to the first applicable
1104 Mercurial will update the working directory to the first applicable
1105 revision from this list:
1105 revision from this list:
1106
1106
1107 a) null if -U or the source repository has no changesets
1107 a) null if -U or the source repository has no changesets
1108 b) if -u . and the source repository is local, the first parent of
1108 b) if -u . and the source repository is local, the first parent of
1109 the source repository's working directory
1109 the source repository's working directory
1110 c) the changeset specified with -u (if a branch name, this means the
1110 c) the changeset specified with -u (if a branch name, this means the
1111 latest head of that branch)
1111 latest head of that branch)
1112 d) the changeset specified with -r
1112 d) the changeset specified with -r
1113 e) the tipmost head specified with -b
1113 e) the tipmost head specified with -b
1114 f) the tipmost head specified with the url#branch source syntax
1114 f) the tipmost head specified with the url#branch source syntax
1115 g) the tipmost head of the default branch
1115 g) the tipmost head of the default branch
1116 h) tip
1116 h) tip
1117
1117
1118 Examples:
1118 Examples:
1119
1119
1120 - clone a remote repository to a new directory named hg/::
1120 - clone a remote repository to a new directory named hg/::
1121
1121
1122 hg clone http://selenic.com/hg
1122 hg clone http://selenic.com/hg
1123
1123
1124 - create a lightweight local clone::
1124 - create a lightweight local clone::
1125
1125
1126 hg clone project/ project-feature/
1126 hg clone project/ project-feature/
1127
1127
1128 - clone from an absolute path on an ssh server (note double-slash)::
1128 - clone from an absolute path on an ssh server (note double-slash)::
1129
1129
1130 hg clone ssh://user@server//home/projects/alpha/
1130 hg clone ssh://user@server//home/projects/alpha/
1131
1131
1132 - do a high-speed clone over a LAN while checking out a
1132 - do a high-speed clone over a LAN while checking out a
1133 specified version::
1133 specified version::
1134
1134
1135 hg clone --uncompressed http://server/repo -u 1.5
1135 hg clone --uncompressed http://server/repo -u 1.5
1136
1136
1137 - create a repository without changesets after a particular revision::
1137 - create a repository without changesets after a particular revision::
1138
1138
1139 hg clone -r 04e544 experimental/ good/
1139 hg clone -r 04e544 experimental/ good/
1140
1140
1141 - clone (and track) a particular named branch::
1141 - clone (and track) a particular named branch::
1142
1142
1143 hg clone http://selenic.com/hg#stable
1143 hg clone http://selenic.com/hg#stable
1144
1144
1145 See :hg:`help urls` for details on specifying URLs.
1145 See :hg:`help urls` for details on specifying URLs.
1146
1146
1147 Returns 0 on success.
1147 Returns 0 on success.
1148 """
1148 """
1149 if opts.get('noupdate') and opts.get('updaterev'):
1149 if opts.get('noupdate') and opts.get('updaterev'):
1150 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
1150 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
1151
1151
1152 r = hg.clone(ui, opts, source, dest,
1152 r = hg.clone(ui, opts, source, dest,
1153 pull=opts.get('pull'),
1153 pull=opts.get('pull'),
1154 stream=opts.get('uncompressed'),
1154 stream=opts.get('uncompressed'),
1155 rev=opts.get('rev'),
1155 rev=opts.get('rev'),
1156 update=opts.get('updaterev') or not opts.get('noupdate'),
1156 update=opts.get('updaterev') or not opts.get('noupdate'),
1157 branch=opts.get('branch'))
1157 branch=opts.get('branch'))
1158
1158
1159 return r is None
1159 return r is None
1160
1160
1161 @command('^commit|ci',
1161 @command('^commit|ci',
1162 [('A', 'addremove', None,
1162 [('A', 'addremove', None,
1163 _('mark new/missing files as added/removed before committing')),
1163 _('mark new/missing files as added/removed before committing')),
1164 ('', 'close-branch', None,
1164 ('', 'close-branch', None,
1165 _('mark a branch as closed, hiding it from the branch list')),
1165 _('mark a branch as closed, hiding it from the branch list')),
1166 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1166 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1167 _('[OPTION]... [FILE]...'))
1167 _('[OPTION]... [FILE]...'))
1168 def commit(ui, repo, *pats, **opts):
1168 def commit(ui, repo, *pats, **opts):
1169 """commit the specified files or all outstanding changes
1169 """commit the specified files or all outstanding changes
1170
1170
1171 Commit changes to the given files into the repository. Unlike a
1171 Commit changes to the given files into the repository. Unlike a
1172 centralized SCM, this operation is a local operation. See
1172 centralized SCM, this operation is a local operation. See
1173 :hg:`push` for a way to actively distribute your changes.
1173 :hg:`push` for a way to actively distribute your changes.
1174
1174
1175 If a list of files is omitted, all changes reported by :hg:`status`
1175 If a list of files is omitted, all changes reported by :hg:`status`
1176 will be committed.
1176 will be committed.
1177
1177
1178 If you are committing the result of a merge, do not provide any
1178 If you are committing the result of a merge, do not provide any
1179 filenames or -I/-X filters.
1179 filenames or -I/-X filters.
1180
1180
1181 If no commit message is specified, Mercurial starts your
1181 If no commit message is specified, Mercurial starts your
1182 configured editor where you can enter a message. In case your
1182 configured editor where you can enter a message. In case your
1183 commit fails, you will find a backup of your message in
1183 commit fails, you will find a backup of your message in
1184 ``.hg/last-message.txt``.
1184 ``.hg/last-message.txt``.
1185
1185
1186 See :hg:`help dates` for a list of formats valid for -d/--date.
1186 See :hg:`help dates` for a list of formats valid for -d/--date.
1187
1187
1188 Returns 0 on success, 1 if nothing changed.
1188 Returns 0 on success, 1 if nothing changed.
1189 """
1189 """
1190 if opts.get('subrepos'):
1190 if opts.get('subrepos'):
1191 # Let --subrepos on the command line overide config setting.
1191 # Let --subrepos on the command line overide config setting.
1192 ui.setconfig('ui', 'commitsubrepos', True)
1192 ui.setconfig('ui', 'commitsubrepos', True)
1193
1193
1194 extra = {}
1194 extra = {}
1195 if opts.get('close_branch'):
1195 if opts.get('close_branch'):
1196 if repo['.'].node() not in repo.branchheads():
1196 if repo['.'].node() not in repo.branchheads():
1197 # The topo heads set is included in the branch heads set of the
1197 # The topo heads set is included in the branch heads set of the
1198 # current branch, so it's sufficient to test branchheads
1198 # current branch, so it's sufficient to test branchheads
1199 raise util.Abort(_('can only close branch heads'))
1199 raise util.Abort(_('can only close branch heads'))
1200 extra['close'] = 1
1200 extra['close'] = 1
1201 e = cmdutil.commiteditor
1201 e = cmdutil.commiteditor
1202 if opts.get('force_editor'):
1202 if opts.get('force_editor'):
1203 e = cmdutil.commitforceeditor
1203 e = cmdutil.commitforceeditor
1204
1204
1205 def commitfunc(ui, repo, message, match, opts):
1205 def commitfunc(ui, repo, message, match, opts):
1206 return repo.commit(message, opts.get('user'), opts.get('date'), match,
1206 return repo.commit(message, opts.get('user'), opts.get('date'), match,
1207 editor=e, extra=extra)
1207 editor=e, extra=extra)
1208
1208
1209 branch = repo[None].branch()
1209 branch = repo[None].branch()
1210 bheads = repo.branchheads(branch)
1210 bheads = repo.branchheads(branch)
1211
1211
1212 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1212 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1213 if not node:
1213 if not node:
1214 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1214 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1215 if stat[3]:
1215 if stat[3]:
1216 ui.status(_("nothing changed (%d missing files, see 'hg status')\n")
1216 ui.status(_("nothing changed (%d missing files, see 'hg status')\n")
1217 % len(stat[3]))
1217 % len(stat[3]))
1218 else:
1218 else:
1219 ui.status(_("nothing changed\n"))
1219 ui.status(_("nothing changed\n"))
1220 return 1
1220 return 1
1221
1221
1222 ctx = repo[node]
1222 ctx = repo[node]
1223 parents = ctx.parents()
1223 parents = ctx.parents()
1224
1224
1225 if (bheads and node not in bheads and not
1225 if (bheads and node not in bheads and not
1226 [x for x in parents if x.node() in bheads and x.branch() == branch]):
1226 [x for x in parents if x.node() in bheads and x.branch() == branch]):
1227 ui.status(_('created new head\n'))
1227 ui.status(_('created new head\n'))
1228 # The message is not printed for initial roots. For the other
1228 # The message is not printed for initial roots. For the other
1229 # changesets, it is printed in the following situations:
1229 # changesets, it is printed in the following situations:
1230 #
1230 #
1231 # Par column: for the 2 parents with ...
1231 # Par column: for the 2 parents with ...
1232 # N: null or no parent
1232 # N: null or no parent
1233 # B: parent is on another named branch
1233 # B: parent is on another named branch
1234 # C: parent is a regular non head changeset
1234 # C: parent is a regular non head changeset
1235 # H: parent was a branch head of the current branch
1235 # H: parent was a branch head of the current branch
1236 # Msg column: whether we print "created new head" message
1236 # Msg column: whether we print "created new head" message
1237 # In the following, it is assumed that there already exists some
1237 # In the following, it is assumed that there already exists some
1238 # initial branch heads of the current branch, otherwise nothing is
1238 # initial branch heads of the current branch, otherwise nothing is
1239 # printed anyway.
1239 # printed anyway.
1240 #
1240 #
1241 # Par Msg Comment
1241 # Par Msg Comment
1242 # NN y additional topo root
1242 # NN y additional topo root
1243 #
1243 #
1244 # BN y additional branch root
1244 # BN y additional branch root
1245 # CN y additional topo head
1245 # CN y additional topo head
1246 # HN n usual case
1246 # HN n usual case
1247 #
1247 #
1248 # BB y weird additional branch root
1248 # BB y weird additional branch root
1249 # CB y branch merge
1249 # CB y branch merge
1250 # HB n merge with named branch
1250 # HB n merge with named branch
1251 #
1251 #
1252 # CC y additional head from merge
1252 # CC y additional head from merge
1253 # CH n merge with a head
1253 # CH n merge with a head
1254 #
1254 #
1255 # HH n head merge: head count decreases
1255 # HH n head merge: head count decreases
1256
1256
1257 if not opts.get('close_branch'):
1257 if not opts.get('close_branch'):
1258 for r in parents:
1258 for r in parents:
1259 if r.extra().get('close') and r.branch() == branch:
1259 if r.extra().get('close') and r.branch() == branch:
1260 ui.status(_('reopening closed branch head %d\n') % r)
1260 ui.status(_('reopening closed branch head %d\n') % r)
1261
1261
1262 if ui.debugflag:
1262 if ui.debugflag:
1263 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
1263 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
1264 elif ui.verbose:
1264 elif ui.verbose:
1265 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
1265 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
1266
1266
1267 @command('copy|cp',
1267 @command('copy|cp',
1268 [('A', 'after', None, _('record a copy that has already occurred')),
1268 [('A', 'after', None, _('record a copy that has already occurred')),
1269 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1269 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1270 ] + walkopts + dryrunopts,
1270 ] + walkopts + dryrunopts,
1271 _('[OPTION]... [SOURCE]... DEST'))
1271 _('[OPTION]... [SOURCE]... DEST'))
1272 def copy(ui, repo, *pats, **opts):
1272 def copy(ui, repo, *pats, **opts):
1273 """mark files as copied for the next commit
1273 """mark files as copied for the next commit
1274
1274
1275 Mark dest as having copies of source files. If dest is a
1275 Mark dest as having copies of source files. If dest is a
1276 directory, copies are put in that directory. If dest is a file,
1276 directory, copies are put in that directory. If dest is a file,
1277 the source must be a single file.
1277 the source must be a single file.
1278
1278
1279 By default, this command copies the contents of files as they
1279 By default, this command copies the contents of files as they
1280 exist in the working directory. If invoked with -A/--after, the
1280 exist in the working directory. If invoked with -A/--after, the
1281 operation is recorded, but no copying is performed.
1281 operation is recorded, but no copying is performed.
1282
1282
1283 This command takes effect with the next commit. To undo a copy
1283 This command takes effect with the next commit. To undo a copy
1284 before that, see :hg:`revert`.
1284 before that, see :hg:`revert`.
1285
1285
1286 Returns 0 on success, 1 if errors are encountered.
1286 Returns 0 on success, 1 if errors are encountered.
1287 """
1287 """
1288 wlock = repo.wlock(False)
1288 wlock = repo.wlock(False)
1289 try:
1289 try:
1290 return cmdutil.copy(ui, repo, pats, opts)
1290 return cmdutil.copy(ui, repo, pats, opts)
1291 finally:
1291 finally:
1292 wlock.release()
1292 wlock.release()
1293
1293
1294 @command('debugancestor', [], _('[INDEX] REV1 REV2'))
1294 @command('debugancestor', [], _('[INDEX] REV1 REV2'))
1295 def debugancestor(ui, repo, *args):
1295 def debugancestor(ui, repo, *args):
1296 """find the ancestor revision of two revisions in a given index"""
1296 """find the ancestor revision of two revisions in a given index"""
1297 if len(args) == 3:
1297 if len(args) == 3:
1298 index, rev1, rev2 = args
1298 index, rev1, rev2 = args
1299 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1299 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1300 lookup = r.lookup
1300 lookup = r.lookup
1301 elif len(args) == 2:
1301 elif len(args) == 2:
1302 if not repo:
1302 if not repo:
1303 raise util.Abort(_("there is no Mercurial repository here "
1303 raise util.Abort(_("there is no Mercurial repository here "
1304 "(.hg not found)"))
1304 "(.hg not found)"))
1305 rev1, rev2 = args
1305 rev1, rev2 = args
1306 r = repo.changelog
1306 r = repo.changelog
1307 lookup = repo.lookup
1307 lookup = repo.lookup
1308 else:
1308 else:
1309 raise util.Abort(_('either two or three arguments required'))
1309 raise util.Abort(_('either two or three arguments required'))
1310 a = r.ancestor(lookup(rev1), lookup(rev2))
1310 a = r.ancestor(lookup(rev1), lookup(rev2))
1311 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1311 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1312
1312
1313 @command('debugbuilddag',
1313 @command('debugbuilddag',
1314 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1314 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1315 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1315 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1316 ('n', 'new-file', None, _('add new file at each rev'))],
1316 ('n', 'new-file', None, _('add new file at each rev'))],
1317 _('[OPTION]... [TEXT]'))
1317 _('[OPTION]... [TEXT]'))
1318 def debugbuilddag(ui, repo, text=None,
1318 def debugbuilddag(ui, repo, text=None,
1319 mergeable_file=False,
1319 mergeable_file=False,
1320 overwritten_file=False,
1320 overwritten_file=False,
1321 new_file=False):
1321 new_file=False):
1322 """builds a repo with a given DAG from scratch in the current empty repo
1322 """builds a repo with a given DAG from scratch in the current empty repo
1323
1323
1324 The description of the DAG is read from stdin if not given on the
1324 The description of the DAG is read from stdin if not given on the
1325 command line.
1325 command line.
1326
1326
1327 Elements:
1327 Elements:
1328
1328
1329 - "+n" is a linear run of n nodes based on the current default parent
1329 - "+n" is a linear run of n nodes based on the current default parent
1330 - "." is a single node based on the current default parent
1330 - "." is a single node based on the current default parent
1331 - "$" resets the default parent to null (implied at the start);
1331 - "$" resets the default parent to null (implied at the start);
1332 otherwise the default parent is always the last node created
1332 otherwise the default parent is always the last node created
1333 - "<p" sets the default parent to the backref p
1333 - "<p" sets the default parent to the backref p
1334 - "*p" is a fork at parent p, which is a backref
1334 - "*p" is a fork at parent p, which is a backref
1335 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1335 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1336 - "/p2" is a merge of the preceding node and p2
1336 - "/p2" is a merge of the preceding node and p2
1337 - ":tag" defines a local tag for the preceding node
1337 - ":tag" defines a local tag for the preceding node
1338 - "@branch" sets the named branch for subsequent nodes
1338 - "@branch" sets the named branch for subsequent nodes
1339 - "#...\\n" is a comment up to the end of the line
1339 - "#...\\n" is a comment up to the end of the line
1340
1340
1341 Whitespace between the above elements is ignored.
1341 Whitespace between the above elements is ignored.
1342
1342
1343 A backref is either
1343 A backref is either
1344
1344
1345 - a number n, which references the node curr-n, where curr is the current
1345 - a number n, which references the node curr-n, where curr is the current
1346 node, or
1346 node, or
1347 - the name of a local tag you placed earlier using ":tag", or
1347 - the name of a local tag you placed earlier using ":tag", or
1348 - empty to denote the default parent.
1348 - empty to denote the default parent.
1349
1349
1350 All string valued-elements are either strictly alphanumeric, or must
1350 All string valued-elements are either strictly alphanumeric, or must
1351 be enclosed in double quotes ("..."), with "\\" as escape character.
1351 be enclosed in double quotes ("..."), with "\\" as escape character.
1352 """
1352 """
1353
1353
1354 if text is None:
1354 if text is None:
1355 ui.status(_("reading DAG from stdin\n"))
1355 ui.status(_("reading DAG from stdin\n"))
1356 text = ui.fin.read()
1356 text = ui.fin.read()
1357
1357
1358 cl = repo.changelog
1358 cl = repo.changelog
1359 if len(cl) > 0:
1359 if len(cl) > 0:
1360 raise util.Abort(_('repository is not empty'))
1360 raise util.Abort(_('repository is not empty'))
1361
1361
1362 # determine number of revs in DAG
1362 # determine number of revs in DAG
1363 total = 0
1363 total = 0
1364 for type, data in dagparser.parsedag(text):
1364 for type, data in dagparser.parsedag(text):
1365 if type == 'n':
1365 if type == 'n':
1366 total += 1
1366 total += 1
1367
1367
1368 if mergeable_file:
1368 if mergeable_file:
1369 linesperrev = 2
1369 linesperrev = 2
1370 # make a file with k lines per rev
1370 # make a file with k lines per rev
1371 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1371 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1372 initialmergedlines.append("")
1372 initialmergedlines.append("")
1373
1373
1374 tags = []
1374 tags = []
1375
1375
1376 lock = tr = None
1376 lock = tr = None
1377 try:
1377 try:
1378 lock = repo.lock()
1378 lock = repo.lock()
1379 tr = repo.transaction("builddag")
1379 tr = repo.transaction("builddag")
1380
1380
1381 at = -1
1381 at = -1
1382 atbranch = 'default'
1382 atbranch = 'default'
1383 nodeids = []
1383 nodeids = []
1384 ui.progress(_('building'), 0, unit=_('revisions'), total=total)
1384 ui.progress(_('building'), 0, unit=_('revisions'), total=total)
1385 for type, data in dagparser.parsedag(text):
1385 for type, data in dagparser.parsedag(text):
1386 if type == 'n':
1386 if type == 'n':
1387 ui.note('node %s\n' % str(data))
1387 ui.note('node %s\n' % str(data))
1388 id, ps = data
1388 id, ps = data
1389
1389
1390 files = []
1390 files = []
1391 fctxs = {}
1391 fctxs = {}
1392
1392
1393 p2 = None
1393 p2 = None
1394 if mergeable_file:
1394 if mergeable_file:
1395 fn = "mf"
1395 fn = "mf"
1396 p1 = repo[ps[0]]
1396 p1 = repo[ps[0]]
1397 if len(ps) > 1:
1397 if len(ps) > 1:
1398 p2 = repo[ps[1]]
1398 p2 = repo[ps[1]]
1399 pa = p1.ancestor(p2)
1399 pa = p1.ancestor(p2)
1400 base, local, other = [x[fn].data() for x in pa, p1, p2]
1400 base, local, other = [x[fn].data() for x in pa, p1, p2]
1401 m3 = simplemerge.Merge3Text(base, local, other)
1401 m3 = simplemerge.Merge3Text(base, local, other)
1402 ml = [l.strip() for l in m3.merge_lines()]
1402 ml = [l.strip() for l in m3.merge_lines()]
1403 ml.append("")
1403 ml.append("")
1404 elif at > 0:
1404 elif at > 0:
1405 ml = p1[fn].data().split("\n")
1405 ml = p1[fn].data().split("\n")
1406 else:
1406 else:
1407 ml = initialmergedlines
1407 ml = initialmergedlines
1408 ml[id * linesperrev] += " r%i" % id
1408 ml[id * linesperrev] += " r%i" % id
1409 mergedtext = "\n".join(ml)
1409 mergedtext = "\n".join(ml)
1410 files.append(fn)
1410 files.append(fn)
1411 fctxs[fn] = context.memfilectx(fn, mergedtext)
1411 fctxs[fn] = context.memfilectx(fn, mergedtext)
1412
1412
1413 if overwritten_file:
1413 if overwritten_file:
1414 fn = "of"
1414 fn = "of"
1415 files.append(fn)
1415 files.append(fn)
1416 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1416 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1417
1417
1418 if new_file:
1418 if new_file:
1419 fn = "nf%i" % id
1419 fn = "nf%i" % id
1420 files.append(fn)
1420 files.append(fn)
1421 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1421 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1422 if len(ps) > 1:
1422 if len(ps) > 1:
1423 if not p2:
1423 if not p2:
1424 p2 = repo[ps[1]]
1424 p2 = repo[ps[1]]
1425 for fn in p2:
1425 for fn in p2:
1426 if fn.startswith("nf"):
1426 if fn.startswith("nf"):
1427 files.append(fn)
1427 files.append(fn)
1428 fctxs[fn] = p2[fn]
1428 fctxs[fn] = p2[fn]
1429
1429
1430 def fctxfn(repo, cx, path):
1430 def fctxfn(repo, cx, path):
1431 return fctxs.get(path)
1431 return fctxs.get(path)
1432
1432
1433 if len(ps) == 0 or ps[0] < 0:
1433 if len(ps) == 0 or ps[0] < 0:
1434 pars = [None, None]
1434 pars = [None, None]
1435 elif len(ps) == 1:
1435 elif len(ps) == 1:
1436 pars = [nodeids[ps[0]], None]
1436 pars = [nodeids[ps[0]], None]
1437 else:
1437 else:
1438 pars = [nodeids[p] for p in ps]
1438 pars = [nodeids[p] for p in ps]
1439 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1439 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1440 date=(id, 0),
1440 date=(id, 0),
1441 user="debugbuilddag",
1441 user="debugbuilddag",
1442 extra={'branch': atbranch})
1442 extra={'branch': atbranch})
1443 nodeid = repo.commitctx(cx)
1443 nodeid = repo.commitctx(cx)
1444 nodeids.append(nodeid)
1444 nodeids.append(nodeid)
1445 at = id
1445 at = id
1446 elif type == 'l':
1446 elif type == 'l':
1447 id, name = data
1447 id, name = data
1448 ui.note('tag %s\n' % name)
1448 ui.note('tag %s\n' % name)
1449 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1449 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1450 elif type == 'a':
1450 elif type == 'a':
1451 ui.note('branch %s\n' % data)
1451 ui.note('branch %s\n' % data)
1452 atbranch = data
1452 atbranch = data
1453 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1453 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1454 tr.close()
1454 tr.close()
1455
1455
1456 if tags:
1456 if tags:
1457 repo.opener.write("localtags", "".join(tags))
1457 repo.opener.write("localtags", "".join(tags))
1458 finally:
1458 finally:
1459 ui.progress(_('building'), None)
1459 ui.progress(_('building'), None)
1460 release(tr, lock)
1460 release(tr, lock)
1461
1461
1462 @command('debugbundle', [('a', 'all', None, _('show all details'))], _('FILE'))
1462 @command('debugbundle', [('a', 'all', None, _('show all details'))], _('FILE'))
1463 def debugbundle(ui, bundlepath, all=None, **opts):
1463 def debugbundle(ui, bundlepath, all=None, **opts):
1464 """lists the contents of a bundle"""
1464 """lists the contents of a bundle"""
1465 f = url.open(ui, bundlepath)
1465 f = url.open(ui, bundlepath)
1466 try:
1466 try:
1467 gen = changegroup.readbundle(f, bundlepath)
1467 gen = changegroup.readbundle(f, bundlepath)
1468 if all:
1468 if all:
1469 ui.write("format: id, p1, p2, cset, delta base, len(delta)\n")
1469 ui.write("format: id, p1, p2, cset, delta base, len(delta)\n")
1470
1470
1471 def showchunks(named):
1471 def showchunks(named):
1472 ui.write("\n%s\n" % named)
1472 ui.write("\n%s\n" % named)
1473 chain = None
1473 chain = None
1474 while True:
1474 while True:
1475 chunkdata = gen.deltachunk(chain)
1475 chunkdata = gen.deltachunk(chain)
1476 if not chunkdata:
1476 if not chunkdata:
1477 break
1477 break
1478 node = chunkdata['node']
1478 node = chunkdata['node']
1479 p1 = chunkdata['p1']
1479 p1 = chunkdata['p1']
1480 p2 = chunkdata['p2']
1480 p2 = chunkdata['p2']
1481 cs = chunkdata['cs']
1481 cs = chunkdata['cs']
1482 deltabase = chunkdata['deltabase']
1482 deltabase = chunkdata['deltabase']
1483 delta = chunkdata['delta']
1483 delta = chunkdata['delta']
1484 ui.write("%s %s %s %s %s %s\n" %
1484 ui.write("%s %s %s %s %s %s\n" %
1485 (hex(node), hex(p1), hex(p2),
1485 (hex(node), hex(p1), hex(p2),
1486 hex(cs), hex(deltabase), len(delta)))
1486 hex(cs), hex(deltabase), len(delta)))
1487 chain = node
1487 chain = node
1488
1488
1489 chunkdata = gen.changelogheader()
1489 chunkdata = gen.changelogheader()
1490 showchunks("changelog")
1490 showchunks("changelog")
1491 chunkdata = gen.manifestheader()
1491 chunkdata = gen.manifestheader()
1492 showchunks("manifest")
1492 showchunks("manifest")
1493 while True:
1493 while True:
1494 chunkdata = gen.filelogheader()
1494 chunkdata = gen.filelogheader()
1495 if not chunkdata:
1495 if not chunkdata:
1496 break
1496 break
1497 fname = chunkdata['filename']
1497 fname = chunkdata['filename']
1498 showchunks(fname)
1498 showchunks(fname)
1499 else:
1499 else:
1500 chunkdata = gen.changelogheader()
1500 chunkdata = gen.changelogheader()
1501 chain = None
1501 chain = None
1502 while True:
1502 while True:
1503 chunkdata = gen.deltachunk(chain)
1503 chunkdata = gen.deltachunk(chain)
1504 if not chunkdata:
1504 if not chunkdata:
1505 break
1505 break
1506 node = chunkdata['node']
1506 node = chunkdata['node']
1507 ui.write("%s\n" % hex(node))
1507 ui.write("%s\n" % hex(node))
1508 chain = node
1508 chain = node
1509 finally:
1509 finally:
1510 f.close()
1510 f.close()
1511
1511
1512 @command('debugcheckstate', [], '')
1512 @command('debugcheckstate', [], '')
1513 def debugcheckstate(ui, repo):
1513 def debugcheckstate(ui, repo):
1514 """validate the correctness of the current dirstate"""
1514 """validate the correctness of the current dirstate"""
1515 parent1, parent2 = repo.dirstate.parents()
1515 parent1, parent2 = repo.dirstate.parents()
1516 m1 = repo[parent1].manifest()
1516 m1 = repo[parent1].manifest()
1517 m2 = repo[parent2].manifest()
1517 m2 = repo[parent2].manifest()
1518 errors = 0
1518 errors = 0
1519 for f in repo.dirstate:
1519 for f in repo.dirstate:
1520 state = repo.dirstate[f]
1520 state = repo.dirstate[f]
1521 if state in "nr" and f not in m1:
1521 if state in "nr" and f not in m1:
1522 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1522 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1523 errors += 1
1523 errors += 1
1524 if state in "a" and f in m1:
1524 if state in "a" and f in m1:
1525 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1525 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1526 errors += 1
1526 errors += 1
1527 if state in "m" and f not in m1 and f not in m2:
1527 if state in "m" and f not in m1 and f not in m2:
1528 ui.warn(_("%s in state %s, but not in either manifest\n") %
1528 ui.warn(_("%s in state %s, but not in either manifest\n") %
1529 (f, state))
1529 (f, state))
1530 errors += 1
1530 errors += 1
1531 for f in m1:
1531 for f in m1:
1532 state = repo.dirstate[f]
1532 state = repo.dirstate[f]
1533 if state not in "nrm":
1533 if state not in "nrm":
1534 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1534 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1535 errors += 1
1535 errors += 1
1536 if errors:
1536 if errors:
1537 error = _(".hg/dirstate inconsistent with current parent's manifest")
1537 error = _(".hg/dirstate inconsistent with current parent's manifest")
1538 raise util.Abort(error)
1538 raise util.Abort(error)
1539
1539
1540 @command('debugcommands', [], _('[COMMAND]'))
1540 @command('debugcommands', [], _('[COMMAND]'))
1541 def debugcommands(ui, cmd='', *args):
1541 def debugcommands(ui, cmd='', *args):
1542 """list all available commands and options"""
1542 """list all available commands and options"""
1543 for cmd, vals in sorted(table.iteritems()):
1543 for cmd, vals in sorted(table.iteritems()):
1544 cmd = cmd.split('|')[0].strip('^')
1544 cmd = cmd.split('|')[0].strip('^')
1545 opts = ', '.join([i[1] for i in vals[1]])
1545 opts = ', '.join([i[1] for i in vals[1]])
1546 ui.write('%s: %s\n' % (cmd, opts))
1546 ui.write('%s: %s\n' % (cmd, opts))
1547
1547
1548 @command('debugcomplete',
1548 @command('debugcomplete',
1549 [('o', 'options', None, _('show the command options'))],
1549 [('o', 'options', None, _('show the command options'))],
1550 _('[-o] CMD'))
1550 _('[-o] CMD'))
1551 def debugcomplete(ui, cmd='', **opts):
1551 def debugcomplete(ui, cmd='', **opts):
1552 """returns the completion list associated with the given command"""
1552 """returns the completion list associated with the given command"""
1553
1553
1554 if opts.get('options'):
1554 if opts.get('options'):
1555 options = []
1555 options = []
1556 otables = [globalopts]
1556 otables = [globalopts]
1557 if cmd:
1557 if cmd:
1558 aliases, entry = cmdutil.findcmd(cmd, table, False)
1558 aliases, entry = cmdutil.findcmd(cmd, table, False)
1559 otables.append(entry[1])
1559 otables.append(entry[1])
1560 for t in otables:
1560 for t in otables:
1561 for o in t:
1561 for o in t:
1562 if "(DEPRECATED)" in o[3]:
1562 if "(DEPRECATED)" in o[3]:
1563 continue
1563 continue
1564 if o[0]:
1564 if o[0]:
1565 options.append('-%s' % o[0])
1565 options.append('-%s' % o[0])
1566 options.append('--%s' % o[1])
1566 options.append('--%s' % o[1])
1567 ui.write("%s\n" % "\n".join(options))
1567 ui.write("%s\n" % "\n".join(options))
1568 return
1568 return
1569
1569
1570 cmdlist = cmdutil.findpossible(cmd, table)
1570 cmdlist = cmdutil.findpossible(cmd, table)
1571 if ui.verbose:
1571 if ui.verbose:
1572 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1572 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1573 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1573 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1574
1574
1575 @command('debugdag',
1575 @command('debugdag',
1576 [('t', 'tags', None, _('use tags as labels')),
1576 [('t', 'tags', None, _('use tags as labels')),
1577 ('b', 'branches', None, _('annotate with branch names')),
1577 ('b', 'branches', None, _('annotate with branch names')),
1578 ('', 'dots', None, _('use dots for runs')),
1578 ('', 'dots', None, _('use dots for runs')),
1579 ('s', 'spaces', None, _('separate elements by spaces'))],
1579 ('s', 'spaces', None, _('separate elements by spaces'))],
1580 _('[OPTION]... [FILE [REV]...]'))
1580 _('[OPTION]... [FILE [REV]...]'))
1581 def debugdag(ui, repo, file_=None, *revs, **opts):
1581 def debugdag(ui, repo, file_=None, *revs, **opts):
1582 """format the changelog or an index DAG as a concise textual description
1582 """format the changelog or an index DAG as a concise textual description
1583
1583
1584 If you pass a revlog index, the revlog's DAG is emitted. If you list
1584 If you pass a revlog index, the revlog's DAG is emitted. If you list
1585 revision numbers, they get labelled in the output as rN.
1585 revision numbers, they get labelled in the output as rN.
1586
1586
1587 Otherwise, the changelog DAG of the current repo is emitted.
1587 Otherwise, the changelog DAG of the current repo is emitted.
1588 """
1588 """
1589 spaces = opts.get('spaces')
1589 spaces = opts.get('spaces')
1590 dots = opts.get('dots')
1590 dots = opts.get('dots')
1591 if file_:
1591 if file_:
1592 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1592 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1593 revs = set((int(r) for r in revs))
1593 revs = set((int(r) for r in revs))
1594 def events():
1594 def events():
1595 for r in rlog:
1595 for r in rlog:
1596 yield 'n', (r, list(set(p for p in rlog.parentrevs(r) if p != -1)))
1596 yield 'n', (r, list(set(p for p in rlog.parentrevs(r) if p != -1)))
1597 if r in revs:
1597 if r in revs:
1598 yield 'l', (r, "r%i" % r)
1598 yield 'l', (r, "r%i" % r)
1599 elif repo:
1599 elif repo:
1600 cl = repo.changelog
1600 cl = repo.changelog
1601 tags = opts.get('tags')
1601 tags = opts.get('tags')
1602 branches = opts.get('branches')
1602 branches = opts.get('branches')
1603 if tags:
1603 if tags:
1604 labels = {}
1604 labels = {}
1605 for l, n in repo.tags().items():
1605 for l, n in repo.tags().items():
1606 labels.setdefault(cl.rev(n), []).append(l)
1606 labels.setdefault(cl.rev(n), []).append(l)
1607 def events():
1607 def events():
1608 b = "default"
1608 b = "default"
1609 for r in cl:
1609 for r in cl:
1610 if branches:
1610 if branches:
1611 newb = cl.read(cl.node(r))[5]['branch']
1611 newb = cl.read(cl.node(r))[5]['branch']
1612 if newb != b:
1612 if newb != b:
1613 yield 'a', newb
1613 yield 'a', newb
1614 b = newb
1614 b = newb
1615 yield 'n', (r, list(set(p for p in cl.parentrevs(r) if p != -1)))
1615 yield 'n', (r, list(set(p for p in cl.parentrevs(r) if p != -1)))
1616 if tags:
1616 if tags:
1617 ls = labels.get(r)
1617 ls = labels.get(r)
1618 if ls:
1618 if ls:
1619 for l in ls:
1619 for l in ls:
1620 yield 'l', (r, l)
1620 yield 'l', (r, l)
1621 else:
1621 else:
1622 raise util.Abort(_('need repo for changelog dag'))
1622 raise util.Abort(_('need repo for changelog dag'))
1623
1623
1624 for line in dagparser.dagtextlines(events(),
1624 for line in dagparser.dagtextlines(events(),
1625 addspaces=spaces,
1625 addspaces=spaces,
1626 wraplabels=True,
1626 wraplabels=True,
1627 wrapannotations=True,
1627 wrapannotations=True,
1628 wrapnonlinear=dots,
1628 wrapnonlinear=dots,
1629 usedots=dots,
1629 usedots=dots,
1630 maxlinewidth=70):
1630 maxlinewidth=70):
1631 ui.write(line)
1631 ui.write(line)
1632 ui.write("\n")
1632 ui.write("\n")
1633
1633
1634 @command('debugdata',
1634 @command('debugdata',
1635 [('c', 'changelog', False, _('open changelog')),
1635 [('c', 'changelog', False, _('open changelog')),
1636 ('m', 'manifest', False, _('open manifest'))],
1636 ('m', 'manifest', False, _('open manifest'))],
1637 _('-c|-m|FILE REV'))
1637 _('-c|-m|FILE REV'))
1638 def debugdata(ui, repo, file_, rev = None, **opts):
1638 def debugdata(ui, repo, file_, rev = None, **opts):
1639 """dump the contents of a data file revision"""
1639 """dump the contents of a data file revision"""
1640 if opts.get('changelog') or opts.get('manifest'):
1640 if opts.get('changelog') or opts.get('manifest'):
1641 file_, rev = None, file_
1641 file_, rev = None, file_
1642 elif rev is None:
1642 elif rev is None:
1643 raise error.CommandError('debugdata', _('invalid arguments'))
1643 raise error.CommandError('debugdata', _('invalid arguments'))
1644 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
1644 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
1645 try:
1645 try:
1646 ui.write(r.revision(r.lookup(rev)))
1646 ui.write(r.revision(r.lookup(rev)))
1647 except KeyError:
1647 except KeyError:
1648 raise util.Abort(_('invalid revision identifier %s') % rev)
1648 raise util.Abort(_('invalid revision identifier %s') % rev)
1649
1649
1650 @command('debugdate',
1650 @command('debugdate',
1651 [('e', 'extended', None, _('try extended date formats'))],
1651 [('e', 'extended', None, _('try extended date formats'))],
1652 _('[-e] DATE [RANGE]'))
1652 _('[-e] DATE [RANGE]'))
1653 def debugdate(ui, date, range=None, **opts):
1653 def debugdate(ui, date, range=None, **opts):
1654 """parse and display a date"""
1654 """parse and display a date"""
1655 if opts["extended"]:
1655 if opts["extended"]:
1656 d = util.parsedate(date, util.extendeddateformats)
1656 d = util.parsedate(date, util.extendeddateformats)
1657 else:
1657 else:
1658 d = util.parsedate(date)
1658 d = util.parsedate(date)
1659 ui.write("internal: %s %s\n" % d)
1659 ui.write("internal: %s %s\n" % d)
1660 ui.write("standard: %s\n" % util.datestr(d))
1660 ui.write("standard: %s\n" % util.datestr(d))
1661 if range:
1661 if range:
1662 m = util.matchdate(range)
1662 m = util.matchdate(range)
1663 ui.write("match: %s\n" % m(d[0]))
1663 ui.write("match: %s\n" % m(d[0]))
1664
1664
1665 @command('debugdiscovery',
1665 @command('debugdiscovery',
1666 [('', 'old', None, _('use old-style discovery')),
1666 [('', 'old', None, _('use old-style discovery')),
1667 ('', 'nonheads', None,
1667 ('', 'nonheads', None,
1668 _('use old-style discovery with non-heads included')),
1668 _('use old-style discovery with non-heads included')),
1669 ] + remoteopts,
1669 ] + remoteopts,
1670 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
1670 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
1671 def debugdiscovery(ui, repo, remoteurl="default", **opts):
1671 def debugdiscovery(ui, repo, remoteurl="default", **opts):
1672 """runs the changeset discovery protocol in isolation"""
1672 """runs the changeset discovery protocol in isolation"""
1673 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl), opts.get('branch'))
1673 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl), opts.get('branch'))
1674 remote = hg.peer(repo, opts, remoteurl)
1674 remote = hg.peer(repo, opts, remoteurl)
1675 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
1675 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
1676
1676
1677 # make sure tests are repeatable
1677 # make sure tests are repeatable
1678 random.seed(12323)
1678 random.seed(12323)
1679
1679
1680 def doit(localheads, remoteheads):
1680 def doit(localheads, remoteheads):
1681 if opts.get('old'):
1681 if opts.get('old'):
1682 if localheads:
1682 if localheads:
1683 raise util.Abort('cannot use localheads with old style discovery')
1683 raise util.Abort('cannot use localheads with old style discovery')
1684 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
1684 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
1685 force=True)
1685 force=True)
1686 common = set(common)
1686 common = set(common)
1687 if not opts.get('nonheads'):
1687 if not opts.get('nonheads'):
1688 ui.write("unpruned common: %s\n" % " ".join([short(n)
1688 ui.write("unpruned common: %s\n" % " ".join([short(n)
1689 for n in common]))
1689 for n in common]))
1690 dag = dagutil.revlogdag(repo.changelog)
1690 dag = dagutil.revlogdag(repo.changelog)
1691 all = dag.ancestorset(dag.internalizeall(common))
1691 all = dag.ancestorset(dag.internalizeall(common))
1692 common = dag.externalizeall(dag.headsetofconnecteds(all))
1692 common = dag.externalizeall(dag.headsetofconnecteds(all))
1693 else:
1693 else:
1694 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
1694 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
1695 common = set(common)
1695 common = set(common)
1696 rheads = set(hds)
1696 rheads = set(hds)
1697 lheads = set(repo.heads())
1697 lheads = set(repo.heads())
1698 ui.write("common heads: %s\n" % " ".join([short(n) for n in common]))
1698 ui.write("common heads: %s\n" % " ".join([short(n) for n in common]))
1699 if lheads <= common:
1699 if lheads <= common:
1700 ui.write("local is subset\n")
1700 ui.write("local is subset\n")
1701 elif rheads <= common:
1701 elif rheads <= common:
1702 ui.write("remote is subset\n")
1702 ui.write("remote is subset\n")
1703
1703
1704 serverlogs = opts.get('serverlog')
1704 serverlogs = opts.get('serverlog')
1705 if serverlogs:
1705 if serverlogs:
1706 for filename in serverlogs:
1706 for filename in serverlogs:
1707 logfile = open(filename, 'r')
1707 logfile = open(filename, 'r')
1708 try:
1708 try:
1709 line = logfile.readline()
1709 line = logfile.readline()
1710 while line:
1710 while line:
1711 parts = line.strip().split(';')
1711 parts = line.strip().split(';')
1712 op = parts[1]
1712 op = parts[1]
1713 if op == 'cg':
1713 if op == 'cg':
1714 pass
1714 pass
1715 elif op == 'cgss':
1715 elif op == 'cgss':
1716 doit(parts[2].split(' '), parts[3].split(' '))
1716 doit(parts[2].split(' '), parts[3].split(' '))
1717 elif op == 'unb':
1717 elif op == 'unb':
1718 doit(parts[3].split(' '), parts[2].split(' '))
1718 doit(parts[3].split(' '), parts[2].split(' '))
1719 line = logfile.readline()
1719 line = logfile.readline()
1720 finally:
1720 finally:
1721 logfile.close()
1721 logfile.close()
1722
1722
1723 else:
1723 else:
1724 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
1724 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
1725 opts.get('remote_head'))
1725 opts.get('remote_head'))
1726 localrevs = opts.get('local_head')
1726 localrevs = opts.get('local_head')
1727 doit(localrevs, remoterevs)
1727 doit(localrevs, remoterevs)
1728
1728
1729 @command('debugfileset', [], ('REVSPEC'))
1729 @command('debugfileset', [], ('REVSPEC'))
1730 def debugfileset(ui, repo, expr):
1730 def debugfileset(ui, repo, expr):
1731 '''parse and apply a fileset specification'''
1731 '''parse and apply a fileset specification'''
1732 if ui.verbose:
1732 if ui.verbose:
1733 tree = fileset.parse(expr)[0]
1733 tree = fileset.parse(expr)[0]
1734 ui.note(tree, "\n")
1734 ui.note(tree, "\n")
1735
1735
1736 for f in fileset.getfileset(repo[None], expr):
1736 for f in fileset.getfileset(repo[None], expr):
1737 ui.write("%s\n" % f)
1737 ui.write("%s\n" % f)
1738
1738
1739 @command('debugfsinfo', [], _('[PATH]'))
1739 @command('debugfsinfo', [], _('[PATH]'))
1740 def debugfsinfo(ui, path = "."):
1740 def debugfsinfo(ui, path = "."):
1741 """show information detected about current filesystem"""
1741 """show information detected about current filesystem"""
1742 util.writefile('.debugfsinfo', '')
1742 util.writefile('.debugfsinfo', '')
1743 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
1743 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
1744 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
1744 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
1745 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
1745 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
1746 and 'yes' or 'no'))
1746 and 'yes' or 'no'))
1747 os.unlink('.debugfsinfo')
1747 os.unlink('.debugfsinfo')
1748
1748
1749 @command('debuggetbundle',
1749 @command('debuggetbundle',
1750 [('H', 'head', [], _('id of head node'), _('ID')),
1750 [('H', 'head', [], _('id of head node'), _('ID')),
1751 ('C', 'common', [], _('id of common node'), _('ID')),
1751 ('C', 'common', [], _('id of common node'), _('ID')),
1752 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
1752 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
1753 _('REPO FILE [-H|-C ID]...'))
1753 _('REPO FILE [-H|-C ID]...'))
1754 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
1754 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
1755 """retrieves a bundle from a repo
1755 """retrieves a bundle from a repo
1756
1756
1757 Every ID must be a full-length hex node id string. Saves the bundle to the
1757 Every ID must be a full-length hex node id string. Saves the bundle to the
1758 given file.
1758 given file.
1759 """
1759 """
1760 repo = hg.peer(ui, opts, repopath)
1760 repo = hg.peer(ui, opts, repopath)
1761 if not repo.capable('getbundle'):
1761 if not repo.capable('getbundle'):
1762 raise util.Abort("getbundle() not supported by target repository")
1762 raise util.Abort("getbundle() not supported by target repository")
1763 args = {}
1763 args = {}
1764 if common:
1764 if common:
1765 args['common'] = [bin(s) for s in common]
1765 args['common'] = [bin(s) for s in common]
1766 if head:
1766 if head:
1767 args['heads'] = [bin(s) for s in head]
1767 args['heads'] = [bin(s) for s in head]
1768 bundle = repo.getbundle('debug', **args)
1768 bundle = repo.getbundle('debug', **args)
1769
1769
1770 bundletype = opts.get('type', 'bzip2').lower()
1770 bundletype = opts.get('type', 'bzip2').lower()
1771 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1771 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1772 bundletype = btypes.get(bundletype)
1772 bundletype = btypes.get(bundletype)
1773 if bundletype not in changegroup.bundletypes:
1773 if bundletype not in changegroup.bundletypes:
1774 raise util.Abort(_('unknown bundle type specified with --type'))
1774 raise util.Abort(_('unknown bundle type specified with --type'))
1775 changegroup.writebundle(bundle, bundlepath, bundletype)
1775 changegroup.writebundle(bundle, bundlepath, bundletype)
1776
1776
1777 @command('debugignore', [], '')
1777 @command('debugignore', [], '')
1778 def debugignore(ui, repo, *values, **opts):
1778 def debugignore(ui, repo, *values, **opts):
1779 """display the combined ignore pattern"""
1779 """display the combined ignore pattern"""
1780 ignore = repo.dirstate._ignore
1780 ignore = repo.dirstate._ignore
1781 includepat = getattr(ignore, 'includepat', None)
1781 includepat = getattr(ignore, 'includepat', None)
1782 if includepat is not None:
1782 if includepat is not None:
1783 ui.write("%s\n" % includepat)
1783 ui.write("%s\n" % includepat)
1784 else:
1784 else:
1785 raise util.Abort(_("no ignore patterns found"))
1785 raise util.Abort(_("no ignore patterns found"))
1786
1786
1787 @command('debugindex',
1787 @command('debugindex',
1788 [('c', 'changelog', False, _('open changelog')),
1788 [('c', 'changelog', False, _('open changelog')),
1789 ('m', 'manifest', False, _('open manifest')),
1789 ('m', 'manifest', False, _('open manifest')),
1790 ('f', 'format', 0, _('revlog format'), _('FORMAT'))],
1790 ('f', 'format', 0, _('revlog format'), _('FORMAT'))],
1791 _('[-f FORMAT] -c|-m|FILE'))
1791 _('[-f FORMAT] -c|-m|FILE'))
1792 def debugindex(ui, repo, file_ = None, **opts):
1792 def debugindex(ui, repo, file_ = None, **opts):
1793 """dump the contents of an index file"""
1793 """dump the contents of an index file"""
1794 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
1794 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
1795 format = opts.get('format', 0)
1795 format = opts.get('format', 0)
1796 if format not in (0, 1):
1796 if format not in (0, 1):
1797 raise util.Abort(_("unknown format %d") % format)
1797 raise util.Abort(_("unknown format %d") % format)
1798
1798
1799 generaldelta = r.version & revlog.REVLOGGENERALDELTA
1799 generaldelta = r.version & revlog.REVLOGGENERALDELTA
1800 if generaldelta:
1800 if generaldelta:
1801 basehdr = ' delta'
1801 basehdr = ' delta'
1802 else:
1802 else:
1803 basehdr = ' base'
1803 basehdr = ' base'
1804
1804
1805 if format == 0:
1805 if format == 0:
1806 ui.write(" rev offset length " + basehdr + " linkrev"
1806 ui.write(" rev offset length " + basehdr + " linkrev"
1807 " nodeid p1 p2\n")
1807 " nodeid p1 p2\n")
1808 elif format == 1:
1808 elif format == 1:
1809 ui.write(" rev flag offset length"
1809 ui.write(" rev flag offset length"
1810 " size " + basehdr + " link p1 p2 nodeid\n")
1810 " size " + basehdr + " link p1 p2 nodeid\n")
1811
1811
1812 for i in r:
1812 for i in r:
1813 node = r.node(i)
1813 node = r.node(i)
1814 if generaldelta:
1814 if generaldelta:
1815 base = r.deltaparent(i)
1815 base = r.deltaparent(i)
1816 else:
1816 else:
1817 base = r.chainbase(i)
1817 base = r.chainbase(i)
1818 if format == 0:
1818 if format == 0:
1819 try:
1819 try:
1820 pp = r.parents(node)
1820 pp = r.parents(node)
1821 except:
1821 except:
1822 pp = [nullid, nullid]
1822 pp = [nullid, nullid]
1823 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1823 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1824 i, r.start(i), r.length(i), base, r.linkrev(i),
1824 i, r.start(i), r.length(i), base, r.linkrev(i),
1825 short(node), short(pp[0]), short(pp[1])))
1825 short(node), short(pp[0]), short(pp[1])))
1826 elif format == 1:
1826 elif format == 1:
1827 pr = r.parentrevs(i)
1827 pr = r.parentrevs(i)
1828 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
1828 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
1829 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
1829 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
1830 base, r.linkrev(i), pr[0], pr[1], short(node)))
1830 base, r.linkrev(i), pr[0], pr[1], short(node)))
1831
1831
1832 @command('debugindexdot', [], _('FILE'))
1832 @command('debugindexdot', [], _('FILE'))
1833 def debugindexdot(ui, repo, file_):
1833 def debugindexdot(ui, repo, file_):
1834 """dump an index DAG as a graphviz dot file"""
1834 """dump an index DAG as a graphviz dot file"""
1835 r = None
1835 r = None
1836 if repo:
1836 if repo:
1837 filelog = repo.file(file_)
1837 filelog = repo.file(file_)
1838 if len(filelog):
1838 if len(filelog):
1839 r = filelog
1839 r = filelog
1840 if not r:
1840 if not r:
1841 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1841 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1842 ui.write("digraph G {\n")
1842 ui.write("digraph G {\n")
1843 for i in r:
1843 for i in r:
1844 node = r.node(i)
1844 node = r.node(i)
1845 pp = r.parents(node)
1845 pp = r.parents(node)
1846 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1846 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1847 if pp[1] != nullid:
1847 if pp[1] != nullid:
1848 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1848 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1849 ui.write("}\n")
1849 ui.write("}\n")
1850
1850
1851 @command('debuginstall', [], '')
1851 @command('debuginstall', [], '')
1852 def debuginstall(ui):
1852 def debuginstall(ui):
1853 '''test Mercurial installation
1853 '''test Mercurial installation
1854
1854
1855 Returns 0 on success.
1855 Returns 0 on success.
1856 '''
1856 '''
1857
1857
1858 def writetemp(contents):
1858 def writetemp(contents):
1859 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1859 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1860 f = os.fdopen(fd, "wb")
1860 f = os.fdopen(fd, "wb")
1861 f.write(contents)
1861 f.write(contents)
1862 f.close()
1862 f.close()
1863 return name
1863 return name
1864
1864
1865 problems = 0
1865 problems = 0
1866
1866
1867 # encoding
1867 # encoding
1868 ui.status(_("Checking encoding (%s)...\n") % encoding.encoding)
1868 ui.status(_("Checking encoding (%s)...\n") % encoding.encoding)
1869 try:
1869 try:
1870 encoding.fromlocal("test")
1870 encoding.fromlocal("test")
1871 except util.Abort, inst:
1871 except util.Abort, inst:
1872 ui.write(" %s\n" % inst)
1872 ui.write(" %s\n" % inst)
1873 ui.write(_(" (check that your locale is properly set)\n"))
1873 ui.write(_(" (check that your locale is properly set)\n"))
1874 problems += 1
1874 problems += 1
1875
1875
1876 # compiled modules
1876 # compiled modules
1877 ui.status(_("Checking installed modules (%s)...\n")
1877 ui.status(_("Checking installed modules (%s)...\n")
1878 % os.path.dirname(__file__))
1878 % os.path.dirname(__file__))
1879 try:
1879 try:
1880 import bdiff, mpatch, base85, osutil
1880 import bdiff, mpatch, base85, osutil
1881 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
1881 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
1882 except Exception, inst:
1882 except Exception, inst:
1883 ui.write(" %s\n" % inst)
1883 ui.write(" %s\n" % inst)
1884 ui.write(_(" One or more extensions could not be found"))
1884 ui.write(_(" One or more extensions could not be found"))
1885 ui.write(_(" (check that you compiled the extensions)\n"))
1885 ui.write(_(" (check that you compiled the extensions)\n"))
1886 problems += 1
1886 problems += 1
1887
1887
1888 # templates
1888 # templates
1889 import templater
1889 import templater
1890 p = templater.templatepath()
1890 p = templater.templatepath()
1891 ui.status(_("Checking templates (%s)...\n") % ' '.join(p))
1891 ui.status(_("Checking templates (%s)...\n") % ' '.join(p))
1892 try:
1892 try:
1893 templater.templater(templater.templatepath("map-cmdline.default"))
1893 templater.templater(templater.templatepath("map-cmdline.default"))
1894 except Exception, inst:
1894 except Exception, inst:
1895 ui.write(" %s\n" % inst)
1895 ui.write(" %s\n" % inst)
1896 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
1896 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
1897 problems += 1
1897 problems += 1
1898
1898
1899 # editor
1899 # editor
1900 ui.status(_("Checking commit editor...\n"))
1900 ui.status(_("Checking commit editor...\n"))
1901 editor = ui.geteditor()
1901 editor = ui.geteditor()
1902 cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
1902 cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
1903 if not cmdpath:
1903 if not cmdpath:
1904 if editor == 'vi':
1904 if editor == 'vi':
1905 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
1905 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
1906 ui.write(_(" (specify a commit editor in your configuration"
1906 ui.write(_(" (specify a commit editor in your configuration"
1907 " file)\n"))
1907 " file)\n"))
1908 else:
1908 else:
1909 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
1909 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
1910 ui.write(_(" (specify a commit editor in your configuration"
1910 ui.write(_(" (specify a commit editor in your configuration"
1911 " file)\n"))
1911 " file)\n"))
1912 problems += 1
1912 problems += 1
1913
1913
1914 # check username
1914 # check username
1915 ui.status(_("Checking username...\n"))
1915 ui.status(_("Checking username...\n"))
1916 try:
1916 try:
1917 ui.username()
1917 ui.username()
1918 except util.Abort, e:
1918 except util.Abort, e:
1919 ui.write(" %s\n" % e)
1919 ui.write(" %s\n" % e)
1920 ui.write(_(" (specify a username in your configuration file)\n"))
1920 ui.write(_(" (specify a username in your configuration file)\n"))
1921 problems += 1
1921 problems += 1
1922
1922
1923 if not problems:
1923 if not problems:
1924 ui.status(_("No problems detected\n"))
1924 ui.status(_("No problems detected\n"))
1925 else:
1925 else:
1926 ui.write(_("%s problems detected,"
1926 ui.write(_("%s problems detected,"
1927 " please check your install!\n") % problems)
1927 " please check your install!\n") % problems)
1928
1928
1929 return problems
1929 return problems
1930
1930
1931 @command('debugknown', [], _('REPO ID...'))
1931 @command('debugknown', [], _('REPO ID...'))
1932 def debugknown(ui, repopath, *ids, **opts):
1932 def debugknown(ui, repopath, *ids, **opts):
1933 """test whether node ids are known to a repo
1933 """test whether node ids are known to a repo
1934
1934
1935 Every ID must be a full-length hex node id string. Returns a list of 0s and 1s
1935 Every ID must be a full-length hex node id string. Returns a list of 0s and 1s
1936 indicating unknown/known.
1936 indicating unknown/known.
1937 """
1937 """
1938 repo = hg.peer(ui, opts, repopath)
1938 repo = hg.peer(ui, opts, repopath)
1939 if not repo.capable('known'):
1939 if not repo.capable('known'):
1940 raise util.Abort("known() not supported by target repository")
1940 raise util.Abort("known() not supported by target repository")
1941 flags = repo.known([bin(s) for s in ids])
1941 flags = repo.known([bin(s) for s in ids])
1942 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
1942 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
1943
1943
1944 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'))
1944 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'))
1945 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
1945 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
1946 '''access the pushkey key/value protocol
1946 '''access the pushkey key/value protocol
1947
1947
1948 With two args, list the keys in the given namespace.
1948 With two args, list the keys in the given namespace.
1949
1949
1950 With five args, set a key to new if it currently is set to old.
1950 With five args, set a key to new if it currently is set to old.
1951 Reports success or failure.
1951 Reports success or failure.
1952 '''
1952 '''
1953
1953
1954 target = hg.peer(ui, {}, repopath)
1954 target = hg.peer(ui, {}, repopath)
1955 if keyinfo:
1955 if keyinfo:
1956 key, old, new = keyinfo
1956 key, old, new = keyinfo
1957 r = target.pushkey(namespace, key, old, new)
1957 r = target.pushkey(namespace, key, old, new)
1958 ui.status(str(r) + '\n')
1958 ui.status(str(r) + '\n')
1959 return not r
1959 return not r
1960 else:
1960 else:
1961 for k, v in target.listkeys(namespace).iteritems():
1961 for k, v in target.listkeys(namespace).iteritems():
1962 ui.write("%s\t%s\n" % (k.encode('string-escape'),
1962 ui.write("%s\t%s\n" % (k.encode('string-escape'),
1963 v.encode('string-escape')))
1963 v.encode('string-escape')))
1964
1964
1965 @command('debugrebuildstate',
1965 @command('debugrebuildstate',
1966 [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
1966 [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
1967 _('[-r REV] [REV]'))
1967 _('[-r REV] [REV]'))
1968 def debugrebuildstate(ui, repo, rev="tip"):
1968 def debugrebuildstate(ui, repo, rev="tip"):
1969 """rebuild the dirstate as it would look like for the given revision"""
1969 """rebuild the dirstate as it would look like for the given revision"""
1970 ctx = scmutil.revsingle(repo, rev)
1970 ctx = scmutil.revsingle(repo, rev)
1971 wlock = repo.wlock()
1971 wlock = repo.wlock()
1972 try:
1972 try:
1973 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
1973 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
1974 finally:
1974 finally:
1975 wlock.release()
1975 wlock.release()
1976
1976
1977 @command('debugrename',
1977 @command('debugrename',
1978 [('r', 'rev', '', _('revision to debug'), _('REV'))],
1978 [('r', 'rev', '', _('revision to debug'), _('REV'))],
1979 _('[-r REV] FILE'))
1979 _('[-r REV] FILE'))
1980 def debugrename(ui, repo, file1, *pats, **opts):
1980 def debugrename(ui, repo, file1, *pats, **opts):
1981 """dump rename information"""
1981 """dump rename information"""
1982
1982
1983 ctx = scmutil.revsingle(repo, opts.get('rev'))
1983 ctx = scmutil.revsingle(repo, opts.get('rev'))
1984 m = scmutil.match(ctx, (file1,) + pats, opts)
1984 m = scmutil.match(ctx, (file1,) + pats, opts)
1985 for abs in ctx.walk(m):
1985 for abs in ctx.walk(m):
1986 fctx = ctx[abs]
1986 fctx = ctx[abs]
1987 o = fctx.filelog().renamed(fctx.filenode())
1987 o = fctx.filelog().renamed(fctx.filenode())
1988 rel = m.rel(abs)
1988 rel = m.rel(abs)
1989 if o:
1989 if o:
1990 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
1990 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
1991 else:
1991 else:
1992 ui.write(_("%s not renamed\n") % rel)
1992 ui.write(_("%s not renamed\n") % rel)
1993
1993
1994 @command('debugrevlog',
1994 @command('debugrevlog',
1995 [('c', 'changelog', False, _('open changelog')),
1995 [('c', 'changelog', False, _('open changelog')),
1996 ('m', 'manifest', False, _('open manifest')),
1996 ('m', 'manifest', False, _('open manifest')),
1997 ('d', 'dump', False, _('dump index data'))],
1997 ('d', 'dump', False, _('dump index data'))],
1998 _('-c|-m|FILE'))
1998 _('-c|-m|FILE'))
1999 def debugrevlog(ui, repo, file_ = None, **opts):
1999 def debugrevlog(ui, repo, file_ = None, **opts):
2000 """show data and statistics about a revlog"""
2000 """show data and statistics about a revlog"""
2001 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2001 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2002
2002
2003 if opts.get("dump"):
2003 if opts.get("dump"):
2004 numrevs = len(r)
2004 numrevs = len(r)
2005 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
2005 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
2006 " rawsize totalsize compression heads\n")
2006 " rawsize totalsize compression heads\n")
2007 ts = 0
2007 ts = 0
2008 heads = set()
2008 heads = set()
2009 for rev in xrange(numrevs):
2009 for rev in xrange(numrevs):
2010 dbase = r.deltaparent(rev)
2010 dbase = r.deltaparent(rev)
2011 if dbase == -1:
2011 if dbase == -1:
2012 dbase = rev
2012 dbase = rev
2013 cbase = r.chainbase(rev)
2013 cbase = r.chainbase(rev)
2014 p1, p2 = r.parentrevs(rev)
2014 p1, p2 = r.parentrevs(rev)
2015 rs = r.rawsize(rev)
2015 rs = r.rawsize(rev)
2016 ts = ts + rs
2016 ts = ts + rs
2017 heads -= set(r.parentrevs(rev))
2017 heads -= set(r.parentrevs(rev))
2018 heads.add(rev)
2018 heads.add(rev)
2019 ui.write("%d %d %d %d %d %d %d %d %d %d %d %d %d\n" %
2019 ui.write("%d %d %d %d %d %d %d %d %d %d %d %d %d\n" %
2020 (rev, p1, p2, r.start(rev), r.end(rev),
2020 (rev, p1, p2, r.start(rev), r.end(rev),
2021 r.start(dbase), r.start(cbase),
2021 r.start(dbase), r.start(cbase),
2022 r.start(p1), r.start(p2),
2022 r.start(p1), r.start(p2),
2023 rs, ts, ts / r.end(rev), len(heads)))
2023 rs, ts, ts / r.end(rev), len(heads)))
2024 return 0
2024 return 0
2025
2025
2026 v = r.version
2026 v = r.version
2027 format = v & 0xFFFF
2027 format = v & 0xFFFF
2028 flags = []
2028 flags = []
2029 gdelta = False
2029 gdelta = False
2030 if v & revlog.REVLOGNGINLINEDATA:
2030 if v & revlog.REVLOGNGINLINEDATA:
2031 flags.append('inline')
2031 flags.append('inline')
2032 if v & revlog.REVLOGGENERALDELTA:
2032 if v & revlog.REVLOGGENERALDELTA:
2033 gdelta = True
2033 gdelta = True
2034 flags.append('generaldelta')
2034 flags.append('generaldelta')
2035 if not flags:
2035 if not flags:
2036 flags = ['(none)']
2036 flags = ['(none)']
2037
2037
2038 nummerges = 0
2038 nummerges = 0
2039 numfull = 0
2039 numfull = 0
2040 numprev = 0
2040 numprev = 0
2041 nump1 = 0
2041 nump1 = 0
2042 nump2 = 0
2042 nump2 = 0
2043 numother = 0
2043 numother = 0
2044 nump1prev = 0
2044 nump1prev = 0
2045 nump2prev = 0
2045 nump2prev = 0
2046 chainlengths = []
2046 chainlengths = []
2047
2047
2048 datasize = [None, 0, 0L]
2048 datasize = [None, 0, 0L]
2049 fullsize = [None, 0, 0L]
2049 fullsize = [None, 0, 0L]
2050 deltasize = [None, 0, 0L]
2050 deltasize = [None, 0, 0L]
2051
2051
2052 def addsize(size, l):
2052 def addsize(size, l):
2053 if l[0] is None or size < l[0]:
2053 if l[0] is None or size < l[0]:
2054 l[0] = size
2054 l[0] = size
2055 if size > l[1]:
2055 if size > l[1]:
2056 l[1] = size
2056 l[1] = size
2057 l[2] += size
2057 l[2] += size
2058
2058
2059 numrevs = len(r)
2059 numrevs = len(r)
2060 for rev in xrange(numrevs):
2060 for rev in xrange(numrevs):
2061 p1, p2 = r.parentrevs(rev)
2061 p1, p2 = r.parentrevs(rev)
2062 delta = r.deltaparent(rev)
2062 delta = r.deltaparent(rev)
2063 if format > 0:
2063 if format > 0:
2064 addsize(r.rawsize(rev), datasize)
2064 addsize(r.rawsize(rev), datasize)
2065 if p2 != nullrev:
2065 if p2 != nullrev:
2066 nummerges += 1
2066 nummerges += 1
2067 size = r.length(rev)
2067 size = r.length(rev)
2068 if delta == nullrev:
2068 if delta == nullrev:
2069 chainlengths.append(0)
2069 chainlengths.append(0)
2070 numfull += 1
2070 numfull += 1
2071 addsize(size, fullsize)
2071 addsize(size, fullsize)
2072 else:
2072 else:
2073 chainlengths.append(chainlengths[delta] + 1)
2073 chainlengths.append(chainlengths[delta] + 1)
2074 addsize(size, deltasize)
2074 addsize(size, deltasize)
2075 if delta == rev - 1:
2075 if delta == rev - 1:
2076 numprev += 1
2076 numprev += 1
2077 if delta == p1:
2077 if delta == p1:
2078 nump1prev += 1
2078 nump1prev += 1
2079 elif delta == p2:
2079 elif delta == p2:
2080 nump2prev += 1
2080 nump2prev += 1
2081 elif delta == p1:
2081 elif delta == p1:
2082 nump1 += 1
2082 nump1 += 1
2083 elif delta == p2:
2083 elif delta == p2:
2084 nump2 += 1
2084 nump2 += 1
2085 elif delta != nullrev:
2085 elif delta != nullrev:
2086 numother += 1
2086 numother += 1
2087
2087
2088 numdeltas = numrevs - numfull
2088 numdeltas = numrevs - numfull
2089 numoprev = numprev - nump1prev - nump2prev
2089 numoprev = numprev - nump1prev - nump2prev
2090 totalrawsize = datasize[2]
2090 totalrawsize = datasize[2]
2091 datasize[2] /= numrevs
2091 datasize[2] /= numrevs
2092 fulltotal = fullsize[2]
2092 fulltotal = fullsize[2]
2093 fullsize[2] /= numfull
2093 fullsize[2] /= numfull
2094 deltatotal = deltasize[2]
2094 deltatotal = deltasize[2]
2095 deltasize[2] /= numrevs - numfull
2095 deltasize[2] /= numrevs - numfull
2096 totalsize = fulltotal + deltatotal
2096 totalsize = fulltotal + deltatotal
2097 avgchainlen = sum(chainlengths) / numrevs
2097 avgchainlen = sum(chainlengths) / numrevs
2098 compratio = totalrawsize / totalsize
2098 compratio = totalrawsize / totalsize
2099
2099
2100 basedfmtstr = '%%%dd\n'
2100 basedfmtstr = '%%%dd\n'
2101 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2101 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2102
2102
2103 def dfmtstr(max):
2103 def dfmtstr(max):
2104 return basedfmtstr % len(str(max))
2104 return basedfmtstr % len(str(max))
2105 def pcfmtstr(max, padding=0):
2105 def pcfmtstr(max, padding=0):
2106 return basepcfmtstr % (len(str(max)), ' ' * padding)
2106 return basepcfmtstr % (len(str(max)), ' ' * padding)
2107
2107
2108 def pcfmt(value, total):
2108 def pcfmt(value, total):
2109 return (value, 100 * float(value) / total)
2109 return (value, 100 * float(value) / total)
2110
2110
2111 ui.write('format : %d\n' % format)
2111 ui.write('format : %d\n' % format)
2112 ui.write('flags : %s\n' % ', '.join(flags))
2112 ui.write('flags : %s\n' % ', '.join(flags))
2113
2113
2114 ui.write('\n')
2114 ui.write('\n')
2115 fmt = pcfmtstr(totalsize)
2115 fmt = pcfmtstr(totalsize)
2116 fmt2 = dfmtstr(totalsize)
2116 fmt2 = dfmtstr(totalsize)
2117 ui.write('revisions : ' + fmt2 % numrevs)
2117 ui.write('revisions : ' + fmt2 % numrevs)
2118 ui.write(' merges : ' + fmt % pcfmt(nummerges, numrevs))
2118 ui.write(' merges : ' + fmt % pcfmt(nummerges, numrevs))
2119 ui.write(' normal : ' + fmt % pcfmt(numrevs - nummerges, numrevs))
2119 ui.write(' normal : ' + fmt % pcfmt(numrevs - nummerges, numrevs))
2120 ui.write('revisions : ' + fmt2 % numrevs)
2120 ui.write('revisions : ' + fmt2 % numrevs)
2121 ui.write(' full : ' + fmt % pcfmt(numfull, numrevs))
2121 ui.write(' full : ' + fmt % pcfmt(numfull, numrevs))
2122 ui.write(' deltas : ' + fmt % pcfmt(numdeltas, numrevs))
2122 ui.write(' deltas : ' + fmt % pcfmt(numdeltas, numrevs))
2123 ui.write('revision size : ' + fmt2 % totalsize)
2123 ui.write('revision size : ' + fmt2 % totalsize)
2124 ui.write(' full : ' + fmt % pcfmt(fulltotal, totalsize))
2124 ui.write(' full : ' + fmt % pcfmt(fulltotal, totalsize))
2125 ui.write(' deltas : ' + fmt % pcfmt(deltatotal, totalsize))
2125 ui.write(' deltas : ' + fmt % pcfmt(deltatotal, totalsize))
2126
2126
2127 ui.write('\n')
2127 ui.write('\n')
2128 fmt = dfmtstr(max(avgchainlen, compratio))
2128 fmt = dfmtstr(max(avgchainlen, compratio))
2129 ui.write('avg chain length : ' + fmt % avgchainlen)
2129 ui.write('avg chain length : ' + fmt % avgchainlen)
2130 ui.write('compression ratio : ' + fmt % compratio)
2130 ui.write('compression ratio : ' + fmt % compratio)
2131
2131
2132 if format > 0:
2132 if format > 0:
2133 ui.write('\n')
2133 ui.write('\n')
2134 ui.write('uncompressed data size (min/max/avg) : %d / %d / %d\n'
2134 ui.write('uncompressed data size (min/max/avg) : %d / %d / %d\n'
2135 % tuple(datasize))
2135 % tuple(datasize))
2136 ui.write('full revision size (min/max/avg) : %d / %d / %d\n'
2136 ui.write('full revision size (min/max/avg) : %d / %d / %d\n'
2137 % tuple(fullsize))
2137 % tuple(fullsize))
2138 ui.write('delta size (min/max/avg) : %d / %d / %d\n'
2138 ui.write('delta size (min/max/avg) : %d / %d / %d\n'
2139 % tuple(deltasize))
2139 % tuple(deltasize))
2140
2140
2141 if numdeltas > 0:
2141 if numdeltas > 0:
2142 ui.write('\n')
2142 ui.write('\n')
2143 fmt = pcfmtstr(numdeltas)
2143 fmt = pcfmtstr(numdeltas)
2144 fmt2 = pcfmtstr(numdeltas, 4)
2144 fmt2 = pcfmtstr(numdeltas, 4)
2145 ui.write('deltas against prev : ' + fmt % pcfmt(numprev, numdeltas))
2145 ui.write('deltas against prev : ' + fmt % pcfmt(numprev, numdeltas))
2146 if numprev > 0:
2146 if numprev > 0:
2147 ui.write(' where prev = p1 : ' + fmt2 % pcfmt(nump1prev, numprev))
2147 ui.write(' where prev = p1 : ' + fmt2 % pcfmt(nump1prev, numprev))
2148 ui.write(' where prev = p2 : ' + fmt2 % pcfmt(nump2prev, numprev))
2148 ui.write(' where prev = p2 : ' + fmt2 % pcfmt(nump2prev, numprev))
2149 ui.write(' other : ' + fmt2 % pcfmt(numoprev, numprev))
2149 ui.write(' other : ' + fmt2 % pcfmt(numoprev, numprev))
2150 if gdelta:
2150 if gdelta:
2151 ui.write('deltas against p1 : ' + fmt % pcfmt(nump1, numdeltas))
2151 ui.write('deltas against p1 : ' + fmt % pcfmt(nump1, numdeltas))
2152 ui.write('deltas against p2 : ' + fmt % pcfmt(nump2, numdeltas))
2152 ui.write('deltas against p2 : ' + fmt % pcfmt(nump2, numdeltas))
2153 ui.write('deltas against other : ' + fmt % pcfmt(numother, numdeltas))
2153 ui.write('deltas against other : ' + fmt % pcfmt(numother, numdeltas))
2154
2154
2155 @command('debugrevspec', [], ('REVSPEC'))
2155 @command('debugrevspec', [], ('REVSPEC'))
2156 def debugrevspec(ui, repo, expr):
2156 def debugrevspec(ui, repo, expr):
2157 """parse and apply a revision specification
2157 """parse and apply a revision specification
2158
2158
2159 Use --verbose to print the parsed tree before and after aliases
2159 Use --verbose to print the parsed tree before and after aliases
2160 expansion.
2160 expansion.
2161 """
2161 """
2162 if ui.verbose:
2162 if ui.verbose:
2163 tree = revset.parse(expr)[0]
2163 tree = revset.parse(expr)[0]
2164 ui.note(tree, "\n")
2164 ui.note(tree, "\n")
2165 newtree = revset.findaliases(ui, tree)
2165 newtree = revset.findaliases(ui, tree)
2166 if newtree != tree:
2166 if newtree != tree:
2167 ui.note(newtree, "\n")
2167 ui.note(newtree, "\n")
2168 func = revset.match(ui, expr)
2168 func = revset.match(ui, expr)
2169 for c in func(repo, range(len(repo))):
2169 for c in func(repo, range(len(repo))):
2170 ui.write("%s\n" % c)
2170 ui.write("%s\n" % c)
2171
2171
2172 @command('debugsetparents', [], _('REV1 [REV2]'))
2172 @command('debugsetparents', [], _('REV1 [REV2]'))
2173 def debugsetparents(ui, repo, rev1, rev2=None):
2173 def debugsetparents(ui, repo, rev1, rev2=None):
2174 """manually set the parents of the current working directory
2174 """manually set the parents of the current working directory
2175
2175
2176 This is useful for writing repository conversion tools, but should
2176 This is useful for writing repository conversion tools, but should
2177 be used with care.
2177 be used with care.
2178
2178
2179 Returns 0 on success.
2179 Returns 0 on success.
2180 """
2180 """
2181
2181
2182 r1 = scmutil.revsingle(repo, rev1).node()
2182 r1 = scmutil.revsingle(repo, rev1).node()
2183 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2183 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2184
2184
2185 wlock = repo.wlock()
2185 wlock = repo.wlock()
2186 try:
2186 try:
2187 repo.dirstate.setparents(r1, r2)
2187 repo.dirstate.setparents(r1, r2)
2188 finally:
2188 finally:
2189 wlock.release()
2189 wlock.release()
2190
2190
2191 @command('debugstate',
2191 @command('debugstate',
2192 [('', 'nodates', None, _('do not display the saved mtime')),
2192 [('', 'nodates', None, _('do not display the saved mtime')),
2193 ('', 'datesort', None, _('sort by saved mtime'))],
2193 ('', 'datesort', None, _('sort by saved mtime'))],
2194 _('[OPTION]...'))
2194 _('[OPTION]...'))
2195 def debugstate(ui, repo, nodates=None, datesort=None):
2195 def debugstate(ui, repo, nodates=None, datesort=None):
2196 """show the contents of the current dirstate"""
2196 """show the contents of the current dirstate"""
2197 timestr = ""
2197 timestr = ""
2198 showdate = not nodates
2198 showdate = not nodates
2199 if datesort:
2199 if datesort:
2200 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2200 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2201 else:
2201 else:
2202 keyfunc = None # sort by filename
2202 keyfunc = None # sort by filename
2203 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2203 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2204 if showdate:
2204 if showdate:
2205 if ent[3] == -1:
2205 if ent[3] == -1:
2206 # Pad or slice to locale representation
2206 # Pad or slice to locale representation
2207 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
2207 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
2208 time.localtime(0)))
2208 time.localtime(0)))
2209 timestr = 'unset'
2209 timestr = 'unset'
2210 timestr = (timestr[:locale_len] +
2210 timestr = (timestr[:locale_len] +
2211 ' ' * (locale_len - len(timestr)))
2211 ' ' * (locale_len - len(timestr)))
2212 else:
2212 else:
2213 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2213 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2214 time.localtime(ent[3]))
2214 time.localtime(ent[3]))
2215 if ent[1] & 020000:
2215 if ent[1] & 020000:
2216 mode = 'lnk'
2216 mode = 'lnk'
2217 else:
2217 else:
2218 mode = '%3o' % (ent[1] & 0777 & ~util.umask)
2218 mode = '%3o' % (ent[1] & 0777 & ~util.umask)
2219 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2219 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2220 for f in repo.dirstate.copies():
2220 for f in repo.dirstate.copies():
2221 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2221 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2222
2222
2223 @command('debugsub',
2223 @command('debugsub',
2224 [('r', 'rev', '',
2224 [('r', 'rev', '',
2225 _('revision to check'), _('REV'))],
2225 _('revision to check'), _('REV'))],
2226 _('[-r REV] [REV]'))
2226 _('[-r REV] [REV]'))
2227 def debugsub(ui, repo, rev=None):
2227 def debugsub(ui, repo, rev=None):
2228 ctx = scmutil.revsingle(repo, rev, None)
2228 ctx = scmutil.revsingle(repo, rev, None)
2229 for k, v in sorted(ctx.substate.items()):
2229 for k, v in sorted(ctx.substate.items()):
2230 ui.write('path %s\n' % k)
2230 ui.write('path %s\n' % k)
2231 ui.write(' source %s\n' % v[0])
2231 ui.write(' source %s\n' % v[0])
2232 ui.write(' revision %s\n' % v[1])
2232 ui.write(' revision %s\n' % v[1])
2233
2233
2234 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'))
2234 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'))
2235 def debugwalk(ui, repo, *pats, **opts):
2235 def debugwalk(ui, repo, *pats, **opts):
2236 """show how files match on given patterns"""
2236 """show how files match on given patterns"""
2237 m = scmutil.match(repo[None], pats, opts)
2237 m = scmutil.match(repo[None], pats, opts)
2238 items = list(repo.walk(m))
2238 items = list(repo.walk(m))
2239 if not items:
2239 if not items:
2240 return
2240 return
2241 fmt = 'f %%-%ds %%-%ds %%s' % (
2241 fmt = 'f %%-%ds %%-%ds %%s' % (
2242 max([len(abs) for abs in items]),
2242 max([len(abs) for abs in items]),
2243 max([len(m.rel(abs)) for abs in items]))
2243 max([len(m.rel(abs)) for abs in items]))
2244 for abs in items:
2244 for abs in items:
2245 line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '')
2245 line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '')
2246 ui.write("%s\n" % line.rstrip())
2246 ui.write("%s\n" % line.rstrip())
2247
2247
2248 @command('debugwireargs',
2248 @command('debugwireargs',
2249 [('', 'three', '', 'three'),
2249 [('', 'three', '', 'three'),
2250 ('', 'four', '', 'four'),
2250 ('', 'four', '', 'four'),
2251 ('', 'five', '', 'five'),
2251 ('', 'five', '', 'five'),
2252 ] + remoteopts,
2252 ] + remoteopts,
2253 _('REPO [OPTIONS]... [ONE [TWO]]'))
2253 _('REPO [OPTIONS]... [ONE [TWO]]'))
2254 def debugwireargs(ui, repopath, *vals, **opts):
2254 def debugwireargs(ui, repopath, *vals, **opts):
2255 repo = hg.peer(ui, opts, repopath)
2255 repo = hg.peer(ui, opts, repopath)
2256 for opt in remoteopts:
2256 for opt in remoteopts:
2257 del opts[opt[1]]
2257 del opts[opt[1]]
2258 args = {}
2258 args = {}
2259 for k, v in opts.iteritems():
2259 for k, v in opts.iteritems():
2260 if v:
2260 if v:
2261 args[k] = v
2261 args[k] = v
2262 # run twice to check that we don't mess up the stream for the next command
2262 # run twice to check that we don't mess up the stream for the next command
2263 res1 = repo.debugwireargs(*vals, **args)
2263 res1 = repo.debugwireargs(*vals, **args)
2264 res2 = repo.debugwireargs(*vals, **args)
2264 res2 = repo.debugwireargs(*vals, **args)
2265 ui.write("%s\n" % res1)
2265 ui.write("%s\n" % res1)
2266 if res1 != res2:
2266 if res1 != res2:
2267 ui.warn("%s\n" % res2)
2267 ui.warn("%s\n" % res2)
2268
2268
2269 @command('^diff',
2269 @command('^diff',
2270 [('r', 'rev', [], _('revision'), _('REV')),
2270 [('r', 'rev', [], _('revision'), _('REV')),
2271 ('c', 'change', '', _('change made by revision'), _('REV'))
2271 ('c', 'change', '', _('change made by revision'), _('REV'))
2272 ] + diffopts + diffopts2 + walkopts + subrepoopts,
2272 ] + diffopts + diffopts2 + walkopts + subrepoopts,
2273 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'))
2273 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'))
2274 def diff(ui, repo, *pats, **opts):
2274 def diff(ui, repo, *pats, **opts):
2275 """diff repository (or selected files)
2275 """diff repository (or selected files)
2276
2276
2277 Show differences between revisions for the specified files.
2277 Show differences between revisions for the specified files.
2278
2278
2279 Differences between files are shown using the unified diff format.
2279 Differences between files are shown using the unified diff format.
2280
2280
2281 .. note::
2281 .. note::
2282 diff may generate unexpected results for merges, as it will
2282 diff may generate unexpected results for merges, as it will
2283 default to comparing against the working directory's first
2283 default to comparing against the working directory's first
2284 parent changeset if no revisions are specified.
2284 parent changeset if no revisions are specified.
2285
2285
2286 When two revision arguments are given, then changes are shown
2286 When two revision arguments are given, then changes are shown
2287 between those revisions. If only one revision is specified then
2287 between those revisions. If only one revision is specified then
2288 that revision is compared to the working directory, and, when no
2288 that revision is compared to the working directory, and, when no
2289 revisions are specified, the working directory files are compared
2289 revisions are specified, the working directory files are compared
2290 to its parent.
2290 to its parent.
2291
2291
2292 Alternatively you can specify -c/--change with a revision to see
2292 Alternatively you can specify -c/--change with a revision to see
2293 the changes in that changeset relative to its first parent.
2293 the changes in that changeset relative to its first parent.
2294
2294
2295 Without the -a/--text option, diff will avoid generating diffs of
2295 Without the -a/--text option, diff will avoid generating diffs of
2296 files it detects as binary. With -a, diff will generate a diff
2296 files it detects as binary. With -a, diff will generate a diff
2297 anyway, probably with undesirable results.
2297 anyway, probably with undesirable results.
2298
2298
2299 Use the -g/--git option to generate diffs in the git extended diff
2299 Use the -g/--git option to generate diffs in the git extended diff
2300 format. For more information, read :hg:`help diffs`.
2300 format. For more information, read :hg:`help diffs`.
2301
2301
2302 .. container:: verbose
2302 .. container:: verbose
2303
2303
2304 Examples:
2304 Examples:
2305
2305
2306 - compare a file in the current working directory to its parent::
2306 - compare a file in the current working directory to its parent::
2307
2307
2308 hg diff foo.c
2308 hg diff foo.c
2309
2309
2310 - compare two historical versions of a directory, with rename info::
2310 - compare two historical versions of a directory, with rename info::
2311
2311
2312 hg diff --git -r 1.0:1.2 lib/
2312 hg diff --git -r 1.0:1.2 lib/
2313
2313
2314 - get change stats relative to the last change on some date::
2314 - get change stats relative to the last change on some date::
2315
2315
2316 hg diff --stat -r "date('may 2')"
2316 hg diff --stat -r "date('may 2')"
2317
2317
2318 - diff all newly-added files that contain a keyword::
2318 - diff all newly-added files that contain a keyword::
2319
2319
2320 hg diff "set:added() and grep(GNU)"
2320 hg diff "set:added() and grep(GNU)"
2321
2321
2322 - compare a revision and its parents::
2322 - compare a revision and its parents::
2323
2323
2324 hg diff -c 9353 # compare against first parent
2324 hg diff -c 9353 # compare against first parent
2325 hg diff -r 9353^:9353 # same using revset syntax
2325 hg diff -r 9353^:9353 # same using revset syntax
2326 hg diff -r 9353^2:9353 # compare against the second parent
2326 hg diff -r 9353^2:9353 # compare against the second parent
2327
2327
2328 Returns 0 on success.
2328 Returns 0 on success.
2329 """
2329 """
2330
2330
2331 revs = opts.get('rev')
2331 revs = opts.get('rev')
2332 change = opts.get('change')
2332 change = opts.get('change')
2333 stat = opts.get('stat')
2333 stat = opts.get('stat')
2334 reverse = opts.get('reverse')
2334 reverse = opts.get('reverse')
2335
2335
2336 if revs and change:
2336 if revs and change:
2337 msg = _('cannot specify --rev and --change at the same time')
2337 msg = _('cannot specify --rev and --change at the same time')
2338 raise util.Abort(msg)
2338 raise util.Abort(msg)
2339 elif change:
2339 elif change:
2340 node2 = scmutil.revsingle(repo, change, None).node()
2340 node2 = scmutil.revsingle(repo, change, None).node()
2341 node1 = repo[node2].p1().node()
2341 node1 = repo[node2].p1().node()
2342 else:
2342 else:
2343 node1, node2 = scmutil.revpair(repo, revs)
2343 node1, node2 = scmutil.revpair(repo, revs)
2344
2344
2345 if reverse:
2345 if reverse:
2346 node1, node2 = node2, node1
2346 node1, node2 = node2, node1
2347
2347
2348 diffopts = patch.diffopts(ui, opts)
2348 diffopts = patch.diffopts(ui, opts)
2349 m = scmutil.match(repo[node2], pats, opts)
2349 m = scmutil.match(repo[node2], pats, opts)
2350 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
2350 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
2351 listsubrepos=opts.get('subrepos'))
2351 listsubrepos=opts.get('subrepos'))
2352
2352
2353 @command('^export',
2353 @command('^export',
2354 [('o', 'output', '',
2354 [('o', 'output', '',
2355 _('print output to file with formatted name'), _('FORMAT')),
2355 _('print output to file with formatted name'), _('FORMAT')),
2356 ('', 'switch-parent', None, _('diff against the second parent')),
2356 ('', 'switch-parent', None, _('diff against the second parent')),
2357 ('r', 'rev', [], _('revisions to export'), _('REV')),
2357 ('r', 'rev', [], _('revisions to export'), _('REV')),
2358 ] + diffopts,
2358 ] + diffopts,
2359 _('[OPTION]... [-o OUTFILESPEC] REV...'))
2359 _('[OPTION]... [-o OUTFILESPEC] REV...'))
2360 def export(ui, repo, *changesets, **opts):
2360 def export(ui, repo, *changesets, **opts):
2361 """dump the header and diffs for one or more changesets
2361 """dump the header and diffs for one or more changesets
2362
2362
2363 Print the changeset header and diffs for one or more revisions.
2363 Print the changeset header and diffs for one or more revisions.
2364
2364
2365 The information shown in the changeset header is: author, date,
2365 The information shown in the changeset header is: author, date,
2366 branch name (if non-default), changeset hash, parent(s) and commit
2366 branch name (if non-default), changeset hash, parent(s) and commit
2367 comment.
2367 comment.
2368
2368
2369 .. note::
2369 .. note::
2370 export may generate unexpected diff output for merge
2370 export may generate unexpected diff output for merge
2371 changesets, as it will compare the merge changeset against its
2371 changesets, as it will compare the merge changeset against its
2372 first parent only.
2372 first parent only.
2373
2373
2374 Output may be to a file, in which case the name of the file is
2374 Output may be to a file, in which case the name of the file is
2375 given using a format string. The formatting rules are as follows:
2375 given using a format string. The formatting rules are as follows:
2376
2376
2377 :``%%``: literal "%" character
2377 :``%%``: literal "%" character
2378 :``%H``: changeset hash (40 hexadecimal digits)
2378 :``%H``: changeset hash (40 hexadecimal digits)
2379 :``%N``: number of patches being generated
2379 :``%N``: number of patches being generated
2380 :``%R``: changeset revision number
2380 :``%R``: changeset revision number
2381 :``%b``: basename of the exporting repository
2381 :``%b``: basename of the exporting repository
2382 :``%h``: short-form changeset hash (12 hexadecimal digits)
2382 :``%h``: short-form changeset hash (12 hexadecimal digits)
2383 :``%m``: first line of the commit message (only alphanumeric characters)
2383 :``%m``: first line of the commit message (only alphanumeric characters)
2384 :``%n``: zero-padded sequence number, starting at 1
2384 :``%n``: zero-padded sequence number, starting at 1
2385 :``%r``: zero-padded changeset revision number
2385 :``%r``: zero-padded changeset revision number
2386
2386
2387 Without the -a/--text option, export will avoid generating diffs
2387 Without the -a/--text option, export will avoid generating diffs
2388 of files it detects as binary. With -a, export will generate a
2388 of files it detects as binary. With -a, export will generate a
2389 diff anyway, probably with undesirable results.
2389 diff anyway, probably with undesirable results.
2390
2390
2391 Use the -g/--git option to generate diffs in the git extended diff
2391 Use the -g/--git option to generate diffs in the git extended diff
2392 format. See :hg:`help diffs` for more information.
2392 format. See :hg:`help diffs` for more information.
2393
2393
2394 With the --switch-parent option, the diff will be against the
2394 With the --switch-parent option, the diff will be against the
2395 second parent. It can be useful to review a merge.
2395 second parent. It can be useful to review a merge.
2396
2396
2397 .. container:: verbose
2397 .. container:: verbose
2398
2398
2399 Examples:
2399 Examples:
2400
2400
2401 - use export and import to transplant a bugfix to the current
2401 - use export and import to transplant a bugfix to the current
2402 branch::
2402 branch::
2403
2403
2404 hg export -r 9353 | hg import -
2404 hg export -r 9353 | hg import -
2405
2405
2406 - export all the changesets between two revisions to a file with
2406 - export all the changesets between two revisions to a file with
2407 rename information::
2407 rename information::
2408
2408
2409 hg export --git -r 123:150 > changes.txt
2409 hg export --git -r 123:150 > changes.txt
2410
2410
2411 - split outgoing changes into a series of patches with
2411 - split outgoing changes into a series of patches with
2412 descriptive names::
2412 descriptive names::
2413
2413
2414 hg export -r "outgoing()" -o "%n-%m.patch"
2414 hg export -r "outgoing()" -o "%n-%m.patch"
2415
2415
2416 Returns 0 on success.
2416 Returns 0 on success.
2417 """
2417 """
2418 changesets += tuple(opts.get('rev', []))
2418 changesets += tuple(opts.get('rev', []))
2419 if not changesets:
2419 if not changesets:
2420 raise util.Abort(_("export requires at least one changeset"))
2420 raise util.Abort(_("export requires at least one changeset"))
2421 revs = scmutil.revrange(repo, changesets)
2421 revs = scmutil.revrange(repo, changesets)
2422 if len(revs) > 1:
2422 if len(revs) > 1:
2423 ui.note(_('exporting patches:\n'))
2423 ui.note(_('exporting patches:\n'))
2424 else:
2424 else:
2425 ui.note(_('exporting patch:\n'))
2425 ui.note(_('exporting patch:\n'))
2426 cmdutil.export(repo, revs, template=opts.get('output'),
2426 cmdutil.export(repo, revs, template=opts.get('output'),
2427 switch_parent=opts.get('switch_parent'),
2427 switch_parent=opts.get('switch_parent'),
2428 opts=patch.diffopts(ui, opts))
2428 opts=patch.diffopts(ui, opts))
2429
2429
2430 @command('^forget', walkopts, _('[OPTION]... FILE...'))
2430 @command('^forget', walkopts, _('[OPTION]... FILE...'))
2431 def forget(ui, repo, *pats, **opts):
2431 def forget(ui, repo, *pats, **opts):
2432 """forget the specified files on the next commit
2432 """forget the specified files on the next commit
2433
2433
2434 Mark the specified files so they will no longer be tracked
2434 Mark the specified files so they will no longer be tracked
2435 after the next commit.
2435 after the next commit.
2436
2436
2437 This only removes files from the current branch, not from the
2437 This only removes files from the current branch, not from the
2438 entire project history, and it does not delete them from the
2438 entire project history, and it does not delete them from the
2439 working directory.
2439 working directory.
2440
2440
2441 To undo a forget before the next commit, see :hg:`add`.
2441 To undo a forget before the next commit, see :hg:`add`.
2442
2442
2443 .. container:: verbose
2443 .. container:: verbose
2444
2444
2445 Examples:
2445 Examples:
2446
2446
2447 - forget newly-added binary files::
2447 - forget newly-added binary files::
2448
2448
2449 hg forget "set:added() and binary()"
2449 hg forget "set:added() and binary()"
2450
2450
2451 - forget files that would be excluded by .hgignore::
2451 - forget files that would be excluded by .hgignore::
2452
2452
2453 hg forget "set:hgignore()"
2453 hg forget "set:hgignore()"
2454
2454
2455 Returns 0 on success.
2455 Returns 0 on success.
2456 """
2456 """
2457
2457
2458 if not pats:
2458 if not pats:
2459 raise util.Abort(_('no files specified'))
2459 raise util.Abort(_('no files specified'))
2460
2460
2461 m = scmutil.match(repo[None], pats, opts)
2461 m = scmutil.match(repo[None], pats, opts)
2462 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2462 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2463 return rejected and 1 or 0
2463 return rejected and 1 or 0
2464
2464
2465 @command(
2465 @command(
2466 'graft',
2466 'graft',
2467 [('c', 'continue', False, _('resume interrupted graft')),
2467 [('c', 'continue', False, _('resume interrupted graft')),
2468 ('e', 'edit', False, _('invoke editor on commit messages')),
2468 ('e', 'edit', False, _('invoke editor on commit messages')),
2469 ('D', 'currentdate', False,
2469 ('D', 'currentdate', False,
2470 _('record the current date as commit date')),
2470 _('record the current date as commit date')),
2471 ('U', 'currentuser', False,
2471 ('U', 'currentuser', False,
2472 _('record the current user as committer'), _('DATE'))]
2472 _('record the current user as committer'), _('DATE'))]
2473 + commitopts2 + mergetoolopts,
2473 + commitopts2 + mergetoolopts,
2474 _('[OPTION]... REVISION...'))
2474 _('[OPTION]... REVISION...'))
2475 def graft(ui, repo, *revs, **opts):
2475 def graft(ui, repo, *revs, **opts):
2476 '''copy changes from other branches onto the current branch
2476 '''copy changes from other branches onto the current branch
2477
2477
2478 This command uses Mercurial's merge logic to copy individual
2478 This command uses Mercurial's merge logic to copy individual
2479 changes from other branches without merging branches in the
2479 changes from other branches without merging branches in the
2480 history graph. This is sometimes known as 'backporting' or
2480 history graph. This is sometimes known as 'backporting' or
2481 'cherry-picking'. By default, graft will copy user, date, and
2481 'cherry-picking'. By default, graft will copy user, date, and
2482 description from the source changesets.
2482 description from the source changesets.
2483
2483
2484 Changesets that are ancestors of the current revision, that have
2484 Changesets that are ancestors of the current revision, that have
2485 already been grafted, or that are merges will be skipped.
2485 already been grafted, or that are merges will be skipped.
2486
2486
2487 If a graft merge results in conflicts, the graft process is
2487 If a graft merge results in conflicts, the graft process is
2488 interrupted so that the current merge can be manually resolved.
2488 interrupted so that the current merge can be manually resolved.
2489 Once all conflicts are addressed, the graft process can be
2489 Once all conflicts are addressed, the graft process can be
2490 continued with the -c/--continue option.
2490 continued with the -c/--continue option.
2491
2491
2492 .. note::
2492 .. note::
2493 The -c/--continue option does not reapply earlier options.
2493 The -c/--continue option does not reapply earlier options.
2494
2494
2495 .. container:: verbose
2495 .. container:: verbose
2496
2496
2497 Examples:
2497 Examples:
2498
2498
2499 - copy a single change to the stable branch and edit its description::
2499 - copy a single change to the stable branch and edit its description::
2500
2500
2501 hg update stable
2501 hg update stable
2502 hg graft --edit 9393
2502 hg graft --edit 9393
2503
2503
2504 - graft a range of changesets with one exception, updating dates::
2504 - graft a range of changesets with one exception, updating dates::
2505
2505
2506 hg graft -D "2085::2093 and not 2091"
2506 hg graft -D "2085::2093 and not 2091"
2507
2507
2508 - continue a graft after resolving conflicts::
2508 - continue a graft after resolving conflicts::
2509
2509
2510 hg graft -c
2510 hg graft -c
2511
2511
2512 - show the source of a grafted changeset::
2512 - show the source of a grafted changeset::
2513
2513
2514 hg log --debug -r tip
2514 hg log --debug -r tip
2515
2515
2516 Returns 0 on successful completion.
2516 Returns 0 on successful completion.
2517 '''
2517 '''
2518
2518
2519 if not opts.get('user') and opts.get('currentuser'):
2519 if not opts.get('user') and opts.get('currentuser'):
2520 opts['user'] = ui.username()
2520 opts['user'] = ui.username()
2521 if not opts.get('date') and opts.get('currentdate'):
2521 if not opts.get('date') and opts.get('currentdate'):
2522 opts['date'] = "%d %d" % util.makedate()
2522 opts['date'] = "%d %d" % util.makedate()
2523
2523
2524 editor = None
2524 editor = None
2525 if opts.get('edit'):
2525 if opts.get('edit'):
2526 editor = cmdutil.commitforceeditor
2526 editor = cmdutil.commitforceeditor
2527
2527
2528 cont = False
2528 cont = False
2529 if opts['continue']:
2529 if opts['continue']:
2530 cont = True
2530 cont = True
2531 if revs:
2531 if revs:
2532 raise util.Abort(_("can't specify --continue and revisions"))
2532 raise util.Abort(_("can't specify --continue and revisions"))
2533 # read in unfinished revisions
2533 # read in unfinished revisions
2534 try:
2534 try:
2535 nodes = repo.opener.read('graftstate').splitlines()
2535 nodes = repo.opener.read('graftstate').splitlines()
2536 revs = [repo[node].rev() for node in nodes]
2536 revs = [repo[node].rev() for node in nodes]
2537 except IOError, inst:
2537 except IOError, inst:
2538 if inst.errno != errno.ENOENT:
2538 if inst.errno != errno.ENOENT:
2539 raise
2539 raise
2540 raise util.Abort(_("no graft state found, can't continue"))
2540 raise util.Abort(_("no graft state found, can't continue"))
2541 else:
2541 else:
2542 cmdutil.bailifchanged(repo)
2542 cmdutil.bailifchanged(repo)
2543 if not revs:
2543 if not revs:
2544 raise util.Abort(_('no revisions specified'))
2544 raise util.Abort(_('no revisions specified'))
2545 revs = scmutil.revrange(repo, revs)
2545 revs = scmutil.revrange(repo, revs)
2546
2546
2547 # check for merges
2547 # check for merges
2548 for rev in repo.revs('%ld and merge()', revs):
2548 for rev in repo.revs('%ld and merge()', revs):
2549 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2549 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2550 revs.remove(rev)
2550 revs.remove(rev)
2551 if not revs:
2551 if not revs:
2552 return -1
2552 return -1
2553
2553
2554 # check for ancestors of dest branch
2554 # check for ancestors of dest branch
2555 for rev in repo.revs('::. and %ld', revs):
2555 for rev in repo.revs('::. and %ld', revs):
2556 ui.warn(_('skipping ancestor revision %s\n') % rev)
2556 ui.warn(_('skipping ancestor revision %s\n') % rev)
2557 revs.remove(rev)
2557 revs.remove(rev)
2558 if not revs:
2558 if not revs:
2559 return -1
2559 return -1
2560
2560
2561 # analyze revs for earlier grafts
2561 # analyze revs for earlier grafts
2562 ids = {}
2562 ids = {}
2563 for ctx in repo.set("%ld", revs):
2563 for ctx in repo.set("%ld", revs):
2564 ids[ctx.hex()] = ctx.rev()
2564 ids[ctx.hex()] = ctx.rev()
2565 n = ctx.extra().get('source')
2565 n = ctx.extra().get('source')
2566 if n:
2566 if n:
2567 ids[n] = ctx.rev()
2567 ids[n] = ctx.rev()
2568
2568
2569 # check ancestors for earlier grafts
2569 # check ancestors for earlier grafts
2570 ui.debug('scanning for duplicate grafts\n')
2570 ui.debug('scanning for duplicate grafts\n')
2571 for ctx in repo.set("::. - ::%ld", revs):
2571 for ctx in repo.set("::. - ::%ld", revs):
2572 n = ctx.extra().get('source')
2572 n = ctx.extra().get('source')
2573 if n in ids:
2573 if n in ids:
2574 r = repo[n].rev()
2574 r = repo[n].rev()
2575 if r in revs:
2575 if r in revs:
2576 ui.warn(_('skipping already grafted revision %s\n') % r)
2576 ui.warn(_('skipping already grafted revision %s\n') % r)
2577 revs.remove(r)
2577 revs.remove(r)
2578 elif ids[n] in revs:
2578 elif ids[n] in revs:
2579 ui.warn(_('skipping already grafted revision %s '
2579 ui.warn(_('skipping already grafted revision %s '
2580 '(same origin %d)\n') % (ids[n], r))
2580 '(same origin %d)\n') % (ids[n], r))
2581 revs.remove(ids[n])
2581 revs.remove(ids[n])
2582 elif ctx.hex() in ids:
2582 elif ctx.hex() in ids:
2583 r = ids[ctx.hex()]
2583 r = ids[ctx.hex()]
2584 ui.warn(_('skipping already grafted revision %s '
2584 ui.warn(_('skipping already grafted revision %s '
2585 '(was grafted from %d)\n') % (r, ctx.rev()))
2585 '(was grafted from %d)\n') % (r, ctx.rev()))
2586 revs.remove(r)
2586 revs.remove(r)
2587 if not revs:
2587 if not revs:
2588 return -1
2588 return -1
2589
2589
2590 for pos, ctx in enumerate(repo.set("%ld", revs)):
2590 for pos, ctx in enumerate(repo.set("%ld", revs)):
2591 current = repo['.']
2591 current = repo['.']
2592 ui.status(_('grafting revision %s\n') % ctx.rev())
2592 ui.status(_('grafting revision %s\n') % ctx.rev())
2593
2593
2594 # we don't merge the first commit when continuing
2594 # we don't merge the first commit when continuing
2595 if not cont:
2595 if not cont:
2596 # perform the graft merge with p1(rev) as 'ancestor'
2596 # perform the graft merge with p1(rev) as 'ancestor'
2597 try:
2597 try:
2598 # ui.forcemerge is an internal variable, do not document
2598 # ui.forcemerge is an internal variable, do not document
2599 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
2599 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
2600 stats = mergemod.update(repo, ctx.node(), True, True, False,
2600 stats = mergemod.update(repo, ctx.node(), True, True, False,
2601 ctx.p1().node())
2601 ctx.p1().node())
2602 finally:
2602 finally:
2603 ui.setconfig('ui', 'forcemerge', '')
2603 ui.setconfig('ui', 'forcemerge', '')
2604 # drop the second merge parent
2604 # drop the second merge parent
2605 repo.dirstate.setparents(current.node(), nullid)
2605 repo.dirstate.setparents(current.node(), nullid)
2606 repo.dirstate.write()
2606 repo.dirstate.write()
2607 # fix up dirstate for copies and renames
2607 # fix up dirstate for copies and renames
2608 cmdutil.duplicatecopies(repo, ctx.rev(), current.node())
2608 cmdutil.duplicatecopies(repo, ctx.rev(), current.node())
2609 # report any conflicts
2609 # report any conflicts
2610 if stats and stats[3] > 0:
2610 if stats and stats[3] > 0:
2611 # write out state for --continue
2611 # write out state for --continue
2612 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2612 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2613 repo.opener.write('graftstate', ''.join(nodelines))
2613 repo.opener.write('graftstate', ''.join(nodelines))
2614 raise util.Abort(
2614 raise util.Abort(
2615 _("unresolved conflicts, can't continue"),
2615 _("unresolved conflicts, can't continue"),
2616 hint=_('use hg resolve and hg graft --continue'))
2616 hint=_('use hg resolve and hg graft --continue'))
2617 else:
2617 else:
2618 cont = False
2618 cont = False
2619
2619
2620 # commit
2620 # commit
2621 source = ctx.extra().get('source')
2621 source = ctx.extra().get('source')
2622 if not source:
2622 if not source:
2623 source = ctx.hex()
2623 source = ctx.hex()
2624 extra = {'source': source}
2624 extra = {'source': source}
2625 user = ctx.user()
2625 user = ctx.user()
2626 if opts.get('user'):
2626 if opts.get('user'):
2627 user = opts['user']
2627 user = opts['user']
2628 date = ctx.date()
2628 date = ctx.date()
2629 if opts.get('date'):
2629 if opts.get('date'):
2630 date = opts['date']
2630 date = opts['date']
2631 repo.commit(text=ctx.description(), user=user,
2631 repo.commit(text=ctx.description(), user=user,
2632 date=date, extra=extra, editor=editor)
2632 date=date, extra=extra, editor=editor)
2633
2633
2634 # remove state when we complete successfully
2634 # remove state when we complete successfully
2635 if os.path.exists(repo.join('graftstate')):
2635 if os.path.exists(repo.join('graftstate')):
2636 util.unlinkpath(repo.join('graftstate'))
2636 util.unlinkpath(repo.join('graftstate'))
2637
2637
2638 return 0
2638 return 0
2639
2639
2640 @command('grep',
2640 @command('grep',
2641 [('0', 'print0', None, _('end fields with NUL')),
2641 [('0', 'print0', None, _('end fields with NUL')),
2642 ('', 'all', None, _('print all revisions that match')),
2642 ('', 'all', None, _('print all revisions that match')),
2643 ('a', 'text', None, _('treat all files as text')),
2643 ('a', 'text', None, _('treat all files as text')),
2644 ('f', 'follow', None,
2644 ('f', 'follow', None,
2645 _('follow changeset history,'
2645 _('follow changeset history,'
2646 ' or file history across copies and renames')),
2646 ' or file history across copies and renames')),
2647 ('i', 'ignore-case', None, _('ignore case when matching')),
2647 ('i', 'ignore-case', None, _('ignore case when matching')),
2648 ('l', 'files-with-matches', None,
2648 ('l', 'files-with-matches', None,
2649 _('print only filenames and revisions that match')),
2649 _('print only filenames and revisions that match')),
2650 ('n', 'line-number', None, _('print matching line numbers')),
2650 ('n', 'line-number', None, _('print matching line numbers')),
2651 ('r', 'rev', [],
2651 ('r', 'rev', [],
2652 _('only search files changed within revision range'), _('REV')),
2652 _('only search files changed within revision range'), _('REV')),
2653 ('u', 'user', None, _('list the author (long with -v)')),
2653 ('u', 'user', None, _('list the author (long with -v)')),
2654 ('d', 'date', None, _('list the date (short with -q)')),
2654 ('d', 'date', None, _('list the date (short with -q)')),
2655 ] + walkopts,
2655 ] + walkopts,
2656 _('[OPTION]... PATTERN [FILE]...'))
2656 _('[OPTION]... PATTERN [FILE]...'))
2657 def grep(ui, repo, pattern, *pats, **opts):
2657 def grep(ui, repo, pattern, *pats, **opts):
2658 """search for a pattern in specified files and revisions
2658 """search for a pattern in specified files and revisions
2659
2659
2660 Search revisions of files for a regular expression.
2660 Search revisions of files for a regular expression.
2661
2661
2662 This command behaves differently than Unix grep. It only accepts
2662 This command behaves differently than Unix grep. It only accepts
2663 Python/Perl regexps. It searches repository history, not the
2663 Python/Perl regexps. It searches repository history, not the
2664 working directory. It always prints the revision number in which a
2664 working directory. It always prints the revision number in which a
2665 match appears.
2665 match appears.
2666
2666
2667 By default, grep only prints output for the first revision of a
2667 By default, grep only prints output for the first revision of a
2668 file in which it finds a match. To get it to print every revision
2668 file in which it finds a match. To get it to print every revision
2669 that contains a change in match status ("-" for a match that
2669 that contains a change in match status ("-" for a match that
2670 becomes a non-match, or "+" for a non-match that becomes a match),
2670 becomes a non-match, or "+" for a non-match that becomes a match),
2671 use the --all flag.
2671 use the --all flag.
2672
2672
2673 Returns 0 if a match is found, 1 otherwise.
2673 Returns 0 if a match is found, 1 otherwise.
2674 """
2674 """
2675 reflags = re.M
2675 reflags = re.M
2676 if opts.get('ignore_case'):
2676 if opts.get('ignore_case'):
2677 reflags |= re.I
2677 reflags |= re.I
2678 try:
2678 try:
2679 regexp = re.compile(pattern, reflags)
2679 regexp = re.compile(pattern, reflags)
2680 except re.error, inst:
2680 except re.error, inst:
2681 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2681 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2682 return 1
2682 return 1
2683 sep, eol = ':', '\n'
2683 sep, eol = ':', '\n'
2684 if opts.get('print0'):
2684 if opts.get('print0'):
2685 sep = eol = '\0'
2685 sep = eol = '\0'
2686
2686
2687 getfile = util.lrucachefunc(repo.file)
2687 getfile = util.lrucachefunc(repo.file)
2688
2688
2689 def matchlines(body):
2689 def matchlines(body):
2690 begin = 0
2690 begin = 0
2691 linenum = 0
2691 linenum = 0
2692 while True:
2692 while True:
2693 match = regexp.search(body, begin)
2693 match = regexp.search(body, begin)
2694 if not match:
2694 if not match:
2695 break
2695 break
2696 mstart, mend = match.span()
2696 mstart, mend = match.span()
2697 linenum += body.count('\n', begin, mstart) + 1
2697 linenum += body.count('\n', begin, mstart) + 1
2698 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2698 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2699 begin = body.find('\n', mend) + 1 or len(body) + 1
2699 begin = body.find('\n', mend) + 1 or len(body) + 1
2700 lend = begin - 1
2700 lend = begin - 1
2701 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2701 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2702
2702
2703 class linestate(object):
2703 class linestate(object):
2704 def __init__(self, line, linenum, colstart, colend):
2704 def __init__(self, line, linenum, colstart, colend):
2705 self.line = line
2705 self.line = line
2706 self.linenum = linenum
2706 self.linenum = linenum
2707 self.colstart = colstart
2707 self.colstart = colstart
2708 self.colend = colend
2708 self.colend = colend
2709
2709
2710 def __hash__(self):
2710 def __hash__(self):
2711 return hash((self.linenum, self.line))
2711 return hash((self.linenum, self.line))
2712
2712
2713 def __eq__(self, other):
2713 def __eq__(self, other):
2714 return self.line == other.line
2714 return self.line == other.line
2715
2715
2716 matches = {}
2716 matches = {}
2717 copies = {}
2717 copies = {}
2718 def grepbody(fn, rev, body):
2718 def grepbody(fn, rev, body):
2719 matches[rev].setdefault(fn, [])
2719 matches[rev].setdefault(fn, [])
2720 m = matches[rev][fn]
2720 m = matches[rev][fn]
2721 for lnum, cstart, cend, line in matchlines(body):
2721 for lnum, cstart, cend, line in matchlines(body):
2722 s = linestate(line, lnum, cstart, cend)
2722 s = linestate(line, lnum, cstart, cend)
2723 m.append(s)
2723 m.append(s)
2724
2724
2725 def difflinestates(a, b):
2725 def difflinestates(a, b):
2726 sm = difflib.SequenceMatcher(None, a, b)
2726 sm = difflib.SequenceMatcher(None, a, b)
2727 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2727 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2728 if tag == 'insert':
2728 if tag == 'insert':
2729 for i in xrange(blo, bhi):
2729 for i in xrange(blo, bhi):
2730 yield ('+', b[i])
2730 yield ('+', b[i])
2731 elif tag == 'delete':
2731 elif tag == 'delete':
2732 for i in xrange(alo, ahi):
2732 for i in xrange(alo, ahi):
2733 yield ('-', a[i])
2733 yield ('-', a[i])
2734 elif tag == 'replace':
2734 elif tag == 'replace':
2735 for i in xrange(alo, ahi):
2735 for i in xrange(alo, ahi):
2736 yield ('-', a[i])
2736 yield ('-', a[i])
2737 for i in xrange(blo, bhi):
2737 for i in xrange(blo, bhi):
2738 yield ('+', b[i])
2738 yield ('+', b[i])
2739
2739
2740 def display(fn, ctx, pstates, states):
2740 def display(fn, ctx, pstates, states):
2741 rev = ctx.rev()
2741 rev = ctx.rev()
2742 datefunc = ui.quiet and util.shortdate or util.datestr
2742 datefunc = ui.quiet and util.shortdate or util.datestr
2743 found = False
2743 found = False
2744 filerevmatches = {}
2744 filerevmatches = {}
2745 def binary():
2745 def binary():
2746 flog = getfile(fn)
2746 flog = getfile(fn)
2747 return util.binary(flog.read(ctx.filenode(fn)))
2747 return util.binary(flog.read(ctx.filenode(fn)))
2748
2748
2749 if opts.get('all'):
2749 if opts.get('all'):
2750 iter = difflinestates(pstates, states)
2750 iter = difflinestates(pstates, states)
2751 else:
2751 else:
2752 iter = [('', l) for l in states]
2752 iter = [('', l) for l in states]
2753 for change, l in iter:
2753 for change, l in iter:
2754 cols = [fn, str(rev)]
2754 cols = [fn, str(rev)]
2755 before, match, after = None, None, None
2755 before, match, after = None, None, None
2756 if opts.get('line_number'):
2756 if opts.get('line_number'):
2757 cols.append(str(l.linenum))
2757 cols.append(str(l.linenum))
2758 if opts.get('all'):
2758 if opts.get('all'):
2759 cols.append(change)
2759 cols.append(change)
2760 if opts.get('user'):
2760 if opts.get('user'):
2761 cols.append(ui.shortuser(ctx.user()))
2761 cols.append(ui.shortuser(ctx.user()))
2762 if opts.get('date'):
2762 if opts.get('date'):
2763 cols.append(datefunc(ctx.date()))
2763 cols.append(datefunc(ctx.date()))
2764 if opts.get('files_with_matches'):
2764 if opts.get('files_with_matches'):
2765 c = (fn, rev)
2765 c = (fn, rev)
2766 if c in filerevmatches:
2766 if c in filerevmatches:
2767 continue
2767 continue
2768 filerevmatches[c] = 1
2768 filerevmatches[c] = 1
2769 else:
2769 else:
2770 before = l.line[:l.colstart]
2770 before = l.line[:l.colstart]
2771 match = l.line[l.colstart:l.colend]
2771 match = l.line[l.colstart:l.colend]
2772 after = l.line[l.colend:]
2772 after = l.line[l.colend:]
2773 ui.write(sep.join(cols))
2773 ui.write(sep.join(cols))
2774 if before is not None:
2774 if before is not None:
2775 if not opts.get('text') and binary():
2775 if not opts.get('text') and binary():
2776 ui.write(sep + " Binary file matches")
2776 ui.write(sep + " Binary file matches")
2777 else:
2777 else:
2778 ui.write(sep + before)
2778 ui.write(sep + before)
2779 ui.write(match, label='grep.match')
2779 ui.write(match, label='grep.match')
2780 ui.write(after)
2780 ui.write(after)
2781 ui.write(eol)
2781 ui.write(eol)
2782 found = True
2782 found = True
2783 return found
2783 return found
2784
2784
2785 skip = {}
2785 skip = {}
2786 revfiles = {}
2786 revfiles = {}
2787 matchfn = scmutil.match(repo[None], pats, opts)
2787 matchfn = scmutil.match(repo[None], pats, opts)
2788 found = False
2788 found = False
2789 follow = opts.get('follow')
2789 follow = opts.get('follow')
2790
2790
2791 def prep(ctx, fns):
2791 def prep(ctx, fns):
2792 rev = ctx.rev()
2792 rev = ctx.rev()
2793 pctx = ctx.p1()
2793 pctx = ctx.p1()
2794 parent = pctx.rev()
2794 parent = pctx.rev()
2795 matches.setdefault(rev, {})
2795 matches.setdefault(rev, {})
2796 matches.setdefault(parent, {})
2796 matches.setdefault(parent, {})
2797 files = revfiles.setdefault(rev, [])
2797 files = revfiles.setdefault(rev, [])
2798 for fn in fns:
2798 for fn in fns:
2799 flog = getfile(fn)
2799 flog = getfile(fn)
2800 try:
2800 try:
2801 fnode = ctx.filenode(fn)
2801 fnode = ctx.filenode(fn)
2802 except error.LookupError:
2802 except error.LookupError:
2803 continue
2803 continue
2804
2804
2805 copied = flog.renamed(fnode)
2805 copied = flog.renamed(fnode)
2806 copy = follow and copied and copied[0]
2806 copy = follow and copied and copied[0]
2807 if copy:
2807 if copy:
2808 copies.setdefault(rev, {})[fn] = copy
2808 copies.setdefault(rev, {})[fn] = copy
2809 if fn in skip:
2809 if fn in skip:
2810 if copy:
2810 if copy:
2811 skip[copy] = True
2811 skip[copy] = True
2812 continue
2812 continue
2813 files.append(fn)
2813 files.append(fn)
2814
2814
2815 if fn not in matches[rev]:
2815 if fn not in matches[rev]:
2816 grepbody(fn, rev, flog.read(fnode))
2816 grepbody(fn, rev, flog.read(fnode))
2817
2817
2818 pfn = copy or fn
2818 pfn = copy or fn
2819 if pfn not in matches[parent]:
2819 if pfn not in matches[parent]:
2820 try:
2820 try:
2821 fnode = pctx.filenode(pfn)
2821 fnode = pctx.filenode(pfn)
2822 grepbody(pfn, parent, flog.read(fnode))
2822 grepbody(pfn, parent, flog.read(fnode))
2823 except error.LookupError:
2823 except error.LookupError:
2824 pass
2824 pass
2825
2825
2826 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2826 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2827 rev = ctx.rev()
2827 rev = ctx.rev()
2828 parent = ctx.p1().rev()
2828 parent = ctx.p1().rev()
2829 for fn in sorted(revfiles.get(rev, [])):
2829 for fn in sorted(revfiles.get(rev, [])):
2830 states = matches[rev][fn]
2830 states = matches[rev][fn]
2831 copy = copies.get(rev, {}).get(fn)
2831 copy = copies.get(rev, {}).get(fn)
2832 if fn in skip:
2832 if fn in skip:
2833 if copy:
2833 if copy:
2834 skip[copy] = True
2834 skip[copy] = True
2835 continue
2835 continue
2836 pstates = matches.get(parent, {}).get(copy or fn, [])
2836 pstates = matches.get(parent, {}).get(copy or fn, [])
2837 if pstates or states:
2837 if pstates or states:
2838 r = display(fn, ctx, pstates, states)
2838 r = display(fn, ctx, pstates, states)
2839 found = found or r
2839 found = found or r
2840 if r and not opts.get('all'):
2840 if r and not opts.get('all'):
2841 skip[fn] = True
2841 skip[fn] = True
2842 if copy:
2842 if copy:
2843 skip[copy] = True
2843 skip[copy] = True
2844 del matches[rev]
2844 del matches[rev]
2845 del revfiles[rev]
2845 del revfiles[rev]
2846
2846
2847 return not found
2847 return not found
2848
2848
2849 @command('heads',
2849 @command('heads',
2850 [('r', 'rev', '',
2850 [('r', 'rev', '',
2851 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2851 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2852 ('t', 'topo', False, _('show topological heads only')),
2852 ('t', 'topo', False, _('show topological heads only')),
2853 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2853 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2854 ('c', 'closed', False, _('show normal and closed branch heads')),
2854 ('c', 'closed', False, _('show normal and closed branch heads')),
2855 ] + templateopts,
2855 ] + templateopts,
2856 _('[-ac] [-r STARTREV] [REV]...'))
2856 _('[-ac] [-r STARTREV] [REV]...'))
2857 def heads(ui, repo, *branchrevs, **opts):
2857 def heads(ui, repo, *branchrevs, **opts):
2858 """show current repository heads or show branch heads
2858 """show current repository heads or show branch heads
2859
2859
2860 With no arguments, show all repository branch heads.
2860 With no arguments, show all repository branch heads.
2861
2861
2862 Repository "heads" are changesets with no child changesets. They are
2862 Repository "heads" are changesets with no child changesets. They are
2863 where development generally takes place and are the usual targets
2863 where development generally takes place and are the usual targets
2864 for update and merge operations. Branch heads are changesets that have
2864 for update and merge operations. Branch heads are changesets that have
2865 no child changeset on the same branch.
2865 no child changeset on the same branch.
2866
2866
2867 If one or more REVs are given, only branch heads on the branches
2867 If one or more REVs are given, only branch heads on the branches
2868 associated with the specified changesets are shown. This means
2868 associated with the specified changesets are shown. This means
2869 that you can use :hg:`heads foo` to see the heads on a branch
2869 that you can use :hg:`heads foo` to see the heads on a branch
2870 named ``foo``.
2870 named ``foo``.
2871
2871
2872 If -c/--closed is specified, also show branch heads marked closed
2872 If -c/--closed is specified, also show branch heads marked closed
2873 (see :hg:`commit --close-branch`).
2873 (see :hg:`commit --close-branch`).
2874
2874
2875 If STARTREV is specified, only those heads that are descendants of
2875 If STARTREV is specified, only those heads that are descendants of
2876 STARTREV will be displayed.
2876 STARTREV will be displayed.
2877
2877
2878 If -t/--topo is specified, named branch mechanics will be ignored and only
2878 If -t/--topo is specified, named branch mechanics will be ignored and only
2879 changesets without children will be shown.
2879 changesets without children will be shown.
2880
2880
2881 Returns 0 if matching heads are found, 1 if not.
2881 Returns 0 if matching heads are found, 1 if not.
2882 """
2882 """
2883
2883
2884 start = None
2884 start = None
2885 if 'rev' in opts:
2885 if 'rev' in opts:
2886 start = scmutil.revsingle(repo, opts['rev'], None).node()
2886 start = scmutil.revsingle(repo, opts['rev'], None).node()
2887
2887
2888 if opts.get('topo'):
2888 if opts.get('topo'):
2889 heads = [repo[h] for h in repo.heads(start)]
2889 heads = [repo[h] for h in repo.heads(start)]
2890 else:
2890 else:
2891 heads = []
2891 heads = []
2892 for branch in repo.branchmap():
2892 for branch in repo.branchmap():
2893 heads += repo.branchheads(branch, start, opts.get('closed'))
2893 heads += repo.branchheads(branch, start, opts.get('closed'))
2894 heads = [repo[h] for h in heads]
2894 heads = [repo[h] for h in heads]
2895
2895
2896 if branchrevs:
2896 if branchrevs:
2897 branches = set(repo[br].branch() for br in branchrevs)
2897 branches = set(repo[br].branch() for br in branchrevs)
2898 heads = [h for h in heads if h.branch() in branches]
2898 heads = [h for h in heads if h.branch() in branches]
2899
2899
2900 if opts.get('active') and branchrevs:
2900 if opts.get('active') and branchrevs:
2901 dagheads = repo.heads(start)
2901 dagheads = repo.heads(start)
2902 heads = [h for h in heads if h.node() in dagheads]
2902 heads = [h for h in heads if h.node() in dagheads]
2903
2903
2904 if branchrevs:
2904 if branchrevs:
2905 haveheads = set(h.branch() for h in heads)
2905 haveheads = set(h.branch() for h in heads)
2906 if branches - haveheads:
2906 if branches - haveheads:
2907 headless = ', '.join(b for b in branches - haveheads)
2907 headless = ', '.join(b for b in branches - haveheads)
2908 msg = _('no open branch heads found on branches %s')
2908 msg = _('no open branch heads found on branches %s')
2909 if opts.get('rev'):
2909 if opts.get('rev'):
2910 msg += _(' (started at %s)' % opts['rev'])
2910 msg += _(' (started at %s)' % opts['rev'])
2911 ui.warn((msg + '\n') % headless)
2911 ui.warn((msg + '\n') % headless)
2912
2912
2913 if not heads:
2913 if not heads:
2914 return 1
2914 return 1
2915
2915
2916 heads = sorted(heads, key=lambda x: -x.rev())
2916 heads = sorted(heads, key=lambda x: -x.rev())
2917 displayer = cmdutil.show_changeset(ui, repo, opts)
2917 displayer = cmdutil.show_changeset(ui, repo, opts)
2918 for ctx in heads:
2918 for ctx in heads:
2919 displayer.show(ctx)
2919 displayer.show(ctx)
2920 displayer.close()
2920 displayer.close()
2921
2921
2922 @command('help',
2922 @command('help',
2923 [('e', 'extension', None, _('show only help for extensions')),
2923 [('e', 'extension', None, _('show only help for extensions')),
2924 ('c', 'command', None, _('show only help for commands'))],
2924 ('c', 'command', None, _('show only help for commands'))],
2925 _('[-ec] [TOPIC]'))
2925 _('[-ec] [TOPIC]'))
2926 def help_(ui, name=None, unknowncmd=False, full=True, **opts):
2926 def help_(ui, name=None, unknowncmd=False, full=True, **opts):
2927 """show help for a given topic or a help overview
2927 """show help for a given topic or a help overview
2928
2928
2929 With no arguments, print a list of commands with short help messages.
2929 With no arguments, print a list of commands with short help messages.
2930
2930
2931 Given a topic, extension, or command name, print help for that
2931 Given a topic, extension, or command name, print help for that
2932 topic.
2932 topic.
2933
2933
2934 Returns 0 if successful.
2934 Returns 0 if successful.
2935 """
2935 """
2936
2936
2937 textwidth = min(ui.termwidth(), 80) - 2
2937 textwidth = min(ui.termwidth(), 80) - 2
2938
2938
2939 def optrst(options):
2939 def optrst(options):
2940 data = []
2940 data = []
2941 multioccur = False
2941 multioccur = False
2942 for option in options:
2942 for option in options:
2943 if len(option) == 5:
2943 if len(option) == 5:
2944 shortopt, longopt, default, desc, optlabel = option
2944 shortopt, longopt, default, desc, optlabel = option
2945 else:
2945 else:
2946 shortopt, longopt, default, desc = option
2946 shortopt, longopt, default, desc = option
2947 optlabel = _("VALUE") # default label
2947 optlabel = _("VALUE") # default label
2948
2948
2949 if _("DEPRECATED") in desc and not ui.verbose:
2949 if _("DEPRECATED") in desc and not ui.verbose:
2950 continue
2950 continue
2951
2951
2952 so = ''
2952 so = ''
2953 if shortopt:
2953 if shortopt:
2954 so = '-' + shortopt
2954 so = '-' + shortopt
2955 lo = '--' + longopt
2955 lo = '--' + longopt
2956 if default:
2956 if default:
2957 desc += _(" (default: %s)") % default
2957 desc += _(" (default: %s)") % default
2958
2958
2959 if isinstance(default, list):
2959 if isinstance(default, list):
2960 lo += " %s [+]" % optlabel
2960 lo += " %s [+]" % optlabel
2961 multioccur = True
2961 multioccur = True
2962 elif (default is not None) and not isinstance(default, bool):
2962 elif (default is not None) and not isinstance(default, bool):
2963 lo += " %s" % optlabel
2963 lo += " %s" % optlabel
2964
2964
2965 data.append((so, lo, desc))
2965 data.append((so, lo, desc))
2966
2966
2967 rst = minirst.maketable(data, 1)
2967 rst = minirst.maketable(data, 1)
2968
2968
2969 if multioccur:
2969 if multioccur:
2970 rst += _("\n[+] marked option can be specified multiple times\n")
2970 rst += _("\n[+] marked option can be specified multiple times\n")
2971
2971
2972 return rst
2972 return rst
2973
2973
2974 # list all option lists
2974 # list all option lists
2975 def opttext(optlist, width):
2975 def opttext(optlist, width):
2976 rst = ''
2976 rst = ''
2977 if not optlist:
2977 if not optlist:
2978 return ''
2978 return ''
2979
2979
2980 for title, options in optlist:
2980 for title, options in optlist:
2981 rst += '\n%s\n' % title
2981 rst += '\n%s\n' % title
2982 if options:
2982 if options:
2983 rst += "\n"
2983 rst += "\n"
2984 rst += optrst(options)
2984 rst += optrst(options)
2985 rst += '\n'
2985 rst += '\n'
2986
2986
2987 return '\n' + minirst.format(rst, width)
2987 return '\n' + minirst.format(rst, width)
2988
2988
2989 def addglobalopts(optlist, aliases):
2989 def addglobalopts(optlist, aliases):
2990 if ui.quiet:
2990 if ui.quiet:
2991 return []
2991 return []
2992
2992
2993 if ui.verbose:
2993 if ui.verbose:
2994 optlist.append((_("global options:"), globalopts))
2994 optlist.append((_("global options:"), globalopts))
2995 if name == 'shortlist':
2995 if name == 'shortlist':
2996 optlist.append((_('use "hg help" for the full list '
2996 optlist.append((_('use "hg help" for the full list '
2997 'of commands'), ()))
2997 'of commands'), ()))
2998 else:
2998 else:
2999 if name == 'shortlist':
2999 if name == 'shortlist':
3000 msg = _('use "hg help" for the full list of commands '
3000 msg = _('use "hg help" for the full list of commands '
3001 'or "hg -v" for details')
3001 'or "hg -v" for details')
3002 elif name and not full:
3002 elif name and not full:
3003 msg = _('use "hg help %s" to show the full help text' % name)
3003 msg = _('use "hg help %s" to show the full help text' % name)
3004 elif aliases:
3004 elif aliases:
3005 msg = _('use "hg -v help%s" to show builtin aliases and '
3005 msg = _('use "hg -v help%s" to show builtin aliases and '
3006 'global options') % (name and " " + name or "")
3006 'global options') % (name and " " + name or "")
3007 else:
3007 else:
3008 msg = _('use "hg -v help %s" to show more info') % name
3008 msg = _('use "hg -v help %s" to show more info') % name
3009 optlist.append((msg, ()))
3009 optlist.append((msg, ()))
3010
3010
3011 def helpcmd(name):
3011 def helpcmd(name):
3012 try:
3012 try:
3013 aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd)
3013 aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd)
3014 except error.AmbiguousCommand, inst:
3014 except error.AmbiguousCommand, inst:
3015 # py3k fix: except vars can't be used outside the scope of the
3015 # py3k fix: except vars can't be used outside the scope of the
3016 # except block, nor can be used inside a lambda. python issue4617
3016 # except block, nor can be used inside a lambda. python issue4617
3017 prefix = inst.args[0]
3017 prefix = inst.args[0]
3018 select = lambda c: c.lstrip('^').startswith(prefix)
3018 select = lambda c: c.lstrip('^').startswith(prefix)
3019 helplist(select)
3019 helplist(select)
3020 return
3020 return
3021
3021
3022 # check if it's an invalid alias and display its error if it is
3022 # check if it's an invalid alias and display its error if it is
3023 if getattr(entry[0], 'badalias', False):
3023 if getattr(entry[0], 'badalias', False):
3024 if not unknowncmd:
3024 if not unknowncmd:
3025 entry[0](ui)
3025 entry[0](ui)
3026 return
3026 return
3027
3027
3028 rst = ""
3028 rst = ""
3029
3029
3030 # synopsis
3030 # synopsis
3031 if len(entry) > 2:
3031 if len(entry) > 2:
3032 if entry[2].startswith('hg'):
3032 if entry[2].startswith('hg'):
3033 rst += "%s\n" % entry[2]
3033 rst += "%s\n" % entry[2]
3034 else:
3034 else:
3035 rst += 'hg %s %s\n' % (aliases[0], entry[2])
3035 rst += 'hg %s %s\n' % (aliases[0], entry[2])
3036 else:
3036 else:
3037 rst += 'hg %s\n' % aliases[0]
3037 rst += 'hg %s\n' % aliases[0]
3038
3038
3039 # aliases
3039 # aliases
3040 if full and not ui.quiet and len(aliases) > 1:
3040 if full and not ui.quiet and len(aliases) > 1:
3041 rst += _("\naliases: %s\n") % ', '.join(aliases[1:])
3041 rst += _("\naliases: %s\n") % ', '.join(aliases[1:])
3042
3042
3043 # description
3043 # description
3044 doc = gettext(entry[0].__doc__)
3044 doc = gettext(entry[0].__doc__)
3045 if not doc:
3045 if not doc:
3046 doc = _("(no help text available)")
3046 doc = _("(no help text available)")
3047 if util.safehasattr(entry[0], 'definition'): # aliased command
3047 if util.safehasattr(entry[0], 'definition'): # aliased command
3048 if entry[0].definition.startswith('!'): # shell alias
3048 if entry[0].definition.startswith('!'): # shell alias
3049 doc = _('shell alias for::\n\n %s') % entry[0].definition[1:]
3049 doc = _('shell alias for::\n\n %s') % entry[0].definition[1:]
3050 else:
3050 else:
3051 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
3051 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
3052 if ui.quiet or not full:
3052 if ui.quiet or not full:
3053 doc = doc.splitlines()[0]
3053 doc = doc.splitlines()[0]
3054 rst += "\n" + doc + "\n"
3054 rst += "\n" + doc + "\n"
3055
3055
3056 # check if this command shadows a non-trivial (multi-line)
3056 # check if this command shadows a non-trivial (multi-line)
3057 # extension help text
3057 # extension help text
3058 try:
3058 try:
3059 mod = extensions.find(name)
3059 mod = extensions.find(name)
3060 doc = gettext(mod.__doc__) or ''
3060 doc = gettext(mod.__doc__) or ''
3061 if '\n' in doc.strip():
3061 if '\n' in doc.strip():
3062 msg = _('use "hg help -e %s" to show help for '
3062 msg = _('use "hg help -e %s" to show help for '
3063 'the %s extension') % (name, name)
3063 'the %s extension') % (name, name)
3064 rst += '\n%s\n' % msg
3064 rst += '\n%s\n' % msg
3065 except KeyError:
3065 except KeyError:
3066 pass
3066 pass
3067
3067
3068 # options
3068 # options
3069 if not ui.quiet and entry[1]:
3069 if not ui.quiet and entry[1]:
3070 rst += '\n'
3070 rst += '\n'
3071 rst += _("options:")
3071 rst += _("options:")
3072 rst += '\n\n'
3072 rst += '\n\n'
3073 rst += optrst(entry[1])
3073 rst += optrst(entry[1])
3074
3074
3075 if ui.verbose:
3075 if ui.verbose:
3076 rst += '\n'
3076 rst += '\n'
3077 rst += _("global options:")
3077 rst += _("global options:")
3078 rst += '\n\n'
3078 rst += '\n\n'
3079 rst += optrst(globalopts)
3079 rst += optrst(globalopts)
3080
3080
3081 keep = ui.verbose and ['verbose'] or []
3081 keep = ui.verbose and ['verbose'] or []
3082 formatted, pruned = minirst.format(rst, textwidth, keep=keep)
3082 formatted, pruned = minirst.format(rst, textwidth, keep=keep)
3083 ui.write(formatted)
3083 ui.write(formatted)
3084
3084
3085 if not ui.verbose:
3085 if not ui.verbose:
3086 if not full:
3086 if not full:
3087 ui.write(_('\nuse "hg help %s" to show the full help text\n')
3087 ui.write(_('\nuse "hg help %s" to show the full help text\n')
3088 % name)
3088 % name)
3089 elif not ui.quiet:
3089 elif not ui.quiet:
3090 ui.write(_('\nuse "hg -v help %s" to show more info\n') % name)
3090 ui.write(_('\nuse "hg -v help %s" to show more info\n') % name)
3091
3091
3092
3092
3093 def helplist(select=None):
3093 def helplist(select=None):
3094 # list of commands
3094 # list of commands
3095 if name == "shortlist":
3095 if name == "shortlist":
3096 header = _('basic commands:\n\n')
3096 header = _('basic commands:\n\n')
3097 else:
3097 else:
3098 header = _('list of commands:\n\n')
3098 header = _('list of commands:\n\n')
3099
3099
3100 h = {}
3100 h = {}
3101 cmds = {}
3101 cmds = {}
3102 for c, e in table.iteritems():
3102 for c, e in table.iteritems():
3103 f = c.split("|", 1)[0]
3103 f = c.split("|", 1)[0]
3104 if select and not select(f):
3104 if select and not select(f):
3105 continue
3105 continue
3106 if (not select and name != 'shortlist' and
3106 if (not select and name != 'shortlist' and
3107 e[0].__module__ != __name__):
3107 e[0].__module__ != __name__):
3108 continue
3108 continue
3109 if name == "shortlist" and not f.startswith("^"):
3109 if name == "shortlist" and not f.startswith("^"):
3110 continue
3110 continue
3111 f = f.lstrip("^")
3111 f = f.lstrip("^")
3112 if not ui.debugflag and f.startswith("debug"):
3112 if not ui.debugflag and f.startswith("debug"):
3113 continue
3113 continue
3114 doc = e[0].__doc__
3114 doc = e[0].__doc__
3115 if doc and 'DEPRECATED' in doc and not ui.verbose:
3115 if doc and 'DEPRECATED' in doc and not ui.verbose:
3116 continue
3116 continue
3117 doc = gettext(doc)
3117 doc = gettext(doc)
3118 if not doc:
3118 if not doc:
3119 doc = _("(no help text available)")
3119 doc = _("(no help text available)")
3120 h[f] = doc.splitlines()[0].rstrip()
3120 h[f] = doc.splitlines()[0].rstrip()
3121 cmds[f] = c.lstrip("^")
3121 cmds[f] = c.lstrip("^")
3122
3122
3123 if not h:
3123 if not h:
3124 ui.status(_('no commands defined\n'))
3124 ui.status(_('no commands defined\n'))
3125 return
3125 return
3126
3126
3127 ui.status(header)
3127 ui.status(header)
3128 fns = sorted(h)
3128 fns = sorted(h)
3129 m = max(map(len, fns))
3129 m = max(map(len, fns))
3130 for f in fns:
3130 for f in fns:
3131 if ui.verbose:
3131 if ui.verbose:
3132 commands = cmds[f].replace("|",", ")
3132 commands = cmds[f].replace("|",", ")
3133 ui.write(" %s:\n %s\n"%(commands, h[f]))
3133 ui.write(" %s:\n %s\n"%(commands, h[f]))
3134 else:
3134 else:
3135 ui.write('%s\n' % (util.wrap(h[f], textwidth,
3135 ui.write('%s\n' % (util.wrap(h[f], textwidth,
3136 initindent=' %-*s ' % (m, f),
3136 initindent=' %-*s ' % (m, f),
3137 hangindent=' ' * (m + 4))))
3137 hangindent=' ' * (m + 4))))
3138
3138
3139 if not name:
3139 if not name:
3140 text = help.listexts(_('enabled extensions:'), extensions.enabled())
3140 text = help.listexts(_('enabled extensions:'), extensions.enabled())
3141 if text:
3141 if text:
3142 ui.write("\n%s" % minirst.format(text, textwidth))
3142 ui.write("\n%s" % minirst.format(text, textwidth))
3143
3143
3144 ui.write(_("\nadditional help topics:\n\n"))
3144 ui.write(_("\nadditional help topics:\n\n"))
3145 topics = []
3145 topics = []
3146 for names, header, doc in help.helptable:
3146 for names, header, doc in help.helptable:
3147 topics.append((sorted(names, key=len, reverse=True)[0], header))
3147 topics.append((sorted(names, key=len, reverse=True)[0], header))
3148 topics_len = max([len(s[0]) for s in topics])
3148 topics_len = max([len(s[0]) for s in topics])
3149 for t, desc in topics:
3149 for t, desc in topics:
3150 ui.write(" %-*s %s\n" % (topics_len, t, desc))
3150 ui.write(" %-*s %s\n" % (topics_len, t, desc))
3151
3151
3152 optlist = []
3152 optlist = []
3153 addglobalopts(optlist, True)
3153 addglobalopts(optlist, True)
3154 ui.write(opttext(optlist, textwidth))
3154 ui.write(opttext(optlist, textwidth))
3155
3155
3156 def helptopic(name):
3156 def helptopic(name):
3157 for names, header, doc in help.helptable:
3157 for names, header, doc in help.helptable:
3158 if name in names:
3158 if name in names:
3159 break
3159 break
3160 else:
3160 else:
3161 raise error.UnknownCommand(name)
3161 raise error.UnknownCommand(name)
3162
3162
3163 # description
3163 # description
3164 if not doc:
3164 if not doc:
3165 doc = _("(no help text available)")
3165 doc = _("(no help text available)")
3166 if util.safehasattr(doc, '__call__'):
3166 if util.safehasattr(doc, '__call__'):
3167 doc = doc()
3167 doc = doc()
3168
3168
3169 ui.write("%s\n\n" % header)
3169 ui.write("%s\n\n" % header)
3170 ui.write("%s" % minirst.format(doc, textwidth, indent=4))
3170 ui.write("%s" % minirst.format(doc, textwidth, indent=4))
3171 try:
3171 try:
3172 cmdutil.findcmd(name, table)
3172 cmdutil.findcmd(name, table)
3173 ui.write(_('\nuse "hg help -c %s" to see help for '
3173 ui.write(_('\nuse "hg help -c %s" to see help for '
3174 'the %s command\n') % (name, name))
3174 'the %s command\n') % (name, name))
3175 except error.UnknownCommand:
3175 except error.UnknownCommand:
3176 pass
3176 pass
3177
3177
3178 def helpext(name):
3178 def helpext(name):
3179 try:
3179 try:
3180 mod = extensions.find(name)
3180 mod = extensions.find(name)
3181 doc = gettext(mod.__doc__) or _('no help text available')
3181 doc = gettext(mod.__doc__) or _('no help text available')
3182 except KeyError:
3182 except KeyError:
3183 mod = None
3183 mod = None
3184 doc = extensions.disabledext(name)
3184 doc = extensions.disabledext(name)
3185 if not doc:
3185 if not doc:
3186 raise error.UnknownCommand(name)
3186 raise error.UnknownCommand(name)
3187
3187
3188 if '\n' not in doc:
3188 if '\n' not in doc:
3189 head, tail = doc, ""
3189 head, tail = doc, ""
3190 else:
3190 else:
3191 head, tail = doc.split('\n', 1)
3191 head, tail = doc.split('\n', 1)
3192 ui.write(_('%s extension - %s\n\n') % (name.split('.')[-1], head))
3192 ui.write(_('%s extension - %s\n\n') % (name.split('.')[-1], head))
3193 if tail:
3193 if tail:
3194 ui.write(minirst.format(tail, textwidth))
3194 ui.write(minirst.format(tail, textwidth))
3195 ui.status('\n')
3195 ui.status('\n')
3196
3196
3197 if mod:
3197 if mod:
3198 try:
3198 try:
3199 ct = mod.cmdtable
3199 ct = mod.cmdtable
3200 except AttributeError:
3200 except AttributeError:
3201 ct = {}
3201 ct = {}
3202 modcmds = set([c.split('|', 1)[0] for c in ct])
3202 modcmds = set([c.split('|', 1)[0] for c in ct])
3203 helplist(modcmds.__contains__)
3203 helplist(modcmds.__contains__)
3204 else:
3204 else:
3205 ui.write(_('use "hg help extensions" for information on enabling '
3205 ui.write(_('use "hg help extensions" for information on enabling '
3206 'extensions\n'))
3206 'extensions\n'))
3207
3207
3208 def helpextcmd(name):
3208 def helpextcmd(name):
3209 cmd, ext, mod = extensions.disabledcmd(ui, name, ui.config('ui', 'strict'))
3209 cmd, ext, mod = extensions.disabledcmd(ui, name, ui.config('ui', 'strict'))
3210 doc = gettext(mod.__doc__).splitlines()[0]
3210 doc = gettext(mod.__doc__).splitlines()[0]
3211
3211
3212 msg = help.listexts(_("'%s' is provided by the following "
3212 msg = help.listexts(_("'%s' is provided by the following "
3213 "extension:") % cmd, {ext: doc}, indent=4)
3213 "extension:") % cmd, {ext: doc}, indent=4)
3214 ui.write(minirst.format(msg, textwidth))
3214 ui.write(minirst.format(msg, textwidth))
3215 ui.write('\n')
3215 ui.write('\n')
3216 ui.write(_('use "hg help extensions" for information on enabling '
3216 ui.write(_('use "hg help extensions" for information on enabling '
3217 'extensions\n'))
3217 'extensions\n'))
3218
3218
3219 if name and name != 'shortlist':
3219 if name and name != 'shortlist':
3220 i = None
3220 i = None
3221 if unknowncmd:
3221 if unknowncmd:
3222 queries = (helpextcmd,)
3222 queries = (helpextcmd,)
3223 elif opts.get('extension'):
3223 elif opts.get('extension'):
3224 queries = (helpext,)
3224 queries = (helpext,)
3225 elif opts.get('command'):
3225 elif opts.get('command'):
3226 queries = (helpcmd,)
3226 queries = (helpcmd,)
3227 else:
3227 else:
3228 queries = (helptopic, helpcmd, helpext, helpextcmd)
3228 queries = (helptopic, helpcmd, helpext, helpextcmd)
3229 for f in queries:
3229 for f in queries:
3230 try:
3230 try:
3231 f(name)
3231 f(name)
3232 i = None
3232 i = None
3233 break
3233 break
3234 except error.UnknownCommand, inst:
3234 except error.UnknownCommand, inst:
3235 i = inst
3235 i = inst
3236 if i:
3236 if i:
3237 raise i
3237 raise i
3238 else:
3238 else:
3239 # program name
3239 # program name
3240 ui.status(_("Mercurial Distributed SCM\n"))
3240 ui.status(_("Mercurial Distributed SCM\n"))
3241 ui.status('\n')
3241 ui.status('\n')
3242 helplist()
3242 helplist()
3243
3243
3244
3244
3245 @command('identify|id',
3245 @command('identify|id',
3246 [('r', 'rev', '',
3246 [('r', 'rev', '',
3247 _('identify the specified revision'), _('REV')),
3247 _('identify the specified revision'), _('REV')),
3248 ('n', 'num', None, _('show local revision number')),
3248 ('n', 'num', None, _('show local revision number')),
3249 ('i', 'id', None, _('show global revision id')),
3249 ('i', 'id', None, _('show global revision id')),
3250 ('b', 'branch', None, _('show branch')),
3250 ('b', 'branch', None, _('show branch')),
3251 ('t', 'tags', None, _('show tags')),
3251 ('t', 'tags', None, _('show tags')),
3252 ('B', 'bookmarks', None, _('show bookmarks')),
3252 ('B', 'bookmarks', None, _('show bookmarks')),
3253 ] + remoteopts,
3253 ] + remoteopts,
3254 _('[-nibtB] [-r REV] [SOURCE]'))
3254 _('[-nibtB] [-r REV] [SOURCE]'))
3255 def identify(ui, repo, source=None, rev=None,
3255 def identify(ui, repo, source=None, rev=None,
3256 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3256 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3257 """identify the working copy or specified revision
3257 """identify the working copy or specified revision
3258
3258
3259 Print a summary identifying the repository state at REV using one or
3259 Print a summary identifying the repository state at REV using one or
3260 two parent hash identifiers, followed by a "+" if the working
3260 two parent hash identifiers, followed by a "+" if the working
3261 directory has uncommitted changes, the branch name (if not default),
3261 directory has uncommitted changes, the branch name (if not default),
3262 a list of tags, and a list of bookmarks.
3262 a list of tags, and a list of bookmarks.
3263
3263
3264 When REV is not given, print a summary of the current state of the
3264 When REV is not given, print a summary of the current state of the
3265 repository.
3265 repository.
3266
3266
3267 Specifying a path to a repository root or Mercurial bundle will
3267 Specifying a path to a repository root or Mercurial bundle will
3268 cause lookup to operate on that repository/bundle.
3268 cause lookup to operate on that repository/bundle.
3269
3269
3270 .. container:: verbose
3270 .. container:: verbose
3271
3271
3272 Examples:
3272 Examples:
3273
3273
3274 - generate a build identifier for the working directory::
3274 - generate a build identifier for the working directory::
3275
3275
3276 hg id --id > build-id.dat
3276 hg id --id > build-id.dat
3277
3277
3278 - find the revision corresponding to a tag::
3278 - find the revision corresponding to a tag::
3279
3279
3280 hg id -n -r 1.3
3280 hg id -n -r 1.3
3281
3281
3282 - check the most recent revision of a remote repository::
3282 - check the most recent revision of a remote repository::
3283
3283
3284 hg id -r tip http://selenic.com/hg/
3284 hg id -r tip http://selenic.com/hg/
3285
3285
3286 Returns 0 if successful.
3286 Returns 0 if successful.
3287 """
3287 """
3288
3288
3289 if not repo and not source:
3289 if not repo and not source:
3290 raise util.Abort(_("there is no Mercurial repository here "
3290 raise util.Abort(_("there is no Mercurial repository here "
3291 "(.hg not found)"))
3291 "(.hg not found)"))
3292
3292
3293 hexfunc = ui.debugflag and hex or short
3293 hexfunc = ui.debugflag and hex or short
3294 default = not (num or id or branch or tags or bookmarks)
3294 default = not (num or id or branch or tags or bookmarks)
3295 output = []
3295 output = []
3296 revs = []
3296 revs = []
3297
3297
3298 if source:
3298 if source:
3299 source, branches = hg.parseurl(ui.expandpath(source))
3299 source, branches = hg.parseurl(ui.expandpath(source))
3300 repo = hg.peer(ui, opts, source)
3300 repo = hg.peer(ui, opts, source)
3301 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
3301 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
3302
3302
3303 if not repo.local():
3303 if not repo.local():
3304 if num or branch or tags:
3304 if num or branch or tags:
3305 raise util.Abort(
3305 raise util.Abort(
3306 _("can't query remote revision number, branch, or tags"))
3306 _("can't query remote revision number, branch, or tags"))
3307 if not rev and revs:
3307 if not rev and revs:
3308 rev = revs[0]
3308 rev = revs[0]
3309 if not rev:
3309 if not rev:
3310 rev = "tip"
3310 rev = "tip"
3311
3311
3312 remoterev = repo.lookup(rev)
3312 remoterev = repo.lookup(rev)
3313 if default or id:
3313 if default or id:
3314 output = [hexfunc(remoterev)]
3314 output = [hexfunc(remoterev)]
3315
3315
3316 def getbms():
3316 def getbms():
3317 bms = []
3317 bms = []
3318
3318
3319 if 'bookmarks' in repo.listkeys('namespaces'):
3319 if 'bookmarks' in repo.listkeys('namespaces'):
3320 hexremoterev = hex(remoterev)
3320 hexremoterev = hex(remoterev)
3321 bms = [bm for bm, bmr in repo.listkeys('bookmarks').iteritems()
3321 bms = [bm for bm, bmr in repo.listkeys('bookmarks').iteritems()
3322 if bmr == hexremoterev]
3322 if bmr == hexremoterev]
3323
3323
3324 return bms
3324 return bms
3325
3325
3326 if bookmarks:
3326 if bookmarks:
3327 output.extend(getbms())
3327 output.extend(getbms())
3328 elif default and not ui.quiet:
3328 elif default and not ui.quiet:
3329 # multiple bookmarks for a single parent separated by '/'
3329 # multiple bookmarks for a single parent separated by '/'
3330 bm = '/'.join(getbms())
3330 bm = '/'.join(getbms())
3331 if bm:
3331 if bm:
3332 output.append(bm)
3332 output.append(bm)
3333 else:
3333 else:
3334 if not rev:
3334 if not rev:
3335 ctx = repo[None]
3335 ctx = repo[None]
3336 parents = ctx.parents()
3336 parents = ctx.parents()
3337 changed = ""
3337 changed = ""
3338 if default or id or num:
3338 if default or id or num:
3339 changed = util.any(repo.status()) and "+" or ""
3339 changed = util.any(repo.status()) and "+" or ""
3340 if default or id:
3340 if default or id:
3341 output = ["%s%s" %
3341 output = ["%s%s" %
3342 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
3342 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
3343 if num:
3343 if num:
3344 output.append("%s%s" %
3344 output.append("%s%s" %
3345 ('+'.join([str(p.rev()) for p in parents]), changed))
3345 ('+'.join([str(p.rev()) for p in parents]), changed))
3346 else:
3346 else:
3347 ctx = scmutil.revsingle(repo, rev)
3347 ctx = scmutil.revsingle(repo, rev)
3348 if default or id:
3348 if default or id:
3349 output = [hexfunc(ctx.node())]
3349 output = [hexfunc(ctx.node())]
3350 if num:
3350 if num:
3351 output.append(str(ctx.rev()))
3351 output.append(str(ctx.rev()))
3352
3352
3353 if default and not ui.quiet:
3353 if default and not ui.quiet:
3354 b = ctx.branch()
3354 b = ctx.branch()
3355 if b != 'default':
3355 if b != 'default':
3356 output.append("(%s)" % b)
3356 output.append("(%s)" % b)
3357
3357
3358 # multiple tags for a single parent separated by '/'
3358 # multiple tags for a single parent separated by '/'
3359 t = '/'.join(ctx.tags())
3359 t = '/'.join(ctx.tags())
3360 if t:
3360 if t:
3361 output.append(t)
3361 output.append(t)
3362
3362
3363 # multiple bookmarks for a single parent separated by '/'
3363 # multiple bookmarks for a single parent separated by '/'
3364 bm = '/'.join(ctx.bookmarks())
3364 bm = '/'.join(ctx.bookmarks())
3365 if bm:
3365 if bm:
3366 output.append(bm)
3366 output.append(bm)
3367 else:
3367 else:
3368 if branch:
3368 if branch:
3369 output.append(ctx.branch())
3369 output.append(ctx.branch())
3370
3370
3371 if tags:
3371 if tags:
3372 output.extend(ctx.tags())
3372 output.extend(ctx.tags())
3373
3373
3374 if bookmarks:
3374 if bookmarks:
3375 output.extend(ctx.bookmarks())
3375 output.extend(ctx.bookmarks())
3376
3376
3377 ui.write("%s\n" % ' '.join(output))
3377 ui.write("%s\n" % ' '.join(output))
3378
3378
3379 @command('import|patch',
3379 @command('import|patch',
3380 [('p', 'strip', 1,
3380 [('p', 'strip', 1,
3381 _('directory strip option for patch. This has the same '
3381 _('directory strip option for patch. This has the same '
3382 'meaning as the corresponding patch option'), _('NUM')),
3382 'meaning as the corresponding patch option'), _('NUM')),
3383 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3383 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3384 ('e', 'edit', False, _('invoke editor on commit messages')),
3384 ('e', 'edit', False, _('invoke editor on commit messages')),
3385 ('f', 'force', None, _('skip check for outstanding uncommitted changes')),
3385 ('f', 'force', None, _('skip check for outstanding uncommitted changes')),
3386 ('', 'no-commit', None,
3386 ('', 'no-commit', None,
3387 _("don't commit, just update the working directory")),
3387 _("don't commit, just update the working directory")),
3388 ('', 'bypass', None,
3388 ('', 'bypass', None,
3389 _("apply patch without touching the working directory")),
3389 _("apply patch without touching the working directory")),
3390 ('', 'exact', None,
3390 ('', 'exact', None,
3391 _('apply patch to the nodes from which it was generated')),
3391 _('apply patch to the nodes from which it was generated')),
3392 ('', 'import-branch', None,
3392 ('', 'import-branch', None,
3393 _('use any branch information in patch (implied by --exact)'))] +
3393 _('use any branch information in patch (implied by --exact)'))] +
3394 commitopts + commitopts2 + similarityopts,
3394 commitopts + commitopts2 + similarityopts,
3395 _('[OPTION]... PATCH...'))
3395 _('[OPTION]... PATCH...'))
3396 def import_(ui, repo, patch1=None, *patches, **opts):
3396 def import_(ui, repo, patch1=None, *patches, **opts):
3397 """import an ordered set of patches
3397 """import an ordered set of patches
3398
3398
3399 Import a list of patches and commit them individually (unless
3399 Import a list of patches and commit them individually (unless
3400 --no-commit is specified).
3400 --no-commit is specified).
3401
3401
3402 If there are outstanding changes in the working directory, import
3402 If there are outstanding changes in the working directory, import
3403 will abort unless given the -f/--force flag.
3403 will abort unless given the -f/--force flag.
3404
3404
3405 You can import a patch straight from a mail message. Even patches
3405 You can import a patch straight from a mail message. Even patches
3406 as attachments work (to use the body part, it must have type
3406 as attachments work (to use the body part, it must have type
3407 text/plain or text/x-patch). From and Subject headers of email
3407 text/plain or text/x-patch). From and Subject headers of email
3408 message are used as default committer and commit message. All
3408 message are used as default committer and commit message. All
3409 text/plain body parts before first diff are added to commit
3409 text/plain body parts before first diff are added to commit
3410 message.
3410 message.
3411
3411
3412 If the imported patch was generated by :hg:`export`, user and
3412 If the imported patch was generated by :hg:`export`, user and
3413 description from patch override values from message headers and
3413 description from patch override values from message headers and
3414 body. Values given on command line with -m/--message and -u/--user
3414 body. Values given on command line with -m/--message and -u/--user
3415 override these.
3415 override these.
3416
3416
3417 If --exact is specified, import will set the working directory to
3417 If --exact is specified, import will set the working directory to
3418 the parent of each patch before applying it, and will abort if the
3418 the parent of each patch before applying it, and will abort if the
3419 resulting changeset has a different ID than the one recorded in
3419 resulting changeset has a different ID than the one recorded in
3420 the patch. This may happen due to character set problems or other
3420 the patch. This may happen due to character set problems or other
3421 deficiencies in the text patch format.
3421 deficiencies in the text patch format.
3422
3422
3423 Use --bypass to apply and commit patches directly to the
3423 Use --bypass to apply and commit patches directly to the
3424 repository, not touching the working directory. Without --exact,
3424 repository, not touching the working directory. Without --exact,
3425 patches will be applied on top of the working directory parent
3425 patches will be applied on top of the working directory parent
3426 revision.
3426 revision.
3427
3427
3428 With -s/--similarity, hg will attempt to discover renames and
3428 With -s/--similarity, hg will attempt to discover renames and
3429 copies in the patch in the same way as :hg:`addremove`.
3429 copies in the patch in the same way as :hg:`addremove`.
3430
3430
3431 To read a patch from standard input, use "-" as the patch name. If
3431 To read a patch from standard input, use "-" as the patch name. If
3432 a URL is specified, the patch will be downloaded from it.
3432 a URL is specified, the patch will be downloaded from it.
3433 See :hg:`help dates` for a list of formats valid for -d/--date.
3433 See :hg:`help dates` for a list of formats valid for -d/--date.
3434
3434
3435 .. container:: verbose
3435 .. container:: verbose
3436
3436
3437 Examples:
3437 Examples:
3438
3438
3439 - import a traditional patch from a website and detect renames::
3439 - import a traditional patch from a website and detect renames::
3440
3440
3441 hg import -s 80 http://example.com/bugfix.patch
3441 hg import -s 80 http://example.com/bugfix.patch
3442
3442
3443 - import a changeset from an hgweb server::
3443 - import a changeset from an hgweb server::
3444
3444
3445 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
3445 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
3446
3446
3447 - import all the patches in an Unix-style mbox::
3447 - import all the patches in an Unix-style mbox::
3448
3448
3449 hg import incoming-patches.mbox
3449 hg import incoming-patches.mbox
3450
3450
3451 - attempt to exactly restore an exported changeset (not always
3451 - attempt to exactly restore an exported changeset (not always
3452 possible)::
3452 possible)::
3453
3453
3454 hg import --exact proposed-fix.patch
3454 hg import --exact proposed-fix.patch
3455
3455
3456 Returns 0 on success.
3456 Returns 0 on success.
3457 """
3457 """
3458
3458
3459 if not patch1:
3459 if not patch1:
3460 raise util.Abort(_('need at least one patch to import'))
3460 raise util.Abort(_('need at least one patch to import'))
3461
3461
3462 patches = (patch1,) + patches
3462 patches = (patch1,) + patches
3463
3463
3464 date = opts.get('date')
3464 date = opts.get('date')
3465 if date:
3465 if date:
3466 opts['date'] = util.parsedate(date)
3466 opts['date'] = util.parsedate(date)
3467
3467
3468 editor = cmdutil.commiteditor
3468 editor = cmdutil.commiteditor
3469 if opts.get('edit'):
3469 if opts.get('edit'):
3470 editor = cmdutil.commitforceeditor
3470 editor = cmdutil.commitforceeditor
3471
3471
3472 update = not opts.get('bypass')
3472 update = not opts.get('bypass')
3473 if not update and opts.get('no_commit'):
3473 if not update and opts.get('no_commit'):
3474 raise util.Abort(_('cannot use --no-commit with --bypass'))
3474 raise util.Abort(_('cannot use --no-commit with --bypass'))
3475 try:
3475 try:
3476 sim = float(opts.get('similarity') or 0)
3476 sim = float(opts.get('similarity') or 0)
3477 except ValueError:
3477 except ValueError:
3478 raise util.Abort(_('similarity must be a number'))
3478 raise util.Abort(_('similarity must be a number'))
3479 if sim < 0 or sim > 100:
3479 if sim < 0 or sim > 100:
3480 raise util.Abort(_('similarity must be between 0 and 100'))
3480 raise util.Abort(_('similarity must be between 0 and 100'))
3481 if sim and not update:
3481 if sim and not update:
3482 raise util.Abort(_('cannot use --similarity with --bypass'))
3482 raise util.Abort(_('cannot use --similarity with --bypass'))
3483
3483
3484 if (opts.get('exact') or not opts.get('force')) and update:
3484 if (opts.get('exact') or not opts.get('force')) and update:
3485 cmdutil.bailifchanged(repo)
3485 cmdutil.bailifchanged(repo)
3486
3486
3487 base = opts["base"]
3487 base = opts["base"]
3488 strip = opts["strip"]
3488 strip = opts["strip"]
3489 wlock = lock = tr = None
3489 wlock = lock = tr = None
3490 msgs = []
3490 msgs = []
3491
3491
3492 def checkexact(repo, n, nodeid):
3492 def checkexact(repo, n, nodeid):
3493 if opts.get('exact') and hex(n) != nodeid:
3493 if opts.get('exact') and hex(n) != nodeid:
3494 repo.rollback()
3494 repo.rollback()
3495 raise util.Abort(_('patch is damaged or loses information'))
3495 raise util.Abort(_('patch is damaged or loses information'))
3496
3496
3497 def tryone(ui, hunk, parents):
3497 def tryone(ui, hunk, parents):
3498 tmpname, message, user, date, branch, nodeid, p1, p2 = \
3498 tmpname, message, user, date, branch, nodeid, p1, p2 = \
3499 patch.extract(ui, hunk)
3499 patch.extract(ui, hunk)
3500
3500
3501 if not tmpname:
3501 if not tmpname:
3502 return (None, None)
3502 return (None, None)
3503 msg = _('applied to working directory')
3503 msg = _('applied to working directory')
3504
3504
3505 try:
3505 try:
3506 cmdline_message = cmdutil.logmessage(ui, opts)
3506 cmdline_message = cmdutil.logmessage(ui, opts)
3507 if cmdline_message:
3507 if cmdline_message:
3508 # pickup the cmdline msg
3508 # pickup the cmdline msg
3509 message = cmdline_message
3509 message = cmdline_message
3510 elif message:
3510 elif message:
3511 # pickup the patch msg
3511 # pickup the patch msg
3512 message = message.strip()
3512 message = message.strip()
3513 else:
3513 else:
3514 # launch the editor
3514 # launch the editor
3515 message = None
3515 message = None
3516 ui.debug('message:\n%s\n' % message)
3516 ui.debug('message:\n%s\n' % message)
3517
3517
3518 if len(parents) == 1:
3518 if len(parents) == 1:
3519 parents.append(repo[nullid])
3519 parents.append(repo[nullid])
3520 if opts.get('exact'):
3520 if opts.get('exact'):
3521 if not nodeid or not p1:
3521 if not nodeid or not p1:
3522 raise util.Abort(_('not a Mercurial patch'))
3522 raise util.Abort(_('not a Mercurial patch'))
3523 p1 = repo[p1]
3523 p1 = repo[p1]
3524 p2 = repo[p2 or nullid]
3524 p2 = repo[p2 or nullid]
3525 elif p2:
3525 elif p2:
3526 try:
3526 try:
3527 p1 = repo[p1]
3527 p1 = repo[p1]
3528 p2 = repo[p2]
3528 p2 = repo[p2]
3529 # Without any options, consider p2 only if the
3529 # Without any options, consider p2 only if the
3530 # patch is being applied on top of the recorded
3530 # patch is being applied on top of the recorded
3531 # first parent.
3531 # first parent.
3532 if p1 != parents[0]:
3532 if p1 != parents[0]:
3533 p1 = parents[0]
3533 p1 = parents[0]
3534 p2 = repo[nullid]
3534 p2 = repo[nullid]
3535 except error.RepoError:
3535 except error.RepoError:
3536 p1, p2 = parents
3536 p1, p2 = parents
3537 else:
3537 else:
3538 p1, p2 = parents
3538 p1, p2 = parents
3539
3539
3540 n = None
3540 n = None
3541 if update:
3541 if update:
3542 if p1 != parents[0]:
3542 if p1 != parents[0]:
3543 hg.clean(repo, p1.node())
3543 hg.clean(repo, p1.node())
3544 if p2 != parents[1]:
3544 if p2 != parents[1]:
3545 repo.dirstate.setparents(p1.node(), p2.node())
3545 repo.dirstate.setparents(p1.node(), p2.node())
3546
3546
3547 if opts.get('exact') or opts.get('import_branch'):
3547 if opts.get('exact') or opts.get('import_branch'):
3548 repo.dirstate.setbranch(branch or 'default')
3548 repo.dirstate.setbranch(branch or 'default')
3549
3549
3550 files = set()
3550 files = set()
3551 patch.patch(ui, repo, tmpname, strip=strip, files=files,
3551 patch.patch(ui, repo, tmpname, strip=strip, files=files,
3552 eolmode=None, similarity=sim / 100.0)
3552 eolmode=None, similarity=sim / 100.0)
3553 files = list(files)
3553 files = list(files)
3554 if opts.get('no_commit'):
3554 if opts.get('no_commit'):
3555 if message:
3555 if message:
3556 msgs.append(message)
3556 msgs.append(message)
3557 else:
3557 else:
3558 if opts.get('exact') or p2:
3558 if opts.get('exact') or p2:
3559 # If you got here, you either use --force and know what
3559 # If you got here, you either use --force and know what
3560 # you are doing or used --exact or a merge patch while
3560 # you are doing or used --exact or a merge patch while
3561 # being updated to its first parent.
3561 # being updated to its first parent.
3562 m = None
3562 m = None
3563 else:
3563 else:
3564 m = scmutil.matchfiles(repo, files or [])
3564 m = scmutil.matchfiles(repo, files or [])
3565 n = repo.commit(message, opts.get('user') or user,
3565 n = repo.commit(message, opts.get('user') or user,
3566 opts.get('date') or date, match=m,
3566 opts.get('date') or date, match=m,
3567 editor=editor)
3567 editor=editor)
3568 checkexact(repo, n, nodeid)
3568 checkexact(repo, n, nodeid)
3569 else:
3569 else:
3570 if opts.get('exact') or opts.get('import_branch'):
3570 if opts.get('exact') or opts.get('import_branch'):
3571 branch = branch or 'default'
3571 branch = branch or 'default'
3572 else:
3572 else:
3573 branch = p1.branch()
3573 branch = p1.branch()
3574 store = patch.filestore()
3574 store = patch.filestore()
3575 try:
3575 try:
3576 files = set()
3576 files = set()
3577 try:
3577 try:
3578 patch.patchrepo(ui, repo, p1, store, tmpname, strip,
3578 patch.patchrepo(ui, repo, p1, store, tmpname, strip,
3579 files, eolmode=None)
3579 files, eolmode=None)
3580 except patch.PatchError, e:
3580 except patch.PatchError, e:
3581 raise util.Abort(str(e))
3581 raise util.Abort(str(e))
3582 memctx = patch.makememctx(repo, (p1.node(), p2.node()),
3582 memctx = patch.makememctx(repo, (p1.node(), p2.node()),
3583 message,
3583 message,
3584 opts.get('user') or user,
3584 opts.get('user') or user,
3585 opts.get('date') or date,
3585 opts.get('date') or date,
3586 branch, files, store,
3586 branch, files, store,
3587 editor=cmdutil.commiteditor)
3587 editor=cmdutil.commiteditor)
3588 repo.savecommitmessage(memctx.description())
3588 repo.savecommitmessage(memctx.description())
3589 n = memctx.commit()
3589 n = memctx.commit()
3590 checkexact(repo, n, nodeid)
3590 checkexact(repo, n, nodeid)
3591 finally:
3591 finally:
3592 store.close()
3592 store.close()
3593 if n:
3593 if n:
3594 # i18n: refers to a short changeset id
3594 # i18n: refers to a short changeset id
3595 msg = _('created %s') % short(n)
3595 msg = _('created %s') % short(n)
3596 return (msg, n)
3596 return (msg, n)
3597 finally:
3597 finally:
3598 os.unlink(tmpname)
3598 os.unlink(tmpname)
3599
3599
3600 try:
3600 try:
3601 try:
3601 try:
3602 wlock = repo.wlock()
3602 wlock = repo.wlock()
3603 lock = repo.lock()
3603 lock = repo.lock()
3604 tr = repo.transaction('import')
3604 tr = repo.transaction('import')
3605 parents = repo.parents()
3605 parents = repo.parents()
3606 for patchurl in patches:
3606 for patchurl in patches:
3607 if patchurl == '-':
3607 if patchurl == '-':
3608 ui.status(_('applying patch from stdin\n'))
3608 ui.status(_('applying patch from stdin\n'))
3609 patchfile = ui.fin
3609 patchfile = ui.fin
3610 patchurl = 'stdin' # for error message
3610 patchurl = 'stdin' # for error message
3611 else:
3611 else:
3612 patchurl = os.path.join(base, patchurl)
3612 patchurl = os.path.join(base, patchurl)
3613 ui.status(_('applying %s\n') % patchurl)
3613 ui.status(_('applying %s\n') % patchurl)
3614 patchfile = url.open(ui, patchurl)
3614 patchfile = url.open(ui, patchurl)
3615
3615
3616 haspatch = False
3616 haspatch = False
3617 for hunk in patch.split(patchfile):
3617 for hunk in patch.split(patchfile):
3618 (msg, node) = tryone(ui, hunk, parents)
3618 (msg, node) = tryone(ui, hunk, parents)
3619 if msg:
3619 if msg:
3620 haspatch = True
3620 haspatch = True
3621 ui.note(msg + '\n')
3621 ui.note(msg + '\n')
3622 if update or opts.get('exact'):
3622 if update or opts.get('exact'):
3623 parents = repo.parents()
3623 parents = repo.parents()
3624 else:
3624 else:
3625 parents = [repo[node]]
3625 parents = [repo[node]]
3626
3626
3627 if not haspatch:
3627 if not haspatch:
3628 raise util.Abort(_('%s: no diffs found') % patchurl)
3628 raise util.Abort(_('%s: no diffs found') % patchurl)
3629
3629
3630 tr.close()
3630 tr.close()
3631 if msgs:
3631 if msgs:
3632 repo.savecommitmessage('\n* * *\n'.join(msgs))
3632 repo.savecommitmessage('\n* * *\n'.join(msgs))
3633 except:
3633 except:
3634 # wlock.release() indirectly calls dirstate.write(): since
3634 # wlock.release() indirectly calls dirstate.write(): since
3635 # we're crashing, we do not want to change the working dir
3635 # we're crashing, we do not want to change the working dir
3636 # parent after all, so make sure it writes nothing
3636 # parent after all, so make sure it writes nothing
3637 repo.dirstate.invalidate()
3637 repo.dirstate.invalidate()
3638 raise
3638 raise
3639 finally:
3639 finally:
3640 if tr:
3640 if tr:
3641 tr.release()
3641 tr.release()
3642 release(lock, wlock)
3642 release(lock, wlock)
3643
3643
3644 @command('incoming|in',
3644 @command('incoming|in',
3645 [('f', 'force', None,
3645 [('f', 'force', None,
3646 _('run even if remote repository is unrelated')),
3646 _('run even if remote repository is unrelated')),
3647 ('n', 'newest-first', None, _('show newest record first')),
3647 ('n', 'newest-first', None, _('show newest record first')),
3648 ('', 'bundle', '',
3648 ('', 'bundle', '',
3649 _('file to store the bundles into'), _('FILE')),
3649 _('file to store the bundles into'), _('FILE')),
3650 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3650 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3651 ('B', 'bookmarks', False, _("compare bookmarks")),
3651 ('B', 'bookmarks', False, _("compare bookmarks")),
3652 ('b', 'branch', [],
3652 ('b', 'branch', [],
3653 _('a specific branch you would like to pull'), _('BRANCH')),
3653 _('a specific branch you would like to pull'), _('BRANCH')),
3654 ] + logopts + remoteopts + subrepoopts,
3654 ] + logopts + remoteopts + subrepoopts,
3655 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3655 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3656 def incoming(ui, repo, source="default", **opts):
3656 def incoming(ui, repo, source="default", **opts):
3657 """show new changesets found in source
3657 """show new changesets found in source
3658
3658
3659 Show new changesets found in the specified path/URL or the default
3659 Show new changesets found in the specified path/URL or the default
3660 pull location. These are the changesets that would have been pulled
3660 pull location. These are the changesets that would have been pulled
3661 if a pull at the time you issued this command.
3661 if a pull at the time you issued this command.
3662
3662
3663 For remote repository, using --bundle avoids downloading the
3663 For remote repository, using --bundle avoids downloading the
3664 changesets twice if the incoming is followed by a pull.
3664 changesets twice if the incoming is followed by a pull.
3665
3665
3666 See pull for valid source format details.
3666 See pull for valid source format details.
3667
3667
3668 Returns 0 if there are incoming changes, 1 otherwise.
3668 Returns 0 if there are incoming changes, 1 otherwise.
3669 """
3669 """
3670 if opts.get('bundle') and opts.get('subrepos'):
3670 if opts.get('bundle') and opts.get('subrepos'):
3671 raise util.Abort(_('cannot combine --bundle and --subrepos'))
3671 raise util.Abort(_('cannot combine --bundle and --subrepos'))
3672
3672
3673 if opts.get('bookmarks'):
3673 if opts.get('bookmarks'):
3674 source, branches = hg.parseurl(ui.expandpath(source),
3674 source, branches = hg.parseurl(ui.expandpath(source),
3675 opts.get('branch'))
3675 opts.get('branch'))
3676 other = hg.peer(repo, opts, source)
3676 other = hg.peer(repo, opts, source)
3677 if 'bookmarks' not in other.listkeys('namespaces'):
3677 if 'bookmarks' not in other.listkeys('namespaces'):
3678 ui.warn(_("remote doesn't support bookmarks\n"))
3678 ui.warn(_("remote doesn't support bookmarks\n"))
3679 return 0
3679 return 0
3680 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3680 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3681 return bookmarks.diff(ui, repo, other)
3681 return bookmarks.diff(ui, repo, other)
3682
3682
3683 repo._subtoppath = ui.expandpath(source)
3683 repo._subtoppath = ui.expandpath(source)
3684 try:
3684 try:
3685 return hg.incoming(ui, repo, source, opts)
3685 return hg.incoming(ui, repo, source, opts)
3686 finally:
3686 finally:
3687 del repo._subtoppath
3687 del repo._subtoppath
3688
3688
3689
3689
3690 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'))
3690 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'))
3691 def init(ui, dest=".", **opts):
3691 def init(ui, dest=".", **opts):
3692 """create a new repository in the given directory
3692 """create a new repository in the given directory
3693
3693
3694 Initialize a new repository in the given directory. If the given
3694 Initialize a new repository in the given directory. If the given
3695 directory does not exist, it will be created.
3695 directory does not exist, it will be created.
3696
3696
3697 If no directory is given, the current directory is used.
3697 If no directory is given, the current directory is used.
3698
3698
3699 It is possible to specify an ``ssh://`` URL as the destination.
3699 It is possible to specify an ``ssh://`` URL as the destination.
3700 See :hg:`help urls` for more information.
3700 See :hg:`help urls` for more information.
3701
3701
3702 Returns 0 on success.
3702 Returns 0 on success.
3703 """
3703 """
3704 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3704 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3705
3705
3706 @command('locate',
3706 @command('locate',
3707 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3707 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3708 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3708 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3709 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3709 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3710 ] + walkopts,
3710 ] + walkopts,
3711 _('[OPTION]... [PATTERN]...'))
3711 _('[OPTION]... [PATTERN]...'))
3712 def locate(ui, repo, *pats, **opts):
3712 def locate(ui, repo, *pats, **opts):
3713 """locate files matching specific patterns
3713 """locate files matching specific patterns
3714
3714
3715 Print files under Mercurial control in the working directory whose
3715 Print files under Mercurial control in the working directory whose
3716 names match the given patterns.
3716 names match the given patterns.
3717
3717
3718 By default, this command searches all directories in the working
3718 By default, this command searches all directories in the working
3719 directory. To search just the current directory and its
3719 directory. To search just the current directory and its
3720 subdirectories, use "--include .".
3720 subdirectories, use "--include .".
3721
3721
3722 If no patterns are given to match, this command prints the names
3722 If no patterns are given to match, this command prints the names
3723 of all files under Mercurial control in the working directory.
3723 of all files under Mercurial control in the working directory.
3724
3724
3725 If you want to feed the output of this command into the "xargs"
3725 If you want to feed the output of this command into the "xargs"
3726 command, use the -0 option to both this command and "xargs". This
3726 command, use the -0 option to both this command and "xargs". This
3727 will avoid the problem of "xargs" treating single filenames that
3727 will avoid the problem of "xargs" treating single filenames that
3728 contain whitespace as multiple filenames.
3728 contain whitespace as multiple filenames.
3729
3729
3730 Returns 0 if a match is found, 1 otherwise.
3730 Returns 0 if a match is found, 1 otherwise.
3731 """
3731 """
3732 end = opts.get('print0') and '\0' or '\n'
3732 end = opts.get('print0') and '\0' or '\n'
3733 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3733 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3734
3734
3735 ret = 1
3735 ret = 1
3736 m = scmutil.match(repo[rev], pats, opts, default='relglob')
3736 m = scmutil.match(repo[rev], pats, opts, default='relglob')
3737 m.bad = lambda x, y: False
3737 m.bad = lambda x, y: False
3738 for abs in repo[rev].walk(m):
3738 for abs in repo[rev].walk(m):
3739 if not rev and abs not in repo.dirstate:
3739 if not rev and abs not in repo.dirstate:
3740 continue
3740 continue
3741 if opts.get('fullpath'):
3741 if opts.get('fullpath'):
3742 ui.write(repo.wjoin(abs), end)
3742 ui.write(repo.wjoin(abs), end)
3743 else:
3743 else:
3744 ui.write(((pats and m.rel(abs)) or abs), end)
3744 ui.write(((pats and m.rel(abs)) or abs), end)
3745 ret = 0
3745 ret = 0
3746
3746
3747 return ret
3747 return ret
3748
3748
3749 @command('^log|history',
3749 @command('^log|history',
3750 [('f', 'follow', None,
3750 [('f', 'follow', None,
3751 _('follow changeset history, or file history across copies and renames')),
3751 _('follow changeset history, or file history across copies and renames')),
3752 ('', 'follow-first', None,
3752 ('', 'follow-first', None,
3753 _('only follow the first parent of merge changesets (DEPRECATED)')),
3753 _('only follow the first parent of merge changesets (DEPRECATED)')),
3754 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3754 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3755 ('C', 'copies', None, _('show copied files')),
3755 ('C', 'copies', None, _('show copied files')),
3756 ('k', 'keyword', [],
3756 ('k', 'keyword', [],
3757 _('do case-insensitive search for a given text'), _('TEXT')),
3757 _('do case-insensitive search for a given text'), _('TEXT')),
3758 ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
3758 ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
3759 ('', 'removed', None, _('include revisions where files were removed')),
3759 ('', 'removed', None, _('include revisions where files were removed')),
3760 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3760 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3761 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3761 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3762 ('', 'only-branch', [],
3762 ('', 'only-branch', [],
3763 _('show only changesets within the given named branch (DEPRECATED)'),
3763 _('show only changesets within the given named branch (DEPRECATED)'),
3764 _('BRANCH')),
3764 _('BRANCH')),
3765 ('b', 'branch', [],
3765 ('b', 'branch', [],
3766 _('show changesets within the given named branch'), _('BRANCH')),
3766 _('show changesets within the given named branch'), _('BRANCH')),
3767 ('P', 'prune', [],
3767 ('P', 'prune', [],
3768 _('do not display revision or any of its ancestors'), _('REV')),
3768 _('do not display revision or any of its ancestors'), _('REV')),
3769 ('', 'hidden', False, _('show hidden changesets (DEPRECATED)')),
3769 ('', 'hidden', False, _('show hidden changesets (DEPRECATED)')),
3770 ] + logopts + walkopts,
3770 ] + logopts + walkopts,
3771 _('[OPTION]... [FILE]'))
3771 _('[OPTION]... [FILE]'))
3772 def log(ui, repo, *pats, **opts):
3772 def log(ui, repo, *pats, **opts):
3773 """show revision history of entire repository or files
3773 """show revision history of entire repository or files
3774
3774
3775 Print the revision history of the specified files or the entire
3775 Print the revision history of the specified files or the entire
3776 project.
3776 project.
3777
3777
3778 If no revision range is specified, the default is ``tip:0`` unless
3778 If no revision range is specified, the default is ``tip:0`` unless
3779 --follow is set, in which case the working directory parent is
3779 --follow is set, in which case the working directory parent is
3780 used as the starting revision.
3780 used as the starting revision.
3781
3781
3782 File history is shown without following rename or copy history of
3782 File history is shown without following rename or copy history of
3783 files. Use -f/--follow with a filename to follow history across
3783 files. Use -f/--follow with a filename to follow history across
3784 renames and copies. --follow without a filename will only show
3784 renames and copies. --follow without a filename will only show
3785 ancestors or descendants of the starting revision.
3785 ancestors or descendants of the starting revision.
3786
3786
3787 By default this command prints revision number and changeset id,
3787 By default this command prints revision number and changeset id,
3788 tags, non-trivial parents, user, date and time, and a summary for
3788 tags, non-trivial parents, user, date and time, and a summary for
3789 each commit. When the -v/--verbose switch is used, the list of
3789 each commit. When the -v/--verbose switch is used, the list of
3790 changed files and full commit message are shown.
3790 changed files and full commit message are shown.
3791
3791
3792 .. note::
3792 .. note::
3793 log -p/--patch may generate unexpected diff output for merge
3793 log -p/--patch may generate unexpected diff output for merge
3794 changesets, as it will only compare the merge changeset against
3794 changesets, as it will only compare the merge changeset against
3795 its first parent. Also, only files different from BOTH parents
3795 its first parent. Also, only files different from BOTH parents
3796 will appear in files:.
3796 will appear in files:.
3797
3797
3798 .. note::
3798 .. note::
3799 for performance reasons, log FILE may omit duplicate changes
3799 for performance reasons, log FILE may omit duplicate changes
3800 made on branches and will not show deletions. To see all
3800 made on branches and will not show deletions. To see all
3801 changes including duplicates and deletions, use the --removed
3801 changes including duplicates and deletions, use the --removed
3802 switch.
3802 switch.
3803
3803
3804 .. container:: verbose
3804 .. container:: verbose
3805
3805
3806 Some examples:
3806 Some examples:
3807
3807
3808 - changesets with full descriptions and file lists::
3808 - changesets with full descriptions and file lists::
3809
3809
3810 hg log -v
3810 hg log -v
3811
3811
3812 - changesets ancestral to the working directory::
3812 - changesets ancestral to the working directory::
3813
3813
3814 hg log -f
3814 hg log -f
3815
3815
3816 - last 10 commits on the current branch::
3816 - last 10 commits on the current branch::
3817
3817
3818 hg log -l 10 -b .
3818 hg log -l 10 -b .
3819
3819
3820 - changesets showing all modifications of a file, including removals::
3820 - changesets showing all modifications of a file, including removals::
3821
3821
3822 hg log --removed file.c
3822 hg log --removed file.c
3823
3823
3824 - all changesets that touch a directory, with diffs, excluding merges::
3824 - all changesets that touch a directory, with diffs, excluding merges::
3825
3825
3826 hg log -Mp lib/
3826 hg log -Mp lib/
3827
3827
3828 - all revision numbers that match a keyword::
3828 - all revision numbers that match a keyword::
3829
3829
3830 hg log -k bug --template "{rev}\\n"
3830 hg log -k bug --template "{rev}\\n"
3831
3831
3832 - check if a given changeset is included is a tagged release::
3832 - check if a given changeset is included is a tagged release::
3833
3833
3834 hg log -r "a21ccf and ancestor(1.9)"
3834 hg log -r "a21ccf and ancestor(1.9)"
3835
3835
3836 - find all changesets by some user in a date range::
3836 - find all changesets by some user in a date range::
3837
3837
3838 hg log -k alice -d "may 2008 to jul 2008"
3838 hg log -k alice -d "may 2008 to jul 2008"
3839
3839
3840 - summary of all changesets after the last tag::
3840 - summary of all changesets after the last tag::
3841
3841
3842 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3842 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3843
3843
3844 See :hg:`help dates` for a list of formats valid for -d/--date.
3844 See :hg:`help dates` for a list of formats valid for -d/--date.
3845
3845
3846 See :hg:`help revisions` and :hg:`help revsets` for more about
3846 See :hg:`help revisions` and :hg:`help revsets` for more about
3847 specifying revisions.
3847 specifying revisions.
3848
3848
3849 Returns 0 on success.
3849 Returns 0 on success.
3850 """
3850 """
3851
3851
3852 matchfn = scmutil.match(repo[None], pats, opts)
3852 matchfn = scmutil.match(repo[None], pats, opts)
3853 limit = cmdutil.loglimit(opts)
3853 limit = cmdutil.loglimit(opts)
3854 count = 0
3854 count = 0
3855
3855
3856 endrev = None
3856 endrev = None
3857 if opts.get('copies') and opts.get('rev'):
3857 if opts.get('copies') and opts.get('rev'):
3858 endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
3858 endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
3859
3859
3860 df = False
3860 df = False
3861 if opts["date"]:
3861 if opts["date"]:
3862 df = util.matchdate(opts["date"])
3862 df = util.matchdate(opts["date"])
3863
3863
3864 branches = opts.get('branch', []) + opts.get('only_branch', [])
3864 branches = opts.get('branch', []) + opts.get('only_branch', [])
3865 opts['branch'] = [repo.lookupbranch(b) for b in branches]
3865 opts['branch'] = [repo.lookupbranch(b) for b in branches]
3866
3866
3867 displayer = cmdutil.show_changeset(ui, repo, opts, True)
3867 displayer = cmdutil.show_changeset(ui, repo, opts, True)
3868 def prep(ctx, fns):
3868 def prep(ctx, fns):
3869 rev = ctx.rev()
3869 rev = ctx.rev()
3870 parents = [p for p in repo.changelog.parentrevs(rev)
3870 parents = [p for p in repo.changelog.parentrevs(rev)
3871 if p != nullrev]
3871 if p != nullrev]
3872 if opts.get('no_merges') and len(parents) == 2:
3872 if opts.get('no_merges') and len(parents) == 2:
3873 return
3873 return
3874 if opts.get('only_merges') and len(parents) != 2:
3874 if opts.get('only_merges') and len(parents) != 2:
3875 return
3875 return
3876 if opts.get('branch') and ctx.branch() not in opts['branch']:
3876 if opts.get('branch') and ctx.branch() not in opts['branch']:
3877 return
3877 return
3878 if not opts.get('hidden') and ctx.hidden():
3878 if not opts.get('hidden') and ctx.hidden():
3879 return
3879 return
3880 if df and not df(ctx.date()[0]):
3880 if df and not df(ctx.date()[0]):
3881 return
3881 return
3882
3882
3883 lower = encoding.lower
3883 lower = encoding.lower
3884 if opts.get('user'):
3884 if opts.get('user'):
3885 luser = lower(ctx.user())
3885 luser = lower(ctx.user())
3886 for k in [lower(x) for x in opts['user']]:
3886 for k in [lower(x) for x in opts['user']]:
3887 if (k in luser):
3887 if (k in luser):
3888 break
3888 break
3889 else:
3889 else:
3890 return
3890 return
3891 if opts.get('keyword'):
3891 if opts.get('keyword'):
3892 luser = lower(ctx.user())
3892 luser = lower(ctx.user())
3893 ldesc = lower(ctx.description())
3893 ldesc = lower(ctx.description())
3894 lfiles = lower(" ".join(ctx.files()))
3894 lfiles = lower(" ".join(ctx.files()))
3895 for k in [lower(x) for x in opts['keyword']]:
3895 for k in [lower(x) for x in opts['keyword']]:
3896 if (k in luser or k in ldesc or k in lfiles):
3896 if (k in luser or k in ldesc or k in lfiles):
3897 break
3897 break
3898 else:
3898 else:
3899 return
3899 return
3900
3900
3901 copies = None
3901 copies = None
3902 if opts.get('copies') and rev:
3902 if opts.get('copies') and rev:
3903 copies = []
3903 copies = []
3904 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3904 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3905 for fn in ctx.files():
3905 for fn in ctx.files():
3906 rename = getrenamed(fn, rev)
3906 rename = getrenamed(fn, rev)
3907 if rename:
3907 if rename:
3908 copies.append((fn, rename[0]))
3908 copies.append((fn, rename[0]))
3909
3909
3910 revmatchfn = None
3910 revmatchfn = None
3911 if opts.get('patch') or opts.get('stat'):
3911 if opts.get('patch') or opts.get('stat'):
3912 if opts.get('follow') or opts.get('follow_first'):
3912 if opts.get('follow') or opts.get('follow_first'):
3913 # note: this might be wrong when following through merges
3913 # note: this might be wrong when following through merges
3914 revmatchfn = scmutil.match(repo[None], fns, default='path')
3914 revmatchfn = scmutil.match(repo[None], fns, default='path')
3915 else:
3915 else:
3916 revmatchfn = matchfn
3916 revmatchfn = matchfn
3917
3917
3918 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3918 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3919
3919
3920 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3920 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3921 if count == limit:
3921 if count == limit:
3922 break
3922 break
3923 if displayer.flush(ctx.rev()):
3923 if displayer.flush(ctx.rev()):
3924 count += 1
3924 count += 1
3925 displayer.close()
3925 displayer.close()
3926
3926
3927 @command('manifest',
3927 @command('manifest',
3928 [('r', 'rev', '', _('revision to display'), _('REV')),
3928 [('r', 'rev', '', _('revision to display'), _('REV')),
3929 ('', 'all', False, _("list files from all revisions"))],
3929 ('', 'all', False, _("list files from all revisions"))],
3930 _('[-r REV]'))
3930 _('[-r REV]'))
3931 def manifest(ui, repo, node=None, rev=None, **opts):
3931 def manifest(ui, repo, node=None, rev=None, **opts):
3932 """output the current or given revision of the project manifest
3932 """output the current or given revision of the project manifest
3933
3933
3934 Print a list of version controlled files for the given revision.
3934 Print a list of version controlled files for the given revision.
3935 If no revision is given, the first parent of the working directory
3935 If no revision is given, the first parent of the working directory
3936 is used, or the null revision if no revision is checked out.
3936 is used, or the null revision if no revision is checked out.
3937
3937
3938 With -v, print file permissions, symlink and executable bits.
3938 With -v, print file permissions, symlink and executable bits.
3939 With --debug, print file revision hashes.
3939 With --debug, print file revision hashes.
3940
3940
3941 If option --all is specified, the list of all files from all revisions
3941 If option --all is specified, the list of all files from all revisions
3942 is printed. This includes deleted and renamed files.
3942 is printed. This includes deleted and renamed files.
3943
3943
3944 Returns 0 on success.
3944 Returns 0 on success.
3945 """
3945 """
3946 if opts.get('all'):
3946 if opts.get('all'):
3947 if rev or node:
3947 if rev or node:
3948 raise util.Abort(_("can't specify a revision with --all"))
3948 raise util.Abort(_("can't specify a revision with --all"))
3949
3949
3950 res = []
3950 res = []
3951 prefix = "data/"
3951 prefix = "data/"
3952 suffix = ".i"
3952 suffix = ".i"
3953 plen = len(prefix)
3953 plen = len(prefix)
3954 slen = len(suffix)
3954 slen = len(suffix)
3955 lock = repo.lock()
3955 lock = repo.lock()
3956 try:
3956 try:
3957 for fn, b, size in repo.store.datafiles():
3957 for fn, b, size in repo.store.datafiles():
3958 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3958 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3959 res.append(fn[plen:-slen])
3959 res.append(fn[plen:-slen])
3960 finally:
3960 finally:
3961 lock.release()
3961 lock.release()
3962 for f in sorted(res):
3962 for f in sorted(res):
3963 ui.write("%s\n" % f)
3963 ui.write("%s\n" % f)
3964 return
3964 return
3965
3965
3966 if rev and node:
3966 if rev and node:
3967 raise util.Abort(_("please specify just one revision"))
3967 raise util.Abort(_("please specify just one revision"))
3968
3968
3969 if not node:
3969 if not node:
3970 node = rev
3970 node = rev
3971
3971
3972 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
3972 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
3973 ctx = scmutil.revsingle(repo, node)
3973 ctx = scmutil.revsingle(repo, node)
3974 for f in ctx:
3974 for f in ctx:
3975 if ui.debugflag:
3975 if ui.debugflag:
3976 ui.write("%40s " % hex(ctx.manifest()[f]))
3976 ui.write("%40s " % hex(ctx.manifest()[f]))
3977 if ui.verbose:
3977 if ui.verbose:
3978 ui.write(decor[ctx.flags(f)])
3978 ui.write(decor[ctx.flags(f)])
3979 ui.write("%s\n" % f)
3979 ui.write("%s\n" % f)
3980
3980
3981 @command('^merge',
3981 @command('^merge',
3982 [('f', 'force', None, _('force a merge with outstanding changes')),
3982 [('f', 'force', None, _('force a merge with outstanding changes')),
3983 ('r', 'rev', '', _('revision to merge'), _('REV')),
3983 ('r', 'rev', '', _('revision to merge'), _('REV')),
3984 ('P', 'preview', None,
3984 ('P', 'preview', None,
3985 _('review revisions to merge (no merge is performed)'))
3985 _('review revisions to merge (no merge is performed)'))
3986 ] + mergetoolopts,
3986 ] + mergetoolopts,
3987 _('[-P] [-f] [[-r] REV]'))
3987 _('[-P] [-f] [[-r] REV]'))
3988 def merge(ui, repo, node=None, **opts):
3988 def merge(ui, repo, node=None, **opts):
3989 """merge working directory with another revision
3989 """merge working directory with another revision
3990
3990
3991 The current working directory is updated with all changes made in
3991 The current working directory is updated with all changes made in
3992 the requested revision since the last common predecessor revision.
3992 the requested revision since the last common predecessor revision.
3993
3993
3994 Files that changed between either parent are marked as changed for
3994 Files that changed between either parent are marked as changed for
3995 the next commit and a commit must be performed before any further
3995 the next commit and a commit must be performed before any further
3996 updates to the repository are allowed. The next commit will have
3996 updates to the repository are allowed. The next commit will have
3997 two parents.
3997 two parents.
3998
3998
3999 ``--tool`` can be used to specify the merge tool used for file
3999 ``--tool`` can be used to specify the merge tool used for file
4000 merges. It overrides the HGMERGE environment variable and your
4000 merges. It overrides the HGMERGE environment variable and your
4001 configuration files. See :hg:`help merge-tools` for options.
4001 configuration files. See :hg:`help merge-tools` for options.
4002
4002
4003 If no revision is specified, the working directory's parent is a
4003 If no revision is specified, the working directory's parent is a
4004 head revision, and the current branch contains exactly one other
4004 head revision, and the current branch contains exactly one other
4005 head, the other head is merged with by default. Otherwise, an
4005 head, the other head is merged with by default. Otherwise, an
4006 explicit revision with which to merge with must be provided.
4006 explicit revision with which to merge with must be provided.
4007
4007
4008 :hg:`resolve` must be used to resolve unresolved files.
4008 :hg:`resolve` must be used to resolve unresolved files.
4009
4009
4010 To undo an uncommitted merge, use :hg:`update --clean .` which
4010 To undo an uncommitted merge, use :hg:`update --clean .` which
4011 will check out a clean copy of the original merge parent, losing
4011 will check out a clean copy of the original merge parent, losing
4012 all changes.
4012 all changes.
4013
4013
4014 Returns 0 on success, 1 if there are unresolved files.
4014 Returns 0 on success, 1 if there are unresolved files.
4015 """
4015 """
4016
4016
4017 if opts.get('rev') and node:
4017 if opts.get('rev') and node:
4018 raise util.Abort(_("please specify just one revision"))
4018 raise util.Abort(_("please specify just one revision"))
4019 if not node:
4019 if not node:
4020 node = opts.get('rev')
4020 node = opts.get('rev')
4021
4021
4022 if not node:
4022 if not node:
4023 branch = repo[None].branch()
4023 branch = repo[None].branch()
4024 bheads = repo.branchheads(branch)
4024 bheads = repo.branchheads(branch)
4025 if len(bheads) > 2:
4025 if len(bheads) > 2:
4026 raise util.Abort(_("branch '%s' has %d heads - "
4026 raise util.Abort(_("branch '%s' has %d heads - "
4027 "please merge with an explicit rev")
4027 "please merge with an explicit rev")
4028 % (branch, len(bheads)),
4028 % (branch, len(bheads)),
4029 hint=_("run 'hg heads .' to see heads"))
4029 hint=_("run 'hg heads .' to see heads"))
4030
4030
4031 parent = repo.dirstate.p1()
4031 parent = repo.dirstate.p1()
4032 if len(bheads) == 1:
4032 if len(bheads) == 1:
4033 if len(repo.heads()) > 1:
4033 if len(repo.heads()) > 1:
4034 raise util.Abort(_("branch '%s' has one head - "
4034 raise util.Abort(_("branch '%s' has one head - "
4035 "please merge with an explicit rev")
4035 "please merge with an explicit rev")
4036 % branch,
4036 % branch,
4037 hint=_("run 'hg heads' to see all heads"))
4037 hint=_("run 'hg heads' to see all heads"))
4038 msg, hint = _('nothing to merge'), None
4038 msg, hint = _('nothing to merge'), None
4039 if parent != repo.lookup(branch):
4039 if parent != repo.lookup(branch):
4040 hint = _("use 'hg update' instead")
4040 hint = _("use 'hg update' instead")
4041 raise util.Abort(msg, hint=hint)
4041 raise util.Abort(msg, hint=hint)
4042
4042
4043 if parent not in bheads:
4043 if parent not in bheads:
4044 raise util.Abort(_('working directory not at a head revision'),
4044 raise util.Abort(_('working directory not at a head revision'),
4045 hint=_("use 'hg update' or merge with an "
4045 hint=_("use 'hg update' or merge with an "
4046 "explicit revision"))
4046 "explicit revision"))
4047 node = parent == bheads[0] and bheads[-1] or bheads[0]
4047 node = parent == bheads[0] and bheads[-1] or bheads[0]
4048 else:
4048 else:
4049 node = scmutil.revsingle(repo, node).node()
4049 node = scmutil.revsingle(repo, node).node()
4050
4050
4051 if opts.get('preview'):
4051 if opts.get('preview'):
4052 # find nodes that are ancestors of p2 but not of p1
4052 # find nodes that are ancestors of p2 but not of p1
4053 p1 = repo.lookup('.')
4053 p1 = repo.lookup('.')
4054 p2 = repo.lookup(node)
4054 p2 = repo.lookup(node)
4055 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4055 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4056
4056
4057 displayer = cmdutil.show_changeset(ui, repo, opts)
4057 displayer = cmdutil.show_changeset(ui, repo, opts)
4058 for node in nodes:
4058 for node in nodes:
4059 displayer.show(repo[node])
4059 displayer.show(repo[node])
4060 displayer.close()
4060 displayer.close()
4061 return 0
4061 return 0
4062
4062
4063 try:
4063 try:
4064 # ui.forcemerge is an internal variable, do not document
4064 # ui.forcemerge is an internal variable, do not document
4065 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4065 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4066 return hg.merge(repo, node, force=opts.get('force'))
4066 return hg.merge(repo, node, force=opts.get('force'))
4067 finally:
4067 finally:
4068 ui.setconfig('ui', 'forcemerge', '')
4068 ui.setconfig('ui', 'forcemerge', '')
4069
4069
4070 @command('outgoing|out',
4070 @command('outgoing|out',
4071 [('f', 'force', None, _('run even when the destination is unrelated')),
4071 [('f', 'force', None, _('run even when the destination is unrelated')),
4072 ('r', 'rev', [],
4072 ('r', 'rev', [],
4073 _('a changeset intended to be included in the destination'), _('REV')),
4073 _('a changeset intended to be included in the destination'), _('REV')),
4074 ('n', 'newest-first', None, _('show newest record first')),
4074 ('n', 'newest-first', None, _('show newest record first')),
4075 ('B', 'bookmarks', False, _('compare bookmarks')),
4075 ('B', 'bookmarks', False, _('compare bookmarks')),
4076 ('b', 'branch', [], _('a specific branch you would like to push'),
4076 ('b', 'branch', [], _('a specific branch you would like to push'),
4077 _('BRANCH')),
4077 _('BRANCH')),
4078 ] + logopts + remoteopts + subrepoopts,
4078 ] + logopts + remoteopts + subrepoopts,
4079 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4079 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4080 def outgoing(ui, repo, dest=None, **opts):
4080 def outgoing(ui, repo, dest=None, **opts):
4081 """show changesets not found in the destination
4081 """show changesets not found in the destination
4082
4082
4083 Show changesets not found in the specified destination repository
4083 Show changesets not found in the specified destination repository
4084 or the default push location. These are the changesets that would
4084 or the default push location. These are the changesets that would
4085 be pushed if a push was requested.
4085 be pushed if a push was requested.
4086
4086
4087 See pull for details of valid destination formats.
4087 See pull for details of valid destination formats.
4088
4088
4089 Returns 0 if there are outgoing changes, 1 otherwise.
4089 Returns 0 if there are outgoing changes, 1 otherwise.
4090 """
4090 """
4091
4091
4092 if opts.get('bookmarks'):
4092 if opts.get('bookmarks'):
4093 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4093 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4094 dest, branches = hg.parseurl(dest, opts.get('branch'))
4094 dest, branches = hg.parseurl(dest, opts.get('branch'))
4095 other = hg.peer(repo, opts, dest)
4095 other = hg.peer(repo, opts, dest)
4096 if 'bookmarks' not in other.listkeys('namespaces'):
4096 if 'bookmarks' not in other.listkeys('namespaces'):
4097 ui.warn(_("remote doesn't support bookmarks\n"))
4097 ui.warn(_("remote doesn't support bookmarks\n"))
4098 return 0
4098 return 0
4099 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4099 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4100 return bookmarks.diff(ui, other, repo)
4100 return bookmarks.diff(ui, other, repo)
4101
4101
4102 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4102 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4103 try:
4103 try:
4104 return hg.outgoing(ui, repo, dest, opts)
4104 return hg.outgoing(ui, repo, dest, opts)
4105 finally:
4105 finally:
4106 del repo._subtoppath
4106 del repo._subtoppath
4107
4107
4108 @command('parents',
4108 @command('parents',
4109 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4109 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4110 ] + templateopts,
4110 ] + templateopts,
4111 _('[-r REV] [FILE]'))
4111 _('[-r REV] [FILE]'))
4112 def parents(ui, repo, file_=None, **opts):
4112 def parents(ui, repo, file_=None, **opts):
4113 """show the parents of the working directory or revision
4113 """show the parents of the working directory or revision
4114
4114
4115 Print the working directory's parent revisions. If a revision is
4115 Print the working directory's parent revisions. If a revision is
4116 given via -r/--rev, the parent of that revision will be printed.
4116 given via -r/--rev, the parent of that revision will be printed.
4117 If a file argument is given, the revision in which the file was
4117 If a file argument is given, the revision in which the file was
4118 last changed (before the working directory revision or the
4118 last changed (before the working directory revision or the
4119 argument to --rev if given) is printed.
4119 argument to --rev if given) is printed.
4120
4120
4121 Returns 0 on success.
4121 Returns 0 on success.
4122 """
4122 """
4123
4123
4124 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4124 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4125
4125
4126 if file_:
4126 if file_:
4127 m = scmutil.match(ctx, (file_,), opts)
4127 m = scmutil.match(ctx, (file_,), opts)
4128 if m.anypats() or len(m.files()) != 1:
4128 if m.anypats() or len(m.files()) != 1:
4129 raise util.Abort(_('can only specify an explicit filename'))
4129 raise util.Abort(_('can only specify an explicit filename'))
4130 file_ = m.files()[0]
4130 file_ = m.files()[0]
4131 filenodes = []
4131 filenodes = []
4132 for cp in ctx.parents():
4132 for cp in ctx.parents():
4133 if not cp:
4133 if not cp:
4134 continue
4134 continue
4135 try:
4135 try:
4136 filenodes.append(cp.filenode(file_))
4136 filenodes.append(cp.filenode(file_))
4137 except error.LookupError:
4137 except error.LookupError:
4138 pass
4138 pass
4139 if not filenodes:
4139 if not filenodes:
4140 raise util.Abort(_("'%s' not found in manifest!") % file_)
4140 raise util.Abort(_("'%s' not found in manifest!") % file_)
4141 fl = repo.file(file_)
4141 fl = repo.file(file_)
4142 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
4142 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
4143 else:
4143 else:
4144 p = [cp.node() for cp in ctx.parents()]
4144 p = [cp.node() for cp in ctx.parents()]
4145
4145
4146 displayer = cmdutil.show_changeset(ui, repo, opts)
4146 displayer = cmdutil.show_changeset(ui, repo, opts)
4147 for n in p:
4147 for n in p:
4148 if n != nullid:
4148 if n != nullid:
4149 displayer.show(repo[n])
4149 displayer.show(repo[n])
4150 displayer.close()
4150 displayer.close()
4151
4151
4152 @command('paths', [], _('[NAME]'))
4152 @command('paths', [], _('[NAME]'))
4153 def paths(ui, repo, search=None):
4153 def paths(ui, repo, search=None):
4154 """show aliases for remote repositories
4154 """show aliases for remote repositories
4155
4155
4156 Show definition of symbolic path name NAME. If no name is given,
4156 Show definition of symbolic path name NAME. If no name is given,
4157 show definition of all available names.
4157 show definition of all available names.
4158
4158
4159 Option -q/--quiet suppresses all output when searching for NAME
4159 Option -q/--quiet suppresses all output when searching for NAME
4160 and shows only the path names when listing all definitions.
4160 and shows only the path names when listing all definitions.
4161
4161
4162 Path names are defined in the [paths] section of your
4162 Path names are defined in the [paths] section of your
4163 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4163 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4164 repository, ``.hg/hgrc`` is used, too.
4164 repository, ``.hg/hgrc`` is used, too.
4165
4165
4166 The path names ``default`` and ``default-push`` have a special
4166 The path names ``default`` and ``default-push`` have a special
4167 meaning. When performing a push or pull operation, they are used
4167 meaning. When performing a push or pull operation, they are used
4168 as fallbacks if no location is specified on the command-line.
4168 as fallbacks if no location is specified on the command-line.
4169 When ``default-push`` is set, it will be used for push and
4169 When ``default-push`` is set, it will be used for push and
4170 ``default`` will be used for pull; otherwise ``default`` is used
4170 ``default`` will be used for pull; otherwise ``default`` is used
4171 as the fallback for both. When cloning a repository, the clone
4171 as the fallback for both. When cloning a repository, the clone
4172 source is written as ``default`` in ``.hg/hgrc``. Note that
4172 source is written as ``default`` in ``.hg/hgrc``. Note that
4173 ``default`` and ``default-push`` apply to all inbound (e.g.
4173 ``default`` and ``default-push`` apply to all inbound (e.g.
4174 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
4174 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
4175 :hg:`bundle`) operations.
4175 :hg:`bundle`) operations.
4176
4176
4177 See :hg:`help urls` for more information.
4177 See :hg:`help urls` for more information.
4178
4178
4179 Returns 0 on success.
4179 Returns 0 on success.
4180 """
4180 """
4181 if search:
4181 if search:
4182 for name, path in ui.configitems("paths"):
4182 for name, path in ui.configitems("paths"):
4183 if name == search:
4183 if name == search:
4184 ui.status("%s\n" % util.hidepassword(path))
4184 ui.status("%s\n" % util.hidepassword(path))
4185 return
4185 return
4186 if not ui.quiet:
4186 if not ui.quiet:
4187 ui.warn(_("not found!\n"))
4187 ui.warn(_("not found!\n"))
4188 return 1
4188 return 1
4189 else:
4189 else:
4190 for name, path in ui.configitems("paths"):
4190 for name, path in ui.configitems("paths"):
4191 if ui.quiet:
4191 if ui.quiet:
4192 ui.write("%s\n" % name)
4192 ui.write("%s\n" % name)
4193 else:
4193 else:
4194 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
4194 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
4195
4195
4196 @command('^phase',
4196 @command('^phase',
4197 [('p', 'public', False, _('set changeset phase to public')),
4197 [('p', 'public', False, _('set changeset phase to public')),
4198 ('d', 'draft', False, _('set changeset phase to draft')),
4198 ('d', 'draft', False, _('set changeset phase to draft')),
4199 ('s', 'secret', False, _('set changeset phase to secret')),
4199 ('s', 'secret', False, _('set changeset phase to secret')),
4200 ('f', 'force', False, _('allow to move boundary backward')),
4200 ('f', 'force', False, _('allow to move boundary backward')),
4201 ('r', 'rev', [], _('target revision'), _('REV')),
4201 ('r', 'rev', [], _('target revision'), _('REV')),
4202 ],
4202 ],
4203 _('[-p|-d|-s] [-f] [-r] REV...'))
4203 _('[-p|-d|-s] [-f] [-r] REV...'))
4204 def phase(ui, repo, *revs, **opts):
4204 def phase(ui, repo, *revs, **opts):
4205 """set or show the current phase name
4205 """set or show the current phase name
4206
4206
4207 With no argument, show the phase name of specified revisions.
4207 With no argument, show the phase name of specified revisions.
4208
4208
4209 With one of -p/--public, -d/--draft or -s/--secret, change the
4209 With one of -p/--public, -d/--draft or -s/--secret, change the
4210 phase value of the specified revisions.
4210 phase value of the specified revisions.
4211
4211
4212 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
4212 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
4213 lower phase to an higher phase. Phases are ordered as follows::
4213 lower phase to an higher phase. Phases are ordered as follows::
4214
4214
4215 public < draft < secret
4215 public < draft < secret
4216
4216
4217 Return 0 on success, 1 if no phases were changed or some could not
4217 Return 0 on success, 1 if no phases were changed or some could not
4218 be changed.
4218 be changed.
4219 """
4219 """
4220 # search for a unique phase argument
4220 # search for a unique phase argument
4221 targetphase = None
4221 targetphase = None
4222 for idx, name in enumerate(phases.phasenames):
4222 for idx, name in enumerate(phases.phasenames):
4223 if opts[name]:
4223 if opts[name]:
4224 if targetphase is not None:
4224 if targetphase is not None:
4225 raise util.Abort(_('only one phase can be specified'))
4225 raise util.Abort(_('only one phase can be specified'))
4226 targetphase = idx
4226 targetphase = idx
4227
4227
4228 # look for specified revision
4228 # look for specified revision
4229 revs = list(revs)
4229 revs = list(revs)
4230 revs.extend(opts['rev'])
4230 revs.extend(opts['rev'])
4231 if not revs:
4231 if not revs:
4232 raise util.Abort(_('no revisions specified'))
4232 raise util.Abort(_('no revisions specified'))
4233
4233
4234 revs = scmutil.revrange(repo, revs)
4234 revs = scmutil.revrange(repo, revs)
4235
4235
4236 lock = None
4236 lock = None
4237 ret = 0
4237 ret = 0
4238 if targetphase is None:
4238 if targetphase is None:
4239 # display
4239 # display
4240 for r in revs:
4240 for r in revs:
4241 ctx = repo[r]
4241 ctx = repo[r]
4242 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4242 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4243 else:
4243 else:
4244 lock = repo.lock()
4244 lock = repo.lock()
4245 try:
4245 try:
4246 # set phase
4246 # set phase
4247 nodes = [ctx.node() for ctx in repo.set('%ld', revs)]
4247 nodes = [ctx.node() for ctx in repo.set('%ld', revs)]
4248 if not nodes:
4248 if not nodes:
4249 raise util.Abort(_('empty revision set'))
4249 raise util.Abort(_('empty revision set'))
4250 olddata = repo._phaserev[:]
4250 olddata = repo._phaserev[:]
4251 phases.advanceboundary(repo, targetphase, nodes)
4251 phases.advanceboundary(repo, targetphase, nodes)
4252 if opts['force']:
4252 if opts['force']:
4253 phases.retractboundary(repo, targetphase, nodes)
4253 phases.retractboundary(repo, targetphase, nodes)
4254 finally:
4254 finally:
4255 lock.release()
4255 lock.release()
4256 if olddata is not None:
4256 if olddata is not None:
4257 changes = 0
4257 changes = 0
4258 newdata = repo._phaserev
4258 newdata = repo._phaserev
4259 changes = sum(o != newdata[i] for i, o in enumerate(olddata))
4259 changes = sum(o != newdata[i] for i, o in enumerate(olddata))
4260 rejected = [n for n in nodes
4260 rejected = [n for n in nodes
4261 if newdata[repo[n].rev()] < targetphase]
4261 if newdata[repo[n].rev()] < targetphase]
4262 if rejected:
4262 if rejected:
4263 ui.warn(_('cannot move %i changesets to a more permissive '
4263 ui.warn(_('cannot move %i changesets to a more permissive '
4264 'phase, use --force\n') % len(rejected))
4264 'phase, use --force\n') % len(rejected))
4265 ret = 1
4265 ret = 1
4266 if changes:
4266 if changes:
4267 msg = _('phase changed for %i changesets\n') % changes
4267 msg = _('phase changed for %i changesets\n') % changes
4268 if ret:
4268 if ret:
4269 ui.status(msg)
4269 ui.status(msg)
4270 else:
4270 else:
4271 ui.note(msg)
4271 ui.note(msg)
4272 else:
4272 else:
4273 ui.warn(_('no phases changed\n'))
4273 ui.warn(_('no phases changed\n'))
4274 ret = 1
4274 ret = 1
4275 return ret
4275 return ret
4276
4276
4277 def postincoming(ui, repo, modheads, optupdate, checkout):
4277 def postincoming(ui, repo, modheads, optupdate, checkout):
4278 if modheads == 0:
4278 if modheads == 0:
4279 return
4279 return
4280 if optupdate:
4280 if optupdate:
4281 movemarkfrom = repo['.'].node()
4281 movemarkfrom = repo['.'].node()
4282 try:
4282 try:
4283 ret = hg.update(repo, checkout)
4283 ret = hg.update(repo, checkout)
4284 except util.Abort, inst:
4284 except util.Abort, inst:
4285 ui.warn(_("not updating: %s\n" % str(inst)))
4285 ui.warn(_("not updating: %s\n" % str(inst)))
4286 return 0
4286 return 0
4287 if not ret and not checkout:
4287 if not ret and not checkout:
4288 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
4288 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
4289 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
4289 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
4290 return ret
4290 return ret
4291 if modheads > 1:
4291 if modheads > 1:
4292 currentbranchheads = len(repo.branchheads())
4292 currentbranchheads = len(repo.branchheads())
4293 if currentbranchheads == modheads:
4293 if currentbranchheads == modheads:
4294 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4294 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4295 elif currentbranchheads > 1:
4295 elif currentbranchheads > 1:
4296 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to merge)\n"))
4296 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to merge)\n"))
4297 else:
4297 else:
4298 ui.status(_("(run 'hg heads' to see heads)\n"))
4298 ui.status(_("(run 'hg heads' to see heads)\n"))
4299 else:
4299 else:
4300 ui.status(_("(run 'hg update' to get a working copy)\n"))
4300 ui.status(_("(run 'hg update' to get a working copy)\n"))
4301
4301
4302 @command('^pull',
4302 @command('^pull',
4303 [('u', 'update', None,
4303 [('u', 'update', None,
4304 _('update to new branch head if changesets were pulled')),
4304 _('update to new branch head if changesets were pulled')),
4305 ('f', 'force', None, _('run even when remote repository is unrelated')),
4305 ('f', 'force', None, _('run even when remote repository is unrelated')),
4306 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4306 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4307 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4307 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4308 ('b', 'branch', [], _('a specific branch you would like to pull'),
4308 ('b', 'branch', [], _('a specific branch you would like to pull'),
4309 _('BRANCH')),
4309 _('BRANCH')),
4310 ] + remoteopts,
4310 ] + remoteopts,
4311 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4311 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4312 def pull(ui, repo, source="default", **opts):
4312 def pull(ui, repo, source="default", **opts):
4313 """pull changes from the specified source
4313 """pull changes from the specified source
4314
4314
4315 Pull changes from a remote repository to a local one.
4315 Pull changes from a remote repository to a local one.
4316
4316
4317 This finds all changes from the repository at the specified path
4317 This finds all changes from the repository at the specified path
4318 or URL and adds them to a local repository (the current one unless
4318 or URL and adds them to a local repository (the current one unless
4319 -R is specified). By default, this does not update the copy of the
4319 -R is specified). By default, this does not update the copy of the
4320 project in the working directory.
4320 project in the working directory.
4321
4321
4322 Use :hg:`incoming` if you want to see what would have been added
4322 Use :hg:`incoming` if you want to see what would have been added
4323 by a pull at the time you issued this command. If you then decide
4323 by a pull at the time you issued this command. If you then decide
4324 to add those changes to the repository, you should use :hg:`pull
4324 to add those changes to the repository, you should use :hg:`pull
4325 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4325 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4326
4326
4327 If SOURCE is omitted, the 'default' path will be used.
4327 If SOURCE is omitted, the 'default' path will be used.
4328 See :hg:`help urls` for more information.
4328 See :hg:`help urls` for more information.
4329
4329
4330 Returns 0 on success, 1 if an update had unresolved files.
4330 Returns 0 on success, 1 if an update had unresolved files.
4331 """
4331 """
4332 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4332 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4333 other = hg.peer(repo, opts, source)
4333 other = hg.peer(repo, opts, source)
4334 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4334 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4335 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
4335 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
4336
4336
4337 if opts.get('bookmark'):
4337 if opts.get('bookmark'):
4338 if not revs:
4338 if not revs:
4339 revs = []
4339 revs = []
4340 rb = other.listkeys('bookmarks')
4340 rb = other.listkeys('bookmarks')
4341 for b in opts['bookmark']:
4341 for b in opts['bookmark']:
4342 if b not in rb:
4342 if b not in rb:
4343 raise util.Abort(_('remote bookmark %s not found!') % b)
4343 raise util.Abort(_('remote bookmark %s not found!') % b)
4344 revs.append(rb[b])
4344 revs.append(rb[b])
4345
4345
4346 if revs:
4346 if revs:
4347 try:
4347 try:
4348 revs = [other.lookup(rev) for rev in revs]
4348 revs = [other.lookup(rev) for rev in revs]
4349 except error.CapabilityError:
4349 except error.CapabilityError:
4350 err = _("other repository doesn't support revision lookup, "
4350 err = _("other repository doesn't support revision lookup, "
4351 "so a rev cannot be specified.")
4351 "so a rev cannot be specified.")
4352 raise util.Abort(err)
4352 raise util.Abort(err)
4353
4353
4354 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
4354 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
4355 bookmarks.updatefromremote(ui, repo, other, source)
4355 bookmarks.updatefromremote(ui, repo, other, source)
4356 if checkout:
4356 if checkout:
4357 checkout = str(repo.changelog.rev(other.lookup(checkout)))
4357 checkout = str(repo.changelog.rev(other.lookup(checkout)))
4358 repo._subtoppath = source
4358 repo._subtoppath = source
4359 try:
4359 try:
4360 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
4360 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
4361
4361
4362 finally:
4362 finally:
4363 del repo._subtoppath
4363 del repo._subtoppath
4364
4364
4365 # update specified bookmarks
4365 # update specified bookmarks
4366 if opts.get('bookmark'):
4366 if opts.get('bookmark'):
4367 for b in opts['bookmark']:
4367 for b in opts['bookmark']:
4368 # explicit pull overrides local bookmark if any
4368 # explicit pull overrides local bookmark if any
4369 ui.status(_("importing bookmark %s\n") % b)
4369 ui.status(_("importing bookmark %s\n") % b)
4370 repo._bookmarks[b] = repo[rb[b]].node()
4370 repo._bookmarks[b] = repo[rb[b]].node()
4371 bookmarks.write(repo)
4371 bookmarks.write(repo)
4372
4372
4373 return ret
4373 return ret
4374
4374
4375 @command('^push',
4375 @command('^push',
4376 [('f', 'force', None, _('force push')),
4376 [('f', 'force', None, _('force push')),
4377 ('r', 'rev', [],
4377 ('r', 'rev', [],
4378 _('a changeset intended to be included in the destination'),
4378 _('a changeset intended to be included in the destination'),
4379 _('REV')),
4379 _('REV')),
4380 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4380 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4381 ('b', 'branch', [],
4381 ('b', 'branch', [],
4382 _('a specific branch you would like to push'), _('BRANCH')),
4382 _('a specific branch you would like to push'), _('BRANCH')),
4383 ('', 'new-branch', False, _('allow pushing a new branch')),
4383 ('', 'new-branch', False, _('allow pushing a new branch')),
4384 ] + remoteopts,
4384 ] + remoteopts,
4385 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4385 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4386 def push(ui, repo, dest=None, **opts):
4386 def push(ui, repo, dest=None, **opts):
4387 """push changes to the specified destination
4387 """push changes to the specified destination
4388
4388
4389 Push changesets from the local repository to the specified
4389 Push changesets from the local repository to the specified
4390 destination.
4390 destination.
4391
4391
4392 This operation is symmetrical to pull: it is identical to a pull
4392 This operation is symmetrical to pull: it is identical to a pull
4393 in the destination repository from the current one.
4393 in the destination repository from the current one.
4394
4394
4395 By default, push will not allow creation of new heads at the
4395 By default, push will not allow creation of new heads at the
4396 destination, since multiple heads would make it unclear which head
4396 destination, since multiple heads would make it unclear which head
4397 to use. In this situation, it is recommended to pull and merge
4397 to use. In this situation, it is recommended to pull and merge
4398 before pushing.
4398 before pushing.
4399
4399
4400 Use --new-branch if you want to allow push to create a new named
4400 Use --new-branch if you want to allow push to create a new named
4401 branch that is not present at the destination. This allows you to
4401 branch that is not present at the destination. This allows you to
4402 only create a new branch without forcing other changes.
4402 only create a new branch without forcing other changes.
4403
4403
4404 Use -f/--force to override the default behavior and push all
4404 Use -f/--force to override the default behavior and push all
4405 changesets on all branches.
4405 changesets on all branches.
4406
4406
4407 If -r/--rev is used, the specified revision and all its ancestors
4407 If -r/--rev is used, the specified revision and all its ancestors
4408 will be pushed to the remote repository.
4408 will be pushed to the remote repository.
4409
4409
4410 Please see :hg:`help urls` for important details about ``ssh://``
4410 Please see :hg:`help urls` for important details about ``ssh://``
4411 URLs. If DESTINATION is omitted, a default path will be used.
4411 URLs. If DESTINATION is omitted, a default path will be used.
4412
4412
4413 Returns 0 if push was successful, 1 if nothing to push.
4413 Returns 0 if push was successful, 1 if nothing to push.
4414 """
4414 """
4415
4415
4416 if opts.get('bookmark'):
4416 if opts.get('bookmark'):
4417 for b in opts['bookmark']:
4417 for b in opts['bookmark']:
4418 # translate -B options to -r so changesets get pushed
4418 # translate -B options to -r so changesets get pushed
4419 if b in repo._bookmarks:
4419 if b in repo._bookmarks:
4420 opts.setdefault('rev', []).append(b)
4420 opts.setdefault('rev', []).append(b)
4421 else:
4421 else:
4422 # if we try to push a deleted bookmark, translate it to null
4422 # if we try to push a deleted bookmark, translate it to null
4423 # this lets simultaneous -r, -b options continue working
4423 # this lets simultaneous -r, -b options continue working
4424 opts.setdefault('rev', []).append("null")
4424 opts.setdefault('rev', []).append("null")
4425
4425
4426 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4426 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4427 dest, branches = hg.parseurl(dest, opts.get('branch'))
4427 dest, branches = hg.parseurl(dest, opts.get('branch'))
4428 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4428 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4429 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4429 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4430 other = hg.peer(repo, opts, dest)
4430 other = hg.peer(repo, opts, dest)
4431 if revs:
4431 if revs:
4432 revs = [repo.lookup(rev) for rev in revs]
4432 revs = [repo.lookup(rev) for rev in revs]
4433
4433
4434 repo._subtoppath = dest
4434 repo._subtoppath = dest
4435 try:
4435 try:
4436 # push subrepos depth-first for coherent ordering
4436 # push subrepos depth-first for coherent ordering
4437 c = repo['']
4437 c = repo['']
4438 subs = c.substate # only repos that are committed
4438 subs = c.substate # only repos that are committed
4439 for s in sorted(subs):
4439 for s in sorted(subs):
4440 if c.sub(s).push(opts) == 0:
4440 if c.sub(s).push(opts) == 0:
4441 return False
4441 return False
4442 finally:
4442 finally:
4443 del repo._subtoppath
4443 del repo._subtoppath
4444 result = repo.push(other, opts.get('force'), revs=revs,
4444 result = repo.push(other, opts.get('force'), revs=revs,
4445 newbranch=opts.get('new_branch'))
4445 newbranch=opts.get('new_branch'))
4446
4446
4447 result = not result
4447 result = not result
4448
4448
4449 if opts.get('bookmark'):
4449 if opts.get('bookmark'):
4450 rb = other.listkeys('bookmarks')
4450 rb = other.listkeys('bookmarks')
4451 for b in opts['bookmark']:
4451 for b in opts['bookmark']:
4452 # explicit push overrides remote bookmark if any
4452 # explicit push overrides remote bookmark if any
4453 if b in repo._bookmarks:
4453 if b in repo._bookmarks:
4454 ui.status(_("exporting bookmark %s\n") % b)
4454 ui.status(_("exporting bookmark %s\n") % b)
4455 new = repo[b].hex()
4455 new = repo[b].hex()
4456 elif b in rb:
4456 elif b in rb:
4457 ui.status(_("deleting remote bookmark %s\n") % b)
4457 ui.status(_("deleting remote bookmark %s\n") % b)
4458 new = '' # delete
4458 new = '' # delete
4459 else:
4459 else:
4460 ui.warn(_('bookmark %s does not exist on the local '
4460 ui.warn(_('bookmark %s does not exist on the local '
4461 'or remote repository!\n') % b)
4461 'or remote repository!\n') % b)
4462 return 2
4462 return 2
4463 old = rb.get(b, '')
4463 old = rb.get(b, '')
4464 r = other.pushkey('bookmarks', b, old, new)
4464 r = other.pushkey('bookmarks', b, old, new)
4465 if not r:
4465 if not r:
4466 ui.warn(_('updating bookmark %s failed!\n') % b)
4466 ui.warn(_('updating bookmark %s failed!\n') % b)
4467 if not result:
4467 if not result:
4468 result = 2
4468 result = 2
4469
4469
4470 return result
4470 return result
4471
4471
4472 @command('recover', [])
4472 @command('recover', [])
4473 def recover(ui, repo):
4473 def recover(ui, repo):
4474 """roll back an interrupted transaction
4474 """roll back an interrupted transaction
4475
4475
4476 Recover from an interrupted commit or pull.
4476 Recover from an interrupted commit or pull.
4477
4477
4478 This command tries to fix the repository status after an
4478 This command tries to fix the repository status after an
4479 interrupted operation. It should only be necessary when Mercurial
4479 interrupted operation. It should only be necessary when Mercurial
4480 suggests it.
4480 suggests it.
4481
4481
4482 Returns 0 if successful, 1 if nothing to recover or verify fails.
4482 Returns 0 if successful, 1 if nothing to recover or verify fails.
4483 """
4483 """
4484 if repo.recover():
4484 if repo.recover():
4485 return hg.verify(repo)
4485 return hg.verify(repo)
4486 return 1
4486 return 1
4487
4487
4488 @command('^remove|rm',
4488 @command('^remove|rm',
4489 [('A', 'after', None, _('record delete for missing files')),
4489 [('A', 'after', None, _('record delete for missing files')),
4490 ('f', 'force', None,
4490 ('f', 'force', None,
4491 _('remove (and delete) file even if added or modified')),
4491 _('remove (and delete) file even if added or modified')),
4492 ] + walkopts,
4492 ] + walkopts,
4493 _('[OPTION]... FILE...'))
4493 _('[OPTION]... FILE...'))
4494 def remove(ui, repo, *pats, **opts):
4494 def remove(ui, repo, *pats, **opts):
4495 """remove the specified files on the next commit
4495 """remove the specified files on the next commit
4496
4496
4497 Schedule the indicated files for removal from the current branch.
4497 Schedule the indicated files for removal from the current branch.
4498
4498
4499 This command schedules the files to be removed at the next commit.
4499 This command schedules the files to be removed at the next commit.
4500 To undo a remove before that, see :hg:`revert`. To undo added
4500 To undo a remove before that, see :hg:`revert`. To undo added
4501 files, see :hg:`forget`.
4501 files, see :hg:`forget`.
4502
4502
4503 .. container:: verbose
4503 .. container:: verbose
4504
4504
4505 -A/--after can be used to remove only files that have already
4505 -A/--after can be used to remove only files that have already
4506 been deleted, -f/--force can be used to force deletion, and -Af
4506 been deleted, -f/--force can be used to force deletion, and -Af
4507 can be used to remove files from the next revision without
4507 can be used to remove files from the next revision without
4508 deleting them from the working directory.
4508 deleting them from the working directory.
4509
4509
4510 The following table details the behavior of remove for different
4510 The following table details the behavior of remove for different
4511 file states (columns) and option combinations (rows). The file
4511 file states (columns) and option combinations (rows). The file
4512 states are Added [A], Clean [C], Modified [M] and Missing [!]
4512 states are Added [A], Clean [C], Modified [M] and Missing [!]
4513 (as reported by :hg:`status`). The actions are Warn, Remove
4513 (as reported by :hg:`status`). The actions are Warn, Remove
4514 (from branch) and Delete (from disk):
4514 (from branch) and Delete (from disk):
4515
4515
4516 ======= == == == ==
4516 ======= == == == ==
4517 A C M !
4517 A C M !
4518 ======= == == == ==
4518 ======= == == == ==
4519 none W RD W R
4519 none W RD W R
4520 -f R RD RD R
4520 -f R RD RD R
4521 -A W W W R
4521 -A W W W R
4522 -Af R R R R
4522 -Af R R R R
4523 ======= == == == ==
4523 ======= == == == ==
4524
4524
4525 Note that remove never deletes files in Added [A] state from the
4525 Note that remove never deletes files in Added [A] state from the
4526 working directory, not even if option --force is specified.
4526 working directory, not even if option --force is specified.
4527
4527
4528 Returns 0 on success, 1 if any warnings encountered.
4528 Returns 0 on success, 1 if any warnings encountered.
4529 """
4529 """
4530
4530
4531 ret = 0
4531 ret = 0
4532 after, force = opts.get('after'), opts.get('force')
4532 after, force = opts.get('after'), opts.get('force')
4533 if not pats and not after:
4533 if not pats and not after:
4534 raise util.Abort(_('no files specified'))
4534 raise util.Abort(_('no files specified'))
4535
4535
4536 m = scmutil.match(repo[None], pats, opts)
4536 m = scmutil.match(repo[None], pats, opts)
4537 s = repo.status(match=m, clean=True)
4537 s = repo.status(match=m, clean=True)
4538 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
4538 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
4539
4539
4540 for f in m.files():
4540 for f in m.files():
4541 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
4541 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
4542 if os.path.exists(m.rel(f)):
4542 if os.path.exists(m.rel(f)):
4543 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
4543 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
4544 ret = 1
4544 ret = 1
4545
4545
4546 if force:
4546 if force:
4547 list = modified + deleted + clean + added
4547 list = modified + deleted + clean + added
4548 elif after:
4548 elif after:
4549 list = deleted
4549 list = deleted
4550 for f in modified + added + clean:
4550 for f in modified + added + clean:
4551 ui.warn(_('not removing %s: file still exists (use -f'
4551 ui.warn(_('not removing %s: file still exists (use -f'
4552 ' to force removal)\n') % m.rel(f))
4552 ' to force removal)\n') % m.rel(f))
4553 ret = 1
4553 ret = 1
4554 else:
4554 else:
4555 list = deleted + clean
4555 list = deleted + clean
4556 for f in modified:
4556 for f in modified:
4557 ui.warn(_('not removing %s: file is modified (use -f'
4557 ui.warn(_('not removing %s: file is modified (use -f'
4558 ' to force removal)\n') % m.rel(f))
4558 ' to force removal)\n') % m.rel(f))
4559 ret = 1
4559 ret = 1
4560 for f in added:
4560 for f in added:
4561 ui.warn(_('not removing %s: file has been marked for add'
4561 ui.warn(_('not removing %s: file has been marked for add'
4562 ' (use forget to undo)\n') % m.rel(f))
4562 ' (use forget to undo)\n') % m.rel(f))
4563 ret = 1
4563 ret = 1
4564
4564
4565 for f in sorted(list):
4565 for f in sorted(list):
4566 if ui.verbose or not m.exact(f):
4566 if ui.verbose or not m.exact(f):
4567 ui.status(_('removing %s\n') % m.rel(f))
4567 ui.status(_('removing %s\n') % m.rel(f))
4568
4568
4569 wlock = repo.wlock()
4569 wlock = repo.wlock()
4570 try:
4570 try:
4571 if not after:
4571 if not after:
4572 for f in list:
4572 for f in list:
4573 if f in added:
4573 if f in added:
4574 continue # we never unlink added files on remove
4574 continue # we never unlink added files on remove
4575 try:
4575 try:
4576 util.unlinkpath(repo.wjoin(f))
4576 util.unlinkpath(repo.wjoin(f))
4577 except OSError, inst:
4577 except OSError, inst:
4578 if inst.errno != errno.ENOENT:
4578 if inst.errno != errno.ENOENT:
4579 raise
4579 raise
4580 repo[None].forget(list)
4580 repo[None].forget(list)
4581 finally:
4581 finally:
4582 wlock.release()
4582 wlock.release()
4583
4583
4584 return ret
4584 return ret
4585
4585
4586 @command('rename|move|mv',
4586 @command('rename|move|mv',
4587 [('A', 'after', None, _('record a rename that has already occurred')),
4587 [('A', 'after', None, _('record a rename that has already occurred')),
4588 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4588 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4589 ] + walkopts + dryrunopts,
4589 ] + walkopts + dryrunopts,
4590 _('[OPTION]... SOURCE... DEST'))
4590 _('[OPTION]... SOURCE... DEST'))
4591 def rename(ui, repo, *pats, **opts):
4591 def rename(ui, repo, *pats, **opts):
4592 """rename files; equivalent of copy + remove
4592 """rename files; equivalent of copy + remove
4593
4593
4594 Mark dest as copies of sources; mark sources for deletion. If dest
4594 Mark dest as copies of sources; mark sources for deletion. If dest
4595 is a directory, copies are put in that directory. If dest is a
4595 is a directory, copies are put in that directory. If dest is a
4596 file, there can only be one source.
4596 file, there can only be one source.
4597
4597
4598 By default, this command copies the contents of files as they
4598 By default, this command copies the contents of files as they
4599 exist in the working directory. If invoked with -A/--after, the
4599 exist in the working directory. If invoked with -A/--after, the
4600 operation is recorded, but no copying is performed.
4600 operation is recorded, but no copying is performed.
4601
4601
4602 This command takes effect at the next commit. To undo a rename
4602 This command takes effect at the next commit. To undo a rename
4603 before that, see :hg:`revert`.
4603 before that, see :hg:`revert`.
4604
4604
4605 Returns 0 on success, 1 if errors are encountered.
4605 Returns 0 on success, 1 if errors are encountered.
4606 """
4606 """
4607 wlock = repo.wlock(False)
4607 wlock = repo.wlock(False)
4608 try:
4608 try:
4609 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4609 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4610 finally:
4610 finally:
4611 wlock.release()
4611 wlock.release()
4612
4612
4613 @command('resolve',
4613 @command('resolve',
4614 [('a', 'all', None, _('select all unresolved files')),
4614 [('a', 'all', None, _('select all unresolved files')),
4615 ('l', 'list', None, _('list state of files needing merge')),
4615 ('l', 'list', None, _('list state of files needing merge')),
4616 ('m', 'mark', None, _('mark files as resolved')),
4616 ('m', 'mark', None, _('mark files as resolved')),
4617 ('u', 'unmark', None, _('mark files as unresolved')),
4617 ('u', 'unmark', None, _('mark files as unresolved')),
4618 ('n', 'no-status', None, _('hide status prefix'))]
4618 ('n', 'no-status', None, _('hide status prefix'))]
4619 + mergetoolopts + walkopts,
4619 + mergetoolopts + walkopts,
4620 _('[OPTION]... [FILE]...'))
4620 _('[OPTION]... [FILE]...'))
4621 def resolve(ui, repo, *pats, **opts):
4621 def resolve(ui, repo, *pats, **opts):
4622 """redo merges or set/view the merge status of files
4622 """redo merges or set/view the merge status of files
4623
4623
4624 Merges with unresolved conflicts are often the result of
4624 Merges with unresolved conflicts are often the result of
4625 non-interactive merging using the ``internal:merge`` configuration
4625 non-interactive merging using the ``internal:merge`` configuration
4626 setting, or a command-line merge tool like ``diff3``. The resolve
4626 setting, or a command-line merge tool like ``diff3``. The resolve
4627 command is used to manage the files involved in a merge, after
4627 command is used to manage the files involved in a merge, after
4628 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4628 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4629 working directory must have two parents). See :hg:`help
4629 working directory must have two parents). See :hg:`help
4630 merge-tools` for information on configuring merge tools.
4630 merge-tools` for information on configuring merge tools.
4631
4631
4632 The resolve command can be used in the following ways:
4632 The resolve command can be used in the following ways:
4633
4633
4634 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4634 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4635 files, discarding any previous merge attempts. Re-merging is not
4635 files, discarding any previous merge attempts. Re-merging is not
4636 performed for files already marked as resolved. Use ``--all/-a``
4636 performed for files already marked as resolved. Use ``--all/-a``
4637 to select all unresolved files. ``--tool`` can be used to specify
4637 to select all unresolved files. ``--tool`` can be used to specify
4638 the merge tool used for the given files. It overrides the HGMERGE
4638 the merge tool used for the given files. It overrides the HGMERGE
4639 environment variable and your configuration files. Previous file
4639 environment variable and your configuration files. Previous file
4640 contents are saved with a ``.orig`` suffix.
4640 contents are saved with a ``.orig`` suffix.
4641
4641
4642 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4642 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4643 (e.g. after having manually fixed-up the files). The default is
4643 (e.g. after having manually fixed-up the files). The default is
4644 to mark all unresolved files.
4644 to mark all unresolved files.
4645
4645
4646 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4646 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4647 default is to mark all resolved files.
4647 default is to mark all resolved files.
4648
4648
4649 - :hg:`resolve -l`: list files which had or still have conflicts.
4649 - :hg:`resolve -l`: list files which had or still have conflicts.
4650 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4650 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4651
4651
4652 Note that Mercurial will not let you commit files with unresolved
4652 Note that Mercurial will not let you commit files with unresolved
4653 merge conflicts. You must use :hg:`resolve -m ...` before you can
4653 merge conflicts. You must use :hg:`resolve -m ...` before you can
4654 commit after a conflicting merge.
4654 commit after a conflicting merge.
4655
4655
4656 Returns 0 on success, 1 if any files fail a resolve attempt.
4656 Returns 0 on success, 1 if any files fail a resolve attempt.
4657 """
4657 """
4658
4658
4659 all, mark, unmark, show, nostatus = \
4659 all, mark, unmark, show, nostatus = \
4660 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
4660 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
4661
4661
4662 if (show and (mark or unmark)) or (mark and unmark):
4662 if (show and (mark or unmark)) or (mark and unmark):
4663 raise util.Abort(_("too many options specified"))
4663 raise util.Abort(_("too many options specified"))
4664 if pats and all:
4664 if pats and all:
4665 raise util.Abort(_("can't specify --all and patterns"))
4665 raise util.Abort(_("can't specify --all and patterns"))
4666 if not (all or pats or show or mark or unmark):
4666 if not (all or pats or show or mark or unmark):
4667 raise util.Abort(_('no files or directories specified; '
4667 raise util.Abort(_('no files or directories specified; '
4668 'use --all to remerge all files'))
4668 'use --all to remerge all files'))
4669
4669
4670 ms = mergemod.mergestate(repo)
4670 ms = mergemod.mergestate(repo)
4671 m = scmutil.match(repo[None], pats, opts)
4671 m = scmutil.match(repo[None], pats, opts)
4672 ret = 0
4672 ret = 0
4673
4673
4674 for f in ms:
4674 for f in ms:
4675 if m(f):
4675 if m(f):
4676 if show:
4676 if show:
4677 if nostatus:
4677 if nostatus:
4678 ui.write("%s\n" % f)
4678 ui.write("%s\n" % f)
4679 else:
4679 else:
4680 ui.write("%s %s\n" % (ms[f].upper(), f),
4680 ui.write("%s %s\n" % (ms[f].upper(), f),
4681 label='resolve.' +
4681 label='resolve.' +
4682 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
4682 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
4683 elif mark:
4683 elif mark:
4684 ms.mark(f, "r")
4684 ms.mark(f, "r")
4685 elif unmark:
4685 elif unmark:
4686 ms.mark(f, "u")
4686 ms.mark(f, "u")
4687 else:
4687 else:
4688 wctx = repo[None]
4688 wctx = repo[None]
4689 mctx = wctx.parents()[-1]
4689 mctx = wctx.parents()[-1]
4690
4690
4691 # backup pre-resolve (merge uses .orig for its own purposes)
4691 # backup pre-resolve (merge uses .orig for its own purposes)
4692 a = repo.wjoin(f)
4692 a = repo.wjoin(f)
4693 util.copyfile(a, a + ".resolve")
4693 util.copyfile(a, a + ".resolve")
4694
4694
4695 try:
4695 try:
4696 # resolve file
4696 # resolve file
4697 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4697 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4698 if ms.resolve(f, wctx, mctx):
4698 if ms.resolve(f, wctx, mctx):
4699 ret = 1
4699 ret = 1
4700 finally:
4700 finally:
4701 ui.setconfig('ui', 'forcemerge', '')
4701 ui.setconfig('ui', 'forcemerge', '')
4702
4702
4703 # replace filemerge's .orig file with our resolve file
4703 # replace filemerge's .orig file with our resolve file
4704 util.rename(a + ".resolve", a + ".orig")
4704 util.rename(a + ".resolve", a + ".orig")
4705
4705
4706 ms.commit()
4706 ms.commit()
4707 return ret
4707 return ret
4708
4708
4709 @command('revert',
4709 @command('revert',
4710 [('a', 'all', None, _('revert all changes when no arguments given')),
4710 [('a', 'all', None, _('revert all changes when no arguments given')),
4711 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4711 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4712 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4712 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4713 ('C', 'no-backup', None, _('do not save backup copies of files')),
4713 ('C', 'no-backup', None, _('do not save backup copies of files')),
4714 ] + walkopts + dryrunopts,
4714 ] + walkopts + dryrunopts,
4715 _('[OPTION]... [-r REV] [NAME]...'))
4715 _('[OPTION]... [-r REV] [NAME]...'))
4716 def revert(ui, repo, *pats, **opts):
4716 def revert(ui, repo, *pats, **opts):
4717 """restore files to their checkout state
4717 """restore files to their checkout state
4718
4718
4719 .. note::
4719 .. note::
4720 To check out earlier revisions, you should use :hg:`update REV`.
4720 To check out earlier revisions, you should use :hg:`update REV`.
4721 To cancel a merge (and lose your changes), use :hg:`update --clean .`.
4721 To cancel a merge (and lose your changes), use :hg:`update --clean .`.
4722
4722
4723 With no revision specified, revert the specified files or directories
4723 With no revision specified, revert the specified files or directories
4724 to the contents they had in the parent of the working directory.
4724 to the contents they had in the parent of the working directory.
4725 This restores the contents of files to an unmodified
4725 This restores the contents of files to an unmodified
4726 state and unschedules adds, removes, copies, and renames. If the
4726 state and unschedules adds, removes, copies, and renames. If the
4727 working directory has two parents, you must explicitly specify a
4727 working directory has two parents, you must explicitly specify a
4728 revision.
4728 revision.
4729
4729
4730 Using the -r/--rev or -d/--date options, revert the given files or
4730 Using the -r/--rev or -d/--date options, revert the given files or
4731 directories to their states as of a specific revision. Because
4731 directories to their states as of a specific revision. Because
4732 revert does not change the working directory parents, this will
4732 revert does not change the working directory parents, this will
4733 cause these files to appear modified. This can be helpful to "back
4733 cause these files to appear modified. This can be helpful to "back
4734 out" some or all of an earlier change. See :hg:`backout` for a
4734 out" some or all of an earlier change. See :hg:`backout` for a
4735 related method.
4735 related method.
4736
4736
4737 Modified files are saved with a .orig suffix before reverting.
4737 Modified files are saved with a .orig suffix before reverting.
4738 To disable these backups, use --no-backup.
4738 To disable these backups, use --no-backup.
4739
4739
4740 See :hg:`help dates` for a list of formats valid for -d/--date.
4740 See :hg:`help dates` for a list of formats valid for -d/--date.
4741
4741
4742 Returns 0 on success.
4742 Returns 0 on success.
4743 """
4743 """
4744
4744
4745 if opts.get("date"):
4745 if opts.get("date"):
4746 if opts.get("rev"):
4746 if opts.get("rev"):
4747 raise util.Abort(_("you can't specify a revision and a date"))
4747 raise util.Abort(_("you can't specify a revision and a date"))
4748 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4748 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4749
4749
4750 parent, p2 = repo.dirstate.parents()
4750 parent, p2 = repo.dirstate.parents()
4751 if not opts.get('rev') and p2 != nullid:
4751 if not opts.get('rev') and p2 != nullid:
4752 # revert after merge is a trap for new users (issue2915)
4752 # revert after merge is a trap for new users (issue2915)
4753 raise util.Abort(_('uncommitted merge with no revision specified'),
4753 raise util.Abort(_('uncommitted merge with no revision specified'),
4754 hint=_('use "hg update" or see "hg help revert"'))
4754 hint=_('use "hg update" or see "hg help revert"'))
4755
4755
4756 ctx = scmutil.revsingle(repo, opts.get('rev'))
4756 ctx = scmutil.revsingle(repo, opts.get('rev'))
4757 node = ctx.node()
4757 node = ctx.node()
4758
4758
4759 if not pats and not opts.get('all'):
4759 if not pats and not opts.get('all'):
4760 msg = _("no files or directories specified")
4760 msg = _("no files or directories specified")
4761 if p2 != nullid:
4761 if p2 != nullid:
4762 hint = _("uncommitted merge, use --all to discard all changes,"
4762 hint = _("uncommitted merge, use --all to discard all changes,"
4763 " or 'hg update -C .' to abort the merge")
4763 " or 'hg update -C .' to abort the merge")
4764 raise util.Abort(msg, hint=hint)
4764 raise util.Abort(msg, hint=hint)
4765 dirty = util.any(repo.status())
4765 dirty = util.any(repo.status())
4766 if node != parent:
4766 if node != parent:
4767 if dirty:
4767 if dirty:
4768 hint = _("uncommitted changes, use --all to discard all"
4768 hint = _("uncommitted changes, use --all to discard all"
4769 " changes, or 'hg update %s' to update") % ctx.rev()
4769 " changes, or 'hg update %s' to update") % ctx.rev()
4770 else:
4770 else:
4771 hint = _("use --all to revert all files,"
4771 hint = _("use --all to revert all files,"
4772 " or 'hg update %s' to update") % ctx.rev()
4772 " or 'hg update %s' to update") % ctx.rev()
4773 elif dirty:
4773 elif dirty:
4774 hint = _("uncommitted changes, use --all to discard all changes")
4774 hint = _("uncommitted changes, use --all to discard all changes")
4775 else:
4775 else:
4776 hint = _("use --all to revert all files")
4776 hint = _("use --all to revert all files")
4777 raise util.Abort(msg, hint=hint)
4777 raise util.Abort(msg, hint=hint)
4778
4778
4779 mf = ctx.manifest()
4779 mf = ctx.manifest()
4780 if node == parent:
4780 if node == parent:
4781 pmf = mf
4781 pmf = mf
4782 else:
4782 else:
4783 pmf = None
4783 pmf = None
4784
4784
4785 # need all matching names in dirstate and manifest of target rev,
4785 # need all matching names in dirstate and manifest of target rev,
4786 # so have to walk both. do not print errors if files exist in one
4786 # so have to walk both. do not print errors if files exist in one
4787 # but not other.
4787 # but not other.
4788
4788
4789 names = {}
4789 names = {}
4790
4790
4791 wlock = repo.wlock()
4791 wlock = repo.wlock()
4792 try:
4792 try:
4793 # walk dirstate.
4793 # walk dirstate.
4794
4794
4795 m = scmutil.match(repo[None], pats, opts)
4795 m = scmutil.match(repo[None], pats, opts)
4796 m.bad = lambda x, y: False
4796 m.bad = lambda x, y: False
4797 for abs in repo.walk(m):
4797 for abs in repo.walk(m):
4798 names[abs] = m.rel(abs), m.exact(abs)
4798 names[abs] = m.rel(abs), m.exact(abs)
4799
4799
4800 # walk target manifest.
4800 # walk target manifest.
4801
4801
4802 def badfn(path, msg):
4802 def badfn(path, msg):
4803 if path in names:
4803 if path in names:
4804 return
4804 return
4805 if path in repo[node].substate:
4805 if path in repo[node].substate:
4806 ui.warn("%s: %s\n" % (m.rel(path),
4806 ui.warn("%s: %s\n" % (m.rel(path),
4807 'reverting subrepos is unsupported'))
4807 'reverting subrepos is unsupported'))
4808 return
4808 return
4809 path_ = path + '/'
4809 path_ = path + '/'
4810 for f in names:
4810 for f in names:
4811 if f.startswith(path_):
4811 if f.startswith(path_):
4812 return
4812 return
4813 ui.warn("%s: %s\n" % (m.rel(path), msg))
4813 ui.warn("%s: %s\n" % (m.rel(path), msg))
4814
4814
4815 m = scmutil.match(repo[node], pats, opts)
4815 m = scmutil.match(repo[node], pats, opts)
4816 m.bad = badfn
4816 m.bad = badfn
4817 for abs in repo[node].walk(m):
4817 for abs in repo[node].walk(m):
4818 if abs not in names:
4818 if abs not in names:
4819 names[abs] = m.rel(abs), m.exact(abs)
4819 names[abs] = m.rel(abs), m.exact(abs)
4820
4820
4821 m = scmutil.matchfiles(repo, names)
4821 m = scmutil.matchfiles(repo, names)
4822 changes = repo.status(match=m)[:4]
4822 changes = repo.status(match=m)[:4]
4823 modified, added, removed, deleted = map(set, changes)
4823 modified, added, removed, deleted = map(set, changes)
4824
4824
4825 # if f is a rename, also revert the source
4825 # if f is a rename, also revert the source
4826 cwd = repo.getcwd()
4826 cwd = repo.getcwd()
4827 for f in added:
4827 for f in added:
4828 src = repo.dirstate.copied(f)
4828 src = repo.dirstate.copied(f)
4829 if src and src not in names and repo.dirstate[src] == 'r':
4829 if src and src not in names and repo.dirstate[src] == 'r':
4830 removed.add(src)
4830 removed.add(src)
4831 names[src] = (repo.pathto(src, cwd), True)
4831 names[src] = (repo.pathto(src, cwd), True)
4832
4832
4833 def removeforget(abs):
4833 def removeforget(abs):
4834 if repo.dirstate[abs] == 'a':
4834 if repo.dirstate[abs] == 'a':
4835 return _('forgetting %s\n')
4835 return _('forgetting %s\n')
4836 return _('removing %s\n')
4836 return _('removing %s\n')
4837
4837
4838 revert = ([], _('reverting %s\n'))
4838 revert = ([], _('reverting %s\n'))
4839 add = ([], _('adding %s\n'))
4839 add = ([], _('adding %s\n'))
4840 remove = ([], removeforget)
4840 remove = ([], removeforget)
4841 undelete = ([], _('undeleting %s\n'))
4841 undelete = ([], _('undeleting %s\n'))
4842
4842
4843 disptable = (
4843 disptable = (
4844 # dispatch table:
4844 # dispatch table:
4845 # file state
4845 # file state
4846 # action if in target manifest
4846 # action if in target manifest
4847 # action if not in target manifest
4847 # action if not in target manifest
4848 # make backup if in target manifest
4848 # make backup if in target manifest
4849 # make backup if not in target manifest
4849 # make backup if not in target manifest
4850 (modified, revert, remove, True, True),
4850 (modified, revert, remove, True, True),
4851 (added, revert, remove, True, False),
4851 (added, revert, remove, True, False),
4852 (removed, undelete, None, False, False),
4852 (removed, undelete, None, False, False),
4853 (deleted, revert, remove, False, False),
4853 (deleted, revert, remove, False, False),
4854 )
4854 )
4855
4855
4856 for abs, (rel, exact) in sorted(names.items()):
4856 for abs, (rel, exact) in sorted(names.items()):
4857 mfentry = mf.get(abs)
4857 mfentry = mf.get(abs)
4858 target = repo.wjoin(abs)
4858 target = repo.wjoin(abs)
4859 def handle(xlist, dobackup):
4859 def handle(xlist, dobackup):
4860 xlist[0].append(abs)
4860 xlist[0].append(abs)
4861 if (dobackup and not opts.get('no_backup') and
4861 if (dobackup and not opts.get('no_backup') and
4862 os.path.lexists(target)):
4862 os.path.lexists(target)):
4863 bakname = "%s.orig" % rel
4863 bakname = "%s.orig" % rel
4864 ui.note(_('saving current version of %s as %s\n') %
4864 ui.note(_('saving current version of %s as %s\n') %
4865 (rel, bakname))
4865 (rel, bakname))
4866 if not opts.get('dry_run'):
4866 if not opts.get('dry_run'):
4867 util.rename(target, bakname)
4867 util.rename(target, bakname)
4868 if ui.verbose or not exact:
4868 if ui.verbose or not exact:
4869 msg = xlist[1]
4869 msg = xlist[1]
4870 if not isinstance(msg, basestring):
4870 if not isinstance(msg, basestring):
4871 msg = msg(abs)
4871 msg = msg(abs)
4872 ui.status(msg % rel)
4872 ui.status(msg % rel)
4873 for table, hitlist, misslist, backuphit, backupmiss in disptable:
4873 for table, hitlist, misslist, backuphit, backupmiss in disptable:
4874 if abs not in table:
4874 if abs not in table:
4875 continue
4875 continue
4876 # file has changed in dirstate
4876 # file has changed in dirstate
4877 if mfentry:
4877 if mfentry:
4878 handle(hitlist, backuphit)
4878 handle(hitlist, backuphit)
4879 elif misslist is not None:
4879 elif misslist is not None:
4880 handle(misslist, backupmiss)
4880 handle(misslist, backupmiss)
4881 break
4881 break
4882 else:
4882 else:
4883 if abs not in repo.dirstate:
4883 if abs not in repo.dirstate:
4884 if mfentry:
4884 if mfentry:
4885 handle(add, True)
4885 handle(add, True)
4886 elif exact:
4886 elif exact:
4887 ui.warn(_('file not managed: %s\n') % rel)
4887 ui.warn(_('file not managed: %s\n') % rel)
4888 continue
4888 continue
4889 # file has not changed in dirstate
4889 # file has not changed in dirstate
4890 if node == parent:
4890 if node == parent:
4891 if exact:
4891 if exact:
4892 ui.warn(_('no changes needed to %s\n') % rel)
4892 ui.warn(_('no changes needed to %s\n') % rel)
4893 continue
4893 continue
4894 if pmf is None:
4894 if pmf is None:
4895 # only need parent manifest in this unlikely case,
4895 # only need parent manifest in this unlikely case,
4896 # so do not read by default
4896 # so do not read by default
4897 pmf = repo[parent].manifest()
4897 pmf = repo[parent].manifest()
4898 if abs in pmf and mfentry:
4898 if abs in pmf and mfentry:
4899 # if version of file is same in parent and target
4899 # if version of file is same in parent and target
4900 # manifests, do nothing
4900 # manifests, do nothing
4901 if (pmf[abs] != mfentry or
4901 if (pmf[abs] != mfentry or
4902 pmf.flags(abs) != mf.flags(abs)):
4902 pmf.flags(abs) != mf.flags(abs)):
4903 handle(revert, False)
4903 handle(revert, False)
4904 else:
4904 else:
4905 handle(remove, False)
4905 handle(remove, False)
4906
4906
4907 if not opts.get('dry_run'):
4907 if not opts.get('dry_run'):
4908 def checkout(f):
4908 def checkout(f):
4909 fc = ctx[f]
4909 fc = ctx[f]
4910 repo.wwrite(f, fc.data(), fc.flags())
4910 repo.wwrite(f, fc.data(), fc.flags())
4911
4911
4912 audit_path = scmutil.pathauditor(repo.root)
4912 audit_path = scmutil.pathauditor(repo.root)
4913 for f in remove[0]:
4913 for f in remove[0]:
4914 if repo.dirstate[f] == 'a':
4914 if repo.dirstate[f] == 'a':
4915 repo.dirstate.drop(f)
4915 repo.dirstate.drop(f)
4916 continue
4916 continue
4917 audit_path(f)
4917 audit_path(f)
4918 try:
4918 try:
4919 util.unlinkpath(repo.wjoin(f))
4919 util.unlinkpath(repo.wjoin(f))
4920 except OSError:
4920 except OSError:
4921 pass
4921 pass
4922 repo.dirstate.remove(f)
4922 repo.dirstate.remove(f)
4923
4923
4924 normal = None
4924 normal = None
4925 if node == parent:
4925 if node == parent:
4926 # We're reverting to our parent. If possible, we'd like status
4926 # We're reverting to our parent. If possible, we'd like status
4927 # to report the file as clean. We have to use normallookup for
4927 # to report the file as clean. We have to use normallookup for
4928 # merges to avoid losing information about merged/dirty files.
4928 # merges to avoid losing information about merged/dirty files.
4929 if p2 != nullid:
4929 if p2 != nullid:
4930 normal = repo.dirstate.normallookup
4930 normal = repo.dirstate.normallookup
4931 else:
4931 else:
4932 normal = repo.dirstate.normal
4932 normal = repo.dirstate.normal
4933 for f in revert[0]:
4933 for f in revert[0]:
4934 checkout(f)
4934 checkout(f)
4935 if normal:
4935 if normal:
4936 normal(f)
4936 normal(f)
4937
4937
4938 for f in add[0]:
4938 for f in add[0]:
4939 checkout(f)
4939 checkout(f)
4940 repo.dirstate.add(f)
4940 repo.dirstate.add(f)
4941
4941
4942 normal = repo.dirstate.normallookup
4942 normal = repo.dirstate.normallookup
4943 if node == parent and p2 == nullid:
4943 if node == parent and p2 == nullid:
4944 normal = repo.dirstate.normal
4944 normal = repo.dirstate.normal
4945 for f in undelete[0]:
4945 for f in undelete[0]:
4946 checkout(f)
4946 checkout(f)
4947 normal(f)
4947 normal(f)
4948
4948
4949 finally:
4949 finally:
4950 wlock.release()
4950 wlock.release()
4951
4951
4952 @command('rollback', dryrunopts +
4952 @command('rollback', dryrunopts +
4953 [('f', 'force', False, _('ignore safety measures'))])
4953 [('f', 'force', False, _('ignore safety measures'))])
4954 def rollback(ui, repo, **opts):
4954 def rollback(ui, repo, **opts):
4955 """roll back the last transaction (dangerous)
4955 """roll back the last transaction (dangerous)
4956
4956
4957 This command should be used with care. There is only one level of
4957 This command should be used with care. There is only one level of
4958 rollback, and there is no way to undo a rollback. It will also
4958 rollback, and there is no way to undo a rollback. It will also
4959 restore the dirstate at the time of the last transaction, losing
4959 restore the dirstate at the time of the last transaction, losing
4960 any dirstate changes since that time. This command does not alter
4960 any dirstate changes since that time. This command does not alter
4961 the working directory.
4961 the working directory.
4962
4962
4963 Transactions are used to encapsulate the effects of all commands
4963 Transactions are used to encapsulate the effects of all commands
4964 that create new changesets or propagate existing changesets into a
4964 that create new changesets or propagate existing changesets into a
4965 repository. For example, the following commands are transactional,
4965 repository. For example, the following commands are transactional,
4966 and their effects can be rolled back:
4966 and their effects can be rolled back:
4967
4967
4968 - commit
4968 - commit
4969 - import
4969 - import
4970 - pull
4970 - pull
4971 - push (with this repository as the destination)
4971 - push (with this repository as the destination)
4972 - unbundle
4972 - unbundle
4973
4973
4974 To avoid permanent data loss, rollback will refuse to rollback a
4974 To avoid permanent data loss, rollback will refuse to rollback a
4975 commit transaction if it isn't checked out. Use --force to
4975 commit transaction if it isn't checked out. Use --force to
4976 override this protection.
4976 override this protection.
4977
4977
4978 This command is not intended for use on public repositories. Once
4978 This command is not intended for use on public repositories. Once
4979 changes are visible for pull by other users, rolling a transaction
4979 changes are visible for pull by other users, rolling a transaction
4980 back locally is ineffective (someone else may already have pulled
4980 back locally is ineffective (someone else may already have pulled
4981 the changes). Furthermore, a race is possible with readers of the
4981 the changes). Furthermore, a race is possible with readers of the
4982 repository; for example an in-progress pull from the repository
4982 repository; for example an in-progress pull from the repository
4983 may fail if a rollback is performed.
4983 may fail if a rollback is performed.
4984
4984
4985 Returns 0 on success, 1 if no rollback data is available.
4985 Returns 0 on success, 1 if no rollback data is available.
4986 """
4986 """
4987 return repo.rollback(dryrun=opts.get('dry_run'),
4987 return repo.rollback(dryrun=opts.get('dry_run'),
4988 force=opts.get('force'))
4988 force=opts.get('force'))
4989
4989
4990 @command('root', [])
4990 @command('root', [])
4991 def root(ui, repo):
4991 def root(ui, repo):
4992 """print the root (top) of the current working directory
4992 """print the root (top) of the current working directory
4993
4993
4994 Print the root directory of the current repository.
4994 Print the root directory of the current repository.
4995
4995
4996 Returns 0 on success.
4996 Returns 0 on success.
4997 """
4997 """
4998 ui.write(repo.root + "\n")
4998 ui.write(repo.root + "\n")
4999
4999
5000 @command('^serve',
5000 @command('^serve',
5001 [('A', 'accesslog', '', _('name of access log file to write to'),
5001 [('A', 'accesslog', '', _('name of access log file to write to'),
5002 _('FILE')),
5002 _('FILE')),
5003 ('d', 'daemon', None, _('run server in background')),
5003 ('d', 'daemon', None, _('run server in background')),
5004 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
5004 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
5005 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5005 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5006 # use string type, then we can check if something was passed
5006 # use string type, then we can check if something was passed
5007 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5007 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5008 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5008 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5009 _('ADDR')),
5009 _('ADDR')),
5010 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5010 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5011 _('PREFIX')),
5011 _('PREFIX')),
5012 ('n', 'name', '',
5012 ('n', 'name', '',
5013 _('name to show in web pages (default: working directory)'), _('NAME')),
5013 _('name to show in web pages (default: working directory)'), _('NAME')),
5014 ('', 'web-conf', '',
5014 ('', 'web-conf', '',
5015 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
5015 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
5016 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5016 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5017 _('FILE')),
5017 _('FILE')),
5018 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5018 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5019 ('', 'stdio', None, _('for remote clients')),
5019 ('', 'stdio', None, _('for remote clients')),
5020 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
5020 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
5021 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5021 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5022 ('', 'style', '', _('template style to use'), _('STYLE')),
5022 ('', 'style', '', _('template style to use'), _('STYLE')),
5023 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5023 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5024 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
5024 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
5025 _('[OPTION]...'))
5025 _('[OPTION]...'))
5026 def serve(ui, repo, **opts):
5026 def serve(ui, repo, **opts):
5027 """start stand-alone webserver
5027 """start stand-alone webserver
5028
5028
5029 Start a local HTTP repository browser and pull server. You can use
5029 Start a local HTTP repository browser and pull server. You can use
5030 this for ad-hoc sharing and browsing of repositories. It is
5030 this for ad-hoc sharing and browsing of repositories. It is
5031 recommended to use a real web server to serve a repository for
5031 recommended to use a real web server to serve a repository for
5032 longer periods of time.
5032 longer periods of time.
5033
5033
5034 Please note that the server does not implement access control.
5034 Please note that the server does not implement access control.
5035 This means that, by default, anybody can read from the server and
5035 This means that, by default, anybody can read from the server and
5036 nobody can write to it by default. Set the ``web.allow_push``
5036 nobody can write to it by default. Set the ``web.allow_push``
5037 option to ``*`` to allow everybody to push to the server. You
5037 option to ``*`` to allow everybody to push to the server. You
5038 should use a real web server if you need to authenticate users.
5038 should use a real web server if you need to authenticate users.
5039
5039
5040 By default, the server logs accesses to stdout and errors to
5040 By default, the server logs accesses to stdout and errors to
5041 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5041 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5042 files.
5042 files.
5043
5043
5044 To have the server choose a free port number to listen on, specify
5044 To have the server choose a free port number to listen on, specify
5045 a port number of 0; in this case, the server will print the port
5045 a port number of 0; in this case, the server will print the port
5046 number it uses.
5046 number it uses.
5047
5047
5048 Returns 0 on success.
5048 Returns 0 on success.
5049 """
5049 """
5050
5050
5051 if opts["stdio"] and opts["cmdserver"]:
5051 if opts["stdio"] and opts["cmdserver"]:
5052 raise util.Abort(_("cannot use --stdio with --cmdserver"))
5052 raise util.Abort(_("cannot use --stdio with --cmdserver"))
5053
5053
5054 def checkrepo():
5054 def checkrepo():
5055 if repo is None:
5055 if repo is None:
5056 raise error.RepoError(_("There is no Mercurial repository here"
5056 raise error.RepoError(_("There is no Mercurial repository here"
5057 " (.hg not found)"))
5057 " (.hg not found)"))
5058
5058
5059 if opts["stdio"]:
5059 if opts["stdio"]:
5060 checkrepo()
5060 checkrepo()
5061 s = sshserver.sshserver(ui, repo)
5061 s = sshserver.sshserver(ui, repo)
5062 s.serve_forever()
5062 s.serve_forever()
5063
5063
5064 if opts["cmdserver"]:
5064 if opts["cmdserver"]:
5065 checkrepo()
5065 checkrepo()
5066 s = commandserver.server(ui, repo, opts["cmdserver"])
5066 s = commandserver.server(ui, repo, opts["cmdserver"])
5067 return s.serve()
5067 return s.serve()
5068
5068
5069 # this way we can check if something was given in the command-line
5069 # this way we can check if something was given in the command-line
5070 if opts.get('port'):
5070 if opts.get('port'):
5071 opts['port'] = util.getport(opts.get('port'))
5071 opts['port'] = util.getport(opts.get('port'))
5072
5072
5073 baseui = repo and repo.baseui or ui
5073 baseui = repo and repo.baseui or ui
5074 optlist = ("name templates style address port prefix ipv6"
5074 optlist = ("name templates style address port prefix ipv6"
5075 " accesslog errorlog certificate encoding")
5075 " accesslog errorlog certificate encoding")
5076 for o in optlist.split():
5076 for o in optlist.split():
5077 val = opts.get(o, '')
5077 val = opts.get(o, '')
5078 if val in (None, ''): # should check against default options instead
5078 if val in (None, ''): # should check against default options instead
5079 continue
5079 continue
5080 baseui.setconfig("web", o, val)
5080 baseui.setconfig("web", o, val)
5081 if repo and repo.ui != baseui:
5081 if repo and repo.ui != baseui:
5082 repo.ui.setconfig("web", o, val)
5082 repo.ui.setconfig("web", o, val)
5083
5083
5084 o = opts.get('web_conf') or opts.get('webdir_conf')
5084 o = opts.get('web_conf') or opts.get('webdir_conf')
5085 if not o:
5085 if not o:
5086 if not repo:
5086 if not repo:
5087 raise error.RepoError(_("There is no Mercurial repository"
5087 raise error.RepoError(_("There is no Mercurial repository"
5088 " here (.hg not found)"))
5088 " here (.hg not found)"))
5089 o = repo.root
5089 o = repo.root
5090
5090
5091 app = hgweb.hgweb(o, baseui=ui)
5091 app = hgweb.hgweb(o, baseui=ui)
5092
5092
5093 class service(object):
5093 class service(object):
5094 def init(self):
5094 def init(self):
5095 util.setsignalhandler()
5095 util.setsignalhandler()
5096 self.httpd = hgweb.server.create_server(ui, app)
5096 self.httpd = hgweb.server.create_server(ui, app)
5097
5097
5098 if opts['port'] and not ui.verbose:
5098 if opts['port'] and not ui.verbose:
5099 return
5099 return
5100
5100
5101 if self.httpd.prefix:
5101 if self.httpd.prefix:
5102 prefix = self.httpd.prefix.strip('/') + '/'
5102 prefix = self.httpd.prefix.strip('/') + '/'
5103 else:
5103 else:
5104 prefix = ''
5104 prefix = ''
5105
5105
5106 port = ':%d' % self.httpd.port
5106 port = ':%d' % self.httpd.port
5107 if port == ':80':
5107 if port == ':80':
5108 port = ''
5108 port = ''
5109
5109
5110 bindaddr = self.httpd.addr
5110 bindaddr = self.httpd.addr
5111 if bindaddr == '0.0.0.0':
5111 if bindaddr == '0.0.0.0':
5112 bindaddr = '*'
5112 bindaddr = '*'
5113 elif ':' in bindaddr: # IPv6
5113 elif ':' in bindaddr: # IPv6
5114 bindaddr = '[%s]' % bindaddr
5114 bindaddr = '[%s]' % bindaddr
5115
5115
5116 fqaddr = self.httpd.fqaddr
5116 fqaddr = self.httpd.fqaddr
5117 if ':' in fqaddr:
5117 if ':' in fqaddr:
5118 fqaddr = '[%s]' % fqaddr
5118 fqaddr = '[%s]' % fqaddr
5119 if opts['port']:
5119 if opts['port']:
5120 write = ui.status
5120 write = ui.status
5121 else:
5121 else:
5122 write = ui.write
5122 write = ui.write
5123 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5123 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5124 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5124 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5125
5125
5126 def run(self):
5126 def run(self):
5127 self.httpd.serve_forever()
5127 self.httpd.serve_forever()
5128
5128
5129 service = service()
5129 service = service()
5130
5130
5131 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5131 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5132
5132
5133 @command('showconfig|debugconfig',
5133 @command('showconfig|debugconfig',
5134 [('u', 'untrusted', None, _('show untrusted configuration options'))],
5134 [('u', 'untrusted', None, _('show untrusted configuration options'))],
5135 _('[-u] [NAME]...'))
5135 _('[-u] [NAME]...'))
5136 def showconfig(ui, repo, *values, **opts):
5136 def showconfig(ui, repo, *values, **opts):
5137 """show combined config settings from all hgrc files
5137 """show combined config settings from all hgrc files
5138
5138
5139 With no arguments, print names and values of all config items.
5139 With no arguments, print names and values of all config items.
5140
5140
5141 With one argument of the form section.name, print just the value
5141 With one argument of the form section.name, print just the value
5142 of that config item.
5142 of that config item.
5143
5143
5144 With multiple arguments, print names and values of all config
5144 With multiple arguments, print names and values of all config
5145 items with matching section names.
5145 items with matching section names.
5146
5146
5147 With --debug, the source (filename and line number) is printed
5147 With --debug, the source (filename and line number) is printed
5148 for each config item.
5148 for each config item.
5149
5149
5150 Returns 0 on success.
5150 Returns 0 on success.
5151 """
5151 """
5152
5152
5153 for f in scmutil.rcpath():
5153 for f in scmutil.rcpath():
5154 ui.debug('read config from: %s\n' % f)
5154 ui.debug('read config from: %s\n' % f)
5155 untrusted = bool(opts.get('untrusted'))
5155 untrusted = bool(opts.get('untrusted'))
5156 if values:
5156 if values:
5157 sections = [v for v in values if '.' not in v]
5157 sections = [v for v in values if '.' not in v]
5158 items = [v for v in values if '.' in v]
5158 items = [v for v in values if '.' in v]
5159 if len(items) > 1 or items and sections:
5159 if len(items) > 1 or items and sections:
5160 raise util.Abort(_('only one config item permitted'))
5160 raise util.Abort(_('only one config item permitted'))
5161 for section, name, value in ui.walkconfig(untrusted=untrusted):
5161 for section, name, value in ui.walkconfig(untrusted=untrusted):
5162 value = str(value).replace('\n', '\\n')
5162 value = str(value).replace('\n', '\\n')
5163 sectname = section + '.' + name
5163 sectname = section + '.' + name
5164 if values:
5164 if values:
5165 for v in values:
5165 for v in values:
5166 if v == section:
5166 if v == section:
5167 ui.debug('%s: ' %
5167 ui.debug('%s: ' %
5168 ui.configsource(section, name, untrusted))
5168 ui.configsource(section, name, untrusted))
5169 ui.write('%s=%s\n' % (sectname, value))
5169 ui.write('%s=%s\n' % (sectname, value))
5170 elif v == sectname:
5170 elif v == sectname:
5171 ui.debug('%s: ' %
5171 ui.debug('%s: ' %
5172 ui.configsource(section, name, untrusted))
5172 ui.configsource(section, name, untrusted))
5173 ui.write(value, '\n')
5173 ui.write(value, '\n')
5174 else:
5174 else:
5175 ui.debug('%s: ' %
5175 ui.debug('%s: ' %
5176 ui.configsource(section, name, untrusted))
5176 ui.configsource(section, name, untrusted))
5177 ui.write('%s=%s\n' % (sectname, value))
5177 ui.write('%s=%s\n' % (sectname, value))
5178
5178
5179 @command('^status|st',
5179 @command('^status|st',
5180 [('A', 'all', None, _('show status of all files')),
5180 [('A', 'all', None, _('show status of all files')),
5181 ('m', 'modified', None, _('show only modified files')),
5181 ('m', 'modified', None, _('show only modified files')),
5182 ('a', 'added', None, _('show only added files')),
5182 ('a', 'added', None, _('show only added files')),
5183 ('r', 'removed', None, _('show only removed files')),
5183 ('r', 'removed', None, _('show only removed files')),
5184 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5184 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5185 ('c', 'clean', None, _('show only files without changes')),
5185 ('c', 'clean', None, _('show only files without changes')),
5186 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5186 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5187 ('i', 'ignored', None, _('show only ignored files')),
5187 ('i', 'ignored', None, _('show only ignored files')),
5188 ('n', 'no-status', None, _('hide status prefix')),
5188 ('n', 'no-status', None, _('hide status prefix')),
5189 ('C', 'copies', None, _('show source of copied files')),
5189 ('C', 'copies', None, _('show source of copied files')),
5190 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5190 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5191 ('', 'rev', [], _('show difference from revision'), _('REV')),
5191 ('', 'rev', [], _('show difference from revision'), _('REV')),
5192 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5192 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5193 ] + walkopts + subrepoopts,
5193 ] + walkopts + subrepoopts,
5194 _('[OPTION]... [FILE]...'))
5194 _('[OPTION]... [FILE]...'))
5195 def status(ui, repo, *pats, **opts):
5195 def status(ui, repo, *pats, **opts):
5196 """show changed files in the working directory
5196 """show changed files in the working directory
5197
5197
5198 Show status of files in the repository. If names are given, only
5198 Show status of files in the repository. If names are given, only
5199 files that match are shown. Files that are clean or ignored or
5199 files that match are shown. Files that are clean or ignored or
5200 the source of a copy/move operation, are not listed unless
5200 the source of a copy/move operation, are not listed unless
5201 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5201 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5202 Unless options described with "show only ..." are given, the
5202 Unless options described with "show only ..." are given, the
5203 options -mardu are used.
5203 options -mardu are used.
5204
5204
5205 Option -q/--quiet hides untracked (unknown and ignored) files
5205 Option -q/--quiet hides untracked (unknown and ignored) files
5206 unless explicitly requested with -u/--unknown or -i/--ignored.
5206 unless explicitly requested with -u/--unknown or -i/--ignored.
5207
5207
5208 .. note::
5208 .. note::
5209 status may appear to disagree with diff if permissions have
5209 status may appear to disagree with diff if permissions have
5210 changed or a merge has occurred. The standard diff format does
5210 changed or a merge has occurred. The standard diff format does
5211 not report permission changes and diff only reports changes
5211 not report permission changes and diff only reports changes
5212 relative to one merge parent.
5212 relative to one merge parent.
5213
5213
5214 If one revision is given, it is used as the base revision.
5214 If one revision is given, it is used as the base revision.
5215 If two revisions are given, the differences between them are
5215 If two revisions are given, the differences between them are
5216 shown. The --change option can also be used as a shortcut to list
5216 shown. The --change option can also be used as a shortcut to list
5217 the changed files of a revision from its first parent.
5217 the changed files of a revision from its first parent.
5218
5218
5219 The codes used to show the status of files are::
5219 The codes used to show the status of files are::
5220
5220
5221 M = modified
5221 M = modified
5222 A = added
5222 A = added
5223 R = removed
5223 R = removed
5224 C = clean
5224 C = clean
5225 ! = missing (deleted by non-hg command, but still tracked)
5225 ! = missing (deleted by non-hg command, but still tracked)
5226 ? = not tracked
5226 ? = not tracked
5227 I = ignored
5227 I = ignored
5228 = origin of the previous file listed as A (added)
5228 = origin of the previous file listed as A (added)
5229
5229
5230 .. container:: verbose
5230 .. container:: verbose
5231
5231
5232 Examples:
5232 Examples:
5233
5233
5234 - show changes in the working directory relative to a
5234 - show changes in the working directory relative to a
5235 changeset::
5235 changeset::
5236
5236
5237 hg status --rev 9353
5237 hg status --rev 9353
5238
5238
5239 - show all changes including copies in an existing changeset::
5239 - show all changes including copies in an existing changeset::
5240
5240
5241 hg status --copies --change 9353
5241 hg status --copies --change 9353
5242
5242
5243 - get a NUL separated list of added files, suitable for xargs::
5243 - get a NUL separated list of added files, suitable for xargs::
5244
5244
5245 hg status -an0
5245 hg status -an0
5246
5246
5247 Returns 0 on success.
5247 Returns 0 on success.
5248 """
5248 """
5249
5249
5250 revs = opts.get('rev')
5250 revs = opts.get('rev')
5251 change = opts.get('change')
5251 change = opts.get('change')
5252
5252
5253 if revs and change:
5253 if revs and change:
5254 msg = _('cannot specify --rev and --change at the same time')
5254 msg = _('cannot specify --rev and --change at the same time')
5255 raise util.Abort(msg)
5255 raise util.Abort(msg)
5256 elif change:
5256 elif change:
5257 node2 = scmutil.revsingle(repo, change, None).node()
5257 node2 = scmutil.revsingle(repo, change, None).node()
5258 node1 = repo[node2].p1().node()
5258 node1 = repo[node2].p1().node()
5259 else:
5259 else:
5260 node1, node2 = scmutil.revpair(repo, revs)
5260 node1, node2 = scmutil.revpair(repo, revs)
5261
5261
5262 cwd = (pats and repo.getcwd()) or ''
5262 cwd = (pats and repo.getcwd()) or ''
5263 end = opts.get('print0') and '\0' or '\n'
5263 end = opts.get('print0') and '\0' or '\n'
5264 copy = {}
5264 copy = {}
5265 states = 'modified added removed deleted unknown ignored clean'.split()
5265 states = 'modified added removed deleted unknown ignored clean'.split()
5266 show = [k for k in states if opts.get(k)]
5266 show = [k for k in states if opts.get(k)]
5267 if opts.get('all'):
5267 if opts.get('all'):
5268 show += ui.quiet and (states[:4] + ['clean']) or states
5268 show += ui.quiet and (states[:4] + ['clean']) or states
5269 if not show:
5269 if not show:
5270 show = ui.quiet and states[:4] or states[:5]
5270 show = ui.quiet and states[:4] or states[:5]
5271
5271
5272 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5272 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5273 'ignored' in show, 'clean' in show, 'unknown' in show,
5273 'ignored' in show, 'clean' in show, 'unknown' in show,
5274 opts.get('subrepos'))
5274 opts.get('subrepos'))
5275 changestates = zip(states, 'MAR!?IC', stat)
5275 changestates = zip(states, 'MAR!?IC', stat)
5276
5276
5277 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5277 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5278 copy = copies.pathcopies(repo[node1], repo[node2])
5278 copy = copies.pathcopies(repo[node1], repo[node2])
5279
5279
5280 fm = ui.formatter('status', opts)
5281 format = '%s %s' + end
5282 if opts.get('no_status'):
5283 format = '%.0s%s' + end
5284
5280 for state, char, files in changestates:
5285 for state, char, files in changestates:
5281 if state in show:
5286 if state in show:
5282 format = "%s %%s%s" % (char, end)
5287 label = 'status.' + state
5283 if opts.get('no_status'):
5284 format = "%%s%s" % end
5285
5286 for f in files:
5288 for f in files:
5287 ui.write(format % repo.pathto(f, cwd),
5289 fm.startitem()
5288 label='status.' + state)
5290 fm.write("status char", format, char,
5291 repo.pathto(f, cwd), label=label)
5289 if f in copy:
5292 if f in copy:
5290 ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end),
5293 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5291 label='status.copied')
5294 label='status.copied')
5295 fm.end()
5292
5296
5293 @command('^summary|sum',
5297 @command('^summary|sum',
5294 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5298 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5295 def summary(ui, repo, **opts):
5299 def summary(ui, repo, **opts):
5296 """summarize working directory state
5300 """summarize working directory state
5297
5301
5298 This generates a brief summary of the working directory state,
5302 This generates a brief summary of the working directory state,
5299 including parents, branch, commit status, and available updates.
5303 including parents, branch, commit status, and available updates.
5300
5304
5301 With the --remote option, this will check the default paths for
5305 With the --remote option, this will check the default paths for
5302 incoming and outgoing changes. This can be time-consuming.
5306 incoming and outgoing changes. This can be time-consuming.
5303
5307
5304 Returns 0 on success.
5308 Returns 0 on success.
5305 """
5309 """
5306
5310
5307 ctx = repo[None]
5311 ctx = repo[None]
5308 parents = ctx.parents()
5312 parents = ctx.parents()
5309 pnode = parents[0].node()
5313 pnode = parents[0].node()
5310 marks = []
5314 marks = []
5311
5315
5312 for p in parents:
5316 for p in parents:
5313 # label with log.changeset (instead of log.parent) since this
5317 # label with log.changeset (instead of log.parent) since this
5314 # shows a working directory parent *changeset*:
5318 # shows a working directory parent *changeset*:
5315 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5319 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5316 label='log.changeset')
5320 label='log.changeset')
5317 ui.write(' '.join(p.tags()), label='log.tag')
5321 ui.write(' '.join(p.tags()), label='log.tag')
5318 if p.bookmarks():
5322 if p.bookmarks():
5319 marks.extend(p.bookmarks())
5323 marks.extend(p.bookmarks())
5320 if p.rev() == -1:
5324 if p.rev() == -1:
5321 if not len(repo):
5325 if not len(repo):
5322 ui.write(_(' (empty repository)'))
5326 ui.write(_(' (empty repository)'))
5323 else:
5327 else:
5324 ui.write(_(' (no revision checked out)'))
5328 ui.write(_(' (no revision checked out)'))
5325 ui.write('\n')
5329 ui.write('\n')
5326 if p.description():
5330 if p.description():
5327 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5331 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5328 label='log.summary')
5332 label='log.summary')
5329
5333
5330 branch = ctx.branch()
5334 branch = ctx.branch()
5331 bheads = repo.branchheads(branch)
5335 bheads = repo.branchheads(branch)
5332 m = _('branch: %s\n') % branch
5336 m = _('branch: %s\n') % branch
5333 if branch != 'default':
5337 if branch != 'default':
5334 ui.write(m, label='log.branch')
5338 ui.write(m, label='log.branch')
5335 else:
5339 else:
5336 ui.status(m, label='log.branch')
5340 ui.status(m, label='log.branch')
5337
5341
5338 if marks:
5342 if marks:
5339 current = repo._bookmarkcurrent
5343 current = repo._bookmarkcurrent
5340 ui.write(_('bookmarks:'), label='log.bookmark')
5344 ui.write(_('bookmarks:'), label='log.bookmark')
5341 if current is not None:
5345 if current is not None:
5342 try:
5346 try:
5343 marks.remove(current)
5347 marks.remove(current)
5344 ui.write(' *' + current, label='bookmarks.current')
5348 ui.write(' *' + current, label='bookmarks.current')
5345 except ValueError:
5349 except ValueError:
5346 # current bookmark not in parent ctx marks
5350 # current bookmark not in parent ctx marks
5347 pass
5351 pass
5348 for m in marks:
5352 for m in marks:
5349 ui.write(' ' + m, label='log.bookmark')
5353 ui.write(' ' + m, label='log.bookmark')
5350 ui.write('\n', label='log.bookmark')
5354 ui.write('\n', label='log.bookmark')
5351
5355
5352 st = list(repo.status(unknown=True))[:6]
5356 st = list(repo.status(unknown=True))[:6]
5353
5357
5354 c = repo.dirstate.copies()
5358 c = repo.dirstate.copies()
5355 copied, renamed = [], []
5359 copied, renamed = [], []
5356 for d, s in c.iteritems():
5360 for d, s in c.iteritems():
5357 if s in st[2]:
5361 if s in st[2]:
5358 st[2].remove(s)
5362 st[2].remove(s)
5359 renamed.append(d)
5363 renamed.append(d)
5360 else:
5364 else:
5361 copied.append(d)
5365 copied.append(d)
5362 if d in st[1]:
5366 if d in st[1]:
5363 st[1].remove(d)
5367 st[1].remove(d)
5364 st.insert(3, renamed)
5368 st.insert(3, renamed)
5365 st.insert(4, copied)
5369 st.insert(4, copied)
5366
5370
5367 ms = mergemod.mergestate(repo)
5371 ms = mergemod.mergestate(repo)
5368 st.append([f for f in ms if ms[f] == 'u'])
5372 st.append([f for f in ms if ms[f] == 'u'])
5369
5373
5370 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5374 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5371 st.append(subs)
5375 st.append(subs)
5372
5376
5373 labels = [ui.label(_('%d modified'), 'status.modified'),
5377 labels = [ui.label(_('%d modified'), 'status.modified'),
5374 ui.label(_('%d added'), 'status.added'),
5378 ui.label(_('%d added'), 'status.added'),
5375 ui.label(_('%d removed'), 'status.removed'),
5379 ui.label(_('%d removed'), 'status.removed'),
5376 ui.label(_('%d renamed'), 'status.copied'),
5380 ui.label(_('%d renamed'), 'status.copied'),
5377 ui.label(_('%d copied'), 'status.copied'),
5381 ui.label(_('%d copied'), 'status.copied'),
5378 ui.label(_('%d deleted'), 'status.deleted'),
5382 ui.label(_('%d deleted'), 'status.deleted'),
5379 ui.label(_('%d unknown'), 'status.unknown'),
5383 ui.label(_('%d unknown'), 'status.unknown'),
5380 ui.label(_('%d ignored'), 'status.ignored'),
5384 ui.label(_('%d ignored'), 'status.ignored'),
5381 ui.label(_('%d unresolved'), 'resolve.unresolved'),
5385 ui.label(_('%d unresolved'), 'resolve.unresolved'),
5382 ui.label(_('%d subrepos'), 'status.modified')]
5386 ui.label(_('%d subrepos'), 'status.modified')]
5383 t = []
5387 t = []
5384 for s, l in zip(st, labels):
5388 for s, l in zip(st, labels):
5385 if s:
5389 if s:
5386 t.append(l % len(s))
5390 t.append(l % len(s))
5387
5391
5388 t = ', '.join(t)
5392 t = ', '.join(t)
5389 cleanworkdir = False
5393 cleanworkdir = False
5390
5394
5391 if len(parents) > 1:
5395 if len(parents) > 1:
5392 t += _(' (merge)')
5396 t += _(' (merge)')
5393 elif branch != parents[0].branch():
5397 elif branch != parents[0].branch():
5394 t += _(' (new branch)')
5398 t += _(' (new branch)')
5395 elif (parents[0].extra().get('close') and
5399 elif (parents[0].extra().get('close') and
5396 pnode in repo.branchheads(branch, closed=True)):
5400 pnode in repo.branchheads(branch, closed=True)):
5397 t += _(' (head closed)')
5401 t += _(' (head closed)')
5398 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
5402 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
5399 t += _(' (clean)')
5403 t += _(' (clean)')
5400 cleanworkdir = True
5404 cleanworkdir = True
5401 elif pnode not in bheads:
5405 elif pnode not in bheads:
5402 t += _(' (new branch head)')
5406 t += _(' (new branch head)')
5403
5407
5404 if cleanworkdir:
5408 if cleanworkdir:
5405 ui.status(_('commit: %s\n') % t.strip())
5409 ui.status(_('commit: %s\n') % t.strip())
5406 else:
5410 else:
5407 ui.write(_('commit: %s\n') % t.strip())
5411 ui.write(_('commit: %s\n') % t.strip())
5408
5412
5409 # all ancestors of branch heads - all ancestors of parent = new csets
5413 # all ancestors of branch heads - all ancestors of parent = new csets
5410 new = [0] * len(repo)
5414 new = [0] * len(repo)
5411 cl = repo.changelog
5415 cl = repo.changelog
5412 for a in [cl.rev(n) for n in bheads]:
5416 for a in [cl.rev(n) for n in bheads]:
5413 new[a] = 1
5417 new[a] = 1
5414 for a in cl.ancestors(*[cl.rev(n) for n in bheads]):
5418 for a in cl.ancestors(*[cl.rev(n) for n in bheads]):
5415 new[a] = 1
5419 new[a] = 1
5416 for a in [p.rev() for p in parents]:
5420 for a in [p.rev() for p in parents]:
5417 if a >= 0:
5421 if a >= 0:
5418 new[a] = 0
5422 new[a] = 0
5419 for a in cl.ancestors(*[p.rev() for p in parents]):
5423 for a in cl.ancestors(*[p.rev() for p in parents]):
5420 new[a] = 0
5424 new[a] = 0
5421 new = sum(new)
5425 new = sum(new)
5422
5426
5423 if new == 0:
5427 if new == 0:
5424 ui.status(_('update: (current)\n'))
5428 ui.status(_('update: (current)\n'))
5425 elif pnode not in bheads:
5429 elif pnode not in bheads:
5426 ui.write(_('update: %d new changesets (update)\n') % new)
5430 ui.write(_('update: %d new changesets (update)\n') % new)
5427 else:
5431 else:
5428 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5432 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5429 (new, len(bheads)))
5433 (new, len(bheads)))
5430
5434
5431 if opts.get('remote'):
5435 if opts.get('remote'):
5432 t = []
5436 t = []
5433 source, branches = hg.parseurl(ui.expandpath('default'))
5437 source, branches = hg.parseurl(ui.expandpath('default'))
5434 other = hg.peer(repo, {}, source)
5438 other = hg.peer(repo, {}, source)
5435 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
5439 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
5436 ui.debug('comparing with %s\n' % util.hidepassword(source))
5440 ui.debug('comparing with %s\n' % util.hidepassword(source))
5437 repo.ui.pushbuffer()
5441 repo.ui.pushbuffer()
5438 commoninc = discovery.findcommonincoming(repo, other)
5442 commoninc = discovery.findcommonincoming(repo, other)
5439 _common, incoming, _rheads = commoninc
5443 _common, incoming, _rheads = commoninc
5440 repo.ui.popbuffer()
5444 repo.ui.popbuffer()
5441 if incoming:
5445 if incoming:
5442 t.append(_('1 or more incoming'))
5446 t.append(_('1 or more incoming'))
5443
5447
5444 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5448 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5445 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5449 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5446 if source != dest:
5450 if source != dest:
5447 other = hg.peer(repo, {}, dest)
5451 other = hg.peer(repo, {}, dest)
5448 commoninc = None
5452 commoninc = None
5449 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5453 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5450 repo.ui.pushbuffer()
5454 repo.ui.pushbuffer()
5451 outgoing = discovery.findcommonoutgoing(repo, other,
5455 outgoing = discovery.findcommonoutgoing(repo, other,
5452 commoninc=commoninc)
5456 commoninc=commoninc)
5453 repo.ui.popbuffer()
5457 repo.ui.popbuffer()
5454 o = outgoing.missing
5458 o = outgoing.missing
5455 if o:
5459 if o:
5456 t.append(_('%d outgoing') % len(o))
5460 t.append(_('%d outgoing') % len(o))
5457 if 'bookmarks' in other.listkeys('namespaces'):
5461 if 'bookmarks' in other.listkeys('namespaces'):
5458 lmarks = repo.listkeys('bookmarks')
5462 lmarks = repo.listkeys('bookmarks')
5459 rmarks = other.listkeys('bookmarks')
5463 rmarks = other.listkeys('bookmarks')
5460 diff = set(rmarks) - set(lmarks)
5464 diff = set(rmarks) - set(lmarks)
5461 if len(diff) > 0:
5465 if len(diff) > 0:
5462 t.append(_('%d incoming bookmarks') % len(diff))
5466 t.append(_('%d incoming bookmarks') % len(diff))
5463 diff = set(lmarks) - set(rmarks)
5467 diff = set(lmarks) - set(rmarks)
5464 if len(diff) > 0:
5468 if len(diff) > 0:
5465 t.append(_('%d outgoing bookmarks') % len(diff))
5469 t.append(_('%d outgoing bookmarks') % len(diff))
5466
5470
5467 if t:
5471 if t:
5468 ui.write(_('remote: %s\n') % (', '.join(t)))
5472 ui.write(_('remote: %s\n') % (', '.join(t)))
5469 else:
5473 else:
5470 ui.status(_('remote: (synced)\n'))
5474 ui.status(_('remote: (synced)\n'))
5471
5475
5472 @command('tag',
5476 @command('tag',
5473 [('f', 'force', None, _('force tag')),
5477 [('f', 'force', None, _('force tag')),
5474 ('l', 'local', None, _('make the tag local')),
5478 ('l', 'local', None, _('make the tag local')),
5475 ('r', 'rev', '', _('revision to tag'), _('REV')),
5479 ('r', 'rev', '', _('revision to tag'), _('REV')),
5476 ('', 'remove', None, _('remove a tag')),
5480 ('', 'remove', None, _('remove a tag')),
5477 # -l/--local is already there, commitopts cannot be used
5481 # -l/--local is already there, commitopts cannot be used
5478 ('e', 'edit', None, _('edit commit message')),
5482 ('e', 'edit', None, _('edit commit message')),
5479 ('m', 'message', '', _('use <text> as commit message'), _('TEXT')),
5483 ('m', 'message', '', _('use <text> as commit message'), _('TEXT')),
5480 ] + commitopts2,
5484 ] + commitopts2,
5481 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5485 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5482 def tag(ui, repo, name1, *names, **opts):
5486 def tag(ui, repo, name1, *names, **opts):
5483 """add one or more tags for the current or given revision
5487 """add one or more tags for the current or given revision
5484
5488
5485 Name a particular revision using <name>.
5489 Name a particular revision using <name>.
5486
5490
5487 Tags are used to name particular revisions of the repository and are
5491 Tags are used to name particular revisions of the repository and are
5488 very useful to compare different revisions, to go back to significant
5492 very useful to compare different revisions, to go back to significant
5489 earlier versions or to mark branch points as releases, etc. Changing
5493 earlier versions or to mark branch points as releases, etc. Changing
5490 an existing tag is normally disallowed; use -f/--force to override.
5494 an existing tag is normally disallowed; use -f/--force to override.
5491
5495
5492 If no revision is given, the parent of the working directory is
5496 If no revision is given, the parent of the working directory is
5493 used, or tip if no revision is checked out.
5497 used, or tip if no revision is checked out.
5494
5498
5495 To facilitate version control, distribution, and merging of tags,
5499 To facilitate version control, distribution, and merging of tags,
5496 they are stored as a file named ".hgtags" which is managed similarly
5500 they are stored as a file named ".hgtags" which is managed similarly
5497 to other project files and can be hand-edited if necessary. This
5501 to other project files and can be hand-edited if necessary. This
5498 also means that tagging creates a new commit. The file
5502 also means that tagging creates a new commit. The file
5499 ".hg/localtags" is used for local tags (not shared among
5503 ".hg/localtags" is used for local tags (not shared among
5500 repositories).
5504 repositories).
5501
5505
5502 Tag commits are usually made at the head of a branch. If the parent
5506 Tag commits are usually made at the head of a branch. If the parent
5503 of the working directory is not a branch head, :hg:`tag` aborts; use
5507 of the working directory is not a branch head, :hg:`tag` aborts; use
5504 -f/--force to force the tag commit to be based on a non-head
5508 -f/--force to force the tag commit to be based on a non-head
5505 changeset.
5509 changeset.
5506
5510
5507 See :hg:`help dates` for a list of formats valid for -d/--date.
5511 See :hg:`help dates` for a list of formats valid for -d/--date.
5508
5512
5509 Since tag names have priority over branch names during revision
5513 Since tag names have priority over branch names during revision
5510 lookup, using an existing branch name as a tag name is discouraged.
5514 lookup, using an existing branch name as a tag name is discouraged.
5511
5515
5512 Returns 0 on success.
5516 Returns 0 on success.
5513 """
5517 """
5514 wlock = lock = None
5518 wlock = lock = None
5515 try:
5519 try:
5516 wlock = repo.wlock()
5520 wlock = repo.wlock()
5517 lock = repo.lock()
5521 lock = repo.lock()
5518 rev_ = "."
5522 rev_ = "."
5519 names = [t.strip() for t in (name1,) + names]
5523 names = [t.strip() for t in (name1,) + names]
5520 if len(names) != len(set(names)):
5524 if len(names) != len(set(names)):
5521 raise util.Abort(_('tag names must be unique'))
5525 raise util.Abort(_('tag names must be unique'))
5522 for n in names:
5526 for n in names:
5523 if n in ['tip', '.', 'null']:
5527 if n in ['tip', '.', 'null']:
5524 raise util.Abort(_("the name '%s' is reserved") % n)
5528 raise util.Abort(_("the name '%s' is reserved") % n)
5525 if not n:
5529 if not n:
5526 raise util.Abort(_('tag names cannot consist entirely of '
5530 raise util.Abort(_('tag names cannot consist entirely of '
5527 'whitespace'))
5531 'whitespace'))
5528 if opts.get('rev') and opts.get('remove'):
5532 if opts.get('rev') and opts.get('remove'):
5529 raise util.Abort(_("--rev and --remove are incompatible"))
5533 raise util.Abort(_("--rev and --remove are incompatible"))
5530 if opts.get('rev'):
5534 if opts.get('rev'):
5531 rev_ = opts['rev']
5535 rev_ = opts['rev']
5532 message = opts.get('message')
5536 message = opts.get('message')
5533 if opts.get('remove'):
5537 if opts.get('remove'):
5534 expectedtype = opts.get('local') and 'local' or 'global'
5538 expectedtype = opts.get('local') and 'local' or 'global'
5535 for n in names:
5539 for n in names:
5536 if not repo.tagtype(n):
5540 if not repo.tagtype(n):
5537 raise util.Abort(_("tag '%s' does not exist") % n)
5541 raise util.Abort(_("tag '%s' does not exist") % n)
5538 if repo.tagtype(n) != expectedtype:
5542 if repo.tagtype(n) != expectedtype:
5539 if expectedtype == 'global':
5543 if expectedtype == 'global':
5540 raise util.Abort(_("tag '%s' is not a global tag") % n)
5544 raise util.Abort(_("tag '%s' is not a global tag") % n)
5541 else:
5545 else:
5542 raise util.Abort(_("tag '%s' is not a local tag") % n)
5546 raise util.Abort(_("tag '%s' is not a local tag") % n)
5543 rev_ = nullid
5547 rev_ = nullid
5544 if not message:
5548 if not message:
5545 # we don't translate commit messages
5549 # we don't translate commit messages
5546 message = 'Removed tag %s' % ', '.join(names)
5550 message = 'Removed tag %s' % ', '.join(names)
5547 elif not opts.get('force'):
5551 elif not opts.get('force'):
5548 for n in names:
5552 for n in names:
5549 if n in repo.tags():
5553 if n in repo.tags():
5550 raise util.Abort(_("tag '%s' already exists "
5554 raise util.Abort(_("tag '%s' already exists "
5551 "(use -f to force)") % n)
5555 "(use -f to force)") % n)
5552 if not opts.get('local'):
5556 if not opts.get('local'):
5553 p1, p2 = repo.dirstate.parents()
5557 p1, p2 = repo.dirstate.parents()
5554 if p2 != nullid:
5558 if p2 != nullid:
5555 raise util.Abort(_('uncommitted merge'))
5559 raise util.Abort(_('uncommitted merge'))
5556 bheads = repo.branchheads()
5560 bheads = repo.branchheads()
5557 if not opts.get('force') and bheads and p1 not in bheads:
5561 if not opts.get('force') and bheads and p1 not in bheads:
5558 raise util.Abort(_('not at a branch head (use -f to force)'))
5562 raise util.Abort(_('not at a branch head (use -f to force)'))
5559 r = scmutil.revsingle(repo, rev_).node()
5563 r = scmutil.revsingle(repo, rev_).node()
5560
5564
5561 if not message:
5565 if not message:
5562 # we don't translate commit messages
5566 # we don't translate commit messages
5563 message = ('Added tag %s for changeset %s' %
5567 message = ('Added tag %s for changeset %s' %
5564 (', '.join(names), short(r)))
5568 (', '.join(names), short(r)))
5565
5569
5566 date = opts.get('date')
5570 date = opts.get('date')
5567 if date:
5571 if date:
5568 date = util.parsedate(date)
5572 date = util.parsedate(date)
5569
5573
5570 if opts.get('edit'):
5574 if opts.get('edit'):
5571 message = ui.edit(message, ui.username())
5575 message = ui.edit(message, ui.username())
5572
5576
5573 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
5577 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
5574 finally:
5578 finally:
5575 release(lock, wlock)
5579 release(lock, wlock)
5576
5580
5577 @command('tags', [], '')
5581 @command('tags', [], '')
5578 def tags(ui, repo):
5582 def tags(ui, repo):
5579 """list repository tags
5583 """list repository tags
5580
5584
5581 This lists both regular and local tags. When the -v/--verbose
5585 This lists both regular and local tags. When the -v/--verbose
5582 switch is used, a third column "local" is printed for local tags.
5586 switch is used, a third column "local" is printed for local tags.
5583
5587
5584 Returns 0 on success.
5588 Returns 0 on success.
5585 """
5589 """
5586
5590
5587 hexfunc = ui.debugflag and hex or short
5591 hexfunc = ui.debugflag and hex or short
5588 tagtype = ""
5592 tagtype = ""
5589
5593
5590 for t, n in reversed(repo.tagslist()):
5594 for t, n in reversed(repo.tagslist()):
5591 if ui.quiet:
5595 if ui.quiet:
5592 ui.write("%s\n" % t, label='tags.normal')
5596 ui.write("%s\n" % t, label='tags.normal')
5593 continue
5597 continue
5594
5598
5595 hn = hexfunc(n)
5599 hn = hexfunc(n)
5596 r = "%5d:%s" % (repo.changelog.rev(n), hn)
5600 r = "%5d:%s" % (repo.changelog.rev(n), hn)
5597 rev = ui.label(r, 'log.changeset')
5601 rev = ui.label(r, 'log.changeset')
5598 spaces = " " * (30 - encoding.colwidth(t))
5602 spaces = " " * (30 - encoding.colwidth(t))
5599
5603
5600 tag = ui.label(t, 'tags.normal')
5604 tag = ui.label(t, 'tags.normal')
5601 if ui.verbose:
5605 if ui.verbose:
5602 if repo.tagtype(t) == 'local':
5606 if repo.tagtype(t) == 'local':
5603 tagtype = " local"
5607 tagtype = " local"
5604 tag = ui.label(t, 'tags.local')
5608 tag = ui.label(t, 'tags.local')
5605 else:
5609 else:
5606 tagtype = ""
5610 tagtype = ""
5607 ui.write("%s%s %s%s\n" % (tag, spaces, rev, tagtype))
5611 ui.write("%s%s %s%s\n" % (tag, spaces, rev, tagtype))
5608
5612
5609 @command('tip',
5613 @command('tip',
5610 [('p', 'patch', None, _('show patch')),
5614 [('p', 'patch', None, _('show patch')),
5611 ('g', 'git', None, _('use git extended diff format')),
5615 ('g', 'git', None, _('use git extended diff format')),
5612 ] + templateopts,
5616 ] + templateopts,
5613 _('[-p] [-g]'))
5617 _('[-p] [-g]'))
5614 def tip(ui, repo, **opts):
5618 def tip(ui, repo, **opts):
5615 """show the tip revision
5619 """show the tip revision
5616
5620
5617 The tip revision (usually just called the tip) is the changeset
5621 The tip revision (usually just called the tip) is the changeset
5618 most recently added to the repository (and therefore the most
5622 most recently added to the repository (and therefore the most
5619 recently changed head).
5623 recently changed head).
5620
5624
5621 If you have just made a commit, that commit will be the tip. If
5625 If you have just made a commit, that commit will be the tip. If
5622 you have just pulled changes from another repository, the tip of
5626 you have just pulled changes from another repository, the tip of
5623 that repository becomes the current tip. The "tip" tag is special
5627 that repository becomes the current tip. The "tip" tag is special
5624 and cannot be renamed or assigned to a different changeset.
5628 and cannot be renamed or assigned to a different changeset.
5625
5629
5626 Returns 0 on success.
5630 Returns 0 on success.
5627 """
5631 """
5628 displayer = cmdutil.show_changeset(ui, repo, opts)
5632 displayer = cmdutil.show_changeset(ui, repo, opts)
5629 displayer.show(repo[len(repo) - 1])
5633 displayer.show(repo[len(repo) - 1])
5630 displayer.close()
5634 displayer.close()
5631
5635
5632 @command('unbundle',
5636 @command('unbundle',
5633 [('u', 'update', None,
5637 [('u', 'update', None,
5634 _('update to new branch head if changesets were unbundled'))],
5638 _('update to new branch head if changesets were unbundled'))],
5635 _('[-u] FILE...'))
5639 _('[-u] FILE...'))
5636 def unbundle(ui, repo, fname1, *fnames, **opts):
5640 def unbundle(ui, repo, fname1, *fnames, **opts):
5637 """apply one or more changegroup files
5641 """apply one or more changegroup files
5638
5642
5639 Apply one or more compressed changegroup files generated by the
5643 Apply one or more compressed changegroup files generated by the
5640 bundle command.
5644 bundle command.
5641
5645
5642 Returns 0 on success, 1 if an update has unresolved files.
5646 Returns 0 on success, 1 if an update has unresolved files.
5643 """
5647 """
5644 fnames = (fname1,) + fnames
5648 fnames = (fname1,) + fnames
5645
5649
5646 lock = repo.lock()
5650 lock = repo.lock()
5647 wc = repo['.']
5651 wc = repo['.']
5648 try:
5652 try:
5649 for fname in fnames:
5653 for fname in fnames:
5650 f = url.open(ui, fname)
5654 f = url.open(ui, fname)
5651 gen = changegroup.readbundle(f, fname)
5655 gen = changegroup.readbundle(f, fname)
5652 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
5656 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
5653 bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
5657 bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
5654 finally:
5658 finally:
5655 lock.release()
5659 lock.release()
5656 return postincoming(ui, repo, modheads, opts.get('update'), None)
5660 return postincoming(ui, repo, modheads, opts.get('update'), None)
5657
5661
5658 @command('^update|up|checkout|co',
5662 @command('^update|up|checkout|co',
5659 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5663 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5660 ('c', 'check', None,
5664 ('c', 'check', None,
5661 _('update across branches if no uncommitted changes')),
5665 _('update across branches if no uncommitted changes')),
5662 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5666 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5663 ('r', 'rev', '', _('revision'), _('REV'))],
5667 ('r', 'rev', '', _('revision'), _('REV'))],
5664 _('[-c] [-C] [-d DATE] [[-r] REV]'))
5668 _('[-c] [-C] [-d DATE] [[-r] REV]'))
5665 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
5669 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
5666 """update working directory (or switch revisions)
5670 """update working directory (or switch revisions)
5667
5671
5668 Update the repository's working directory to the specified
5672 Update the repository's working directory to the specified
5669 changeset. If no changeset is specified, update to the tip of the
5673 changeset. If no changeset is specified, update to the tip of the
5670 current named branch and move the current bookmark (see :hg:`help
5674 current named branch and move the current bookmark (see :hg:`help
5671 bookmarks`).
5675 bookmarks`).
5672
5676
5673 If the changeset is not a descendant of the working directory's
5677 If the changeset is not a descendant of the working directory's
5674 parent, the update is aborted. With the -c/--check option, the
5678 parent, the update is aborted. With the -c/--check option, the
5675 working directory is checked for uncommitted changes; if none are
5679 working directory is checked for uncommitted changes; if none are
5676 found, the working directory is updated to the specified
5680 found, the working directory is updated to the specified
5677 changeset.
5681 changeset.
5678
5682
5679 Update sets the working directory's parent revison to the specified
5683 Update sets the working directory's parent revison to the specified
5680 changeset (see :hg:`help parents`).
5684 changeset (see :hg:`help parents`).
5681
5685
5682 The following rules apply when the working directory contains
5686 The following rules apply when the working directory contains
5683 uncommitted changes:
5687 uncommitted changes:
5684
5688
5685 1. If neither -c/--check nor -C/--clean is specified, and if
5689 1. If neither -c/--check nor -C/--clean is specified, and if
5686 the requested changeset is an ancestor or descendant of
5690 the requested changeset is an ancestor or descendant of
5687 the working directory's parent, the uncommitted changes
5691 the working directory's parent, the uncommitted changes
5688 are merged into the requested changeset and the merged
5692 are merged into the requested changeset and the merged
5689 result is left uncommitted. If the requested changeset is
5693 result is left uncommitted. If the requested changeset is
5690 not an ancestor or descendant (that is, it is on another
5694 not an ancestor or descendant (that is, it is on another
5691 branch), the update is aborted and the uncommitted changes
5695 branch), the update is aborted and the uncommitted changes
5692 are preserved.
5696 are preserved.
5693
5697
5694 2. With the -c/--check option, the update is aborted and the
5698 2. With the -c/--check option, the update is aborted and the
5695 uncommitted changes are preserved.
5699 uncommitted changes are preserved.
5696
5700
5697 3. With the -C/--clean option, uncommitted changes are discarded and
5701 3. With the -C/--clean option, uncommitted changes are discarded and
5698 the working directory is updated to the requested changeset.
5702 the working directory is updated to the requested changeset.
5699
5703
5700 Use null as the changeset to remove the working directory (like
5704 Use null as the changeset to remove the working directory (like
5701 :hg:`clone -U`).
5705 :hg:`clone -U`).
5702
5706
5703 If you want to revert just one file to an older revision, use
5707 If you want to revert just one file to an older revision, use
5704 :hg:`revert [-r REV] NAME`.
5708 :hg:`revert [-r REV] NAME`.
5705
5709
5706 See :hg:`help dates` for a list of formats valid for -d/--date.
5710 See :hg:`help dates` for a list of formats valid for -d/--date.
5707
5711
5708 Returns 0 on success, 1 if there are unresolved files.
5712 Returns 0 on success, 1 if there are unresolved files.
5709 """
5713 """
5710 if rev and node:
5714 if rev and node:
5711 raise util.Abort(_("please specify just one revision"))
5715 raise util.Abort(_("please specify just one revision"))
5712
5716
5713 if rev is None or rev == '':
5717 if rev is None or rev == '':
5714 rev = node
5718 rev = node
5715
5719
5716 # with no argument, we also move the current bookmark, if any
5720 # with no argument, we also move the current bookmark, if any
5717 movemarkfrom = None
5721 movemarkfrom = None
5718 if node is None or node == '':
5722 if node is None or node == '':
5719 movemarkfrom = repo['.'].node()
5723 movemarkfrom = repo['.'].node()
5720
5724
5721 # if we defined a bookmark, we have to remember the original bookmark name
5725 # if we defined a bookmark, we have to remember the original bookmark name
5722 brev = rev
5726 brev = rev
5723 rev = scmutil.revsingle(repo, rev, rev).rev()
5727 rev = scmutil.revsingle(repo, rev, rev).rev()
5724
5728
5725 if check and clean:
5729 if check and clean:
5726 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
5730 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
5727
5731
5728 if date:
5732 if date:
5729 if rev is not None:
5733 if rev is not None:
5730 raise util.Abort(_("you can't specify a revision and a date"))
5734 raise util.Abort(_("you can't specify a revision and a date"))
5731 rev = cmdutil.finddate(ui, repo, date)
5735 rev = cmdutil.finddate(ui, repo, date)
5732
5736
5733 if check:
5737 if check:
5734 # we could use dirty() but we can ignore merge and branch trivia
5738 # we could use dirty() but we can ignore merge and branch trivia
5735 c = repo[None]
5739 c = repo[None]
5736 if c.modified() or c.added() or c.removed():
5740 if c.modified() or c.added() or c.removed():
5737 raise util.Abort(_("uncommitted local changes"))
5741 raise util.Abort(_("uncommitted local changes"))
5738 if not rev:
5742 if not rev:
5739 rev = repo[repo[None].branch()].rev()
5743 rev = repo[repo[None].branch()].rev()
5740 mergemod._checkunknown(repo, repo[None], repo[rev])
5744 mergemod._checkunknown(repo, repo[None], repo[rev])
5741
5745
5742 if clean:
5746 if clean:
5743 ret = hg.clean(repo, rev)
5747 ret = hg.clean(repo, rev)
5744 else:
5748 else:
5745 ret = hg.update(repo, rev)
5749 ret = hg.update(repo, rev)
5746
5750
5747 if not ret and movemarkfrom:
5751 if not ret and movemarkfrom:
5748 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5752 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5749 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
5753 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
5750 elif brev in repo._bookmarks:
5754 elif brev in repo._bookmarks:
5751 bookmarks.setcurrent(repo, brev)
5755 bookmarks.setcurrent(repo, brev)
5752
5756
5753 return ret
5757 return ret
5754
5758
5755 @command('verify', [])
5759 @command('verify', [])
5756 def verify(ui, repo):
5760 def verify(ui, repo):
5757 """verify the integrity of the repository
5761 """verify the integrity of the repository
5758
5762
5759 Verify the integrity of the current repository.
5763 Verify the integrity of the current repository.
5760
5764
5761 This will perform an extensive check of the repository's
5765 This will perform an extensive check of the repository's
5762 integrity, validating the hashes and checksums of each entry in
5766 integrity, validating the hashes and checksums of each entry in
5763 the changelog, manifest, and tracked files, as well as the
5767 the changelog, manifest, and tracked files, as well as the
5764 integrity of their crosslinks and indices.
5768 integrity of their crosslinks and indices.
5765
5769
5766 Returns 0 on success, 1 if errors are encountered.
5770 Returns 0 on success, 1 if errors are encountered.
5767 """
5771 """
5768 return hg.verify(repo)
5772 return hg.verify(repo)
5769
5773
5770 @command('version', [])
5774 @command('version', [])
5771 def version_(ui):
5775 def version_(ui):
5772 """output version and copyright information"""
5776 """output version and copyright information"""
5773 ui.write(_("Mercurial Distributed SCM (version %s)\n")
5777 ui.write(_("Mercurial Distributed SCM (version %s)\n")
5774 % util.version())
5778 % util.version())
5775 ui.status(_(
5779 ui.status(_(
5776 "(see http://mercurial.selenic.com for more information)\n"
5780 "(see http://mercurial.selenic.com for more information)\n"
5777 "\nCopyright (C) 2005-2012 Matt Mackall and others\n"
5781 "\nCopyright (C) 2005-2012 Matt Mackall and others\n"
5778 "This is free software; see the source for copying conditions. "
5782 "This is free software; see the source for copying conditions. "
5779 "There is NO\nwarranty; "
5783 "There is NO\nwarranty; "
5780 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5784 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5781 ))
5785 ))
5782
5786
5783 norepo = ("clone init version help debugcommands debugcomplete"
5787 norepo = ("clone init version help debugcommands debugcomplete"
5784 " debugdate debuginstall debugfsinfo debugpushkey debugwireargs"
5788 " debugdate debuginstall debugfsinfo debugpushkey debugwireargs"
5785 " debugknown debuggetbundle debugbundle")
5789 " debugknown debuggetbundle debugbundle")
5786 optionalrepo = ("identify paths serve showconfig debugancestor debugdag"
5790 optionalrepo = ("identify paths serve showconfig debugancestor debugdag"
5787 " debugdata debugindex debugindexdot debugrevlog")
5791 " debugdata debugindex debugindexdot debugrevlog")
General Comments 0
You need to be logged in to leave comments. Login now