##// END OF EJS Templates
push: return 0 when updating bookmarks
Matt Mackall -
r16021:7f47873d stable
parent child Browse files
Show More
@@ -1,5766 +1,5767 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 if ui.verbose:
2158 if ui.verbose:
2159 tree = revset.parse(expr)[0]
2159 tree = revset.parse(expr)[0]
2160 ui.note(tree, "\n")
2160 ui.note(tree, "\n")
2161 newtree = revset.findaliases(ui, tree)
2161 newtree = revset.findaliases(ui, tree)
2162 if newtree != tree:
2162 if newtree != tree:
2163 ui.note(newtree, "\n")
2163 ui.note(newtree, "\n")
2164 func = revset.match(ui, expr)
2164 func = revset.match(ui, expr)
2165 for c in func(repo, range(len(repo))):
2165 for c in func(repo, range(len(repo))):
2166 ui.write("%s\n" % c)
2166 ui.write("%s\n" % c)
2167
2167
2168 @command('debugsetparents', [], _('REV1 [REV2]'))
2168 @command('debugsetparents', [], _('REV1 [REV2]'))
2169 def debugsetparents(ui, repo, rev1, rev2=None):
2169 def debugsetparents(ui, repo, rev1, rev2=None):
2170 """manually set the parents of the current working directory
2170 """manually set the parents of the current working directory
2171
2171
2172 This is useful for writing repository conversion tools, but should
2172 This is useful for writing repository conversion tools, but should
2173 be used with care.
2173 be used with care.
2174
2174
2175 Returns 0 on success.
2175 Returns 0 on success.
2176 """
2176 """
2177
2177
2178 r1 = scmutil.revsingle(repo, rev1).node()
2178 r1 = scmutil.revsingle(repo, rev1).node()
2179 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2179 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2180
2180
2181 wlock = repo.wlock()
2181 wlock = repo.wlock()
2182 try:
2182 try:
2183 repo.dirstate.setparents(r1, r2)
2183 repo.dirstate.setparents(r1, r2)
2184 finally:
2184 finally:
2185 wlock.release()
2185 wlock.release()
2186
2186
2187 @command('debugstate',
2187 @command('debugstate',
2188 [('', 'nodates', None, _('do not display the saved mtime')),
2188 [('', 'nodates', None, _('do not display the saved mtime')),
2189 ('', 'datesort', None, _('sort by saved mtime'))],
2189 ('', 'datesort', None, _('sort by saved mtime'))],
2190 _('[OPTION]...'))
2190 _('[OPTION]...'))
2191 def debugstate(ui, repo, nodates=None, datesort=None):
2191 def debugstate(ui, repo, nodates=None, datesort=None):
2192 """show the contents of the current dirstate"""
2192 """show the contents of the current dirstate"""
2193 timestr = ""
2193 timestr = ""
2194 showdate = not nodates
2194 showdate = not nodates
2195 if datesort:
2195 if datesort:
2196 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2196 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2197 else:
2197 else:
2198 keyfunc = None # sort by filename
2198 keyfunc = None # sort by filename
2199 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2199 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2200 if showdate:
2200 if showdate:
2201 if ent[3] == -1:
2201 if ent[3] == -1:
2202 # Pad or slice to locale representation
2202 # Pad or slice to locale representation
2203 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
2203 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
2204 time.localtime(0)))
2204 time.localtime(0)))
2205 timestr = 'unset'
2205 timestr = 'unset'
2206 timestr = (timestr[:locale_len] +
2206 timestr = (timestr[:locale_len] +
2207 ' ' * (locale_len - len(timestr)))
2207 ' ' * (locale_len - len(timestr)))
2208 else:
2208 else:
2209 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2209 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2210 time.localtime(ent[3]))
2210 time.localtime(ent[3]))
2211 if ent[1] & 020000:
2211 if ent[1] & 020000:
2212 mode = 'lnk'
2212 mode = 'lnk'
2213 else:
2213 else:
2214 mode = '%3o' % (ent[1] & 0777 & ~util.umask)
2214 mode = '%3o' % (ent[1] & 0777 & ~util.umask)
2215 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2215 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2216 for f in repo.dirstate.copies():
2216 for f in repo.dirstate.copies():
2217 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2217 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2218
2218
2219 @command('debugsub',
2219 @command('debugsub',
2220 [('r', 'rev', '',
2220 [('r', 'rev', '',
2221 _('revision to check'), _('REV'))],
2221 _('revision to check'), _('REV'))],
2222 _('[-r REV] [REV]'))
2222 _('[-r REV] [REV]'))
2223 def debugsub(ui, repo, rev=None):
2223 def debugsub(ui, repo, rev=None):
2224 ctx = scmutil.revsingle(repo, rev, None)
2224 ctx = scmutil.revsingle(repo, rev, None)
2225 for k, v in sorted(ctx.substate.items()):
2225 for k, v in sorted(ctx.substate.items()):
2226 ui.write('path %s\n' % k)
2226 ui.write('path %s\n' % k)
2227 ui.write(' source %s\n' % v[0])
2227 ui.write(' source %s\n' % v[0])
2228 ui.write(' revision %s\n' % v[1])
2228 ui.write(' revision %s\n' % v[1])
2229
2229
2230 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'))
2230 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'))
2231 def debugwalk(ui, repo, *pats, **opts):
2231 def debugwalk(ui, repo, *pats, **opts):
2232 """show how files match on given patterns"""
2232 """show how files match on given patterns"""
2233 m = scmutil.match(repo[None], pats, opts)
2233 m = scmutil.match(repo[None], pats, opts)
2234 items = list(repo.walk(m))
2234 items = list(repo.walk(m))
2235 if not items:
2235 if not items:
2236 return
2236 return
2237 fmt = 'f %%-%ds %%-%ds %%s' % (
2237 fmt = 'f %%-%ds %%-%ds %%s' % (
2238 max([len(abs) for abs in items]),
2238 max([len(abs) for abs in items]),
2239 max([len(m.rel(abs)) for abs in items]))
2239 max([len(m.rel(abs)) for abs in items]))
2240 for abs in items:
2240 for abs in items:
2241 line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '')
2241 line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '')
2242 ui.write("%s\n" % line.rstrip())
2242 ui.write("%s\n" % line.rstrip())
2243
2243
2244 @command('debugwireargs',
2244 @command('debugwireargs',
2245 [('', 'three', '', 'three'),
2245 [('', 'three', '', 'three'),
2246 ('', 'four', '', 'four'),
2246 ('', 'four', '', 'four'),
2247 ('', 'five', '', 'five'),
2247 ('', 'five', '', 'five'),
2248 ] + remoteopts,
2248 ] + remoteopts,
2249 _('REPO [OPTIONS]... [ONE [TWO]]'))
2249 _('REPO [OPTIONS]... [ONE [TWO]]'))
2250 def debugwireargs(ui, repopath, *vals, **opts):
2250 def debugwireargs(ui, repopath, *vals, **opts):
2251 repo = hg.peer(ui, opts, repopath)
2251 repo = hg.peer(ui, opts, repopath)
2252 for opt in remoteopts:
2252 for opt in remoteopts:
2253 del opts[opt[1]]
2253 del opts[opt[1]]
2254 args = {}
2254 args = {}
2255 for k, v in opts.iteritems():
2255 for k, v in opts.iteritems():
2256 if v:
2256 if v:
2257 args[k] = v
2257 args[k] = v
2258 # run twice to check that we don't mess up the stream for the next command
2258 # run twice to check that we don't mess up the stream for the next command
2259 res1 = repo.debugwireargs(*vals, **args)
2259 res1 = repo.debugwireargs(*vals, **args)
2260 res2 = repo.debugwireargs(*vals, **args)
2260 res2 = repo.debugwireargs(*vals, **args)
2261 ui.write("%s\n" % res1)
2261 ui.write("%s\n" % res1)
2262 if res1 != res2:
2262 if res1 != res2:
2263 ui.warn("%s\n" % res2)
2263 ui.warn("%s\n" % res2)
2264
2264
2265 @command('^diff',
2265 @command('^diff',
2266 [('r', 'rev', [], _('revision'), _('REV')),
2266 [('r', 'rev', [], _('revision'), _('REV')),
2267 ('c', 'change', '', _('change made by revision'), _('REV'))
2267 ('c', 'change', '', _('change made by revision'), _('REV'))
2268 ] + diffopts + diffopts2 + walkopts + subrepoopts,
2268 ] + diffopts + diffopts2 + walkopts + subrepoopts,
2269 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'))
2269 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'))
2270 def diff(ui, repo, *pats, **opts):
2270 def diff(ui, repo, *pats, **opts):
2271 """diff repository (or selected files)
2271 """diff repository (or selected files)
2272
2272
2273 Show differences between revisions for the specified files.
2273 Show differences between revisions for the specified files.
2274
2274
2275 Differences between files are shown using the unified diff format.
2275 Differences between files are shown using the unified diff format.
2276
2276
2277 .. note::
2277 .. note::
2278 diff may generate unexpected results for merges, as it will
2278 diff may generate unexpected results for merges, as it will
2279 default to comparing against the working directory's first
2279 default to comparing against the working directory's first
2280 parent changeset if no revisions are specified.
2280 parent changeset if no revisions are specified.
2281
2281
2282 When two revision arguments are given, then changes are shown
2282 When two revision arguments are given, then changes are shown
2283 between those revisions. If only one revision is specified then
2283 between those revisions. If only one revision is specified then
2284 that revision is compared to the working directory, and, when no
2284 that revision is compared to the working directory, and, when no
2285 revisions are specified, the working directory files are compared
2285 revisions are specified, the working directory files are compared
2286 to its parent.
2286 to its parent.
2287
2287
2288 Alternatively you can specify -c/--change with a revision to see
2288 Alternatively you can specify -c/--change with a revision to see
2289 the changes in that changeset relative to its first parent.
2289 the changes in that changeset relative to its first parent.
2290
2290
2291 Without the -a/--text option, diff will avoid generating diffs of
2291 Without the -a/--text option, diff will avoid generating diffs of
2292 files it detects as binary. With -a, diff will generate a diff
2292 files it detects as binary. With -a, diff will generate a diff
2293 anyway, probably with undesirable results.
2293 anyway, probably with undesirable results.
2294
2294
2295 Use the -g/--git option to generate diffs in the git extended diff
2295 Use the -g/--git option to generate diffs in the git extended diff
2296 format. For more information, read :hg:`help diffs`.
2296 format. For more information, read :hg:`help diffs`.
2297
2297
2298 .. container:: verbose
2298 .. container:: verbose
2299
2299
2300 Examples:
2300 Examples:
2301
2301
2302 - compare a file in the current working directory to its parent::
2302 - compare a file in the current working directory to its parent::
2303
2303
2304 hg diff foo.c
2304 hg diff foo.c
2305
2305
2306 - compare two historical versions of a directory, with rename info::
2306 - compare two historical versions of a directory, with rename info::
2307
2307
2308 hg diff --git -r 1.0:1.2 lib/
2308 hg diff --git -r 1.0:1.2 lib/
2309
2309
2310 - get change stats relative to the last change on some date::
2310 - get change stats relative to the last change on some date::
2311
2311
2312 hg diff --stat -r "date('may 2')"
2312 hg diff --stat -r "date('may 2')"
2313
2313
2314 - diff all newly-added files that contain a keyword::
2314 - diff all newly-added files that contain a keyword::
2315
2315
2316 hg diff "set:added() and grep(GNU)"
2316 hg diff "set:added() and grep(GNU)"
2317
2317
2318 - compare a revision and its parents::
2318 - compare a revision and its parents::
2319
2319
2320 hg diff -c 9353 # compare against first parent
2320 hg diff -c 9353 # compare against first parent
2321 hg diff -r 9353^:9353 # same using revset syntax
2321 hg diff -r 9353^:9353 # same using revset syntax
2322 hg diff -r 9353^2:9353 # compare against the second parent
2322 hg diff -r 9353^2:9353 # compare against the second parent
2323
2323
2324 Returns 0 on success.
2324 Returns 0 on success.
2325 """
2325 """
2326
2326
2327 revs = opts.get('rev')
2327 revs = opts.get('rev')
2328 change = opts.get('change')
2328 change = opts.get('change')
2329 stat = opts.get('stat')
2329 stat = opts.get('stat')
2330 reverse = opts.get('reverse')
2330 reverse = opts.get('reverse')
2331
2331
2332 if revs and change:
2332 if revs and change:
2333 msg = _('cannot specify --rev and --change at the same time')
2333 msg = _('cannot specify --rev and --change at the same time')
2334 raise util.Abort(msg)
2334 raise util.Abort(msg)
2335 elif change:
2335 elif change:
2336 node2 = scmutil.revsingle(repo, change, None).node()
2336 node2 = scmutil.revsingle(repo, change, None).node()
2337 node1 = repo[node2].p1().node()
2337 node1 = repo[node2].p1().node()
2338 else:
2338 else:
2339 node1, node2 = scmutil.revpair(repo, revs)
2339 node1, node2 = scmutil.revpair(repo, revs)
2340
2340
2341 if reverse:
2341 if reverse:
2342 node1, node2 = node2, node1
2342 node1, node2 = node2, node1
2343
2343
2344 diffopts = patch.diffopts(ui, opts)
2344 diffopts = patch.diffopts(ui, opts)
2345 m = scmutil.match(repo[node2], pats, opts)
2345 m = scmutil.match(repo[node2], pats, opts)
2346 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
2346 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
2347 listsubrepos=opts.get('subrepos'))
2347 listsubrepos=opts.get('subrepos'))
2348
2348
2349 @command('^export',
2349 @command('^export',
2350 [('o', 'output', '',
2350 [('o', 'output', '',
2351 _('print output to file with formatted name'), _('FORMAT')),
2351 _('print output to file with formatted name'), _('FORMAT')),
2352 ('', 'switch-parent', None, _('diff against the second parent')),
2352 ('', 'switch-parent', None, _('diff against the second parent')),
2353 ('r', 'rev', [], _('revisions to export'), _('REV')),
2353 ('r', 'rev', [], _('revisions to export'), _('REV')),
2354 ] + diffopts,
2354 ] + diffopts,
2355 _('[OPTION]... [-o OUTFILESPEC] REV...'))
2355 _('[OPTION]... [-o OUTFILESPEC] REV...'))
2356 def export(ui, repo, *changesets, **opts):
2356 def export(ui, repo, *changesets, **opts):
2357 """dump the header and diffs for one or more changesets
2357 """dump the header and diffs for one or more changesets
2358
2358
2359 Print the changeset header and diffs for one or more revisions.
2359 Print the changeset header and diffs for one or more revisions.
2360
2360
2361 The information shown in the changeset header is: author, date,
2361 The information shown in the changeset header is: author, date,
2362 branch name (if non-default), changeset hash, parent(s) and commit
2362 branch name (if non-default), changeset hash, parent(s) and commit
2363 comment.
2363 comment.
2364
2364
2365 .. note::
2365 .. note::
2366 export may generate unexpected diff output for merge
2366 export may generate unexpected diff output for merge
2367 changesets, as it will compare the merge changeset against its
2367 changesets, as it will compare the merge changeset against its
2368 first parent only.
2368 first parent only.
2369
2369
2370 Output may be to a file, in which case the name of the file is
2370 Output may be to a file, in which case the name of the file is
2371 given using a format string. The formatting rules are as follows:
2371 given using a format string. The formatting rules are as follows:
2372
2372
2373 :``%%``: literal "%" character
2373 :``%%``: literal "%" character
2374 :``%H``: changeset hash (40 hexadecimal digits)
2374 :``%H``: changeset hash (40 hexadecimal digits)
2375 :``%N``: number of patches being generated
2375 :``%N``: number of patches being generated
2376 :``%R``: changeset revision number
2376 :``%R``: changeset revision number
2377 :``%b``: basename of the exporting repository
2377 :``%b``: basename of the exporting repository
2378 :``%h``: short-form changeset hash (12 hexadecimal digits)
2378 :``%h``: short-form changeset hash (12 hexadecimal digits)
2379 :``%m``: first line of the commit message (only alphanumeric characters)
2379 :``%m``: first line of the commit message (only alphanumeric characters)
2380 :``%n``: zero-padded sequence number, starting at 1
2380 :``%n``: zero-padded sequence number, starting at 1
2381 :``%r``: zero-padded changeset revision number
2381 :``%r``: zero-padded changeset revision number
2382
2382
2383 Without the -a/--text option, export will avoid generating diffs
2383 Without the -a/--text option, export will avoid generating diffs
2384 of files it detects as binary. With -a, export will generate a
2384 of files it detects as binary. With -a, export will generate a
2385 diff anyway, probably with undesirable results.
2385 diff anyway, probably with undesirable results.
2386
2386
2387 Use the -g/--git option to generate diffs in the git extended diff
2387 Use the -g/--git option to generate diffs in the git extended diff
2388 format. See :hg:`help diffs` for more information.
2388 format. See :hg:`help diffs` for more information.
2389
2389
2390 With the --switch-parent option, the diff will be against the
2390 With the --switch-parent option, the diff will be against the
2391 second parent. It can be useful to review a merge.
2391 second parent. It can be useful to review a merge.
2392
2392
2393 .. container:: verbose
2393 .. container:: verbose
2394
2394
2395 Examples:
2395 Examples:
2396
2396
2397 - use export and import to transplant a bugfix to the current
2397 - use export and import to transplant a bugfix to the current
2398 branch::
2398 branch::
2399
2399
2400 hg export -r 9353 | hg import -
2400 hg export -r 9353 | hg import -
2401
2401
2402 - export all the changesets between two revisions to a file with
2402 - export all the changesets between two revisions to a file with
2403 rename information::
2403 rename information::
2404
2404
2405 hg export --git -r 123:150 > changes.txt
2405 hg export --git -r 123:150 > changes.txt
2406
2406
2407 - split outgoing changes into a series of patches with
2407 - split outgoing changes into a series of patches with
2408 descriptive names::
2408 descriptive names::
2409
2409
2410 hg export -r "outgoing()" -o "%n-%m.patch"
2410 hg export -r "outgoing()" -o "%n-%m.patch"
2411
2411
2412 Returns 0 on success.
2412 Returns 0 on success.
2413 """
2413 """
2414 changesets += tuple(opts.get('rev', []))
2414 changesets += tuple(opts.get('rev', []))
2415 if not changesets:
2415 if not changesets:
2416 raise util.Abort(_("export requires at least one changeset"))
2416 raise util.Abort(_("export requires at least one changeset"))
2417 revs = scmutil.revrange(repo, changesets)
2417 revs = scmutil.revrange(repo, changesets)
2418 if len(revs) > 1:
2418 if len(revs) > 1:
2419 ui.note(_('exporting patches:\n'))
2419 ui.note(_('exporting patches:\n'))
2420 else:
2420 else:
2421 ui.note(_('exporting patch:\n'))
2421 ui.note(_('exporting patch:\n'))
2422 cmdutil.export(repo, revs, template=opts.get('output'),
2422 cmdutil.export(repo, revs, template=opts.get('output'),
2423 switch_parent=opts.get('switch_parent'),
2423 switch_parent=opts.get('switch_parent'),
2424 opts=patch.diffopts(ui, opts))
2424 opts=patch.diffopts(ui, opts))
2425
2425
2426 @command('^forget', walkopts, _('[OPTION]... FILE...'))
2426 @command('^forget', walkopts, _('[OPTION]... FILE...'))
2427 def forget(ui, repo, *pats, **opts):
2427 def forget(ui, repo, *pats, **opts):
2428 """forget the specified files on the next commit
2428 """forget the specified files on the next commit
2429
2429
2430 Mark the specified files so they will no longer be tracked
2430 Mark the specified files so they will no longer be tracked
2431 after the next commit.
2431 after the next commit.
2432
2432
2433 This only removes files from the current branch, not from the
2433 This only removes files from the current branch, not from the
2434 entire project history, and it does not delete them from the
2434 entire project history, and it does not delete them from the
2435 working directory.
2435 working directory.
2436
2436
2437 To undo a forget before the next commit, see :hg:`add`.
2437 To undo a forget before the next commit, see :hg:`add`.
2438
2438
2439 .. container:: verbose
2439 .. container:: verbose
2440
2440
2441 Examples:
2441 Examples:
2442
2442
2443 - forget newly-added binary files::
2443 - forget newly-added binary files::
2444
2444
2445 hg forget "set:added() and binary()"
2445 hg forget "set:added() and binary()"
2446
2446
2447 - forget files that would be excluded by .hgignore::
2447 - forget files that would be excluded by .hgignore::
2448
2448
2449 hg forget "set:hgignore()"
2449 hg forget "set:hgignore()"
2450
2450
2451 Returns 0 on success.
2451 Returns 0 on success.
2452 """
2452 """
2453
2453
2454 if not pats:
2454 if not pats:
2455 raise util.Abort(_('no files specified'))
2455 raise util.Abort(_('no files specified'))
2456
2456
2457 m = scmutil.match(repo[None], pats, opts)
2457 m = scmutil.match(repo[None], pats, opts)
2458 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2458 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2459 return rejected and 1 or 0
2459 return rejected and 1 or 0
2460
2460
2461 @command(
2461 @command(
2462 'graft',
2462 'graft',
2463 [('c', 'continue', False, _('resume interrupted graft')),
2463 [('c', 'continue', False, _('resume interrupted graft')),
2464 ('e', 'edit', False, _('invoke editor on commit messages')),
2464 ('e', 'edit', False, _('invoke editor on commit messages')),
2465 ('D', 'currentdate', False,
2465 ('D', 'currentdate', False,
2466 _('record the current date as commit date')),
2466 _('record the current date as commit date')),
2467 ('U', 'currentuser', False,
2467 ('U', 'currentuser', False,
2468 _('record the current user as committer'), _('DATE'))]
2468 _('record the current user as committer'), _('DATE'))]
2469 + commitopts2 + mergetoolopts,
2469 + commitopts2 + mergetoolopts,
2470 _('[OPTION]... REVISION...'))
2470 _('[OPTION]... REVISION...'))
2471 def graft(ui, repo, *revs, **opts):
2471 def graft(ui, repo, *revs, **opts):
2472 '''copy changes from other branches onto the current branch
2472 '''copy changes from other branches onto the current branch
2473
2473
2474 This command uses Mercurial's merge logic to copy individual
2474 This command uses Mercurial's merge logic to copy individual
2475 changes from other branches without merging branches in the
2475 changes from other branches without merging branches in the
2476 history graph. This is sometimes known as 'backporting' or
2476 history graph. This is sometimes known as 'backporting' or
2477 'cherry-picking'. By default, graft will copy user, date, and
2477 'cherry-picking'. By default, graft will copy user, date, and
2478 description from the source changesets.
2478 description from the source changesets.
2479
2479
2480 Changesets that are ancestors of the current revision, that have
2480 Changesets that are ancestors of the current revision, that have
2481 already been grafted, or that are merges will be skipped.
2481 already been grafted, or that are merges will be skipped.
2482
2482
2483 If a graft merge results in conflicts, the graft process is
2483 If a graft merge results in conflicts, the graft process is
2484 interrupted so that the current merge can be manually resolved.
2484 interrupted so that the current merge can be manually resolved.
2485 Once all conflicts are addressed, the graft process can be
2485 Once all conflicts are addressed, the graft process can be
2486 continued with the -c/--continue option.
2486 continued with the -c/--continue option.
2487
2487
2488 .. note::
2488 .. note::
2489 The -c/--continue option does not reapply earlier options.
2489 The -c/--continue option does not reapply earlier options.
2490
2490
2491 .. container:: verbose
2491 .. container:: verbose
2492
2492
2493 Examples:
2493 Examples:
2494
2494
2495 - copy a single change to the stable branch and edit its description::
2495 - copy a single change to the stable branch and edit its description::
2496
2496
2497 hg update stable
2497 hg update stable
2498 hg graft --edit 9393
2498 hg graft --edit 9393
2499
2499
2500 - graft a range of changesets with one exception, updating dates::
2500 - graft a range of changesets with one exception, updating dates::
2501
2501
2502 hg graft -D "2085::2093 and not 2091"
2502 hg graft -D "2085::2093 and not 2091"
2503
2503
2504 - continue a graft after resolving conflicts::
2504 - continue a graft after resolving conflicts::
2505
2505
2506 hg graft -c
2506 hg graft -c
2507
2507
2508 - show the source of a grafted changeset::
2508 - show the source of a grafted changeset::
2509
2509
2510 hg log --debug -r tip
2510 hg log --debug -r tip
2511
2511
2512 Returns 0 on successful completion.
2512 Returns 0 on successful completion.
2513 '''
2513 '''
2514
2514
2515 if not opts.get('user') and opts.get('currentuser'):
2515 if not opts.get('user') and opts.get('currentuser'):
2516 opts['user'] = ui.username()
2516 opts['user'] = ui.username()
2517 if not opts.get('date') and opts.get('currentdate'):
2517 if not opts.get('date') and opts.get('currentdate'):
2518 opts['date'] = "%d %d" % util.makedate()
2518 opts['date'] = "%d %d" % util.makedate()
2519
2519
2520 editor = None
2520 editor = None
2521 if opts.get('edit'):
2521 if opts.get('edit'):
2522 editor = cmdutil.commitforceeditor
2522 editor = cmdutil.commitforceeditor
2523
2523
2524 cont = False
2524 cont = False
2525 if opts['continue']:
2525 if opts['continue']:
2526 cont = True
2526 cont = True
2527 if revs:
2527 if revs:
2528 raise util.Abort(_("can't specify --continue and revisions"))
2528 raise util.Abort(_("can't specify --continue and revisions"))
2529 # read in unfinished revisions
2529 # read in unfinished revisions
2530 try:
2530 try:
2531 nodes = repo.opener.read('graftstate').splitlines()
2531 nodes = repo.opener.read('graftstate').splitlines()
2532 revs = [repo[node].rev() for node in nodes]
2532 revs = [repo[node].rev() for node in nodes]
2533 except IOError, inst:
2533 except IOError, inst:
2534 if inst.errno != errno.ENOENT:
2534 if inst.errno != errno.ENOENT:
2535 raise
2535 raise
2536 raise util.Abort(_("no graft state found, can't continue"))
2536 raise util.Abort(_("no graft state found, can't continue"))
2537 else:
2537 else:
2538 cmdutil.bailifchanged(repo)
2538 cmdutil.bailifchanged(repo)
2539 if not revs:
2539 if not revs:
2540 raise util.Abort(_('no revisions specified'))
2540 raise util.Abort(_('no revisions specified'))
2541 revs = scmutil.revrange(repo, revs)
2541 revs = scmutil.revrange(repo, revs)
2542
2542
2543 # check for merges
2543 # check for merges
2544 for rev in repo.revs('%ld and merge()', revs):
2544 for rev in repo.revs('%ld and merge()', revs):
2545 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2545 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2546 revs.remove(rev)
2546 revs.remove(rev)
2547 if not revs:
2547 if not revs:
2548 return -1
2548 return -1
2549
2549
2550 # check for ancestors of dest branch
2550 # check for ancestors of dest branch
2551 for rev in repo.revs('::. and %ld', revs):
2551 for rev in repo.revs('::. and %ld', revs):
2552 ui.warn(_('skipping ancestor revision %s\n') % rev)
2552 ui.warn(_('skipping ancestor revision %s\n') % rev)
2553 revs.remove(rev)
2553 revs.remove(rev)
2554 if not revs:
2554 if not revs:
2555 return -1
2555 return -1
2556
2556
2557 # analyze revs for earlier grafts
2557 # analyze revs for earlier grafts
2558 ids = {}
2558 ids = {}
2559 for ctx in repo.set("%ld", revs):
2559 for ctx in repo.set("%ld", revs):
2560 ids[ctx.hex()] = ctx.rev()
2560 ids[ctx.hex()] = ctx.rev()
2561 n = ctx.extra().get('source')
2561 n = ctx.extra().get('source')
2562 if n:
2562 if n:
2563 ids[n] = ctx.rev()
2563 ids[n] = ctx.rev()
2564
2564
2565 # check ancestors for earlier grafts
2565 # check ancestors for earlier grafts
2566 ui.debug('scanning for duplicate grafts\n')
2566 ui.debug('scanning for duplicate grafts\n')
2567 for ctx in repo.set("::. - ::%ld", revs):
2567 for ctx in repo.set("::. - ::%ld", revs):
2568 n = ctx.extra().get('source')
2568 n = ctx.extra().get('source')
2569 if n in ids:
2569 if n in ids:
2570 r = repo[n].rev()
2570 r = repo[n].rev()
2571 if r in revs:
2571 if r in revs:
2572 ui.warn(_('skipping already grafted revision %s\n') % r)
2572 ui.warn(_('skipping already grafted revision %s\n') % r)
2573 revs.remove(r)
2573 revs.remove(r)
2574 elif ids[n] in revs:
2574 elif ids[n] in revs:
2575 ui.warn(_('skipping already grafted revision %s '
2575 ui.warn(_('skipping already grafted revision %s '
2576 '(same origin %d)\n') % (ids[n], r))
2576 '(same origin %d)\n') % (ids[n], r))
2577 revs.remove(ids[n])
2577 revs.remove(ids[n])
2578 elif ctx.hex() in ids:
2578 elif ctx.hex() in ids:
2579 r = ids[ctx.hex()]
2579 r = ids[ctx.hex()]
2580 ui.warn(_('skipping already grafted revision %s '
2580 ui.warn(_('skipping already grafted revision %s '
2581 '(was grafted from %d)\n') % (r, ctx.rev()))
2581 '(was grafted from %d)\n') % (r, ctx.rev()))
2582 revs.remove(r)
2582 revs.remove(r)
2583 if not revs:
2583 if not revs:
2584 return -1
2584 return -1
2585
2585
2586 for pos, ctx in enumerate(repo.set("%ld", revs)):
2586 for pos, ctx in enumerate(repo.set("%ld", revs)):
2587 current = repo['.']
2587 current = repo['.']
2588 ui.status(_('grafting revision %s\n') % ctx.rev())
2588 ui.status(_('grafting revision %s\n') % ctx.rev())
2589
2589
2590 # we don't merge the first commit when continuing
2590 # we don't merge the first commit when continuing
2591 if not cont:
2591 if not cont:
2592 # perform the graft merge with p1(rev) as 'ancestor'
2592 # perform the graft merge with p1(rev) as 'ancestor'
2593 try:
2593 try:
2594 # ui.forcemerge is an internal variable, do not document
2594 # ui.forcemerge is an internal variable, do not document
2595 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
2595 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
2596 stats = mergemod.update(repo, ctx.node(), True, True, False,
2596 stats = mergemod.update(repo, ctx.node(), True, True, False,
2597 ctx.p1().node())
2597 ctx.p1().node())
2598 finally:
2598 finally:
2599 ui.setconfig('ui', 'forcemerge', '')
2599 ui.setconfig('ui', 'forcemerge', '')
2600 # drop the second merge parent
2600 # drop the second merge parent
2601 repo.dirstate.setparents(current.node(), nullid)
2601 repo.dirstate.setparents(current.node(), nullid)
2602 repo.dirstate.write()
2602 repo.dirstate.write()
2603 # fix up dirstate for copies and renames
2603 # fix up dirstate for copies and renames
2604 cmdutil.duplicatecopies(repo, ctx.rev(), current.node())
2604 cmdutil.duplicatecopies(repo, ctx.rev(), current.node())
2605 # report any conflicts
2605 # report any conflicts
2606 if stats and stats[3] > 0:
2606 if stats and stats[3] > 0:
2607 # write out state for --continue
2607 # write out state for --continue
2608 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2608 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2609 repo.opener.write('graftstate', ''.join(nodelines))
2609 repo.opener.write('graftstate', ''.join(nodelines))
2610 raise util.Abort(
2610 raise util.Abort(
2611 _("unresolved conflicts, can't continue"),
2611 _("unresolved conflicts, can't continue"),
2612 hint=_('use hg resolve and hg graft --continue'))
2612 hint=_('use hg resolve and hg graft --continue'))
2613 else:
2613 else:
2614 cont = False
2614 cont = False
2615
2615
2616 # commit
2616 # commit
2617 source = ctx.extra().get('source')
2617 source = ctx.extra().get('source')
2618 if not source:
2618 if not source:
2619 source = ctx.hex()
2619 source = ctx.hex()
2620 extra = {'source': source}
2620 extra = {'source': source}
2621 user = ctx.user()
2621 user = ctx.user()
2622 if opts.get('user'):
2622 if opts.get('user'):
2623 user = opts['user']
2623 user = opts['user']
2624 date = ctx.date()
2624 date = ctx.date()
2625 if opts.get('date'):
2625 if opts.get('date'):
2626 date = opts['date']
2626 date = opts['date']
2627 repo.commit(text=ctx.description(), user=user,
2627 repo.commit(text=ctx.description(), user=user,
2628 date=date, extra=extra, editor=editor)
2628 date=date, extra=extra, editor=editor)
2629
2629
2630 # remove state when we complete successfully
2630 # remove state when we complete successfully
2631 if os.path.exists(repo.join('graftstate')):
2631 if os.path.exists(repo.join('graftstate')):
2632 util.unlinkpath(repo.join('graftstate'))
2632 util.unlinkpath(repo.join('graftstate'))
2633
2633
2634 return 0
2634 return 0
2635
2635
2636 @command('grep',
2636 @command('grep',
2637 [('0', 'print0', None, _('end fields with NUL')),
2637 [('0', 'print0', None, _('end fields with NUL')),
2638 ('', 'all', None, _('print all revisions that match')),
2638 ('', 'all', None, _('print all revisions that match')),
2639 ('a', 'text', None, _('treat all files as text')),
2639 ('a', 'text', None, _('treat all files as text')),
2640 ('f', 'follow', None,
2640 ('f', 'follow', None,
2641 _('follow changeset history,'
2641 _('follow changeset history,'
2642 ' or file history across copies and renames')),
2642 ' or file history across copies and renames')),
2643 ('i', 'ignore-case', None, _('ignore case when matching')),
2643 ('i', 'ignore-case', None, _('ignore case when matching')),
2644 ('l', 'files-with-matches', None,
2644 ('l', 'files-with-matches', None,
2645 _('print only filenames and revisions that match')),
2645 _('print only filenames and revisions that match')),
2646 ('n', 'line-number', None, _('print matching line numbers')),
2646 ('n', 'line-number', None, _('print matching line numbers')),
2647 ('r', 'rev', [],
2647 ('r', 'rev', [],
2648 _('only search files changed within revision range'), _('REV')),
2648 _('only search files changed within revision range'), _('REV')),
2649 ('u', 'user', None, _('list the author (long with -v)')),
2649 ('u', 'user', None, _('list the author (long with -v)')),
2650 ('d', 'date', None, _('list the date (short with -q)')),
2650 ('d', 'date', None, _('list the date (short with -q)')),
2651 ] + walkopts,
2651 ] + walkopts,
2652 _('[OPTION]... PATTERN [FILE]...'))
2652 _('[OPTION]... PATTERN [FILE]...'))
2653 def grep(ui, repo, pattern, *pats, **opts):
2653 def grep(ui, repo, pattern, *pats, **opts):
2654 """search for a pattern in specified files and revisions
2654 """search for a pattern in specified files and revisions
2655
2655
2656 Search revisions of files for a regular expression.
2656 Search revisions of files for a regular expression.
2657
2657
2658 This command behaves differently than Unix grep. It only accepts
2658 This command behaves differently than Unix grep. It only accepts
2659 Python/Perl regexps. It searches repository history, not the
2659 Python/Perl regexps. It searches repository history, not the
2660 working directory. It always prints the revision number in which a
2660 working directory. It always prints the revision number in which a
2661 match appears.
2661 match appears.
2662
2662
2663 By default, grep only prints output for the first revision of a
2663 By default, grep only prints output for the first revision of a
2664 file in which it finds a match. To get it to print every revision
2664 file in which it finds a match. To get it to print every revision
2665 that contains a change in match status ("-" for a match that
2665 that contains a change in match status ("-" for a match that
2666 becomes a non-match, or "+" for a non-match that becomes a match),
2666 becomes a non-match, or "+" for a non-match that becomes a match),
2667 use the --all flag.
2667 use the --all flag.
2668
2668
2669 Returns 0 if a match is found, 1 otherwise.
2669 Returns 0 if a match is found, 1 otherwise.
2670 """
2670 """
2671 reflags = re.M
2671 reflags = re.M
2672 if opts.get('ignore_case'):
2672 if opts.get('ignore_case'):
2673 reflags |= re.I
2673 reflags |= re.I
2674 try:
2674 try:
2675 regexp = re.compile(pattern, reflags)
2675 regexp = re.compile(pattern, reflags)
2676 except re.error, inst:
2676 except re.error, inst:
2677 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2677 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2678 return 1
2678 return 1
2679 sep, eol = ':', '\n'
2679 sep, eol = ':', '\n'
2680 if opts.get('print0'):
2680 if opts.get('print0'):
2681 sep = eol = '\0'
2681 sep = eol = '\0'
2682
2682
2683 getfile = util.lrucachefunc(repo.file)
2683 getfile = util.lrucachefunc(repo.file)
2684
2684
2685 def matchlines(body):
2685 def matchlines(body):
2686 begin = 0
2686 begin = 0
2687 linenum = 0
2687 linenum = 0
2688 while True:
2688 while True:
2689 match = regexp.search(body, begin)
2689 match = regexp.search(body, begin)
2690 if not match:
2690 if not match:
2691 break
2691 break
2692 mstart, mend = match.span()
2692 mstart, mend = match.span()
2693 linenum += body.count('\n', begin, mstart) + 1
2693 linenum += body.count('\n', begin, mstart) + 1
2694 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2694 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2695 begin = body.find('\n', mend) + 1 or len(body) + 1
2695 begin = body.find('\n', mend) + 1 or len(body) + 1
2696 lend = begin - 1
2696 lend = begin - 1
2697 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2697 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2698
2698
2699 class linestate(object):
2699 class linestate(object):
2700 def __init__(self, line, linenum, colstart, colend):
2700 def __init__(self, line, linenum, colstart, colend):
2701 self.line = line
2701 self.line = line
2702 self.linenum = linenum
2702 self.linenum = linenum
2703 self.colstart = colstart
2703 self.colstart = colstart
2704 self.colend = colend
2704 self.colend = colend
2705
2705
2706 def __hash__(self):
2706 def __hash__(self):
2707 return hash((self.linenum, self.line))
2707 return hash((self.linenum, self.line))
2708
2708
2709 def __eq__(self, other):
2709 def __eq__(self, other):
2710 return self.line == other.line
2710 return self.line == other.line
2711
2711
2712 matches = {}
2712 matches = {}
2713 copies = {}
2713 copies = {}
2714 def grepbody(fn, rev, body):
2714 def grepbody(fn, rev, body):
2715 matches[rev].setdefault(fn, [])
2715 matches[rev].setdefault(fn, [])
2716 m = matches[rev][fn]
2716 m = matches[rev][fn]
2717 for lnum, cstart, cend, line in matchlines(body):
2717 for lnum, cstart, cend, line in matchlines(body):
2718 s = linestate(line, lnum, cstart, cend)
2718 s = linestate(line, lnum, cstart, cend)
2719 m.append(s)
2719 m.append(s)
2720
2720
2721 def difflinestates(a, b):
2721 def difflinestates(a, b):
2722 sm = difflib.SequenceMatcher(None, a, b)
2722 sm = difflib.SequenceMatcher(None, a, b)
2723 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2723 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2724 if tag == 'insert':
2724 if tag == 'insert':
2725 for i in xrange(blo, bhi):
2725 for i in xrange(blo, bhi):
2726 yield ('+', b[i])
2726 yield ('+', b[i])
2727 elif tag == 'delete':
2727 elif tag == 'delete':
2728 for i in xrange(alo, ahi):
2728 for i in xrange(alo, ahi):
2729 yield ('-', a[i])
2729 yield ('-', a[i])
2730 elif tag == 'replace':
2730 elif tag == 'replace':
2731 for i in xrange(alo, ahi):
2731 for i in xrange(alo, ahi):
2732 yield ('-', a[i])
2732 yield ('-', a[i])
2733 for i in xrange(blo, bhi):
2733 for i in xrange(blo, bhi):
2734 yield ('+', b[i])
2734 yield ('+', b[i])
2735
2735
2736 def display(fn, ctx, pstates, states):
2736 def display(fn, ctx, pstates, states):
2737 rev = ctx.rev()
2737 rev = ctx.rev()
2738 datefunc = ui.quiet and util.shortdate or util.datestr
2738 datefunc = ui.quiet and util.shortdate or util.datestr
2739 found = False
2739 found = False
2740 filerevmatches = {}
2740 filerevmatches = {}
2741 def binary():
2741 def binary():
2742 flog = getfile(fn)
2742 flog = getfile(fn)
2743 return util.binary(flog.read(ctx.filenode(fn)))
2743 return util.binary(flog.read(ctx.filenode(fn)))
2744
2744
2745 if opts.get('all'):
2745 if opts.get('all'):
2746 iter = difflinestates(pstates, states)
2746 iter = difflinestates(pstates, states)
2747 else:
2747 else:
2748 iter = [('', l) for l in states]
2748 iter = [('', l) for l in states]
2749 for change, l in iter:
2749 for change, l in iter:
2750 cols = [fn, str(rev)]
2750 cols = [fn, str(rev)]
2751 before, match, after = None, None, None
2751 before, match, after = None, None, None
2752 if opts.get('line_number'):
2752 if opts.get('line_number'):
2753 cols.append(str(l.linenum))
2753 cols.append(str(l.linenum))
2754 if opts.get('all'):
2754 if opts.get('all'):
2755 cols.append(change)
2755 cols.append(change)
2756 if opts.get('user'):
2756 if opts.get('user'):
2757 cols.append(ui.shortuser(ctx.user()))
2757 cols.append(ui.shortuser(ctx.user()))
2758 if opts.get('date'):
2758 if opts.get('date'):
2759 cols.append(datefunc(ctx.date()))
2759 cols.append(datefunc(ctx.date()))
2760 if opts.get('files_with_matches'):
2760 if opts.get('files_with_matches'):
2761 c = (fn, rev)
2761 c = (fn, rev)
2762 if c in filerevmatches:
2762 if c in filerevmatches:
2763 continue
2763 continue
2764 filerevmatches[c] = 1
2764 filerevmatches[c] = 1
2765 else:
2765 else:
2766 before = l.line[:l.colstart]
2766 before = l.line[:l.colstart]
2767 match = l.line[l.colstart:l.colend]
2767 match = l.line[l.colstart:l.colend]
2768 after = l.line[l.colend:]
2768 after = l.line[l.colend:]
2769 ui.write(sep.join(cols))
2769 ui.write(sep.join(cols))
2770 if before is not None:
2770 if before is not None:
2771 if not opts.get('text') and binary():
2771 if not opts.get('text') and binary():
2772 ui.write(sep + " Binary file matches")
2772 ui.write(sep + " Binary file matches")
2773 else:
2773 else:
2774 ui.write(sep + before)
2774 ui.write(sep + before)
2775 ui.write(match, label='grep.match')
2775 ui.write(match, label='grep.match')
2776 ui.write(after)
2776 ui.write(after)
2777 ui.write(eol)
2777 ui.write(eol)
2778 found = True
2778 found = True
2779 return found
2779 return found
2780
2780
2781 skip = {}
2781 skip = {}
2782 revfiles = {}
2782 revfiles = {}
2783 matchfn = scmutil.match(repo[None], pats, opts)
2783 matchfn = scmutil.match(repo[None], pats, opts)
2784 found = False
2784 found = False
2785 follow = opts.get('follow')
2785 follow = opts.get('follow')
2786
2786
2787 def prep(ctx, fns):
2787 def prep(ctx, fns):
2788 rev = ctx.rev()
2788 rev = ctx.rev()
2789 pctx = ctx.p1()
2789 pctx = ctx.p1()
2790 parent = pctx.rev()
2790 parent = pctx.rev()
2791 matches.setdefault(rev, {})
2791 matches.setdefault(rev, {})
2792 matches.setdefault(parent, {})
2792 matches.setdefault(parent, {})
2793 files = revfiles.setdefault(rev, [])
2793 files = revfiles.setdefault(rev, [])
2794 for fn in fns:
2794 for fn in fns:
2795 flog = getfile(fn)
2795 flog = getfile(fn)
2796 try:
2796 try:
2797 fnode = ctx.filenode(fn)
2797 fnode = ctx.filenode(fn)
2798 except error.LookupError:
2798 except error.LookupError:
2799 continue
2799 continue
2800
2800
2801 copied = flog.renamed(fnode)
2801 copied = flog.renamed(fnode)
2802 copy = follow and copied and copied[0]
2802 copy = follow and copied and copied[0]
2803 if copy:
2803 if copy:
2804 copies.setdefault(rev, {})[fn] = copy
2804 copies.setdefault(rev, {})[fn] = copy
2805 if fn in skip:
2805 if fn in skip:
2806 if copy:
2806 if copy:
2807 skip[copy] = True
2807 skip[copy] = True
2808 continue
2808 continue
2809 files.append(fn)
2809 files.append(fn)
2810
2810
2811 if fn not in matches[rev]:
2811 if fn not in matches[rev]:
2812 grepbody(fn, rev, flog.read(fnode))
2812 grepbody(fn, rev, flog.read(fnode))
2813
2813
2814 pfn = copy or fn
2814 pfn = copy or fn
2815 if pfn not in matches[parent]:
2815 if pfn not in matches[parent]:
2816 try:
2816 try:
2817 fnode = pctx.filenode(pfn)
2817 fnode = pctx.filenode(pfn)
2818 grepbody(pfn, parent, flog.read(fnode))
2818 grepbody(pfn, parent, flog.read(fnode))
2819 except error.LookupError:
2819 except error.LookupError:
2820 pass
2820 pass
2821
2821
2822 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2822 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2823 rev = ctx.rev()
2823 rev = ctx.rev()
2824 parent = ctx.p1().rev()
2824 parent = ctx.p1().rev()
2825 for fn in sorted(revfiles.get(rev, [])):
2825 for fn in sorted(revfiles.get(rev, [])):
2826 states = matches[rev][fn]
2826 states = matches[rev][fn]
2827 copy = copies.get(rev, {}).get(fn)
2827 copy = copies.get(rev, {}).get(fn)
2828 if fn in skip:
2828 if fn in skip:
2829 if copy:
2829 if copy:
2830 skip[copy] = True
2830 skip[copy] = True
2831 continue
2831 continue
2832 pstates = matches.get(parent, {}).get(copy or fn, [])
2832 pstates = matches.get(parent, {}).get(copy or fn, [])
2833 if pstates or states:
2833 if pstates or states:
2834 r = display(fn, ctx, pstates, states)
2834 r = display(fn, ctx, pstates, states)
2835 found = found or r
2835 found = found or r
2836 if r and not opts.get('all'):
2836 if r and not opts.get('all'):
2837 skip[fn] = True
2837 skip[fn] = True
2838 if copy:
2838 if copy:
2839 skip[copy] = True
2839 skip[copy] = True
2840 del matches[rev]
2840 del matches[rev]
2841 del revfiles[rev]
2841 del revfiles[rev]
2842
2842
2843 return not found
2843 return not found
2844
2844
2845 @command('heads',
2845 @command('heads',
2846 [('r', 'rev', '',
2846 [('r', 'rev', '',
2847 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2847 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2848 ('t', 'topo', False, _('show topological heads only')),
2848 ('t', 'topo', False, _('show topological heads only')),
2849 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2849 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2850 ('c', 'closed', False, _('show normal and closed branch heads')),
2850 ('c', 'closed', False, _('show normal and closed branch heads')),
2851 ] + templateopts,
2851 ] + templateopts,
2852 _('[-ac] [-r STARTREV] [REV]...'))
2852 _('[-ac] [-r STARTREV] [REV]...'))
2853 def heads(ui, repo, *branchrevs, **opts):
2853 def heads(ui, repo, *branchrevs, **opts):
2854 """show current repository heads or show branch heads
2854 """show current repository heads or show branch heads
2855
2855
2856 With no arguments, show all repository branch heads.
2856 With no arguments, show all repository branch heads.
2857
2857
2858 Repository "heads" are changesets with no child changesets. They are
2858 Repository "heads" are changesets with no child changesets. They are
2859 where development generally takes place and are the usual targets
2859 where development generally takes place and are the usual targets
2860 for update and merge operations. Branch heads are changesets that have
2860 for update and merge operations. Branch heads are changesets that have
2861 no child changeset on the same branch.
2861 no child changeset on the same branch.
2862
2862
2863 If one or more REVs are given, only branch heads on the branches
2863 If one or more REVs are given, only branch heads on the branches
2864 associated with the specified changesets are shown. This means
2864 associated with the specified changesets are shown. This means
2865 that you can use :hg:`heads foo` to see the heads on a branch
2865 that you can use :hg:`heads foo` to see the heads on a branch
2866 named ``foo``.
2866 named ``foo``.
2867
2867
2868 If -c/--closed is specified, also show branch heads marked closed
2868 If -c/--closed is specified, also show branch heads marked closed
2869 (see :hg:`commit --close-branch`).
2869 (see :hg:`commit --close-branch`).
2870
2870
2871 If STARTREV is specified, only those heads that are descendants of
2871 If STARTREV is specified, only those heads that are descendants of
2872 STARTREV will be displayed.
2872 STARTREV will be displayed.
2873
2873
2874 If -t/--topo is specified, named branch mechanics will be ignored and only
2874 If -t/--topo is specified, named branch mechanics will be ignored and only
2875 changesets without children will be shown.
2875 changesets without children will be shown.
2876
2876
2877 Returns 0 if matching heads are found, 1 if not.
2877 Returns 0 if matching heads are found, 1 if not.
2878 """
2878 """
2879
2879
2880 start = None
2880 start = None
2881 if 'rev' in opts:
2881 if 'rev' in opts:
2882 start = scmutil.revsingle(repo, opts['rev'], None).node()
2882 start = scmutil.revsingle(repo, opts['rev'], None).node()
2883
2883
2884 if opts.get('topo'):
2884 if opts.get('topo'):
2885 heads = [repo[h] for h in repo.heads(start)]
2885 heads = [repo[h] for h in repo.heads(start)]
2886 else:
2886 else:
2887 heads = []
2887 heads = []
2888 for branch in repo.branchmap():
2888 for branch in repo.branchmap():
2889 heads += repo.branchheads(branch, start, opts.get('closed'))
2889 heads += repo.branchheads(branch, start, opts.get('closed'))
2890 heads = [repo[h] for h in heads]
2890 heads = [repo[h] for h in heads]
2891
2891
2892 if branchrevs:
2892 if branchrevs:
2893 branches = set(repo[br].branch() for br in branchrevs)
2893 branches = set(repo[br].branch() for br in branchrevs)
2894 heads = [h for h in heads if h.branch() in branches]
2894 heads = [h for h in heads if h.branch() in branches]
2895
2895
2896 if opts.get('active') and branchrevs:
2896 if opts.get('active') and branchrevs:
2897 dagheads = repo.heads(start)
2897 dagheads = repo.heads(start)
2898 heads = [h for h in heads if h.node() in dagheads]
2898 heads = [h for h in heads if h.node() in dagheads]
2899
2899
2900 if branchrevs:
2900 if branchrevs:
2901 haveheads = set(h.branch() for h in heads)
2901 haveheads = set(h.branch() for h in heads)
2902 if branches - haveheads:
2902 if branches - haveheads:
2903 headless = ', '.join(b for b in branches - haveheads)
2903 headless = ', '.join(b for b in branches - haveheads)
2904 msg = _('no open branch heads found on branches %s')
2904 msg = _('no open branch heads found on branches %s')
2905 if opts.get('rev'):
2905 if opts.get('rev'):
2906 msg += _(' (started at %s)' % opts['rev'])
2906 msg += _(' (started at %s)' % opts['rev'])
2907 ui.warn((msg + '\n') % headless)
2907 ui.warn((msg + '\n') % headless)
2908
2908
2909 if not heads:
2909 if not heads:
2910 return 1
2910 return 1
2911
2911
2912 heads = sorted(heads, key=lambda x: -x.rev())
2912 heads = sorted(heads, key=lambda x: -x.rev())
2913 displayer = cmdutil.show_changeset(ui, repo, opts)
2913 displayer = cmdutil.show_changeset(ui, repo, opts)
2914 for ctx in heads:
2914 for ctx in heads:
2915 displayer.show(ctx)
2915 displayer.show(ctx)
2916 displayer.close()
2916 displayer.close()
2917
2917
2918 @command('help',
2918 @command('help',
2919 [('e', 'extension', None, _('show only help for extensions')),
2919 [('e', 'extension', None, _('show only help for extensions')),
2920 ('c', 'command', None, _('show only help for commands'))],
2920 ('c', 'command', None, _('show only help for commands'))],
2921 _('[-ec] [TOPIC]'))
2921 _('[-ec] [TOPIC]'))
2922 def help_(ui, name=None, unknowncmd=False, full=True, **opts):
2922 def help_(ui, name=None, unknowncmd=False, full=True, **opts):
2923 """show help for a given topic or a help overview
2923 """show help for a given topic or a help overview
2924
2924
2925 With no arguments, print a list of commands with short help messages.
2925 With no arguments, print a list of commands with short help messages.
2926
2926
2927 Given a topic, extension, or command name, print help for that
2927 Given a topic, extension, or command name, print help for that
2928 topic.
2928 topic.
2929
2929
2930 Returns 0 if successful.
2930 Returns 0 if successful.
2931 """
2931 """
2932
2932
2933 textwidth = min(ui.termwidth(), 80) - 2
2933 textwidth = min(ui.termwidth(), 80) - 2
2934
2934
2935 def optrst(options):
2935 def optrst(options):
2936 data = []
2936 data = []
2937 multioccur = False
2937 multioccur = False
2938 for option in options:
2938 for option in options:
2939 if len(option) == 5:
2939 if len(option) == 5:
2940 shortopt, longopt, default, desc, optlabel = option
2940 shortopt, longopt, default, desc, optlabel = option
2941 else:
2941 else:
2942 shortopt, longopt, default, desc = option
2942 shortopt, longopt, default, desc = option
2943 optlabel = _("VALUE") # default label
2943 optlabel = _("VALUE") # default label
2944
2944
2945 if _("DEPRECATED") in desc and not ui.verbose:
2945 if _("DEPRECATED") in desc and not ui.verbose:
2946 continue
2946 continue
2947
2947
2948 so = ''
2948 so = ''
2949 if shortopt:
2949 if shortopt:
2950 so = '-' + shortopt
2950 so = '-' + shortopt
2951 lo = '--' + longopt
2951 lo = '--' + longopt
2952 if default:
2952 if default:
2953 desc += _(" (default: %s)") % default
2953 desc += _(" (default: %s)") % default
2954
2954
2955 if isinstance(default, list):
2955 if isinstance(default, list):
2956 lo += " %s [+]" % optlabel
2956 lo += " %s [+]" % optlabel
2957 multioccur = True
2957 multioccur = True
2958 elif (default is not None) and not isinstance(default, bool):
2958 elif (default is not None) and not isinstance(default, bool):
2959 lo += " %s" % optlabel
2959 lo += " %s" % optlabel
2960
2960
2961 data.append((so, lo, desc))
2961 data.append((so, lo, desc))
2962
2962
2963 rst = minirst.maketable(data, 1)
2963 rst = minirst.maketable(data, 1)
2964
2964
2965 if multioccur:
2965 if multioccur:
2966 rst += _("\n[+] marked option can be specified multiple times\n")
2966 rst += _("\n[+] marked option can be specified multiple times\n")
2967
2967
2968 return rst
2968 return rst
2969
2969
2970 # list all option lists
2970 # list all option lists
2971 def opttext(optlist, width):
2971 def opttext(optlist, width):
2972 rst = ''
2972 rst = ''
2973 if not optlist:
2973 if not optlist:
2974 return ''
2974 return ''
2975
2975
2976 for title, options in optlist:
2976 for title, options in optlist:
2977 rst += '\n%s\n' % title
2977 rst += '\n%s\n' % title
2978 if options:
2978 if options:
2979 rst += "\n"
2979 rst += "\n"
2980 rst += optrst(options)
2980 rst += optrst(options)
2981 rst += '\n'
2981 rst += '\n'
2982
2982
2983 return '\n' + minirst.format(rst, width)
2983 return '\n' + minirst.format(rst, width)
2984
2984
2985 def addglobalopts(optlist, aliases):
2985 def addglobalopts(optlist, aliases):
2986 if ui.quiet:
2986 if ui.quiet:
2987 return []
2987 return []
2988
2988
2989 if ui.verbose:
2989 if ui.verbose:
2990 optlist.append((_("global options:"), globalopts))
2990 optlist.append((_("global options:"), globalopts))
2991 if name == 'shortlist':
2991 if name == 'shortlist':
2992 optlist.append((_('use "hg help" for the full list '
2992 optlist.append((_('use "hg help" for the full list '
2993 'of commands'), ()))
2993 'of commands'), ()))
2994 else:
2994 else:
2995 if name == 'shortlist':
2995 if name == 'shortlist':
2996 msg = _('use "hg help" for the full list of commands '
2996 msg = _('use "hg help" for the full list of commands '
2997 'or "hg -v" for details')
2997 'or "hg -v" for details')
2998 elif name and not full:
2998 elif name and not full:
2999 msg = _('use "hg help %s" to show the full help text' % name)
2999 msg = _('use "hg help %s" to show the full help text' % name)
3000 elif aliases:
3000 elif aliases:
3001 msg = _('use "hg -v help%s" to show builtin aliases and '
3001 msg = _('use "hg -v help%s" to show builtin aliases and '
3002 'global options') % (name and " " + name or "")
3002 'global options') % (name and " " + name or "")
3003 else:
3003 else:
3004 msg = _('use "hg -v help %s" to show more info') % name
3004 msg = _('use "hg -v help %s" to show more info') % name
3005 optlist.append((msg, ()))
3005 optlist.append((msg, ()))
3006
3006
3007 def helpcmd(name):
3007 def helpcmd(name):
3008 try:
3008 try:
3009 aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd)
3009 aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd)
3010 except error.AmbiguousCommand, inst:
3010 except error.AmbiguousCommand, inst:
3011 # py3k fix: except vars can't be used outside the scope of the
3011 # py3k fix: except vars can't be used outside the scope of the
3012 # except block, nor can be used inside a lambda. python issue4617
3012 # except block, nor can be used inside a lambda. python issue4617
3013 prefix = inst.args[0]
3013 prefix = inst.args[0]
3014 select = lambda c: c.lstrip('^').startswith(prefix)
3014 select = lambda c: c.lstrip('^').startswith(prefix)
3015 helplist(select)
3015 helplist(select)
3016 return
3016 return
3017
3017
3018 # check if it's an invalid alias and display its error if it is
3018 # check if it's an invalid alias and display its error if it is
3019 if getattr(entry[0], 'badalias', False):
3019 if getattr(entry[0], 'badalias', False):
3020 if not unknowncmd:
3020 if not unknowncmd:
3021 entry[0](ui)
3021 entry[0](ui)
3022 return
3022 return
3023
3023
3024 rst = ""
3024 rst = ""
3025
3025
3026 # synopsis
3026 # synopsis
3027 if len(entry) > 2:
3027 if len(entry) > 2:
3028 if entry[2].startswith('hg'):
3028 if entry[2].startswith('hg'):
3029 rst += "%s\n" % entry[2]
3029 rst += "%s\n" % entry[2]
3030 else:
3030 else:
3031 rst += 'hg %s %s\n' % (aliases[0], entry[2])
3031 rst += 'hg %s %s\n' % (aliases[0], entry[2])
3032 else:
3032 else:
3033 rst += 'hg %s\n' % aliases[0]
3033 rst += 'hg %s\n' % aliases[0]
3034
3034
3035 # aliases
3035 # aliases
3036 if full and not ui.quiet and len(aliases) > 1:
3036 if full and not ui.quiet and len(aliases) > 1:
3037 rst += _("\naliases: %s\n") % ', '.join(aliases[1:])
3037 rst += _("\naliases: %s\n") % ', '.join(aliases[1:])
3038
3038
3039 # description
3039 # description
3040 doc = gettext(entry[0].__doc__)
3040 doc = gettext(entry[0].__doc__)
3041 if not doc:
3041 if not doc:
3042 doc = _("(no help text available)")
3042 doc = _("(no help text available)")
3043 if util.safehasattr(entry[0], 'definition'): # aliased command
3043 if util.safehasattr(entry[0], 'definition'): # aliased command
3044 if entry[0].definition.startswith('!'): # shell alias
3044 if entry[0].definition.startswith('!'): # shell alias
3045 doc = _('shell alias for::\n\n %s') % entry[0].definition[1:]
3045 doc = _('shell alias for::\n\n %s') % entry[0].definition[1:]
3046 else:
3046 else:
3047 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
3047 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
3048 if ui.quiet or not full:
3048 if ui.quiet or not full:
3049 doc = doc.splitlines()[0]
3049 doc = doc.splitlines()[0]
3050 rst += "\n" + doc + "\n"
3050 rst += "\n" + doc + "\n"
3051
3051
3052 # check if this command shadows a non-trivial (multi-line)
3052 # check if this command shadows a non-trivial (multi-line)
3053 # extension help text
3053 # extension help text
3054 try:
3054 try:
3055 mod = extensions.find(name)
3055 mod = extensions.find(name)
3056 doc = gettext(mod.__doc__) or ''
3056 doc = gettext(mod.__doc__) or ''
3057 if '\n' in doc.strip():
3057 if '\n' in doc.strip():
3058 msg = _('use "hg help -e %s" to show help for '
3058 msg = _('use "hg help -e %s" to show help for '
3059 'the %s extension') % (name, name)
3059 'the %s extension') % (name, name)
3060 rst += '\n%s\n' % msg
3060 rst += '\n%s\n' % msg
3061 except KeyError:
3061 except KeyError:
3062 pass
3062 pass
3063
3063
3064 # options
3064 # options
3065 if not ui.quiet and entry[1]:
3065 if not ui.quiet and entry[1]:
3066 rst += '\n'
3066 rst += '\n'
3067 rst += _("options:")
3067 rst += _("options:")
3068 rst += '\n\n'
3068 rst += '\n\n'
3069 rst += optrst(entry[1])
3069 rst += optrst(entry[1])
3070
3070
3071 if ui.verbose:
3071 if ui.verbose:
3072 rst += '\n'
3072 rst += '\n'
3073 rst += _("global options:")
3073 rst += _("global options:")
3074 rst += '\n\n'
3074 rst += '\n\n'
3075 rst += optrst(globalopts)
3075 rst += optrst(globalopts)
3076
3076
3077 keep = ui.verbose and ['verbose'] or []
3077 keep = ui.verbose and ['verbose'] or []
3078 formatted, pruned = minirst.format(rst, textwidth, keep=keep)
3078 formatted, pruned = minirst.format(rst, textwidth, keep=keep)
3079 ui.write(formatted)
3079 ui.write(formatted)
3080
3080
3081 if not ui.verbose:
3081 if not ui.verbose:
3082 if not full:
3082 if not full:
3083 ui.write(_('\nuse "hg help %s" to show the full help text\n')
3083 ui.write(_('\nuse "hg help %s" to show the full help text\n')
3084 % name)
3084 % name)
3085 elif not ui.quiet:
3085 elif not ui.quiet:
3086 ui.write(_('\nuse "hg -v help %s" to show more info\n') % name)
3086 ui.write(_('\nuse "hg -v help %s" to show more info\n') % name)
3087
3087
3088
3088
3089 def helplist(select=None):
3089 def helplist(select=None):
3090 # list of commands
3090 # list of commands
3091 if name == "shortlist":
3091 if name == "shortlist":
3092 header = _('basic commands:\n\n')
3092 header = _('basic commands:\n\n')
3093 else:
3093 else:
3094 header = _('list of commands:\n\n')
3094 header = _('list of commands:\n\n')
3095
3095
3096 h = {}
3096 h = {}
3097 cmds = {}
3097 cmds = {}
3098 for c, e in table.iteritems():
3098 for c, e in table.iteritems():
3099 f = c.split("|", 1)[0]
3099 f = c.split("|", 1)[0]
3100 if select and not select(f):
3100 if select and not select(f):
3101 continue
3101 continue
3102 if (not select and name != 'shortlist' and
3102 if (not select and name != 'shortlist' and
3103 e[0].__module__ != __name__):
3103 e[0].__module__ != __name__):
3104 continue
3104 continue
3105 if name == "shortlist" and not f.startswith("^"):
3105 if name == "shortlist" and not f.startswith("^"):
3106 continue
3106 continue
3107 f = f.lstrip("^")
3107 f = f.lstrip("^")
3108 if not ui.debugflag and f.startswith("debug"):
3108 if not ui.debugflag and f.startswith("debug"):
3109 continue
3109 continue
3110 doc = e[0].__doc__
3110 doc = e[0].__doc__
3111 if doc and 'DEPRECATED' in doc and not ui.verbose:
3111 if doc and 'DEPRECATED' in doc and not ui.verbose:
3112 continue
3112 continue
3113 doc = gettext(doc)
3113 doc = gettext(doc)
3114 if not doc:
3114 if not doc:
3115 doc = _("(no help text available)")
3115 doc = _("(no help text available)")
3116 h[f] = doc.splitlines()[0].rstrip()
3116 h[f] = doc.splitlines()[0].rstrip()
3117 cmds[f] = c.lstrip("^")
3117 cmds[f] = c.lstrip("^")
3118
3118
3119 if not h:
3119 if not h:
3120 ui.status(_('no commands defined\n'))
3120 ui.status(_('no commands defined\n'))
3121 return
3121 return
3122
3122
3123 ui.status(header)
3123 ui.status(header)
3124 fns = sorted(h)
3124 fns = sorted(h)
3125 m = max(map(len, fns))
3125 m = max(map(len, fns))
3126 for f in fns:
3126 for f in fns:
3127 if ui.verbose:
3127 if ui.verbose:
3128 commands = cmds[f].replace("|",", ")
3128 commands = cmds[f].replace("|",", ")
3129 ui.write(" %s:\n %s\n"%(commands, h[f]))
3129 ui.write(" %s:\n %s\n"%(commands, h[f]))
3130 else:
3130 else:
3131 ui.write('%s\n' % (util.wrap(h[f], textwidth,
3131 ui.write('%s\n' % (util.wrap(h[f], textwidth,
3132 initindent=' %-*s ' % (m, f),
3132 initindent=' %-*s ' % (m, f),
3133 hangindent=' ' * (m + 4))))
3133 hangindent=' ' * (m + 4))))
3134
3134
3135 if not name:
3135 if not name:
3136 text = help.listexts(_('enabled extensions:'), extensions.enabled())
3136 text = help.listexts(_('enabled extensions:'), extensions.enabled())
3137 if text:
3137 if text:
3138 ui.write("\n%s" % minirst.format(text, textwidth))
3138 ui.write("\n%s" % minirst.format(text, textwidth))
3139
3139
3140 ui.write(_("\nadditional help topics:\n\n"))
3140 ui.write(_("\nadditional help topics:\n\n"))
3141 topics = []
3141 topics = []
3142 for names, header, doc in help.helptable:
3142 for names, header, doc in help.helptable:
3143 topics.append((sorted(names, key=len, reverse=True)[0], header))
3143 topics.append((sorted(names, key=len, reverse=True)[0], header))
3144 topics_len = max([len(s[0]) for s in topics])
3144 topics_len = max([len(s[0]) for s in topics])
3145 for t, desc in topics:
3145 for t, desc in topics:
3146 ui.write(" %-*s %s\n" % (topics_len, t, desc))
3146 ui.write(" %-*s %s\n" % (topics_len, t, desc))
3147
3147
3148 optlist = []
3148 optlist = []
3149 addglobalopts(optlist, True)
3149 addglobalopts(optlist, True)
3150 ui.write(opttext(optlist, textwidth))
3150 ui.write(opttext(optlist, textwidth))
3151
3151
3152 def helptopic(name):
3152 def helptopic(name):
3153 for names, header, doc in help.helptable:
3153 for names, header, doc in help.helptable:
3154 if name in names:
3154 if name in names:
3155 break
3155 break
3156 else:
3156 else:
3157 raise error.UnknownCommand(name)
3157 raise error.UnknownCommand(name)
3158
3158
3159 # description
3159 # description
3160 if not doc:
3160 if not doc:
3161 doc = _("(no help text available)")
3161 doc = _("(no help text available)")
3162 if util.safehasattr(doc, '__call__'):
3162 if util.safehasattr(doc, '__call__'):
3163 doc = doc()
3163 doc = doc()
3164
3164
3165 ui.write("%s\n\n" % header)
3165 ui.write("%s\n\n" % header)
3166 ui.write("%s" % minirst.format(doc, textwidth, indent=4))
3166 ui.write("%s" % minirst.format(doc, textwidth, indent=4))
3167 try:
3167 try:
3168 cmdutil.findcmd(name, table)
3168 cmdutil.findcmd(name, table)
3169 ui.write(_('\nuse "hg help -c %s" to see help for '
3169 ui.write(_('\nuse "hg help -c %s" to see help for '
3170 'the %s command\n') % (name, name))
3170 'the %s command\n') % (name, name))
3171 except error.UnknownCommand:
3171 except error.UnknownCommand:
3172 pass
3172 pass
3173
3173
3174 def helpext(name):
3174 def helpext(name):
3175 try:
3175 try:
3176 mod = extensions.find(name)
3176 mod = extensions.find(name)
3177 doc = gettext(mod.__doc__) or _('no help text available')
3177 doc = gettext(mod.__doc__) or _('no help text available')
3178 except KeyError:
3178 except KeyError:
3179 mod = None
3179 mod = None
3180 doc = extensions.disabledext(name)
3180 doc = extensions.disabledext(name)
3181 if not doc:
3181 if not doc:
3182 raise error.UnknownCommand(name)
3182 raise error.UnknownCommand(name)
3183
3183
3184 if '\n' not in doc:
3184 if '\n' not in doc:
3185 head, tail = doc, ""
3185 head, tail = doc, ""
3186 else:
3186 else:
3187 head, tail = doc.split('\n', 1)
3187 head, tail = doc.split('\n', 1)
3188 ui.write(_('%s extension - %s\n\n') % (name.split('.')[-1], head))
3188 ui.write(_('%s extension - %s\n\n') % (name.split('.')[-1], head))
3189 if tail:
3189 if tail:
3190 ui.write(minirst.format(tail, textwidth))
3190 ui.write(minirst.format(tail, textwidth))
3191 ui.status('\n')
3191 ui.status('\n')
3192
3192
3193 if mod:
3193 if mod:
3194 try:
3194 try:
3195 ct = mod.cmdtable
3195 ct = mod.cmdtable
3196 except AttributeError:
3196 except AttributeError:
3197 ct = {}
3197 ct = {}
3198 modcmds = set([c.split('|', 1)[0] for c in ct])
3198 modcmds = set([c.split('|', 1)[0] for c in ct])
3199 helplist(modcmds.__contains__)
3199 helplist(modcmds.__contains__)
3200 else:
3200 else:
3201 ui.write(_('use "hg help extensions" for information on enabling '
3201 ui.write(_('use "hg help extensions" for information on enabling '
3202 'extensions\n'))
3202 'extensions\n'))
3203
3203
3204 def helpextcmd(name):
3204 def helpextcmd(name):
3205 cmd, ext, mod = extensions.disabledcmd(ui, name, ui.config('ui', 'strict'))
3205 cmd, ext, mod = extensions.disabledcmd(ui, name, ui.config('ui', 'strict'))
3206 doc = gettext(mod.__doc__).splitlines()[0]
3206 doc = gettext(mod.__doc__).splitlines()[0]
3207
3207
3208 msg = help.listexts(_("'%s' is provided by the following "
3208 msg = help.listexts(_("'%s' is provided by the following "
3209 "extension:") % cmd, {ext: doc}, indent=4)
3209 "extension:") % cmd, {ext: doc}, indent=4)
3210 ui.write(minirst.format(msg, textwidth))
3210 ui.write(minirst.format(msg, textwidth))
3211 ui.write('\n')
3211 ui.write('\n')
3212 ui.write(_('use "hg help extensions" for information on enabling '
3212 ui.write(_('use "hg help extensions" for information on enabling '
3213 'extensions\n'))
3213 'extensions\n'))
3214
3214
3215 if name and name != 'shortlist':
3215 if name and name != 'shortlist':
3216 i = None
3216 i = None
3217 if unknowncmd:
3217 if unknowncmd:
3218 queries = (helpextcmd,)
3218 queries = (helpextcmd,)
3219 elif opts.get('extension'):
3219 elif opts.get('extension'):
3220 queries = (helpext,)
3220 queries = (helpext,)
3221 elif opts.get('command'):
3221 elif opts.get('command'):
3222 queries = (helpcmd,)
3222 queries = (helpcmd,)
3223 else:
3223 else:
3224 queries = (helptopic, helpcmd, helpext, helpextcmd)
3224 queries = (helptopic, helpcmd, helpext, helpextcmd)
3225 for f in queries:
3225 for f in queries:
3226 try:
3226 try:
3227 f(name)
3227 f(name)
3228 i = None
3228 i = None
3229 break
3229 break
3230 except error.UnknownCommand, inst:
3230 except error.UnknownCommand, inst:
3231 i = inst
3231 i = inst
3232 if i:
3232 if i:
3233 raise i
3233 raise i
3234 else:
3234 else:
3235 # program name
3235 # program name
3236 ui.status(_("Mercurial Distributed SCM\n"))
3236 ui.status(_("Mercurial Distributed SCM\n"))
3237 ui.status('\n')
3237 ui.status('\n')
3238 helplist()
3238 helplist()
3239
3239
3240
3240
3241 @command('identify|id',
3241 @command('identify|id',
3242 [('r', 'rev', '',
3242 [('r', 'rev', '',
3243 _('identify the specified revision'), _('REV')),
3243 _('identify the specified revision'), _('REV')),
3244 ('n', 'num', None, _('show local revision number')),
3244 ('n', 'num', None, _('show local revision number')),
3245 ('i', 'id', None, _('show global revision id')),
3245 ('i', 'id', None, _('show global revision id')),
3246 ('b', 'branch', None, _('show branch')),
3246 ('b', 'branch', None, _('show branch')),
3247 ('t', 'tags', None, _('show tags')),
3247 ('t', 'tags', None, _('show tags')),
3248 ('B', 'bookmarks', None, _('show bookmarks')),
3248 ('B', 'bookmarks', None, _('show bookmarks')),
3249 ] + remoteopts,
3249 ] + remoteopts,
3250 _('[-nibtB] [-r REV] [SOURCE]'))
3250 _('[-nibtB] [-r REV] [SOURCE]'))
3251 def identify(ui, repo, source=None, rev=None,
3251 def identify(ui, repo, source=None, rev=None,
3252 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3252 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3253 """identify the working copy or specified revision
3253 """identify the working copy or specified revision
3254
3254
3255 Print a summary identifying the repository state at REV using one or
3255 Print a summary identifying the repository state at REV using one or
3256 two parent hash identifiers, followed by a "+" if the working
3256 two parent hash identifiers, followed by a "+" if the working
3257 directory has uncommitted changes, the branch name (if not default),
3257 directory has uncommitted changes, the branch name (if not default),
3258 a list of tags, and a list of bookmarks.
3258 a list of tags, and a list of bookmarks.
3259
3259
3260 When REV is not given, print a summary of the current state of the
3260 When REV is not given, print a summary of the current state of the
3261 repository.
3261 repository.
3262
3262
3263 Specifying a path to a repository root or Mercurial bundle will
3263 Specifying a path to a repository root or Mercurial bundle will
3264 cause lookup to operate on that repository/bundle.
3264 cause lookup to operate on that repository/bundle.
3265
3265
3266 .. container:: verbose
3266 .. container:: verbose
3267
3267
3268 Examples:
3268 Examples:
3269
3269
3270 - generate a build identifier for the working directory::
3270 - generate a build identifier for the working directory::
3271
3271
3272 hg id --id > build-id.dat
3272 hg id --id > build-id.dat
3273
3273
3274 - find the revision corresponding to a tag::
3274 - find the revision corresponding to a tag::
3275
3275
3276 hg id -n -r 1.3
3276 hg id -n -r 1.3
3277
3277
3278 - check the most recent revision of a remote repository::
3278 - check the most recent revision of a remote repository::
3279
3279
3280 hg id -r tip http://selenic.com/hg/
3280 hg id -r tip http://selenic.com/hg/
3281
3281
3282 Returns 0 if successful.
3282 Returns 0 if successful.
3283 """
3283 """
3284
3284
3285 if not repo and not source:
3285 if not repo and not source:
3286 raise util.Abort(_("there is no Mercurial repository here "
3286 raise util.Abort(_("there is no Mercurial repository here "
3287 "(.hg not found)"))
3287 "(.hg not found)"))
3288
3288
3289 hexfunc = ui.debugflag and hex or short
3289 hexfunc = ui.debugflag and hex or short
3290 default = not (num or id or branch or tags or bookmarks)
3290 default = not (num or id or branch or tags or bookmarks)
3291 output = []
3291 output = []
3292 revs = []
3292 revs = []
3293
3293
3294 if source:
3294 if source:
3295 source, branches = hg.parseurl(ui.expandpath(source))
3295 source, branches = hg.parseurl(ui.expandpath(source))
3296 repo = hg.peer(ui, opts, source)
3296 repo = hg.peer(ui, opts, source)
3297 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
3297 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
3298
3298
3299 if not repo.local():
3299 if not repo.local():
3300 if num or branch or tags:
3300 if num or branch or tags:
3301 raise util.Abort(
3301 raise util.Abort(
3302 _("can't query remote revision number, branch, or tags"))
3302 _("can't query remote revision number, branch, or tags"))
3303 if not rev and revs:
3303 if not rev and revs:
3304 rev = revs[0]
3304 rev = revs[0]
3305 if not rev:
3305 if not rev:
3306 rev = "tip"
3306 rev = "tip"
3307
3307
3308 remoterev = repo.lookup(rev)
3308 remoterev = repo.lookup(rev)
3309 if default or id:
3309 if default or id:
3310 output = [hexfunc(remoterev)]
3310 output = [hexfunc(remoterev)]
3311
3311
3312 def getbms():
3312 def getbms():
3313 bms = []
3313 bms = []
3314
3314
3315 if 'bookmarks' in repo.listkeys('namespaces'):
3315 if 'bookmarks' in repo.listkeys('namespaces'):
3316 hexremoterev = hex(remoterev)
3316 hexremoterev = hex(remoterev)
3317 bms = [bm for bm, bmr in repo.listkeys('bookmarks').iteritems()
3317 bms = [bm for bm, bmr in repo.listkeys('bookmarks').iteritems()
3318 if bmr == hexremoterev]
3318 if bmr == hexremoterev]
3319
3319
3320 return bms
3320 return bms
3321
3321
3322 if bookmarks:
3322 if bookmarks:
3323 output.extend(getbms())
3323 output.extend(getbms())
3324 elif default and not ui.quiet:
3324 elif default and not ui.quiet:
3325 # multiple bookmarks for a single parent separated by '/'
3325 # multiple bookmarks for a single parent separated by '/'
3326 bm = '/'.join(getbms())
3326 bm = '/'.join(getbms())
3327 if bm:
3327 if bm:
3328 output.append(bm)
3328 output.append(bm)
3329 else:
3329 else:
3330 if not rev:
3330 if not rev:
3331 ctx = repo[None]
3331 ctx = repo[None]
3332 parents = ctx.parents()
3332 parents = ctx.parents()
3333 changed = ""
3333 changed = ""
3334 if default or id or num:
3334 if default or id or num:
3335 changed = util.any(repo.status()) and "+" or ""
3335 changed = util.any(repo.status()) and "+" or ""
3336 if default or id:
3336 if default or id:
3337 output = ["%s%s" %
3337 output = ["%s%s" %
3338 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
3338 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
3339 if num:
3339 if num:
3340 output.append("%s%s" %
3340 output.append("%s%s" %
3341 ('+'.join([str(p.rev()) for p in parents]), changed))
3341 ('+'.join([str(p.rev()) for p in parents]), changed))
3342 else:
3342 else:
3343 ctx = scmutil.revsingle(repo, rev)
3343 ctx = scmutil.revsingle(repo, rev)
3344 if default or id:
3344 if default or id:
3345 output = [hexfunc(ctx.node())]
3345 output = [hexfunc(ctx.node())]
3346 if num:
3346 if num:
3347 output.append(str(ctx.rev()))
3347 output.append(str(ctx.rev()))
3348
3348
3349 if default and not ui.quiet:
3349 if default and not ui.quiet:
3350 b = ctx.branch()
3350 b = ctx.branch()
3351 if b != 'default':
3351 if b != 'default':
3352 output.append("(%s)" % b)
3352 output.append("(%s)" % b)
3353
3353
3354 # multiple tags for a single parent separated by '/'
3354 # multiple tags for a single parent separated by '/'
3355 t = '/'.join(ctx.tags())
3355 t = '/'.join(ctx.tags())
3356 if t:
3356 if t:
3357 output.append(t)
3357 output.append(t)
3358
3358
3359 # multiple bookmarks for a single parent separated by '/'
3359 # multiple bookmarks for a single parent separated by '/'
3360 bm = '/'.join(ctx.bookmarks())
3360 bm = '/'.join(ctx.bookmarks())
3361 if bm:
3361 if bm:
3362 output.append(bm)
3362 output.append(bm)
3363 else:
3363 else:
3364 if branch:
3364 if branch:
3365 output.append(ctx.branch())
3365 output.append(ctx.branch())
3366
3366
3367 if tags:
3367 if tags:
3368 output.extend(ctx.tags())
3368 output.extend(ctx.tags())
3369
3369
3370 if bookmarks:
3370 if bookmarks:
3371 output.extend(ctx.bookmarks())
3371 output.extend(ctx.bookmarks())
3372
3372
3373 ui.write("%s\n" % ' '.join(output))
3373 ui.write("%s\n" % ' '.join(output))
3374
3374
3375 @command('import|patch',
3375 @command('import|patch',
3376 [('p', 'strip', 1,
3376 [('p', 'strip', 1,
3377 _('directory strip option for patch. This has the same '
3377 _('directory strip option for patch. This has the same '
3378 'meaning as the corresponding patch option'), _('NUM')),
3378 'meaning as the corresponding patch option'), _('NUM')),
3379 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3379 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3380 ('e', 'edit', False, _('invoke editor on commit messages')),
3380 ('e', 'edit', False, _('invoke editor on commit messages')),
3381 ('f', 'force', None, _('skip check for outstanding uncommitted changes')),
3381 ('f', 'force', None, _('skip check for outstanding uncommitted changes')),
3382 ('', 'no-commit', None,
3382 ('', 'no-commit', None,
3383 _("don't commit, just update the working directory")),
3383 _("don't commit, just update the working directory")),
3384 ('', 'bypass', None,
3384 ('', 'bypass', None,
3385 _("apply patch without touching the working directory")),
3385 _("apply patch without touching the working directory")),
3386 ('', 'exact', None,
3386 ('', 'exact', None,
3387 _('apply patch to the nodes from which it was generated')),
3387 _('apply patch to the nodes from which it was generated')),
3388 ('', 'import-branch', None,
3388 ('', 'import-branch', None,
3389 _('use any branch information in patch (implied by --exact)'))] +
3389 _('use any branch information in patch (implied by --exact)'))] +
3390 commitopts + commitopts2 + similarityopts,
3390 commitopts + commitopts2 + similarityopts,
3391 _('[OPTION]... PATCH...'))
3391 _('[OPTION]... PATCH...'))
3392 def import_(ui, repo, patch1=None, *patches, **opts):
3392 def import_(ui, repo, patch1=None, *patches, **opts):
3393 """import an ordered set of patches
3393 """import an ordered set of patches
3394
3394
3395 Import a list of patches and commit them individually (unless
3395 Import a list of patches and commit them individually (unless
3396 --no-commit is specified).
3396 --no-commit is specified).
3397
3397
3398 If there are outstanding changes in the working directory, import
3398 If there are outstanding changes in the working directory, import
3399 will abort unless given the -f/--force flag.
3399 will abort unless given the -f/--force flag.
3400
3400
3401 You can import a patch straight from a mail message. Even patches
3401 You can import a patch straight from a mail message. Even patches
3402 as attachments work (to use the body part, it must have type
3402 as attachments work (to use the body part, it must have type
3403 text/plain or text/x-patch). From and Subject headers of email
3403 text/plain or text/x-patch). From and Subject headers of email
3404 message are used as default committer and commit message. All
3404 message are used as default committer and commit message. All
3405 text/plain body parts before first diff are added to commit
3405 text/plain body parts before first diff are added to commit
3406 message.
3406 message.
3407
3407
3408 If the imported patch was generated by :hg:`export`, user and
3408 If the imported patch was generated by :hg:`export`, user and
3409 description from patch override values from message headers and
3409 description from patch override values from message headers and
3410 body. Values given on command line with -m/--message and -u/--user
3410 body. Values given on command line with -m/--message and -u/--user
3411 override these.
3411 override these.
3412
3412
3413 If --exact is specified, import will set the working directory to
3413 If --exact is specified, import will set the working directory to
3414 the parent of each patch before applying it, and will abort if the
3414 the parent of each patch before applying it, and will abort if the
3415 resulting changeset has a different ID than the one recorded in
3415 resulting changeset has a different ID than the one recorded in
3416 the patch. This may happen due to character set problems or other
3416 the patch. This may happen due to character set problems or other
3417 deficiencies in the text patch format.
3417 deficiencies in the text patch format.
3418
3418
3419 Use --bypass to apply and commit patches directly to the
3419 Use --bypass to apply and commit patches directly to the
3420 repository, not touching the working directory. Without --exact,
3420 repository, not touching the working directory. Without --exact,
3421 patches will be applied on top of the working directory parent
3421 patches will be applied on top of the working directory parent
3422 revision.
3422 revision.
3423
3423
3424 With -s/--similarity, hg will attempt to discover renames and
3424 With -s/--similarity, hg will attempt to discover renames and
3425 copies in the patch in the same way as :hg:`addremove`.
3425 copies in the patch in the same way as :hg:`addremove`.
3426
3426
3427 To read a patch from standard input, use "-" as the patch name. If
3427 To read a patch from standard input, use "-" as the patch name. If
3428 a URL is specified, the patch will be downloaded from it.
3428 a URL is specified, the patch will be downloaded from it.
3429 See :hg:`help dates` for a list of formats valid for -d/--date.
3429 See :hg:`help dates` for a list of formats valid for -d/--date.
3430
3430
3431 .. container:: verbose
3431 .. container:: verbose
3432
3432
3433 Examples:
3433 Examples:
3434
3434
3435 - import a traditional patch from a website and detect renames::
3435 - import a traditional patch from a website and detect renames::
3436
3436
3437 hg import -s 80 http://example.com/bugfix.patch
3437 hg import -s 80 http://example.com/bugfix.patch
3438
3438
3439 - import a changeset from an hgweb server::
3439 - import a changeset from an hgweb server::
3440
3440
3441 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
3441 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
3442
3442
3443 - import all the patches in an Unix-style mbox::
3443 - import all the patches in an Unix-style mbox::
3444
3444
3445 hg import incoming-patches.mbox
3445 hg import incoming-patches.mbox
3446
3446
3447 - attempt to exactly restore an exported changeset (not always
3447 - attempt to exactly restore an exported changeset (not always
3448 possible)::
3448 possible)::
3449
3449
3450 hg import --exact proposed-fix.patch
3450 hg import --exact proposed-fix.patch
3451
3451
3452 Returns 0 on success.
3452 Returns 0 on success.
3453 """
3453 """
3454
3454
3455 if not patch1:
3455 if not patch1:
3456 raise util.Abort(_('need at least one patch to import'))
3456 raise util.Abort(_('need at least one patch to import'))
3457
3457
3458 patches = (patch1,) + patches
3458 patches = (patch1,) + patches
3459
3459
3460 date = opts.get('date')
3460 date = opts.get('date')
3461 if date:
3461 if date:
3462 opts['date'] = util.parsedate(date)
3462 opts['date'] = util.parsedate(date)
3463
3463
3464 editor = cmdutil.commiteditor
3464 editor = cmdutil.commiteditor
3465 if opts.get('edit'):
3465 if opts.get('edit'):
3466 editor = cmdutil.commitforceeditor
3466 editor = cmdutil.commitforceeditor
3467
3467
3468 update = not opts.get('bypass')
3468 update = not opts.get('bypass')
3469 if not update and opts.get('no_commit'):
3469 if not update and opts.get('no_commit'):
3470 raise util.Abort(_('cannot use --no-commit with --bypass'))
3470 raise util.Abort(_('cannot use --no-commit with --bypass'))
3471 try:
3471 try:
3472 sim = float(opts.get('similarity') or 0)
3472 sim = float(opts.get('similarity') or 0)
3473 except ValueError:
3473 except ValueError:
3474 raise util.Abort(_('similarity must be a number'))
3474 raise util.Abort(_('similarity must be a number'))
3475 if sim < 0 or sim > 100:
3475 if sim < 0 or sim > 100:
3476 raise util.Abort(_('similarity must be between 0 and 100'))
3476 raise util.Abort(_('similarity must be between 0 and 100'))
3477 if sim and not update:
3477 if sim and not update:
3478 raise util.Abort(_('cannot use --similarity with --bypass'))
3478 raise util.Abort(_('cannot use --similarity with --bypass'))
3479
3479
3480 if (opts.get('exact') or not opts.get('force')) and update:
3480 if (opts.get('exact') or not opts.get('force')) and update:
3481 cmdutil.bailifchanged(repo)
3481 cmdutil.bailifchanged(repo)
3482
3482
3483 base = opts["base"]
3483 base = opts["base"]
3484 strip = opts["strip"]
3484 strip = opts["strip"]
3485 wlock = lock = tr = None
3485 wlock = lock = tr = None
3486 msgs = []
3486 msgs = []
3487
3487
3488 def checkexact(repo, n, nodeid):
3488 def checkexact(repo, n, nodeid):
3489 if opts.get('exact') and hex(n) != nodeid:
3489 if opts.get('exact') and hex(n) != nodeid:
3490 repo.rollback()
3490 repo.rollback()
3491 raise util.Abort(_('patch is damaged or loses information'))
3491 raise util.Abort(_('patch is damaged or loses information'))
3492
3492
3493 def tryone(ui, hunk, parents):
3493 def tryone(ui, hunk, parents):
3494 tmpname, message, user, date, branch, nodeid, p1, p2 = \
3494 tmpname, message, user, date, branch, nodeid, p1, p2 = \
3495 patch.extract(ui, hunk)
3495 patch.extract(ui, hunk)
3496
3496
3497 if not tmpname:
3497 if not tmpname:
3498 return (None, None)
3498 return (None, None)
3499 msg = _('applied to working directory')
3499 msg = _('applied to working directory')
3500
3500
3501 try:
3501 try:
3502 cmdline_message = cmdutil.logmessage(ui, opts)
3502 cmdline_message = cmdutil.logmessage(ui, opts)
3503 if cmdline_message:
3503 if cmdline_message:
3504 # pickup the cmdline msg
3504 # pickup the cmdline msg
3505 message = cmdline_message
3505 message = cmdline_message
3506 elif message:
3506 elif message:
3507 # pickup the patch msg
3507 # pickup the patch msg
3508 message = message.strip()
3508 message = message.strip()
3509 else:
3509 else:
3510 # launch the editor
3510 # launch the editor
3511 message = None
3511 message = None
3512 ui.debug('message:\n%s\n' % message)
3512 ui.debug('message:\n%s\n' % message)
3513
3513
3514 if len(parents) == 1:
3514 if len(parents) == 1:
3515 parents.append(repo[nullid])
3515 parents.append(repo[nullid])
3516 if opts.get('exact'):
3516 if opts.get('exact'):
3517 if not nodeid or not p1:
3517 if not nodeid or not p1:
3518 raise util.Abort(_('not a Mercurial patch'))
3518 raise util.Abort(_('not a Mercurial patch'))
3519 p1 = repo[p1]
3519 p1 = repo[p1]
3520 p2 = repo[p2 or nullid]
3520 p2 = repo[p2 or nullid]
3521 elif p2:
3521 elif p2:
3522 try:
3522 try:
3523 p1 = repo[p1]
3523 p1 = repo[p1]
3524 p2 = repo[p2]
3524 p2 = repo[p2]
3525 # Without any options, consider p2 only if the
3525 # Without any options, consider p2 only if the
3526 # patch is being applied on top of the recorded
3526 # patch is being applied on top of the recorded
3527 # first parent.
3527 # first parent.
3528 if p1 != parents[0]:
3528 if p1 != parents[0]:
3529 p1 = parents[0]
3529 p1 = parents[0]
3530 p2 = repo[nullid]
3530 p2 = repo[nullid]
3531 except error.RepoError:
3531 except error.RepoError:
3532 p1, p2 = parents
3532 p1, p2 = parents
3533 else:
3533 else:
3534 p1, p2 = parents
3534 p1, p2 = parents
3535
3535
3536 n = None
3536 n = None
3537 if update:
3537 if update:
3538 if p1 != parents[0]:
3538 if p1 != parents[0]:
3539 hg.clean(repo, p1.node())
3539 hg.clean(repo, p1.node())
3540 if p2 != parents[1]:
3540 if p2 != parents[1]:
3541 repo.dirstate.setparents(p1.node(), p2.node())
3541 repo.dirstate.setparents(p1.node(), p2.node())
3542
3542
3543 if opts.get('exact') or opts.get('import_branch'):
3543 if opts.get('exact') or opts.get('import_branch'):
3544 repo.dirstate.setbranch(branch or 'default')
3544 repo.dirstate.setbranch(branch or 'default')
3545
3545
3546 files = set()
3546 files = set()
3547 patch.patch(ui, repo, tmpname, strip=strip, files=files,
3547 patch.patch(ui, repo, tmpname, strip=strip, files=files,
3548 eolmode=None, similarity=sim / 100.0)
3548 eolmode=None, similarity=sim / 100.0)
3549 files = list(files)
3549 files = list(files)
3550 if opts.get('no_commit'):
3550 if opts.get('no_commit'):
3551 if message:
3551 if message:
3552 msgs.append(message)
3552 msgs.append(message)
3553 else:
3553 else:
3554 if opts.get('exact') or p2:
3554 if opts.get('exact') or p2:
3555 # If you got here, you either use --force and know what
3555 # If you got here, you either use --force and know what
3556 # you are doing or used --exact or a merge patch while
3556 # you are doing or used --exact or a merge patch while
3557 # being updated to its first parent.
3557 # being updated to its first parent.
3558 m = None
3558 m = None
3559 else:
3559 else:
3560 m = scmutil.matchfiles(repo, files or [])
3560 m = scmutil.matchfiles(repo, files or [])
3561 n = repo.commit(message, opts.get('user') or user,
3561 n = repo.commit(message, opts.get('user') or user,
3562 opts.get('date') or date, match=m,
3562 opts.get('date') or date, match=m,
3563 editor=editor)
3563 editor=editor)
3564 checkexact(repo, n, nodeid)
3564 checkexact(repo, n, nodeid)
3565 else:
3565 else:
3566 if opts.get('exact') or opts.get('import_branch'):
3566 if opts.get('exact') or opts.get('import_branch'):
3567 branch = branch or 'default'
3567 branch = branch or 'default'
3568 else:
3568 else:
3569 branch = p1.branch()
3569 branch = p1.branch()
3570 store = patch.filestore()
3570 store = patch.filestore()
3571 try:
3571 try:
3572 files = set()
3572 files = set()
3573 try:
3573 try:
3574 patch.patchrepo(ui, repo, p1, store, tmpname, strip,
3574 patch.patchrepo(ui, repo, p1, store, tmpname, strip,
3575 files, eolmode=None)
3575 files, eolmode=None)
3576 except patch.PatchError, e:
3576 except patch.PatchError, e:
3577 raise util.Abort(str(e))
3577 raise util.Abort(str(e))
3578 memctx = patch.makememctx(repo, (p1.node(), p2.node()),
3578 memctx = patch.makememctx(repo, (p1.node(), p2.node()),
3579 message,
3579 message,
3580 opts.get('user') or user,
3580 opts.get('user') or user,
3581 opts.get('date') or date,
3581 opts.get('date') or date,
3582 branch, files, store,
3582 branch, files, store,
3583 editor=cmdutil.commiteditor)
3583 editor=cmdutil.commiteditor)
3584 repo.savecommitmessage(memctx.description())
3584 repo.savecommitmessage(memctx.description())
3585 n = memctx.commit()
3585 n = memctx.commit()
3586 checkexact(repo, n, nodeid)
3586 checkexact(repo, n, nodeid)
3587 finally:
3587 finally:
3588 store.close()
3588 store.close()
3589 if n:
3589 if n:
3590 # i18n: refers to a short changeset id
3590 # i18n: refers to a short changeset id
3591 msg = _('created %s') % short(n)
3591 msg = _('created %s') % short(n)
3592 return (msg, n)
3592 return (msg, n)
3593 finally:
3593 finally:
3594 os.unlink(tmpname)
3594 os.unlink(tmpname)
3595
3595
3596 try:
3596 try:
3597 try:
3597 try:
3598 wlock = repo.wlock()
3598 wlock = repo.wlock()
3599 lock = repo.lock()
3599 lock = repo.lock()
3600 tr = repo.transaction('import')
3600 tr = repo.transaction('import')
3601 parents = repo.parents()
3601 parents = repo.parents()
3602 for patchurl in patches:
3602 for patchurl in patches:
3603 if patchurl == '-':
3603 if patchurl == '-':
3604 ui.status(_('applying patch from stdin\n'))
3604 ui.status(_('applying patch from stdin\n'))
3605 patchfile = ui.fin
3605 patchfile = ui.fin
3606 patchurl = 'stdin' # for error message
3606 patchurl = 'stdin' # for error message
3607 else:
3607 else:
3608 patchurl = os.path.join(base, patchurl)
3608 patchurl = os.path.join(base, patchurl)
3609 ui.status(_('applying %s\n') % patchurl)
3609 ui.status(_('applying %s\n') % patchurl)
3610 patchfile = url.open(ui, patchurl)
3610 patchfile = url.open(ui, patchurl)
3611
3611
3612 haspatch = False
3612 haspatch = False
3613 for hunk in patch.split(patchfile):
3613 for hunk in patch.split(patchfile):
3614 (msg, node) = tryone(ui, hunk, parents)
3614 (msg, node) = tryone(ui, hunk, parents)
3615 if msg:
3615 if msg:
3616 haspatch = True
3616 haspatch = True
3617 ui.note(msg + '\n')
3617 ui.note(msg + '\n')
3618 if update or opts.get('exact'):
3618 if update or opts.get('exact'):
3619 parents = repo.parents()
3619 parents = repo.parents()
3620 else:
3620 else:
3621 parents = [repo[node]]
3621 parents = [repo[node]]
3622
3622
3623 if not haspatch:
3623 if not haspatch:
3624 raise util.Abort(_('%s: no diffs found') % patchurl)
3624 raise util.Abort(_('%s: no diffs found') % patchurl)
3625
3625
3626 tr.close()
3626 tr.close()
3627 if msgs:
3627 if msgs:
3628 repo.savecommitmessage('\n* * *\n'.join(msgs))
3628 repo.savecommitmessage('\n* * *\n'.join(msgs))
3629 except:
3629 except:
3630 # wlock.release() indirectly calls dirstate.write(): since
3630 # wlock.release() indirectly calls dirstate.write(): since
3631 # we're crashing, we do not want to change the working dir
3631 # we're crashing, we do not want to change the working dir
3632 # parent after all, so make sure it writes nothing
3632 # parent after all, so make sure it writes nothing
3633 repo.dirstate.invalidate()
3633 repo.dirstate.invalidate()
3634 raise
3634 raise
3635 finally:
3635 finally:
3636 if tr:
3636 if tr:
3637 tr.release()
3637 tr.release()
3638 release(lock, wlock)
3638 release(lock, wlock)
3639
3639
3640 @command('incoming|in',
3640 @command('incoming|in',
3641 [('f', 'force', None,
3641 [('f', 'force', None,
3642 _('run even if remote repository is unrelated')),
3642 _('run even if remote repository is unrelated')),
3643 ('n', 'newest-first', None, _('show newest record first')),
3643 ('n', 'newest-first', None, _('show newest record first')),
3644 ('', 'bundle', '',
3644 ('', 'bundle', '',
3645 _('file to store the bundles into'), _('FILE')),
3645 _('file to store the bundles into'), _('FILE')),
3646 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3646 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3647 ('B', 'bookmarks', False, _("compare bookmarks")),
3647 ('B', 'bookmarks', False, _("compare bookmarks")),
3648 ('b', 'branch', [],
3648 ('b', 'branch', [],
3649 _('a specific branch you would like to pull'), _('BRANCH')),
3649 _('a specific branch you would like to pull'), _('BRANCH')),
3650 ] + logopts + remoteopts + subrepoopts,
3650 ] + logopts + remoteopts + subrepoopts,
3651 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3651 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3652 def incoming(ui, repo, source="default", **opts):
3652 def incoming(ui, repo, source="default", **opts):
3653 """show new changesets found in source
3653 """show new changesets found in source
3654
3654
3655 Show new changesets found in the specified path/URL or the default
3655 Show new changesets found in the specified path/URL or the default
3656 pull location. These are the changesets that would have been pulled
3656 pull location. These are the changesets that would have been pulled
3657 if a pull at the time you issued this command.
3657 if a pull at the time you issued this command.
3658
3658
3659 For remote repository, using --bundle avoids downloading the
3659 For remote repository, using --bundle avoids downloading the
3660 changesets twice if the incoming is followed by a pull.
3660 changesets twice if the incoming is followed by a pull.
3661
3661
3662 See pull for valid source format details.
3662 See pull for valid source format details.
3663
3663
3664 Returns 0 if there are incoming changes, 1 otherwise.
3664 Returns 0 if there are incoming changes, 1 otherwise.
3665 """
3665 """
3666 if opts.get('bundle') and opts.get('subrepos'):
3666 if opts.get('bundle') and opts.get('subrepos'):
3667 raise util.Abort(_('cannot combine --bundle and --subrepos'))
3667 raise util.Abort(_('cannot combine --bundle and --subrepos'))
3668
3668
3669 if opts.get('bookmarks'):
3669 if opts.get('bookmarks'):
3670 source, branches = hg.parseurl(ui.expandpath(source),
3670 source, branches = hg.parseurl(ui.expandpath(source),
3671 opts.get('branch'))
3671 opts.get('branch'))
3672 other = hg.peer(repo, opts, source)
3672 other = hg.peer(repo, opts, source)
3673 if 'bookmarks' not in other.listkeys('namespaces'):
3673 if 'bookmarks' not in other.listkeys('namespaces'):
3674 ui.warn(_("remote doesn't support bookmarks\n"))
3674 ui.warn(_("remote doesn't support bookmarks\n"))
3675 return 0
3675 return 0
3676 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3676 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3677 return bookmarks.diff(ui, repo, other)
3677 return bookmarks.diff(ui, repo, other)
3678
3678
3679 repo._subtoppath = ui.expandpath(source)
3679 repo._subtoppath = ui.expandpath(source)
3680 try:
3680 try:
3681 return hg.incoming(ui, repo, source, opts)
3681 return hg.incoming(ui, repo, source, opts)
3682 finally:
3682 finally:
3683 del repo._subtoppath
3683 del repo._subtoppath
3684
3684
3685
3685
3686 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'))
3686 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'))
3687 def init(ui, dest=".", **opts):
3687 def init(ui, dest=".", **opts):
3688 """create a new repository in the given directory
3688 """create a new repository in the given directory
3689
3689
3690 Initialize a new repository in the given directory. If the given
3690 Initialize a new repository in the given directory. If the given
3691 directory does not exist, it will be created.
3691 directory does not exist, it will be created.
3692
3692
3693 If no directory is given, the current directory is used.
3693 If no directory is given, the current directory is used.
3694
3694
3695 It is possible to specify an ``ssh://`` URL as the destination.
3695 It is possible to specify an ``ssh://`` URL as the destination.
3696 See :hg:`help urls` for more information.
3696 See :hg:`help urls` for more information.
3697
3697
3698 Returns 0 on success.
3698 Returns 0 on success.
3699 """
3699 """
3700 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3700 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3701
3701
3702 @command('locate',
3702 @command('locate',
3703 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3703 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3704 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3704 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3705 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3705 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3706 ] + walkopts,
3706 ] + walkopts,
3707 _('[OPTION]... [PATTERN]...'))
3707 _('[OPTION]... [PATTERN]...'))
3708 def locate(ui, repo, *pats, **opts):
3708 def locate(ui, repo, *pats, **opts):
3709 """locate files matching specific patterns
3709 """locate files matching specific patterns
3710
3710
3711 Print files under Mercurial control in the working directory whose
3711 Print files under Mercurial control in the working directory whose
3712 names match the given patterns.
3712 names match the given patterns.
3713
3713
3714 By default, this command searches all directories in the working
3714 By default, this command searches all directories in the working
3715 directory. To search just the current directory and its
3715 directory. To search just the current directory and its
3716 subdirectories, use "--include .".
3716 subdirectories, use "--include .".
3717
3717
3718 If no patterns are given to match, this command prints the names
3718 If no patterns are given to match, this command prints the names
3719 of all files under Mercurial control in the working directory.
3719 of all files under Mercurial control in the working directory.
3720
3720
3721 If you want to feed the output of this command into the "xargs"
3721 If you want to feed the output of this command into the "xargs"
3722 command, use the -0 option to both this command and "xargs". This
3722 command, use the -0 option to both this command and "xargs". This
3723 will avoid the problem of "xargs" treating single filenames that
3723 will avoid the problem of "xargs" treating single filenames that
3724 contain whitespace as multiple filenames.
3724 contain whitespace as multiple filenames.
3725
3725
3726 Returns 0 if a match is found, 1 otherwise.
3726 Returns 0 if a match is found, 1 otherwise.
3727 """
3727 """
3728 end = opts.get('print0') and '\0' or '\n'
3728 end = opts.get('print0') and '\0' or '\n'
3729 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3729 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3730
3730
3731 ret = 1
3731 ret = 1
3732 m = scmutil.match(repo[rev], pats, opts, default='relglob')
3732 m = scmutil.match(repo[rev], pats, opts, default='relglob')
3733 m.bad = lambda x, y: False
3733 m.bad = lambda x, y: False
3734 for abs in repo[rev].walk(m):
3734 for abs in repo[rev].walk(m):
3735 if not rev and abs not in repo.dirstate:
3735 if not rev and abs not in repo.dirstate:
3736 continue
3736 continue
3737 if opts.get('fullpath'):
3737 if opts.get('fullpath'):
3738 ui.write(repo.wjoin(abs), end)
3738 ui.write(repo.wjoin(abs), end)
3739 else:
3739 else:
3740 ui.write(((pats and m.rel(abs)) or abs), end)
3740 ui.write(((pats and m.rel(abs)) or abs), end)
3741 ret = 0
3741 ret = 0
3742
3742
3743 return ret
3743 return ret
3744
3744
3745 @command('^log|history',
3745 @command('^log|history',
3746 [('f', 'follow', None,
3746 [('f', 'follow', None,
3747 _('follow changeset history, or file history across copies and renames')),
3747 _('follow changeset history, or file history across copies and renames')),
3748 ('', 'follow-first', None,
3748 ('', 'follow-first', None,
3749 _('only follow the first parent of merge changesets (DEPRECATED)')),
3749 _('only follow the first parent of merge changesets (DEPRECATED)')),
3750 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3750 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3751 ('C', 'copies', None, _('show copied files')),
3751 ('C', 'copies', None, _('show copied files')),
3752 ('k', 'keyword', [],
3752 ('k', 'keyword', [],
3753 _('do case-insensitive search for a given text'), _('TEXT')),
3753 _('do case-insensitive search for a given text'), _('TEXT')),
3754 ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
3754 ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
3755 ('', 'removed', None, _('include revisions where files were removed')),
3755 ('', 'removed', None, _('include revisions where files were removed')),
3756 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3756 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3757 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3757 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3758 ('', 'only-branch', [],
3758 ('', 'only-branch', [],
3759 _('show only changesets within the given named branch (DEPRECATED)'),
3759 _('show only changesets within the given named branch (DEPRECATED)'),
3760 _('BRANCH')),
3760 _('BRANCH')),
3761 ('b', 'branch', [],
3761 ('b', 'branch', [],
3762 _('show changesets within the given named branch'), _('BRANCH')),
3762 _('show changesets within the given named branch'), _('BRANCH')),
3763 ('P', 'prune', [],
3763 ('P', 'prune', [],
3764 _('do not display revision or any of its ancestors'), _('REV')),
3764 _('do not display revision or any of its ancestors'), _('REV')),
3765 ('', 'hidden', False, _('show hidden changesets (DEPRECATED)')),
3765 ('', 'hidden', False, _('show hidden changesets (DEPRECATED)')),
3766 ] + logopts + walkopts,
3766 ] + logopts + walkopts,
3767 _('[OPTION]... [FILE]'))
3767 _('[OPTION]... [FILE]'))
3768 def log(ui, repo, *pats, **opts):
3768 def log(ui, repo, *pats, **opts):
3769 """show revision history of entire repository or files
3769 """show revision history of entire repository or files
3770
3770
3771 Print the revision history of the specified files or the entire
3771 Print the revision history of the specified files or the entire
3772 project.
3772 project.
3773
3773
3774 If no revision range is specified, the default is ``tip:0`` unless
3774 If no revision range is specified, the default is ``tip:0`` unless
3775 --follow is set, in which case the working directory parent is
3775 --follow is set, in which case the working directory parent is
3776 used as the starting revision.
3776 used as the starting revision.
3777
3777
3778 File history is shown without following rename or copy history of
3778 File history is shown without following rename or copy history of
3779 files. Use -f/--follow with a filename to follow history across
3779 files. Use -f/--follow with a filename to follow history across
3780 renames and copies. --follow without a filename will only show
3780 renames and copies. --follow without a filename will only show
3781 ancestors or descendants of the starting revision.
3781 ancestors or descendants of the starting revision.
3782
3782
3783 By default this command prints revision number and changeset id,
3783 By default this command prints revision number and changeset id,
3784 tags, non-trivial parents, user, date and time, and a summary for
3784 tags, non-trivial parents, user, date and time, and a summary for
3785 each commit. When the -v/--verbose switch is used, the list of
3785 each commit. When the -v/--verbose switch is used, the list of
3786 changed files and full commit message are shown.
3786 changed files and full commit message are shown.
3787
3787
3788 .. note::
3788 .. note::
3789 log -p/--patch may generate unexpected diff output for merge
3789 log -p/--patch may generate unexpected diff output for merge
3790 changesets, as it will only compare the merge changeset against
3790 changesets, as it will only compare the merge changeset against
3791 its first parent. Also, only files different from BOTH parents
3791 its first parent. Also, only files different from BOTH parents
3792 will appear in files:.
3792 will appear in files:.
3793
3793
3794 .. note::
3794 .. note::
3795 for performance reasons, log FILE may omit duplicate changes
3795 for performance reasons, log FILE may omit duplicate changes
3796 made on branches and will not show deletions. To see all
3796 made on branches and will not show deletions. To see all
3797 changes including duplicates and deletions, use the --removed
3797 changes including duplicates and deletions, use the --removed
3798 switch.
3798 switch.
3799
3799
3800 .. container:: verbose
3800 .. container:: verbose
3801
3801
3802 Some examples:
3802 Some examples:
3803
3803
3804 - changesets with full descriptions and file lists::
3804 - changesets with full descriptions and file lists::
3805
3805
3806 hg log -v
3806 hg log -v
3807
3807
3808 - changesets ancestral to the working directory::
3808 - changesets ancestral to the working directory::
3809
3809
3810 hg log -f
3810 hg log -f
3811
3811
3812 - last 10 commits on the current branch::
3812 - last 10 commits on the current branch::
3813
3813
3814 hg log -l 10 -b .
3814 hg log -l 10 -b .
3815
3815
3816 - changesets showing all modifications of a file, including removals::
3816 - changesets showing all modifications of a file, including removals::
3817
3817
3818 hg log --removed file.c
3818 hg log --removed file.c
3819
3819
3820 - all changesets that touch a directory, with diffs, excluding merges::
3820 - all changesets that touch a directory, with diffs, excluding merges::
3821
3821
3822 hg log -Mp lib/
3822 hg log -Mp lib/
3823
3823
3824 - all revision numbers that match a keyword::
3824 - all revision numbers that match a keyword::
3825
3825
3826 hg log -k bug --template "{rev}\\n"
3826 hg log -k bug --template "{rev}\\n"
3827
3827
3828 - check if a given changeset is included is a tagged release::
3828 - check if a given changeset is included is a tagged release::
3829
3829
3830 hg log -r "a21ccf and ancestor(1.9)"
3830 hg log -r "a21ccf and ancestor(1.9)"
3831
3831
3832 - find all changesets by some user in a date range::
3832 - find all changesets by some user in a date range::
3833
3833
3834 hg log -k alice -d "may 2008 to jul 2008"
3834 hg log -k alice -d "may 2008 to jul 2008"
3835
3835
3836 - summary of all changesets after the last tag::
3836 - summary of all changesets after the last tag::
3837
3837
3838 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3838 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3839
3839
3840 See :hg:`help dates` for a list of formats valid for -d/--date.
3840 See :hg:`help dates` for a list of formats valid for -d/--date.
3841
3841
3842 See :hg:`help revisions` and :hg:`help revsets` for more about
3842 See :hg:`help revisions` and :hg:`help revsets` for more about
3843 specifying revisions.
3843 specifying revisions.
3844
3844
3845 Returns 0 on success.
3845 Returns 0 on success.
3846 """
3846 """
3847
3847
3848 matchfn = scmutil.match(repo[None], pats, opts)
3848 matchfn = scmutil.match(repo[None], pats, opts)
3849 limit = cmdutil.loglimit(opts)
3849 limit = cmdutil.loglimit(opts)
3850 count = 0
3850 count = 0
3851
3851
3852 endrev = None
3852 endrev = None
3853 if opts.get('copies') and opts.get('rev'):
3853 if opts.get('copies') and opts.get('rev'):
3854 endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
3854 endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
3855
3855
3856 df = False
3856 df = False
3857 if opts["date"]:
3857 if opts["date"]:
3858 df = util.matchdate(opts["date"])
3858 df = util.matchdate(opts["date"])
3859
3859
3860 branches = opts.get('branch', []) + opts.get('only_branch', [])
3860 branches = opts.get('branch', []) + opts.get('only_branch', [])
3861 opts['branch'] = [repo.lookupbranch(b) for b in branches]
3861 opts['branch'] = [repo.lookupbranch(b) for b in branches]
3862
3862
3863 displayer = cmdutil.show_changeset(ui, repo, opts, True)
3863 displayer = cmdutil.show_changeset(ui, repo, opts, True)
3864 def prep(ctx, fns):
3864 def prep(ctx, fns):
3865 rev = ctx.rev()
3865 rev = ctx.rev()
3866 parents = [p for p in repo.changelog.parentrevs(rev)
3866 parents = [p for p in repo.changelog.parentrevs(rev)
3867 if p != nullrev]
3867 if p != nullrev]
3868 if opts.get('no_merges') and len(parents) == 2:
3868 if opts.get('no_merges') and len(parents) == 2:
3869 return
3869 return
3870 if opts.get('only_merges') and len(parents) != 2:
3870 if opts.get('only_merges') and len(parents) != 2:
3871 return
3871 return
3872 if opts.get('branch') and ctx.branch() not in opts['branch']:
3872 if opts.get('branch') and ctx.branch() not in opts['branch']:
3873 return
3873 return
3874 if not opts.get('hidden') and ctx.hidden():
3874 if not opts.get('hidden') and ctx.hidden():
3875 return
3875 return
3876 if df and not df(ctx.date()[0]):
3876 if df and not df(ctx.date()[0]):
3877 return
3877 return
3878
3878
3879 lower = encoding.lower
3879 lower = encoding.lower
3880 if opts.get('user'):
3880 if opts.get('user'):
3881 luser = lower(ctx.user())
3881 luser = lower(ctx.user())
3882 for k in [lower(x) for x in opts['user']]:
3882 for k in [lower(x) for x in opts['user']]:
3883 if (k in luser):
3883 if (k in luser):
3884 break
3884 break
3885 else:
3885 else:
3886 return
3886 return
3887 if opts.get('keyword'):
3887 if opts.get('keyword'):
3888 luser = lower(ctx.user())
3888 luser = lower(ctx.user())
3889 ldesc = lower(ctx.description())
3889 ldesc = lower(ctx.description())
3890 lfiles = lower(" ".join(ctx.files()))
3890 lfiles = lower(" ".join(ctx.files()))
3891 for k in [lower(x) for x in opts['keyword']]:
3891 for k in [lower(x) for x in opts['keyword']]:
3892 if (k in luser or k in ldesc or k in lfiles):
3892 if (k in luser or k in ldesc or k in lfiles):
3893 break
3893 break
3894 else:
3894 else:
3895 return
3895 return
3896
3896
3897 copies = None
3897 copies = None
3898 if opts.get('copies') and rev:
3898 if opts.get('copies') and rev:
3899 copies = []
3899 copies = []
3900 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3900 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3901 for fn in ctx.files():
3901 for fn in ctx.files():
3902 rename = getrenamed(fn, rev)
3902 rename = getrenamed(fn, rev)
3903 if rename:
3903 if rename:
3904 copies.append((fn, rename[0]))
3904 copies.append((fn, rename[0]))
3905
3905
3906 revmatchfn = None
3906 revmatchfn = None
3907 if opts.get('patch') or opts.get('stat'):
3907 if opts.get('patch') or opts.get('stat'):
3908 if opts.get('follow') or opts.get('follow_first'):
3908 if opts.get('follow') or opts.get('follow_first'):
3909 # note: this might be wrong when following through merges
3909 # note: this might be wrong when following through merges
3910 revmatchfn = scmutil.match(repo[None], fns, default='path')
3910 revmatchfn = scmutil.match(repo[None], fns, default='path')
3911 else:
3911 else:
3912 revmatchfn = matchfn
3912 revmatchfn = matchfn
3913
3913
3914 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3914 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3915
3915
3916 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3916 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3917 if count == limit:
3917 if count == limit:
3918 break
3918 break
3919 if displayer.flush(ctx.rev()):
3919 if displayer.flush(ctx.rev()):
3920 count += 1
3920 count += 1
3921 displayer.close()
3921 displayer.close()
3922
3922
3923 @command('manifest',
3923 @command('manifest',
3924 [('r', 'rev', '', _('revision to display'), _('REV')),
3924 [('r', 'rev', '', _('revision to display'), _('REV')),
3925 ('', 'all', False, _("list files from all revisions"))],
3925 ('', 'all', False, _("list files from all revisions"))],
3926 _('[-r REV]'))
3926 _('[-r REV]'))
3927 def manifest(ui, repo, node=None, rev=None, **opts):
3927 def manifest(ui, repo, node=None, rev=None, **opts):
3928 """output the current or given revision of the project manifest
3928 """output the current or given revision of the project manifest
3929
3929
3930 Print a list of version controlled files for the given revision.
3930 Print a list of version controlled files for the given revision.
3931 If no revision is given, the first parent of the working directory
3931 If no revision is given, the first parent of the working directory
3932 is used, or the null revision if no revision is checked out.
3932 is used, or the null revision if no revision is checked out.
3933
3933
3934 With -v, print file permissions, symlink and executable bits.
3934 With -v, print file permissions, symlink and executable bits.
3935 With --debug, print file revision hashes.
3935 With --debug, print file revision hashes.
3936
3936
3937 If option --all is specified, the list of all files from all revisions
3937 If option --all is specified, the list of all files from all revisions
3938 is printed. This includes deleted and renamed files.
3938 is printed. This includes deleted and renamed files.
3939
3939
3940 Returns 0 on success.
3940 Returns 0 on success.
3941 """
3941 """
3942 if opts.get('all'):
3942 if opts.get('all'):
3943 if rev or node:
3943 if rev or node:
3944 raise util.Abort(_("can't specify a revision with --all"))
3944 raise util.Abort(_("can't specify a revision with --all"))
3945
3945
3946 res = []
3946 res = []
3947 prefix = "data/"
3947 prefix = "data/"
3948 suffix = ".i"
3948 suffix = ".i"
3949 plen = len(prefix)
3949 plen = len(prefix)
3950 slen = len(suffix)
3950 slen = len(suffix)
3951 lock = repo.lock()
3951 lock = repo.lock()
3952 try:
3952 try:
3953 for fn, b, size in repo.store.datafiles():
3953 for fn, b, size in repo.store.datafiles():
3954 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3954 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3955 res.append(fn[plen:-slen])
3955 res.append(fn[plen:-slen])
3956 finally:
3956 finally:
3957 lock.release()
3957 lock.release()
3958 for f in sorted(res):
3958 for f in sorted(res):
3959 ui.write("%s\n" % f)
3959 ui.write("%s\n" % f)
3960 return
3960 return
3961
3961
3962 if rev and node:
3962 if rev and node:
3963 raise util.Abort(_("please specify just one revision"))
3963 raise util.Abort(_("please specify just one revision"))
3964
3964
3965 if not node:
3965 if not node:
3966 node = rev
3966 node = rev
3967
3967
3968 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
3968 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
3969 ctx = scmutil.revsingle(repo, node)
3969 ctx = scmutil.revsingle(repo, node)
3970 for f in ctx:
3970 for f in ctx:
3971 if ui.debugflag:
3971 if ui.debugflag:
3972 ui.write("%40s " % hex(ctx.manifest()[f]))
3972 ui.write("%40s " % hex(ctx.manifest()[f]))
3973 if ui.verbose:
3973 if ui.verbose:
3974 ui.write(decor[ctx.flags(f)])
3974 ui.write(decor[ctx.flags(f)])
3975 ui.write("%s\n" % f)
3975 ui.write("%s\n" % f)
3976
3976
3977 @command('^merge',
3977 @command('^merge',
3978 [('f', 'force', None, _('force a merge with outstanding changes')),
3978 [('f', 'force', None, _('force a merge with outstanding changes')),
3979 ('r', 'rev', '', _('revision to merge'), _('REV')),
3979 ('r', 'rev', '', _('revision to merge'), _('REV')),
3980 ('P', 'preview', None,
3980 ('P', 'preview', None,
3981 _('review revisions to merge (no merge is performed)'))
3981 _('review revisions to merge (no merge is performed)'))
3982 ] + mergetoolopts,
3982 ] + mergetoolopts,
3983 _('[-P] [-f] [[-r] REV]'))
3983 _('[-P] [-f] [[-r] REV]'))
3984 def merge(ui, repo, node=None, **opts):
3984 def merge(ui, repo, node=None, **opts):
3985 """merge working directory with another revision
3985 """merge working directory with another revision
3986
3986
3987 The current working directory is updated with all changes made in
3987 The current working directory is updated with all changes made in
3988 the requested revision since the last common predecessor revision.
3988 the requested revision since the last common predecessor revision.
3989
3989
3990 Files that changed between either parent are marked as changed for
3990 Files that changed between either parent are marked as changed for
3991 the next commit and a commit must be performed before any further
3991 the next commit and a commit must be performed before any further
3992 updates to the repository are allowed. The next commit will have
3992 updates to the repository are allowed. The next commit will have
3993 two parents.
3993 two parents.
3994
3994
3995 ``--tool`` can be used to specify the merge tool used for file
3995 ``--tool`` can be used to specify the merge tool used for file
3996 merges. It overrides the HGMERGE environment variable and your
3996 merges. It overrides the HGMERGE environment variable and your
3997 configuration files. See :hg:`help merge-tools` for options.
3997 configuration files. See :hg:`help merge-tools` for options.
3998
3998
3999 If no revision is specified, the working directory's parent is a
3999 If no revision is specified, the working directory's parent is a
4000 head revision, and the current branch contains exactly one other
4000 head revision, and the current branch contains exactly one other
4001 head, the other head is merged with by default. Otherwise, an
4001 head, the other head is merged with by default. Otherwise, an
4002 explicit revision with which to merge with must be provided.
4002 explicit revision with which to merge with must be provided.
4003
4003
4004 :hg:`resolve` must be used to resolve unresolved files.
4004 :hg:`resolve` must be used to resolve unresolved files.
4005
4005
4006 To undo an uncommitted merge, use :hg:`update --clean .` which
4006 To undo an uncommitted merge, use :hg:`update --clean .` which
4007 will check out a clean copy of the original merge parent, losing
4007 will check out a clean copy of the original merge parent, losing
4008 all changes.
4008 all changes.
4009
4009
4010 Returns 0 on success, 1 if there are unresolved files.
4010 Returns 0 on success, 1 if there are unresolved files.
4011 """
4011 """
4012
4012
4013 if opts.get('rev') and node:
4013 if opts.get('rev') and node:
4014 raise util.Abort(_("please specify just one revision"))
4014 raise util.Abort(_("please specify just one revision"))
4015 if not node:
4015 if not node:
4016 node = opts.get('rev')
4016 node = opts.get('rev')
4017
4017
4018 if not node:
4018 if not node:
4019 branch = repo[None].branch()
4019 branch = repo[None].branch()
4020 bheads = repo.branchheads(branch)
4020 bheads = repo.branchheads(branch)
4021 if len(bheads) > 2:
4021 if len(bheads) > 2:
4022 raise util.Abort(_("branch '%s' has %d heads - "
4022 raise util.Abort(_("branch '%s' has %d heads - "
4023 "please merge with an explicit rev")
4023 "please merge with an explicit rev")
4024 % (branch, len(bheads)),
4024 % (branch, len(bheads)),
4025 hint=_("run 'hg heads .' to see heads"))
4025 hint=_("run 'hg heads .' to see heads"))
4026
4026
4027 parent = repo.dirstate.p1()
4027 parent = repo.dirstate.p1()
4028 if len(bheads) == 1:
4028 if len(bheads) == 1:
4029 if len(repo.heads()) > 1:
4029 if len(repo.heads()) > 1:
4030 raise util.Abort(_("branch '%s' has one head - "
4030 raise util.Abort(_("branch '%s' has one head - "
4031 "please merge with an explicit rev")
4031 "please merge with an explicit rev")
4032 % branch,
4032 % branch,
4033 hint=_("run 'hg heads' to see all heads"))
4033 hint=_("run 'hg heads' to see all heads"))
4034 msg, hint = _('nothing to merge'), None
4034 msg, hint = _('nothing to merge'), None
4035 if parent != repo.lookup(branch):
4035 if parent != repo.lookup(branch):
4036 hint = _("use 'hg update' instead")
4036 hint = _("use 'hg update' instead")
4037 raise util.Abort(msg, hint=hint)
4037 raise util.Abort(msg, hint=hint)
4038
4038
4039 if parent not in bheads:
4039 if parent not in bheads:
4040 raise util.Abort(_('working directory not at a head revision'),
4040 raise util.Abort(_('working directory not at a head revision'),
4041 hint=_("use 'hg update' or merge with an "
4041 hint=_("use 'hg update' or merge with an "
4042 "explicit revision"))
4042 "explicit revision"))
4043 node = parent == bheads[0] and bheads[-1] or bheads[0]
4043 node = parent == bheads[0] and bheads[-1] or bheads[0]
4044 else:
4044 else:
4045 node = scmutil.revsingle(repo, node).node()
4045 node = scmutil.revsingle(repo, node).node()
4046
4046
4047 if opts.get('preview'):
4047 if opts.get('preview'):
4048 # find nodes that are ancestors of p2 but not of p1
4048 # find nodes that are ancestors of p2 but not of p1
4049 p1 = repo.lookup('.')
4049 p1 = repo.lookup('.')
4050 p2 = repo.lookup(node)
4050 p2 = repo.lookup(node)
4051 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4051 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4052
4052
4053 displayer = cmdutil.show_changeset(ui, repo, opts)
4053 displayer = cmdutil.show_changeset(ui, repo, opts)
4054 for node in nodes:
4054 for node in nodes:
4055 displayer.show(repo[node])
4055 displayer.show(repo[node])
4056 displayer.close()
4056 displayer.close()
4057 return 0
4057 return 0
4058
4058
4059 try:
4059 try:
4060 # ui.forcemerge is an internal variable, do not document
4060 # ui.forcemerge is an internal variable, do not document
4061 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4061 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4062 return hg.merge(repo, node, force=opts.get('force'))
4062 return hg.merge(repo, node, force=opts.get('force'))
4063 finally:
4063 finally:
4064 ui.setconfig('ui', 'forcemerge', '')
4064 ui.setconfig('ui', 'forcemerge', '')
4065
4065
4066 @command('outgoing|out',
4066 @command('outgoing|out',
4067 [('f', 'force', None, _('run even when the destination is unrelated')),
4067 [('f', 'force', None, _('run even when the destination is unrelated')),
4068 ('r', 'rev', [],
4068 ('r', 'rev', [],
4069 _('a changeset intended to be included in the destination'), _('REV')),
4069 _('a changeset intended to be included in the destination'), _('REV')),
4070 ('n', 'newest-first', None, _('show newest record first')),
4070 ('n', 'newest-first', None, _('show newest record first')),
4071 ('B', 'bookmarks', False, _('compare bookmarks')),
4071 ('B', 'bookmarks', False, _('compare bookmarks')),
4072 ('b', 'branch', [], _('a specific branch you would like to push'),
4072 ('b', 'branch', [], _('a specific branch you would like to push'),
4073 _('BRANCH')),
4073 _('BRANCH')),
4074 ] + logopts + remoteopts + subrepoopts,
4074 ] + logopts + remoteopts + subrepoopts,
4075 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4075 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4076 def outgoing(ui, repo, dest=None, **opts):
4076 def outgoing(ui, repo, dest=None, **opts):
4077 """show changesets not found in the destination
4077 """show changesets not found in the destination
4078
4078
4079 Show changesets not found in the specified destination repository
4079 Show changesets not found in the specified destination repository
4080 or the default push location. These are the changesets that would
4080 or the default push location. These are the changesets that would
4081 be pushed if a push was requested.
4081 be pushed if a push was requested.
4082
4082
4083 See pull for details of valid destination formats.
4083 See pull for details of valid destination formats.
4084
4084
4085 Returns 0 if there are outgoing changes, 1 otherwise.
4085 Returns 0 if there are outgoing changes, 1 otherwise.
4086 """
4086 """
4087
4087
4088 if opts.get('bookmarks'):
4088 if opts.get('bookmarks'):
4089 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4089 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4090 dest, branches = hg.parseurl(dest, opts.get('branch'))
4090 dest, branches = hg.parseurl(dest, opts.get('branch'))
4091 other = hg.peer(repo, opts, dest)
4091 other = hg.peer(repo, opts, dest)
4092 if 'bookmarks' not in other.listkeys('namespaces'):
4092 if 'bookmarks' not in other.listkeys('namespaces'):
4093 ui.warn(_("remote doesn't support bookmarks\n"))
4093 ui.warn(_("remote doesn't support bookmarks\n"))
4094 return 0
4094 return 0
4095 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4095 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4096 return bookmarks.diff(ui, other, repo)
4096 return bookmarks.diff(ui, other, repo)
4097
4097
4098 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4098 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4099 try:
4099 try:
4100 return hg.outgoing(ui, repo, dest, opts)
4100 return hg.outgoing(ui, repo, dest, opts)
4101 finally:
4101 finally:
4102 del repo._subtoppath
4102 del repo._subtoppath
4103
4103
4104 @command('parents',
4104 @command('parents',
4105 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4105 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4106 ] + templateopts,
4106 ] + templateopts,
4107 _('[-r REV] [FILE]'))
4107 _('[-r REV] [FILE]'))
4108 def parents(ui, repo, file_=None, **opts):
4108 def parents(ui, repo, file_=None, **opts):
4109 """show the parents of the working directory or revision
4109 """show the parents of the working directory or revision
4110
4110
4111 Print the working directory's parent revisions. If a revision is
4111 Print the working directory's parent revisions. If a revision is
4112 given via -r/--rev, the parent of that revision will be printed.
4112 given via -r/--rev, the parent of that revision will be printed.
4113 If a file argument is given, the revision in which the file was
4113 If a file argument is given, the revision in which the file was
4114 last changed (before the working directory revision or the
4114 last changed (before the working directory revision or the
4115 argument to --rev if given) is printed.
4115 argument to --rev if given) is printed.
4116
4116
4117 Returns 0 on success.
4117 Returns 0 on success.
4118 """
4118 """
4119
4119
4120 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4120 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4121
4121
4122 if file_:
4122 if file_:
4123 m = scmutil.match(ctx, (file_,), opts)
4123 m = scmutil.match(ctx, (file_,), opts)
4124 if m.anypats() or len(m.files()) != 1:
4124 if m.anypats() or len(m.files()) != 1:
4125 raise util.Abort(_('can only specify an explicit filename'))
4125 raise util.Abort(_('can only specify an explicit filename'))
4126 file_ = m.files()[0]
4126 file_ = m.files()[0]
4127 filenodes = []
4127 filenodes = []
4128 for cp in ctx.parents():
4128 for cp in ctx.parents():
4129 if not cp:
4129 if not cp:
4130 continue
4130 continue
4131 try:
4131 try:
4132 filenodes.append(cp.filenode(file_))
4132 filenodes.append(cp.filenode(file_))
4133 except error.LookupError:
4133 except error.LookupError:
4134 pass
4134 pass
4135 if not filenodes:
4135 if not filenodes:
4136 raise util.Abort(_("'%s' not found in manifest!") % file_)
4136 raise util.Abort(_("'%s' not found in manifest!") % file_)
4137 fl = repo.file(file_)
4137 fl = repo.file(file_)
4138 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
4138 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
4139 else:
4139 else:
4140 p = [cp.node() for cp in ctx.parents()]
4140 p = [cp.node() for cp in ctx.parents()]
4141
4141
4142 displayer = cmdutil.show_changeset(ui, repo, opts)
4142 displayer = cmdutil.show_changeset(ui, repo, opts)
4143 for n in p:
4143 for n in p:
4144 if n != nullid:
4144 if n != nullid:
4145 displayer.show(repo[n])
4145 displayer.show(repo[n])
4146 displayer.close()
4146 displayer.close()
4147
4147
4148 @command('paths', [], _('[NAME]'))
4148 @command('paths', [], _('[NAME]'))
4149 def paths(ui, repo, search=None):
4149 def paths(ui, repo, search=None):
4150 """show aliases for remote repositories
4150 """show aliases for remote repositories
4151
4151
4152 Show definition of symbolic path name NAME. If no name is given,
4152 Show definition of symbolic path name NAME. If no name is given,
4153 show definition of all available names.
4153 show definition of all available names.
4154
4154
4155 Option -q/--quiet suppresses all output when searching for NAME
4155 Option -q/--quiet suppresses all output when searching for NAME
4156 and shows only the path names when listing all definitions.
4156 and shows only the path names when listing all definitions.
4157
4157
4158 Path names are defined in the [paths] section of your
4158 Path names are defined in the [paths] section of your
4159 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4159 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4160 repository, ``.hg/hgrc`` is used, too.
4160 repository, ``.hg/hgrc`` is used, too.
4161
4161
4162 The path names ``default`` and ``default-push`` have a special
4162 The path names ``default`` and ``default-push`` have a special
4163 meaning. When performing a push or pull operation, they are used
4163 meaning. When performing a push or pull operation, they are used
4164 as fallbacks if no location is specified on the command-line.
4164 as fallbacks if no location is specified on the command-line.
4165 When ``default-push`` is set, it will be used for push and
4165 When ``default-push`` is set, it will be used for push and
4166 ``default`` will be used for pull; otherwise ``default`` is used
4166 ``default`` will be used for pull; otherwise ``default`` is used
4167 as the fallback for both. When cloning a repository, the clone
4167 as the fallback for both. When cloning a repository, the clone
4168 source is written as ``default`` in ``.hg/hgrc``. Note that
4168 source is written as ``default`` in ``.hg/hgrc``. Note that
4169 ``default`` and ``default-push`` apply to all inbound (e.g.
4169 ``default`` and ``default-push`` apply to all inbound (e.g.
4170 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
4170 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
4171 :hg:`bundle`) operations.
4171 :hg:`bundle`) operations.
4172
4172
4173 See :hg:`help urls` for more information.
4173 See :hg:`help urls` for more information.
4174
4174
4175 Returns 0 on success.
4175 Returns 0 on success.
4176 """
4176 """
4177 if search:
4177 if search:
4178 for name, path in ui.configitems("paths"):
4178 for name, path in ui.configitems("paths"):
4179 if name == search:
4179 if name == search:
4180 ui.status("%s\n" % util.hidepassword(path))
4180 ui.status("%s\n" % util.hidepassword(path))
4181 return
4181 return
4182 if not ui.quiet:
4182 if not ui.quiet:
4183 ui.warn(_("not found!\n"))
4183 ui.warn(_("not found!\n"))
4184 return 1
4184 return 1
4185 else:
4185 else:
4186 for name, path in ui.configitems("paths"):
4186 for name, path in ui.configitems("paths"):
4187 if ui.quiet:
4187 if ui.quiet:
4188 ui.write("%s\n" % name)
4188 ui.write("%s\n" % name)
4189 else:
4189 else:
4190 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
4190 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
4191
4191
4192 @command('^phase',
4192 @command('^phase',
4193 [('p', 'public', False, _('set changeset phase to public')),
4193 [('p', 'public', False, _('set changeset phase to public')),
4194 ('d', 'draft', False, _('set changeset phase to draft')),
4194 ('d', 'draft', False, _('set changeset phase to draft')),
4195 ('s', 'secret', False, _('set changeset phase to secret')),
4195 ('s', 'secret', False, _('set changeset phase to secret')),
4196 ('f', 'force', False, _('allow to move boundary backward')),
4196 ('f', 'force', False, _('allow to move boundary backward')),
4197 ('r', 'rev', [], _('target revision'), _('REV')),
4197 ('r', 'rev', [], _('target revision'), _('REV')),
4198 ],
4198 ],
4199 _('[-p|-d|-s] [-f] [-r] REV...'))
4199 _('[-p|-d|-s] [-f] [-r] REV...'))
4200 def phase(ui, repo, *revs, **opts):
4200 def phase(ui, repo, *revs, **opts):
4201 """set or show the current phase name
4201 """set or show the current phase name
4202
4202
4203 With no argument, show the phase name of specified revisions.
4203 With no argument, show the phase name of specified revisions.
4204
4204
4205 With one of -p/--public, -d/--draft or -s/--secret, change the
4205 With one of -p/--public, -d/--draft or -s/--secret, change the
4206 phase value of the specified revisions.
4206 phase value of the specified revisions.
4207
4207
4208 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
4208 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
4209 lower phase to an higher phase. Phases are ordered as follows::
4209 lower phase to an higher phase. Phases are ordered as follows::
4210
4210
4211 public < draft < secret
4211 public < draft < secret
4212
4212
4213 Return 0 on success, 1 if no phases were changed.
4213 Return 0 on success, 1 if no phases were changed.
4214 """
4214 """
4215 # search for a unique phase argument
4215 # search for a unique phase argument
4216 targetphase = None
4216 targetphase = None
4217 for idx, name in enumerate(phases.phasenames):
4217 for idx, name in enumerate(phases.phasenames):
4218 if opts[name]:
4218 if opts[name]:
4219 if targetphase is not None:
4219 if targetphase is not None:
4220 raise util.Abort(_('only one phase can be specified'))
4220 raise util.Abort(_('only one phase can be specified'))
4221 targetphase = idx
4221 targetphase = idx
4222
4222
4223 # look for specified revision
4223 # look for specified revision
4224 revs = list(revs)
4224 revs = list(revs)
4225 revs.extend(opts['rev'])
4225 revs.extend(opts['rev'])
4226 if not revs:
4226 if not revs:
4227 raise util.Abort(_('no revisions specified'))
4227 raise util.Abort(_('no revisions specified'))
4228
4228
4229 lock = None
4229 lock = None
4230 ret = 0
4230 ret = 0
4231 if targetphase is None:
4231 if targetphase is None:
4232 # display
4232 # display
4233 for ctx in repo.set('%lr', revs):
4233 for ctx in repo.set('%lr', revs):
4234 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4234 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4235 else:
4235 else:
4236 lock = repo.lock()
4236 lock = repo.lock()
4237 try:
4237 try:
4238 # set phase
4238 # set phase
4239 nodes = [ctx.node() for ctx in repo.set('%lr', revs)]
4239 nodes = [ctx.node() for ctx in repo.set('%lr', revs)]
4240 if not nodes:
4240 if not nodes:
4241 raise util.Abort(_('empty revision set'))
4241 raise util.Abort(_('empty revision set'))
4242 olddata = repo._phaserev[:]
4242 olddata = repo._phaserev[:]
4243 phases.advanceboundary(repo, targetphase, nodes)
4243 phases.advanceboundary(repo, targetphase, nodes)
4244 if opts['force']:
4244 if opts['force']:
4245 phases.retractboundary(repo, targetphase, nodes)
4245 phases.retractboundary(repo, targetphase, nodes)
4246 finally:
4246 finally:
4247 lock.release()
4247 lock.release()
4248 if olddata is not None:
4248 if olddata is not None:
4249 changes = 0
4249 changes = 0
4250 newdata = repo._phaserev
4250 newdata = repo._phaserev
4251 changes = sum(o != newdata[i] for i, o in enumerate(olddata))
4251 changes = sum(o != newdata[i] for i, o in enumerate(olddata))
4252 if changes:
4252 if changes:
4253 ui.note(_('phase change for %i changesets\n') % changes)
4253 ui.note(_('phase change for %i changesets\n') % changes)
4254 else:
4254 else:
4255 ui.warn(_('no phases changed\n'))
4255 ui.warn(_('no phases changed\n'))
4256 ret = 1
4256 ret = 1
4257 return ret
4257 return ret
4258
4258
4259 def postincoming(ui, repo, modheads, optupdate, checkout):
4259 def postincoming(ui, repo, modheads, optupdate, checkout):
4260 if modheads == 0:
4260 if modheads == 0:
4261 return
4261 return
4262 if optupdate:
4262 if optupdate:
4263 movemarkfrom = repo['.'].node()
4263 movemarkfrom = repo['.'].node()
4264 try:
4264 try:
4265 ret = hg.update(repo, checkout)
4265 ret = hg.update(repo, checkout)
4266 except util.Abort, inst:
4266 except util.Abort, inst:
4267 ui.warn(_("not updating: %s\n" % str(inst)))
4267 ui.warn(_("not updating: %s\n" % str(inst)))
4268 return 0
4268 return 0
4269 if not ret and not checkout:
4269 if not ret and not checkout:
4270 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
4270 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
4271 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
4271 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
4272 return ret
4272 return ret
4273 if modheads > 1:
4273 if modheads > 1:
4274 currentbranchheads = len(repo.branchheads())
4274 currentbranchheads = len(repo.branchheads())
4275 if currentbranchheads == modheads:
4275 if currentbranchheads == modheads:
4276 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4276 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4277 elif currentbranchheads > 1:
4277 elif currentbranchheads > 1:
4278 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to merge)\n"))
4278 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to merge)\n"))
4279 else:
4279 else:
4280 ui.status(_("(run 'hg heads' to see heads)\n"))
4280 ui.status(_("(run 'hg heads' to see heads)\n"))
4281 else:
4281 else:
4282 ui.status(_("(run 'hg update' to get a working copy)\n"))
4282 ui.status(_("(run 'hg update' to get a working copy)\n"))
4283
4283
4284 @command('^pull',
4284 @command('^pull',
4285 [('u', 'update', None,
4285 [('u', 'update', None,
4286 _('update to new branch head if changesets were pulled')),
4286 _('update to new branch head if changesets were pulled')),
4287 ('f', 'force', None, _('run even when remote repository is unrelated')),
4287 ('f', 'force', None, _('run even when remote repository is unrelated')),
4288 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4288 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4289 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4289 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4290 ('b', 'branch', [], _('a specific branch you would like to pull'),
4290 ('b', 'branch', [], _('a specific branch you would like to pull'),
4291 _('BRANCH')),
4291 _('BRANCH')),
4292 ] + remoteopts,
4292 ] + remoteopts,
4293 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4293 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4294 def pull(ui, repo, source="default", **opts):
4294 def pull(ui, repo, source="default", **opts):
4295 """pull changes from the specified source
4295 """pull changes from the specified source
4296
4296
4297 Pull changes from a remote repository to a local one.
4297 Pull changes from a remote repository to a local one.
4298
4298
4299 This finds all changes from the repository at the specified path
4299 This finds all changes from the repository at the specified path
4300 or URL and adds them to a local repository (the current one unless
4300 or URL and adds them to a local repository (the current one unless
4301 -R is specified). By default, this does not update the copy of the
4301 -R is specified). By default, this does not update the copy of the
4302 project in the working directory.
4302 project in the working directory.
4303
4303
4304 Use :hg:`incoming` if you want to see what would have been added
4304 Use :hg:`incoming` if you want to see what would have been added
4305 by a pull at the time you issued this command. If you then decide
4305 by a pull at the time you issued this command. If you then decide
4306 to add those changes to the repository, you should use :hg:`pull
4306 to add those changes to the repository, you should use :hg:`pull
4307 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4307 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4308
4308
4309 If SOURCE is omitted, the 'default' path will be used.
4309 If SOURCE is omitted, the 'default' path will be used.
4310 See :hg:`help urls` for more information.
4310 See :hg:`help urls` for more information.
4311
4311
4312 Returns 0 on success, 1 if an update had unresolved files.
4312 Returns 0 on success, 1 if an update had unresolved files.
4313 """
4313 """
4314 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4314 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4315 other = hg.peer(repo, opts, source)
4315 other = hg.peer(repo, opts, source)
4316 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4316 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4317 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
4317 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
4318
4318
4319 if opts.get('bookmark'):
4319 if opts.get('bookmark'):
4320 if not revs:
4320 if not revs:
4321 revs = []
4321 revs = []
4322 rb = other.listkeys('bookmarks')
4322 rb = other.listkeys('bookmarks')
4323 for b in opts['bookmark']:
4323 for b in opts['bookmark']:
4324 if b not in rb:
4324 if b not in rb:
4325 raise util.Abort(_('remote bookmark %s not found!') % b)
4325 raise util.Abort(_('remote bookmark %s not found!') % b)
4326 revs.append(rb[b])
4326 revs.append(rb[b])
4327
4327
4328 if revs:
4328 if revs:
4329 try:
4329 try:
4330 revs = [other.lookup(rev) for rev in revs]
4330 revs = [other.lookup(rev) for rev in revs]
4331 except error.CapabilityError:
4331 except error.CapabilityError:
4332 err = _("other repository doesn't support revision lookup, "
4332 err = _("other repository doesn't support revision lookup, "
4333 "so a rev cannot be specified.")
4333 "so a rev cannot be specified.")
4334 raise util.Abort(err)
4334 raise util.Abort(err)
4335
4335
4336 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
4336 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
4337 bookmarks.updatefromremote(ui, repo, other, source)
4337 bookmarks.updatefromremote(ui, repo, other, source)
4338 if checkout:
4338 if checkout:
4339 checkout = str(repo.changelog.rev(other.lookup(checkout)))
4339 checkout = str(repo.changelog.rev(other.lookup(checkout)))
4340 repo._subtoppath = source
4340 repo._subtoppath = source
4341 try:
4341 try:
4342 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
4342 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
4343
4343
4344 finally:
4344 finally:
4345 del repo._subtoppath
4345 del repo._subtoppath
4346
4346
4347 # update specified bookmarks
4347 # update specified bookmarks
4348 if opts.get('bookmark'):
4348 if opts.get('bookmark'):
4349 for b in opts['bookmark']:
4349 for b in opts['bookmark']:
4350 # explicit pull overrides local bookmark if any
4350 # explicit pull overrides local bookmark if any
4351 ui.status(_("importing bookmark %s\n") % b)
4351 ui.status(_("importing bookmark %s\n") % b)
4352 repo._bookmarks[b] = repo[rb[b]].node()
4352 repo._bookmarks[b] = repo[rb[b]].node()
4353 bookmarks.write(repo)
4353 bookmarks.write(repo)
4354
4354
4355 return ret
4355 return ret
4356
4356
4357 @command('^push',
4357 @command('^push',
4358 [('f', 'force', None, _('force push')),
4358 [('f', 'force', None, _('force push')),
4359 ('r', 'rev', [],
4359 ('r', 'rev', [],
4360 _('a changeset intended to be included in the destination'),
4360 _('a changeset intended to be included in the destination'),
4361 _('REV')),
4361 _('REV')),
4362 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4362 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4363 ('b', 'branch', [],
4363 ('b', 'branch', [],
4364 _('a specific branch you would like to push'), _('BRANCH')),
4364 _('a specific branch you would like to push'), _('BRANCH')),
4365 ('', 'new-branch', False, _('allow pushing a new branch')),
4365 ('', 'new-branch', False, _('allow pushing a new branch')),
4366 ] + remoteopts,
4366 ] + remoteopts,
4367 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4367 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4368 def push(ui, repo, dest=None, **opts):
4368 def push(ui, repo, dest=None, **opts):
4369 """push changes to the specified destination
4369 """push changes to the specified destination
4370
4370
4371 Push changesets from the local repository to the specified
4371 Push changesets from the local repository to the specified
4372 destination.
4372 destination.
4373
4373
4374 This operation is symmetrical to pull: it is identical to a pull
4374 This operation is symmetrical to pull: it is identical to a pull
4375 in the destination repository from the current one.
4375 in the destination repository from the current one.
4376
4376
4377 By default, push will not allow creation of new heads at the
4377 By default, push will not allow creation of new heads at the
4378 destination, since multiple heads would make it unclear which head
4378 destination, since multiple heads would make it unclear which head
4379 to use. In this situation, it is recommended to pull and merge
4379 to use. In this situation, it is recommended to pull and merge
4380 before pushing.
4380 before pushing.
4381
4381
4382 Use --new-branch if you want to allow push to create a new named
4382 Use --new-branch if you want to allow push to create a new named
4383 branch that is not present at the destination. This allows you to
4383 branch that is not present at the destination. This allows you to
4384 only create a new branch without forcing other changes.
4384 only create a new branch without forcing other changes.
4385
4385
4386 Use -f/--force to override the default behavior and push all
4386 Use -f/--force to override the default behavior and push all
4387 changesets on all branches.
4387 changesets on all branches.
4388
4388
4389 If -r/--rev is used, the specified revision and all its ancestors
4389 If -r/--rev is used, the specified revision and all its ancestors
4390 will be pushed to the remote repository.
4390 will be pushed to the remote repository.
4391
4391
4392 Please see :hg:`help urls` for important details about ``ssh://``
4392 Please see :hg:`help urls` for important details about ``ssh://``
4393 URLs. If DESTINATION is omitted, a default path will be used.
4393 URLs. If DESTINATION is omitted, a default path will be used.
4394
4394
4395 Returns 0 if push was successful, 1 if nothing to push.
4395 Returns 0 if push was successful, 1 if nothing to push.
4396 """
4396 """
4397
4397
4398 if opts.get('bookmark'):
4398 if opts.get('bookmark'):
4399 for b in opts['bookmark']:
4399 for b in opts['bookmark']:
4400 # translate -B options to -r so changesets get pushed
4400 # translate -B options to -r so changesets get pushed
4401 if b in repo._bookmarks:
4401 if b in repo._bookmarks:
4402 opts.setdefault('rev', []).append(b)
4402 opts.setdefault('rev', []).append(b)
4403 else:
4403 else:
4404 # if we try to push a deleted bookmark, translate it to null
4404 # if we try to push a deleted bookmark, translate it to null
4405 # this lets simultaneous -r, -b options continue working
4405 # this lets simultaneous -r, -b options continue working
4406 opts.setdefault('rev', []).append("null")
4406 opts.setdefault('rev', []).append("null")
4407
4407
4408 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4408 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4409 dest, branches = hg.parseurl(dest, opts.get('branch'))
4409 dest, branches = hg.parseurl(dest, opts.get('branch'))
4410 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4410 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4411 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4411 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4412 other = hg.peer(repo, opts, dest)
4412 other = hg.peer(repo, opts, dest)
4413 if revs:
4413 if revs:
4414 revs = [repo.lookup(rev) for rev in revs]
4414 revs = [repo.lookup(rev) for rev in revs]
4415
4415
4416 repo._subtoppath = dest
4416 repo._subtoppath = dest
4417 try:
4417 try:
4418 # push subrepos depth-first for coherent ordering
4418 # push subrepos depth-first for coherent ordering
4419 c = repo['']
4419 c = repo['']
4420 subs = c.substate # only repos that are committed
4420 subs = c.substate # only repos that are committed
4421 for s in sorted(subs):
4421 for s in sorted(subs):
4422 if not c.sub(s).push(opts):
4422 if not c.sub(s).push(opts):
4423 return False
4423 return False
4424 finally:
4424 finally:
4425 del repo._subtoppath
4425 del repo._subtoppath
4426 result = repo.push(other, opts.get('force'), revs=revs,
4426 result = repo.push(other, opts.get('force'), revs=revs,
4427 newbranch=opts.get('new_branch'))
4427 newbranch=opts.get('new_branch'))
4428
4428
4429 result = (result == 0)
4429 result = (result == 0)
4430
4430
4431 if opts.get('bookmark'):
4431 if opts.get('bookmark'):
4432 rb = other.listkeys('bookmarks')
4432 rb = other.listkeys('bookmarks')
4433 for b in opts['bookmark']:
4433 for b in opts['bookmark']:
4434 # explicit push overrides remote bookmark if any
4434 # explicit push overrides remote bookmark if any
4435 if b in repo._bookmarks:
4435 if b in repo._bookmarks:
4436 ui.status(_("exporting bookmark %s\n") % b)
4436 ui.status(_("exporting bookmark %s\n") % b)
4437 new = repo[b].hex()
4437 new = repo[b].hex()
4438 elif b in rb:
4438 elif b in rb:
4439 ui.status(_("deleting remote bookmark %s\n") % b)
4439 ui.status(_("deleting remote bookmark %s\n") % b)
4440 new = '' # delete
4440 new = '' # delete
4441 else:
4441 else:
4442 ui.warn(_('bookmark %s does not exist on the local '
4442 ui.warn(_('bookmark %s does not exist on the local '
4443 'or remote repository!\n') % b)
4443 'or remote repository!\n') % b)
4444 return 2
4444 return 2
4445 old = rb.get(b, '')
4445 old = rb.get(b, '')
4446 r = other.pushkey('bookmarks', b, old, new)
4446 r = other.pushkey('bookmarks', b, old, new)
4447 if not r:
4447 if not r:
4448 ui.warn(_('updating bookmark %s failed!\n') % b)
4448 ui.warn(_('updating bookmark %s failed!\n') % b)
4449 if not result:
4449 if not result:
4450 result = 2
4450 result = 2
4451 result = 0
4451
4452
4452 return result
4453 return result
4453
4454
4454 @command('recover', [])
4455 @command('recover', [])
4455 def recover(ui, repo):
4456 def recover(ui, repo):
4456 """roll back an interrupted transaction
4457 """roll back an interrupted transaction
4457
4458
4458 Recover from an interrupted commit or pull.
4459 Recover from an interrupted commit or pull.
4459
4460
4460 This command tries to fix the repository status after an
4461 This command tries to fix the repository status after an
4461 interrupted operation. It should only be necessary when Mercurial
4462 interrupted operation. It should only be necessary when Mercurial
4462 suggests it.
4463 suggests it.
4463
4464
4464 Returns 0 if successful, 1 if nothing to recover or verify fails.
4465 Returns 0 if successful, 1 if nothing to recover or verify fails.
4465 """
4466 """
4466 if repo.recover():
4467 if repo.recover():
4467 return hg.verify(repo)
4468 return hg.verify(repo)
4468 return 1
4469 return 1
4469
4470
4470 @command('^remove|rm',
4471 @command('^remove|rm',
4471 [('A', 'after', None, _('record delete for missing files')),
4472 [('A', 'after', None, _('record delete for missing files')),
4472 ('f', 'force', None,
4473 ('f', 'force', None,
4473 _('remove (and delete) file even if added or modified')),
4474 _('remove (and delete) file even if added or modified')),
4474 ] + walkopts,
4475 ] + walkopts,
4475 _('[OPTION]... FILE...'))
4476 _('[OPTION]... FILE...'))
4476 def remove(ui, repo, *pats, **opts):
4477 def remove(ui, repo, *pats, **opts):
4477 """remove the specified files on the next commit
4478 """remove the specified files on the next commit
4478
4479
4479 Schedule the indicated files for removal from the current branch.
4480 Schedule the indicated files for removal from the current branch.
4480
4481
4481 This command schedules the files to be removed at the next commit.
4482 This command schedules the files to be removed at the next commit.
4482 To undo a remove before that, see :hg:`revert`. To undo added
4483 To undo a remove before that, see :hg:`revert`. To undo added
4483 files, see :hg:`forget`.
4484 files, see :hg:`forget`.
4484
4485
4485 .. container:: verbose
4486 .. container:: verbose
4486
4487
4487 -A/--after can be used to remove only files that have already
4488 -A/--after can be used to remove only files that have already
4488 been deleted, -f/--force can be used to force deletion, and -Af
4489 been deleted, -f/--force can be used to force deletion, and -Af
4489 can be used to remove files from the next revision without
4490 can be used to remove files from the next revision without
4490 deleting them from the working directory.
4491 deleting them from the working directory.
4491
4492
4492 The following table details the behavior of remove for different
4493 The following table details the behavior of remove for different
4493 file states (columns) and option combinations (rows). The file
4494 file states (columns) and option combinations (rows). The file
4494 states are Added [A], Clean [C], Modified [M] and Missing [!]
4495 states are Added [A], Clean [C], Modified [M] and Missing [!]
4495 (as reported by :hg:`status`). The actions are Warn, Remove
4496 (as reported by :hg:`status`). The actions are Warn, Remove
4496 (from branch) and Delete (from disk):
4497 (from branch) and Delete (from disk):
4497
4498
4498 ======= == == == ==
4499 ======= == == == ==
4499 A C M !
4500 A C M !
4500 ======= == == == ==
4501 ======= == == == ==
4501 none W RD W R
4502 none W RD W R
4502 -f R RD RD R
4503 -f R RD RD R
4503 -A W W W R
4504 -A W W W R
4504 -Af R R R R
4505 -Af R R R R
4505 ======= == == == ==
4506 ======= == == == ==
4506
4507
4507 Note that remove never deletes files in Added [A] state from the
4508 Note that remove never deletes files in Added [A] state from the
4508 working directory, not even if option --force is specified.
4509 working directory, not even if option --force is specified.
4509
4510
4510 Returns 0 on success, 1 if any warnings encountered.
4511 Returns 0 on success, 1 if any warnings encountered.
4511 """
4512 """
4512
4513
4513 ret = 0
4514 ret = 0
4514 after, force = opts.get('after'), opts.get('force')
4515 after, force = opts.get('after'), opts.get('force')
4515 if not pats and not after:
4516 if not pats and not after:
4516 raise util.Abort(_('no files specified'))
4517 raise util.Abort(_('no files specified'))
4517
4518
4518 m = scmutil.match(repo[None], pats, opts)
4519 m = scmutil.match(repo[None], pats, opts)
4519 s = repo.status(match=m, clean=True)
4520 s = repo.status(match=m, clean=True)
4520 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
4521 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
4521
4522
4522 for f in m.files():
4523 for f in m.files():
4523 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
4524 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
4524 if os.path.exists(m.rel(f)):
4525 if os.path.exists(m.rel(f)):
4525 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
4526 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
4526 ret = 1
4527 ret = 1
4527
4528
4528 if force:
4529 if force:
4529 list = modified + deleted + clean + added
4530 list = modified + deleted + clean + added
4530 elif after:
4531 elif after:
4531 list = deleted
4532 list = deleted
4532 for f in modified + added + clean:
4533 for f in modified + added + clean:
4533 ui.warn(_('not removing %s: file still exists (use -f'
4534 ui.warn(_('not removing %s: file still exists (use -f'
4534 ' to force removal)\n') % m.rel(f))
4535 ' to force removal)\n') % m.rel(f))
4535 ret = 1
4536 ret = 1
4536 else:
4537 else:
4537 list = deleted + clean
4538 list = deleted + clean
4538 for f in modified:
4539 for f in modified:
4539 ui.warn(_('not removing %s: file is modified (use -f'
4540 ui.warn(_('not removing %s: file is modified (use -f'
4540 ' to force removal)\n') % m.rel(f))
4541 ' to force removal)\n') % m.rel(f))
4541 ret = 1
4542 ret = 1
4542 for f in added:
4543 for f in added:
4543 ui.warn(_('not removing %s: file has been marked for add'
4544 ui.warn(_('not removing %s: file has been marked for add'
4544 ' (use forget to undo)\n') % m.rel(f))
4545 ' (use forget to undo)\n') % m.rel(f))
4545 ret = 1
4546 ret = 1
4546
4547
4547 for f in sorted(list):
4548 for f in sorted(list):
4548 if ui.verbose or not m.exact(f):
4549 if ui.verbose or not m.exact(f):
4549 ui.status(_('removing %s\n') % m.rel(f))
4550 ui.status(_('removing %s\n') % m.rel(f))
4550
4551
4551 wlock = repo.wlock()
4552 wlock = repo.wlock()
4552 try:
4553 try:
4553 if not after:
4554 if not after:
4554 for f in list:
4555 for f in list:
4555 if f in added:
4556 if f in added:
4556 continue # we never unlink added files on remove
4557 continue # we never unlink added files on remove
4557 try:
4558 try:
4558 util.unlinkpath(repo.wjoin(f))
4559 util.unlinkpath(repo.wjoin(f))
4559 except OSError, inst:
4560 except OSError, inst:
4560 if inst.errno != errno.ENOENT:
4561 if inst.errno != errno.ENOENT:
4561 raise
4562 raise
4562 repo[None].forget(list)
4563 repo[None].forget(list)
4563 finally:
4564 finally:
4564 wlock.release()
4565 wlock.release()
4565
4566
4566 return ret
4567 return ret
4567
4568
4568 @command('rename|move|mv',
4569 @command('rename|move|mv',
4569 [('A', 'after', None, _('record a rename that has already occurred')),
4570 [('A', 'after', None, _('record a rename that has already occurred')),
4570 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4571 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4571 ] + walkopts + dryrunopts,
4572 ] + walkopts + dryrunopts,
4572 _('[OPTION]... SOURCE... DEST'))
4573 _('[OPTION]... SOURCE... DEST'))
4573 def rename(ui, repo, *pats, **opts):
4574 def rename(ui, repo, *pats, **opts):
4574 """rename files; equivalent of copy + remove
4575 """rename files; equivalent of copy + remove
4575
4576
4576 Mark dest as copies of sources; mark sources for deletion. If dest
4577 Mark dest as copies of sources; mark sources for deletion. If dest
4577 is a directory, copies are put in that directory. If dest is a
4578 is a directory, copies are put in that directory. If dest is a
4578 file, there can only be one source.
4579 file, there can only be one source.
4579
4580
4580 By default, this command copies the contents of files as they
4581 By default, this command copies the contents of files as they
4581 exist in the working directory. If invoked with -A/--after, the
4582 exist in the working directory. If invoked with -A/--after, the
4582 operation is recorded, but no copying is performed.
4583 operation is recorded, but no copying is performed.
4583
4584
4584 This command takes effect at the next commit. To undo a rename
4585 This command takes effect at the next commit. To undo a rename
4585 before that, see :hg:`revert`.
4586 before that, see :hg:`revert`.
4586
4587
4587 Returns 0 on success, 1 if errors are encountered.
4588 Returns 0 on success, 1 if errors are encountered.
4588 """
4589 """
4589 wlock = repo.wlock(False)
4590 wlock = repo.wlock(False)
4590 try:
4591 try:
4591 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4592 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4592 finally:
4593 finally:
4593 wlock.release()
4594 wlock.release()
4594
4595
4595 @command('resolve',
4596 @command('resolve',
4596 [('a', 'all', None, _('select all unresolved files')),
4597 [('a', 'all', None, _('select all unresolved files')),
4597 ('l', 'list', None, _('list state of files needing merge')),
4598 ('l', 'list', None, _('list state of files needing merge')),
4598 ('m', 'mark', None, _('mark files as resolved')),
4599 ('m', 'mark', None, _('mark files as resolved')),
4599 ('u', 'unmark', None, _('mark files as unresolved')),
4600 ('u', 'unmark', None, _('mark files as unresolved')),
4600 ('n', 'no-status', None, _('hide status prefix'))]
4601 ('n', 'no-status', None, _('hide status prefix'))]
4601 + mergetoolopts + walkopts,
4602 + mergetoolopts + walkopts,
4602 _('[OPTION]... [FILE]...'))
4603 _('[OPTION]... [FILE]...'))
4603 def resolve(ui, repo, *pats, **opts):
4604 def resolve(ui, repo, *pats, **opts):
4604 """redo merges or set/view the merge status of files
4605 """redo merges or set/view the merge status of files
4605
4606
4606 Merges with unresolved conflicts are often the result of
4607 Merges with unresolved conflicts are often the result of
4607 non-interactive merging using the ``internal:merge`` configuration
4608 non-interactive merging using the ``internal:merge`` configuration
4608 setting, or a command-line merge tool like ``diff3``. The resolve
4609 setting, or a command-line merge tool like ``diff3``. The resolve
4609 command is used to manage the files involved in a merge, after
4610 command is used to manage the files involved in a merge, after
4610 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4611 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4611 working directory must have two parents). See :hg:`help
4612 working directory must have two parents). See :hg:`help
4612 merge-tools` for information on configuring merge tools.
4613 merge-tools` for information on configuring merge tools.
4613
4614
4614 The resolve command can be used in the following ways:
4615 The resolve command can be used in the following ways:
4615
4616
4616 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4617 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4617 files, discarding any previous merge attempts. Re-merging is not
4618 files, discarding any previous merge attempts. Re-merging is not
4618 performed for files already marked as resolved. Use ``--all/-a``
4619 performed for files already marked as resolved. Use ``--all/-a``
4619 to select all unresolved files. ``--tool`` can be used to specify
4620 to select all unresolved files. ``--tool`` can be used to specify
4620 the merge tool used for the given files. It overrides the HGMERGE
4621 the merge tool used for the given files. It overrides the HGMERGE
4621 environment variable and your configuration files. Previous file
4622 environment variable and your configuration files. Previous file
4622 contents are saved with a ``.orig`` suffix.
4623 contents are saved with a ``.orig`` suffix.
4623
4624
4624 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4625 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4625 (e.g. after having manually fixed-up the files). The default is
4626 (e.g. after having manually fixed-up the files). The default is
4626 to mark all unresolved files.
4627 to mark all unresolved files.
4627
4628
4628 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4629 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4629 default is to mark all resolved files.
4630 default is to mark all resolved files.
4630
4631
4631 - :hg:`resolve -l`: list files which had or still have conflicts.
4632 - :hg:`resolve -l`: list files which had or still have conflicts.
4632 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4633 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4633
4634
4634 Note that Mercurial will not let you commit files with unresolved
4635 Note that Mercurial will not let you commit files with unresolved
4635 merge conflicts. You must use :hg:`resolve -m ...` before you can
4636 merge conflicts. You must use :hg:`resolve -m ...` before you can
4636 commit after a conflicting merge.
4637 commit after a conflicting merge.
4637
4638
4638 Returns 0 on success, 1 if any files fail a resolve attempt.
4639 Returns 0 on success, 1 if any files fail a resolve attempt.
4639 """
4640 """
4640
4641
4641 all, mark, unmark, show, nostatus = \
4642 all, mark, unmark, show, nostatus = \
4642 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
4643 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
4643
4644
4644 if (show and (mark or unmark)) or (mark and unmark):
4645 if (show and (mark or unmark)) or (mark and unmark):
4645 raise util.Abort(_("too many options specified"))
4646 raise util.Abort(_("too many options specified"))
4646 if pats and all:
4647 if pats and all:
4647 raise util.Abort(_("can't specify --all and patterns"))
4648 raise util.Abort(_("can't specify --all and patterns"))
4648 if not (all or pats or show or mark or unmark):
4649 if not (all or pats or show or mark or unmark):
4649 raise util.Abort(_('no files or directories specified; '
4650 raise util.Abort(_('no files or directories specified; '
4650 'use --all to remerge all files'))
4651 'use --all to remerge all files'))
4651
4652
4652 ms = mergemod.mergestate(repo)
4653 ms = mergemod.mergestate(repo)
4653 m = scmutil.match(repo[None], pats, opts)
4654 m = scmutil.match(repo[None], pats, opts)
4654 ret = 0
4655 ret = 0
4655
4656
4656 for f in ms:
4657 for f in ms:
4657 if m(f):
4658 if m(f):
4658 if show:
4659 if show:
4659 if nostatus:
4660 if nostatus:
4660 ui.write("%s\n" % f)
4661 ui.write("%s\n" % f)
4661 else:
4662 else:
4662 ui.write("%s %s\n" % (ms[f].upper(), f),
4663 ui.write("%s %s\n" % (ms[f].upper(), f),
4663 label='resolve.' +
4664 label='resolve.' +
4664 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
4665 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
4665 elif mark:
4666 elif mark:
4666 ms.mark(f, "r")
4667 ms.mark(f, "r")
4667 elif unmark:
4668 elif unmark:
4668 ms.mark(f, "u")
4669 ms.mark(f, "u")
4669 else:
4670 else:
4670 wctx = repo[None]
4671 wctx = repo[None]
4671 mctx = wctx.parents()[-1]
4672 mctx = wctx.parents()[-1]
4672
4673
4673 # backup pre-resolve (merge uses .orig for its own purposes)
4674 # backup pre-resolve (merge uses .orig for its own purposes)
4674 a = repo.wjoin(f)
4675 a = repo.wjoin(f)
4675 util.copyfile(a, a + ".resolve")
4676 util.copyfile(a, a + ".resolve")
4676
4677
4677 try:
4678 try:
4678 # resolve file
4679 # resolve file
4679 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4680 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4680 if ms.resolve(f, wctx, mctx):
4681 if ms.resolve(f, wctx, mctx):
4681 ret = 1
4682 ret = 1
4682 finally:
4683 finally:
4683 ui.setconfig('ui', 'forcemerge', '')
4684 ui.setconfig('ui', 'forcemerge', '')
4684
4685
4685 # replace filemerge's .orig file with our resolve file
4686 # replace filemerge's .orig file with our resolve file
4686 util.rename(a + ".resolve", a + ".orig")
4687 util.rename(a + ".resolve", a + ".orig")
4687
4688
4688 ms.commit()
4689 ms.commit()
4689 return ret
4690 return ret
4690
4691
4691 @command('revert',
4692 @command('revert',
4692 [('a', 'all', None, _('revert all changes when no arguments given')),
4693 [('a', 'all', None, _('revert all changes when no arguments given')),
4693 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4694 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4694 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4695 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4695 ('C', 'no-backup', None, _('do not save backup copies of files')),
4696 ('C', 'no-backup', None, _('do not save backup copies of files')),
4696 ] + walkopts + dryrunopts,
4697 ] + walkopts + dryrunopts,
4697 _('[OPTION]... [-r REV] [NAME]...'))
4698 _('[OPTION]... [-r REV] [NAME]...'))
4698 def revert(ui, repo, *pats, **opts):
4699 def revert(ui, repo, *pats, **opts):
4699 """restore files to their checkout state
4700 """restore files to their checkout state
4700
4701
4701 .. note::
4702 .. note::
4702 To check out earlier revisions, you should use :hg:`update REV`.
4703 To check out earlier revisions, you should use :hg:`update REV`.
4703 To cancel a merge (and lose your changes), use :hg:`update --clean .`.
4704 To cancel a merge (and lose your changes), use :hg:`update --clean .`.
4704
4705
4705 With no revision specified, revert the specified files or directories
4706 With no revision specified, revert the specified files or directories
4706 to the contents they had in the parent of the working directory.
4707 to the contents they had in the parent of the working directory.
4707 This restores the contents of files to an unmodified
4708 This restores the contents of files to an unmodified
4708 state and unschedules adds, removes, copies, and renames. If the
4709 state and unschedules adds, removes, copies, and renames. If the
4709 working directory has two parents, you must explicitly specify a
4710 working directory has two parents, you must explicitly specify a
4710 revision.
4711 revision.
4711
4712
4712 Using the -r/--rev or -d/--date options, revert the given files or
4713 Using the -r/--rev or -d/--date options, revert the given files or
4713 directories to their states as of a specific revision. Because
4714 directories to their states as of a specific revision. Because
4714 revert does not change the working directory parents, this will
4715 revert does not change the working directory parents, this will
4715 cause these files to appear modified. This can be helpful to "back
4716 cause these files to appear modified. This can be helpful to "back
4716 out" some or all of an earlier change. See :hg:`backout` for a
4717 out" some or all of an earlier change. See :hg:`backout` for a
4717 related method.
4718 related method.
4718
4719
4719 Modified files are saved with a .orig suffix before reverting.
4720 Modified files are saved with a .orig suffix before reverting.
4720 To disable these backups, use --no-backup.
4721 To disable these backups, use --no-backup.
4721
4722
4722 See :hg:`help dates` for a list of formats valid for -d/--date.
4723 See :hg:`help dates` for a list of formats valid for -d/--date.
4723
4724
4724 Returns 0 on success.
4725 Returns 0 on success.
4725 """
4726 """
4726
4727
4727 if opts.get("date"):
4728 if opts.get("date"):
4728 if opts.get("rev"):
4729 if opts.get("rev"):
4729 raise util.Abort(_("you can't specify a revision and a date"))
4730 raise util.Abort(_("you can't specify a revision and a date"))
4730 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4731 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4731
4732
4732 parent, p2 = repo.dirstate.parents()
4733 parent, p2 = repo.dirstate.parents()
4733 if not opts.get('rev') and p2 != nullid:
4734 if not opts.get('rev') and p2 != nullid:
4734 # revert after merge is a trap for new users (issue2915)
4735 # revert after merge is a trap for new users (issue2915)
4735 raise util.Abort(_('uncommitted merge with no revision specified'),
4736 raise util.Abort(_('uncommitted merge with no revision specified'),
4736 hint=_('use "hg update" or see "hg help revert"'))
4737 hint=_('use "hg update" or see "hg help revert"'))
4737
4738
4738 ctx = scmutil.revsingle(repo, opts.get('rev'))
4739 ctx = scmutil.revsingle(repo, opts.get('rev'))
4739 node = ctx.node()
4740 node = ctx.node()
4740
4741
4741 if not pats and not opts.get('all'):
4742 if not pats and not opts.get('all'):
4742 msg = _("no files or directories specified")
4743 msg = _("no files or directories specified")
4743 if p2 != nullid:
4744 if p2 != nullid:
4744 hint = _("uncommitted merge, use --all to discard all changes,"
4745 hint = _("uncommitted merge, use --all to discard all changes,"
4745 " or 'hg update -C .' to abort the merge")
4746 " or 'hg update -C .' to abort the merge")
4746 raise util.Abort(msg, hint=hint)
4747 raise util.Abort(msg, hint=hint)
4747 dirty = util.any(repo.status())
4748 dirty = util.any(repo.status())
4748 if node != parent:
4749 if node != parent:
4749 if dirty:
4750 if dirty:
4750 hint = _("uncommitted changes, use --all to discard all"
4751 hint = _("uncommitted changes, use --all to discard all"
4751 " changes, or 'hg update %s' to update") % ctx.rev()
4752 " changes, or 'hg update %s' to update") % ctx.rev()
4752 else:
4753 else:
4753 hint = _("use --all to revert all files,"
4754 hint = _("use --all to revert all files,"
4754 " or 'hg update %s' to update") % ctx.rev()
4755 " or 'hg update %s' to update") % ctx.rev()
4755 elif dirty:
4756 elif dirty:
4756 hint = _("uncommitted changes, use --all to discard all changes")
4757 hint = _("uncommitted changes, use --all to discard all changes")
4757 else:
4758 else:
4758 hint = _("use --all to revert all files")
4759 hint = _("use --all to revert all files")
4759 raise util.Abort(msg, hint=hint)
4760 raise util.Abort(msg, hint=hint)
4760
4761
4761 mf = ctx.manifest()
4762 mf = ctx.manifest()
4762 if node == parent:
4763 if node == parent:
4763 pmf = mf
4764 pmf = mf
4764 else:
4765 else:
4765 pmf = None
4766 pmf = None
4766
4767
4767 # need all matching names in dirstate and manifest of target rev,
4768 # need all matching names in dirstate and manifest of target rev,
4768 # so have to walk both. do not print errors if files exist in one
4769 # so have to walk both. do not print errors if files exist in one
4769 # but not other.
4770 # but not other.
4770
4771
4771 names = {}
4772 names = {}
4772
4773
4773 wlock = repo.wlock()
4774 wlock = repo.wlock()
4774 try:
4775 try:
4775 # walk dirstate.
4776 # walk dirstate.
4776
4777
4777 m = scmutil.match(repo[None], pats, opts)
4778 m = scmutil.match(repo[None], pats, opts)
4778 m.bad = lambda x, y: False
4779 m.bad = lambda x, y: False
4779 for abs in repo.walk(m):
4780 for abs in repo.walk(m):
4780 names[abs] = m.rel(abs), m.exact(abs)
4781 names[abs] = m.rel(abs), m.exact(abs)
4781
4782
4782 # walk target manifest.
4783 # walk target manifest.
4783
4784
4784 def badfn(path, msg):
4785 def badfn(path, msg):
4785 if path in names:
4786 if path in names:
4786 return
4787 return
4787 if path in repo[node].substate:
4788 if path in repo[node].substate:
4788 ui.warn("%s: %s\n" % (m.rel(path),
4789 ui.warn("%s: %s\n" % (m.rel(path),
4789 'reverting subrepos is unsupported'))
4790 'reverting subrepos is unsupported'))
4790 return
4791 return
4791 path_ = path + '/'
4792 path_ = path + '/'
4792 for f in names:
4793 for f in names:
4793 if f.startswith(path_):
4794 if f.startswith(path_):
4794 return
4795 return
4795 ui.warn("%s: %s\n" % (m.rel(path), msg))
4796 ui.warn("%s: %s\n" % (m.rel(path), msg))
4796
4797
4797 m = scmutil.match(repo[node], pats, opts)
4798 m = scmutil.match(repo[node], pats, opts)
4798 m.bad = badfn
4799 m.bad = badfn
4799 for abs in repo[node].walk(m):
4800 for abs in repo[node].walk(m):
4800 if abs not in names:
4801 if abs not in names:
4801 names[abs] = m.rel(abs), m.exact(abs)
4802 names[abs] = m.rel(abs), m.exact(abs)
4802
4803
4803 m = scmutil.matchfiles(repo, names)
4804 m = scmutil.matchfiles(repo, names)
4804 changes = repo.status(match=m)[:4]
4805 changes = repo.status(match=m)[:4]
4805 modified, added, removed, deleted = map(set, changes)
4806 modified, added, removed, deleted = map(set, changes)
4806
4807
4807 # if f is a rename, also revert the source
4808 # if f is a rename, also revert the source
4808 cwd = repo.getcwd()
4809 cwd = repo.getcwd()
4809 for f in added:
4810 for f in added:
4810 src = repo.dirstate.copied(f)
4811 src = repo.dirstate.copied(f)
4811 if src and src not in names and repo.dirstate[src] == 'r':
4812 if src and src not in names and repo.dirstate[src] == 'r':
4812 removed.add(src)
4813 removed.add(src)
4813 names[src] = (repo.pathto(src, cwd), True)
4814 names[src] = (repo.pathto(src, cwd), True)
4814
4815
4815 def removeforget(abs):
4816 def removeforget(abs):
4816 if repo.dirstate[abs] == 'a':
4817 if repo.dirstate[abs] == 'a':
4817 return _('forgetting %s\n')
4818 return _('forgetting %s\n')
4818 return _('removing %s\n')
4819 return _('removing %s\n')
4819
4820
4820 revert = ([], _('reverting %s\n'))
4821 revert = ([], _('reverting %s\n'))
4821 add = ([], _('adding %s\n'))
4822 add = ([], _('adding %s\n'))
4822 remove = ([], removeforget)
4823 remove = ([], removeforget)
4823 undelete = ([], _('undeleting %s\n'))
4824 undelete = ([], _('undeleting %s\n'))
4824
4825
4825 disptable = (
4826 disptable = (
4826 # dispatch table:
4827 # dispatch table:
4827 # file state
4828 # file state
4828 # action if in target manifest
4829 # action if in target manifest
4829 # action if not in target manifest
4830 # action if not in target manifest
4830 # make backup if in target manifest
4831 # make backup if in target manifest
4831 # make backup if not in target manifest
4832 # make backup if not in target manifest
4832 (modified, revert, remove, True, True),
4833 (modified, revert, remove, True, True),
4833 (added, revert, remove, True, False),
4834 (added, revert, remove, True, False),
4834 (removed, undelete, None, False, False),
4835 (removed, undelete, None, False, False),
4835 (deleted, revert, remove, False, False),
4836 (deleted, revert, remove, False, False),
4836 )
4837 )
4837
4838
4838 for abs, (rel, exact) in sorted(names.items()):
4839 for abs, (rel, exact) in sorted(names.items()):
4839 mfentry = mf.get(abs)
4840 mfentry = mf.get(abs)
4840 target = repo.wjoin(abs)
4841 target = repo.wjoin(abs)
4841 def handle(xlist, dobackup):
4842 def handle(xlist, dobackup):
4842 xlist[0].append(abs)
4843 xlist[0].append(abs)
4843 if (dobackup and not opts.get('no_backup') and
4844 if (dobackup and not opts.get('no_backup') and
4844 os.path.lexists(target)):
4845 os.path.lexists(target)):
4845 bakname = "%s.orig" % rel
4846 bakname = "%s.orig" % rel
4846 ui.note(_('saving current version of %s as %s\n') %
4847 ui.note(_('saving current version of %s as %s\n') %
4847 (rel, bakname))
4848 (rel, bakname))
4848 if not opts.get('dry_run'):
4849 if not opts.get('dry_run'):
4849 util.rename(target, bakname)
4850 util.rename(target, bakname)
4850 if ui.verbose or not exact:
4851 if ui.verbose or not exact:
4851 msg = xlist[1]
4852 msg = xlist[1]
4852 if not isinstance(msg, basestring):
4853 if not isinstance(msg, basestring):
4853 msg = msg(abs)
4854 msg = msg(abs)
4854 ui.status(msg % rel)
4855 ui.status(msg % rel)
4855 for table, hitlist, misslist, backuphit, backupmiss in disptable:
4856 for table, hitlist, misslist, backuphit, backupmiss in disptable:
4856 if abs not in table:
4857 if abs not in table:
4857 continue
4858 continue
4858 # file has changed in dirstate
4859 # file has changed in dirstate
4859 if mfentry:
4860 if mfentry:
4860 handle(hitlist, backuphit)
4861 handle(hitlist, backuphit)
4861 elif misslist is not None:
4862 elif misslist is not None:
4862 handle(misslist, backupmiss)
4863 handle(misslist, backupmiss)
4863 break
4864 break
4864 else:
4865 else:
4865 if abs not in repo.dirstate:
4866 if abs not in repo.dirstate:
4866 if mfentry:
4867 if mfentry:
4867 handle(add, True)
4868 handle(add, True)
4868 elif exact:
4869 elif exact:
4869 ui.warn(_('file not managed: %s\n') % rel)
4870 ui.warn(_('file not managed: %s\n') % rel)
4870 continue
4871 continue
4871 # file has not changed in dirstate
4872 # file has not changed in dirstate
4872 if node == parent:
4873 if node == parent:
4873 if exact:
4874 if exact:
4874 ui.warn(_('no changes needed to %s\n') % rel)
4875 ui.warn(_('no changes needed to %s\n') % rel)
4875 continue
4876 continue
4876 if pmf is None:
4877 if pmf is None:
4877 # only need parent manifest in this unlikely case,
4878 # only need parent manifest in this unlikely case,
4878 # so do not read by default
4879 # so do not read by default
4879 pmf = repo[parent].manifest()
4880 pmf = repo[parent].manifest()
4880 if abs in pmf and mfentry:
4881 if abs in pmf and mfentry:
4881 # if version of file is same in parent and target
4882 # if version of file is same in parent and target
4882 # manifests, do nothing
4883 # manifests, do nothing
4883 if (pmf[abs] != mfentry or
4884 if (pmf[abs] != mfentry or
4884 pmf.flags(abs) != mf.flags(abs)):
4885 pmf.flags(abs) != mf.flags(abs)):
4885 handle(revert, False)
4886 handle(revert, False)
4886 else:
4887 else:
4887 handle(remove, False)
4888 handle(remove, False)
4888
4889
4889 if not opts.get('dry_run'):
4890 if not opts.get('dry_run'):
4890 def checkout(f):
4891 def checkout(f):
4891 fc = ctx[f]
4892 fc = ctx[f]
4892 repo.wwrite(f, fc.data(), fc.flags())
4893 repo.wwrite(f, fc.data(), fc.flags())
4893
4894
4894 audit_path = scmutil.pathauditor(repo.root)
4895 audit_path = scmutil.pathauditor(repo.root)
4895 for f in remove[0]:
4896 for f in remove[0]:
4896 if repo.dirstate[f] == 'a':
4897 if repo.dirstate[f] == 'a':
4897 repo.dirstate.drop(f)
4898 repo.dirstate.drop(f)
4898 continue
4899 continue
4899 audit_path(f)
4900 audit_path(f)
4900 try:
4901 try:
4901 util.unlinkpath(repo.wjoin(f))
4902 util.unlinkpath(repo.wjoin(f))
4902 except OSError:
4903 except OSError:
4903 pass
4904 pass
4904 repo.dirstate.remove(f)
4905 repo.dirstate.remove(f)
4905
4906
4906 normal = None
4907 normal = None
4907 if node == parent:
4908 if node == parent:
4908 # We're reverting to our parent. If possible, we'd like status
4909 # We're reverting to our parent. If possible, we'd like status
4909 # to report the file as clean. We have to use normallookup for
4910 # to report the file as clean. We have to use normallookup for
4910 # merges to avoid losing information about merged/dirty files.
4911 # merges to avoid losing information about merged/dirty files.
4911 if p2 != nullid:
4912 if p2 != nullid:
4912 normal = repo.dirstate.normallookup
4913 normal = repo.dirstate.normallookup
4913 else:
4914 else:
4914 normal = repo.dirstate.normal
4915 normal = repo.dirstate.normal
4915 for f in revert[0]:
4916 for f in revert[0]:
4916 checkout(f)
4917 checkout(f)
4917 if normal:
4918 if normal:
4918 normal(f)
4919 normal(f)
4919
4920
4920 for f in add[0]:
4921 for f in add[0]:
4921 checkout(f)
4922 checkout(f)
4922 repo.dirstate.add(f)
4923 repo.dirstate.add(f)
4923
4924
4924 normal = repo.dirstate.normallookup
4925 normal = repo.dirstate.normallookup
4925 if node == parent and p2 == nullid:
4926 if node == parent and p2 == nullid:
4926 normal = repo.dirstate.normal
4927 normal = repo.dirstate.normal
4927 for f in undelete[0]:
4928 for f in undelete[0]:
4928 checkout(f)
4929 checkout(f)
4929 normal(f)
4930 normal(f)
4930
4931
4931 finally:
4932 finally:
4932 wlock.release()
4933 wlock.release()
4933
4934
4934 @command('rollback', dryrunopts +
4935 @command('rollback', dryrunopts +
4935 [('f', 'force', False, _('ignore safety measures'))])
4936 [('f', 'force', False, _('ignore safety measures'))])
4936 def rollback(ui, repo, **opts):
4937 def rollback(ui, repo, **opts):
4937 """roll back the last transaction (dangerous)
4938 """roll back the last transaction (dangerous)
4938
4939
4939 This command should be used with care. There is only one level of
4940 This command should be used with care. There is only one level of
4940 rollback, and there is no way to undo a rollback. It will also
4941 rollback, and there is no way to undo a rollback. It will also
4941 restore the dirstate at the time of the last transaction, losing
4942 restore the dirstate at the time of the last transaction, losing
4942 any dirstate changes since that time. This command does not alter
4943 any dirstate changes since that time. This command does not alter
4943 the working directory.
4944 the working directory.
4944
4945
4945 Transactions are used to encapsulate the effects of all commands
4946 Transactions are used to encapsulate the effects of all commands
4946 that create new changesets or propagate existing changesets into a
4947 that create new changesets or propagate existing changesets into a
4947 repository. For example, the following commands are transactional,
4948 repository. For example, the following commands are transactional,
4948 and their effects can be rolled back:
4949 and their effects can be rolled back:
4949
4950
4950 - commit
4951 - commit
4951 - import
4952 - import
4952 - pull
4953 - pull
4953 - push (with this repository as the destination)
4954 - push (with this repository as the destination)
4954 - unbundle
4955 - unbundle
4955
4956
4956 To avoid permanent data loss, rollback will refuse to rollback a
4957 To avoid permanent data loss, rollback will refuse to rollback a
4957 commit transaction if it isn't checked out. Use --force to
4958 commit transaction if it isn't checked out. Use --force to
4958 override this protection.
4959 override this protection.
4959
4960
4960 This command is not intended for use on public repositories. Once
4961 This command is not intended for use on public repositories. Once
4961 changes are visible for pull by other users, rolling a transaction
4962 changes are visible for pull by other users, rolling a transaction
4962 back locally is ineffective (someone else may already have pulled
4963 back locally is ineffective (someone else may already have pulled
4963 the changes). Furthermore, a race is possible with readers of the
4964 the changes). Furthermore, a race is possible with readers of the
4964 repository; for example an in-progress pull from the repository
4965 repository; for example an in-progress pull from the repository
4965 may fail if a rollback is performed.
4966 may fail if a rollback is performed.
4966
4967
4967 Returns 0 on success, 1 if no rollback data is available.
4968 Returns 0 on success, 1 if no rollback data is available.
4968 """
4969 """
4969 return repo.rollback(dryrun=opts.get('dry_run'),
4970 return repo.rollback(dryrun=opts.get('dry_run'),
4970 force=opts.get('force'))
4971 force=opts.get('force'))
4971
4972
4972 @command('root', [])
4973 @command('root', [])
4973 def root(ui, repo):
4974 def root(ui, repo):
4974 """print the root (top) of the current working directory
4975 """print the root (top) of the current working directory
4975
4976
4976 Print the root directory of the current repository.
4977 Print the root directory of the current repository.
4977
4978
4978 Returns 0 on success.
4979 Returns 0 on success.
4979 """
4980 """
4980 ui.write(repo.root + "\n")
4981 ui.write(repo.root + "\n")
4981
4982
4982 @command('^serve',
4983 @command('^serve',
4983 [('A', 'accesslog', '', _('name of access log file to write to'),
4984 [('A', 'accesslog', '', _('name of access log file to write to'),
4984 _('FILE')),
4985 _('FILE')),
4985 ('d', 'daemon', None, _('run server in background')),
4986 ('d', 'daemon', None, _('run server in background')),
4986 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
4987 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
4987 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4988 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4988 # use string type, then we can check if something was passed
4989 # use string type, then we can check if something was passed
4989 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4990 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4990 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4991 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4991 _('ADDR')),
4992 _('ADDR')),
4992 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4993 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4993 _('PREFIX')),
4994 _('PREFIX')),
4994 ('n', 'name', '',
4995 ('n', 'name', '',
4995 _('name to show in web pages (default: working directory)'), _('NAME')),
4996 _('name to show in web pages (default: working directory)'), _('NAME')),
4996 ('', 'web-conf', '',
4997 ('', 'web-conf', '',
4997 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
4998 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
4998 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4999 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4999 _('FILE')),
5000 _('FILE')),
5000 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5001 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5001 ('', 'stdio', None, _('for remote clients')),
5002 ('', 'stdio', None, _('for remote clients')),
5002 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
5003 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
5003 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5004 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5004 ('', 'style', '', _('template style to use'), _('STYLE')),
5005 ('', 'style', '', _('template style to use'), _('STYLE')),
5005 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5006 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5006 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
5007 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
5007 _('[OPTION]...'))
5008 _('[OPTION]...'))
5008 def serve(ui, repo, **opts):
5009 def serve(ui, repo, **opts):
5009 """start stand-alone webserver
5010 """start stand-alone webserver
5010
5011
5011 Start a local HTTP repository browser and pull server. You can use
5012 Start a local HTTP repository browser and pull server. You can use
5012 this for ad-hoc sharing and browsing of repositories. It is
5013 this for ad-hoc sharing and browsing of repositories. It is
5013 recommended to use a real web server to serve a repository for
5014 recommended to use a real web server to serve a repository for
5014 longer periods of time.
5015 longer periods of time.
5015
5016
5016 Please note that the server does not implement access control.
5017 Please note that the server does not implement access control.
5017 This means that, by default, anybody can read from the server and
5018 This means that, by default, anybody can read from the server and
5018 nobody can write to it by default. Set the ``web.allow_push``
5019 nobody can write to it by default. Set the ``web.allow_push``
5019 option to ``*`` to allow everybody to push to the server. You
5020 option to ``*`` to allow everybody to push to the server. You
5020 should use a real web server if you need to authenticate users.
5021 should use a real web server if you need to authenticate users.
5021
5022
5022 By default, the server logs accesses to stdout and errors to
5023 By default, the server logs accesses to stdout and errors to
5023 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5024 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5024 files.
5025 files.
5025
5026
5026 To have the server choose a free port number to listen on, specify
5027 To have the server choose a free port number to listen on, specify
5027 a port number of 0; in this case, the server will print the port
5028 a port number of 0; in this case, the server will print the port
5028 number it uses.
5029 number it uses.
5029
5030
5030 Returns 0 on success.
5031 Returns 0 on success.
5031 """
5032 """
5032
5033
5033 if opts["stdio"] and opts["cmdserver"]:
5034 if opts["stdio"] and opts["cmdserver"]:
5034 raise util.Abort(_("cannot use --stdio with --cmdserver"))
5035 raise util.Abort(_("cannot use --stdio with --cmdserver"))
5035
5036
5036 def checkrepo():
5037 def checkrepo():
5037 if repo is None:
5038 if repo is None:
5038 raise error.RepoError(_("There is no Mercurial repository here"
5039 raise error.RepoError(_("There is no Mercurial repository here"
5039 " (.hg not found)"))
5040 " (.hg not found)"))
5040
5041
5041 if opts["stdio"]:
5042 if opts["stdio"]:
5042 checkrepo()
5043 checkrepo()
5043 s = sshserver.sshserver(ui, repo)
5044 s = sshserver.sshserver(ui, repo)
5044 s.serve_forever()
5045 s.serve_forever()
5045
5046
5046 if opts["cmdserver"]:
5047 if opts["cmdserver"]:
5047 checkrepo()
5048 checkrepo()
5048 s = commandserver.server(ui, repo, opts["cmdserver"])
5049 s = commandserver.server(ui, repo, opts["cmdserver"])
5049 return s.serve()
5050 return s.serve()
5050
5051
5051 # this way we can check if something was given in the command-line
5052 # this way we can check if something was given in the command-line
5052 if opts.get('port'):
5053 if opts.get('port'):
5053 opts['port'] = util.getport(opts.get('port'))
5054 opts['port'] = util.getport(opts.get('port'))
5054
5055
5055 baseui = repo and repo.baseui or ui
5056 baseui = repo and repo.baseui or ui
5056 optlist = ("name templates style address port prefix ipv6"
5057 optlist = ("name templates style address port prefix ipv6"
5057 " accesslog errorlog certificate encoding")
5058 " accesslog errorlog certificate encoding")
5058 for o in optlist.split():
5059 for o in optlist.split():
5059 val = opts.get(o, '')
5060 val = opts.get(o, '')
5060 if val in (None, ''): # should check against default options instead
5061 if val in (None, ''): # should check against default options instead
5061 continue
5062 continue
5062 baseui.setconfig("web", o, val)
5063 baseui.setconfig("web", o, val)
5063 if repo and repo.ui != baseui:
5064 if repo and repo.ui != baseui:
5064 repo.ui.setconfig("web", o, val)
5065 repo.ui.setconfig("web", o, val)
5065
5066
5066 o = opts.get('web_conf') or opts.get('webdir_conf')
5067 o = opts.get('web_conf') or opts.get('webdir_conf')
5067 if not o:
5068 if not o:
5068 if not repo:
5069 if not repo:
5069 raise error.RepoError(_("There is no Mercurial repository"
5070 raise error.RepoError(_("There is no Mercurial repository"
5070 " here (.hg not found)"))
5071 " here (.hg not found)"))
5071 o = repo.root
5072 o = repo.root
5072
5073
5073 app = hgweb.hgweb(o, baseui=ui)
5074 app = hgweb.hgweb(o, baseui=ui)
5074
5075
5075 class service(object):
5076 class service(object):
5076 def init(self):
5077 def init(self):
5077 util.setsignalhandler()
5078 util.setsignalhandler()
5078 self.httpd = hgweb.server.create_server(ui, app)
5079 self.httpd = hgweb.server.create_server(ui, app)
5079
5080
5080 if opts['port'] and not ui.verbose:
5081 if opts['port'] and not ui.verbose:
5081 return
5082 return
5082
5083
5083 if self.httpd.prefix:
5084 if self.httpd.prefix:
5084 prefix = self.httpd.prefix.strip('/') + '/'
5085 prefix = self.httpd.prefix.strip('/') + '/'
5085 else:
5086 else:
5086 prefix = ''
5087 prefix = ''
5087
5088
5088 port = ':%d' % self.httpd.port
5089 port = ':%d' % self.httpd.port
5089 if port == ':80':
5090 if port == ':80':
5090 port = ''
5091 port = ''
5091
5092
5092 bindaddr = self.httpd.addr
5093 bindaddr = self.httpd.addr
5093 if bindaddr == '0.0.0.0':
5094 if bindaddr == '0.0.0.0':
5094 bindaddr = '*'
5095 bindaddr = '*'
5095 elif ':' in bindaddr: # IPv6
5096 elif ':' in bindaddr: # IPv6
5096 bindaddr = '[%s]' % bindaddr
5097 bindaddr = '[%s]' % bindaddr
5097
5098
5098 fqaddr = self.httpd.fqaddr
5099 fqaddr = self.httpd.fqaddr
5099 if ':' in fqaddr:
5100 if ':' in fqaddr:
5100 fqaddr = '[%s]' % fqaddr
5101 fqaddr = '[%s]' % fqaddr
5101 if opts['port']:
5102 if opts['port']:
5102 write = ui.status
5103 write = ui.status
5103 else:
5104 else:
5104 write = ui.write
5105 write = ui.write
5105 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5106 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5106 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5107 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5107
5108
5108 def run(self):
5109 def run(self):
5109 self.httpd.serve_forever()
5110 self.httpd.serve_forever()
5110
5111
5111 service = service()
5112 service = service()
5112
5113
5113 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5114 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5114
5115
5115 @command('showconfig|debugconfig',
5116 @command('showconfig|debugconfig',
5116 [('u', 'untrusted', None, _('show untrusted configuration options'))],
5117 [('u', 'untrusted', None, _('show untrusted configuration options'))],
5117 _('[-u] [NAME]...'))
5118 _('[-u] [NAME]...'))
5118 def showconfig(ui, repo, *values, **opts):
5119 def showconfig(ui, repo, *values, **opts):
5119 """show combined config settings from all hgrc files
5120 """show combined config settings from all hgrc files
5120
5121
5121 With no arguments, print names and values of all config items.
5122 With no arguments, print names and values of all config items.
5122
5123
5123 With one argument of the form section.name, print just the value
5124 With one argument of the form section.name, print just the value
5124 of that config item.
5125 of that config item.
5125
5126
5126 With multiple arguments, print names and values of all config
5127 With multiple arguments, print names and values of all config
5127 items with matching section names.
5128 items with matching section names.
5128
5129
5129 With --debug, the source (filename and line number) is printed
5130 With --debug, the source (filename and line number) is printed
5130 for each config item.
5131 for each config item.
5131
5132
5132 Returns 0 on success.
5133 Returns 0 on success.
5133 """
5134 """
5134
5135
5135 for f in scmutil.rcpath():
5136 for f in scmutil.rcpath():
5136 ui.debug('read config from: %s\n' % f)
5137 ui.debug('read config from: %s\n' % f)
5137 untrusted = bool(opts.get('untrusted'))
5138 untrusted = bool(opts.get('untrusted'))
5138 if values:
5139 if values:
5139 sections = [v for v in values if '.' not in v]
5140 sections = [v for v in values if '.' not in v]
5140 items = [v for v in values if '.' in v]
5141 items = [v for v in values if '.' in v]
5141 if len(items) > 1 or items and sections:
5142 if len(items) > 1 or items and sections:
5142 raise util.Abort(_('only one config item permitted'))
5143 raise util.Abort(_('only one config item permitted'))
5143 for section, name, value in ui.walkconfig(untrusted=untrusted):
5144 for section, name, value in ui.walkconfig(untrusted=untrusted):
5144 value = str(value).replace('\n', '\\n')
5145 value = str(value).replace('\n', '\\n')
5145 sectname = section + '.' + name
5146 sectname = section + '.' + name
5146 if values:
5147 if values:
5147 for v in values:
5148 for v in values:
5148 if v == section:
5149 if v == section:
5149 ui.debug('%s: ' %
5150 ui.debug('%s: ' %
5150 ui.configsource(section, name, untrusted))
5151 ui.configsource(section, name, untrusted))
5151 ui.write('%s=%s\n' % (sectname, value))
5152 ui.write('%s=%s\n' % (sectname, value))
5152 elif v == sectname:
5153 elif v == sectname:
5153 ui.debug('%s: ' %
5154 ui.debug('%s: ' %
5154 ui.configsource(section, name, untrusted))
5155 ui.configsource(section, name, untrusted))
5155 ui.write(value, '\n')
5156 ui.write(value, '\n')
5156 else:
5157 else:
5157 ui.debug('%s: ' %
5158 ui.debug('%s: ' %
5158 ui.configsource(section, name, untrusted))
5159 ui.configsource(section, name, untrusted))
5159 ui.write('%s=%s\n' % (sectname, value))
5160 ui.write('%s=%s\n' % (sectname, value))
5160
5161
5161 @command('^status|st',
5162 @command('^status|st',
5162 [('A', 'all', None, _('show status of all files')),
5163 [('A', 'all', None, _('show status of all files')),
5163 ('m', 'modified', None, _('show only modified files')),
5164 ('m', 'modified', None, _('show only modified files')),
5164 ('a', 'added', None, _('show only added files')),
5165 ('a', 'added', None, _('show only added files')),
5165 ('r', 'removed', None, _('show only removed files')),
5166 ('r', 'removed', None, _('show only removed files')),
5166 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5167 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5167 ('c', 'clean', None, _('show only files without changes')),
5168 ('c', 'clean', None, _('show only files without changes')),
5168 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5169 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5169 ('i', 'ignored', None, _('show only ignored files')),
5170 ('i', 'ignored', None, _('show only ignored files')),
5170 ('n', 'no-status', None, _('hide status prefix')),
5171 ('n', 'no-status', None, _('hide status prefix')),
5171 ('C', 'copies', None, _('show source of copied files')),
5172 ('C', 'copies', None, _('show source of copied files')),
5172 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5173 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5173 ('', 'rev', [], _('show difference from revision'), _('REV')),
5174 ('', 'rev', [], _('show difference from revision'), _('REV')),
5174 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5175 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5175 ] + walkopts + subrepoopts,
5176 ] + walkopts + subrepoopts,
5176 _('[OPTION]... [FILE]...'))
5177 _('[OPTION]... [FILE]...'))
5177 def status(ui, repo, *pats, **opts):
5178 def status(ui, repo, *pats, **opts):
5178 """show changed files in the working directory
5179 """show changed files in the working directory
5179
5180
5180 Show status of files in the repository. If names are given, only
5181 Show status of files in the repository. If names are given, only
5181 files that match are shown. Files that are clean or ignored or
5182 files that match are shown. Files that are clean or ignored or
5182 the source of a copy/move operation, are not listed unless
5183 the source of a copy/move operation, are not listed unless
5183 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5184 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5184 Unless options described with "show only ..." are given, the
5185 Unless options described with "show only ..." are given, the
5185 options -mardu are used.
5186 options -mardu are used.
5186
5187
5187 Option -q/--quiet hides untracked (unknown and ignored) files
5188 Option -q/--quiet hides untracked (unknown and ignored) files
5188 unless explicitly requested with -u/--unknown or -i/--ignored.
5189 unless explicitly requested with -u/--unknown or -i/--ignored.
5189
5190
5190 .. note::
5191 .. note::
5191 status may appear to disagree with diff if permissions have
5192 status may appear to disagree with diff if permissions have
5192 changed or a merge has occurred. The standard diff format does
5193 changed or a merge has occurred. The standard diff format does
5193 not report permission changes and diff only reports changes
5194 not report permission changes and diff only reports changes
5194 relative to one merge parent.
5195 relative to one merge parent.
5195
5196
5196 If one revision is given, it is used as the base revision.
5197 If one revision is given, it is used as the base revision.
5197 If two revisions are given, the differences between them are
5198 If two revisions are given, the differences between them are
5198 shown. The --change option can also be used as a shortcut to list
5199 shown. The --change option can also be used as a shortcut to list
5199 the changed files of a revision from its first parent.
5200 the changed files of a revision from its first parent.
5200
5201
5201 The codes used to show the status of files are::
5202 The codes used to show the status of files are::
5202
5203
5203 M = modified
5204 M = modified
5204 A = added
5205 A = added
5205 R = removed
5206 R = removed
5206 C = clean
5207 C = clean
5207 ! = missing (deleted by non-hg command, but still tracked)
5208 ! = missing (deleted by non-hg command, but still tracked)
5208 ? = not tracked
5209 ? = not tracked
5209 I = ignored
5210 I = ignored
5210 = origin of the previous file listed as A (added)
5211 = origin of the previous file listed as A (added)
5211
5212
5212 .. container:: verbose
5213 .. container:: verbose
5213
5214
5214 Examples:
5215 Examples:
5215
5216
5216 - show changes in the working directory relative to a
5217 - show changes in the working directory relative to a
5217 changeset::
5218 changeset::
5218
5219
5219 hg status --rev 9353
5220 hg status --rev 9353
5220
5221
5221 - show all changes including copies in an existing changeset::
5222 - show all changes including copies in an existing changeset::
5222
5223
5223 hg status --copies --change 9353
5224 hg status --copies --change 9353
5224
5225
5225 - get a NUL separated list of added files, suitable for xargs::
5226 - get a NUL separated list of added files, suitable for xargs::
5226
5227
5227 hg status -an0
5228 hg status -an0
5228
5229
5229 Returns 0 on success.
5230 Returns 0 on success.
5230 """
5231 """
5231
5232
5232 revs = opts.get('rev')
5233 revs = opts.get('rev')
5233 change = opts.get('change')
5234 change = opts.get('change')
5234
5235
5235 if revs and change:
5236 if revs and change:
5236 msg = _('cannot specify --rev and --change at the same time')
5237 msg = _('cannot specify --rev and --change at the same time')
5237 raise util.Abort(msg)
5238 raise util.Abort(msg)
5238 elif change:
5239 elif change:
5239 node2 = scmutil.revsingle(repo, change, None).node()
5240 node2 = scmutil.revsingle(repo, change, None).node()
5240 node1 = repo[node2].p1().node()
5241 node1 = repo[node2].p1().node()
5241 else:
5242 else:
5242 node1, node2 = scmutil.revpair(repo, revs)
5243 node1, node2 = scmutil.revpair(repo, revs)
5243
5244
5244 cwd = (pats and repo.getcwd()) or ''
5245 cwd = (pats and repo.getcwd()) or ''
5245 end = opts.get('print0') and '\0' or '\n'
5246 end = opts.get('print0') and '\0' or '\n'
5246 copy = {}
5247 copy = {}
5247 states = 'modified added removed deleted unknown ignored clean'.split()
5248 states = 'modified added removed deleted unknown ignored clean'.split()
5248 show = [k for k in states if opts.get(k)]
5249 show = [k for k in states if opts.get(k)]
5249 if opts.get('all'):
5250 if opts.get('all'):
5250 show += ui.quiet and (states[:4] + ['clean']) or states
5251 show += ui.quiet and (states[:4] + ['clean']) or states
5251 if not show:
5252 if not show:
5252 show = ui.quiet and states[:4] or states[:5]
5253 show = ui.quiet and states[:4] or states[:5]
5253
5254
5254 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5255 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5255 'ignored' in show, 'clean' in show, 'unknown' in show,
5256 'ignored' in show, 'clean' in show, 'unknown' in show,
5256 opts.get('subrepos'))
5257 opts.get('subrepos'))
5257 changestates = zip(states, 'MAR!?IC', stat)
5258 changestates = zip(states, 'MAR!?IC', stat)
5258
5259
5259 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5260 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5260 copy = copies.pathcopies(repo[node1], repo[node2])
5261 copy = copies.pathcopies(repo[node1], repo[node2])
5261
5262
5262 for state, char, files in changestates:
5263 for state, char, files in changestates:
5263 if state in show:
5264 if state in show:
5264 format = "%s %%s%s" % (char, end)
5265 format = "%s %%s%s" % (char, end)
5265 if opts.get('no_status'):
5266 if opts.get('no_status'):
5266 format = "%%s%s" % end
5267 format = "%%s%s" % end
5267
5268
5268 for f in files:
5269 for f in files:
5269 ui.write(format % repo.pathto(f, cwd),
5270 ui.write(format % repo.pathto(f, cwd),
5270 label='status.' + state)
5271 label='status.' + state)
5271 if f in copy:
5272 if f in copy:
5272 ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end),
5273 ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end),
5273 label='status.copied')
5274 label='status.copied')
5274
5275
5275 @command('^summary|sum',
5276 @command('^summary|sum',
5276 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5277 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5277 def summary(ui, repo, **opts):
5278 def summary(ui, repo, **opts):
5278 """summarize working directory state
5279 """summarize working directory state
5279
5280
5280 This generates a brief summary of the working directory state,
5281 This generates a brief summary of the working directory state,
5281 including parents, branch, commit status, and available updates.
5282 including parents, branch, commit status, and available updates.
5282
5283
5283 With the --remote option, this will check the default paths for
5284 With the --remote option, this will check the default paths for
5284 incoming and outgoing changes. This can be time-consuming.
5285 incoming and outgoing changes. This can be time-consuming.
5285
5286
5286 Returns 0 on success.
5287 Returns 0 on success.
5287 """
5288 """
5288
5289
5289 ctx = repo[None]
5290 ctx = repo[None]
5290 parents = ctx.parents()
5291 parents = ctx.parents()
5291 pnode = parents[0].node()
5292 pnode = parents[0].node()
5292 marks = []
5293 marks = []
5293
5294
5294 for p in parents:
5295 for p in parents:
5295 # label with log.changeset (instead of log.parent) since this
5296 # label with log.changeset (instead of log.parent) since this
5296 # shows a working directory parent *changeset*:
5297 # shows a working directory parent *changeset*:
5297 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5298 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5298 label='log.changeset')
5299 label='log.changeset')
5299 ui.write(' '.join(p.tags()), label='log.tag')
5300 ui.write(' '.join(p.tags()), label='log.tag')
5300 if p.bookmarks():
5301 if p.bookmarks():
5301 marks.extend(p.bookmarks())
5302 marks.extend(p.bookmarks())
5302 if p.rev() == -1:
5303 if p.rev() == -1:
5303 if not len(repo):
5304 if not len(repo):
5304 ui.write(_(' (empty repository)'))
5305 ui.write(_(' (empty repository)'))
5305 else:
5306 else:
5306 ui.write(_(' (no revision checked out)'))
5307 ui.write(_(' (no revision checked out)'))
5307 ui.write('\n')
5308 ui.write('\n')
5308 if p.description():
5309 if p.description():
5309 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5310 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5310 label='log.summary')
5311 label='log.summary')
5311
5312
5312 branch = ctx.branch()
5313 branch = ctx.branch()
5313 bheads = repo.branchheads(branch)
5314 bheads = repo.branchheads(branch)
5314 m = _('branch: %s\n') % branch
5315 m = _('branch: %s\n') % branch
5315 if branch != 'default':
5316 if branch != 'default':
5316 ui.write(m, label='log.branch')
5317 ui.write(m, label='log.branch')
5317 else:
5318 else:
5318 ui.status(m, label='log.branch')
5319 ui.status(m, label='log.branch')
5319
5320
5320 if marks:
5321 if marks:
5321 current = repo._bookmarkcurrent
5322 current = repo._bookmarkcurrent
5322 ui.write(_('bookmarks:'), label='log.bookmark')
5323 ui.write(_('bookmarks:'), label='log.bookmark')
5323 if current is not None:
5324 if current is not None:
5324 try:
5325 try:
5325 marks.remove(current)
5326 marks.remove(current)
5326 ui.write(' *' + current, label='bookmarks.current')
5327 ui.write(' *' + current, label='bookmarks.current')
5327 except ValueError:
5328 except ValueError:
5328 # current bookmark not in parent ctx marks
5329 # current bookmark not in parent ctx marks
5329 pass
5330 pass
5330 for m in marks:
5331 for m in marks:
5331 ui.write(' ' + m, label='log.bookmark')
5332 ui.write(' ' + m, label='log.bookmark')
5332 ui.write('\n', label='log.bookmark')
5333 ui.write('\n', label='log.bookmark')
5333
5334
5334 st = list(repo.status(unknown=True))[:6]
5335 st = list(repo.status(unknown=True))[:6]
5335
5336
5336 c = repo.dirstate.copies()
5337 c = repo.dirstate.copies()
5337 copied, renamed = [], []
5338 copied, renamed = [], []
5338 for d, s in c.iteritems():
5339 for d, s in c.iteritems():
5339 if s in st[2]:
5340 if s in st[2]:
5340 st[2].remove(s)
5341 st[2].remove(s)
5341 renamed.append(d)
5342 renamed.append(d)
5342 else:
5343 else:
5343 copied.append(d)
5344 copied.append(d)
5344 if d in st[1]:
5345 if d in st[1]:
5345 st[1].remove(d)
5346 st[1].remove(d)
5346 st.insert(3, renamed)
5347 st.insert(3, renamed)
5347 st.insert(4, copied)
5348 st.insert(4, copied)
5348
5349
5349 ms = mergemod.mergestate(repo)
5350 ms = mergemod.mergestate(repo)
5350 st.append([f for f in ms if ms[f] == 'u'])
5351 st.append([f for f in ms if ms[f] == 'u'])
5351
5352
5352 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5353 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5353 st.append(subs)
5354 st.append(subs)
5354
5355
5355 labels = [ui.label(_('%d modified'), 'status.modified'),
5356 labels = [ui.label(_('%d modified'), 'status.modified'),
5356 ui.label(_('%d added'), 'status.added'),
5357 ui.label(_('%d added'), 'status.added'),
5357 ui.label(_('%d removed'), 'status.removed'),
5358 ui.label(_('%d removed'), 'status.removed'),
5358 ui.label(_('%d renamed'), 'status.copied'),
5359 ui.label(_('%d renamed'), 'status.copied'),
5359 ui.label(_('%d copied'), 'status.copied'),
5360 ui.label(_('%d copied'), 'status.copied'),
5360 ui.label(_('%d deleted'), 'status.deleted'),
5361 ui.label(_('%d deleted'), 'status.deleted'),
5361 ui.label(_('%d unknown'), 'status.unknown'),
5362 ui.label(_('%d unknown'), 'status.unknown'),
5362 ui.label(_('%d ignored'), 'status.ignored'),
5363 ui.label(_('%d ignored'), 'status.ignored'),
5363 ui.label(_('%d unresolved'), 'resolve.unresolved'),
5364 ui.label(_('%d unresolved'), 'resolve.unresolved'),
5364 ui.label(_('%d subrepos'), 'status.modified')]
5365 ui.label(_('%d subrepos'), 'status.modified')]
5365 t = []
5366 t = []
5366 for s, l in zip(st, labels):
5367 for s, l in zip(st, labels):
5367 if s:
5368 if s:
5368 t.append(l % len(s))
5369 t.append(l % len(s))
5369
5370
5370 t = ', '.join(t)
5371 t = ', '.join(t)
5371 cleanworkdir = False
5372 cleanworkdir = False
5372
5373
5373 if len(parents) > 1:
5374 if len(parents) > 1:
5374 t += _(' (merge)')
5375 t += _(' (merge)')
5375 elif branch != parents[0].branch():
5376 elif branch != parents[0].branch():
5376 t += _(' (new branch)')
5377 t += _(' (new branch)')
5377 elif (parents[0].extra().get('close') and
5378 elif (parents[0].extra().get('close') and
5378 pnode in repo.branchheads(branch, closed=True)):
5379 pnode in repo.branchheads(branch, closed=True)):
5379 t += _(' (head closed)')
5380 t += _(' (head closed)')
5380 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
5381 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
5381 t += _(' (clean)')
5382 t += _(' (clean)')
5382 cleanworkdir = True
5383 cleanworkdir = True
5383 elif pnode not in bheads:
5384 elif pnode not in bheads:
5384 t += _(' (new branch head)')
5385 t += _(' (new branch head)')
5385
5386
5386 if cleanworkdir:
5387 if cleanworkdir:
5387 ui.status(_('commit: %s\n') % t.strip())
5388 ui.status(_('commit: %s\n') % t.strip())
5388 else:
5389 else:
5389 ui.write(_('commit: %s\n') % t.strip())
5390 ui.write(_('commit: %s\n') % t.strip())
5390
5391
5391 # all ancestors of branch heads - all ancestors of parent = new csets
5392 # all ancestors of branch heads - all ancestors of parent = new csets
5392 new = [0] * len(repo)
5393 new = [0] * len(repo)
5393 cl = repo.changelog
5394 cl = repo.changelog
5394 for a in [cl.rev(n) for n in bheads]:
5395 for a in [cl.rev(n) for n in bheads]:
5395 new[a] = 1
5396 new[a] = 1
5396 for a in cl.ancestors(*[cl.rev(n) for n in bheads]):
5397 for a in cl.ancestors(*[cl.rev(n) for n in bheads]):
5397 new[a] = 1
5398 new[a] = 1
5398 for a in [p.rev() for p in parents]:
5399 for a in [p.rev() for p in parents]:
5399 if a >= 0:
5400 if a >= 0:
5400 new[a] = 0
5401 new[a] = 0
5401 for a in cl.ancestors(*[p.rev() for p in parents]):
5402 for a in cl.ancestors(*[p.rev() for p in parents]):
5402 new[a] = 0
5403 new[a] = 0
5403 new = sum(new)
5404 new = sum(new)
5404
5405
5405 if new == 0:
5406 if new == 0:
5406 ui.status(_('update: (current)\n'))
5407 ui.status(_('update: (current)\n'))
5407 elif pnode not in bheads:
5408 elif pnode not in bheads:
5408 ui.write(_('update: %d new changesets (update)\n') % new)
5409 ui.write(_('update: %d new changesets (update)\n') % new)
5409 else:
5410 else:
5410 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5411 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5411 (new, len(bheads)))
5412 (new, len(bheads)))
5412
5413
5413 if opts.get('remote'):
5414 if opts.get('remote'):
5414 t = []
5415 t = []
5415 source, branches = hg.parseurl(ui.expandpath('default'))
5416 source, branches = hg.parseurl(ui.expandpath('default'))
5416 other = hg.peer(repo, {}, source)
5417 other = hg.peer(repo, {}, source)
5417 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
5418 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
5418 ui.debug('comparing with %s\n' % util.hidepassword(source))
5419 ui.debug('comparing with %s\n' % util.hidepassword(source))
5419 repo.ui.pushbuffer()
5420 repo.ui.pushbuffer()
5420 commoninc = discovery.findcommonincoming(repo, other)
5421 commoninc = discovery.findcommonincoming(repo, other)
5421 _common, incoming, _rheads = commoninc
5422 _common, incoming, _rheads = commoninc
5422 repo.ui.popbuffer()
5423 repo.ui.popbuffer()
5423 if incoming:
5424 if incoming:
5424 t.append(_('1 or more incoming'))
5425 t.append(_('1 or more incoming'))
5425
5426
5426 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5427 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5427 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5428 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5428 if source != dest:
5429 if source != dest:
5429 other = hg.peer(repo, {}, dest)
5430 other = hg.peer(repo, {}, dest)
5430 commoninc = None
5431 commoninc = None
5431 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5432 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5432 repo.ui.pushbuffer()
5433 repo.ui.pushbuffer()
5433 outgoing = discovery.findcommonoutgoing(repo, other,
5434 outgoing = discovery.findcommonoutgoing(repo, other,
5434 commoninc=commoninc)
5435 commoninc=commoninc)
5435 repo.ui.popbuffer()
5436 repo.ui.popbuffer()
5436 o = outgoing.missing
5437 o = outgoing.missing
5437 if o:
5438 if o:
5438 t.append(_('%d outgoing') % len(o))
5439 t.append(_('%d outgoing') % len(o))
5439 if 'bookmarks' in other.listkeys('namespaces'):
5440 if 'bookmarks' in other.listkeys('namespaces'):
5440 lmarks = repo.listkeys('bookmarks')
5441 lmarks = repo.listkeys('bookmarks')
5441 rmarks = other.listkeys('bookmarks')
5442 rmarks = other.listkeys('bookmarks')
5442 diff = set(rmarks) - set(lmarks)
5443 diff = set(rmarks) - set(lmarks)
5443 if len(diff) > 0:
5444 if len(diff) > 0:
5444 t.append(_('%d incoming bookmarks') % len(diff))
5445 t.append(_('%d incoming bookmarks') % len(diff))
5445 diff = set(lmarks) - set(rmarks)
5446 diff = set(lmarks) - set(rmarks)
5446 if len(diff) > 0:
5447 if len(diff) > 0:
5447 t.append(_('%d outgoing bookmarks') % len(diff))
5448 t.append(_('%d outgoing bookmarks') % len(diff))
5448
5449
5449 if t:
5450 if t:
5450 ui.write(_('remote: %s\n') % (', '.join(t)))
5451 ui.write(_('remote: %s\n') % (', '.join(t)))
5451 else:
5452 else:
5452 ui.status(_('remote: (synced)\n'))
5453 ui.status(_('remote: (synced)\n'))
5453
5454
5454 @command('tag',
5455 @command('tag',
5455 [('f', 'force', None, _('force tag')),
5456 [('f', 'force', None, _('force tag')),
5456 ('l', 'local', None, _('make the tag local')),
5457 ('l', 'local', None, _('make the tag local')),
5457 ('r', 'rev', '', _('revision to tag'), _('REV')),
5458 ('r', 'rev', '', _('revision to tag'), _('REV')),
5458 ('', 'remove', None, _('remove a tag')),
5459 ('', 'remove', None, _('remove a tag')),
5459 # -l/--local is already there, commitopts cannot be used
5460 # -l/--local is already there, commitopts cannot be used
5460 ('e', 'edit', None, _('edit commit message')),
5461 ('e', 'edit', None, _('edit commit message')),
5461 ('m', 'message', '', _('use <text> as commit message'), _('TEXT')),
5462 ('m', 'message', '', _('use <text> as commit message'), _('TEXT')),
5462 ] + commitopts2,
5463 ] + commitopts2,
5463 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5464 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5464 def tag(ui, repo, name1, *names, **opts):
5465 def tag(ui, repo, name1, *names, **opts):
5465 """add one or more tags for the current or given revision
5466 """add one or more tags for the current or given revision
5466
5467
5467 Name a particular revision using <name>.
5468 Name a particular revision using <name>.
5468
5469
5469 Tags are used to name particular revisions of the repository and are
5470 Tags are used to name particular revisions of the repository and are
5470 very useful to compare different revisions, to go back to significant
5471 very useful to compare different revisions, to go back to significant
5471 earlier versions or to mark branch points as releases, etc. Changing
5472 earlier versions or to mark branch points as releases, etc. Changing
5472 an existing tag is normally disallowed; use -f/--force to override.
5473 an existing tag is normally disallowed; use -f/--force to override.
5473
5474
5474 If no revision is given, the parent of the working directory is
5475 If no revision is given, the parent of the working directory is
5475 used, or tip if no revision is checked out.
5476 used, or tip if no revision is checked out.
5476
5477
5477 To facilitate version control, distribution, and merging of tags,
5478 To facilitate version control, distribution, and merging of tags,
5478 they are stored as a file named ".hgtags" which is managed similarly
5479 they are stored as a file named ".hgtags" which is managed similarly
5479 to other project files and can be hand-edited if necessary. This
5480 to other project files and can be hand-edited if necessary. This
5480 also means that tagging creates a new commit. The file
5481 also means that tagging creates a new commit. The file
5481 ".hg/localtags" is used for local tags (not shared among
5482 ".hg/localtags" is used for local tags (not shared among
5482 repositories).
5483 repositories).
5483
5484
5484 Tag commits are usually made at the head of a branch. If the parent
5485 Tag commits are usually made at the head of a branch. If the parent
5485 of the working directory is not a branch head, :hg:`tag` aborts; use
5486 of the working directory is not a branch head, :hg:`tag` aborts; use
5486 -f/--force to force the tag commit to be based on a non-head
5487 -f/--force to force the tag commit to be based on a non-head
5487 changeset.
5488 changeset.
5488
5489
5489 See :hg:`help dates` for a list of formats valid for -d/--date.
5490 See :hg:`help dates` for a list of formats valid for -d/--date.
5490
5491
5491 Since tag names have priority over branch names during revision
5492 Since tag names have priority over branch names during revision
5492 lookup, using an existing branch name as a tag name is discouraged.
5493 lookup, using an existing branch name as a tag name is discouraged.
5493
5494
5494 Returns 0 on success.
5495 Returns 0 on success.
5495 """
5496 """
5496 wlock = lock = None
5497 wlock = lock = None
5497 try:
5498 try:
5498 wlock = repo.wlock()
5499 wlock = repo.wlock()
5499 lock = repo.lock()
5500 lock = repo.lock()
5500 rev_ = "."
5501 rev_ = "."
5501 names = [t.strip() for t in (name1,) + names]
5502 names = [t.strip() for t in (name1,) + names]
5502 if len(names) != len(set(names)):
5503 if len(names) != len(set(names)):
5503 raise util.Abort(_('tag names must be unique'))
5504 raise util.Abort(_('tag names must be unique'))
5504 for n in names:
5505 for n in names:
5505 if n in ['tip', '.', 'null']:
5506 if n in ['tip', '.', 'null']:
5506 raise util.Abort(_("the name '%s' is reserved") % n)
5507 raise util.Abort(_("the name '%s' is reserved") % n)
5507 if not n:
5508 if not n:
5508 raise util.Abort(_('tag names cannot consist entirely of '
5509 raise util.Abort(_('tag names cannot consist entirely of '
5509 'whitespace'))
5510 'whitespace'))
5510 if opts.get('rev') and opts.get('remove'):
5511 if opts.get('rev') and opts.get('remove'):
5511 raise util.Abort(_("--rev and --remove are incompatible"))
5512 raise util.Abort(_("--rev and --remove are incompatible"))
5512 if opts.get('rev'):
5513 if opts.get('rev'):
5513 rev_ = opts['rev']
5514 rev_ = opts['rev']
5514 message = opts.get('message')
5515 message = opts.get('message')
5515 if opts.get('remove'):
5516 if opts.get('remove'):
5516 expectedtype = opts.get('local') and 'local' or 'global'
5517 expectedtype = opts.get('local') and 'local' or 'global'
5517 for n in names:
5518 for n in names:
5518 if not repo.tagtype(n):
5519 if not repo.tagtype(n):
5519 raise util.Abort(_("tag '%s' does not exist") % n)
5520 raise util.Abort(_("tag '%s' does not exist") % n)
5520 if repo.tagtype(n) != expectedtype:
5521 if repo.tagtype(n) != expectedtype:
5521 if expectedtype == 'global':
5522 if expectedtype == 'global':
5522 raise util.Abort(_("tag '%s' is not a global tag") % n)
5523 raise util.Abort(_("tag '%s' is not a global tag") % n)
5523 else:
5524 else:
5524 raise util.Abort(_("tag '%s' is not a local tag") % n)
5525 raise util.Abort(_("tag '%s' is not a local tag") % n)
5525 rev_ = nullid
5526 rev_ = nullid
5526 if not message:
5527 if not message:
5527 # we don't translate commit messages
5528 # we don't translate commit messages
5528 message = 'Removed tag %s' % ', '.join(names)
5529 message = 'Removed tag %s' % ', '.join(names)
5529 elif not opts.get('force'):
5530 elif not opts.get('force'):
5530 for n in names:
5531 for n in names:
5531 if n in repo.tags():
5532 if n in repo.tags():
5532 raise util.Abort(_("tag '%s' already exists "
5533 raise util.Abort(_("tag '%s' already exists "
5533 "(use -f to force)") % n)
5534 "(use -f to force)") % n)
5534 if not opts.get('local'):
5535 if not opts.get('local'):
5535 p1, p2 = repo.dirstate.parents()
5536 p1, p2 = repo.dirstate.parents()
5536 if p2 != nullid:
5537 if p2 != nullid:
5537 raise util.Abort(_('uncommitted merge'))
5538 raise util.Abort(_('uncommitted merge'))
5538 bheads = repo.branchheads()
5539 bheads = repo.branchheads()
5539 if not opts.get('force') and bheads and p1 not in bheads:
5540 if not opts.get('force') and bheads and p1 not in bheads:
5540 raise util.Abort(_('not at a branch head (use -f to force)'))
5541 raise util.Abort(_('not at a branch head (use -f to force)'))
5541 r = scmutil.revsingle(repo, rev_).node()
5542 r = scmutil.revsingle(repo, rev_).node()
5542
5543
5543 if not message:
5544 if not message:
5544 # we don't translate commit messages
5545 # we don't translate commit messages
5545 message = ('Added tag %s for changeset %s' %
5546 message = ('Added tag %s for changeset %s' %
5546 (', '.join(names), short(r)))
5547 (', '.join(names), short(r)))
5547
5548
5548 date = opts.get('date')
5549 date = opts.get('date')
5549 if date:
5550 if date:
5550 date = util.parsedate(date)
5551 date = util.parsedate(date)
5551
5552
5552 if opts.get('edit'):
5553 if opts.get('edit'):
5553 message = ui.edit(message, ui.username())
5554 message = ui.edit(message, ui.username())
5554
5555
5555 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
5556 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
5556 finally:
5557 finally:
5557 release(lock, wlock)
5558 release(lock, wlock)
5558
5559
5559 @command('tags', [], '')
5560 @command('tags', [], '')
5560 def tags(ui, repo):
5561 def tags(ui, repo):
5561 """list repository tags
5562 """list repository tags
5562
5563
5563 This lists both regular and local tags. When the -v/--verbose
5564 This lists both regular and local tags. When the -v/--verbose
5564 switch is used, a third column "local" is printed for local tags.
5565 switch is used, a third column "local" is printed for local tags.
5565
5566
5566 Returns 0 on success.
5567 Returns 0 on success.
5567 """
5568 """
5568
5569
5569 hexfunc = ui.debugflag and hex or short
5570 hexfunc = ui.debugflag and hex or short
5570 tagtype = ""
5571 tagtype = ""
5571
5572
5572 for t, n in reversed(repo.tagslist()):
5573 for t, n in reversed(repo.tagslist()):
5573 if ui.quiet:
5574 if ui.quiet:
5574 ui.write("%s\n" % t, label='tags.normal')
5575 ui.write("%s\n" % t, label='tags.normal')
5575 continue
5576 continue
5576
5577
5577 hn = hexfunc(n)
5578 hn = hexfunc(n)
5578 r = "%5d:%s" % (repo.changelog.rev(n), hn)
5579 r = "%5d:%s" % (repo.changelog.rev(n), hn)
5579 rev = ui.label(r, 'log.changeset')
5580 rev = ui.label(r, 'log.changeset')
5580 spaces = " " * (30 - encoding.colwidth(t))
5581 spaces = " " * (30 - encoding.colwidth(t))
5581
5582
5582 tag = ui.label(t, 'tags.normal')
5583 tag = ui.label(t, 'tags.normal')
5583 if ui.verbose:
5584 if ui.verbose:
5584 if repo.tagtype(t) == 'local':
5585 if repo.tagtype(t) == 'local':
5585 tagtype = " local"
5586 tagtype = " local"
5586 tag = ui.label(t, 'tags.local')
5587 tag = ui.label(t, 'tags.local')
5587 else:
5588 else:
5588 tagtype = ""
5589 tagtype = ""
5589 ui.write("%s%s %s%s\n" % (tag, spaces, rev, tagtype))
5590 ui.write("%s%s %s%s\n" % (tag, spaces, rev, tagtype))
5590
5591
5591 @command('tip',
5592 @command('tip',
5592 [('p', 'patch', None, _('show patch')),
5593 [('p', 'patch', None, _('show patch')),
5593 ('g', 'git', None, _('use git extended diff format')),
5594 ('g', 'git', None, _('use git extended diff format')),
5594 ] + templateopts,
5595 ] + templateopts,
5595 _('[-p] [-g]'))
5596 _('[-p] [-g]'))
5596 def tip(ui, repo, **opts):
5597 def tip(ui, repo, **opts):
5597 """show the tip revision
5598 """show the tip revision
5598
5599
5599 The tip revision (usually just called the tip) is the changeset
5600 The tip revision (usually just called the tip) is the changeset
5600 most recently added to the repository (and therefore the most
5601 most recently added to the repository (and therefore the most
5601 recently changed head).
5602 recently changed head).
5602
5603
5603 If you have just made a commit, that commit will be the tip. If
5604 If you have just made a commit, that commit will be the tip. If
5604 you have just pulled changes from another repository, the tip of
5605 you have just pulled changes from another repository, the tip of
5605 that repository becomes the current tip. The "tip" tag is special
5606 that repository becomes the current tip. The "tip" tag is special
5606 and cannot be renamed or assigned to a different changeset.
5607 and cannot be renamed or assigned to a different changeset.
5607
5608
5608 Returns 0 on success.
5609 Returns 0 on success.
5609 """
5610 """
5610 displayer = cmdutil.show_changeset(ui, repo, opts)
5611 displayer = cmdutil.show_changeset(ui, repo, opts)
5611 displayer.show(repo[len(repo) - 1])
5612 displayer.show(repo[len(repo) - 1])
5612 displayer.close()
5613 displayer.close()
5613
5614
5614 @command('unbundle',
5615 @command('unbundle',
5615 [('u', 'update', None,
5616 [('u', 'update', None,
5616 _('update to new branch head if changesets were unbundled'))],
5617 _('update to new branch head if changesets were unbundled'))],
5617 _('[-u] FILE...'))
5618 _('[-u] FILE...'))
5618 def unbundle(ui, repo, fname1, *fnames, **opts):
5619 def unbundle(ui, repo, fname1, *fnames, **opts):
5619 """apply one or more changegroup files
5620 """apply one or more changegroup files
5620
5621
5621 Apply one or more compressed changegroup files generated by the
5622 Apply one or more compressed changegroup files generated by the
5622 bundle command.
5623 bundle command.
5623
5624
5624 Returns 0 on success, 1 if an update has unresolved files.
5625 Returns 0 on success, 1 if an update has unresolved files.
5625 """
5626 """
5626 fnames = (fname1,) + fnames
5627 fnames = (fname1,) + fnames
5627
5628
5628 lock = repo.lock()
5629 lock = repo.lock()
5629 wc = repo['.']
5630 wc = repo['.']
5630 try:
5631 try:
5631 for fname in fnames:
5632 for fname in fnames:
5632 f = url.open(ui, fname)
5633 f = url.open(ui, fname)
5633 gen = changegroup.readbundle(f, fname)
5634 gen = changegroup.readbundle(f, fname)
5634 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
5635 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
5635 bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
5636 bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
5636 finally:
5637 finally:
5637 lock.release()
5638 lock.release()
5638 return postincoming(ui, repo, modheads, opts.get('update'), None)
5639 return postincoming(ui, repo, modheads, opts.get('update'), None)
5639
5640
5640 @command('^update|up|checkout|co',
5641 @command('^update|up|checkout|co',
5641 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5642 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5642 ('c', 'check', None,
5643 ('c', 'check', None,
5643 _('update across branches if no uncommitted changes')),
5644 _('update across branches if no uncommitted changes')),
5644 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5645 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5645 ('r', 'rev', '', _('revision'), _('REV'))],
5646 ('r', 'rev', '', _('revision'), _('REV'))],
5646 _('[-c] [-C] [-d DATE] [[-r] REV]'))
5647 _('[-c] [-C] [-d DATE] [[-r] REV]'))
5647 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
5648 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
5648 """update working directory (or switch revisions)
5649 """update working directory (or switch revisions)
5649
5650
5650 Update the repository's working directory to the specified
5651 Update the repository's working directory to the specified
5651 changeset. If no changeset is specified, update to the tip of the
5652 changeset. If no changeset is specified, update to the tip of the
5652 current named branch and move the current bookmark (see :hg:`help
5653 current named branch and move the current bookmark (see :hg:`help
5653 bookmarks`).
5654 bookmarks`).
5654
5655
5655 If the changeset is not a descendant of the working directory's
5656 If the changeset is not a descendant of the working directory's
5656 parent, the update is aborted. With the -c/--check option, the
5657 parent, the update is aborted. With the -c/--check option, the
5657 working directory is checked for uncommitted changes; if none are
5658 working directory is checked for uncommitted changes; if none are
5658 found, the working directory is updated to the specified
5659 found, the working directory is updated to the specified
5659 changeset.
5660 changeset.
5660
5661
5661 Update sets the working directory's parent revison to the specified
5662 Update sets the working directory's parent revison to the specified
5662 changeset (see :hg:`help parents`).
5663 changeset (see :hg:`help parents`).
5663
5664
5664 The following rules apply when the working directory contains
5665 The following rules apply when the working directory contains
5665 uncommitted changes:
5666 uncommitted changes:
5666
5667
5667 1. If neither -c/--check nor -C/--clean is specified, and if
5668 1. If neither -c/--check nor -C/--clean is specified, and if
5668 the requested changeset is an ancestor or descendant of
5669 the requested changeset is an ancestor or descendant of
5669 the working directory's parent, the uncommitted changes
5670 the working directory's parent, the uncommitted changes
5670 are merged into the requested changeset and the merged
5671 are merged into the requested changeset and the merged
5671 result is left uncommitted. If the requested changeset is
5672 result is left uncommitted. If the requested changeset is
5672 not an ancestor or descendant (that is, it is on another
5673 not an ancestor or descendant (that is, it is on another
5673 branch), the update is aborted and the uncommitted changes
5674 branch), the update is aborted and the uncommitted changes
5674 are preserved.
5675 are preserved.
5675
5676
5676 2. With the -c/--check option, the update is aborted and the
5677 2. With the -c/--check option, the update is aborted and the
5677 uncommitted changes are preserved.
5678 uncommitted changes are preserved.
5678
5679
5679 3. With the -C/--clean option, uncommitted changes are discarded and
5680 3. With the -C/--clean option, uncommitted changes are discarded and
5680 the working directory is updated to the requested changeset.
5681 the working directory is updated to the requested changeset.
5681
5682
5682 Use null as the changeset to remove the working directory (like
5683 Use null as the changeset to remove the working directory (like
5683 :hg:`clone -U`).
5684 :hg:`clone -U`).
5684
5685
5685 If you want to revert just one file to an older revision, use
5686 If you want to revert just one file to an older revision, use
5686 :hg:`revert [-r REV] NAME`.
5687 :hg:`revert [-r REV] NAME`.
5687
5688
5688 See :hg:`help dates` for a list of formats valid for -d/--date.
5689 See :hg:`help dates` for a list of formats valid for -d/--date.
5689
5690
5690 Returns 0 on success, 1 if there are unresolved files.
5691 Returns 0 on success, 1 if there are unresolved files.
5691 """
5692 """
5692 if rev and node:
5693 if rev and node:
5693 raise util.Abort(_("please specify just one revision"))
5694 raise util.Abort(_("please specify just one revision"))
5694
5695
5695 if rev is None or rev == '':
5696 if rev is None or rev == '':
5696 rev = node
5697 rev = node
5697
5698
5698 # with no argument, we also move the current bookmark, if any
5699 # with no argument, we also move the current bookmark, if any
5699 movemarkfrom = None
5700 movemarkfrom = None
5700 if node is None or node == '':
5701 if node is None or node == '':
5701 movemarkfrom = repo['.'].node()
5702 movemarkfrom = repo['.'].node()
5702
5703
5703 # if we defined a bookmark, we have to remember the original bookmark name
5704 # if we defined a bookmark, we have to remember the original bookmark name
5704 brev = rev
5705 brev = rev
5705 rev = scmutil.revsingle(repo, rev, rev).rev()
5706 rev = scmutil.revsingle(repo, rev, rev).rev()
5706
5707
5707 if check and clean:
5708 if check and clean:
5708 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
5709 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
5709
5710
5710 if check:
5711 if check:
5711 # we could use dirty() but we can ignore merge and branch trivia
5712 # we could use dirty() but we can ignore merge and branch trivia
5712 c = repo[None]
5713 c = repo[None]
5713 if c.modified() or c.added() or c.removed():
5714 if c.modified() or c.added() or c.removed():
5714 raise util.Abort(_("uncommitted local changes"))
5715 raise util.Abort(_("uncommitted local changes"))
5715
5716
5716 if date:
5717 if date:
5717 if rev is not None:
5718 if rev is not None:
5718 raise util.Abort(_("you can't specify a revision and a date"))
5719 raise util.Abort(_("you can't specify a revision and a date"))
5719 rev = cmdutil.finddate(ui, repo, date)
5720 rev = cmdutil.finddate(ui, repo, date)
5720
5721
5721 if clean or check:
5722 if clean or check:
5722 ret = hg.clean(repo, rev)
5723 ret = hg.clean(repo, rev)
5723 else:
5724 else:
5724 ret = hg.update(repo, rev)
5725 ret = hg.update(repo, rev)
5725
5726
5726 if not ret and movemarkfrom:
5727 if not ret and movemarkfrom:
5727 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5728 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5728 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
5729 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
5729 elif brev in repo._bookmarks:
5730 elif brev in repo._bookmarks:
5730 bookmarks.setcurrent(repo, brev)
5731 bookmarks.setcurrent(repo, brev)
5731
5732
5732 return ret
5733 return ret
5733
5734
5734 @command('verify', [])
5735 @command('verify', [])
5735 def verify(ui, repo):
5736 def verify(ui, repo):
5736 """verify the integrity of the repository
5737 """verify the integrity of the repository
5737
5738
5738 Verify the integrity of the current repository.
5739 Verify the integrity of the current repository.
5739
5740
5740 This will perform an extensive check of the repository's
5741 This will perform an extensive check of the repository's
5741 integrity, validating the hashes and checksums of each entry in
5742 integrity, validating the hashes and checksums of each entry in
5742 the changelog, manifest, and tracked files, as well as the
5743 the changelog, manifest, and tracked files, as well as the
5743 integrity of their crosslinks and indices.
5744 integrity of their crosslinks and indices.
5744
5745
5745 Returns 0 on success, 1 if errors are encountered.
5746 Returns 0 on success, 1 if errors are encountered.
5746 """
5747 """
5747 return hg.verify(repo)
5748 return hg.verify(repo)
5748
5749
5749 @command('version', [])
5750 @command('version', [])
5750 def version_(ui):
5751 def version_(ui):
5751 """output version and copyright information"""
5752 """output version and copyright information"""
5752 ui.write(_("Mercurial Distributed SCM (version %s)\n")
5753 ui.write(_("Mercurial Distributed SCM (version %s)\n")
5753 % util.version())
5754 % util.version())
5754 ui.status(_(
5755 ui.status(_(
5755 "(see http://mercurial.selenic.com for more information)\n"
5756 "(see http://mercurial.selenic.com for more information)\n"
5756 "\nCopyright (C) 2005-2012 Matt Mackall and others\n"
5757 "\nCopyright (C) 2005-2012 Matt Mackall and others\n"
5757 "This is free software; see the source for copying conditions. "
5758 "This is free software; see the source for copying conditions. "
5758 "There is NO\nwarranty; "
5759 "There is NO\nwarranty; "
5759 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5760 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5760 ))
5761 ))
5761
5762
5762 norepo = ("clone init version help debugcommands debugcomplete"
5763 norepo = ("clone init version help debugcommands debugcomplete"
5763 " debugdate debuginstall debugfsinfo debugpushkey debugwireargs"
5764 " debugdate debuginstall debugfsinfo debugpushkey debugwireargs"
5764 " debugknown debuggetbundle debugbundle")
5765 " debugknown debuggetbundle debugbundle")
5765 optionalrepo = ("identify paths serve showconfig debugancestor debugdag"
5766 optionalrepo = ("identify paths serve showconfig debugancestor debugdag"
5766 " debugdata debugindex debugindexdot debugrevlog")
5767 " debugdata debugindex debugindexdot debugrevlog")
General Comments 0
You need to be logged in to leave comments. Login now