##// END OF EJS Templates
merge with crew-stable
Martin Geisler -
r17149:4b33422e merge default
parent child Browse files
Show More
@@ -1,5820 +1,5822 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, pvec
19 import random, setdiscovery, treediscovery, dagutil, pvec
20 import phases, obsolete
20 import phases, obsolete
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 If this option is not specified, only renames of identical files
199 If this option is not specified, only renames of identical files
200 are detected.
200 are detected.
201
201
202 Returns 0 if all files are successfully added.
202 Returns 0 if all files are successfully added.
203 """
203 """
204 try:
204 try:
205 sim = float(opts.get('similarity') or 100)
205 sim = float(opts.get('similarity') or 100)
206 except ValueError:
206 except ValueError:
207 raise util.Abort(_('similarity must be a number'))
207 raise util.Abort(_('similarity must be a number'))
208 if sim < 0 or sim > 100:
208 if sim < 0 or sim > 100:
209 raise util.Abort(_('similarity must be between 0 and 100'))
209 raise util.Abort(_('similarity must be between 0 and 100'))
210 return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0)
210 return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0)
211
211
212 @command('^annotate|blame',
212 @command('^annotate|blame',
213 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
213 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
214 ('', 'follow', None,
214 ('', 'follow', None,
215 _('follow copies/renames and list the filename (DEPRECATED)')),
215 _('follow copies/renames and list the filename (DEPRECATED)')),
216 ('', 'no-follow', None, _("don't follow copies and renames")),
216 ('', 'no-follow', None, _("don't follow copies and renames")),
217 ('a', 'text', None, _('treat all files as text')),
217 ('a', 'text', None, _('treat all files as text')),
218 ('u', 'user', None, _('list the author (long with -v)')),
218 ('u', 'user', None, _('list the author (long with -v)')),
219 ('f', 'file', None, _('list the filename')),
219 ('f', 'file', None, _('list the filename')),
220 ('d', 'date', None, _('list the date (short with -q)')),
220 ('d', 'date', None, _('list the date (short with -q)')),
221 ('n', 'number', None, _('list the revision number (default)')),
221 ('n', 'number', None, _('list the revision number (default)')),
222 ('c', 'changeset', None, _('list the changeset')),
222 ('c', 'changeset', None, _('list the changeset')),
223 ('l', 'line-number', None, _('show line number at the first appearance'))
223 ('l', 'line-number', None, _('show line number at the first appearance'))
224 ] + diffwsopts + walkopts,
224 ] + diffwsopts + walkopts,
225 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'))
225 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'))
226 def annotate(ui, repo, *pats, **opts):
226 def annotate(ui, repo, *pats, **opts):
227 """show changeset information by line for each file
227 """show changeset information by line for each file
228
228
229 List changes in files, showing the revision id responsible for
229 List changes in files, showing the revision id responsible for
230 each line
230 each line
231
231
232 This command is useful for discovering when a change was made and
232 This command is useful for discovering when a change was made and
233 by whom.
233 by whom.
234
234
235 Without the -a/--text option, annotate will avoid processing files
235 Without the -a/--text option, annotate will avoid processing files
236 it detects as binary. With -a, annotate will annotate the file
236 it detects as binary. With -a, annotate will annotate the file
237 anyway, although the results will probably be neither useful
237 anyway, although the results will probably be neither useful
238 nor desirable.
238 nor desirable.
239
239
240 Returns 0 on success.
240 Returns 0 on success.
241 """
241 """
242 if opts.get('follow'):
242 if opts.get('follow'):
243 # --follow is deprecated and now just an alias for -f/--file
243 # --follow is deprecated and now just an alias for -f/--file
244 # to mimic the behavior of Mercurial before version 1.5
244 # to mimic the behavior of Mercurial before version 1.5
245 opts['file'] = True
245 opts['file'] = True
246
246
247 datefunc = ui.quiet and util.shortdate or util.datestr
247 datefunc = ui.quiet and util.shortdate or util.datestr
248 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
248 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
249
249
250 if not pats:
250 if not pats:
251 raise util.Abort(_('at least one filename or pattern is required'))
251 raise util.Abort(_('at least one filename or pattern is required'))
252
252
253 hexfn = ui.debugflag and hex or short
253 hexfn = ui.debugflag and hex or short
254
254
255 opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())),
255 opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())),
256 ('number', ' ', lambda x: str(x[0].rev())),
256 ('number', ' ', lambda x: str(x[0].rev())),
257 ('changeset', ' ', lambda x: hexfn(x[0].node())),
257 ('changeset', ' ', lambda x: hexfn(x[0].node())),
258 ('date', ' ', getdate),
258 ('date', ' ', getdate),
259 ('file', ' ', lambda x: x[0].path()),
259 ('file', ' ', lambda x: x[0].path()),
260 ('line_number', ':', lambda x: str(x[1])),
260 ('line_number', ':', lambda x: str(x[1])),
261 ]
261 ]
262
262
263 if (not opts.get('user') and not opts.get('changeset')
263 if (not opts.get('user') and not opts.get('changeset')
264 and not opts.get('date') and not opts.get('file')):
264 and not opts.get('date') and not opts.get('file')):
265 opts['number'] = True
265 opts['number'] = True
266
266
267 linenumber = opts.get('line_number') is not None
267 linenumber = opts.get('line_number') is not None
268 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
268 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
269 raise util.Abort(_('at least one of -n/-c is required for -l'))
269 raise util.Abort(_('at least one of -n/-c is required for -l'))
270
270
271 funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)]
271 funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)]
272 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
272 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
273
273
274 def bad(x, y):
274 def bad(x, y):
275 raise util.Abort("%s: %s" % (x, y))
275 raise util.Abort("%s: %s" % (x, y))
276
276
277 ctx = scmutil.revsingle(repo, opts.get('rev'))
277 ctx = scmutil.revsingle(repo, opts.get('rev'))
278 m = scmutil.match(ctx, pats, opts)
278 m = scmutil.match(ctx, pats, opts)
279 m.bad = bad
279 m.bad = bad
280 follow = not opts.get('no_follow')
280 follow = not opts.get('no_follow')
281 diffopts = patch.diffopts(ui, opts, section='annotate')
281 diffopts = patch.diffopts(ui, opts, section='annotate')
282 for abs in ctx.walk(m):
282 for abs in ctx.walk(m):
283 fctx = ctx[abs]
283 fctx = ctx[abs]
284 if not opts.get('text') and util.binary(fctx.data()):
284 if not opts.get('text') and util.binary(fctx.data()):
285 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
285 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
286 continue
286 continue
287
287
288 lines = fctx.annotate(follow=follow, linenumber=linenumber,
288 lines = fctx.annotate(follow=follow, linenumber=linenumber,
289 diffopts=diffopts)
289 diffopts=diffopts)
290 pieces = []
290 pieces = []
291
291
292 for f, sep in funcmap:
292 for f, sep in funcmap:
293 l = [f(n) for n, dummy in lines]
293 l = [f(n) for n, dummy in lines]
294 if l:
294 if l:
295 sized = [(x, encoding.colwidth(x)) for x in l]
295 sized = [(x, encoding.colwidth(x)) for x in l]
296 ml = max([w for x, w in sized])
296 ml = max([w for x, w in sized])
297 pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x)
297 pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x)
298 for x, w in sized])
298 for x, w in sized])
299
299
300 if pieces:
300 if pieces:
301 for p, l in zip(zip(*pieces), lines):
301 for p, l in zip(zip(*pieces), lines):
302 ui.write("%s: %s" % ("".join(p), l[1]))
302 ui.write("%s: %s" % ("".join(p), l[1]))
303
303
304 if lines and not lines[-1][1].endswith('\n'):
304 if lines and not lines[-1][1].endswith('\n'):
305 ui.write('\n')
305 ui.write('\n')
306
306
307 @command('archive',
307 @command('archive',
308 [('', 'no-decode', None, _('do not pass files through decoders')),
308 [('', 'no-decode', None, _('do not pass files through decoders')),
309 ('p', 'prefix', '', _('directory prefix for files in archive'),
309 ('p', 'prefix', '', _('directory prefix for files in archive'),
310 _('PREFIX')),
310 _('PREFIX')),
311 ('r', 'rev', '', _('revision to distribute'), _('REV')),
311 ('r', 'rev', '', _('revision to distribute'), _('REV')),
312 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
312 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
313 ] + subrepoopts + walkopts,
313 ] + subrepoopts + walkopts,
314 _('[OPTION]... DEST'))
314 _('[OPTION]... DEST'))
315 def archive(ui, repo, dest, **opts):
315 def archive(ui, repo, dest, **opts):
316 '''create an unversioned archive of a repository revision
316 '''create an unversioned archive of a repository revision
317
317
318 By default, the revision used is the parent of the working
318 By default, the revision used is the parent of the working
319 directory; use -r/--rev to specify a different revision.
319 directory; use -r/--rev to specify a different revision.
320
320
321 The archive type is automatically detected based on file
321 The archive type is automatically detected based on file
322 extension (or override using -t/--type).
322 extension (or override using -t/--type).
323
323
324 .. container:: verbose
324 .. container:: verbose
325
325
326 Examples:
326 Examples:
327
327
328 - create a zip file containing the 1.0 release::
328 - create a zip file containing the 1.0 release::
329
329
330 hg archive -r 1.0 project-1.0.zip
330 hg archive -r 1.0 project-1.0.zip
331
331
332 - create a tarball excluding .hg files::
332 - create a tarball excluding .hg files::
333
333
334 hg archive project.tar.gz -X ".hg*"
334 hg archive project.tar.gz -X ".hg*"
335
335
336 Valid types are:
336 Valid types are:
337
337
338 :``files``: a directory full of files (default)
338 :``files``: a directory full of files (default)
339 :``tar``: tar archive, uncompressed
339 :``tar``: tar archive, uncompressed
340 :``tbz2``: tar archive, compressed using bzip2
340 :``tbz2``: tar archive, compressed using bzip2
341 :``tgz``: tar archive, compressed using gzip
341 :``tgz``: tar archive, compressed using gzip
342 :``uzip``: zip archive, uncompressed
342 :``uzip``: zip archive, uncompressed
343 :``zip``: zip archive, compressed using deflate
343 :``zip``: zip archive, compressed using deflate
344
344
345 The exact name of the destination archive or directory is given
345 The exact name of the destination archive or directory is given
346 using a format string; see :hg:`help export` for details.
346 using a format string; see :hg:`help export` for details.
347
347
348 Each member added to an archive file has a directory prefix
348 Each member added to an archive file has a directory prefix
349 prepended. Use -p/--prefix to specify a format string for the
349 prepended. Use -p/--prefix to specify a format string for the
350 prefix. The default is the basename of the archive, with suffixes
350 prefix. The default is the basename of the archive, with suffixes
351 removed.
351 removed.
352
352
353 Returns 0 on success.
353 Returns 0 on success.
354 '''
354 '''
355
355
356 ctx = scmutil.revsingle(repo, opts.get('rev'))
356 ctx = scmutil.revsingle(repo, opts.get('rev'))
357 if not ctx:
357 if not ctx:
358 raise util.Abort(_('no working directory: please specify a revision'))
358 raise util.Abort(_('no working directory: please specify a revision'))
359 node = ctx.node()
359 node = ctx.node()
360 dest = cmdutil.makefilename(repo, dest, node)
360 dest = cmdutil.makefilename(repo, dest, node)
361 if os.path.realpath(dest) == repo.root:
361 if os.path.realpath(dest) == repo.root:
362 raise util.Abort(_('repository root cannot be destination'))
362 raise util.Abort(_('repository root cannot be destination'))
363
363
364 kind = opts.get('type') or archival.guesskind(dest) or 'files'
364 kind = opts.get('type') or archival.guesskind(dest) or 'files'
365 prefix = opts.get('prefix')
365 prefix = opts.get('prefix')
366
366
367 if dest == '-':
367 if dest == '-':
368 if kind == 'files':
368 if kind == 'files':
369 raise util.Abort(_('cannot archive plain files to stdout'))
369 raise util.Abort(_('cannot archive plain files to stdout'))
370 dest = cmdutil.makefileobj(repo, dest)
370 dest = cmdutil.makefileobj(repo, dest)
371 if not prefix:
371 if not prefix:
372 prefix = os.path.basename(repo.root) + '-%h'
372 prefix = os.path.basename(repo.root) + '-%h'
373
373
374 prefix = cmdutil.makefilename(repo, prefix, node)
374 prefix = cmdutil.makefilename(repo, prefix, node)
375 matchfn = scmutil.match(ctx, [], opts)
375 matchfn = scmutil.match(ctx, [], opts)
376 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
376 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
377 matchfn, prefix, subrepos=opts.get('subrepos'))
377 matchfn, prefix, subrepos=opts.get('subrepos'))
378
378
379 @command('backout',
379 @command('backout',
380 [('', 'merge', None, _('merge with old dirstate parent after backout')),
380 [('', 'merge', None, _('merge with old dirstate parent after backout')),
381 ('', 'parent', '',
381 ('', 'parent', '',
382 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
382 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
383 ('r', 'rev', '', _('revision to backout'), _('REV')),
383 ('r', 'rev', '', _('revision to backout'), _('REV')),
384 ] + mergetoolopts + walkopts + commitopts + commitopts2,
384 ] + mergetoolopts + walkopts + commitopts + commitopts2,
385 _('[OPTION]... [-r] REV'))
385 _('[OPTION]... [-r] REV'))
386 def backout(ui, repo, node=None, rev=None, **opts):
386 def backout(ui, repo, node=None, rev=None, **opts):
387 '''reverse effect of earlier changeset
387 '''reverse effect of earlier changeset
388
388
389 Prepare a new changeset with the effect of REV undone in the
389 Prepare a new changeset with the effect of REV undone in the
390 current working directory.
390 current working directory.
391
391
392 If REV is the parent of the working directory, then this new changeset
392 If REV is the parent of the working directory, then this new changeset
393 is committed automatically. Otherwise, hg needs to merge the
393 is committed automatically. Otherwise, hg needs to merge the
394 changes and the merged result is left uncommitted.
394 changes and the merged result is left uncommitted.
395
395
396 .. note::
396 .. note::
397 backout cannot be used to fix either an unwanted or
397 backout cannot be used to fix either an unwanted or
398 incorrect merge.
398 incorrect merge.
399
399
400 .. container:: verbose
400 .. container:: verbose
401
401
402 By default, the pending changeset will have one parent,
402 By default, the pending changeset will have one parent,
403 maintaining a linear history. With --merge, the pending
403 maintaining a linear history. With --merge, the pending
404 changeset will instead have two parents: the old parent of the
404 changeset will instead have two parents: the old parent of the
405 working directory and a new child of REV that simply undoes REV.
405 working directory and a new child of REV that simply undoes REV.
406
406
407 Before version 1.7, the behavior without --merge was equivalent
407 Before version 1.7, the behavior without --merge was equivalent
408 to specifying --merge followed by :hg:`update --clean .` to
408 to specifying --merge followed by :hg:`update --clean .` to
409 cancel the merge and leave the child of REV as a head to be
409 cancel the merge and leave the child of REV as a head to be
410 merged separately.
410 merged separately.
411
411
412 See :hg:`help dates` for a list of formats valid for -d/--date.
412 See :hg:`help dates` for a list of formats valid for -d/--date.
413
413
414 Returns 0 on success.
414 Returns 0 on success.
415 '''
415 '''
416 if rev and node:
416 if rev and node:
417 raise util.Abort(_("please specify just one revision"))
417 raise util.Abort(_("please specify just one revision"))
418
418
419 if not rev:
419 if not rev:
420 rev = node
420 rev = node
421
421
422 if not rev:
422 if not rev:
423 raise util.Abort(_("please specify a revision to backout"))
423 raise util.Abort(_("please specify a revision to backout"))
424
424
425 date = opts.get('date')
425 date = opts.get('date')
426 if date:
426 if date:
427 opts['date'] = util.parsedate(date)
427 opts['date'] = util.parsedate(date)
428
428
429 cmdutil.bailifchanged(repo)
429 cmdutil.bailifchanged(repo)
430 node = scmutil.revsingle(repo, rev).node()
430 node = scmutil.revsingle(repo, rev).node()
431
431
432 op1, op2 = repo.dirstate.parents()
432 op1, op2 = repo.dirstate.parents()
433 a = repo.changelog.ancestor(op1, node)
433 a = repo.changelog.ancestor(op1, node)
434 if a != node:
434 if a != node:
435 raise util.Abort(_('cannot backout change on a different branch'))
435 raise util.Abort(_('cannot backout change on a different branch'))
436
436
437 p1, p2 = repo.changelog.parents(node)
437 p1, p2 = repo.changelog.parents(node)
438 if p1 == nullid:
438 if p1 == nullid:
439 raise util.Abort(_('cannot backout a change with no parents'))
439 raise util.Abort(_('cannot backout a change with no parents'))
440 if p2 != nullid:
440 if p2 != nullid:
441 if not opts.get('parent'):
441 if not opts.get('parent'):
442 raise util.Abort(_('cannot backout a merge changeset'))
442 raise util.Abort(_('cannot backout a merge changeset'))
443 p = repo.lookup(opts['parent'])
443 p = repo.lookup(opts['parent'])
444 if p not in (p1, p2):
444 if p not in (p1, p2):
445 raise util.Abort(_('%s is not a parent of %s') %
445 raise util.Abort(_('%s is not a parent of %s') %
446 (short(p), short(node)))
446 (short(p), short(node)))
447 parent = p
447 parent = p
448 else:
448 else:
449 if opts.get('parent'):
449 if opts.get('parent'):
450 raise util.Abort(_('cannot use --parent on non-merge changeset'))
450 raise util.Abort(_('cannot use --parent on non-merge changeset'))
451 parent = p1
451 parent = p1
452
452
453 # the backout should appear on the same branch
453 # the backout should appear on the same branch
454 wlock = repo.wlock()
454 wlock = repo.wlock()
455 try:
455 try:
456 branch = repo.dirstate.branch()
456 branch = repo.dirstate.branch()
457 hg.clean(repo, node, show_stats=False)
457 hg.clean(repo, node, show_stats=False)
458 repo.dirstate.setbranch(branch)
458 repo.dirstate.setbranch(branch)
459 revert_opts = opts.copy()
459 revert_opts = opts.copy()
460 revert_opts['date'] = None
460 revert_opts['date'] = None
461 revert_opts['all'] = True
461 revert_opts['all'] = True
462 revert_opts['rev'] = hex(parent)
462 revert_opts['rev'] = hex(parent)
463 revert_opts['no_backup'] = None
463 revert_opts['no_backup'] = None
464 revert(ui, repo, **revert_opts)
464 revert(ui, repo, **revert_opts)
465 if not opts.get('merge') and op1 != node:
465 if not opts.get('merge') and op1 != node:
466 try:
466 try:
467 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
467 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
468 return hg.update(repo, op1)
468 return hg.update(repo, op1)
469 finally:
469 finally:
470 ui.setconfig('ui', 'forcemerge', '')
470 ui.setconfig('ui', 'forcemerge', '')
471
471
472 commit_opts = opts.copy()
472 commit_opts = opts.copy()
473 commit_opts['addremove'] = False
473 commit_opts['addremove'] = False
474 if not commit_opts['message'] and not commit_opts['logfile']:
474 if not commit_opts['message'] and not commit_opts['logfile']:
475 # we don't translate commit messages
475 # we don't translate commit messages
476 commit_opts['message'] = "Backed out changeset %s" % short(node)
476 commit_opts['message'] = "Backed out changeset %s" % short(node)
477 commit_opts['force_editor'] = True
477 commit_opts['force_editor'] = True
478 commit(ui, repo, **commit_opts)
478 commit(ui, repo, **commit_opts)
479 def nice(node):
479 def nice(node):
480 return '%d:%s' % (repo.changelog.rev(node), short(node))
480 return '%d:%s' % (repo.changelog.rev(node), short(node))
481 ui.status(_('changeset %s backs out changeset %s\n') %
481 ui.status(_('changeset %s backs out changeset %s\n') %
482 (nice(repo.changelog.tip()), nice(node)))
482 (nice(repo.changelog.tip()), nice(node)))
483 if opts.get('merge') and op1 != node:
483 if opts.get('merge') and op1 != node:
484 hg.clean(repo, op1, show_stats=False)
484 hg.clean(repo, op1, show_stats=False)
485 ui.status(_('merging with changeset %s\n')
485 ui.status(_('merging with changeset %s\n')
486 % nice(repo.changelog.tip()))
486 % nice(repo.changelog.tip()))
487 try:
487 try:
488 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
488 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
489 return hg.merge(repo, hex(repo.changelog.tip()))
489 return hg.merge(repo, hex(repo.changelog.tip()))
490 finally:
490 finally:
491 ui.setconfig('ui', 'forcemerge', '')
491 ui.setconfig('ui', 'forcemerge', '')
492 finally:
492 finally:
493 wlock.release()
493 wlock.release()
494 return 0
494 return 0
495
495
496 @command('bisect',
496 @command('bisect',
497 [('r', 'reset', False, _('reset bisect state')),
497 [('r', 'reset', False, _('reset bisect state')),
498 ('g', 'good', False, _('mark changeset good')),
498 ('g', 'good', False, _('mark changeset good')),
499 ('b', 'bad', False, _('mark changeset bad')),
499 ('b', 'bad', False, _('mark changeset bad')),
500 ('s', 'skip', False, _('skip testing changeset')),
500 ('s', 'skip', False, _('skip testing changeset')),
501 ('e', 'extend', False, _('extend the bisect range')),
501 ('e', 'extend', False, _('extend the bisect range')),
502 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
502 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
503 ('U', 'noupdate', False, _('do not update to target'))],
503 ('U', 'noupdate', False, _('do not update to target'))],
504 _("[-gbsr] [-U] [-c CMD] [REV]"))
504 _("[-gbsr] [-U] [-c CMD] [REV]"))
505 def bisect(ui, repo, rev=None, extra=None, command=None,
505 def bisect(ui, repo, rev=None, extra=None, command=None,
506 reset=None, good=None, bad=None, skip=None, extend=None,
506 reset=None, good=None, bad=None, skip=None, extend=None,
507 noupdate=None):
507 noupdate=None):
508 """subdivision search of changesets
508 """subdivision search of changesets
509
509
510 This command helps to find changesets which introduce problems. To
510 This command helps to find changesets which introduce problems. To
511 use, mark the earliest changeset you know exhibits the problem as
511 use, mark the earliest changeset you know exhibits the problem as
512 bad, then mark the latest changeset which is free from the problem
512 bad, then mark the latest changeset which is free from the problem
513 as good. Bisect will update your working directory to a revision
513 as good. Bisect will update your working directory to a revision
514 for testing (unless the -U/--noupdate option is specified). Once
514 for testing (unless the -U/--noupdate option is specified). Once
515 you have performed tests, mark the working directory as good or
515 you have performed tests, mark the working directory as good or
516 bad, and bisect will either update to another candidate changeset
516 bad, and bisect will either update to another candidate changeset
517 or announce that it has found the bad revision.
517 or announce that it has found the bad revision.
518
518
519 As a shortcut, you can also use the revision argument to mark a
519 As a shortcut, you can also use the revision argument to mark a
520 revision as good or bad without checking it out first.
520 revision as good or bad without checking it out first.
521
521
522 If you supply a command, it will be used for automatic bisection.
522 If you supply a command, it will be used for automatic bisection.
523 The environment variable HG_NODE will contain the ID of the
523 The environment variable HG_NODE will contain the ID of the
524 changeset being tested. The exit status of the command will be
524 changeset being tested. The exit status of the command will be
525 used to mark revisions as good or bad: status 0 means good, 125
525 used to mark revisions as good or bad: status 0 means good, 125
526 means to skip the revision, 127 (command not found) will abort the
526 means to skip the revision, 127 (command not found) will abort the
527 bisection, and any other non-zero exit status means the revision
527 bisection, and any other non-zero exit status means the revision
528 is bad.
528 is bad.
529
529
530 .. container:: verbose
530 .. container:: verbose
531
531
532 Some examples:
532 Some examples:
533
533
534 - start a bisection with known bad revision 12, and good revision 34::
534 - start a bisection with known bad revision 12, and good revision 34::
535
535
536 hg bisect --bad 34
536 hg bisect --bad 34
537 hg bisect --good 12
537 hg bisect --good 12
538
538
539 - advance the current bisection by marking current revision as good or
539 - advance the current bisection by marking current revision as good or
540 bad::
540 bad::
541
541
542 hg bisect --good
542 hg bisect --good
543 hg bisect --bad
543 hg bisect --bad
544
544
545 - mark the current revision, or a known revision, to be skipped (eg. if
545 - mark the current revision, or a known revision, to be skipped (eg. if
546 that revision is not usable because of another issue)::
546 that revision is not usable because of another issue)::
547
547
548 hg bisect --skip
548 hg bisect --skip
549 hg bisect --skip 23
549 hg bisect --skip 23
550
550
551 - forget the current bisection::
551 - forget the current bisection::
552
552
553 hg bisect --reset
553 hg bisect --reset
554
554
555 - use 'make && make tests' to automatically find the first broken
555 - use 'make && make tests' to automatically find the first broken
556 revision::
556 revision::
557
557
558 hg bisect --reset
558 hg bisect --reset
559 hg bisect --bad 34
559 hg bisect --bad 34
560 hg bisect --good 12
560 hg bisect --good 12
561 hg bisect --command 'make && make tests'
561 hg bisect --command 'make && make tests'
562
562
563 - see all changesets whose states are already known in the current
563 - see all changesets whose states are already known in the current
564 bisection::
564 bisection::
565
565
566 hg log -r "bisect(pruned)"
566 hg log -r "bisect(pruned)"
567
567
568 - see the changeset currently being bisected (especially useful
568 - see the changeset currently being bisected (especially useful
569 if running with -U/--noupdate)::
569 if running with -U/--noupdate)::
570
570
571 hg log -r "bisect(current)"
571 hg log -r "bisect(current)"
572
572
573 - see all changesets that took part in the current bisection::
573 - see all changesets that took part in the current bisection::
574
574
575 hg log -r "bisect(range)"
575 hg log -r "bisect(range)"
576
576
577 - with the graphlog extension, you can even get a nice graph::
577 - with the graphlog extension, you can even get a nice graph::
578
578
579 hg log --graph -r "bisect(range)"
579 hg log --graph -r "bisect(range)"
580
580
581 See :hg:`help revsets` for more about the `bisect()` keyword.
581 See :hg:`help revsets` for more about the `bisect()` keyword.
582
582
583 Returns 0 on success.
583 Returns 0 on success.
584 """
584 """
585 def extendbisectrange(nodes, good):
585 def extendbisectrange(nodes, good):
586 # bisect is incomplete when it ends on a merge node and
586 # bisect is incomplete when it ends on a merge node and
587 # one of the parent was not checked.
587 # one of the parent was not checked.
588 parents = repo[nodes[0]].parents()
588 parents = repo[nodes[0]].parents()
589 if len(parents) > 1:
589 if len(parents) > 1:
590 side = good and state['bad'] or state['good']
590 side = good and state['bad'] or state['good']
591 num = len(set(i.node() for i in parents) & set(side))
591 num = len(set(i.node() for i in parents) & set(side))
592 if num == 1:
592 if num == 1:
593 return parents[0].ancestor(parents[1])
593 return parents[0].ancestor(parents[1])
594 return None
594 return None
595
595
596 def print_result(nodes, good):
596 def print_result(nodes, good):
597 displayer = cmdutil.show_changeset(ui, repo, {})
597 displayer = cmdutil.show_changeset(ui, repo, {})
598 if len(nodes) == 1:
598 if len(nodes) == 1:
599 # narrowed it down to a single revision
599 # narrowed it down to a single revision
600 if good:
600 if good:
601 ui.write(_("The first good revision is:\n"))
601 ui.write(_("The first good revision is:\n"))
602 else:
602 else:
603 ui.write(_("The first bad revision is:\n"))
603 ui.write(_("The first bad revision is:\n"))
604 displayer.show(repo[nodes[0]])
604 displayer.show(repo[nodes[0]])
605 extendnode = extendbisectrange(nodes, good)
605 extendnode = extendbisectrange(nodes, good)
606 if extendnode is not None:
606 if extendnode is not None:
607 ui.write(_('Not all ancestors of this changeset have been'
607 ui.write(_('Not all ancestors of this changeset have been'
608 ' checked.\nUse bisect --extend to continue the '
608 ' checked.\nUse bisect --extend to continue the '
609 'bisection from\nthe common ancestor, %s.\n')
609 'bisection from\nthe common ancestor, %s.\n')
610 % extendnode)
610 % extendnode)
611 else:
611 else:
612 # multiple possible revisions
612 # multiple possible revisions
613 if good:
613 if good:
614 ui.write(_("Due to skipped revisions, the first "
614 ui.write(_("Due to skipped revisions, the first "
615 "good revision could be any of:\n"))
615 "good revision could be any of:\n"))
616 else:
616 else:
617 ui.write(_("Due to skipped revisions, the first "
617 ui.write(_("Due to skipped revisions, the first "
618 "bad revision could be any of:\n"))
618 "bad revision could be any of:\n"))
619 for n in nodes:
619 for n in nodes:
620 displayer.show(repo[n])
620 displayer.show(repo[n])
621 displayer.close()
621 displayer.close()
622
622
623 def check_state(state, interactive=True):
623 def check_state(state, interactive=True):
624 if not state['good'] or not state['bad']:
624 if not state['good'] or not state['bad']:
625 if (good or bad or skip or reset) and interactive:
625 if (good or bad or skip or reset) and interactive:
626 return
626 return
627 if not state['good']:
627 if not state['good']:
628 raise util.Abort(_('cannot bisect (no known good revisions)'))
628 raise util.Abort(_('cannot bisect (no known good revisions)'))
629 else:
629 else:
630 raise util.Abort(_('cannot bisect (no known bad revisions)'))
630 raise util.Abort(_('cannot bisect (no known bad revisions)'))
631 return True
631 return True
632
632
633 # backward compatibility
633 # backward compatibility
634 if rev in "good bad reset init".split():
634 if rev in "good bad reset init".split():
635 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
635 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
636 cmd, rev, extra = rev, extra, None
636 cmd, rev, extra = rev, extra, None
637 if cmd == "good":
637 if cmd == "good":
638 good = True
638 good = True
639 elif cmd == "bad":
639 elif cmd == "bad":
640 bad = True
640 bad = True
641 else:
641 else:
642 reset = True
642 reset = True
643 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
643 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
644 raise util.Abort(_('incompatible arguments'))
644 raise util.Abort(_('incompatible arguments'))
645
645
646 if reset:
646 if reset:
647 p = repo.join("bisect.state")
647 p = repo.join("bisect.state")
648 if os.path.exists(p):
648 if os.path.exists(p):
649 os.unlink(p)
649 os.unlink(p)
650 return
650 return
651
651
652 state = hbisect.load_state(repo)
652 state = hbisect.load_state(repo)
653
653
654 if command:
654 if command:
655 changesets = 1
655 changesets = 1
656 try:
656 try:
657 node = state['current'][0]
657 node = state['current'][0]
658 except LookupError:
658 except LookupError:
659 if noupdate:
659 if noupdate:
660 raise util.Abort(_('current bisect revision is unknown - '
660 raise util.Abort(_('current bisect revision is unknown - '
661 'start a new bisect to fix'))
661 'start a new bisect to fix'))
662 node, p2 = repo.dirstate.parents()
662 node, p2 = repo.dirstate.parents()
663 if p2 != nullid:
663 if p2 != nullid:
664 raise util.Abort(_('current bisect revision is a merge'))
664 raise util.Abort(_('current bisect revision is a merge'))
665 try:
665 try:
666 while changesets:
666 while changesets:
667 # update state
667 # update state
668 state['current'] = [node]
668 state['current'] = [node]
669 hbisect.save_state(repo, state)
669 hbisect.save_state(repo, state)
670 status = util.system(command,
670 status = util.system(command,
671 environ={'HG_NODE': hex(node)},
671 environ={'HG_NODE': hex(node)},
672 out=ui.fout)
672 out=ui.fout)
673 if status == 125:
673 if status == 125:
674 transition = "skip"
674 transition = "skip"
675 elif status == 0:
675 elif status == 0:
676 transition = "good"
676 transition = "good"
677 # status < 0 means process was killed
677 # status < 0 means process was killed
678 elif status == 127:
678 elif status == 127:
679 raise util.Abort(_("failed to execute %s") % command)
679 raise util.Abort(_("failed to execute %s") % command)
680 elif status < 0:
680 elif status < 0:
681 raise util.Abort(_("%s killed") % command)
681 raise util.Abort(_("%s killed") % command)
682 else:
682 else:
683 transition = "bad"
683 transition = "bad"
684 ctx = scmutil.revsingle(repo, rev, node)
684 ctx = scmutil.revsingle(repo, rev, node)
685 rev = None # clear for future iterations
685 rev = None # clear for future iterations
686 state[transition].append(ctx.node())
686 state[transition].append(ctx.node())
687 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
687 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
688 check_state(state, interactive=False)
688 check_state(state, interactive=False)
689 # bisect
689 # bisect
690 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
690 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
691 # update to next check
691 # update to next check
692 node = nodes[0]
692 node = nodes[0]
693 if not noupdate:
693 if not noupdate:
694 cmdutil.bailifchanged(repo)
694 cmdutil.bailifchanged(repo)
695 hg.clean(repo, node, show_stats=False)
695 hg.clean(repo, node, show_stats=False)
696 finally:
696 finally:
697 state['current'] = [node]
697 state['current'] = [node]
698 hbisect.save_state(repo, state)
698 hbisect.save_state(repo, state)
699 print_result(nodes, good)
699 print_result(nodes, good)
700 return
700 return
701
701
702 # update state
702 # update state
703
703
704 if rev:
704 if rev:
705 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
705 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
706 else:
706 else:
707 nodes = [repo.lookup('.')]
707 nodes = [repo.lookup('.')]
708
708
709 if good or bad or skip:
709 if good or bad or skip:
710 if good:
710 if good:
711 state['good'] += nodes
711 state['good'] += nodes
712 elif bad:
712 elif bad:
713 state['bad'] += nodes
713 state['bad'] += nodes
714 elif skip:
714 elif skip:
715 state['skip'] += nodes
715 state['skip'] += nodes
716 hbisect.save_state(repo, state)
716 hbisect.save_state(repo, state)
717
717
718 if not check_state(state):
718 if not check_state(state):
719 return
719 return
720
720
721 # actually bisect
721 # actually bisect
722 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
722 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
723 if extend:
723 if extend:
724 if not changesets:
724 if not changesets:
725 extendnode = extendbisectrange(nodes, good)
725 extendnode = extendbisectrange(nodes, good)
726 if extendnode is not None:
726 if extendnode is not None:
727 ui.write(_("Extending search to changeset %d:%s\n"
727 ui.write(_("Extending search to changeset %d:%s\n"
728 % (extendnode.rev(), extendnode)))
728 % (extendnode.rev(), extendnode)))
729 state['current'] = [extendnode.node()]
729 state['current'] = [extendnode.node()]
730 hbisect.save_state(repo, state)
730 hbisect.save_state(repo, state)
731 if noupdate:
731 if noupdate:
732 return
732 return
733 cmdutil.bailifchanged(repo)
733 cmdutil.bailifchanged(repo)
734 return hg.clean(repo, extendnode.node())
734 return hg.clean(repo, extendnode.node())
735 raise util.Abort(_("nothing to extend"))
735 raise util.Abort(_("nothing to extend"))
736
736
737 if changesets == 0:
737 if changesets == 0:
738 print_result(nodes, good)
738 print_result(nodes, good)
739 else:
739 else:
740 assert len(nodes) == 1 # only a single node can be tested next
740 assert len(nodes) == 1 # only a single node can be tested next
741 node = nodes[0]
741 node = nodes[0]
742 # compute the approximate number of remaining tests
742 # compute the approximate number of remaining tests
743 tests, size = 0, 2
743 tests, size = 0, 2
744 while size <= changesets:
744 while size <= changesets:
745 tests, size = tests + 1, size * 2
745 tests, size = tests + 1, size * 2
746 rev = repo.changelog.rev(node)
746 rev = repo.changelog.rev(node)
747 ui.write(_("Testing changeset %d:%s "
747 ui.write(_("Testing changeset %d:%s "
748 "(%d changesets remaining, ~%d tests)\n")
748 "(%d changesets remaining, ~%d tests)\n")
749 % (rev, short(node), changesets, tests))
749 % (rev, short(node), changesets, tests))
750 state['current'] = [node]
750 state['current'] = [node]
751 hbisect.save_state(repo, state)
751 hbisect.save_state(repo, state)
752 if not noupdate:
752 if not noupdate:
753 cmdutil.bailifchanged(repo)
753 cmdutil.bailifchanged(repo)
754 return hg.clean(repo, node)
754 return hg.clean(repo, node)
755
755
756 @command('bookmarks',
756 @command('bookmarks',
757 [('f', 'force', False, _('force')),
757 [('f', 'force', False, _('force')),
758 ('r', 'rev', '', _('revision'), _('REV')),
758 ('r', 'rev', '', _('revision'), _('REV')),
759 ('d', 'delete', False, _('delete a given bookmark')),
759 ('d', 'delete', False, _('delete a given bookmark')),
760 ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
760 ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
761 ('i', 'inactive', False, _('mark a bookmark inactive'))],
761 ('i', 'inactive', False, _('mark a bookmark inactive'))],
762 _('hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]'))
762 _('hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]'))
763 def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False,
763 def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False,
764 rename=None, inactive=False):
764 rename=None, inactive=False):
765 '''track a line of development with movable markers
765 '''track a line of development with movable markers
766
766
767 Bookmarks are pointers to certain commits that move when committing.
767 Bookmarks are pointers to certain commits that move when committing.
768 Bookmarks are local. They can be renamed, copied and deleted. It is
768 Bookmarks are local. They can be renamed, copied and deleted. It is
769 possible to use :hg:`merge NAME` to merge from a given bookmark, and
769 possible to use :hg:`merge NAME` to merge from a given bookmark, and
770 :hg:`update NAME` to update to a given bookmark.
770 :hg:`update NAME` to update to a given bookmark.
771
771
772 You can use :hg:`bookmark NAME` to set a bookmark on the working
772 You can use :hg:`bookmark NAME` to set a bookmark on the working
773 directory's parent revision with the given name. If you specify
773 directory's parent revision with the given name. If you specify
774 a revision using -r REV (where REV may be an existing bookmark),
774 a revision using -r REV (where REV may be an existing bookmark),
775 the bookmark is assigned to that revision.
775 the bookmark is assigned to that revision.
776
776
777 Bookmarks can be pushed and pulled between repositories (see :hg:`help
777 Bookmarks can be pushed and pulled between repositories (see :hg:`help
778 push` and :hg:`help pull`). This requires both the local and remote
778 push` and :hg:`help pull`). This requires both the local and remote
779 repositories to support bookmarks. For versions prior to 1.8, this means
779 repositories to support bookmarks. For versions prior to 1.8, this means
780 the bookmarks extension must be enabled.
780 the bookmarks extension must be enabled.
781
781
782 With -i/--inactive, the new bookmark will not be made the active
782 With -i/--inactive, the new bookmark will not be made the active
783 bookmark. If -r/--rev is given, the new bookmark will not be made
783 bookmark. If -r/--rev is given, the new bookmark will not be made
784 active even if -i/--inactive is not given. If no NAME is given, the
784 active even if -i/--inactive is not given. If no NAME is given, the
785 current active bookmark will be marked inactive.
785 current active bookmark will be marked inactive.
786 '''
786 '''
787 hexfn = ui.debugflag and hex or short
787 hexfn = ui.debugflag and hex or short
788 marks = repo._bookmarks
788 marks = repo._bookmarks
789 cur = repo.changectx('.').node()
789 cur = repo.changectx('.').node()
790
790
791 if delete:
791 if delete:
792 if mark is None:
792 if mark is None:
793 raise util.Abort(_("bookmark name required"))
793 raise util.Abort(_("bookmark name required"))
794 if mark not in marks:
794 if mark not in marks:
795 raise util.Abort(_("bookmark '%s' does not exist") % mark)
795 raise util.Abort(_("bookmark '%s' does not exist") % mark)
796 if mark == repo._bookmarkcurrent:
796 if mark == repo._bookmarkcurrent:
797 bookmarks.setcurrent(repo, None)
797 bookmarks.setcurrent(repo, None)
798 del marks[mark]
798 del marks[mark]
799 bookmarks.write(repo)
799 bookmarks.write(repo)
800 return
800 return
801
801
802 if rename:
802 if rename:
803 if rename not in marks:
803 if rename not in marks:
804 raise util.Abort(_("bookmark '%s' does not exist") % rename)
804 raise util.Abort(_("bookmark '%s' does not exist") % rename)
805 if mark in marks and not force:
805 if mark in marks and not force:
806 raise util.Abort(_("bookmark '%s' already exists "
806 raise util.Abort(_("bookmark '%s' already exists "
807 "(use -f to force)") % mark)
807 "(use -f to force)") % mark)
808 if mark is None:
808 if mark is None:
809 raise util.Abort(_("new bookmark name required"))
809 raise util.Abort(_("new bookmark name required"))
810 marks[mark] = marks[rename]
810 marks[mark] = marks[rename]
811 if repo._bookmarkcurrent == rename and not inactive:
811 if repo._bookmarkcurrent == rename and not inactive:
812 bookmarks.setcurrent(repo, mark)
812 bookmarks.setcurrent(repo, mark)
813 del marks[rename]
813 del marks[rename]
814 bookmarks.write(repo)
814 bookmarks.write(repo)
815 return
815 return
816
816
817 if mark is not None:
817 if mark is not None:
818 if "\n" in mark:
818 if "\n" in mark:
819 raise util.Abort(_("bookmark name cannot contain newlines"))
819 raise util.Abort(_("bookmark name cannot contain newlines"))
820 mark = mark.strip()
820 mark = mark.strip()
821 if not mark:
821 if not mark:
822 raise util.Abort(_("bookmark names cannot consist entirely of "
822 raise util.Abort(_("bookmark names cannot consist entirely of "
823 "whitespace"))
823 "whitespace"))
824 if inactive and mark == repo._bookmarkcurrent:
824 if inactive and mark == repo._bookmarkcurrent:
825 bookmarks.setcurrent(repo, None)
825 bookmarks.setcurrent(repo, None)
826 return
826 return
827 if mark in marks and not force:
827 if mark in marks and not force:
828 raise util.Abort(_("bookmark '%s' already exists "
828 raise util.Abort(_("bookmark '%s' already exists "
829 "(use -f to force)") % mark)
829 "(use -f to force)") % mark)
830 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
830 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
831 and not force):
831 and not force):
832 raise util.Abort(
832 raise util.Abort(
833 _("a bookmark cannot have the name of an existing branch"))
833 _("a bookmark cannot have the name of an existing branch"))
834 if rev:
834 if rev:
835 marks[mark] = repo.lookup(rev)
835 marks[mark] = repo.lookup(rev)
836 else:
836 else:
837 marks[mark] = cur
837 marks[mark] = cur
838 if not inactive and cur == marks[mark]:
838 if not inactive and cur == marks[mark]:
839 bookmarks.setcurrent(repo, mark)
839 bookmarks.setcurrent(repo, mark)
840 bookmarks.write(repo)
840 bookmarks.write(repo)
841 return
841 return
842
842
843 if mark is None:
843 if mark is None:
844 if rev:
844 if rev:
845 raise util.Abort(_("bookmark name required"))
845 raise util.Abort(_("bookmark name required"))
846 if len(marks) == 0:
846 if len(marks) == 0:
847 ui.status(_("no bookmarks set\n"))
847 ui.status(_("no bookmarks set\n"))
848 else:
848 else:
849 for bmark, n in sorted(marks.iteritems()):
849 for bmark, n in sorted(marks.iteritems()):
850 current = repo._bookmarkcurrent
850 current = repo._bookmarkcurrent
851 if bmark == current and n == cur:
851 if bmark == current and n == cur:
852 prefix, label = '*', 'bookmarks.current'
852 prefix, label = '*', 'bookmarks.current'
853 else:
853 else:
854 prefix, label = ' ', ''
854 prefix, label = ' ', ''
855
855
856 if ui.quiet:
856 if ui.quiet:
857 ui.write("%s\n" % bmark, label=label)
857 ui.write("%s\n" % bmark, label=label)
858 else:
858 else:
859 ui.write(" %s %-25s %d:%s\n" % (
859 ui.write(" %s %-25s %d:%s\n" % (
860 prefix, bmark, repo.changelog.rev(n), hexfn(n)),
860 prefix, bmark, repo.changelog.rev(n), hexfn(n)),
861 label=label)
861 label=label)
862 return
862 return
863
863
864 @command('branch',
864 @command('branch',
865 [('f', 'force', None,
865 [('f', 'force', None,
866 _('set branch name even if it shadows an existing branch')),
866 _('set branch name even if it shadows an existing branch')),
867 ('C', 'clean', None, _('reset branch name to parent branch name'))],
867 ('C', 'clean', None, _('reset branch name to parent branch name'))],
868 _('[-fC] [NAME]'))
868 _('[-fC] [NAME]'))
869 def branch(ui, repo, label=None, **opts):
869 def branch(ui, repo, label=None, **opts):
870 """set or show the current branch name
870 """set or show the current branch name
871
871
872 .. note::
872 .. note::
873 Branch names are permanent and global. Use :hg:`bookmark` to create a
873 Branch names are permanent and global. Use :hg:`bookmark` to create a
874 light-weight bookmark instead. See :hg:`help glossary` for more
874 light-weight bookmark instead. See :hg:`help glossary` for more
875 information about named branches and bookmarks.
875 information about named branches and bookmarks.
876
876
877 With no argument, show the current branch name. With one argument,
877 With no argument, show the current branch name. With one argument,
878 set the working directory branch name (the branch will not exist
878 set the working directory branch name (the branch will not exist
879 in the repository until the next commit). Standard practice
879 in the repository until the next commit). Standard practice
880 recommends that primary development take place on the 'default'
880 recommends that primary development take place on the 'default'
881 branch.
881 branch.
882
882
883 Unless -f/--force is specified, branch will not let you set a
883 Unless -f/--force is specified, branch will not let you set a
884 branch name that already exists, even if it's inactive.
884 branch name that already exists, even if it's inactive.
885
885
886 Use -C/--clean to reset the working directory branch to that of
886 Use -C/--clean to reset the working directory branch to that of
887 the parent of the working directory, negating a previous branch
887 the parent of the working directory, negating a previous branch
888 change.
888 change.
889
889
890 Use the command :hg:`update` to switch to an existing branch. Use
890 Use the command :hg:`update` to switch to an existing branch. Use
891 :hg:`commit --close-branch` to mark this branch as closed.
891 :hg:`commit --close-branch` to mark this branch as closed.
892
892
893 Returns 0 on success.
893 Returns 0 on success.
894 """
894 """
895 if not opts.get('clean') and not label:
895 if not opts.get('clean') and not label:
896 ui.write("%s\n" % repo.dirstate.branch())
896 ui.write("%s\n" % repo.dirstate.branch())
897 return
897 return
898
898
899 wlock = repo.wlock()
899 wlock = repo.wlock()
900 try:
900 try:
901 if opts.get('clean'):
901 if opts.get('clean'):
902 label = repo[None].p1().branch()
902 label = repo[None].p1().branch()
903 repo.dirstate.setbranch(label)
903 repo.dirstate.setbranch(label)
904 ui.status(_('reset working directory to branch %s\n') % label)
904 ui.status(_('reset working directory to branch %s\n') % label)
905 elif label:
905 elif label:
906 if not opts.get('force') and label in repo.branchmap():
906 if not opts.get('force') and label in repo.branchmap():
907 if label not in [p.branch() for p in repo.parents()]:
907 if label not in [p.branch() for p in repo.parents()]:
908 raise util.Abort(_('a branch of the same name already'
908 raise util.Abort(_('a branch of the same name already'
909 ' exists'),
909 ' exists'),
910 # i18n: "it" refers to an existing branch
910 # i18n: "it" refers to an existing branch
911 hint=_("use 'hg update' to switch to it"))
911 hint=_("use 'hg update' to switch to it"))
912 repo.dirstate.setbranch(label)
912 repo.dirstate.setbranch(label)
913 ui.status(_('marked working directory as branch %s\n') % label)
913 ui.status(_('marked working directory as branch %s\n') % label)
914 ui.status(_('(branches are permanent and global, '
914 ui.status(_('(branches are permanent and global, '
915 'did you want a bookmark?)\n'))
915 'did you want a bookmark?)\n'))
916 finally:
916 finally:
917 wlock.release()
917 wlock.release()
918
918
919 @command('branches',
919 @command('branches',
920 [('a', 'active', False, _('show only branches that have unmerged heads')),
920 [('a', 'active', False, _('show only branches that have unmerged heads')),
921 ('c', 'closed', False, _('show normal and closed branches'))],
921 ('c', 'closed', False, _('show normal and closed branches'))],
922 _('[-ac]'))
922 _('[-ac]'))
923 def branches(ui, repo, active=False, closed=False):
923 def branches(ui, repo, active=False, closed=False):
924 """list repository named branches
924 """list repository named branches
925
925
926 List the repository's named branches, indicating which ones are
926 List the repository's named branches, indicating which ones are
927 inactive. If -c/--closed is specified, also list branches which have
927 inactive. If -c/--closed is specified, also list branches which have
928 been marked closed (see :hg:`commit --close-branch`).
928 been marked closed (see :hg:`commit --close-branch`).
929
929
930 If -a/--active is specified, only show active branches. A branch
930 If -a/--active is specified, only show active branches. A branch
931 is considered active if it contains repository heads.
931 is considered active if it contains repository heads.
932
932
933 Use the command :hg:`update` to switch to an existing branch.
933 Use the command :hg:`update` to switch to an existing branch.
934
934
935 Returns 0.
935 Returns 0.
936 """
936 """
937
937
938 hexfunc = ui.debugflag and hex or short
938 hexfunc = ui.debugflag and hex or short
939
939
940 activebranches = set([repo[n].branch() for n in repo.heads()])
940 activebranches = set([repo[n].branch() for n in repo.heads()])
941 branches = []
941 branches = []
942 for tag, heads in repo.branchmap().iteritems():
942 for tag, heads in repo.branchmap().iteritems():
943 for h in reversed(heads):
943 for h in reversed(heads):
944 ctx = repo[h]
944 ctx = repo[h]
945 isopen = not ctx.closesbranch()
945 isopen = not ctx.closesbranch()
946 if isopen:
946 if isopen:
947 tip = ctx
947 tip = ctx
948 break
948 break
949 else:
949 else:
950 tip = repo[heads[-1]]
950 tip = repo[heads[-1]]
951 isactive = tag in activebranches and isopen
951 isactive = tag in activebranches and isopen
952 branches.append((tip, isactive, isopen))
952 branches.append((tip, isactive, isopen))
953 branches.sort(key=lambda i: (i[1], i[0].rev(), i[0].branch(), i[2]),
953 branches.sort(key=lambda i: (i[1], i[0].rev(), i[0].branch(), i[2]),
954 reverse=True)
954 reverse=True)
955
955
956 for ctx, isactive, isopen in branches:
956 for ctx, isactive, isopen in branches:
957 if (not active) or isactive:
957 if (not active) or isactive:
958 if isactive:
958 if isactive:
959 label = 'branches.active'
959 label = 'branches.active'
960 notice = ''
960 notice = ''
961 elif not isopen:
961 elif not isopen:
962 if not closed:
962 if not closed:
963 continue
963 continue
964 label = 'branches.closed'
964 label = 'branches.closed'
965 notice = _(' (closed)')
965 notice = _(' (closed)')
966 else:
966 else:
967 label = 'branches.inactive'
967 label = 'branches.inactive'
968 notice = _(' (inactive)')
968 notice = _(' (inactive)')
969 if ctx.branch() == repo.dirstate.branch():
969 if ctx.branch() == repo.dirstate.branch():
970 label = 'branches.current'
970 label = 'branches.current'
971 rev = str(ctx.rev()).rjust(31 - encoding.colwidth(ctx.branch()))
971 rev = str(ctx.rev()).rjust(31 - encoding.colwidth(ctx.branch()))
972 rev = ui.label('%s:%s' % (rev, hexfunc(ctx.node())),
972 rev = ui.label('%s:%s' % (rev, hexfunc(ctx.node())),
973 'log.changeset')
973 'log.changeset')
974 tag = ui.label(ctx.branch(), label)
974 tag = ui.label(ctx.branch(), label)
975 if ui.quiet:
975 if ui.quiet:
976 ui.write("%s\n" % tag)
976 ui.write("%s\n" % tag)
977 else:
977 else:
978 ui.write("%s %s%s\n" % (tag, rev, notice))
978 ui.write("%s %s%s\n" % (tag, rev, notice))
979
979
980 @command('bundle',
980 @command('bundle',
981 [('f', 'force', None, _('run even when the destination is unrelated')),
981 [('f', 'force', None, _('run even when the destination is unrelated')),
982 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
982 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
983 _('REV')),
983 _('REV')),
984 ('b', 'branch', [], _('a specific branch you would like to bundle'),
984 ('b', 'branch', [], _('a specific branch you would like to bundle'),
985 _('BRANCH')),
985 _('BRANCH')),
986 ('', 'base', [],
986 ('', 'base', [],
987 _('a base changeset assumed to be available at the destination'),
987 _('a base changeset assumed to be available at the destination'),
988 _('REV')),
988 _('REV')),
989 ('a', 'all', None, _('bundle all changesets in the repository')),
989 ('a', 'all', None, _('bundle all changesets in the repository')),
990 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
990 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
991 ] + remoteopts,
991 ] + remoteopts,
992 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
992 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
993 def bundle(ui, repo, fname, dest=None, **opts):
993 def bundle(ui, repo, fname, dest=None, **opts):
994 """create a changegroup file
994 """create a changegroup file
995
995
996 Generate a compressed changegroup file collecting changesets not
996 Generate a compressed changegroup file collecting changesets not
997 known to be in another repository.
997 known to be in another repository.
998
998
999 If you omit the destination repository, then hg assumes the
999 If you omit the destination repository, then hg assumes the
1000 destination will have all the nodes you specify with --base
1000 destination will have all the nodes you specify with --base
1001 parameters. To create a bundle containing all changesets, use
1001 parameters. To create a bundle containing all changesets, use
1002 -a/--all (or --base null).
1002 -a/--all (or --base null).
1003
1003
1004 You can change compression method with the -t/--type option.
1004 You can change compression method with the -t/--type option.
1005 The available compression methods are: none, bzip2, and
1005 The available compression methods are: none, bzip2, and
1006 gzip (by default, bundles are compressed using bzip2).
1006 gzip (by default, bundles are compressed using bzip2).
1007
1007
1008 The bundle file can then be transferred using conventional means
1008 The bundle file can then be transferred using conventional means
1009 and applied to another repository with the unbundle or pull
1009 and applied to another repository with the unbundle or pull
1010 command. This is useful when direct push and pull are not
1010 command. This is useful when direct push and pull are not
1011 available or when exporting an entire repository is undesirable.
1011 available or when exporting an entire repository is undesirable.
1012
1012
1013 Applying bundles preserves all changeset contents including
1013 Applying bundles preserves all changeset contents including
1014 permissions, copy/rename information, and revision history.
1014 permissions, copy/rename information, and revision history.
1015
1015
1016 Returns 0 on success, 1 if no changes found.
1016 Returns 0 on success, 1 if no changes found.
1017 """
1017 """
1018 revs = None
1018 revs = None
1019 if 'rev' in opts:
1019 if 'rev' in opts:
1020 revs = scmutil.revrange(repo, opts['rev'])
1020 revs = scmutil.revrange(repo, opts['rev'])
1021
1021
1022 bundletype = opts.get('type', 'bzip2').lower()
1022 bundletype = opts.get('type', 'bzip2').lower()
1023 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1023 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1024 bundletype = btypes.get(bundletype)
1024 bundletype = btypes.get(bundletype)
1025 if bundletype not in changegroup.bundletypes:
1025 if bundletype not in changegroup.bundletypes:
1026 raise util.Abort(_('unknown bundle type specified with --type'))
1026 raise util.Abort(_('unknown bundle type specified with --type'))
1027
1027
1028 if opts.get('all'):
1028 if opts.get('all'):
1029 base = ['null']
1029 base = ['null']
1030 else:
1030 else:
1031 base = scmutil.revrange(repo, opts.get('base'))
1031 base = scmutil.revrange(repo, opts.get('base'))
1032 if base:
1032 if base:
1033 if dest:
1033 if dest:
1034 raise util.Abort(_("--base is incompatible with specifying "
1034 raise util.Abort(_("--base is incompatible with specifying "
1035 "a destination"))
1035 "a destination"))
1036 common = [repo.lookup(rev) for rev in base]
1036 common = [repo.lookup(rev) for rev in base]
1037 heads = revs and map(repo.lookup, revs) or revs
1037 heads = revs and map(repo.lookup, revs) or revs
1038 cg = repo.getbundle('bundle', heads=heads, common=common)
1038 cg = repo.getbundle('bundle', heads=heads, common=common)
1039 outgoing = None
1039 outgoing = None
1040 else:
1040 else:
1041 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1041 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1042 dest, branches = hg.parseurl(dest, opts.get('branch'))
1042 dest, branches = hg.parseurl(dest, opts.get('branch'))
1043 other = hg.peer(repo, opts, dest)
1043 other = hg.peer(repo, opts, dest)
1044 revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
1044 revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
1045 heads = revs and map(repo.lookup, revs) or revs
1045 heads = revs and map(repo.lookup, revs) or revs
1046 outgoing = discovery.findcommonoutgoing(repo, other,
1046 outgoing = discovery.findcommonoutgoing(repo, other,
1047 onlyheads=heads,
1047 onlyheads=heads,
1048 force=opts.get('force'),
1048 force=opts.get('force'),
1049 portable=True)
1049 portable=True)
1050 cg = repo.getlocalbundle('bundle', outgoing)
1050 cg = repo.getlocalbundle('bundle', outgoing)
1051 if not cg:
1051 if not cg:
1052 scmutil.nochangesfound(ui, outgoing and outgoing.excluded)
1052 scmutil.nochangesfound(ui, outgoing and outgoing.excluded)
1053 return 1
1053 return 1
1054
1054
1055 changegroup.writebundle(cg, fname, bundletype)
1055 changegroup.writebundle(cg, fname, bundletype)
1056
1056
1057 @command('cat',
1057 @command('cat',
1058 [('o', 'output', '',
1058 [('o', 'output', '',
1059 _('print output to file with formatted name'), _('FORMAT')),
1059 _('print output to file with formatted name'), _('FORMAT')),
1060 ('r', 'rev', '', _('print the given revision'), _('REV')),
1060 ('r', 'rev', '', _('print the given revision'), _('REV')),
1061 ('', 'decode', None, _('apply any matching decode filter')),
1061 ('', 'decode', None, _('apply any matching decode filter')),
1062 ] + walkopts,
1062 ] + walkopts,
1063 _('[OPTION]... FILE...'))
1063 _('[OPTION]... FILE...'))
1064 def cat(ui, repo, file1, *pats, **opts):
1064 def cat(ui, repo, file1, *pats, **opts):
1065 """output the current or given revision of files
1065 """output the current or given revision of files
1066
1066
1067 Print the specified files as they were at the given revision. If
1067 Print the specified files as they were at the given revision. If
1068 no revision is given, the parent of the working directory is used,
1068 no revision is given, the parent of the working directory is used,
1069 or tip if no revision is checked out.
1069 or tip if no revision is checked out.
1070
1070
1071 Output may be to a file, in which case the name of the file is
1071 Output may be to a file, in which case the name of the file is
1072 given using a format string. The formatting rules are the same as
1072 given using a format string. The formatting rules are the same as
1073 for the export command, with the following additions:
1073 for the export command, with the following additions:
1074
1074
1075 :``%s``: basename of file being printed
1075 :``%s``: basename of file being printed
1076 :``%d``: dirname of file being printed, or '.' if in repository root
1076 :``%d``: dirname of file being printed, or '.' if in repository root
1077 :``%p``: root-relative path name of file being printed
1077 :``%p``: root-relative path name of file being printed
1078
1078
1079 Returns 0 on success.
1079 Returns 0 on success.
1080 """
1080 """
1081 ctx = scmutil.revsingle(repo, opts.get('rev'))
1081 ctx = scmutil.revsingle(repo, opts.get('rev'))
1082 err = 1
1082 err = 1
1083 m = scmutil.match(ctx, (file1,) + pats, opts)
1083 m = scmutil.match(ctx, (file1,) + pats, opts)
1084 for abs in ctx.walk(m):
1084 for abs in ctx.walk(m):
1085 fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(),
1085 fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(),
1086 pathname=abs)
1086 pathname=abs)
1087 data = ctx[abs].data()
1087 data = ctx[abs].data()
1088 if opts.get('decode'):
1088 if opts.get('decode'):
1089 data = repo.wwritedata(abs, data)
1089 data = repo.wwritedata(abs, data)
1090 fp.write(data)
1090 fp.write(data)
1091 fp.close()
1091 fp.close()
1092 err = 0
1092 err = 0
1093 return err
1093 return err
1094
1094
1095 @command('^clone',
1095 @command('^clone',
1096 [('U', 'noupdate', None,
1096 [('U', 'noupdate', None,
1097 _('the clone will include an empty working copy (only a repository)')),
1097 _('the clone will include an empty working copy (only a repository)')),
1098 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
1098 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
1099 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1099 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1100 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1100 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1101 ('', 'pull', None, _('use pull protocol to copy metadata')),
1101 ('', 'pull', None, _('use pull protocol to copy metadata')),
1102 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1102 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1103 ] + remoteopts,
1103 ] + remoteopts,
1104 _('[OPTION]... SOURCE [DEST]'))
1104 _('[OPTION]... SOURCE [DEST]'))
1105 def clone(ui, source, dest=None, **opts):
1105 def clone(ui, source, dest=None, **opts):
1106 """make a copy of an existing repository
1106 """make a copy of an existing repository
1107
1107
1108 Create a copy of an existing repository in a new directory.
1108 Create a copy of an existing repository in a new directory.
1109
1109
1110 If no destination directory name is specified, it defaults to the
1110 If no destination directory name is specified, it defaults to the
1111 basename of the source.
1111 basename of the source.
1112
1112
1113 The location of the source is added to the new repository's
1113 The location of the source is added to the new repository's
1114 ``.hg/hgrc`` file, as the default to be used for future pulls.
1114 ``.hg/hgrc`` file, as the default to be used for future pulls.
1115
1115
1116 Only local paths and ``ssh://`` URLs are supported as
1116 Only local paths and ``ssh://`` URLs are supported as
1117 destinations. For ``ssh://`` destinations, no working directory or
1117 destinations. For ``ssh://`` destinations, no working directory or
1118 ``.hg/hgrc`` will be created on the remote side.
1118 ``.hg/hgrc`` will be created on the remote side.
1119
1119
1120 To pull only a subset of changesets, specify one or more revisions
1120 To pull only a subset of changesets, specify one or more revisions
1121 identifiers with -r/--rev or branches with -b/--branch. The
1121 identifiers with -r/--rev or branches with -b/--branch. The
1122 resulting clone will contain only the specified changesets and
1122 resulting clone will contain only the specified changesets and
1123 their ancestors. These options (or 'clone src#rev dest') imply
1123 their ancestors. These options (or 'clone src#rev dest') imply
1124 --pull, even for local source repositories. Note that specifying a
1124 --pull, even for local source repositories. Note that specifying a
1125 tag will include the tagged changeset but not the changeset
1125 tag will include the tagged changeset but not the changeset
1126 containing the tag.
1126 containing the tag.
1127
1127
1128 To check out a particular version, use -u/--update, or
1128 To check out a particular version, use -u/--update, or
1129 -U/--noupdate to create a clone with no working directory.
1129 -U/--noupdate to create a clone with no working directory.
1130
1130
1131 .. container:: verbose
1131 .. container:: verbose
1132
1132
1133 For efficiency, hardlinks are used for cloning whenever the
1133 For efficiency, hardlinks are used for cloning whenever the
1134 source and destination are on the same filesystem (note this
1134 source and destination are on the same filesystem (note this
1135 applies only to the repository data, not to the working
1135 applies only to the repository data, not to the working
1136 directory). Some filesystems, such as AFS, implement hardlinking
1136 directory). Some filesystems, such as AFS, implement hardlinking
1137 incorrectly, but do not report errors. In these cases, use the
1137 incorrectly, but do not report errors. In these cases, use the
1138 --pull option to avoid hardlinking.
1138 --pull option to avoid hardlinking.
1139
1139
1140 In some cases, you can clone repositories and the working
1140 In some cases, you can clone repositories and the working
1141 directory using full hardlinks with ::
1141 directory using full hardlinks with ::
1142
1142
1143 $ cp -al REPO REPOCLONE
1143 $ cp -al REPO REPOCLONE
1144
1144
1145 This is the fastest way to clone, but it is not always safe. The
1145 This is the fastest way to clone, but it is not always safe. The
1146 operation is not atomic (making sure REPO is not modified during
1146 operation is not atomic (making sure REPO is not modified during
1147 the operation is up to you) and you have to make sure your
1147 the operation is up to you) and you have to make sure your
1148 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1148 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1149 so). Also, this is not compatible with certain extensions that
1149 so). Also, this is not compatible with certain extensions that
1150 place their metadata under the .hg directory, such as mq.
1150 place their metadata under the .hg directory, such as mq.
1151
1151
1152 Mercurial will update the working directory to the first applicable
1152 Mercurial will update the working directory to the first applicable
1153 revision from this list:
1153 revision from this list:
1154
1154
1155 a) null if -U or the source repository has no changesets
1155 a) null if -U or the source repository has no changesets
1156 b) if -u . and the source repository is local, the first parent of
1156 b) if -u . and the source repository is local, the first parent of
1157 the source repository's working directory
1157 the source repository's working directory
1158 c) the changeset specified with -u (if a branch name, this means the
1158 c) the changeset specified with -u (if a branch name, this means the
1159 latest head of that branch)
1159 latest head of that branch)
1160 d) the changeset specified with -r
1160 d) the changeset specified with -r
1161 e) the tipmost head specified with -b
1161 e) the tipmost head specified with -b
1162 f) the tipmost head specified with the url#branch source syntax
1162 f) the tipmost head specified with the url#branch source syntax
1163 g) the tipmost head of the default branch
1163 g) the tipmost head of the default branch
1164 h) tip
1164 h) tip
1165
1165
1166 Examples:
1166 Examples:
1167
1167
1168 - clone a remote repository to a new directory named hg/::
1168 - clone a remote repository to a new directory named hg/::
1169
1169
1170 hg clone http://selenic.com/hg
1170 hg clone http://selenic.com/hg
1171
1171
1172 - create a lightweight local clone::
1172 - create a lightweight local clone::
1173
1173
1174 hg clone project/ project-feature/
1174 hg clone project/ project-feature/
1175
1175
1176 - clone from an absolute path on an ssh server (note double-slash)::
1176 - clone from an absolute path on an ssh server (note double-slash)::
1177
1177
1178 hg clone ssh://user@server//home/projects/alpha/
1178 hg clone ssh://user@server//home/projects/alpha/
1179
1179
1180 - do a high-speed clone over a LAN while checking out a
1180 - do a high-speed clone over a LAN while checking out a
1181 specified version::
1181 specified version::
1182
1182
1183 hg clone --uncompressed http://server/repo -u 1.5
1183 hg clone --uncompressed http://server/repo -u 1.5
1184
1184
1185 - create a repository without changesets after a particular revision::
1185 - create a repository without changesets after a particular revision::
1186
1186
1187 hg clone -r 04e544 experimental/ good/
1187 hg clone -r 04e544 experimental/ good/
1188
1188
1189 - clone (and track) a particular named branch::
1189 - clone (and track) a particular named branch::
1190
1190
1191 hg clone http://selenic.com/hg#stable
1191 hg clone http://selenic.com/hg#stable
1192
1192
1193 See :hg:`help urls` for details on specifying URLs.
1193 See :hg:`help urls` for details on specifying URLs.
1194
1194
1195 Returns 0 on success.
1195 Returns 0 on success.
1196 """
1196 """
1197 if opts.get('noupdate') and opts.get('updaterev'):
1197 if opts.get('noupdate') and opts.get('updaterev'):
1198 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
1198 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
1199
1199
1200 r = hg.clone(ui, opts, source, dest,
1200 r = hg.clone(ui, opts, source, dest,
1201 pull=opts.get('pull'),
1201 pull=opts.get('pull'),
1202 stream=opts.get('uncompressed'),
1202 stream=opts.get('uncompressed'),
1203 rev=opts.get('rev'),
1203 rev=opts.get('rev'),
1204 update=opts.get('updaterev') or not opts.get('noupdate'),
1204 update=opts.get('updaterev') or not opts.get('noupdate'),
1205 branch=opts.get('branch'))
1205 branch=opts.get('branch'))
1206
1206
1207 return r is None
1207 return r is None
1208
1208
1209 @command('^commit|ci',
1209 @command('^commit|ci',
1210 [('A', 'addremove', None,
1210 [('A', 'addremove', None,
1211 _('mark new/missing files as added/removed before committing')),
1211 _('mark new/missing files as added/removed before committing')),
1212 ('', 'close-branch', None,
1212 ('', 'close-branch', None,
1213 _('mark a branch as closed, hiding it from the branch list')),
1213 _('mark a branch as closed, hiding it from the branch list')),
1214 ('', 'amend', None, _('amend the parent of the working dir')),
1214 ('', 'amend', None, _('amend the parent of the working dir')),
1215 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1215 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1216 _('[OPTION]... [FILE]...'))
1216 _('[OPTION]... [FILE]...'))
1217 def commit(ui, repo, *pats, **opts):
1217 def commit(ui, repo, *pats, **opts):
1218 """commit the specified files or all outstanding changes
1218 """commit the specified files or all outstanding changes
1219
1219
1220 Commit changes to the given files into the repository. Unlike a
1220 Commit changes to the given files into the repository. Unlike a
1221 centralized SCM, this operation is a local operation. See
1221 centralized SCM, this operation is a local operation. See
1222 :hg:`push` for a way to actively distribute your changes.
1222 :hg:`push` for a way to actively distribute your changes.
1223
1223
1224 If a list of files is omitted, all changes reported by :hg:`status`
1224 If a list of files is omitted, all changes reported by :hg:`status`
1225 will be committed.
1225 will be committed.
1226
1226
1227 If you are committing the result of a merge, do not provide any
1227 If you are committing the result of a merge, do not provide any
1228 filenames or -I/-X filters.
1228 filenames or -I/-X filters.
1229
1229
1230 If no commit message is specified, Mercurial starts your
1230 If no commit message is specified, Mercurial starts your
1231 configured editor where you can enter a message. In case your
1231 configured editor where you can enter a message. In case your
1232 commit fails, you will find a backup of your message in
1232 commit fails, you will find a backup of your message in
1233 ``.hg/last-message.txt``.
1233 ``.hg/last-message.txt``.
1234
1234
1235 The --amend flag can be used to amend the parent of the
1235 The --amend flag can be used to amend the parent of the
1236 working directory with a new commit that contains the changes
1236 working directory with a new commit that contains the changes
1237 in the parent in addition to those currently reported by :hg:`status`,
1237 in the parent in addition to those currently reported by :hg:`status`,
1238 if there are any. The old commit is stored in a backup bundle in
1238 if there are any. The old commit is stored in a backup bundle in
1239 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1239 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1240 on how to restore it).
1240 on how to restore it).
1241
1241
1242 Message, user and date are taken from the amended commit unless
1242 Message, user and date are taken from the amended commit unless
1243 specified. When a message isn't specified on the command line,
1243 specified. When a message isn't specified on the command line,
1244 the editor will open with the message of the amended commit.
1244 the editor will open with the message of the amended commit.
1245
1245
1246 It is not possible to amend public changesets (see :hg:`help phases`)
1246 It is not possible to amend public changesets (see :hg:`help phases`)
1247 or changesets that have children.
1247 or changesets that have children.
1248
1248
1249 See :hg:`help dates` for a list of formats valid for -d/--date.
1249 See :hg:`help dates` for a list of formats valid for -d/--date.
1250
1250
1251 Returns 0 on success, 1 if nothing changed.
1251 Returns 0 on success, 1 if nothing changed.
1252 """
1252 """
1253 if opts.get('subrepos'):
1253 if opts.get('subrepos'):
1254 # Let --subrepos on the command line overide config setting.
1254 # Let --subrepos on the command line overide config setting.
1255 ui.setconfig('ui', 'commitsubrepos', True)
1255 ui.setconfig('ui', 'commitsubrepos', True)
1256
1256
1257 extra = {}
1257 extra = {}
1258 if opts.get('close_branch'):
1258 if opts.get('close_branch'):
1259 if repo['.'].node() not in repo.branchheads():
1259 if repo['.'].node() not in repo.branchheads():
1260 # The topo heads set is included in the branch heads set of the
1260 # The topo heads set is included in the branch heads set of the
1261 # current branch, so it's sufficient to test branchheads
1261 # current branch, so it's sufficient to test branchheads
1262 raise util.Abort(_('can only close branch heads'))
1262 raise util.Abort(_('can only close branch heads'))
1263 extra['close'] = 1
1263 extra['close'] = 1
1264
1264
1265 branch = repo[None].branch()
1265 branch = repo[None].branch()
1266 bheads = repo.branchheads(branch)
1266 bheads = repo.branchheads(branch)
1267
1267
1268 if opts.get('amend'):
1268 if opts.get('amend'):
1269 if ui.configbool('ui', 'commitsubrepos'):
1269 if ui.configbool('ui', 'commitsubrepos'):
1270 raise util.Abort(_('cannot amend recursively'))
1270 raise util.Abort(_('cannot amend recursively'))
1271
1271
1272 old = repo['.']
1272 old = repo['.']
1273 if old.phase() == phases.public:
1273 if old.phase() == phases.public:
1274 raise util.Abort(_('cannot amend public changesets'))
1274 raise util.Abort(_('cannot amend public changesets'))
1275 if len(old.parents()) > 1:
1275 if len(old.parents()) > 1:
1276 raise util.Abort(_('cannot amend merge changesets'))
1276 raise util.Abort(_('cannot amend merge changesets'))
1277 if len(repo[None].parents()) > 1:
1277 if len(repo[None].parents()) > 1:
1278 raise util.Abort(_('cannot amend while merging'))
1278 raise util.Abort(_('cannot amend while merging'))
1279 if old.children():
1279 if old.children():
1280 raise util.Abort(_('cannot amend changeset with children'))
1280 raise util.Abort(_('cannot amend changeset with children'))
1281
1281
1282 e = cmdutil.commiteditor
1282 e = cmdutil.commiteditor
1283 if opts.get('force_editor'):
1283 if opts.get('force_editor'):
1284 e = cmdutil.commitforceeditor
1284 e = cmdutil.commitforceeditor
1285
1285
1286 def commitfunc(ui, repo, message, match, opts):
1286 def commitfunc(ui, repo, message, match, opts):
1287 editor = e
1287 editor = e
1288 # message contains text from -m or -l, if it's empty,
1288 # message contains text from -m or -l, if it's empty,
1289 # open the editor with the old message
1289 # open the editor with the old message
1290 if not message:
1290 if not message:
1291 message = old.description()
1291 message = old.description()
1292 editor = cmdutil.commitforceeditor
1292 editor = cmdutil.commitforceeditor
1293 return repo.commit(message,
1293 return repo.commit(message,
1294 opts.get('user') or old.user(),
1294 opts.get('user') or old.user(),
1295 opts.get('date') or old.date(),
1295 opts.get('date') or old.date(),
1296 match,
1296 match,
1297 editor=editor,
1297 editor=editor,
1298 extra=extra)
1298 extra=extra)
1299
1299
1300 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1300 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1301 if node == old.node():
1301 if node == old.node():
1302 ui.status(_("nothing changed\n"))
1302 ui.status(_("nothing changed\n"))
1303 return 1
1303 return 1
1304 else:
1304 else:
1305 e = cmdutil.commiteditor
1305 e = cmdutil.commiteditor
1306 if opts.get('force_editor'):
1306 if opts.get('force_editor'):
1307 e = cmdutil.commitforceeditor
1307 e = cmdutil.commitforceeditor
1308
1308
1309 def commitfunc(ui, repo, message, match, opts):
1309 def commitfunc(ui, repo, message, match, opts):
1310 return repo.commit(message, opts.get('user'), opts.get('date'),
1310 return repo.commit(message, opts.get('user'), opts.get('date'),
1311 match, editor=e, extra=extra)
1311 match, editor=e, extra=extra)
1312
1312
1313 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1313 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1314
1314
1315 if not node:
1315 if not node:
1316 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1316 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1317 if stat[3]:
1317 if stat[3]:
1318 ui.status(_("nothing changed (%d missing files, see "
1318 ui.status(_("nothing changed (%d missing files, see "
1319 "'hg status')\n") % len(stat[3]))
1319 "'hg status')\n") % len(stat[3]))
1320 else:
1320 else:
1321 ui.status(_("nothing changed\n"))
1321 ui.status(_("nothing changed\n"))
1322 return 1
1322 return 1
1323
1323
1324 ctx = repo[node]
1324 ctx = repo[node]
1325 parents = ctx.parents()
1325 parents = ctx.parents()
1326
1326
1327 if (not opts.get('amend') and bheads and node not in bheads and not
1327 if (not opts.get('amend') and bheads and node not in bheads and not
1328 [x for x in parents if x.node() in bheads and x.branch() == branch]):
1328 [x for x in parents if x.node() in bheads and x.branch() == branch]):
1329 ui.status(_('created new head\n'))
1329 ui.status(_('created new head\n'))
1330 # The message is not printed for initial roots. For the other
1330 # The message is not printed for initial roots. For the other
1331 # changesets, it is printed in the following situations:
1331 # changesets, it is printed in the following situations:
1332 #
1332 #
1333 # Par column: for the 2 parents with ...
1333 # Par column: for the 2 parents with ...
1334 # N: null or no parent
1334 # N: null or no parent
1335 # B: parent is on another named branch
1335 # B: parent is on another named branch
1336 # C: parent is a regular non head changeset
1336 # C: parent is a regular non head changeset
1337 # H: parent was a branch head of the current branch
1337 # H: parent was a branch head of the current branch
1338 # Msg column: whether we print "created new head" message
1338 # Msg column: whether we print "created new head" message
1339 # In the following, it is assumed that there already exists some
1339 # In the following, it is assumed that there already exists some
1340 # initial branch heads of the current branch, otherwise nothing is
1340 # initial branch heads of the current branch, otherwise nothing is
1341 # printed anyway.
1341 # printed anyway.
1342 #
1342 #
1343 # Par Msg Comment
1343 # Par Msg Comment
1344 # NN y additional topo root
1344 # NN y additional topo root
1345 #
1345 #
1346 # BN y additional branch root
1346 # BN y additional branch root
1347 # CN y additional topo head
1347 # CN y additional topo head
1348 # HN n usual case
1348 # HN n usual case
1349 #
1349 #
1350 # BB y weird additional branch root
1350 # BB y weird additional branch root
1351 # CB y branch merge
1351 # CB y branch merge
1352 # HB n merge with named branch
1352 # HB n merge with named branch
1353 #
1353 #
1354 # CC y additional head from merge
1354 # CC y additional head from merge
1355 # CH n merge with a head
1355 # CH n merge with a head
1356 #
1356 #
1357 # HH n head merge: head count decreases
1357 # HH n head merge: head count decreases
1358
1358
1359 if not opts.get('close_branch'):
1359 if not opts.get('close_branch'):
1360 for r in parents:
1360 for r in parents:
1361 if r.closesbranch() and r.branch() == branch:
1361 if r.closesbranch() and r.branch() == branch:
1362 ui.status(_('reopening closed branch head %d\n') % r)
1362 ui.status(_('reopening closed branch head %d\n') % r)
1363
1363
1364 if ui.debugflag:
1364 if ui.debugflag:
1365 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
1365 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
1366 elif ui.verbose:
1366 elif ui.verbose:
1367 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
1367 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
1368
1368
1369 @command('copy|cp',
1369 @command('copy|cp',
1370 [('A', 'after', None, _('record a copy that has already occurred')),
1370 [('A', 'after', None, _('record a copy that has already occurred')),
1371 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1371 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1372 ] + walkopts + dryrunopts,
1372 ] + walkopts + dryrunopts,
1373 _('[OPTION]... [SOURCE]... DEST'))
1373 _('[OPTION]... [SOURCE]... DEST'))
1374 def copy(ui, repo, *pats, **opts):
1374 def copy(ui, repo, *pats, **opts):
1375 """mark files as copied for the next commit
1375 """mark files as copied for the next commit
1376
1376
1377 Mark dest as having copies of source files. If dest is a
1377 Mark dest as having copies of source files. If dest is a
1378 directory, copies are put in that directory. If dest is a file,
1378 directory, copies are put in that directory. If dest is a file,
1379 the source must be a single file.
1379 the source must be a single file.
1380
1380
1381 By default, this command copies the contents of files as they
1381 By default, this command copies the contents of files as they
1382 exist in the working directory. If invoked with -A/--after, the
1382 exist in the working directory. If invoked with -A/--after, the
1383 operation is recorded, but no copying is performed.
1383 operation is recorded, but no copying is performed.
1384
1384
1385 This command takes effect with the next commit. To undo a copy
1385 This command takes effect with the next commit. To undo a copy
1386 before that, see :hg:`revert`.
1386 before that, see :hg:`revert`.
1387
1387
1388 Returns 0 on success, 1 if errors are encountered.
1388 Returns 0 on success, 1 if errors are encountered.
1389 """
1389 """
1390 wlock = repo.wlock(False)
1390 wlock = repo.wlock(False)
1391 try:
1391 try:
1392 return cmdutil.copy(ui, repo, pats, opts)
1392 return cmdutil.copy(ui, repo, pats, opts)
1393 finally:
1393 finally:
1394 wlock.release()
1394 wlock.release()
1395
1395
1396 @command('debugancestor', [], _('[INDEX] REV1 REV2'))
1396 @command('debugancestor', [], _('[INDEX] REV1 REV2'))
1397 def debugancestor(ui, repo, *args):
1397 def debugancestor(ui, repo, *args):
1398 """find the ancestor revision of two revisions in a given index"""
1398 """find the ancestor revision of two revisions in a given index"""
1399 if len(args) == 3:
1399 if len(args) == 3:
1400 index, rev1, rev2 = args
1400 index, rev1, rev2 = args
1401 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1401 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1402 lookup = r.lookup
1402 lookup = r.lookup
1403 elif len(args) == 2:
1403 elif len(args) == 2:
1404 if not repo:
1404 if not repo:
1405 raise util.Abort(_("there is no Mercurial repository here "
1405 raise util.Abort(_("there is no Mercurial repository here "
1406 "(.hg not found)"))
1406 "(.hg not found)"))
1407 rev1, rev2 = args
1407 rev1, rev2 = args
1408 r = repo.changelog
1408 r = repo.changelog
1409 lookup = repo.lookup
1409 lookup = repo.lookup
1410 else:
1410 else:
1411 raise util.Abort(_('either two or three arguments required'))
1411 raise util.Abort(_('either two or three arguments required'))
1412 a = r.ancestor(lookup(rev1), lookup(rev2))
1412 a = r.ancestor(lookup(rev1), lookup(rev2))
1413 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1413 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1414
1414
1415 @command('debugbuilddag',
1415 @command('debugbuilddag',
1416 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1416 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1417 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1417 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1418 ('n', 'new-file', None, _('add new file at each rev'))],
1418 ('n', 'new-file', None, _('add new file at each rev'))],
1419 _('[OPTION]... [TEXT]'))
1419 _('[OPTION]... [TEXT]'))
1420 def debugbuilddag(ui, repo, text=None,
1420 def debugbuilddag(ui, repo, text=None,
1421 mergeable_file=False,
1421 mergeable_file=False,
1422 overwritten_file=False,
1422 overwritten_file=False,
1423 new_file=False):
1423 new_file=False):
1424 """builds a repo with a given DAG from scratch in the current empty repo
1424 """builds a repo with a given DAG from scratch in the current empty repo
1425
1425
1426 The description of the DAG is read from stdin if not given on the
1426 The description of the DAG is read from stdin if not given on the
1427 command line.
1427 command line.
1428
1428
1429 Elements:
1429 Elements:
1430
1430
1431 - "+n" is a linear run of n nodes based on the current default parent
1431 - "+n" is a linear run of n nodes based on the current default parent
1432 - "." is a single node based on the current default parent
1432 - "." is a single node based on the current default parent
1433 - "$" resets the default parent to null (implied at the start);
1433 - "$" resets the default parent to null (implied at the start);
1434 otherwise the default parent is always the last node created
1434 otherwise the default parent is always the last node created
1435 - "<p" sets the default parent to the backref p
1435 - "<p" sets the default parent to the backref p
1436 - "*p" is a fork at parent p, which is a backref
1436 - "*p" is a fork at parent p, which is a backref
1437 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1437 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1438 - "/p2" is a merge of the preceding node and p2
1438 - "/p2" is a merge of the preceding node and p2
1439 - ":tag" defines a local tag for the preceding node
1439 - ":tag" defines a local tag for the preceding node
1440 - "@branch" sets the named branch for subsequent nodes
1440 - "@branch" sets the named branch for subsequent nodes
1441 - "#...\\n" is a comment up to the end of the line
1441 - "#...\\n" is a comment up to the end of the line
1442
1442
1443 Whitespace between the above elements is ignored.
1443 Whitespace between the above elements is ignored.
1444
1444
1445 A backref is either
1445 A backref is either
1446
1446
1447 - a number n, which references the node curr-n, where curr is the current
1447 - a number n, which references the node curr-n, where curr is the current
1448 node, or
1448 node, or
1449 - the name of a local tag you placed earlier using ":tag", or
1449 - the name of a local tag you placed earlier using ":tag", or
1450 - empty to denote the default parent.
1450 - empty to denote the default parent.
1451
1451
1452 All string valued-elements are either strictly alphanumeric, or must
1452 All string valued-elements are either strictly alphanumeric, or must
1453 be enclosed in double quotes ("..."), with "\\" as escape character.
1453 be enclosed in double quotes ("..."), with "\\" as escape character.
1454 """
1454 """
1455
1455
1456 if text is None:
1456 if text is None:
1457 ui.status(_("reading DAG from stdin\n"))
1457 ui.status(_("reading DAG from stdin\n"))
1458 text = ui.fin.read()
1458 text = ui.fin.read()
1459
1459
1460 cl = repo.changelog
1460 cl = repo.changelog
1461 if len(cl) > 0:
1461 if len(cl) > 0:
1462 raise util.Abort(_('repository is not empty'))
1462 raise util.Abort(_('repository is not empty'))
1463
1463
1464 # determine number of revs in DAG
1464 # determine number of revs in DAG
1465 total = 0
1465 total = 0
1466 for type, data in dagparser.parsedag(text):
1466 for type, data in dagparser.parsedag(text):
1467 if type == 'n':
1467 if type == 'n':
1468 total += 1
1468 total += 1
1469
1469
1470 if mergeable_file:
1470 if mergeable_file:
1471 linesperrev = 2
1471 linesperrev = 2
1472 # make a file with k lines per rev
1472 # make a file with k lines per rev
1473 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1473 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1474 initialmergedlines.append("")
1474 initialmergedlines.append("")
1475
1475
1476 tags = []
1476 tags = []
1477
1477
1478 lock = tr = None
1478 lock = tr = None
1479 try:
1479 try:
1480 lock = repo.lock()
1480 lock = repo.lock()
1481 tr = repo.transaction("builddag")
1481 tr = repo.transaction("builddag")
1482
1482
1483 at = -1
1483 at = -1
1484 atbranch = 'default'
1484 atbranch = 'default'
1485 nodeids = []
1485 nodeids = []
1486 id = 0
1486 id = 0
1487 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1487 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1488 for type, data in dagparser.parsedag(text):
1488 for type, data in dagparser.parsedag(text):
1489 if type == 'n':
1489 if type == 'n':
1490 ui.note('node %s\n' % str(data))
1490 ui.note('node %s\n' % str(data))
1491 id, ps = data
1491 id, ps = data
1492
1492
1493 files = []
1493 files = []
1494 fctxs = {}
1494 fctxs = {}
1495
1495
1496 p2 = None
1496 p2 = None
1497 if mergeable_file:
1497 if mergeable_file:
1498 fn = "mf"
1498 fn = "mf"
1499 p1 = repo[ps[0]]
1499 p1 = repo[ps[0]]
1500 if len(ps) > 1:
1500 if len(ps) > 1:
1501 p2 = repo[ps[1]]
1501 p2 = repo[ps[1]]
1502 pa = p1.ancestor(p2)
1502 pa = p1.ancestor(p2)
1503 base, local, other = [x[fn].data() for x in pa, p1, p2]
1503 base, local, other = [x[fn].data() for x in pa, p1, p2]
1504 m3 = simplemerge.Merge3Text(base, local, other)
1504 m3 = simplemerge.Merge3Text(base, local, other)
1505 ml = [l.strip() for l in m3.merge_lines()]
1505 ml = [l.strip() for l in m3.merge_lines()]
1506 ml.append("")
1506 ml.append("")
1507 elif at > 0:
1507 elif at > 0:
1508 ml = p1[fn].data().split("\n")
1508 ml = p1[fn].data().split("\n")
1509 else:
1509 else:
1510 ml = initialmergedlines
1510 ml = initialmergedlines
1511 ml[id * linesperrev] += " r%i" % id
1511 ml[id * linesperrev] += " r%i" % id
1512 mergedtext = "\n".join(ml)
1512 mergedtext = "\n".join(ml)
1513 files.append(fn)
1513 files.append(fn)
1514 fctxs[fn] = context.memfilectx(fn, mergedtext)
1514 fctxs[fn] = context.memfilectx(fn, mergedtext)
1515
1515
1516 if overwritten_file:
1516 if overwritten_file:
1517 fn = "of"
1517 fn = "of"
1518 files.append(fn)
1518 files.append(fn)
1519 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1519 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1520
1520
1521 if new_file:
1521 if new_file:
1522 fn = "nf%i" % id
1522 fn = "nf%i" % id
1523 files.append(fn)
1523 files.append(fn)
1524 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1524 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1525 if len(ps) > 1:
1525 if len(ps) > 1:
1526 if not p2:
1526 if not p2:
1527 p2 = repo[ps[1]]
1527 p2 = repo[ps[1]]
1528 for fn in p2:
1528 for fn in p2:
1529 if fn.startswith("nf"):
1529 if fn.startswith("nf"):
1530 files.append(fn)
1530 files.append(fn)
1531 fctxs[fn] = p2[fn]
1531 fctxs[fn] = p2[fn]
1532
1532
1533 def fctxfn(repo, cx, path):
1533 def fctxfn(repo, cx, path):
1534 return fctxs.get(path)
1534 return fctxs.get(path)
1535
1535
1536 if len(ps) == 0 or ps[0] < 0:
1536 if len(ps) == 0 or ps[0] < 0:
1537 pars = [None, None]
1537 pars = [None, None]
1538 elif len(ps) == 1:
1538 elif len(ps) == 1:
1539 pars = [nodeids[ps[0]], None]
1539 pars = [nodeids[ps[0]], None]
1540 else:
1540 else:
1541 pars = [nodeids[p] for p in ps]
1541 pars = [nodeids[p] for p in ps]
1542 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1542 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1543 date=(id, 0),
1543 date=(id, 0),
1544 user="debugbuilddag",
1544 user="debugbuilddag",
1545 extra={'branch': atbranch})
1545 extra={'branch': atbranch})
1546 nodeid = repo.commitctx(cx)
1546 nodeid = repo.commitctx(cx)
1547 nodeids.append(nodeid)
1547 nodeids.append(nodeid)
1548 at = id
1548 at = id
1549 elif type == 'l':
1549 elif type == 'l':
1550 id, name = data
1550 id, name = data
1551 ui.note('tag %s\n' % name)
1551 ui.note('tag %s\n' % name)
1552 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1552 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1553 elif type == 'a':
1553 elif type == 'a':
1554 ui.note('branch %s\n' % data)
1554 ui.note('branch %s\n' % data)
1555 atbranch = data
1555 atbranch = data
1556 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1556 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1557 tr.close()
1557 tr.close()
1558
1558
1559 if tags:
1559 if tags:
1560 repo.opener.write("localtags", "".join(tags))
1560 repo.opener.write("localtags", "".join(tags))
1561 finally:
1561 finally:
1562 ui.progress(_('building'), None)
1562 ui.progress(_('building'), None)
1563 release(tr, lock)
1563 release(tr, lock)
1564
1564
1565 @command('debugbundle', [('a', 'all', None, _('show all details'))], _('FILE'))
1565 @command('debugbundle', [('a', 'all', None, _('show all details'))], _('FILE'))
1566 def debugbundle(ui, bundlepath, all=None, **opts):
1566 def debugbundle(ui, bundlepath, all=None, **opts):
1567 """lists the contents of a bundle"""
1567 """lists the contents of a bundle"""
1568 f = url.open(ui, bundlepath)
1568 f = url.open(ui, bundlepath)
1569 try:
1569 try:
1570 gen = changegroup.readbundle(f, bundlepath)
1570 gen = changegroup.readbundle(f, bundlepath)
1571 if all:
1571 if all:
1572 ui.write("format: id, p1, p2, cset, delta base, len(delta)\n")
1572 ui.write("format: id, p1, p2, cset, delta base, len(delta)\n")
1573
1573
1574 def showchunks(named):
1574 def showchunks(named):
1575 ui.write("\n%s\n" % named)
1575 ui.write("\n%s\n" % named)
1576 chain = None
1576 chain = None
1577 while True:
1577 while True:
1578 chunkdata = gen.deltachunk(chain)
1578 chunkdata = gen.deltachunk(chain)
1579 if not chunkdata:
1579 if not chunkdata:
1580 break
1580 break
1581 node = chunkdata['node']
1581 node = chunkdata['node']
1582 p1 = chunkdata['p1']
1582 p1 = chunkdata['p1']
1583 p2 = chunkdata['p2']
1583 p2 = chunkdata['p2']
1584 cs = chunkdata['cs']
1584 cs = chunkdata['cs']
1585 deltabase = chunkdata['deltabase']
1585 deltabase = chunkdata['deltabase']
1586 delta = chunkdata['delta']
1586 delta = chunkdata['delta']
1587 ui.write("%s %s %s %s %s %s\n" %
1587 ui.write("%s %s %s %s %s %s\n" %
1588 (hex(node), hex(p1), hex(p2),
1588 (hex(node), hex(p1), hex(p2),
1589 hex(cs), hex(deltabase), len(delta)))
1589 hex(cs), hex(deltabase), len(delta)))
1590 chain = node
1590 chain = node
1591
1591
1592 chunkdata = gen.changelogheader()
1592 chunkdata = gen.changelogheader()
1593 showchunks("changelog")
1593 showchunks("changelog")
1594 chunkdata = gen.manifestheader()
1594 chunkdata = gen.manifestheader()
1595 showchunks("manifest")
1595 showchunks("manifest")
1596 while True:
1596 while True:
1597 chunkdata = gen.filelogheader()
1597 chunkdata = gen.filelogheader()
1598 if not chunkdata:
1598 if not chunkdata:
1599 break
1599 break
1600 fname = chunkdata['filename']
1600 fname = chunkdata['filename']
1601 showchunks(fname)
1601 showchunks(fname)
1602 else:
1602 else:
1603 chunkdata = gen.changelogheader()
1603 chunkdata = gen.changelogheader()
1604 chain = None
1604 chain = None
1605 while True:
1605 while True:
1606 chunkdata = gen.deltachunk(chain)
1606 chunkdata = gen.deltachunk(chain)
1607 if not chunkdata:
1607 if not chunkdata:
1608 break
1608 break
1609 node = chunkdata['node']
1609 node = chunkdata['node']
1610 ui.write("%s\n" % hex(node))
1610 ui.write("%s\n" % hex(node))
1611 chain = node
1611 chain = node
1612 finally:
1612 finally:
1613 f.close()
1613 f.close()
1614
1614
1615 @command('debugcheckstate', [], '')
1615 @command('debugcheckstate', [], '')
1616 def debugcheckstate(ui, repo):
1616 def debugcheckstate(ui, repo):
1617 """validate the correctness of the current dirstate"""
1617 """validate the correctness of the current dirstate"""
1618 parent1, parent2 = repo.dirstate.parents()
1618 parent1, parent2 = repo.dirstate.parents()
1619 m1 = repo[parent1].manifest()
1619 m1 = repo[parent1].manifest()
1620 m2 = repo[parent2].manifest()
1620 m2 = repo[parent2].manifest()
1621 errors = 0
1621 errors = 0
1622 for f in repo.dirstate:
1622 for f in repo.dirstate:
1623 state = repo.dirstate[f]
1623 state = repo.dirstate[f]
1624 if state in "nr" and f not in m1:
1624 if state in "nr" and f not in m1:
1625 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1625 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1626 errors += 1
1626 errors += 1
1627 if state in "a" and f in m1:
1627 if state in "a" and f in m1:
1628 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1628 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1629 errors += 1
1629 errors += 1
1630 if state in "m" and f not in m1 and f not in m2:
1630 if state in "m" and f not in m1 and f not in m2:
1631 ui.warn(_("%s in state %s, but not in either manifest\n") %
1631 ui.warn(_("%s in state %s, but not in either manifest\n") %
1632 (f, state))
1632 (f, state))
1633 errors += 1
1633 errors += 1
1634 for f in m1:
1634 for f in m1:
1635 state = repo.dirstate[f]
1635 state = repo.dirstate[f]
1636 if state not in "nrm":
1636 if state not in "nrm":
1637 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1637 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1638 errors += 1
1638 errors += 1
1639 if errors:
1639 if errors:
1640 error = _(".hg/dirstate inconsistent with current parent's manifest")
1640 error = _(".hg/dirstate inconsistent with current parent's manifest")
1641 raise util.Abort(error)
1641 raise util.Abort(error)
1642
1642
1643 @command('debugcommands', [], _('[COMMAND]'))
1643 @command('debugcommands', [], _('[COMMAND]'))
1644 def debugcommands(ui, cmd='', *args):
1644 def debugcommands(ui, cmd='', *args):
1645 """list all available commands and options"""
1645 """list all available commands and options"""
1646 for cmd, vals in sorted(table.iteritems()):
1646 for cmd, vals in sorted(table.iteritems()):
1647 cmd = cmd.split('|')[0].strip('^')
1647 cmd = cmd.split('|')[0].strip('^')
1648 opts = ', '.join([i[1] for i in vals[1]])
1648 opts = ', '.join([i[1] for i in vals[1]])
1649 ui.write('%s: %s\n' % (cmd, opts))
1649 ui.write('%s: %s\n' % (cmd, opts))
1650
1650
1651 @command('debugcomplete',
1651 @command('debugcomplete',
1652 [('o', 'options', None, _('show the command options'))],
1652 [('o', 'options', None, _('show the command options'))],
1653 _('[-o] CMD'))
1653 _('[-o] CMD'))
1654 def debugcomplete(ui, cmd='', **opts):
1654 def debugcomplete(ui, cmd='', **opts):
1655 """returns the completion list associated with the given command"""
1655 """returns the completion list associated with the given command"""
1656
1656
1657 if opts.get('options'):
1657 if opts.get('options'):
1658 options = []
1658 options = []
1659 otables = [globalopts]
1659 otables = [globalopts]
1660 if cmd:
1660 if cmd:
1661 aliases, entry = cmdutil.findcmd(cmd, table, False)
1661 aliases, entry = cmdutil.findcmd(cmd, table, False)
1662 otables.append(entry[1])
1662 otables.append(entry[1])
1663 for t in otables:
1663 for t in otables:
1664 for o in t:
1664 for o in t:
1665 if "(DEPRECATED)" in o[3]:
1665 if "(DEPRECATED)" in o[3]:
1666 continue
1666 continue
1667 if o[0]:
1667 if o[0]:
1668 options.append('-%s' % o[0])
1668 options.append('-%s' % o[0])
1669 options.append('--%s' % o[1])
1669 options.append('--%s' % o[1])
1670 ui.write("%s\n" % "\n".join(options))
1670 ui.write("%s\n" % "\n".join(options))
1671 return
1671 return
1672
1672
1673 cmdlist = cmdutil.findpossible(cmd, table)
1673 cmdlist = cmdutil.findpossible(cmd, table)
1674 if ui.verbose:
1674 if ui.verbose:
1675 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1675 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1676 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1676 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1677
1677
1678 @command('debugdag',
1678 @command('debugdag',
1679 [('t', 'tags', None, _('use tags as labels')),
1679 [('t', 'tags', None, _('use tags as labels')),
1680 ('b', 'branches', None, _('annotate with branch names')),
1680 ('b', 'branches', None, _('annotate with branch names')),
1681 ('', 'dots', None, _('use dots for runs')),
1681 ('', 'dots', None, _('use dots for runs')),
1682 ('s', 'spaces', None, _('separate elements by spaces'))],
1682 ('s', 'spaces', None, _('separate elements by spaces'))],
1683 _('[OPTION]... [FILE [REV]...]'))
1683 _('[OPTION]... [FILE [REV]...]'))
1684 def debugdag(ui, repo, file_=None, *revs, **opts):
1684 def debugdag(ui, repo, file_=None, *revs, **opts):
1685 """format the changelog or an index DAG as a concise textual description
1685 """format the changelog or an index DAG as a concise textual description
1686
1686
1687 If you pass a revlog index, the revlog's DAG is emitted. If you list
1687 If you pass a revlog index, the revlog's DAG is emitted. If you list
1688 revision numbers, they get labelled in the output as rN.
1688 revision numbers, they get labelled in the output as rN.
1689
1689
1690 Otherwise, the changelog DAG of the current repo is emitted.
1690 Otherwise, the changelog DAG of the current repo is emitted.
1691 """
1691 """
1692 spaces = opts.get('spaces')
1692 spaces = opts.get('spaces')
1693 dots = opts.get('dots')
1693 dots = opts.get('dots')
1694 if file_:
1694 if file_:
1695 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1695 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1696 revs = set((int(r) for r in revs))
1696 revs = set((int(r) for r in revs))
1697 def events():
1697 def events():
1698 for r in rlog:
1698 for r in rlog:
1699 yield 'n', (r, list(set(p for p in rlog.parentrevs(r)
1699 yield 'n', (r, list(set(p for p in rlog.parentrevs(r)
1700 if p != -1)))
1700 if p != -1)))
1701 if r in revs:
1701 if r in revs:
1702 yield 'l', (r, "r%i" % r)
1702 yield 'l', (r, "r%i" % r)
1703 elif repo:
1703 elif repo:
1704 cl = repo.changelog
1704 cl = repo.changelog
1705 tags = opts.get('tags')
1705 tags = opts.get('tags')
1706 branches = opts.get('branches')
1706 branches = opts.get('branches')
1707 if tags:
1707 if tags:
1708 labels = {}
1708 labels = {}
1709 for l, n in repo.tags().items():
1709 for l, n in repo.tags().items():
1710 labels.setdefault(cl.rev(n), []).append(l)
1710 labels.setdefault(cl.rev(n), []).append(l)
1711 def events():
1711 def events():
1712 b = "default"
1712 b = "default"
1713 for r in cl:
1713 for r in cl:
1714 if branches:
1714 if branches:
1715 newb = cl.read(cl.node(r))[5]['branch']
1715 newb = cl.read(cl.node(r))[5]['branch']
1716 if newb != b:
1716 if newb != b:
1717 yield 'a', newb
1717 yield 'a', newb
1718 b = newb
1718 b = newb
1719 yield 'n', (r, list(set(p for p in cl.parentrevs(r)
1719 yield 'n', (r, list(set(p for p in cl.parentrevs(r)
1720 if p != -1)))
1720 if p != -1)))
1721 if tags:
1721 if tags:
1722 ls = labels.get(r)
1722 ls = labels.get(r)
1723 if ls:
1723 if ls:
1724 for l in ls:
1724 for l in ls:
1725 yield 'l', (r, l)
1725 yield 'l', (r, l)
1726 else:
1726 else:
1727 raise util.Abort(_('need repo for changelog dag'))
1727 raise util.Abort(_('need repo for changelog dag'))
1728
1728
1729 for line in dagparser.dagtextlines(events(),
1729 for line in dagparser.dagtextlines(events(),
1730 addspaces=spaces,
1730 addspaces=spaces,
1731 wraplabels=True,
1731 wraplabels=True,
1732 wrapannotations=True,
1732 wrapannotations=True,
1733 wrapnonlinear=dots,
1733 wrapnonlinear=dots,
1734 usedots=dots,
1734 usedots=dots,
1735 maxlinewidth=70):
1735 maxlinewidth=70):
1736 ui.write(line)
1736 ui.write(line)
1737 ui.write("\n")
1737 ui.write("\n")
1738
1738
1739 @command('debugdata',
1739 @command('debugdata',
1740 [('c', 'changelog', False, _('open changelog')),
1740 [('c', 'changelog', False, _('open changelog')),
1741 ('m', 'manifest', False, _('open manifest'))],
1741 ('m', 'manifest', False, _('open manifest'))],
1742 _('-c|-m|FILE REV'))
1742 _('-c|-m|FILE REV'))
1743 def debugdata(ui, repo, file_, rev = None, **opts):
1743 def debugdata(ui, repo, file_, rev = None, **opts):
1744 """dump the contents of a data file revision"""
1744 """dump the contents of a data file revision"""
1745 if opts.get('changelog') or opts.get('manifest'):
1745 if opts.get('changelog') or opts.get('manifest'):
1746 file_, rev = None, file_
1746 file_, rev = None, file_
1747 elif rev is None:
1747 elif rev is None:
1748 raise error.CommandError('debugdata', _('invalid arguments'))
1748 raise error.CommandError('debugdata', _('invalid arguments'))
1749 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
1749 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
1750 try:
1750 try:
1751 ui.write(r.revision(r.lookup(rev)))
1751 ui.write(r.revision(r.lookup(rev)))
1752 except KeyError:
1752 except KeyError:
1753 raise util.Abort(_('invalid revision identifier %s') % rev)
1753 raise util.Abort(_('invalid revision identifier %s') % rev)
1754
1754
1755 @command('debugdate',
1755 @command('debugdate',
1756 [('e', 'extended', None, _('try extended date formats'))],
1756 [('e', 'extended', None, _('try extended date formats'))],
1757 _('[-e] DATE [RANGE]'))
1757 _('[-e] DATE [RANGE]'))
1758 def debugdate(ui, date, range=None, **opts):
1758 def debugdate(ui, date, range=None, **opts):
1759 """parse and display a date"""
1759 """parse and display a date"""
1760 if opts["extended"]:
1760 if opts["extended"]:
1761 d = util.parsedate(date, util.extendeddateformats)
1761 d = util.parsedate(date, util.extendeddateformats)
1762 else:
1762 else:
1763 d = util.parsedate(date)
1763 d = util.parsedate(date)
1764 ui.write("internal: %s %s\n" % d)
1764 ui.write("internal: %s %s\n" % d)
1765 ui.write("standard: %s\n" % util.datestr(d))
1765 ui.write("standard: %s\n" % util.datestr(d))
1766 if range:
1766 if range:
1767 m = util.matchdate(range)
1767 m = util.matchdate(range)
1768 ui.write("match: %s\n" % m(d[0]))
1768 ui.write("match: %s\n" % m(d[0]))
1769
1769
1770 @command('debugdiscovery',
1770 @command('debugdiscovery',
1771 [('', 'old', None, _('use old-style discovery')),
1771 [('', 'old', None, _('use old-style discovery')),
1772 ('', 'nonheads', None,
1772 ('', 'nonheads', None,
1773 _('use old-style discovery with non-heads included')),
1773 _('use old-style discovery with non-heads included')),
1774 ] + remoteopts,
1774 ] + remoteopts,
1775 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
1775 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
1776 def debugdiscovery(ui, repo, remoteurl="default", **opts):
1776 def debugdiscovery(ui, repo, remoteurl="default", **opts):
1777 """runs the changeset discovery protocol in isolation"""
1777 """runs the changeset discovery protocol in isolation"""
1778 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
1778 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
1779 opts.get('branch'))
1779 opts.get('branch'))
1780 remote = hg.peer(repo, opts, remoteurl)
1780 remote = hg.peer(repo, opts, remoteurl)
1781 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
1781 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
1782
1782
1783 # make sure tests are repeatable
1783 # make sure tests are repeatable
1784 random.seed(12323)
1784 random.seed(12323)
1785
1785
1786 def doit(localheads, remoteheads):
1786 def doit(localheads, remoteheads):
1787 if opts.get('old'):
1787 if opts.get('old'):
1788 if localheads:
1788 if localheads:
1789 raise util.Abort('cannot use localheads with old style '
1789 raise util.Abort('cannot use localheads with old style '
1790 'discovery')
1790 'discovery')
1791 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
1791 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
1792 force=True)
1792 force=True)
1793 common = set(common)
1793 common = set(common)
1794 if not opts.get('nonheads'):
1794 if not opts.get('nonheads'):
1795 ui.write("unpruned common: %s\n" % " ".join([short(n)
1795 ui.write("unpruned common: %s\n" % " ".join([short(n)
1796 for n in common]))
1796 for n in common]))
1797 dag = dagutil.revlogdag(repo.changelog)
1797 dag = dagutil.revlogdag(repo.changelog)
1798 all = dag.ancestorset(dag.internalizeall(common))
1798 all = dag.ancestorset(dag.internalizeall(common))
1799 common = dag.externalizeall(dag.headsetofconnecteds(all))
1799 common = dag.externalizeall(dag.headsetofconnecteds(all))
1800 else:
1800 else:
1801 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
1801 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
1802 common = set(common)
1802 common = set(common)
1803 rheads = set(hds)
1803 rheads = set(hds)
1804 lheads = set(repo.heads())
1804 lheads = set(repo.heads())
1805 ui.write("common heads: %s\n" % " ".join([short(n) for n in common]))
1805 ui.write("common heads: %s\n" % " ".join([short(n) for n in common]))
1806 if lheads <= common:
1806 if lheads <= common:
1807 ui.write("local is subset\n")
1807 ui.write("local is subset\n")
1808 elif rheads <= common:
1808 elif rheads <= common:
1809 ui.write("remote is subset\n")
1809 ui.write("remote is subset\n")
1810
1810
1811 serverlogs = opts.get('serverlog')
1811 serverlogs = opts.get('serverlog')
1812 if serverlogs:
1812 if serverlogs:
1813 for filename in serverlogs:
1813 for filename in serverlogs:
1814 logfile = open(filename, 'r')
1814 logfile = open(filename, 'r')
1815 try:
1815 try:
1816 line = logfile.readline()
1816 line = logfile.readline()
1817 while line:
1817 while line:
1818 parts = line.strip().split(';')
1818 parts = line.strip().split(';')
1819 op = parts[1]
1819 op = parts[1]
1820 if op == 'cg':
1820 if op == 'cg':
1821 pass
1821 pass
1822 elif op == 'cgss':
1822 elif op == 'cgss':
1823 doit(parts[2].split(' '), parts[3].split(' '))
1823 doit(parts[2].split(' '), parts[3].split(' '))
1824 elif op == 'unb':
1824 elif op == 'unb':
1825 doit(parts[3].split(' '), parts[2].split(' '))
1825 doit(parts[3].split(' '), parts[2].split(' '))
1826 line = logfile.readline()
1826 line = logfile.readline()
1827 finally:
1827 finally:
1828 logfile.close()
1828 logfile.close()
1829
1829
1830 else:
1830 else:
1831 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
1831 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
1832 opts.get('remote_head'))
1832 opts.get('remote_head'))
1833 localrevs = opts.get('local_head')
1833 localrevs = opts.get('local_head')
1834 doit(localrevs, remoterevs)
1834 doit(localrevs, remoterevs)
1835
1835
1836 @command('debugfileset', [], ('REVSPEC'))
1836 @command('debugfileset', [], ('REVSPEC'))
1837 def debugfileset(ui, repo, expr):
1837 def debugfileset(ui, repo, expr):
1838 '''parse and apply a fileset specification'''
1838 '''parse and apply a fileset specification'''
1839 if ui.verbose:
1839 if ui.verbose:
1840 tree = fileset.parse(expr)[0]
1840 tree = fileset.parse(expr)[0]
1841 ui.note(tree, "\n")
1841 ui.note(tree, "\n")
1842
1842
1843 for f in fileset.getfileset(repo[None], expr):
1843 for f in fileset.getfileset(repo[None], expr):
1844 ui.write("%s\n" % f)
1844 ui.write("%s\n" % f)
1845
1845
1846 @command('debugfsinfo', [], _('[PATH]'))
1846 @command('debugfsinfo', [], _('[PATH]'))
1847 def debugfsinfo(ui, path = "."):
1847 def debugfsinfo(ui, path = "."):
1848 """show information detected about current filesystem"""
1848 """show information detected about current filesystem"""
1849 util.writefile('.debugfsinfo', '')
1849 util.writefile('.debugfsinfo', '')
1850 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
1850 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
1851 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
1851 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
1852 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
1852 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
1853 and 'yes' or 'no'))
1853 and 'yes' or 'no'))
1854 os.unlink('.debugfsinfo')
1854 os.unlink('.debugfsinfo')
1855
1855
1856 @command('debuggetbundle',
1856 @command('debuggetbundle',
1857 [('H', 'head', [], _('id of head node'), _('ID')),
1857 [('H', 'head', [], _('id of head node'), _('ID')),
1858 ('C', 'common', [], _('id of common node'), _('ID')),
1858 ('C', 'common', [], _('id of common node'), _('ID')),
1859 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
1859 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
1860 _('REPO FILE [-H|-C ID]...'))
1860 _('REPO FILE [-H|-C ID]...'))
1861 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
1861 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
1862 """retrieves a bundle from a repo
1862 """retrieves a bundle from a repo
1863
1863
1864 Every ID must be a full-length hex node id string. Saves the bundle to the
1864 Every ID must be a full-length hex node id string. Saves the bundle to the
1865 given file.
1865 given file.
1866 """
1866 """
1867 repo = hg.peer(ui, opts, repopath)
1867 repo = hg.peer(ui, opts, repopath)
1868 if not repo.capable('getbundle'):
1868 if not repo.capable('getbundle'):
1869 raise util.Abort("getbundle() not supported by target repository")
1869 raise util.Abort("getbundle() not supported by target repository")
1870 args = {}
1870 args = {}
1871 if common:
1871 if common:
1872 args['common'] = [bin(s) for s in common]
1872 args['common'] = [bin(s) for s in common]
1873 if head:
1873 if head:
1874 args['heads'] = [bin(s) for s in head]
1874 args['heads'] = [bin(s) for s in head]
1875 bundle = repo.getbundle('debug', **args)
1875 bundle = repo.getbundle('debug', **args)
1876
1876
1877 bundletype = opts.get('type', 'bzip2').lower()
1877 bundletype = opts.get('type', 'bzip2').lower()
1878 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1878 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1879 bundletype = btypes.get(bundletype)
1879 bundletype = btypes.get(bundletype)
1880 if bundletype not in changegroup.bundletypes:
1880 if bundletype not in changegroup.bundletypes:
1881 raise util.Abort(_('unknown bundle type specified with --type'))
1881 raise util.Abort(_('unknown bundle type specified with --type'))
1882 changegroup.writebundle(bundle, bundlepath, bundletype)
1882 changegroup.writebundle(bundle, bundlepath, bundletype)
1883
1883
1884 @command('debugignore', [], '')
1884 @command('debugignore', [], '')
1885 def debugignore(ui, repo, *values, **opts):
1885 def debugignore(ui, repo, *values, **opts):
1886 """display the combined ignore pattern"""
1886 """display the combined ignore pattern"""
1887 ignore = repo.dirstate._ignore
1887 ignore = repo.dirstate._ignore
1888 includepat = getattr(ignore, 'includepat', None)
1888 includepat = getattr(ignore, 'includepat', None)
1889 if includepat is not None:
1889 if includepat is not None:
1890 ui.write("%s\n" % includepat)
1890 ui.write("%s\n" % includepat)
1891 else:
1891 else:
1892 raise util.Abort(_("no ignore patterns found"))
1892 raise util.Abort(_("no ignore patterns found"))
1893
1893
1894 @command('debugindex',
1894 @command('debugindex',
1895 [('c', 'changelog', False, _('open changelog')),
1895 [('c', 'changelog', False, _('open changelog')),
1896 ('m', 'manifest', False, _('open manifest')),
1896 ('m', 'manifest', False, _('open manifest')),
1897 ('f', 'format', 0, _('revlog format'), _('FORMAT'))],
1897 ('f', 'format', 0, _('revlog format'), _('FORMAT'))],
1898 _('[-f FORMAT] -c|-m|FILE'))
1898 _('[-f FORMAT] -c|-m|FILE'))
1899 def debugindex(ui, repo, file_ = None, **opts):
1899 def debugindex(ui, repo, file_ = None, **opts):
1900 """dump the contents of an index file"""
1900 """dump the contents of an index file"""
1901 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
1901 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
1902 format = opts.get('format', 0)
1902 format = opts.get('format', 0)
1903 if format not in (0, 1):
1903 if format not in (0, 1):
1904 raise util.Abort(_("unknown format %d") % format)
1904 raise util.Abort(_("unknown format %d") % format)
1905
1905
1906 generaldelta = r.version & revlog.REVLOGGENERALDELTA
1906 generaldelta = r.version & revlog.REVLOGGENERALDELTA
1907 if generaldelta:
1907 if generaldelta:
1908 basehdr = ' delta'
1908 basehdr = ' delta'
1909 else:
1909 else:
1910 basehdr = ' base'
1910 basehdr = ' base'
1911
1911
1912 if format == 0:
1912 if format == 0:
1913 ui.write(" rev offset length " + basehdr + " linkrev"
1913 ui.write(" rev offset length " + basehdr + " linkrev"
1914 " nodeid p1 p2\n")
1914 " nodeid p1 p2\n")
1915 elif format == 1:
1915 elif format == 1:
1916 ui.write(" rev flag offset length"
1916 ui.write(" rev flag offset length"
1917 " size " + basehdr + " link p1 p2"
1917 " size " + basehdr + " link p1 p2"
1918 " nodeid\n")
1918 " nodeid\n")
1919
1919
1920 for i in r:
1920 for i in r:
1921 node = r.node(i)
1921 node = r.node(i)
1922 if generaldelta:
1922 if generaldelta:
1923 base = r.deltaparent(i)
1923 base = r.deltaparent(i)
1924 else:
1924 else:
1925 base = r.chainbase(i)
1925 base = r.chainbase(i)
1926 if format == 0:
1926 if format == 0:
1927 try:
1927 try:
1928 pp = r.parents(node)
1928 pp = r.parents(node)
1929 except Exception:
1929 except Exception:
1930 pp = [nullid, nullid]
1930 pp = [nullid, nullid]
1931 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1931 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1932 i, r.start(i), r.length(i), base, r.linkrev(i),
1932 i, r.start(i), r.length(i), base, r.linkrev(i),
1933 short(node), short(pp[0]), short(pp[1])))
1933 short(node), short(pp[0]), short(pp[1])))
1934 elif format == 1:
1934 elif format == 1:
1935 pr = r.parentrevs(i)
1935 pr = r.parentrevs(i)
1936 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
1936 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
1937 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
1937 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
1938 base, r.linkrev(i), pr[0], pr[1], short(node)))
1938 base, r.linkrev(i), pr[0], pr[1], short(node)))
1939
1939
1940 @command('debugindexdot', [], _('FILE'))
1940 @command('debugindexdot', [], _('FILE'))
1941 def debugindexdot(ui, repo, file_):
1941 def debugindexdot(ui, repo, file_):
1942 """dump an index DAG as a graphviz dot file"""
1942 """dump an index DAG as a graphviz dot file"""
1943 r = None
1943 r = None
1944 if repo:
1944 if repo:
1945 filelog = repo.file(file_)
1945 filelog = repo.file(file_)
1946 if len(filelog):
1946 if len(filelog):
1947 r = filelog
1947 r = filelog
1948 if not r:
1948 if not r:
1949 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1949 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1950 ui.write("digraph G {\n")
1950 ui.write("digraph G {\n")
1951 for i in r:
1951 for i in r:
1952 node = r.node(i)
1952 node = r.node(i)
1953 pp = r.parents(node)
1953 pp = r.parents(node)
1954 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1954 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1955 if pp[1] != nullid:
1955 if pp[1] != nullid:
1956 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1956 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1957 ui.write("}\n")
1957 ui.write("}\n")
1958
1958
1959 @command('debuginstall', [], '')
1959 @command('debuginstall', [], '')
1960 def debuginstall(ui):
1960 def debuginstall(ui):
1961 '''test Mercurial installation
1961 '''test Mercurial installation
1962
1962
1963 Returns 0 on success.
1963 Returns 0 on success.
1964 '''
1964 '''
1965
1965
1966 def writetemp(contents):
1966 def writetemp(contents):
1967 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1967 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1968 f = os.fdopen(fd, "wb")
1968 f = os.fdopen(fd, "wb")
1969 f.write(contents)
1969 f.write(contents)
1970 f.close()
1970 f.close()
1971 return name
1971 return name
1972
1972
1973 problems = 0
1973 problems = 0
1974
1974
1975 # encoding
1975 # encoding
1976 ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
1976 ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
1977 try:
1977 try:
1978 encoding.fromlocal("test")
1978 encoding.fromlocal("test")
1979 except util.Abort, inst:
1979 except util.Abort, inst:
1980 ui.write(" %s\n" % inst)
1980 ui.write(" %s\n" % inst)
1981 ui.write(_(" (check that your locale is properly set)\n"))
1981 ui.write(_(" (check that your locale is properly set)\n"))
1982 problems += 1
1982 problems += 1
1983
1983
1984 # compiled modules
1984 # compiled modules
1985 ui.status(_("checking installed modules (%s)...\n")
1985 ui.status(_("checking installed modules (%s)...\n")
1986 % os.path.dirname(__file__))
1986 % os.path.dirname(__file__))
1987 try:
1987 try:
1988 import bdiff, mpatch, base85, osutil
1988 import bdiff, mpatch, base85, osutil
1989 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
1989 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
1990 except Exception, inst:
1990 except Exception, inst:
1991 ui.write(" %s\n" % inst)
1991 ui.write(" %s\n" % inst)
1992 ui.write(_(" One or more extensions could not be found"))
1992 ui.write(_(" One or more extensions could not be found"))
1993 ui.write(_(" (check that you compiled the extensions)\n"))
1993 ui.write(_(" (check that you compiled the extensions)\n"))
1994 problems += 1
1994 problems += 1
1995
1995
1996 # templates
1996 # templates
1997 import templater
1997 import templater
1998 p = templater.templatepath()
1998 p = templater.templatepath()
1999 ui.status(_("checking templates (%s)...\n") % ' '.join(p))
1999 ui.status(_("checking templates (%s)...\n") % ' '.join(p))
2000 try:
2000 try:
2001 templater.templater(templater.templatepath("map-cmdline.default"))
2001 templater.templater(templater.templatepath("map-cmdline.default"))
2002 except Exception, inst:
2002 except Exception, inst:
2003 ui.write(" %s\n" % inst)
2003 ui.write(" %s\n" % inst)
2004 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
2004 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
2005 problems += 1
2005 problems += 1
2006
2006
2007 # editor
2007 # editor
2008 ui.status(_("checking commit editor...\n"))
2008 ui.status(_("checking commit editor...\n"))
2009 editor = ui.geteditor()
2009 editor = ui.geteditor()
2010 cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
2010 cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
2011 if not cmdpath:
2011 if not cmdpath:
2012 if editor == 'vi':
2012 if editor == 'vi':
2013 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2013 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2014 ui.write(_(" (specify a commit editor in your configuration"
2014 ui.write(_(" (specify a commit editor in your configuration"
2015 " file)\n"))
2015 " file)\n"))
2016 else:
2016 else:
2017 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2017 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2018 ui.write(_(" (specify a commit editor in your configuration"
2018 ui.write(_(" (specify a commit editor in your configuration"
2019 " file)\n"))
2019 " file)\n"))
2020 problems += 1
2020 problems += 1
2021
2021
2022 # check username
2022 # check username
2023 ui.status(_("checking username...\n"))
2023 ui.status(_("checking username...\n"))
2024 try:
2024 try:
2025 ui.username()
2025 ui.username()
2026 except util.Abort, e:
2026 except util.Abort, e:
2027 ui.write(" %s\n" % e)
2027 ui.write(" %s\n" % e)
2028 ui.write(_(" (specify a username in your configuration file)\n"))
2028 ui.write(_(" (specify a username in your configuration file)\n"))
2029 problems += 1
2029 problems += 1
2030
2030
2031 if not problems:
2031 if not problems:
2032 ui.status(_("no problems detected\n"))
2032 ui.status(_("no problems detected\n"))
2033 else:
2033 else:
2034 ui.write(_("%s problems detected,"
2034 ui.write(_("%s problems detected,"
2035 " please check your install!\n") % problems)
2035 " please check your install!\n") % problems)
2036
2036
2037 return problems
2037 return problems
2038
2038
2039 @command('debugknown', [], _('REPO ID...'))
2039 @command('debugknown', [], _('REPO ID...'))
2040 def debugknown(ui, repopath, *ids, **opts):
2040 def debugknown(ui, repopath, *ids, **opts):
2041 """test whether node ids are known to a repo
2041 """test whether node ids are known to a repo
2042
2042
2043 Every ID must be a full-length hex node id string. Returns a list of 0s
2043 Every ID must be a full-length hex node id string. Returns a list of 0s
2044 and 1s indicating unknown/known.
2044 and 1s indicating unknown/known.
2045 """
2045 """
2046 repo = hg.peer(ui, opts, repopath)
2046 repo = hg.peer(ui, opts, repopath)
2047 if not repo.capable('known'):
2047 if not repo.capable('known'):
2048 raise util.Abort("known() not supported by target repository")
2048 raise util.Abort("known() not supported by target repository")
2049 flags = repo.known([bin(s) for s in ids])
2049 flags = repo.known([bin(s) for s in ids])
2050 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2050 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2051
2051
2052 @command('debugobsolete', [] + commitopts2,
2052 @command('debugobsolete', [] + commitopts2,
2053 _('[OBSOLETED [REPLACEMENT] [REPL... ]'))
2053 _('[OBSOLETED [REPLACEMENT] [REPL... ]'))
2054 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2054 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2055 """create arbitrary obsolete marker"""
2055 """create arbitrary obsolete marker"""
2056 if precursor is not None:
2056 if precursor is not None:
2057 metadata = {}
2057 metadata = {}
2058 if 'date' in opts:
2058 if 'date' in opts:
2059 metadata['date'] = opts['date']
2059 metadata['date'] = opts['date']
2060 metadata['user'] = opts['user'] or ui.username()
2060 metadata['user'] = opts['user'] or ui.username()
2061 succs = tuple(bin(succ) for succ in successors)
2061 succs = tuple(bin(succ) for succ in successors)
2062 l = repo.lock()
2062 l = repo.lock()
2063 try:
2063 try:
2064 tr = repo.transaction('debugobsolete')
2064 tr = repo.transaction('debugobsolete')
2065 try:
2065 try:
2066 repo.obsstore.create(tr, bin(precursor), succs, 0, metadata)
2066 repo.obsstore.create(tr, bin(precursor), succs, 0, metadata)
2067 tr.close()
2067 tr.close()
2068 finally:
2068 finally:
2069 tr.release()
2069 tr.release()
2070 finally:
2070 finally:
2071 l.release()
2071 l.release()
2072 else:
2072 else:
2073 for m in obsolete.allmarkers(repo):
2073 for m in obsolete.allmarkers(repo):
2074 ui.write(hex(m.precnode()))
2074 ui.write(hex(m.precnode()))
2075 for repl in m.succnodes():
2075 for repl in m.succnodes():
2076 ui.write(' ')
2076 ui.write(' ')
2077 ui.write(hex(repl))
2077 ui.write(hex(repl))
2078 ui.write(' %X ' % m._data[2])
2078 ui.write(' %X ' % m._data[2])
2079 ui.write(m.metadata())
2079 ui.write(m.metadata())
2080 ui.write('\n')
2080 ui.write('\n')
2081
2081
2082 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'))
2082 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'))
2083 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
2083 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
2084 '''access the pushkey key/value protocol
2084 '''access the pushkey key/value protocol
2085
2085
2086 With two args, list the keys in the given namespace.
2086 With two args, list the keys in the given namespace.
2087
2087
2088 With five args, set a key to new if it currently is set to old.
2088 With five args, set a key to new if it currently is set to old.
2089 Reports success or failure.
2089 Reports success or failure.
2090 '''
2090 '''
2091
2091
2092 target = hg.peer(ui, {}, repopath)
2092 target = hg.peer(ui, {}, repopath)
2093 if keyinfo:
2093 if keyinfo:
2094 key, old, new = keyinfo
2094 key, old, new = keyinfo
2095 r = target.pushkey(namespace, key, old, new)
2095 r = target.pushkey(namespace, key, old, new)
2096 ui.status(str(r) + '\n')
2096 ui.status(str(r) + '\n')
2097 return not r
2097 return not r
2098 else:
2098 else:
2099 for k, v in target.listkeys(namespace).iteritems():
2099 for k, v in target.listkeys(namespace).iteritems():
2100 ui.write("%s\t%s\n" % (k.encode('string-escape'),
2100 ui.write("%s\t%s\n" % (k.encode('string-escape'),
2101 v.encode('string-escape')))
2101 v.encode('string-escape')))
2102
2102
2103 @command('debugpvec', [], _('A B'))
2103 @command('debugpvec', [], _('A B'))
2104 def debugpvec(ui, repo, a, b=None):
2104 def debugpvec(ui, repo, a, b=None):
2105 ca = scmutil.revsingle(repo, a)
2105 ca = scmutil.revsingle(repo, a)
2106 cb = scmutil.revsingle(repo, b)
2106 cb = scmutil.revsingle(repo, b)
2107 pa = pvec.ctxpvec(ca)
2107 pa = pvec.ctxpvec(ca)
2108 pb = pvec.ctxpvec(cb)
2108 pb = pvec.ctxpvec(cb)
2109 if pa == pb:
2109 if pa == pb:
2110 rel = "="
2110 rel = "="
2111 elif pa > pb:
2111 elif pa > pb:
2112 rel = ">"
2112 rel = ">"
2113 elif pa < pb:
2113 elif pa < pb:
2114 rel = "<"
2114 rel = "<"
2115 elif pa | pb:
2115 elif pa | pb:
2116 rel = "|"
2116 rel = "|"
2117 ui.write(_("a: %s\n") % pa)
2117 ui.write(_("a: %s\n") % pa)
2118 ui.write(_("b: %s\n") % pb)
2118 ui.write(_("b: %s\n") % pb)
2119 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
2119 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
2120 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
2120 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
2121 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
2121 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
2122 pa.distance(pb), rel))
2122 pa.distance(pb), rel))
2123
2123
2124 @command('debugrebuildstate',
2124 @command('debugrebuildstate',
2125 [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
2125 [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
2126 _('[-r REV] [REV]'))
2126 _('[-r REV] [REV]'))
2127 def debugrebuildstate(ui, repo, rev="tip"):
2127 def debugrebuildstate(ui, repo, rev="tip"):
2128 """rebuild the dirstate as it would look like for the given revision"""
2128 """rebuild the dirstate as it would look like for the given revision"""
2129 ctx = scmutil.revsingle(repo, rev)
2129 ctx = scmutil.revsingle(repo, rev)
2130 wlock = repo.wlock()
2130 wlock = repo.wlock()
2131 try:
2131 try:
2132 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
2132 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
2133 finally:
2133 finally:
2134 wlock.release()
2134 wlock.release()
2135
2135
2136 @command('debugrename',
2136 @command('debugrename',
2137 [('r', 'rev', '', _('revision to debug'), _('REV'))],
2137 [('r', 'rev', '', _('revision to debug'), _('REV'))],
2138 _('[-r REV] FILE'))
2138 _('[-r REV] FILE'))
2139 def debugrename(ui, repo, file1, *pats, **opts):
2139 def debugrename(ui, repo, file1, *pats, **opts):
2140 """dump rename information"""
2140 """dump rename information"""
2141
2141
2142 ctx = scmutil.revsingle(repo, opts.get('rev'))
2142 ctx = scmutil.revsingle(repo, opts.get('rev'))
2143 m = scmutil.match(ctx, (file1,) + pats, opts)
2143 m = scmutil.match(ctx, (file1,) + pats, opts)
2144 for abs in ctx.walk(m):
2144 for abs in ctx.walk(m):
2145 fctx = ctx[abs]
2145 fctx = ctx[abs]
2146 o = fctx.filelog().renamed(fctx.filenode())
2146 o = fctx.filelog().renamed(fctx.filenode())
2147 rel = m.rel(abs)
2147 rel = m.rel(abs)
2148 if o:
2148 if o:
2149 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
2149 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
2150 else:
2150 else:
2151 ui.write(_("%s not renamed\n") % rel)
2151 ui.write(_("%s not renamed\n") % rel)
2152
2152
2153 @command('debugrevlog',
2153 @command('debugrevlog',
2154 [('c', 'changelog', False, _('open changelog')),
2154 [('c', 'changelog', False, _('open changelog')),
2155 ('m', 'manifest', False, _('open manifest')),
2155 ('m', 'manifest', False, _('open manifest')),
2156 ('d', 'dump', False, _('dump index data'))],
2156 ('d', 'dump', False, _('dump index data'))],
2157 _('-c|-m|FILE'))
2157 _('-c|-m|FILE'))
2158 def debugrevlog(ui, repo, file_ = None, **opts):
2158 def debugrevlog(ui, repo, file_ = None, **opts):
2159 """show data and statistics about a revlog"""
2159 """show data and statistics about a revlog"""
2160 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2160 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2161
2161
2162 if opts.get("dump"):
2162 if opts.get("dump"):
2163 numrevs = len(r)
2163 numrevs = len(r)
2164 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
2164 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
2165 " rawsize totalsize compression heads\n")
2165 " rawsize totalsize compression heads\n")
2166 ts = 0
2166 ts = 0
2167 heads = set()
2167 heads = set()
2168 for rev in xrange(numrevs):
2168 for rev in xrange(numrevs):
2169 dbase = r.deltaparent(rev)
2169 dbase = r.deltaparent(rev)
2170 if dbase == -1:
2170 if dbase == -1:
2171 dbase = rev
2171 dbase = rev
2172 cbase = r.chainbase(rev)
2172 cbase = r.chainbase(rev)
2173 p1, p2 = r.parentrevs(rev)
2173 p1, p2 = r.parentrevs(rev)
2174 rs = r.rawsize(rev)
2174 rs = r.rawsize(rev)
2175 ts = ts + rs
2175 ts = ts + rs
2176 heads -= set(r.parentrevs(rev))
2176 heads -= set(r.parentrevs(rev))
2177 heads.add(rev)
2177 heads.add(rev)
2178 ui.write("%d %d %d %d %d %d %d %d %d %d %d %d %d\n" %
2178 ui.write("%d %d %d %d %d %d %d %d %d %d %d %d %d\n" %
2179 (rev, p1, p2, r.start(rev), r.end(rev),
2179 (rev, p1, p2, r.start(rev), r.end(rev),
2180 r.start(dbase), r.start(cbase),
2180 r.start(dbase), r.start(cbase),
2181 r.start(p1), r.start(p2),
2181 r.start(p1), r.start(p2),
2182 rs, ts, ts / r.end(rev), len(heads)))
2182 rs, ts, ts / r.end(rev), len(heads)))
2183 return 0
2183 return 0
2184
2184
2185 v = r.version
2185 v = r.version
2186 format = v & 0xFFFF
2186 format = v & 0xFFFF
2187 flags = []
2187 flags = []
2188 gdelta = False
2188 gdelta = False
2189 if v & revlog.REVLOGNGINLINEDATA:
2189 if v & revlog.REVLOGNGINLINEDATA:
2190 flags.append('inline')
2190 flags.append('inline')
2191 if v & revlog.REVLOGGENERALDELTA:
2191 if v & revlog.REVLOGGENERALDELTA:
2192 gdelta = True
2192 gdelta = True
2193 flags.append('generaldelta')
2193 flags.append('generaldelta')
2194 if not flags:
2194 if not flags:
2195 flags = ['(none)']
2195 flags = ['(none)']
2196
2196
2197 nummerges = 0
2197 nummerges = 0
2198 numfull = 0
2198 numfull = 0
2199 numprev = 0
2199 numprev = 0
2200 nump1 = 0
2200 nump1 = 0
2201 nump2 = 0
2201 nump2 = 0
2202 numother = 0
2202 numother = 0
2203 nump1prev = 0
2203 nump1prev = 0
2204 nump2prev = 0
2204 nump2prev = 0
2205 chainlengths = []
2205 chainlengths = []
2206
2206
2207 datasize = [None, 0, 0L]
2207 datasize = [None, 0, 0L]
2208 fullsize = [None, 0, 0L]
2208 fullsize = [None, 0, 0L]
2209 deltasize = [None, 0, 0L]
2209 deltasize = [None, 0, 0L]
2210
2210
2211 def addsize(size, l):
2211 def addsize(size, l):
2212 if l[0] is None or size < l[0]:
2212 if l[0] is None or size < l[0]:
2213 l[0] = size
2213 l[0] = size
2214 if size > l[1]:
2214 if size > l[1]:
2215 l[1] = size
2215 l[1] = size
2216 l[2] += size
2216 l[2] += size
2217
2217
2218 numrevs = len(r)
2218 numrevs = len(r)
2219 for rev in xrange(numrevs):
2219 for rev in xrange(numrevs):
2220 p1, p2 = r.parentrevs(rev)
2220 p1, p2 = r.parentrevs(rev)
2221 delta = r.deltaparent(rev)
2221 delta = r.deltaparent(rev)
2222 if format > 0:
2222 if format > 0:
2223 addsize(r.rawsize(rev), datasize)
2223 addsize(r.rawsize(rev), datasize)
2224 if p2 != nullrev:
2224 if p2 != nullrev:
2225 nummerges += 1
2225 nummerges += 1
2226 size = r.length(rev)
2226 size = r.length(rev)
2227 if delta == nullrev:
2227 if delta == nullrev:
2228 chainlengths.append(0)
2228 chainlengths.append(0)
2229 numfull += 1
2229 numfull += 1
2230 addsize(size, fullsize)
2230 addsize(size, fullsize)
2231 else:
2231 else:
2232 chainlengths.append(chainlengths[delta] + 1)
2232 chainlengths.append(chainlengths[delta] + 1)
2233 addsize(size, deltasize)
2233 addsize(size, deltasize)
2234 if delta == rev - 1:
2234 if delta == rev - 1:
2235 numprev += 1
2235 numprev += 1
2236 if delta == p1:
2236 if delta == p1:
2237 nump1prev += 1
2237 nump1prev += 1
2238 elif delta == p2:
2238 elif delta == p2:
2239 nump2prev += 1
2239 nump2prev += 1
2240 elif delta == p1:
2240 elif delta == p1:
2241 nump1 += 1
2241 nump1 += 1
2242 elif delta == p2:
2242 elif delta == p2:
2243 nump2 += 1
2243 nump2 += 1
2244 elif delta != nullrev:
2244 elif delta != nullrev:
2245 numother += 1
2245 numother += 1
2246
2246
2247 numdeltas = numrevs - numfull
2247 numdeltas = numrevs - numfull
2248 numoprev = numprev - nump1prev - nump2prev
2248 numoprev = numprev - nump1prev - nump2prev
2249 totalrawsize = datasize[2]
2249 totalrawsize = datasize[2]
2250 datasize[2] /= numrevs
2250 datasize[2] /= numrevs
2251 fulltotal = fullsize[2]
2251 fulltotal = fullsize[2]
2252 fullsize[2] /= numfull
2252 fullsize[2] /= numfull
2253 deltatotal = deltasize[2]
2253 deltatotal = deltasize[2]
2254 deltasize[2] /= numrevs - numfull
2254 deltasize[2] /= numrevs - numfull
2255 totalsize = fulltotal + deltatotal
2255 totalsize = fulltotal + deltatotal
2256 avgchainlen = sum(chainlengths) / numrevs
2256 avgchainlen = sum(chainlengths) / numrevs
2257 compratio = totalrawsize / totalsize
2257 compratio = totalrawsize / totalsize
2258
2258
2259 basedfmtstr = '%%%dd\n'
2259 basedfmtstr = '%%%dd\n'
2260 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2260 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2261
2261
2262 def dfmtstr(max):
2262 def dfmtstr(max):
2263 return basedfmtstr % len(str(max))
2263 return basedfmtstr % len(str(max))
2264 def pcfmtstr(max, padding=0):
2264 def pcfmtstr(max, padding=0):
2265 return basepcfmtstr % (len(str(max)), ' ' * padding)
2265 return basepcfmtstr % (len(str(max)), ' ' * padding)
2266
2266
2267 def pcfmt(value, total):
2267 def pcfmt(value, total):
2268 return (value, 100 * float(value) / total)
2268 return (value, 100 * float(value) / total)
2269
2269
2270 ui.write('format : %d\n' % format)
2270 ui.write('format : %d\n' % format)
2271 ui.write('flags : %s\n' % ', '.join(flags))
2271 ui.write('flags : %s\n' % ', '.join(flags))
2272
2272
2273 ui.write('\n')
2273 ui.write('\n')
2274 fmt = pcfmtstr(totalsize)
2274 fmt = pcfmtstr(totalsize)
2275 fmt2 = dfmtstr(totalsize)
2275 fmt2 = dfmtstr(totalsize)
2276 ui.write('revisions : ' + fmt2 % numrevs)
2276 ui.write('revisions : ' + fmt2 % numrevs)
2277 ui.write(' merges : ' + fmt % pcfmt(nummerges, numrevs))
2277 ui.write(' merges : ' + fmt % pcfmt(nummerges, numrevs))
2278 ui.write(' normal : ' + fmt % pcfmt(numrevs - nummerges, numrevs))
2278 ui.write(' normal : ' + fmt % pcfmt(numrevs - nummerges, numrevs))
2279 ui.write('revisions : ' + fmt2 % numrevs)
2279 ui.write('revisions : ' + fmt2 % numrevs)
2280 ui.write(' full : ' + fmt % pcfmt(numfull, numrevs))
2280 ui.write(' full : ' + fmt % pcfmt(numfull, numrevs))
2281 ui.write(' deltas : ' + fmt % pcfmt(numdeltas, numrevs))
2281 ui.write(' deltas : ' + fmt % pcfmt(numdeltas, numrevs))
2282 ui.write('revision size : ' + fmt2 % totalsize)
2282 ui.write('revision size : ' + fmt2 % totalsize)
2283 ui.write(' full : ' + fmt % pcfmt(fulltotal, totalsize))
2283 ui.write(' full : ' + fmt % pcfmt(fulltotal, totalsize))
2284 ui.write(' deltas : ' + fmt % pcfmt(deltatotal, totalsize))
2284 ui.write(' deltas : ' + fmt % pcfmt(deltatotal, totalsize))
2285
2285
2286 ui.write('\n')
2286 ui.write('\n')
2287 fmt = dfmtstr(max(avgchainlen, compratio))
2287 fmt = dfmtstr(max(avgchainlen, compratio))
2288 ui.write('avg chain length : ' + fmt % avgchainlen)
2288 ui.write('avg chain length : ' + fmt % avgchainlen)
2289 ui.write('compression ratio : ' + fmt % compratio)
2289 ui.write('compression ratio : ' + fmt % compratio)
2290
2290
2291 if format > 0:
2291 if format > 0:
2292 ui.write('\n')
2292 ui.write('\n')
2293 ui.write('uncompressed data size (min/max/avg) : %d / %d / %d\n'
2293 ui.write('uncompressed data size (min/max/avg) : %d / %d / %d\n'
2294 % tuple(datasize))
2294 % tuple(datasize))
2295 ui.write('full revision size (min/max/avg) : %d / %d / %d\n'
2295 ui.write('full revision size (min/max/avg) : %d / %d / %d\n'
2296 % tuple(fullsize))
2296 % tuple(fullsize))
2297 ui.write('delta size (min/max/avg) : %d / %d / %d\n'
2297 ui.write('delta size (min/max/avg) : %d / %d / %d\n'
2298 % tuple(deltasize))
2298 % tuple(deltasize))
2299
2299
2300 if numdeltas > 0:
2300 if numdeltas > 0:
2301 ui.write('\n')
2301 ui.write('\n')
2302 fmt = pcfmtstr(numdeltas)
2302 fmt = pcfmtstr(numdeltas)
2303 fmt2 = pcfmtstr(numdeltas, 4)
2303 fmt2 = pcfmtstr(numdeltas, 4)
2304 ui.write('deltas against prev : ' + fmt % pcfmt(numprev, numdeltas))
2304 ui.write('deltas against prev : ' + fmt % pcfmt(numprev, numdeltas))
2305 if numprev > 0:
2305 if numprev > 0:
2306 ui.write(' where prev = p1 : ' + fmt2 % pcfmt(nump1prev,
2306 ui.write(' where prev = p1 : ' + fmt2 % pcfmt(nump1prev,
2307 numprev))
2307 numprev))
2308 ui.write(' where prev = p2 : ' + fmt2 % pcfmt(nump2prev,
2308 ui.write(' where prev = p2 : ' + fmt2 % pcfmt(nump2prev,
2309 numprev))
2309 numprev))
2310 ui.write(' other : ' + fmt2 % pcfmt(numoprev,
2310 ui.write(' other : ' + fmt2 % pcfmt(numoprev,
2311 numprev))
2311 numprev))
2312 if gdelta:
2312 if gdelta:
2313 ui.write('deltas against p1 : ' + fmt % pcfmt(nump1, numdeltas))
2313 ui.write('deltas against p1 : ' + fmt % pcfmt(nump1, numdeltas))
2314 ui.write('deltas against p2 : ' + fmt % pcfmt(nump2, numdeltas))
2314 ui.write('deltas against p2 : ' + fmt % pcfmt(nump2, numdeltas))
2315 ui.write('deltas against other : ' + fmt % pcfmt(numother,
2315 ui.write('deltas against other : ' + fmt % pcfmt(numother,
2316 numdeltas))
2316 numdeltas))
2317
2317
2318 @command('debugrevspec', [], ('REVSPEC'))
2318 @command('debugrevspec', [], ('REVSPEC'))
2319 def debugrevspec(ui, repo, expr):
2319 def debugrevspec(ui, repo, expr):
2320 """parse and apply a revision specification
2320 """parse and apply a revision specification
2321
2321
2322 Use --verbose to print the parsed tree before and after aliases
2322 Use --verbose to print the parsed tree before and after aliases
2323 expansion.
2323 expansion.
2324 """
2324 """
2325 if ui.verbose:
2325 if ui.verbose:
2326 tree = revset.parse(expr)[0]
2326 tree = revset.parse(expr)[0]
2327 ui.note(revset.prettyformat(tree), "\n")
2327 ui.note(revset.prettyformat(tree), "\n")
2328 newtree = revset.findaliases(ui, tree)
2328 newtree = revset.findaliases(ui, tree)
2329 if newtree != tree:
2329 if newtree != tree:
2330 ui.note(revset.prettyformat(newtree), "\n")
2330 ui.note(revset.prettyformat(newtree), "\n")
2331 func = revset.match(ui, expr)
2331 func = revset.match(ui, expr)
2332 for c in func(repo, range(len(repo))):
2332 for c in func(repo, range(len(repo))):
2333 ui.write("%s\n" % c)
2333 ui.write("%s\n" % c)
2334
2334
2335 @command('debugsetparents', [], _('REV1 [REV2]'))
2335 @command('debugsetparents', [], _('REV1 [REV2]'))
2336 def debugsetparents(ui, repo, rev1, rev2=None):
2336 def debugsetparents(ui, repo, rev1, rev2=None):
2337 """manually set the parents of the current working directory
2337 """manually set the parents of the current working directory
2338
2338
2339 This is useful for writing repository conversion tools, but should
2339 This is useful for writing repository conversion tools, but should
2340 be used with care.
2340 be used with care.
2341
2341
2342 Returns 0 on success.
2342 Returns 0 on success.
2343 """
2343 """
2344
2344
2345 r1 = scmutil.revsingle(repo, rev1).node()
2345 r1 = scmutil.revsingle(repo, rev1).node()
2346 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2346 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2347
2347
2348 wlock = repo.wlock()
2348 wlock = repo.wlock()
2349 try:
2349 try:
2350 repo.setparents(r1, r2)
2350 repo.setparents(r1, r2)
2351 finally:
2351 finally:
2352 wlock.release()
2352 wlock.release()
2353
2353
2354 @command('debugstate',
2354 @command('debugstate',
2355 [('', 'nodates', None, _('do not display the saved mtime')),
2355 [('', 'nodates', None, _('do not display the saved mtime')),
2356 ('', 'datesort', None, _('sort by saved mtime'))],
2356 ('', 'datesort', None, _('sort by saved mtime'))],
2357 _('[OPTION]...'))
2357 _('[OPTION]...'))
2358 def debugstate(ui, repo, nodates=None, datesort=None):
2358 def debugstate(ui, repo, nodates=None, datesort=None):
2359 """show the contents of the current dirstate"""
2359 """show the contents of the current dirstate"""
2360 timestr = ""
2360 timestr = ""
2361 showdate = not nodates
2361 showdate = not nodates
2362 if datesort:
2362 if datesort:
2363 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2363 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2364 else:
2364 else:
2365 keyfunc = None # sort by filename
2365 keyfunc = None # sort by filename
2366 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2366 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2367 if showdate:
2367 if showdate:
2368 if ent[3] == -1:
2368 if ent[3] == -1:
2369 # Pad or slice to locale representation
2369 # Pad or slice to locale representation
2370 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
2370 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
2371 time.localtime(0)))
2371 time.localtime(0)))
2372 timestr = 'unset'
2372 timestr = 'unset'
2373 timestr = (timestr[:locale_len] +
2373 timestr = (timestr[:locale_len] +
2374 ' ' * (locale_len - len(timestr)))
2374 ' ' * (locale_len - len(timestr)))
2375 else:
2375 else:
2376 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2376 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2377 time.localtime(ent[3]))
2377 time.localtime(ent[3]))
2378 if ent[1] & 020000:
2378 if ent[1] & 020000:
2379 mode = 'lnk'
2379 mode = 'lnk'
2380 else:
2380 else:
2381 mode = '%3o' % (ent[1] & 0777 & ~util.umask)
2381 mode = '%3o' % (ent[1] & 0777 & ~util.umask)
2382 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2382 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2383 for f in repo.dirstate.copies():
2383 for f in repo.dirstate.copies():
2384 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2384 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2385
2385
2386 @command('debugsub',
2386 @command('debugsub',
2387 [('r', 'rev', '',
2387 [('r', 'rev', '',
2388 _('revision to check'), _('REV'))],
2388 _('revision to check'), _('REV'))],
2389 _('[-r REV] [REV]'))
2389 _('[-r REV] [REV]'))
2390 def debugsub(ui, repo, rev=None):
2390 def debugsub(ui, repo, rev=None):
2391 ctx = scmutil.revsingle(repo, rev, None)
2391 ctx = scmutil.revsingle(repo, rev, None)
2392 for k, v in sorted(ctx.substate.items()):
2392 for k, v in sorted(ctx.substate.items()):
2393 ui.write('path %s\n' % k)
2393 ui.write('path %s\n' % k)
2394 ui.write(' source %s\n' % v[0])
2394 ui.write(' source %s\n' % v[0])
2395 ui.write(' revision %s\n' % v[1])
2395 ui.write(' revision %s\n' % v[1])
2396
2396
2397 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'))
2397 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'))
2398 def debugwalk(ui, repo, *pats, **opts):
2398 def debugwalk(ui, repo, *pats, **opts):
2399 """show how files match on given patterns"""
2399 """show how files match on given patterns"""
2400 m = scmutil.match(repo[None], pats, opts)
2400 m = scmutil.match(repo[None], pats, opts)
2401 items = list(repo.walk(m))
2401 items = list(repo.walk(m))
2402 if not items:
2402 if not items:
2403 return
2403 return
2404 f = lambda fn: fn
2404 f = lambda fn: fn
2405 if ui.configbool('ui', 'slash') and os.sep != '/':
2405 if ui.configbool('ui', 'slash') and os.sep != '/':
2406 f = lambda fn: util.normpath(fn)
2406 f = lambda fn: util.normpath(fn)
2407 fmt = 'f %%-%ds %%-%ds %%s' % (
2407 fmt = 'f %%-%ds %%-%ds %%s' % (
2408 max([len(abs) for abs in items]),
2408 max([len(abs) for abs in items]),
2409 max([len(m.rel(abs)) for abs in items]))
2409 max([len(m.rel(abs)) for abs in items]))
2410 for abs in items:
2410 for abs in items:
2411 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
2411 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
2412 ui.write("%s\n" % line.rstrip())
2412 ui.write("%s\n" % line.rstrip())
2413
2413
2414 @command('debugwireargs',
2414 @command('debugwireargs',
2415 [('', 'three', '', 'three'),
2415 [('', 'three', '', 'three'),
2416 ('', 'four', '', 'four'),
2416 ('', 'four', '', 'four'),
2417 ('', 'five', '', 'five'),
2417 ('', 'five', '', 'five'),
2418 ] + remoteopts,
2418 ] + remoteopts,
2419 _('REPO [OPTIONS]... [ONE [TWO]]'))
2419 _('REPO [OPTIONS]... [ONE [TWO]]'))
2420 def debugwireargs(ui, repopath, *vals, **opts):
2420 def debugwireargs(ui, repopath, *vals, **opts):
2421 repo = hg.peer(ui, opts, repopath)
2421 repo = hg.peer(ui, opts, repopath)
2422 for opt in remoteopts:
2422 for opt in remoteopts:
2423 del opts[opt[1]]
2423 del opts[opt[1]]
2424 args = {}
2424 args = {}
2425 for k, v in opts.iteritems():
2425 for k, v in opts.iteritems():
2426 if v:
2426 if v:
2427 args[k] = v
2427 args[k] = v
2428 # run twice to check that we don't mess up the stream for the next command
2428 # run twice to check that we don't mess up the stream for the next command
2429 res1 = repo.debugwireargs(*vals, **args)
2429 res1 = repo.debugwireargs(*vals, **args)
2430 res2 = repo.debugwireargs(*vals, **args)
2430 res2 = repo.debugwireargs(*vals, **args)
2431 ui.write("%s\n" % res1)
2431 ui.write("%s\n" % res1)
2432 if res1 != res2:
2432 if res1 != res2:
2433 ui.warn("%s\n" % res2)
2433 ui.warn("%s\n" % res2)
2434
2434
2435 @command('^diff',
2435 @command('^diff',
2436 [('r', 'rev', [], _('revision'), _('REV')),
2436 [('r', 'rev', [], _('revision'), _('REV')),
2437 ('c', 'change', '', _('change made by revision'), _('REV'))
2437 ('c', 'change', '', _('change made by revision'), _('REV'))
2438 ] + diffopts + diffopts2 + walkopts + subrepoopts,
2438 ] + diffopts + diffopts2 + walkopts + subrepoopts,
2439 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'))
2439 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'))
2440 def diff(ui, repo, *pats, **opts):
2440 def diff(ui, repo, *pats, **opts):
2441 """diff repository (or selected files)
2441 """diff repository (or selected files)
2442
2442
2443 Show differences between revisions for the specified files.
2443 Show differences between revisions for the specified files.
2444
2444
2445 Differences between files are shown using the unified diff format.
2445 Differences between files are shown using the unified diff format.
2446
2446
2447 .. note::
2447 .. note::
2448 diff may generate unexpected results for merges, as it will
2448 diff may generate unexpected results for merges, as it will
2449 default to comparing against the working directory's first
2449 default to comparing against the working directory's first
2450 parent changeset if no revisions are specified.
2450 parent changeset if no revisions are specified.
2451
2451
2452 When two revision arguments are given, then changes are shown
2452 When two revision arguments are given, then changes are shown
2453 between those revisions. If only one revision is specified then
2453 between those revisions. If only one revision is specified then
2454 that revision is compared to the working directory, and, when no
2454 that revision is compared to the working directory, and, when no
2455 revisions are specified, the working directory files are compared
2455 revisions are specified, the working directory files are compared
2456 to its parent.
2456 to its parent.
2457
2457
2458 Alternatively you can specify -c/--change with a revision to see
2458 Alternatively you can specify -c/--change with a revision to see
2459 the changes in that changeset relative to its first parent.
2459 the changes in that changeset relative to its first parent.
2460
2460
2461 Without the -a/--text option, diff will avoid generating diffs of
2461 Without the -a/--text option, diff will avoid generating diffs of
2462 files it detects as binary. With -a, diff will generate a diff
2462 files it detects as binary. With -a, diff will generate a diff
2463 anyway, probably with undesirable results.
2463 anyway, probably with undesirable results.
2464
2464
2465 Use the -g/--git option to generate diffs in the git extended diff
2465 Use the -g/--git option to generate diffs in the git extended diff
2466 format. For more information, read :hg:`help diffs`.
2466 format. For more information, read :hg:`help diffs`.
2467
2467
2468 .. container:: verbose
2468 .. container:: verbose
2469
2469
2470 Examples:
2470 Examples:
2471
2471
2472 - compare a file in the current working directory to its parent::
2472 - compare a file in the current working directory to its parent::
2473
2473
2474 hg diff foo.c
2474 hg diff foo.c
2475
2475
2476 - compare two historical versions of a directory, with rename info::
2476 - compare two historical versions of a directory, with rename info::
2477
2477
2478 hg diff --git -r 1.0:1.2 lib/
2478 hg diff --git -r 1.0:1.2 lib/
2479
2479
2480 - get change stats relative to the last change on some date::
2480 - get change stats relative to the last change on some date::
2481
2481
2482 hg diff --stat -r "date('may 2')"
2482 hg diff --stat -r "date('may 2')"
2483
2483
2484 - diff all newly-added files that contain a keyword::
2484 - diff all newly-added files that contain a keyword::
2485
2485
2486 hg diff "set:added() and grep(GNU)"
2486 hg diff "set:added() and grep(GNU)"
2487
2487
2488 - compare a revision and its parents::
2488 - compare a revision and its parents::
2489
2489
2490 hg diff -c 9353 # compare against first parent
2490 hg diff -c 9353 # compare against first parent
2491 hg diff -r 9353^:9353 # same using revset syntax
2491 hg diff -r 9353^:9353 # same using revset syntax
2492 hg diff -r 9353^2:9353 # compare against the second parent
2492 hg diff -r 9353^2:9353 # compare against the second parent
2493
2493
2494 Returns 0 on success.
2494 Returns 0 on success.
2495 """
2495 """
2496
2496
2497 revs = opts.get('rev')
2497 revs = opts.get('rev')
2498 change = opts.get('change')
2498 change = opts.get('change')
2499 stat = opts.get('stat')
2499 stat = opts.get('stat')
2500 reverse = opts.get('reverse')
2500 reverse = opts.get('reverse')
2501
2501
2502 if revs and change:
2502 if revs and change:
2503 msg = _('cannot specify --rev and --change at the same time')
2503 msg = _('cannot specify --rev and --change at the same time')
2504 raise util.Abort(msg)
2504 raise util.Abort(msg)
2505 elif change:
2505 elif change:
2506 node2 = scmutil.revsingle(repo, change, None).node()
2506 node2 = scmutil.revsingle(repo, change, None).node()
2507 node1 = repo[node2].p1().node()
2507 node1 = repo[node2].p1().node()
2508 else:
2508 else:
2509 node1, node2 = scmutil.revpair(repo, revs)
2509 node1, node2 = scmutil.revpair(repo, revs)
2510
2510
2511 if reverse:
2511 if reverse:
2512 node1, node2 = node2, node1
2512 node1, node2 = node2, node1
2513
2513
2514 diffopts = patch.diffopts(ui, opts)
2514 diffopts = patch.diffopts(ui, opts)
2515 m = scmutil.match(repo[node2], pats, opts)
2515 m = scmutil.match(repo[node2], pats, opts)
2516 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
2516 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
2517 listsubrepos=opts.get('subrepos'))
2517 listsubrepos=opts.get('subrepos'))
2518
2518
2519 @command('^export',
2519 @command('^export',
2520 [('o', 'output', '',
2520 [('o', 'output', '',
2521 _('print output to file with formatted name'), _('FORMAT')),
2521 _('print output to file with formatted name'), _('FORMAT')),
2522 ('', 'switch-parent', None, _('diff against the second parent')),
2522 ('', 'switch-parent', None, _('diff against the second parent')),
2523 ('r', 'rev', [], _('revisions to export'), _('REV')),
2523 ('r', 'rev', [], _('revisions to export'), _('REV')),
2524 ] + diffopts,
2524 ] + diffopts,
2525 _('[OPTION]... [-o OUTFILESPEC] [-r] REV...'))
2525 _('[OPTION]... [-o OUTFILESPEC] [-r] REV...'))
2526 def export(ui, repo, *changesets, **opts):
2526 def export(ui, repo, *changesets, **opts):
2527 """dump the header and diffs for one or more changesets
2527 """dump the header and diffs for one or more changesets
2528
2528
2529 Print the changeset header and diffs for one or more revisions.
2529 Print the changeset header and diffs for one or more revisions.
2530
2530
2531 The information shown in the changeset header is: author, date,
2531 The information shown in the changeset header is: author, date,
2532 branch name (if non-default), changeset hash, parent(s) and commit
2532 branch name (if non-default), changeset hash, parent(s) and commit
2533 comment.
2533 comment.
2534
2534
2535 .. note::
2535 .. note::
2536 export may generate unexpected diff output for merge
2536 export may generate unexpected diff output for merge
2537 changesets, as it will compare the merge changeset against its
2537 changesets, as it will compare the merge changeset against its
2538 first parent only.
2538 first parent only.
2539
2539
2540 Output may be to a file, in which case the name of the file is
2540 Output may be to a file, in which case the name of the file is
2541 given using a format string. The formatting rules are as follows:
2541 given using a format string. The formatting rules are as follows:
2542
2542
2543 :``%%``: literal "%" character
2543 :``%%``: literal "%" character
2544 :``%H``: changeset hash (40 hexadecimal digits)
2544 :``%H``: changeset hash (40 hexadecimal digits)
2545 :``%N``: number of patches being generated
2545 :``%N``: number of patches being generated
2546 :``%R``: changeset revision number
2546 :``%R``: changeset revision number
2547 :``%b``: basename of the exporting repository
2547 :``%b``: basename of the exporting repository
2548 :``%h``: short-form changeset hash (12 hexadecimal digits)
2548 :``%h``: short-form changeset hash (12 hexadecimal digits)
2549 :``%m``: first line of the commit message (only alphanumeric characters)
2549 :``%m``: first line of the commit message (only alphanumeric characters)
2550 :``%n``: zero-padded sequence number, starting at 1
2550 :``%n``: zero-padded sequence number, starting at 1
2551 :``%r``: zero-padded changeset revision number
2551 :``%r``: zero-padded changeset revision number
2552
2552
2553 Without the -a/--text option, export will avoid generating diffs
2553 Without the -a/--text option, export will avoid generating diffs
2554 of files it detects as binary. With -a, export will generate a
2554 of files it detects as binary. With -a, export will generate a
2555 diff anyway, probably with undesirable results.
2555 diff anyway, probably with undesirable results.
2556
2556
2557 Use the -g/--git option to generate diffs in the git extended diff
2557 Use the -g/--git option to generate diffs in the git extended diff
2558 format. See :hg:`help diffs` for more information.
2558 format. See :hg:`help diffs` for more information.
2559
2559
2560 With the --switch-parent option, the diff will be against the
2560 With the --switch-parent option, the diff will be against the
2561 second parent. It can be useful to review a merge.
2561 second parent. It can be useful to review a merge.
2562
2562
2563 .. container:: verbose
2563 .. container:: verbose
2564
2564
2565 Examples:
2565 Examples:
2566
2566
2567 - use export and import to transplant a bugfix to the current
2567 - use export and import to transplant a bugfix to the current
2568 branch::
2568 branch::
2569
2569
2570 hg export -r 9353 | hg import -
2570 hg export -r 9353 | hg import -
2571
2571
2572 - export all the changesets between two revisions to a file with
2572 - export all the changesets between two revisions to a file with
2573 rename information::
2573 rename information::
2574
2574
2575 hg export --git -r 123:150 > changes.txt
2575 hg export --git -r 123:150 > changes.txt
2576
2576
2577 - split outgoing changes into a series of patches with
2577 - split outgoing changes into a series of patches with
2578 descriptive names::
2578 descriptive names::
2579
2579
2580 hg export -r "outgoing()" -o "%n-%m.patch"
2580 hg export -r "outgoing()" -o "%n-%m.patch"
2581
2581
2582 Returns 0 on success.
2582 Returns 0 on success.
2583 """
2583 """
2584 changesets += tuple(opts.get('rev', []))
2584 changesets += tuple(opts.get('rev', []))
2585 revs = scmutil.revrange(repo, changesets)
2585 revs = scmutil.revrange(repo, changesets)
2586 if not revs:
2586 if not revs:
2587 raise util.Abort(_("export requires at least one changeset"))
2587 raise util.Abort(_("export requires at least one changeset"))
2588 if len(revs) > 1:
2588 if len(revs) > 1:
2589 ui.note(_('exporting patches:\n'))
2589 ui.note(_('exporting patches:\n'))
2590 else:
2590 else:
2591 ui.note(_('exporting patch:\n'))
2591 ui.note(_('exporting patch:\n'))
2592 cmdutil.export(repo, revs, template=opts.get('output'),
2592 cmdutil.export(repo, revs, template=opts.get('output'),
2593 switch_parent=opts.get('switch_parent'),
2593 switch_parent=opts.get('switch_parent'),
2594 opts=patch.diffopts(ui, opts))
2594 opts=patch.diffopts(ui, opts))
2595
2595
2596 @command('^forget', walkopts, _('[OPTION]... FILE...'))
2596 @command('^forget', walkopts, _('[OPTION]... FILE...'))
2597 def forget(ui, repo, *pats, **opts):
2597 def forget(ui, repo, *pats, **opts):
2598 """forget the specified files on the next commit
2598 """forget the specified files on the next commit
2599
2599
2600 Mark the specified files so they will no longer be tracked
2600 Mark the specified files so they will no longer be tracked
2601 after the next commit.
2601 after the next commit.
2602
2602
2603 This only removes files from the current branch, not from the
2603 This only removes files from the current branch, not from the
2604 entire project history, and it does not delete them from the
2604 entire project history, and it does not delete them from the
2605 working directory.
2605 working directory.
2606
2606
2607 To undo a forget before the next commit, see :hg:`add`.
2607 To undo a forget before the next commit, see :hg:`add`.
2608
2608
2609 .. container:: verbose
2609 .. container:: verbose
2610
2610
2611 Examples:
2611 Examples:
2612
2612
2613 - forget newly-added binary files::
2613 - forget newly-added binary files::
2614
2614
2615 hg forget "set:added() and binary()"
2615 hg forget "set:added() and binary()"
2616
2616
2617 - forget files that would be excluded by .hgignore::
2617 - forget files that would be excluded by .hgignore::
2618
2618
2619 hg forget "set:hgignore()"
2619 hg forget "set:hgignore()"
2620
2620
2621 Returns 0 on success.
2621 Returns 0 on success.
2622 """
2622 """
2623
2623
2624 if not pats:
2624 if not pats:
2625 raise util.Abort(_('no files specified'))
2625 raise util.Abort(_('no files specified'))
2626
2626
2627 m = scmutil.match(repo[None], pats, opts)
2627 m = scmutil.match(repo[None], pats, opts)
2628 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2628 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2629 return rejected and 1 or 0
2629 return rejected and 1 or 0
2630
2630
2631 @command(
2631 @command(
2632 'graft',
2632 'graft',
2633 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2633 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2634 ('c', 'continue', False, _('resume interrupted graft')),
2634 ('c', 'continue', False, _('resume interrupted graft')),
2635 ('e', 'edit', False, _('invoke editor on commit messages')),
2635 ('e', 'edit', False, _('invoke editor on commit messages')),
2636 ('', 'log', None, _('append graft info to log message')),
2636 ('', 'log', None, _('append graft info to log message')),
2637 ('D', 'currentdate', False,
2637 ('D', 'currentdate', False,
2638 _('record the current date as commit date')),
2638 _('record the current date as commit date')),
2639 ('U', 'currentuser', False,
2639 ('U', 'currentuser', False,
2640 _('record the current user as committer'), _('DATE'))]
2640 _('record the current user as committer'), _('DATE'))]
2641 + commitopts2 + mergetoolopts + dryrunopts,
2641 + commitopts2 + mergetoolopts + dryrunopts,
2642 _('[OPTION]... [-r] REV...'))
2642 _('[OPTION]... [-r] REV...'))
2643 def graft(ui, repo, *revs, **opts):
2643 def graft(ui, repo, *revs, **opts):
2644 '''copy changes from other branches onto the current branch
2644 '''copy changes from other branches onto the current branch
2645
2645
2646 This command uses Mercurial's merge logic to copy individual
2646 This command uses Mercurial's merge logic to copy individual
2647 changes from other branches without merging branches in the
2647 changes from other branches without merging branches in the
2648 history graph. This is sometimes known as 'backporting' or
2648 history graph. This is sometimes known as 'backporting' or
2649 'cherry-picking'. By default, graft will copy user, date, and
2649 'cherry-picking'. By default, graft will copy user, date, and
2650 description from the source changesets.
2650 description from the source changesets.
2651
2651
2652 Changesets that are ancestors of the current revision, that have
2652 Changesets that are ancestors of the current revision, that have
2653 already been grafted, or that are merges will be skipped.
2653 already been grafted, or that are merges will be skipped.
2654
2654
2655 If --log is specified, log messages will have a comment appended
2655 If --log is specified, log messages will have a comment appended
2656 of the form::
2656 of the form::
2657
2657
2658 (grafted from CHANGESETHASH)
2658 (grafted from CHANGESETHASH)
2659
2659
2660 If a graft merge results in conflicts, the graft process is
2660 If a graft merge results in conflicts, the graft process is
2661 interrupted so that the current merge can be manually resolved.
2661 interrupted so that the current merge can be manually resolved.
2662 Once all conflicts are addressed, the graft process can be
2662 Once all conflicts are addressed, the graft process can be
2663 continued with the -c/--continue option.
2663 continued with the -c/--continue option.
2664
2664
2665 .. note::
2665 .. note::
2666 The -c/--continue option does not reapply earlier options.
2666 The -c/--continue option does not reapply earlier options.
2667
2667
2668 .. container:: verbose
2668 .. container:: verbose
2669
2669
2670 Examples:
2670 Examples:
2671
2671
2672 - copy a single change to the stable branch and edit its description::
2672 - copy a single change to the stable branch and edit its description::
2673
2673
2674 hg update stable
2674 hg update stable
2675 hg graft --edit 9393
2675 hg graft --edit 9393
2676
2676
2677 - graft a range of changesets with one exception, updating dates::
2677 - graft a range of changesets with one exception, updating dates::
2678
2678
2679 hg graft -D "2085::2093 and not 2091"
2679 hg graft -D "2085::2093 and not 2091"
2680
2680
2681 - continue a graft after resolving conflicts::
2681 - continue a graft after resolving conflicts::
2682
2682
2683 hg graft -c
2683 hg graft -c
2684
2684
2685 - show the source of a grafted changeset::
2685 - show the source of a grafted changeset::
2686
2686
2687 hg log --debug -r tip
2687 hg log --debug -r tip
2688
2688
2689 Returns 0 on successful completion.
2689 Returns 0 on successful completion.
2690 '''
2690 '''
2691
2691
2692 revs = list(revs)
2692 revs = list(revs)
2693 revs.extend(opts['rev'])
2693 revs.extend(opts['rev'])
2694
2694
2695 if not opts.get('user') and opts.get('currentuser'):
2695 if not opts.get('user') and opts.get('currentuser'):
2696 opts['user'] = ui.username()
2696 opts['user'] = ui.username()
2697 if not opts.get('date') and opts.get('currentdate'):
2697 if not opts.get('date') and opts.get('currentdate'):
2698 opts['date'] = "%d %d" % util.makedate()
2698 opts['date'] = "%d %d" % util.makedate()
2699
2699
2700 editor = None
2700 editor = None
2701 if opts.get('edit'):
2701 if opts.get('edit'):
2702 editor = cmdutil.commitforceeditor
2702 editor = cmdutil.commitforceeditor
2703
2703
2704 cont = False
2704 cont = False
2705 if opts['continue']:
2705 if opts['continue']:
2706 cont = True
2706 cont = True
2707 if revs:
2707 if revs:
2708 raise util.Abort(_("can't specify --continue and revisions"))
2708 raise util.Abort(_("can't specify --continue and revisions"))
2709 # read in unfinished revisions
2709 # read in unfinished revisions
2710 try:
2710 try:
2711 nodes = repo.opener.read('graftstate').splitlines()
2711 nodes = repo.opener.read('graftstate').splitlines()
2712 revs = [repo[node].rev() for node in nodes]
2712 revs = [repo[node].rev() for node in nodes]
2713 except IOError, inst:
2713 except IOError, inst:
2714 if inst.errno != errno.ENOENT:
2714 if inst.errno != errno.ENOENT:
2715 raise
2715 raise
2716 raise util.Abort(_("no graft state found, can't continue"))
2716 raise util.Abort(_("no graft state found, can't continue"))
2717 else:
2717 else:
2718 cmdutil.bailifchanged(repo)
2718 cmdutil.bailifchanged(repo)
2719 if not revs:
2719 if not revs:
2720 raise util.Abort(_('no revisions specified'))
2720 raise util.Abort(_('no revisions specified'))
2721 revs = scmutil.revrange(repo, revs)
2721 revs = scmutil.revrange(repo, revs)
2722
2722
2723 # check for merges
2723 # check for merges
2724 for rev in repo.revs('%ld and merge()', revs):
2724 for rev in repo.revs('%ld and merge()', revs):
2725 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2725 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2726 revs.remove(rev)
2726 revs.remove(rev)
2727 if not revs:
2727 if not revs:
2728 return -1
2728 return -1
2729
2729
2730 # check for ancestors of dest branch
2730 # check for ancestors of dest branch
2731 for rev in repo.revs('::. and %ld', revs):
2731 for rev in repo.revs('::. and %ld', revs):
2732 ui.warn(_('skipping ancestor revision %s\n') % rev)
2732 ui.warn(_('skipping ancestor revision %s\n') % rev)
2733 revs.remove(rev)
2733 revs.remove(rev)
2734 if not revs:
2734 if not revs:
2735 return -1
2735 return -1
2736
2736
2737 # analyze revs for earlier grafts
2737 # analyze revs for earlier grafts
2738 ids = {}
2738 ids = {}
2739 for ctx in repo.set("%ld", revs):
2739 for ctx in repo.set("%ld", revs):
2740 ids[ctx.hex()] = ctx.rev()
2740 ids[ctx.hex()] = ctx.rev()
2741 n = ctx.extra().get('source')
2741 n = ctx.extra().get('source')
2742 if n:
2742 if n:
2743 ids[n] = ctx.rev()
2743 ids[n] = ctx.rev()
2744
2744
2745 # check ancestors for earlier grafts
2745 # check ancestors for earlier grafts
2746 ui.debug('scanning for duplicate grafts\n')
2746 ui.debug('scanning for duplicate grafts\n')
2747 for ctx in repo.set("::. - ::%ld", revs):
2747 for ctx in repo.set("::. - ::%ld", revs):
2748 n = ctx.extra().get('source')
2748 n = ctx.extra().get('source')
2749 if n in ids:
2749 if n in ids:
2750 r = repo[n].rev()
2750 r = repo[n].rev()
2751 if r in revs:
2751 if r in revs:
2752 ui.warn(_('skipping already grafted revision %s\n') % r)
2752 ui.warn(_('skipping already grafted revision %s\n') % r)
2753 revs.remove(r)
2753 revs.remove(r)
2754 elif ids[n] in revs:
2754 elif ids[n] in revs:
2755 ui.warn(_('skipping already grafted revision %s '
2755 ui.warn(_('skipping already grafted revision %s '
2756 '(same origin %d)\n') % (ids[n], r))
2756 '(same origin %d)\n') % (ids[n], r))
2757 revs.remove(ids[n])
2757 revs.remove(ids[n])
2758 elif ctx.hex() in ids:
2758 elif ctx.hex() in ids:
2759 r = ids[ctx.hex()]
2759 r = ids[ctx.hex()]
2760 ui.warn(_('skipping already grafted revision %s '
2760 ui.warn(_('skipping already grafted revision %s '
2761 '(was grafted from %d)\n') % (r, ctx.rev()))
2761 '(was grafted from %d)\n') % (r, ctx.rev()))
2762 revs.remove(r)
2762 revs.remove(r)
2763 if not revs:
2763 if not revs:
2764 return -1
2764 return -1
2765
2765
2766 wlock = repo.wlock()
2766 wlock = repo.wlock()
2767 try:
2767 try:
2768 for pos, ctx in enumerate(repo.set("%ld", revs)):
2768 for pos, ctx in enumerate(repo.set("%ld", revs)):
2769 current = repo['.']
2769 current = repo['.']
2770
2770
2771 ui.status(_('grafting revision %s\n') % ctx.rev())
2771 ui.status(_('grafting revision %s\n') % ctx.rev())
2772 if opts.get('dry_run'):
2772 if opts.get('dry_run'):
2773 continue
2773 continue
2774
2774
2775 # we don't merge the first commit when continuing
2775 # we don't merge the first commit when continuing
2776 if not cont:
2776 if not cont:
2777 # perform the graft merge with p1(rev) as 'ancestor'
2777 # perform the graft merge with p1(rev) as 'ancestor'
2778 try:
2778 try:
2779 # ui.forcemerge is an internal variable, do not document
2779 # ui.forcemerge is an internal variable, do not document
2780 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
2780 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
2781 stats = mergemod.update(repo, ctx.node(), True, True, False,
2781 stats = mergemod.update(repo, ctx.node(), True, True, False,
2782 ctx.p1().node())
2782 ctx.p1().node())
2783 finally:
2783 finally:
2784 repo.ui.setconfig('ui', 'forcemerge', '')
2784 repo.ui.setconfig('ui', 'forcemerge', '')
2785 # report any conflicts
2785 # report any conflicts
2786 if stats and stats[3] > 0:
2786 if stats and stats[3] > 0:
2787 # write out state for --continue
2787 # write out state for --continue
2788 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2788 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2789 repo.opener.write('graftstate', ''.join(nodelines))
2789 repo.opener.write('graftstate', ''.join(nodelines))
2790 raise util.Abort(
2790 raise util.Abort(
2791 _("unresolved conflicts, can't continue"),
2791 _("unresolved conflicts, can't continue"),
2792 hint=_('use hg resolve and hg graft --continue'))
2792 hint=_('use hg resolve and hg graft --continue'))
2793 else:
2793 else:
2794 cont = False
2794 cont = False
2795
2795
2796 # drop the second merge parent
2796 # drop the second merge parent
2797 repo.setparents(current.node(), nullid)
2797 repo.setparents(current.node(), nullid)
2798 repo.dirstate.write()
2798 repo.dirstate.write()
2799 # fix up dirstate for copies and renames
2799 # fix up dirstate for copies and renames
2800 cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())
2800 cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())
2801
2801
2802 # commit
2802 # commit
2803 source = ctx.extra().get('source')
2803 source = ctx.extra().get('source')
2804 if not source:
2804 if not source:
2805 source = ctx.hex()
2805 source = ctx.hex()
2806 extra = {'source': source}
2806 extra = {'source': source}
2807 user = ctx.user()
2807 user = ctx.user()
2808 if opts.get('user'):
2808 if opts.get('user'):
2809 user = opts['user']
2809 user = opts['user']
2810 date = ctx.date()
2810 date = ctx.date()
2811 if opts.get('date'):
2811 if opts.get('date'):
2812 date = opts['date']
2812 date = opts['date']
2813 message = ctx.description()
2813 message = ctx.description()
2814 if opts.get('log'):
2814 if opts.get('log'):
2815 message += '\n(grafted from %s)' % ctx.hex()
2815 message += '\n(grafted from %s)' % ctx.hex()
2816 node = repo.commit(text=message, user=user,
2816 node = repo.commit(text=message, user=user,
2817 date=date, extra=extra, editor=editor)
2817 date=date, extra=extra, editor=editor)
2818 if node is None:
2818 if node is None:
2819 ui.status(_('graft for revision %s is empty\n') % ctx.rev())
2819 ui.status(_('graft for revision %s is empty\n') % ctx.rev())
2820 finally:
2820 finally:
2821 wlock.release()
2821 wlock.release()
2822
2822
2823 # remove state when we complete successfully
2823 # remove state when we complete successfully
2824 if not opts.get('dry_run') and os.path.exists(repo.join('graftstate')):
2824 if not opts.get('dry_run') and os.path.exists(repo.join('graftstate')):
2825 util.unlinkpath(repo.join('graftstate'))
2825 util.unlinkpath(repo.join('graftstate'))
2826
2826
2827 return 0
2827 return 0
2828
2828
2829 @command('grep',
2829 @command('grep',
2830 [('0', 'print0', None, _('end fields with NUL')),
2830 [('0', 'print0', None, _('end fields with NUL')),
2831 ('', 'all', None, _('print all revisions that match')),
2831 ('', 'all', None, _('print all revisions that match')),
2832 ('a', 'text', None, _('treat all files as text')),
2832 ('a', 'text', None, _('treat all files as text')),
2833 ('f', 'follow', None,
2833 ('f', 'follow', None,
2834 _('follow changeset history,'
2834 _('follow changeset history,'
2835 ' or file history across copies and renames')),
2835 ' or file history across copies and renames')),
2836 ('i', 'ignore-case', None, _('ignore case when matching')),
2836 ('i', 'ignore-case', None, _('ignore case when matching')),
2837 ('l', 'files-with-matches', None,
2837 ('l', 'files-with-matches', None,
2838 _('print only filenames and revisions that match')),
2838 _('print only filenames and revisions that match')),
2839 ('n', 'line-number', None, _('print matching line numbers')),
2839 ('n', 'line-number', None, _('print matching line numbers')),
2840 ('r', 'rev', [],
2840 ('r', 'rev', [],
2841 _('only search files changed within revision range'), _('REV')),
2841 _('only search files changed within revision range'), _('REV')),
2842 ('u', 'user', None, _('list the author (long with -v)')),
2842 ('u', 'user', None, _('list the author (long with -v)')),
2843 ('d', 'date', None, _('list the date (short with -q)')),
2843 ('d', 'date', None, _('list the date (short with -q)')),
2844 ] + walkopts,
2844 ] + walkopts,
2845 _('[OPTION]... PATTERN [FILE]...'))
2845 _('[OPTION]... PATTERN [FILE]...'))
2846 def grep(ui, repo, pattern, *pats, **opts):
2846 def grep(ui, repo, pattern, *pats, **opts):
2847 """search for a pattern in specified files and revisions
2847 """search for a pattern in specified files and revisions
2848
2848
2849 Search revisions of files for a regular expression.
2849 Search revisions of files for a regular expression.
2850
2850
2851 This command behaves differently than Unix grep. It only accepts
2851 This command behaves differently than Unix grep. It only accepts
2852 Python/Perl regexps. It searches repository history, not the
2852 Python/Perl regexps. It searches repository history, not the
2853 working directory. It always prints the revision number in which a
2853 working directory. It always prints the revision number in which a
2854 match appears.
2854 match appears.
2855
2855
2856 By default, grep only prints output for the first revision of a
2856 By default, grep only prints output for the first revision of a
2857 file in which it finds a match. To get it to print every revision
2857 file in which it finds a match. To get it to print every revision
2858 that contains a change in match status ("-" for a match that
2858 that contains a change in match status ("-" for a match that
2859 becomes a non-match, or "+" for a non-match that becomes a match),
2859 becomes a non-match, or "+" for a non-match that becomes a match),
2860 use the --all flag.
2860 use the --all flag.
2861
2861
2862 Returns 0 if a match is found, 1 otherwise.
2862 Returns 0 if a match is found, 1 otherwise.
2863 """
2863 """
2864 reflags = re.M
2864 reflags = re.M
2865 if opts.get('ignore_case'):
2865 if opts.get('ignore_case'):
2866 reflags |= re.I
2866 reflags |= re.I
2867 try:
2867 try:
2868 regexp = re.compile(pattern, reflags)
2868 regexp = re.compile(pattern, reflags)
2869 except re.error, inst:
2869 except re.error, inst:
2870 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2870 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2871 return 1
2871 return 1
2872 sep, eol = ':', '\n'
2872 sep, eol = ':', '\n'
2873 if opts.get('print0'):
2873 if opts.get('print0'):
2874 sep = eol = '\0'
2874 sep = eol = '\0'
2875
2875
2876 getfile = util.lrucachefunc(repo.file)
2876 getfile = util.lrucachefunc(repo.file)
2877
2877
2878 def matchlines(body):
2878 def matchlines(body):
2879 begin = 0
2879 begin = 0
2880 linenum = 0
2880 linenum = 0
2881 while True:
2881 while True:
2882 match = regexp.search(body, begin)
2882 match = regexp.search(body, begin)
2883 if not match:
2883 if not match:
2884 break
2884 break
2885 mstart, mend = match.span()
2885 mstart, mend = match.span()
2886 linenum += body.count('\n', begin, mstart) + 1
2886 linenum += body.count('\n', begin, mstart) + 1
2887 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2887 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2888 begin = body.find('\n', mend) + 1 or len(body) + 1
2888 begin = body.find('\n', mend) + 1 or len(body) + 1
2889 lend = begin - 1
2889 lend = begin - 1
2890 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2890 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2891
2891
2892 class linestate(object):
2892 class linestate(object):
2893 def __init__(self, line, linenum, colstart, colend):
2893 def __init__(self, line, linenum, colstart, colend):
2894 self.line = line
2894 self.line = line
2895 self.linenum = linenum
2895 self.linenum = linenum
2896 self.colstart = colstart
2896 self.colstart = colstart
2897 self.colend = colend
2897 self.colend = colend
2898
2898
2899 def __hash__(self):
2899 def __hash__(self):
2900 return hash((self.linenum, self.line))
2900 return hash((self.linenum, self.line))
2901
2901
2902 def __eq__(self, other):
2902 def __eq__(self, other):
2903 return self.line == other.line
2903 return self.line == other.line
2904
2904
2905 matches = {}
2905 matches = {}
2906 copies = {}
2906 copies = {}
2907 def grepbody(fn, rev, body):
2907 def grepbody(fn, rev, body):
2908 matches[rev].setdefault(fn, [])
2908 matches[rev].setdefault(fn, [])
2909 m = matches[rev][fn]
2909 m = matches[rev][fn]
2910 for lnum, cstart, cend, line in matchlines(body):
2910 for lnum, cstart, cend, line in matchlines(body):
2911 s = linestate(line, lnum, cstart, cend)
2911 s = linestate(line, lnum, cstart, cend)
2912 m.append(s)
2912 m.append(s)
2913
2913
2914 def difflinestates(a, b):
2914 def difflinestates(a, b):
2915 sm = difflib.SequenceMatcher(None, a, b)
2915 sm = difflib.SequenceMatcher(None, a, b)
2916 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2916 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2917 if tag == 'insert':
2917 if tag == 'insert':
2918 for i in xrange(blo, bhi):
2918 for i in xrange(blo, bhi):
2919 yield ('+', b[i])
2919 yield ('+', b[i])
2920 elif tag == 'delete':
2920 elif tag == 'delete':
2921 for i in xrange(alo, ahi):
2921 for i in xrange(alo, ahi):
2922 yield ('-', a[i])
2922 yield ('-', a[i])
2923 elif tag == 'replace':
2923 elif tag == 'replace':
2924 for i in xrange(alo, ahi):
2924 for i in xrange(alo, ahi):
2925 yield ('-', a[i])
2925 yield ('-', a[i])
2926 for i in xrange(blo, bhi):
2926 for i in xrange(blo, bhi):
2927 yield ('+', b[i])
2927 yield ('+', b[i])
2928
2928
2929 def display(fn, ctx, pstates, states):
2929 def display(fn, ctx, pstates, states):
2930 rev = ctx.rev()
2930 rev = ctx.rev()
2931 datefunc = ui.quiet and util.shortdate or util.datestr
2931 datefunc = ui.quiet and util.shortdate or util.datestr
2932 found = False
2932 found = False
2933 filerevmatches = {}
2933 filerevmatches = {}
2934 def binary():
2934 def binary():
2935 flog = getfile(fn)
2935 flog = getfile(fn)
2936 return util.binary(flog.read(ctx.filenode(fn)))
2936 return util.binary(flog.read(ctx.filenode(fn)))
2937
2937
2938 if opts.get('all'):
2938 if opts.get('all'):
2939 iter = difflinestates(pstates, states)
2939 iter = difflinestates(pstates, states)
2940 else:
2940 else:
2941 iter = [('', l) for l in states]
2941 iter = [('', l) for l in states]
2942 for change, l in iter:
2942 for change, l in iter:
2943 cols = [fn, str(rev)]
2943 cols = [fn, str(rev)]
2944 before, match, after = None, None, None
2944 before, match, after = None, None, None
2945 if opts.get('line_number'):
2945 if opts.get('line_number'):
2946 cols.append(str(l.linenum))
2946 cols.append(str(l.linenum))
2947 if opts.get('all'):
2947 if opts.get('all'):
2948 cols.append(change)
2948 cols.append(change)
2949 if opts.get('user'):
2949 if opts.get('user'):
2950 cols.append(ui.shortuser(ctx.user()))
2950 cols.append(ui.shortuser(ctx.user()))
2951 if opts.get('date'):
2951 if opts.get('date'):
2952 cols.append(datefunc(ctx.date()))
2952 cols.append(datefunc(ctx.date()))
2953 if opts.get('files_with_matches'):
2953 if opts.get('files_with_matches'):
2954 c = (fn, rev)
2954 c = (fn, rev)
2955 if c in filerevmatches:
2955 if c in filerevmatches:
2956 continue
2956 continue
2957 filerevmatches[c] = 1
2957 filerevmatches[c] = 1
2958 else:
2958 else:
2959 before = l.line[:l.colstart]
2959 before = l.line[:l.colstart]
2960 match = l.line[l.colstart:l.colend]
2960 match = l.line[l.colstart:l.colend]
2961 after = l.line[l.colend:]
2961 after = l.line[l.colend:]
2962 ui.write(sep.join(cols))
2962 ui.write(sep.join(cols))
2963 if before is not None:
2963 if before is not None:
2964 if not opts.get('text') and binary():
2964 if not opts.get('text') and binary():
2965 ui.write(sep + " Binary file matches")
2965 ui.write(sep + " Binary file matches")
2966 else:
2966 else:
2967 ui.write(sep + before)
2967 ui.write(sep + before)
2968 ui.write(match, label='grep.match')
2968 ui.write(match, label='grep.match')
2969 ui.write(after)
2969 ui.write(after)
2970 ui.write(eol)
2970 ui.write(eol)
2971 found = True
2971 found = True
2972 return found
2972 return found
2973
2973
2974 skip = {}
2974 skip = {}
2975 revfiles = {}
2975 revfiles = {}
2976 matchfn = scmutil.match(repo[None], pats, opts)
2976 matchfn = scmutil.match(repo[None], pats, opts)
2977 found = False
2977 found = False
2978 follow = opts.get('follow')
2978 follow = opts.get('follow')
2979
2979
2980 def prep(ctx, fns):
2980 def prep(ctx, fns):
2981 rev = ctx.rev()
2981 rev = ctx.rev()
2982 pctx = ctx.p1()
2982 pctx = ctx.p1()
2983 parent = pctx.rev()
2983 parent = pctx.rev()
2984 matches.setdefault(rev, {})
2984 matches.setdefault(rev, {})
2985 matches.setdefault(parent, {})
2985 matches.setdefault(parent, {})
2986 files = revfiles.setdefault(rev, [])
2986 files = revfiles.setdefault(rev, [])
2987 for fn in fns:
2987 for fn in fns:
2988 flog = getfile(fn)
2988 flog = getfile(fn)
2989 try:
2989 try:
2990 fnode = ctx.filenode(fn)
2990 fnode = ctx.filenode(fn)
2991 except error.LookupError:
2991 except error.LookupError:
2992 continue
2992 continue
2993
2993
2994 copied = flog.renamed(fnode)
2994 copied = flog.renamed(fnode)
2995 copy = follow and copied and copied[0]
2995 copy = follow and copied and copied[0]
2996 if copy:
2996 if copy:
2997 copies.setdefault(rev, {})[fn] = copy
2997 copies.setdefault(rev, {})[fn] = copy
2998 if fn in skip:
2998 if fn in skip:
2999 if copy:
2999 if copy:
3000 skip[copy] = True
3000 skip[copy] = True
3001 continue
3001 continue
3002 files.append(fn)
3002 files.append(fn)
3003
3003
3004 if fn not in matches[rev]:
3004 if fn not in matches[rev]:
3005 grepbody(fn, rev, flog.read(fnode))
3005 grepbody(fn, rev, flog.read(fnode))
3006
3006
3007 pfn = copy or fn
3007 pfn = copy or fn
3008 if pfn not in matches[parent]:
3008 if pfn not in matches[parent]:
3009 try:
3009 try:
3010 fnode = pctx.filenode(pfn)
3010 fnode = pctx.filenode(pfn)
3011 grepbody(pfn, parent, flog.read(fnode))
3011 grepbody(pfn, parent, flog.read(fnode))
3012 except error.LookupError:
3012 except error.LookupError:
3013 pass
3013 pass
3014
3014
3015 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3015 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3016 rev = ctx.rev()
3016 rev = ctx.rev()
3017 parent = ctx.p1().rev()
3017 parent = ctx.p1().rev()
3018 for fn in sorted(revfiles.get(rev, [])):
3018 for fn in sorted(revfiles.get(rev, [])):
3019 states = matches[rev][fn]
3019 states = matches[rev][fn]
3020 copy = copies.get(rev, {}).get(fn)
3020 copy = copies.get(rev, {}).get(fn)
3021 if fn in skip:
3021 if fn in skip:
3022 if copy:
3022 if copy:
3023 skip[copy] = True
3023 skip[copy] = True
3024 continue
3024 continue
3025 pstates = matches.get(parent, {}).get(copy or fn, [])
3025 pstates = matches.get(parent, {}).get(copy or fn, [])
3026 if pstates or states:
3026 if pstates or states:
3027 r = display(fn, ctx, pstates, states)
3027 r = display(fn, ctx, pstates, states)
3028 found = found or r
3028 found = found or r
3029 if r and not opts.get('all'):
3029 if r and not opts.get('all'):
3030 skip[fn] = True
3030 skip[fn] = True
3031 if copy:
3031 if copy:
3032 skip[copy] = True
3032 skip[copy] = True
3033 del matches[rev]
3033 del matches[rev]
3034 del revfiles[rev]
3034 del revfiles[rev]
3035
3035
3036 return not found
3036 return not found
3037
3037
3038 @command('heads',
3038 @command('heads',
3039 [('r', 'rev', '',
3039 [('r', 'rev', '',
3040 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
3040 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
3041 ('t', 'topo', False, _('show topological heads only')),
3041 ('t', 'topo', False, _('show topological heads only')),
3042 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
3042 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
3043 ('c', 'closed', False, _('show normal and closed branch heads')),
3043 ('c', 'closed', False, _('show normal and closed branch heads')),
3044 ] + templateopts,
3044 ] + templateopts,
3045 _('[-ct] [-r STARTREV] [REV]...'))
3045 _('[-ct] [-r STARTREV] [REV]...'))
3046 def heads(ui, repo, *branchrevs, **opts):
3046 def heads(ui, repo, *branchrevs, **opts):
3047 """show current repository heads or show branch heads
3047 """show current repository heads or show branch heads
3048
3048
3049 With no arguments, show all repository branch heads.
3049 With no arguments, show all repository branch heads.
3050
3050
3051 Repository "heads" are changesets with no child changesets. They are
3051 Repository "heads" are changesets with no child changesets. They are
3052 where development generally takes place and are the usual targets
3052 where development generally takes place and are the usual targets
3053 for update and merge operations. Branch heads are changesets that have
3053 for update and merge operations. Branch heads are changesets that have
3054 no child changeset on the same branch.
3054 no child changeset on the same branch.
3055
3055
3056 If one or more REVs are given, only branch heads on the branches
3056 If one or more REVs are given, only branch heads on the branches
3057 associated with the specified changesets are shown. This means
3057 associated with the specified changesets are shown. This means
3058 that you can use :hg:`heads foo` to see the heads on a branch
3058 that you can use :hg:`heads foo` to see the heads on a branch
3059 named ``foo``.
3059 named ``foo``.
3060
3060
3061 If -c/--closed is specified, also show branch heads marked closed
3061 If -c/--closed is specified, also show branch heads marked closed
3062 (see :hg:`commit --close-branch`).
3062 (see :hg:`commit --close-branch`).
3063
3063
3064 If STARTREV is specified, only those heads that are descendants of
3064 If STARTREV is specified, only those heads that are descendants of
3065 STARTREV will be displayed.
3065 STARTREV will be displayed.
3066
3066
3067 If -t/--topo is specified, named branch mechanics will be ignored and only
3067 If -t/--topo is specified, named branch mechanics will be ignored and only
3068 changesets without children will be shown.
3068 changesets without children will be shown.
3069
3069
3070 Returns 0 if matching heads are found, 1 if not.
3070 Returns 0 if matching heads are found, 1 if not.
3071 """
3071 """
3072
3072
3073 start = None
3073 start = None
3074 if 'rev' in opts:
3074 if 'rev' in opts:
3075 start = scmutil.revsingle(repo, opts['rev'], None).node()
3075 start = scmutil.revsingle(repo, opts['rev'], None).node()
3076
3076
3077 if opts.get('topo'):
3077 if opts.get('topo'):
3078 heads = [repo[h] for h in repo.heads(start)]
3078 heads = [repo[h] for h in repo.heads(start)]
3079 else:
3079 else:
3080 heads = []
3080 heads = []
3081 for branch in repo.branchmap():
3081 for branch in repo.branchmap():
3082 heads += repo.branchheads(branch, start, opts.get('closed'))
3082 heads += repo.branchheads(branch, start, opts.get('closed'))
3083 heads = [repo[h] for h in heads]
3083 heads = [repo[h] for h in heads]
3084
3084
3085 if branchrevs:
3085 if branchrevs:
3086 branches = set(repo[br].branch() for br in branchrevs)
3086 branches = set(repo[br].branch() for br in branchrevs)
3087 heads = [h for h in heads if h.branch() in branches]
3087 heads = [h for h in heads if h.branch() in branches]
3088
3088
3089 if opts.get('active') and branchrevs:
3089 if opts.get('active') and branchrevs:
3090 dagheads = repo.heads(start)
3090 dagheads = repo.heads(start)
3091 heads = [h for h in heads if h.node() in dagheads]
3091 heads = [h for h in heads if h.node() in dagheads]
3092
3092
3093 if branchrevs:
3093 if branchrevs:
3094 haveheads = set(h.branch() for h in heads)
3094 haveheads = set(h.branch() for h in heads)
3095 if branches - haveheads:
3095 if branches - haveheads:
3096 headless = ', '.join(b for b in branches - haveheads)
3096 headless = ', '.join(b for b in branches - haveheads)
3097 msg = _('no open branch heads found on branches %s')
3097 msg = _('no open branch heads found on branches %s')
3098 if opts.get('rev'):
3098 if opts.get('rev'):
3099 msg += _(' (started at %s)') % opts['rev']
3099 msg += _(' (started at %s)') % opts['rev']
3100 ui.warn((msg + '\n') % headless)
3100 ui.warn((msg + '\n') % headless)
3101
3101
3102 if not heads:
3102 if not heads:
3103 return 1
3103 return 1
3104
3104
3105 heads = sorted(heads, key=lambda x: -x.rev())
3105 heads = sorted(heads, key=lambda x: -x.rev())
3106 displayer = cmdutil.show_changeset(ui, repo, opts)
3106 displayer = cmdutil.show_changeset(ui, repo, opts)
3107 for ctx in heads:
3107 for ctx in heads:
3108 displayer.show(ctx)
3108 displayer.show(ctx)
3109 displayer.close()
3109 displayer.close()
3110
3110
3111 @command('help',
3111 @command('help',
3112 [('e', 'extension', None, _('show only help for extensions')),
3112 [('e', 'extension', None, _('show only help for extensions')),
3113 ('c', 'command', None, _('show only help for commands')),
3113 ('c', 'command', None, _('show only help for commands')),
3114 ('k', 'keyword', '', _('show topics matching keyword')),
3114 ('k', 'keyword', '', _('show topics matching keyword')),
3115 ],
3115 ],
3116 _('[-ec] [TOPIC]'))
3116 _('[-ec] [TOPIC]'))
3117 def help_(ui, name=None, unknowncmd=False, full=True, **opts):
3117 def help_(ui, name=None, unknowncmd=False, full=True, **opts):
3118 """show help for a given topic or a help overview
3118 """show help for a given topic or a help overview
3119
3119
3120 With no arguments, print a list of commands with short help messages.
3120 With no arguments, print a list of commands with short help messages.
3121
3121
3122 Given a topic, extension, or command name, print help for that
3122 Given a topic, extension, or command name, print help for that
3123 topic.
3123 topic.
3124
3124
3125 Returns 0 if successful.
3125 Returns 0 if successful.
3126 """
3126 """
3127
3127
3128 textwidth = min(ui.termwidth(), 80) - 2
3128 textwidth = min(ui.termwidth(), 80) - 2
3129
3129
3130 def helpcmd(name):
3130 def helpcmd(name):
3131 try:
3131 try:
3132 aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd)
3132 aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd)
3133 except error.AmbiguousCommand, inst:
3133 except error.AmbiguousCommand, inst:
3134 # py3k fix: except vars can't be used outside the scope of the
3134 # py3k fix: except vars can't be used outside the scope of the
3135 # except block, nor can be used inside a lambda. python issue4617
3135 # except block, nor can be used inside a lambda. python issue4617
3136 prefix = inst.args[0]
3136 prefix = inst.args[0]
3137 select = lambda c: c.lstrip('^').startswith(prefix)
3137 select = lambda c: c.lstrip('^').startswith(prefix)
3138 rst = helplist(select)
3138 rst = helplist(select)
3139 return rst
3139 return rst
3140
3140
3141 rst = []
3141 rst = []
3142
3142
3143 # check if it's an invalid alias and display its error if it is
3143 # check if it's an invalid alias and display its error if it is
3144 if getattr(entry[0], 'badalias', False):
3144 if getattr(entry[0], 'badalias', False):
3145 if not unknowncmd:
3145 if not unknowncmd:
3146 ui.pushbuffer()
3146 ui.pushbuffer()
3147 entry[0](ui)
3147 entry[0](ui)
3148 rst.append(ui.popbuffer())
3148 rst.append(ui.popbuffer())
3149 return rst
3149 return rst
3150
3150
3151 # synopsis
3151 # synopsis
3152 if len(entry) > 2:
3152 if len(entry) > 2:
3153 if entry[2].startswith('hg'):
3153 if entry[2].startswith('hg'):
3154 rst.append("%s\n" % entry[2])
3154 rst.append("%s\n" % entry[2])
3155 else:
3155 else:
3156 rst.append('hg %s %s\n' % (aliases[0], entry[2]))
3156 rst.append('hg %s %s\n' % (aliases[0], entry[2]))
3157 else:
3157 else:
3158 rst.append('hg %s\n' % aliases[0])
3158 rst.append('hg %s\n' % aliases[0])
3159 # aliases
3159 # aliases
3160 if full and not ui.quiet and len(aliases) > 1:
3160 if full and not ui.quiet and len(aliases) > 1:
3161 rst.append(_("\naliases: %s\n") % ', '.join(aliases[1:]))
3161 rst.append(_("\naliases: %s\n") % ', '.join(aliases[1:]))
3162 rst.append('\n')
3162 rst.append('\n')
3163
3163
3164 # description
3164 # description
3165 doc = gettext(entry[0].__doc__)
3165 doc = gettext(entry[0].__doc__)
3166 if not doc:
3166 if not doc:
3167 doc = _("(no help text available)")
3167 doc = _("(no help text available)")
3168 if util.safehasattr(entry[0], 'definition'): # aliased command
3168 if util.safehasattr(entry[0], 'definition'): # aliased command
3169 if entry[0].definition.startswith('!'): # shell alias
3169 if entry[0].definition.startswith('!'): # shell alias
3170 doc = _('shell alias for::\n\n %s') % entry[0].definition[1:]
3170 doc = _('shell alias for::\n\n %s') % entry[0].definition[1:]
3171 else:
3171 else:
3172 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
3172 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
3173 doc = doc.splitlines(True)
3173 doc = doc.splitlines(True)
3174 if ui.quiet or not full:
3174 if ui.quiet or not full:
3175 rst.append(doc[0])
3175 rst.append(doc[0])
3176 else:
3176 else:
3177 rst.extend(doc)
3177 rst.extend(doc)
3178 rst.append('\n')
3178 rst.append('\n')
3179
3179
3180 # check if this command shadows a non-trivial (multi-line)
3180 # check if this command shadows a non-trivial (multi-line)
3181 # extension help text
3181 # extension help text
3182 try:
3182 try:
3183 mod = extensions.find(name)
3183 mod = extensions.find(name)
3184 doc = gettext(mod.__doc__) or ''
3184 doc = gettext(mod.__doc__) or ''
3185 if '\n' in doc.strip():
3185 if '\n' in doc.strip():
3186 msg = _('use "hg help -e %s" to show help for '
3186 msg = _('use "hg help -e %s" to show help for '
3187 'the %s extension') % (name, name)
3187 'the %s extension') % (name, name)
3188 rst.append('\n%s\n' % msg)
3188 rst.append('\n%s\n' % msg)
3189 except KeyError:
3189 except KeyError:
3190 pass
3190 pass
3191
3191
3192 # options
3192 # options
3193 if not ui.quiet and entry[1]:
3193 if not ui.quiet and entry[1]:
3194 rst.append('\n%s\n\n' % _("options:"))
3194 rst.append('\n%s\n\n' % _("options:"))
3195 rst.append(help.optrst(entry[1], ui.verbose))
3195 rst.append(help.optrst(entry[1], ui.verbose))
3196
3196
3197 if ui.verbose:
3197 if ui.verbose:
3198 rst.append('\n%s\n\n' % _("global options:"))
3198 rst.append('\n%s\n\n' % _("global options:"))
3199 rst.append(help.optrst(globalopts, ui.verbose))
3199 rst.append(help.optrst(globalopts, ui.verbose))
3200
3200
3201 if not ui.verbose:
3201 if not ui.verbose:
3202 if not full:
3202 if not full:
3203 rst.append(_('\nuse "hg help %s" to show the full help text\n')
3203 rst.append(_('\nuse "hg help %s" to show the full help text\n')
3204 % name)
3204 % name)
3205 elif not ui.quiet:
3205 elif not ui.quiet:
3206 rst.append(_('\nuse "hg -v help %s" to show more info\n')
3206 rst.append(_('\nuse "hg -v help %s" to show more info\n')
3207 % name)
3207 % name)
3208 return rst
3208 return rst
3209
3209
3210
3210
3211 def helplist(select=None):
3211 def helplist(select=None):
3212 # list of commands
3212 # list of commands
3213 if name == "shortlist":
3213 if name == "shortlist":
3214 header = _('basic commands:\n\n')
3214 header = _('basic commands:\n\n')
3215 else:
3215 else:
3216 header = _('list of commands:\n\n')
3216 header = _('list of commands:\n\n')
3217
3217
3218 h = {}
3218 h = {}
3219 cmds = {}
3219 cmds = {}
3220 for c, e in table.iteritems():
3220 for c, e in table.iteritems():
3221 f = c.split("|", 1)[0]
3221 f = c.split("|", 1)[0]
3222 if select and not select(f):
3222 if select and not select(f):
3223 continue
3223 continue
3224 if (not select and name != 'shortlist' and
3224 if (not select and name != 'shortlist' and
3225 e[0].__module__ != __name__):
3225 e[0].__module__ != __name__):
3226 continue
3226 continue
3227 if name == "shortlist" and not f.startswith("^"):
3227 if name == "shortlist" and not f.startswith("^"):
3228 continue
3228 continue
3229 f = f.lstrip("^")
3229 f = f.lstrip("^")
3230 if not ui.debugflag and f.startswith("debug"):
3230 if not ui.debugflag and f.startswith("debug"):
3231 continue
3231 continue
3232 doc = e[0].__doc__
3232 doc = e[0].__doc__
3233 if doc and 'DEPRECATED' in doc and not ui.verbose:
3233 if doc and 'DEPRECATED' in doc and not ui.verbose:
3234 continue
3234 continue
3235 doc = gettext(doc)
3235 doc = gettext(doc)
3236 if not doc:
3236 if not doc:
3237 doc = _("(no help text available)")
3237 doc = _("(no help text available)")
3238 h[f] = doc.splitlines()[0].rstrip()
3238 h[f] = doc.splitlines()[0].rstrip()
3239 cmds[f] = c.lstrip("^")
3239 cmds[f] = c.lstrip("^")
3240
3240
3241 rst = []
3241 rst = []
3242 if not h:
3242 if not h:
3243 if not ui.quiet:
3243 if not ui.quiet:
3244 rst.append(_('no commands defined\n'))
3244 rst.append(_('no commands defined\n'))
3245 return rst
3245 return rst
3246
3246
3247 if not ui.quiet:
3247 if not ui.quiet:
3248 rst.append(header)
3248 rst.append(header)
3249 fns = sorted(h)
3249 fns = sorted(h)
3250 for f in fns:
3250 for f in fns:
3251 if ui.verbose:
3251 if ui.verbose:
3252 commands = cmds[f].replace("|",", ")
3252 commands = cmds[f].replace("|",", ")
3253 rst.append(" :%s: %s\n" % (commands, h[f]))
3253 rst.append(" :%s: %s\n" % (commands, h[f]))
3254 else:
3254 else:
3255 rst.append(' :%s: %s\n' % (f, h[f]))
3255 rst.append(' :%s: %s\n' % (f, h[f]))
3256
3256
3257 if not name:
3257 if not name:
3258 exts = help.listexts(_('enabled extensions:'), extensions.enabled())
3258 exts = help.listexts(_('enabled extensions:'), extensions.enabled())
3259 if exts:
3259 if exts:
3260 rst.append('\n')
3260 rst.append('\n')
3261 rst.extend(exts)
3261 rst.extend(exts)
3262
3262
3263 rst.append(_("\nadditional help topics:\n\n"))
3263 rst.append(_("\nadditional help topics:\n\n"))
3264 topics = []
3264 topics = []
3265 for names, header, doc in help.helptable:
3265 for names, header, doc in help.helptable:
3266 topics.append((sorted(names, key=len, reverse=True)[0], header))
3266 topics.append((sorted(names, key=len, reverse=True)[0], header))
3267 for t, desc in topics:
3267 for t, desc in topics:
3268 rst.append(" :%s: %s\n" % (t, desc))
3268 rst.append(" :%s: %s\n" % (t, desc))
3269
3269
3270 optlist = []
3270 optlist = []
3271 if not ui.quiet:
3271 if not ui.quiet:
3272 if ui.verbose:
3272 if ui.verbose:
3273 optlist.append((_("global options:"), globalopts))
3273 optlist.append((_("global options:"), globalopts))
3274 if name == 'shortlist':
3274 if name == 'shortlist':
3275 optlist.append((_('use "hg help" for the full list '
3275 optlist.append((_('use "hg help" for the full list '
3276 'of commands'), ()))
3276 'of commands'), ()))
3277 else:
3277 else:
3278 if name == 'shortlist':
3278 if name == 'shortlist':
3279 msg = _('use "hg help" for the full list of commands '
3279 msg = _('use "hg help" for the full list of commands '
3280 'or "hg -v" for details')
3280 'or "hg -v" for details')
3281 elif name and not full:
3281 elif name and not full:
3282 msg = _('use "hg help %s" to show the full help '
3282 msg = _('use "hg help %s" to show the full help '
3283 'text') % name
3283 'text') % name
3284 else:
3284 else:
3285 msg = _('use "hg -v help%s" to show builtin aliases and '
3285 msg = _('use "hg -v help%s" to show builtin aliases and '
3286 'global options') % (name and " " + name or "")
3286 'global options') % (name and " " + name or "")
3287 optlist.append((msg, ()))
3287 optlist.append((msg, ()))
3288
3288
3289 if optlist:
3289 if optlist:
3290 for title, options in optlist:
3290 for title, options in optlist:
3291 rst.append('\n%s\n' % title)
3291 rst.append('\n%s\n' % title)
3292 if options:
3292 if options:
3293 rst.append('\n%s\n' % help.optrst(options, ui.verbose))
3293 rst.append('\n%s\n' % help.optrst(options, ui.verbose))
3294 return rst
3294 return rst
3295
3295
3296 def helptopic(name):
3296 def helptopic(name):
3297 for names, header, doc in help.helptable:
3297 for names, header, doc in help.helptable:
3298 if name in names:
3298 if name in names:
3299 break
3299 break
3300 else:
3300 else:
3301 raise error.UnknownCommand(name)
3301 raise error.UnknownCommand(name)
3302
3302
3303 rst = ["%s\n\n" % header]
3303 rst = ["%s\n\n" % header]
3304 # description
3304 # description
3305 if not doc:
3305 if not doc:
3306 rst.append(" %s\n" % _("(no help text available)"))
3306 rst.append(" %s\n" % _("(no help text available)"))
3307 if util.safehasattr(doc, '__call__'):
3307 if util.safehasattr(doc, '__call__'):
3308 rst += [" %s\n" % l for l in doc().splitlines()]
3308 rst += [" %s\n" % l for l in doc().splitlines()]
3309
3309
3310 try:
3310 try:
3311 cmdutil.findcmd(name, table)
3311 cmdutil.findcmd(name, table)
3312 rst.append(_('\nuse "hg help -c %s" to see help for '
3312 rst.append(_('\nuse "hg help -c %s" to see help for '
3313 'the %s command\n') % (name, name))
3313 'the %s command\n') % (name, name))
3314 except error.UnknownCommand:
3314 except error.UnknownCommand:
3315 pass
3315 pass
3316 return rst
3316 return rst
3317
3317
3318 def helpext(name):
3318 def helpext(name):
3319 try:
3319 try:
3320 mod = extensions.find(name)
3320 mod = extensions.find(name)
3321 doc = gettext(mod.__doc__) or _('no help text available')
3321 doc = gettext(mod.__doc__) or _('no help text available')
3322 except KeyError:
3322 except KeyError:
3323 mod = None
3323 mod = None
3324 doc = extensions.disabledext(name)
3324 doc = extensions.disabledext(name)
3325 if not doc:
3325 if not doc:
3326 raise error.UnknownCommand(name)
3326 raise error.UnknownCommand(name)
3327
3327
3328 if '\n' not in doc:
3328 if '\n' not in doc:
3329 head, tail = doc, ""
3329 head, tail = doc, ""
3330 else:
3330 else:
3331 head, tail = doc.split('\n', 1)
3331 head, tail = doc.split('\n', 1)
3332 rst = [_('%s extension - %s\n\n') % (name.split('.')[-1], head)]
3332 rst = [_('%s extension - %s\n\n') % (name.split('.')[-1], head)]
3333 if tail:
3333 if tail:
3334 rst.extend(tail.splitlines(True))
3334 rst.extend(tail.splitlines(True))
3335 rst.append('\n')
3335 rst.append('\n')
3336
3336
3337 if mod:
3337 if mod:
3338 try:
3338 try:
3339 ct = mod.cmdtable
3339 ct = mod.cmdtable
3340 except AttributeError:
3340 except AttributeError:
3341 ct = {}
3341 ct = {}
3342 modcmds = set([c.split('|', 1)[0] for c in ct])
3342 modcmds = set([c.split('|', 1)[0] for c in ct])
3343 rst.extend(helplist(modcmds.__contains__))
3343 rst.extend(helplist(modcmds.__contains__))
3344 else:
3344 else:
3345 rst.append(_('use "hg help extensions" for information on enabling '
3345 rst.append(_('use "hg help extensions" for information on enabling '
3346 'extensions\n'))
3346 'extensions\n'))
3347 return rst
3347 return rst
3348
3348
3349 def helpextcmd(name):
3349 def helpextcmd(name):
3350 cmd, ext, mod = extensions.disabledcmd(ui, name,
3350 cmd, ext, mod = extensions.disabledcmd(ui, name,
3351 ui.configbool('ui', 'strict'))
3351 ui.configbool('ui', 'strict'))
3352 doc = gettext(mod.__doc__).splitlines()[0]
3352 doc = gettext(mod.__doc__).splitlines()[0]
3353
3353
3354 rst = help.listexts(_("'%s' is provided by the following "
3354 rst = help.listexts(_("'%s' is provided by the following "
3355 "extension:") % cmd, {ext: doc}, indent=4)
3355 "extension:") % cmd, {ext: doc}, indent=4)
3356 rst.append('\n')
3356 rst.append('\n')
3357 rst.append(_('use "hg help extensions" for information on enabling '
3357 rst.append(_('use "hg help extensions" for information on enabling '
3358 'extensions\n'))
3358 'extensions\n'))
3359 return rst
3359 return rst
3360
3360
3361
3361
3362 rst = []
3362 rst = []
3363 kw = opts.get('keyword')
3363 kw = opts.get('keyword')
3364 if kw:
3364 if kw:
3365 matches = help.topicmatch(kw)
3365 matches = help.topicmatch(kw)
3366 for t, title in (('topics', _('Topics')),
3366 for t, title in (('topics', _('Topics')),
3367 ('commands', _('Commands')),
3367 ('commands', _('Commands')),
3368 ('extensions', _('Extensions')),
3368 ('extensions', _('Extensions')),
3369 ('extensioncommands', _('Extension Commands'))):
3369 ('extensioncommands', _('Extension Commands'))):
3370 if matches[t]:
3370 if matches[t]:
3371 rst.append('%s:\n\n' % title)
3371 rst.append('%s:\n\n' % title)
3372 rst.extend(minirst.maketable(sorted(matches[t]), 1))
3372 rst.extend(minirst.maketable(sorted(matches[t]), 1))
3373 rst.append('\n')
3373 rst.append('\n')
3374 elif name and name != 'shortlist':
3374 elif name and name != 'shortlist':
3375 i = None
3375 i = None
3376 if unknowncmd:
3376 if unknowncmd:
3377 queries = (helpextcmd,)
3377 queries = (helpextcmd,)
3378 elif opts.get('extension'):
3378 elif opts.get('extension'):
3379 queries = (helpext,)
3379 queries = (helpext,)
3380 elif opts.get('command'):
3380 elif opts.get('command'):
3381 queries = (helpcmd,)
3381 queries = (helpcmd,)
3382 else:
3382 else:
3383 queries = (helptopic, helpcmd, helpext, helpextcmd)
3383 queries = (helptopic, helpcmd, helpext, helpextcmd)
3384 for f in queries:
3384 for f in queries:
3385 try:
3385 try:
3386 rst = f(name)
3386 rst = f(name)
3387 i = None
3387 i = None
3388 break
3388 break
3389 except error.UnknownCommand, inst:
3389 except error.UnknownCommand, inst:
3390 i = inst
3390 i = inst
3391 if i:
3391 if i:
3392 raise i
3392 raise i
3393 else:
3393 else:
3394 # program name
3394 # program name
3395 if not ui.quiet:
3395 if not ui.quiet:
3396 rst = [_("Mercurial Distributed SCM\n"), '\n']
3396 rst = [_("Mercurial Distributed SCM\n"), '\n']
3397 rst.extend(helplist())
3397 rst.extend(helplist())
3398
3398
3399 keep = ui.verbose and ['verbose'] or []
3399 keep = ui.verbose and ['verbose'] or []
3400 formatted, pruned = minirst.format(''.join(rst), textwidth, keep=keep)
3400 formatted, pruned = minirst.format(''.join(rst), textwidth, keep=keep)
3401 ui.write(formatted)
3401 ui.write(formatted)
3402
3402
3403
3403
3404 @command('identify|id',
3404 @command('identify|id',
3405 [('r', 'rev', '',
3405 [('r', 'rev', '',
3406 _('identify the specified revision'), _('REV')),
3406 _('identify the specified revision'), _('REV')),
3407 ('n', 'num', None, _('show local revision number')),
3407 ('n', 'num', None, _('show local revision number')),
3408 ('i', 'id', None, _('show global revision id')),
3408 ('i', 'id', None, _('show global revision id')),
3409 ('b', 'branch', None, _('show branch')),
3409 ('b', 'branch', None, _('show branch')),
3410 ('t', 'tags', None, _('show tags')),
3410 ('t', 'tags', None, _('show tags')),
3411 ('B', 'bookmarks', None, _('show bookmarks')),
3411 ('B', 'bookmarks', None, _('show bookmarks')),
3412 ] + remoteopts,
3412 ] + remoteopts,
3413 _('[-nibtB] [-r REV] [SOURCE]'))
3413 _('[-nibtB] [-r REV] [SOURCE]'))
3414 def identify(ui, repo, source=None, rev=None,
3414 def identify(ui, repo, source=None, rev=None,
3415 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3415 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3416 """identify the working copy or specified revision
3416 """identify the working copy or specified revision
3417
3417
3418 Print a summary identifying the repository state at REV using one or
3418 Print a summary identifying the repository state at REV using one or
3419 two parent hash identifiers, followed by a "+" if the working
3419 two parent hash identifiers, followed by a "+" if the working
3420 directory has uncommitted changes, the branch name (if not default),
3420 directory has uncommitted changes, the branch name (if not default),
3421 a list of tags, and a list of bookmarks.
3421 a list of tags, and a list of bookmarks.
3422
3422
3423 When REV is not given, print a summary of the current state of the
3423 When REV is not given, print a summary of the current state of the
3424 repository.
3424 repository.
3425
3425
3426 Specifying a path to a repository root or Mercurial bundle will
3426 Specifying a path to a repository root or Mercurial bundle will
3427 cause lookup to operate on that repository/bundle.
3427 cause lookup to operate on that repository/bundle.
3428
3428
3429 .. container:: verbose
3429 .. container:: verbose
3430
3430
3431 Examples:
3431 Examples:
3432
3432
3433 - generate a build identifier for the working directory::
3433 - generate a build identifier for the working directory::
3434
3434
3435 hg id --id > build-id.dat
3435 hg id --id > build-id.dat
3436
3436
3437 - find the revision corresponding to a tag::
3437 - find the revision corresponding to a tag::
3438
3438
3439 hg id -n -r 1.3
3439 hg id -n -r 1.3
3440
3440
3441 - check the most recent revision of a remote repository::
3441 - check the most recent revision of a remote repository::
3442
3442
3443 hg id -r tip http://selenic.com/hg/
3443 hg id -r tip http://selenic.com/hg/
3444
3444
3445 Returns 0 if successful.
3445 Returns 0 if successful.
3446 """
3446 """
3447
3447
3448 if not repo and not source:
3448 if not repo and not source:
3449 raise util.Abort(_("there is no Mercurial repository here "
3449 raise util.Abort(_("there is no Mercurial repository here "
3450 "(.hg not found)"))
3450 "(.hg not found)"))
3451
3451
3452 hexfunc = ui.debugflag and hex or short
3452 hexfunc = ui.debugflag and hex or short
3453 default = not (num or id or branch or tags or bookmarks)
3453 default = not (num or id or branch or tags or bookmarks)
3454 output = []
3454 output = []
3455 revs = []
3455 revs = []
3456
3456
3457 if source:
3457 if source:
3458 source, branches = hg.parseurl(ui.expandpath(source))
3458 source, branches = hg.parseurl(ui.expandpath(source))
3459 repo = hg.peer(ui, opts, source)
3459 repo = hg.peer(ui, opts, source)
3460 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
3460 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
3461
3461
3462 if not repo.local():
3462 if not repo.local():
3463 if num or branch or tags:
3463 if num or branch or tags:
3464 raise util.Abort(
3464 raise util.Abort(
3465 _("can't query remote revision number, branch, or tags"))
3465 _("can't query remote revision number, branch, or tags"))
3466 if not rev and revs:
3466 if not rev and revs:
3467 rev = revs[0]
3467 rev = revs[0]
3468 if not rev:
3468 if not rev:
3469 rev = "tip"
3469 rev = "tip"
3470
3470
3471 remoterev = repo.lookup(rev)
3471 remoterev = repo.lookup(rev)
3472 if default or id:
3472 if default or id:
3473 output = [hexfunc(remoterev)]
3473 output = [hexfunc(remoterev)]
3474
3474
3475 def getbms():
3475 def getbms():
3476 bms = []
3476 bms = []
3477
3477
3478 if 'bookmarks' in repo.listkeys('namespaces'):
3478 if 'bookmarks' in repo.listkeys('namespaces'):
3479 hexremoterev = hex(remoterev)
3479 hexremoterev = hex(remoterev)
3480 bms = [bm for bm, bmr in repo.listkeys('bookmarks').iteritems()
3480 bms = [bm for bm, bmr in repo.listkeys('bookmarks').iteritems()
3481 if bmr == hexremoterev]
3481 if bmr == hexremoterev]
3482
3482
3483 return bms
3483 return bms
3484
3484
3485 if bookmarks:
3485 if bookmarks:
3486 output.extend(getbms())
3486 output.extend(getbms())
3487 elif default and not ui.quiet:
3487 elif default and not ui.quiet:
3488 # multiple bookmarks for a single parent separated by '/'
3488 # multiple bookmarks for a single parent separated by '/'
3489 bm = '/'.join(getbms())
3489 bm = '/'.join(getbms())
3490 if bm:
3490 if bm:
3491 output.append(bm)
3491 output.append(bm)
3492 else:
3492 else:
3493 if not rev:
3493 if not rev:
3494 ctx = repo[None]
3494 ctx = repo[None]
3495 parents = ctx.parents()
3495 parents = ctx.parents()
3496 changed = ""
3496 changed = ""
3497 if default or id or num:
3497 if default or id or num:
3498 changed = util.any(repo.status()) and "+" or ""
3498 changed = util.any(repo.status()) and "+" or ""
3499 if default or id:
3499 if default or id:
3500 output = ["%s%s" %
3500 output = ["%s%s" %
3501 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
3501 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
3502 if num:
3502 if num:
3503 output.append("%s%s" %
3503 output.append("%s%s" %
3504 ('+'.join([str(p.rev()) for p in parents]), changed))
3504 ('+'.join([str(p.rev()) for p in parents]), changed))
3505 else:
3505 else:
3506 ctx = scmutil.revsingle(repo, rev)
3506 ctx = scmutil.revsingle(repo, rev)
3507 if default or id:
3507 if default or id:
3508 output = [hexfunc(ctx.node())]
3508 output = [hexfunc(ctx.node())]
3509 if num:
3509 if num:
3510 output.append(str(ctx.rev()))
3510 output.append(str(ctx.rev()))
3511
3511
3512 if default and not ui.quiet:
3512 if default and not ui.quiet:
3513 b = ctx.branch()
3513 b = ctx.branch()
3514 if b != 'default':
3514 if b != 'default':
3515 output.append("(%s)" % b)
3515 output.append("(%s)" % b)
3516
3516
3517 # multiple tags for a single parent separated by '/'
3517 # multiple tags for a single parent separated by '/'
3518 t = '/'.join(ctx.tags())
3518 t = '/'.join(ctx.tags())
3519 if t:
3519 if t:
3520 output.append(t)
3520 output.append(t)
3521
3521
3522 # multiple bookmarks for a single parent separated by '/'
3522 # multiple bookmarks for a single parent separated by '/'
3523 bm = '/'.join(ctx.bookmarks())
3523 bm = '/'.join(ctx.bookmarks())
3524 if bm:
3524 if bm:
3525 output.append(bm)
3525 output.append(bm)
3526 else:
3526 else:
3527 if branch:
3527 if branch:
3528 output.append(ctx.branch())
3528 output.append(ctx.branch())
3529
3529
3530 if tags:
3530 if tags:
3531 output.extend(ctx.tags())
3531 output.extend(ctx.tags())
3532
3532
3533 if bookmarks:
3533 if bookmarks:
3534 output.extend(ctx.bookmarks())
3534 output.extend(ctx.bookmarks())
3535
3535
3536 ui.write("%s\n" % ' '.join(output))
3536 ui.write("%s\n" % ' '.join(output))
3537
3537
3538 @command('import|patch',
3538 @command('import|patch',
3539 [('p', 'strip', 1,
3539 [('p', 'strip', 1,
3540 _('directory strip option for patch. This has the same '
3540 _('directory strip option for patch. This has the same '
3541 'meaning as the corresponding patch option'), _('NUM')),
3541 'meaning as the corresponding patch option'), _('NUM')),
3542 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3542 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3543 ('e', 'edit', False, _('invoke editor on commit messages')),
3543 ('e', 'edit', False, _('invoke editor on commit messages')),
3544 ('f', 'force', None, _('skip check for outstanding uncommitted changes')),
3544 ('f', 'force', None, _('skip check for outstanding uncommitted changes')),
3545 ('', 'no-commit', None,
3545 ('', 'no-commit', None,
3546 _("don't commit, just update the working directory")),
3546 _("don't commit, just update the working directory")),
3547 ('', 'bypass', None,
3547 ('', 'bypass', None,
3548 _("apply patch without touching the working directory")),
3548 _("apply patch without touching the working directory")),
3549 ('', 'exact', None,
3549 ('', 'exact', None,
3550 _('apply patch to the nodes from which it was generated')),
3550 _('apply patch to the nodes from which it was generated')),
3551 ('', 'import-branch', None,
3551 ('', 'import-branch', None,
3552 _('use any branch information in patch (implied by --exact)'))] +
3552 _('use any branch information in patch (implied by --exact)'))] +
3553 commitopts + commitopts2 + similarityopts,
3553 commitopts + commitopts2 + similarityopts,
3554 _('[OPTION]... PATCH...'))
3554 _('[OPTION]... PATCH...'))
3555 def import_(ui, repo, patch1=None, *patches, **opts):
3555 def import_(ui, repo, patch1=None, *patches, **opts):
3556 """import an ordered set of patches
3556 """import an ordered set of patches
3557
3557
3558 Import a list of patches and commit them individually (unless
3558 Import a list of patches and commit them individually (unless
3559 --no-commit is specified).
3559 --no-commit is specified).
3560
3560
3561 If there are outstanding changes in the working directory, import
3561 If there are outstanding changes in the working directory, import
3562 will abort unless given the -f/--force flag.
3562 will abort unless given the -f/--force flag.
3563
3563
3564 You can import a patch straight from a mail message. Even patches
3564 You can import a patch straight from a mail message. Even patches
3565 as attachments work (to use the body part, it must have type
3565 as attachments work (to use the body part, it must have type
3566 text/plain or text/x-patch). From and Subject headers of email
3566 text/plain or text/x-patch). From and Subject headers of email
3567 message are used as default committer and commit message. All
3567 message are used as default committer and commit message. All
3568 text/plain body parts before first diff are added to commit
3568 text/plain body parts before first diff are added to commit
3569 message.
3569 message.
3570
3570
3571 If the imported patch was generated by :hg:`export`, user and
3571 If the imported patch was generated by :hg:`export`, user and
3572 description from patch override values from message headers and
3572 description from patch override values from message headers and
3573 body. Values given on command line with -m/--message and -u/--user
3573 body. Values given on command line with -m/--message and -u/--user
3574 override these.
3574 override these.
3575
3575
3576 If --exact is specified, import will set the working directory to
3576 If --exact is specified, import will set the working directory to
3577 the parent of each patch before applying it, and will abort if the
3577 the parent of each patch before applying it, and will abort if the
3578 resulting changeset has a different ID than the one recorded in
3578 resulting changeset has a different ID than the one recorded in
3579 the patch. This may happen due to character set problems or other
3579 the patch. This may happen due to character set problems or other
3580 deficiencies in the text patch format.
3580 deficiencies in the text patch format.
3581
3581
3582 Use --bypass to apply and commit patches directly to the
3582 Use --bypass to apply and commit patches directly to the
3583 repository, not touching the working directory. Without --exact,
3583 repository, not touching the working directory. Without --exact,
3584 patches will be applied on top of the working directory parent
3584 patches will be applied on top of the working directory parent
3585 revision.
3585 revision.
3586
3586
3587 With -s/--similarity, hg will attempt to discover renames and
3587 With -s/--similarity, hg will attempt to discover renames and
3588 copies in the patch in the same way as :hg:`addremove`.
3588 copies in the patch in the same way as :hg:`addremove`.
3589
3589
3590 To read a patch from standard input, use "-" as the patch name. If
3590 To read a patch from standard input, use "-" as the patch name. If
3591 a URL is specified, the patch will be downloaded from it.
3591 a URL is specified, the patch will be downloaded from it.
3592 See :hg:`help dates` for a list of formats valid for -d/--date.
3592 See :hg:`help dates` for a list of formats valid for -d/--date.
3593
3593
3594 .. container:: verbose
3594 .. container:: verbose
3595
3595
3596 Examples:
3596 Examples:
3597
3597
3598 - import a traditional patch from a website and detect renames::
3598 - import a traditional patch from a website and detect renames::
3599
3599
3600 hg import -s 80 http://example.com/bugfix.patch
3600 hg import -s 80 http://example.com/bugfix.patch
3601
3601
3602 - import a changeset from an hgweb server::
3602 - import a changeset from an hgweb server::
3603
3603
3604 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
3604 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
3605
3605
3606 - import all the patches in an Unix-style mbox::
3606 - import all the patches in an Unix-style mbox::
3607
3607
3608 hg import incoming-patches.mbox
3608 hg import incoming-patches.mbox
3609
3609
3610 - attempt to exactly restore an exported changeset (not always
3610 - attempt to exactly restore an exported changeset (not always
3611 possible)::
3611 possible)::
3612
3612
3613 hg import --exact proposed-fix.patch
3613 hg import --exact proposed-fix.patch
3614
3614
3615 Returns 0 on success.
3615 Returns 0 on success.
3616 """
3616 """
3617
3617
3618 if not patch1:
3618 if not patch1:
3619 raise util.Abort(_('need at least one patch to import'))
3619 raise util.Abort(_('need at least one patch to import'))
3620
3620
3621 patches = (patch1,) + patches
3621 patches = (patch1,) + patches
3622
3622
3623 date = opts.get('date')
3623 date = opts.get('date')
3624 if date:
3624 if date:
3625 opts['date'] = util.parsedate(date)
3625 opts['date'] = util.parsedate(date)
3626
3626
3627 editor = cmdutil.commiteditor
3627 editor = cmdutil.commiteditor
3628 if opts.get('edit'):
3628 if opts.get('edit'):
3629 editor = cmdutil.commitforceeditor
3629 editor = cmdutil.commitforceeditor
3630
3630
3631 update = not opts.get('bypass')
3631 update = not opts.get('bypass')
3632 if not update and opts.get('no_commit'):
3632 if not update and opts.get('no_commit'):
3633 raise util.Abort(_('cannot use --no-commit with --bypass'))
3633 raise util.Abort(_('cannot use --no-commit with --bypass'))
3634 try:
3634 try:
3635 sim = float(opts.get('similarity') or 0)
3635 sim = float(opts.get('similarity') or 0)
3636 except ValueError:
3636 except ValueError:
3637 raise util.Abort(_('similarity must be a number'))
3637 raise util.Abort(_('similarity must be a number'))
3638 if sim < 0 or sim > 100:
3638 if sim < 0 or sim > 100:
3639 raise util.Abort(_('similarity must be between 0 and 100'))
3639 raise util.Abort(_('similarity must be between 0 and 100'))
3640 if sim and not update:
3640 if sim and not update:
3641 raise util.Abort(_('cannot use --similarity with --bypass'))
3641 raise util.Abort(_('cannot use --similarity with --bypass'))
3642
3642
3643 if (opts.get('exact') or not opts.get('force')) and update:
3643 if (opts.get('exact') or not opts.get('force')) and update:
3644 cmdutil.bailifchanged(repo)
3644 cmdutil.bailifchanged(repo)
3645
3645
3646 base = opts["base"]
3646 base = opts["base"]
3647 strip = opts["strip"]
3647 strip = opts["strip"]
3648 wlock = lock = tr = None
3648 wlock = lock = tr = None
3649 msgs = []
3649 msgs = []
3650
3650
3651 def checkexact(repo, n, nodeid):
3651 def checkexact(repo, n, nodeid):
3652 if opts.get('exact') and hex(n) != nodeid:
3652 if opts.get('exact') and hex(n) != nodeid:
3653 repo.rollback()
3653 repo.rollback()
3654 raise util.Abort(_('patch is damaged or loses information'))
3654 raise util.Abort(_('patch is damaged or loses information'))
3655
3655
3656 def tryone(ui, hunk, parents):
3656 def tryone(ui, hunk, parents):
3657 tmpname, message, user, date, branch, nodeid, p1, p2 = \
3657 tmpname, message, user, date, branch, nodeid, p1, p2 = \
3658 patch.extract(ui, hunk)
3658 patch.extract(ui, hunk)
3659
3659
3660 if not tmpname:
3660 if not tmpname:
3661 return (None, None)
3661 return (None, None)
3662 msg = _('applied to working directory')
3662 msg = _('applied to working directory')
3663
3663
3664 try:
3664 try:
3665 cmdline_message = cmdutil.logmessage(ui, opts)
3665 cmdline_message = cmdutil.logmessage(ui, opts)
3666 if cmdline_message:
3666 if cmdline_message:
3667 # pickup the cmdline msg
3667 # pickup the cmdline msg
3668 message = cmdline_message
3668 message = cmdline_message
3669 elif message:
3669 elif message:
3670 # pickup the patch msg
3670 # pickup the patch msg
3671 message = message.strip()
3671 message = message.strip()
3672 else:
3672 else:
3673 # launch the editor
3673 # launch the editor
3674 message = None
3674 message = None
3675 ui.debug('message:\n%s\n' % message)
3675 ui.debug('message:\n%s\n' % message)
3676
3676
3677 if len(parents) == 1:
3677 if len(parents) == 1:
3678 parents.append(repo[nullid])
3678 parents.append(repo[nullid])
3679 if opts.get('exact'):
3679 if opts.get('exact'):
3680 if not nodeid or not p1:
3680 if not nodeid or not p1:
3681 raise util.Abort(_('not a Mercurial patch'))
3681 raise util.Abort(_('not a Mercurial patch'))
3682 p1 = repo[p1]
3682 p1 = repo[p1]
3683 p2 = repo[p2 or nullid]
3683 p2 = repo[p2 or nullid]
3684 elif p2:
3684 elif p2:
3685 try:
3685 try:
3686 p1 = repo[p1]
3686 p1 = repo[p1]
3687 p2 = repo[p2]
3687 p2 = repo[p2]
3688 # Without any options, consider p2 only if the
3688 # Without any options, consider p2 only if the
3689 # patch is being applied on top of the recorded
3689 # patch is being applied on top of the recorded
3690 # first parent.
3690 # first parent.
3691 if p1 != parents[0]:
3691 if p1 != parents[0]:
3692 p1 = parents[0]
3692 p1 = parents[0]
3693 p2 = repo[nullid]
3693 p2 = repo[nullid]
3694 except error.RepoError:
3694 except error.RepoError:
3695 p1, p2 = parents
3695 p1, p2 = parents
3696 else:
3696 else:
3697 p1, p2 = parents
3697 p1, p2 = parents
3698
3698
3699 n = None
3699 n = None
3700 if update:
3700 if update:
3701 if p1 != parents[0]:
3701 if p1 != parents[0]:
3702 hg.clean(repo, p1.node())
3702 hg.clean(repo, p1.node())
3703 if p2 != parents[1]:
3703 if p2 != parents[1]:
3704 repo.setparents(p1.node(), p2.node())
3704 repo.setparents(p1.node(), p2.node())
3705
3705
3706 if opts.get('exact') or opts.get('import_branch'):
3706 if opts.get('exact') or opts.get('import_branch'):
3707 repo.dirstate.setbranch(branch or 'default')
3707 repo.dirstate.setbranch(branch or 'default')
3708
3708
3709 files = set()
3709 files = set()
3710 patch.patch(ui, repo, tmpname, strip=strip, files=files,
3710 patch.patch(ui, repo, tmpname, strip=strip, files=files,
3711 eolmode=None, similarity=sim / 100.0)
3711 eolmode=None, similarity=sim / 100.0)
3712 files = list(files)
3712 files = list(files)
3713 if opts.get('no_commit'):
3713 if opts.get('no_commit'):
3714 if message:
3714 if message:
3715 msgs.append(message)
3715 msgs.append(message)
3716 else:
3716 else:
3717 if opts.get('exact') or p2:
3717 if opts.get('exact') or p2:
3718 # If you got here, you either use --force and know what
3718 # If you got here, you either use --force and know what
3719 # you are doing or used --exact or a merge patch while
3719 # you are doing or used --exact or a merge patch while
3720 # being updated to its first parent.
3720 # being updated to its first parent.
3721 m = None
3721 m = None
3722 else:
3722 else:
3723 m = scmutil.matchfiles(repo, files or [])
3723 m = scmutil.matchfiles(repo, files or [])
3724 n = repo.commit(message, opts.get('user') or user,
3724 n = repo.commit(message, opts.get('user') or user,
3725 opts.get('date') or date, match=m,
3725 opts.get('date') or date, match=m,
3726 editor=editor)
3726 editor=editor)
3727 checkexact(repo, n, nodeid)
3727 checkexact(repo, n, nodeid)
3728 else:
3728 else:
3729 if opts.get('exact') or opts.get('import_branch'):
3729 if opts.get('exact') or opts.get('import_branch'):
3730 branch = branch or 'default'
3730 branch = branch or 'default'
3731 else:
3731 else:
3732 branch = p1.branch()
3732 branch = p1.branch()
3733 store = patch.filestore()
3733 store = patch.filestore()
3734 try:
3734 try:
3735 files = set()
3735 files = set()
3736 try:
3736 try:
3737 patch.patchrepo(ui, repo, p1, store, tmpname, strip,
3737 patch.patchrepo(ui, repo, p1, store, tmpname, strip,
3738 files, eolmode=None)
3738 files, eolmode=None)
3739 except patch.PatchError, e:
3739 except patch.PatchError, e:
3740 raise util.Abort(str(e))
3740 raise util.Abort(str(e))
3741 memctx = patch.makememctx(repo, (p1.node(), p2.node()),
3741 memctx = patch.makememctx(repo, (p1.node(), p2.node()),
3742 message,
3742 message,
3743 opts.get('user') or user,
3743 opts.get('user') or user,
3744 opts.get('date') or date,
3744 opts.get('date') or date,
3745 branch, files, store,
3745 branch, files, store,
3746 editor=cmdutil.commiteditor)
3746 editor=cmdutil.commiteditor)
3747 repo.savecommitmessage(memctx.description())
3747 repo.savecommitmessage(memctx.description())
3748 n = memctx.commit()
3748 n = memctx.commit()
3749 checkexact(repo, n, nodeid)
3749 checkexact(repo, n, nodeid)
3750 finally:
3750 finally:
3751 store.close()
3751 store.close()
3752 if n:
3752 if n:
3753 # i18n: refers to a short changeset id
3753 # i18n: refers to a short changeset id
3754 msg = _('created %s') % short(n)
3754 msg = _('created %s') % short(n)
3755 return (msg, n)
3755 return (msg, n)
3756 finally:
3756 finally:
3757 os.unlink(tmpname)
3757 os.unlink(tmpname)
3758
3758
3759 try:
3759 try:
3760 try:
3760 try:
3761 wlock = repo.wlock()
3761 wlock = repo.wlock()
3762 if not opts.get('no_commit'):
3762 if not opts.get('no_commit'):
3763 lock = repo.lock()
3763 lock = repo.lock()
3764 tr = repo.transaction('import')
3764 tr = repo.transaction('import')
3765 parents = repo.parents()
3765 parents = repo.parents()
3766 for patchurl in patches:
3766 for patchurl in patches:
3767 if patchurl == '-':
3767 if patchurl == '-':
3768 ui.status(_('applying patch from stdin\n'))
3768 ui.status(_('applying patch from stdin\n'))
3769 patchfile = ui.fin
3769 patchfile = ui.fin
3770 patchurl = 'stdin' # for error message
3770 patchurl = 'stdin' # for error message
3771 else:
3771 else:
3772 patchurl = os.path.join(base, patchurl)
3772 patchurl = os.path.join(base, patchurl)
3773 ui.status(_('applying %s\n') % patchurl)
3773 ui.status(_('applying %s\n') % patchurl)
3774 patchfile = url.open(ui, patchurl)
3774 patchfile = url.open(ui, patchurl)
3775
3775
3776 haspatch = False
3776 haspatch = False
3777 for hunk in patch.split(patchfile):
3777 for hunk in patch.split(patchfile):
3778 (msg, node) = tryone(ui, hunk, parents)
3778 (msg, node) = tryone(ui, hunk, parents)
3779 if msg:
3779 if msg:
3780 haspatch = True
3780 haspatch = True
3781 ui.note(msg + '\n')
3781 ui.note(msg + '\n')
3782 if update or opts.get('exact'):
3782 if update or opts.get('exact'):
3783 parents = repo.parents()
3783 parents = repo.parents()
3784 else:
3784 else:
3785 parents = [repo[node]]
3785 parents = [repo[node]]
3786
3786
3787 if not haspatch:
3787 if not haspatch:
3788 raise util.Abort(_('%s: no diffs found') % patchurl)
3788 raise util.Abort(_('%s: no diffs found') % patchurl)
3789
3789
3790 if tr:
3790 if tr:
3791 tr.close()
3791 tr.close()
3792 if msgs:
3792 if msgs:
3793 repo.savecommitmessage('\n* * *\n'.join(msgs))
3793 repo.savecommitmessage('\n* * *\n'.join(msgs))
3794 except: # re-raises
3794 except: # re-raises
3795 # wlock.release() indirectly calls dirstate.write(): since
3795 # wlock.release() indirectly calls dirstate.write(): since
3796 # we're crashing, we do not want to change the working dir
3796 # we're crashing, we do not want to change the working dir
3797 # parent after all, so make sure it writes nothing
3797 # parent after all, so make sure it writes nothing
3798 repo.dirstate.invalidate()
3798 repo.dirstate.invalidate()
3799 raise
3799 raise
3800 finally:
3800 finally:
3801 if tr:
3801 if tr:
3802 tr.release()
3802 tr.release()
3803 release(lock, wlock)
3803 release(lock, wlock)
3804
3804
3805 @command('incoming|in',
3805 @command('incoming|in',
3806 [('f', 'force', None,
3806 [('f', 'force', None,
3807 _('run even if remote repository is unrelated')),
3807 _('run even if remote repository is unrelated')),
3808 ('n', 'newest-first', None, _('show newest record first')),
3808 ('n', 'newest-first', None, _('show newest record first')),
3809 ('', 'bundle', '',
3809 ('', 'bundle', '',
3810 _('file to store the bundles into'), _('FILE')),
3810 _('file to store the bundles into'), _('FILE')),
3811 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3811 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3812 ('B', 'bookmarks', False, _("compare bookmarks")),
3812 ('B', 'bookmarks', False, _("compare bookmarks")),
3813 ('b', 'branch', [],
3813 ('b', 'branch', [],
3814 _('a specific branch you would like to pull'), _('BRANCH')),
3814 _('a specific branch you would like to pull'), _('BRANCH')),
3815 ] + logopts + remoteopts + subrepoopts,
3815 ] + logopts + remoteopts + subrepoopts,
3816 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3816 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3817 def incoming(ui, repo, source="default", **opts):
3817 def incoming(ui, repo, source="default", **opts):
3818 """show new changesets found in source
3818 """show new changesets found in source
3819
3819
3820 Show new changesets found in the specified path/URL or the default
3820 Show new changesets found in the specified path/URL or the default
3821 pull location. These are the changesets that would have been pulled
3821 pull location. These are the changesets that would have been pulled
3822 if a pull at the time you issued this command.
3822 if a pull at the time you issued this command.
3823
3823
3824 For remote repository, using --bundle avoids downloading the
3824 For remote repository, using --bundle avoids downloading the
3825 changesets twice if the incoming is followed by a pull.
3825 changesets twice if the incoming is followed by a pull.
3826
3826
3827 See pull for valid source format details.
3827 See pull for valid source format details.
3828
3828
3829 Returns 0 if there are incoming changes, 1 otherwise.
3829 Returns 0 if there are incoming changes, 1 otherwise.
3830 """
3830 """
3831 if opts.get('bundle') and opts.get('subrepos'):
3831 if opts.get('bundle') and opts.get('subrepos'):
3832 raise util.Abort(_('cannot combine --bundle and --subrepos'))
3832 raise util.Abort(_('cannot combine --bundle and --subrepos'))
3833
3833
3834 if opts.get('bookmarks'):
3834 if opts.get('bookmarks'):
3835 source, branches = hg.parseurl(ui.expandpath(source),
3835 source, branches = hg.parseurl(ui.expandpath(source),
3836 opts.get('branch'))
3836 opts.get('branch'))
3837 other = hg.peer(repo, opts, source)
3837 other = hg.peer(repo, opts, source)
3838 if 'bookmarks' not in other.listkeys('namespaces'):
3838 if 'bookmarks' not in other.listkeys('namespaces'):
3839 ui.warn(_("remote doesn't support bookmarks\n"))
3839 ui.warn(_("remote doesn't support bookmarks\n"))
3840 return 0
3840 return 0
3841 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3841 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3842 return bookmarks.diff(ui, repo, other)
3842 return bookmarks.diff(ui, repo, other)
3843
3843
3844 repo._subtoppath = ui.expandpath(source)
3844 repo._subtoppath = ui.expandpath(source)
3845 try:
3845 try:
3846 return hg.incoming(ui, repo, source, opts)
3846 return hg.incoming(ui, repo, source, opts)
3847 finally:
3847 finally:
3848 del repo._subtoppath
3848 del repo._subtoppath
3849
3849
3850
3850
3851 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'))
3851 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'))
3852 def init(ui, dest=".", **opts):
3852 def init(ui, dest=".", **opts):
3853 """create a new repository in the given directory
3853 """create a new repository in the given directory
3854
3854
3855 Initialize a new repository in the given directory. If the given
3855 Initialize a new repository in the given directory. If the given
3856 directory does not exist, it will be created.
3856 directory does not exist, it will be created.
3857
3857
3858 If no directory is given, the current directory is used.
3858 If no directory is given, the current directory is used.
3859
3859
3860 It is possible to specify an ``ssh://`` URL as the destination.
3860 It is possible to specify an ``ssh://`` URL as the destination.
3861 See :hg:`help urls` for more information.
3861 See :hg:`help urls` for more information.
3862
3862
3863 Returns 0 on success.
3863 Returns 0 on success.
3864 """
3864 """
3865 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3865 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3866
3866
3867 @command('locate',
3867 @command('locate',
3868 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3868 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3869 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3869 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3870 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3870 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3871 ] + walkopts,
3871 ] + walkopts,
3872 _('[OPTION]... [PATTERN]...'))
3872 _('[OPTION]... [PATTERN]...'))
3873 def locate(ui, repo, *pats, **opts):
3873 def locate(ui, repo, *pats, **opts):
3874 """locate files matching specific patterns
3874 """locate files matching specific patterns
3875
3875
3876 Print files under Mercurial control in the working directory whose
3876 Print files under Mercurial control in the working directory whose
3877 names match the given patterns.
3877 names match the given patterns.
3878
3878
3879 By default, this command searches all directories in the working
3879 By default, this command searches all directories in the working
3880 directory. To search just the current directory and its
3880 directory. To search just the current directory and its
3881 subdirectories, use "--include .".
3881 subdirectories, use "--include .".
3882
3882
3883 If no patterns are given to match, this command prints the names
3883 If no patterns are given to match, this command prints the names
3884 of all files under Mercurial control in the working directory.
3884 of all files under Mercurial control in the working directory.
3885
3885
3886 If you want to feed the output of this command into the "xargs"
3886 If you want to feed the output of this command into the "xargs"
3887 command, use the -0 option to both this command and "xargs". This
3887 command, use the -0 option to both this command and "xargs". This
3888 will avoid the problem of "xargs" treating single filenames that
3888 will avoid the problem of "xargs" treating single filenames that
3889 contain whitespace as multiple filenames.
3889 contain whitespace as multiple filenames.
3890
3890
3891 Returns 0 if a match is found, 1 otherwise.
3891 Returns 0 if a match is found, 1 otherwise.
3892 """
3892 """
3893 end = opts.get('print0') and '\0' or '\n'
3893 end = opts.get('print0') and '\0' or '\n'
3894 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3894 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3895
3895
3896 ret = 1
3896 ret = 1
3897 m = scmutil.match(repo[rev], pats, opts, default='relglob')
3897 m = scmutil.match(repo[rev], pats, opts, default='relglob')
3898 m.bad = lambda x, y: False
3898 m.bad = lambda x, y: False
3899 for abs in repo[rev].walk(m):
3899 for abs in repo[rev].walk(m):
3900 if not rev and abs not in repo.dirstate:
3900 if not rev and abs not in repo.dirstate:
3901 continue
3901 continue
3902 if opts.get('fullpath'):
3902 if opts.get('fullpath'):
3903 ui.write(repo.wjoin(abs), end)
3903 ui.write(repo.wjoin(abs), end)
3904 else:
3904 else:
3905 ui.write(((pats and m.rel(abs)) or abs), end)
3905 ui.write(((pats and m.rel(abs)) or abs), end)
3906 ret = 0
3906 ret = 0
3907
3907
3908 return ret
3908 return ret
3909
3909
3910 @command('^log|history',
3910 @command('^log|history',
3911 [('f', 'follow', None,
3911 [('f', 'follow', None,
3912 _('follow changeset history, or file history across copies and renames')),
3912 _('follow changeset history, or file history across copies and renames')),
3913 ('', 'follow-first', None,
3913 ('', 'follow-first', None,
3914 _('only follow the first parent of merge changesets (DEPRECATED)')),
3914 _('only follow the first parent of merge changesets (DEPRECATED)')),
3915 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3915 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3916 ('C', 'copies', None, _('show copied files')),
3916 ('C', 'copies', None, _('show copied files')),
3917 ('k', 'keyword', [],
3917 ('k', 'keyword', [],
3918 _('do case-insensitive search for a given text'), _('TEXT')),
3918 _('do case-insensitive search for a given text'), _('TEXT')),
3919 ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
3919 ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
3920 ('', 'removed', None, _('include revisions where files were removed')),
3920 ('', 'removed', None, _('include revisions where files were removed')),
3921 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3921 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3922 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3922 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3923 ('', 'only-branch', [],
3923 ('', 'only-branch', [],
3924 _('show only changesets within the given named branch (DEPRECATED)'),
3924 _('show only changesets within the given named branch (DEPRECATED)'),
3925 _('BRANCH')),
3925 _('BRANCH')),
3926 ('b', 'branch', [],
3926 ('b', 'branch', [],
3927 _('show changesets within the given named branch'), _('BRANCH')),
3927 _('show changesets within the given named branch'), _('BRANCH')),
3928 ('P', 'prune', [],
3928 ('P', 'prune', [],
3929 _('do not display revision or any of its ancestors'), _('REV')),
3929 _('do not display revision or any of its ancestors'), _('REV')),
3930 ('', 'hidden', False, _('show hidden changesets (DEPRECATED)')),
3930 ('', 'hidden', False, _('show hidden changesets (DEPRECATED)')),
3931 ] + logopts + walkopts,
3931 ] + logopts + walkopts,
3932 _('[OPTION]... [FILE]'))
3932 _('[OPTION]... [FILE]'))
3933 def log(ui, repo, *pats, **opts):
3933 def log(ui, repo, *pats, **opts):
3934 """show revision history of entire repository or files
3934 """show revision history of entire repository or files
3935
3935
3936 Print the revision history of the specified files or the entire
3936 Print the revision history of the specified files or the entire
3937 project.
3937 project.
3938
3938
3939 If no revision range is specified, the default is ``tip:0`` unless
3939 If no revision range is specified, the default is ``tip:0`` unless
3940 --follow is set, in which case the working directory parent is
3940 --follow is set, in which case the working directory parent is
3941 used as the starting revision.
3941 used as the starting revision.
3942
3942
3943 File history is shown without following rename or copy history of
3943 File history is shown without following rename or copy history of
3944 files. Use -f/--follow with a filename to follow history across
3944 files. Use -f/--follow with a filename to follow history across
3945 renames and copies. --follow without a filename will only show
3945 renames and copies. --follow without a filename will only show
3946 ancestors or descendants of the starting revision.
3946 ancestors or descendants of the starting revision.
3947
3947
3948 By default this command prints revision number and changeset id,
3948 By default this command prints revision number and changeset id,
3949 tags, non-trivial parents, user, date and time, and a summary for
3949 tags, non-trivial parents, user, date and time, and a summary for
3950 each commit. When the -v/--verbose switch is used, the list of
3950 each commit. When the -v/--verbose switch is used, the list of
3951 changed files and full commit message are shown.
3951 changed files and full commit message are shown.
3952
3952
3953 .. note::
3953 .. note::
3954 log -p/--patch may generate unexpected diff output for merge
3954 log -p/--patch may generate unexpected diff output for merge
3955 changesets, as it will only compare the merge changeset against
3955 changesets, as it will only compare the merge changeset against
3956 its first parent. Also, only files different from BOTH parents
3956 its first parent. Also, only files different from BOTH parents
3957 will appear in files:.
3957 will appear in files:.
3958
3958
3959 .. note::
3959 .. note::
3960 for performance reasons, log FILE may omit duplicate changes
3960 for performance reasons, log FILE may omit duplicate changes
3961 made on branches and will not show deletions. To see all
3961 made on branches and will not show deletions. To see all
3962 changes including duplicates and deletions, use the --removed
3962 changes including duplicates and deletions, use the --removed
3963 switch.
3963 switch.
3964
3964
3965 .. container:: verbose
3965 .. container:: verbose
3966
3966
3967 Some examples:
3967 Some examples:
3968
3968
3969 - changesets with full descriptions and file lists::
3969 - changesets with full descriptions and file lists::
3970
3970
3971 hg log -v
3971 hg log -v
3972
3972
3973 - changesets ancestral to the working directory::
3973 - changesets ancestral to the working directory::
3974
3974
3975 hg log -f
3975 hg log -f
3976
3976
3977 - last 10 commits on the current branch::
3977 - last 10 commits on the current branch::
3978
3978
3979 hg log -l 10 -b .
3979 hg log -l 10 -b .
3980
3980
3981 - changesets showing all modifications of a file, including removals::
3981 - changesets showing all modifications of a file, including removals::
3982
3982
3983 hg log --removed file.c
3983 hg log --removed file.c
3984
3984
3985 - all changesets that touch a directory, with diffs, excluding merges::
3985 - all changesets that touch a directory, with diffs, excluding merges::
3986
3986
3987 hg log -Mp lib/
3987 hg log -Mp lib/
3988
3988
3989 - all revision numbers that match a keyword::
3989 - all revision numbers that match a keyword::
3990
3990
3991 hg log -k bug --template "{rev}\\n"
3991 hg log -k bug --template "{rev}\\n"
3992
3992
3993 - check if a given changeset is included is a tagged release::
3993 - check if a given changeset is included is a tagged release::
3994
3994
3995 hg log -r "a21ccf and ancestor(1.9)"
3995 hg log -r "a21ccf and ancestor(1.9)"
3996
3996
3997 - find all changesets by some user in a date range::
3997 - find all changesets by some user in a date range::
3998
3998
3999 hg log -k alice -d "may 2008 to jul 2008"
3999 hg log -k alice -d "may 2008 to jul 2008"
4000
4000
4001 - summary of all changesets after the last tag::
4001 - summary of all changesets after the last tag::
4002
4002
4003 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4003 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4004
4004
4005 See :hg:`help dates` for a list of formats valid for -d/--date.
4005 See :hg:`help dates` for a list of formats valid for -d/--date.
4006
4006
4007 See :hg:`help revisions` and :hg:`help revsets` for more about
4007 See :hg:`help revisions` and :hg:`help revsets` for more about
4008 specifying revisions.
4008 specifying revisions.
4009
4009
4010 See :hg:`help templates` for more about pre-packaged styles and
4010 See :hg:`help templates` for more about pre-packaged styles and
4011 specifying custom templates.
4011 specifying custom templates.
4012
4012
4013 Returns 0 on success.
4013 Returns 0 on success.
4014 """
4014 """
4015
4015
4016 matchfn = scmutil.match(repo[None], pats, opts)
4016 matchfn = scmutil.match(repo[None], pats, opts)
4017 limit = cmdutil.loglimit(opts)
4017 limit = cmdutil.loglimit(opts)
4018 count = 0
4018 count = 0
4019
4019
4020 getrenamed, endrev = None, None
4020 getrenamed, endrev = None, None
4021 if opts.get('copies'):
4021 if opts.get('copies'):
4022 if opts.get('rev'):
4022 if opts.get('rev'):
4023 endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
4023 endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
4024 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
4024 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
4025
4025
4026 df = False
4026 df = False
4027 if opts["date"]:
4027 if opts["date"]:
4028 df = util.matchdate(opts["date"])
4028 df = util.matchdate(opts["date"])
4029
4029
4030 branches = opts.get('branch', []) + opts.get('only_branch', [])
4030 branches = opts.get('branch', []) + opts.get('only_branch', [])
4031 opts['branch'] = [repo.lookupbranch(b) for b in branches]
4031 opts['branch'] = [repo.lookupbranch(b) for b in branches]
4032
4032
4033 displayer = cmdutil.show_changeset(ui, repo, opts, True)
4033 displayer = cmdutil.show_changeset(ui, repo, opts, True)
4034 def prep(ctx, fns):
4034 def prep(ctx, fns):
4035 rev = ctx.rev()
4035 rev = ctx.rev()
4036 parents = [p for p in repo.changelog.parentrevs(rev)
4036 parents = [p for p in repo.changelog.parentrevs(rev)
4037 if p != nullrev]
4037 if p != nullrev]
4038 if opts.get('no_merges') and len(parents) == 2:
4038 if opts.get('no_merges') and len(parents) == 2:
4039 return
4039 return
4040 if opts.get('only_merges') and len(parents) != 2:
4040 if opts.get('only_merges') and len(parents) != 2:
4041 return
4041 return
4042 if opts.get('branch') and ctx.branch() not in opts['branch']:
4042 if opts.get('branch') and ctx.branch() not in opts['branch']:
4043 return
4043 return
4044 if not opts.get('hidden') and ctx.hidden():
4044 if not opts.get('hidden') and ctx.hidden():
4045 return
4045 return
4046 if df and not df(ctx.date()[0]):
4046 if df and not df(ctx.date()[0]):
4047 return
4047 return
4048
4048
4049 lower = encoding.lower
4049 lower = encoding.lower
4050 if opts.get('user'):
4050 if opts.get('user'):
4051 luser = lower(ctx.user())
4051 luser = lower(ctx.user())
4052 for k in [lower(x) for x in opts['user']]:
4052 for k in [lower(x) for x in opts['user']]:
4053 if (k in luser):
4053 if (k in luser):
4054 break
4054 break
4055 else:
4055 else:
4056 return
4056 return
4057 if opts.get('keyword'):
4057 if opts.get('keyword'):
4058 luser = lower(ctx.user())
4058 luser = lower(ctx.user())
4059 ldesc = lower(ctx.description())
4059 ldesc = lower(ctx.description())
4060 lfiles = lower(" ".join(ctx.files()))
4060 lfiles = lower(" ".join(ctx.files()))
4061 for k in [lower(x) for x in opts['keyword']]:
4061 for k in [lower(x) for x in opts['keyword']]:
4062 if (k in luser or k in ldesc or k in lfiles):
4062 if (k in luser or k in ldesc or k in lfiles):
4063 break
4063 break
4064 else:
4064 else:
4065 return
4065 return
4066
4066
4067 copies = None
4067 copies = None
4068 if getrenamed is not None and rev:
4068 if getrenamed is not None and rev:
4069 copies = []
4069 copies = []
4070 for fn in ctx.files():
4070 for fn in ctx.files():
4071 rename = getrenamed(fn, rev)
4071 rename = getrenamed(fn, rev)
4072 if rename:
4072 if rename:
4073 copies.append((fn, rename[0]))
4073 copies.append((fn, rename[0]))
4074
4074
4075 revmatchfn = None
4075 revmatchfn = None
4076 if opts.get('patch') or opts.get('stat'):
4076 if opts.get('patch') or opts.get('stat'):
4077 if opts.get('follow') or opts.get('follow_first'):
4077 if opts.get('follow') or opts.get('follow_first'):
4078 # note: this might be wrong when following through merges
4078 # note: this might be wrong when following through merges
4079 revmatchfn = scmutil.match(repo[None], fns, default='path')
4079 revmatchfn = scmutil.match(repo[None], fns, default='path')
4080 else:
4080 else:
4081 revmatchfn = matchfn
4081 revmatchfn = matchfn
4082
4082
4083 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
4083 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
4084
4084
4085 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4085 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4086 if count == limit:
4086 if count == limit:
4087 break
4087 break
4088 if displayer.flush(ctx.rev()):
4088 if displayer.flush(ctx.rev()):
4089 count += 1
4089 count += 1
4090 displayer.close()
4090 displayer.close()
4091
4091
4092 @command('manifest',
4092 @command('manifest',
4093 [('r', 'rev', '', _('revision to display'), _('REV')),
4093 [('r', 'rev', '', _('revision to display'), _('REV')),
4094 ('', 'all', False, _("list files from all revisions"))],
4094 ('', 'all', False, _("list files from all revisions"))],
4095 _('[-r REV]'))
4095 _('[-r REV]'))
4096 def manifest(ui, repo, node=None, rev=None, **opts):
4096 def manifest(ui, repo, node=None, rev=None, **opts):
4097 """output the current or given revision of the project manifest
4097 """output the current or given revision of the project manifest
4098
4098
4099 Print a list of version controlled files for the given revision.
4099 Print a list of version controlled files for the given revision.
4100 If no revision is given, the first parent of the working directory
4100 If no revision is given, the first parent of the working directory
4101 is used, or the null revision if no revision is checked out.
4101 is used, or the null revision if no revision is checked out.
4102
4102
4103 With -v, print file permissions, symlink and executable bits.
4103 With -v, print file permissions, symlink and executable bits.
4104 With --debug, print file revision hashes.
4104 With --debug, print file revision hashes.
4105
4105
4106 If option --all is specified, the list of all files from all revisions
4106 If option --all is specified, the list of all files from all revisions
4107 is printed. This includes deleted and renamed files.
4107 is printed. This includes deleted and renamed files.
4108
4108
4109 Returns 0 on success.
4109 Returns 0 on success.
4110 """
4110 """
4111 if opts.get('all'):
4111 if opts.get('all'):
4112 if rev or node:
4112 if rev or node:
4113 raise util.Abort(_("can't specify a revision with --all"))
4113 raise util.Abort(_("can't specify a revision with --all"))
4114
4114
4115 res = []
4115 res = []
4116 prefix = "data/"
4116 prefix = "data/"
4117 suffix = ".i"
4117 suffix = ".i"
4118 plen = len(prefix)
4118 plen = len(prefix)
4119 slen = len(suffix)
4119 slen = len(suffix)
4120 lock = repo.lock()
4120 lock = repo.lock()
4121 try:
4121 try:
4122 for fn, b, size in repo.store.datafiles():
4122 for fn, b, size in repo.store.datafiles():
4123 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
4123 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
4124 res.append(fn[plen:-slen])
4124 res.append(fn[plen:-slen])
4125 finally:
4125 finally:
4126 lock.release()
4126 lock.release()
4127 for f in sorted(res):
4127 for f in sorted(res):
4128 ui.write("%s\n" % f)
4128 ui.write("%s\n" % f)
4129 return
4129 return
4130
4130
4131 if rev and node:
4131 if rev and node:
4132 raise util.Abort(_("please specify just one revision"))
4132 raise util.Abort(_("please specify just one revision"))
4133
4133
4134 if not node:
4134 if not node:
4135 node = rev
4135 node = rev
4136
4136
4137 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
4137 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
4138 ctx = scmutil.revsingle(repo, node)
4138 ctx = scmutil.revsingle(repo, node)
4139 for f in ctx:
4139 for f in ctx:
4140 if ui.debugflag:
4140 if ui.debugflag:
4141 ui.write("%40s " % hex(ctx.manifest()[f]))
4141 ui.write("%40s " % hex(ctx.manifest()[f]))
4142 if ui.verbose:
4142 if ui.verbose:
4143 ui.write(decor[ctx.flags(f)])
4143 ui.write(decor[ctx.flags(f)])
4144 ui.write("%s\n" % f)
4144 ui.write("%s\n" % f)
4145
4145
4146 @command('^merge',
4146 @command('^merge',
4147 [('f', 'force', None, _('force a merge with outstanding changes')),
4147 [('f', 'force', None, _('force a merge with outstanding changes')),
4148 ('r', 'rev', '', _('revision to merge'), _('REV')),
4148 ('r', 'rev', '', _('revision to merge'), _('REV')),
4149 ('P', 'preview', None,
4149 ('P', 'preview', None,
4150 _('review revisions to merge (no merge is performed)'))
4150 _('review revisions to merge (no merge is performed)'))
4151 ] + mergetoolopts,
4151 ] + mergetoolopts,
4152 _('[-P] [-f] [[-r] REV]'))
4152 _('[-P] [-f] [[-r] REV]'))
4153 def merge(ui, repo, node=None, **opts):
4153 def merge(ui, repo, node=None, **opts):
4154 """merge working directory with another revision
4154 """merge working directory with another revision
4155
4155
4156 The current working directory is updated with all changes made in
4156 The current working directory is updated with all changes made in
4157 the requested revision since the last common predecessor revision.
4157 the requested revision since the last common predecessor revision.
4158
4158
4159 Files that changed between either parent are marked as changed for
4159 Files that changed between either parent are marked as changed for
4160 the next commit and a commit must be performed before any further
4160 the next commit and a commit must be performed before any further
4161 updates to the repository are allowed. The next commit will have
4161 updates to the repository are allowed. The next commit will have
4162 two parents.
4162 two parents.
4163
4163
4164 ``--tool`` can be used to specify the merge tool used for file
4164 ``--tool`` can be used to specify the merge tool used for file
4165 merges. It overrides the HGMERGE environment variable and your
4165 merges. It overrides the HGMERGE environment variable and your
4166 configuration files. See :hg:`help merge-tools` for options.
4166 configuration files. See :hg:`help merge-tools` for options.
4167
4167
4168 If no revision is specified, the working directory's parent is a
4168 If no revision is specified, the working directory's parent is a
4169 head revision, and the current branch contains exactly one other
4169 head revision, and the current branch contains exactly one other
4170 head, the other head is merged with by default. Otherwise, an
4170 head, the other head is merged with by default. Otherwise, an
4171 explicit revision with which to merge with must be provided.
4171 explicit revision with which to merge with must be provided.
4172
4172
4173 :hg:`resolve` must be used to resolve unresolved files.
4173 :hg:`resolve` must be used to resolve unresolved files.
4174
4174
4175 To undo an uncommitted merge, use :hg:`update --clean .` which
4175 To undo an uncommitted merge, use :hg:`update --clean .` which
4176 will check out a clean copy of the original merge parent, losing
4176 will check out a clean copy of the original merge parent, losing
4177 all changes.
4177 all changes.
4178
4178
4179 Returns 0 on success, 1 if there are unresolved files.
4179 Returns 0 on success, 1 if there are unresolved files.
4180 """
4180 """
4181
4181
4182 if opts.get('rev') and node:
4182 if opts.get('rev') and node:
4183 raise util.Abort(_("please specify just one revision"))
4183 raise util.Abort(_("please specify just one revision"))
4184 if not node:
4184 if not node:
4185 node = opts.get('rev')
4185 node = opts.get('rev')
4186
4186
4187 if node:
4187 if node:
4188 node = scmutil.revsingle(repo, node).node()
4188 node = scmutil.revsingle(repo, node).node()
4189
4189
4190 if not node and repo._bookmarkcurrent:
4190 if not node and repo._bookmarkcurrent:
4191 bmheads = repo.bookmarkheads(repo._bookmarkcurrent)
4191 bmheads = repo.bookmarkheads(repo._bookmarkcurrent)
4192 curhead = repo[repo._bookmarkcurrent]
4192 curhead = repo[repo._bookmarkcurrent]
4193 if len(bmheads) == 2:
4193 if len(bmheads) == 2:
4194 if curhead == bmheads[0]:
4194 if curhead == bmheads[0]:
4195 node = bmheads[1]
4195 node = bmheads[1]
4196 else:
4196 else:
4197 node = bmheads[0]
4197 node = bmheads[0]
4198 elif len(bmheads) > 2:
4198 elif len(bmheads) > 2:
4199 raise util.Abort(_("multiple matching bookmarks to merge - "
4199 raise util.Abort(_("multiple matching bookmarks to merge - "
4200 "please merge with an explicit rev or bookmark"),
4200 "please merge with an explicit rev or bookmark"),
4201 hint=_("run 'hg heads' to see all heads"))
4201 hint=_("run 'hg heads' to see all heads"))
4202 elif len(bmheads) <= 1:
4202 elif len(bmheads) <= 1:
4203 raise util.Abort(_("no matching bookmark to merge - "
4203 raise util.Abort(_("no matching bookmark to merge - "
4204 "please merge with an explicit rev or bookmark"),
4204 "please merge with an explicit rev or bookmark"),
4205 hint=_("run 'hg heads' to see all heads"))
4205 hint=_("run 'hg heads' to see all heads"))
4206
4206
4207 if not node and not repo._bookmarkcurrent:
4207 if not node and not repo._bookmarkcurrent:
4208 branch = repo[None].branch()
4208 branch = repo[None].branch()
4209 bheads = repo.branchheads(branch)
4209 bheads = repo.branchheads(branch)
4210 nbhs = [bh for bh in bheads if not repo[bh].bookmarks()]
4210 nbhs = [bh for bh in bheads if not repo[bh].bookmarks()]
4211
4211
4212 if len(nbhs) > 2:
4212 if len(nbhs) > 2:
4213 raise util.Abort(_("branch '%s' has %d heads - "
4213 raise util.Abort(_("branch '%s' has %d heads - "
4214 "please merge with an explicit rev")
4214 "please merge with an explicit rev")
4215 % (branch, len(bheads)),
4215 % (branch, len(bheads)),
4216 hint=_("run 'hg heads .' to see heads"))
4216 hint=_("run 'hg heads .' to see heads"))
4217
4217
4218 parent = repo.dirstate.p1()
4218 parent = repo.dirstate.p1()
4219 if len(nbhs) == 1:
4219 if len(nbhs) == 1:
4220 if len(bheads) > 1:
4220 if len(bheads) > 1:
4221 raise util.Abort(_("heads are bookmarked - "
4221 raise util.Abort(_("heads are bookmarked - "
4222 "please merge with an explicit rev"),
4222 "please merge with an explicit rev"),
4223 hint=_("run 'hg heads' to see all heads"))
4223 hint=_("run 'hg heads' to see all heads"))
4224 if len(repo.heads()) > 1:
4224 if len(repo.heads()) > 1:
4225 raise util.Abort(_("branch '%s' has one head - "
4225 raise util.Abort(_("branch '%s' has one head - "
4226 "please merge with an explicit rev")
4226 "please merge with an explicit rev")
4227 % branch,
4227 % branch,
4228 hint=_("run 'hg heads' to see all heads"))
4228 hint=_("run 'hg heads' to see all heads"))
4229 msg, hint = _('nothing to merge'), None
4229 msg, hint = _('nothing to merge'), None
4230 if parent != repo.lookup(branch):
4230 if parent != repo.lookup(branch):
4231 hint = _("use 'hg update' instead")
4231 hint = _("use 'hg update' instead")
4232 raise util.Abort(msg, hint=hint)
4232 raise util.Abort(msg, hint=hint)
4233
4233
4234 if parent not in bheads:
4234 if parent not in bheads:
4235 raise util.Abort(_('working directory not at a head revision'),
4235 raise util.Abort(_('working directory not at a head revision'),
4236 hint=_("use 'hg update' or merge with an "
4236 hint=_("use 'hg update' or merge with an "
4237 "explicit revision"))
4237 "explicit revision"))
4238 if parent == nbhs[0]:
4238 if parent == nbhs[0]:
4239 node = nbhs[-1]
4239 node = nbhs[-1]
4240 else:
4240 else:
4241 node = nbhs[0]
4241 node = nbhs[0]
4242
4242
4243 if opts.get('preview'):
4243 if opts.get('preview'):
4244 # find nodes that are ancestors of p2 but not of p1
4244 # find nodes that are ancestors of p2 but not of p1
4245 p1 = repo.lookup('.')
4245 p1 = repo.lookup('.')
4246 p2 = repo.lookup(node)
4246 p2 = repo.lookup(node)
4247 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4247 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4248
4248
4249 displayer = cmdutil.show_changeset(ui, repo, opts)
4249 displayer = cmdutil.show_changeset(ui, repo, opts)
4250 for node in nodes:
4250 for node in nodes:
4251 displayer.show(repo[node])
4251 displayer.show(repo[node])
4252 displayer.close()
4252 displayer.close()
4253 return 0
4253 return 0
4254
4254
4255 try:
4255 try:
4256 # ui.forcemerge is an internal variable, do not document
4256 # ui.forcemerge is an internal variable, do not document
4257 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4257 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4258 return hg.merge(repo, node, force=opts.get('force'))
4258 return hg.merge(repo, node, force=opts.get('force'))
4259 finally:
4259 finally:
4260 ui.setconfig('ui', 'forcemerge', '')
4260 ui.setconfig('ui', 'forcemerge', '')
4261
4261
4262 @command('outgoing|out',
4262 @command('outgoing|out',
4263 [('f', 'force', None, _('run even when the destination is unrelated')),
4263 [('f', 'force', None, _('run even when the destination is unrelated')),
4264 ('r', 'rev', [],
4264 ('r', 'rev', [],
4265 _('a changeset intended to be included in the destination'), _('REV')),
4265 _('a changeset intended to be included in the destination'), _('REV')),
4266 ('n', 'newest-first', None, _('show newest record first')),
4266 ('n', 'newest-first', None, _('show newest record first')),
4267 ('B', 'bookmarks', False, _('compare bookmarks')),
4267 ('B', 'bookmarks', False, _('compare bookmarks')),
4268 ('b', 'branch', [], _('a specific branch you would like to push'),
4268 ('b', 'branch', [], _('a specific branch you would like to push'),
4269 _('BRANCH')),
4269 _('BRANCH')),
4270 ] + logopts + remoteopts + subrepoopts,
4270 ] + logopts + remoteopts + subrepoopts,
4271 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4271 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4272 def outgoing(ui, repo, dest=None, **opts):
4272 def outgoing(ui, repo, dest=None, **opts):
4273 """show changesets not found in the destination
4273 """show changesets not found in the destination
4274
4274
4275 Show changesets not found in the specified destination repository
4275 Show changesets not found in the specified destination repository
4276 or the default push location. These are the changesets that would
4276 or the default push location. These are the changesets that would
4277 be pushed if a push was requested.
4277 be pushed if a push was requested.
4278
4278
4279 See pull for details of valid destination formats.
4279 See pull for details of valid destination formats.
4280
4280
4281 Returns 0 if there are outgoing changes, 1 otherwise.
4281 Returns 0 if there are outgoing changes, 1 otherwise.
4282 """
4282 """
4283
4283
4284 if opts.get('bookmarks'):
4284 if opts.get('bookmarks'):
4285 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4285 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4286 dest, branches = hg.parseurl(dest, opts.get('branch'))
4286 dest, branches = hg.parseurl(dest, opts.get('branch'))
4287 other = hg.peer(repo, opts, dest)
4287 other = hg.peer(repo, opts, dest)
4288 if 'bookmarks' not in other.listkeys('namespaces'):
4288 if 'bookmarks' not in other.listkeys('namespaces'):
4289 ui.warn(_("remote doesn't support bookmarks\n"))
4289 ui.warn(_("remote doesn't support bookmarks\n"))
4290 return 0
4290 return 0
4291 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4291 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4292 return bookmarks.diff(ui, other, repo)
4292 return bookmarks.diff(ui, other, repo)
4293
4293
4294 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4294 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4295 try:
4295 try:
4296 return hg.outgoing(ui, repo, dest, opts)
4296 return hg.outgoing(ui, repo, dest, opts)
4297 finally:
4297 finally:
4298 del repo._subtoppath
4298 del repo._subtoppath
4299
4299
4300 @command('parents',
4300 @command('parents',
4301 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4301 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4302 ] + templateopts,
4302 ] + templateopts,
4303 _('[-r REV] [FILE]'))
4303 _('[-r REV] [FILE]'))
4304 def parents(ui, repo, file_=None, **opts):
4304 def parents(ui, repo, file_=None, **opts):
4305 """show the parents of the working directory or revision
4305 """show the parents of the working directory or revision
4306
4306
4307 Print the working directory's parent revisions. If a revision is
4307 Print the working directory's parent revisions. If a revision is
4308 given via -r/--rev, the parent of that revision will be printed.
4308 given via -r/--rev, the parent of that revision will be printed.
4309 If a file argument is given, the revision in which the file was
4309 If a file argument is given, the revision in which the file was
4310 last changed (before the working directory revision or the
4310 last changed (before the working directory revision or the
4311 argument to --rev if given) is printed.
4311 argument to --rev if given) is printed.
4312
4312
4313 Returns 0 on success.
4313 Returns 0 on success.
4314 """
4314 """
4315
4315
4316 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4316 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4317
4317
4318 if file_:
4318 if file_:
4319 m = scmutil.match(ctx, (file_,), opts)
4319 m = scmutil.match(ctx, (file_,), opts)
4320 if m.anypats() or len(m.files()) != 1:
4320 if m.anypats() or len(m.files()) != 1:
4321 raise util.Abort(_('can only specify an explicit filename'))
4321 raise util.Abort(_('can only specify an explicit filename'))
4322 file_ = m.files()[0]
4322 file_ = m.files()[0]
4323 filenodes = []
4323 filenodes = []
4324 for cp in ctx.parents():
4324 for cp in ctx.parents():
4325 if not cp:
4325 if not cp:
4326 continue
4326 continue
4327 try:
4327 try:
4328 filenodes.append(cp.filenode(file_))
4328 filenodes.append(cp.filenode(file_))
4329 except error.LookupError:
4329 except error.LookupError:
4330 pass
4330 pass
4331 if not filenodes:
4331 if not filenodes:
4332 raise util.Abort(_("'%s' not found in manifest!") % file_)
4332 raise util.Abort(_("'%s' not found in manifest!") % file_)
4333 fl = repo.file(file_)
4333 fl = repo.file(file_)
4334 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
4334 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
4335 else:
4335 else:
4336 p = [cp.node() for cp in ctx.parents()]
4336 p = [cp.node() for cp in ctx.parents()]
4337
4337
4338 displayer = cmdutil.show_changeset(ui, repo, opts)
4338 displayer = cmdutil.show_changeset(ui, repo, opts)
4339 for n in p:
4339 for n in p:
4340 if n != nullid:
4340 if n != nullid:
4341 displayer.show(repo[n])
4341 displayer.show(repo[n])
4342 displayer.close()
4342 displayer.close()
4343
4343
4344 @command('paths', [], _('[NAME]'))
4344 @command('paths', [], _('[NAME]'))
4345 def paths(ui, repo, search=None):
4345 def paths(ui, repo, search=None):
4346 """show aliases for remote repositories
4346 """show aliases for remote repositories
4347
4347
4348 Show definition of symbolic path name NAME. If no name is given,
4348 Show definition of symbolic path name NAME. If no name is given,
4349 show definition of all available names.
4349 show definition of all available names.
4350
4350
4351 Option -q/--quiet suppresses all output when searching for NAME
4351 Option -q/--quiet suppresses all output when searching for NAME
4352 and shows only the path names when listing all definitions.
4352 and shows only the path names when listing all definitions.
4353
4353
4354 Path names are defined in the [paths] section of your
4354 Path names are defined in the [paths] section of your
4355 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4355 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4356 repository, ``.hg/hgrc`` is used, too.
4356 repository, ``.hg/hgrc`` is used, too.
4357
4357
4358 The path names ``default`` and ``default-push`` have a special
4358 The path names ``default`` and ``default-push`` have a special
4359 meaning. When performing a push or pull operation, they are used
4359 meaning. When performing a push or pull operation, they are used
4360 as fallbacks if no location is specified on the command-line.
4360 as fallbacks if no location is specified on the command-line.
4361 When ``default-push`` is set, it will be used for push and
4361 When ``default-push`` is set, it will be used for push and
4362 ``default`` will be used for pull; otherwise ``default`` is used
4362 ``default`` will be used for pull; otherwise ``default`` is used
4363 as the fallback for both. When cloning a repository, the clone
4363 as the fallback for both. When cloning a repository, the clone
4364 source is written as ``default`` in ``.hg/hgrc``. Note that
4364 source is written as ``default`` in ``.hg/hgrc``. Note that
4365 ``default`` and ``default-push`` apply to all inbound (e.g.
4365 ``default`` and ``default-push`` apply to all inbound (e.g.
4366 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
4366 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
4367 :hg:`bundle`) operations.
4367 :hg:`bundle`) operations.
4368
4368
4369 See :hg:`help urls` for more information.
4369 See :hg:`help urls` for more information.
4370
4370
4371 Returns 0 on success.
4371 Returns 0 on success.
4372 """
4372 """
4373 if search:
4373 if search:
4374 for name, path in ui.configitems("paths"):
4374 for name, path in ui.configitems("paths"):
4375 if name == search:
4375 if name == search:
4376 ui.status("%s\n" % util.hidepassword(path))
4376 ui.status("%s\n" % util.hidepassword(path))
4377 return
4377 return
4378 if not ui.quiet:
4378 if not ui.quiet:
4379 ui.warn(_("not found!\n"))
4379 ui.warn(_("not found!\n"))
4380 return 1
4380 return 1
4381 else:
4381 else:
4382 for name, path in ui.configitems("paths"):
4382 for name, path in ui.configitems("paths"):
4383 if ui.quiet:
4383 if ui.quiet:
4384 ui.write("%s\n" % name)
4384 ui.write("%s\n" % name)
4385 else:
4385 else:
4386 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
4386 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
4387
4387
4388 @command('^phase',
4388 @command('^phase',
4389 [('p', 'public', False, _('set changeset phase to public')),
4389 [('p', 'public', False, _('set changeset phase to public')),
4390 ('d', 'draft', False, _('set changeset phase to draft')),
4390 ('d', 'draft', False, _('set changeset phase to draft')),
4391 ('s', 'secret', False, _('set changeset phase to secret')),
4391 ('s', 'secret', False, _('set changeset phase to secret')),
4392 ('f', 'force', False, _('allow to move boundary backward')),
4392 ('f', 'force', False, _('allow to move boundary backward')),
4393 ('r', 'rev', [], _('target revision'), _('REV')),
4393 ('r', 'rev', [], _('target revision'), _('REV')),
4394 ],
4394 ],
4395 _('[-p|-d|-s] [-f] [-r] REV...'))
4395 _('[-p|-d|-s] [-f] [-r] REV...'))
4396 def phase(ui, repo, *revs, **opts):
4396 def phase(ui, repo, *revs, **opts):
4397 """set or show the current phase name
4397 """set or show the current phase name
4398
4398
4399 With no argument, show the phase name of specified revisions.
4399 With no argument, show the phase name of specified revisions.
4400
4400
4401 With one of -p/--public, -d/--draft or -s/--secret, change the
4401 With one of -p/--public, -d/--draft or -s/--secret, change the
4402 phase value of the specified revisions.
4402 phase value of the specified revisions.
4403
4403
4404 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
4404 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
4405 lower phase to an higher phase. Phases are ordered as follows::
4405 lower phase to an higher phase. Phases are ordered as follows::
4406
4406
4407 public < draft < secret
4407 public < draft < secret
4408
4408
4409 Return 0 on success, 1 if no phases were changed or some could not
4409 Return 0 on success, 1 if no phases were changed or some could not
4410 be changed.
4410 be changed.
4411 """
4411 """
4412 # search for a unique phase argument
4412 # search for a unique phase argument
4413 targetphase = None
4413 targetphase = None
4414 for idx, name in enumerate(phases.phasenames):
4414 for idx, name in enumerate(phases.phasenames):
4415 if opts[name]:
4415 if opts[name]:
4416 if targetphase is not None:
4416 if targetphase is not None:
4417 raise util.Abort(_('only one phase can be specified'))
4417 raise util.Abort(_('only one phase can be specified'))
4418 targetphase = idx
4418 targetphase = idx
4419
4419
4420 # look for specified revision
4420 # look for specified revision
4421 revs = list(revs)
4421 revs = list(revs)
4422 revs.extend(opts['rev'])
4422 revs.extend(opts['rev'])
4423 if not revs:
4423 if not revs:
4424 raise util.Abort(_('no revisions specified'))
4424 raise util.Abort(_('no revisions specified'))
4425
4425
4426 revs = scmutil.revrange(repo, revs)
4426 revs = scmutil.revrange(repo, revs)
4427
4427
4428 lock = None
4428 lock = None
4429 ret = 0
4429 ret = 0
4430 if targetphase is None:
4430 if targetphase is None:
4431 # display
4431 # display
4432 for r in revs:
4432 for r in revs:
4433 ctx = repo[r]
4433 ctx = repo[r]
4434 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4434 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4435 else:
4435 else:
4436 lock = repo.lock()
4436 lock = repo.lock()
4437 try:
4437 try:
4438 # set phase
4438 # set phase
4439 if not revs:
4439 if not revs:
4440 raise util.Abort(_('empty revision set'))
4440 raise util.Abort(_('empty revision set'))
4441 nodes = [repo[r].node() for r in revs]
4441 nodes = [repo[r].node() for r in revs]
4442 olddata = repo._phasecache.getphaserevs(repo)[:]
4442 olddata = repo._phasecache.getphaserevs(repo)[:]
4443 phases.advanceboundary(repo, targetphase, nodes)
4443 phases.advanceboundary(repo, targetphase, nodes)
4444 if opts['force']:
4444 if opts['force']:
4445 phases.retractboundary(repo, targetphase, nodes)
4445 phases.retractboundary(repo, targetphase, nodes)
4446 finally:
4446 finally:
4447 lock.release()
4447 lock.release()
4448 newdata = repo._phasecache.getphaserevs(repo)
4448 newdata = repo._phasecache.getphaserevs(repo)
4449 changes = sum(o != newdata[i] for i, o in enumerate(olddata))
4449 changes = sum(o != newdata[i] for i, o in enumerate(olddata))
4450 rejected = [n for n in nodes
4450 rejected = [n for n in nodes
4451 if newdata[repo[n].rev()] < targetphase]
4451 if newdata[repo[n].rev()] < targetphase]
4452 if rejected:
4452 if rejected:
4453 ui.warn(_('cannot move %i changesets to a more permissive '
4453 ui.warn(_('cannot move %i changesets to a more permissive '
4454 'phase, use --force\n') % len(rejected))
4454 'phase, use --force\n') % len(rejected))
4455 ret = 1
4455 ret = 1
4456 if changes:
4456 if changes:
4457 msg = _('phase changed for %i changesets\n') % changes
4457 msg = _('phase changed for %i changesets\n') % changes
4458 if ret:
4458 if ret:
4459 ui.status(msg)
4459 ui.status(msg)
4460 else:
4460 else:
4461 ui.note(msg)
4461 ui.note(msg)
4462 else:
4462 else:
4463 ui.warn(_('no phases changed\n'))
4463 ui.warn(_('no phases changed\n'))
4464 ret = 1
4464 ret = 1
4465 return ret
4465 return ret
4466
4466
4467 def postincoming(ui, repo, modheads, optupdate, checkout):
4467 def postincoming(ui, repo, modheads, optupdate, checkout):
4468 if modheads == 0:
4468 if modheads == 0:
4469 return
4469 return
4470 if optupdate:
4470 if optupdate:
4471 movemarkfrom = repo['.'].node()
4471 movemarkfrom = repo['.'].node()
4472 try:
4472 try:
4473 ret = hg.update(repo, checkout)
4473 ret = hg.update(repo, checkout)
4474 except util.Abort, inst:
4474 except util.Abort, inst:
4475 ui.warn(_("not updating: %s\n") % str(inst))
4475 ui.warn(_("not updating: %s\n") % str(inst))
4476 return 0
4476 return 0
4477 if not ret and not checkout:
4477 if not ret and not checkout:
4478 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
4478 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
4479 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
4479 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
4480 return ret
4480 return ret
4481 if modheads > 1:
4481 if modheads > 1:
4482 currentbranchheads = len(repo.branchheads())
4482 currentbranchheads = len(repo.branchheads())
4483 if currentbranchheads == modheads:
4483 if currentbranchheads == modheads:
4484 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4484 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4485 elif currentbranchheads > 1:
4485 elif currentbranchheads > 1:
4486 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
4486 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
4487 "merge)\n"))
4487 "merge)\n"))
4488 else:
4488 else:
4489 ui.status(_("(run 'hg heads' to see heads)\n"))
4489 ui.status(_("(run 'hg heads' to see heads)\n"))
4490 else:
4490 else:
4491 ui.status(_("(run 'hg update' to get a working copy)\n"))
4491 ui.status(_("(run 'hg update' to get a working copy)\n"))
4492
4492
4493 @command('^pull',
4493 @command('^pull',
4494 [('u', 'update', None,
4494 [('u', 'update', None,
4495 _('update to new branch head if changesets were pulled')),
4495 _('update to new branch head if changesets were pulled')),
4496 ('f', 'force', None, _('run even when remote repository is unrelated')),
4496 ('f', 'force', None, _('run even when remote repository is unrelated')),
4497 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4497 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4498 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4498 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4499 ('b', 'branch', [], _('a specific branch you would like to pull'),
4499 ('b', 'branch', [], _('a specific branch you would like to pull'),
4500 _('BRANCH')),
4500 _('BRANCH')),
4501 ] + remoteopts,
4501 ] + remoteopts,
4502 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4502 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4503 def pull(ui, repo, source="default", **opts):
4503 def pull(ui, repo, source="default", **opts):
4504 """pull changes from the specified source
4504 """pull changes from the specified source
4505
4505
4506 Pull changes from a remote repository to a local one.
4506 Pull changes from a remote repository to a local one.
4507
4507
4508 This finds all changes from the repository at the specified path
4508 This finds all changes from the repository at the specified path
4509 or URL and adds them to a local repository (the current one unless
4509 or URL and adds them to a local repository (the current one unless
4510 -R is specified). By default, this does not update the copy of the
4510 -R is specified). By default, this does not update the copy of the
4511 project in the working directory.
4511 project in the working directory.
4512
4512
4513 Use :hg:`incoming` if you want to see what would have been added
4513 Use :hg:`incoming` if you want to see what would have been added
4514 by a pull at the time you issued this command. If you then decide
4514 by a pull at the time you issued this command. If you then decide
4515 to add those changes to the repository, you should use :hg:`pull
4515 to add those changes to the repository, you should use :hg:`pull
4516 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4516 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4517
4517
4518 If SOURCE is omitted, the 'default' path will be used.
4518 If SOURCE is omitted, the 'default' path will be used.
4519 See :hg:`help urls` for more information.
4519 See :hg:`help urls` for more information.
4520
4520
4521 Returns 0 on success, 1 if an update had unresolved files.
4521 Returns 0 on success, 1 if an update had unresolved files.
4522 """
4522 """
4523 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4523 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4524 other = hg.peer(repo, opts, source)
4524 other = hg.peer(repo, opts, source)
4525 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4525 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4526 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
4526 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
4527
4527
4528 if opts.get('bookmark'):
4528 if opts.get('bookmark'):
4529 if not revs:
4529 if not revs:
4530 revs = []
4530 revs = []
4531 rb = other.listkeys('bookmarks')
4531 rb = other.listkeys('bookmarks')
4532 for b in opts['bookmark']:
4532 for b in opts['bookmark']:
4533 if b not in rb:
4533 if b not in rb:
4534 raise util.Abort(_('remote bookmark %s not found!') % b)
4534 raise util.Abort(_('remote bookmark %s not found!') % b)
4535 revs.append(rb[b])
4535 revs.append(rb[b])
4536
4536
4537 if revs:
4537 if revs:
4538 try:
4538 try:
4539 revs = [other.lookup(rev) for rev in revs]
4539 revs = [other.lookup(rev) for rev in revs]
4540 except error.CapabilityError:
4540 except error.CapabilityError:
4541 err = _("other repository doesn't support revision lookup, "
4541 err = _("other repository doesn't support revision lookup, "
4542 "so a rev cannot be specified.")
4542 "so a rev cannot be specified.")
4543 raise util.Abort(err)
4543 raise util.Abort(err)
4544
4544
4545 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
4545 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
4546 bookmarks.updatefromremote(ui, repo, other, source)
4546 bookmarks.updatefromremote(ui, repo, other, source)
4547 if checkout:
4547 if checkout:
4548 checkout = str(repo.changelog.rev(other.lookup(checkout)))
4548 checkout = str(repo.changelog.rev(other.lookup(checkout)))
4549 repo._subtoppath = source
4549 repo._subtoppath = source
4550 try:
4550 try:
4551 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
4551 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
4552
4552
4553 finally:
4553 finally:
4554 del repo._subtoppath
4554 del repo._subtoppath
4555
4555
4556 # update specified bookmarks
4556 # update specified bookmarks
4557 if opts.get('bookmark'):
4557 if opts.get('bookmark'):
4558 for b in opts['bookmark']:
4558 for b in opts['bookmark']:
4559 # explicit pull overrides local bookmark if any
4559 # explicit pull overrides local bookmark if any
4560 ui.status(_("importing bookmark %s\n") % b)
4560 ui.status(_("importing bookmark %s\n") % b)
4561 repo._bookmarks[b] = repo[rb[b]].node()
4561 repo._bookmarks[b] = repo[rb[b]].node()
4562 bookmarks.write(repo)
4562 bookmarks.write(repo)
4563
4563
4564 return ret
4564 return ret
4565
4565
4566 @command('^push',
4566 @command('^push',
4567 [('f', 'force', None, _('force push')),
4567 [('f', 'force', None, _('force push')),
4568 ('r', 'rev', [],
4568 ('r', 'rev', [],
4569 _('a changeset intended to be included in the destination'),
4569 _('a changeset intended to be included in the destination'),
4570 _('REV')),
4570 _('REV')),
4571 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4571 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4572 ('b', 'branch', [],
4572 ('b', 'branch', [],
4573 _('a specific branch you would like to push'), _('BRANCH')),
4573 _('a specific branch you would like to push'), _('BRANCH')),
4574 ('', 'new-branch', False, _('allow pushing a new branch')),
4574 ('', 'new-branch', False, _('allow pushing a new branch')),
4575 ] + remoteopts,
4575 ] + remoteopts,
4576 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4576 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4577 def push(ui, repo, dest=None, **opts):
4577 def push(ui, repo, dest=None, **opts):
4578 """push changes to the specified destination
4578 """push changes to the specified destination
4579
4579
4580 Push changesets from the local repository to the specified
4580 Push changesets from the local repository to the specified
4581 destination.
4581 destination.
4582
4582
4583 This operation is symmetrical to pull: it is identical to a pull
4583 This operation is symmetrical to pull: it is identical to a pull
4584 in the destination repository from the current one.
4584 in the destination repository from the current one.
4585
4585
4586 By default, push will not allow creation of new heads at the
4586 By default, push will not allow creation of new heads at the
4587 destination, since multiple heads would make it unclear which head
4587 destination, since multiple heads would make it unclear which head
4588 to use. In this situation, it is recommended to pull and merge
4588 to use. In this situation, it is recommended to pull and merge
4589 before pushing.
4589 before pushing.
4590
4590
4591 Use --new-branch if you want to allow push to create a new named
4591 Use --new-branch if you want to allow push to create a new named
4592 branch that is not present at the destination. This allows you to
4592 branch that is not present at the destination. This allows you to
4593 only create a new branch without forcing other changes.
4593 only create a new branch without forcing other changes.
4594
4594
4595 Use -f/--force to override the default behavior and push all
4595 Use -f/--force to override the default behavior and push all
4596 changesets on all branches.
4596 changesets on all branches.
4597
4597
4598 If -r/--rev is used, the specified revision and all its ancestors
4598 If -r/--rev is used, the specified revision and all its ancestors
4599 will be pushed to the remote repository.
4599 will be pushed to the remote repository.
4600
4600
4601 Please see :hg:`help urls` for important details about ``ssh://``
4601 Please see :hg:`help urls` for important details about ``ssh://``
4602 URLs. If DESTINATION is omitted, a default path will be used.
4602 URLs. If DESTINATION is omitted, a default path will be used.
4603
4603
4604 Returns 0 if push was successful, 1 if nothing to push.
4604 Returns 0 if push was successful, 1 if nothing to push.
4605 """
4605 """
4606
4606
4607 if opts.get('bookmark'):
4607 if opts.get('bookmark'):
4608 for b in opts['bookmark']:
4608 for b in opts['bookmark']:
4609 # translate -B options to -r so changesets get pushed
4609 # translate -B options to -r so changesets get pushed
4610 if b in repo._bookmarks:
4610 if b in repo._bookmarks:
4611 opts.setdefault('rev', []).append(b)
4611 opts.setdefault('rev', []).append(b)
4612 else:
4612 else:
4613 # if we try to push a deleted bookmark, translate it to null
4613 # if we try to push a deleted bookmark, translate it to null
4614 # this lets simultaneous -r, -b options continue working
4614 # this lets simultaneous -r, -b options continue working
4615 opts.setdefault('rev', []).append("null")
4615 opts.setdefault('rev', []).append("null")
4616
4616
4617 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4617 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4618 dest, branches = hg.parseurl(dest, opts.get('branch'))
4618 dest, branches = hg.parseurl(dest, opts.get('branch'))
4619 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4619 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4620 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4620 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4621 other = hg.peer(repo, opts, dest)
4621 other = hg.peer(repo, opts, dest)
4622 if revs:
4622 if revs:
4623 revs = [repo.lookup(rev) for rev in revs]
4623 revs = [repo.lookup(rev) for rev in revs]
4624
4624
4625 repo._subtoppath = dest
4625 repo._subtoppath = dest
4626 try:
4626 try:
4627 # push subrepos depth-first for coherent ordering
4627 # push subrepos depth-first for coherent ordering
4628 c = repo['']
4628 c = repo['']
4629 subs = c.substate # only repos that are committed
4629 subs = c.substate # only repos that are committed
4630 for s in sorted(subs):
4630 for s in sorted(subs):
4631 if c.sub(s).push(opts) == 0:
4631 if c.sub(s).push(opts) == 0:
4632 return False
4632 return False
4633 finally:
4633 finally:
4634 del repo._subtoppath
4634 del repo._subtoppath
4635 result = repo.push(other, opts.get('force'), revs=revs,
4635 result = repo.push(other, opts.get('force'), revs=revs,
4636 newbranch=opts.get('new_branch'))
4636 newbranch=opts.get('new_branch'))
4637
4637
4638 result = not result
4638 result = not result
4639
4639
4640 if opts.get('bookmark'):
4640 if opts.get('bookmark'):
4641 rb = other.listkeys('bookmarks')
4641 rb = other.listkeys('bookmarks')
4642 for b in opts['bookmark']:
4642 for b in opts['bookmark']:
4643 # explicit push overrides remote bookmark if any
4643 # explicit push overrides remote bookmark if any
4644 if b in repo._bookmarks:
4644 if b in repo._bookmarks:
4645 ui.status(_("exporting bookmark %s\n") % b)
4645 ui.status(_("exporting bookmark %s\n") % b)
4646 new = repo[b].hex()
4646 new = repo[b].hex()
4647 elif b in rb:
4647 elif b in rb:
4648 ui.status(_("deleting remote bookmark %s\n") % b)
4648 ui.status(_("deleting remote bookmark %s\n") % b)
4649 new = '' # delete
4649 new = '' # delete
4650 else:
4650 else:
4651 ui.warn(_('bookmark %s does not exist on the local '
4651 ui.warn(_('bookmark %s does not exist on the local '
4652 'or remote repository!\n') % b)
4652 'or remote repository!\n') % b)
4653 return 2
4653 return 2
4654 old = rb.get(b, '')
4654 old = rb.get(b, '')
4655 r = other.pushkey('bookmarks', b, old, new)
4655 r = other.pushkey('bookmarks', b, old, new)
4656 if not r:
4656 if not r:
4657 ui.warn(_('updating bookmark %s failed!\n') % b)
4657 ui.warn(_('updating bookmark %s failed!\n') % b)
4658 if not result:
4658 if not result:
4659 result = 2
4659 result = 2
4660
4660
4661 return result
4661 return result
4662
4662
4663 @command('recover', [])
4663 @command('recover', [])
4664 def recover(ui, repo):
4664 def recover(ui, repo):
4665 """roll back an interrupted transaction
4665 """roll back an interrupted transaction
4666
4666
4667 Recover from an interrupted commit or pull.
4667 Recover from an interrupted commit or pull.
4668
4668
4669 This command tries to fix the repository status after an
4669 This command tries to fix the repository status after an
4670 interrupted operation. It should only be necessary when Mercurial
4670 interrupted operation. It should only be necessary when Mercurial
4671 suggests it.
4671 suggests it.
4672
4672
4673 Returns 0 if successful, 1 if nothing to recover or verify fails.
4673 Returns 0 if successful, 1 if nothing to recover or verify fails.
4674 """
4674 """
4675 if repo.recover():
4675 if repo.recover():
4676 return hg.verify(repo)
4676 return hg.verify(repo)
4677 return 1
4677 return 1
4678
4678
4679 @command('^remove|rm',
4679 @command('^remove|rm',
4680 [('A', 'after', None, _('record delete for missing files')),
4680 [('A', 'after', None, _('record delete for missing files')),
4681 ('f', 'force', None,
4681 ('f', 'force', None,
4682 _('remove (and delete) file even if added or modified')),
4682 _('remove (and delete) file even if added or modified')),
4683 ] + walkopts,
4683 ] + walkopts,
4684 _('[OPTION]... FILE...'))
4684 _('[OPTION]... FILE...'))
4685 def remove(ui, repo, *pats, **opts):
4685 def remove(ui, repo, *pats, **opts):
4686 """remove the specified files on the next commit
4686 """remove the specified files on the next commit
4687
4687
4688 Schedule the indicated files for removal from the current branch.
4688 Schedule the indicated files for removal from the current branch.
4689
4689
4690 This command schedules the files to be removed at the next commit.
4690 This command schedules the files to be removed at the next commit.
4691 To undo a remove before that, see :hg:`revert`. To undo added
4691 To undo a remove before that, see :hg:`revert`. To undo added
4692 files, see :hg:`forget`.
4692 files, see :hg:`forget`.
4693
4693
4694 .. container:: verbose
4694 .. container:: verbose
4695
4695
4696 -A/--after can be used to remove only files that have already
4696 -A/--after can be used to remove only files that have already
4697 been deleted, -f/--force can be used to force deletion, and -Af
4697 been deleted, -f/--force can be used to force deletion, and -Af
4698 can be used to remove files from the next revision without
4698 can be used to remove files from the next revision without
4699 deleting them from the working directory.
4699 deleting them from the working directory.
4700
4700
4701 The following table details the behavior of remove for different
4701 The following table details the behavior of remove for different
4702 file states (columns) and option combinations (rows). The file
4702 file states (columns) and option combinations (rows). The file
4703 states are Added [A], Clean [C], Modified [M] and Missing [!]
4703 states are Added [A], Clean [C], Modified [M] and Missing [!]
4704 (as reported by :hg:`status`). The actions are Warn, Remove
4704 (as reported by :hg:`status`). The actions are Warn, Remove
4705 (from branch) and Delete (from disk):
4705 (from branch) and Delete (from disk):
4706
4706
4707 ======= == == == ==
4707 ======= == == == ==
4708 A C M !
4708 A C M !
4709 ======= == == == ==
4709 ======= == == == ==
4710 none W RD W R
4710 none W RD W R
4711 -f R RD RD R
4711 -f R RD RD R
4712 -A W W W R
4712 -A W W W R
4713 -Af R R R R
4713 -Af R R R R
4714 ======= == == == ==
4714 ======= == == == ==
4715
4715
4716 Note that remove never deletes files in Added [A] state from the
4716 Note that remove never deletes files in Added [A] state from the
4717 working directory, not even if option --force is specified.
4717 working directory, not even if option --force is specified.
4718
4718
4719 Returns 0 on success, 1 if any warnings encountered.
4719 Returns 0 on success, 1 if any warnings encountered.
4720 """
4720 """
4721
4721
4722 ret = 0
4722 ret = 0
4723 after, force = opts.get('after'), opts.get('force')
4723 after, force = opts.get('after'), opts.get('force')
4724 if not pats and not after:
4724 if not pats and not after:
4725 raise util.Abort(_('no files specified'))
4725 raise util.Abort(_('no files specified'))
4726
4726
4727 m = scmutil.match(repo[None], pats, opts)
4727 m = scmutil.match(repo[None], pats, opts)
4728 s = repo.status(match=m, clean=True)
4728 s = repo.status(match=m, clean=True)
4729 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
4729 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
4730
4730
4731 for f in m.files():
4731 for f in m.files():
4732 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
4732 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
4733 if os.path.exists(m.rel(f)):
4733 if os.path.exists(m.rel(f)):
4734 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
4734 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
4735 ret = 1
4735 ret = 1
4736
4736
4737 if force:
4737 if force:
4738 list = modified + deleted + clean + added
4738 list = modified + deleted + clean + added
4739 elif after:
4739 elif after:
4740 list = deleted
4740 list = deleted
4741 for f in modified + added + clean:
4741 for f in modified + added + clean:
4742 ui.warn(_('not removing %s: file still exists (use -f'
4742 ui.warn(_('not removing %s: file still exists (use -f'
4743 ' to force removal)\n') % m.rel(f))
4743 ' to force removal)\n') % m.rel(f))
4744 ret = 1
4744 ret = 1
4745 else:
4745 else:
4746 list = deleted + clean
4746 list = deleted + clean
4747 for f in modified:
4747 for f in modified:
4748 ui.warn(_('not removing %s: file is modified (use -f'
4748 ui.warn(_('not removing %s: file is modified (use -f'
4749 ' to force removal)\n') % m.rel(f))
4749 ' to force removal)\n') % m.rel(f))
4750 ret = 1
4750 ret = 1
4751 for f in added:
4751 for f in added:
4752 ui.warn(_('not removing %s: file has been marked for add'
4752 ui.warn(_('not removing %s: file has been marked for add'
4753 ' (use forget to undo)\n') % m.rel(f))
4753 ' (use forget to undo)\n') % m.rel(f))
4754 ret = 1
4754 ret = 1
4755
4755
4756 for f in sorted(list):
4756 for f in sorted(list):
4757 if ui.verbose or not m.exact(f):
4757 if ui.verbose or not m.exact(f):
4758 ui.status(_('removing %s\n') % m.rel(f))
4758 ui.status(_('removing %s\n') % m.rel(f))
4759
4759
4760 wlock = repo.wlock()
4760 wlock = repo.wlock()
4761 try:
4761 try:
4762 if not after:
4762 if not after:
4763 for f in list:
4763 for f in list:
4764 if f in added:
4764 if f in added:
4765 continue # we never unlink added files on remove
4765 continue # we never unlink added files on remove
4766 try:
4766 try:
4767 util.unlinkpath(repo.wjoin(f))
4767 util.unlinkpath(repo.wjoin(f))
4768 except OSError, inst:
4768 except OSError, inst:
4769 if inst.errno != errno.ENOENT:
4769 if inst.errno != errno.ENOENT:
4770 raise
4770 raise
4771 repo[None].forget(list)
4771 repo[None].forget(list)
4772 finally:
4772 finally:
4773 wlock.release()
4773 wlock.release()
4774
4774
4775 return ret
4775 return ret
4776
4776
4777 @command('rename|move|mv',
4777 @command('rename|move|mv',
4778 [('A', 'after', None, _('record a rename that has already occurred')),
4778 [('A', 'after', None, _('record a rename that has already occurred')),
4779 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4779 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4780 ] + walkopts + dryrunopts,
4780 ] + walkopts + dryrunopts,
4781 _('[OPTION]... SOURCE... DEST'))
4781 _('[OPTION]... SOURCE... DEST'))
4782 def rename(ui, repo, *pats, **opts):
4782 def rename(ui, repo, *pats, **opts):
4783 """rename files; equivalent of copy + remove
4783 """rename files; equivalent of copy + remove
4784
4784
4785 Mark dest as copies of sources; mark sources for deletion. If dest
4785 Mark dest as copies of sources; mark sources for deletion. If dest
4786 is a directory, copies are put in that directory. If dest is a
4786 is a directory, copies are put in that directory. If dest is a
4787 file, there can only be one source.
4787 file, there can only be one source.
4788
4788
4789 By default, this command copies the contents of files as they
4789 By default, this command copies the contents of files as they
4790 exist in the working directory. If invoked with -A/--after, the
4790 exist in the working directory. If invoked with -A/--after, the
4791 operation is recorded, but no copying is performed.
4791 operation is recorded, but no copying is performed.
4792
4792
4793 This command takes effect at the next commit. To undo a rename
4793 This command takes effect at the next commit. To undo a rename
4794 before that, see :hg:`revert`.
4794 before that, see :hg:`revert`.
4795
4795
4796 Returns 0 on success, 1 if errors are encountered.
4796 Returns 0 on success, 1 if errors are encountered.
4797 """
4797 """
4798 wlock = repo.wlock(False)
4798 wlock = repo.wlock(False)
4799 try:
4799 try:
4800 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4800 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4801 finally:
4801 finally:
4802 wlock.release()
4802 wlock.release()
4803
4803
4804 @command('resolve',
4804 @command('resolve',
4805 [('a', 'all', None, _('select all unresolved files')),
4805 [('a', 'all', None, _('select all unresolved files')),
4806 ('l', 'list', None, _('list state of files needing merge')),
4806 ('l', 'list', None, _('list state of files needing merge')),
4807 ('m', 'mark', None, _('mark files as resolved')),
4807 ('m', 'mark', None, _('mark files as resolved')),
4808 ('u', 'unmark', None, _('mark files as unresolved')),
4808 ('u', 'unmark', None, _('mark files as unresolved')),
4809 ('n', 'no-status', None, _('hide status prefix'))]
4809 ('n', 'no-status', None, _('hide status prefix'))]
4810 + mergetoolopts + walkopts,
4810 + mergetoolopts + walkopts,
4811 _('[OPTION]... [FILE]...'))
4811 _('[OPTION]... [FILE]...'))
4812 def resolve(ui, repo, *pats, **opts):
4812 def resolve(ui, repo, *pats, **opts):
4813 """redo merges or set/view the merge status of files
4813 """redo merges or set/view the merge status of files
4814
4814
4815 Merges with unresolved conflicts are often the result of
4815 Merges with unresolved conflicts are often the result of
4816 non-interactive merging using the ``internal:merge`` configuration
4816 non-interactive merging using the ``internal:merge`` configuration
4817 setting, or a command-line merge tool like ``diff3``. The resolve
4817 setting, or a command-line merge tool like ``diff3``. The resolve
4818 command is used to manage the files involved in a merge, after
4818 command is used to manage the files involved in a merge, after
4819 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4819 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4820 working directory must have two parents). See :hg:`help
4820 working directory must have two parents). See :hg:`help
4821 merge-tools` for information on configuring merge tools.
4821 merge-tools` for information on configuring merge tools.
4822
4822
4823 The resolve command can be used in the following ways:
4823 The resolve command can be used in the following ways:
4824
4824
4825 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4825 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4826 files, discarding any previous merge attempts. Re-merging is not
4826 files, discarding any previous merge attempts. Re-merging is not
4827 performed for files already marked as resolved. Use ``--all/-a``
4827 performed for files already marked as resolved. Use ``--all/-a``
4828 to select all unresolved files. ``--tool`` can be used to specify
4828 to select all unresolved files. ``--tool`` can be used to specify
4829 the merge tool used for the given files. It overrides the HGMERGE
4829 the merge tool used for the given files. It overrides the HGMERGE
4830 environment variable and your configuration files. Previous file
4830 environment variable and your configuration files. Previous file
4831 contents are saved with a ``.orig`` suffix.
4831 contents are saved with a ``.orig`` suffix.
4832
4832
4833 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4833 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4834 (e.g. after having manually fixed-up the files). The default is
4834 (e.g. after having manually fixed-up the files). The default is
4835 to mark all unresolved files.
4835 to mark all unresolved files.
4836
4836
4837 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4837 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4838 default is to mark all resolved files.
4838 default is to mark all resolved files.
4839
4839
4840 - :hg:`resolve -l`: list files which had or still have conflicts.
4840 - :hg:`resolve -l`: list files which had or still have conflicts.
4841 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4841 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4842
4842
4843 Note that Mercurial will not let you commit files with unresolved
4843 Note that Mercurial will not let you commit files with unresolved
4844 merge conflicts. You must use :hg:`resolve -m ...` before you can
4844 merge conflicts. You must use :hg:`resolve -m ...` before you can
4845 commit after a conflicting merge.
4845 commit after a conflicting merge.
4846
4846
4847 Returns 0 on success, 1 if any files fail a resolve attempt.
4847 Returns 0 on success, 1 if any files fail a resolve attempt.
4848 """
4848 """
4849
4849
4850 all, mark, unmark, show, nostatus = \
4850 all, mark, unmark, show, nostatus = \
4851 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
4851 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
4852
4852
4853 if (show and (mark or unmark)) or (mark and unmark):
4853 if (show and (mark or unmark)) or (mark and unmark):
4854 raise util.Abort(_("too many options specified"))
4854 raise util.Abort(_("too many options specified"))
4855 if pats and all:
4855 if pats and all:
4856 raise util.Abort(_("can't specify --all and patterns"))
4856 raise util.Abort(_("can't specify --all and patterns"))
4857 if not (all or pats or show or mark or unmark):
4857 if not (all or pats or show or mark or unmark):
4858 raise util.Abort(_('no files or directories specified; '
4858 raise util.Abort(_('no files or directories specified; '
4859 'use --all to remerge all files'))
4859 'use --all to remerge all files'))
4860
4860
4861 ms = mergemod.mergestate(repo)
4861 ms = mergemod.mergestate(repo)
4862 m = scmutil.match(repo[None], pats, opts)
4862 m = scmutil.match(repo[None], pats, opts)
4863 ret = 0
4863 ret = 0
4864
4864
4865 for f in ms:
4865 for f in ms:
4866 if m(f):
4866 if m(f):
4867 if show:
4867 if show:
4868 if nostatus:
4868 if nostatus:
4869 ui.write("%s\n" % f)
4869 ui.write("%s\n" % f)
4870 else:
4870 else:
4871 ui.write("%s %s\n" % (ms[f].upper(), f),
4871 ui.write("%s %s\n" % (ms[f].upper(), f),
4872 label='resolve.' +
4872 label='resolve.' +
4873 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
4873 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
4874 elif mark:
4874 elif mark:
4875 ms.mark(f, "r")
4875 ms.mark(f, "r")
4876 elif unmark:
4876 elif unmark:
4877 ms.mark(f, "u")
4877 ms.mark(f, "u")
4878 else:
4878 else:
4879 wctx = repo[None]
4879 wctx = repo[None]
4880 mctx = wctx.parents()[-1]
4880 mctx = wctx.parents()[-1]
4881
4881
4882 # backup pre-resolve (merge uses .orig for its own purposes)
4882 # backup pre-resolve (merge uses .orig for its own purposes)
4883 a = repo.wjoin(f)
4883 a = repo.wjoin(f)
4884 util.copyfile(a, a + ".resolve")
4884 util.copyfile(a, a + ".resolve")
4885
4885
4886 try:
4886 try:
4887 # resolve file
4887 # resolve file
4888 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4888 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4889 if ms.resolve(f, wctx, mctx):
4889 if ms.resolve(f, wctx, mctx):
4890 ret = 1
4890 ret = 1
4891 finally:
4891 finally:
4892 ui.setconfig('ui', 'forcemerge', '')
4892 ui.setconfig('ui', 'forcemerge', '')
4893
4893
4894 # replace filemerge's .orig file with our resolve file
4894 # replace filemerge's .orig file with our resolve file
4895 util.rename(a + ".resolve", a + ".orig")
4895 util.rename(a + ".resolve", a + ".orig")
4896
4896
4897 ms.commit()
4897 ms.commit()
4898 return ret
4898 return ret
4899
4899
4900 @command('revert',
4900 @command('revert',
4901 [('a', 'all', None, _('revert all changes when no arguments given')),
4901 [('a', 'all', None, _('revert all changes when no arguments given')),
4902 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4902 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4903 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4903 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4904 ('C', 'no-backup', None, _('do not save backup copies of files')),
4904 ('C', 'no-backup', None, _('do not save backup copies of files')),
4905 ] + walkopts + dryrunopts,
4905 ] + walkopts + dryrunopts,
4906 _('[OPTION]... [-r REV] [NAME]...'))
4906 _('[OPTION]... [-r REV] [NAME]...'))
4907 def revert(ui, repo, *pats, **opts):
4907 def revert(ui, repo, *pats, **opts):
4908 """restore files to their checkout state
4908 """restore files to their checkout state
4909
4909
4910 .. note::
4910 .. note::
4911
4911 To check out earlier revisions, you should use :hg:`update REV`.
4912 To check out earlier revisions, you should use :hg:`update REV`.
4912 To cancel a merge (and lose your changes), use :hg:`update --clean .`.
4913 To cancel an uncommitted merge (and lose your changes), use
4914 :hg:`update --clean .`.
4913
4915
4914 With no revision specified, revert the specified files or directories
4916 With no revision specified, revert the specified files or directories
4915 to the contents they had in the parent of the working directory.
4917 to the contents they had in the parent of the working directory.
4916 This restores the contents of files to an unmodified
4918 This restores the contents of files to an unmodified
4917 state and unschedules adds, removes, copies, and renames. If the
4919 state and unschedules adds, removes, copies, and renames. If the
4918 working directory has two parents, you must explicitly specify a
4920 working directory has two parents, you must explicitly specify a
4919 revision.
4921 revision.
4920
4922
4921 Using the -r/--rev or -d/--date options, revert the given files or
4923 Using the -r/--rev or -d/--date options, revert the given files or
4922 directories to their states as of a specific revision. Because
4924 directories to their states as of a specific revision. Because
4923 revert does not change the working directory parents, this will
4925 revert does not change the working directory parents, this will
4924 cause these files to appear modified. This can be helpful to "back
4926 cause these files to appear modified. This can be helpful to "back
4925 out" some or all of an earlier change. See :hg:`backout` for a
4927 out" some or all of an earlier change. See :hg:`backout` for a
4926 related method.
4928 related method.
4927
4929
4928 Modified files are saved with a .orig suffix before reverting.
4930 Modified files are saved with a .orig suffix before reverting.
4929 To disable these backups, use --no-backup.
4931 To disable these backups, use --no-backup.
4930
4932
4931 See :hg:`help dates` for a list of formats valid for -d/--date.
4933 See :hg:`help dates` for a list of formats valid for -d/--date.
4932
4934
4933 Returns 0 on success.
4935 Returns 0 on success.
4934 """
4936 """
4935
4937
4936 if opts.get("date"):
4938 if opts.get("date"):
4937 if opts.get("rev"):
4939 if opts.get("rev"):
4938 raise util.Abort(_("you can't specify a revision and a date"))
4940 raise util.Abort(_("you can't specify a revision and a date"))
4939 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4941 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4940
4942
4941 parent, p2 = repo.dirstate.parents()
4943 parent, p2 = repo.dirstate.parents()
4942 if not opts.get('rev') and p2 != nullid:
4944 if not opts.get('rev') and p2 != nullid:
4943 # revert after merge is a trap for new users (issue2915)
4945 # revert after merge is a trap for new users (issue2915)
4944 raise util.Abort(_('uncommitted merge with no revision specified'),
4946 raise util.Abort(_('uncommitted merge with no revision specified'),
4945 hint=_('use "hg update" or see "hg help revert"'))
4947 hint=_('use "hg update" or see "hg help revert"'))
4946
4948
4947 ctx = scmutil.revsingle(repo, opts.get('rev'))
4949 ctx = scmutil.revsingle(repo, opts.get('rev'))
4948
4950
4949 if not pats and not opts.get('all'):
4951 if not pats and not opts.get('all'):
4950 msg = _("no files or directories specified")
4952 msg = _("no files or directories specified")
4951 if p2 != nullid:
4953 if p2 != nullid:
4952 hint = _("uncommitted merge, use --all to discard all changes,"
4954 hint = _("uncommitted merge, use --all to discard all changes,"
4953 " or 'hg update -C .' to abort the merge")
4955 " or 'hg update -C .' to abort the merge")
4954 raise util.Abort(msg, hint=hint)
4956 raise util.Abort(msg, hint=hint)
4955 dirty = util.any(repo.status())
4957 dirty = util.any(repo.status())
4956 node = ctx.node()
4958 node = ctx.node()
4957 if node != parent:
4959 if node != parent:
4958 if dirty:
4960 if dirty:
4959 hint = _("uncommitted changes, use --all to discard all"
4961 hint = _("uncommitted changes, use --all to discard all"
4960 " changes, or 'hg update %s' to update") % ctx.rev()
4962 " changes, or 'hg update %s' to update") % ctx.rev()
4961 else:
4963 else:
4962 hint = _("use --all to revert all files,"
4964 hint = _("use --all to revert all files,"
4963 " or 'hg update %s' to update") % ctx.rev()
4965 " or 'hg update %s' to update") % ctx.rev()
4964 elif dirty:
4966 elif dirty:
4965 hint = _("uncommitted changes, use --all to discard all changes")
4967 hint = _("uncommitted changes, use --all to discard all changes")
4966 else:
4968 else:
4967 hint = _("use --all to revert all files")
4969 hint = _("use --all to revert all files")
4968 raise util.Abort(msg, hint=hint)
4970 raise util.Abort(msg, hint=hint)
4969
4971
4970 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
4972 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
4971
4973
4972 @command('rollback', dryrunopts +
4974 @command('rollback', dryrunopts +
4973 [('f', 'force', False, _('ignore safety measures'))])
4975 [('f', 'force', False, _('ignore safety measures'))])
4974 def rollback(ui, repo, **opts):
4976 def rollback(ui, repo, **opts):
4975 """roll back the last transaction (dangerous)
4977 """roll back the last transaction (dangerous)
4976
4978
4977 This command should be used with care. There is only one level of
4979 This command should be used with care. There is only one level of
4978 rollback, and there is no way to undo a rollback. It will also
4980 rollback, and there is no way to undo a rollback. It will also
4979 restore the dirstate at the time of the last transaction, losing
4981 restore the dirstate at the time of the last transaction, losing
4980 any dirstate changes since that time. This command does not alter
4982 any dirstate changes since that time. This command does not alter
4981 the working directory.
4983 the working directory.
4982
4984
4983 Transactions are used to encapsulate the effects of all commands
4985 Transactions are used to encapsulate the effects of all commands
4984 that create new changesets or propagate existing changesets into a
4986 that create new changesets or propagate existing changesets into a
4985 repository.
4987 repository.
4986
4988
4987 .. container:: verbose
4989 .. container:: verbose
4988
4990
4989 For example, the following commands are transactional, and their
4991 For example, the following commands are transactional, and their
4990 effects can be rolled back:
4992 effects can be rolled back:
4991
4993
4992 - commit
4994 - commit
4993 - import
4995 - import
4994 - pull
4996 - pull
4995 - push (with this repository as the destination)
4997 - push (with this repository as the destination)
4996 - unbundle
4998 - unbundle
4997
4999
4998 To avoid permanent data loss, rollback will refuse to rollback a
5000 To avoid permanent data loss, rollback will refuse to rollback a
4999 commit transaction if it isn't checked out. Use --force to
5001 commit transaction if it isn't checked out. Use --force to
5000 override this protection.
5002 override this protection.
5001
5003
5002 This command is not intended for use on public repositories. Once
5004 This command is not intended for use on public repositories. Once
5003 changes are visible for pull by other users, rolling a transaction
5005 changes are visible for pull by other users, rolling a transaction
5004 back locally is ineffective (someone else may already have pulled
5006 back locally is ineffective (someone else may already have pulled
5005 the changes). Furthermore, a race is possible with readers of the
5007 the changes). Furthermore, a race is possible with readers of the
5006 repository; for example an in-progress pull from the repository
5008 repository; for example an in-progress pull from the repository
5007 may fail if a rollback is performed.
5009 may fail if a rollback is performed.
5008
5010
5009 Returns 0 on success, 1 if no rollback data is available.
5011 Returns 0 on success, 1 if no rollback data is available.
5010 """
5012 """
5011 return repo.rollback(dryrun=opts.get('dry_run'),
5013 return repo.rollback(dryrun=opts.get('dry_run'),
5012 force=opts.get('force'))
5014 force=opts.get('force'))
5013
5015
5014 @command('root', [])
5016 @command('root', [])
5015 def root(ui, repo):
5017 def root(ui, repo):
5016 """print the root (top) of the current working directory
5018 """print the root (top) of the current working directory
5017
5019
5018 Print the root directory of the current repository.
5020 Print the root directory of the current repository.
5019
5021
5020 Returns 0 on success.
5022 Returns 0 on success.
5021 """
5023 """
5022 ui.write(repo.root + "\n")
5024 ui.write(repo.root + "\n")
5023
5025
5024 @command('^serve',
5026 @command('^serve',
5025 [('A', 'accesslog', '', _('name of access log file to write to'),
5027 [('A', 'accesslog', '', _('name of access log file to write to'),
5026 _('FILE')),
5028 _('FILE')),
5027 ('d', 'daemon', None, _('run server in background')),
5029 ('d', 'daemon', None, _('run server in background')),
5028 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
5030 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
5029 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5031 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5030 # use string type, then we can check if something was passed
5032 # use string type, then we can check if something was passed
5031 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5033 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5032 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5034 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5033 _('ADDR')),
5035 _('ADDR')),
5034 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5036 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5035 _('PREFIX')),
5037 _('PREFIX')),
5036 ('n', 'name', '',
5038 ('n', 'name', '',
5037 _('name to show in web pages (default: working directory)'), _('NAME')),
5039 _('name to show in web pages (default: working directory)'), _('NAME')),
5038 ('', 'web-conf', '',
5040 ('', 'web-conf', '',
5039 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
5041 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
5040 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5042 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5041 _('FILE')),
5043 _('FILE')),
5042 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5044 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5043 ('', 'stdio', None, _('for remote clients')),
5045 ('', 'stdio', None, _('for remote clients')),
5044 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
5046 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
5045 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5047 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5046 ('', 'style', '', _('template style to use'), _('STYLE')),
5048 ('', 'style', '', _('template style to use'), _('STYLE')),
5047 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5049 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5048 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
5050 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
5049 _('[OPTION]...'))
5051 _('[OPTION]...'))
5050 def serve(ui, repo, **opts):
5052 def serve(ui, repo, **opts):
5051 """start stand-alone webserver
5053 """start stand-alone webserver
5052
5054
5053 Start a local HTTP repository browser and pull server. You can use
5055 Start a local HTTP repository browser and pull server. You can use
5054 this for ad-hoc sharing and browsing of repositories. It is
5056 this for ad-hoc sharing and browsing of repositories. It is
5055 recommended to use a real web server to serve a repository for
5057 recommended to use a real web server to serve a repository for
5056 longer periods of time.
5058 longer periods of time.
5057
5059
5058 Please note that the server does not implement access control.
5060 Please note that the server does not implement access control.
5059 This means that, by default, anybody can read from the server and
5061 This means that, by default, anybody can read from the server and
5060 nobody can write to it by default. Set the ``web.allow_push``
5062 nobody can write to it by default. Set the ``web.allow_push``
5061 option to ``*`` to allow everybody to push to the server. You
5063 option to ``*`` to allow everybody to push to the server. You
5062 should use a real web server if you need to authenticate users.
5064 should use a real web server if you need to authenticate users.
5063
5065
5064 By default, the server logs accesses to stdout and errors to
5066 By default, the server logs accesses to stdout and errors to
5065 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5067 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5066 files.
5068 files.
5067
5069
5068 To have the server choose a free port number to listen on, specify
5070 To have the server choose a free port number to listen on, specify
5069 a port number of 0; in this case, the server will print the port
5071 a port number of 0; in this case, the server will print the port
5070 number it uses.
5072 number it uses.
5071
5073
5072 Returns 0 on success.
5074 Returns 0 on success.
5073 """
5075 """
5074
5076
5075 if opts["stdio"] and opts["cmdserver"]:
5077 if opts["stdio"] and opts["cmdserver"]:
5076 raise util.Abort(_("cannot use --stdio with --cmdserver"))
5078 raise util.Abort(_("cannot use --stdio with --cmdserver"))
5077
5079
5078 def checkrepo():
5080 def checkrepo():
5079 if repo is None:
5081 if repo is None:
5080 raise error.RepoError(_("there is no Mercurial repository here"
5082 raise error.RepoError(_("there is no Mercurial repository here"
5081 " (.hg not found)"))
5083 " (.hg not found)"))
5082
5084
5083 if opts["stdio"]:
5085 if opts["stdio"]:
5084 checkrepo()
5086 checkrepo()
5085 s = sshserver.sshserver(ui, repo)
5087 s = sshserver.sshserver(ui, repo)
5086 s.serve_forever()
5088 s.serve_forever()
5087
5089
5088 if opts["cmdserver"]:
5090 if opts["cmdserver"]:
5089 checkrepo()
5091 checkrepo()
5090 s = commandserver.server(ui, repo, opts["cmdserver"])
5092 s = commandserver.server(ui, repo, opts["cmdserver"])
5091 return s.serve()
5093 return s.serve()
5092
5094
5093 # this way we can check if something was given in the command-line
5095 # this way we can check if something was given in the command-line
5094 if opts.get('port'):
5096 if opts.get('port'):
5095 opts['port'] = util.getport(opts.get('port'))
5097 opts['port'] = util.getport(opts.get('port'))
5096
5098
5097 baseui = repo and repo.baseui or ui
5099 baseui = repo and repo.baseui or ui
5098 optlist = ("name templates style address port prefix ipv6"
5100 optlist = ("name templates style address port prefix ipv6"
5099 " accesslog errorlog certificate encoding")
5101 " accesslog errorlog certificate encoding")
5100 for o in optlist.split():
5102 for o in optlist.split():
5101 val = opts.get(o, '')
5103 val = opts.get(o, '')
5102 if val in (None, ''): # should check against default options instead
5104 if val in (None, ''): # should check against default options instead
5103 continue
5105 continue
5104 baseui.setconfig("web", o, val)
5106 baseui.setconfig("web", o, val)
5105 if repo and repo.ui != baseui:
5107 if repo and repo.ui != baseui:
5106 repo.ui.setconfig("web", o, val)
5108 repo.ui.setconfig("web", o, val)
5107
5109
5108 o = opts.get('web_conf') or opts.get('webdir_conf')
5110 o = opts.get('web_conf') or opts.get('webdir_conf')
5109 if not o:
5111 if not o:
5110 if not repo:
5112 if not repo:
5111 raise error.RepoError(_("there is no Mercurial repository"
5113 raise error.RepoError(_("there is no Mercurial repository"
5112 " here (.hg not found)"))
5114 " here (.hg not found)"))
5113 o = repo.root
5115 o = repo.root
5114
5116
5115 app = hgweb.hgweb(o, baseui=ui)
5117 app = hgweb.hgweb(o, baseui=ui)
5116
5118
5117 class service(object):
5119 class service(object):
5118 def init(self):
5120 def init(self):
5119 util.setsignalhandler()
5121 util.setsignalhandler()
5120 self.httpd = hgweb.server.create_server(ui, app)
5122 self.httpd = hgweb.server.create_server(ui, app)
5121
5123
5122 if opts['port'] and not ui.verbose:
5124 if opts['port'] and not ui.verbose:
5123 return
5125 return
5124
5126
5125 if self.httpd.prefix:
5127 if self.httpd.prefix:
5126 prefix = self.httpd.prefix.strip('/') + '/'
5128 prefix = self.httpd.prefix.strip('/') + '/'
5127 else:
5129 else:
5128 prefix = ''
5130 prefix = ''
5129
5131
5130 port = ':%d' % self.httpd.port
5132 port = ':%d' % self.httpd.port
5131 if port == ':80':
5133 if port == ':80':
5132 port = ''
5134 port = ''
5133
5135
5134 bindaddr = self.httpd.addr
5136 bindaddr = self.httpd.addr
5135 if bindaddr == '0.0.0.0':
5137 if bindaddr == '0.0.0.0':
5136 bindaddr = '*'
5138 bindaddr = '*'
5137 elif ':' in bindaddr: # IPv6
5139 elif ':' in bindaddr: # IPv6
5138 bindaddr = '[%s]' % bindaddr
5140 bindaddr = '[%s]' % bindaddr
5139
5141
5140 fqaddr = self.httpd.fqaddr
5142 fqaddr = self.httpd.fqaddr
5141 if ':' in fqaddr:
5143 if ':' in fqaddr:
5142 fqaddr = '[%s]' % fqaddr
5144 fqaddr = '[%s]' % fqaddr
5143 if opts['port']:
5145 if opts['port']:
5144 write = ui.status
5146 write = ui.status
5145 else:
5147 else:
5146 write = ui.write
5148 write = ui.write
5147 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5149 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5148 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5150 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5149
5151
5150 def run(self):
5152 def run(self):
5151 self.httpd.serve_forever()
5153 self.httpd.serve_forever()
5152
5154
5153 service = service()
5155 service = service()
5154
5156
5155 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5157 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5156
5158
5157 @command('showconfig|debugconfig',
5159 @command('showconfig|debugconfig',
5158 [('u', 'untrusted', None, _('show untrusted configuration options'))],
5160 [('u', 'untrusted', None, _('show untrusted configuration options'))],
5159 _('[-u] [NAME]...'))
5161 _('[-u] [NAME]...'))
5160 def showconfig(ui, repo, *values, **opts):
5162 def showconfig(ui, repo, *values, **opts):
5161 """show combined config settings from all hgrc files
5163 """show combined config settings from all hgrc files
5162
5164
5163 With no arguments, print names and values of all config items.
5165 With no arguments, print names and values of all config items.
5164
5166
5165 With one argument of the form section.name, print just the value
5167 With one argument of the form section.name, print just the value
5166 of that config item.
5168 of that config item.
5167
5169
5168 With multiple arguments, print names and values of all config
5170 With multiple arguments, print names and values of all config
5169 items with matching section names.
5171 items with matching section names.
5170
5172
5171 With --debug, the source (filename and line number) is printed
5173 With --debug, the source (filename and line number) is printed
5172 for each config item.
5174 for each config item.
5173
5175
5174 Returns 0 on success.
5176 Returns 0 on success.
5175 """
5177 """
5176
5178
5177 for f in scmutil.rcpath():
5179 for f in scmutil.rcpath():
5178 ui.debug('read config from: %s\n' % f)
5180 ui.debug('read config from: %s\n' % f)
5179 untrusted = bool(opts.get('untrusted'))
5181 untrusted = bool(opts.get('untrusted'))
5180 if values:
5182 if values:
5181 sections = [v for v in values if '.' not in v]
5183 sections = [v for v in values if '.' not in v]
5182 items = [v for v in values if '.' in v]
5184 items = [v for v in values if '.' in v]
5183 if len(items) > 1 or items and sections:
5185 if len(items) > 1 or items and sections:
5184 raise util.Abort(_('only one config item permitted'))
5186 raise util.Abort(_('only one config item permitted'))
5185 for section, name, value in ui.walkconfig(untrusted=untrusted):
5187 for section, name, value in ui.walkconfig(untrusted=untrusted):
5186 value = str(value).replace('\n', '\\n')
5188 value = str(value).replace('\n', '\\n')
5187 sectname = section + '.' + name
5189 sectname = section + '.' + name
5188 if values:
5190 if values:
5189 for v in values:
5191 for v in values:
5190 if v == section:
5192 if v == section:
5191 ui.debug('%s: ' %
5193 ui.debug('%s: ' %
5192 ui.configsource(section, name, untrusted))
5194 ui.configsource(section, name, untrusted))
5193 ui.write('%s=%s\n' % (sectname, value))
5195 ui.write('%s=%s\n' % (sectname, value))
5194 elif v == sectname:
5196 elif v == sectname:
5195 ui.debug('%s: ' %
5197 ui.debug('%s: ' %
5196 ui.configsource(section, name, untrusted))
5198 ui.configsource(section, name, untrusted))
5197 ui.write(value, '\n')
5199 ui.write(value, '\n')
5198 else:
5200 else:
5199 ui.debug('%s: ' %
5201 ui.debug('%s: ' %
5200 ui.configsource(section, name, untrusted))
5202 ui.configsource(section, name, untrusted))
5201 ui.write('%s=%s\n' % (sectname, value))
5203 ui.write('%s=%s\n' % (sectname, value))
5202
5204
5203 @command('^status|st',
5205 @command('^status|st',
5204 [('A', 'all', None, _('show status of all files')),
5206 [('A', 'all', None, _('show status of all files')),
5205 ('m', 'modified', None, _('show only modified files')),
5207 ('m', 'modified', None, _('show only modified files')),
5206 ('a', 'added', None, _('show only added files')),
5208 ('a', 'added', None, _('show only added files')),
5207 ('r', 'removed', None, _('show only removed files')),
5209 ('r', 'removed', None, _('show only removed files')),
5208 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5210 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5209 ('c', 'clean', None, _('show only files without changes')),
5211 ('c', 'clean', None, _('show only files without changes')),
5210 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5212 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5211 ('i', 'ignored', None, _('show only ignored files')),
5213 ('i', 'ignored', None, _('show only ignored files')),
5212 ('n', 'no-status', None, _('hide status prefix')),
5214 ('n', 'no-status', None, _('hide status prefix')),
5213 ('C', 'copies', None, _('show source of copied files')),
5215 ('C', 'copies', None, _('show source of copied files')),
5214 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5216 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5215 ('', 'rev', [], _('show difference from revision'), _('REV')),
5217 ('', 'rev', [], _('show difference from revision'), _('REV')),
5216 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5218 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5217 ] + walkopts + subrepoopts,
5219 ] + walkopts + subrepoopts,
5218 _('[OPTION]... [FILE]...'))
5220 _('[OPTION]... [FILE]...'))
5219 def status(ui, repo, *pats, **opts):
5221 def status(ui, repo, *pats, **opts):
5220 """show changed files in the working directory
5222 """show changed files in the working directory
5221
5223
5222 Show status of files in the repository. If names are given, only
5224 Show status of files in the repository. If names are given, only
5223 files that match are shown. Files that are clean or ignored or
5225 files that match are shown. Files that are clean or ignored or
5224 the source of a copy/move operation, are not listed unless
5226 the source of a copy/move operation, are not listed unless
5225 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5227 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5226 Unless options described with "show only ..." are given, the
5228 Unless options described with "show only ..." are given, the
5227 options -mardu are used.
5229 options -mardu are used.
5228
5230
5229 Option -q/--quiet hides untracked (unknown and ignored) files
5231 Option -q/--quiet hides untracked (unknown and ignored) files
5230 unless explicitly requested with -u/--unknown or -i/--ignored.
5232 unless explicitly requested with -u/--unknown or -i/--ignored.
5231
5233
5232 .. note::
5234 .. note::
5233 status may appear to disagree with diff if permissions have
5235 status may appear to disagree with diff if permissions have
5234 changed or a merge has occurred. The standard diff format does
5236 changed or a merge has occurred. The standard diff format does
5235 not report permission changes and diff only reports changes
5237 not report permission changes and diff only reports changes
5236 relative to one merge parent.
5238 relative to one merge parent.
5237
5239
5238 If one revision is given, it is used as the base revision.
5240 If one revision is given, it is used as the base revision.
5239 If two revisions are given, the differences between them are
5241 If two revisions are given, the differences between them are
5240 shown. The --change option can also be used as a shortcut to list
5242 shown. The --change option can also be used as a shortcut to list
5241 the changed files of a revision from its first parent.
5243 the changed files of a revision from its first parent.
5242
5244
5243 The codes used to show the status of files are::
5245 The codes used to show the status of files are::
5244
5246
5245 M = modified
5247 M = modified
5246 A = added
5248 A = added
5247 R = removed
5249 R = removed
5248 C = clean
5250 C = clean
5249 ! = missing (deleted by non-hg command, but still tracked)
5251 ! = missing (deleted by non-hg command, but still tracked)
5250 ? = not tracked
5252 ? = not tracked
5251 I = ignored
5253 I = ignored
5252 = origin of the previous file listed as A (added)
5254 = origin of the previous file listed as A (added)
5253
5255
5254 .. container:: verbose
5256 .. container:: verbose
5255
5257
5256 Examples:
5258 Examples:
5257
5259
5258 - show changes in the working directory relative to a
5260 - show changes in the working directory relative to a
5259 changeset::
5261 changeset::
5260
5262
5261 hg status --rev 9353
5263 hg status --rev 9353
5262
5264
5263 - show all changes including copies in an existing changeset::
5265 - show all changes including copies in an existing changeset::
5264
5266
5265 hg status --copies --change 9353
5267 hg status --copies --change 9353
5266
5268
5267 - get a NUL separated list of added files, suitable for xargs::
5269 - get a NUL separated list of added files, suitable for xargs::
5268
5270
5269 hg status -an0
5271 hg status -an0
5270
5272
5271 Returns 0 on success.
5273 Returns 0 on success.
5272 """
5274 """
5273
5275
5274 revs = opts.get('rev')
5276 revs = opts.get('rev')
5275 change = opts.get('change')
5277 change = opts.get('change')
5276
5278
5277 if revs and change:
5279 if revs and change:
5278 msg = _('cannot specify --rev and --change at the same time')
5280 msg = _('cannot specify --rev and --change at the same time')
5279 raise util.Abort(msg)
5281 raise util.Abort(msg)
5280 elif change:
5282 elif change:
5281 node2 = scmutil.revsingle(repo, change, None).node()
5283 node2 = scmutil.revsingle(repo, change, None).node()
5282 node1 = repo[node2].p1().node()
5284 node1 = repo[node2].p1().node()
5283 else:
5285 else:
5284 node1, node2 = scmutil.revpair(repo, revs)
5286 node1, node2 = scmutil.revpair(repo, revs)
5285
5287
5286 cwd = (pats and repo.getcwd()) or ''
5288 cwd = (pats and repo.getcwd()) or ''
5287 end = opts.get('print0') and '\0' or '\n'
5289 end = opts.get('print0') and '\0' or '\n'
5288 copy = {}
5290 copy = {}
5289 states = 'modified added removed deleted unknown ignored clean'.split()
5291 states = 'modified added removed deleted unknown ignored clean'.split()
5290 show = [k for k in states if opts.get(k)]
5292 show = [k for k in states if opts.get(k)]
5291 if opts.get('all'):
5293 if opts.get('all'):
5292 show += ui.quiet and (states[:4] + ['clean']) or states
5294 show += ui.quiet and (states[:4] + ['clean']) or states
5293 if not show:
5295 if not show:
5294 show = ui.quiet and states[:4] or states[:5]
5296 show = ui.quiet and states[:4] or states[:5]
5295
5297
5296 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5298 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5297 'ignored' in show, 'clean' in show, 'unknown' in show,
5299 'ignored' in show, 'clean' in show, 'unknown' in show,
5298 opts.get('subrepos'))
5300 opts.get('subrepos'))
5299 changestates = zip(states, 'MAR!?IC', stat)
5301 changestates = zip(states, 'MAR!?IC', stat)
5300
5302
5301 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5303 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5302 copy = copies.pathcopies(repo[node1], repo[node2])
5304 copy = copies.pathcopies(repo[node1], repo[node2])
5303
5305
5304 fm = ui.formatter('status', opts)
5306 fm = ui.formatter('status', opts)
5305 format = '%s %s' + end
5307 format = '%s %s' + end
5306 if opts.get('no_status'):
5308 if opts.get('no_status'):
5307 format = '%.0s%s' + end
5309 format = '%.0s%s' + end
5308
5310
5309 for state, char, files in changestates:
5311 for state, char, files in changestates:
5310 if state in show:
5312 if state in show:
5311 label = 'status.' + state
5313 label = 'status.' + state
5312 for f in files:
5314 for f in files:
5313 fm.startitem()
5315 fm.startitem()
5314 fm.write("status path", format, char,
5316 fm.write("status path", format, char,
5315 repo.pathto(f, cwd), label=label)
5317 repo.pathto(f, cwd), label=label)
5316 if f in copy:
5318 if f in copy:
5317 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5319 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5318 label='status.copied')
5320 label='status.copied')
5319 fm.end()
5321 fm.end()
5320
5322
5321 @command('^summary|sum',
5323 @command('^summary|sum',
5322 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5324 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5323 def summary(ui, repo, **opts):
5325 def summary(ui, repo, **opts):
5324 """summarize working directory state
5326 """summarize working directory state
5325
5327
5326 This generates a brief summary of the working directory state,
5328 This generates a brief summary of the working directory state,
5327 including parents, branch, commit status, and available updates.
5329 including parents, branch, commit status, and available updates.
5328
5330
5329 With the --remote option, this will check the default paths for
5331 With the --remote option, this will check the default paths for
5330 incoming and outgoing changes. This can be time-consuming.
5332 incoming and outgoing changes. This can be time-consuming.
5331
5333
5332 Returns 0 on success.
5334 Returns 0 on success.
5333 """
5335 """
5334
5336
5335 ctx = repo[None]
5337 ctx = repo[None]
5336 parents = ctx.parents()
5338 parents = ctx.parents()
5337 pnode = parents[0].node()
5339 pnode = parents[0].node()
5338 marks = []
5340 marks = []
5339
5341
5340 for p in parents:
5342 for p in parents:
5341 # label with log.changeset (instead of log.parent) since this
5343 # label with log.changeset (instead of log.parent) since this
5342 # shows a working directory parent *changeset*:
5344 # shows a working directory parent *changeset*:
5343 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5345 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5344 label='log.changeset')
5346 label='log.changeset')
5345 ui.write(' '.join(p.tags()), label='log.tag')
5347 ui.write(' '.join(p.tags()), label='log.tag')
5346 if p.bookmarks():
5348 if p.bookmarks():
5347 marks.extend(p.bookmarks())
5349 marks.extend(p.bookmarks())
5348 if p.rev() == -1:
5350 if p.rev() == -1:
5349 if not len(repo):
5351 if not len(repo):
5350 ui.write(_(' (empty repository)'))
5352 ui.write(_(' (empty repository)'))
5351 else:
5353 else:
5352 ui.write(_(' (no revision checked out)'))
5354 ui.write(_(' (no revision checked out)'))
5353 ui.write('\n')
5355 ui.write('\n')
5354 if p.description():
5356 if p.description():
5355 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5357 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5356 label='log.summary')
5358 label='log.summary')
5357
5359
5358 branch = ctx.branch()
5360 branch = ctx.branch()
5359 bheads = repo.branchheads(branch)
5361 bheads = repo.branchheads(branch)
5360 m = _('branch: %s\n') % branch
5362 m = _('branch: %s\n') % branch
5361 if branch != 'default':
5363 if branch != 'default':
5362 ui.write(m, label='log.branch')
5364 ui.write(m, label='log.branch')
5363 else:
5365 else:
5364 ui.status(m, label='log.branch')
5366 ui.status(m, label='log.branch')
5365
5367
5366 if marks:
5368 if marks:
5367 current = repo._bookmarkcurrent
5369 current = repo._bookmarkcurrent
5368 ui.write(_('bookmarks:'), label='log.bookmark')
5370 ui.write(_('bookmarks:'), label='log.bookmark')
5369 if current is not None:
5371 if current is not None:
5370 try:
5372 try:
5371 marks.remove(current)
5373 marks.remove(current)
5372 ui.write(' *' + current, label='bookmarks.current')
5374 ui.write(' *' + current, label='bookmarks.current')
5373 except ValueError:
5375 except ValueError:
5374 # current bookmark not in parent ctx marks
5376 # current bookmark not in parent ctx marks
5375 pass
5377 pass
5376 for m in marks:
5378 for m in marks:
5377 ui.write(' ' + m, label='log.bookmark')
5379 ui.write(' ' + m, label='log.bookmark')
5378 ui.write('\n', label='log.bookmark')
5380 ui.write('\n', label='log.bookmark')
5379
5381
5380 st = list(repo.status(unknown=True))[:6]
5382 st = list(repo.status(unknown=True))[:6]
5381
5383
5382 c = repo.dirstate.copies()
5384 c = repo.dirstate.copies()
5383 copied, renamed = [], []
5385 copied, renamed = [], []
5384 for d, s in c.iteritems():
5386 for d, s in c.iteritems():
5385 if s in st[2]:
5387 if s in st[2]:
5386 st[2].remove(s)
5388 st[2].remove(s)
5387 renamed.append(d)
5389 renamed.append(d)
5388 else:
5390 else:
5389 copied.append(d)
5391 copied.append(d)
5390 if d in st[1]:
5392 if d in st[1]:
5391 st[1].remove(d)
5393 st[1].remove(d)
5392 st.insert(3, renamed)
5394 st.insert(3, renamed)
5393 st.insert(4, copied)
5395 st.insert(4, copied)
5394
5396
5395 ms = mergemod.mergestate(repo)
5397 ms = mergemod.mergestate(repo)
5396 st.append([f for f in ms if ms[f] == 'u'])
5398 st.append([f for f in ms if ms[f] == 'u'])
5397
5399
5398 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5400 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5399 st.append(subs)
5401 st.append(subs)
5400
5402
5401 labels = [ui.label(_('%d modified'), 'status.modified'),
5403 labels = [ui.label(_('%d modified'), 'status.modified'),
5402 ui.label(_('%d added'), 'status.added'),
5404 ui.label(_('%d added'), 'status.added'),
5403 ui.label(_('%d removed'), 'status.removed'),
5405 ui.label(_('%d removed'), 'status.removed'),
5404 ui.label(_('%d renamed'), 'status.copied'),
5406 ui.label(_('%d renamed'), 'status.copied'),
5405 ui.label(_('%d copied'), 'status.copied'),
5407 ui.label(_('%d copied'), 'status.copied'),
5406 ui.label(_('%d deleted'), 'status.deleted'),
5408 ui.label(_('%d deleted'), 'status.deleted'),
5407 ui.label(_('%d unknown'), 'status.unknown'),
5409 ui.label(_('%d unknown'), 'status.unknown'),
5408 ui.label(_('%d ignored'), 'status.ignored'),
5410 ui.label(_('%d ignored'), 'status.ignored'),
5409 ui.label(_('%d unresolved'), 'resolve.unresolved'),
5411 ui.label(_('%d unresolved'), 'resolve.unresolved'),
5410 ui.label(_('%d subrepos'), 'status.modified')]
5412 ui.label(_('%d subrepos'), 'status.modified')]
5411 t = []
5413 t = []
5412 for s, l in zip(st, labels):
5414 for s, l in zip(st, labels):
5413 if s:
5415 if s:
5414 t.append(l % len(s))
5416 t.append(l % len(s))
5415
5417
5416 t = ', '.join(t)
5418 t = ', '.join(t)
5417 cleanworkdir = False
5419 cleanworkdir = False
5418
5420
5419 if len(parents) > 1:
5421 if len(parents) > 1:
5420 t += _(' (merge)')
5422 t += _(' (merge)')
5421 elif branch != parents[0].branch():
5423 elif branch != parents[0].branch():
5422 t += _(' (new branch)')
5424 t += _(' (new branch)')
5423 elif (parents[0].closesbranch() and
5425 elif (parents[0].closesbranch() and
5424 pnode in repo.branchheads(branch, closed=True)):
5426 pnode in repo.branchheads(branch, closed=True)):
5425 t += _(' (head closed)')
5427 t += _(' (head closed)')
5426 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
5428 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
5427 t += _(' (clean)')
5429 t += _(' (clean)')
5428 cleanworkdir = True
5430 cleanworkdir = True
5429 elif pnode not in bheads:
5431 elif pnode not in bheads:
5430 t += _(' (new branch head)')
5432 t += _(' (new branch head)')
5431
5433
5432 if cleanworkdir:
5434 if cleanworkdir:
5433 ui.status(_('commit: %s\n') % t.strip())
5435 ui.status(_('commit: %s\n') % t.strip())
5434 else:
5436 else:
5435 ui.write(_('commit: %s\n') % t.strip())
5437 ui.write(_('commit: %s\n') % t.strip())
5436
5438
5437 # all ancestors of branch heads - all ancestors of parent = new csets
5439 # all ancestors of branch heads - all ancestors of parent = new csets
5438 new = [0] * len(repo)
5440 new = [0] * len(repo)
5439 cl = repo.changelog
5441 cl = repo.changelog
5440 for a in [cl.rev(n) for n in bheads]:
5442 for a in [cl.rev(n) for n in bheads]:
5441 new[a] = 1
5443 new[a] = 1
5442 for a in cl.ancestors([cl.rev(n) for n in bheads]):
5444 for a in cl.ancestors([cl.rev(n) for n in bheads]):
5443 new[a] = 1
5445 new[a] = 1
5444 for a in [p.rev() for p in parents]:
5446 for a in [p.rev() for p in parents]:
5445 if a >= 0:
5447 if a >= 0:
5446 new[a] = 0
5448 new[a] = 0
5447 for a in cl.ancestors([p.rev() for p in parents]):
5449 for a in cl.ancestors([p.rev() for p in parents]):
5448 new[a] = 0
5450 new[a] = 0
5449 new = sum(new)
5451 new = sum(new)
5450
5452
5451 if new == 0:
5453 if new == 0:
5452 ui.status(_('update: (current)\n'))
5454 ui.status(_('update: (current)\n'))
5453 elif pnode not in bheads:
5455 elif pnode not in bheads:
5454 ui.write(_('update: %d new changesets (update)\n') % new)
5456 ui.write(_('update: %d new changesets (update)\n') % new)
5455 else:
5457 else:
5456 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5458 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5457 (new, len(bheads)))
5459 (new, len(bheads)))
5458
5460
5459 if opts.get('remote'):
5461 if opts.get('remote'):
5460 t = []
5462 t = []
5461 source, branches = hg.parseurl(ui.expandpath('default'))
5463 source, branches = hg.parseurl(ui.expandpath('default'))
5462 other = hg.peer(repo, {}, source)
5464 other = hg.peer(repo, {}, source)
5463 revs, checkout = hg.addbranchrevs(repo, other, branches,
5465 revs, checkout = hg.addbranchrevs(repo, other, branches,
5464 opts.get('rev'))
5466 opts.get('rev'))
5465 ui.debug('comparing with %s\n' % util.hidepassword(source))
5467 ui.debug('comparing with %s\n' % util.hidepassword(source))
5466 repo.ui.pushbuffer()
5468 repo.ui.pushbuffer()
5467 commoninc = discovery.findcommonincoming(repo, other)
5469 commoninc = discovery.findcommonincoming(repo, other)
5468 _common, incoming, _rheads = commoninc
5470 _common, incoming, _rheads = commoninc
5469 repo.ui.popbuffer()
5471 repo.ui.popbuffer()
5470 if incoming:
5472 if incoming:
5471 t.append(_('1 or more incoming'))
5473 t.append(_('1 or more incoming'))
5472
5474
5473 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5475 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5474 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5476 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5475 if source != dest:
5477 if source != dest:
5476 other = hg.peer(repo, {}, dest)
5478 other = hg.peer(repo, {}, dest)
5477 commoninc = None
5479 commoninc = None
5478 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5480 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5479 repo.ui.pushbuffer()
5481 repo.ui.pushbuffer()
5480 outgoing = discovery.findcommonoutgoing(repo, other,
5482 outgoing = discovery.findcommonoutgoing(repo, other,
5481 commoninc=commoninc)
5483 commoninc=commoninc)
5482 repo.ui.popbuffer()
5484 repo.ui.popbuffer()
5483 o = outgoing.missing
5485 o = outgoing.missing
5484 if o:
5486 if o:
5485 t.append(_('%d outgoing') % len(o))
5487 t.append(_('%d outgoing') % len(o))
5486 if 'bookmarks' in other.listkeys('namespaces'):
5488 if 'bookmarks' in other.listkeys('namespaces'):
5487 lmarks = repo.listkeys('bookmarks')
5489 lmarks = repo.listkeys('bookmarks')
5488 rmarks = other.listkeys('bookmarks')
5490 rmarks = other.listkeys('bookmarks')
5489 diff = set(rmarks) - set(lmarks)
5491 diff = set(rmarks) - set(lmarks)
5490 if len(diff) > 0:
5492 if len(diff) > 0:
5491 t.append(_('%d incoming bookmarks') % len(diff))
5493 t.append(_('%d incoming bookmarks') % len(diff))
5492 diff = set(lmarks) - set(rmarks)
5494 diff = set(lmarks) - set(rmarks)
5493 if len(diff) > 0:
5495 if len(diff) > 0:
5494 t.append(_('%d outgoing bookmarks') % len(diff))
5496 t.append(_('%d outgoing bookmarks') % len(diff))
5495
5497
5496 if t:
5498 if t:
5497 ui.write(_('remote: %s\n') % (', '.join(t)))
5499 ui.write(_('remote: %s\n') % (', '.join(t)))
5498 else:
5500 else:
5499 ui.status(_('remote: (synced)\n'))
5501 ui.status(_('remote: (synced)\n'))
5500
5502
5501 @command('tag',
5503 @command('tag',
5502 [('f', 'force', None, _('force tag')),
5504 [('f', 'force', None, _('force tag')),
5503 ('l', 'local', None, _('make the tag local')),
5505 ('l', 'local', None, _('make the tag local')),
5504 ('r', 'rev', '', _('revision to tag'), _('REV')),
5506 ('r', 'rev', '', _('revision to tag'), _('REV')),
5505 ('', 'remove', None, _('remove a tag')),
5507 ('', 'remove', None, _('remove a tag')),
5506 # -l/--local is already there, commitopts cannot be used
5508 # -l/--local is already there, commitopts cannot be used
5507 ('e', 'edit', None, _('edit commit message')),
5509 ('e', 'edit', None, _('edit commit message')),
5508 ('m', 'message', '', _('use <text> as commit message'), _('TEXT')),
5510 ('m', 'message', '', _('use <text> as commit message'), _('TEXT')),
5509 ] + commitopts2,
5511 ] + commitopts2,
5510 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5512 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5511 def tag(ui, repo, name1, *names, **opts):
5513 def tag(ui, repo, name1, *names, **opts):
5512 """add one or more tags for the current or given revision
5514 """add one or more tags for the current or given revision
5513
5515
5514 Name a particular revision using <name>.
5516 Name a particular revision using <name>.
5515
5517
5516 Tags are used to name particular revisions of the repository and are
5518 Tags are used to name particular revisions of the repository and are
5517 very useful to compare different revisions, to go back to significant
5519 very useful to compare different revisions, to go back to significant
5518 earlier versions or to mark branch points as releases, etc. Changing
5520 earlier versions or to mark branch points as releases, etc. Changing
5519 an existing tag is normally disallowed; use -f/--force to override.
5521 an existing tag is normally disallowed; use -f/--force to override.
5520
5522
5521 If no revision is given, the parent of the working directory is
5523 If no revision is given, the parent of the working directory is
5522 used, or tip if no revision is checked out.
5524 used, or tip if no revision is checked out.
5523
5525
5524 To facilitate version control, distribution, and merging of tags,
5526 To facilitate version control, distribution, and merging of tags,
5525 they are stored as a file named ".hgtags" which is managed similarly
5527 they are stored as a file named ".hgtags" which is managed similarly
5526 to other project files and can be hand-edited if necessary. This
5528 to other project files and can be hand-edited if necessary. This
5527 also means that tagging creates a new commit. The file
5529 also means that tagging creates a new commit. The file
5528 ".hg/localtags" is used for local tags (not shared among
5530 ".hg/localtags" is used for local tags (not shared among
5529 repositories).
5531 repositories).
5530
5532
5531 Tag commits are usually made at the head of a branch. If the parent
5533 Tag commits are usually made at the head of a branch. If the parent
5532 of the working directory is not a branch head, :hg:`tag` aborts; use
5534 of the working directory is not a branch head, :hg:`tag` aborts; use
5533 -f/--force to force the tag commit to be based on a non-head
5535 -f/--force to force the tag commit to be based on a non-head
5534 changeset.
5536 changeset.
5535
5537
5536 See :hg:`help dates` for a list of formats valid for -d/--date.
5538 See :hg:`help dates` for a list of formats valid for -d/--date.
5537
5539
5538 Since tag names have priority over branch names during revision
5540 Since tag names have priority over branch names during revision
5539 lookup, using an existing branch name as a tag name is discouraged.
5541 lookup, using an existing branch name as a tag name is discouraged.
5540
5542
5541 Returns 0 on success.
5543 Returns 0 on success.
5542 """
5544 """
5543 wlock = lock = None
5545 wlock = lock = None
5544 try:
5546 try:
5545 wlock = repo.wlock()
5547 wlock = repo.wlock()
5546 lock = repo.lock()
5548 lock = repo.lock()
5547 rev_ = "."
5549 rev_ = "."
5548 names = [t.strip() for t in (name1,) + names]
5550 names = [t.strip() for t in (name1,) + names]
5549 if len(names) != len(set(names)):
5551 if len(names) != len(set(names)):
5550 raise util.Abort(_('tag names must be unique'))
5552 raise util.Abort(_('tag names must be unique'))
5551 for n in names:
5553 for n in names:
5552 if n in ['tip', '.', 'null']:
5554 if n in ['tip', '.', 'null']:
5553 raise util.Abort(_("the name '%s' is reserved") % n)
5555 raise util.Abort(_("the name '%s' is reserved") % n)
5554 if not n:
5556 if not n:
5555 raise util.Abort(_('tag names cannot consist entirely of '
5557 raise util.Abort(_('tag names cannot consist entirely of '
5556 'whitespace'))
5558 'whitespace'))
5557 if opts.get('rev') and opts.get('remove'):
5559 if opts.get('rev') and opts.get('remove'):
5558 raise util.Abort(_("--rev and --remove are incompatible"))
5560 raise util.Abort(_("--rev and --remove are incompatible"))
5559 if opts.get('rev'):
5561 if opts.get('rev'):
5560 rev_ = opts['rev']
5562 rev_ = opts['rev']
5561 message = opts.get('message')
5563 message = opts.get('message')
5562 if opts.get('remove'):
5564 if opts.get('remove'):
5563 expectedtype = opts.get('local') and 'local' or 'global'
5565 expectedtype = opts.get('local') and 'local' or 'global'
5564 for n in names:
5566 for n in names:
5565 if not repo.tagtype(n):
5567 if not repo.tagtype(n):
5566 raise util.Abort(_("tag '%s' does not exist") % n)
5568 raise util.Abort(_("tag '%s' does not exist") % n)
5567 if repo.tagtype(n) != expectedtype:
5569 if repo.tagtype(n) != expectedtype:
5568 if expectedtype == 'global':
5570 if expectedtype == 'global':
5569 raise util.Abort(_("tag '%s' is not a global tag") % n)
5571 raise util.Abort(_("tag '%s' is not a global tag") % n)
5570 else:
5572 else:
5571 raise util.Abort(_("tag '%s' is not a local tag") % n)
5573 raise util.Abort(_("tag '%s' is not a local tag") % n)
5572 rev_ = nullid
5574 rev_ = nullid
5573 if not message:
5575 if not message:
5574 # we don't translate commit messages
5576 # we don't translate commit messages
5575 message = 'Removed tag %s' % ', '.join(names)
5577 message = 'Removed tag %s' % ', '.join(names)
5576 elif not opts.get('force'):
5578 elif not opts.get('force'):
5577 for n in names:
5579 for n in names:
5578 if n in repo.tags():
5580 if n in repo.tags():
5579 raise util.Abort(_("tag '%s' already exists "
5581 raise util.Abort(_("tag '%s' already exists "
5580 "(use -f to force)") % n)
5582 "(use -f to force)") % n)
5581 if not opts.get('local'):
5583 if not opts.get('local'):
5582 p1, p2 = repo.dirstate.parents()
5584 p1, p2 = repo.dirstate.parents()
5583 if p2 != nullid:
5585 if p2 != nullid:
5584 raise util.Abort(_('uncommitted merge'))
5586 raise util.Abort(_('uncommitted merge'))
5585 bheads = repo.branchheads()
5587 bheads = repo.branchheads()
5586 if not opts.get('force') and bheads and p1 not in bheads:
5588 if not opts.get('force') and bheads and p1 not in bheads:
5587 raise util.Abort(_('not at a branch head (use -f to force)'))
5589 raise util.Abort(_('not at a branch head (use -f to force)'))
5588 r = scmutil.revsingle(repo, rev_).node()
5590 r = scmutil.revsingle(repo, rev_).node()
5589
5591
5590 if not message:
5592 if not message:
5591 # we don't translate commit messages
5593 # we don't translate commit messages
5592 message = ('Added tag %s for changeset %s' %
5594 message = ('Added tag %s for changeset %s' %
5593 (', '.join(names), short(r)))
5595 (', '.join(names), short(r)))
5594
5596
5595 date = opts.get('date')
5597 date = opts.get('date')
5596 if date:
5598 if date:
5597 date = util.parsedate(date)
5599 date = util.parsedate(date)
5598
5600
5599 if opts.get('edit'):
5601 if opts.get('edit'):
5600 message = ui.edit(message, ui.username())
5602 message = ui.edit(message, ui.username())
5601
5603
5602 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
5604 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
5603 finally:
5605 finally:
5604 release(lock, wlock)
5606 release(lock, wlock)
5605
5607
5606 @command('tags', [], '')
5608 @command('tags', [], '')
5607 def tags(ui, repo):
5609 def tags(ui, repo):
5608 """list repository tags
5610 """list repository tags
5609
5611
5610 This lists both regular and local tags. When the -v/--verbose
5612 This lists both regular and local tags. When the -v/--verbose
5611 switch is used, a third column "local" is printed for local tags.
5613 switch is used, a third column "local" is printed for local tags.
5612
5614
5613 Returns 0 on success.
5615 Returns 0 on success.
5614 """
5616 """
5615
5617
5616 hexfunc = ui.debugflag and hex or short
5618 hexfunc = ui.debugflag and hex or short
5617 tagtype = ""
5619 tagtype = ""
5618
5620
5619 for t, n in reversed(repo.tagslist()):
5621 for t, n in reversed(repo.tagslist()):
5620 if ui.quiet:
5622 if ui.quiet:
5621 ui.write("%s\n" % t, label='tags.normal')
5623 ui.write("%s\n" % t, label='tags.normal')
5622 continue
5624 continue
5623
5625
5624 hn = hexfunc(n)
5626 hn = hexfunc(n)
5625 r = "%5d:%s" % (repo.changelog.rev(n), hn)
5627 r = "%5d:%s" % (repo.changelog.rev(n), hn)
5626 rev = ui.label(r, 'log.changeset')
5628 rev = ui.label(r, 'log.changeset')
5627 spaces = " " * (30 - encoding.colwidth(t))
5629 spaces = " " * (30 - encoding.colwidth(t))
5628
5630
5629 tag = ui.label(t, 'tags.normal')
5631 tag = ui.label(t, 'tags.normal')
5630 if ui.verbose:
5632 if ui.verbose:
5631 if repo.tagtype(t) == 'local':
5633 if repo.tagtype(t) == 'local':
5632 tagtype = " local"
5634 tagtype = " local"
5633 tag = ui.label(t, 'tags.local')
5635 tag = ui.label(t, 'tags.local')
5634 else:
5636 else:
5635 tagtype = ""
5637 tagtype = ""
5636 ui.write("%s%s %s%s\n" % (tag, spaces, rev, tagtype))
5638 ui.write("%s%s %s%s\n" % (tag, spaces, rev, tagtype))
5637
5639
5638 @command('tip',
5640 @command('tip',
5639 [('p', 'patch', None, _('show patch')),
5641 [('p', 'patch', None, _('show patch')),
5640 ('g', 'git', None, _('use git extended diff format')),
5642 ('g', 'git', None, _('use git extended diff format')),
5641 ] + templateopts,
5643 ] + templateopts,
5642 _('[-p] [-g]'))
5644 _('[-p] [-g]'))
5643 def tip(ui, repo, **opts):
5645 def tip(ui, repo, **opts):
5644 """show the tip revision
5646 """show the tip revision
5645
5647
5646 The tip revision (usually just called the tip) is the changeset
5648 The tip revision (usually just called the tip) is the changeset
5647 most recently added to the repository (and therefore the most
5649 most recently added to the repository (and therefore the most
5648 recently changed head).
5650 recently changed head).
5649
5651
5650 If you have just made a commit, that commit will be the tip. If
5652 If you have just made a commit, that commit will be the tip. If
5651 you have just pulled changes from another repository, the tip of
5653 you have just pulled changes from another repository, the tip of
5652 that repository becomes the current tip. The "tip" tag is special
5654 that repository becomes the current tip. The "tip" tag is special
5653 and cannot be renamed or assigned to a different changeset.
5655 and cannot be renamed or assigned to a different changeset.
5654
5656
5655 Returns 0 on success.
5657 Returns 0 on success.
5656 """
5658 """
5657 displayer = cmdutil.show_changeset(ui, repo, opts)
5659 displayer = cmdutil.show_changeset(ui, repo, opts)
5658 displayer.show(repo[len(repo) - 1])
5660 displayer.show(repo[len(repo) - 1])
5659 displayer.close()
5661 displayer.close()
5660
5662
5661 @command('unbundle',
5663 @command('unbundle',
5662 [('u', 'update', None,
5664 [('u', 'update', None,
5663 _('update to new branch head if changesets were unbundled'))],
5665 _('update to new branch head if changesets were unbundled'))],
5664 _('[-u] FILE...'))
5666 _('[-u] FILE...'))
5665 def unbundle(ui, repo, fname1, *fnames, **opts):
5667 def unbundle(ui, repo, fname1, *fnames, **opts):
5666 """apply one or more changegroup files
5668 """apply one or more changegroup files
5667
5669
5668 Apply one or more compressed changegroup files generated by the
5670 Apply one or more compressed changegroup files generated by the
5669 bundle command.
5671 bundle command.
5670
5672
5671 Returns 0 on success, 1 if an update has unresolved files.
5673 Returns 0 on success, 1 if an update has unresolved files.
5672 """
5674 """
5673 fnames = (fname1,) + fnames
5675 fnames = (fname1,) + fnames
5674
5676
5675 lock = repo.lock()
5677 lock = repo.lock()
5676 wc = repo['.']
5678 wc = repo['.']
5677 try:
5679 try:
5678 for fname in fnames:
5680 for fname in fnames:
5679 f = url.open(ui, fname)
5681 f = url.open(ui, fname)
5680 gen = changegroup.readbundle(f, fname)
5682 gen = changegroup.readbundle(f, fname)
5681 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
5683 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
5682 finally:
5684 finally:
5683 lock.release()
5685 lock.release()
5684 bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
5686 bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
5685 return postincoming(ui, repo, modheads, opts.get('update'), None)
5687 return postincoming(ui, repo, modheads, opts.get('update'), None)
5686
5688
5687 @command('^update|up|checkout|co',
5689 @command('^update|up|checkout|co',
5688 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5690 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5689 ('c', 'check', None,
5691 ('c', 'check', None,
5690 _('update across branches if no uncommitted changes')),
5692 _('update across branches if no uncommitted changes')),
5691 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5693 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5692 ('r', 'rev', '', _('revision'), _('REV'))],
5694 ('r', 'rev', '', _('revision'), _('REV'))],
5693 _('[-c] [-C] [-d DATE] [[-r] REV]'))
5695 _('[-c] [-C] [-d DATE] [[-r] REV]'))
5694 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
5696 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
5695 """update working directory (or switch revisions)
5697 """update working directory (or switch revisions)
5696
5698
5697 Update the repository's working directory to the specified
5699 Update the repository's working directory to the specified
5698 changeset. If no changeset is specified, update to the tip of the
5700 changeset. If no changeset is specified, update to the tip of the
5699 current named branch and move the current bookmark (see :hg:`help
5701 current named branch and move the current bookmark (see :hg:`help
5700 bookmarks`).
5702 bookmarks`).
5701
5703
5702 Update sets the working directory's parent revison to the specified
5704 Update sets the working directory's parent revison to the specified
5703 changeset (see :hg:`help parents`).
5705 changeset (see :hg:`help parents`).
5704
5706
5705 If the changeset is not a descendant or ancestor of the working
5707 If the changeset is not a descendant or ancestor of the working
5706 directory's parent, the update is aborted. With the -c/--check
5708 directory's parent, the update is aborted. With the -c/--check
5707 option, the working directory is checked for uncommitted changes; if
5709 option, the working directory is checked for uncommitted changes; if
5708 none are found, the working directory is updated to the specified
5710 none are found, the working directory is updated to the specified
5709 changeset.
5711 changeset.
5710
5712
5711 The following rules apply when the working directory contains
5713 The following rules apply when the working directory contains
5712 uncommitted changes:
5714 uncommitted changes:
5713
5715
5714 1. If neither -c/--check nor -C/--clean is specified, and if
5716 1. If neither -c/--check nor -C/--clean is specified, and if
5715 the requested changeset is an ancestor or descendant of
5717 the requested changeset is an ancestor or descendant of
5716 the working directory's parent, the uncommitted changes
5718 the working directory's parent, the uncommitted changes
5717 are merged into the requested changeset and the merged
5719 are merged into the requested changeset and the merged
5718 result is left uncommitted. If the requested changeset is
5720 result is left uncommitted. If the requested changeset is
5719 not an ancestor or descendant (that is, it is on another
5721 not an ancestor or descendant (that is, it is on another
5720 branch), the update is aborted and the uncommitted changes
5722 branch), the update is aborted and the uncommitted changes
5721 are preserved.
5723 are preserved.
5722
5724
5723 2. With the -c/--check option, the update is aborted and the
5725 2. With the -c/--check option, the update is aborted and the
5724 uncommitted changes are preserved.
5726 uncommitted changes are preserved.
5725
5727
5726 3. With the -C/--clean option, uncommitted changes are discarded and
5728 3. With the -C/--clean option, uncommitted changes are discarded and
5727 the working directory is updated to the requested changeset.
5729 the working directory is updated to the requested changeset.
5728
5730
5729 To cancel an uncommitted merge (and lose your changes), use
5731 To cancel an uncommitted merge (and lose your changes), use
5730 :hg:`update --clean .`.
5732 :hg:`update --clean .`.
5731
5733
5732 Use null as the changeset to remove the working directory (like
5734 Use null as the changeset to remove the working directory (like
5733 :hg:`clone -U`).
5735 :hg:`clone -U`).
5734
5736
5735 If you want to revert just one file to an older revision, use
5737 If you want to revert just one file to an older revision, use
5736 :hg:`revert [-r REV] NAME`.
5738 :hg:`revert [-r REV] NAME`.
5737
5739
5738 See :hg:`help dates` for a list of formats valid for -d/--date.
5740 See :hg:`help dates` for a list of formats valid for -d/--date.
5739
5741
5740 Returns 0 on success, 1 if there are unresolved files.
5742 Returns 0 on success, 1 if there are unresolved files.
5741 """
5743 """
5742 if rev and node:
5744 if rev and node:
5743 raise util.Abort(_("please specify just one revision"))
5745 raise util.Abort(_("please specify just one revision"))
5744
5746
5745 if rev is None or rev == '':
5747 if rev is None or rev == '':
5746 rev = node
5748 rev = node
5747
5749
5748 # with no argument, we also move the current bookmark, if any
5750 # with no argument, we also move the current bookmark, if any
5749 movemarkfrom = None
5751 movemarkfrom = None
5750 if rev is None or node == '':
5752 if rev is None or node == '':
5751 movemarkfrom = repo['.'].node()
5753 movemarkfrom = repo['.'].node()
5752
5754
5753 # if we defined a bookmark, we have to remember the original bookmark name
5755 # if we defined a bookmark, we have to remember the original bookmark name
5754 brev = rev
5756 brev = rev
5755 rev = scmutil.revsingle(repo, rev, rev).rev()
5757 rev = scmutil.revsingle(repo, rev, rev).rev()
5756
5758
5757 if check and clean:
5759 if check and clean:
5758 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
5760 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
5759
5761
5760 if date:
5762 if date:
5761 if rev is not None:
5763 if rev is not None:
5762 raise util.Abort(_("you can't specify a revision and a date"))
5764 raise util.Abort(_("you can't specify a revision and a date"))
5763 rev = cmdutil.finddate(ui, repo, date)
5765 rev = cmdutil.finddate(ui, repo, date)
5764
5766
5765 if check:
5767 if check:
5766 c = repo[None]
5768 c = repo[None]
5767 if c.dirty(merge=False, branch=False):
5769 if c.dirty(merge=False, branch=False):
5768 raise util.Abort(_("uncommitted local changes"))
5770 raise util.Abort(_("uncommitted local changes"))
5769 if rev is None:
5771 if rev is None:
5770 rev = repo[repo[None].branch()].rev()
5772 rev = repo[repo[None].branch()].rev()
5771 mergemod._checkunknown(repo, repo[None], repo[rev])
5773 mergemod._checkunknown(repo, repo[None], repo[rev])
5772
5774
5773 if clean:
5775 if clean:
5774 ret = hg.clean(repo, rev)
5776 ret = hg.clean(repo, rev)
5775 else:
5777 else:
5776 ret = hg.update(repo, rev)
5778 ret = hg.update(repo, rev)
5777
5779
5778 if not ret and movemarkfrom:
5780 if not ret and movemarkfrom:
5779 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5781 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5780 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
5782 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
5781 elif brev in repo._bookmarks:
5783 elif brev in repo._bookmarks:
5782 bookmarks.setcurrent(repo, brev)
5784 bookmarks.setcurrent(repo, brev)
5783 elif brev:
5785 elif brev:
5784 bookmarks.unsetcurrent(repo)
5786 bookmarks.unsetcurrent(repo)
5785
5787
5786 return ret
5788 return ret
5787
5789
5788 @command('verify', [])
5790 @command('verify', [])
5789 def verify(ui, repo):
5791 def verify(ui, repo):
5790 """verify the integrity of the repository
5792 """verify the integrity of the repository
5791
5793
5792 Verify the integrity of the current repository.
5794 Verify the integrity of the current repository.
5793
5795
5794 This will perform an extensive check of the repository's
5796 This will perform an extensive check of the repository's
5795 integrity, validating the hashes and checksums of each entry in
5797 integrity, validating the hashes and checksums of each entry in
5796 the changelog, manifest, and tracked files, as well as the
5798 the changelog, manifest, and tracked files, as well as the
5797 integrity of their crosslinks and indices.
5799 integrity of their crosslinks and indices.
5798
5800
5799 Returns 0 on success, 1 if errors are encountered.
5801 Returns 0 on success, 1 if errors are encountered.
5800 """
5802 """
5801 return hg.verify(repo)
5803 return hg.verify(repo)
5802
5804
5803 @command('version', [])
5805 @command('version', [])
5804 def version_(ui):
5806 def version_(ui):
5805 """output version and copyright information"""
5807 """output version and copyright information"""
5806 ui.write(_("Mercurial Distributed SCM (version %s)\n")
5808 ui.write(_("Mercurial Distributed SCM (version %s)\n")
5807 % util.version())
5809 % util.version())
5808 ui.status(_(
5810 ui.status(_(
5809 "(see http://mercurial.selenic.com for more information)\n"
5811 "(see http://mercurial.selenic.com for more information)\n"
5810 "\nCopyright (C) 2005-2012 Matt Mackall and others\n"
5812 "\nCopyright (C) 2005-2012 Matt Mackall and others\n"
5811 "This is free software; see the source for copying conditions. "
5813 "This is free software; see the source for copying conditions. "
5812 "There is NO\nwarranty; "
5814 "There is NO\nwarranty; "
5813 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5815 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5814 ))
5816 ))
5815
5817
5816 norepo = ("clone init version help debugcommands debugcomplete"
5818 norepo = ("clone init version help debugcommands debugcomplete"
5817 " debugdate debuginstall debugfsinfo debugpushkey debugwireargs"
5819 " debugdate debuginstall debugfsinfo debugpushkey debugwireargs"
5818 " debugknown debuggetbundle debugbundle")
5820 " debugknown debuggetbundle debugbundle")
5819 optionalrepo = ("identify paths serve showconfig debugancestor debugdag"
5821 optionalrepo = ("identify paths serve showconfig debugancestor debugdag"
5820 " debugdata debugindex debugindexdot debugrevlog")
5822 " debugdata debugindex debugindexdot debugrevlog")
General Comments 0
You need to be logged in to leave comments. Login now