##// END OF EJS Templates
commands: hg debuginstall checks missing templates (issue4151)...
Simon Heimberg -
r20389:9a86b5b8 default
parent child Browse files
Show More
@@ -1,5934 +1,5945 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 _
10 from i18n import _
11 import os, re, difflib, time, tempfile, errno
11 import os, re, difflib, time, tempfile, errno
12 import hg, scmutil, util, revlog, copies, error, bookmarks
12 import hg, scmutil, util, revlog, copies, error, bookmarks
13 import patch, help, encoding, templatekw, discovery
13 import patch, help, encoding, templatekw, discovery
14 import archival, changegroup, cmdutil, hbisect
14 import archival, changegroup, cmdutil, hbisect
15 import sshserver, hgweb, commandserver
15 import sshserver, hgweb, commandserver
16 from hgweb import server as hgweb_server
16 from hgweb import server as hgweb_server
17 import merge as mergemod
17 import merge as mergemod
18 import minirst, revset, fileset
18 import minirst, revset, fileset
19 import dagparser, context, simplemerge, graphmod
19 import dagparser, context, simplemerge, graphmod
20 import random
20 import random
21 import setdiscovery, treediscovery, dagutil, pvec, localrepo
21 import setdiscovery, treediscovery, dagutil, pvec, localrepo
22 import phases, obsolete
22 import phases, obsolete
23
23
24 table = {}
24 table = {}
25
25
26 command = cmdutil.command(table)
26 command = cmdutil.command(table)
27
27
28 # common command options
28 # common command options
29
29
30 globalopts = [
30 globalopts = [
31 ('R', 'repository', '',
31 ('R', 'repository', '',
32 _('repository root directory or name of overlay bundle file'),
32 _('repository root directory or name of overlay bundle file'),
33 _('REPO')),
33 _('REPO')),
34 ('', 'cwd', '',
34 ('', 'cwd', '',
35 _('change working directory'), _('DIR')),
35 _('change working directory'), _('DIR')),
36 ('y', 'noninteractive', None,
36 ('y', 'noninteractive', None,
37 _('do not prompt, automatically pick the first choice for all prompts')),
37 _('do not prompt, automatically pick the first choice for all prompts')),
38 ('q', 'quiet', None, _('suppress output')),
38 ('q', 'quiet', None, _('suppress output')),
39 ('v', 'verbose', None, _('enable additional output')),
39 ('v', 'verbose', None, _('enable additional output')),
40 ('', 'config', [],
40 ('', 'config', [],
41 _('set/override config option (use \'section.name=value\')'),
41 _('set/override config option (use \'section.name=value\')'),
42 _('CONFIG')),
42 _('CONFIG')),
43 ('', 'debug', None, _('enable debugging output')),
43 ('', 'debug', None, _('enable debugging output')),
44 ('', 'debugger', None, _('start debugger')),
44 ('', 'debugger', None, _('start debugger')),
45 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
45 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
46 _('ENCODE')),
46 _('ENCODE')),
47 ('', 'encodingmode', encoding.encodingmode,
47 ('', 'encodingmode', encoding.encodingmode,
48 _('set the charset encoding mode'), _('MODE')),
48 _('set the charset encoding mode'), _('MODE')),
49 ('', 'traceback', None, _('always print a traceback on exception')),
49 ('', 'traceback', None, _('always print a traceback on exception')),
50 ('', 'time', None, _('time how long the command takes')),
50 ('', 'time', None, _('time how long the command takes')),
51 ('', 'profile', None, _('print command execution profile')),
51 ('', 'profile', None, _('print command execution profile')),
52 ('', 'version', None, _('output version information and exit')),
52 ('', 'version', None, _('output version information and exit')),
53 ('h', 'help', None, _('display help and exit')),
53 ('h', 'help', None, _('display help and exit')),
54 ('', 'hidden', False, _('consider hidden changesets')),
54 ('', 'hidden', False, _('consider hidden changesets')),
55 ]
55 ]
56
56
57 dryrunopts = [('n', 'dry-run', None,
57 dryrunopts = [('n', 'dry-run', None,
58 _('do not perform actions, just print output'))]
58 _('do not perform actions, just print output'))]
59
59
60 remoteopts = [
60 remoteopts = [
61 ('e', 'ssh', '',
61 ('e', 'ssh', '',
62 _('specify ssh command to use'), _('CMD')),
62 _('specify ssh command to use'), _('CMD')),
63 ('', 'remotecmd', '',
63 ('', 'remotecmd', '',
64 _('specify hg command to run on the remote side'), _('CMD')),
64 _('specify hg command to run on the remote side'), _('CMD')),
65 ('', 'insecure', None,
65 ('', 'insecure', None,
66 _('do not verify server certificate (ignoring web.cacerts config)')),
66 _('do not verify server certificate (ignoring web.cacerts config)')),
67 ]
67 ]
68
68
69 walkopts = [
69 walkopts = [
70 ('I', 'include', [],
70 ('I', 'include', [],
71 _('include names matching the given patterns'), _('PATTERN')),
71 _('include names matching the given patterns'), _('PATTERN')),
72 ('X', 'exclude', [],
72 ('X', 'exclude', [],
73 _('exclude names matching the given patterns'), _('PATTERN')),
73 _('exclude names matching the given patterns'), _('PATTERN')),
74 ]
74 ]
75
75
76 commitopts = [
76 commitopts = [
77 ('m', 'message', '',
77 ('m', 'message', '',
78 _('use text as commit message'), _('TEXT')),
78 _('use text as commit message'), _('TEXT')),
79 ('l', 'logfile', '',
79 ('l', 'logfile', '',
80 _('read commit message from file'), _('FILE')),
80 _('read commit message from file'), _('FILE')),
81 ]
81 ]
82
82
83 commitopts2 = [
83 commitopts2 = [
84 ('d', 'date', '',
84 ('d', 'date', '',
85 _('record the specified date as commit date'), _('DATE')),
85 _('record the specified date as commit date'), _('DATE')),
86 ('u', 'user', '',
86 ('u', 'user', '',
87 _('record the specified user as committer'), _('USER')),
87 _('record the specified user as committer'), _('USER')),
88 ]
88 ]
89
89
90 templateopts = [
90 templateopts = [
91 ('', 'style', '',
91 ('', 'style', '',
92 _('display using template map file'), _('STYLE')),
92 _('display using template map file'), _('STYLE')),
93 ('', 'template', '',
93 ('', 'template', '',
94 _('display with template'), _('TEMPLATE')),
94 _('display with template'), _('TEMPLATE')),
95 ]
95 ]
96
96
97 logopts = [
97 logopts = [
98 ('p', 'patch', None, _('show patch')),
98 ('p', 'patch', None, _('show patch')),
99 ('g', 'git', None, _('use git extended diff format')),
99 ('g', 'git', None, _('use git extended diff format')),
100 ('l', 'limit', '',
100 ('l', 'limit', '',
101 _('limit number of changes displayed'), _('NUM')),
101 _('limit number of changes displayed'), _('NUM')),
102 ('M', 'no-merges', None, _('do not show merges')),
102 ('M', 'no-merges', None, _('do not show merges')),
103 ('', 'stat', None, _('output diffstat-style summary of changes')),
103 ('', 'stat', None, _('output diffstat-style summary of changes')),
104 ('G', 'graph', None, _("show the revision DAG")),
104 ('G', 'graph', None, _("show the revision DAG")),
105 ] + templateopts
105 ] + templateopts
106
106
107 diffopts = [
107 diffopts = [
108 ('a', 'text', None, _('treat all files as text')),
108 ('a', 'text', None, _('treat all files as text')),
109 ('g', 'git', None, _('use git extended diff format')),
109 ('g', 'git', None, _('use git extended diff format')),
110 ('', 'nodates', None, _('omit dates from diff headers'))
110 ('', 'nodates', None, _('omit dates from diff headers'))
111 ]
111 ]
112
112
113 diffwsopts = [
113 diffwsopts = [
114 ('w', 'ignore-all-space', None,
114 ('w', 'ignore-all-space', None,
115 _('ignore white space when comparing lines')),
115 _('ignore white space when comparing lines')),
116 ('b', 'ignore-space-change', None,
116 ('b', 'ignore-space-change', None,
117 _('ignore changes in the amount of white space')),
117 _('ignore changes in the amount of white space')),
118 ('B', 'ignore-blank-lines', None,
118 ('B', 'ignore-blank-lines', None,
119 _('ignore changes whose lines are all blank')),
119 _('ignore changes whose lines are all blank')),
120 ]
120 ]
121
121
122 diffopts2 = [
122 diffopts2 = [
123 ('p', 'show-function', None, _('show which function each change is in')),
123 ('p', 'show-function', None, _('show which function each change is in')),
124 ('', 'reverse', None, _('produce a diff that undoes the changes')),
124 ('', 'reverse', None, _('produce a diff that undoes the changes')),
125 ] + diffwsopts + [
125 ] + diffwsopts + [
126 ('U', 'unified', '',
126 ('U', 'unified', '',
127 _('number of lines of context to show'), _('NUM')),
127 _('number of lines of context to show'), _('NUM')),
128 ('', 'stat', None, _('output diffstat-style summary of changes')),
128 ('', 'stat', None, _('output diffstat-style summary of changes')),
129 ]
129 ]
130
130
131 mergetoolopts = [
131 mergetoolopts = [
132 ('t', 'tool', '', _('specify merge tool')),
132 ('t', 'tool', '', _('specify merge tool')),
133 ]
133 ]
134
134
135 similarityopts = [
135 similarityopts = [
136 ('s', 'similarity', '',
136 ('s', 'similarity', '',
137 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
137 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
138 ]
138 ]
139
139
140 subrepoopts = [
140 subrepoopts = [
141 ('S', 'subrepos', None,
141 ('S', 'subrepos', None,
142 _('recurse into subrepositories'))
142 _('recurse into subrepositories'))
143 ]
143 ]
144
144
145 # Commands start here, listed alphabetically
145 # Commands start here, listed alphabetically
146
146
147 @command('^add',
147 @command('^add',
148 walkopts + subrepoopts + dryrunopts,
148 walkopts + subrepoopts + dryrunopts,
149 _('[OPTION]... [FILE]...'))
149 _('[OPTION]... [FILE]...'))
150 def add(ui, repo, *pats, **opts):
150 def add(ui, repo, *pats, **opts):
151 """add the specified files on the next commit
151 """add the specified files on the next commit
152
152
153 Schedule files to be version controlled and added to the
153 Schedule files to be version controlled and added to the
154 repository.
154 repository.
155
155
156 The files will be added to the repository at the next commit. To
156 The files will be added to the repository at the next commit. To
157 undo an add before that, see :hg:`forget`.
157 undo an add before that, see :hg:`forget`.
158
158
159 If no names are given, add all files to the repository.
159 If no names are given, add all files to the repository.
160
160
161 .. container:: verbose
161 .. container:: verbose
162
162
163 An example showing how new (unknown) files are added
163 An example showing how new (unknown) files are added
164 automatically by :hg:`add`::
164 automatically by :hg:`add`::
165
165
166 $ ls
166 $ ls
167 foo.c
167 foo.c
168 $ hg status
168 $ hg status
169 ? foo.c
169 ? foo.c
170 $ hg add
170 $ hg add
171 adding foo.c
171 adding foo.c
172 $ hg status
172 $ hg status
173 A foo.c
173 A foo.c
174
174
175 Returns 0 if all files are successfully added.
175 Returns 0 if all files are successfully added.
176 """
176 """
177
177
178 m = scmutil.match(repo[None], pats, opts)
178 m = scmutil.match(repo[None], pats, opts)
179 rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
179 rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
180 opts.get('subrepos'), prefix="", explicitonly=False)
180 opts.get('subrepos'), prefix="", explicitonly=False)
181 return rejected and 1 or 0
181 return rejected and 1 or 0
182
182
183 @command('addremove',
183 @command('addremove',
184 similarityopts + walkopts + dryrunopts,
184 similarityopts + walkopts + dryrunopts,
185 _('[OPTION]... [FILE]...'))
185 _('[OPTION]... [FILE]...'))
186 def addremove(ui, repo, *pats, **opts):
186 def addremove(ui, repo, *pats, **opts):
187 """add all new files, delete all missing files
187 """add all new files, delete all missing files
188
188
189 Add all new files and remove all missing files from the
189 Add all new files and remove all missing files from the
190 repository.
190 repository.
191
191
192 New files are ignored if they match any of the patterns in
192 New files are ignored if they match any of the patterns in
193 ``.hgignore``. As with add, these changes take effect at the next
193 ``.hgignore``. As with add, these changes take effect at the next
194 commit.
194 commit.
195
195
196 Use the -s/--similarity option to detect renamed files. This
196 Use the -s/--similarity option to detect renamed files. This
197 option takes a percentage between 0 (disabled) and 100 (files must
197 option takes a percentage between 0 (disabled) and 100 (files must
198 be identical) as its parameter. With a parameter greater than 0,
198 be identical) as its parameter. With a parameter greater than 0,
199 this compares every removed file with every added file and records
199 this compares every removed file with every added file and records
200 those similar enough as renames. Detecting renamed files this way
200 those similar enough as renames. Detecting renamed files this way
201 can be expensive. After using this option, :hg:`status -C` can be
201 can be expensive. After using this option, :hg:`status -C` can be
202 used to check which files were identified as moved or renamed. If
202 used to check which files were identified as moved or renamed. If
203 not specified, -s/--similarity defaults to 100 and only renames of
203 not specified, -s/--similarity defaults to 100 and only renames of
204 identical files are detected.
204 identical files are detected.
205
205
206 Returns 0 if all files are successfully added.
206 Returns 0 if all files are successfully added.
207 """
207 """
208 try:
208 try:
209 sim = float(opts.get('similarity') or 100)
209 sim = float(opts.get('similarity') or 100)
210 except ValueError:
210 except ValueError:
211 raise util.Abort(_('similarity must be a number'))
211 raise util.Abort(_('similarity must be a number'))
212 if sim < 0 or sim > 100:
212 if sim < 0 or sim > 100:
213 raise util.Abort(_('similarity must be between 0 and 100'))
213 raise util.Abort(_('similarity must be between 0 and 100'))
214 return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0)
214 return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0)
215
215
216 @command('^annotate|blame',
216 @command('^annotate|blame',
217 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
217 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
218 ('', 'follow', None,
218 ('', 'follow', None,
219 _('follow copies/renames and list the filename (DEPRECATED)')),
219 _('follow copies/renames and list the filename (DEPRECATED)')),
220 ('', 'no-follow', None, _("don't follow copies and renames")),
220 ('', 'no-follow', None, _("don't follow copies and renames")),
221 ('a', 'text', None, _('treat all files as text')),
221 ('a', 'text', None, _('treat all files as text')),
222 ('u', 'user', None, _('list the author (long with -v)')),
222 ('u', 'user', None, _('list the author (long with -v)')),
223 ('f', 'file', None, _('list the filename')),
223 ('f', 'file', None, _('list the filename')),
224 ('d', 'date', None, _('list the date (short with -q)')),
224 ('d', 'date', None, _('list the date (short with -q)')),
225 ('n', 'number', None, _('list the revision number (default)')),
225 ('n', 'number', None, _('list the revision number (default)')),
226 ('c', 'changeset', None, _('list the changeset')),
226 ('c', 'changeset', None, _('list the changeset')),
227 ('l', 'line-number', None, _('show line number at the first appearance'))
227 ('l', 'line-number', None, _('show line number at the first appearance'))
228 ] + diffwsopts + walkopts,
228 ] + diffwsopts + walkopts,
229 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'))
229 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'))
230 def annotate(ui, repo, *pats, **opts):
230 def annotate(ui, repo, *pats, **opts):
231 """show changeset information by line for each file
231 """show changeset information by line for each file
232
232
233 List changes in files, showing the revision id responsible for
233 List changes in files, showing the revision id responsible for
234 each line
234 each line
235
235
236 This command is useful for discovering when a change was made and
236 This command is useful for discovering when a change was made and
237 by whom.
237 by whom.
238
238
239 Without the -a/--text option, annotate will avoid processing files
239 Without the -a/--text option, annotate will avoid processing files
240 it detects as binary. With -a, annotate will annotate the file
240 it detects as binary. With -a, annotate will annotate the file
241 anyway, although the results will probably be neither useful
241 anyway, although the results will probably be neither useful
242 nor desirable.
242 nor desirable.
243
243
244 Returns 0 on success.
244 Returns 0 on success.
245 """
245 """
246 if opts.get('follow'):
246 if opts.get('follow'):
247 # --follow is deprecated and now just an alias for -f/--file
247 # --follow is deprecated and now just an alias for -f/--file
248 # to mimic the behavior of Mercurial before version 1.5
248 # to mimic the behavior of Mercurial before version 1.5
249 opts['file'] = True
249 opts['file'] = True
250
250
251 datefunc = ui.quiet and util.shortdate or util.datestr
251 datefunc = ui.quiet and util.shortdate or util.datestr
252 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
252 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
253
253
254 if not pats:
254 if not pats:
255 raise util.Abort(_('at least one filename or pattern is required'))
255 raise util.Abort(_('at least one filename or pattern is required'))
256
256
257 hexfn = ui.debugflag and hex or short
257 hexfn = ui.debugflag and hex or short
258
258
259 opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())),
259 opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())),
260 ('number', ' ', lambda x: str(x[0].rev())),
260 ('number', ' ', lambda x: str(x[0].rev())),
261 ('changeset', ' ', lambda x: hexfn(x[0].node())),
261 ('changeset', ' ', lambda x: hexfn(x[0].node())),
262 ('date', ' ', getdate),
262 ('date', ' ', getdate),
263 ('file', ' ', lambda x: x[0].path()),
263 ('file', ' ', lambda x: x[0].path()),
264 ('line_number', ':', lambda x: str(x[1])),
264 ('line_number', ':', lambda x: str(x[1])),
265 ]
265 ]
266
266
267 if (not opts.get('user') and not opts.get('changeset')
267 if (not opts.get('user') and not opts.get('changeset')
268 and not opts.get('date') and not opts.get('file')):
268 and not opts.get('date') and not opts.get('file')):
269 opts['number'] = True
269 opts['number'] = True
270
270
271 linenumber = opts.get('line_number') is not None
271 linenumber = opts.get('line_number') is not None
272 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
272 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
273 raise util.Abort(_('at least one of -n/-c is required for -l'))
273 raise util.Abort(_('at least one of -n/-c is required for -l'))
274
274
275 funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)]
275 funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)]
276 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
276 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
277
277
278 def bad(x, y):
278 def bad(x, y):
279 raise util.Abort("%s: %s" % (x, y))
279 raise util.Abort("%s: %s" % (x, y))
280
280
281 ctx = scmutil.revsingle(repo, opts.get('rev'))
281 ctx = scmutil.revsingle(repo, opts.get('rev'))
282 m = scmutil.match(ctx, pats, opts)
282 m = scmutil.match(ctx, pats, opts)
283 m.bad = bad
283 m.bad = bad
284 follow = not opts.get('no_follow')
284 follow = not opts.get('no_follow')
285 diffopts = patch.diffopts(ui, opts, section='annotate')
285 diffopts = patch.diffopts(ui, opts, section='annotate')
286 for abs in ctx.walk(m):
286 for abs in ctx.walk(m):
287 fctx = ctx[abs]
287 fctx = ctx[abs]
288 if not opts.get('text') and util.binary(fctx.data()):
288 if not opts.get('text') and util.binary(fctx.data()):
289 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
289 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
290 continue
290 continue
291
291
292 lines = fctx.annotate(follow=follow, linenumber=linenumber,
292 lines = fctx.annotate(follow=follow, linenumber=linenumber,
293 diffopts=diffopts)
293 diffopts=diffopts)
294 pieces = []
294 pieces = []
295
295
296 for f, sep in funcmap:
296 for f, sep in funcmap:
297 l = [f(n) for n, dummy in lines]
297 l = [f(n) for n, dummy in lines]
298 if l:
298 if l:
299 sized = [(x, encoding.colwidth(x)) for x in l]
299 sized = [(x, encoding.colwidth(x)) for x in l]
300 ml = max([w for x, w in sized])
300 ml = max([w for x, w in sized])
301 pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x)
301 pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x)
302 for x, w in sized])
302 for x, w in sized])
303
303
304 if pieces:
304 if pieces:
305 for p, l in zip(zip(*pieces), lines):
305 for p, l in zip(zip(*pieces), lines):
306 ui.write("%s: %s" % ("".join(p), l[1]))
306 ui.write("%s: %s" % ("".join(p), l[1]))
307
307
308 if lines and not lines[-1][1].endswith('\n'):
308 if lines and not lines[-1][1].endswith('\n'):
309 ui.write('\n')
309 ui.write('\n')
310
310
311 @command('archive',
311 @command('archive',
312 [('', 'no-decode', None, _('do not pass files through decoders')),
312 [('', 'no-decode', None, _('do not pass files through decoders')),
313 ('p', 'prefix', '', _('directory prefix for files in archive'),
313 ('p', 'prefix', '', _('directory prefix for files in archive'),
314 _('PREFIX')),
314 _('PREFIX')),
315 ('r', 'rev', '', _('revision to distribute'), _('REV')),
315 ('r', 'rev', '', _('revision to distribute'), _('REV')),
316 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
316 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
317 ] + subrepoopts + walkopts,
317 ] + subrepoopts + walkopts,
318 _('[OPTION]... DEST'))
318 _('[OPTION]... DEST'))
319 def archive(ui, repo, dest, **opts):
319 def archive(ui, repo, dest, **opts):
320 '''create an unversioned archive of a repository revision
320 '''create an unversioned archive of a repository revision
321
321
322 By default, the revision used is the parent of the working
322 By default, the revision used is the parent of the working
323 directory; use -r/--rev to specify a different revision.
323 directory; use -r/--rev to specify a different revision.
324
324
325 The archive type is automatically detected based on file
325 The archive type is automatically detected based on file
326 extension (or override using -t/--type).
326 extension (or override using -t/--type).
327
327
328 .. container:: verbose
328 .. container:: verbose
329
329
330 Examples:
330 Examples:
331
331
332 - create a zip file containing the 1.0 release::
332 - create a zip file containing the 1.0 release::
333
333
334 hg archive -r 1.0 project-1.0.zip
334 hg archive -r 1.0 project-1.0.zip
335
335
336 - create a tarball excluding .hg files::
336 - create a tarball excluding .hg files::
337
337
338 hg archive project.tar.gz -X ".hg*"
338 hg archive project.tar.gz -X ".hg*"
339
339
340 Valid types are:
340 Valid types are:
341
341
342 :``files``: a directory full of files (default)
342 :``files``: a directory full of files (default)
343 :``tar``: tar archive, uncompressed
343 :``tar``: tar archive, uncompressed
344 :``tbz2``: tar archive, compressed using bzip2
344 :``tbz2``: tar archive, compressed using bzip2
345 :``tgz``: tar archive, compressed using gzip
345 :``tgz``: tar archive, compressed using gzip
346 :``uzip``: zip archive, uncompressed
346 :``uzip``: zip archive, uncompressed
347 :``zip``: zip archive, compressed using deflate
347 :``zip``: zip archive, compressed using deflate
348
348
349 The exact name of the destination archive or directory is given
349 The exact name of the destination archive or directory is given
350 using a format string; see :hg:`help export` for details.
350 using a format string; see :hg:`help export` for details.
351
351
352 Each member added to an archive file has a directory prefix
352 Each member added to an archive file has a directory prefix
353 prepended. Use -p/--prefix to specify a format string for the
353 prepended. Use -p/--prefix to specify a format string for the
354 prefix. The default is the basename of the archive, with suffixes
354 prefix. The default is the basename of the archive, with suffixes
355 removed.
355 removed.
356
356
357 Returns 0 on success.
357 Returns 0 on success.
358 '''
358 '''
359
359
360 ctx = scmutil.revsingle(repo, opts.get('rev'))
360 ctx = scmutil.revsingle(repo, opts.get('rev'))
361 if not ctx:
361 if not ctx:
362 raise util.Abort(_('no working directory: please specify a revision'))
362 raise util.Abort(_('no working directory: please specify a revision'))
363 node = ctx.node()
363 node = ctx.node()
364 dest = cmdutil.makefilename(repo, dest, node)
364 dest = cmdutil.makefilename(repo, dest, node)
365 if os.path.realpath(dest) == repo.root:
365 if os.path.realpath(dest) == repo.root:
366 raise util.Abort(_('repository root cannot be destination'))
366 raise util.Abort(_('repository root cannot be destination'))
367
367
368 kind = opts.get('type') or archival.guesskind(dest) or 'files'
368 kind = opts.get('type') or archival.guesskind(dest) or 'files'
369 prefix = opts.get('prefix')
369 prefix = opts.get('prefix')
370
370
371 if dest == '-':
371 if dest == '-':
372 if kind == 'files':
372 if kind == 'files':
373 raise util.Abort(_('cannot archive plain files to stdout'))
373 raise util.Abort(_('cannot archive plain files to stdout'))
374 dest = cmdutil.makefileobj(repo, dest)
374 dest = cmdutil.makefileobj(repo, dest)
375 if not prefix:
375 if not prefix:
376 prefix = os.path.basename(repo.root) + '-%h'
376 prefix = os.path.basename(repo.root) + '-%h'
377
377
378 prefix = cmdutil.makefilename(repo, prefix, node)
378 prefix = cmdutil.makefilename(repo, prefix, node)
379 matchfn = scmutil.match(ctx, [], opts)
379 matchfn = scmutil.match(ctx, [], opts)
380 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
380 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
381 matchfn, prefix, subrepos=opts.get('subrepos'))
381 matchfn, prefix, subrepos=opts.get('subrepos'))
382
382
383 @command('backout',
383 @command('backout',
384 [('', 'merge', None, _('merge with old dirstate parent after backout')),
384 [('', 'merge', None, _('merge with old dirstate parent after backout')),
385 ('', 'parent', '',
385 ('', 'parent', '',
386 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
386 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
387 ('r', 'rev', '', _('revision to backout'), _('REV')),
387 ('r', 'rev', '', _('revision to backout'), _('REV')),
388 ] + mergetoolopts + walkopts + commitopts + commitopts2,
388 ] + mergetoolopts + walkopts + commitopts + commitopts2,
389 _('[OPTION]... [-r] REV'))
389 _('[OPTION]... [-r] REV'))
390 def backout(ui, repo, node=None, rev=None, **opts):
390 def backout(ui, repo, node=None, rev=None, **opts):
391 '''reverse effect of earlier changeset
391 '''reverse effect of earlier changeset
392
392
393 Prepare a new changeset with the effect of REV undone in the
393 Prepare a new changeset with the effect of REV undone in the
394 current working directory.
394 current working directory.
395
395
396 If REV is the parent of the working directory, then this new changeset
396 If REV is the parent of the working directory, then this new changeset
397 is committed automatically. Otherwise, hg needs to merge the
397 is committed automatically. Otherwise, hg needs to merge the
398 changes and the merged result is left uncommitted.
398 changes and the merged result is left uncommitted.
399
399
400 .. note::
400 .. note::
401
401
402 backout cannot be used to fix either an unwanted or
402 backout cannot be used to fix either an unwanted or
403 incorrect merge.
403 incorrect merge.
404
404
405 .. container:: verbose
405 .. container:: verbose
406
406
407 By default, the pending changeset will have one parent,
407 By default, the pending changeset will have one parent,
408 maintaining a linear history. With --merge, the pending
408 maintaining a linear history. With --merge, the pending
409 changeset will instead have two parents: the old parent of the
409 changeset will instead have two parents: the old parent of the
410 working directory and a new child of REV that simply undoes REV.
410 working directory and a new child of REV that simply undoes REV.
411
411
412 Before version 1.7, the behavior without --merge was equivalent
412 Before version 1.7, the behavior without --merge was equivalent
413 to specifying --merge followed by :hg:`update --clean .` to
413 to specifying --merge followed by :hg:`update --clean .` to
414 cancel the merge and leave the child of REV as a head to be
414 cancel the merge and leave the child of REV as a head to be
415 merged separately.
415 merged separately.
416
416
417 See :hg:`help dates` for a list of formats valid for -d/--date.
417 See :hg:`help dates` for a list of formats valid for -d/--date.
418
418
419 Returns 0 on success.
419 Returns 0 on success.
420 '''
420 '''
421 if rev and node:
421 if rev and node:
422 raise util.Abort(_("please specify just one revision"))
422 raise util.Abort(_("please specify just one revision"))
423
423
424 if not rev:
424 if not rev:
425 rev = node
425 rev = node
426
426
427 if not rev:
427 if not rev:
428 raise util.Abort(_("please specify a revision to backout"))
428 raise util.Abort(_("please specify a revision to backout"))
429
429
430 date = opts.get('date')
430 date = opts.get('date')
431 if date:
431 if date:
432 opts['date'] = util.parsedate(date)
432 opts['date'] = util.parsedate(date)
433
433
434 cmdutil.checkunfinished(repo)
434 cmdutil.checkunfinished(repo)
435 cmdutil.bailifchanged(repo)
435 cmdutil.bailifchanged(repo)
436 node = scmutil.revsingle(repo, rev).node()
436 node = scmutil.revsingle(repo, rev).node()
437
437
438 op1, op2 = repo.dirstate.parents()
438 op1, op2 = repo.dirstate.parents()
439 a = repo.changelog.ancestor(op1, node)
439 a = repo.changelog.ancestor(op1, node)
440 if a != node:
440 if a != node:
441 raise util.Abort(_('cannot backout change on a different branch'))
441 raise util.Abort(_('cannot backout change on a different branch'))
442
442
443 p1, p2 = repo.changelog.parents(node)
443 p1, p2 = repo.changelog.parents(node)
444 if p1 == nullid:
444 if p1 == nullid:
445 raise util.Abort(_('cannot backout a change with no parents'))
445 raise util.Abort(_('cannot backout a change with no parents'))
446 if p2 != nullid:
446 if p2 != nullid:
447 if not opts.get('parent'):
447 if not opts.get('parent'):
448 raise util.Abort(_('cannot backout a merge changeset'))
448 raise util.Abort(_('cannot backout a merge changeset'))
449 p = repo.lookup(opts['parent'])
449 p = repo.lookup(opts['parent'])
450 if p not in (p1, p2):
450 if p not in (p1, p2):
451 raise util.Abort(_('%s is not a parent of %s') %
451 raise util.Abort(_('%s is not a parent of %s') %
452 (short(p), short(node)))
452 (short(p), short(node)))
453 parent = p
453 parent = p
454 else:
454 else:
455 if opts.get('parent'):
455 if opts.get('parent'):
456 raise util.Abort(_('cannot use --parent on non-merge changeset'))
456 raise util.Abort(_('cannot use --parent on non-merge changeset'))
457 parent = p1
457 parent = p1
458
458
459 # the backout should appear on the same branch
459 # the backout should appear on the same branch
460 wlock = repo.wlock()
460 wlock = repo.wlock()
461 try:
461 try:
462 branch = repo.dirstate.branch()
462 branch = repo.dirstate.branch()
463 bheads = repo.branchheads(branch)
463 bheads = repo.branchheads(branch)
464 rctx = scmutil.revsingle(repo, hex(parent))
464 rctx = scmutil.revsingle(repo, hex(parent))
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 stats = mergemod.update(repo, parent, True, True, False,
468 stats = mergemod.update(repo, parent, True, True, False,
469 node, False)
469 node, False)
470 repo.setparents(op1, op2)
470 repo.setparents(op1, op2)
471 hg._showstats(repo, stats)
471 hg._showstats(repo, stats)
472 if stats[3]:
472 if stats[3]:
473 repo.ui.status(_("use 'hg resolve' to retry unresolved "
473 repo.ui.status(_("use 'hg resolve' to retry unresolved "
474 "file merges\n"))
474 "file merges\n"))
475 else:
475 else:
476 msg = _("changeset %s backed out, "
476 msg = _("changeset %s backed out, "
477 "don't forget to commit.\n")
477 "don't forget to commit.\n")
478 ui.status(msg % short(node))
478 ui.status(msg % short(node))
479 return stats[3] > 0
479 return stats[3] > 0
480 finally:
480 finally:
481 ui.setconfig('ui', 'forcemerge', '')
481 ui.setconfig('ui', 'forcemerge', '')
482 else:
482 else:
483 hg.clean(repo, node, show_stats=False)
483 hg.clean(repo, node, show_stats=False)
484 repo.dirstate.setbranch(branch)
484 repo.dirstate.setbranch(branch)
485 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
485 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
486
486
487
487
488 e = cmdutil.commiteditor
488 e = cmdutil.commiteditor
489 if not opts['message'] and not opts['logfile']:
489 if not opts['message'] and not opts['logfile']:
490 # we don't translate commit messages
490 # we don't translate commit messages
491 opts['message'] = "Backed out changeset %s" % short(node)
491 opts['message'] = "Backed out changeset %s" % short(node)
492 e = cmdutil.commitforceeditor
492 e = cmdutil.commitforceeditor
493
493
494 def commitfunc(ui, repo, message, match, opts):
494 def commitfunc(ui, repo, message, match, opts):
495 return repo.commit(message, opts.get('user'), opts.get('date'),
495 return repo.commit(message, opts.get('user'), opts.get('date'),
496 match, editor=e)
496 match, editor=e)
497 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
497 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
498 cmdutil.commitstatus(repo, newnode, branch, bheads)
498 cmdutil.commitstatus(repo, newnode, branch, bheads)
499
499
500 def nice(node):
500 def nice(node):
501 return '%d:%s' % (repo.changelog.rev(node), short(node))
501 return '%d:%s' % (repo.changelog.rev(node), short(node))
502 ui.status(_('changeset %s backs out changeset %s\n') %
502 ui.status(_('changeset %s backs out changeset %s\n') %
503 (nice(repo.changelog.tip()), nice(node)))
503 (nice(repo.changelog.tip()), nice(node)))
504 if opts.get('merge') and op1 != node:
504 if opts.get('merge') and op1 != node:
505 hg.clean(repo, op1, show_stats=False)
505 hg.clean(repo, op1, show_stats=False)
506 ui.status(_('merging with changeset %s\n')
506 ui.status(_('merging with changeset %s\n')
507 % nice(repo.changelog.tip()))
507 % nice(repo.changelog.tip()))
508 try:
508 try:
509 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
509 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
510 return hg.merge(repo, hex(repo.changelog.tip()))
510 return hg.merge(repo, hex(repo.changelog.tip()))
511 finally:
511 finally:
512 ui.setconfig('ui', 'forcemerge', '')
512 ui.setconfig('ui', 'forcemerge', '')
513 finally:
513 finally:
514 wlock.release()
514 wlock.release()
515 return 0
515 return 0
516
516
517 @command('bisect',
517 @command('bisect',
518 [('r', 'reset', False, _('reset bisect state')),
518 [('r', 'reset', False, _('reset bisect state')),
519 ('g', 'good', False, _('mark changeset good')),
519 ('g', 'good', False, _('mark changeset good')),
520 ('b', 'bad', False, _('mark changeset bad')),
520 ('b', 'bad', False, _('mark changeset bad')),
521 ('s', 'skip', False, _('skip testing changeset')),
521 ('s', 'skip', False, _('skip testing changeset')),
522 ('e', 'extend', False, _('extend the bisect range')),
522 ('e', 'extend', False, _('extend the bisect range')),
523 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
523 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
524 ('U', 'noupdate', False, _('do not update to target'))],
524 ('U', 'noupdate', False, _('do not update to target'))],
525 _("[-gbsr] [-U] [-c CMD] [REV]"))
525 _("[-gbsr] [-U] [-c CMD] [REV]"))
526 def bisect(ui, repo, rev=None, extra=None, command=None,
526 def bisect(ui, repo, rev=None, extra=None, command=None,
527 reset=None, good=None, bad=None, skip=None, extend=None,
527 reset=None, good=None, bad=None, skip=None, extend=None,
528 noupdate=None):
528 noupdate=None):
529 """subdivision search of changesets
529 """subdivision search of changesets
530
530
531 This command helps to find changesets which introduce problems. To
531 This command helps to find changesets which introduce problems. To
532 use, mark the earliest changeset you know exhibits the problem as
532 use, mark the earliest changeset you know exhibits the problem as
533 bad, then mark the latest changeset which is free from the problem
533 bad, then mark the latest changeset which is free from the problem
534 as good. Bisect will update your working directory to a revision
534 as good. Bisect will update your working directory to a revision
535 for testing (unless the -U/--noupdate option is specified). Once
535 for testing (unless the -U/--noupdate option is specified). Once
536 you have performed tests, mark the working directory as good or
536 you have performed tests, mark the working directory as good or
537 bad, and bisect will either update to another candidate changeset
537 bad, and bisect will either update to another candidate changeset
538 or announce that it has found the bad revision.
538 or announce that it has found the bad revision.
539
539
540 As a shortcut, you can also use the revision argument to mark a
540 As a shortcut, you can also use the revision argument to mark a
541 revision as good or bad without checking it out first.
541 revision as good or bad without checking it out first.
542
542
543 If you supply a command, it will be used for automatic bisection.
543 If you supply a command, it will be used for automatic bisection.
544 The environment variable HG_NODE will contain the ID of the
544 The environment variable HG_NODE will contain the ID of the
545 changeset being tested. The exit status of the command will be
545 changeset being tested. The exit status of the command will be
546 used to mark revisions as good or bad: status 0 means good, 125
546 used to mark revisions as good or bad: status 0 means good, 125
547 means to skip the revision, 127 (command not found) will abort the
547 means to skip the revision, 127 (command not found) will abort the
548 bisection, and any other non-zero exit status means the revision
548 bisection, and any other non-zero exit status means the revision
549 is bad.
549 is bad.
550
550
551 .. container:: verbose
551 .. container:: verbose
552
552
553 Some examples:
553 Some examples:
554
554
555 - start a bisection with known bad revision 34, and good revision 12::
555 - start a bisection with known bad revision 34, and good revision 12::
556
556
557 hg bisect --bad 34
557 hg bisect --bad 34
558 hg bisect --good 12
558 hg bisect --good 12
559
559
560 - advance the current bisection by marking current revision as good or
560 - advance the current bisection by marking current revision as good or
561 bad::
561 bad::
562
562
563 hg bisect --good
563 hg bisect --good
564 hg bisect --bad
564 hg bisect --bad
565
565
566 - mark the current revision, or a known revision, to be skipped (e.g. if
566 - mark the current revision, or a known revision, to be skipped (e.g. if
567 that revision is not usable because of another issue)::
567 that revision is not usable because of another issue)::
568
568
569 hg bisect --skip
569 hg bisect --skip
570 hg bisect --skip 23
570 hg bisect --skip 23
571
571
572 - skip all revisions that do not touch directories ``foo`` or ``bar``::
572 - skip all revisions that do not touch directories ``foo`` or ``bar``::
573
573
574 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
574 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
575
575
576 - forget the current bisection::
576 - forget the current bisection::
577
577
578 hg bisect --reset
578 hg bisect --reset
579
579
580 - use 'make && make tests' to automatically find the first broken
580 - use 'make && make tests' to automatically find the first broken
581 revision::
581 revision::
582
582
583 hg bisect --reset
583 hg bisect --reset
584 hg bisect --bad 34
584 hg bisect --bad 34
585 hg bisect --good 12
585 hg bisect --good 12
586 hg bisect --command "make && make tests"
586 hg bisect --command "make && make tests"
587
587
588 - see all changesets whose states are already known in the current
588 - see all changesets whose states are already known in the current
589 bisection::
589 bisection::
590
590
591 hg log -r "bisect(pruned)"
591 hg log -r "bisect(pruned)"
592
592
593 - see the changeset currently being bisected (especially useful
593 - see the changeset currently being bisected (especially useful
594 if running with -U/--noupdate)::
594 if running with -U/--noupdate)::
595
595
596 hg log -r "bisect(current)"
596 hg log -r "bisect(current)"
597
597
598 - see all changesets that took part in the current bisection::
598 - see all changesets that took part in the current bisection::
599
599
600 hg log -r "bisect(range)"
600 hg log -r "bisect(range)"
601
601
602 - you can even get a nice graph::
602 - you can even get a nice graph::
603
603
604 hg log --graph -r "bisect(range)"
604 hg log --graph -r "bisect(range)"
605
605
606 See :hg:`help revsets` for more about the `bisect()` keyword.
606 See :hg:`help revsets` for more about the `bisect()` keyword.
607
607
608 Returns 0 on success.
608 Returns 0 on success.
609 """
609 """
610 def extendbisectrange(nodes, good):
610 def extendbisectrange(nodes, good):
611 # bisect is incomplete when it ends on a merge node and
611 # bisect is incomplete when it ends on a merge node and
612 # one of the parent was not checked.
612 # one of the parent was not checked.
613 parents = repo[nodes[0]].parents()
613 parents = repo[nodes[0]].parents()
614 if len(parents) > 1:
614 if len(parents) > 1:
615 side = good and state['bad'] or state['good']
615 side = good and state['bad'] or state['good']
616 num = len(set(i.node() for i in parents) & set(side))
616 num = len(set(i.node() for i in parents) & set(side))
617 if num == 1:
617 if num == 1:
618 return parents[0].ancestor(parents[1])
618 return parents[0].ancestor(parents[1])
619 return None
619 return None
620
620
621 def print_result(nodes, good):
621 def print_result(nodes, good):
622 displayer = cmdutil.show_changeset(ui, repo, {})
622 displayer = cmdutil.show_changeset(ui, repo, {})
623 if len(nodes) == 1:
623 if len(nodes) == 1:
624 # narrowed it down to a single revision
624 # narrowed it down to a single revision
625 if good:
625 if good:
626 ui.write(_("The first good revision is:\n"))
626 ui.write(_("The first good revision is:\n"))
627 else:
627 else:
628 ui.write(_("The first bad revision is:\n"))
628 ui.write(_("The first bad revision is:\n"))
629 displayer.show(repo[nodes[0]])
629 displayer.show(repo[nodes[0]])
630 extendnode = extendbisectrange(nodes, good)
630 extendnode = extendbisectrange(nodes, good)
631 if extendnode is not None:
631 if extendnode is not None:
632 ui.write(_('Not all ancestors of this changeset have been'
632 ui.write(_('Not all ancestors of this changeset have been'
633 ' checked.\nUse bisect --extend to continue the '
633 ' checked.\nUse bisect --extend to continue the '
634 'bisection from\nthe common ancestor, %s.\n')
634 'bisection from\nthe common ancestor, %s.\n')
635 % extendnode)
635 % extendnode)
636 else:
636 else:
637 # multiple possible revisions
637 # multiple possible revisions
638 if good:
638 if good:
639 ui.write(_("Due to skipped revisions, the first "
639 ui.write(_("Due to skipped revisions, the first "
640 "good revision could be any of:\n"))
640 "good revision could be any of:\n"))
641 else:
641 else:
642 ui.write(_("Due to skipped revisions, the first "
642 ui.write(_("Due to skipped revisions, the first "
643 "bad revision could be any of:\n"))
643 "bad revision could be any of:\n"))
644 for n in nodes:
644 for n in nodes:
645 displayer.show(repo[n])
645 displayer.show(repo[n])
646 displayer.close()
646 displayer.close()
647
647
648 def check_state(state, interactive=True):
648 def check_state(state, interactive=True):
649 if not state['good'] or not state['bad']:
649 if not state['good'] or not state['bad']:
650 if (good or bad or skip or reset) and interactive:
650 if (good or bad or skip or reset) and interactive:
651 return
651 return
652 if not state['good']:
652 if not state['good']:
653 raise util.Abort(_('cannot bisect (no known good revisions)'))
653 raise util.Abort(_('cannot bisect (no known good revisions)'))
654 else:
654 else:
655 raise util.Abort(_('cannot bisect (no known bad revisions)'))
655 raise util.Abort(_('cannot bisect (no known bad revisions)'))
656 return True
656 return True
657
657
658 # backward compatibility
658 # backward compatibility
659 if rev in "good bad reset init".split():
659 if rev in "good bad reset init".split():
660 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
660 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
661 cmd, rev, extra = rev, extra, None
661 cmd, rev, extra = rev, extra, None
662 if cmd == "good":
662 if cmd == "good":
663 good = True
663 good = True
664 elif cmd == "bad":
664 elif cmd == "bad":
665 bad = True
665 bad = True
666 else:
666 else:
667 reset = True
667 reset = True
668 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
668 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
669 raise util.Abort(_('incompatible arguments'))
669 raise util.Abort(_('incompatible arguments'))
670
670
671 cmdutil.checkunfinished(repo)
671 cmdutil.checkunfinished(repo)
672
672
673 if reset:
673 if reset:
674 p = repo.join("bisect.state")
674 p = repo.join("bisect.state")
675 if os.path.exists(p):
675 if os.path.exists(p):
676 os.unlink(p)
676 os.unlink(p)
677 return
677 return
678
678
679 state = hbisect.load_state(repo)
679 state = hbisect.load_state(repo)
680
680
681 if command:
681 if command:
682 changesets = 1
682 changesets = 1
683 if noupdate:
683 if noupdate:
684 try:
684 try:
685 node = state['current'][0]
685 node = state['current'][0]
686 except LookupError:
686 except LookupError:
687 raise util.Abort(_('current bisect revision is unknown - '
687 raise util.Abort(_('current bisect revision is unknown - '
688 'start a new bisect to fix'))
688 'start a new bisect to fix'))
689 else:
689 else:
690 node, p2 = repo.dirstate.parents()
690 node, p2 = repo.dirstate.parents()
691 if p2 != nullid:
691 if p2 != nullid:
692 raise util.Abort(_('current bisect revision is a merge'))
692 raise util.Abort(_('current bisect revision is a merge'))
693 try:
693 try:
694 while changesets:
694 while changesets:
695 # update state
695 # update state
696 state['current'] = [node]
696 state['current'] = [node]
697 hbisect.save_state(repo, state)
697 hbisect.save_state(repo, state)
698 status = util.system(command,
698 status = util.system(command,
699 environ={'HG_NODE': hex(node)},
699 environ={'HG_NODE': hex(node)},
700 out=ui.fout)
700 out=ui.fout)
701 if status == 125:
701 if status == 125:
702 transition = "skip"
702 transition = "skip"
703 elif status == 0:
703 elif status == 0:
704 transition = "good"
704 transition = "good"
705 # status < 0 means process was killed
705 # status < 0 means process was killed
706 elif status == 127:
706 elif status == 127:
707 raise util.Abort(_("failed to execute %s") % command)
707 raise util.Abort(_("failed to execute %s") % command)
708 elif status < 0:
708 elif status < 0:
709 raise util.Abort(_("%s killed") % command)
709 raise util.Abort(_("%s killed") % command)
710 else:
710 else:
711 transition = "bad"
711 transition = "bad"
712 ctx = scmutil.revsingle(repo, rev, node)
712 ctx = scmutil.revsingle(repo, rev, node)
713 rev = None # clear for future iterations
713 rev = None # clear for future iterations
714 state[transition].append(ctx.node())
714 state[transition].append(ctx.node())
715 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
715 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
716 check_state(state, interactive=False)
716 check_state(state, interactive=False)
717 # bisect
717 # bisect
718 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
718 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
719 # update to next check
719 # update to next check
720 node = nodes[0]
720 node = nodes[0]
721 if not noupdate:
721 if not noupdate:
722 cmdutil.bailifchanged(repo)
722 cmdutil.bailifchanged(repo)
723 hg.clean(repo, node, show_stats=False)
723 hg.clean(repo, node, show_stats=False)
724 finally:
724 finally:
725 state['current'] = [node]
725 state['current'] = [node]
726 hbisect.save_state(repo, state)
726 hbisect.save_state(repo, state)
727 print_result(nodes, bgood)
727 print_result(nodes, bgood)
728 return
728 return
729
729
730 # update state
730 # update state
731
731
732 if rev:
732 if rev:
733 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
733 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
734 else:
734 else:
735 nodes = [repo.lookup('.')]
735 nodes = [repo.lookup('.')]
736
736
737 if good or bad or skip:
737 if good or bad or skip:
738 if good:
738 if good:
739 state['good'] += nodes
739 state['good'] += nodes
740 elif bad:
740 elif bad:
741 state['bad'] += nodes
741 state['bad'] += nodes
742 elif skip:
742 elif skip:
743 state['skip'] += nodes
743 state['skip'] += nodes
744 hbisect.save_state(repo, state)
744 hbisect.save_state(repo, state)
745
745
746 if not check_state(state):
746 if not check_state(state):
747 return
747 return
748
748
749 # actually bisect
749 # actually bisect
750 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
750 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
751 if extend:
751 if extend:
752 if not changesets:
752 if not changesets:
753 extendnode = extendbisectrange(nodes, good)
753 extendnode = extendbisectrange(nodes, good)
754 if extendnode is not None:
754 if extendnode is not None:
755 ui.write(_("Extending search to changeset %d:%s\n"
755 ui.write(_("Extending search to changeset %d:%s\n"
756 % (extendnode.rev(), extendnode)))
756 % (extendnode.rev(), extendnode)))
757 state['current'] = [extendnode.node()]
757 state['current'] = [extendnode.node()]
758 hbisect.save_state(repo, state)
758 hbisect.save_state(repo, state)
759 if noupdate:
759 if noupdate:
760 return
760 return
761 cmdutil.bailifchanged(repo)
761 cmdutil.bailifchanged(repo)
762 return hg.clean(repo, extendnode.node())
762 return hg.clean(repo, extendnode.node())
763 raise util.Abort(_("nothing to extend"))
763 raise util.Abort(_("nothing to extend"))
764
764
765 if changesets == 0:
765 if changesets == 0:
766 print_result(nodes, good)
766 print_result(nodes, good)
767 else:
767 else:
768 assert len(nodes) == 1 # only a single node can be tested next
768 assert len(nodes) == 1 # only a single node can be tested next
769 node = nodes[0]
769 node = nodes[0]
770 # compute the approximate number of remaining tests
770 # compute the approximate number of remaining tests
771 tests, size = 0, 2
771 tests, size = 0, 2
772 while size <= changesets:
772 while size <= changesets:
773 tests, size = tests + 1, size * 2
773 tests, size = tests + 1, size * 2
774 rev = repo.changelog.rev(node)
774 rev = repo.changelog.rev(node)
775 ui.write(_("Testing changeset %d:%s "
775 ui.write(_("Testing changeset %d:%s "
776 "(%d changesets remaining, ~%d tests)\n")
776 "(%d changesets remaining, ~%d tests)\n")
777 % (rev, short(node), changesets, tests))
777 % (rev, short(node), changesets, tests))
778 state['current'] = [node]
778 state['current'] = [node]
779 hbisect.save_state(repo, state)
779 hbisect.save_state(repo, state)
780 if not noupdate:
780 if not noupdate:
781 cmdutil.bailifchanged(repo)
781 cmdutil.bailifchanged(repo)
782 return hg.clean(repo, node)
782 return hg.clean(repo, node)
783
783
784 @command('bookmarks|bookmark',
784 @command('bookmarks|bookmark',
785 [('f', 'force', False, _('force')),
785 [('f', 'force', False, _('force')),
786 ('r', 'rev', '', _('revision'), _('REV')),
786 ('r', 'rev', '', _('revision'), _('REV')),
787 ('d', 'delete', False, _('delete a given bookmark')),
787 ('d', 'delete', False, _('delete a given bookmark')),
788 ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
788 ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
789 ('i', 'inactive', False, _('mark a bookmark inactive'))],
789 ('i', 'inactive', False, _('mark a bookmark inactive'))],
790 _('hg bookmarks [OPTIONS]... [NAME]...'))
790 _('hg bookmarks [OPTIONS]... [NAME]...'))
791 def bookmark(ui, repo, *names, **opts):
791 def bookmark(ui, repo, *names, **opts):
792 '''track a line of development with movable markers
792 '''track a line of development with movable markers
793
793
794 Bookmarks are pointers to certain commits that move when committing.
794 Bookmarks are pointers to certain commits that move when committing.
795 Bookmarks are local. They can be renamed, copied and deleted. It is
795 Bookmarks are local. They can be renamed, copied and deleted. It is
796 possible to use :hg:`merge NAME` to merge from a given bookmark, and
796 possible to use :hg:`merge NAME` to merge from a given bookmark, and
797 :hg:`update NAME` to update to a given bookmark.
797 :hg:`update NAME` to update to a given bookmark.
798
798
799 You can use :hg:`bookmark NAME` to set a bookmark on the working
799 You can use :hg:`bookmark NAME` to set a bookmark on the working
800 directory's parent revision with the given name. If you specify
800 directory's parent revision with the given name. If you specify
801 a revision using -r REV (where REV may be an existing bookmark),
801 a revision using -r REV (where REV may be an existing bookmark),
802 the bookmark is assigned to that revision.
802 the bookmark is assigned to that revision.
803
803
804 Bookmarks can be pushed and pulled between repositories (see :hg:`help
804 Bookmarks can be pushed and pulled between repositories (see :hg:`help
805 push` and :hg:`help pull`). This requires both the local and remote
805 push` and :hg:`help pull`). This requires both the local and remote
806 repositories to support bookmarks. For versions prior to 1.8, this means
806 repositories to support bookmarks. For versions prior to 1.8, this means
807 the bookmarks extension must be enabled.
807 the bookmarks extension must be enabled.
808
808
809 If you set a bookmark called '@', new clones of the repository will
809 If you set a bookmark called '@', new clones of the repository will
810 have that revision checked out (and the bookmark made active) by
810 have that revision checked out (and the bookmark made active) by
811 default.
811 default.
812
812
813 With -i/--inactive, the new bookmark will not be made the active
813 With -i/--inactive, the new bookmark will not be made the active
814 bookmark. If -r/--rev is given, the new bookmark will not be made
814 bookmark. If -r/--rev is given, the new bookmark will not be made
815 active even if -i/--inactive is not given. If no NAME is given, the
815 active even if -i/--inactive is not given. If no NAME is given, the
816 current active bookmark will be marked inactive.
816 current active bookmark will be marked inactive.
817 '''
817 '''
818 force = opts.get('force')
818 force = opts.get('force')
819 rev = opts.get('rev')
819 rev = opts.get('rev')
820 delete = opts.get('delete')
820 delete = opts.get('delete')
821 rename = opts.get('rename')
821 rename = opts.get('rename')
822 inactive = opts.get('inactive')
822 inactive = opts.get('inactive')
823
823
824 def checkformat(mark):
824 def checkformat(mark):
825 mark = mark.strip()
825 mark = mark.strip()
826 if not mark:
826 if not mark:
827 raise util.Abort(_("bookmark names cannot consist entirely of "
827 raise util.Abort(_("bookmark names cannot consist entirely of "
828 "whitespace"))
828 "whitespace"))
829 scmutil.checknewlabel(repo, mark, 'bookmark')
829 scmutil.checknewlabel(repo, mark, 'bookmark')
830 return mark
830 return mark
831
831
832 def checkconflict(repo, mark, cur, force=False, target=None):
832 def checkconflict(repo, mark, cur, force=False, target=None):
833 if mark in marks and not force:
833 if mark in marks and not force:
834 if target:
834 if target:
835 if marks[mark] == target and target == cur:
835 if marks[mark] == target and target == cur:
836 # re-activating a bookmark
836 # re-activating a bookmark
837 return
837 return
838 anc = repo.changelog.ancestors([repo[target].rev()])
838 anc = repo.changelog.ancestors([repo[target].rev()])
839 bmctx = repo[marks[mark]]
839 bmctx = repo[marks[mark]]
840 divs = [repo[b].node() for b in marks
840 divs = [repo[b].node() for b in marks
841 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
841 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
842
842
843 # allow resolving a single divergent bookmark even if moving
843 # allow resolving a single divergent bookmark even if moving
844 # the bookmark across branches when a revision is specified
844 # the bookmark across branches when a revision is specified
845 # that contains a divergent bookmark
845 # that contains a divergent bookmark
846 if bmctx.rev() not in anc and target in divs:
846 if bmctx.rev() not in anc and target in divs:
847 bookmarks.deletedivergent(repo, [target], mark)
847 bookmarks.deletedivergent(repo, [target], mark)
848 return
848 return
849
849
850 deletefrom = [b for b in divs
850 deletefrom = [b for b in divs
851 if repo[b].rev() in anc or b == target]
851 if repo[b].rev() in anc or b == target]
852 bookmarks.deletedivergent(repo, deletefrom, mark)
852 bookmarks.deletedivergent(repo, deletefrom, mark)
853 if bookmarks.validdest(repo, bmctx, repo[target]):
853 if bookmarks.validdest(repo, bmctx, repo[target]):
854 ui.status(_("moving bookmark '%s' forward from %s\n") %
854 ui.status(_("moving bookmark '%s' forward from %s\n") %
855 (mark, short(bmctx.node())))
855 (mark, short(bmctx.node())))
856 return
856 return
857 raise util.Abort(_("bookmark '%s' already exists "
857 raise util.Abort(_("bookmark '%s' already exists "
858 "(use -f to force)") % mark)
858 "(use -f to force)") % mark)
859 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
859 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
860 and not force):
860 and not force):
861 raise util.Abort(
861 raise util.Abort(
862 _("a bookmark cannot have the name of an existing branch"))
862 _("a bookmark cannot have the name of an existing branch"))
863
863
864 if delete and rename:
864 if delete and rename:
865 raise util.Abort(_("--delete and --rename are incompatible"))
865 raise util.Abort(_("--delete and --rename are incompatible"))
866 if delete and rev:
866 if delete and rev:
867 raise util.Abort(_("--rev is incompatible with --delete"))
867 raise util.Abort(_("--rev is incompatible with --delete"))
868 if rename and rev:
868 if rename and rev:
869 raise util.Abort(_("--rev is incompatible with --rename"))
869 raise util.Abort(_("--rev is incompatible with --rename"))
870 if not names and (delete or rev):
870 if not names and (delete or rev):
871 raise util.Abort(_("bookmark name required"))
871 raise util.Abort(_("bookmark name required"))
872
872
873 if delete or rename or names or inactive:
873 if delete or rename or names or inactive:
874 wlock = repo.wlock()
874 wlock = repo.wlock()
875 try:
875 try:
876 cur = repo.changectx('.').node()
876 cur = repo.changectx('.').node()
877 marks = repo._bookmarks
877 marks = repo._bookmarks
878 if delete:
878 if delete:
879 for mark in names:
879 for mark in names:
880 if mark not in marks:
880 if mark not in marks:
881 raise util.Abort(_("bookmark '%s' does not exist") %
881 raise util.Abort(_("bookmark '%s' does not exist") %
882 mark)
882 mark)
883 if mark == repo._bookmarkcurrent:
883 if mark == repo._bookmarkcurrent:
884 bookmarks.unsetcurrent(repo)
884 bookmarks.unsetcurrent(repo)
885 del marks[mark]
885 del marks[mark]
886 marks.write()
886 marks.write()
887
887
888 elif rename:
888 elif rename:
889 if not names:
889 if not names:
890 raise util.Abort(_("new bookmark name required"))
890 raise util.Abort(_("new bookmark name required"))
891 elif len(names) > 1:
891 elif len(names) > 1:
892 raise util.Abort(_("only one new bookmark name allowed"))
892 raise util.Abort(_("only one new bookmark name allowed"))
893 mark = checkformat(names[0])
893 mark = checkformat(names[0])
894 if rename not in marks:
894 if rename not in marks:
895 raise util.Abort(_("bookmark '%s' does not exist") % rename)
895 raise util.Abort(_("bookmark '%s' does not exist") % rename)
896 checkconflict(repo, mark, cur, force)
896 checkconflict(repo, mark, cur, force)
897 marks[mark] = marks[rename]
897 marks[mark] = marks[rename]
898 if repo._bookmarkcurrent == rename and not inactive:
898 if repo._bookmarkcurrent == rename and not inactive:
899 bookmarks.setcurrent(repo, mark)
899 bookmarks.setcurrent(repo, mark)
900 del marks[rename]
900 del marks[rename]
901 marks.write()
901 marks.write()
902
902
903 elif names:
903 elif names:
904 newact = None
904 newact = None
905 for mark in names:
905 for mark in names:
906 mark = checkformat(mark)
906 mark = checkformat(mark)
907 if newact is None:
907 if newact is None:
908 newact = mark
908 newact = mark
909 if inactive and mark == repo._bookmarkcurrent:
909 if inactive and mark == repo._bookmarkcurrent:
910 bookmarks.unsetcurrent(repo)
910 bookmarks.unsetcurrent(repo)
911 return
911 return
912 tgt = cur
912 tgt = cur
913 if rev:
913 if rev:
914 tgt = scmutil.revsingle(repo, rev).node()
914 tgt = scmutil.revsingle(repo, rev).node()
915 checkconflict(repo, mark, cur, force, tgt)
915 checkconflict(repo, mark, cur, force, tgt)
916 marks[mark] = tgt
916 marks[mark] = tgt
917 if not inactive and cur == marks[newact] and not rev:
917 if not inactive and cur == marks[newact] and not rev:
918 bookmarks.setcurrent(repo, newact)
918 bookmarks.setcurrent(repo, newact)
919 elif cur != tgt and newact == repo._bookmarkcurrent:
919 elif cur != tgt and newact == repo._bookmarkcurrent:
920 bookmarks.unsetcurrent(repo)
920 bookmarks.unsetcurrent(repo)
921 marks.write()
921 marks.write()
922
922
923 elif inactive:
923 elif inactive:
924 if len(marks) == 0:
924 if len(marks) == 0:
925 ui.status(_("no bookmarks set\n"))
925 ui.status(_("no bookmarks set\n"))
926 elif not repo._bookmarkcurrent:
926 elif not repo._bookmarkcurrent:
927 ui.status(_("no active bookmark\n"))
927 ui.status(_("no active bookmark\n"))
928 else:
928 else:
929 bookmarks.unsetcurrent(repo)
929 bookmarks.unsetcurrent(repo)
930 finally:
930 finally:
931 wlock.release()
931 wlock.release()
932 else: # show bookmarks
932 else: # show bookmarks
933 hexfn = ui.debugflag and hex or short
933 hexfn = ui.debugflag and hex or short
934 marks = repo._bookmarks
934 marks = repo._bookmarks
935 if len(marks) == 0:
935 if len(marks) == 0:
936 ui.status(_("no bookmarks set\n"))
936 ui.status(_("no bookmarks set\n"))
937 else:
937 else:
938 for bmark, n in sorted(marks.iteritems()):
938 for bmark, n in sorted(marks.iteritems()):
939 current = repo._bookmarkcurrent
939 current = repo._bookmarkcurrent
940 if bmark == current:
940 if bmark == current:
941 prefix, label = '*', 'bookmarks.current'
941 prefix, label = '*', 'bookmarks.current'
942 else:
942 else:
943 prefix, label = ' ', ''
943 prefix, label = ' ', ''
944
944
945 if ui.quiet:
945 if ui.quiet:
946 ui.write("%s\n" % bmark, label=label)
946 ui.write("%s\n" % bmark, label=label)
947 else:
947 else:
948 ui.write(" %s %-25s %d:%s\n" % (
948 ui.write(" %s %-25s %d:%s\n" % (
949 prefix, bmark, repo.changelog.rev(n), hexfn(n)),
949 prefix, bmark, repo.changelog.rev(n), hexfn(n)),
950 label=label)
950 label=label)
951
951
952 @command('branch',
952 @command('branch',
953 [('f', 'force', None,
953 [('f', 'force', None,
954 _('set branch name even if it shadows an existing branch')),
954 _('set branch name even if it shadows an existing branch')),
955 ('C', 'clean', None, _('reset branch name to parent branch name'))],
955 ('C', 'clean', None, _('reset branch name to parent branch name'))],
956 _('[-fC] [NAME]'))
956 _('[-fC] [NAME]'))
957 def branch(ui, repo, label=None, **opts):
957 def branch(ui, repo, label=None, **opts):
958 """set or show the current branch name
958 """set or show the current branch name
959
959
960 .. note::
960 .. note::
961
961
962 Branch names are permanent and global. Use :hg:`bookmark` to create a
962 Branch names are permanent and global. Use :hg:`bookmark` to create a
963 light-weight bookmark instead. See :hg:`help glossary` for more
963 light-weight bookmark instead. See :hg:`help glossary` for more
964 information about named branches and bookmarks.
964 information about named branches and bookmarks.
965
965
966 With no argument, show the current branch name. With one argument,
966 With no argument, show the current branch name. With one argument,
967 set the working directory branch name (the branch will not exist
967 set the working directory branch name (the branch will not exist
968 in the repository until the next commit). Standard practice
968 in the repository until the next commit). Standard practice
969 recommends that primary development take place on the 'default'
969 recommends that primary development take place on the 'default'
970 branch.
970 branch.
971
971
972 Unless -f/--force is specified, branch will not let you set a
972 Unless -f/--force is specified, branch will not let you set a
973 branch name that already exists, even if it's inactive.
973 branch name that already exists, even if it's inactive.
974
974
975 Use -C/--clean to reset the working directory branch to that of
975 Use -C/--clean to reset the working directory branch to that of
976 the parent of the working directory, negating a previous branch
976 the parent of the working directory, negating a previous branch
977 change.
977 change.
978
978
979 Use the command :hg:`update` to switch to an existing branch. Use
979 Use the command :hg:`update` to switch to an existing branch. Use
980 :hg:`commit --close-branch` to mark this branch as closed.
980 :hg:`commit --close-branch` to mark this branch as closed.
981
981
982 Returns 0 on success.
982 Returns 0 on success.
983 """
983 """
984 if label:
984 if label:
985 label = label.strip()
985 label = label.strip()
986
986
987 if not opts.get('clean') and not label:
987 if not opts.get('clean') and not label:
988 ui.write("%s\n" % repo.dirstate.branch())
988 ui.write("%s\n" % repo.dirstate.branch())
989 return
989 return
990
990
991 wlock = repo.wlock()
991 wlock = repo.wlock()
992 try:
992 try:
993 if opts.get('clean'):
993 if opts.get('clean'):
994 label = repo[None].p1().branch()
994 label = repo[None].p1().branch()
995 repo.dirstate.setbranch(label)
995 repo.dirstate.setbranch(label)
996 ui.status(_('reset working directory to branch %s\n') % label)
996 ui.status(_('reset working directory to branch %s\n') % label)
997 elif label:
997 elif label:
998 if not opts.get('force') and label in repo.branchmap():
998 if not opts.get('force') and label in repo.branchmap():
999 if label not in [p.branch() for p in repo.parents()]:
999 if label not in [p.branch() for p in repo.parents()]:
1000 raise util.Abort(_('a branch of the same name already'
1000 raise util.Abort(_('a branch of the same name already'
1001 ' exists'),
1001 ' exists'),
1002 # i18n: "it" refers to an existing branch
1002 # i18n: "it" refers to an existing branch
1003 hint=_("use 'hg update' to switch to it"))
1003 hint=_("use 'hg update' to switch to it"))
1004 scmutil.checknewlabel(repo, label, 'branch')
1004 scmutil.checknewlabel(repo, label, 'branch')
1005 repo.dirstate.setbranch(label)
1005 repo.dirstate.setbranch(label)
1006 ui.status(_('marked working directory as branch %s\n') % label)
1006 ui.status(_('marked working directory as branch %s\n') % label)
1007 ui.status(_('(branches are permanent and global, '
1007 ui.status(_('(branches are permanent and global, '
1008 'did you want a bookmark?)\n'))
1008 'did you want a bookmark?)\n'))
1009 finally:
1009 finally:
1010 wlock.release()
1010 wlock.release()
1011
1011
1012 @command('branches',
1012 @command('branches',
1013 [('a', 'active', False, _('show only branches that have unmerged heads')),
1013 [('a', 'active', False, _('show only branches that have unmerged heads')),
1014 ('c', 'closed', False, _('show normal and closed branches'))],
1014 ('c', 'closed', False, _('show normal and closed branches'))],
1015 _('[-ac]'))
1015 _('[-ac]'))
1016 def branches(ui, repo, active=False, closed=False):
1016 def branches(ui, repo, active=False, closed=False):
1017 """list repository named branches
1017 """list repository named branches
1018
1018
1019 List the repository's named branches, indicating which ones are
1019 List the repository's named branches, indicating which ones are
1020 inactive. If -c/--closed is specified, also list branches which have
1020 inactive. If -c/--closed is specified, also list branches which have
1021 been marked closed (see :hg:`commit --close-branch`).
1021 been marked closed (see :hg:`commit --close-branch`).
1022
1022
1023 If -a/--active is specified, only show active branches. A branch
1023 If -a/--active is specified, only show active branches. A branch
1024 is considered active if it contains repository heads.
1024 is considered active if it contains repository heads.
1025
1025
1026 Use the command :hg:`update` to switch to an existing branch.
1026 Use the command :hg:`update` to switch to an existing branch.
1027
1027
1028 Returns 0.
1028 Returns 0.
1029 """
1029 """
1030
1030
1031 hexfunc = ui.debugflag and hex or short
1031 hexfunc = ui.debugflag and hex or short
1032
1032
1033 allheads = set(repo.heads())
1033 allheads = set(repo.heads())
1034 branches = []
1034 branches = []
1035 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1035 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1036 isactive = not isclosed and bool(set(heads) & allheads)
1036 isactive = not isclosed and bool(set(heads) & allheads)
1037 branches.append((tag, repo[tip], isactive, not isclosed))
1037 branches.append((tag, repo[tip], isactive, not isclosed))
1038 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1038 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1039 reverse=True)
1039 reverse=True)
1040
1040
1041 for tag, ctx, isactive, isopen in branches:
1041 for tag, ctx, isactive, isopen in branches:
1042 if (not active) or isactive:
1042 if (not active) or isactive:
1043 if isactive:
1043 if isactive:
1044 label = 'branches.active'
1044 label = 'branches.active'
1045 notice = ''
1045 notice = ''
1046 elif not isopen:
1046 elif not isopen:
1047 if not closed:
1047 if not closed:
1048 continue
1048 continue
1049 label = 'branches.closed'
1049 label = 'branches.closed'
1050 notice = _(' (closed)')
1050 notice = _(' (closed)')
1051 else:
1051 else:
1052 label = 'branches.inactive'
1052 label = 'branches.inactive'
1053 notice = _(' (inactive)')
1053 notice = _(' (inactive)')
1054 if tag == repo.dirstate.branch():
1054 if tag == repo.dirstate.branch():
1055 label = 'branches.current'
1055 label = 'branches.current'
1056 rev = str(ctx.rev()).rjust(31 - encoding.colwidth(tag))
1056 rev = str(ctx.rev()).rjust(31 - encoding.colwidth(tag))
1057 rev = ui.label('%s:%s' % (rev, hexfunc(ctx.node())),
1057 rev = ui.label('%s:%s' % (rev, hexfunc(ctx.node())),
1058 'log.changeset changeset.%s' % ctx.phasestr())
1058 'log.changeset changeset.%s' % ctx.phasestr())
1059 labeledtag = ui.label(tag, label)
1059 labeledtag = ui.label(tag, label)
1060 if ui.quiet:
1060 if ui.quiet:
1061 ui.write("%s\n" % labeledtag)
1061 ui.write("%s\n" % labeledtag)
1062 else:
1062 else:
1063 ui.write("%s %s%s\n" % (labeledtag, rev, notice))
1063 ui.write("%s %s%s\n" % (labeledtag, rev, notice))
1064
1064
1065 @command('bundle',
1065 @command('bundle',
1066 [('f', 'force', None, _('run even when the destination is unrelated')),
1066 [('f', 'force', None, _('run even when the destination is unrelated')),
1067 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1067 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1068 _('REV')),
1068 _('REV')),
1069 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1069 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1070 _('BRANCH')),
1070 _('BRANCH')),
1071 ('', 'base', [],
1071 ('', 'base', [],
1072 _('a base changeset assumed to be available at the destination'),
1072 _('a base changeset assumed to be available at the destination'),
1073 _('REV')),
1073 _('REV')),
1074 ('a', 'all', None, _('bundle all changesets in the repository')),
1074 ('a', 'all', None, _('bundle all changesets in the repository')),
1075 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1075 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1076 ] + remoteopts,
1076 ] + remoteopts,
1077 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1077 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1078 def bundle(ui, repo, fname, dest=None, **opts):
1078 def bundle(ui, repo, fname, dest=None, **opts):
1079 """create a changegroup file
1079 """create a changegroup file
1080
1080
1081 Generate a compressed changegroup file collecting changesets not
1081 Generate a compressed changegroup file collecting changesets not
1082 known to be in another repository.
1082 known to be in another repository.
1083
1083
1084 If you omit the destination repository, then hg assumes the
1084 If you omit the destination repository, then hg assumes the
1085 destination will have all the nodes you specify with --base
1085 destination will have all the nodes you specify with --base
1086 parameters. To create a bundle containing all changesets, use
1086 parameters. To create a bundle containing all changesets, use
1087 -a/--all (or --base null).
1087 -a/--all (or --base null).
1088
1088
1089 You can change compression method with the -t/--type option.
1089 You can change compression method with the -t/--type option.
1090 The available compression methods are: none, bzip2, and
1090 The available compression methods are: none, bzip2, and
1091 gzip (by default, bundles are compressed using bzip2).
1091 gzip (by default, bundles are compressed using bzip2).
1092
1092
1093 The bundle file can then be transferred using conventional means
1093 The bundle file can then be transferred using conventional means
1094 and applied to another repository with the unbundle or pull
1094 and applied to another repository with the unbundle or pull
1095 command. This is useful when direct push and pull are not
1095 command. This is useful when direct push and pull are not
1096 available or when exporting an entire repository is undesirable.
1096 available or when exporting an entire repository is undesirable.
1097
1097
1098 Applying bundles preserves all changeset contents including
1098 Applying bundles preserves all changeset contents including
1099 permissions, copy/rename information, and revision history.
1099 permissions, copy/rename information, and revision history.
1100
1100
1101 Returns 0 on success, 1 if no changes found.
1101 Returns 0 on success, 1 if no changes found.
1102 """
1102 """
1103 revs = None
1103 revs = None
1104 if 'rev' in opts:
1104 if 'rev' in opts:
1105 revs = scmutil.revrange(repo, opts['rev'])
1105 revs = scmutil.revrange(repo, opts['rev'])
1106
1106
1107 bundletype = opts.get('type', 'bzip2').lower()
1107 bundletype = opts.get('type', 'bzip2').lower()
1108 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1108 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1109 bundletype = btypes.get(bundletype)
1109 bundletype = btypes.get(bundletype)
1110 if bundletype not in changegroup.bundletypes:
1110 if bundletype not in changegroup.bundletypes:
1111 raise util.Abort(_('unknown bundle type specified with --type'))
1111 raise util.Abort(_('unknown bundle type specified with --type'))
1112
1112
1113 if opts.get('all'):
1113 if opts.get('all'):
1114 base = ['null']
1114 base = ['null']
1115 else:
1115 else:
1116 base = scmutil.revrange(repo, opts.get('base'))
1116 base = scmutil.revrange(repo, opts.get('base'))
1117 # TODO: get desired bundlecaps from command line.
1117 # TODO: get desired bundlecaps from command line.
1118 bundlecaps = None
1118 bundlecaps = None
1119 if base:
1119 if base:
1120 if dest:
1120 if dest:
1121 raise util.Abort(_("--base is incompatible with specifying "
1121 raise util.Abort(_("--base is incompatible with specifying "
1122 "a destination"))
1122 "a destination"))
1123 common = [repo.lookup(rev) for rev in base]
1123 common = [repo.lookup(rev) for rev in base]
1124 heads = revs and map(repo.lookup, revs) or revs
1124 heads = revs and map(repo.lookup, revs) or revs
1125 cg = repo.getbundle('bundle', heads=heads, common=common,
1125 cg = repo.getbundle('bundle', heads=heads, common=common,
1126 bundlecaps=bundlecaps)
1126 bundlecaps=bundlecaps)
1127 outgoing = None
1127 outgoing = None
1128 else:
1128 else:
1129 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1129 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1130 dest, branches = hg.parseurl(dest, opts.get('branch'))
1130 dest, branches = hg.parseurl(dest, opts.get('branch'))
1131 other = hg.peer(repo, opts, dest)
1131 other = hg.peer(repo, opts, dest)
1132 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1132 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1133 heads = revs and map(repo.lookup, revs) or revs
1133 heads = revs and map(repo.lookup, revs) or revs
1134 outgoing = discovery.findcommonoutgoing(repo, other,
1134 outgoing = discovery.findcommonoutgoing(repo, other,
1135 onlyheads=heads,
1135 onlyheads=heads,
1136 force=opts.get('force'),
1136 force=opts.get('force'),
1137 portable=True)
1137 portable=True)
1138 cg = repo.getlocalbundle('bundle', outgoing, bundlecaps)
1138 cg = repo.getlocalbundle('bundle', outgoing, bundlecaps)
1139 if not cg:
1139 if not cg:
1140 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1140 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1141 return 1
1141 return 1
1142
1142
1143 changegroup.writebundle(cg, fname, bundletype)
1143 changegroup.writebundle(cg, fname, bundletype)
1144
1144
1145 @command('cat',
1145 @command('cat',
1146 [('o', 'output', '',
1146 [('o', 'output', '',
1147 _('print output to file with formatted name'), _('FORMAT')),
1147 _('print output to file with formatted name'), _('FORMAT')),
1148 ('r', 'rev', '', _('print the given revision'), _('REV')),
1148 ('r', 'rev', '', _('print the given revision'), _('REV')),
1149 ('', 'decode', None, _('apply any matching decode filter')),
1149 ('', 'decode', None, _('apply any matching decode filter')),
1150 ] + walkopts,
1150 ] + walkopts,
1151 _('[OPTION]... FILE...'))
1151 _('[OPTION]... FILE...'))
1152 def cat(ui, repo, file1, *pats, **opts):
1152 def cat(ui, repo, file1, *pats, **opts):
1153 """output the current or given revision of files
1153 """output the current or given revision of files
1154
1154
1155 Print the specified files as they were at the given revision. If
1155 Print the specified files as they were at the given revision. If
1156 no revision is given, the parent of the working directory is used.
1156 no revision is given, the parent of the working directory is used.
1157
1157
1158 Output may be to a file, in which case the name of the file is
1158 Output may be to a file, in which case the name of the file is
1159 given using a format string. The formatting rules are the same as
1159 given using a format string. The formatting rules are the same as
1160 for the export command, with the following additions:
1160 for the export command, with the following additions:
1161
1161
1162 :``%s``: basename of file being printed
1162 :``%s``: basename of file being printed
1163 :``%d``: dirname of file being printed, or '.' if in repository root
1163 :``%d``: dirname of file being printed, or '.' if in repository root
1164 :``%p``: root-relative path name of file being printed
1164 :``%p``: root-relative path name of file being printed
1165
1165
1166 Returns 0 on success.
1166 Returns 0 on success.
1167 """
1167 """
1168 ctx = scmutil.revsingle(repo, opts.get('rev'))
1168 ctx = scmutil.revsingle(repo, opts.get('rev'))
1169 err = 1
1169 err = 1
1170 m = scmutil.match(ctx, (file1,) + pats, opts)
1170 m = scmutil.match(ctx, (file1,) + pats, opts)
1171
1171
1172 def write(path):
1172 def write(path):
1173 fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(),
1173 fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(),
1174 pathname=path)
1174 pathname=path)
1175 data = ctx[path].data()
1175 data = ctx[path].data()
1176 if opts.get('decode'):
1176 if opts.get('decode'):
1177 data = repo.wwritedata(path, data)
1177 data = repo.wwritedata(path, data)
1178 fp.write(data)
1178 fp.write(data)
1179 fp.close()
1179 fp.close()
1180
1180
1181 # Automation often uses hg cat on single files, so special case it
1181 # Automation often uses hg cat on single files, so special case it
1182 # for performance to avoid the cost of parsing the manifest.
1182 # for performance to avoid the cost of parsing the manifest.
1183 if len(m.files()) == 1 and not m.anypats():
1183 if len(m.files()) == 1 and not m.anypats():
1184 file = m.files()[0]
1184 file = m.files()[0]
1185 mf = repo.manifest
1185 mf = repo.manifest
1186 mfnode = ctx._changeset[0]
1186 mfnode = ctx._changeset[0]
1187 if mf.find(mfnode, file)[0]:
1187 if mf.find(mfnode, file)[0]:
1188 write(file)
1188 write(file)
1189 return 0
1189 return 0
1190
1190
1191 for abs in ctx.walk(m):
1191 for abs in ctx.walk(m):
1192 write(abs)
1192 write(abs)
1193 err = 0
1193 err = 0
1194 return err
1194 return err
1195
1195
1196 @command('^clone',
1196 @command('^clone',
1197 [('U', 'noupdate', None,
1197 [('U', 'noupdate', None,
1198 _('the clone will include an empty working copy (only a repository)')),
1198 _('the clone will include an empty working copy (only a repository)')),
1199 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
1199 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
1200 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1200 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1201 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1201 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1202 ('', 'pull', None, _('use pull protocol to copy metadata')),
1202 ('', 'pull', None, _('use pull protocol to copy metadata')),
1203 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1203 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1204 ] + remoteopts,
1204 ] + remoteopts,
1205 _('[OPTION]... SOURCE [DEST]'))
1205 _('[OPTION]... SOURCE [DEST]'))
1206 def clone(ui, source, dest=None, **opts):
1206 def clone(ui, source, dest=None, **opts):
1207 """make a copy of an existing repository
1207 """make a copy of an existing repository
1208
1208
1209 Create a copy of an existing repository in a new directory.
1209 Create a copy of an existing repository in a new directory.
1210
1210
1211 If no destination directory name is specified, it defaults to the
1211 If no destination directory name is specified, it defaults to the
1212 basename of the source.
1212 basename of the source.
1213
1213
1214 The location of the source is added to the new repository's
1214 The location of the source is added to the new repository's
1215 ``.hg/hgrc`` file, as the default to be used for future pulls.
1215 ``.hg/hgrc`` file, as the default to be used for future pulls.
1216
1216
1217 Only local paths and ``ssh://`` URLs are supported as
1217 Only local paths and ``ssh://`` URLs are supported as
1218 destinations. For ``ssh://`` destinations, no working directory or
1218 destinations. For ``ssh://`` destinations, no working directory or
1219 ``.hg/hgrc`` will be created on the remote side.
1219 ``.hg/hgrc`` will be created on the remote side.
1220
1220
1221 To pull only a subset of changesets, specify one or more revisions
1221 To pull only a subset of changesets, specify one or more revisions
1222 identifiers with -r/--rev or branches with -b/--branch. The
1222 identifiers with -r/--rev or branches with -b/--branch. The
1223 resulting clone will contain only the specified changesets and
1223 resulting clone will contain only the specified changesets and
1224 their ancestors. These options (or 'clone src#rev dest') imply
1224 their ancestors. These options (or 'clone src#rev dest') imply
1225 --pull, even for local source repositories. Note that specifying a
1225 --pull, even for local source repositories. Note that specifying a
1226 tag will include the tagged changeset but not the changeset
1226 tag will include the tagged changeset but not the changeset
1227 containing the tag.
1227 containing the tag.
1228
1228
1229 If the source repository has a bookmark called '@' set, that
1229 If the source repository has a bookmark called '@' set, that
1230 revision will be checked out in the new repository by default.
1230 revision will be checked out in the new repository by default.
1231
1231
1232 To check out a particular version, use -u/--update, or
1232 To check out a particular version, use -u/--update, or
1233 -U/--noupdate to create a clone with no working directory.
1233 -U/--noupdate to create a clone with no working directory.
1234
1234
1235 .. container:: verbose
1235 .. container:: verbose
1236
1236
1237 For efficiency, hardlinks are used for cloning whenever the
1237 For efficiency, hardlinks are used for cloning whenever the
1238 source and destination are on the same filesystem (note this
1238 source and destination are on the same filesystem (note this
1239 applies only to the repository data, not to the working
1239 applies only to the repository data, not to the working
1240 directory). Some filesystems, such as AFS, implement hardlinking
1240 directory). Some filesystems, such as AFS, implement hardlinking
1241 incorrectly, but do not report errors. In these cases, use the
1241 incorrectly, but do not report errors. In these cases, use the
1242 --pull option to avoid hardlinking.
1242 --pull option to avoid hardlinking.
1243
1243
1244 In some cases, you can clone repositories and the working
1244 In some cases, you can clone repositories and the working
1245 directory using full hardlinks with ::
1245 directory using full hardlinks with ::
1246
1246
1247 $ cp -al REPO REPOCLONE
1247 $ cp -al REPO REPOCLONE
1248
1248
1249 This is the fastest way to clone, but it is not always safe. The
1249 This is the fastest way to clone, but it is not always safe. The
1250 operation is not atomic (making sure REPO is not modified during
1250 operation is not atomic (making sure REPO is not modified during
1251 the operation is up to you) and you have to make sure your
1251 the operation is up to you) and you have to make sure your
1252 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1252 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1253 so). Also, this is not compatible with certain extensions that
1253 so). Also, this is not compatible with certain extensions that
1254 place their metadata under the .hg directory, such as mq.
1254 place their metadata under the .hg directory, such as mq.
1255
1255
1256 Mercurial will update the working directory to the first applicable
1256 Mercurial will update the working directory to the first applicable
1257 revision from this list:
1257 revision from this list:
1258
1258
1259 a) null if -U or the source repository has no changesets
1259 a) null if -U or the source repository has no changesets
1260 b) if -u . and the source repository is local, the first parent of
1260 b) if -u . and the source repository is local, the first parent of
1261 the source repository's working directory
1261 the source repository's working directory
1262 c) the changeset specified with -u (if a branch name, this means the
1262 c) the changeset specified with -u (if a branch name, this means the
1263 latest head of that branch)
1263 latest head of that branch)
1264 d) the changeset specified with -r
1264 d) the changeset specified with -r
1265 e) the tipmost head specified with -b
1265 e) the tipmost head specified with -b
1266 f) the tipmost head specified with the url#branch source syntax
1266 f) the tipmost head specified with the url#branch source syntax
1267 g) the revision marked with the '@' bookmark, if present
1267 g) the revision marked with the '@' bookmark, if present
1268 h) the tipmost head of the default branch
1268 h) the tipmost head of the default branch
1269 i) tip
1269 i) tip
1270
1270
1271 Examples:
1271 Examples:
1272
1272
1273 - clone a remote repository to a new directory named hg/::
1273 - clone a remote repository to a new directory named hg/::
1274
1274
1275 hg clone http://selenic.com/hg
1275 hg clone http://selenic.com/hg
1276
1276
1277 - create a lightweight local clone::
1277 - create a lightweight local clone::
1278
1278
1279 hg clone project/ project-feature/
1279 hg clone project/ project-feature/
1280
1280
1281 - clone from an absolute path on an ssh server (note double-slash)::
1281 - clone from an absolute path on an ssh server (note double-slash)::
1282
1282
1283 hg clone ssh://user@server//home/projects/alpha/
1283 hg clone ssh://user@server//home/projects/alpha/
1284
1284
1285 - do a high-speed clone over a LAN while checking out a
1285 - do a high-speed clone over a LAN while checking out a
1286 specified version::
1286 specified version::
1287
1287
1288 hg clone --uncompressed http://server/repo -u 1.5
1288 hg clone --uncompressed http://server/repo -u 1.5
1289
1289
1290 - create a repository without changesets after a particular revision::
1290 - create a repository without changesets after a particular revision::
1291
1291
1292 hg clone -r 04e544 experimental/ good/
1292 hg clone -r 04e544 experimental/ good/
1293
1293
1294 - clone (and track) a particular named branch::
1294 - clone (and track) a particular named branch::
1295
1295
1296 hg clone http://selenic.com/hg#stable
1296 hg clone http://selenic.com/hg#stable
1297
1297
1298 See :hg:`help urls` for details on specifying URLs.
1298 See :hg:`help urls` for details on specifying URLs.
1299
1299
1300 Returns 0 on success.
1300 Returns 0 on success.
1301 """
1301 """
1302 if opts.get('noupdate') and opts.get('updaterev'):
1302 if opts.get('noupdate') and opts.get('updaterev'):
1303 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
1303 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
1304
1304
1305 r = hg.clone(ui, opts, source, dest,
1305 r = hg.clone(ui, opts, source, dest,
1306 pull=opts.get('pull'),
1306 pull=opts.get('pull'),
1307 stream=opts.get('uncompressed'),
1307 stream=opts.get('uncompressed'),
1308 rev=opts.get('rev'),
1308 rev=opts.get('rev'),
1309 update=opts.get('updaterev') or not opts.get('noupdate'),
1309 update=opts.get('updaterev') or not opts.get('noupdate'),
1310 branch=opts.get('branch'))
1310 branch=opts.get('branch'))
1311
1311
1312 return r is None
1312 return r is None
1313
1313
1314 @command('^commit|ci',
1314 @command('^commit|ci',
1315 [('A', 'addremove', None,
1315 [('A', 'addremove', None,
1316 _('mark new/missing files as added/removed before committing')),
1316 _('mark new/missing files as added/removed before committing')),
1317 ('', 'close-branch', None,
1317 ('', 'close-branch', None,
1318 _('mark a branch as closed, hiding it from the branch list')),
1318 _('mark a branch as closed, hiding it from the branch list')),
1319 ('', 'amend', None, _('amend the parent of the working dir')),
1319 ('', 'amend', None, _('amend the parent of the working dir')),
1320 ('s', 'secret', None, _('use the secret phase for committing')),
1320 ('s', 'secret', None, _('use the secret phase for committing')),
1321 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1321 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1322 _('[OPTION]... [FILE]...'))
1322 _('[OPTION]... [FILE]...'))
1323 def commit(ui, repo, *pats, **opts):
1323 def commit(ui, repo, *pats, **opts):
1324 """commit the specified files or all outstanding changes
1324 """commit the specified files or all outstanding changes
1325
1325
1326 Commit changes to the given files into the repository. Unlike a
1326 Commit changes to the given files into the repository. Unlike a
1327 centralized SCM, this operation is a local operation. See
1327 centralized SCM, this operation is a local operation. See
1328 :hg:`push` for a way to actively distribute your changes.
1328 :hg:`push` for a way to actively distribute your changes.
1329
1329
1330 If a list of files is omitted, all changes reported by :hg:`status`
1330 If a list of files is omitted, all changes reported by :hg:`status`
1331 will be committed.
1331 will be committed.
1332
1332
1333 If you are committing the result of a merge, do not provide any
1333 If you are committing the result of a merge, do not provide any
1334 filenames or -I/-X filters.
1334 filenames or -I/-X filters.
1335
1335
1336 If no commit message is specified, Mercurial starts your
1336 If no commit message is specified, Mercurial starts your
1337 configured editor where you can enter a message. In case your
1337 configured editor where you can enter a message. In case your
1338 commit fails, you will find a backup of your message in
1338 commit fails, you will find a backup of your message in
1339 ``.hg/last-message.txt``.
1339 ``.hg/last-message.txt``.
1340
1340
1341 The --amend flag can be used to amend the parent of the
1341 The --amend flag can be used to amend the parent of the
1342 working directory with a new commit that contains the changes
1342 working directory with a new commit that contains the changes
1343 in the parent in addition to those currently reported by :hg:`status`,
1343 in the parent in addition to those currently reported by :hg:`status`,
1344 if there are any. The old commit is stored in a backup bundle in
1344 if there are any. The old commit is stored in a backup bundle in
1345 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1345 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1346 on how to restore it).
1346 on how to restore it).
1347
1347
1348 Message, user and date are taken from the amended commit unless
1348 Message, user and date are taken from the amended commit unless
1349 specified. When a message isn't specified on the command line,
1349 specified. When a message isn't specified on the command line,
1350 the editor will open with the message of the amended commit.
1350 the editor will open with the message of the amended commit.
1351
1351
1352 It is not possible to amend public changesets (see :hg:`help phases`)
1352 It is not possible to amend public changesets (see :hg:`help phases`)
1353 or changesets that have children.
1353 or changesets that have children.
1354
1354
1355 See :hg:`help dates` for a list of formats valid for -d/--date.
1355 See :hg:`help dates` for a list of formats valid for -d/--date.
1356
1356
1357 Returns 0 on success, 1 if nothing changed.
1357 Returns 0 on success, 1 if nothing changed.
1358 """
1358 """
1359 if opts.get('subrepos'):
1359 if opts.get('subrepos'):
1360 if opts.get('amend'):
1360 if opts.get('amend'):
1361 raise util.Abort(_('cannot amend with --subrepos'))
1361 raise util.Abort(_('cannot amend with --subrepos'))
1362 # Let --subrepos on the command line override config setting.
1362 # Let --subrepos on the command line override config setting.
1363 ui.setconfig('ui', 'commitsubrepos', True)
1363 ui.setconfig('ui', 'commitsubrepos', True)
1364
1364
1365 # Save this for restoring it later
1365 # Save this for restoring it later
1366 oldcommitphase = ui.config('phases', 'new-commit')
1366 oldcommitphase = ui.config('phases', 'new-commit')
1367
1367
1368 cmdutil.checkunfinished(repo, commit=True)
1368 cmdutil.checkunfinished(repo, commit=True)
1369
1369
1370 branch = repo[None].branch()
1370 branch = repo[None].branch()
1371 bheads = repo.branchheads(branch)
1371 bheads = repo.branchheads(branch)
1372
1372
1373 extra = {}
1373 extra = {}
1374 if opts.get('close_branch'):
1374 if opts.get('close_branch'):
1375 extra['close'] = 1
1375 extra['close'] = 1
1376
1376
1377 if not bheads:
1377 if not bheads:
1378 raise util.Abort(_('can only close branch heads'))
1378 raise util.Abort(_('can only close branch heads'))
1379 elif opts.get('amend'):
1379 elif opts.get('amend'):
1380 if repo.parents()[0].p1().branch() != branch and \
1380 if repo.parents()[0].p1().branch() != branch and \
1381 repo.parents()[0].p2().branch() != branch:
1381 repo.parents()[0].p2().branch() != branch:
1382 raise util.Abort(_('can only close branch heads'))
1382 raise util.Abort(_('can only close branch heads'))
1383
1383
1384 if opts.get('amend'):
1384 if opts.get('amend'):
1385 if ui.configbool('ui', 'commitsubrepos'):
1385 if ui.configbool('ui', 'commitsubrepos'):
1386 raise util.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1386 raise util.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1387
1387
1388 old = repo['.']
1388 old = repo['.']
1389 if old.phase() == phases.public:
1389 if old.phase() == phases.public:
1390 raise util.Abort(_('cannot amend public changesets'))
1390 raise util.Abort(_('cannot amend public changesets'))
1391 if len(repo[None].parents()) > 1:
1391 if len(repo[None].parents()) > 1:
1392 raise util.Abort(_('cannot amend while merging'))
1392 raise util.Abort(_('cannot amend while merging'))
1393 if (not obsolete._enabled) and old.children():
1393 if (not obsolete._enabled) and old.children():
1394 raise util.Abort(_('cannot amend changeset with children'))
1394 raise util.Abort(_('cannot amend changeset with children'))
1395
1395
1396 e = cmdutil.commiteditor
1396 e = cmdutil.commiteditor
1397 if opts.get('force_editor'):
1397 if opts.get('force_editor'):
1398 e = cmdutil.commitforceeditor
1398 e = cmdutil.commitforceeditor
1399
1399
1400 def commitfunc(ui, repo, message, match, opts):
1400 def commitfunc(ui, repo, message, match, opts):
1401 editor = e
1401 editor = e
1402 # message contains text from -m or -l, if it's empty,
1402 # message contains text from -m or -l, if it's empty,
1403 # open the editor with the old message
1403 # open the editor with the old message
1404 if not message:
1404 if not message:
1405 message = old.description()
1405 message = old.description()
1406 editor = cmdutil.commitforceeditor
1406 editor = cmdutil.commitforceeditor
1407 try:
1407 try:
1408 if opts.get('secret'):
1408 if opts.get('secret'):
1409 ui.setconfig('phases', 'new-commit', 'secret')
1409 ui.setconfig('phases', 'new-commit', 'secret')
1410
1410
1411 return repo.commit(message,
1411 return repo.commit(message,
1412 opts.get('user') or old.user(),
1412 opts.get('user') or old.user(),
1413 opts.get('date') or old.date(),
1413 opts.get('date') or old.date(),
1414 match,
1414 match,
1415 editor=editor,
1415 editor=editor,
1416 extra=extra)
1416 extra=extra)
1417 finally:
1417 finally:
1418 ui.setconfig('phases', 'new-commit', oldcommitphase)
1418 ui.setconfig('phases', 'new-commit', oldcommitphase)
1419
1419
1420 current = repo._bookmarkcurrent
1420 current = repo._bookmarkcurrent
1421 marks = old.bookmarks()
1421 marks = old.bookmarks()
1422 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1422 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1423 if node == old.node():
1423 if node == old.node():
1424 ui.status(_("nothing changed\n"))
1424 ui.status(_("nothing changed\n"))
1425 return 1
1425 return 1
1426 elif marks:
1426 elif marks:
1427 ui.debug('moving bookmarks %r from %s to %s\n' %
1427 ui.debug('moving bookmarks %r from %s to %s\n' %
1428 (marks, old.hex(), hex(node)))
1428 (marks, old.hex(), hex(node)))
1429 newmarks = repo._bookmarks
1429 newmarks = repo._bookmarks
1430 for bm in marks:
1430 for bm in marks:
1431 newmarks[bm] = node
1431 newmarks[bm] = node
1432 if bm == current:
1432 if bm == current:
1433 bookmarks.setcurrent(repo, bm)
1433 bookmarks.setcurrent(repo, bm)
1434 newmarks.write()
1434 newmarks.write()
1435 else:
1435 else:
1436 e = cmdutil.commiteditor
1436 e = cmdutil.commiteditor
1437 if opts.get('force_editor'):
1437 if opts.get('force_editor'):
1438 e = cmdutil.commitforceeditor
1438 e = cmdutil.commitforceeditor
1439
1439
1440 def commitfunc(ui, repo, message, match, opts):
1440 def commitfunc(ui, repo, message, match, opts):
1441 try:
1441 try:
1442 if opts.get('secret'):
1442 if opts.get('secret'):
1443 ui.setconfig('phases', 'new-commit', 'secret')
1443 ui.setconfig('phases', 'new-commit', 'secret')
1444
1444
1445 return repo.commit(message, opts.get('user'), opts.get('date'),
1445 return repo.commit(message, opts.get('user'), opts.get('date'),
1446 match, editor=e, extra=extra)
1446 match, editor=e, extra=extra)
1447 finally:
1447 finally:
1448 ui.setconfig('phases', 'new-commit', oldcommitphase)
1448 ui.setconfig('phases', 'new-commit', oldcommitphase)
1449
1449
1450
1450
1451 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1451 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1452
1452
1453 if not node:
1453 if not node:
1454 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1454 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1455 if stat[3]:
1455 if stat[3]:
1456 ui.status(_("nothing changed (%d missing files, see "
1456 ui.status(_("nothing changed (%d missing files, see "
1457 "'hg status')\n") % len(stat[3]))
1457 "'hg status')\n") % len(stat[3]))
1458 else:
1458 else:
1459 ui.status(_("nothing changed\n"))
1459 ui.status(_("nothing changed\n"))
1460 return 1
1460 return 1
1461
1461
1462 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1462 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1463
1463
1464 @command('copy|cp',
1464 @command('copy|cp',
1465 [('A', 'after', None, _('record a copy that has already occurred')),
1465 [('A', 'after', None, _('record a copy that has already occurred')),
1466 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1466 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1467 ] + walkopts + dryrunopts,
1467 ] + walkopts + dryrunopts,
1468 _('[OPTION]... [SOURCE]... DEST'))
1468 _('[OPTION]... [SOURCE]... DEST'))
1469 def copy(ui, repo, *pats, **opts):
1469 def copy(ui, repo, *pats, **opts):
1470 """mark files as copied for the next commit
1470 """mark files as copied for the next commit
1471
1471
1472 Mark dest as having copies of source files. If dest is a
1472 Mark dest as having copies of source files. If dest is a
1473 directory, copies are put in that directory. If dest is a file,
1473 directory, copies are put in that directory. If dest is a file,
1474 the source must be a single file.
1474 the source must be a single file.
1475
1475
1476 By default, this command copies the contents of files as they
1476 By default, this command copies the contents of files as they
1477 exist in the working directory. If invoked with -A/--after, the
1477 exist in the working directory. If invoked with -A/--after, the
1478 operation is recorded, but no copying is performed.
1478 operation is recorded, but no copying is performed.
1479
1479
1480 This command takes effect with the next commit. To undo a copy
1480 This command takes effect with the next commit. To undo a copy
1481 before that, see :hg:`revert`.
1481 before that, see :hg:`revert`.
1482
1482
1483 Returns 0 on success, 1 if errors are encountered.
1483 Returns 0 on success, 1 if errors are encountered.
1484 """
1484 """
1485 wlock = repo.wlock(False)
1485 wlock = repo.wlock(False)
1486 try:
1486 try:
1487 return cmdutil.copy(ui, repo, pats, opts)
1487 return cmdutil.copy(ui, repo, pats, opts)
1488 finally:
1488 finally:
1489 wlock.release()
1489 wlock.release()
1490
1490
1491 @command('debugancestor', [], _('[INDEX] REV1 REV2'))
1491 @command('debugancestor', [], _('[INDEX] REV1 REV2'))
1492 def debugancestor(ui, repo, *args):
1492 def debugancestor(ui, repo, *args):
1493 """find the ancestor revision of two revisions in a given index"""
1493 """find the ancestor revision of two revisions in a given index"""
1494 if len(args) == 3:
1494 if len(args) == 3:
1495 index, rev1, rev2 = args
1495 index, rev1, rev2 = args
1496 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1496 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1497 lookup = r.lookup
1497 lookup = r.lookup
1498 elif len(args) == 2:
1498 elif len(args) == 2:
1499 if not repo:
1499 if not repo:
1500 raise util.Abort(_("there is no Mercurial repository here "
1500 raise util.Abort(_("there is no Mercurial repository here "
1501 "(.hg not found)"))
1501 "(.hg not found)"))
1502 rev1, rev2 = args
1502 rev1, rev2 = args
1503 r = repo.changelog
1503 r = repo.changelog
1504 lookup = repo.lookup
1504 lookup = repo.lookup
1505 else:
1505 else:
1506 raise util.Abort(_('either two or three arguments required'))
1506 raise util.Abort(_('either two or three arguments required'))
1507 a = r.ancestor(lookup(rev1), lookup(rev2))
1507 a = r.ancestor(lookup(rev1), lookup(rev2))
1508 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1508 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1509
1509
1510 @command('debugbuilddag',
1510 @command('debugbuilddag',
1511 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1511 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1512 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1512 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1513 ('n', 'new-file', None, _('add new file at each rev'))],
1513 ('n', 'new-file', None, _('add new file at each rev'))],
1514 _('[OPTION]... [TEXT]'))
1514 _('[OPTION]... [TEXT]'))
1515 def debugbuilddag(ui, repo, text=None,
1515 def debugbuilddag(ui, repo, text=None,
1516 mergeable_file=False,
1516 mergeable_file=False,
1517 overwritten_file=False,
1517 overwritten_file=False,
1518 new_file=False):
1518 new_file=False):
1519 """builds a repo with a given DAG from scratch in the current empty repo
1519 """builds a repo with a given DAG from scratch in the current empty repo
1520
1520
1521 The description of the DAG is read from stdin if not given on the
1521 The description of the DAG is read from stdin if not given on the
1522 command line.
1522 command line.
1523
1523
1524 Elements:
1524 Elements:
1525
1525
1526 - "+n" is a linear run of n nodes based on the current default parent
1526 - "+n" is a linear run of n nodes based on the current default parent
1527 - "." is a single node based on the current default parent
1527 - "." is a single node based on the current default parent
1528 - "$" resets the default parent to null (implied at the start);
1528 - "$" resets the default parent to null (implied at the start);
1529 otherwise the default parent is always the last node created
1529 otherwise the default parent is always the last node created
1530 - "<p" sets the default parent to the backref p
1530 - "<p" sets the default parent to the backref p
1531 - "*p" is a fork at parent p, which is a backref
1531 - "*p" is a fork at parent p, which is a backref
1532 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1532 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1533 - "/p2" is a merge of the preceding node and p2
1533 - "/p2" is a merge of the preceding node and p2
1534 - ":tag" defines a local tag for the preceding node
1534 - ":tag" defines a local tag for the preceding node
1535 - "@branch" sets the named branch for subsequent nodes
1535 - "@branch" sets the named branch for subsequent nodes
1536 - "#...\\n" is a comment up to the end of the line
1536 - "#...\\n" is a comment up to the end of the line
1537
1537
1538 Whitespace between the above elements is ignored.
1538 Whitespace between the above elements is ignored.
1539
1539
1540 A backref is either
1540 A backref is either
1541
1541
1542 - a number n, which references the node curr-n, where curr is the current
1542 - a number n, which references the node curr-n, where curr is the current
1543 node, or
1543 node, or
1544 - the name of a local tag you placed earlier using ":tag", or
1544 - the name of a local tag you placed earlier using ":tag", or
1545 - empty to denote the default parent.
1545 - empty to denote the default parent.
1546
1546
1547 All string valued-elements are either strictly alphanumeric, or must
1547 All string valued-elements are either strictly alphanumeric, or must
1548 be enclosed in double quotes ("..."), with "\\" as escape character.
1548 be enclosed in double quotes ("..."), with "\\" as escape character.
1549 """
1549 """
1550
1550
1551 if text is None:
1551 if text is None:
1552 ui.status(_("reading DAG from stdin\n"))
1552 ui.status(_("reading DAG from stdin\n"))
1553 text = ui.fin.read()
1553 text = ui.fin.read()
1554
1554
1555 cl = repo.changelog
1555 cl = repo.changelog
1556 if len(cl) > 0:
1556 if len(cl) > 0:
1557 raise util.Abort(_('repository is not empty'))
1557 raise util.Abort(_('repository is not empty'))
1558
1558
1559 # determine number of revs in DAG
1559 # determine number of revs in DAG
1560 total = 0
1560 total = 0
1561 for type, data in dagparser.parsedag(text):
1561 for type, data in dagparser.parsedag(text):
1562 if type == 'n':
1562 if type == 'n':
1563 total += 1
1563 total += 1
1564
1564
1565 if mergeable_file:
1565 if mergeable_file:
1566 linesperrev = 2
1566 linesperrev = 2
1567 # make a file with k lines per rev
1567 # make a file with k lines per rev
1568 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1568 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1569 initialmergedlines.append("")
1569 initialmergedlines.append("")
1570
1570
1571 tags = []
1571 tags = []
1572
1572
1573 lock = tr = None
1573 lock = tr = None
1574 try:
1574 try:
1575 lock = repo.lock()
1575 lock = repo.lock()
1576 tr = repo.transaction("builddag")
1576 tr = repo.transaction("builddag")
1577
1577
1578 at = -1
1578 at = -1
1579 atbranch = 'default'
1579 atbranch = 'default'
1580 nodeids = []
1580 nodeids = []
1581 id = 0
1581 id = 0
1582 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1582 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1583 for type, data in dagparser.parsedag(text):
1583 for type, data in dagparser.parsedag(text):
1584 if type == 'n':
1584 if type == 'n':
1585 ui.note(('node %s\n' % str(data)))
1585 ui.note(('node %s\n' % str(data)))
1586 id, ps = data
1586 id, ps = data
1587
1587
1588 files = []
1588 files = []
1589 fctxs = {}
1589 fctxs = {}
1590
1590
1591 p2 = None
1591 p2 = None
1592 if mergeable_file:
1592 if mergeable_file:
1593 fn = "mf"
1593 fn = "mf"
1594 p1 = repo[ps[0]]
1594 p1 = repo[ps[0]]
1595 if len(ps) > 1:
1595 if len(ps) > 1:
1596 p2 = repo[ps[1]]
1596 p2 = repo[ps[1]]
1597 pa = p1.ancestor(p2)
1597 pa = p1.ancestor(p2)
1598 base, local, other = [x[fn].data() for x in (pa, p1,
1598 base, local, other = [x[fn].data() for x in (pa, p1,
1599 p2)]
1599 p2)]
1600 m3 = simplemerge.Merge3Text(base, local, other)
1600 m3 = simplemerge.Merge3Text(base, local, other)
1601 ml = [l.strip() for l in m3.merge_lines()]
1601 ml = [l.strip() for l in m3.merge_lines()]
1602 ml.append("")
1602 ml.append("")
1603 elif at > 0:
1603 elif at > 0:
1604 ml = p1[fn].data().split("\n")
1604 ml = p1[fn].data().split("\n")
1605 else:
1605 else:
1606 ml = initialmergedlines
1606 ml = initialmergedlines
1607 ml[id * linesperrev] += " r%i" % id
1607 ml[id * linesperrev] += " r%i" % id
1608 mergedtext = "\n".join(ml)
1608 mergedtext = "\n".join(ml)
1609 files.append(fn)
1609 files.append(fn)
1610 fctxs[fn] = context.memfilectx(fn, mergedtext)
1610 fctxs[fn] = context.memfilectx(fn, mergedtext)
1611
1611
1612 if overwritten_file:
1612 if overwritten_file:
1613 fn = "of"
1613 fn = "of"
1614 files.append(fn)
1614 files.append(fn)
1615 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1615 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1616
1616
1617 if new_file:
1617 if new_file:
1618 fn = "nf%i" % id
1618 fn = "nf%i" % id
1619 files.append(fn)
1619 files.append(fn)
1620 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1620 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1621 if len(ps) > 1:
1621 if len(ps) > 1:
1622 if not p2:
1622 if not p2:
1623 p2 = repo[ps[1]]
1623 p2 = repo[ps[1]]
1624 for fn in p2:
1624 for fn in p2:
1625 if fn.startswith("nf"):
1625 if fn.startswith("nf"):
1626 files.append(fn)
1626 files.append(fn)
1627 fctxs[fn] = p2[fn]
1627 fctxs[fn] = p2[fn]
1628
1628
1629 def fctxfn(repo, cx, path):
1629 def fctxfn(repo, cx, path):
1630 return fctxs.get(path)
1630 return fctxs.get(path)
1631
1631
1632 if len(ps) == 0 or ps[0] < 0:
1632 if len(ps) == 0 or ps[0] < 0:
1633 pars = [None, None]
1633 pars = [None, None]
1634 elif len(ps) == 1:
1634 elif len(ps) == 1:
1635 pars = [nodeids[ps[0]], None]
1635 pars = [nodeids[ps[0]], None]
1636 else:
1636 else:
1637 pars = [nodeids[p] for p in ps]
1637 pars = [nodeids[p] for p in ps]
1638 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1638 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1639 date=(id, 0),
1639 date=(id, 0),
1640 user="debugbuilddag",
1640 user="debugbuilddag",
1641 extra={'branch': atbranch})
1641 extra={'branch': atbranch})
1642 nodeid = repo.commitctx(cx)
1642 nodeid = repo.commitctx(cx)
1643 nodeids.append(nodeid)
1643 nodeids.append(nodeid)
1644 at = id
1644 at = id
1645 elif type == 'l':
1645 elif type == 'l':
1646 id, name = data
1646 id, name = data
1647 ui.note(('tag %s\n' % name))
1647 ui.note(('tag %s\n' % name))
1648 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1648 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1649 elif type == 'a':
1649 elif type == 'a':
1650 ui.note(('branch %s\n' % data))
1650 ui.note(('branch %s\n' % data))
1651 atbranch = data
1651 atbranch = data
1652 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1652 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1653 tr.close()
1653 tr.close()
1654
1654
1655 if tags:
1655 if tags:
1656 repo.opener.write("localtags", "".join(tags))
1656 repo.opener.write("localtags", "".join(tags))
1657 finally:
1657 finally:
1658 ui.progress(_('building'), None)
1658 ui.progress(_('building'), None)
1659 release(tr, lock)
1659 release(tr, lock)
1660
1660
1661 @command('debugbundle', [('a', 'all', None, _('show all details'))], _('FILE'))
1661 @command('debugbundle', [('a', 'all', None, _('show all details'))], _('FILE'))
1662 def debugbundle(ui, bundlepath, all=None, **opts):
1662 def debugbundle(ui, bundlepath, all=None, **opts):
1663 """lists the contents of a bundle"""
1663 """lists the contents of a bundle"""
1664 f = hg.openpath(ui, bundlepath)
1664 f = hg.openpath(ui, bundlepath)
1665 try:
1665 try:
1666 gen = changegroup.readbundle(f, bundlepath)
1666 gen = changegroup.readbundle(f, bundlepath)
1667 if all:
1667 if all:
1668 ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n"))
1668 ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n"))
1669
1669
1670 def showchunks(named):
1670 def showchunks(named):
1671 ui.write("\n%s\n" % named)
1671 ui.write("\n%s\n" % named)
1672 chain = None
1672 chain = None
1673 while True:
1673 while True:
1674 chunkdata = gen.deltachunk(chain)
1674 chunkdata = gen.deltachunk(chain)
1675 if not chunkdata:
1675 if not chunkdata:
1676 break
1676 break
1677 node = chunkdata['node']
1677 node = chunkdata['node']
1678 p1 = chunkdata['p1']
1678 p1 = chunkdata['p1']
1679 p2 = chunkdata['p2']
1679 p2 = chunkdata['p2']
1680 cs = chunkdata['cs']
1680 cs = chunkdata['cs']
1681 deltabase = chunkdata['deltabase']
1681 deltabase = chunkdata['deltabase']
1682 delta = chunkdata['delta']
1682 delta = chunkdata['delta']
1683 ui.write("%s %s %s %s %s %s\n" %
1683 ui.write("%s %s %s %s %s %s\n" %
1684 (hex(node), hex(p1), hex(p2),
1684 (hex(node), hex(p1), hex(p2),
1685 hex(cs), hex(deltabase), len(delta)))
1685 hex(cs), hex(deltabase), len(delta)))
1686 chain = node
1686 chain = node
1687
1687
1688 chunkdata = gen.changelogheader()
1688 chunkdata = gen.changelogheader()
1689 showchunks("changelog")
1689 showchunks("changelog")
1690 chunkdata = gen.manifestheader()
1690 chunkdata = gen.manifestheader()
1691 showchunks("manifest")
1691 showchunks("manifest")
1692 while True:
1692 while True:
1693 chunkdata = gen.filelogheader()
1693 chunkdata = gen.filelogheader()
1694 if not chunkdata:
1694 if not chunkdata:
1695 break
1695 break
1696 fname = chunkdata['filename']
1696 fname = chunkdata['filename']
1697 showchunks(fname)
1697 showchunks(fname)
1698 else:
1698 else:
1699 chunkdata = gen.changelogheader()
1699 chunkdata = gen.changelogheader()
1700 chain = None
1700 chain = None
1701 while True:
1701 while True:
1702 chunkdata = gen.deltachunk(chain)
1702 chunkdata = gen.deltachunk(chain)
1703 if not chunkdata:
1703 if not chunkdata:
1704 break
1704 break
1705 node = chunkdata['node']
1705 node = chunkdata['node']
1706 ui.write("%s\n" % hex(node))
1706 ui.write("%s\n" % hex(node))
1707 chain = node
1707 chain = node
1708 finally:
1708 finally:
1709 f.close()
1709 f.close()
1710
1710
1711 @command('debugcheckstate', [], '')
1711 @command('debugcheckstate', [], '')
1712 def debugcheckstate(ui, repo):
1712 def debugcheckstate(ui, repo):
1713 """validate the correctness of the current dirstate"""
1713 """validate the correctness of the current dirstate"""
1714 parent1, parent2 = repo.dirstate.parents()
1714 parent1, parent2 = repo.dirstate.parents()
1715 m1 = repo[parent1].manifest()
1715 m1 = repo[parent1].manifest()
1716 m2 = repo[parent2].manifest()
1716 m2 = repo[parent2].manifest()
1717 errors = 0
1717 errors = 0
1718 for f in repo.dirstate:
1718 for f in repo.dirstate:
1719 state = repo.dirstate[f]
1719 state = repo.dirstate[f]
1720 if state in "nr" and f not in m1:
1720 if state in "nr" and f not in m1:
1721 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1721 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1722 errors += 1
1722 errors += 1
1723 if state in "a" and f in m1:
1723 if state in "a" and f in m1:
1724 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1724 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1725 errors += 1
1725 errors += 1
1726 if state in "m" and f not in m1 and f not in m2:
1726 if state in "m" and f not in m1 and f not in m2:
1727 ui.warn(_("%s in state %s, but not in either manifest\n") %
1727 ui.warn(_("%s in state %s, but not in either manifest\n") %
1728 (f, state))
1728 (f, state))
1729 errors += 1
1729 errors += 1
1730 for f in m1:
1730 for f in m1:
1731 state = repo.dirstate[f]
1731 state = repo.dirstate[f]
1732 if state not in "nrm":
1732 if state not in "nrm":
1733 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1733 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1734 errors += 1
1734 errors += 1
1735 if errors:
1735 if errors:
1736 error = _(".hg/dirstate inconsistent with current parent's manifest")
1736 error = _(".hg/dirstate inconsistent with current parent's manifest")
1737 raise util.Abort(error)
1737 raise util.Abort(error)
1738
1738
1739 @command('debugcommands', [], _('[COMMAND]'))
1739 @command('debugcommands', [], _('[COMMAND]'))
1740 def debugcommands(ui, cmd='', *args):
1740 def debugcommands(ui, cmd='', *args):
1741 """list all available commands and options"""
1741 """list all available commands and options"""
1742 for cmd, vals in sorted(table.iteritems()):
1742 for cmd, vals in sorted(table.iteritems()):
1743 cmd = cmd.split('|')[0].strip('^')
1743 cmd = cmd.split('|')[0].strip('^')
1744 opts = ', '.join([i[1] for i in vals[1]])
1744 opts = ', '.join([i[1] for i in vals[1]])
1745 ui.write('%s: %s\n' % (cmd, opts))
1745 ui.write('%s: %s\n' % (cmd, opts))
1746
1746
1747 @command('debugcomplete',
1747 @command('debugcomplete',
1748 [('o', 'options', None, _('show the command options'))],
1748 [('o', 'options', None, _('show the command options'))],
1749 _('[-o] CMD'))
1749 _('[-o] CMD'))
1750 def debugcomplete(ui, cmd='', **opts):
1750 def debugcomplete(ui, cmd='', **opts):
1751 """returns the completion list associated with the given command"""
1751 """returns the completion list associated with the given command"""
1752
1752
1753 if opts.get('options'):
1753 if opts.get('options'):
1754 options = []
1754 options = []
1755 otables = [globalopts]
1755 otables = [globalopts]
1756 if cmd:
1756 if cmd:
1757 aliases, entry = cmdutil.findcmd(cmd, table, False)
1757 aliases, entry = cmdutil.findcmd(cmd, table, False)
1758 otables.append(entry[1])
1758 otables.append(entry[1])
1759 for t in otables:
1759 for t in otables:
1760 for o in t:
1760 for o in t:
1761 if "(DEPRECATED)" in o[3]:
1761 if "(DEPRECATED)" in o[3]:
1762 continue
1762 continue
1763 if o[0]:
1763 if o[0]:
1764 options.append('-%s' % o[0])
1764 options.append('-%s' % o[0])
1765 options.append('--%s' % o[1])
1765 options.append('--%s' % o[1])
1766 ui.write("%s\n" % "\n".join(options))
1766 ui.write("%s\n" % "\n".join(options))
1767 return
1767 return
1768
1768
1769 cmdlist = cmdutil.findpossible(cmd, table)
1769 cmdlist = cmdutil.findpossible(cmd, table)
1770 if ui.verbose:
1770 if ui.verbose:
1771 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1771 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1772 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1772 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1773
1773
1774 @command('debugdag',
1774 @command('debugdag',
1775 [('t', 'tags', None, _('use tags as labels')),
1775 [('t', 'tags', None, _('use tags as labels')),
1776 ('b', 'branches', None, _('annotate with branch names')),
1776 ('b', 'branches', None, _('annotate with branch names')),
1777 ('', 'dots', None, _('use dots for runs')),
1777 ('', 'dots', None, _('use dots for runs')),
1778 ('s', 'spaces', None, _('separate elements by spaces'))],
1778 ('s', 'spaces', None, _('separate elements by spaces'))],
1779 _('[OPTION]... [FILE [REV]...]'))
1779 _('[OPTION]... [FILE [REV]...]'))
1780 def debugdag(ui, repo, file_=None, *revs, **opts):
1780 def debugdag(ui, repo, file_=None, *revs, **opts):
1781 """format the changelog or an index DAG as a concise textual description
1781 """format the changelog or an index DAG as a concise textual description
1782
1782
1783 If you pass a revlog index, the revlog's DAG is emitted. If you list
1783 If you pass a revlog index, the revlog's DAG is emitted. If you list
1784 revision numbers, they get labeled in the output as rN.
1784 revision numbers, they get labeled in the output as rN.
1785
1785
1786 Otherwise, the changelog DAG of the current repo is emitted.
1786 Otherwise, the changelog DAG of the current repo is emitted.
1787 """
1787 """
1788 spaces = opts.get('spaces')
1788 spaces = opts.get('spaces')
1789 dots = opts.get('dots')
1789 dots = opts.get('dots')
1790 if file_:
1790 if file_:
1791 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1791 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1792 revs = set((int(r) for r in revs))
1792 revs = set((int(r) for r in revs))
1793 def events():
1793 def events():
1794 for r in rlog:
1794 for r in rlog:
1795 yield 'n', (r, list(set(p for p in rlog.parentrevs(r)
1795 yield 'n', (r, list(set(p for p in rlog.parentrevs(r)
1796 if p != -1)))
1796 if p != -1)))
1797 if r in revs:
1797 if r in revs:
1798 yield 'l', (r, "r%i" % r)
1798 yield 'l', (r, "r%i" % r)
1799 elif repo:
1799 elif repo:
1800 cl = repo.changelog
1800 cl = repo.changelog
1801 tags = opts.get('tags')
1801 tags = opts.get('tags')
1802 branches = opts.get('branches')
1802 branches = opts.get('branches')
1803 if tags:
1803 if tags:
1804 labels = {}
1804 labels = {}
1805 for l, n in repo.tags().items():
1805 for l, n in repo.tags().items():
1806 labels.setdefault(cl.rev(n), []).append(l)
1806 labels.setdefault(cl.rev(n), []).append(l)
1807 def events():
1807 def events():
1808 b = "default"
1808 b = "default"
1809 for r in cl:
1809 for r in cl:
1810 if branches:
1810 if branches:
1811 newb = cl.read(cl.node(r))[5]['branch']
1811 newb = cl.read(cl.node(r))[5]['branch']
1812 if newb != b:
1812 if newb != b:
1813 yield 'a', newb
1813 yield 'a', newb
1814 b = newb
1814 b = newb
1815 yield 'n', (r, list(set(p for p in cl.parentrevs(r)
1815 yield 'n', (r, list(set(p for p in cl.parentrevs(r)
1816 if p != -1)))
1816 if p != -1)))
1817 if tags:
1817 if tags:
1818 ls = labels.get(r)
1818 ls = labels.get(r)
1819 if ls:
1819 if ls:
1820 for l in ls:
1820 for l in ls:
1821 yield 'l', (r, l)
1821 yield 'l', (r, l)
1822 else:
1822 else:
1823 raise util.Abort(_('need repo for changelog dag'))
1823 raise util.Abort(_('need repo for changelog dag'))
1824
1824
1825 for line in dagparser.dagtextlines(events(),
1825 for line in dagparser.dagtextlines(events(),
1826 addspaces=spaces,
1826 addspaces=spaces,
1827 wraplabels=True,
1827 wraplabels=True,
1828 wrapannotations=True,
1828 wrapannotations=True,
1829 wrapnonlinear=dots,
1829 wrapnonlinear=dots,
1830 usedots=dots,
1830 usedots=dots,
1831 maxlinewidth=70):
1831 maxlinewidth=70):
1832 ui.write(line)
1832 ui.write(line)
1833 ui.write("\n")
1833 ui.write("\n")
1834
1834
1835 @command('debugdata',
1835 @command('debugdata',
1836 [('c', 'changelog', False, _('open changelog')),
1836 [('c', 'changelog', False, _('open changelog')),
1837 ('m', 'manifest', False, _('open manifest'))],
1837 ('m', 'manifest', False, _('open manifest'))],
1838 _('-c|-m|FILE REV'))
1838 _('-c|-m|FILE REV'))
1839 def debugdata(ui, repo, file_, rev=None, **opts):
1839 def debugdata(ui, repo, file_, rev=None, **opts):
1840 """dump the contents of a data file revision"""
1840 """dump the contents of a data file revision"""
1841 if opts.get('changelog') or opts.get('manifest'):
1841 if opts.get('changelog') or opts.get('manifest'):
1842 file_, rev = None, file_
1842 file_, rev = None, file_
1843 elif rev is None:
1843 elif rev is None:
1844 raise error.CommandError('debugdata', _('invalid arguments'))
1844 raise error.CommandError('debugdata', _('invalid arguments'))
1845 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
1845 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
1846 try:
1846 try:
1847 ui.write(r.revision(r.lookup(rev)))
1847 ui.write(r.revision(r.lookup(rev)))
1848 except KeyError:
1848 except KeyError:
1849 raise util.Abort(_('invalid revision identifier %s') % rev)
1849 raise util.Abort(_('invalid revision identifier %s') % rev)
1850
1850
1851 @command('debugdate',
1851 @command('debugdate',
1852 [('e', 'extended', None, _('try extended date formats'))],
1852 [('e', 'extended', None, _('try extended date formats'))],
1853 _('[-e] DATE [RANGE]'))
1853 _('[-e] DATE [RANGE]'))
1854 def debugdate(ui, date, range=None, **opts):
1854 def debugdate(ui, date, range=None, **opts):
1855 """parse and display a date"""
1855 """parse and display a date"""
1856 if opts["extended"]:
1856 if opts["extended"]:
1857 d = util.parsedate(date, util.extendeddateformats)
1857 d = util.parsedate(date, util.extendeddateformats)
1858 else:
1858 else:
1859 d = util.parsedate(date)
1859 d = util.parsedate(date)
1860 ui.write(("internal: %s %s\n") % d)
1860 ui.write(("internal: %s %s\n") % d)
1861 ui.write(("standard: %s\n") % util.datestr(d))
1861 ui.write(("standard: %s\n") % util.datestr(d))
1862 if range:
1862 if range:
1863 m = util.matchdate(range)
1863 m = util.matchdate(range)
1864 ui.write(("match: %s\n") % m(d[0]))
1864 ui.write(("match: %s\n") % m(d[0]))
1865
1865
1866 @command('debugdiscovery',
1866 @command('debugdiscovery',
1867 [('', 'old', None, _('use old-style discovery')),
1867 [('', 'old', None, _('use old-style discovery')),
1868 ('', 'nonheads', None,
1868 ('', 'nonheads', None,
1869 _('use old-style discovery with non-heads included')),
1869 _('use old-style discovery with non-heads included')),
1870 ] + remoteopts,
1870 ] + remoteopts,
1871 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
1871 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
1872 def debugdiscovery(ui, repo, remoteurl="default", **opts):
1872 def debugdiscovery(ui, repo, remoteurl="default", **opts):
1873 """runs the changeset discovery protocol in isolation"""
1873 """runs the changeset discovery protocol in isolation"""
1874 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
1874 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
1875 opts.get('branch'))
1875 opts.get('branch'))
1876 remote = hg.peer(repo, opts, remoteurl)
1876 remote = hg.peer(repo, opts, remoteurl)
1877 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
1877 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
1878
1878
1879 # make sure tests are repeatable
1879 # make sure tests are repeatable
1880 random.seed(12323)
1880 random.seed(12323)
1881
1881
1882 def doit(localheads, remoteheads, remote=remote):
1882 def doit(localheads, remoteheads, remote=remote):
1883 if opts.get('old'):
1883 if opts.get('old'):
1884 if localheads:
1884 if localheads:
1885 raise util.Abort('cannot use localheads with old style '
1885 raise util.Abort('cannot use localheads with old style '
1886 'discovery')
1886 'discovery')
1887 if not util.safehasattr(remote, 'branches'):
1887 if not util.safehasattr(remote, 'branches'):
1888 # enable in-client legacy support
1888 # enable in-client legacy support
1889 remote = localrepo.locallegacypeer(remote.local())
1889 remote = localrepo.locallegacypeer(remote.local())
1890 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
1890 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
1891 force=True)
1891 force=True)
1892 common = set(common)
1892 common = set(common)
1893 if not opts.get('nonheads'):
1893 if not opts.get('nonheads'):
1894 ui.write(("unpruned common: %s\n") %
1894 ui.write(("unpruned common: %s\n") %
1895 " ".join(sorted(short(n) for n in common)))
1895 " ".join(sorted(short(n) for n in common)))
1896 dag = dagutil.revlogdag(repo.changelog)
1896 dag = dagutil.revlogdag(repo.changelog)
1897 all = dag.ancestorset(dag.internalizeall(common))
1897 all = dag.ancestorset(dag.internalizeall(common))
1898 common = dag.externalizeall(dag.headsetofconnecteds(all))
1898 common = dag.externalizeall(dag.headsetofconnecteds(all))
1899 else:
1899 else:
1900 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
1900 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
1901 common = set(common)
1901 common = set(common)
1902 rheads = set(hds)
1902 rheads = set(hds)
1903 lheads = set(repo.heads())
1903 lheads = set(repo.heads())
1904 ui.write(("common heads: %s\n") %
1904 ui.write(("common heads: %s\n") %
1905 " ".join(sorted(short(n) for n in common)))
1905 " ".join(sorted(short(n) for n in common)))
1906 if lheads <= common:
1906 if lheads <= common:
1907 ui.write(("local is subset\n"))
1907 ui.write(("local is subset\n"))
1908 elif rheads <= common:
1908 elif rheads <= common:
1909 ui.write(("remote is subset\n"))
1909 ui.write(("remote is subset\n"))
1910
1910
1911 serverlogs = opts.get('serverlog')
1911 serverlogs = opts.get('serverlog')
1912 if serverlogs:
1912 if serverlogs:
1913 for filename in serverlogs:
1913 for filename in serverlogs:
1914 logfile = open(filename, 'r')
1914 logfile = open(filename, 'r')
1915 try:
1915 try:
1916 line = logfile.readline()
1916 line = logfile.readline()
1917 while line:
1917 while line:
1918 parts = line.strip().split(';')
1918 parts = line.strip().split(';')
1919 op = parts[1]
1919 op = parts[1]
1920 if op == 'cg':
1920 if op == 'cg':
1921 pass
1921 pass
1922 elif op == 'cgss':
1922 elif op == 'cgss':
1923 doit(parts[2].split(' '), parts[3].split(' '))
1923 doit(parts[2].split(' '), parts[3].split(' '))
1924 elif op == 'unb':
1924 elif op == 'unb':
1925 doit(parts[3].split(' '), parts[2].split(' '))
1925 doit(parts[3].split(' '), parts[2].split(' '))
1926 line = logfile.readline()
1926 line = logfile.readline()
1927 finally:
1927 finally:
1928 logfile.close()
1928 logfile.close()
1929
1929
1930 else:
1930 else:
1931 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
1931 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
1932 opts.get('remote_head'))
1932 opts.get('remote_head'))
1933 localrevs = opts.get('local_head')
1933 localrevs = opts.get('local_head')
1934 doit(localrevs, remoterevs)
1934 doit(localrevs, remoterevs)
1935
1935
1936 @command('debugfileset',
1936 @command('debugfileset',
1937 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
1937 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
1938 _('[-r REV] FILESPEC'))
1938 _('[-r REV] FILESPEC'))
1939 def debugfileset(ui, repo, expr, **opts):
1939 def debugfileset(ui, repo, expr, **opts):
1940 '''parse and apply a fileset specification'''
1940 '''parse and apply a fileset specification'''
1941 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
1941 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
1942 if ui.verbose:
1942 if ui.verbose:
1943 tree = fileset.parse(expr)[0]
1943 tree = fileset.parse(expr)[0]
1944 ui.note(tree, "\n")
1944 ui.note(tree, "\n")
1945
1945
1946 for f in fileset.getfileset(ctx, expr):
1946 for f in fileset.getfileset(ctx, expr):
1947 ui.write("%s\n" % f)
1947 ui.write("%s\n" % f)
1948
1948
1949 @command('debugfsinfo', [], _('[PATH]'))
1949 @command('debugfsinfo', [], _('[PATH]'))
1950 def debugfsinfo(ui, path="."):
1950 def debugfsinfo(ui, path="."):
1951 """show information detected about current filesystem"""
1951 """show information detected about current filesystem"""
1952 util.writefile('.debugfsinfo', '')
1952 util.writefile('.debugfsinfo', '')
1953 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
1953 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
1954 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
1954 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
1955 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
1955 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
1956 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
1956 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
1957 and 'yes' or 'no'))
1957 and 'yes' or 'no'))
1958 os.unlink('.debugfsinfo')
1958 os.unlink('.debugfsinfo')
1959
1959
1960 @command('debuggetbundle',
1960 @command('debuggetbundle',
1961 [('H', 'head', [], _('id of head node'), _('ID')),
1961 [('H', 'head', [], _('id of head node'), _('ID')),
1962 ('C', 'common', [], _('id of common node'), _('ID')),
1962 ('C', 'common', [], _('id of common node'), _('ID')),
1963 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
1963 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
1964 _('REPO FILE [-H|-C ID]...'))
1964 _('REPO FILE [-H|-C ID]...'))
1965 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
1965 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
1966 """retrieves a bundle from a repo
1966 """retrieves a bundle from a repo
1967
1967
1968 Every ID must be a full-length hex node id string. Saves the bundle to the
1968 Every ID must be a full-length hex node id string. Saves the bundle to the
1969 given file.
1969 given file.
1970 """
1970 """
1971 repo = hg.peer(ui, opts, repopath)
1971 repo = hg.peer(ui, opts, repopath)
1972 if not repo.capable('getbundle'):
1972 if not repo.capable('getbundle'):
1973 raise util.Abort("getbundle() not supported by target repository")
1973 raise util.Abort("getbundle() not supported by target repository")
1974 args = {}
1974 args = {}
1975 if common:
1975 if common:
1976 args['common'] = [bin(s) for s in common]
1976 args['common'] = [bin(s) for s in common]
1977 if head:
1977 if head:
1978 args['heads'] = [bin(s) for s in head]
1978 args['heads'] = [bin(s) for s in head]
1979 # TODO: get desired bundlecaps from command line.
1979 # TODO: get desired bundlecaps from command line.
1980 args['bundlecaps'] = None
1980 args['bundlecaps'] = None
1981 bundle = repo.getbundle('debug', **args)
1981 bundle = repo.getbundle('debug', **args)
1982
1982
1983 bundletype = opts.get('type', 'bzip2').lower()
1983 bundletype = opts.get('type', 'bzip2').lower()
1984 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1984 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1985 bundletype = btypes.get(bundletype)
1985 bundletype = btypes.get(bundletype)
1986 if bundletype not in changegroup.bundletypes:
1986 if bundletype not in changegroup.bundletypes:
1987 raise util.Abort(_('unknown bundle type specified with --type'))
1987 raise util.Abort(_('unknown bundle type specified with --type'))
1988 changegroup.writebundle(bundle, bundlepath, bundletype)
1988 changegroup.writebundle(bundle, bundlepath, bundletype)
1989
1989
1990 @command('debugignore', [], '')
1990 @command('debugignore', [], '')
1991 def debugignore(ui, repo, *values, **opts):
1991 def debugignore(ui, repo, *values, **opts):
1992 """display the combined ignore pattern"""
1992 """display the combined ignore pattern"""
1993 ignore = repo.dirstate._ignore
1993 ignore = repo.dirstate._ignore
1994 includepat = getattr(ignore, 'includepat', None)
1994 includepat = getattr(ignore, 'includepat', None)
1995 if includepat is not None:
1995 if includepat is not None:
1996 ui.write("%s\n" % includepat)
1996 ui.write("%s\n" % includepat)
1997 else:
1997 else:
1998 raise util.Abort(_("no ignore patterns found"))
1998 raise util.Abort(_("no ignore patterns found"))
1999
1999
2000 @command('debugindex',
2000 @command('debugindex',
2001 [('c', 'changelog', False, _('open changelog')),
2001 [('c', 'changelog', False, _('open changelog')),
2002 ('m', 'manifest', False, _('open manifest')),
2002 ('m', 'manifest', False, _('open manifest')),
2003 ('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2003 ('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2004 _('[-f FORMAT] -c|-m|FILE'))
2004 _('[-f FORMAT] -c|-m|FILE'))
2005 def debugindex(ui, repo, file_=None, **opts):
2005 def debugindex(ui, repo, file_=None, **opts):
2006 """dump the contents of an index file"""
2006 """dump the contents of an index file"""
2007 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2007 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2008 format = opts.get('format', 0)
2008 format = opts.get('format', 0)
2009 if format not in (0, 1):
2009 if format not in (0, 1):
2010 raise util.Abort(_("unknown format %d") % format)
2010 raise util.Abort(_("unknown format %d") % format)
2011
2011
2012 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2012 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2013 if generaldelta:
2013 if generaldelta:
2014 basehdr = ' delta'
2014 basehdr = ' delta'
2015 else:
2015 else:
2016 basehdr = ' base'
2016 basehdr = ' base'
2017
2017
2018 if format == 0:
2018 if format == 0:
2019 ui.write(" rev offset length " + basehdr + " linkrev"
2019 ui.write(" rev offset length " + basehdr + " linkrev"
2020 " nodeid p1 p2\n")
2020 " nodeid p1 p2\n")
2021 elif format == 1:
2021 elif format == 1:
2022 ui.write(" rev flag offset length"
2022 ui.write(" rev flag offset length"
2023 " size " + basehdr + " link p1 p2"
2023 " size " + basehdr + " link p1 p2"
2024 " nodeid\n")
2024 " nodeid\n")
2025
2025
2026 for i in r:
2026 for i in r:
2027 node = r.node(i)
2027 node = r.node(i)
2028 if generaldelta:
2028 if generaldelta:
2029 base = r.deltaparent(i)
2029 base = r.deltaparent(i)
2030 else:
2030 else:
2031 base = r.chainbase(i)
2031 base = r.chainbase(i)
2032 if format == 0:
2032 if format == 0:
2033 try:
2033 try:
2034 pp = r.parents(node)
2034 pp = r.parents(node)
2035 except Exception:
2035 except Exception:
2036 pp = [nullid, nullid]
2036 pp = [nullid, nullid]
2037 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2037 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2038 i, r.start(i), r.length(i), base, r.linkrev(i),
2038 i, r.start(i), r.length(i), base, r.linkrev(i),
2039 short(node), short(pp[0]), short(pp[1])))
2039 short(node), short(pp[0]), short(pp[1])))
2040 elif format == 1:
2040 elif format == 1:
2041 pr = r.parentrevs(i)
2041 pr = r.parentrevs(i)
2042 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2042 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2043 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2043 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2044 base, r.linkrev(i), pr[0], pr[1], short(node)))
2044 base, r.linkrev(i), pr[0], pr[1], short(node)))
2045
2045
2046 @command('debugindexdot', [], _('FILE'))
2046 @command('debugindexdot', [], _('FILE'))
2047 def debugindexdot(ui, repo, file_):
2047 def debugindexdot(ui, repo, file_):
2048 """dump an index DAG as a graphviz dot file"""
2048 """dump an index DAG as a graphviz dot file"""
2049 r = None
2049 r = None
2050 if repo:
2050 if repo:
2051 filelog = repo.file(file_)
2051 filelog = repo.file(file_)
2052 if len(filelog):
2052 if len(filelog):
2053 r = filelog
2053 r = filelog
2054 if not r:
2054 if not r:
2055 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2055 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2056 ui.write(("digraph G {\n"))
2056 ui.write(("digraph G {\n"))
2057 for i in r:
2057 for i in r:
2058 node = r.node(i)
2058 node = r.node(i)
2059 pp = r.parents(node)
2059 pp = r.parents(node)
2060 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2060 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2061 if pp[1] != nullid:
2061 if pp[1] != nullid:
2062 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2062 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2063 ui.write("}\n")
2063 ui.write("}\n")
2064
2064
2065 @command('debuginstall', [], '')
2065 @command('debuginstall', [], '')
2066 def debuginstall(ui):
2066 def debuginstall(ui):
2067 '''test Mercurial installation
2067 '''test Mercurial installation
2068
2068
2069 Returns 0 on success.
2069 Returns 0 on success.
2070 '''
2070 '''
2071
2071
2072 def writetemp(contents):
2072 def writetemp(contents):
2073 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2073 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2074 f = os.fdopen(fd, "wb")
2074 f = os.fdopen(fd, "wb")
2075 f.write(contents)
2075 f.write(contents)
2076 f.close()
2076 f.close()
2077 return name
2077 return name
2078
2078
2079 problems = 0
2079 problems = 0
2080
2080
2081 # encoding
2081 # encoding
2082 ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
2082 ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
2083 try:
2083 try:
2084 encoding.fromlocal("test")
2084 encoding.fromlocal("test")
2085 except util.Abort, inst:
2085 except util.Abort, inst:
2086 ui.write(" %s\n" % inst)
2086 ui.write(" %s\n" % inst)
2087 ui.write(_(" (check that your locale is properly set)\n"))
2087 ui.write(_(" (check that your locale is properly set)\n"))
2088 problems += 1
2088 problems += 1
2089
2089
2090 # Python lib
2090 # Python lib
2091 ui.status(_("checking Python lib (%s)...\n")
2091 ui.status(_("checking Python lib (%s)...\n")
2092 % os.path.dirname(os.__file__))
2092 % os.path.dirname(os.__file__))
2093
2093
2094 # compiled modules
2094 # compiled modules
2095 ui.status(_("checking installed modules (%s)...\n")
2095 ui.status(_("checking installed modules (%s)...\n")
2096 % os.path.dirname(__file__))
2096 % os.path.dirname(__file__))
2097 try:
2097 try:
2098 import bdiff, mpatch, base85, osutil
2098 import bdiff, mpatch, base85, osutil
2099 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2099 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2100 except Exception, inst:
2100 except Exception, inst:
2101 ui.write(" %s\n" % inst)
2101 ui.write(" %s\n" % inst)
2102 ui.write(_(" One or more extensions could not be found"))
2102 ui.write(_(" One or more extensions could not be found"))
2103 ui.write(_(" (check that you compiled the extensions)\n"))
2103 ui.write(_(" (check that you compiled the extensions)\n"))
2104 problems += 1
2104 problems += 1
2105
2105
2106 # templates
2106 # templates
2107 import templater
2107 import templater
2108 p = templater.templatepath()
2108 p = templater.templatepath()
2109 ui.status(_("checking templates (%s)...\n") % ' '.join(p))
2109 ui.status(_("checking templates (%s)...\n") % ' '.join(p))
2110 if p:
2111 m = templater.templatepath("map-cmdline.default")
2112 if m:
2113 # template found, check if it is working
2110 try:
2114 try:
2111 templater.templater(templater.templatepath("map-cmdline.default"))
2115 templater.templater(m)
2112 except Exception, inst:
2116 except Exception, inst:
2113 ui.write(" %s\n" % inst)
2117 ui.write(" %s\n" % inst)
2118 p = None
2119 else:
2120 ui.write(_(" template 'default' not found\n"))
2121 p = None
2122 else:
2123 ui.write(_(" no template directories found\n"))
2124 if not p:
2114 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
2125 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
2115 problems += 1
2126 problems += 1
2116
2127
2117 # editor
2128 # editor
2118 ui.status(_("checking commit editor...\n"))
2129 ui.status(_("checking commit editor...\n"))
2119 editor = ui.geteditor()
2130 editor = ui.geteditor()
2120 cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
2131 cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
2121 if not cmdpath:
2132 if not cmdpath:
2122 if editor == 'vi':
2133 if editor == 'vi':
2123 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2134 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2124 ui.write(_(" (specify a commit editor in your configuration"
2135 ui.write(_(" (specify a commit editor in your configuration"
2125 " file)\n"))
2136 " file)\n"))
2126 else:
2137 else:
2127 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2138 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2128 ui.write(_(" (specify a commit editor in your configuration"
2139 ui.write(_(" (specify a commit editor in your configuration"
2129 " file)\n"))
2140 " file)\n"))
2130 problems += 1
2141 problems += 1
2131
2142
2132 # check username
2143 # check username
2133 ui.status(_("checking username...\n"))
2144 ui.status(_("checking username...\n"))
2134 try:
2145 try:
2135 ui.username()
2146 ui.username()
2136 except util.Abort, e:
2147 except util.Abort, e:
2137 ui.write(" %s\n" % e)
2148 ui.write(" %s\n" % e)
2138 ui.write(_(" (specify a username in your configuration file)\n"))
2149 ui.write(_(" (specify a username in your configuration file)\n"))
2139 problems += 1
2150 problems += 1
2140
2151
2141 if not problems:
2152 if not problems:
2142 ui.status(_("no problems detected\n"))
2153 ui.status(_("no problems detected\n"))
2143 else:
2154 else:
2144 ui.write(_("%s problems detected,"
2155 ui.write(_("%s problems detected,"
2145 " please check your install!\n") % problems)
2156 " please check your install!\n") % problems)
2146
2157
2147 return problems
2158 return problems
2148
2159
2149 @command('debugknown', [], _('REPO ID...'))
2160 @command('debugknown', [], _('REPO ID...'))
2150 def debugknown(ui, repopath, *ids, **opts):
2161 def debugknown(ui, repopath, *ids, **opts):
2151 """test whether node ids are known to a repo
2162 """test whether node ids are known to a repo
2152
2163
2153 Every ID must be a full-length hex node id string. Returns a list of 0s
2164 Every ID must be a full-length hex node id string. Returns a list of 0s
2154 and 1s indicating unknown/known.
2165 and 1s indicating unknown/known.
2155 """
2166 """
2156 repo = hg.peer(ui, opts, repopath)
2167 repo = hg.peer(ui, opts, repopath)
2157 if not repo.capable('known'):
2168 if not repo.capable('known'):
2158 raise util.Abort("known() not supported by target repository")
2169 raise util.Abort("known() not supported by target repository")
2159 flags = repo.known([bin(s) for s in ids])
2170 flags = repo.known([bin(s) for s in ids])
2160 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2171 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2161
2172
2162 @command('debuglabelcomplete', [], _('LABEL...'))
2173 @command('debuglabelcomplete', [], _('LABEL...'))
2163 def debuglabelcomplete(ui, repo, *args):
2174 def debuglabelcomplete(ui, repo, *args):
2164 '''complete "labels" - tags, open branch names, bookmark names'''
2175 '''complete "labels" - tags, open branch names, bookmark names'''
2165
2176
2166 labels = set()
2177 labels = set()
2167 labels.update(t[0] for t in repo.tagslist())
2178 labels.update(t[0] for t in repo.tagslist())
2168 labels.update(repo._bookmarks.keys())
2179 labels.update(repo._bookmarks.keys())
2169 labels.update(tag for (tag, heads, tip, closed)
2180 labels.update(tag for (tag, heads, tip, closed)
2170 in repo.branchmap().iterbranches() if not closed)
2181 in repo.branchmap().iterbranches() if not closed)
2171 completions = set()
2182 completions = set()
2172 if not args:
2183 if not args:
2173 args = ['']
2184 args = ['']
2174 for a in args:
2185 for a in args:
2175 completions.update(l for l in labels if l.startswith(a))
2186 completions.update(l for l in labels if l.startswith(a))
2176 ui.write('\n'.join(sorted(completions)))
2187 ui.write('\n'.join(sorted(completions)))
2177 ui.write('\n')
2188 ui.write('\n')
2178
2189
2179 @command('debugobsolete',
2190 @command('debugobsolete',
2180 [('', 'flags', 0, _('markers flag')),
2191 [('', 'flags', 0, _('markers flag')),
2181 ] + commitopts2,
2192 ] + commitopts2,
2182 _('[OBSOLETED [REPLACEMENT] [REPL... ]'))
2193 _('[OBSOLETED [REPLACEMENT] [REPL... ]'))
2183 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2194 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2184 """create arbitrary obsolete marker
2195 """create arbitrary obsolete marker
2185
2196
2186 With no arguments, displays the list of obsolescence markers."""
2197 With no arguments, displays the list of obsolescence markers."""
2187 def parsenodeid(s):
2198 def parsenodeid(s):
2188 try:
2199 try:
2189 # We do not use revsingle/revrange functions here to accept
2200 # We do not use revsingle/revrange functions here to accept
2190 # arbitrary node identifiers, possibly not present in the
2201 # arbitrary node identifiers, possibly not present in the
2191 # local repository.
2202 # local repository.
2192 n = bin(s)
2203 n = bin(s)
2193 if len(n) != len(nullid):
2204 if len(n) != len(nullid):
2194 raise TypeError()
2205 raise TypeError()
2195 return n
2206 return n
2196 except TypeError:
2207 except TypeError:
2197 raise util.Abort('changeset references must be full hexadecimal '
2208 raise util.Abort('changeset references must be full hexadecimal '
2198 'node identifiers')
2209 'node identifiers')
2199
2210
2200 if precursor is not None:
2211 if precursor is not None:
2201 metadata = {}
2212 metadata = {}
2202 if 'date' in opts:
2213 if 'date' in opts:
2203 metadata['date'] = opts['date']
2214 metadata['date'] = opts['date']
2204 metadata['user'] = opts['user'] or ui.username()
2215 metadata['user'] = opts['user'] or ui.username()
2205 succs = tuple(parsenodeid(succ) for succ in successors)
2216 succs = tuple(parsenodeid(succ) for succ in successors)
2206 l = repo.lock()
2217 l = repo.lock()
2207 try:
2218 try:
2208 tr = repo.transaction('debugobsolete')
2219 tr = repo.transaction('debugobsolete')
2209 try:
2220 try:
2210 repo.obsstore.create(tr, parsenodeid(precursor), succs,
2221 repo.obsstore.create(tr, parsenodeid(precursor), succs,
2211 opts['flags'], metadata)
2222 opts['flags'], metadata)
2212 tr.close()
2223 tr.close()
2213 finally:
2224 finally:
2214 tr.release()
2225 tr.release()
2215 finally:
2226 finally:
2216 l.release()
2227 l.release()
2217 else:
2228 else:
2218 for m in obsolete.allmarkers(repo):
2229 for m in obsolete.allmarkers(repo):
2219 ui.write(hex(m.precnode()))
2230 ui.write(hex(m.precnode()))
2220 for repl in m.succnodes():
2231 for repl in m.succnodes():
2221 ui.write(' ')
2232 ui.write(' ')
2222 ui.write(hex(repl))
2233 ui.write(hex(repl))
2223 ui.write(' %X ' % m._data[2])
2234 ui.write(' %X ' % m._data[2])
2224 ui.write('{%s}' % (', '.join('%r: %r' % t for t in
2235 ui.write('{%s}' % (', '.join('%r: %r' % t for t in
2225 sorted(m.metadata().items()))))
2236 sorted(m.metadata().items()))))
2226 ui.write('\n')
2237 ui.write('\n')
2227
2238
2228 @command('debugpathcomplete',
2239 @command('debugpathcomplete',
2229 [('f', 'full', None, _('complete an entire path')),
2240 [('f', 'full', None, _('complete an entire path')),
2230 ('n', 'normal', None, _('show only normal files')),
2241 ('n', 'normal', None, _('show only normal files')),
2231 ('a', 'added', None, _('show only added files')),
2242 ('a', 'added', None, _('show only added files')),
2232 ('r', 'removed', None, _('show only removed files'))],
2243 ('r', 'removed', None, _('show only removed files'))],
2233 _('FILESPEC...'))
2244 _('FILESPEC...'))
2234 def debugpathcomplete(ui, repo, *specs, **opts):
2245 def debugpathcomplete(ui, repo, *specs, **opts):
2235 '''complete part or all of a tracked path
2246 '''complete part or all of a tracked path
2236
2247
2237 This command supports shells that offer path name completion. It
2248 This command supports shells that offer path name completion. It
2238 currently completes only files already known to the dirstate.
2249 currently completes only files already known to the dirstate.
2239
2250
2240 Completion extends only to the next path segment unless
2251 Completion extends only to the next path segment unless
2241 --full is specified, in which case entire paths are used.'''
2252 --full is specified, in which case entire paths are used.'''
2242
2253
2243 def complete(path, acceptable):
2254 def complete(path, acceptable):
2244 dirstate = repo.dirstate
2255 dirstate = repo.dirstate
2245 spec = os.path.normpath(os.path.join(os.getcwd(), path))
2256 spec = os.path.normpath(os.path.join(os.getcwd(), path))
2246 rootdir = repo.root + os.sep
2257 rootdir = repo.root + os.sep
2247 if spec != repo.root and not spec.startswith(rootdir):
2258 if spec != repo.root and not spec.startswith(rootdir):
2248 return [], []
2259 return [], []
2249 if os.path.isdir(spec):
2260 if os.path.isdir(spec):
2250 spec += '/'
2261 spec += '/'
2251 spec = spec[len(rootdir):]
2262 spec = spec[len(rootdir):]
2252 fixpaths = os.sep != '/'
2263 fixpaths = os.sep != '/'
2253 if fixpaths:
2264 if fixpaths:
2254 spec = spec.replace(os.sep, '/')
2265 spec = spec.replace(os.sep, '/')
2255 speclen = len(spec)
2266 speclen = len(spec)
2256 fullpaths = opts['full']
2267 fullpaths = opts['full']
2257 files, dirs = set(), set()
2268 files, dirs = set(), set()
2258 adddir, addfile = dirs.add, files.add
2269 adddir, addfile = dirs.add, files.add
2259 for f, st in dirstate.iteritems():
2270 for f, st in dirstate.iteritems():
2260 if f.startswith(spec) and st[0] in acceptable:
2271 if f.startswith(spec) and st[0] in acceptable:
2261 if fixpaths:
2272 if fixpaths:
2262 f = f.replace('/', os.sep)
2273 f = f.replace('/', os.sep)
2263 if fullpaths:
2274 if fullpaths:
2264 addfile(f)
2275 addfile(f)
2265 continue
2276 continue
2266 s = f.find(os.sep, speclen)
2277 s = f.find(os.sep, speclen)
2267 if s >= 0:
2278 if s >= 0:
2268 adddir(f[:s])
2279 adddir(f[:s])
2269 else:
2280 else:
2270 addfile(f)
2281 addfile(f)
2271 return files, dirs
2282 return files, dirs
2272
2283
2273 acceptable = ''
2284 acceptable = ''
2274 if opts['normal']:
2285 if opts['normal']:
2275 acceptable += 'nm'
2286 acceptable += 'nm'
2276 if opts['added']:
2287 if opts['added']:
2277 acceptable += 'a'
2288 acceptable += 'a'
2278 if opts['removed']:
2289 if opts['removed']:
2279 acceptable += 'r'
2290 acceptable += 'r'
2280 cwd = repo.getcwd()
2291 cwd = repo.getcwd()
2281 if not specs:
2292 if not specs:
2282 specs = ['.']
2293 specs = ['.']
2283
2294
2284 files, dirs = set(), set()
2295 files, dirs = set(), set()
2285 for spec in specs:
2296 for spec in specs:
2286 f, d = complete(spec, acceptable or 'nmar')
2297 f, d = complete(spec, acceptable or 'nmar')
2287 files.update(f)
2298 files.update(f)
2288 dirs.update(d)
2299 dirs.update(d)
2289 files.update(dirs)
2300 files.update(dirs)
2290 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
2301 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
2291 ui.write('\n')
2302 ui.write('\n')
2292
2303
2293 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'))
2304 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'))
2294 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
2305 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
2295 '''access the pushkey key/value protocol
2306 '''access the pushkey key/value protocol
2296
2307
2297 With two args, list the keys in the given namespace.
2308 With two args, list the keys in the given namespace.
2298
2309
2299 With five args, set a key to new if it currently is set to old.
2310 With five args, set a key to new if it currently is set to old.
2300 Reports success or failure.
2311 Reports success or failure.
2301 '''
2312 '''
2302
2313
2303 target = hg.peer(ui, {}, repopath)
2314 target = hg.peer(ui, {}, repopath)
2304 if keyinfo:
2315 if keyinfo:
2305 key, old, new = keyinfo
2316 key, old, new = keyinfo
2306 r = target.pushkey(namespace, key, old, new)
2317 r = target.pushkey(namespace, key, old, new)
2307 ui.status(str(r) + '\n')
2318 ui.status(str(r) + '\n')
2308 return not r
2319 return not r
2309 else:
2320 else:
2310 for k, v in sorted(target.listkeys(namespace).iteritems()):
2321 for k, v in sorted(target.listkeys(namespace).iteritems()):
2311 ui.write("%s\t%s\n" % (k.encode('string-escape'),
2322 ui.write("%s\t%s\n" % (k.encode('string-escape'),
2312 v.encode('string-escape')))
2323 v.encode('string-escape')))
2313
2324
2314 @command('debugpvec', [], _('A B'))
2325 @command('debugpvec', [], _('A B'))
2315 def debugpvec(ui, repo, a, b=None):
2326 def debugpvec(ui, repo, a, b=None):
2316 ca = scmutil.revsingle(repo, a)
2327 ca = scmutil.revsingle(repo, a)
2317 cb = scmutil.revsingle(repo, b)
2328 cb = scmutil.revsingle(repo, b)
2318 pa = pvec.ctxpvec(ca)
2329 pa = pvec.ctxpvec(ca)
2319 pb = pvec.ctxpvec(cb)
2330 pb = pvec.ctxpvec(cb)
2320 if pa == pb:
2331 if pa == pb:
2321 rel = "="
2332 rel = "="
2322 elif pa > pb:
2333 elif pa > pb:
2323 rel = ">"
2334 rel = ">"
2324 elif pa < pb:
2335 elif pa < pb:
2325 rel = "<"
2336 rel = "<"
2326 elif pa | pb:
2337 elif pa | pb:
2327 rel = "|"
2338 rel = "|"
2328 ui.write(_("a: %s\n") % pa)
2339 ui.write(_("a: %s\n") % pa)
2329 ui.write(_("b: %s\n") % pb)
2340 ui.write(_("b: %s\n") % pb)
2330 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
2341 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
2331 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
2342 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
2332 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
2343 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
2333 pa.distance(pb), rel))
2344 pa.distance(pb), rel))
2334
2345
2335 @command('debugrebuilddirstate|debugrebuildstate',
2346 @command('debugrebuilddirstate|debugrebuildstate',
2336 [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
2347 [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
2337 _('[-r REV]'))
2348 _('[-r REV]'))
2338 def debugrebuilddirstate(ui, repo, rev):
2349 def debugrebuilddirstate(ui, repo, rev):
2339 """rebuild the dirstate as it would look like for the given revision
2350 """rebuild the dirstate as it would look like for the given revision
2340
2351
2341 If no revision is specified the first current parent will be used.
2352 If no revision is specified the first current parent will be used.
2342
2353
2343 The dirstate will be set to the files of the given revision.
2354 The dirstate will be set to the files of the given revision.
2344 The actual working directory content or existing dirstate
2355 The actual working directory content or existing dirstate
2345 information such as adds or removes is not considered.
2356 information such as adds or removes is not considered.
2346
2357
2347 One use of this command is to make the next :hg:`status` invocation
2358 One use of this command is to make the next :hg:`status` invocation
2348 check the actual file content.
2359 check the actual file content.
2349 """
2360 """
2350 ctx = scmutil.revsingle(repo, rev)
2361 ctx = scmutil.revsingle(repo, rev)
2351 wlock = repo.wlock()
2362 wlock = repo.wlock()
2352 try:
2363 try:
2353 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
2364 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
2354 finally:
2365 finally:
2355 wlock.release()
2366 wlock.release()
2356
2367
2357 @command('debugrename',
2368 @command('debugrename',
2358 [('r', 'rev', '', _('revision to debug'), _('REV'))],
2369 [('r', 'rev', '', _('revision to debug'), _('REV'))],
2359 _('[-r REV] FILE'))
2370 _('[-r REV] FILE'))
2360 def debugrename(ui, repo, file1, *pats, **opts):
2371 def debugrename(ui, repo, file1, *pats, **opts):
2361 """dump rename information"""
2372 """dump rename information"""
2362
2373
2363 ctx = scmutil.revsingle(repo, opts.get('rev'))
2374 ctx = scmutil.revsingle(repo, opts.get('rev'))
2364 m = scmutil.match(ctx, (file1,) + pats, opts)
2375 m = scmutil.match(ctx, (file1,) + pats, opts)
2365 for abs in ctx.walk(m):
2376 for abs in ctx.walk(m):
2366 fctx = ctx[abs]
2377 fctx = ctx[abs]
2367 o = fctx.filelog().renamed(fctx.filenode())
2378 o = fctx.filelog().renamed(fctx.filenode())
2368 rel = m.rel(abs)
2379 rel = m.rel(abs)
2369 if o:
2380 if o:
2370 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
2381 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
2371 else:
2382 else:
2372 ui.write(_("%s not renamed\n") % rel)
2383 ui.write(_("%s not renamed\n") % rel)
2373
2384
2374 @command('debugrevlog',
2385 @command('debugrevlog',
2375 [('c', 'changelog', False, _('open changelog')),
2386 [('c', 'changelog', False, _('open changelog')),
2376 ('m', 'manifest', False, _('open manifest')),
2387 ('m', 'manifest', False, _('open manifest')),
2377 ('d', 'dump', False, _('dump index data'))],
2388 ('d', 'dump', False, _('dump index data'))],
2378 _('-c|-m|FILE'))
2389 _('-c|-m|FILE'))
2379 def debugrevlog(ui, repo, file_=None, **opts):
2390 def debugrevlog(ui, repo, file_=None, **opts):
2380 """show data and statistics about a revlog"""
2391 """show data and statistics about a revlog"""
2381 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2392 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2382
2393
2383 if opts.get("dump"):
2394 if opts.get("dump"):
2384 numrevs = len(r)
2395 numrevs = len(r)
2385 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
2396 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
2386 " rawsize totalsize compression heads\n")
2397 " rawsize totalsize compression heads\n")
2387 ts = 0
2398 ts = 0
2388 heads = set()
2399 heads = set()
2389 for rev in xrange(numrevs):
2400 for rev in xrange(numrevs):
2390 dbase = r.deltaparent(rev)
2401 dbase = r.deltaparent(rev)
2391 if dbase == -1:
2402 if dbase == -1:
2392 dbase = rev
2403 dbase = rev
2393 cbase = r.chainbase(rev)
2404 cbase = r.chainbase(rev)
2394 p1, p2 = r.parentrevs(rev)
2405 p1, p2 = r.parentrevs(rev)
2395 rs = r.rawsize(rev)
2406 rs = r.rawsize(rev)
2396 ts = ts + rs
2407 ts = ts + rs
2397 heads -= set(r.parentrevs(rev))
2408 heads -= set(r.parentrevs(rev))
2398 heads.add(rev)
2409 heads.add(rev)
2399 ui.write("%d %d %d %d %d %d %d %d %d %d %d %d %d\n" %
2410 ui.write("%d %d %d %d %d %d %d %d %d %d %d %d %d\n" %
2400 (rev, p1, p2, r.start(rev), r.end(rev),
2411 (rev, p1, p2, r.start(rev), r.end(rev),
2401 r.start(dbase), r.start(cbase),
2412 r.start(dbase), r.start(cbase),
2402 r.start(p1), r.start(p2),
2413 r.start(p1), r.start(p2),
2403 rs, ts, ts / r.end(rev), len(heads)))
2414 rs, ts, ts / r.end(rev), len(heads)))
2404 return 0
2415 return 0
2405
2416
2406 v = r.version
2417 v = r.version
2407 format = v & 0xFFFF
2418 format = v & 0xFFFF
2408 flags = []
2419 flags = []
2409 gdelta = False
2420 gdelta = False
2410 if v & revlog.REVLOGNGINLINEDATA:
2421 if v & revlog.REVLOGNGINLINEDATA:
2411 flags.append('inline')
2422 flags.append('inline')
2412 if v & revlog.REVLOGGENERALDELTA:
2423 if v & revlog.REVLOGGENERALDELTA:
2413 gdelta = True
2424 gdelta = True
2414 flags.append('generaldelta')
2425 flags.append('generaldelta')
2415 if not flags:
2426 if not flags:
2416 flags = ['(none)']
2427 flags = ['(none)']
2417
2428
2418 nummerges = 0
2429 nummerges = 0
2419 numfull = 0
2430 numfull = 0
2420 numprev = 0
2431 numprev = 0
2421 nump1 = 0
2432 nump1 = 0
2422 nump2 = 0
2433 nump2 = 0
2423 numother = 0
2434 numother = 0
2424 nump1prev = 0
2435 nump1prev = 0
2425 nump2prev = 0
2436 nump2prev = 0
2426 chainlengths = []
2437 chainlengths = []
2427
2438
2428 datasize = [None, 0, 0L]
2439 datasize = [None, 0, 0L]
2429 fullsize = [None, 0, 0L]
2440 fullsize = [None, 0, 0L]
2430 deltasize = [None, 0, 0L]
2441 deltasize = [None, 0, 0L]
2431
2442
2432 def addsize(size, l):
2443 def addsize(size, l):
2433 if l[0] is None or size < l[0]:
2444 if l[0] is None or size < l[0]:
2434 l[0] = size
2445 l[0] = size
2435 if size > l[1]:
2446 if size > l[1]:
2436 l[1] = size
2447 l[1] = size
2437 l[2] += size
2448 l[2] += size
2438
2449
2439 numrevs = len(r)
2450 numrevs = len(r)
2440 for rev in xrange(numrevs):
2451 for rev in xrange(numrevs):
2441 p1, p2 = r.parentrevs(rev)
2452 p1, p2 = r.parentrevs(rev)
2442 delta = r.deltaparent(rev)
2453 delta = r.deltaparent(rev)
2443 if format > 0:
2454 if format > 0:
2444 addsize(r.rawsize(rev), datasize)
2455 addsize(r.rawsize(rev), datasize)
2445 if p2 != nullrev:
2456 if p2 != nullrev:
2446 nummerges += 1
2457 nummerges += 1
2447 size = r.length(rev)
2458 size = r.length(rev)
2448 if delta == nullrev:
2459 if delta == nullrev:
2449 chainlengths.append(0)
2460 chainlengths.append(0)
2450 numfull += 1
2461 numfull += 1
2451 addsize(size, fullsize)
2462 addsize(size, fullsize)
2452 else:
2463 else:
2453 chainlengths.append(chainlengths[delta] + 1)
2464 chainlengths.append(chainlengths[delta] + 1)
2454 addsize(size, deltasize)
2465 addsize(size, deltasize)
2455 if delta == rev - 1:
2466 if delta == rev - 1:
2456 numprev += 1
2467 numprev += 1
2457 if delta == p1:
2468 if delta == p1:
2458 nump1prev += 1
2469 nump1prev += 1
2459 elif delta == p2:
2470 elif delta == p2:
2460 nump2prev += 1
2471 nump2prev += 1
2461 elif delta == p1:
2472 elif delta == p1:
2462 nump1 += 1
2473 nump1 += 1
2463 elif delta == p2:
2474 elif delta == p2:
2464 nump2 += 1
2475 nump2 += 1
2465 elif delta != nullrev:
2476 elif delta != nullrev:
2466 numother += 1
2477 numother += 1
2467
2478
2468 # Adjust size min value for empty cases
2479 # Adjust size min value for empty cases
2469 for size in (datasize, fullsize, deltasize):
2480 for size in (datasize, fullsize, deltasize):
2470 if size[0] is None:
2481 if size[0] is None:
2471 size[0] = 0
2482 size[0] = 0
2472
2483
2473 numdeltas = numrevs - numfull
2484 numdeltas = numrevs - numfull
2474 numoprev = numprev - nump1prev - nump2prev
2485 numoprev = numprev - nump1prev - nump2prev
2475 totalrawsize = datasize[2]
2486 totalrawsize = datasize[2]
2476 datasize[2] /= numrevs
2487 datasize[2] /= numrevs
2477 fulltotal = fullsize[2]
2488 fulltotal = fullsize[2]
2478 fullsize[2] /= numfull
2489 fullsize[2] /= numfull
2479 deltatotal = deltasize[2]
2490 deltatotal = deltasize[2]
2480 if numrevs - numfull > 0:
2491 if numrevs - numfull > 0:
2481 deltasize[2] /= numrevs - numfull
2492 deltasize[2] /= numrevs - numfull
2482 totalsize = fulltotal + deltatotal
2493 totalsize = fulltotal + deltatotal
2483 avgchainlen = sum(chainlengths) / numrevs
2494 avgchainlen = sum(chainlengths) / numrevs
2484 compratio = totalrawsize / totalsize
2495 compratio = totalrawsize / totalsize
2485
2496
2486 basedfmtstr = '%%%dd\n'
2497 basedfmtstr = '%%%dd\n'
2487 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2498 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2488
2499
2489 def dfmtstr(max):
2500 def dfmtstr(max):
2490 return basedfmtstr % len(str(max))
2501 return basedfmtstr % len(str(max))
2491 def pcfmtstr(max, padding=0):
2502 def pcfmtstr(max, padding=0):
2492 return basepcfmtstr % (len(str(max)), ' ' * padding)
2503 return basepcfmtstr % (len(str(max)), ' ' * padding)
2493
2504
2494 def pcfmt(value, total):
2505 def pcfmt(value, total):
2495 return (value, 100 * float(value) / total)
2506 return (value, 100 * float(value) / total)
2496
2507
2497 ui.write(('format : %d\n') % format)
2508 ui.write(('format : %d\n') % format)
2498 ui.write(('flags : %s\n') % ', '.join(flags))
2509 ui.write(('flags : %s\n') % ', '.join(flags))
2499
2510
2500 ui.write('\n')
2511 ui.write('\n')
2501 fmt = pcfmtstr(totalsize)
2512 fmt = pcfmtstr(totalsize)
2502 fmt2 = dfmtstr(totalsize)
2513 fmt2 = dfmtstr(totalsize)
2503 ui.write(('revisions : ') + fmt2 % numrevs)
2514 ui.write(('revisions : ') + fmt2 % numrevs)
2504 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
2515 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
2505 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
2516 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
2506 ui.write(('revisions : ') + fmt2 % numrevs)
2517 ui.write(('revisions : ') + fmt2 % numrevs)
2507 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
2518 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
2508 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
2519 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
2509 ui.write(('revision size : ') + fmt2 % totalsize)
2520 ui.write(('revision size : ') + fmt2 % totalsize)
2510 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
2521 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
2511 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
2522 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
2512
2523
2513 ui.write('\n')
2524 ui.write('\n')
2514 fmt = dfmtstr(max(avgchainlen, compratio))
2525 fmt = dfmtstr(max(avgchainlen, compratio))
2515 ui.write(('avg chain length : ') + fmt % avgchainlen)
2526 ui.write(('avg chain length : ') + fmt % avgchainlen)
2516 ui.write(('compression ratio : ') + fmt % compratio)
2527 ui.write(('compression ratio : ') + fmt % compratio)
2517
2528
2518 if format > 0:
2529 if format > 0:
2519 ui.write('\n')
2530 ui.write('\n')
2520 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
2531 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
2521 % tuple(datasize))
2532 % tuple(datasize))
2522 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
2533 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
2523 % tuple(fullsize))
2534 % tuple(fullsize))
2524 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
2535 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
2525 % tuple(deltasize))
2536 % tuple(deltasize))
2526
2537
2527 if numdeltas > 0:
2538 if numdeltas > 0:
2528 ui.write('\n')
2539 ui.write('\n')
2529 fmt = pcfmtstr(numdeltas)
2540 fmt = pcfmtstr(numdeltas)
2530 fmt2 = pcfmtstr(numdeltas, 4)
2541 fmt2 = pcfmtstr(numdeltas, 4)
2531 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
2542 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
2532 if numprev > 0:
2543 if numprev > 0:
2533 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
2544 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
2534 numprev))
2545 numprev))
2535 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
2546 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
2536 numprev))
2547 numprev))
2537 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
2548 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
2538 numprev))
2549 numprev))
2539 if gdelta:
2550 if gdelta:
2540 ui.write(('deltas against p1 : ')
2551 ui.write(('deltas against p1 : ')
2541 + fmt % pcfmt(nump1, numdeltas))
2552 + fmt % pcfmt(nump1, numdeltas))
2542 ui.write(('deltas against p2 : ')
2553 ui.write(('deltas against p2 : ')
2543 + fmt % pcfmt(nump2, numdeltas))
2554 + fmt % pcfmt(nump2, numdeltas))
2544 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
2555 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
2545 numdeltas))
2556 numdeltas))
2546
2557
2547 @command('debugrevspec', [], ('REVSPEC'))
2558 @command('debugrevspec', [], ('REVSPEC'))
2548 def debugrevspec(ui, repo, expr):
2559 def debugrevspec(ui, repo, expr):
2549 """parse and apply a revision specification
2560 """parse and apply a revision specification
2550
2561
2551 Use --verbose to print the parsed tree before and after aliases
2562 Use --verbose to print the parsed tree before and after aliases
2552 expansion.
2563 expansion.
2553 """
2564 """
2554 if ui.verbose:
2565 if ui.verbose:
2555 tree = revset.parse(expr)[0]
2566 tree = revset.parse(expr)[0]
2556 ui.note(revset.prettyformat(tree), "\n")
2567 ui.note(revset.prettyformat(tree), "\n")
2557 newtree = revset.findaliases(ui, tree)
2568 newtree = revset.findaliases(ui, tree)
2558 if newtree != tree:
2569 if newtree != tree:
2559 ui.note(revset.prettyformat(newtree), "\n")
2570 ui.note(revset.prettyformat(newtree), "\n")
2560 func = revset.match(ui, expr)
2571 func = revset.match(ui, expr)
2561 for c in func(repo, revset.baseset(range(len(repo)))):
2572 for c in func(repo, revset.baseset(range(len(repo)))):
2562 ui.write("%s\n" % c)
2573 ui.write("%s\n" % c)
2563
2574
2564 @command('debugsetparents', [], _('REV1 [REV2]'))
2575 @command('debugsetparents', [], _('REV1 [REV2]'))
2565 def debugsetparents(ui, repo, rev1, rev2=None):
2576 def debugsetparents(ui, repo, rev1, rev2=None):
2566 """manually set the parents of the current working directory
2577 """manually set the parents of the current working directory
2567
2578
2568 This is useful for writing repository conversion tools, but should
2579 This is useful for writing repository conversion tools, but should
2569 be used with care.
2580 be used with care.
2570
2581
2571 Returns 0 on success.
2582 Returns 0 on success.
2572 """
2583 """
2573
2584
2574 r1 = scmutil.revsingle(repo, rev1).node()
2585 r1 = scmutil.revsingle(repo, rev1).node()
2575 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2586 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2576
2587
2577 wlock = repo.wlock()
2588 wlock = repo.wlock()
2578 try:
2589 try:
2579 repo.setparents(r1, r2)
2590 repo.setparents(r1, r2)
2580 finally:
2591 finally:
2581 wlock.release()
2592 wlock.release()
2582
2593
2583 @command('debugdirstate|debugstate',
2594 @command('debugdirstate|debugstate',
2584 [('', 'nodates', None, _('do not display the saved mtime')),
2595 [('', 'nodates', None, _('do not display the saved mtime')),
2585 ('', 'datesort', None, _('sort by saved mtime'))],
2596 ('', 'datesort', None, _('sort by saved mtime'))],
2586 _('[OPTION]...'))
2597 _('[OPTION]...'))
2587 def debugstate(ui, repo, nodates=None, datesort=None):
2598 def debugstate(ui, repo, nodates=None, datesort=None):
2588 """show the contents of the current dirstate"""
2599 """show the contents of the current dirstate"""
2589 timestr = ""
2600 timestr = ""
2590 showdate = not nodates
2601 showdate = not nodates
2591 if datesort:
2602 if datesort:
2592 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2603 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2593 else:
2604 else:
2594 keyfunc = None # sort by filename
2605 keyfunc = None # sort by filename
2595 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2606 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2596 if showdate:
2607 if showdate:
2597 if ent[3] == -1:
2608 if ent[3] == -1:
2598 # Pad or slice to locale representation
2609 # Pad or slice to locale representation
2599 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
2610 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
2600 time.localtime(0)))
2611 time.localtime(0)))
2601 timestr = 'unset'
2612 timestr = 'unset'
2602 timestr = (timestr[:locale_len] +
2613 timestr = (timestr[:locale_len] +
2603 ' ' * (locale_len - len(timestr)))
2614 ' ' * (locale_len - len(timestr)))
2604 else:
2615 else:
2605 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2616 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2606 time.localtime(ent[3]))
2617 time.localtime(ent[3]))
2607 if ent[1] & 020000:
2618 if ent[1] & 020000:
2608 mode = 'lnk'
2619 mode = 'lnk'
2609 else:
2620 else:
2610 mode = '%3o' % (ent[1] & 0777 & ~util.umask)
2621 mode = '%3o' % (ent[1] & 0777 & ~util.umask)
2611 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2622 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2612 for f in repo.dirstate.copies():
2623 for f in repo.dirstate.copies():
2613 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2624 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2614
2625
2615 @command('debugsub',
2626 @command('debugsub',
2616 [('r', 'rev', '',
2627 [('r', 'rev', '',
2617 _('revision to check'), _('REV'))],
2628 _('revision to check'), _('REV'))],
2618 _('[-r REV] [REV]'))
2629 _('[-r REV] [REV]'))
2619 def debugsub(ui, repo, rev=None):
2630 def debugsub(ui, repo, rev=None):
2620 ctx = scmutil.revsingle(repo, rev, None)
2631 ctx = scmutil.revsingle(repo, rev, None)
2621 for k, v in sorted(ctx.substate.items()):
2632 for k, v in sorted(ctx.substate.items()):
2622 ui.write(('path %s\n') % k)
2633 ui.write(('path %s\n') % k)
2623 ui.write((' source %s\n') % v[0])
2634 ui.write((' source %s\n') % v[0])
2624 ui.write((' revision %s\n') % v[1])
2635 ui.write((' revision %s\n') % v[1])
2625
2636
2626 @command('debugsuccessorssets',
2637 @command('debugsuccessorssets',
2627 [],
2638 [],
2628 _('[REV]'))
2639 _('[REV]'))
2629 def debugsuccessorssets(ui, repo, *revs):
2640 def debugsuccessorssets(ui, repo, *revs):
2630 """show set of successors for revision
2641 """show set of successors for revision
2631
2642
2632 A successors set of changeset A is a consistent group of revisions that
2643 A successors set of changeset A is a consistent group of revisions that
2633 succeed A. It contains non-obsolete changesets only.
2644 succeed A. It contains non-obsolete changesets only.
2634
2645
2635 In most cases a changeset A has a single successors set containing a single
2646 In most cases a changeset A has a single successors set containing a single
2636 successor (changeset A replaced by A').
2647 successor (changeset A replaced by A').
2637
2648
2638 A changeset that is made obsolete with no successors are called "pruned".
2649 A changeset that is made obsolete with no successors are called "pruned".
2639 Such changesets have no successors sets at all.
2650 Such changesets have no successors sets at all.
2640
2651
2641 A changeset that has been "split" will have a successors set containing
2652 A changeset that has been "split" will have a successors set containing
2642 more than one successor.
2653 more than one successor.
2643
2654
2644 A changeset that has been rewritten in multiple different ways is called
2655 A changeset that has been rewritten in multiple different ways is called
2645 "divergent". Such changesets have multiple successor sets (each of which
2656 "divergent". Such changesets have multiple successor sets (each of which
2646 may also be split, i.e. have multiple successors).
2657 may also be split, i.e. have multiple successors).
2647
2658
2648 Results are displayed as follows::
2659 Results are displayed as follows::
2649
2660
2650 <rev1>
2661 <rev1>
2651 <successors-1A>
2662 <successors-1A>
2652 <rev2>
2663 <rev2>
2653 <successors-2A>
2664 <successors-2A>
2654 <successors-2B1> <successors-2B2> <successors-2B3>
2665 <successors-2B1> <successors-2B2> <successors-2B3>
2655
2666
2656 Here rev2 has two possible (i.e. divergent) successors sets. The first
2667 Here rev2 has two possible (i.e. divergent) successors sets. The first
2657 holds one element, whereas the second holds three (i.e. the changeset has
2668 holds one element, whereas the second holds three (i.e. the changeset has
2658 been split).
2669 been split).
2659 """
2670 """
2660 # passed to successorssets caching computation from one call to another
2671 # passed to successorssets caching computation from one call to another
2661 cache = {}
2672 cache = {}
2662 ctx2str = str
2673 ctx2str = str
2663 node2str = short
2674 node2str = short
2664 if ui.debug():
2675 if ui.debug():
2665 def ctx2str(ctx):
2676 def ctx2str(ctx):
2666 return ctx.hex()
2677 return ctx.hex()
2667 node2str = hex
2678 node2str = hex
2668 for rev in scmutil.revrange(repo, revs):
2679 for rev in scmutil.revrange(repo, revs):
2669 ctx = repo[rev]
2680 ctx = repo[rev]
2670 ui.write('%s\n'% ctx2str(ctx))
2681 ui.write('%s\n'% ctx2str(ctx))
2671 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
2682 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
2672 if succsset:
2683 if succsset:
2673 ui.write(' ')
2684 ui.write(' ')
2674 ui.write(node2str(succsset[0]))
2685 ui.write(node2str(succsset[0]))
2675 for node in succsset[1:]:
2686 for node in succsset[1:]:
2676 ui.write(' ')
2687 ui.write(' ')
2677 ui.write(node2str(node))
2688 ui.write(node2str(node))
2678 ui.write('\n')
2689 ui.write('\n')
2679
2690
2680 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'))
2691 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'))
2681 def debugwalk(ui, repo, *pats, **opts):
2692 def debugwalk(ui, repo, *pats, **opts):
2682 """show how files match on given patterns"""
2693 """show how files match on given patterns"""
2683 m = scmutil.match(repo[None], pats, opts)
2694 m = scmutil.match(repo[None], pats, opts)
2684 items = list(repo.walk(m))
2695 items = list(repo.walk(m))
2685 if not items:
2696 if not items:
2686 return
2697 return
2687 f = lambda fn: fn
2698 f = lambda fn: fn
2688 if ui.configbool('ui', 'slash') and os.sep != '/':
2699 if ui.configbool('ui', 'slash') and os.sep != '/':
2689 f = lambda fn: util.normpath(fn)
2700 f = lambda fn: util.normpath(fn)
2690 fmt = 'f %%-%ds %%-%ds %%s' % (
2701 fmt = 'f %%-%ds %%-%ds %%s' % (
2691 max([len(abs) for abs in items]),
2702 max([len(abs) for abs in items]),
2692 max([len(m.rel(abs)) for abs in items]))
2703 max([len(m.rel(abs)) for abs in items]))
2693 for abs in items:
2704 for abs in items:
2694 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
2705 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
2695 ui.write("%s\n" % line.rstrip())
2706 ui.write("%s\n" % line.rstrip())
2696
2707
2697 @command('debugwireargs',
2708 @command('debugwireargs',
2698 [('', 'three', '', 'three'),
2709 [('', 'three', '', 'three'),
2699 ('', 'four', '', 'four'),
2710 ('', 'four', '', 'four'),
2700 ('', 'five', '', 'five'),
2711 ('', 'five', '', 'five'),
2701 ] + remoteopts,
2712 ] + remoteopts,
2702 _('REPO [OPTIONS]... [ONE [TWO]]'))
2713 _('REPO [OPTIONS]... [ONE [TWO]]'))
2703 def debugwireargs(ui, repopath, *vals, **opts):
2714 def debugwireargs(ui, repopath, *vals, **opts):
2704 repo = hg.peer(ui, opts, repopath)
2715 repo = hg.peer(ui, opts, repopath)
2705 for opt in remoteopts:
2716 for opt in remoteopts:
2706 del opts[opt[1]]
2717 del opts[opt[1]]
2707 args = {}
2718 args = {}
2708 for k, v in opts.iteritems():
2719 for k, v in opts.iteritems():
2709 if v:
2720 if v:
2710 args[k] = v
2721 args[k] = v
2711 # run twice to check that we don't mess up the stream for the next command
2722 # run twice to check that we don't mess up the stream for the next command
2712 res1 = repo.debugwireargs(*vals, **args)
2723 res1 = repo.debugwireargs(*vals, **args)
2713 res2 = repo.debugwireargs(*vals, **args)
2724 res2 = repo.debugwireargs(*vals, **args)
2714 ui.write("%s\n" % res1)
2725 ui.write("%s\n" % res1)
2715 if res1 != res2:
2726 if res1 != res2:
2716 ui.warn("%s\n" % res2)
2727 ui.warn("%s\n" % res2)
2717
2728
2718 @command('^diff',
2729 @command('^diff',
2719 [('r', 'rev', [], _('revision'), _('REV')),
2730 [('r', 'rev', [], _('revision'), _('REV')),
2720 ('c', 'change', '', _('change made by revision'), _('REV'))
2731 ('c', 'change', '', _('change made by revision'), _('REV'))
2721 ] + diffopts + diffopts2 + walkopts + subrepoopts,
2732 ] + diffopts + diffopts2 + walkopts + subrepoopts,
2722 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'))
2733 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'))
2723 def diff(ui, repo, *pats, **opts):
2734 def diff(ui, repo, *pats, **opts):
2724 """diff repository (or selected files)
2735 """diff repository (or selected files)
2725
2736
2726 Show differences between revisions for the specified files.
2737 Show differences between revisions for the specified files.
2727
2738
2728 Differences between files are shown using the unified diff format.
2739 Differences between files are shown using the unified diff format.
2729
2740
2730 .. note::
2741 .. note::
2731
2742
2732 diff may generate unexpected results for merges, as it will
2743 diff may generate unexpected results for merges, as it will
2733 default to comparing against the working directory's first
2744 default to comparing against the working directory's first
2734 parent changeset if no revisions are specified.
2745 parent changeset if no revisions are specified.
2735
2746
2736 When two revision arguments are given, then changes are shown
2747 When two revision arguments are given, then changes are shown
2737 between those revisions. If only one revision is specified then
2748 between those revisions. If only one revision is specified then
2738 that revision is compared to the working directory, and, when no
2749 that revision is compared to the working directory, and, when no
2739 revisions are specified, the working directory files are compared
2750 revisions are specified, the working directory files are compared
2740 to its parent.
2751 to its parent.
2741
2752
2742 Alternatively you can specify -c/--change with a revision to see
2753 Alternatively you can specify -c/--change with a revision to see
2743 the changes in that changeset relative to its first parent.
2754 the changes in that changeset relative to its first parent.
2744
2755
2745 Without the -a/--text option, diff will avoid generating diffs of
2756 Without the -a/--text option, diff will avoid generating diffs of
2746 files it detects as binary. With -a, diff will generate a diff
2757 files it detects as binary. With -a, diff will generate a diff
2747 anyway, probably with undesirable results.
2758 anyway, probably with undesirable results.
2748
2759
2749 Use the -g/--git option to generate diffs in the git extended diff
2760 Use the -g/--git option to generate diffs in the git extended diff
2750 format. For more information, read :hg:`help diffs`.
2761 format. For more information, read :hg:`help diffs`.
2751
2762
2752 .. container:: verbose
2763 .. container:: verbose
2753
2764
2754 Examples:
2765 Examples:
2755
2766
2756 - compare a file in the current working directory to its parent::
2767 - compare a file in the current working directory to its parent::
2757
2768
2758 hg diff foo.c
2769 hg diff foo.c
2759
2770
2760 - compare two historical versions of a directory, with rename info::
2771 - compare two historical versions of a directory, with rename info::
2761
2772
2762 hg diff --git -r 1.0:1.2 lib/
2773 hg diff --git -r 1.0:1.2 lib/
2763
2774
2764 - get change stats relative to the last change on some date::
2775 - get change stats relative to the last change on some date::
2765
2776
2766 hg diff --stat -r "date('may 2')"
2777 hg diff --stat -r "date('may 2')"
2767
2778
2768 - diff all newly-added files that contain a keyword::
2779 - diff all newly-added files that contain a keyword::
2769
2780
2770 hg diff "set:added() and grep(GNU)"
2781 hg diff "set:added() and grep(GNU)"
2771
2782
2772 - compare a revision and its parents::
2783 - compare a revision and its parents::
2773
2784
2774 hg diff -c 9353 # compare against first parent
2785 hg diff -c 9353 # compare against first parent
2775 hg diff -r 9353^:9353 # same using revset syntax
2786 hg diff -r 9353^:9353 # same using revset syntax
2776 hg diff -r 9353^2:9353 # compare against the second parent
2787 hg diff -r 9353^2:9353 # compare against the second parent
2777
2788
2778 Returns 0 on success.
2789 Returns 0 on success.
2779 """
2790 """
2780
2791
2781 revs = opts.get('rev')
2792 revs = opts.get('rev')
2782 change = opts.get('change')
2793 change = opts.get('change')
2783 stat = opts.get('stat')
2794 stat = opts.get('stat')
2784 reverse = opts.get('reverse')
2795 reverse = opts.get('reverse')
2785
2796
2786 if revs and change:
2797 if revs and change:
2787 msg = _('cannot specify --rev and --change at the same time')
2798 msg = _('cannot specify --rev and --change at the same time')
2788 raise util.Abort(msg)
2799 raise util.Abort(msg)
2789 elif change:
2800 elif change:
2790 node2 = scmutil.revsingle(repo, change, None).node()
2801 node2 = scmutil.revsingle(repo, change, None).node()
2791 node1 = repo[node2].p1().node()
2802 node1 = repo[node2].p1().node()
2792 else:
2803 else:
2793 node1, node2 = scmutil.revpair(repo, revs)
2804 node1, node2 = scmutil.revpair(repo, revs)
2794
2805
2795 if reverse:
2806 if reverse:
2796 node1, node2 = node2, node1
2807 node1, node2 = node2, node1
2797
2808
2798 diffopts = patch.diffopts(ui, opts)
2809 diffopts = patch.diffopts(ui, opts)
2799 m = scmutil.match(repo[node2], pats, opts)
2810 m = scmutil.match(repo[node2], pats, opts)
2800 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
2811 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
2801 listsubrepos=opts.get('subrepos'))
2812 listsubrepos=opts.get('subrepos'))
2802
2813
2803 @command('^export',
2814 @command('^export',
2804 [('o', 'output', '',
2815 [('o', 'output', '',
2805 _('print output to file with formatted name'), _('FORMAT')),
2816 _('print output to file with formatted name'), _('FORMAT')),
2806 ('', 'switch-parent', None, _('diff against the second parent')),
2817 ('', 'switch-parent', None, _('diff against the second parent')),
2807 ('r', 'rev', [], _('revisions to export'), _('REV')),
2818 ('r', 'rev', [], _('revisions to export'), _('REV')),
2808 ] + diffopts,
2819 ] + diffopts,
2809 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
2820 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
2810 def export(ui, repo, *changesets, **opts):
2821 def export(ui, repo, *changesets, **opts):
2811 """dump the header and diffs for one or more changesets
2822 """dump the header and diffs for one or more changesets
2812
2823
2813 Print the changeset header and diffs for one or more revisions.
2824 Print the changeset header and diffs for one or more revisions.
2814 If no revision is given, the parent of the working directory is used.
2825 If no revision is given, the parent of the working directory is used.
2815
2826
2816 The information shown in the changeset header is: author, date,
2827 The information shown in the changeset header is: author, date,
2817 branch name (if non-default), changeset hash, parent(s) and commit
2828 branch name (if non-default), changeset hash, parent(s) and commit
2818 comment.
2829 comment.
2819
2830
2820 .. note::
2831 .. note::
2821
2832
2822 export may generate unexpected diff output for merge
2833 export may generate unexpected diff output for merge
2823 changesets, as it will compare the merge changeset against its
2834 changesets, as it will compare the merge changeset against its
2824 first parent only.
2835 first parent only.
2825
2836
2826 Output may be to a file, in which case the name of the file is
2837 Output may be to a file, in which case the name of the file is
2827 given using a format string. The formatting rules are as follows:
2838 given using a format string. The formatting rules are as follows:
2828
2839
2829 :``%%``: literal "%" character
2840 :``%%``: literal "%" character
2830 :``%H``: changeset hash (40 hexadecimal digits)
2841 :``%H``: changeset hash (40 hexadecimal digits)
2831 :``%N``: number of patches being generated
2842 :``%N``: number of patches being generated
2832 :``%R``: changeset revision number
2843 :``%R``: changeset revision number
2833 :``%b``: basename of the exporting repository
2844 :``%b``: basename of the exporting repository
2834 :``%h``: short-form changeset hash (12 hexadecimal digits)
2845 :``%h``: short-form changeset hash (12 hexadecimal digits)
2835 :``%m``: first line of the commit message (only alphanumeric characters)
2846 :``%m``: first line of the commit message (only alphanumeric characters)
2836 :``%n``: zero-padded sequence number, starting at 1
2847 :``%n``: zero-padded sequence number, starting at 1
2837 :``%r``: zero-padded changeset revision number
2848 :``%r``: zero-padded changeset revision number
2838
2849
2839 Without the -a/--text option, export will avoid generating diffs
2850 Without the -a/--text option, export will avoid generating diffs
2840 of files it detects as binary. With -a, export will generate a
2851 of files it detects as binary. With -a, export will generate a
2841 diff anyway, probably with undesirable results.
2852 diff anyway, probably with undesirable results.
2842
2853
2843 Use the -g/--git option to generate diffs in the git extended diff
2854 Use the -g/--git option to generate diffs in the git extended diff
2844 format. See :hg:`help diffs` for more information.
2855 format. See :hg:`help diffs` for more information.
2845
2856
2846 With the --switch-parent option, the diff will be against the
2857 With the --switch-parent option, the diff will be against the
2847 second parent. It can be useful to review a merge.
2858 second parent. It can be useful to review a merge.
2848
2859
2849 .. container:: verbose
2860 .. container:: verbose
2850
2861
2851 Examples:
2862 Examples:
2852
2863
2853 - use export and import to transplant a bugfix to the current
2864 - use export and import to transplant a bugfix to the current
2854 branch::
2865 branch::
2855
2866
2856 hg export -r 9353 | hg import -
2867 hg export -r 9353 | hg import -
2857
2868
2858 - export all the changesets between two revisions to a file with
2869 - export all the changesets between two revisions to a file with
2859 rename information::
2870 rename information::
2860
2871
2861 hg export --git -r 123:150 > changes.txt
2872 hg export --git -r 123:150 > changes.txt
2862
2873
2863 - split outgoing changes into a series of patches with
2874 - split outgoing changes into a series of patches with
2864 descriptive names::
2875 descriptive names::
2865
2876
2866 hg export -r "outgoing()" -o "%n-%m.patch"
2877 hg export -r "outgoing()" -o "%n-%m.patch"
2867
2878
2868 Returns 0 on success.
2879 Returns 0 on success.
2869 """
2880 """
2870 changesets += tuple(opts.get('rev', []))
2881 changesets += tuple(opts.get('rev', []))
2871 if not changesets:
2882 if not changesets:
2872 changesets = ['.']
2883 changesets = ['.']
2873 revs = scmutil.revrange(repo, changesets)
2884 revs = scmutil.revrange(repo, changesets)
2874 if not revs:
2885 if not revs:
2875 raise util.Abort(_("export requires at least one changeset"))
2886 raise util.Abort(_("export requires at least one changeset"))
2876 if len(revs) > 1:
2887 if len(revs) > 1:
2877 ui.note(_('exporting patches:\n'))
2888 ui.note(_('exporting patches:\n'))
2878 else:
2889 else:
2879 ui.note(_('exporting patch:\n'))
2890 ui.note(_('exporting patch:\n'))
2880 cmdutil.export(repo, revs, template=opts.get('output'),
2891 cmdutil.export(repo, revs, template=opts.get('output'),
2881 switch_parent=opts.get('switch_parent'),
2892 switch_parent=opts.get('switch_parent'),
2882 opts=patch.diffopts(ui, opts))
2893 opts=patch.diffopts(ui, opts))
2883
2894
2884 @command('^forget', walkopts, _('[OPTION]... FILE...'))
2895 @command('^forget', walkopts, _('[OPTION]... FILE...'))
2885 def forget(ui, repo, *pats, **opts):
2896 def forget(ui, repo, *pats, **opts):
2886 """forget the specified files on the next commit
2897 """forget the specified files on the next commit
2887
2898
2888 Mark the specified files so they will no longer be tracked
2899 Mark the specified files so they will no longer be tracked
2889 after the next commit.
2900 after the next commit.
2890
2901
2891 This only removes files from the current branch, not from the
2902 This only removes files from the current branch, not from the
2892 entire project history, and it does not delete them from the
2903 entire project history, and it does not delete them from the
2893 working directory.
2904 working directory.
2894
2905
2895 To undo a forget before the next commit, see :hg:`add`.
2906 To undo a forget before the next commit, see :hg:`add`.
2896
2907
2897 .. container:: verbose
2908 .. container:: verbose
2898
2909
2899 Examples:
2910 Examples:
2900
2911
2901 - forget newly-added binary files::
2912 - forget newly-added binary files::
2902
2913
2903 hg forget "set:added() and binary()"
2914 hg forget "set:added() and binary()"
2904
2915
2905 - forget files that would be excluded by .hgignore::
2916 - forget files that would be excluded by .hgignore::
2906
2917
2907 hg forget "set:hgignore()"
2918 hg forget "set:hgignore()"
2908
2919
2909 Returns 0 on success.
2920 Returns 0 on success.
2910 """
2921 """
2911
2922
2912 if not pats:
2923 if not pats:
2913 raise util.Abort(_('no files specified'))
2924 raise util.Abort(_('no files specified'))
2914
2925
2915 m = scmutil.match(repo[None], pats, opts)
2926 m = scmutil.match(repo[None], pats, opts)
2916 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2927 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2917 return rejected and 1 or 0
2928 return rejected and 1 or 0
2918
2929
2919 @command(
2930 @command(
2920 'graft',
2931 'graft',
2921 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2932 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2922 ('c', 'continue', False, _('resume interrupted graft')),
2933 ('c', 'continue', False, _('resume interrupted graft')),
2923 ('e', 'edit', False, _('invoke editor on commit messages')),
2934 ('e', 'edit', False, _('invoke editor on commit messages')),
2924 ('', 'log', None, _('append graft info to log message')),
2935 ('', 'log', None, _('append graft info to log message')),
2925 ('D', 'currentdate', False,
2936 ('D', 'currentdate', False,
2926 _('record the current date as commit date')),
2937 _('record the current date as commit date')),
2927 ('U', 'currentuser', False,
2938 ('U', 'currentuser', False,
2928 _('record the current user as committer'), _('DATE'))]
2939 _('record the current user as committer'), _('DATE'))]
2929 + commitopts2 + mergetoolopts + dryrunopts,
2940 + commitopts2 + mergetoolopts + dryrunopts,
2930 _('[OPTION]... [-r] REV...'))
2941 _('[OPTION]... [-r] REV...'))
2931 def graft(ui, repo, *revs, **opts):
2942 def graft(ui, repo, *revs, **opts):
2932 '''copy changes from other branches onto the current branch
2943 '''copy changes from other branches onto the current branch
2933
2944
2934 This command uses Mercurial's merge logic to copy individual
2945 This command uses Mercurial's merge logic to copy individual
2935 changes from other branches without merging branches in the
2946 changes from other branches without merging branches in the
2936 history graph. This is sometimes known as 'backporting' or
2947 history graph. This is sometimes known as 'backporting' or
2937 'cherry-picking'. By default, graft will copy user, date, and
2948 'cherry-picking'. By default, graft will copy user, date, and
2938 description from the source changesets.
2949 description from the source changesets.
2939
2950
2940 Changesets that are ancestors of the current revision, that have
2951 Changesets that are ancestors of the current revision, that have
2941 already been grafted, or that are merges will be skipped.
2952 already been grafted, or that are merges will be skipped.
2942
2953
2943 If --log is specified, log messages will have a comment appended
2954 If --log is specified, log messages will have a comment appended
2944 of the form::
2955 of the form::
2945
2956
2946 (grafted from CHANGESETHASH)
2957 (grafted from CHANGESETHASH)
2947
2958
2948 If a graft merge results in conflicts, the graft process is
2959 If a graft merge results in conflicts, the graft process is
2949 interrupted so that the current merge can be manually resolved.
2960 interrupted so that the current merge can be manually resolved.
2950 Once all conflicts are addressed, the graft process can be
2961 Once all conflicts are addressed, the graft process can be
2951 continued with the -c/--continue option.
2962 continued with the -c/--continue option.
2952
2963
2953 .. note::
2964 .. note::
2954
2965
2955 The -c/--continue option does not reapply earlier options.
2966 The -c/--continue option does not reapply earlier options.
2956
2967
2957 .. container:: verbose
2968 .. container:: verbose
2958
2969
2959 Examples:
2970 Examples:
2960
2971
2961 - copy a single change to the stable branch and edit its description::
2972 - copy a single change to the stable branch and edit its description::
2962
2973
2963 hg update stable
2974 hg update stable
2964 hg graft --edit 9393
2975 hg graft --edit 9393
2965
2976
2966 - graft a range of changesets with one exception, updating dates::
2977 - graft a range of changesets with one exception, updating dates::
2967
2978
2968 hg graft -D "2085::2093 and not 2091"
2979 hg graft -D "2085::2093 and not 2091"
2969
2980
2970 - continue a graft after resolving conflicts::
2981 - continue a graft after resolving conflicts::
2971
2982
2972 hg graft -c
2983 hg graft -c
2973
2984
2974 - show the source of a grafted changeset::
2985 - show the source of a grafted changeset::
2975
2986
2976 hg log --debug -r .
2987 hg log --debug -r .
2977
2988
2978 Returns 0 on successful completion.
2989 Returns 0 on successful completion.
2979 '''
2990 '''
2980
2991
2981 revs = list(revs)
2992 revs = list(revs)
2982 revs.extend(opts['rev'])
2993 revs.extend(opts['rev'])
2983
2994
2984 if not opts.get('user') and opts.get('currentuser'):
2995 if not opts.get('user') and opts.get('currentuser'):
2985 opts['user'] = ui.username()
2996 opts['user'] = ui.username()
2986 if not opts.get('date') and opts.get('currentdate'):
2997 if not opts.get('date') and opts.get('currentdate'):
2987 opts['date'] = "%d %d" % util.makedate()
2998 opts['date'] = "%d %d" % util.makedate()
2988
2999
2989 editor = None
3000 editor = None
2990 if opts.get('edit'):
3001 if opts.get('edit'):
2991 editor = cmdutil.commitforceeditor
3002 editor = cmdutil.commitforceeditor
2992
3003
2993 cont = False
3004 cont = False
2994 if opts['continue']:
3005 if opts['continue']:
2995 cont = True
3006 cont = True
2996 if revs:
3007 if revs:
2997 raise util.Abort(_("can't specify --continue and revisions"))
3008 raise util.Abort(_("can't specify --continue and revisions"))
2998 # read in unfinished revisions
3009 # read in unfinished revisions
2999 try:
3010 try:
3000 nodes = repo.opener.read('graftstate').splitlines()
3011 nodes = repo.opener.read('graftstate').splitlines()
3001 revs = [repo[node].rev() for node in nodes]
3012 revs = [repo[node].rev() for node in nodes]
3002 except IOError, inst:
3013 except IOError, inst:
3003 if inst.errno != errno.ENOENT:
3014 if inst.errno != errno.ENOENT:
3004 raise
3015 raise
3005 raise util.Abort(_("no graft state found, can't continue"))
3016 raise util.Abort(_("no graft state found, can't continue"))
3006 else:
3017 else:
3007 cmdutil.checkunfinished(repo)
3018 cmdutil.checkunfinished(repo)
3008 cmdutil.bailifchanged(repo)
3019 cmdutil.bailifchanged(repo)
3009 if not revs:
3020 if not revs:
3010 raise util.Abort(_('no revisions specified'))
3021 raise util.Abort(_('no revisions specified'))
3011 revs = scmutil.revrange(repo, revs)
3022 revs = scmutil.revrange(repo, revs)
3012
3023
3013 # check for merges
3024 # check for merges
3014 for rev in repo.revs('%ld and merge()', revs):
3025 for rev in repo.revs('%ld and merge()', revs):
3015 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
3026 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
3016 revs.remove(rev)
3027 revs.remove(rev)
3017 if not revs:
3028 if not revs:
3018 return -1
3029 return -1
3019
3030
3020 # check for ancestors of dest branch
3031 # check for ancestors of dest branch
3021 crev = repo['.'].rev()
3032 crev = repo['.'].rev()
3022 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3033 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3023 # don't mutate while iterating, create a copy
3034 # don't mutate while iterating, create a copy
3024 for rev in list(revs):
3035 for rev in list(revs):
3025 if rev in ancestors:
3036 if rev in ancestors:
3026 ui.warn(_('skipping ancestor revision %s\n') % rev)
3037 ui.warn(_('skipping ancestor revision %s\n') % rev)
3027 revs.remove(rev)
3038 revs.remove(rev)
3028 if not revs:
3039 if not revs:
3029 return -1
3040 return -1
3030
3041
3031 # analyze revs for earlier grafts
3042 # analyze revs for earlier grafts
3032 ids = {}
3043 ids = {}
3033 for ctx in repo.set("%ld", revs):
3044 for ctx in repo.set("%ld", revs):
3034 ids[ctx.hex()] = ctx.rev()
3045 ids[ctx.hex()] = ctx.rev()
3035 n = ctx.extra().get('source')
3046 n = ctx.extra().get('source')
3036 if n:
3047 if n:
3037 ids[n] = ctx.rev()
3048 ids[n] = ctx.rev()
3038
3049
3039 # check ancestors for earlier grafts
3050 # check ancestors for earlier grafts
3040 ui.debug('scanning for duplicate grafts\n')
3051 ui.debug('scanning for duplicate grafts\n')
3041
3052
3042 for rev in repo.changelog.findmissingrevs(revs, [crev]):
3053 for rev in repo.changelog.findmissingrevs(revs, [crev]):
3043 ctx = repo[rev]
3054 ctx = repo[rev]
3044 n = ctx.extra().get('source')
3055 n = ctx.extra().get('source')
3045 if n in ids:
3056 if n in ids:
3046 r = repo[n].rev()
3057 r = repo[n].rev()
3047 if r in revs:
3058 if r in revs:
3048 ui.warn(_('skipping revision %s (already grafted to %s)\n')
3059 ui.warn(_('skipping revision %s (already grafted to %s)\n')
3049 % (r, rev))
3060 % (r, rev))
3050 revs.remove(r)
3061 revs.remove(r)
3051 elif ids[n] in revs:
3062 elif ids[n] in revs:
3052 ui.warn(_('skipping already grafted revision %s '
3063 ui.warn(_('skipping already grafted revision %s '
3053 '(%s also has origin %d)\n') % (ids[n], rev, r))
3064 '(%s also has origin %d)\n') % (ids[n], rev, r))
3054 revs.remove(ids[n])
3065 revs.remove(ids[n])
3055 elif ctx.hex() in ids:
3066 elif ctx.hex() in ids:
3056 r = ids[ctx.hex()]
3067 r = ids[ctx.hex()]
3057 ui.warn(_('skipping already grafted revision %s '
3068 ui.warn(_('skipping already grafted revision %s '
3058 '(was grafted from %d)\n') % (r, rev))
3069 '(was grafted from %d)\n') % (r, rev))
3059 revs.remove(r)
3070 revs.remove(r)
3060 if not revs:
3071 if not revs:
3061 return -1
3072 return -1
3062
3073
3063 wlock = repo.wlock()
3074 wlock = repo.wlock()
3064 try:
3075 try:
3065 current = repo['.']
3076 current = repo['.']
3066 for pos, ctx in enumerate(repo.set("%ld", revs)):
3077 for pos, ctx in enumerate(repo.set("%ld", revs)):
3067
3078
3068 ui.status(_('grafting revision %s\n') % ctx.rev())
3079 ui.status(_('grafting revision %s\n') % ctx.rev())
3069 if opts.get('dry_run'):
3080 if opts.get('dry_run'):
3070 continue
3081 continue
3071
3082
3072 source = ctx.extra().get('source')
3083 source = ctx.extra().get('source')
3073 if not source:
3084 if not source:
3074 source = ctx.hex()
3085 source = ctx.hex()
3075 extra = {'source': source}
3086 extra = {'source': source}
3076 user = ctx.user()
3087 user = ctx.user()
3077 if opts.get('user'):
3088 if opts.get('user'):
3078 user = opts['user']
3089 user = opts['user']
3079 date = ctx.date()
3090 date = ctx.date()
3080 if opts.get('date'):
3091 if opts.get('date'):
3081 date = opts['date']
3092 date = opts['date']
3082 message = ctx.description()
3093 message = ctx.description()
3083 if opts.get('log'):
3094 if opts.get('log'):
3084 message += '\n(grafted from %s)' % ctx.hex()
3095 message += '\n(grafted from %s)' % ctx.hex()
3085
3096
3086 # we don't merge the first commit when continuing
3097 # we don't merge the first commit when continuing
3087 if not cont:
3098 if not cont:
3088 # perform the graft merge with p1(rev) as 'ancestor'
3099 # perform the graft merge with p1(rev) as 'ancestor'
3089 try:
3100 try:
3090 # ui.forcemerge is an internal variable, do not document
3101 # ui.forcemerge is an internal variable, do not document
3091 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
3102 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
3092 stats = mergemod.update(repo, ctx.node(), True, True, False,
3103 stats = mergemod.update(repo, ctx.node(), True, True, False,
3093 ctx.p1().node())
3104 ctx.p1().node())
3094 finally:
3105 finally:
3095 repo.ui.setconfig('ui', 'forcemerge', '')
3106 repo.ui.setconfig('ui', 'forcemerge', '')
3096 # report any conflicts
3107 # report any conflicts
3097 if stats and stats[3] > 0:
3108 if stats and stats[3] > 0:
3098 # write out state for --continue
3109 # write out state for --continue
3099 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
3110 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
3100 repo.opener.write('graftstate', ''.join(nodelines))
3111 repo.opener.write('graftstate', ''.join(nodelines))
3101 raise util.Abort(
3112 raise util.Abort(
3102 _("unresolved conflicts, can't continue"),
3113 _("unresolved conflicts, can't continue"),
3103 hint=_('use hg resolve and hg graft --continue'))
3114 hint=_('use hg resolve and hg graft --continue'))
3104 else:
3115 else:
3105 cont = False
3116 cont = False
3106
3117
3107 # drop the second merge parent
3118 # drop the second merge parent
3108 repo.setparents(current.node(), nullid)
3119 repo.setparents(current.node(), nullid)
3109 repo.dirstate.write()
3120 repo.dirstate.write()
3110 # fix up dirstate for copies and renames
3121 # fix up dirstate for copies and renames
3111 cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())
3122 cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())
3112
3123
3113 # commit
3124 # commit
3114 node = repo.commit(text=message, user=user,
3125 node = repo.commit(text=message, user=user,
3115 date=date, extra=extra, editor=editor)
3126 date=date, extra=extra, editor=editor)
3116 if node is None:
3127 if node is None:
3117 ui.status(_('graft for revision %s is empty\n') % ctx.rev())
3128 ui.status(_('graft for revision %s is empty\n') % ctx.rev())
3118 else:
3129 else:
3119 current = repo[node]
3130 current = repo[node]
3120 finally:
3131 finally:
3121 wlock.release()
3132 wlock.release()
3122
3133
3123 # remove state when we complete successfully
3134 # remove state when we complete successfully
3124 if not opts.get('dry_run'):
3135 if not opts.get('dry_run'):
3125 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
3136 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
3126
3137
3127 return 0
3138 return 0
3128
3139
3129 @command('grep',
3140 @command('grep',
3130 [('0', 'print0', None, _('end fields with NUL')),
3141 [('0', 'print0', None, _('end fields with NUL')),
3131 ('', 'all', None, _('print all revisions that match')),
3142 ('', 'all', None, _('print all revisions that match')),
3132 ('a', 'text', None, _('treat all files as text')),
3143 ('a', 'text', None, _('treat all files as text')),
3133 ('f', 'follow', None,
3144 ('f', 'follow', None,
3134 _('follow changeset history,'
3145 _('follow changeset history,'
3135 ' or file history across copies and renames')),
3146 ' or file history across copies and renames')),
3136 ('i', 'ignore-case', None, _('ignore case when matching')),
3147 ('i', 'ignore-case', None, _('ignore case when matching')),
3137 ('l', 'files-with-matches', None,
3148 ('l', 'files-with-matches', None,
3138 _('print only filenames and revisions that match')),
3149 _('print only filenames and revisions that match')),
3139 ('n', 'line-number', None, _('print matching line numbers')),
3150 ('n', 'line-number', None, _('print matching line numbers')),
3140 ('r', 'rev', [],
3151 ('r', 'rev', [],
3141 _('only search files changed within revision range'), _('REV')),
3152 _('only search files changed within revision range'), _('REV')),
3142 ('u', 'user', None, _('list the author (long with -v)')),
3153 ('u', 'user', None, _('list the author (long with -v)')),
3143 ('d', 'date', None, _('list the date (short with -q)')),
3154 ('d', 'date', None, _('list the date (short with -q)')),
3144 ] + walkopts,
3155 ] + walkopts,
3145 _('[OPTION]... PATTERN [FILE]...'))
3156 _('[OPTION]... PATTERN [FILE]...'))
3146 def grep(ui, repo, pattern, *pats, **opts):
3157 def grep(ui, repo, pattern, *pats, **opts):
3147 """search for a pattern in specified files and revisions
3158 """search for a pattern in specified files and revisions
3148
3159
3149 Search revisions of files for a regular expression.
3160 Search revisions of files for a regular expression.
3150
3161
3151 This command behaves differently than Unix grep. It only accepts
3162 This command behaves differently than Unix grep. It only accepts
3152 Python/Perl regexps. It searches repository history, not the
3163 Python/Perl regexps. It searches repository history, not the
3153 working directory. It always prints the revision number in which a
3164 working directory. It always prints the revision number in which a
3154 match appears.
3165 match appears.
3155
3166
3156 By default, grep only prints output for the first revision of a
3167 By default, grep only prints output for the first revision of a
3157 file in which it finds a match. To get it to print every revision
3168 file in which it finds a match. To get it to print every revision
3158 that contains a change in match status ("-" for a match that
3169 that contains a change in match status ("-" for a match that
3159 becomes a non-match, or "+" for a non-match that becomes a match),
3170 becomes a non-match, or "+" for a non-match that becomes a match),
3160 use the --all flag.
3171 use the --all flag.
3161
3172
3162 Returns 0 if a match is found, 1 otherwise.
3173 Returns 0 if a match is found, 1 otherwise.
3163 """
3174 """
3164 reflags = re.M
3175 reflags = re.M
3165 if opts.get('ignore_case'):
3176 if opts.get('ignore_case'):
3166 reflags |= re.I
3177 reflags |= re.I
3167 try:
3178 try:
3168 regexp = util.compilere(pattern, reflags)
3179 regexp = util.compilere(pattern, reflags)
3169 except re.error, inst:
3180 except re.error, inst:
3170 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
3181 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
3171 return 1
3182 return 1
3172 sep, eol = ':', '\n'
3183 sep, eol = ':', '\n'
3173 if opts.get('print0'):
3184 if opts.get('print0'):
3174 sep = eol = '\0'
3185 sep = eol = '\0'
3175
3186
3176 getfile = util.lrucachefunc(repo.file)
3187 getfile = util.lrucachefunc(repo.file)
3177
3188
3178 def matchlines(body):
3189 def matchlines(body):
3179 begin = 0
3190 begin = 0
3180 linenum = 0
3191 linenum = 0
3181 while begin < len(body):
3192 while begin < len(body):
3182 match = regexp.search(body, begin)
3193 match = regexp.search(body, begin)
3183 if not match:
3194 if not match:
3184 break
3195 break
3185 mstart, mend = match.span()
3196 mstart, mend = match.span()
3186 linenum += body.count('\n', begin, mstart) + 1
3197 linenum += body.count('\n', begin, mstart) + 1
3187 lstart = body.rfind('\n', begin, mstart) + 1 or begin
3198 lstart = body.rfind('\n', begin, mstart) + 1 or begin
3188 begin = body.find('\n', mend) + 1 or len(body) + 1
3199 begin = body.find('\n', mend) + 1 or len(body) + 1
3189 lend = begin - 1
3200 lend = begin - 1
3190 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3201 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3191
3202
3192 class linestate(object):
3203 class linestate(object):
3193 def __init__(self, line, linenum, colstart, colend):
3204 def __init__(self, line, linenum, colstart, colend):
3194 self.line = line
3205 self.line = line
3195 self.linenum = linenum
3206 self.linenum = linenum
3196 self.colstart = colstart
3207 self.colstart = colstart
3197 self.colend = colend
3208 self.colend = colend
3198
3209
3199 def __hash__(self):
3210 def __hash__(self):
3200 return hash((self.linenum, self.line))
3211 return hash((self.linenum, self.line))
3201
3212
3202 def __eq__(self, other):
3213 def __eq__(self, other):
3203 return self.line == other.line
3214 return self.line == other.line
3204
3215
3205 matches = {}
3216 matches = {}
3206 copies = {}
3217 copies = {}
3207 def grepbody(fn, rev, body):
3218 def grepbody(fn, rev, body):
3208 matches[rev].setdefault(fn, [])
3219 matches[rev].setdefault(fn, [])
3209 m = matches[rev][fn]
3220 m = matches[rev][fn]
3210 for lnum, cstart, cend, line in matchlines(body):
3221 for lnum, cstart, cend, line in matchlines(body):
3211 s = linestate(line, lnum, cstart, cend)
3222 s = linestate(line, lnum, cstart, cend)
3212 m.append(s)
3223 m.append(s)
3213
3224
3214 def difflinestates(a, b):
3225 def difflinestates(a, b):
3215 sm = difflib.SequenceMatcher(None, a, b)
3226 sm = difflib.SequenceMatcher(None, a, b)
3216 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3227 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3217 if tag == 'insert':
3228 if tag == 'insert':
3218 for i in xrange(blo, bhi):
3229 for i in xrange(blo, bhi):
3219 yield ('+', b[i])
3230 yield ('+', b[i])
3220 elif tag == 'delete':
3231 elif tag == 'delete':
3221 for i in xrange(alo, ahi):
3232 for i in xrange(alo, ahi):
3222 yield ('-', a[i])
3233 yield ('-', a[i])
3223 elif tag == 'replace':
3234 elif tag == 'replace':
3224 for i in xrange(alo, ahi):
3235 for i in xrange(alo, ahi):
3225 yield ('-', a[i])
3236 yield ('-', a[i])
3226 for i in xrange(blo, bhi):
3237 for i in xrange(blo, bhi):
3227 yield ('+', b[i])
3238 yield ('+', b[i])
3228
3239
3229 def display(fn, ctx, pstates, states):
3240 def display(fn, ctx, pstates, states):
3230 rev = ctx.rev()
3241 rev = ctx.rev()
3231 datefunc = ui.quiet and util.shortdate or util.datestr
3242 datefunc = ui.quiet and util.shortdate or util.datestr
3232 found = False
3243 found = False
3233 filerevmatches = {}
3244 filerevmatches = {}
3234 def binary():
3245 def binary():
3235 flog = getfile(fn)
3246 flog = getfile(fn)
3236 return util.binary(flog.read(ctx.filenode(fn)))
3247 return util.binary(flog.read(ctx.filenode(fn)))
3237
3248
3238 if opts.get('all'):
3249 if opts.get('all'):
3239 iter = difflinestates(pstates, states)
3250 iter = difflinestates(pstates, states)
3240 else:
3251 else:
3241 iter = [('', l) for l in states]
3252 iter = [('', l) for l in states]
3242 for change, l in iter:
3253 for change, l in iter:
3243 cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
3254 cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
3244 before, match, after = None, None, None
3255 before, match, after = None, None, None
3245
3256
3246 if opts.get('line_number'):
3257 if opts.get('line_number'):
3247 cols.append((str(l.linenum), 'grep.linenumber'))
3258 cols.append((str(l.linenum), 'grep.linenumber'))
3248 if opts.get('all'):
3259 if opts.get('all'):
3249 cols.append((change, 'grep.change'))
3260 cols.append((change, 'grep.change'))
3250 if opts.get('user'):
3261 if opts.get('user'):
3251 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
3262 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
3252 if opts.get('date'):
3263 if opts.get('date'):
3253 cols.append((datefunc(ctx.date()), 'grep.date'))
3264 cols.append((datefunc(ctx.date()), 'grep.date'))
3254 if opts.get('files_with_matches'):
3265 if opts.get('files_with_matches'):
3255 c = (fn, rev)
3266 c = (fn, rev)
3256 if c in filerevmatches:
3267 if c in filerevmatches:
3257 continue
3268 continue
3258 filerevmatches[c] = 1
3269 filerevmatches[c] = 1
3259 else:
3270 else:
3260 before = l.line[:l.colstart]
3271 before = l.line[:l.colstart]
3261 match = l.line[l.colstart:l.colend]
3272 match = l.line[l.colstart:l.colend]
3262 after = l.line[l.colend:]
3273 after = l.line[l.colend:]
3263 for col, label in cols[:-1]:
3274 for col, label in cols[:-1]:
3264 ui.write(col, label=label)
3275 ui.write(col, label=label)
3265 ui.write(sep, label='grep.sep')
3276 ui.write(sep, label='grep.sep')
3266 ui.write(cols[-1][0], label=cols[-1][1])
3277 ui.write(cols[-1][0], label=cols[-1][1])
3267 if before is not None:
3278 if before is not None:
3268 ui.write(sep, label='grep.sep')
3279 ui.write(sep, label='grep.sep')
3269 if not opts.get('text') and binary():
3280 if not opts.get('text') and binary():
3270 ui.write(" Binary file matches")
3281 ui.write(" Binary file matches")
3271 else:
3282 else:
3272 ui.write(before)
3283 ui.write(before)
3273 ui.write(match, label='grep.match')
3284 ui.write(match, label='grep.match')
3274 ui.write(after)
3285 ui.write(after)
3275 ui.write(eol)
3286 ui.write(eol)
3276 found = True
3287 found = True
3277 return found
3288 return found
3278
3289
3279 skip = {}
3290 skip = {}
3280 revfiles = {}
3291 revfiles = {}
3281 matchfn = scmutil.match(repo[None], pats, opts)
3292 matchfn = scmutil.match(repo[None], pats, opts)
3282 found = False
3293 found = False
3283 follow = opts.get('follow')
3294 follow = opts.get('follow')
3284
3295
3285 def prep(ctx, fns):
3296 def prep(ctx, fns):
3286 rev = ctx.rev()
3297 rev = ctx.rev()
3287 pctx = ctx.p1()
3298 pctx = ctx.p1()
3288 parent = pctx.rev()
3299 parent = pctx.rev()
3289 matches.setdefault(rev, {})
3300 matches.setdefault(rev, {})
3290 matches.setdefault(parent, {})
3301 matches.setdefault(parent, {})
3291 files = revfiles.setdefault(rev, [])
3302 files = revfiles.setdefault(rev, [])
3292 for fn in fns:
3303 for fn in fns:
3293 flog = getfile(fn)
3304 flog = getfile(fn)
3294 try:
3305 try:
3295 fnode = ctx.filenode(fn)
3306 fnode = ctx.filenode(fn)
3296 except error.LookupError:
3307 except error.LookupError:
3297 continue
3308 continue
3298
3309
3299 copied = flog.renamed(fnode)
3310 copied = flog.renamed(fnode)
3300 copy = follow and copied and copied[0]
3311 copy = follow and copied and copied[0]
3301 if copy:
3312 if copy:
3302 copies.setdefault(rev, {})[fn] = copy
3313 copies.setdefault(rev, {})[fn] = copy
3303 if fn in skip:
3314 if fn in skip:
3304 if copy:
3315 if copy:
3305 skip[copy] = True
3316 skip[copy] = True
3306 continue
3317 continue
3307 files.append(fn)
3318 files.append(fn)
3308
3319
3309 if fn not in matches[rev]:
3320 if fn not in matches[rev]:
3310 grepbody(fn, rev, flog.read(fnode))
3321 grepbody(fn, rev, flog.read(fnode))
3311
3322
3312 pfn = copy or fn
3323 pfn = copy or fn
3313 if pfn not in matches[parent]:
3324 if pfn not in matches[parent]:
3314 try:
3325 try:
3315 fnode = pctx.filenode(pfn)
3326 fnode = pctx.filenode(pfn)
3316 grepbody(pfn, parent, flog.read(fnode))
3327 grepbody(pfn, parent, flog.read(fnode))
3317 except error.LookupError:
3328 except error.LookupError:
3318 pass
3329 pass
3319
3330
3320 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3331 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3321 rev = ctx.rev()
3332 rev = ctx.rev()
3322 parent = ctx.p1().rev()
3333 parent = ctx.p1().rev()
3323 for fn in sorted(revfiles.get(rev, [])):
3334 for fn in sorted(revfiles.get(rev, [])):
3324 states = matches[rev][fn]
3335 states = matches[rev][fn]
3325 copy = copies.get(rev, {}).get(fn)
3336 copy = copies.get(rev, {}).get(fn)
3326 if fn in skip:
3337 if fn in skip:
3327 if copy:
3338 if copy:
3328 skip[copy] = True
3339 skip[copy] = True
3329 continue
3340 continue
3330 pstates = matches.get(parent, {}).get(copy or fn, [])
3341 pstates = matches.get(parent, {}).get(copy or fn, [])
3331 if pstates or states:
3342 if pstates or states:
3332 r = display(fn, ctx, pstates, states)
3343 r = display(fn, ctx, pstates, states)
3333 found = found or r
3344 found = found or r
3334 if r and not opts.get('all'):
3345 if r and not opts.get('all'):
3335 skip[fn] = True
3346 skip[fn] = True
3336 if copy:
3347 if copy:
3337 skip[copy] = True
3348 skip[copy] = True
3338 del matches[rev]
3349 del matches[rev]
3339 del revfiles[rev]
3350 del revfiles[rev]
3340
3351
3341 return not found
3352 return not found
3342
3353
3343 @command('heads',
3354 @command('heads',
3344 [('r', 'rev', '',
3355 [('r', 'rev', '',
3345 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
3356 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
3346 ('t', 'topo', False, _('show topological heads only')),
3357 ('t', 'topo', False, _('show topological heads only')),
3347 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
3358 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
3348 ('c', 'closed', False, _('show normal and closed branch heads')),
3359 ('c', 'closed', False, _('show normal and closed branch heads')),
3349 ] + templateopts,
3360 ] + templateopts,
3350 _('[-ct] [-r STARTREV] [REV]...'))
3361 _('[-ct] [-r STARTREV] [REV]...'))
3351 def heads(ui, repo, *branchrevs, **opts):
3362 def heads(ui, repo, *branchrevs, **opts):
3352 """show branch heads
3363 """show branch heads
3353
3364
3354 With no arguments, show all open branch heads in the repository.
3365 With no arguments, show all open branch heads in the repository.
3355 Branch heads are changesets that have no descendants on the
3366 Branch heads are changesets that have no descendants on the
3356 same branch. They are where development generally takes place and
3367 same branch. They are where development generally takes place and
3357 are the usual targets for update and merge operations.
3368 are the usual targets for update and merge operations.
3358
3369
3359 If one or more REVs are given, only open branch heads on the
3370 If one or more REVs are given, only open branch heads on the
3360 branches associated with the specified changesets are shown. This
3371 branches associated with the specified changesets are shown. This
3361 means that you can use :hg:`heads .` to see the heads on the
3372 means that you can use :hg:`heads .` to see the heads on the
3362 currently checked-out branch.
3373 currently checked-out branch.
3363
3374
3364 If -c/--closed is specified, also show branch heads marked closed
3375 If -c/--closed is specified, also show branch heads marked closed
3365 (see :hg:`commit --close-branch`).
3376 (see :hg:`commit --close-branch`).
3366
3377
3367 If STARTREV is specified, only those heads that are descendants of
3378 If STARTREV is specified, only those heads that are descendants of
3368 STARTREV will be displayed.
3379 STARTREV will be displayed.
3369
3380
3370 If -t/--topo is specified, named branch mechanics will be ignored and only
3381 If -t/--topo is specified, named branch mechanics will be ignored and only
3371 topological heads (changesets with no children) will be shown.
3382 topological heads (changesets with no children) will be shown.
3372
3383
3373 Returns 0 if matching heads are found, 1 if not.
3384 Returns 0 if matching heads are found, 1 if not.
3374 """
3385 """
3375
3386
3376 start = None
3387 start = None
3377 if 'rev' in opts:
3388 if 'rev' in opts:
3378 start = scmutil.revsingle(repo, opts['rev'], None).node()
3389 start = scmutil.revsingle(repo, opts['rev'], None).node()
3379
3390
3380 if opts.get('topo'):
3391 if opts.get('topo'):
3381 heads = [repo[h] for h in repo.heads(start)]
3392 heads = [repo[h] for h in repo.heads(start)]
3382 else:
3393 else:
3383 heads = []
3394 heads = []
3384 for branch in repo.branchmap():
3395 for branch in repo.branchmap():
3385 heads += repo.branchheads(branch, start, opts.get('closed'))
3396 heads += repo.branchheads(branch, start, opts.get('closed'))
3386 heads = [repo[h] for h in heads]
3397 heads = [repo[h] for h in heads]
3387
3398
3388 if branchrevs:
3399 if branchrevs:
3389 branches = set(repo[br].branch() for br in branchrevs)
3400 branches = set(repo[br].branch() for br in branchrevs)
3390 heads = [h for h in heads if h.branch() in branches]
3401 heads = [h for h in heads if h.branch() in branches]
3391
3402
3392 if opts.get('active') and branchrevs:
3403 if opts.get('active') and branchrevs:
3393 dagheads = repo.heads(start)
3404 dagheads = repo.heads(start)
3394 heads = [h for h in heads if h.node() in dagheads]
3405 heads = [h for h in heads if h.node() in dagheads]
3395
3406
3396 if branchrevs:
3407 if branchrevs:
3397 haveheads = set(h.branch() for h in heads)
3408 haveheads = set(h.branch() for h in heads)
3398 if branches - haveheads:
3409 if branches - haveheads:
3399 headless = ', '.join(b for b in branches - haveheads)
3410 headless = ', '.join(b for b in branches - haveheads)
3400 msg = _('no open branch heads found on branches %s')
3411 msg = _('no open branch heads found on branches %s')
3401 if opts.get('rev'):
3412 if opts.get('rev'):
3402 msg += _(' (started at %s)') % opts['rev']
3413 msg += _(' (started at %s)') % opts['rev']
3403 ui.warn((msg + '\n') % headless)
3414 ui.warn((msg + '\n') % headless)
3404
3415
3405 if not heads:
3416 if not heads:
3406 return 1
3417 return 1
3407
3418
3408 heads = sorted(heads, key=lambda x: -x.rev())
3419 heads = sorted(heads, key=lambda x: -x.rev())
3409 displayer = cmdutil.show_changeset(ui, repo, opts)
3420 displayer = cmdutil.show_changeset(ui, repo, opts)
3410 for ctx in heads:
3421 for ctx in heads:
3411 displayer.show(ctx)
3422 displayer.show(ctx)
3412 displayer.close()
3423 displayer.close()
3413
3424
3414 @command('help',
3425 @command('help',
3415 [('e', 'extension', None, _('show only help for extensions')),
3426 [('e', 'extension', None, _('show only help for extensions')),
3416 ('c', 'command', None, _('show only help for commands')),
3427 ('c', 'command', None, _('show only help for commands')),
3417 ('k', 'keyword', '', _('show topics matching keyword')),
3428 ('k', 'keyword', '', _('show topics matching keyword')),
3418 ],
3429 ],
3419 _('[-ec] [TOPIC]'))
3430 _('[-ec] [TOPIC]'))
3420 def help_(ui, name=None, **opts):
3431 def help_(ui, name=None, **opts):
3421 """show help for a given topic or a help overview
3432 """show help for a given topic or a help overview
3422
3433
3423 With no arguments, print a list of commands with short help messages.
3434 With no arguments, print a list of commands with short help messages.
3424
3435
3425 Given a topic, extension, or command name, print help for that
3436 Given a topic, extension, or command name, print help for that
3426 topic.
3437 topic.
3427
3438
3428 Returns 0 if successful.
3439 Returns 0 if successful.
3429 """
3440 """
3430
3441
3431 textwidth = min(ui.termwidth(), 80) - 2
3442 textwidth = min(ui.termwidth(), 80) - 2
3432
3443
3433 keep = ui.verbose and ['verbose'] or []
3444 keep = ui.verbose and ['verbose'] or []
3434 text = help.help_(ui, name, **opts)
3445 text = help.help_(ui, name, **opts)
3435
3446
3436 formatted, pruned = minirst.format(text, textwidth, keep=keep)
3447 formatted, pruned = minirst.format(text, textwidth, keep=keep)
3437 if 'verbose' in pruned:
3448 if 'verbose' in pruned:
3438 keep.append('omitted')
3449 keep.append('omitted')
3439 else:
3450 else:
3440 keep.append('notomitted')
3451 keep.append('notomitted')
3441 formatted, pruned = minirst.format(text, textwidth, keep=keep)
3452 formatted, pruned = minirst.format(text, textwidth, keep=keep)
3442 ui.write(formatted)
3453 ui.write(formatted)
3443
3454
3444
3455
3445 @command('identify|id',
3456 @command('identify|id',
3446 [('r', 'rev', '',
3457 [('r', 'rev', '',
3447 _('identify the specified revision'), _('REV')),
3458 _('identify the specified revision'), _('REV')),
3448 ('n', 'num', None, _('show local revision number')),
3459 ('n', 'num', None, _('show local revision number')),
3449 ('i', 'id', None, _('show global revision id')),
3460 ('i', 'id', None, _('show global revision id')),
3450 ('b', 'branch', None, _('show branch')),
3461 ('b', 'branch', None, _('show branch')),
3451 ('t', 'tags', None, _('show tags')),
3462 ('t', 'tags', None, _('show tags')),
3452 ('B', 'bookmarks', None, _('show bookmarks')),
3463 ('B', 'bookmarks', None, _('show bookmarks')),
3453 ] + remoteopts,
3464 ] + remoteopts,
3454 _('[-nibtB] [-r REV] [SOURCE]'))
3465 _('[-nibtB] [-r REV] [SOURCE]'))
3455 def identify(ui, repo, source=None, rev=None,
3466 def identify(ui, repo, source=None, rev=None,
3456 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3467 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3457 """identify the working copy or specified revision
3468 """identify the working copy or specified revision
3458
3469
3459 Print a summary identifying the repository state at REV using one or
3470 Print a summary identifying the repository state at REV using one or
3460 two parent hash identifiers, followed by a "+" if the working
3471 two parent hash identifiers, followed by a "+" if the working
3461 directory has uncommitted changes, the branch name (if not default),
3472 directory has uncommitted changes, the branch name (if not default),
3462 a list of tags, and a list of bookmarks.
3473 a list of tags, and a list of bookmarks.
3463
3474
3464 When REV is not given, print a summary of the current state of the
3475 When REV is not given, print a summary of the current state of the
3465 repository.
3476 repository.
3466
3477
3467 Specifying a path to a repository root or Mercurial bundle will
3478 Specifying a path to a repository root or Mercurial bundle will
3468 cause lookup to operate on that repository/bundle.
3479 cause lookup to operate on that repository/bundle.
3469
3480
3470 .. container:: verbose
3481 .. container:: verbose
3471
3482
3472 Examples:
3483 Examples:
3473
3484
3474 - generate a build identifier for the working directory::
3485 - generate a build identifier for the working directory::
3475
3486
3476 hg id --id > build-id.dat
3487 hg id --id > build-id.dat
3477
3488
3478 - find the revision corresponding to a tag::
3489 - find the revision corresponding to a tag::
3479
3490
3480 hg id -n -r 1.3
3491 hg id -n -r 1.3
3481
3492
3482 - check the most recent revision of a remote repository::
3493 - check the most recent revision of a remote repository::
3483
3494
3484 hg id -r tip http://selenic.com/hg/
3495 hg id -r tip http://selenic.com/hg/
3485
3496
3486 Returns 0 if successful.
3497 Returns 0 if successful.
3487 """
3498 """
3488
3499
3489 if not repo and not source:
3500 if not repo and not source:
3490 raise util.Abort(_("there is no Mercurial repository here "
3501 raise util.Abort(_("there is no Mercurial repository here "
3491 "(.hg not found)"))
3502 "(.hg not found)"))
3492
3503
3493 hexfunc = ui.debugflag and hex or short
3504 hexfunc = ui.debugflag and hex or short
3494 default = not (num or id or branch or tags or bookmarks)
3505 default = not (num or id or branch or tags or bookmarks)
3495 output = []
3506 output = []
3496 revs = []
3507 revs = []
3497
3508
3498 if source:
3509 if source:
3499 source, branches = hg.parseurl(ui.expandpath(source))
3510 source, branches = hg.parseurl(ui.expandpath(source))
3500 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3511 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3501 repo = peer.local()
3512 repo = peer.local()
3502 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3513 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3503
3514
3504 if not repo:
3515 if not repo:
3505 if num or branch or tags:
3516 if num or branch or tags:
3506 raise util.Abort(
3517 raise util.Abort(
3507 _("can't query remote revision number, branch, or tags"))
3518 _("can't query remote revision number, branch, or tags"))
3508 if not rev and revs:
3519 if not rev and revs:
3509 rev = revs[0]
3520 rev = revs[0]
3510 if not rev:
3521 if not rev:
3511 rev = "tip"
3522 rev = "tip"
3512
3523
3513 remoterev = peer.lookup(rev)
3524 remoterev = peer.lookup(rev)
3514 if default or id:
3525 if default or id:
3515 output = [hexfunc(remoterev)]
3526 output = [hexfunc(remoterev)]
3516
3527
3517 def getbms():
3528 def getbms():
3518 bms = []
3529 bms = []
3519
3530
3520 if 'bookmarks' in peer.listkeys('namespaces'):
3531 if 'bookmarks' in peer.listkeys('namespaces'):
3521 hexremoterev = hex(remoterev)
3532 hexremoterev = hex(remoterev)
3522 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
3533 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
3523 if bmr == hexremoterev]
3534 if bmr == hexremoterev]
3524
3535
3525 return sorted(bms)
3536 return sorted(bms)
3526
3537
3527 if bookmarks:
3538 if bookmarks:
3528 output.extend(getbms())
3539 output.extend(getbms())
3529 elif default and not ui.quiet:
3540 elif default and not ui.quiet:
3530 # multiple bookmarks for a single parent separated by '/'
3541 # multiple bookmarks for a single parent separated by '/'
3531 bm = '/'.join(getbms())
3542 bm = '/'.join(getbms())
3532 if bm:
3543 if bm:
3533 output.append(bm)
3544 output.append(bm)
3534 else:
3545 else:
3535 if not rev:
3546 if not rev:
3536 ctx = repo[None]
3547 ctx = repo[None]
3537 parents = ctx.parents()
3548 parents = ctx.parents()
3538 changed = ""
3549 changed = ""
3539 if default or id or num:
3550 if default or id or num:
3540 if (util.any(repo.status())
3551 if (util.any(repo.status())
3541 or util.any(ctx.sub(s).dirty() for s in ctx.substate)):
3552 or util.any(ctx.sub(s).dirty() for s in ctx.substate)):
3542 changed = '+'
3553 changed = '+'
3543 if default or id:
3554 if default or id:
3544 output = ["%s%s" %
3555 output = ["%s%s" %
3545 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
3556 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
3546 if num:
3557 if num:
3547 output.append("%s%s" %
3558 output.append("%s%s" %
3548 ('+'.join([str(p.rev()) for p in parents]), changed))
3559 ('+'.join([str(p.rev()) for p in parents]), changed))
3549 else:
3560 else:
3550 ctx = scmutil.revsingle(repo, rev)
3561 ctx = scmutil.revsingle(repo, rev)
3551 if default or id:
3562 if default or id:
3552 output = [hexfunc(ctx.node())]
3563 output = [hexfunc(ctx.node())]
3553 if num:
3564 if num:
3554 output.append(str(ctx.rev()))
3565 output.append(str(ctx.rev()))
3555
3566
3556 if default and not ui.quiet:
3567 if default and not ui.quiet:
3557 b = ctx.branch()
3568 b = ctx.branch()
3558 if b != 'default':
3569 if b != 'default':
3559 output.append("(%s)" % b)
3570 output.append("(%s)" % b)
3560
3571
3561 # multiple tags for a single parent separated by '/'
3572 # multiple tags for a single parent separated by '/'
3562 t = '/'.join(ctx.tags())
3573 t = '/'.join(ctx.tags())
3563 if t:
3574 if t:
3564 output.append(t)
3575 output.append(t)
3565
3576
3566 # multiple bookmarks for a single parent separated by '/'
3577 # multiple bookmarks for a single parent separated by '/'
3567 bm = '/'.join(ctx.bookmarks())
3578 bm = '/'.join(ctx.bookmarks())
3568 if bm:
3579 if bm:
3569 output.append(bm)
3580 output.append(bm)
3570 else:
3581 else:
3571 if branch:
3582 if branch:
3572 output.append(ctx.branch())
3583 output.append(ctx.branch())
3573
3584
3574 if tags:
3585 if tags:
3575 output.extend(ctx.tags())
3586 output.extend(ctx.tags())
3576
3587
3577 if bookmarks:
3588 if bookmarks:
3578 output.extend(ctx.bookmarks())
3589 output.extend(ctx.bookmarks())
3579
3590
3580 ui.write("%s\n" % ' '.join(output))
3591 ui.write("%s\n" % ' '.join(output))
3581
3592
3582 @command('import|patch',
3593 @command('import|patch',
3583 [('p', 'strip', 1,
3594 [('p', 'strip', 1,
3584 _('directory strip option for patch. This has the same '
3595 _('directory strip option for patch. This has the same '
3585 'meaning as the corresponding patch option'), _('NUM')),
3596 'meaning as the corresponding patch option'), _('NUM')),
3586 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3597 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3587 ('e', 'edit', False, _('invoke editor on commit messages')),
3598 ('e', 'edit', False, _('invoke editor on commit messages')),
3588 ('f', 'force', None,
3599 ('f', 'force', None,
3589 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
3600 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
3590 ('', 'no-commit', None,
3601 ('', 'no-commit', None,
3591 _("don't commit, just update the working directory")),
3602 _("don't commit, just update the working directory")),
3592 ('', 'bypass', None,
3603 ('', 'bypass', None,
3593 _("apply patch without touching the working directory")),
3604 _("apply patch without touching the working directory")),
3594 ('', 'exact', None,
3605 ('', 'exact', None,
3595 _('apply patch to the nodes from which it was generated')),
3606 _('apply patch to the nodes from which it was generated')),
3596 ('', 'import-branch', None,
3607 ('', 'import-branch', None,
3597 _('use any branch information in patch (implied by --exact)'))] +
3608 _('use any branch information in patch (implied by --exact)'))] +
3598 commitopts + commitopts2 + similarityopts,
3609 commitopts + commitopts2 + similarityopts,
3599 _('[OPTION]... PATCH...'))
3610 _('[OPTION]... PATCH...'))
3600 def import_(ui, repo, patch1=None, *patches, **opts):
3611 def import_(ui, repo, patch1=None, *patches, **opts):
3601 """import an ordered set of patches
3612 """import an ordered set of patches
3602
3613
3603 Import a list of patches and commit them individually (unless
3614 Import a list of patches and commit them individually (unless
3604 --no-commit is specified).
3615 --no-commit is specified).
3605
3616
3606 Because import first applies changes to the working directory,
3617 Because import first applies changes to the working directory,
3607 import will abort if there are outstanding changes.
3618 import will abort if there are outstanding changes.
3608
3619
3609 You can import a patch straight from a mail message. Even patches
3620 You can import a patch straight from a mail message. Even patches
3610 as attachments work (to use the body part, it must have type
3621 as attachments work (to use the body part, it must have type
3611 text/plain or text/x-patch). From and Subject headers of email
3622 text/plain or text/x-patch). From and Subject headers of email
3612 message are used as default committer and commit message. All
3623 message are used as default committer and commit message. All
3613 text/plain body parts before first diff are added to commit
3624 text/plain body parts before first diff are added to commit
3614 message.
3625 message.
3615
3626
3616 If the imported patch was generated by :hg:`export`, user and
3627 If the imported patch was generated by :hg:`export`, user and
3617 description from patch override values from message headers and
3628 description from patch override values from message headers and
3618 body. Values given on command line with -m/--message and -u/--user
3629 body. Values given on command line with -m/--message and -u/--user
3619 override these.
3630 override these.
3620
3631
3621 If --exact is specified, import will set the working directory to
3632 If --exact is specified, import will set the working directory to
3622 the parent of each patch before applying it, and will abort if the
3633 the parent of each patch before applying it, and will abort if the
3623 resulting changeset has a different ID than the one recorded in
3634 resulting changeset has a different ID than the one recorded in
3624 the patch. This may happen due to character set problems or other
3635 the patch. This may happen due to character set problems or other
3625 deficiencies in the text patch format.
3636 deficiencies in the text patch format.
3626
3637
3627 Use --bypass to apply and commit patches directly to the
3638 Use --bypass to apply and commit patches directly to the
3628 repository, not touching the working directory. Without --exact,
3639 repository, not touching the working directory. Without --exact,
3629 patches will be applied on top of the working directory parent
3640 patches will be applied on top of the working directory parent
3630 revision.
3641 revision.
3631
3642
3632 With -s/--similarity, hg will attempt to discover renames and
3643 With -s/--similarity, hg will attempt to discover renames and
3633 copies in the patch in the same way as :hg:`addremove`.
3644 copies in the patch in the same way as :hg:`addremove`.
3634
3645
3635 To read a patch from standard input, use "-" as the patch name. If
3646 To read a patch from standard input, use "-" as the patch name. If
3636 a URL is specified, the patch will be downloaded from it.
3647 a URL is specified, the patch will be downloaded from it.
3637 See :hg:`help dates` for a list of formats valid for -d/--date.
3648 See :hg:`help dates` for a list of formats valid for -d/--date.
3638
3649
3639 .. container:: verbose
3650 .. container:: verbose
3640
3651
3641 Examples:
3652 Examples:
3642
3653
3643 - import a traditional patch from a website and detect renames::
3654 - import a traditional patch from a website and detect renames::
3644
3655
3645 hg import -s 80 http://example.com/bugfix.patch
3656 hg import -s 80 http://example.com/bugfix.patch
3646
3657
3647 - import a changeset from an hgweb server::
3658 - import a changeset from an hgweb server::
3648
3659
3649 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
3660 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
3650
3661
3651 - import all the patches in an Unix-style mbox::
3662 - import all the patches in an Unix-style mbox::
3652
3663
3653 hg import incoming-patches.mbox
3664 hg import incoming-patches.mbox
3654
3665
3655 - attempt to exactly restore an exported changeset (not always
3666 - attempt to exactly restore an exported changeset (not always
3656 possible)::
3667 possible)::
3657
3668
3658 hg import --exact proposed-fix.patch
3669 hg import --exact proposed-fix.patch
3659
3670
3660 Returns 0 on success.
3671 Returns 0 on success.
3661 """
3672 """
3662
3673
3663 if not patch1:
3674 if not patch1:
3664 raise util.Abort(_('need at least one patch to import'))
3675 raise util.Abort(_('need at least one patch to import'))
3665
3676
3666 patches = (patch1,) + patches
3677 patches = (patch1,) + patches
3667
3678
3668 date = opts.get('date')
3679 date = opts.get('date')
3669 if date:
3680 if date:
3670 opts['date'] = util.parsedate(date)
3681 opts['date'] = util.parsedate(date)
3671
3682
3672 editor = cmdutil.commiteditor
3683 editor = cmdutil.commiteditor
3673 if opts.get('edit'):
3684 if opts.get('edit'):
3674 editor = cmdutil.commitforceeditor
3685 editor = cmdutil.commitforceeditor
3675
3686
3676 update = not opts.get('bypass')
3687 update = not opts.get('bypass')
3677 if not update and opts.get('no_commit'):
3688 if not update and opts.get('no_commit'):
3678 raise util.Abort(_('cannot use --no-commit with --bypass'))
3689 raise util.Abort(_('cannot use --no-commit with --bypass'))
3679 try:
3690 try:
3680 sim = float(opts.get('similarity') or 0)
3691 sim = float(opts.get('similarity') or 0)
3681 except ValueError:
3692 except ValueError:
3682 raise util.Abort(_('similarity must be a number'))
3693 raise util.Abort(_('similarity must be a number'))
3683 if sim < 0 or sim > 100:
3694 if sim < 0 or sim > 100:
3684 raise util.Abort(_('similarity must be between 0 and 100'))
3695 raise util.Abort(_('similarity must be between 0 and 100'))
3685 if sim and not update:
3696 if sim and not update:
3686 raise util.Abort(_('cannot use --similarity with --bypass'))
3697 raise util.Abort(_('cannot use --similarity with --bypass'))
3687
3698
3688 if update:
3699 if update:
3689 cmdutil.checkunfinished(repo)
3700 cmdutil.checkunfinished(repo)
3690 if (opts.get('exact') or not opts.get('force')) and update:
3701 if (opts.get('exact') or not opts.get('force')) and update:
3691 cmdutil.bailifchanged(repo)
3702 cmdutil.bailifchanged(repo)
3692
3703
3693 base = opts["base"]
3704 base = opts["base"]
3694 strip = opts["strip"]
3705 strip = opts["strip"]
3695 wlock = lock = tr = None
3706 wlock = lock = tr = None
3696 msgs = []
3707 msgs = []
3697
3708
3698 def tryone(ui, hunk, parents):
3709 def tryone(ui, hunk, parents):
3699 tmpname, message, user, date, branch, nodeid, p1, p2 = \
3710 tmpname, message, user, date, branch, nodeid, p1, p2 = \
3700 patch.extract(ui, hunk)
3711 patch.extract(ui, hunk)
3701
3712
3702 if not tmpname:
3713 if not tmpname:
3703 return (None, None)
3714 return (None, None)
3704 msg = _('applied to working directory')
3715 msg = _('applied to working directory')
3705
3716
3706 try:
3717 try:
3707 cmdline_message = cmdutil.logmessage(ui, opts)
3718 cmdline_message = cmdutil.logmessage(ui, opts)
3708 if cmdline_message:
3719 if cmdline_message:
3709 # pickup the cmdline msg
3720 # pickup the cmdline msg
3710 message = cmdline_message
3721 message = cmdline_message
3711 elif message:
3722 elif message:
3712 # pickup the patch msg
3723 # pickup the patch msg
3713 message = message.strip()
3724 message = message.strip()
3714 else:
3725 else:
3715 # launch the editor
3726 # launch the editor
3716 message = None
3727 message = None
3717 ui.debug('message:\n%s\n' % message)
3728 ui.debug('message:\n%s\n' % message)
3718
3729
3719 if len(parents) == 1:
3730 if len(parents) == 1:
3720 parents.append(repo[nullid])
3731 parents.append(repo[nullid])
3721 if opts.get('exact'):
3732 if opts.get('exact'):
3722 if not nodeid or not p1:
3733 if not nodeid or not p1:
3723 raise util.Abort(_('not a Mercurial patch'))
3734 raise util.Abort(_('not a Mercurial patch'))
3724 p1 = repo[p1]
3735 p1 = repo[p1]
3725 p2 = repo[p2 or nullid]
3736 p2 = repo[p2 or nullid]
3726 elif p2:
3737 elif p2:
3727 try:
3738 try:
3728 p1 = repo[p1]
3739 p1 = repo[p1]
3729 p2 = repo[p2]
3740 p2 = repo[p2]
3730 # Without any options, consider p2 only if the
3741 # Without any options, consider p2 only if the
3731 # patch is being applied on top of the recorded
3742 # patch is being applied on top of the recorded
3732 # first parent.
3743 # first parent.
3733 if p1 != parents[0]:
3744 if p1 != parents[0]:
3734 p1 = parents[0]
3745 p1 = parents[0]
3735 p2 = repo[nullid]
3746 p2 = repo[nullid]
3736 except error.RepoError:
3747 except error.RepoError:
3737 p1, p2 = parents
3748 p1, p2 = parents
3738 else:
3749 else:
3739 p1, p2 = parents
3750 p1, p2 = parents
3740
3751
3741 n = None
3752 n = None
3742 if update:
3753 if update:
3743 if p1 != parents[0]:
3754 if p1 != parents[0]:
3744 hg.clean(repo, p1.node())
3755 hg.clean(repo, p1.node())
3745 if p2 != parents[1]:
3756 if p2 != parents[1]:
3746 repo.setparents(p1.node(), p2.node())
3757 repo.setparents(p1.node(), p2.node())
3747
3758
3748 if opts.get('exact') or opts.get('import_branch'):
3759 if opts.get('exact') or opts.get('import_branch'):
3749 repo.dirstate.setbranch(branch or 'default')
3760 repo.dirstate.setbranch(branch or 'default')
3750
3761
3751 files = set()
3762 files = set()
3752 patch.patch(ui, repo, tmpname, strip=strip, files=files,
3763 patch.patch(ui, repo, tmpname, strip=strip, files=files,
3753 eolmode=None, similarity=sim / 100.0)
3764 eolmode=None, similarity=sim / 100.0)
3754 files = list(files)
3765 files = list(files)
3755 if opts.get('no_commit'):
3766 if opts.get('no_commit'):
3756 if message:
3767 if message:
3757 msgs.append(message)
3768 msgs.append(message)
3758 else:
3769 else:
3759 if opts.get('exact') or p2:
3770 if opts.get('exact') or p2:
3760 # If you got here, you either use --force and know what
3771 # If you got here, you either use --force and know what
3761 # you are doing or used --exact or a merge patch while
3772 # you are doing or used --exact or a merge patch while
3762 # being updated to its first parent.
3773 # being updated to its first parent.
3763 m = None
3774 m = None
3764 else:
3775 else:
3765 m = scmutil.matchfiles(repo, files or [])
3776 m = scmutil.matchfiles(repo, files or [])
3766 n = repo.commit(message, opts.get('user') or user,
3777 n = repo.commit(message, opts.get('user') or user,
3767 opts.get('date') or date, match=m,
3778 opts.get('date') or date, match=m,
3768 editor=editor)
3779 editor=editor)
3769 else:
3780 else:
3770 if opts.get('exact') or opts.get('import_branch'):
3781 if opts.get('exact') or opts.get('import_branch'):
3771 branch = branch or 'default'
3782 branch = branch or 'default'
3772 else:
3783 else:
3773 branch = p1.branch()
3784 branch = p1.branch()
3774 store = patch.filestore()
3785 store = patch.filestore()
3775 try:
3786 try:
3776 files = set()
3787 files = set()
3777 try:
3788 try:
3778 patch.patchrepo(ui, repo, p1, store, tmpname, strip,
3789 patch.patchrepo(ui, repo, p1, store, tmpname, strip,
3779 files, eolmode=None)
3790 files, eolmode=None)
3780 except patch.PatchError, e:
3791 except patch.PatchError, e:
3781 raise util.Abort(str(e))
3792 raise util.Abort(str(e))
3782 memctx = context.makememctx(repo, (p1.node(), p2.node()),
3793 memctx = context.makememctx(repo, (p1.node(), p2.node()),
3783 message,
3794 message,
3784 opts.get('user') or user,
3795 opts.get('user') or user,
3785 opts.get('date') or date,
3796 opts.get('date') or date,
3786 branch, files, store,
3797 branch, files, store,
3787 editor=cmdutil.commiteditor)
3798 editor=cmdutil.commiteditor)
3788 repo.savecommitmessage(memctx.description())
3799 repo.savecommitmessage(memctx.description())
3789 n = memctx.commit()
3800 n = memctx.commit()
3790 finally:
3801 finally:
3791 store.close()
3802 store.close()
3792 if opts.get('exact') and hex(n) != nodeid:
3803 if opts.get('exact') and hex(n) != nodeid:
3793 raise util.Abort(_('patch is damaged or loses information'))
3804 raise util.Abort(_('patch is damaged or loses information'))
3794 if n:
3805 if n:
3795 # i18n: refers to a short changeset id
3806 # i18n: refers to a short changeset id
3796 msg = _('created %s') % short(n)
3807 msg = _('created %s') % short(n)
3797 return (msg, n)
3808 return (msg, n)
3798 finally:
3809 finally:
3799 os.unlink(tmpname)
3810 os.unlink(tmpname)
3800
3811
3801 try:
3812 try:
3802 try:
3813 try:
3803 wlock = repo.wlock()
3814 wlock = repo.wlock()
3804 if not opts.get('no_commit'):
3815 if not opts.get('no_commit'):
3805 lock = repo.lock()
3816 lock = repo.lock()
3806 tr = repo.transaction('import')
3817 tr = repo.transaction('import')
3807 parents = repo.parents()
3818 parents = repo.parents()
3808 for patchurl in patches:
3819 for patchurl in patches:
3809 if patchurl == '-':
3820 if patchurl == '-':
3810 ui.status(_('applying patch from stdin\n'))
3821 ui.status(_('applying patch from stdin\n'))
3811 patchfile = ui.fin
3822 patchfile = ui.fin
3812 patchurl = 'stdin' # for error message
3823 patchurl = 'stdin' # for error message
3813 else:
3824 else:
3814 patchurl = os.path.join(base, patchurl)
3825 patchurl = os.path.join(base, patchurl)
3815 ui.status(_('applying %s\n') % patchurl)
3826 ui.status(_('applying %s\n') % patchurl)
3816 patchfile = hg.openpath(ui, patchurl)
3827 patchfile = hg.openpath(ui, patchurl)
3817
3828
3818 haspatch = False
3829 haspatch = False
3819 for hunk in patch.split(patchfile):
3830 for hunk in patch.split(patchfile):
3820 (msg, node) = tryone(ui, hunk, parents)
3831 (msg, node) = tryone(ui, hunk, parents)
3821 if msg:
3832 if msg:
3822 haspatch = True
3833 haspatch = True
3823 ui.note(msg + '\n')
3834 ui.note(msg + '\n')
3824 if update or opts.get('exact'):
3835 if update or opts.get('exact'):
3825 parents = repo.parents()
3836 parents = repo.parents()
3826 else:
3837 else:
3827 parents = [repo[node]]
3838 parents = [repo[node]]
3828
3839
3829 if not haspatch:
3840 if not haspatch:
3830 raise util.Abort(_('%s: no diffs found') % patchurl)
3841 raise util.Abort(_('%s: no diffs found') % patchurl)
3831
3842
3832 if tr:
3843 if tr:
3833 tr.close()
3844 tr.close()
3834 if msgs:
3845 if msgs:
3835 repo.savecommitmessage('\n* * *\n'.join(msgs))
3846 repo.savecommitmessage('\n* * *\n'.join(msgs))
3836 except: # re-raises
3847 except: # re-raises
3837 # wlock.release() indirectly calls dirstate.write(): since
3848 # wlock.release() indirectly calls dirstate.write(): since
3838 # we're crashing, we do not want to change the working dir
3849 # we're crashing, we do not want to change the working dir
3839 # parent after all, so make sure it writes nothing
3850 # parent after all, so make sure it writes nothing
3840 repo.dirstate.invalidate()
3851 repo.dirstate.invalidate()
3841 raise
3852 raise
3842 finally:
3853 finally:
3843 if tr:
3854 if tr:
3844 tr.release()
3855 tr.release()
3845 release(lock, wlock)
3856 release(lock, wlock)
3846
3857
3847 @command('incoming|in',
3858 @command('incoming|in',
3848 [('f', 'force', None,
3859 [('f', 'force', None,
3849 _('run even if remote repository is unrelated')),
3860 _('run even if remote repository is unrelated')),
3850 ('n', 'newest-first', None, _('show newest record first')),
3861 ('n', 'newest-first', None, _('show newest record first')),
3851 ('', 'bundle', '',
3862 ('', 'bundle', '',
3852 _('file to store the bundles into'), _('FILE')),
3863 _('file to store the bundles into'), _('FILE')),
3853 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3864 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3854 ('B', 'bookmarks', False, _("compare bookmarks")),
3865 ('B', 'bookmarks', False, _("compare bookmarks")),
3855 ('b', 'branch', [],
3866 ('b', 'branch', [],
3856 _('a specific branch you would like to pull'), _('BRANCH')),
3867 _('a specific branch you would like to pull'), _('BRANCH')),
3857 ] + logopts + remoteopts + subrepoopts,
3868 ] + logopts + remoteopts + subrepoopts,
3858 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3869 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3859 def incoming(ui, repo, source="default", **opts):
3870 def incoming(ui, repo, source="default", **opts):
3860 """show new changesets found in source
3871 """show new changesets found in source
3861
3872
3862 Show new changesets found in the specified path/URL or the default
3873 Show new changesets found in the specified path/URL or the default
3863 pull location. These are the changesets that would have been pulled
3874 pull location. These are the changesets that would have been pulled
3864 if a pull at the time you issued this command.
3875 if a pull at the time you issued this command.
3865
3876
3866 For remote repository, using --bundle avoids downloading the
3877 For remote repository, using --bundle avoids downloading the
3867 changesets twice if the incoming is followed by a pull.
3878 changesets twice if the incoming is followed by a pull.
3868
3879
3869 See pull for valid source format details.
3880 See pull for valid source format details.
3870
3881
3871 Returns 0 if there are incoming changes, 1 otherwise.
3882 Returns 0 if there are incoming changes, 1 otherwise.
3872 """
3883 """
3873 if opts.get('graph'):
3884 if opts.get('graph'):
3874 cmdutil.checkunsupportedgraphflags([], opts)
3885 cmdutil.checkunsupportedgraphflags([], opts)
3875 def display(other, chlist, displayer):
3886 def display(other, chlist, displayer):
3876 revdag = cmdutil.graphrevs(other, chlist, opts)
3887 revdag = cmdutil.graphrevs(other, chlist, opts)
3877 showparents = [ctx.node() for ctx in repo[None].parents()]
3888 showparents = [ctx.node() for ctx in repo[None].parents()]
3878 cmdutil.displaygraph(ui, revdag, displayer, showparents,
3889 cmdutil.displaygraph(ui, revdag, displayer, showparents,
3879 graphmod.asciiedges)
3890 graphmod.asciiedges)
3880
3891
3881 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3892 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3882 return 0
3893 return 0
3883
3894
3884 if opts.get('bundle') and opts.get('subrepos'):
3895 if opts.get('bundle') and opts.get('subrepos'):
3885 raise util.Abort(_('cannot combine --bundle and --subrepos'))
3896 raise util.Abort(_('cannot combine --bundle and --subrepos'))
3886
3897
3887 if opts.get('bookmarks'):
3898 if opts.get('bookmarks'):
3888 source, branches = hg.parseurl(ui.expandpath(source),
3899 source, branches = hg.parseurl(ui.expandpath(source),
3889 opts.get('branch'))
3900 opts.get('branch'))
3890 other = hg.peer(repo, opts, source)
3901 other = hg.peer(repo, opts, source)
3891 if 'bookmarks' not in other.listkeys('namespaces'):
3902 if 'bookmarks' not in other.listkeys('namespaces'):
3892 ui.warn(_("remote doesn't support bookmarks\n"))
3903 ui.warn(_("remote doesn't support bookmarks\n"))
3893 return 0
3904 return 0
3894 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3905 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3895 return bookmarks.diff(ui, repo, other)
3906 return bookmarks.diff(ui, repo, other)
3896
3907
3897 repo._subtoppath = ui.expandpath(source)
3908 repo._subtoppath = ui.expandpath(source)
3898 try:
3909 try:
3899 return hg.incoming(ui, repo, source, opts)
3910 return hg.incoming(ui, repo, source, opts)
3900 finally:
3911 finally:
3901 del repo._subtoppath
3912 del repo._subtoppath
3902
3913
3903
3914
3904 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'))
3915 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'))
3905 def init(ui, dest=".", **opts):
3916 def init(ui, dest=".", **opts):
3906 """create a new repository in the given directory
3917 """create a new repository in the given directory
3907
3918
3908 Initialize a new repository in the given directory. If the given
3919 Initialize a new repository in the given directory. If the given
3909 directory does not exist, it will be created.
3920 directory does not exist, it will be created.
3910
3921
3911 If no directory is given, the current directory is used.
3922 If no directory is given, the current directory is used.
3912
3923
3913 It is possible to specify an ``ssh://`` URL as the destination.
3924 It is possible to specify an ``ssh://`` URL as the destination.
3914 See :hg:`help urls` for more information.
3925 See :hg:`help urls` for more information.
3915
3926
3916 Returns 0 on success.
3927 Returns 0 on success.
3917 """
3928 """
3918 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3929 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3919
3930
3920 @command('locate',
3931 @command('locate',
3921 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3932 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3922 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3933 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3923 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3934 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3924 ] + walkopts,
3935 ] + walkopts,
3925 _('[OPTION]... [PATTERN]...'))
3936 _('[OPTION]... [PATTERN]...'))
3926 def locate(ui, repo, *pats, **opts):
3937 def locate(ui, repo, *pats, **opts):
3927 """locate files matching specific patterns
3938 """locate files matching specific patterns
3928
3939
3929 Print files under Mercurial control in the working directory whose
3940 Print files under Mercurial control in the working directory whose
3930 names match the given patterns.
3941 names match the given patterns.
3931
3942
3932 By default, this command searches all directories in the working
3943 By default, this command searches all directories in the working
3933 directory. To search just the current directory and its
3944 directory. To search just the current directory and its
3934 subdirectories, use "--include .".
3945 subdirectories, use "--include .".
3935
3946
3936 If no patterns are given to match, this command prints the names
3947 If no patterns are given to match, this command prints the names
3937 of all files under Mercurial control in the working directory.
3948 of all files under Mercurial control in the working directory.
3938
3949
3939 If you want to feed the output of this command into the "xargs"
3950 If you want to feed the output of this command into the "xargs"
3940 command, use the -0 option to both this command and "xargs". This
3951 command, use the -0 option to both this command and "xargs". This
3941 will avoid the problem of "xargs" treating single filenames that
3952 will avoid the problem of "xargs" treating single filenames that
3942 contain whitespace as multiple filenames.
3953 contain whitespace as multiple filenames.
3943
3954
3944 Returns 0 if a match is found, 1 otherwise.
3955 Returns 0 if a match is found, 1 otherwise.
3945 """
3956 """
3946 end = opts.get('print0') and '\0' or '\n'
3957 end = opts.get('print0') and '\0' or '\n'
3947 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3958 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3948
3959
3949 ret = 1
3960 ret = 1
3950 m = scmutil.match(repo[rev], pats, opts, default='relglob')
3961 m = scmutil.match(repo[rev], pats, opts, default='relglob')
3951 m.bad = lambda x, y: False
3962 m.bad = lambda x, y: False
3952 for abs in repo[rev].walk(m):
3963 for abs in repo[rev].walk(m):
3953 if not rev and abs not in repo.dirstate:
3964 if not rev and abs not in repo.dirstate:
3954 continue
3965 continue
3955 if opts.get('fullpath'):
3966 if opts.get('fullpath'):
3956 ui.write(repo.wjoin(abs), end)
3967 ui.write(repo.wjoin(abs), end)
3957 else:
3968 else:
3958 ui.write(((pats and m.rel(abs)) or abs), end)
3969 ui.write(((pats and m.rel(abs)) or abs), end)
3959 ret = 0
3970 ret = 0
3960
3971
3961 return ret
3972 return ret
3962
3973
3963 @command('^log|history',
3974 @command('^log|history',
3964 [('f', 'follow', None,
3975 [('f', 'follow', None,
3965 _('follow changeset history, or file history across copies and renames')),
3976 _('follow changeset history, or file history across copies and renames')),
3966 ('', 'follow-first', None,
3977 ('', 'follow-first', None,
3967 _('only follow the first parent of merge changesets (DEPRECATED)')),
3978 _('only follow the first parent of merge changesets (DEPRECATED)')),
3968 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3979 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3969 ('C', 'copies', None, _('show copied files')),
3980 ('C', 'copies', None, _('show copied files')),
3970 ('k', 'keyword', [],
3981 ('k', 'keyword', [],
3971 _('do case-insensitive search for a given text'), _('TEXT')),
3982 _('do case-insensitive search for a given text'), _('TEXT')),
3972 ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
3983 ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
3973 ('', 'removed', None, _('include revisions where files were removed')),
3984 ('', 'removed', None, _('include revisions where files were removed')),
3974 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3985 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3975 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3986 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3976 ('', 'only-branch', [],
3987 ('', 'only-branch', [],
3977 _('show only changesets within the given named branch (DEPRECATED)'),
3988 _('show only changesets within the given named branch (DEPRECATED)'),
3978 _('BRANCH')),
3989 _('BRANCH')),
3979 ('b', 'branch', [],
3990 ('b', 'branch', [],
3980 _('show changesets within the given named branch'), _('BRANCH')),
3991 _('show changesets within the given named branch'), _('BRANCH')),
3981 ('P', 'prune', [],
3992 ('P', 'prune', [],
3982 _('do not display revision or any of its ancestors'), _('REV')),
3993 _('do not display revision or any of its ancestors'), _('REV')),
3983 ] + logopts + walkopts,
3994 ] + logopts + walkopts,
3984 _('[OPTION]... [FILE]'))
3995 _('[OPTION]... [FILE]'))
3985 def log(ui, repo, *pats, **opts):
3996 def log(ui, repo, *pats, **opts):
3986 """show revision history of entire repository or files
3997 """show revision history of entire repository or files
3987
3998
3988 Print the revision history of the specified files or the entire
3999 Print the revision history of the specified files or the entire
3989 project.
4000 project.
3990
4001
3991 If no revision range is specified, the default is ``tip:0`` unless
4002 If no revision range is specified, the default is ``tip:0`` unless
3992 --follow is set, in which case the working directory parent is
4003 --follow is set, in which case the working directory parent is
3993 used as the starting revision.
4004 used as the starting revision.
3994
4005
3995 File history is shown without following rename or copy history of
4006 File history is shown without following rename or copy history of
3996 files. Use -f/--follow with a filename to follow history across
4007 files. Use -f/--follow with a filename to follow history across
3997 renames and copies. --follow without a filename will only show
4008 renames and copies. --follow without a filename will only show
3998 ancestors or descendants of the starting revision.
4009 ancestors or descendants of the starting revision.
3999
4010
4000 By default this command prints revision number and changeset id,
4011 By default this command prints revision number and changeset id,
4001 tags, non-trivial parents, user, date and time, and a summary for
4012 tags, non-trivial parents, user, date and time, and a summary for
4002 each commit. When the -v/--verbose switch is used, the list of
4013 each commit. When the -v/--verbose switch is used, the list of
4003 changed files and full commit message are shown.
4014 changed files and full commit message are shown.
4004
4015
4005 .. note::
4016 .. note::
4006
4017
4007 log -p/--patch may generate unexpected diff output for merge
4018 log -p/--patch may generate unexpected diff output for merge
4008 changesets, as it will only compare the merge changeset against
4019 changesets, as it will only compare the merge changeset against
4009 its first parent. Also, only files different from BOTH parents
4020 its first parent. Also, only files different from BOTH parents
4010 will appear in files:.
4021 will appear in files:.
4011
4022
4012 .. note::
4023 .. note::
4013
4024
4014 for performance reasons, log FILE may omit duplicate changes
4025 for performance reasons, log FILE may omit duplicate changes
4015 made on branches and will not show deletions. To see all
4026 made on branches and will not show deletions. To see all
4016 changes including duplicates and deletions, use the --removed
4027 changes including duplicates and deletions, use the --removed
4017 switch.
4028 switch.
4018
4029
4019 .. container:: verbose
4030 .. container:: verbose
4020
4031
4021 Some examples:
4032 Some examples:
4022
4033
4023 - changesets with full descriptions and file lists::
4034 - changesets with full descriptions and file lists::
4024
4035
4025 hg log -v
4036 hg log -v
4026
4037
4027 - changesets ancestral to the working directory::
4038 - changesets ancestral to the working directory::
4028
4039
4029 hg log -f
4040 hg log -f
4030
4041
4031 - last 10 commits on the current branch::
4042 - last 10 commits on the current branch::
4032
4043
4033 hg log -l 10 -b .
4044 hg log -l 10 -b .
4034
4045
4035 - changesets showing all modifications of a file, including removals::
4046 - changesets showing all modifications of a file, including removals::
4036
4047
4037 hg log --removed file.c
4048 hg log --removed file.c
4038
4049
4039 - all changesets that touch a directory, with diffs, excluding merges::
4050 - all changesets that touch a directory, with diffs, excluding merges::
4040
4051
4041 hg log -Mp lib/
4052 hg log -Mp lib/
4042
4053
4043 - all revision numbers that match a keyword::
4054 - all revision numbers that match a keyword::
4044
4055
4045 hg log -k bug --template "{rev}\\n"
4056 hg log -k bug --template "{rev}\\n"
4046
4057
4047 - check if a given changeset is included is a tagged release::
4058 - check if a given changeset is included is a tagged release::
4048
4059
4049 hg log -r "a21ccf and ancestor(1.9)"
4060 hg log -r "a21ccf and ancestor(1.9)"
4050
4061
4051 - find all changesets by some user in a date range::
4062 - find all changesets by some user in a date range::
4052
4063
4053 hg log -k alice -d "may 2008 to jul 2008"
4064 hg log -k alice -d "may 2008 to jul 2008"
4054
4065
4055 - summary of all changesets after the last tag::
4066 - summary of all changesets after the last tag::
4056
4067
4057 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4068 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4058
4069
4059 See :hg:`help dates` for a list of formats valid for -d/--date.
4070 See :hg:`help dates` for a list of formats valid for -d/--date.
4060
4071
4061 See :hg:`help revisions` and :hg:`help revsets` for more about
4072 See :hg:`help revisions` and :hg:`help revsets` for more about
4062 specifying revisions.
4073 specifying revisions.
4063
4074
4064 See :hg:`help templates` for more about pre-packaged styles and
4075 See :hg:`help templates` for more about pre-packaged styles and
4065 specifying custom templates.
4076 specifying custom templates.
4066
4077
4067 Returns 0 on success.
4078 Returns 0 on success.
4068 """
4079 """
4069 if opts.get('graph'):
4080 if opts.get('graph'):
4070 return cmdutil.graphlog(ui, repo, *pats, **opts)
4081 return cmdutil.graphlog(ui, repo, *pats, **opts)
4071
4082
4072 matchfn = scmutil.match(repo[None], pats, opts)
4083 matchfn = scmutil.match(repo[None], pats, opts)
4073 limit = cmdutil.loglimit(opts)
4084 limit = cmdutil.loglimit(opts)
4074 count = 0
4085 count = 0
4075
4086
4076 getrenamed, endrev = None, None
4087 getrenamed, endrev = None, None
4077 if opts.get('copies'):
4088 if opts.get('copies'):
4078 if opts.get('rev'):
4089 if opts.get('rev'):
4079 endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
4090 endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
4080 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
4091 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
4081
4092
4082 df = False
4093 df = False
4083 if opts.get("date"):
4094 if opts.get("date"):
4084 df = util.matchdate(opts["date"])
4095 df = util.matchdate(opts["date"])
4085
4096
4086 branches = opts.get('branch', []) + opts.get('only_branch', [])
4097 branches = opts.get('branch', []) + opts.get('only_branch', [])
4087 opts['branch'] = [repo.lookupbranch(b) for b in branches]
4098 opts['branch'] = [repo.lookupbranch(b) for b in branches]
4088
4099
4089 displayer = cmdutil.show_changeset(ui, repo, opts, True)
4100 displayer = cmdutil.show_changeset(ui, repo, opts, True)
4090 def prep(ctx, fns):
4101 def prep(ctx, fns):
4091 rev = ctx.rev()
4102 rev = ctx.rev()
4092 parents = [p for p in repo.changelog.parentrevs(rev)
4103 parents = [p for p in repo.changelog.parentrevs(rev)
4093 if p != nullrev]
4104 if p != nullrev]
4094 if opts.get('no_merges') and len(parents) == 2:
4105 if opts.get('no_merges') and len(parents) == 2:
4095 return
4106 return
4096 if opts.get('only_merges') and len(parents) != 2:
4107 if opts.get('only_merges') and len(parents) != 2:
4097 return
4108 return
4098 if opts.get('branch') and ctx.branch() not in opts['branch']:
4109 if opts.get('branch') and ctx.branch() not in opts['branch']:
4099 return
4110 return
4100 if df and not df(ctx.date()[0]):
4111 if df and not df(ctx.date()[0]):
4101 return
4112 return
4102
4113
4103 lower = encoding.lower
4114 lower = encoding.lower
4104 if opts.get('user'):
4115 if opts.get('user'):
4105 luser = lower(ctx.user())
4116 luser = lower(ctx.user())
4106 for k in [lower(x) for x in opts['user']]:
4117 for k in [lower(x) for x in opts['user']]:
4107 if (k in luser):
4118 if (k in luser):
4108 break
4119 break
4109 else:
4120 else:
4110 return
4121 return
4111 if opts.get('keyword'):
4122 if opts.get('keyword'):
4112 luser = lower(ctx.user())
4123 luser = lower(ctx.user())
4113 ldesc = lower(ctx.description())
4124 ldesc = lower(ctx.description())
4114 lfiles = lower(" ".join(ctx.files()))
4125 lfiles = lower(" ".join(ctx.files()))
4115 for k in [lower(x) for x in opts['keyword']]:
4126 for k in [lower(x) for x in opts['keyword']]:
4116 if (k in luser or k in ldesc or k in lfiles):
4127 if (k in luser or k in ldesc or k in lfiles):
4117 break
4128 break
4118 else:
4129 else:
4119 return
4130 return
4120
4131
4121 copies = None
4132 copies = None
4122 if getrenamed is not None and rev:
4133 if getrenamed is not None and rev:
4123 copies = []
4134 copies = []
4124 for fn in ctx.files():
4135 for fn in ctx.files():
4125 rename = getrenamed(fn, rev)
4136 rename = getrenamed(fn, rev)
4126 if rename:
4137 if rename:
4127 copies.append((fn, rename[0]))
4138 copies.append((fn, rename[0]))
4128
4139
4129 revmatchfn = None
4140 revmatchfn = None
4130 if opts.get('patch') or opts.get('stat'):
4141 if opts.get('patch') or opts.get('stat'):
4131 if opts.get('follow') or opts.get('follow_first'):
4142 if opts.get('follow') or opts.get('follow_first'):
4132 # note: this might be wrong when following through merges
4143 # note: this might be wrong when following through merges
4133 revmatchfn = scmutil.match(repo[None], fns, default='path')
4144 revmatchfn = scmutil.match(repo[None], fns, default='path')
4134 else:
4145 else:
4135 revmatchfn = matchfn
4146 revmatchfn = matchfn
4136
4147
4137 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
4148 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
4138
4149
4139 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4150 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4140 if displayer.flush(ctx.rev()):
4151 if displayer.flush(ctx.rev()):
4141 count += 1
4152 count += 1
4142 if count == limit:
4153 if count == limit:
4143 break
4154 break
4144 displayer.close()
4155 displayer.close()
4145
4156
4146 @command('manifest',
4157 @command('manifest',
4147 [('r', 'rev', '', _('revision to display'), _('REV')),
4158 [('r', 'rev', '', _('revision to display'), _('REV')),
4148 ('', 'all', False, _("list files from all revisions"))],
4159 ('', 'all', False, _("list files from all revisions"))],
4149 _('[-r REV]'))
4160 _('[-r REV]'))
4150 def manifest(ui, repo, node=None, rev=None, **opts):
4161 def manifest(ui, repo, node=None, rev=None, **opts):
4151 """output the current or given revision of the project manifest
4162 """output the current or given revision of the project manifest
4152
4163
4153 Print a list of version controlled files for the given revision.
4164 Print a list of version controlled files for the given revision.
4154 If no revision is given, the first parent of the working directory
4165 If no revision is given, the first parent of the working directory
4155 is used, or the null revision if no revision is checked out.
4166 is used, or the null revision if no revision is checked out.
4156
4167
4157 With -v, print file permissions, symlink and executable bits.
4168 With -v, print file permissions, symlink and executable bits.
4158 With --debug, print file revision hashes.
4169 With --debug, print file revision hashes.
4159
4170
4160 If option --all is specified, the list of all files from all revisions
4171 If option --all is specified, the list of all files from all revisions
4161 is printed. This includes deleted and renamed files.
4172 is printed. This includes deleted and renamed files.
4162
4173
4163 Returns 0 on success.
4174 Returns 0 on success.
4164 """
4175 """
4165
4176
4166 fm = ui.formatter('manifest', opts)
4177 fm = ui.formatter('manifest', opts)
4167
4178
4168 if opts.get('all'):
4179 if opts.get('all'):
4169 if rev or node:
4180 if rev or node:
4170 raise util.Abort(_("can't specify a revision with --all"))
4181 raise util.Abort(_("can't specify a revision with --all"))
4171
4182
4172 res = []
4183 res = []
4173 prefix = "data/"
4184 prefix = "data/"
4174 suffix = ".i"
4185 suffix = ".i"
4175 plen = len(prefix)
4186 plen = len(prefix)
4176 slen = len(suffix)
4187 slen = len(suffix)
4177 lock = repo.lock()
4188 lock = repo.lock()
4178 try:
4189 try:
4179 for fn, b, size in repo.store.datafiles():
4190 for fn, b, size in repo.store.datafiles():
4180 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
4191 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
4181 res.append(fn[plen:-slen])
4192 res.append(fn[plen:-slen])
4182 finally:
4193 finally:
4183 lock.release()
4194 lock.release()
4184 for f in res:
4195 for f in res:
4185 fm.startitem()
4196 fm.startitem()
4186 fm.write("path", '%s\n', f)
4197 fm.write("path", '%s\n', f)
4187 fm.end()
4198 fm.end()
4188 return
4199 return
4189
4200
4190 if rev and node:
4201 if rev and node:
4191 raise util.Abort(_("please specify just one revision"))
4202 raise util.Abort(_("please specify just one revision"))
4192
4203
4193 if not node:
4204 if not node:
4194 node = rev
4205 node = rev
4195
4206
4196 char = {'l': '@', 'x': '*', '': ''}
4207 char = {'l': '@', 'x': '*', '': ''}
4197 mode = {'l': '644', 'x': '755', '': '644'}
4208 mode = {'l': '644', 'x': '755', '': '644'}
4198 ctx = scmutil.revsingle(repo, node)
4209 ctx = scmutil.revsingle(repo, node)
4199 mf = ctx.manifest()
4210 mf = ctx.manifest()
4200 for f in ctx:
4211 for f in ctx:
4201 fm.startitem()
4212 fm.startitem()
4202 fl = ctx[f].flags()
4213 fl = ctx[f].flags()
4203 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
4214 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
4204 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
4215 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
4205 fm.write('path', '%s\n', f)
4216 fm.write('path', '%s\n', f)
4206 fm.end()
4217 fm.end()
4207
4218
4208 @command('^merge',
4219 @command('^merge',
4209 [('f', 'force', None,
4220 [('f', 'force', None,
4210 _('force a merge including outstanding changes (DEPRECATED)')),
4221 _('force a merge including outstanding changes (DEPRECATED)')),
4211 ('r', 'rev', '', _('revision to merge'), _('REV')),
4222 ('r', 'rev', '', _('revision to merge'), _('REV')),
4212 ('P', 'preview', None,
4223 ('P', 'preview', None,
4213 _('review revisions to merge (no merge is performed)'))
4224 _('review revisions to merge (no merge is performed)'))
4214 ] + mergetoolopts,
4225 ] + mergetoolopts,
4215 _('[-P] [-f] [[-r] REV]'))
4226 _('[-P] [-f] [[-r] REV]'))
4216 def merge(ui, repo, node=None, **opts):
4227 def merge(ui, repo, node=None, **opts):
4217 """merge working directory with another revision
4228 """merge working directory with another revision
4218
4229
4219 The current working directory is updated with all changes made in
4230 The current working directory is updated with all changes made in
4220 the requested revision since the last common predecessor revision.
4231 the requested revision since the last common predecessor revision.
4221
4232
4222 Files that changed between either parent are marked as changed for
4233 Files that changed between either parent are marked as changed for
4223 the next commit and a commit must be performed before any further
4234 the next commit and a commit must be performed before any further
4224 updates to the repository are allowed. The next commit will have
4235 updates to the repository are allowed. The next commit will have
4225 two parents.
4236 two parents.
4226
4237
4227 ``--tool`` can be used to specify the merge tool used for file
4238 ``--tool`` can be used to specify the merge tool used for file
4228 merges. It overrides the HGMERGE environment variable and your
4239 merges. It overrides the HGMERGE environment variable and your
4229 configuration files. See :hg:`help merge-tools` for options.
4240 configuration files. See :hg:`help merge-tools` for options.
4230
4241
4231 If no revision is specified, the working directory's parent is a
4242 If no revision is specified, the working directory's parent is a
4232 head revision, and the current branch contains exactly one other
4243 head revision, and the current branch contains exactly one other
4233 head, the other head is merged with by default. Otherwise, an
4244 head, the other head is merged with by default. Otherwise, an
4234 explicit revision with which to merge with must be provided.
4245 explicit revision with which to merge with must be provided.
4235
4246
4236 :hg:`resolve` must be used to resolve unresolved files.
4247 :hg:`resolve` must be used to resolve unresolved files.
4237
4248
4238 To undo an uncommitted merge, use :hg:`update --clean .` which
4249 To undo an uncommitted merge, use :hg:`update --clean .` which
4239 will check out a clean copy of the original merge parent, losing
4250 will check out a clean copy of the original merge parent, losing
4240 all changes.
4251 all changes.
4241
4252
4242 Returns 0 on success, 1 if there are unresolved files.
4253 Returns 0 on success, 1 if there are unresolved files.
4243 """
4254 """
4244
4255
4245 if opts.get('rev') and node:
4256 if opts.get('rev') and node:
4246 raise util.Abort(_("please specify just one revision"))
4257 raise util.Abort(_("please specify just one revision"))
4247 if not node:
4258 if not node:
4248 node = opts.get('rev')
4259 node = opts.get('rev')
4249
4260
4250 if node:
4261 if node:
4251 node = scmutil.revsingle(repo, node).node()
4262 node = scmutil.revsingle(repo, node).node()
4252
4263
4253 if not node and repo._bookmarkcurrent:
4264 if not node and repo._bookmarkcurrent:
4254 bmheads = repo.bookmarkheads(repo._bookmarkcurrent)
4265 bmheads = repo.bookmarkheads(repo._bookmarkcurrent)
4255 curhead = repo[repo._bookmarkcurrent].node()
4266 curhead = repo[repo._bookmarkcurrent].node()
4256 if len(bmheads) == 2:
4267 if len(bmheads) == 2:
4257 if curhead == bmheads[0]:
4268 if curhead == bmheads[0]:
4258 node = bmheads[1]
4269 node = bmheads[1]
4259 else:
4270 else:
4260 node = bmheads[0]
4271 node = bmheads[0]
4261 elif len(bmheads) > 2:
4272 elif len(bmheads) > 2:
4262 raise util.Abort(_("multiple matching bookmarks to merge - "
4273 raise util.Abort(_("multiple matching bookmarks to merge - "
4263 "please merge with an explicit rev or bookmark"),
4274 "please merge with an explicit rev or bookmark"),
4264 hint=_("run 'hg heads' to see all heads"))
4275 hint=_("run 'hg heads' to see all heads"))
4265 elif len(bmheads) <= 1:
4276 elif len(bmheads) <= 1:
4266 raise util.Abort(_("no matching bookmark to merge - "
4277 raise util.Abort(_("no matching bookmark to merge - "
4267 "please merge with an explicit rev or bookmark"),
4278 "please merge with an explicit rev or bookmark"),
4268 hint=_("run 'hg heads' to see all heads"))
4279 hint=_("run 'hg heads' to see all heads"))
4269
4280
4270 if not node and not repo._bookmarkcurrent:
4281 if not node and not repo._bookmarkcurrent:
4271 branch = repo[None].branch()
4282 branch = repo[None].branch()
4272 bheads = repo.branchheads(branch)
4283 bheads = repo.branchheads(branch)
4273 nbhs = [bh for bh in bheads if not repo[bh].bookmarks()]
4284 nbhs = [bh for bh in bheads if not repo[bh].bookmarks()]
4274
4285
4275 if len(nbhs) > 2:
4286 if len(nbhs) > 2:
4276 raise util.Abort(_("branch '%s' has %d heads - "
4287 raise util.Abort(_("branch '%s' has %d heads - "
4277 "please merge with an explicit rev")
4288 "please merge with an explicit rev")
4278 % (branch, len(bheads)),
4289 % (branch, len(bheads)),
4279 hint=_("run 'hg heads .' to see heads"))
4290 hint=_("run 'hg heads .' to see heads"))
4280
4291
4281 parent = repo.dirstate.p1()
4292 parent = repo.dirstate.p1()
4282 if len(nbhs) <= 1:
4293 if len(nbhs) <= 1:
4283 if len(bheads) > 1:
4294 if len(bheads) > 1:
4284 raise util.Abort(_("heads are bookmarked - "
4295 raise util.Abort(_("heads are bookmarked - "
4285 "please merge with an explicit rev"),
4296 "please merge with an explicit rev"),
4286 hint=_("run 'hg heads' to see all heads"))
4297 hint=_("run 'hg heads' to see all heads"))
4287 if len(repo.heads()) > 1:
4298 if len(repo.heads()) > 1:
4288 raise util.Abort(_("branch '%s' has one head - "
4299 raise util.Abort(_("branch '%s' has one head - "
4289 "please merge with an explicit rev")
4300 "please merge with an explicit rev")
4290 % branch,
4301 % branch,
4291 hint=_("run 'hg heads' to see all heads"))
4302 hint=_("run 'hg heads' to see all heads"))
4292 msg, hint = _('nothing to merge'), None
4303 msg, hint = _('nothing to merge'), None
4293 if parent != repo.lookup(branch):
4304 if parent != repo.lookup(branch):
4294 hint = _("use 'hg update' instead")
4305 hint = _("use 'hg update' instead")
4295 raise util.Abort(msg, hint=hint)
4306 raise util.Abort(msg, hint=hint)
4296
4307
4297 if parent not in bheads:
4308 if parent not in bheads:
4298 raise util.Abort(_('working directory not at a head revision'),
4309 raise util.Abort(_('working directory not at a head revision'),
4299 hint=_("use 'hg update' or merge with an "
4310 hint=_("use 'hg update' or merge with an "
4300 "explicit revision"))
4311 "explicit revision"))
4301 if parent == nbhs[0]:
4312 if parent == nbhs[0]:
4302 node = nbhs[-1]
4313 node = nbhs[-1]
4303 else:
4314 else:
4304 node = nbhs[0]
4315 node = nbhs[0]
4305
4316
4306 if opts.get('preview'):
4317 if opts.get('preview'):
4307 # find nodes that are ancestors of p2 but not of p1
4318 # find nodes that are ancestors of p2 but not of p1
4308 p1 = repo.lookup('.')
4319 p1 = repo.lookup('.')
4309 p2 = repo.lookup(node)
4320 p2 = repo.lookup(node)
4310 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4321 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4311
4322
4312 displayer = cmdutil.show_changeset(ui, repo, opts)
4323 displayer = cmdutil.show_changeset(ui, repo, opts)
4313 for node in nodes:
4324 for node in nodes:
4314 displayer.show(repo[node])
4325 displayer.show(repo[node])
4315 displayer.close()
4326 displayer.close()
4316 return 0
4327 return 0
4317
4328
4318 try:
4329 try:
4319 # ui.forcemerge is an internal variable, do not document
4330 # ui.forcemerge is an internal variable, do not document
4320 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4331 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4321 return hg.merge(repo, node, force=opts.get('force'))
4332 return hg.merge(repo, node, force=opts.get('force'))
4322 finally:
4333 finally:
4323 ui.setconfig('ui', 'forcemerge', '')
4334 ui.setconfig('ui', 'forcemerge', '')
4324
4335
4325 @command('outgoing|out',
4336 @command('outgoing|out',
4326 [('f', 'force', None, _('run even when the destination is unrelated')),
4337 [('f', 'force', None, _('run even when the destination is unrelated')),
4327 ('r', 'rev', [],
4338 ('r', 'rev', [],
4328 _('a changeset intended to be included in the destination'), _('REV')),
4339 _('a changeset intended to be included in the destination'), _('REV')),
4329 ('n', 'newest-first', None, _('show newest record first')),
4340 ('n', 'newest-first', None, _('show newest record first')),
4330 ('B', 'bookmarks', False, _('compare bookmarks')),
4341 ('B', 'bookmarks', False, _('compare bookmarks')),
4331 ('b', 'branch', [], _('a specific branch you would like to push'),
4342 ('b', 'branch', [], _('a specific branch you would like to push'),
4332 _('BRANCH')),
4343 _('BRANCH')),
4333 ] + logopts + remoteopts + subrepoopts,
4344 ] + logopts + remoteopts + subrepoopts,
4334 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4345 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4335 def outgoing(ui, repo, dest=None, **opts):
4346 def outgoing(ui, repo, dest=None, **opts):
4336 """show changesets not found in the destination
4347 """show changesets not found in the destination
4337
4348
4338 Show changesets not found in the specified destination repository
4349 Show changesets not found in the specified destination repository
4339 or the default push location. These are the changesets that would
4350 or the default push location. These are the changesets that would
4340 be pushed if a push was requested.
4351 be pushed if a push was requested.
4341
4352
4342 See pull for details of valid destination formats.
4353 See pull for details of valid destination formats.
4343
4354
4344 Returns 0 if there are outgoing changes, 1 otherwise.
4355 Returns 0 if there are outgoing changes, 1 otherwise.
4345 """
4356 """
4346 if opts.get('graph'):
4357 if opts.get('graph'):
4347 cmdutil.checkunsupportedgraphflags([], opts)
4358 cmdutil.checkunsupportedgraphflags([], opts)
4348 o = hg._outgoing(ui, repo, dest, opts)
4359 o = hg._outgoing(ui, repo, dest, opts)
4349 if o is None:
4360 if o is None:
4350 return
4361 return
4351
4362
4352 revdag = cmdutil.graphrevs(repo, o, opts)
4363 revdag = cmdutil.graphrevs(repo, o, opts)
4353 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
4364 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
4354 showparents = [ctx.node() for ctx in repo[None].parents()]
4365 showparents = [ctx.node() for ctx in repo[None].parents()]
4355 cmdutil.displaygraph(ui, revdag, displayer, showparents,
4366 cmdutil.displaygraph(ui, revdag, displayer, showparents,
4356 graphmod.asciiedges)
4367 graphmod.asciiedges)
4357 return 0
4368 return 0
4358
4369
4359 if opts.get('bookmarks'):
4370 if opts.get('bookmarks'):
4360 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4371 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4361 dest, branches = hg.parseurl(dest, opts.get('branch'))
4372 dest, branches = hg.parseurl(dest, opts.get('branch'))
4362 other = hg.peer(repo, opts, dest)
4373 other = hg.peer(repo, opts, dest)
4363 if 'bookmarks' not in other.listkeys('namespaces'):
4374 if 'bookmarks' not in other.listkeys('namespaces'):
4364 ui.warn(_("remote doesn't support bookmarks\n"))
4375 ui.warn(_("remote doesn't support bookmarks\n"))
4365 return 0
4376 return 0
4366 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4377 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4367 return bookmarks.diff(ui, other, repo)
4378 return bookmarks.diff(ui, other, repo)
4368
4379
4369 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4380 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4370 try:
4381 try:
4371 return hg.outgoing(ui, repo, dest, opts)
4382 return hg.outgoing(ui, repo, dest, opts)
4372 finally:
4383 finally:
4373 del repo._subtoppath
4384 del repo._subtoppath
4374
4385
4375 @command('parents',
4386 @command('parents',
4376 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4387 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4377 ] + templateopts,
4388 ] + templateopts,
4378 _('[-r REV] [FILE]'))
4389 _('[-r REV] [FILE]'))
4379 def parents(ui, repo, file_=None, **opts):
4390 def parents(ui, repo, file_=None, **opts):
4380 """show the parents of the working directory or revision
4391 """show the parents of the working directory or revision
4381
4392
4382 Print the working directory's parent revisions. If a revision is
4393 Print the working directory's parent revisions. If a revision is
4383 given via -r/--rev, the parent of that revision will be printed.
4394 given via -r/--rev, the parent of that revision will be printed.
4384 If a file argument is given, the revision in which the file was
4395 If a file argument is given, the revision in which the file was
4385 last changed (before the working directory revision or the
4396 last changed (before the working directory revision or the
4386 argument to --rev if given) is printed.
4397 argument to --rev if given) is printed.
4387
4398
4388 Returns 0 on success.
4399 Returns 0 on success.
4389 """
4400 """
4390
4401
4391 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4402 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4392
4403
4393 if file_:
4404 if file_:
4394 m = scmutil.match(ctx, (file_,), opts)
4405 m = scmutil.match(ctx, (file_,), opts)
4395 if m.anypats() or len(m.files()) != 1:
4406 if m.anypats() or len(m.files()) != 1:
4396 raise util.Abort(_('can only specify an explicit filename'))
4407 raise util.Abort(_('can only specify an explicit filename'))
4397 file_ = m.files()[0]
4408 file_ = m.files()[0]
4398 filenodes = []
4409 filenodes = []
4399 for cp in ctx.parents():
4410 for cp in ctx.parents():
4400 if not cp:
4411 if not cp:
4401 continue
4412 continue
4402 try:
4413 try:
4403 filenodes.append(cp.filenode(file_))
4414 filenodes.append(cp.filenode(file_))
4404 except error.LookupError:
4415 except error.LookupError:
4405 pass
4416 pass
4406 if not filenodes:
4417 if not filenodes:
4407 raise util.Abort(_("'%s' not found in manifest!") % file_)
4418 raise util.Abort(_("'%s' not found in manifest!") % file_)
4408 p = []
4419 p = []
4409 for fn in filenodes:
4420 for fn in filenodes:
4410 fctx = repo.filectx(file_, fileid=fn)
4421 fctx = repo.filectx(file_, fileid=fn)
4411 p.append(fctx.node())
4422 p.append(fctx.node())
4412 else:
4423 else:
4413 p = [cp.node() for cp in ctx.parents()]
4424 p = [cp.node() for cp in ctx.parents()]
4414
4425
4415 displayer = cmdutil.show_changeset(ui, repo, opts)
4426 displayer = cmdutil.show_changeset(ui, repo, opts)
4416 for n in p:
4427 for n in p:
4417 if n != nullid:
4428 if n != nullid:
4418 displayer.show(repo[n])
4429 displayer.show(repo[n])
4419 displayer.close()
4430 displayer.close()
4420
4431
4421 @command('paths', [], _('[NAME]'))
4432 @command('paths', [], _('[NAME]'))
4422 def paths(ui, repo, search=None):
4433 def paths(ui, repo, search=None):
4423 """show aliases for remote repositories
4434 """show aliases for remote repositories
4424
4435
4425 Show definition of symbolic path name NAME. If no name is given,
4436 Show definition of symbolic path name NAME. If no name is given,
4426 show definition of all available names.
4437 show definition of all available names.
4427
4438
4428 Option -q/--quiet suppresses all output when searching for NAME
4439 Option -q/--quiet suppresses all output when searching for NAME
4429 and shows only the path names when listing all definitions.
4440 and shows only the path names when listing all definitions.
4430
4441
4431 Path names are defined in the [paths] section of your
4442 Path names are defined in the [paths] section of your
4432 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4443 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4433 repository, ``.hg/hgrc`` is used, too.
4444 repository, ``.hg/hgrc`` is used, too.
4434
4445
4435 The path names ``default`` and ``default-push`` have a special
4446 The path names ``default`` and ``default-push`` have a special
4436 meaning. When performing a push or pull operation, they are used
4447 meaning. When performing a push or pull operation, they are used
4437 as fallbacks if no location is specified on the command-line.
4448 as fallbacks if no location is specified on the command-line.
4438 When ``default-push`` is set, it will be used for push and
4449 When ``default-push`` is set, it will be used for push and
4439 ``default`` will be used for pull; otherwise ``default`` is used
4450 ``default`` will be used for pull; otherwise ``default`` is used
4440 as the fallback for both. When cloning a repository, the clone
4451 as the fallback for both. When cloning a repository, the clone
4441 source is written as ``default`` in ``.hg/hgrc``. Note that
4452 source is written as ``default`` in ``.hg/hgrc``. Note that
4442 ``default`` and ``default-push`` apply to all inbound (e.g.
4453 ``default`` and ``default-push`` apply to all inbound (e.g.
4443 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
4454 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
4444 :hg:`bundle`) operations.
4455 :hg:`bundle`) operations.
4445
4456
4446 See :hg:`help urls` for more information.
4457 See :hg:`help urls` for more information.
4447
4458
4448 Returns 0 on success.
4459 Returns 0 on success.
4449 """
4460 """
4450 if search:
4461 if search:
4451 for name, path in ui.configitems("paths"):
4462 for name, path in ui.configitems("paths"):
4452 if name == search:
4463 if name == search:
4453 ui.status("%s\n" % util.hidepassword(path))
4464 ui.status("%s\n" % util.hidepassword(path))
4454 return
4465 return
4455 if not ui.quiet:
4466 if not ui.quiet:
4456 ui.warn(_("not found!\n"))
4467 ui.warn(_("not found!\n"))
4457 return 1
4468 return 1
4458 else:
4469 else:
4459 for name, path in ui.configitems("paths"):
4470 for name, path in ui.configitems("paths"):
4460 if ui.quiet:
4471 if ui.quiet:
4461 ui.write("%s\n" % name)
4472 ui.write("%s\n" % name)
4462 else:
4473 else:
4463 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
4474 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
4464
4475
4465 @command('phase',
4476 @command('phase',
4466 [('p', 'public', False, _('set changeset phase to public')),
4477 [('p', 'public', False, _('set changeset phase to public')),
4467 ('d', 'draft', False, _('set changeset phase to draft')),
4478 ('d', 'draft', False, _('set changeset phase to draft')),
4468 ('s', 'secret', False, _('set changeset phase to secret')),
4479 ('s', 'secret', False, _('set changeset phase to secret')),
4469 ('f', 'force', False, _('allow to move boundary backward')),
4480 ('f', 'force', False, _('allow to move boundary backward')),
4470 ('r', 'rev', [], _('target revision'), _('REV')),
4481 ('r', 'rev', [], _('target revision'), _('REV')),
4471 ],
4482 ],
4472 _('[-p|-d|-s] [-f] [-r] REV...'))
4483 _('[-p|-d|-s] [-f] [-r] REV...'))
4473 def phase(ui, repo, *revs, **opts):
4484 def phase(ui, repo, *revs, **opts):
4474 """set or show the current phase name
4485 """set or show the current phase name
4475
4486
4476 With no argument, show the phase name of specified revisions.
4487 With no argument, show the phase name of specified revisions.
4477
4488
4478 With one of -p/--public, -d/--draft or -s/--secret, change the
4489 With one of -p/--public, -d/--draft or -s/--secret, change the
4479 phase value of the specified revisions.
4490 phase value of the specified revisions.
4480
4491
4481 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
4492 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
4482 lower phase to an higher phase. Phases are ordered as follows::
4493 lower phase to an higher phase. Phases are ordered as follows::
4483
4494
4484 public < draft < secret
4495 public < draft < secret
4485
4496
4486 Return 0 on success, 1 if no phases were changed or some could not
4497 Return 0 on success, 1 if no phases were changed or some could not
4487 be changed.
4498 be changed.
4488 """
4499 """
4489 # search for a unique phase argument
4500 # search for a unique phase argument
4490 targetphase = None
4501 targetphase = None
4491 for idx, name in enumerate(phases.phasenames):
4502 for idx, name in enumerate(phases.phasenames):
4492 if opts[name]:
4503 if opts[name]:
4493 if targetphase is not None:
4504 if targetphase is not None:
4494 raise util.Abort(_('only one phase can be specified'))
4505 raise util.Abort(_('only one phase can be specified'))
4495 targetphase = idx
4506 targetphase = idx
4496
4507
4497 # look for specified revision
4508 # look for specified revision
4498 revs = list(revs)
4509 revs = list(revs)
4499 revs.extend(opts['rev'])
4510 revs.extend(opts['rev'])
4500 if not revs:
4511 if not revs:
4501 raise util.Abort(_('no revisions specified'))
4512 raise util.Abort(_('no revisions specified'))
4502
4513
4503 revs = scmutil.revrange(repo, revs)
4514 revs = scmutil.revrange(repo, revs)
4504
4515
4505 lock = None
4516 lock = None
4506 ret = 0
4517 ret = 0
4507 if targetphase is None:
4518 if targetphase is None:
4508 # display
4519 # display
4509 for r in revs:
4520 for r in revs:
4510 ctx = repo[r]
4521 ctx = repo[r]
4511 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4522 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4512 else:
4523 else:
4513 lock = repo.lock()
4524 lock = repo.lock()
4514 try:
4525 try:
4515 # set phase
4526 # set phase
4516 if not revs:
4527 if not revs:
4517 raise util.Abort(_('empty revision set'))
4528 raise util.Abort(_('empty revision set'))
4518 nodes = [repo[r].node() for r in revs]
4529 nodes = [repo[r].node() for r in revs]
4519 olddata = repo._phasecache.getphaserevs(repo)[:]
4530 olddata = repo._phasecache.getphaserevs(repo)[:]
4520 phases.advanceboundary(repo, targetphase, nodes)
4531 phases.advanceboundary(repo, targetphase, nodes)
4521 if opts['force']:
4532 if opts['force']:
4522 phases.retractboundary(repo, targetphase, nodes)
4533 phases.retractboundary(repo, targetphase, nodes)
4523 finally:
4534 finally:
4524 lock.release()
4535 lock.release()
4525 # moving revision from public to draft may hide them
4536 # moving revision from public to draft may hide them
4526 # We have to check result on an unfiltered repository
4537 # We have to check result on an unfiltered repository
4527 unfi = repo.unfiltered()
4538 unfi = repo.unfiltered()
4528 newdata = repo._phasecache.getphaserevs(unfi)
4539 newdata = repo._phasecache.getphaserevs(unfi)
4529 changes = sum(o != newdata[i] for i, o in enumerate(olddata))
4540 changes = sum(o != newdata[i] for i, o in enumerate(olddata))
4530 cl = unfi.changelog
4541 cl = unfi.changelog
4531 rejected = [n for n in nodes
4542 rejected = [n for n in nodes
4532 if newdata[cl.rev(n)] < targetphase]
4543 if newdata[cl.rev(n)] < targetphase]
4533 if rejected:
4544 if rejected:
4534 ui.warn(_('cannot move %i changesets to a higher '
4545 ui.warn(_('cannot move %i changesets to a higher '
4535 'phase, use --force\n') % len(rejected))
4546 'phase, use --force\n') % len(rejected))
4536 ret = 1
4547 ret = 1
4537 if changes:
4548 if changes:
4538 msg = _('phase changed for %i changesets\n') % changes
4549 msg = _('phase changed for %i changesets\n') % changes
4539 if ret:
4550 if ret:
4540 ui.status(msg)
4551 ui.status(msg)
4541 else:
4552 else:
4542 ui.note(msg)
4553 ui.note(msg)
4543 else:
4554 else:
4544 ui.warn(_('no phases changed\n'))
4555 ui.warn(_('no phases changed\n'))
4545 ret = 1
4556 ret = 1
4546 return ret
4557 return ret
4547
4558
4548 def postincoming(ui, repo, modheads, optupdate, checkout):
4559 def postincoming(ui, repo, modheads, optupdate, checkout):
4549 if modheads == 0:
4560 if modheads == 0:
4550 return
4561 return
4551 if optupdate:
4562 if optupdate:
4552 checkout, movemarkfrom = bookmarks.calculateupdate(ui, repo, checkout)
4563 checkout, movemarkfrom = bookmarks.calculateupdate(ui, repo, checkout)
4553 try:
4564 try:
4554 ret = hg.update(repo, checkout)
4565 ret = hg.update(repo, checkout)
4555 except util.Abort, inst:
4566 except util.Abort, inst:
4556 ui.warn(_("not updating: %s\n") % str(inst))
4567 ui.warn(_("not updating: %s\n") % str(inst))
4557 if inst.hint:
4568 if inst.hint:
4558 ui.warn(_("(%s)\n") % inst.hint)
4569 ui.warn(_("(%s)\n") % inst.hint)
4559 return 0
4570 return 0
4560 if not ret and not checkout:
4571 if not ret and not checkout:
4561 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
4572 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
4562 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
4573 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
4563 return ret
4574 return ret
4564 if modheads > 1:
4575 if modheads > 1:
4565 currentbranchheads = len(repo.branchheads())
4576 currentbranchheads = len(repo.branchheads())
4566 if currentbranchheads == modheads:
4577 if currentbranchheads == modheads:
4567 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4578 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4568 elif currentbranchheads > 1:
4579 elif currentbranchheads > 1:
4569 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
4580 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
4570 "merge)\n"))
4581 "merge)\n"))
4571 else:
4582 else:
4572 ui.status(_("(run 'hg heads' to see heads)\n"))
4583 ui.status(_("(run 'hg heads' to see heads)\n"))
4573 else:
4584 else:
4574 ui.status(_("(run 'hg update' to get a working copy)\n"))
4585 ui.status(_("(run 'hg update' to get a working copy)\n"))
4575
4586
4576 @command('^pull',
4587 @command('^pull',
4577 [('u', 'update', None,
4588 [('u', 'update', None,
4578 _('update to new branch head if changesets were pulled')),
4589 _('update to new branch head if changesets were pulled')),
4579 ('f', 'force', None, _('run even when remote repository is unrelated')),
4590 ('f', 'force', None, _('run even when remote repository is unrelated')),
4580 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4591 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4581 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4592 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4582 ('b', 'branch', [], _('a specific branch you would like to pull'),
4593 ('b', 'branch', [], _('a specific branch you would like to pull'),
4583 _('BRANCH')),
4594 _('BRANCH')),
4584 ] + remoteopts,
4595 ] + remoteopts,
4585 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4596 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4586 def pull(ui, repo, source="default", **opts):
4597 def pull(ui, repo, source="default", **opts):
4587 """pull changes from the specified source
4598 """pull changes from the specified source
4588
4599
4589 Pull changes from a remote repository to a local one.
4600 Pull changes from a remote repository to a local one.
4590
4601
4591 This finds all changes from the repository at the specified path
4602 This finds all changes from the repository at the specified path
4592 or URL and adds them to a local repository (the current one unless
4603 or URL and adds them to a local repository (the current one unless
4593 -R is specified). By default, this does not update the copy of the
4604 -R is specified). By default, this does not update the copy of the
4594 project in the working directory.
4605 project in the working directory.
4595
4606
4596 Use :hg:`incoming` if you want to see what would have been added
4607 Use :hg:`incoming` if you want to see what would have been added
4597 by a pull at the time you issued this command. If you then decide
4608 by a pull at the time you issued this command. If you then decide
4598 to add those changes to the repository, you should use :hg:`pull
4609 to add those changes to the repository, you should use :hg:`pull
4599 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4610 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4600
4611
4601 If SOURCE is omitted, the 'default' path will be used.
4612 If SOURCE is omitted, the 'default' path will be used.
4602 See :hg:`help urls` for more information.
4613 See :hg:`help urls` for more information.
4603
4614
4604 Returns 0 on success, 1 if an update had unresolved files.
4615 Returns 0 on success, 1 if an update had unresolved files.
4605 """
4616 """
4606 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4617 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4607 other = hg.peer(repo, opts, source)
4618 other = hg.peer(repo, opts, source)
4608 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4619 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4609 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
4620 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
4610
4621
4611 remotebookmarks = other.listkeys('bookmarks')
4622 remotebookmarks = other.listkeys('bookmarks')
4612
4623
4613 if opts.get('bookmark'):
4624 if opts.get('bookmark'):
4614 if not revs:
4625 if not revs:
4615 revs = []
4626 revs = []
4616 for b in opts['bookmark']:
4627 for b in opts['bookmark']:
4617 if b not in remotebookmarks:
4628 if b not in remotebookmarks:
4618 raise util.Abort(_('remote bookmark %s not found!') % b)
4629 raise util.Abort(_('remote bookmark %s not found!') % b)
4619 revs.append(remotebookmarks[b])
4630 revs.append(remotebookmarks[b])
4620
4631
4621 if revs:
4632 if revs:
4622 try:
4633 try:
4623 revs = [other.lookup(rev) for rev in revs]
4634 revs = [other.lookup(rev) for rev in revs]
4624 except error.CapabilityError:
4635 except error.CapabilityError:
4625 err = _("other repository doesn't support revision lookup, "
4636 err = _("other repository doesn't support revision lookup, "
4626 "so a rev cannot be specified.")
4637 "so a rev cannot be specified.")
4627 raise util.Abort(err)
4638 raise util.Abort(err)
4628
4639
4629 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
4640 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
4630 bookmarks.updatefromremote(ui, repo, remotebookmarks, source)
4641 bookmarks.updatefromremote(ui, repo, remotebookmarks, source)
4631 if checkout:
4642 if checkout:
4632 checkout = str(repo.changelog.rev(other.lookup(checkout)))
4643 checkout = str(repo.changelog.rev(other.lookup(checkout)))
4633 repo._subtoppath = source
4644 repo._subtoppath = source
4634 try:
4645 try:
4635 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
4646 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
4636
4647
4637 finally:
4648 finally:
4638 del repo._subtoppath
4649 del repo._subtoppath
4639
4650
4640 # update specified bookmarks
4651 # update specified bookmarks
4641 if opts.get('bookmark'):
4652 if opts.get('bookmark'):
4642 marks = repo._bookmarks
4653 marks = repo._bookmarks
4643 for b in opts['bookmark']:
4654 for b in opts['bookmark']:
4644 # explicit pull overrides local bookmark if any
4655 # explicit pull overrides local bookmark if any
4645 ui.status(_("importing bookmark %s\n") % b)
4656 ui.status(_("importing bookmark %s\n") % b)
4646 marks[b] = repo[remotebookmarks[b]].node()
4657 marks[b] = repo[remotebookmarks[b]].node()
4647 marks.write()
4658 marks.write()
4648
4659
4649 return ret
4660 return ret
4650
4661
4651 @command('^push',
4662 @command('^push',
4652 [('f', 'force', None, _('force push')),
4663 [('f', 'force', None, _('force push')),
4653 ('r', 'rev', [],
4664 ('r', 'rev', [],
4654 _('a changeset intended to be included in the destination'),
4665 _('a changeset intended to be included in the destination'),
4655 _('REV')),
4666 _('REV')),
4656 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4667 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4657 ('b', 'branch', [],
4668 ('b', 'branch', [],
4658 _('a specific branch you would like to push'), _('BRANCH')),
4669 _('a specific branch you would like to push'), _('BRANCH')),
4659 ('', 'new-branch', False, _('allow pushing a new branch')),
4670 ('', 'new-branch', False, _('allow pushing a new branch')),
4660 ] + remoteopts,
4671 ] + remoteopts,
4661 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4672 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4662 def push(ui, repo, dest=None, **opts):
4673 def push(ui, repo, dest=None, **opts):
4663 """push changes to the specified destination
4674 """push changes to the specified destination
4664
4675
4665 Push changesets from the local repository to the specified
4676 Push changesets from the local repository to the specified
4666 destination.
4677 destination.
4667
4678
4668 This operation is symmetrical to pull: it is identical to a pull
4679 This operation is symmetrical to pull: it is identical to a pull
4669 in the destination repository from the current one.
4680 in the destination repository from the current one.
4670
4681
4671 By default, push will not allow creation of new heads at the
4682 By default, push will not allow creation of new heads at the
4672 destination, since multiple heads would make it unclear which head
4683 destination, since multiple heads would make it unclear which head
4673 to use. In this situation, it is recommended to pull and merge
4684 to use. In this situation, it is recommended to pull and merge
4674 before pushing.
4685 before pushing.
4675
4686
4676 Use --new-branch if you want to allow push to create a new named
4687 Use --new-branch if you want to allow push to create a new named
4677 branch that is not present at the destination. This allows you to
4688 branch that is not present at the destination. This allows you to
4678 only create a new branch without forcing other changes.
4689 only create a new branch without forcing other changes.
4679
4690
4680 .. note::
4691 .. note::
4681
4692
4682 Extra care should be taken with the -f/--force option,
4693 Extra care should be taken with the -f/--force option,
4683 which will push all new heads on all branches, an action which will
4694 which will push all new heads on all branches, an action which will
4684 almost always cause confusion for collaborators.
4695 almost always cause confusion for collaborators.
4685
4696
4686 If -r/--rev is used, the specified revision and all its ancestors
4697 If -r/--rev is used, the specified revision and all its ancestors
4687 will be pushed to the remote repository.
4698 will be pushed to the remote repository.
4688
4699
4689 If -B/--bookmark is used, the specified bookmarked revision, its
4700 If -B/--bookmark is used, the specified bookmarked revision, its
4690 ancestors, and the bookmark will be pushed to the remote
4701 ancestors, and the bookmark will be pushed to the remote
4691 repository.
4702 repository.
4692
4703
4693 Please see :hg:`help urls` for important details about ``ssh://``
4704 Please see :hg:`help urls` for important details about ``ssh://``
4694 URLs. If DESTINATION is omitted, a default path will be used.
4705 URLs. If DESTINATION is omitted, a default path will be used.
4695
4706
4696 Returns 0 if push was successful, 1 if nothing to push.
4707 Returns 0 if push was successful, 1 if nothing to push.
4697 """
4708 """
4698
4709
4699 if opts.get('bookmark'):
4710 if opts.get('bookmark'):
4700 ui.setconfig('bookmarks', 'pushing', opts['bookmark'])
4711 ui.setconfig('bookmarks', 'pushing', opts['bookmark'])
4701 for b in opts['bookmark']:
4712 for b in opts['bookmark']:
4702 # translate -B options to -r so changesets get pushed
4713 # translate -B options to -r so changesets get pushed
4703 if b in repo._bookmarks:
4714 if b in repo._bookmarks:
4704 opts.setdefault('rev', []).append(b)
4715 opts.setdefault('rev', []).append(b)
4705 else:
4716 else:
4706 # if we try to push a deleted bookmark, translate it to null
4717 # if we try to push a deleted bookmark, translate it to null
4707 # this lets simultaneous -r, -b options continue working
4718 # this lets simultaneous -r, -b options continue working
4708 opts.setdefault('rev', []).append("null")
4719 opts.setdefault('rev', []).append("null")
4709
4720
4710 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4721 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4711 dest, branches = hg.parseurl(dest, opts.get('branch'))
4722 dest, branches = hg.parseurl(dest, opts.get('branch'))
4712 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4723 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4713 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4724 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4714 other = hg.peer(repo, opts, dest)
4725 other = hg.peer(repo, opts, dest)
4715 if revs:
4726 if revs:
4716 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4727 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4717
4728
4718 repo._subtoppath = dest
4729 repo._subtoppath = dest
4719 try:
4730 try:
4720 # push subrepos depth-first for coherent ordering
4731 # push subrepos depth-first for coherent ordering
4721 c = repo['']
4732 c = repo['']
4722 subs = c.substate # only repos that are committed
4733 subs = c.substate # only repos that are committed
4723 for s in sorted(subs):
4734 for s in sorted(subs):
4724 if c.sub(s).push(opts) == 0:
4735 if c.sub(s).push(opts) == 0:
4725 return False
4736 return False
4726 finally:
4737 finally:
4727 del repo._subtoppath
4738 del repo._subtoppath
4728 result = repo.push(other, opts.get('force'), revs=revs,
4739 result = repo.push(other, opts.get('force'), revs=revs,
4729 newbranch=opts.get('new_branch'))
4740 newbranch=opts.get('new_branch'))
4730
4741
4731 result = not result
4742 result = not result
4732
4743
4733 if opts.get('bookmark'):
4744 if opts.get('bookmark'):
4734 bresult = bookmarks.pushtoremote(ui, repo, other, opts['bookmark'])
4745 bresult = bookmarks.pushtoremote(ui, repo, other, opts['bookmark'])
4735 if bresult == 2:
4746 if bresult == 2:
4736 return 2
4747 return 2
4737 if not result and bresult:
4748 if not result and bresult:
4738 result = 2
4749 result = 2
4739
4750
4740 return result
4751 return result
4741
4752
4742 @command('recover', [])
4753 @command('recover', [])
4743 def recover(ui, repo):
4754 def recover(ui, repo):
4744 """roll back an interrupted transaction
4755 """roll back an interrupted transaction
4745
4756
4746 Recover from an interrupted commit or pull.
4757 Recover from an interrupted commit or pull.
4747
4758
4748 This command tries to fix the repository status after an
4759 This command tries to fix the repository status after an
4749 interrupted operation. It should only be necessary when Mercurial
4760 interrupted operation. It should only be necessary when Mercurial
4750 suggests it.
4761 suggests it.
4751
4762
4752 Returns 0 if successful, 1 if nothing to recover or verify fails.
4763 Returns 0 if successful, 1 if nothing to recover or verify fails.
4753 """
4764 """
4754 if repo.recover():
4765 if repo.recover():
4755 return hg.verify(repo)
4766 return hg.verify(repo)
4756 return 1
4767 return 1
4757
4768
4758 @command('^remove|rm',
4769 @command('^remove|rm',
4759 [('A', 'after', None, _('record delete for missing files')),
4770 [('A', 'after', None, _('record delete for missing files')),
4760 ('f', 'force', None,
4771 ('f', 'force', None,
4761 _('remove (and delete) file even if added or modified')),
4772 _('remove (and delete) file even if added or modified')),
4762 ] + walkopts,
4773 ] + walkopts,
4763 _('[OPTION]... FILE...'))
4774 _('[OPTION]... FILE...'))
4764 def remove(ui, repo, *pats, **opts):
4775 def remove(ui, repo, *pats, **opts):
4765 """remove the specified files on the next commit
4776 """remove the specified files on the next commit
4766
4777
4767 Schedule the indicated files for removal from the current branch.
4778 Schedule the indicated files for removal from the current branch.
4768
4779
4769 This command schedules the files to be removed at the next commit.
4780 This command schedules the files to be removed at the next commit.
4770 To undo a remove before that, see :hg:`revert`. To undo added
4781 To undo a remove before that, see :hg:`revert`. To undo added
4771 files, see :hg:`forget`.
4782 files, see :hg:`forget`.
4772
4783
4773 .. container:: verbose
4784 .. container:: verbose
4774
4785
4775 -A/--after can be used to remove only files that have already
4786 -A/--after can be used to remove only files that have already
4776 been deleted, -f/--force can be used to force deletion, and -Af
4787 been deleted, -f/--force can be used to force deletion, and -Af
4777 can be used to remove files from the next revision without
4788 can be used to remove files from the next revision without
4778 deleting them from the working directory.
4789 deleting them from the working directory.
4779
4790
4780 The following table details the behavior of remove for different
4791 The following table details the behavior of remove for different
4781 file states (columns) and option combinations (rows). The file
4792 file states (columns) and option combinations (rows). The file
4782 states are Added [A], Clean [C], Modified [M] and Missing [!]
4793 states are Added [A], Clean [C], Modified [M] and Missing [!]
4783 (as reported by :hg:`status`). The actions are Warn, Remove
4794 (as reported by :hg:`status`). The actions are Warn, Remove
4784 (from branch) and Delete (from disk):
4795 (from branch) and Delete (from disk):
4785
4796
4786 ========= == == == ==
4797 ========= == == == ==
4787 opt/state A C M !
4798 opt/state A C M !
4788 ========= == == == ==
4799 ========= == == == ==
4789 none W RD W R
4800 none W RD W R
4790 -f R RD RD R
4801 -f R RD RD R
4791 -A W W W R
4802 -A W W W R
4792 -Af R R R R
4803 -Af R R R R
4793 ========= == == == ==
4804 ========= == == == ==
4794
4805
4795 Note that remove never deletes files in Added [A] state from the
4806 Note that remove never deletes files in Added [A] state from the
4796 working directory, not even if option --force is specified.
4807 working directory, not even if option --force is specified.
4797
4808
4798 Returns 0 on success, 1 if any warnings encountered.
4809 Returns 0 on success, 1 if any warnings encountered.
4799 """
4810 """
4800
4811
4801 ret = 0
4812 ret = 0
4802 after, force = opts.get('after'), opts.get('force')
4813 after, force = opts.get('after'), opts.get('force')
4803 if not pats and not after:
4814 if not pats and not after:
4804 raise util.Abort(_('no files specified'))
4815 raise util.Abort(_('no files specified'))
4805
4816
4806 m = scmutil.match(repo[None], pats, opts)
4817 m = scmutil.match(repo[None], pats, opts)
4807 s = repo.status(match=m, clean=True)
4818 s = repo.status(match=m, clean=True)
4808 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
4819 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
4809
4820
4810 # warn about failure to delete explicit files/dirs
4821 # warn about failure to delete explicit files/dirs
4811 wctx = repo[None]
4822 wctx = repo[None]
4812 for f in m.files():
4823 for f in m.files():
4813 if f in repo.dirstate or f in wctx.dirs():
4824 if f in repo.dirstate or f in wctx.dirs():
4814 continue
4825 continue
4815 if os.path.exists(m.rel(f)):
4826 if os.path.exists(m.rel(f)):
4816 if os.path.isdir(m.rel(f)):
4827 if os.path.isdir(m.rel(f)):
4817 ui.warn(_('not removing %s: no tracked files\n') % m.rel(f))
4828 ui.warn(_('not removing %s: no tracked files\n') % m.rel(f))
4818 else:
4829 else:
4819 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
4830 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
4820 # missing files will generate a warning elsewhere
4831 # missing files will generate a warning elsewhere
4821 ret = 1
4832 ret = 1
4822
4833
4823 if force:
4834 if force:
4824 list = modified + deleted + clean + added
4835 list = modified + deleted + clean + added
4825 elif after:
4836 elif after:
4826 list = deleted
4837 list = deleted
4827 for f in modified + added + clean:
4838 for f in modified + added + clean:
4828 ui.warn(_('not removing %s: file still exists\n') % m.rel(f))
4839 ui.warn(_('not removing %s: file still exists\n') % m.rel(f))
4829 ret = 1
4840 ret = 1
4830 else:
4841 else:
4831 list = deleted + clean
4842 list = deleted + clean
4832 for f in modified:
4843 for f in modified:
4833 ui.warn(_('not removing %s: file is modified (use -f'
4844 ui.warn(_('not removing %s: file is modified (use -f'
4834 ' to force removal)\n') % m.rel(f))
4845 ' to force removal)\n') % m.rel(f))
4835 ret = 1
4846 ret = 1
4836 for f in added:
4847 for f in added:
4837 ui.warn(_('not removing %s: file has been marked for add'
4848 ui.warn(_('not removing %s: file has been marked for add'
4838 ' (use forget to undo)\n') % m.rel(f))
4849 ' (use forget to undo)\n') % m.rel(f))
4839 ret = 1
4850 ret = 1
4840
4851
4841 for f in sorted(list):
4852 for f in sorted(list):
4842 if ui.verbose or not m.exact(f):
4853 if ui.verbose or not m.exact(f):
4843 ui.status(_('removing %s\n') % m.rel(f))
4854 ui.status(_('removing %s\n') % m.rel(f))
4844
4855
4845 wlock = repo.wlock()
4856 wlock = repo.wlock()
4846 try:
4857 try:
4847 if not after:
4858 if not after:
4848 for f in list:
4859 for f in list:
4849 if f in added:
4860 if f in added:
4850 continue # we never unlink added files on remove
4861 continue # we never unlink added files on remove
4851 util.unlinkpath(repo.wjoin(f), ignoremissing=True)
4862 util.unlinkpath(repo.wjoin(f), ignoremissing=True)
4852 repo[None].forget(list)
4863 repo[None].forget(list)
4853 finally:
4864 finally:
4854 wlock.release()
4865 wlock.release()
4855
4866
4856 return ret
4867 return ret
4857
4868
4858 @command('rename|move|mv',
4869 @command('rename|move|mv',
4859 [('A', 'after', None, _('record a rename that has already occurred')),
4870 [('A', 'after', None, _('record a rename that has already occurred')),
4860 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4871 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4861 ] + walkopts + dryrunopts,
4872 ] + walkopts + dryrunopts,
4862 _('[OPTION]... SOURCE... DEST'))
4873 _('[OPTION]... SOURCE... DEST'))
4863 def rename(ui, repo, *pats, **opts):
4874 def rename(ui, repo, *pats, **opts):
4864 """rename files; equivalent of copy + remove
4875 """rename files; equivalent of copy + remove
4865
4876
4866 Mark dest as copies of sources; mark sources for deletion. If dest
4877 Mark dest as copies of sources; mark sources for deletion. If dest
4867 is a directory, copies are put in that directory. If dest is a
4878 is a directory, copies are put in that directory. If dest is a
4868 file, there can only be one source.
4879 file, there can only be one source.
4869
4880
4870 By default, this command copies the contents of files as they
4881 By default, this command copies the contents of files as they
4871 exist in the working directory. If invoked with -A/--after, the
4882 exist in the working directory. If invoked with -A/--after, the
4872 operation is recorded, but no copying is performed.
4883 operation is recorded, but no copying is performed.
4873
4884
4874 This command takes effect at the next commit. To undo a rename
4885 This command takes effect at the next commit. To undo a rename
4875 before that, see :hg:`revert`.
4886 before that, see :hg:`revert`.
4876
4887
4877 Returns 0 on success, 1 if errors are encountered.
4888 Returns 0 on success, 1 if errors are encountered.
4878 """
4889 """
4879 wlock = repo.wlock(False)
4890 wlock = repo.wlock(False)
4880 try:
4891 try:
4881 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4892 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4882 finally:
4893 finally:
4883 wlock.release()
4894 wlock.release()
4884
4895
4885 @command('resolve',
4896 @command('resolve',
4886 [('a', 'all', None, _('select all unresolved files')),
4897 [('a', 'all', None, _('select all unresolved files')),
4887 ('l', 'list', None, _('list state of files needing merge')),
4898 ('l', 'list', None, _('list state of files needing merge')),
4888 ('m', 'mark', None, _('mark files as resolved')),
4899 ('m', 'mark', None, _('mark files as resolved')),
4889 ('u', 'unmark', None, _('mark files as unresolved')),
4900 ('u', 'unmark', None, _('mark files as unresolved')),
4890 ('n', 'no-status', None, _('hide status prefix'))]
4901 ('n', 'no-status', None, _('hide status prefix'))]
4891 + mergetoolopts + walkopts,
4902 + mergetoolopts + walkopts,
4892 _('[OPTION]... [FILE]...'))
4903 _('[OPTION]... [FILE]...'))
4893 def resolve(ui, repo, *pats, **opts):
4904 def resolve(ui, repo, *pats, **opts):
4894 """redo merges or set/view the merge status of files
4905 """redo merges or set/view the merge status of files
4895
4906
4896 Merges with unresolved conflicts are often the result of
4907 Merges with unresolved conflicts are often the result of
4897 non-interactive merging using the ``internal:merge`` configuration
4908 non-interactive merging using the ``internal:merge`` configuration
4898 setting, or a command-line merge tool like ``diff3``. The resolve
4909 setting, or a command-line merge tool like ``diff3``. The resolve
4899 command is used to manage the files involved in a merge, after
4910 command is used to manage the files involved in a merge, after
4900 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4911 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4901 working directory must have two parents). See :hg:`help
4912 working directory must have two parents). See :hg:`help
4902 merge-tools` for information on configuring merge tools.
4913 merge-tools` for information on configuring merge tools.
4903
4914
4904 The resolve command can be used in the following ways:
4915 The resolve command can be used in the following ways:
4905
4916
4906 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4917 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4907 files, discarding any previous merge attempts. Re-merging is not
4918 files, discarding any previous merge attempts. Re-merging is not
4908 performed for files already marked as resolved. Use ``--all/-a``
4919 performed for files already marked as resolved. Use ``--all/-a``
4909 to select all unresolved files. ``--tool`` can be used to specify
4920 to select all unresolved files. ``--tool`` can be used to specify
4910 the merge tool used for the given files. It overrides the HGMERGE
4921 the merge tool used for the given files. It overrides the HGMERGE
4911 environment variable and your configuration files. Previous file
4922 environment variable and your configuration files. Previous file
4912 contents are saved with a ``.orig`` suffix.
4923 contents are saved with a ``.orig`` suffix.
4913
4924
4914 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4925 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4915 (e.g. after having manually fixed-up the files). The default is
4926 (e.g. after having manually fixed-up the files). The default is
4916 to mark all unresolved files.
4927 to mark all unresolved files.
4917
4928
4918 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4929 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4919 default is to mark all resolved files.
4930 default is to mark all resolved files.
4920
4931
4921 - :hg:`resolve -l`: list files which had or still have conflicts.
4932 - :hg:`resolve -l`: list files which had or still have conflicts.
4922 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4933 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4923
4934
4924 Note that Mercurial will not let you commit files with unresolved
4935 Note that Mercurial will not let you commit files with unresolved
4925 merge conflicts. You must use :hg:`resolve -m ...` before you can
4936 merge conflicts. You must use :hg:`resolve -m ...` before you can
4926 commit after a conflicting merge.
4937 commit after a conflicting merge.
4927
4938
4928 Returns 0 on success, 1 if any files fail a resolve attempt.
4939 Returns 0 on success, 1 if any files fail a resolve attempt.
4929 """
4940 """
4930
4941
4931 all, mark, unmark, show, nostatus = \
4942 all, mark, unmark, show, nostatus = \
4932 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
4943 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
4933
4944
4934 if (show and (mark or unmark)) or (mark and unmark):
4945 if (show and (mark or unmark)) or (mark and unmark):
4935 raise util.Abort(_("too many options specified"))
4946 raise util.Abort(_("too many options specified"))
4936 if pats and all:
4947 if pats and all:
4937 raise util.Abort(_("can't specify --all and patterns"))
4948 raise util.Abort(_("can't specify --all and patterns"))
4938 if not (all or pats or show or mark or unmark):
4949 if not (all or pats or show or mark or unmark):
4939 raise util.Abort(_('no files or directories specified; '
4950 raise util.Abort(_('no files or directories specified; '
4940 'use --all to remerge all files'))
4951 'use --all to remerge all files'))
4941
4952
4942 ms = mergemod.mergestate(repo)
4953 ms = mergemod.mergestate(repo)
4943 m = scmutil.match(repo[None], pats, opts)
4954 m = scmutil.match(repo[None], pats, opts)
4944 ret = 0
4955 ret = 0
4945
4956
4946 for f in ms:
4957 for f in ms:
4947 if m(f):
4958 if m(f):
4948 if show:
4959 if show:
4949 if nostatus:
4960 if nostatus:
4950 ui.write("%s\n" % f)
4961 ui.write("%s\n" % f)
4951 else:
4962 else:
4952 ui.write("%s %s\n" % (ms[f].upper(), f),
4963 ui.write("%s %s\n" % (ms[f].upper(), f),
4953 label='resolve.' +
4964 label='resolve.' +
4954 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
4965 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
4955 elif mark:
4966 elif mark:
4956 ms.mark(f, "r")
4967 ms.mark(f, "r")
4957 elif unmark:
4968 elif unmark:
4958 ms.mark(f, "u")
4969 ms.mark(f, "u")
4959 else:
4970 else:
4960 wctx = repo[None]
4971 wctx = repo[None]
4961 mctx = wctx.parents()[-1]
4972 mctx = wctx.parents()[-1]
4962
4973
4963 # backup pre-resolve (merge uses .orig for its own purposes)
4974 # backup pre-resolve (merge uses .orig for its own purposes)
4964 a = repo.wjoin(f)
4975 a = repo.wjoin(f)
4965 util.copyfile(a, a + ".resolve")
4976 util.copyfile(a, a + ".resolve")
4966
4977
4967 try:
4978 try:
4968 # resolve file
4979 # resolve file
4969 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4980 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4970 if ms.resolve(f, wctx, mctx):
4981 if ms.resolve(f, wctx, mctx):
4971 ret = 1
4982 ret = 1
4972 finally:
4983 finally:
4973 ui.setconfig('ui', 'forcemerge', '')
4984 ui.setconfig('ui', 'forcemerge', '')
4974 ms.commit()
4985 ms.commit()
4975
4986
4976 # replace filemerge's .orig file with our resolve file
4987 # replace filemerge's .orig file with our resolve file
4977 util.rename(a + ".resolve", a + ".orig")
4988 util.rename(a + ".resolve", a + ".orig")
4978
4989
4979 ms.commit()
4990 ms.commit()
4980 return ret
4991 return ret
4981
4992
4982 @command('revert',
4993 @command('revert',
4983 [('a', 'all', None, _('revert all changes when no arguments given')),
4994 [('a', 'all', None, _('revert all changes when no arguments given')),
4984 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4995 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4985 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4996 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4986 ('C', 'no-backup', None, _('do not save backup copies of files')),
4997 ('C', 'no-backup', None, _('do not save backup copies of files')),
4987 ] + walkopts + dryrunopts,
4998 ] + walkopts + dryrunopts,
4988 _('[OPTION]... [-r REV] [NAME]...'))
4999 _('[OPTION]... [-r REV] [NAME]...'))
4989 def revert(ui, repo, *pats, **opts):
5000 def revert(ui, repo, *pats, **opts):
4990 """restore files to their checkout state
5001 """restore files to their checkout state
4991
5002
4992 .. note::
5003 .. note::
4993
5004
4994 To check out earlier revisions, you should use :hg:`update REV`.
5005 To check out earlier revisions, you should use :hg:`update REV`.
4995 To cancel an uncommitted merge (and lose your changes),
5006 To cancel an uncommitted merge (and lose your changes),
4996 use :hg:`update --clean .`.
5007 use :hg:`update --clean .`.
4997
5008
4998 With no revision specified, revert the specified files or directories
5009 With no revision specified, revert the specified files or directories
4999 to the contents they had in the parent of the working directory.
5010 to the contents they had in the parent of the working directory.
5000 This restores the contents of files to an unmodified
5011 This restores the contents of files to an unmodified
5001 state and unschedules adds, removes, copies, and renames. If the
5012 state and unschedules adds, removes, copies, and renames. If the
5002 working directory has two parents, you must explicitly specify a
5013 working directory has two parents, you must explicitly specify a
5003 revision.
5014 revision.
5004
5015
5005 Using the -r/--rev or -d/--date options, revert the given files or
5016 Using the -r/--rev or -d/--date options, revert the given files or
5006 directories to their states as of a specific revision. Because
5017 directories to their states as of a specific revision. Because
5007 revert does not change the working directory parents, this will
5018 revert does not change the working directory parents, this will
5008 cause these files to appear modified. This can be helpful to "back
5019 cause these files to appear modified. This can be helpful to "back
5009 out" some or all of an earlier change. See :hg:`backout` for a
5020 out" some or all of an earlier change. See :hg:`backout` for a
5010 related method.
5021 related method.
5011
5022
5012 Modified files are saved with a .orig suffix before reverting.
5023 Modified files are saved with a .orig suffix before reverting.
5013 To disable these backups, use --no-backup.
5024 To disable these backups, use --no-backup.
5014
5025
5015 See :hg:`help dates` for a list of formats valid for -d/--date.
5026 See :hg:`help dates` for a list of formats valid for -d/--date.
5016
5027
5017 Returns 0 on success.
5028 Returns 0 on success.
5018 """
5029 """
5019
5030
5020 if opts.get("date"):
5031 if opts.get("date"):
5021 if opts.get("rev"):
5032 if opts.get("rev"):
5022 raise util.Abort(_("you can't specify a revision and a date"))
5033 raise util.Abort(_("you can't specify a revision and a date"))
5023 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
5034 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
5024
5035
5025 parent, p2 = repo.dirstate.parents()
5036 parent, p2 = repo.dirstate.parents()
5026 if not opts.get('rev') and p2 != nullid:
5037 if not opts.get('rev') and p2 != nullid:
5027 # revert after merge is a trap for new users (issue2915)
5038 # revert after merge is a trap for new users (issue2915)
5028 raise util.Abort(_('uncommitted merge with no revision specified'),
5039 raise util.Abort(_('uncommitted merge with no revision specified'),
5029 hint=_('use "hg update" or see "hg help revert"'))
5040 hint=_('use "hg update" or see "hg help revert"'))
5030
5041
5031 ctx = scmutil.revsingle(repo, opts.get('rev'))
5042 ctx = scmutil.revsingle(repo, opts.get('rev'))
5032
5043
5033 if not pats and not opts.get('all'):
5044 if not pats and not opts.get('all'):
5034 msg = _("no files or directories specified")
5045 msg = _("no files or directories specified")
5035 if p2 != nullid:
5046 if p2 != nullid:
5036 hint = _("uncommitted merge, use --all to discard all changes,"
5047 hint = _("uncommitted merge, use --all to discard all changes,"
5037 " or 'hg update -C .' to abort the merge")
5048 " or 'hg update -C .' to abort the merge")
5038 raise util.Abort(msg, hint=hint)
5049 raise util.Abort(msg, hint=hint)
5039 dirty = util.any(repo.status())
5050 dirty = util.any(repo.status())
5040 node = ctx.node()
5051 node = ctx.node()
5041 if node != parent:
5052 if node != parent:
5042 if dirty:
5053 if dirty:
5043 hint = _("uncommitted changes, use --all to discard all"
5054 hint = _("uncommitted changes, use --all to discard all"
5044 " changes, or 'hg update %s' to update") % ctx.rev()
5055 " changes, or 'hg update %s' to update") % ctx.rev()
5045 else:
5056 else:
5046 hint = _("use --all to revert all files,"
5057 hint = _("use --all to revert all files,"
5047 " or 'hg update %s' to update") % ctx.rev()
5058 " or 'hg update %s' to update") % ctx.rev()
5048 elif dirty:
5059 elif dirty:
5049 hint = _("uncommitted changes, use --all to discard all changes")
5060 hint = _("uncommitted changes, use --all to discard all changes")
5050 else:
5061 else:
5051 hint = _("use --all to revert all files")
5062 hint = _("use --all to revert all files")
5052 raise util.Abort(msg, hint=hint)
5063 raise util.Abort(msg, hint=hint)
5053
5064
5054 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
5065 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
5055
5066
5056 @command('rollback', dryrunopts +
5067 @command('rollback', dryrunopts +
5057 [('f', 'force', False, _('ignore safety measures'))])
5068 [('f', 'force', False, _('ignore safety measures'))])
5058 def rollback(ui, repo, **opts):
5069 def rollback(ui, repo, **opts):
5059 """roll back the last transaction (DANGEROUS) (DEPRECATED)
5070 """roll back the last transaction (DANGEROUS) (DEPRECATED)
5060
5071
5061 Please use :hg:`commit --amend` instead of rollback to correct
5072 Please use :hg:`commit --amend` instead of rollback to correct
5062 mistakes in the last commit.
5073 mistakes in the last commit.
5063
5074
5064 This command should be used with care. There is only one level of
5075 This command should be used with care. There is only one level of
5065 rollback, and there is no way to undo a rollback. It will also
5076 rollback, and there is no way to undo a rollback. It will also
5066 restore the dirstate at the time of the last transaction, losing
5077 restore the dirstate at the time of the last transaction, losing
5067 any dirstate changes since that time. This command does not alter
5078 any dirstate changes since that time. This command does not alter
5068 the working directory.
5079 the working directory.
5069
5080
5070 Transactions are used to encapsulate the effects of all commands
5081 Transactions are used to encapsulate the effects of all commands
5071 that create new changesets or propagate existing changesets into a
5082 that create new changesets or propagate existing changesets into a
5072 repository.
5083 repository.
5073
5084
5074 .. container:: verbose
5085 .. container:: verbose
5075
5086
5076 For example, the following commands are transactional, and their
5087 For example, the following commands are transactional, and their
5077 effects can be rolled back:
5088 effects can be rolled back:
5078
5089
5079 - commit
5090 - commit
5080 - import
5091 - import
5081 - pull
5092 - pull
5082 - push (with this repository as the destination)
5093 - push (with this repository as the destination)
5083 - unbundle
5094 - unbundle
5084
5095
5085 To avoid permanent data loss, rollback will refuse to rollback a
5096 To avoid permanent data loss, rollback will refuse to rollback a
5086 commit transaction if it isn't checked out. Use --force to
5097 commit transaction if it isn't checked out. Use --force to
5087 override this protection.
5098 override this protection.
5088
5099
5089 This command is not intended for use on public repositories. Once
5100 This command is not intended for use on public repositories. Once
5090 changes are visible for pull by other users, rolling a transaction
5101 changes are visible for pull by other users, rolling a transaction
5091 back locally is ineffective (someone else may already have pulled
5102 back locally is ineffective (someone else may already have pulled
5092 the changes). Furthermore, a race is possible with readers of the
5103 the changes). Furthermore, a race is possible with readers of the
5093 repository; for example an in-progress pull from the repository
5104 repository; for example an in-progress pull from the repository
5094 may fail if a rollback is performed.
5105 may fail if a rollback is performed.
5095
5106
5096 Returns 0 on success, 1 if no rollback data is available.
5107 Returns 0 on success, 1 if no rollback data is available.
5097 """
5108 """
5098 return repo.rollback(dryrun=opts.get('dry_run'),
5109 return repo.rollback(dryrun=opts.get('dry_run'),
5099 force=opts.get('force'))
5110 force=opts.get('force'))
5100
5111
5101 @command('root', [])
5112 @command('root', [])
5102 def root(ui, repo):
5113 def root(ui, repo):
5103 """print the root (top) of the current working directory
5114 """print the root (top) of the current working directory
5104
5115
5105 Print the root directory of the current repository.
5116 Print the root directory of the current repository.
5106
5117
5107 Returns 0 on success.
5118 Returns 0 on success.
5108 """
5119 """
5109 ui.write(repo.root + "\n")
5120 ui.write(repo.root + "\n")
5110
5121
5111 @command('^serve',
5122 @command('^serve',
5112 [('A', 'accesslog', '', _('name of access log file to write to'),
5123 [('A', 'accesslog', '', _('name of access log file to write to'),
5113 _('FILE')),
5124 _('FILE')),
5114 ('d', 'daemon', None, _('run server in background')),
5125 ('d', 'daemon', None, _('run server in background')),
5115 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
5126 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
5116 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5127 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5117 # use string type, then we can check if something was passed
5128 # use string type, then we can check if something was passed
5118 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5129 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5119 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5130 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5120 _('ADDR')),
5131 _('ADDR')),
5121 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5132 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5122 _('PREFIX')),
5133 _('PREFIX')),
5123 ('n', 'name', '',
5134 ('n', 'name', '',
5124 _('name to show in web pages (default: working directory)'), _('NAME')),
5135 _('name to show in web pages (default: working directory)'), _('NAME')),
5125 ('', 'web-conf', '',
5136 ('', 'web-conf', '',
5126 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
5137 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
5127 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5138 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5128 _('FILE')),
5139 _('FILE')),
5129 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5140 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5130 ('', 'stdio', None, _('for remote clients')),
5141 ('', 'stdio', None, _('for remote clients')),
5131 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
5142 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
5132 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5143 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5133 ('', 'style', '', _('template style to use'), _('STYLE')),
5144 ('', 'style', '', _('template style to use'), _('STYLE')),
5134 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5145 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5135 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
5146 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
5136 _('[OPTION]...'))
5147 _('[OPTION]...'))
5137 def serve(ui, repo, **opts):
5148 def serve(ui, repo, **opts):
5138 """start stand-alone webserver
5149 """start stand-alone webserver
5139
5150
5140 Start a local HTTP repository browser and pull server. You can use
5151 Start a local HTTP repository browser and pull server. You can use
5141 this for ad-hoc sharing and browsing of repositories. It is
5152 this for ad-hoc sharing and browsing of repositories. It is
5142 recommended to use a real web server to serve a repository for
5153 recommended to use a real web server to serve a repository for
5143 longer periods of time.
5154 longer periods of time.
5144
5155
5145 Please note that the server does not implement access control.
5156 Please note that the server does not implement access control.
5146 This means that, by default, anybody can read from the server and
5157 This means that, by default, anybody can read from the server and
5147 nobody can write to it by default. Set the ``web.allow_push``
5158 nobody can write to it by default. Set the ``web.allow_push``
5148 option to ``*`` to allow everybody to push to the server. You
5159 option to ``*`` to allow everybody to push to the server. You
5149 should use a real web server if you need to authenticate users.
5160 should use a real web server if you need to authenticate users.
5150
5161
5151 By default, the server logs accesses to stdout and errors to
5162 By default, the server logs accesses to stdout and errors to
5152 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5163 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5153 files.
5164 files.
5154
5165
5155 To have the server choose a free port number to listen on, specify
5166 To have the server choose a free port number to listen on, specify
5156 a port number of 0; in this case, the server will print the port
5167 a port number of 0; in this case, the server will print the port
5157 number it uses.
5168 number it uses.
5158
5169
5159 Returns 0 on success.
5170 Returns 0 on success.
5160 """
5171 """
5161
5172
5162 if opts["stdio"] and opts["cmdserver"]:
5173 if opts["stdio"] and opts["cmdserver"]:
5163 raise util.Abort(_("cannot use --stdio with --cmdserver"))
5174 raise util.Abort(_("cannot use --stdio with --cmdserver"))
5164
5175
5165 def checkrepo():
5176 def checkrepo():
5166 if repo is None:
5177 if repo is None:
5167 raise error.RepoError(_("there is no Mercurial repository here"
5178 raise error.RepoError(_("there is no Mercurial repository here"
5168 " (.hg not found)"))
5179 " (.hg not found)"))
5169
5180
5170 if opts["stdio"]:
5181 if opts["stdio"]:
5171 checkrepo()
5182 checkrepo()
5172 s = sshserver.sshserver(ui, repo)
5183 s = sshserver.sshserver(ui, repo)
5173 s.serve_forever()
5184 s.serve_forever()
5174
5185
5175 if opts["cmdserver"]:
5186 if opts["cmdserver"]:
5176 checkrepo()
5187 checkrepo()
5177 s = commandserver.server(ui, repo, opts["cmdserver"])
5188 s = commandserver.server(ui, repo, opts["cmdserver"])
5178 return s.serve()
5189 return s.serve()
5179
5190
5180 # this way we can check if something was given in the command-line
5191 # this way we can check if something was given in the command-line
5181 if opts.get('port'):
5192 if opts.get('port'):
5182 opts['port'] = util.getport(opts.get('port'))
5193 opts['port'] = util.getport(opts.get('port'))
5183
5194
5184 baseui = repo and repo.baseui or ui
5195 baseui = repo and repo.baseui or ui
5185 optlist = ("name templates style address port prefix ipv6"
5196 optlist = ("name templates style address port prefix ipv6"
5186 " accesslog errorlog certificate encoding")
5197 " accesslog errorlog certificate encoding")
5187 for o in optlist.split():
5198 for o in optlist.split():
5188 val = opts.get(o, '')
5199 val = opts.get(o, '')
5189 if val in (None, ''): # should check against default options instead
5200 if val in (None, ''): # should check against default options instead
5190 continue
5201 continue
5191 baseui.setconfig("web", o, val)
5202 baseui.setconfig("web", o, val)
5192 if repo and repo.ui != baseui:
5203 if repo and repo.ui != baseui:
5193 repo.ui.setconfig("web", o, val)
5204 repo.ui.setconfig("web", o, val)
5194
5205
5195 o = opts.get('web_conf') or opts.get('webdir_conf')
5206 o = opts.get('web_conf') or opts.get('webdir_conf')
5196 if not o:
5207 if not o:
5197 if not repo:
5208 if not repo:
5198 raise error.RepoError(_("there is no Mercurial repository"
5209 raise error.RepoError(_("there is no Mercurial repository"
5199 " here (.hg not found)"))
5210 " here (.hg not found)"))
5200 o = repo
5211 o = repo
5201
5212
5202 app = hgweb.hgweb(o, baseui=baseui)
5213 app = hgweb.hgweb(o, baseui=baseui)
5203 service = httpservice(ui, app, opts)
5214 service = httpservice(ui, app, opts)
5204 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5215 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5205
5216
5206 class httpservice(object):
5217 class httpservice(object):
5207 def __init__(self, ui, app, opts):
5218 def __init__(self, ui, app, opts):
5208 self.ui = ui
5219 self.ui = ui
5209 self.app = app
5220 self.app = app
5210 self.opts = opts
5221 self.opts = opts
5211
5222
5212 def init(self):
5223 def init(self):
5213 util.setsignalhandler()
5224 util.setsignalhandler()
5214 self.httpd = hgweb_server.create_server(self.ui, self.app)
5225 self.httpd = hgweb_server.create_server(self.ui, self.app)
5215
5226
5216 if self.opts['port'] and not self.ui.verbose:
5227 if self.opts['port'] and not self.ui.verbose:
5217 return
5228 return
5218
5229
5219 if self.httpd.prefix:
5230 if self.httpd.prefix:
5220 prefix = self.httpd.prefix.strip('/') + '/'
5231 prefix = self.httpd.prefix.strip('/') + '/'
5221 else:
5232 else:
5222 prefix = ''
5233 prefix = ''
5223
5234
5224 port = ':%d' % self.httpd.port
5235 port = ':%d' % self.httpd.port
5225 if port == ':80':
5236 if port == ':80':
5226 port = ''
5237 port = ''
5227
5238
5228 bindaddr = self.httpd.addr
5239 bindaddr = self.httpd.addr
5229 if bindaddr == '0.0.0.0':
5240 if bindaddr == '0.0.0.0':
5230 bindaddr = '*'
5241 bindaddr = '*'
5231 elif ':' in bindaddr: # IPv6
5242 elif ':' in bindaddr: # IPv6
5232 bindaddr = '[%s]' % bindaddr
5243 bindaddr = '[%s]' % bindaddr
5233
5244
5234 fqaddr = self.httpd.fqaddr
5245 fqaddr = self.httpd.fqaddr
5235 if ':' in fqaddr:
5246 if ':' in fqaddr:
5236 fqaddr = '[%s]' % fqaddr
5247 fqaddr = '[%s]' % fqaddr
5237 if self.opts['port']:
5248 if self.opts['port']:
5238 write = self.ui.status
5249 write = self.ui.status
5239 else:
5250 else:
5240 write = self.ui.write
5251 write = self.ui.write
5241 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5252 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5242 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5253 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5243
5254
5244 def run(self):
5255 def run(self):
5245 self.httpd.serve_forever()
5256 self.httpd.serve_forever()
5246
5257
5247
5258
5248 @command('showconfig|debugconfig',
5259 @command('showconfig|debugconfig',
5249 [('u', 'untrusted', None, _('show untrusted configuration options'))],
5260 [('u', 'untrusted', None, _('show untrusted configuration options'))],
5250 _('[-u] [NAME]...'))
5261 _('[-u] [NAME]...'))
5251 def showconfig(ui, repo, *values, **opts):
5262 def showconfig(ui, repo, *values, **opts):
5252 """show combined config settings from all hgrc files
5263 """show combined config settings from all hgrc files
5253
5264
5254 With no arguments, print names and values of all config items.
5265 With no arguments, print names and values of all config items.
5255
5266
5256 With one argument of the form section.name, print just the value
5267 With one argument of the form section.name, print just the value
5257 of that config item.
5268 of that config item.
5258
5269
5259 With multiple arguments, print names and values of all config
5270 With multiple arguments, print names and values of all config
5260 items with matching section names.
5271 items with matching section names.
5261
5272
5262 With --debug, the source (filename and line number) is printed
5273 With --debug, the source (filename and line number) is printed
5263 for each config item.
5274 for each config item.
5264
5275
5265 Returns 0 on success.
5276 Returns 0 on success.
5266 """
5277 """
5267
5278
5268 for f in scmutil.rcpath():
5279 for f in scmutil.rcpath():
5269 ui.debug('read config from: %s\n' % f)
5280 ui.debug('read config from: %s\n' % f)
5270 untrusted = bool(opts.get('untrusted'))
5281 untrusted = bool(opts.get('untrusted'))
5271 if values:
5282 if values:
5272 sections = [v for v in values if '.' not in v]
5283 sections = [v for v in values if '.' not in v]
5273 items = [v for v in values if '.' in v]
5284 items = [v for v in values if '.' in v]
5274 if len(items) > 1 or items and sections:
5285 if len(items) > 1 or items and sections:
5275 raise util.Abort(_('only one config item permitted'))
5286 raise util.Abort(_('only one config item permitted'))
5276 for section, name, value in ui.walkconfig(untrusted=untrusted):
5287 for section, name, value in ui.walkconfig(untrusted=untrusted):
5277 value = str(value).replace('\n', '\\n')
5288 value = str(value).replace('\n', '\\n')
5278 sectname = section + '.' + name
5289 sectname = section + '.' + name
5279 if values:
5290 if values:
5280 for v in values:
5291 for v in values:
5281 if v == section:
5292 if v == section:
5282 ui.debug('%s: ' %
5293 ui.debug('%s: ' %
5283 ui.configsource(section, name, untrusted))
5294 ui.configsource(section, name, untrusted))
5284 ui.write('%s=%s\n' % (sectname, value))
5295 ui.write('%s=%s\n' % (sectname, value))
5285 elif v == sectname:
5296 elif v == sectname:
5286 ui.debug('%s: ' %
5297 ui.debug('%s: ' %
5287 ui.configsource(section, name, untrusted))
5298 ui.configsource(section, name, untrusted))
5288 ui.write(value, '\n')
5299 ui.write(value, '\n')
5289 else:
5300 else:
5290 ui.debug('%s: ' %
5301 ui.debug('%s: ' %
5291 ui.configsource(section, name, untrusted))
5302 ui.configsource(section, name, untrusted))
5292 ui.write('%s=%s\n' % (sectname, value))
5303 ui.write('%s=%s\n' % (sectname, value))
5293
5304
5294 @command('^status|st',
5305 @command('^status|st',
5295 [('A', 'all', None, _('show status of all files')),
5306 [('A', 'all', None, _('show status of all files')),
5296 ('m', 'modified', None, _('show only modified files')),
5307 ('m', 'modified', None, _('show only modified files')),
5297 ('a', 'added', None, _('show only added files')),
5308 ('a', 'added', None, _('show only added files')),
5298 ('r', 'removed', None, _('show only removed files')),
5309 ('r', 'removed', None, _('show only removed files')),
5299 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5310 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5300 ('c', 'clean', None, _('show only files without changes')),
5311 ('c', 'clean', None, _('show only files without changes')),
5301 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5312 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5302 ('i', 'ignored', None, _('show only ignored files')),
5313 ('i', 'ignored', None, _('show only ignored files')),
5303 ('n', 'no-status', None, _('hide status prefix')),
5314 ('n', 'no-status', None, _('hide status prefix')),
5304 ('C', 'copies', None, _('show source of copied files')),
5315 ('C', 'copies', None, _('show source of copied files')),
5305 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5316 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5306 ('', 'rev', [], _('show difference from revision'), _('REV')),
5317 ('', 'rev', [], _('show difference from revision'), _('REV')),
5307 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5318 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5308 ] + walkopts + subrepoopts,
5319 ] + walkopts + subrepoopts,
5309 _('[OPTION]... [FILE]...'))
5320 _('[OPTION]... [FILE]...'))
5310 def status(ui, repo, *pats, **opts):
5321 def status(ui, repo, *pats, **opts):
5311 """show changed files in the working directory
5322 """show changed files in the working directory
5312
5323
5313 Show status of files in the repository. If names are given, only
5324 Show status of files in the repository. If names are given, only
5314 files that match are shown. Files that are clean or ignored or
5325 files that match are shown. Files that are clean or ignored or
5315 the source of a copy/move operation, are not listed unless
5326 the source of a copy/move operation, are not listed unless
5316 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5327 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5317 Unless options described with "show only ..." are given, the
5328 Unless options described with "show only ..." are given, the
5318 options -mardu are used.
5329 options -mardu are used.
5319
5330
5320 Option -q/--quiet hides untracked (unknown and ignored) files
5331 Option -q/--quiet hides untracked (unknown and ignored) files
5321 unless explicitly requested with -u/--unknown or -i/--ignored.
5332 unless explicitly requested with -u/--unknown or -i/--ignored.
5322
5333
5323 .. note::
5334 .. note::
5324
5335
5325 status may appear to disagree with diff if permissions have
5336 status may appear to disagree with diff if permissions have
5326 changed or a merge has occurred. The standard diff format does
5337 changed or a merge has occurred. The standard diff format does
5327 not report permission changes and diff only reports changes
5338 not report permission changes and diff only reports changes
5328 relative to one merge parent.
5339 relative to one merge parent.
5329
5340
5330 If one revision is given, it is used as the base revision.
5341 If one revision is given, it is used as the base revision.
5331 If two revisions are given, the differences between them are
5342 If two revisions are given, the differences between them are
5332 shown. The --change option can also be used as a shortcut to list
5343 shown. The --change option can also be used as a shortcut to list
5333 the changed files of a revision from its first parent.
5344 the changed files of a revision from its first parent.
5334
5345
5335 The codes used to show the status of files are::
5346 The codes used to show the status of files are::
5336
5347
5337 M = modified
5348 M = modified
5338 A = added
5349 A = added
5339 R = removed
5350 R = removed
5340 C = clean
5351 C = clean
5341 ! = missing (deleted by non-hg command, but still tracked)
5352 ! = missing (deleted by non-hg command, but still tracked)
5342 ? = not tracked
5353 ? = not tracked
5343 I = ignored
5354 I = ignored
5344 = origin of the previous file listed as A (added)
5355 = origin of the previous file listed as A (added)
5345
5356
5346 .. container:: verbose
5357 .. container:: verbose
5347
5358
5348 Examples:
5359 Examples:
5349
5360
5350 - show changes in the working directory relative to a
5361 - show changes in the working directory relative to a
5351 changeset::
5362 changeset::
5352
5363
5353 hg status --rev 9353
5364 hg status --rev 9353
5354
5365
5355 - show all changes including copies in an existing changeset::
5366 - show all changes including copies in an existing changeset::
5356
5367
5357 hg status --copies --change 9353
5368 hg status --copies --change 9353
5358
5369
5359 - get a NUL separated list of added files, suitable for xargs::
5370 - get a NUL separated list of added files, suitable for xargs::
5360
5371
5361 hg status -an0
5372 hg status -an0
5362
5373
5363 Returns 0 on success.
5374 Returns 0 on success.
5364 """
5375 """
5365
5376
5366 revs = opts.get('rev')
5377 revs = opts.get('rev')
5367 change = opts.get('change')
5378 change = opts.get('change')
5368
5379
5369 if revs and change:
5380 if revs and change:
5370 msg = _('cannot specify --rev and --change at the same time')
5381 msg = _('cannot specify --rev and --change at the same time')
5371 raise util.Abort(msg)
5382 raise util.Abort(msg)
5372 elif change:
5383 elif change:
5373 node2 = scmutil.revsingle(repo, change, None).node()
5384 node2 = scmutil.revsingle(repo, change, None).node()
5374 node1 = repo[node2].p1().node()
5385 node1 = repo[node2].p1().node()
5375 else:
5386 else:
5376 node1, node2 = scmutil.revpair(repo, revs)
5387 node1, node2 = scmutil.revpair(repo, revs)
5377
5388
5378 cwd = (pats and repo.getcwd()) or ''
5389 cwd = (pats and repo.getcwd()) or ''
5379 end = opts.get('print0') and '\0' or '\n'
5390 end = opts.get('print0') and '\0' or '\n'
5380 copy = {}
5391 copy = {}
5381 states = 'modified added removed deleted unknown ignored clean'.split()
5392 states = 'modified added removed deleted unknown ignored clean'.split()
5382 show = [k for k in states if opts.get(k)]
5393 show = [k for k in states if opts.get(k)]
5383 if opts.get('all'):
5394 if opts.get('all'):
5384 show += ui.quiet and (states[:4] + ['clean']) or states
5395 show += ui.quiet and (states[:4] + ['clean']) or states
5385 if not show:
5396 if not show:
5386 show = ui.quiet and states[:4] or states[:5]
5397 show = ui.quiet and states[:4] or states[:5]
5387
5398
5388 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5399 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5389 'ignored' in show, 'clean' in show, 'unknown' in show,
5400 'ignored' in show, 'clean' in show, 'unknown' in show,
5390 opts.get('subrepos'))
5401 opts.get('subrepos'))
5391 changestates = zip(states, 'MAR!?IC', stat)
5402 changestates = zip(states, 'MAR!?IC', stat)
5392
5403
5393 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5404 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5394 copy = copies.pathcopies(repo[node1], repo[node2])
5405 copy = copies.pathcopies(repo[node1], repo[node2])
5395
5406
5396 fm = ui.formatter('status', opts)
5407 fm = ui.formatter('status', opts)
5397 fmt = '%s' + end
5408 fmt = '%s' + end
5398 showchar = not opts.get('no_status')
5409 showchar = not opts.get('no_status')
5399
5410
5400 for state, char, files in changestates:
5411 for state, char, files in changestates:
5401 if state in show:
5412 if state in show:
5402 label = 'status.' + state
5413 label = 'status.' + state
5403 for f in files:
5414 for f in files:
5404 fm.startitem()
5415 fm.startitem()
5405 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5416 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5406 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
5417 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
5407 if f in copy:
5418 if f in copy:
5408 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5419 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5409 label='status.copied')
5420 label='status.copied')
5410 fm.end()
5421 fm.end()
5411
5422
5412 @command('^summary|sum',
5423 @command('^summary|sum',
5413 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5424 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5414 def summary(ui, repo, **opts):
5425 def summary(ui, repo, **opts):
5415 """summarize working directory state
5426 """summarize working directory state
5416
5427
5417 This generates a brief summary of the working directory state,
5428 This generates a brief summary of the working directory state,
5418 including parents, branch, commit status, and available updates.
5429 including parents, branch, commit status, and available updates.
5419
5430
5420 With the --remote option, this will check the default paths for
5431 With the --remote option, this will check the default paths for
5421 incoming and outgoing changes. This can be time-consuming.
5432 incoming and outgoing changes. This can be time-consuming.
5422
5433
5423 Returns 0 on success.
5434 Returns 0 on success.
5424 """
5435 """
5425
5436
5426 ctx = repo[None]
5437 ctx = repo[None]
5427 parents = ctx.parents()
5438 parents = ctx.parents()
5428 pnode = parents[0].node()
5439 pnode = parents[0].node()
5429 marks = []
5440 marks = []
5430
5441
5431 for p in parents:
5442 for p in parents:
5432 # label with log.changeset (instead of log.parent) since this
5443 # label with log.changeset (instead of log.parent) since this
5433 # shows a working directory parent *changeset*:
5444 # shows a working directory parent *changeset*:
5434 # i18n: column positioning for "hg summary"
5445 # i18n: column positioning for "hg summary"
5435 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5446 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5436 label='log.changeset changeset.%s' % p.phasestr())
5447 label='log.changeset changeset.%s' % p.phasestr())
5437 ui.write(' '.join(p.tags()), label='log.tag')
5448 ui.write(' '.join(p.tags()), label='log.tag')
5438 if p.bookmarks():
5449 if p.bookmarks():
5439 marks.extend(p.bookmarks())
5450 marks.extend(p.bookmarks())
5440 if p.rev() == -1:
5451 if p.rev() == -1:
5441 if not len(repo):
5452 if not len(repo):
5442 ui.write(_(' (empty repository)'))
5453 ui.write(_(' (empty repository)'))
5443 else:
5454 else:
5444 ui.write(_(' (no revision checked out)'))
5455 ui.write(_(' (no revision checked out)'))
5445 ui.write('\n')
5456 ui.write('\n')
5446 if p.description():
5457 if p.description():
5447 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5458 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5448 label='log.summary')
5459 label='log.summary')
5449
5460
5450 branch = ctx.branch()
5461 branch = ctx.branch()
5451 bheads = repo.branchheads(branch)
5462 bheads = repo.branchheads(branch)
5452 # i18n: column positioning for "hg summary"
5463 # i18n: column positioning for "hg summary"
5453 m = _('branch: %s\n') % branch
5464 m = _('branch: %s\n') % branch
5454 if branch != 'default':
5465 if branch != 'default':
5455 ui.write(m, label='log.branch')
5466 ui.write(m, label='log.branch')
5456 else:
5467 else:
5457 ui.status(m, label='log.branch')
5468 ui.status(m, label='log.branch')
5458
5469
5459 if marks:
5470 if marks:
5460 current = repo._bookmarkcurrent
5471 current = repo._bookmarkcurrent
5461 # i18n: column positioning for "hg summary"
5472 # i18n: column positioning for "hg summary"
5462 ui.write(_('bookmarks:'), label='log.bookmark')
5473 ui.write(_('bookmarks:'), label='log.bookmark')
5463 if current is not None:
5474 if current is not None:
5464 if current in marks:
5475 if current in marks:
5465 ui.write(' *' + current, label='bookmarks.current')
5476 ui.write(' *' + current, label='bookmarks.current')
5466 marks.remove(current)
5477 marks.remove(current)
5467 else:
5478 else:
5468 ui.write(' [%s]' % current, label='bookmarks.current')
5479 ui.write(' [%s]' % current, label='bookmarks.current')
5469 for m in marks:
5480 for m in marks:
5470 ui.write(' ' + m, label='log.bookmark')
5481 ui.write(' ' + m, label='log.bookmark')
5471 ui.write('\n', label='log.bookmark')
5482 ui.write('\n', label='log.bookmark')
5472
5483
5473 st = list(repo.status(unknown=True))[:6]
5484 st = list(repo.status(unknown=True))[:6]
5474
5485
5475 c = repo.dirstate.copies()
5486 c = repo.dirstate.copies()
5476 copied, renamed = [], []
5487 copied, renamed = [], []
5477 for d, s in c.iteritems():
5488 for d, s in c.iteritems():
5478 if s in st[2]:
5489 if s in st[2]:
5479 st[2].remove(s)
5490 st[2].remove(s)
5480 renamed.append(d)
5491 renamed.append(d)
5481 else:
5492 else:
5482 copied.append(d)
5493 copied.append(d)
5483 if d in st[1]:
5494 if d in st[1]:
5484 st[1].remove(d)
5495 st[1].remove(d)
5485 st.insert(3, renamed)
5496 st.insert(3, renamed)
5486 st.insert(4, copied)
5497 st.insert(4, copied)
5487
5498
5488 ms = mergemod.mergestate(repo)
5499 ms = mergemod.mergestate(repo)
5489 st.append([f for f in ms if ms[f] == 'u'])
5500 st.append([f for f in ms if ms[f] == 'u'])
5490
5501
5491 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5502 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5492 st.append(subs)
5503 st.append(subs)
5493
5504
5494 labels = [ui.label(_('%d modified'), 'status.modified'),
5505 labels = [ui.label(_('%d modified'), 'status.modified'),
5495 ui.label(_('%d added'), 'status.added'),
5506 ui.label(_('%d added'), 'status.added'),
5496 ui.label(_('%d removed'), 'status.removed'),
5507 ui.label(_('%d removed'), 'status.removed'),
5497 ui.label(_('%d renamed'), 'status.copied'),
5508 ui.label(_('%d renamed'), 'status.copied'),
5498 ui.label(_('%d copied'), 'status.copied'),
5509 ui.label(_('%d copied'), 'status.copied'),
5499 ui.label(_('%d deleted'), 'status.deleted'),
5510 ui.label(_('%d deleted'), 'status.deleted'),
5500 ui.label(_('%d unknown'), 'status.unknown'),
5511 ui.label(_('%d unknown'), 'status.unknown'),
5501 ui.label(_('%d ignored'), 'status.ignored'),
5512 ui.label(_('%d ignored'), 'status.ignored'),
5502 ui.label(_('%d unresolved'), 'resolve.unresolved'),
5513 ui.label(_('%d unresolved'), 'resolve.unresolved'),
5503 ui.label(_('%d subrepos'), 'status.modified')]
5514 ui.label(_('%d subrepos'), 'status.modified')]
5504 t = []
5515 t = []
5505 for s, l in zip(st, labels):
5516 for s, l in zip(st, labels):
5506 if s:
5517 if s:
5507 t.append(l % len(s))
5518 t.append(l % len(s))
5508
5519
5509 t = ', '.join(t)
5520 t = ', '.join(t)
5510 cleanworkdir = False
5521 cleanworkdir = False
5511
5522
5512 if repo.vfs.exists('updatestate'):
5523 if repo.vfs.exists('updatestate'):
5513 t += _(' (interrupted update)')
5524 t += _(' (interrupted update)')
5514 elif len(parents) > 1:
5525 elif len(parents) > 1:
5515 t += _(' (merge)')
5526 t += _(' (merge)')
5516 elif branch != parents[0].branch():
5527 elif branch != parents[0].branch():
5517 t += _(' (new branch)')
5528 t += _(' (new branch)')
5518 elif (parents[0].closesbranch() and
5529 elif (parents[0].closesbranch() and
5519 pnode in repo.branchheads(branch, closed=True)):
5530 pnode in repo.branchheads(branch, closed=True)):
5520 t += _(' (head closed)')
5531 t += _(' (head closed)')
5521 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
5532 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
5522 t += _(' (clean)')
5533 t += _(' (clean)')
5523 cleanworkdir = True
5534 cleanworkdir = True
5524 elif pnode not in bheads:
5535 elif pnode not in bheads:
5525 t += _(' (new branch head)')
5536 t += _(' (new branch head)')
5526
5537
5527 if cleanworkdir:
5538 if cleanworkdir:
5528 # i18n: column positioning for "hg summary"
5539 # i18n: column positioning for "hg summary"
5529 ui.status(_('commit: %s\n') % t.strip())
5540 ui.status(_('commit: %s\n') % t.strip())
5530 else:
5541 else:
5531 # i18n: column positioning for "hg summary"
5542 # i18n: column positioning for "hg summary"
5532 ui.write(_('commit: %s\n') % t.strip())
5543 ui.write(_('commit: %s\n') % t.strip())
5533
5544
5534 # all ancestors of branch heads - all ancestors of parent = new csets
5545 # all ancestors of branch heads - all ancestors of parent = new csets
5535 new = len(repo.changelog.findmissing([ctx.node() for ctx in parents],
5546 new = len(repo.changelog.findmissing([ctx.node() for ctx in parents],
5536 bheads))
5547 bheads))
5537
5548
5538 if new == 0:
5549 if new == 0:
5539 # i18n: column positioning for "hg summary"
5550 # i18n: column positioning for "hg summary"
5540 ui.status(_('update: (current)\n'))
5551 ui.status(_('update: (current)\n'))
5541 elif pnode not in bheads:
5552 elif pnode not in bheads:
5542 # i18n: column positioning for "hg summary"
5553 # i18n: column positioning for "hg summary"
5543 ui.write(_('update: %d new changesets (update)\n') % new)
5554 ui.write(_('update: %d new changesets (update)\n') % new)
5544 else:
5555 else:
5545 # i18n: column positioning for "hg summary"
5556 # i18n: column positioning for "hg summary"
5546 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5557 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5547 (new, len(bheads)))
5558 (new, len(bheads)))
5548
5559
5549 cmdutil.summaryhooks(ui, repo)
5560 cmdutil.summaryhooks(ui, repo)
5550
5561
5551 if opts.get('remote'):
5562 if opts.get('remote'):
5552 t = []
5563 t = []
5553 source, branches = hg.parseurl(ui.expandpath('default'))
5564 source, branches = hg.parseurl(ui.expandpath('default'))
5554 sbranch = branches[0]
5565 sbranch = branches[0]
5555 other = hg.peer(repo, {}, source)
5566 other = hg.peer(repo, {}, source)
5556 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5567 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5557 if revs:
5568 if revs:
5558 revs = [other.lookup(rev) for rev in revs]
5569 revs = [other.lookup(rev) for rev in revs]
5559 ui.debug('comparing with %s\n' % util.hidepassword(source))
5570 ui.debug('comparing with %s\n' % util.hidepassword(source))
5560 repo.ui.pushbuffer()
5571 repo.ui.pushbuffer()
5561 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5572 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5562 _common, incoming, _rheads = commoninc
5573 _common, incoming, _rheads = commoninc
5563 repo.ui.popbuffer()
5574 repo.ui.popbuffer()
5564 if incoming:
5575 if incoming:
5565 t.append(_('1 or more incoming'))
5576 t.append(_('1 or more incoming'))
5566
5577
5567 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5578 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5568 dbranch = branches[0]
5579 dbranch = branches[0]
5569 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5580 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5570 if source != dest:
5581 if source != dest:
5571 other = hg.peer(repo, {}, dest)
5582 other = hg.peer(repo, {}, dest)
5572 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5583 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5573 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5584 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5574 commoninc = None
5585 commoninc = None
5575 if revs:
5586 if revs:
5576 revs = [repo.lookup(rev) for rev in revs]
5587 revs = [repo.lookup(rev) for rev in revs]
5577 repo.ui.pushbuffer()
5588 repo.ui.pushbuffer()
5578 outgoing = discovery.findcommonoutgoing(repo, other, onlyheads=revs,
5589 outgoing = discovery.findcommonoutgoing(repo, other, onlyheads=revs,
5579 commoninc=commoninc)
5590 commoninc=commoninc)
5580 repo.ui.popbuffer()
5591 repo.ui.popbuffer()
5581 o = outgoing.missing
5592 o = outgoing.missing
5582 if o:
5593 if o:
5583 t.append(_('%d outgoing') % len(o))
5594 t.append(_('%d outgoing') % len(o))
5584 if 'bookmarks' in other.listkeys('namespaces'):
5595 if 'bookmarks' in other.listkeys('namespaces'):
5585 lmarks = repo.listkeys('bookmarks')
5596 lmarks = repo.listkeys('bookmarks')
5586 rmarks = other.listkeys('bookmarks')
5597 rmarks = other.listkeys('bookmarks')
5587 diff = set(rmarks) - set(lmarks)
5598 diff = set(rmarks) - set(lmarks)
5588 if len(diff) > 0:
5599 if len(diff) > 0:
5589 t.append(_('%d incoming bookmarks') % len(diff))
5600 t.append(_('%d incoming bookmarks') % len(diff))
5590 diff = set(lmarks) - set(rmarks)
5601 diff = set(lmarks) - set(rmarks)
5591 if len(diff) > 0:
5602 if len(diff) > 0:
5592 t.append(_('%d outgoing bookmarks') % len(diff))
5603 t.append(_('%d outgoing bookmarks') % len(diff))
5593
5604
5594 if t:
5605 if t:
5595 # i18n: column positioning for "hg summary"
5606 # i18n: column positioning for "hg summary"
5596 ui.write(_('remote: %s\n') % (', '.join(t)))
5607 ui.write(_('remote: %s\n') % (', '.join(t)))
5597 else:
5608 else:
5598 # i18n: column positioning for "hg summary"
5609 # i18n: column positioning for "hg summary"
5599 ui.status(_('remote: (synced)\n'))
5610 ui.status(_('remote: (synced)\n'))
5600
5611
5601 @command('tag',
5612 @command('tag',
5602 [('f', 'force', None, _('force tag')),
5613 [('f', 'force', None, _('force tag')),
5603 ('l', 'local', None, _('make the tag local')),
5614 ('l', 'local', None, _('make the tag local')),
5604 ('r', 'rev', '', _('revision to tag'), _('REV')),
5615 ('r', 'rev', '', _('revision to tag'), _('REV')),
5605 ('', 'remove', None, _('remove a tag')),
5616 ('', 'remove', None, _('remove a tag')),
5606 # -l/--local is already there, commitopts cannot be used
5617 # -l/--local is already there, commitopts cannot be used
5607 ('e', 'edit', None, _('edit commit message')),
5618 ('e', 'edit', None, _('edit commit message')),
5608 ('m', 'message', '', _('use <text> as commit message'), _('TEXT')),
5619 ('m', 'message', '', _('use <text> as commit message'), _('TEXT')),
5609 ] + commitopts2,
5620 ] + commitopts2,
5610 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5621 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5611 def tag(ui, repo, name1, *names, **opts):
5622 def tag(ui, repo, name1, *names, **opts):
5612 """add one or more tags for the current or given revision
5623 """add one or more tags for the current or given revision
5613
5624
5614 Name a particular revision using <name>.
5625 Name a particular revision using <name>.
5615
5626
5616 Tags are used to name particular revisions of the repository and are
5627 Tags are used to name particular revisions of the repository and are
5617 very useful to compare different revisions, to go back to significant
5628 very useful to compare different revisions, to go back to significant
5618 earlier versions or to mark branch points as releases, etc. Changing
5629 earlier versions or to mark branch points as releases, etc. Changing
5619 an existing tag is normally disallowed; use -f/--force to override.
5630 an existing tag is normally disallowed; use -f/--force to override.
5620
5631
5621 If no revision is given, the parent of the working directory is
5632 If no revision is given, the parent of the working directory is
5622 used.
5633 used.
5623
5634
5624 To facilitate version control, distribution, and merging of tags,
5635 To facilitate version control, distribution, and merging of tags,
5625 they are stored as a file named ".hgtags" which is managed similarly
5636 they are stored as a file named ".hgtags" which is managed similarly
5626 to other project files and can be hand-edited if necessary. This
5637 to other project files and can be hand-edited if necessary. This
5627 also means that tagging creates a new commit. The file
5638 also means that tagging creates a new commit. The file
5628 ".hg/localtags" is used for local tags (not shared among
5639 ".hg/localtags" is used for local tags (not shared among
5629 repositories).
5640 repositories).
5630
5641
5631 Tag commits are usually made at the head of a branch. If the parent
5642 Tag commits are usually made at the head of a branch. If the parent
5632 of the working directory is not a branch head, :hg:`tag` aborts; use
5643 of the working directory is not a branch head, :hg:`tag` aborts; use
5633 -f/--force to force the tag commit to be based on a non-head
5644 -f/--force to force the tag commit to be based on a non-head
5634 changeset.
5645 changeset.
5635
5646
5636 See :hg:`help dates` for a list of formats valid for -d/--date.
5647 See :hg:`help dates` for a list of formats valid for -d/--date.
5637
5648
5638 Since tag names have priority over branch names during revision
5649 Since tag names have priority over branch names during revision
5639 lookup, using an existing branch name as a tag name is discouraged.
5650 lookup, using an existing branch name as a tag name is discouraged.
5640
5651
5641 Returns 0 on success.
5652 Returns 0 on success.
5642 """
5653 """
5643 wlock = lock = None
5654 wlock = lock = None
5644 try:
5655 try:
5645 wlock = repo.wlock()
5656 wlock = repo.wlock()
5646 lock = repo.lock()
5657 lock = repo.lock()
5647 rev_ = "."
5658 rev_ = "."
5648 names = [t.strip() for t in (name1,) + names]
5659 names = [t.strip() for t in (name1,) + names]
5649 if len(names) != len(set(names)):
5660 if len(names) != len(set(names)):
5650 raise util.Abort(_('tag names must be unique'))
5661 raise util.Abort(_('tag names must be unique'))
5651 for n in names:
5662 for n in names:
5652 scmutil.checknewlabel(repo, n, 'tag')
5663 scmutil.checknewlabel(repo, n, 'tag')
5653 if not n:
5664 if not n:
5654 raise util.Abort(_('tag names cannot consist entirely of '
5665 raise util.Abort(_('tag names cannot consist entirely of '
5655 'whitespace'))
5666 'whitespace'))
5656 if opts.get('rev') and opts.get('remove'):
5667 if opts.get('rev') and opts.get('remove'):
5657 raise util.Abort(_("--rev and --remove are incompatible"))
5668 raise util.Abort(_("--rev and --remove are incompatible"))
5658 if opts.get('rev'):
5669 if opts.get('rev'):
5659 rev_ = opts['rev']
5670 rev_ = opts['rev']
5660 message = opts.get('message')
5671 message = opts.get('message')
5661 if opts.get('remove'):
5672 if opts.get('remove'):
5662 expectedtype = opts.get('local') and 'local' or 'global'
5673 expectedtype = opts.get('local') and 'local' or 'global'
5663 for n in names:
5674 for n in names:
5664 if not repo.tagtype(n):
5675 if not repo.tagtype(n):
5665 raise util.Abort(_("tag '%s' does not exist") % n)
5676 raise util.Abort(_("tag '%s' does not exist") % n)
5666 if repo.tagtype(n) != expectedtype:
5677 if repo.tagtype(n) != expectedtype:
5667 if expectedtype == 'global':
5678 if expectedtype == 'global':
5668 raise util.Abort(_("tag '%s' is not a global tag") % n)
5679 raise util.Abort(_("tag '%s' is not a global tag") % n)
5669 else:
5680 else:
5670 raise util.Abort(_("tag '%s' is not a local tag") % n)
5681 raise util.Abort(_("tag '%s' is not a local tag") % n)
5671 rev_ = nullid
5682 rev_ = nullid
5672 if not message:
5683 if not message:
5673 # we don't translate commit messages
5684 # we don't translate commit messages
5674 message = 'Removed tag %s' % ', '.join(names)
5685 message = 'Removed tag %s' % ', '.join(names)
5675 elif not opts.get('force'):
5686 elif not opts.get('force'):
5676 for n in names:
5687 for n in names:
5677 if n in repo.tags():
5688 if n in repo.tags():
5678 raise util.Abort(_("tag '%s' already exists "
5689 raise util.Abort(_("tag '%s' already exists "
5679 "(use -f to force)") % n)
5690 "(use -f to force)") % n)
5680 if not opts.get('local'):
5691 if not opts.get('local'):
5681 p1, p2 = repo.dirstate.parents()
5692 p1, p2 = repo.dirstate.parents()
5682 if p2 != nullid:
5693 if p2 != nullid:
5683 raise util.Abort(_('uncommitted merge'))
5694 raise util.Abort(_('uncommitted merge'))
5684 bheads = repo.branchheads()
5695 bheads = repo.branchheads()
5685 if not opts.get('force') and bheads and p1 not in bheads:
5696 if not opts.get('force') and bheads and p1 not in bheads:
5686 raise util.Abort(_('not at a branch head (use -f to force)'))
5697 raise util.Abort(_('not at a branch head (use -f to force)'))
5687 r = scmutil.revsingle(repo, rev_).node()
5698 r = scmutil.revsingle(repo, rev_).node()
5688
5699
5689 if not message:
5700 if not message:
5690 # we don't translate commit messages
5701 # we don't translate commit messages
5691 message = ('Added tag %s for changeset %s' %
5702 message = ('Added tag %s for changeset %s' %
5692 (', '.join(names), short(r)))
5703 (', '.join(names), short(r)))
5693
5704
5694 date = opts.get('date')
5705 date = opts.get('date')
5695 if date:
5706 if date:
5696 date = util.parsedate(date)
5707 date = util.parsedate(date)
5697
5708
5698 if opts.get('edit'):
5709 if opts.get('edit'):
5699 message = ui.edit(message, ui.username())
5710 message = ui.edit(message, ui.username())
5700
5711
5701 # don't allow tagging the null rev
5712 # don't allow tagging the null rev
5702 if (not opts.get('remove') and
5713 if (not opts.get('remove') and
5703 scmutil.revsingle(repo, rev_).rev() == nullrev):
5714 scmutil.revsingle(repo, rev_).rev() == nullrev):
5704 raise util.Abort(_("cannot tag null revision"))
5715 raise util.Abort(_("cannot tag null revision"))
5705
5716
5706 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
5717 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
5707 finally:
5718 finally:
5708 release(lock, wlock)
5719 release(lock, wlock)
5709
5720
5710 @command('tags', [], '')
5721 @command('tags', [], '')
5711 def tags(ui, repo, **opts):
5722 def tags(ui, repo, **opts):
5712 """list repository tags
5723 """list repository tags
5713
5724
5714 This lists both regular and local tags. When the -v/--verbose
5725 This lists both regular and local tags. When the -v/--verbose
5715 switch is used, a third column "local" is printed for local tags.
5726 switch is used, a third column "local" is printed for local tags.
5716
5727
5717 Returns 0 on success.
5728 Returns 0 on success.
5718 """
5729 """
5719
5730
5720 fm = ui.formatter('tags', opts)
5731 fm = ui.formatter('tags', opts)
5721 hexfunc = ui.debugflag and hex or short
5732 hexfunc = ui.debugflag and hex or short
5722 tagtype = ""
5733 tagtype = ""
5723
5734
5724 for t, n in reversed(repo.tagslist()):
5735 for t, n in reversed(repo.tagslist()):
5725 hn = hexfunc(n)
5736 hn = hexfunc(n)
5726 label = 'tags.normal'
5737 label = 'tags.normal'
5727 tagtype = ''
5738 tagtype = ''
5728 if repo.tagtype(t) == 'local':
5739 if repo.tagtype(t) == 'local':
5729 label = 'tags.local'
5740 label = 'tags.local'
5730 tagtype = 'local'
5741 tagtype = 'local'
5731
5742
5732 fm.startitem()
5743 fm.startitem()
5733 fm.write('tag', '%s', t, label=label)
5744 fm.write('tag', '%s', t, label=label)
5734 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5745 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5735 fm.condwrite(not ui.quiet, 'rev id', fmt,
5746 fm.condwrite(not ui.quiet, 'rev id', fmt,
5736 repo.changelog.rev(n), hn, label=label)
5747 repo.changelog.rev(n), hn, label=label)
5737 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5748 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5738 tagtype, label=label)
5749 tagtype, label=label)
5739 fm.plain('\n')
5750 fm.plain('\n')
5740 fm.end()
5751 fm.end()
5741
5752
5742 @command('tip',
5753 @command('tip',
5743 [('p', 'patch', None, _('show patch')),
5754 [('p', 'patch', None, _('show patch')),
5744 ('g', 'git', None, _('use git extended diff format')),
5755 ('g', 'git', None, _('use git extended diff format')),
5745 ] + templateopts,
5756 ] + templateopts,
5746 _('[-p] [-g]'))
5757 _('[-p] [-g]'))
5747 def tip(ui, repo, **opts):
5758 def tip(ui, repo, **opts):
5748 """show the tip revision (DEPRECATED)
5759 """show the tip revision (DEPRECATED)
5749
5760
5750 The tip revision (usually just called the tip) is the changeset
5761 The tip revision (usually just called the tip) is the changeset
5751 most recently added to the repository (and therefore the most
5762 most recently added to the repository (and therefore the most
5752 recently changed head).
5763 recently changed head).
5753
5764
5754 If you have just made a commit, that commit will be the tip. If
5765 If you have just made a commit, that commit will be the tip. If
5755 you have just pulled changes from another repository, the tip of
5766 you have just pulled changes from another repository, the tip of
5756 that repository becomes the current tip. The "tip" tag is special
5767 that repository becomes the current tip. The "tip" tag is special
5757 and cannot be renamed or assigned to a different changeset.
5768 and cannot be renamed or assigned to a different changeset.
5758
5769
5759 This command is deprecated, please use :hg:`heads` instead.
5770 This command is deprecated, please use :hg:`heads` instead.
5760
5771
5761 Returns 0 on success.
5772 Returns 0 on success.
5762 """
5773 """
5763 displayer = cmdutil.show_changeset(ui, repo, opts)
5774 displayer = cmdutil.show_changeset(ui, repo, opts)
5764 displayer.show(repo['tip'])
5775 displayer.show(repo['tip'])
5765 displayer.close()
5776 displayer.close()
5766
5777
5767 @command('unbundle',
5778 @command('unbundle',
5768 [('u', 'update', None,
5779 [('u', 'update', None,
5769 _('update to new branch head if changesets were unbundled'))],
5780 _('update to new branch head if changesets were unbundled'))],
5770 _('[-u] FILE...'))
5781 _('[-u] FILE...'))
5771 def unbundle(ui, repo, fname1, *fnames, **opts):
5782 def unbundle(ui, repo, fname1, *fnames, **opts):
5772 """apply one or more changegroup files
5783 """apply one or more changegroup files
5773
5784
5774 Apply one or more compressed changegroup files generated by the
5785 Apply one or more compressed changegroup files generated by the
5775 bundle command.
5786 bundle command.
5776
5787
5777 Returns 0 on success, 1 if an update has unresolved files.
5788 Returns 0 on success, 1 if an update has unresolved files.
5778 """
5789 """
5779 fnames = (fname1,) + fnames
5790 fnames = (fname1,) + fnames
5780
5791
5781 lock = repo.lock()
5792 lock = repo.lock()
5782 wc = repo['.']
5793 wc = repo['.']
5783 try:
5794 try:
5784 for fname in fnames:
5795 for fname in fnames:
5785 f = hg.openpath(ui, fname)
5796 f = hg.openpath(ui, fname)
5786 gen = changegroup.readbundle(f, fname)
5797 gen = changegroup.readbundle(f, fname)
5787 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
5798 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
5788 finally:
5799 finally:
5789 lock.release()
5800 lock.release()
5790 bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
5801 bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
5791 return postincoming(ui, repo, modheads, opts.get('update'), None)
5802 return postincoming(ui, repo, modheads, opts.get('update'), None)
5792
5803
5793 @command('^update|up|checkout|co',
5804 @command('^update|up|checkout|co',
5794 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5805 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5795 ('c', 'check', None,
5806 ('c', 'check', None,
5796 _('update across branches if no uncommitted changes')),
5807 _('update across branches if no uncommitted changes')),
5797 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5808 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5798 ('r', 'rev', '', _('revision'), _('REV'))],
5809 ('r', 'rev', '', _('revision'), _('REV'))],
5799 _('[-c] [-C] [-d DATE] [[-r] REV]'))
5810 _('[-c] [-C] [-d DATE] [[-r] REV]'))
5800 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
5811 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
5801 """update working directory (or switch revisions)
5812 """update working directory (or switch revisions)
5802
5813
5803 Update the repository's working directory to the specified
5814 Update the repository's working directory to the specified
5804 changeset. If no changeset is specified, update to the tip of the
5815 changeset. If no changeset is specified, update to the tip of the
5805 current named branch and move the current bookmark (see :hg:`help
5816 current named branch and move the current bookmark (see :hg:`help
5806 bookmarks`).
5817 bookmarks`).
5807
5818
5808 Update sets the working directory's parent revision to the specified
5819 Update sets the working directory's parent revision to the specified
5809 changeset (see :hg:`help parents`).
5820 changeset (see :hg:`help parents`).
5810
5821
5811 If the changeset is not a descendant or ancestor of the working
5822 If the changeset is not a descendant or ancestor of the working
5812 directory's parent, the update is aborted. With the -c/--check
5823 directory's parent, the update is aborted. With the -c/--check
5813 option, the working directory is checked for uncommitted changes; if
5824 option, the working directory is checked for uncommitted changes; if
5814 none are found, the working directory is updated to the specified
5825 none are found, the working directory is updated to the specified
5815 changeset.
5826 changeset.
5816
5827
5817 .. container:: verbose
5828 .. container:: verbose
5818
5829
5819 The following rules apply when the working directory contains
5830 The following rules apply when the working directory contains
5820 uncommitted changes:
5831 uncommitted changes:
5821
5832
5822 1. If neither -c/--check nor -C/--clean is specified, and if
5833 1. If neither -c/--check nor -C/--clean is specified, and if
5823 the requested changeset is an ancestor or descendant of
5834 the requested changeset is an ancestor or descendant of
5824 the working directory's parent, the uncommitted changes
5835 the working directory's parent, the uncommitted changes
5825 are merged into the requested changeset and the merged
5836 are merged into the requested changeset and the merged
5826 result is left uncommitted. If the requested changeset is
5837 result is left uncommitted. If the requested changeset is
5827 not an ancestor or descendant (that is, it is on another
5838 not an ancestor or descendant (that is, it is on another
5828 branch), the update is aborted and the uncommitted changes
5839 branch), the update is aborted and the uncommitted changes
5829 are preserved.
5840 are preserved.
5830
5841
5831 2. With the -c/--check option, the update is aborted and the
5842 2. With the -c/--check option, the update is aborted and the
5832 uncommitted changes are preserved.
5843 uncommitted changes are preserved.
5833
5844
5834 3. With the -C/--clean option, uncommitted changes are discarded and
5845 3. With the -C/--clean option, uncommitted changes are discarded and
5835 the working directory is updated to the requested changeset.
5846 the working directory is updated to the requested changeset.
5836
5847
5837 To cancel an uncommitted merge (and lose your changes), use
5848 To cancel an uncommitted merge (and lose your changes), use
5838 :hg:`update --clean .`.
5849 :hg:`update --clean .`.
5839
5850
5840 Use null as the changeset to remove the working directory (like
5851 Use null as the changeset to remove the working directory (like
5841 :hg:`clone -U`).
5852 :hg:`clone -U`).
5842
5853
5843 If you want to revert just one file to an older revision, use
5854 If you want to revert just one file to an older revision, use
5844 :hg:`revert [-r REV] NAME`.
5855 :hg:`revert [-r REV] NAME`.
5845
5856
5846 See :hg:`help dates` for a list of formats valid for -d/--date.
5857 See :hg:`help dates` for a list of formats valid for -d/--date.
5847
5858
5848 Returns 0 on success, 1 if there are unresolved files.
5859 Returns 0 on success, 1 if there are unresolved files.
5849 """
5860 """
5850 if rev and node:
5861 if rev and node:
5851 raise util.Abort(_("please specify just one revision"))
5862 raise util.Abort(_("please specify just one revision"))
5852
5863
5853 if rev is None or rev == '':
5864 if rev is None or rev == '':
5854 rev = node
5865 rev = node
5855
5866
5856 cmdutil.clearunfinished(repo)
5867 cmdutil.clearunfinished(repo)
5857
5868
5858 # with no argument, we also move the current bookmark, if any
5869 # with no argument, we also move the current bookmark, if any
5859 rev, movemarkfrom = bookmarks.calculateupdate(ui, repo, rev)
5870 rev, movemarkfrom = bookmarks.calculateupdate(ui, repo, rev)
5860
5871
5861 # if we defined a bookmark, we have to remember the original bookmark name
5872 # if we defined a bookmark, we have to remember the original bookmark name
5862 brev = rev
5873 brev = rev
5863 rev = scmutil.revsingle(repo, rev, rev).rev()
5874 rev = scmutil.revsingle(repo, rev, rev).rev()
5864
5875
5865 if check and clean:
5876 if check and clean:
5866 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
5877 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
5867
5878
5868 if date:
5879 if date:
5869 if rev is not None:
5880 if rev is not None:
5870 raise util.Abort(_("you can't specify a revision and a date"))
5881 raise util.Abort(_("you can't specify a revision and a date"))
5871 rev = cmdutil.finddate(ui, repo, date)
5882 rev = cmdutil.finddate(ui, repo, date)
5872
5883
5873 if check:
5884 if check:
5874 c = repo[None]
5885 c = repo[None]
5875 if c.dirty(merge=False, branch=False, missing=True):
5886 if c.dirty(merge=False, branch=False, missing=True):
5876 raise util.Abort(_("uncommitted changes"))
5887 raise util.Abort(_("uncommitted changes"))
5877 if rev is None:
5888 if rev is None:
5878 rev = repo[repo[None].branch()].rev()
5889 rev = repo[repo[None].branch()].rev()
5879 mergemod._checkunknown(repo, repo[None], repo[rev])
5890 mergemod._checkunknown(repo, repo[None], repo[rev])
5880
5891
5881 if clean:
5892 if clean:
5882 ret = hg.clean(repo, rev)
5893 ret = hg.clean(repo, rev)
5883 else:
5894 else:
5884 ret = hg.update(repo, rev)
5895 ret = hg.update(repo, rev)
5885
5896
5886 if not ret and movemarkfrom:
5897 if not ret and movemarkfrom:
5887 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5898 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5888 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
5899 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
5889 elif brev in repo._bookmarks:
5900 elif brev in repo._bookmarks:
5890 bookmarks.setcurrent(repo, brev)
5901 bookmarks.setcurrent(repo, brev)
5891 elif brev:
5902 elif brev:
5892 bookmarks.unsetcurrent(repo)
5903 bookmarks.unsetcurrent(repo)
5893
5904
5894 return ret
5905 return ret
5895
5906
5896 @command('verify', [])
5907 @command('verify', [])
5897 def verify(ui, repo):
5908 def verify(ui, repo):
5898 """verify the integrity of the repository
5909 """verify the integrity of the repository
5899
5910
5900 Verify the integrity of the current repository.
5911 Verify the integrity of the current repository.
5901
5912
5902 This will perform an extensive check of the repository's
5913 This will perform an extensive check of the repository's
5903 integrity, validating the hashes and checksums of each entry in
5914 integrity, validating the hashes and checksums of each entry in
5904 the changelog, manifest, and tracked files, as well as the
5915 the changelog, manifest, and tracked files, as well as the
5905 integrity of their crosslinks and indices.
5916 integrity of their crosslinks and indices.
5906
5917
5907 Please see http://mercurial.selenic.com/wiki/RepositoryCorruption
5918 Please see http://mercurial.selenic.com/wiki/RepositoryCorruption
5908 for more information about recovery from corruption of the
5919 for more information about recovery from corruption of the
5909 repository.
5920 repository.
5910
5921
5911 Returns 0 on success, 1 if errors are encountered.
5922 Returns 0 on success, 1 if errors are encountered.
5912 """
5923 """
5913 return hg.verify(repo)
5924 return hg.verify(repo)
5914
5925
5915 @command('version', [])
5926 @command('version', [])
5916 def version_(ui):
5927 def version_(ui):
5917 """output version and copyright information"""
5928 """output version and copyright information"""
5918 ui.write(_("Mercurial Distributed SCM (version %s)\n")
5929 ui.write(_("Mercurial Distributed SCM (version %s)\n")
5919 % util.version())
5930 % util.version())
5920 ui.status(_(
5931 ui.status(_(
5921 "(see http://mercurial.selenic.com for more information)\n"
5932 "(see http://mercurial.selenic.com for more information)\n"
5922 "\nCopyright (C) 2005-2014 Matt Mackall and others\n"
5933 "\nCopyright (C) 2005-2014 Matt Mackall and others\n"
5923 "This is free software; see the source for copying conditions. "
5934 "This is free software; see the source for copying conditions. "
5924 "There is NO\nwarranty; "
5935 "There is NO\nwarranty; "
5925 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5936 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5926 ))
5937 ))
5927
5938
5928 norepo = ("clone init version help debugcommands debugcomplete"
5939 norepo = ("clone init version help debugcommands debugcomplete"
5929 " debugdate debuginstall debugfsinfo debugpushkey debugwireargs"
5940 " debugdate debuginstall debugfsinfo debugpushkey debugwireargs"
5930 " debugknown debuggetbundle debugbundle")
5941 " debugknown debuggetbundle debugbundle")
5931 optionalrepo = ("identify paths serve showconfig debugancestor debugdag"
5942 optionalrepo = ("identify paths serve showconfig debugancestor debugdag"
5932 " debugdata debugindex debugindexdot debugrevlog")
5943 " debugdata debugindex debugindexdot debugrevlog")
5933 inferrepo = ("add addremove annotate cat commit diff grep forget log parents"
5944 inferrepo = ("add addremove annotate cat commit diff grep forget log parents"
5934 " remove resolve status debugwalk")
5945 " remove resolve status debugwalk")
General Comments 0
You need to be logged in to leave comments. Login now