##// END OF EJS Templates
bundle: lookup revisions after addbranchrevs...
Nicolas Dumazet -
r11636:c10eaf12 stable
parent child Browse files
Show More
@@ -1,4469 +1,4470 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, nullid, nullrev, short
8 from node import hex, nullid, nullrev, short
9 from lock import release
9 from lock import release
10 from i18n import _, gettext
10 from i18n import _, gettext
11 import os, re, sys, difflib, time, tempfile
11 import os, re, sys, difflib, time, tempfile
12 import hg, util, revlog, bundlerepo, extensions, copies, error
12 import hg, util, revlog, bundlerepo, extensions, copies, error
13 import patch, help, mdiff, url, encoding, templatekw, discovery
13 import patch, help, mdiff, url, encoding, templatekw, discovery
14 import archival, changegroup, cmdutil, sshserver, hbisect, hgweb, hgweb.server
14 import archival, changegroup, cmdutil, sshserver, hbisect, hgweb, hgweb.server
15 import merge as mergemod
15 import merge as mergemod
16 import minirst, revset
16 import minirst, revset
17 import dagparser
17 import dagparser
18
18
19 # Commands start here, listed alphabetically
19 # Commands start here, listed alphabetically
20
20
21 def add(ui, repo, *pats, **opts):
21 def add(ui, repo, *pats, **opts):
22 """add the specified files on the next commit
22 """add the specified files on the next commit
23
23
24 Schedule files to be version controlled and added to the
24 Schedule files to be version controlled and added to the
25 repository.
25 repository.
26
26
27 The files will be added to the repository at the next commit. To
27 The files will be added to the repository at the next commit. To
28 undo an add before that, see :hg:`forget`.
28 undo an add before that, see :hg:`forget`.
29
29
30 If no names are given, add all files to the repository.
30 If no names are given, add all files to the repository.
31
31
32 .. container:: verbose
32 .. container:: verbose
33
33
34 An example showing how new (unknown) files are added
34 An example showing how new (unknown) files are added
35 automatically by :hg:`add`::
35 automatically by :hg:`add`::
36
36
37 $ ls
37 $ ls
38 foo.c
38 foo.c
39 $ hg status
39 $ hg status
40 ? foo.c
40 ? foo.c
41 $ hg add
41 $ hg add
42 adding foo.c
42 adding foo.c
43 $ hg status
43 $ hg status
44 A foo.c
44 A foo.c
45
45
46 Returns 0 if all files are successfully added.
46 Returns 0 if all files are successfully added.
47 """
47 """
48
48
49 bad = []
49 bad = []
50 names = []
50 names = []
51 m = cmdutil.match(repo, pats, opts)
51 m = cmdutil.match(repo, pats, opts)
52 oldbad = m.bad
52 oldbad = m.bad
53 m.bad = lambda x, y: bad.append(x) or oldbad(x, y)
53 m.bad = lambda x, y: bad.append(x) or oldbad(x, y)
54
54
55 for f in repo.walk(m):
55 for f in repo.walk(m):
56 exact = m.exact(f)
56 exact = m.exact(f)
57 if exact or f not in repo.dirstate:
57 if exact or f not in repo.dirstate:
58 names.append(f)
58 names.append(f)
59 if ui.verbose or not exact:
59 if ui.verbose or not exact:
60 ui.status(_('adding %s\n') % m.rel(f))
60 ui.status(_('adding %s\n') % m.rel(f))
61 if not opts.get('dry_run'):
61 if not opts.get('dry_run'):
62 bad += [f for f in repo[None].add(names) if f in m.files()]
62 bad += [f for f in repo[None].add(names) if f in m.files()]
63 return bad and 1 or 0
63 return bad and 1 or 0
64
64
65 def addremove(ui, repo, *pats, **opts):
65 def addremove(ui, repo, *pats, **opts):
66 """add all new files, delete all missing files
66 """add all new files, delete all missing files
67
67
68 Add all new files and remove all missing files from the
68 Add all new files and remove all missing files from the
69 repository.
69 repository.
70
70
71 New files are ignored if they match any of the patterns in
71 New files are ignored if they match any of the patterns in
72 .hgignore. As with add, these changes take effect at the next
72 .hgignore. As with add, these changes take effect at the next
73 commit.
73 commit.
74
74
75 Use the -s/--similarity option to detect renamed files. With a
75 Use the -s/--similarity option to detect renamed files. With a
76 parameter greater than 0, this compares every removed file with
76 parameter greater than 0, this compares every removed file with
77 every added file and records those similar enough as renames. This
77 every added file and records those similar enough as renames. This
78 option takes a percentage between 0 (disabled) and 100 (files must
78 option takes a percentage between 0 (disabled) and 100 (files must
79 be identical) as its parameter. Detecting renamed files this way
79 be identical) as its parameter. Detecting renamed files this way
80 can be expensive. After using this option, :hg:`status -C` can be
80 can be expensive. After using this option, :hg:`status -C` can be
81 used to check which files were identified as moved or renamed.
81 used to check which files were identified as moved or renamed.
82
82
83 Returns 0 if all files are successfully added.
83 Returns 0 if all files are successfully added.
84 """
84 """
85 try:
85 try:
86 sim = float(opts.get('similarity') or 0)
86 sim = float(opts.get('similarity') or 0)
87 except ValueError:
87 except ValueError:
88 raise util.Abort(_('similarity must be a number'))
88 raise util.Abort(_('similarity must be a number'))
89 if sim < 0 or sim > 100:
89 if sim < 0 or sim > 100:
90 raise util.Abort(_('similarity must be between 0 and 100'))
90 raise util.Abort(_('similarity must be between 0 and 100'))
91 return cmdutil.addremove(repo, pats, opts, similarity=sim / 100.0)
91 return cmdutil.addremove(repo, pats, opts, similarity=sim / 100.0)
92
92
93 def annotate(ui, repo, *pats, **opts):
93 def annotate(ui, repo, *pats, **opts):
94 """show changeset information by line for each file
94 """show changeset information by line for each file
95
95
96 List changes in files, showing the revision id responsible for
96 List changes in files, showing the revision id responsible for
97 each line
97 each line
98
98
99 This command is useful for discovering when a change was made and
99 This command is useful for discovering when a change was made and
100 by whom.
100 by whom.
101
101
102 Without the -a/--text option, annotate will avoid processing files
102 Without the -a/--text option, annotate will avoid processing files
103 it detects as binary. With -a, annotate will annotate the file
103 it detects as binary. With -a, annotate will annotate the file
104 anyway, although the results will probably be neither useful
104 anyway, although the results will probably be neither useful
105 nor desirable.
105 nor desirable.
106
106
107 Returns 0 on success.
107 Returns 0 on success.
108 """
108 """
109 if opts.get('follow'):
109 if opts.get('follow'):
110 # --follow is deprecated and now just an alias for -f/--file
110 # --follow is deprecated and now just an alias for -f/--file
111 # to mimic the behavior of Mercurial before version 1.5
111 # to mimic the behavior of Mercurial before version 1.5
112 opts['file'] = 1
112 opts['file'] = 1
113
113
114 datefunc = ui.quiet and util.shortdate or util.datestr
114 datefunc = ui.quiet and util.shortdate or util.datestr
115 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
115 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
116
116
117 if not pats:
117 if not pats:
118 raise util.Abort(_('at least one filename or pattern is required'))
118 raise util.Abort(_('at least one filename or pattern is required'))
119
119
120 opmap = [('user', lambda x: ui.shortuser(x[0].user())),
120 opmap = [('user', lambda x: ui.shortuser(x[0].user())),
121 ('number', lambda x: str(x[0].rev())),
121 ('number', lambda x: str(x[0].rev())),
122 ('changeset', lambda x: short(x[0].node())),
122 ('changeset', lambda x: short(x[0].node())),
123 ('date', getdate),
123 ('date', getdate),
124 ('file', lambda x: x[0].path()),
124 ('file', lambda x: x[0].path()),
125 ]
125 ]
126
126
127 if (not opts.get('user') and not opts.get('changeset')
127 if (not opts.get('user') and not opts.get('changeset')
128 and not opts.get('date') and not opts.get('file')):
128 and not opts.get('date') and not opts.get('file')):
129 opts['number'] = 1
129 opts['number'] = 1
130
130
131 linenumber = opts.get('line_number') is not None
131 linenumber = opts.get('line_number') is not None
132 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
132 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
133 raise util.Abort(_('at least one of -n/-c is required for -l'))
133 raise util.Abort(_('at least one of -n/-c is required for -l'))
134
134
135 funcmap = [func for op, func in opmap if opts.get(op)]
135 funcmap = [func for op, func in opmap if opts.get(op)]
136 if linenumber:
136 if linenumber:
137 lastfunc = funcmap[-1]
137 lastfunc = funcmap[-1]
138 funcmap[-1] = lambda x: "%s:%s" % (lastfunc(x), x[1])
138 funcmap[-1] = lambda x: "%s:%s" % (lastfunc(x), x[1])
139
139
140 ctx = repo[opts.get('rev')]
140 ctx = repo[opts.get('rev')]
141 m = cmdutil.match(repo, pats, opts)
141 m = cmdutil.match(repo, pats, opts)
142 follow = not opts.get('no_follow')
142 follow = not opts.get('no_follow')
143 for abs in ctx.walk(m):
143 for abs in ctx.walk(m):
144 fctx = ctx[abs]
144 fctx = ctx[abs]
145 if not opts.get('text') and util.binary(fctx.data()):
145 if not opts.get('text') and util.binary(fctx.data()):
146 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
146 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
147 continue
147 continue
148
148
149 lines = fctx.annotate(follow=follow, linenumber=linenumber)
149 lines = fctx.annotate(follow=follow, linenumber=linenumber)
150 pieces = []
150 pieces = []
151
151
152 for f in funcmap:
152 for f in funcmap:
153 l = [f(n) for n, dummy in lines]
153 l = [f(n) for n, dummy in lines]
154 if l:
154 if l:
155 sized = [(x, encoding.colwidth(x)) for x in l]
155 sized = [(x, encoding.colwidth(x)) for x in l]
156 ml = max([w for x, w in sized])
156 ml = max([w for x, w in sized])
157 pieces.append(["%s%s" % (' ' * (ml - w), x) for x, w in sized])
157 pieces.append(["%s%s" % (' ' * (ml - w), x) for x, w in sized])
158
158
159 if pieces:
159 if pieces:
160 for p, l in zip(zip(*pieces), lines):
160 for p, l in zip(zip(*pieces), lines):
161 ui.write("%s: %s" % (" ".join(p), l[1]))
161 ui.write("%s: %s" % (" ".join(p), l[1]))
162
162
163 def archive(ui, repo, dest, **opts):
163 def archive(ui, repo, dest, **opts):
164 '''create an unversioned archive of a repository revision
164 '''create an unversioned archive of a repository revision
165
165
166 By default, the revision used is the parent of the working
166 By default, the revision used is the parent of the working
167 directory; use -r/--rev to specify a different revision.
167 directory; use -r/--rev to specify a different revision.
168
168
169 The archive type is automatically detected based on file
169 The archive type is automatically detected based on file
170 extension (or override using -t/--type).
170 extension (or override using -t/--type).
171
171
172 Valid types are:
172 Valid types are:
173
173
174 :``files``: a directory full of files (default)
174 :``files``: a directory full of files (default)
175 :``tar``: tar archive, uncompressed
175 :``tar``: tar archive, uncompressed
176 :``tbz2``: tar archive, compressed using bzip2
176 :``tbz2``: tar archive, compressed using bzip2
177 :``tgz``: tar archive, compressed using gzip
177 :``tgz``: tar archive, compressed using gzip
178 :``uzip``: zip archive, uncompressed
178 :``uzip``: zip archive, uncompressed
179 :``zip``: zip archive, compressed using deflate
179 :``zip``: zip archive, compressed using deflate
180
180
181 The exact name of the destination archive or directory is given
181 The exact name of the destination archive or directory is given
182 using a format string; see :hg:`help export` for details.
182 using a format string; see :hg:`help export` for details.
183
183
184 Each member added to an archive file has a directory prefix
184 Each member added to an archive file has a directory prefix
185 prepended. Use -p/--prefix to specify a format string for the
185 prepended. Use -p/--prefix to specify a format string for the
186 prefix. The default is the basename of the archive, with suffixes
186 prefix. The default is the basename of the archive, with suffixes
187 removed.
187 removed.
188
188
189 Returns 0 on success.
189 Returns 0 on success.
190 '''
190 '''
191
191
192 ctx = repo[opts.get('rev')]
192 ctx = repo[opts.get('rev')]
193 if not ctx:
193 if not ctx:
194 raise util.Abort(_('no working directory: please specify a revision'))
194 raise util.Abort(_('no working directory: please specify a revision'))
195 node = ctx.node()
195 node = ctx.node()
196 dest = cmdutil.make_filename(repo, dest, node)
196 dest = cmdutil.make_filename(repo, dest, node)
197 if os.path.realpath(dest) == repo.root:
197 if os.path.realpath(dest) == repo.root:
198 raise util.Abort(_('repository root cannot be destination'))
198 raise util.Abort(_('repository root cannot be destination'))
199
199
200 def guess_type():
200 def guess_type():
201 exttypes = {
201 exttypes = {
202 'tar': ['.tar'],
202 'tar': ['.tar'],
203 'tbz2': ['.tbz2', '.tar.bz2'],
203 'tbz2': ['.tbz2', '.tar.bz2'],
204 'tgz': ['.tgz', '.tar.gz'],
204 'tgz': ['.tgz', '.tar.gz'],
205 'zip': ['.zip'],
205 'zip': ['.zip'],
206 }
206 }
207
207
208 for type, extensions in exttypes.items():
208 for type, extensions in exttypes.items():
209 if util.any(dest.endswith(ext) for ext in extensions):
209 if util.any(dest.endswith(ext) for ext in extensions):
210 return type
210 return type
211 return None
211 return None
212
212
213 kind = opts.get('type') or guess_type() or 'files'
213 kind = opts.get('type') or guess_type() or 'files'
214 prefix = opts.get('prefix')
214 prefix = opts.get('prefix')
215
215
216 if dest == '-':
216 if dest == '-':
217 if kind == 'files':
217 if kind == 'files':
218 raise util.Abort(_('cannot archive plain files to stdout'))
218 raise util.Abort(_('cannot archive plain files to stdout'))
219 dest = sys.stdout
219 dest = sys.stdout
220 if not prefix:
220 if not prefix:
221 prefix = os.path.basename(repo.root) + '-%h'
221 prefix = os.path.basename(repo.root) + '-%h'
222
222
223 prefix = cmdutil.make_filename(repo, prefix, node)
223 prefix = cmdutil.make_filename(repo, prefix, node)
224 matchfn = cmdutil.match(repo, [], opts)
224 matchfn = cmdutil.match(repo, [], opts)
225 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
225 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
226 matchfn, prefix)
226 matchfn, prefix)
227
227
228 def backout(ui, repo, node=None, rev=None, **opts):
228 def backout(ui, repo, node=None, rev=None, **opts):
229 '''reverse effect of earlier changeset
229 '''reverse effect of earlier changeset
230
230
231 Commit the backed out changes as a new changeset. The new
231 Commit the backed out changes as a new changeset. The new
232 changeset is a child of the backed out changeset.
232 changeset is a child of the backed out changeset.
233
233
234 If you backout a changeset other than the tip, a new head is
234 If you backout a changeset other than the tip, a new head is
235 created. This head will be the new tip and you should merge this
235 created. This head will be the new tip and you should merge this
236 backout changeset with another head.
236 backout changeset with another head.
237
237
238 The --merge option remembers the parent of the working directory
238 The --merge option remembers the parent of the working directory
239 before starting the backout, then merges the new head with that
239 before starting the backout, then merges the new head with that
240 changeset afterwards. This saves you from doing the merge by hand.
240 changeset afterwards. This saves you from doing the merge by hand.
241 The result of this merge is not committed, as with a normal merge.
241 The result of this merge is not committed, as with a normal merge.
242
242
243 See :hg:`help dates` for a list of formats valid for -d/--date.
243 See :hg:`help dates` for a list of formats valid for -d/--date.
244
244
245 Returns 0 on success.
245 Returns 0 on success.
246 '''
246 '''
247 if rev and node:
247 if rev and node:
248 raise util.Abort(_("please specify just one revision"))
248 raise util.Abort(_("please specify just one revision"))
249
249
250 if not rev:
250 if not rev:
251 rev = node
251 rev = node
252
252
253 if not rev:
253 if not rev:
254 raise util.Abort(_("please specify a revision to backout"))
254 raise util.Abort(_("please specify a revision to backout"))
255
255
256 date = opts.get('date')
256 date = opts.get('date')
257 if date:
257 if date:
258 opts['date'] = util.parsedate(date)
258 opts['date'] = util.parsedate(date)
259
259
260 cmdutil.bail_if_changed(repo)
260 cmdutil.bail_if_changed(repo)
261 node = repo.lookup(rev)
261 node = repo.lookup(rev)
262
262
263 op1, op2 = repo.dirstate.parents()
263 op1, op2 = repo.dirstate.parents()
264 a = repo.changelog.ancestor(op1, node)
264 a = repo.changelog.ancestor(op1, node)
265 if a != node:
265 if a != node:
266 raise util.Abort(_('cannot backout change on a different branch'))
266 raise util.Abort(_('cannot backout change on a different branch'))
267
267
268 p1, p2 = repo.changelog.parents(node)
268 p1, p2 = repo.changelog.parents(node)
269 if p1 == nullid:
269 if p1 == nullid:
270 raise util.Abort(_('cannot backout a change with no parents'))
270 raise util.Abort(_('cannot backout a change with no parents'))
271 if p2 != nullid:
271 if p2 != nullid:
272 if not opts.get('parent'):
272 if not opts.get('parent'):
273 raise util.Abort(_('cannot backout a merge changeset without '
273 raise util.Abort(_('cannot backout a merge changeset without '
274 '--parent'))
274 '--parent'))
275 p = repo.lookup(opts['parent'])
275 p = repo.lookup(opts['parent'])
276 if p not in (p1, p2):
276 if p not in (p1, p2):
277 raise util.Abort(_('%s is not a parent of %s') %
277 raise util.Abort(_('%s is not a parent of %s') %
278 (short(p), short(node)))
278 (short(p), short(node)))
279 parent = p
279 parent = p
280 else:
280 else:
281 if opts.get('parent'):
281 if opts.get('parent'):
282 raise util.Abort(_('cannot use --parent on non-merge changeset'))
282 raise util.Abort(_('cannot use --parent on non-merge changeset'))
283 parent = p1
283 parent = p1
284
284
285 # the backout should appear on the same branch
285 # the backout should appear on the same branch
286 branch = repo.dirstate.branch()
286 branch = repo.dirstate.branch()
287 hg.clean(repo, node, show_stats=False)
287 hg.clean(repo, node, show_stats=False)
288 repo.dirstate.setbranch(branch)
288 repo.dirstate.setbranch(branch)
289 revert_opts = opts.copy()
289 revert_opts = opts.copy()
290 revert_opts['date'] = None
290 revert_opts['date'] = None
291 revert_opts['all'] = True
291 revert_opts['all'] = True
292 revert_opts['rev'] = hex(parent)
292 revert_opts['rev'] = hex(parent)
293 revert_opts['no_backup'] = None
293 revert_opts['no_backup'] = None
294 revert(ui, repo, **revert_opts)
294 revert(ui, repo, **revert_opts)
295 commit_opts = opts.copy()
295 commit_opts = opts.copy()
296 commit_opts['addremove'] = False
296 commit_opts['addremove'] = False
297 if not commit_opts['message'] and not commit_opts['logfile']:
297 if not commit_opts['message'] and not commit_opts['logfile']:
298 # we don't translate commit messages
298 # we don't translate commit messages
299 commit_opts['message'] = "Backed out changeset %s" % short(node)
299 commit_opts['message'] = "Backed out changeset %s" % short(node)
300 commit_opts['force_editor'] = True
300 commit_opts['force_editor'] = True
301 commit(ui, repo, **commit_opts)
301 commit(ui, repo, **commit_opts)
302 def nice(node):
302 def nice(node):
303 return '%d:%s' % (repo.changelog.rev(node), short(node))
303 return '%d:%s' % (repo.changelog.rev(node), short(node))
304 ui.status(_('changeset %s backs out changeset %s\n') %
304 ui.status(_('changeset %s backs out changeset %s\n') %
305 (nice(repo.changelog.tip()), nice(node)))
305 (nice(repo.changelog.tip()), nice(node)))
306 if op1 != node:
306 if op1 != node:
307 hg.clean(repo, op1, show_stats=False)
307 hg.clean(repo, op1, show_stats=False)
308 if opts.get('merge'):
308 if opts.get('merge'):
309 ui.status(_('merging with changeset %s\n')
309 ui.status(_('merging with changeset %s\n')
310 % nice(repo.changelog.tip()))
310 % nice(repo.changelog.tip()))
311 hg.merge(repo, hex(repo.changelog.tip()))
311 hg.merge(repo, hex(repo.changelog.tip()))
312 else:
312 else:
313 ui.status(_('the backout changeset is a new head - '
313 ui.status(_('the backout changeset is a new head - '
314 'do not forget to merge\n'))
314 'do not forget to merge\n'))
315 ui.status(_('(use "backout --merge" '
315 ui.status(_('(use "backout --merge" '
316 'if you want to auto-merge)\n'))
316 'if you want to auto-merge)\n'))
317
317
318 def bisect(ui, repo, rev=None, extra=None, command=None,
318 def bisect(ui, repo, rev=None, extra=None, command=None,
319 reset=None, good=None, bad=None, skip=None, noupdate=None):
319 reset=None, good=None, bad=None, skip=None, noupdate=None):
320 """subdivision search of changesets
320 """subdivision search of changesets
321
321
322 This command helps to find changesets which introduce problems. To
322 This command helps to find changesets which introduce problems. To
323 use, mark the earliest changeset you know exhibits the problem as
323 use, mark the earliest changeset you know exhibits the problem as
324 bad, then mark the latest changeset which is free from the problem
324 bad, then mark the latest changeset which is free from the problem
325 as good. Bisect will update your working directory to a revision
325 as good. Bisect will update your working directory to a revision
326 for testing (unless the -U/--noupdate option is specified). Once
326 for testing (unless the -U/--noupdate option is specified). Once
327 you have performed tests, mark the working directory as good or
327 you have performed tests, mark the working directory as good or
328 bad, and bisect will either update to another candidate changeset
328 bad, and bisect will either update to another candidate changeset
329 or announce that it has found the bad revision.
329 or announce that it has found the bad revision.
330
330
331 As a shortcut, you can also use the revision argument to mark a
331 As a shortcut, you can also use the revision argument to mark a
332 revision as good or bad without checking it out first.
332 revision as good or bad without checking it out first.
333
333
334 If you supply a command, it will be used for automatic bisection.
334 If you supply a command, it will be used for automatic bisection.
335 Its exit status will be used to mark revisions as good or bad:
335 Its exit status will be used to mark revisions as good or bad:
336 status 0 means good, 125 means to skip the revision, 127
336 status 0 means good, 125 means to skip the revision, 127
337 (command not found) will abort the bisection, and any other
337 (command not found) will abort the bisection, and any other
338 non-zero exit status means the revision is bad.
338 non-zero exit status means the revision is bad.
339
339
340 Returns 0 on success.
340 Returns 0 on success.
341 """
341 """
342 def print_result(nodes, good):
342 def print_result(nodes, good):
343 displayer = cmdutil.show_changeset(ui, repo, {})
343 displayer = cmdutil.show_changeset(ui, repo, {})
344 if len(nodes) == 1:
344 if len(nodes) == 1:
345 # narrowed it down to a single revision
345 # narrowed it down to a single revision
346 if good:
346 if good:
347 ui.write(_("The first good revision is:\n"))
347 ui.write(_("The first good revision is:\n"))
348 else:
348 else:
349 ui.write(_("The first bad revision is:\n"))
349 ui.write(_("The first bad revision is:\n"))
350 displayer.show(repo[nodes[0]])
350 displayer.show(repo[nodes[0]])
351 else:
351 else:
352 # multiple possible revisions
352 # multiple possible revisions
353 if good:
353 if good:
354 ui.write(_("Due to skipped revisions, the first "
354 ui.write(_("Due to skipped revisions, the first "
355 "good revision could be any of:\n"))
355 "good revision could be any of:\n"))
356 else:
356 else:
357 ui.write(_("Due to skipped revisions, the first "
357 ui.write(_("Due to skipped revisions, the first "
358 "bad revision could be any of:\n"))
358 "bad revision could be any of:\n"))
359 for n in nodes:
359 for n in nodes:
360 displayer.show(repo[n])
360 displayer.show(repo[n])
361 displayer.close()
361 displayer.close()
362
362
363 def check_state(state, interactive=True):
363 def check_state(state, interactive=True):
364 if not state['good'] or not state['bad']:
364 if not state['good'] or not state['bad']:
365 if (good or bad or skip or reset) and interactive:
365 if (good or bad or skip or reset) and interactive:
366 return
366 return
367 if not state['good']:
367 if not state['good']:
368 raise util.Abort(_('cannot bisect (no known good revisions)'))
368 raise util.Abort(_('cannot bisect (no known good revisions)'))
369 else:
369 else:
370 raise util.Abort(_('cannot bisect (no known bad revisions)'))
370 raise util.Abort(_('cannot bisect (no known bad revisions)'))
371 return True
371 return True
372
372
373 # backward compatibility
373 # backward compatibility
374 if rev in "good bad reset init".split():
374 if rev in "good bad reset init".split():
375 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
375 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
376 cmd, rev, extra = rev, extra, None
376 cmd, rev, extra = rev, extra, None
377 if cmd == "good":
377 if cmd == "good":
378 good = True
378 good = True
379 elif cmd == "bad":
379 elif cmd == "bad":
380 bad = True
380 bad = True
381 else:
381 else:
382 reset = True
382 reset = True
383 elif extra or good + bad + skip + reset + bool(command) > 1:
383 elif extra or good + bad + skip + reset + bool(command) > 1:
384 raise util.Abort(_('incompatible arguments'))
384 raise util.Abort(_('incompatible arguments'))
385
385
386 if reset:
386 if reset:
387 p = repo.join("bisect.state")
387 p = repo.join("bisect.state")
388 if os.path.exists(p):
388 if os.path.exists(p):
389 os.unlink(p)
389 os.unlink(p)
390 return
390 return
391
391
392 state = hbisect.load_state(repo)
392 state = hbisect.load_state(repo)
393
393
394 if command:
394 if command:
395 changesets = 1
395 changesets = 1
396 try:
396 try:
397 while changesets:
397 while changesets:
398 # update state
398 # update state
399 status = util.system(command)
399 status = util.system(command)
400 if status == 125:
400 if status == 125:
401 transition = "skip"
401 transition = "skip"
402 elif status == 0:
402 elif status == 0:
403 transition = "good"
403 transition = "good"
404 # status < 0 means process was killed
404 # status < 0 means process was killed
405 elif status == 127:
405 elif status == 127:
406 raise util.Abort(_("failed to execute %s") % command)
406 raise util.Abort(_("failed to execute %s") % command)
407 elif status < 0:
407 elif status < 0:
408 raise util.Abort(_("%s killed") % command)
408 raise util.Abort(_("%s killed") % command)
409 else:
409 else:
410 transition = "bad"
410 transition = "bad"
411 ctx = repo[rev or '.']
411 ctx = repo[rev or '.']
412 state[transition].append(ctx.node())
412 state[transition].append(ctx.node())
413 ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition))
413 ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition))
414 check_state(state, interactive=False)
414 check_state(state, interactive=False)
415 # bisect
415 # bisect
416 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
416 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
417 # update to next check
417 # update to next check
418 cmdutil.bail_if_changed(repo)
418 cmdutil.bail_if_changed(repo)
419 hg.clean(repo, nodes[0], show_stats=False)
419 hg.clean(repo, nodes[0], show_stats=False)
420 finally:
420 finally:
421 hbisect.save_state(repo, state)
421 hbisect.save_state(repo, state)
422 print_result(nodes, good)
422 print_result(nodes, good)
423 return
423 return
424
424
425 # update state
425 # update state
426 node = repo.lookup(rev or '.')
426 node = repo.lookup(rev or '.')
427 if good or bad or skip:
427 if good or bad or skip:
428 if good:
428 if good:
429 state['good'].append(node)
429 state['good'].append(node)
430 elif bad:
430 elif bad:
431 state['bad'].append(node)
431 state['bad'].append(node)
432 elif skip:
432 elif skip:
433 state['skip'].append(node)
433 state['skip'].append(node)
434 hbisect.save_state(repo, state)
434 hbisect.save_state(repo, state)
435
435
436 if not check_state(state):
436 if not check_state(state):
437 return
437 return
438
438
439 # actually bisect
439 # actually bisect
440 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
440 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
441 if changesets == 0:
441 if changesets == 0:
442 print_result(nodes, good)
442 print_result(nodes, good)
443 else:
443 else:
444 assert len(nodes) == 1 # only a single node can be tested next
444 assert len(nodes) == 1 # only a single node can be tested next
445 node = nodes[0]
445 node = nodes[0]
446 # compute the approximate number of remaining tests
446 # compute the approximate number of remaining tests
447 tests, size = 0, 2
447 tests, size = 0, 2
448 while size <= changesets:
448 while size <= changesets:
449 tests, size = tests + 1, size * 2
449 tests, size = tests + 1, size * 2
450 rev = repo.changelog.rev(node)
450 rev = repo.changelog.rev(node)
451 ui.write(_("Testing changeset %d:%s "
451 ui.write(_("Testing changeset %d:%s "
452 "(%d changesets remaining, ~%d tests)\n")
452 "(%d changesets remaining, ~%d tests)\n")
453 % (rev, short(node), changesets, tests))
453 % (rev, short(node), changesets, tests))
454 if not noupdate:
454 if not noupdate:
455 cmdutil.bail_if_changed(repo)
455 cmdutil.bail_if_changed(repo)
456 return hg.clean(repo, node)
456 return hg.clean(repo, node)
457
457
458 def branch(ui, repo, label=None, **opts):
458 def branch(ui, repo, label=None, **opts):
459 """set or show the current branch name
459 """set or show the current branch name
460
460
461 With no argument, show the current branch name. With one argument,
461 With no argument, show the current branch name. With one argument,
462 set the working directory branch name (the branch will not exist
462 set the working directory branch name (the branch will not exist
463 in the repository until the next commit). Standard practice
463 in the repository until the next commit). Standard practice
464 recommends that primary development take place on the 'default'
464 recommends that primary development take place on the 'default'
465 branch.
465 branch.
466
466
467 Unless -f/--force is specified, branch will not let you set a
467 Unless -f/--force is specified, branch will not let you set a
468 branch name that already exists, even if it's inactive.
468 branch name that already exists, even if it's inactive.
469
469
470 Use -C/--clean to reset the working directory branch to that of
470 Use -C/--clean to reset the working directory branch to that of
471 the parent of the working directory, negating a previous branch
471 the parent of the working directory, negating a previous branch
472 change.
472 change.
473
473
474 Use the command :hg:`update` to switch to an existing branch. Use
474 Use the command :hg:`update` to switch to an existing branch. Use
475 :hg:`commit --close-branch` to mark this branch as closed.
475 :hg:`commit --close-branch` to mark this branch as closed.
476
476
477 Returns 0 on success.
477 Returns 0 on success.
478 """
478 """
479
479
480 if opts.get('clean'):
480 if opts.get('clean'):
481 label = repo[None].parents()[0].branch()
481 label = repo[None].parents()[0].branch()
482 repo.dirstate.setbranch(label)
482 repo.dirstate.setbranch(label)
483 ui.status(_('reset working directory to branch %s\n') % label)
483 ui.status(_('reset working directory to branch %s\n') % label)
484 elif label:
484 elif label:
485 utflabel = encoding.fromlocal(label)
485 utflabel = encoding.fromlocal(label)
486 if not opts.get('force') and utflabel in repo.branchtags():
486 if not opts.get('force') and utflabel in repo.branchtags():
487 if label not in [p.branch() for p in repo.parents()]:
487 if label not in [p.branch() for p in repo.parents()]:
488 raise util.Abort(_('a branch of the same name already exists'
488 raise util.Abort(_('a branch of the same name already exists'
489 " (use 'hg update' to switch to it)"))
489 " (use 'hg update' to switch to it)"))
490 repo.dirstate.setbranch(utflabel)
490 repo.dirstate.setbranch(utflabel)
491 ui.status(_('marked working directory as branch %s\n') % label)
491 ui.status(_('marked working directory as branch %s\n') % label)
492 else:
492 else:
493 ui.write("%s\n" % encoding.tolocal(repo.dirstate.branch()))
493 ui.write("%s\n" % encoding.tolocal(repo.dirstate.branch()))
494
494
495 def branches(ui, repo, active=False, closed=False):
495 def branches(ui, repo, active=False, closed=False):
496 """list repository named branches
496 """list repository named branches
497
497
498 List the repository's named branches, indicating which ones are
498 List the repository's named branches, indicating which ones are
499 inactive. If -c/--closed is specified, also list branches which have
499 inactive. If -c/--closed is specified, also list branches which have
500 been marked closed (see :hg:`commit --close-branch`).
500 been marked closed (see :hg:`commit --close-branch`).
501
501
502 If -a/--active is specified, only show active branches. A branch
502 If -a/--active is specified, only show active branches. A branch
503 is considered active if it contains repository heads.
503 is considered active if it contains repository heads.
504
504
505 Use the command :hg:`update` to switch to an existing branch.
505 Use the command :hg:`update` to switch to an existing branch.
506
506
507 Returns 0.
507 Returns 0.
508 """
508 """
509
509
510 hexfunc = ui.debugflag and hex or short
510 hexfunc = ui.debugflag and hex or short
511 activebranches = [repo[n].branch() for n in repo.heads()]
511 activebranches = [repo[n].branch() for n in repo.heads()]
512 def testactive(tag, node):
512 def testactive(tag, node):
513 realhead = tag in activebranches
513 realhead = tag in activebranches
514 open = node in repo.branchheads(tag, closed=False)
514 open = node in repo.branchheads(tag, closed=False)
515 return realhead and open
515 return realhead and open
516 branches = sorted([(testactive(tag, node), repo.changelog.rev(node), tag)
516 branches = sorted([(testactive(tag, node), repo.changelog.rev(node), tag)
517 for tag, node in repo.branchtags().items()],
517 for tag, node in repo.branchtags().items()],
518 reverse=True)
518 reverse=True)
519
519
520 for isactive, node, tag in branches:
520 for isactive, node, tag in branches:
521 if (not active) or isactive:
521 if (not active) or isactive:
522 encodedtag = encoding.tolocal(tag)
522 encodedtag = encoding.tolocal(tag)
523 if ui.quiet:
523 if ui.quiet:
524 ui.write("%s\n" % encodedtag)
524 ui.write("%s\n" % encodedtag)
525 else:
525 else:
526 hn = repo.lookup(node)
526 hn = repo.lookup(node)
527 if isactive:
527 if isactive:
528 notice = ''
528 notice = ''
529 elif hn not in repo.branchheads(tag, closed=False):
529 elif hn not in repo.branchheads(tag, closed=False):
530 if not closed:
530 if not closed:
531 continue
531 continue
532 notice = _(' (closed)')
532 notice = _(' (closed)')
533 else:
533 else:
534 notice = _(' (inactive)')
534 notice = _(' (inactive)')
535 rev = str(node).rjust(31 - encoding.colwidth(encodedtag))
535 rev = str(node).rjust(31 - encoding.colwidth(encodedtag))
536 data = encodedtag, rev, hexfunc(hn), notice
536 data = encodedtag, rev, hexfunc(hn), notice
537 ui.write("%s %s:%s%s\n" % data)
537 ui.write("%s %s:%s%s\n" % data)
538
538
539 def bundle(ui, repo, fname, dest=None, **opts):
539 def bundle(ui, repo, fname, dest=None, **opts):
540 """create a changegroup file
540 """create a changegroup file
541
541
542 Generate a compressed changegroup file collecting changesets not
542 Generate a compressed changegroup file collecting changesets not
543 known to be in another repository.
543 known to be in another repository.
544
544
545 If you omit the destination repository, then hg assumes the
545 If you omit the destination repository, then hg assumes the
546 destination will have all the nodes you specify with --base
546 destination will have all the nodes you specify with --base
547 parameters. To create a bundle containing all changesets, use
547 parameters. To create a bundle containing all changesets, use
548 -a/--all (or --base null).
548 -a/--all (or --base null).
549
549
550 You can change compression method with the -t/--type option.
550 You can change compression method with the -t/--type option.
551 The available compression methods are: none, bzip2, and
551 The available compression methods are: none, bzip2, and
552 gzip (by default, bundles are compressed using bzip2).
552 gzip (by default, bundles are compressed using bzip2).
553
553
554 The bundle file can then be transferred using conventional means
554 The bundle file can then be transferred using conventional means
555 and applied to another repository with the unbundle or pull
555 and applied to another repository with the unbundle or pull
556 command. This is useful when direct push and pull are not
556 command. This is useful when direct push and pull are not
557 available or when exporting an entire repository is undesirable.
557 available or when exporting an entire repository is undesirable.
558
558
559 Applying bundles preserves all changeset contents including
559 Applying bundles preserves all changeset contents including
560 permissions, copy/rename information, and revision history.
560 permissions, copy/rename information, and revision history.
561
561
562 Returns 0 on success, 1 if no changes found.
562 Returns 0 on success, 1 if no changes found.
563 """
563 """
564 revs = opts.get('rev') or None
564 revs = opts.get('rev') or None
565 if revs:
566 revs = [repo.lookup(rev) for rev in revs]
567 if opts.get('all'):
565 if opts.get('all'):
568 base = ['null']
566 base = ['null']
569 else:
567 else:
570 base = opts.get('base')
568 base = opts.get('base')
571 if base:
569 if base:
572 if dest:
570 if dest:
573 raise util.Abort(_("--base is incompatible with specifying "
571 raise util.Abort(_("--base is incompatible with specifying "
574 "a destination"))
572 "a destination"))
575 base = [repo.lookup(rev) for rev in base]
573 base = [repo.lookup(rev) for rev in base]
576 # create the right base
574 # create the right base
577 # XXX: nodesbetween / changegroup* should be "fixed" instead
575 # XXX: nodesbetween / changegroup* should be "fixed" instead
578 o = []
576 o = []
579 has = set((nullid,))
577 has = set((nullid,))
580 for n in base:
578 for n in base:
581 has.update(repo.changelog.reachable(n))
579 has.update(repo.changelog.reachable(n))
582 if revs:
580 if revs:
583 visit = list(revs)
581 revs = [repo.lookup(rev) for rev in revs]
584 has.difference_update(revs)
582 visit = revs[:]
583 has.difference_update(visit)
585 else:
584 else:
586 visit = repo.changelog.heads()
585 visit = repo.changelog.heads()
587 seen = {}
586 seen = {}
588 while visit:
587 while visit:
589 n = visit.pop(0)
588 n = visit.pop(0)
590 parents = [p for p in repo.changelog.parents(n) if p not in has]
589 parents = [p for p in repo.changelog.parents(n) if p not in has]
591 if len(parents) == 0:
590 if len(parents) == 0:
592 if n not in has:
591 if n not in has:
593 o.append(n)
592 o.append(n)
594 else:
593 else:
595 for p in parents:
594 for p in parents:
596 if p not in seen:
595 if p not in seen:
597 seen[p] = 1
596 seen[p] = 1
598 visit.append(p)
597 visit.append(p)
599 else:
598 else:
600 dest = ui.expandpath(dest or 'default-push', dest or 'default')
599 dest = ui.expandpath(dest or 'default-push', dest or 'default')
601 dest, branches = hg.parseurl(dest, opts.get('branch'))
600 dest, branches = hg.parseurl(dest, opts.get('branch'))
602 other = hg.repository(hg.remoteui(repo, opts), dest)
601 other = hg.repository(hg.remoteui(repo, opts), dest)
603 revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
602 revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
603 if revs:
604 revs = [repo.lookup(rev) for rev in revs]
604 o = discovery.findoutgoing(repo, other, force=opts.get('force'))
605 o = discovery.findoutgoing(repo, other, force=opts.get('force'))
605
606
606 if not o:
607 if not o:
607 ui.status(_("no changes found\n"))
608 ui.status(_("no changes found\n"))
608 return 1
609 return 1
609
610
610 if revs:
611 if revs:
611 cg = repo.changegroupsubset(o, revs, 'bundle')
612 cg = repo.changegroupsubset(o, revs, 'bundle')
612 else:
613 else:
613 cg = repo.changegroup(o, 'bundle')
614 cg = repo.changegroup(o, 'bundle')
614
615
615 bundletype = opts.get('type', 'bzip2').lower()
616 bundletype = opts.get('type', 'bzip2').lower()
616 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
617 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
617 bundletype = btypes.get(bundletype)
618 bundletype = btypes.get(bundletype)
618 if bundletype not in changegroup.bundletypes:
619 if bundletype not in changegroup.bundletypes:
619 raise util.Abort(_('unknown bundle type specified with --type'))
620 raise util.Abort(_('unknown bundle type specified with --type'))
620
621
621 changegroup.writebundle(cg, fname, bundletype)
622 changegroup.writebundle(cg, fname, bundletype)
622
623
623 def cat(ui, repo, file1, *pats, **opts):
624 def cat(ui, repo, file1, *pats, **opts):
624 """output the current or given revision of files
625 """output the current or given revision of files
625
626
626 Print the specified files as they were at the given revision. If
627 Print the specified files as they were at the given revision. If
627 no revision is given, the parent of the working directory is used,
628 no revision is given, the parent of the working directory is used,
628 or tip if no revision is checked out.
629 or tip if no revision is checked out.
629
630
630 Output may be to a file, in which case the name of the file is
631 Output may be to a file, in which case the name of the file is
631 given using a format string. The formatting rules are the same as
632 given using a format string. The formatting rules are the same as
632 for the export command, with the following additions:
633 for the export command, with the following additions:
633
634
634 :``%s``: basename of file being printed
635 :``%s``: basename of file being printed
635 :``%d``: dirname of file being printed, or '.' if in repository root
636 :``%d``: dirname of file being printed, or '.' if in repository root
636 :``%p``: root-relative path name of file being printed
637 :``%p``: root-relative path name of file being printed
637
638
638 Returns 0 on success.
639 Returns 0 on success.
639 """
640 """
640 ctx = repo[opts.get('rev')]
641 ctx = repo[opts.get('rev')]
641 err = 1
642 err = 1
642 m = cmdutil.match(repo, (file1,) + pats, opts)
643 m = cmdutil.match(repo, (file1,) + pats, opts)
643 for abs in ctx.walk(m):
644 for abs in ctx.walk(m):
644 fp = cmdutil.make_file(repo, opts.get('output'), ctx.node(), pathname=abs)
645 fp = cmdutil.make_file(repo, opts.get('output'), ctx.node(), pathname=abs)
645 data = ctx[abs].data()
646 data = ctx[abs].data()
646 if opts.get('decode'):
647 if opts.get('decode'):
647 data = repo.wwritedata(abs, data)
648 data = repo.wwritedata(abs, data)
648 fp.write(data)
649 fp.write(data)
649 err = 0
650 err = 0
650 return err
651 return err
651
652
652 def clone(ui, source, dest=None, **opts):
653 def clone(ui, source, dest=None, **opts):
653 """make a copy of an existing repository
654 """make a copy of an existing repository
654
655
655 Create a copy of an existing repository in a new directory.
656 Create a copy of an existing repository in a new directory.
656
657
657 If no destination directory name is specified, it defaults to the
658 If no destination directory name is specified, it defaults to the
658 basename of the source.
659 basename of the source.
659
660
660 The location of the source is added to the new repository's
661 The location of the source is added to the new repository's
661 .hg/hgrc file, as the default to be used for future pulls.
662 .hg/hgrc file, as the default to be used for future pulls.
662
663
663 See :hg:`help urls` for valid source format details.
664 See :hg:`help urls` for valid source format details.
664
665
665 It is possible to specify an ``ssh://`` URL as the destination, but no
666 It is possible to specify an ``ssh://`` URL as the destination, but no
666 .hg/hgrc and working directory will be created on the remote side.
667 .hg/hgrc and working directory will be created on the remote side.
667 Please see :hg:`help urls` for important details about ``ssh://`` URLs.
668 Please see :hg:`help urls` for important details about ``ssh://`` URLs.
668
669
669 A set of changesets (tags, or branch names) to pull may be specified
670 A set of changesets (tags, or branch names) to pull may be specified
670 by listing each changeset (tag, or branch name) with -r/--rev.
671 by listing each changeset (tag, or branch name) with -r/--rev.
671 If -r/--rev is used, the cloned repository will contain only a subset
672 If -r/--rev is used, the cloned repository will contain only a subset
672 of the changesets of the source repository. Only the set of changesets
673 of the changesets of the source repository. Only the set of changesets
673 defined by all -r/--rev options (including all their ancestors)
674 defined by all -r/--rev options (including all their ancestors)
674 will be pulled into the destination repository.
675 will be pulled into the destination repository.
675 No subsequent changesets (including subsequent tags) will be present
676 No subsequent changesets (including subsequent tags) will be present
676 in the destination.
677 in the destination.
677
678
678 Using -r/--rev (or 'clone src#rev dest') implies --pull, even for
679 Using -r/--rev (or 'clone src#rev dest') implies --pull, even for
679 local source repositories.
680 local source repositories.
680
681
681 For efficiency, hardlinks are used for cloning whenever the source
682 For efficiency, hardlinks are used for cloning whenever the source
682 and destination are on the same filesystem (note this applies only
683 and destination are on the same filesystem (note this applies only
683 to the repository data, not to the working directory). Some
684 to the repository data, not to the working directory). Some
684 filesystems, such as AFS, implement hardlinking incorrectly, but
685 filesystems, such as AFS, implement hardlinking incorrectly, but
685 do not report errors. In these cases, use the --pull option to
686 do not report errors. In these cases, use the --pull option to
686 avoid hardlinking.
687 avoid hardlinking.
687
688
688 In some cases, you can clone repositories and the working directory
689 In some cases, you can clone repositories and the working directory
689 using full hardlinks with ::
690 using full hardlinks with ::
690
691
691 $ cp -al REPO REPOCLONE
692 $ cp -al REPO REPOCLONE
692
693
693 This is the fastest way to clone, but it is not always safe. The
694 This is the fastest way to clone, but it is not always safe. The
694 operation is not atomic (making sure REPO is not modified during
695 operation is not atomic (making sure REPO is not modified during
695 the operation is up to you) and you have to make sure your editor
696 the operation is up to you) and you have to make sure your editor
696 breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,
697 breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,
697 this is not compatible with certain extensions that place their
698 this is not compatible with certain extensions that place their
698 metadata under the .hg directory, such as mq.
699 metadata under the .hg directory, such as mq.
699
700
700 Mercurial will update the working directory to the first applicable
701 Mercurial will update the working directory to the first applicable
701 revision from this list:
702 revision from this list:
702
703
703 a) null if -U or the source repository has no changesets
704 a) null if -U or the source repository has no changesets
704 b) if -u . and the source repository is local, the first parent of
705 b) if -u . and the source repository is local, the first parent of
705 the source repository's working directory
706 the source repository's working directory
706 c) the changeset specified with -u (if a branch name, this means the
707 c) the changeset specified with -u (if a branch name, this means the
707 latest head of that branch)
708 latest head of that branch)
708 d) the changeset specified with -r
709 d) the changeset specified with -r
709 e) the tipmost head specified with -b
710 e) the tipmost head specified with -b
710 f) the tipmost head specified with the url#branch source syntax
711 f) the tipmost head specified with the url#branch source syntax
711 g) the tipmost head of the default branch
712 g) the tipmost head of the default branch
712 h) tip
713 h) tip
713
714
714 Returns 0 on success.
715 Returns 0 on success.
715 """
716 """
716 if opts.get('noupdate') and opts.get('updaterev'):
717 if opts.get('noupdate') and opts.get('updaterev'):
717 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
718 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
718
719
719 r = hg.clone(hg.remoteui(ui, opts), source, dest,
720 r = hg.clone(hg.remoteui(ui, opts), source, dest,
720 pull=opts.get('pull'),
721 pull=opts.get('pull'),
721 stream=opts.get('uncompressed'),
722 stream=opts.get('uncompressed'),
722 rev=opts.get('rev'),
723 rev=opts.get('rev'),
723 update=opts.get('updaterev') or not opts.get('noupdate'),
724 update=opts.get('updaterev') or not opts.get('noupdate'),
724 branch=opts.get('branch'))
725 branch=opts.get('branch'))
725
726
726 return r is None
727 return r is None
727
728
728 def commit(ui, repo, *pats, **opts):
729 def commit(ui, repo, *pats, **opts):
729 """commit the specified files or all outstanding changes
730 """commit the specified files or all outstanding changes
730
731
731 Commit changes to the given files into the repository. Unlike a
732 Commit changes to the given files into the repository. Unlike a
732 centralized RCS, this operation is a local operation. See
733 centralized RCS, this operation is a local operation. See
733 :hg:`push` for a way to actively distribute your changes.
734 :hg:`push` for a way to actively distribute your changes.
734
735
735 If a list of files is omitted, all changes reported by :hg:`status`
736 If a list of files is omitted, all changes reported by :hg:`status`
736 will be committed.
737 will be committed.
737
738
738 If you are committing the result of a merge, do not provide any
739 If you are committing the result of a merge, do not provide any
739 filenames or -I/-X filters.
740 filenames or -I/-X filters.
740
741
741 If no commit message is specified, the configured editor is
742 If no commit message is specified, the configured editor is
742 started to prompt you for a message.
743 started to prompt you for a message.
743
744
744 See :hg:`help dates` for a list of formats valid for -d/--date.
745 See :hg:`help dates` for a list of formats valid for -d/--date.
745
746
746 Returns 0 on success, 1 if nothing changed.
747 Returns 0 on success, 1 if nothing changed.
747 """
748 """
748 extra = {}
749 extra = {}
749 if opts.get('close_branch'):
750 if opts.get('close_branch'):
750 if repo['.'].node() not in repo.branchheads():
751 if repo['.'].node() not in repo.branchheads():
751 # The topo heads set is included in the branch heads set of the
752 # The topo heads set is included in the branch heads set of the
752 # current branch, so it's sufficient to test branchheads
753 # current branch, so it's sufficient to test branchheads
753 raise util.Abort(_('can only close branch heads'))
754 raise util.Abort(_('can only close branch heads'))
754 extra['close'] = 1
755 extra['close'] = 1
755 e = cmdutil.commiteditor
756 e = cmdutil.commiteditor
756 if opts.get('force_editor'):
757 if opts.get('force_editor'):
757 e = cmdutil.commitforceeditor
758 e = cmdutil.commitforceeditor
758
759
759 def commitfunc(ui, repo, message, match, opts):
760 def commitfunc(ui, repo, message, match, opts):
760 return repo.commit(message, opts.get('user'), opts.get('date'), match,
761 return repo.commit(message, opts.get('user'), opts.get('date'), match,
761 editor=e, extra=extra)
762 editor=e, extra=extra)
762
763
763 branch = repo[None].branch()
764 branch = repo[None].branch()
764 bheads = repo.branchheads(branch)
765 bheads = repo.branchheads(branch)
765
766
766 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
767 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
767 if not node:
768 if not node:
768 ui.status(_("nothing changed\n"))
769 ui.status(_("nothing changed\n"))
769 return 1
770 return 1
770
771
771 ctx = repo[node]
772 ctx = repo[node]
772 parents = ctx.parents()
773 parents = ctx.parents()
773
774
774 if bheads and not [x for x in parents
775 if bheads and not [x for x in parents
775 if x.node() in bheads and x.branch() == branch]:
776 if x.node() in bheads and x.branch() == branch]:
776 ui.status(_('created new head\n'))
777 ui.status(_('created new head\n'))
777 # The message is not printed for initial roots. For the other
778 # The message is not printed for initial roots. For the other
778 # changesets, it is printed in the following situations:
779 # changesets, it is printed in the following situations:
779 #
780 #
780 # Par column: for the 2 parents with ...
781 # Par column: for the 2 parents with ...
781 # N: null or no parent
782 # N: null or no parent
782 # B: parent is on another named branch
783 # B: parent is on another named branch
783 # C: parent is a regular non head changeset
784 # C: parent is a regular non head changeset
784 # H: parent was a branch head of the current branch
785 # H: parent was a branch head of the current branch
785 # Msg column: whether we print "created new head" message
786 # Msg column: whether we print "created new head" message
786 # In the following, it is assumed that there already exists some
787 # In the following, it is assumed that there already exists some
787 # initial branch heads of the current branch, otherwise nothing is
788 # initial branch heads of the current branch, otherwise nothing is
788 # printed anyway.
789 # printed anyway.
789 #
790 #
790 # Par Msg Comment
791 # Par Msg Comment
791 # NN y additional topo root
792 # NN y additional topo root
792 #
793 #
793 # BN y additional branch root
794 # BN y additional branch root
794 # CN y additional topo head
795 # CN y additional topo head
795 # HN n usual case
796 # HN n usual case
796 #
797 #
797 # BB y weird additional branch root
798 # BB y weird additional branch root
798 # CB y branch merge
799 # CB y branch merge
799 # HB n merge with named branch
800 # HB n merge with named branch
800 #
801 #
801 # CC y additional head from merge
802 # CC y additional head from merge
802 # CH n merge with a head
803 # CH n merge with a head
803 #
804 #
804 # HH n head merge: head count decreases
805 # HH n head merge: head count decreases
805
806
806 if not opts.get('close_branch'):
807 if not opts.get('close_branch'):
807 for r in parents:
808 for r in parents:
808 if r.extra().get('close') and r.branch() == branch:
809 if r.extra().get('close') and r.branch() == branch:
809 ui.status(_('reopening closed branch head %d\n') % r)
810 ui.status(_('reopening closed branch head %d\n') % r)
810
811
811 if ui.debugflag:
812 if ui.debugflag:
812 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
813 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
813 elif ui.verbose:
814 elif ui.verbose:
814 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
815 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
815
816
816 def copy(ui, repo, *pats, **opts):
817 def copy(ui, repo, *pats, **opts):
817 """mark files as copied for the next commit
818 """mark files as copied for the next commit
818
819
819 Mark dest as having copies of source files. If dest is a
820 Mark dest as having copies of source files. If dest is a
820 directory, copies are put in that directory. If dest is a file,
821 directory, copies are put in that directory. If dest is a file,
821 the source must be a single file.
822 the source must be a single file.
822
823
823 By default, this command copies the contents of files as they
824 By default, this command copies the contents of files as they
824 exist in the working directory. If invoked with -A/--after, the
825 exist in the working directory. If invoked with -A/--after, the
825 operation is recorded, but no copying is performed.
826 operation is recorded, but no copying is performed.
826
827
827 This command takes effect with the next commit. To undo a copy
828 This command takes effect with the next commit. To undo a copy
828 before that, see :hg:`revert`.
829 before that, see :hg:`revert`.
829
830
830 Returns 0 on success, 1 if errors are encountered.
831 Returns 0 on success, 1 if errors are encountered.
831 """
832 """
832 wlock = repo.wlock(False)
833 wlock = repo.wlock(False)
833 try:
834 try:
834 return cmdutil.copy(ui, repo, pats, opts)
835 return cmdutil.copy(ui, repo, pats, opts)
835 finally:
836 finally:
836 wlock.release()
837 wlock.release()
837
838
838 def debugancestor(ui, repo, *args):
839 def debugancestor(ui, repo, *args):
839 """find the ancestor revision of two revisions in a given index"""
840 """find the ancestor revision of two revisions in a given index"""
840 if len(args) == 3:
841 if len(args) == 3:
841 index, rev1, rev2 = args
842 index, rev1, rev2 = args
842 r = revlog.revlog(util.opener(os.getcwd(), audit=False), index)
843 r = revlog.revlog(util.opener(os.getcwd(), audit=False), index)
843 lookup = r.lookup
844 lookup = r.lookup
844 elif len(args) == 2:
845 elif len(args) == 2:
845 if not repo:
846 if not repo:
846 raise util.Abort(_("There is no Mercurial repository here "
847 raise util.Abort(_("There is no Mercurial repository here "
847 "(.hg not found)"))
848 "(.hg not found)"))
848 rev1, rev2 = args
849 rev1, rev2 = args
849 r = repo.changelog
850 r = repo.changelog
850 lookup = repo.lookup
851 lookup = repo.lookup
851 else:
852 else:
852 raise util.Abort(_('either two or three arguments required'))
853 raise util.Abort(_('either two or three arguments required'))
853 a = r.ancestor(lookup(rev1), lookup(rev2))
854 a = r.ancestor(lookup(rev1), lookup(rev2))
854 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
855 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
855
856
856 def debugbuilddag(ui, repo, text,
857 def debugbuilddag(ui, repo, text,
857 mergeable_file=False,
858 mergeable_file=False,
858 appended_file=False,
859 appended_file=False,
859 overwritten_file=False,
860 overwritten_file=False,
860 new_file=False):
861 new_file=False):
861 """builds a repo with a given dag from scratch in the current empty repo
862 """builds a repo with a given dag from scratch in the current empty repo
862
863
863 Elements:
864 Elements:
864
865
865 - "+n" is a linear run of n nodes based on the current default parent
866 - "+n" is a linear run of n nodes based on the current default parent
866 - "." is a single node based on the current default parent
867 - "." is a single node based on the current default parent
867 - "$" resets the default parent to null (implied at the start);
868 - "$" resets the default parent to null (implied at the start);
868 otherwise the default parent is always the last node created
869 otherwise the default parent is always the last node created
869 - "<p" sets the default parent to the backref p
870 - "<p" sets the default parent to the backref p
870 - "*p" is a fork at parent p, which is a backref
871 - "*p" is a fork at parent p, which is a backref
871 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
872 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
872 - "/p2" is a merge of the preceding node and p2
873 - "/p2" is a merge of the preceding node and p2
873 - ":tag" defines a local tag for the preceding node
874 - ":tag" defines a local tag for the preceding node
874 - "@branch" sets the named branch for subsequent nodes
875 - "@branch" sets the named branch for subsequent nodes
875 - "!command" runs the command using your shell
876 - "!command" runs the command using your shell
876 - "!!my command\\n" is like "!", but to the end of the line
877 - "!!my command\\n" is like "!", but to the end of the line
877 - "#...\\n" is a comment up to the end of the line
878 - "#...\\n" is a comment up to the end of the line
878
879
879 Whitespace between the above elements is ignored.
880 Whitespace between the above elements is ignored.
880
881
881 A backref is either
882 A backref is either
882
883
883 - a number n, which references the node curr-n, where curr is the current
884 - a number n, which references the node curr-n, where curr is the current
884 node, or
885 node, or
885 - the name of a local tag you placed earlier using ":tag", or
886 - the name of a local tag you placed earlier using ":tag", or
886 - empty to denote the default parent.
887 - empty to denote the default parent.
887
888
888 All string valued-elements are either strictly alphanumeric, or must
889 All string valued-elements are either strictly alphanumeric, or must
889 be enclosed in double quotes ("..."), with "\" as escape character.
890 be enclosed in double quotes ("..."), with "\" as escape character.
890
891
891 Note that the --overwritten-file and --appended-file options imply the
892 Note that the --overwritten-file and --appended-file options imply the
892 use of "HGMERGE=internal:local" during DAG buildup.
893 use of "HGMERGE=internal:local" during DAG buildup.
893 """
894 """
894
895
895 if not (mergeable_file or appended_file or overwritten_file or new_file):
896 if not (mergeable_file or appended_file or overwritten_file or new_file):
896 raise util.Abort(_('need at least one of -m, -a, -o, -n'))
897 raise util.Abort(_('need at least one of -m, -a, -o, -n'))
897
898
898 if len(repo.changelog) > 0:
899 if len(repo.changelog) > 0:
899 raise util.Abort(_('repository is not empty'))
900 raise util.Abort(_('repository is not empty'))
900
901
901 if overwritten_file or appended_file:
902 if overwritten_file or appended_file:
902 # we don't want to fail in merges during buildup
903 # we don't want to fail in merges during buildup
903 os.environ['HGMERGE'] = 'internal:local'
904 os.environ['HGMERGE'] = 'internal:local'
904
905
905 def writefile(fname, text, fmode="w"):
906 def writefile(fname, text, fmode="w"):
906 f = open(fname, fmode)
907 f = open(fname, fmode)
907 try:
908 try:
908 f.write(text)
909 f.write(text)
909 finally:
910 finally:
910 f.close()
911 f.close()
911
912
912 if mergeable_file:
913 if mergeable_file:
913 linesperrev = 2
914 linesperrev = 2
914 # determine number of revs in DAG
915 # determine number of revs in DAG
915 n = 0
916 n = 0
916 for type, data in dagparser.parsedag(text):
917 for type, data in dagparser.parsedag(text):
917 if type == 'n':
918 if type == 'n':
918 n += 1
919 n += 1
919 # make a file with k lines per rev
920 # make a file with k lines per rev
920 writefile("mf", "\n".join(str(i) for i in xrange(0, n * linesperrev))
921 writefile("mf", "\n".join(str(i) for i in xrange(0, n * linesperrev))
921 + "\n")
922 + "\n")
922
923
923 at = -1
924 at = -1
924 atbranch = 'default'
925 atbranch = 'default'
925 for type, data in dagparser.parsedag(text):
926 for type, data in dagparser.parsedag(text):
926 if type == 'n':
927 if type == 'n':
927 ui.status('node %s\n' % str(data))
928 ui.status('node %s\n' % str(data))
928 id, ps = data
929 id, ps = data
929 p1 = ps[0]
930 p1 = ps[0]
930 if p1 != at:
931 if p1 != at:
931 update(ui, repo, node=p1, clean=True)
932 update(ui, repo, node=p1, clean=True)
932 at = p1
933 at = p1
933 if repo.dirstate.branch() != atbranch:
934 if repo.dirstate.branch() != atbranch:
934 branch(ui, repo, atbranch, force=True)
935 branch(ui, repo, atbranch, force=True)
935 if len(ps) > 1:
936 if len(ps) > 1:
936 p2 = ps[1]
937 p2 = ps[1]
937 merge(ui, repo, node=p2)
938 merge(ui, repo, node=p2)
938
939
939 if mergeable_file:
940 if mergeable_file:
940 f = open("mf", "r+")
941 f = open("mf", "r+")
941 try:
942 try:
942 lines = f.read().split("\n")
943 lines = f.read().split("\n")
943 lines[id * linesperrev] += " r%i" % id
944 lines[id * linesperrev] += " r%i" % id
944 f.seek(0)
945 f.seek(0)
945 f.write("\n".join(lines))
946 f.write("\n".join(lines))
946 finally:
947 finally:
947 f.close()
948 f.close()
948
949
949 if appended_file:
950 if appended_file:
950 writefile("af", "r%i\n" % id, "a")
951 writefile("af", "r%i\n" % id, "a")
951
952
952 if overwritten_file:
953 if overwritten_file:
953 writefile("of", "r%i\n" % id)
954 writefile("of", "r%i\n" % id)
954
955
955 if new_file:
956 if new_file:
956 writefile("nf%i" % id, "r%i\n" % id)
957 writefile("nf%i" % id, "r%i\n" % id)
957
958
958 commit(ui, repo, addremove=True, message="r%i" % id, date=(id, 0))
959 commit(ui, repo, addremove=True, message="r%i" % id, date=(id, 0))
959 at = id
960 at = id
960 elif type == 'l':
961 elif type == 'l':
961 id, name = data
962 id, name = data
962 ui.status('tag %s\n' % name)
963 ui.status('tag %s\n' % name)
963 tag(ui, repo, name, local=True)
964 tag(ui, repo, name, local=True)
964 elif type == 'a':
965 elif type == 'a':
965 ui.status('branch %s\n' % data)
966 ui.status('branch %s\n' % data)
966 atbranch = data
967 atbranch = data
967 elif type in 'cC':
968 elif type in 'cC':
968 r = util.system(data, cwd=repo.root)
969 r = util.system(data, cwd=repo.root)
969 if r:
970 if r:
970 desc, r = util.explain_exit(r)
971 desc, r = util.explain_exit(r)
971 raise util.Abort(_('%s command %s') % (data, desc))
972 raise util.Abort(_('%s command %s') % (data, desc))
972
973
973 def debugcommands(ui, cmd='', *args):
974 def debugcommands(ui, cmd='', *args):
974 """list all available commands and options"""
975 """list all available commands and options"""
975 for cmd, vals in sorted(table.iteritems()):
976 for cmd, vals in sorted(table.iteritems()):
976 cmd = cmd.split('|')[0].strip('^')
977 cmd = cmd.split('|')[0].strip('^')
977 opts = ', '.join([i[1] for i in vals[1]])
978 opts = ', '.join([i[1] for i in vals[1]])
978 ui.write('%s: %s\n' % (cmd, opts))
979 ui.write('%s: %s\n' % (cmd, opts))
979
980
980 def debugcomplete(ui, cmd='', **opts):
981 def debugcomplete(ui, cmd='', **opts):
981 """returns the completion list associated with the given command"""
982 """returns the completion list associated with the given command"""
982
983
983 if opts.get('options'):
984 if opts.get('options'):
984 options = []
985 options = []
985 otables = [globalopts]
986 otables = [globalopts]
986 if cmd:
987 if cmd:
987 aliases, entry = cmdutil.findcmd(cmd, table, False)
988 aliases, entry = cmdutil.findcmd(cmd, table, False)
988 otables.append(entry[1])
989 otables.append(entry[1])
989 for t in otables:
990 for t in otables:
990 for o in t:
991 for o in t:
991 if "(DEPRECATED)" in o[3]:
992 if "(DEPRECATED)" in o[3]:
992 continue
993 continue
993 if o[0]:
994 if o[0]:
994 options.append('-%s' % o[0])
995 options.append('-%s' % o[0])
995 options.append('--%s' % o[1])
996 options.append('--%s' % o[1])
996 ui.write("%s\n" % "\n".join(options))
997 ui.write("%s\n" % "\n".join(options))
997 return
998 return
998
999
999 cmdlist = cmdutil.findpossible(cmd, table)
1000 cmdlist = cmdutil.findpossible(cmd, table)
1000 if ui.verbose:
1001 if ui.verbose:
1001 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1002 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1002 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1003 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1003
1004
1004 def debugfsinfo(ui, path = "."):
1005 def debugfsinfo(ui, path = "."):
1005 """show information detected about current filesystem"""
1006 """show information detected about current filesystem"""
1006 open('.debugfsinfo', 'w').write('')
1007 open('.debugfsinfo', 'w').write('')
1007 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
1008 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
1008 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
1009 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
1009 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
1010 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
1010 and 'yes' or 'no'))
1011 and 'yes' or 'no'))
1011 os.unlink('.debugfsinfo')
1012 os.unlink('.debugfsinfo')
1012
1013
1013 def debugrebuildstate(ui, repo, rev="tip"):
1014 def debugrebuildstate(ui, repo, rev="tip"):
1014 """rebuild the dirstate as it would look like for the given revision"""
1015 """rebuild the dirstate as it would look like for the given revision"""
1015 ctx = repo[rev]
1016 ctx = repo[rev]
1016 wlock = repo.wlock()
1017 wlock = repo.wlock()
1017 try:
1018 try:
1018 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
1019 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
1019 finally:
1020 finally:
1020 wlock.release()
1021 wlock.release()
1021
1022
1022 def debugcheckstate(ui, repo):
1023 def debugcheckstate(ui, repo):
1023 """validate the correctness of the current dirstate"""
1024 """validate the correctness of the current dirstate"""
1024 parent1, parent2 = repo.dirstate.parents()
1025 parent1, parent2 = repo.dirstate.parents()
1025 m1 = repo[parent1].manifest()
1026 m1 = repo[parent1].manifest()
1026 m2 = repo[parent2].manifest()
1027 m2 = repo[parent2].manifest()
1027 errors = 0
1028 errors = 0
1028 for f in repo.dirstate:
1029 for f in repo.dirstate:
1029 state = repo.dirstate[f]
1030 state = repo.dirstate[f]
1030 if state in "nr" and f not in m1:
1031 if state in "nr" and f not in m1:
1031 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1032 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1032 errors += 1
1033 errors += 1
1033 if state in "a" and f in m1:
1034 if state in "a" and f in m1:
1034 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1035 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1035 errors += 1
1036 errors += 1
1036 if state in "m" and f not in m1 and f not in m2:
1037 if state in "m" and f not in m1 and f not in m2:
1037 ui.warn(_("%s in state %s, but not in either manifest\n") %
1038 ui.warn(_("%s in state %s, but not in either manifest\n") %
1038 (f, state))
1039 (f, state))
1039 errors += 1
1040 errors += 1
1040 for f in m1:
1041 for f in m1:
1041 state = repo.dirstate[f]
1042 state = repo.dirstate[f]
1042 if state not in "nrm":
1043 if state not in "nrm":
1043 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1044 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1044 errors += 1
1045 errors += 1
1045 if errors:
1046 if errors:
1046 error = _(".hg/dirstate inconsistent with current parent's manifest")
1047 error = _(".hg/dirstate inconsistent with current parent's manifest")
1047 raise util.Abort(error)
1048 raise util.Abort(error)
1048
1049
1049 def showconfig(ui, repo, *values, **opts):
1050 def showconfig(ui, repo, *values, **opts):
1050 """show combined config settings from all hgrc files
1051 """show combined config settings from all hgrc files
1051
1052
1052 With no arguments, print names and values of all config items.
1053 With no arguments, print names and values of all config items.
1053
1054
1054 With one argument of the form section.name, print just the value
1055 With one argument of the form section.name, print just the value
1055 of that config item.
1056 of that config item.
1056
1057
1057 With multiple arguments, print names and values of all config
1058 With multiple arguments, print names and values of all config
1058 items with matching section names.
1059 items with matching section names.
1059
1060
1060 With --debug, the source (filename and line number) is printed
1061 With --debug, the source (filename and line number) is printed
1061 for each config item.
1062 for each config item.
1062
1063
1063 Returns 0 on success.
1064 Returns 0 on success.
1064 """
1065 """
1065
1066
1066 for f in util.rcpath():
1067 for f in util.rcpath():
1067 ui.debug(_('read config from: %s\n') % f)
1068 ui.debug(_('read config from: %s\n') % f)
1068 untrusted = bool(opts.get('untrusted'))
1069 untrusted = bool(opts.get('untrusted'))
1069 if values:
1070 if values:
1070 if len([v for v in values if '.' in v]) > 1:
1071 if len([v for v in values if '.' in v]) > 1:
1071 raise util.Abort(_('only one config item permitted'))
1072 raise util.Abort(_('only one config item permitted'))
1072 for section, name, value in ui.walkconfig(untrusted=untrusted):
1073 for section, name, value in ui.walkconfig(untrusted=untrusted):
1073 sectname = section + '.' + name
1074 sectname = section + '.' + name
1074 if values:
1075 if values:
1075 for v in values:
1076 for v in values:
1076 if v == section:
1077 if v == section:
1077 ui.debug('%s: ' %
1078 ui.debug('%s: ' %
1078 ui.configsource(section, name, untrusted))
1079 ui.configsource(section, name, untrusted))
1079 ui.write('%s=%s\n' % (sectname, value))
1080 ui.write('%s=%s\n' % (sectname, value))
1080 elif v == sectname:
1081 elif v == sectname:
1081 ui.debug('%s: ' %
1082 ui.debug('%s: ' %
1082 ui.configsource(section, name, untrusted))
1083 ui.configsource(section, name, untrusted))
1083 ui.write(value, '\n')
1084 ui.write(value, '\n')
1084 else:
1085 else:
1085 ui.debug('%s: ' %
1086 ui.debug('%s: ' %
1086 ui.configsource(section, name, untrusted))
1087 ui.configsource(section, name, untrusted))
1087 ui.write('%s=%s\n' % (sectname, value))
1088 ui.write('%s=%s\n' % (sectname, value))
1088
1089
1089 def debugpushkey(ui, repopath, namespace, *keyinfo):
1090 def debugpushkey(ui, repopath, namespace, *keyinfo):
1090 '''access the pushkey key/value protocol
1091 '''access the pushkey key/value protocol
1091
1092
1092 With two args, list the keys in the given namespace.
1093 With two args, list the keys in the given namespace.
1093
1094
1094 With five args, set a key to new if it currently is set to old.
1095 With five args, set a key to new if it currently is set to old.
1095 Reports success or failure.
1096 Reports success or failure.
1096 '''
1097 '''
1097
1098
1098 target = hg.repository(ui, repopath)
1099 target = hg.repository(ui, repopath)
1099 if keyinfo:
1100 if keyinfo:
1100 key, old, new = keyinfo
1101 key, old, new = keyinfo
1101 r = target.pushkey(namespace, key, old, new)
1102 r = target.pushkey(namespace, key, old, new)
1102 ui.status(str(r) + '\n')
1103 ui.status(str(r) + '\n')
1103 return not(r)
1104 return not(r)
1104 else:
1105 else:
1105 for k, v in target.listkeys(namespace).iteritems():
1106 for k, v in target.listkeys(namespace).iteritems():
1106 ui.write("%s\t%s\n" % (k.encode('string-escape'),
1107 ui.write("%s\t%s\n" % (k.encode('string-escape'),
1107 v.encode('string-escape')))
1108 v.encode('string-escape')))
1108
1109
1109 def debugrevspec(ui, repo, expr):
1110 def debugrevspec(ui, repo, expr):
1110 '''parse and apply a revision specification'''
1111 '''parse and apply a revision specification'''
1111 if ui.verbose:
1112 if ui.verbose:
1112 tree = revset.parse(expr)
1113 tree = revset.parse(expr)
1113 ui.note(tree, "\n")
1114 ui.note(tree, "\n")
1114 func = revset.match(expr)
1115 func = revset.match(expr)
1115 for c in func(repo, range(len(repo))):
1116 for c in func(repo, range(len(repo))):
1116 ui.write("%s\n" % c)
1117 ui.write("%s\n" % c)
1117
1118
1118 def debugsetparents(ui, repo, rev1, rev2=None):
1119 def debugsetparents(ui, repo, rev1, rev2=None):
1119 """manually set the parents of the current working directory
1120 """manually set the parents of the current working directory
1120
1121
1121 This is useful for writing repository conversion tools, but should
1122 This is useful for writing repository conversion tools, but should
1122 be used with care.
1123 be used with care.
1123
1124
1124 Returns 0 on success.
1125 Returns 0 on success.
1125 """
1126 """
1126
1127
1127 if not rev2:
1128 if not rev2:
1128 rev2 = hex(nullid)
1129 rev2 = hex(nullid)
1129
1130
1130 wlock = repo.wlock()
1131 wlock = repo.wlock()
1131 try:
1132 try:
1132 repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2))
1133 repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2))
1133 finally:
1134 finally:
1134 wlock.release()
1135 wlock.release()
1135
1136
1136 def debugstate(ui, repo, nodates=None):
1137 def debugstate(ui, repo, nodates=None):
1137 """show the contents of the current dirstate"""
1138 """show the contents of the current dirstate"""
1138 timestr = ""
1139 timestr = ""
1139 showdate = not nodates
1140 showdate = not nodates
1140 for file_, ent in sorted(repo.dirstate._map.iteritems()):
1141 for file_, ent in sorted(repo.dirstate._map.iteritems()):
1141 if showdate:
1142 if showdate:
1142 if ent[3] == -1:
1143 if ent[3] == -1:
1143 # Pad or slice to locale representation
1144 # Pad or slice to locale representation
1144 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
1145 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
1145 time.localtime(0)))
1146 time.localtime(0)))
1146 timestr = 'unset'
1147 timestr = 'unset'
1147 timestr = (timestr[:locale_len] +
1148 timestr = (timestr[:locale_len] +
1148 ' ' * (locale_len - len(timestr)))
1149 ' ' * (locale_len - len(timestr)))
1149 else:
1150 else:
1150 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
1151 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
1151 time.localtime(ent[3]))
1152 time.localtime(ent[3]))
1152 if ent[1] & 020000:
1153 if ent[1] & 020000:
1153 mode = 'lnk'
1154 mode = 'lnk'
1154 else:
1155 else:
1155 mode = '%3o' % (ent[1] & 0777)
1156 mode = '%3o' % (ent[1] & 0777)
1156 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
1157 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
1157 for f in repo.dirstate.copies():
1158 for f in repo.dirstate.copies():
1158 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
1159 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
1159
1160
1160 def debugsub(ui, repo, rev=None):
1161 def debugsub(ui, repo, rev=None):
1161 if rev == '':
1162 if rev == '':
1162 rev = None
1163 rev = None
1163 for k, v in sorted(repo[rev].substate.items()):
1164 for k, v in sorted(repo[rev].substate.items()):
1164 ui.write('path %s\n' % k)
1165 ui.write('path %s\n' % k)
1165 ui.write(' source %s\n' % v[0])
1166 ui.write(' source %s\n' % v[0])
1166 ui.write(' revision %s\n' % v[1])
1167 ui.write(' revision %s\n' % v[1])
1167
1168
1168 def debugdag(ui, repo, file_=None, *revs, **opts):
1169 def debugdag(ui, repo, file_=None, *revs, **opts):
1169 """format the changelog or an index DAG as a concise textual description
1170 """format the changelog or an index DAG as a concise textual description
1170
1171
1171 If you pass a revlog index, the revlog's DAG is emitted. If you list
1172 If you pass a revlog index, the revlog's DAG is emitted. If you list
1172 revision numbers, they get labelled in the output as rN.
1173 revision numbers, they get labelled in the output as rN.
1173
1174
1174 Otherwise, the changelog DAG of the current repo is emitted.
1175 Otherwise, the changelog DAG of the current repo is emitted.
1175 """
1176 """
1176 spaces = opts.get('spaces')
1177 spaces = opts.get('spaces')
1177 dots = opts.get('dots')
1178 dots = opts.get('dots')
1178 if file_:
1179 if file_:
1179 rlog = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
1180 rlog = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
1180 revs = set((int(r) for r in revs))
1181 revs = set((int(r) for r in revs))
1181 def events():
1182 def events():
1182 for r in rlog:
1183 for r in rlog:
1183 yield 'n', (r, list(set(p for p in rlog.parentrevs(r) if p != -1)))
1184 yield 'n', (r, list(set(p for p in rlog.parentrevs(r) if p != -1)))
1184 if r in revs:
1185 if r in revs:
1185 yield 'l', (r, "r%i" % r)
1186 yield 'l', (r, "r%i" % r)
1186 elif repo:
1187 elif repo:
1187 cl = repo.changelog
1188 cl = repo.changelog
1188 tags = opts.get('tags')
1189 tags = opts.get('tags')
1189 branches = opts.get('branches')
1190 branches = opts.get('branches')
1190 if tags:
1191 if tags:
1191 labels = {}
1192 labels = {}
1192 for l, n in repo.tags().items():
1193 for l, n in repo.tags().items():
1193 labels.setdefault(cl.rev(n), []).append(l)
1194 labels.setdefault(cl.rev(n), []).append(l)
1194 def events():
1195 def events():
1195 b = "default"
1196 b = "default"
1196 for r in cl:
1197 for r in cl:
1197 if branches:
1198 if branches:
1198 newb = cl.read(cl.node(r))[5]['branch']
1199 newb = cl.read(cl.node(r))[5]['branch']
1199 if newb != b:
1200 if newb != b:
1200 yield 'a', newb
1201 yield 'a', newb
1201 b = newb
1202 b = newb
1202 yield 'n', (r, list(set(p for p in cl.parentrevs(r) if p != -1)))
1203 yield 'n', (r, list(set(p for p in cl.parentrevs(r) if p != -1)))
1203 if tags:
1204 if tags:
1204 ls = labels.get(r)
1205 ls = labels.get(r)
1205 if ls:
1206 if ls:
1206 for l in ls:
1207 for l in ls:
1207 yield 'l', (r, l)
1208 yield 'l', (r, l)
1208 else:
1209 else:
1209 raise util.Abort(_('need repo for changelog dag'))
1210 raise util.Abort(_('need repo for changelog dag'))
1210
1211
1211 for line in dagparser.dagtextlines(events(),
1212 for line in dagparser.dagtextlines(events(),
1212 addspaces=spaces,
1213 addspaces=spaces,
1213 wraplabels=True,
1214 wraplabels=True,
1214 wrapannotations=True,
1215 wrapannotations=True,
1215 wrapnonlinear=dots,
1216 wrapnonlinear=dots,
1216 usedots=dots,
1217 usedots=dots,
1217 maxlinewidth=70):
1218 maxlinewidth=70):
1218 ui.write(line)
1219 ui.write(line)
1219 ui.write("\n")
1220 ui.write("\n")
1220
1221
1221 def debugdata(ui, file_, rev):
1222 def debugdata(ui, file_, rev):
1222 """dump the contents of a data file revision"""
1223 """dump the contents of a data file revision"""
1223 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_[:-2] + ".i")
1224 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_[:-2] + ".i")
1224 try:
1225 try:
1225 ui.write(r.revision(r.lookup(rev)))
1226 ui.write(r.revision(r.lookup(rev)))
1226 except KeyError:
1227 except KeyError:
1227 raise util.Abort(_('invalid revision identifier %s') % rev)
1228 raise util.Abort(_('invalid revision identifier %s') % rev)
1228
1229
1229 def debugdate(ui, date, range=None, **opts):
1230 def debugdate(ui, date, range=None, **opts):
1230 """parse and display a date"""
1231 """parse and display a date"""
1231 if opts["extended"]:
1232 if opts["extended"]:
1232 d = util.parsedate(date, util.extendeddateformats)
1233 d = util.parsedate(date, util.extendeddateformats)
1233 else:
1234 else:
1234 d = util.parsedate(date)
1235 d = util.parsedate(date)
1235 ui.write("internal: %s %s\n" % d)
1236 ui.write("internal: %s %s\n" % d)
1236 ui.write("standard: %s\n" % util.datestr(d))
1237 ui.write("standard: %s\n" % util.datestr(d))
1237 if range:
1238 if range:
1238 m = util.matchdate(range)
1239 m = util.matchdate(range)
1239 ui.write("match: %s\n" % m(d[0]))
1240 ui.write("match: %s\n" % m(d[0]))
1240
1241
1241 def debugindex(ui, file_):
1242 def debugindex(ui, file_):
1242 """dump the contents of an index file"""
1243 """dump the contents of an index file"""
1243 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
1244 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
1244 ui.write(" rev offset length base linkrev"
1245 ui.write(" rev offset length base linkrev"
1245 " nodeid p1 p2\n")
1246 " nodeid p1 p2\n")
1246 for i in r:
1247 for i in r:
1247 node = r.node(i)
1248 node = r.node(i)
1248 try:
1249 try:
1249 pp = r.parents(node)
1250 pp = r.parents(node)
1250 except:
1251 except:
1251 pp = [nullid, nullid]
1252 pp = [nullid, nullid]
1252 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1253 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1253 i, r.start(i), r.length(i), r.base(i), r.linkrev(i),
1254 i, r.start(i), r.length(i), r.base(i), r.linkrev(i),
1254 short(node), short(pp[0]), short(pp[1])))
1255 short(node), short(pp[0]), short(pp[1])))
1255
1256
1256 def debugindexdot(ui, file_):
1257 def debugindexdot(ui, file_):
1257 """dump an index DAG as a graphviz dot file"""
1258 """dump an index DAG as a graphviz dot file"""
1258 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
1259 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
1259 ui.write("digraph G {\n")
1260 ui.write("digraph G {\n")
1260 for i in r:
1261 for i in r:
1261 node = r.node(i)
1262 node = r.node(i)
1262 pp = r.parents(node)
1263 pp = r.parents(node)
1263 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1264 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1264 if pp[1] != nullid:
1265 if pp[1] != nullid:
1265 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1266 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1266 ui.write("}\n")
1267 ui.write("}\n")
1267
1268
1268 def debuginstall(ui):
1269 def debuginstall(ui):
1269 '''test Mercurial installation
1270 '''test Mercurial installation
1270
1271
1271 Returns 0 on success.
1272 Returns 0 on success.
1272 '''
1273 '''
1273
1274
1274 def writetemp(contents):
1275 def writetemp(contents):
1275 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1276 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1276 f = os.fdopen(fd, "wb")
1277 f = os.fdopen(fd, "wb")
1277 f.write(contents)
1278 f.write(contents)
1278 f.close()
1279 f.close()
1279 return name
1280 return name
1280
1281
1281 problems = 0
1282 problems = 0
1282
1283
1283 # encoding
1284 # encoding
1284 ui.status(_("Checking encoding (%s)...\n") % encoding.encoding)
1285 ui.status(_("Checking encoding (%s)...\n") % encoding.encoding)
1285 try:
1286 try:
1286 encoding.fromlocal("test")
1287 encoding.fromlocal("test")
1287 except util.Abort, inst:
1288 except util.Abort, inst:
1288 ui.write(" %s\n" % inst)
1289 ui.write(" %s\n" % inst)
1289 ui.write(_(" (check that your locale is properly set)\n"))
1290 ui.write(_(" (check that your locale is properly set)\n"))
1290 problems += 1
1291 problems += 1
1291
1292
1292 # compiled modules
1293 # compiled modules
1293 ui.status(_("Checking extensions...\n"))
1294 ui.status(_("Checking extensions...\n"))
1294 try:
1295 try:
1295 import bdiff, mpatch, base85
1296 import bdiff, mpatch, base85
1296 except Exception, inst:
1297 except Exception, inst:
1297 ui.write(" %s\n" % inst)
1298 ui.write(" %s\n" % inst)
1298 ui.write(_(" One or more extensions could not be found"))
1299 ui.write(_(" One or more extensions could not be found"))
1299 ui.write(_(" (check that you compiled the extensions)\n"))
1300 ui.write(_(" (check that you compiled the extensions)\n"))
1300 problems += 1
1301 problems += 1
1301
1302
1302 # templates
1303 # templates
1303 ui.status(_("Checking templates...\n"))
1304 ui.status(_("Checking templates...\n"))
1304 try:
1305 try:
1305 import templater
1306 import templater
1306 templater.templater(templater.templatepath("map-cmdline.default"))
1307 templater.templater(templater.templatepath("map-cmdline.default"))
1307 except Exception, inst:
1308 except Exception, inst:
1308 ui.write(" %s\n" % inst)
1309 ui.write(" %s\n" % inst)
1309 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
1310 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
1310 problems += 1
1311 problems += 1
1311
1312
1312 # patch
1313 # patch
1313 ui.status(_("Checking patch...\n"))
1314 ui.status(_("Checking patch...\n"))
1314 patchproblems = 0
1315 patchproblems = 0
1315 a = "1\n2\n3\n4\n"
1316 a = "1\n2\n3\n4\n"
1316 b = "1\n2\n3\ninsert\n4\n"
1317 b = "1\n2\n3\ninsert\n4\n"
1317 fa = writetemp(a)
1318 fa = writetemp(a)
1318 d = mdiff.unidiff(a, None, b, None, os.path.basename(fa),
1319 d = mdiff.unidiff(a, None, b, None, os.path.basename(fa),
1319 os.path.basename(fa))
1320 os.path.basename(fa))
1320 fd = writetemp(d)
1321 fd = writetemp(d)
1321
1322
1322 files = {}
1323 files = {}
1323 try:
1324 try:
1324 patch.patch(fd, ui, cwd=os.path.dirname(fa), files=files)
1325 patch.patch(fd, ui, cwd=os.path.dirname(fa), files=files)
1325 except util.Abort, e:
1326 except util.Abort, e:
1326 ui.write(_(" patch call failed:\n"))
1327 ui.write(_(" patch call failed:\n"))
1327 ui.write(" " + str(e) + "\n")
1328 ui.write(" " + str(e) + "\n")
1328 patchproblems += 1
1329 patchproblems += 1
1329 else:
1330 else:
1330 if list(files) != [os.path.basename(fa)]:
1331 if list(files) != [os.path.basename(fa)]:
1331 ui.write(_(" unexpected patch output!\n"))
1332 ui.write(_(" unexpected patch output!\n"))
1332 patchproblems += 1
1333 patchproblems += 1
1333 a = open(fa).read()
1334 a = open(fa).read()
1334 if a != b:
1335 if a != b:
1335 ui.write(_(" patch test failed!\n"))
1336 ui.write(_(" patch test failed!\n"))
1336 patchproblems += 1
1337 patchproblems += 1
1337
1338
1338 if patchproblems:
1339 if patchproblems:
1339 if ui.config('ui', 'patch'):
1340 if ui.config('ui', 'patch'):
1340 ui.write(_(" (Current patch tool may be incompatible with patch,"
1341 ui.write(_(" (Current patch tool may be incompatible with patch,"
1341 " or misconfigured. Please check your .hgrc file)\n"))
1342 " or misconfigured. Please check your .hgrc file)\n"))
1342 else:
1343 else:
1343 ui.write(_(" Internal patcher failure, please report this error"
1344 ui.write(_(" Internal patcher failure, please report this error"
1344 " to http://mercurial.selenic.com/bts/\n"))
1345 " to http://mercurial.selenic.com/bts/\n"))
1345 problems += patchproblems
1346 problems += patchproblems
1346
1347
1347 os.unlink(fa)
1348 os.unlink(fa)
1348 os.unlink(fd)
1349 os.unlink(fd)
1349
1350
1350 # editor
1351 # editor
1351 ui.status(_("Checking commit editor...\n"))
1352 ui.status(_("Checking commit editor...\n"))
1352 editor = ui.geteditor()
1353 editor = ui.geteditor()
1353 cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
1354 cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
1354 if not cmdpath:
1355 if not cmdpath:
1355 if editor == 'vi':
1356 if editor == 'vi':
1356 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
1357 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
1357 ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
1358 ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
1358 else:
1359 else:
1359 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
1360 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
1360 ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
1361 ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
1361 problems += 1
1362 problems += 1
1362
1363
1363 # check username
1364 # check username
1364 ui.status(_("Checking username...\n"))
1365 ui.status(_("Checking username...\n"))
1365 try:
1366 try:
1366 user = ui.username()
1367 user = ui.username()
1367 except util.Abort, e:
1368 except util.Abort, e:
1368 ui.write(" %s\n" % e)
1369 ui.write(" %s\n" % e)
1369 ui.write(_(" (specify a username in your .hgrc file)\n"))
1370 ui.write(_(" (specify a username in your .hgrc file)\n"))
1370 problems += 1
1371 problems += 1
1371
1372
1372 if not problems:
1373 if not problems:
1373 ui.status(_("No problems detected\n"))
1374 ui.status(_("No problems detected\n"))
1374 else:
1375 else:
1375 ui.write(_("%s problems detected,"
1376 ui.write(_("%s problems detected,"
1376 " please check your install!\n") % problems)
1377 " please check your install!\n") % problems)
1377
1378
1378 return problems
1379 return problems
1379
1380
1380 def debugrename(ui, repo, file1, *pats, **opts):
1381 def debugrename(ui, repo, file1, *pats, **opts):
1381 """dump rename information"""
1382 """dump rename information"""
1382
1383
1383 ctx = repo[opts.get('rev')]
1384 ctx = repo[opts.get('rev')]
1384 m = cmdutil.match(repo, (file1,) + pats, opts)
1385 m = cmdutil.match(repo, (file1,) + pats, opts)
1385 for abs in ctx.walk(m):
1386 for abs in ctx.walk(m):
1386 fctx = ctx[abs]
1387 fctx = ctx[abs]
1387 o = fctx.filelog().renamed(fctx.filenode())
1388 o = fctx.filelog().renamed(fctx.filenode())
1388 rel = m.rel(abs)
1389 rel = m.rel(abs)
1389 if o:
1390 if o:
1390 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
1391 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
1391 else:
1392 else:
1392 ui.write(_("%s not renamed\n") % rel)
1393 ui.write(_("%s not renamed\n") % rel)
1393
1394
1394 def debugwalk(ui, repo, *pats, **opts):
1395 def debugwalk(ui, repo, *pats, **opts):
1395 """show how files match on given patterns"""
1396 """show how files match on given patterns"""
1396 m = cmdutil.match(repo, pats, opts)
1397 m = cmdutil.match(repo, pats, opts)
1397 items = list(repo.walk(m))
1398 items = list(repo.walk(m))
1398 if not items:
1399 if not items:
1399 return
1400 return
1400 fmt = 'f %%-%ds %%-%ds %%s' % (
1401 fmt = 'f %%-%ds %%-%ds %%s' % (
1401 max([len(abs) for abs in items]),
1402 max([len(abs) for abs in items]),
1402 max([len(m.rel(abs)) for abs in items]))
1403 max([len(m.rel(abs)) for abs in items]))
1403 for abs in items:
1404 for abs in items:
1404 line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '')
1405 line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '')
1405 ui.write("%s\n" % line.rstrip())
1406 ui.write("%s\n" % line.rstrip())
1406
1407
1407 def diff(ui, repo, *pats, **opts):
1408 def diff(ui, repo, *pats, **opts):
1408 """diff repository (or selected files)
1409 """diff repository (or selected files)
1409
1410
1410 Show differences between revisions for the specified files.
1411 Show differences between revisions for the specified files.
1411
1412
1412 Differences between files are shown using the unified diff format.
1413 Differences between files are shown using the unified diff format.
1413
1414
1414 NOTE: diff may generate unexpected results for merges, as it will
1415 NOTE: diff may generate unexpected results for merges, as it will
1415 default to comparing against the working directory's first parent
1416 default to comparing against the working directory's first parent
1416 changeset if no revisions are specified.
1417 changeset if no revisions are specified.
1417
1418
1418 When two revision arguments are given, then changes are shown
1419 When two revision arguments are given, then changes are shown
1419 between those revisions. If only one revision is specified then
1420 between those revisions. If only one revision is specified then
1420 that revision is compared to the working directory, and, when no
1421 that revision is compared to the working directory, and, when no
1421 revisions are specified, the working directory files are compared
1422 revisions are specified, the working directory files are compared
1422 to its parent.
1423 to its parent.
1423
1424
1424 Alternatively you can specify -c/--change with a revision to see
1425 Alternatively you can specify -c/--change with a revision to see
1425 the changes in that changeset relative to its first parent.
1426 the changes in that changeset relative to its first parent.
1426
1427
1427 Without the -a/--text option, diff will avoid generating diffs of
1428 Without the -a/--text option, diff will avoid generating diffs of
1428 files it detects as binary. With -a, diff will generate a diff
1429 files it detects as binary. With -a, diff will generate a diff
1429 anyway, probably with undesirable results.
1430 anyway, probably with undesirable results.
1430
1431
1431 Use the -g/--git option to generate diffs in the git extended diff
1432 Use the -g/--git option to generate diffs in the git extended diff
1432 format. For more information, read :hg:`help diffs`.
1433 format. For more information, read :hg:`help diffs`.
1433
1434
1434 Returns 0 on success.
1435 Returns 0 on success.
1435 """
1436 """
1436
1437
1437 revs = opts.get('rev')
1438 revs = opts.get('rev')
1438 change = opts.get('change')
1439 change = opts.get('change')
1439 stat = opts.get('stat')
1440 stat = opts.get('stat')
1440 reverse = opts.get('reverse')
1441 reverse = opts.get('reverse')
1441
1442
1442 if revs and change:
1443 if revs and change:
1443 msg = _('cannot specify --rev and --change at the same time')
1444 msg = _('cannot specify --rev and --change at the same time')
1444 raise util.Abort(msg)
1445 raise util.Abort(msg)
1445 elif change:
1446 elif change:
1446 node2 = repo.lookup(change)
1447 node2 = repo.lookup(change)
1447 node1 = repo[node2].parents()[0].node()
1448 node1 = repo[node2].parents()[0].node()
1448 else:
1449 else:
1449 node1, node2 = cmdutil.revpair(repo, revs)
1450 node1, node2 = cmdutil.revpair(repo, revs)
1450
1451
1451 if reverse:
1452 if reverse:
1452 node1, node2 = node2, node1
1453 node1, node2 = node2, node1
1453
1454
1454 diffopts = patch.diffopts(ui, opts)
1455 diffopts = patch.diffopts(ui, opts)
1455 m = cmdutil.match(repo, pats, opts)
1456 m = cmdutil.match(repo, pats, opts)
1456 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat)
1457 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat)
1457
1458
1458 def export(ui, repo, *changesets, **opts):
1459 def export(ui, repo, *changesets, **opts):
1459 """dump the header and diffs for one or more changesets
1460 """dump the header and diffs for one or more changesets
1460
1461
1461 Print the changeset header and diffs for one or more revisions.
1462 Print the changeset header and diffs for one or more revisions.
1462
1463
1463 The information shown in the changeset header is: author, date,
1464 The information shown in the changeset header is: author, date,
1464 branch name (if non-default), changeset hash, parent(s) and commit
1465 branch name (if non-default), changeset hash, parent(s) and commit
1465 comment.
1466 comment.
1466
1467
1467 NOTE: export may generate unexpected diff output for merge
1468 NOTE: export may generate unexpected diff output for merge
1468 changesets, as it will compare the merge changeset against its
1469 changesets, as it will compare the merge changeset against its
1469 first parent only.
1470 first parent only.
1470
1471
1471 Output may be to a file, in which case the name of the file is
1472 Output may be to a file, in which case the name of the file is
1472 given using a format string. The formatting rules are as follows:
1473 given using a format string. The formatting rules are as follows:
1473
1474
1474 :``%%``: literal "%" character
1475 :``%%``: literal "%" character
1475 :``%H``: changeset hash (40 bytes of hexadecimal)
1476 :``%H``: changeset hash (40 bytes of hexadecimal)
1476 :``%N``: number of patches being generated
1477 :``%N``: number of patches being generated
1477 :``%R``: changeset revision number
1478 :``%R``: changeset revision number
1478 :``%b``: basename of the exporting repository
1479 :``%b``: basename of the exporting repository
1479 :``%h``: short-form changeset hash (12 bytes of hexadecimal)
1480 :``%h``: short-form changeset hash (12 bytes of hexadecimal)
1480 :``%n``: zero-padded sequence number, starting at 1
1481 :``%n``: zero-padded sequence number, starting at 1
1481 :``%r``: zero-padded changeset revision number
1482 :``%r``: zero-padded changeset revision number
1482
1483
1483 Without the -a/--text option, export will avoid generating diffs
1484 Without the -a/--text option, export will avoid generating diffs
1484 of files it detects as binary. With -a, export will generate a
1485 of files it detects as binary. With -a, export will generate a
1485 diff anyway, probably with undesirable results.
1486 diff anyway, probably with undesirable results.
1486
1487
1487 Use the -g/--git option to generate diffs in the git extended diff
1488 Use the -g/--git option to generate diffs in the git extended diff
1488 format. See :hg:`help diffs` for more information.
1489 format. See :hg:`help diffs` for more information.
1489
1490
1490 With the --switch-parent option, the diff will be against the
1491 With the --switch-parent option, the diff will be against the
1491 second parent. It can be useful to review a merge.
1492 second parent. It can be useful to review a merge.
1492
1493
1493 Returns 0 on success.
1494 Returns 0 on success.
1494 """
1495 """
1495 changesets += tuple(opts.get('rev', []))
1496 changesets += tuple(opts.get('rev', []))
1496 if not changesets:
1497 if not changesets:
1497 raise util.Abort(_("export requires at least one changeset"))
1498 raise util.Abort(_("export requires at least one changeset"))
1498 revs = cmdutil.revrange(repo, changesets)
1499 revs = cmdutil.revrange(repo, changesets)
1499 if len(revs) > 1:
1500 if len(revs) > 1:
1500 ui.note(_('exporting patches:\n'))
1501 ui.note(_('exporting patches:\n'))
1501 else:
1502 else:
1502 ui.note(_('exporting patch:\n'))
1503 ui.note(_('exporting patch:\n'))
1503 cmdutil.export(repo, revs, template=opts.get('output'),
1504 cmdutil.export(repo, revs, template=opts.get('output'),
1504 switch_parent=opts.get('switch_parent'),
1505 switch_parent=opts.get('switch_parent'),
1505 opts=patch.diffopts(ui, opts))
1506 opts=patch.diffopts(ui, opts))
1506
1507
1507 def forget(ui, repo, *pats, **opts):
1508 def forget(ui, repo, *pats, **opts):
1508 """forget the specified files on the next commit
1509 """forget the specified files on the next commit
1509
1510
1510 Mark the specified files so they will no longer be tracked
1511 Mark the specified files so they will no longer be tracked
1511 after the next commit.
1512 after the next commit.
1512
1513
1513 This only removes files from the current branch, not from the
1514 This only removes files from the current branch, not from the
1514 entire project history, and it does not delete them from the
1515 entire project history, and it does not delete them from the
1515 working directory.
1516 working directory.
1516
1517
1517 To undo a forget before the next commit, see :hg:`add`.
1518 To undo a forget before the next commit, see :hg:`add`.
1518
1519
1519 Returns 0 on success.
1520 Returns 0 on success.
1520 """
1521 """
1521
1522
1522 if not pats:
1523 if not pats:
1523 raise util.Abort(_('no files specified'))
1524 raise util.Abort(_('no files specified'))
1524
1525
1525 m = cmdutil.match(repo, pats, opts)
1526 m = cmdutil.match(repo, pats, opts)
1526 s = repo.status(match=m, clean=True)
1527 s = repo.status(match=m, clean=True)
1527 forget = sorted(s[0] + s[1] + s[3] + s[6])
1528 forget = sorted(s[0] + s[1] + s[3] + s[6])
1528 errs = 0
1529 errs = 0
1529
1530
1530 for f in m.files():
1531 for f in m.files():
1531 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
1532 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
1532 ui.warn(_('not removing %s: file is already untracked\n')
1533 ui.warn(_('not removing %s: file is already untracked\n')
1533 % m.rel(f))
1534 % m.rel(f))
1534 errs = 1
1535 errs = 1
1535
1536
1536 for f in forget:
1537 for f in forget:
1537 if ui.verbose or not m.exact(f):
1538 if ui.verbose or not m.exact(f):
1538 ui.status(_('removing %s\n') % m.rel(f))
1539 ui.status(_('removing %s\n') % m.rel(f))
1539
1540
1540 repo[None].remove(forget, unlink=False)
1541 repo[None].remove(forget, unlink=False)
1541 return errs
1542 return errs
1542
1543
1543 def grep(ui, repo, pattern, *pats, **opts):
1544 def grep(ui, repo, pattern, *pats, **opts):
1544 """search for a pattern in specified files and revisions
1545 """search for a pattern in specified files and revisions
1545
1546
1546 Search revisions of files for a regular expression.
1547 Search revisions of files for a regular expression.
1547
1548
1548 This command behaves differently than Unix grep. It only accepts
1549 This command behaves differently than Unix grep. It only accepts
1549 Python/Perl regexps. It searches repository history, not the
1550 Python/Perl regexps. It searches repository history, not the
1550 working directory. It always prints the revision number in which a
1551 working directory. It always prints the revision number in which a
1551 match appears.
1552 match appears.
1552
1553
1553 By default, grep only prints output for the first revision of a
1554 By default, grep only prints output for the first revision of a
1554 file in which it finds a match. To get it to print every revision
1555 file in which it finds a match. To get it to print every revision
1555 that contains a change in match status ("-" for a match that
1556 that contains a change in match status ("-" for a match that
1556 becomes a non-match, or "+" for a non-match that becomes a match),
1557 becomes a non-match, or "+" for a non-match that becomes a match),
1557 use the --all flag.
1558 use the --all flag.
1558
1559
1559 Returns 0 if a match is found, 1 otherwise.
1560 Returns 0 if a match is found, 1 otherwise.
1560 """
1561 """
1561 reflags = 0
1562 reflags = 0
1562 if opts.get('ignore_case'):
1563 if opts.get('ignore_case'):
1563 reflags |= re.I
1564 reflags |= re.I
1564 try:
1565 try:
1565 regexp = re.compile(pattern, reflags)
1566 regexp = re.compile(pattern, reflags)
1566 except Exception, inst:
1567 except Exception, inst:
1567 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
1568 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
1568 return 1
1569 return 1
1569 sep, eol = ':', '\n'
1570 sep, eol = ':', '\n'
1570 if opts.get('print0'):
1571 if opts.get('print0'):
1571 sep = eol = '\0'
1572 sep = eol = '\0'
1572
1573
1573 getfile = util.lrucachefunc(repo.file)
1574 getfile = util.lrucachefunc(repo.file)
1574
1575
1575 def matchlines(body):
1576 def matchlines(body):
1576 begin = 0
1577 begin = 0
1577 linenum = 0
1578 linenum = 0
1578 while True:
1579 while True:
1579 match = regexp.search(body, begin)
1580 match = regexp.search(body, begin)
1580 if not match:
1581 if not match:
1581 break
1582 break
1582 mstart, mend = match.span()
1583 mstart, mend = match.span()
1583 linenum += body.count('\n', begin, mstart) + 1
1584 linenum += body.count('\n', begin, mstart) + 1
1584 lstart = body.rfind('\n', begin, mstart) + 1 or begin
1585 lstart = body.rfind('\n', begin, mstart) + 1 or begin
1585 begin = body.find('\n', mend) + 1 or len(body)
1586 begin = body.find('\n', mend) + 1 or len(body)
1586 lend = begin - 1
1587 lend = begin - 1
1587 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
1588 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
1588
1589
1589 class linestate(object):
1590 class linestate(object):
1590 def __init__(self, line, linenum, colstart, colend):
1591 def __init__(self, line, linenum, colstart, colend):
1591 self.line = line
1592 self.line = line
1592 self.linenum = linenum
1593 self.linenum = linenum
1593 self.colstart = colstart
1594 self.colstart = colstart
1594 self.colend = colend
1595 self.colend = colend
1595
1596
1596 def __hash__(self):
1597 def __hash__(self):
1597 return hash((self.linenum, self.line))
1598 return hash((self.linenum, self.line))
1598
1599
1599 def __eq__(self, other):
1600 def __eq__(self, other):
1600 return self.line == other.line
1601 return self.line == other.line
1601
1602
1602 matches = {}
1603 matches = {}
1603 copies = {}
1604 copies = {}
1604 def grepbody(fn, rev, body):
1605 def grepbody(fn, rev, body):
1605 matches[rev].setdefault(fn, [])
1606 matches[rev].setdefault(fn, [])
1606 m = matches[rev][fn]
1607 m = matches[rev][fn]
1607 for lnum, cstart, cend, line in matchlines(body):
1608 for lnum, cstart, cend, line in matchlines(body):
1608 s = linestate(line, lnum, cstart, cend)
1609 s = linestate(line, lnum, cstart, cend)
1609 m.append(s)
1610 m.append(s)
1610
1611
1611 def difflinestates(a, b):
1612 def difflinestates(a, b):
1612 sm = difflib.SequenceMatcher(None, a, b)
1613 sm = difflib.SequenceMatcher(None, a, b)
1613 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
1614 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
1614 if tag == 'insert':
1615 if tag == 'insert':
1615 for i in xrange(blo, bhi):
1616 for i in xrange(blo, bhi):
1616 yield ('+', b[i])
1617 yield ('+', b[i])
1617 elif tag == 'delete':
1618 elif tag == 'delete':
1618 for i in xrange(alo, ahi):
1619 for i in xrange(alo, ahi):
1619 yield ('-', a[i])
1620 yield ('-', a[i])
1620 elif tag == 'replace':
1621 elif tag == 'replace':
1621 for i in xrange(alo, ahi):
1622 for i in xrange(alo, ahi):
1622 yield ('-', a[i])
1623 yield ('-', a[i])
1623 for i in xrange(blo, bhi):
1624 for i in xrange(blo, bhi):
1624 yield ('+', b[i])
1625 yield ('+', b[i])
1625
1626
1626 def display(fn, ctx, pstates, states):
1627 def display(fn, ctx, pstates, states):
1627 rev = ctx.rev()
1628 rev = ctx.rev()
1628 datefunc = ui.quiet and util.shortdate or util.datestr
1629 datefunc = ui.quiet and util.shortdate or util.datestr
1629 found = False
1630 found = False
1630 filerevmatches = {}
1631 filerevmatches = {}
1631 if opts.get('all'):
1632 if opts.get('all'):
1632 iter = difflinestates(pstates, states)
1633 iter = difflinestates(pstates, states)
1633 else:
1634 else:
1634 iter = [('', l) for l in states]
1635 iter = [('', l) for l in states]
1635 for change, l in iter:
1636 for change, l in iter:
1636 cols = [fn, str(rev)]
1637 cols = [fn, str(rev)]
1637 before, match, after = None, None, None
1638 before, match, after = None, None, None
1638 if opts.get('line_number'):
1639 if opts.get('line_number'):
1639 cols.append(str(l.linenum))
1640 cols.append(str(l.linenum))
1640 if opts.get('all'):
1641 if opts.get('all'):
1641 cols.append(change)
1642 cols.append(change)
1642 if opts.get('user'):
1643 if opts.get('user'):
1643 cols.append(ui.shortuser(ctx.user()))
1644 cols.append(ui.shortuser(ctx.user()))
1644 if opts.get('date'):
1645 if opts.get('date'):
1645 cols.append(datefunc(ctx.date()))
1646 cols.append(datefunc(ctx.date()))
1646 if opts.get('files_with_matches'):
1647 if opts.get('files_with_matches'):
1647 c = (fn, rev)
1648 c = (fn, rev)
1648 if c in filerevmatches:
1649 if c in filerevmatches:
1649 continue
1650 continue
1650 filerevmatches[c] = 1
1651 filerevmatches[c] = 1
1651 else:
1652 else:
1652 before = l.line[:l.colstart]
1653 before = l.line[:l.colstart]
1653 match = l.line[l.colstart:l.colend]
1654 match = l.line[l.colstart:l.colend]
1654 after = l.line[l.colend:]
1655 after = l.line[l.colend:]
1655 ui.write(sep.join(cols))
1656 ui.write(sep.join(cols))
1656 if before is not None:
1657 if before is not None:
1657 ui.write(sep + before)
1658 ui.write(sep + before)
1658 ui.write(match, label='grep.match')
1659 ui.write(match, label='grep.match')
1659 ui.write(after)
1660 ui.write(after)
1660 ui.write(eol)
1661 ui.write(eol)
1661 found = True
1662 found = True
1662 return found
1663 return found
1663
1664
1664 skip = {}
1665 skip = {}
1665 revfiles = {}
1666 revfiles = {}
1666 matchfn = cmdutil.match(repo, pats, opts)
1667 matchfn = cmdutil.match(repo, pats, opts)
1667 found = False
1668 found = False
1668 follow = opts.get('follow')
1669 follow = opts.get('follow')
1669
1670
1670 def prep(ctx, fns):
1671 def prep(ctx, fns):
1671 rev = ctx.rev()
1672 rev = ctx.rev()
1672 pctx = ctx.parents()[0]
1673 pctx = ctx.parents()[0]
1673 parent = pctx.rev()
1674 parent = pctx.rev()
1674 matches.setdefault(rev, {})
1675 matches.setdefault(rev, {})
1675 matches.setdefault(parent, {})
1676 matches.setdefault(parent, {})
1676 files = revfiles.setdefault(rev, [])
1677 files = revfiles.setdefault(rev, [])
1677 for fn in fns:
1678 for fn in fns:
1678 flog = getfile(fn)
1679 flog = getfile(fn)
1679 try:
1680 try:
1680 fnode = ctx.filenode(fn)
1681 fnode = ctx.filenode(fn)
1681 except error.LookupError:
1682 except error.LookupError:
1682 continue
1683 continue
1683
1684
1684 copied = flog.renamed(fnode)
1685 copied = flog.renamed(fnode)
1685 copy = follow and copied and copied[0]
1686 copy = follow and copied and copied[0]
1686 if copy:
1687 if copy:
1687 copies.setdefault(rev, {})[fn] = copy
1688 copies.setdefault(rev, {})[fn] = copy
1688 if fn in skip:
1689 if fn in skip:
1689 if copy:
1690 if copy:
1690 skip[copy] = True
1691 skip[copy] = True
1691 continue
1692 continue
1692 files.append(fn)
1693 files.append(fn)
1693
1694
1694 if fn not in matches[rev]:
1695 if fn not in matches[rev]:
1695 grepbody(fn, rev, flog.read(fnode))
1696 grepbody(fn, rev, flog.read(fnode))
1696
1697
1697 pfn = copy or fn
1698 pfn = copy or fn
1698 if pfn not in matches[parent]:
1699 if pfn not in matches[parent]:
1699 try:
1700 try:
1700 fnode = pctx.filenode(pfn)
1701 fnode = pctx.filenode(pfn)
1701 grepbody(pfn, parent, flog.read(fnode))
1702 grepbody(pfn, parent, flog.read(fnode))
1702 except error.LookupError:
1703 except error.LookupError:
1703 pass
1704 pass
1704
1705
1705 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
1706 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
1706 rev = ctx.rev()
1707 rev = ctx.rev()
1707 parent = ctx.parents()[0].rev()
1708 parent = ctx.parents()[0].rev()
1708 for fn in sorted(revfiles.get(rev, [])):
1709 for fn in sorted(revfiles.get(rev, [])):
1709 states = matches[rev][fn]
1710 states = matches[rev][fn]
1710 copy = copies.get(rev, {}).get(fn)
1711 copy = copies.get(rev, {}).get(fn)
1711 if fn in skip:
1712 if fn in skip:
1712 if copy:
1713 if copy:
1713 skip[copy] = True
1714 skip[copy] = True
1714 continue
1715 continue
1715 pstates = matches.get(parent, {}).get(copy or fn, [])
1716 pstates = matches.get(parent, {}).get(copy or fn, [])
1716 if pstates or states:
1717 if pstates or states:
1717 r = display(fn, ctx, pstates, states)
1718 r = display(fn, ctx, pstates, states)
1718 found = found or r
1719 found = found or r
1719 if r and not opts.get('all'):
1720 if r and not opts.get('all'):
1720 skip[fn] = True
1721 skip[fn] = True
1721 if copy:
1722 if copy:
1722 skip[copy] = True
1723 skip[copy] = True
1723 del matches[rev]
1724 del matches[rev]
1724 del revfiles[rev]
1725 del revfiles[rev]
1725
1726
1726 return not found
1727 return not found
1727
1728
1728 def heads(ui, repo, *branchrevs, **opts):
1729 def heads(ui, repo, *branchrevs, **opts):
1729 """show current repository heads or show branch heads
1730 """show current repository heads or show branch heads
1730
1731
1731 With no arguments, show all repository branch heads.
1732 With no arguments, show all repository branch heads.
1732
1733
1733 Repository "heads" are changesets with no child changesets. They are
1734 Repository "heads" are changesets with no child changesets. They are
1734 where development generally takes place and are the usual targets
1735 where development generally takes place and are the usual targets
1735 for update and merge operations. Branch heads are changesets that have
1736 for update and merge operations. Branch heads are changesets that have
1736 no child changeset on the same branch.
1737 no child changeset on the same branch.
1737
1738
1738 If one or more REVs are given, only branch heads on the branches
1739 If one or more REVs are given, only branch heads on the branches
1739 associated with the specified changesets are shown.
1740 associated with the specified changesets are shown.
1740
1741
1741 If -c/--closed is specified, also show branch heads marked closed
1742 If -c/--closed is specified, also show branch heads marked closed
1742 (see :hg:`commit --close-branch`).
1743 (see :hg:`commit --close-branch`).
1743
1744
1744 If STARTREV is specified, only those heads that are descendants of
1745 If STARTREV is specified, only those heads that are descendants of
1745 STARTREV will be displayed.
1746 STARTREV will be displayed.
1746
1747
1747 If -t/--topo is specified, named branch mechanics will be ignored and only
1748 If -t/--topo is specified, named branch mechanics will be ignored and only
1748 changesets without children will be shown.
1749 changesets without children will be shown.
1749
1750
1750 Returns 0 if matching heads are found, 1 if not.
1751 Returns 0 if matching heads are found, 1 if not.
1751 """
1752 """
1752
1753
1753 if opts.get('rev'):
1754 if opts.get('rev'):
1754 start = repo.lookup(opts['rev'])
1755 start = repo.lookup(opts['rev'])
1755 else:
1756 else:
1756 start = None
1757 start = None
1757
1758
1758 if opts.get('topo'):
1759 if opts.get('topo'):
1759 heads = [repo[h] for h in repo.heads(start)]
1760 heads = [repo[h] for h in repo.heads(start)]
1760 else:
1761 else:
1761 heads = []
1762 heads = []
1762 for b, ls in repo.branchmap().iteritems():
1763 for b, ls in repo.branchmap().iteritems():
1763 if start is None:
1764 if start is None:
1764 heads += [repo[h] for h in ls]
1765 heads += [repo[h] for h in ls]
1765 continue
1766 continue
1766 startrev = repo.changelog.rev(start)
1767 startrev = repo.changelog.rev(start)
1767 descendants = set(repo.changelog.descendants(startrev))
1768 descendants = set(repo.changelog.descendants(startrev))
1768 descendants.add(startrev)
1769 descendants.add(startrev)
1769 rev = repo.changelog.rev
1770 rev = repo.changelog.rev
1770 heads += [repo[h] for h in ls if rev(h) in descendants]
1771 heads += [repo[h] for h in ls if rev(h) in descendants]
1771
1772
1772 if branchrevs:
1773 if branchrevs:
1773 decode, encode = encoding.fromlocal, encoding.tolocal
1774 decode, encode = encoding.fromlocal, encoding.tolocal
1774 branches = set(repo[decode(br)].branch() for br in branchrevs)
1775 branches = set(repo[decode(br)].branch() for br in branchrevs)
1775 heads = [h for h in heads if h.branch() in branches]
1776 heads = [h for h in heads if h.branch() in branches]
1776
1777
1777 if not opts.get('closed'):
1778 if not opts.get('closed'):
1778 heads = [h for h in heads if not h.extra().get('close')]
1779 heads = [h for h in heads if not h.extra().get('close')]
1779
1780
1780 if opts.get('active') and branchrevs:
1781 if opts.get('active') and branchrevs:
1781 dagheads = repo.heads(start)
1782 dagheads = repo.heads(start)
1782 heads = [h for h in heads if h.node() in dagheads]
1783 heads = [h for h in heads if h.node() in dagheads]
1783
1784
1784 if branchrevs:
1785 if branchrevs:
1785 haveheads = set(h.branch() for h in heads)
1786 haveheads = set(h.branch() for h in heads)
1786 if branches - haveheads:
1787 if branches - haveheads:
1787 headless = ', '.join(encode(b) for b in branches - haveheads)
1788 headless = ', '.join(encode(b) for b in branches - haveheads)
1788 msg = _('no open branch heads found on branches %s')
1789 msg = _('no open branch heads found on branches %s')
1789 if opts.get('rev'):
1790 if opts.get('rev'):
1790 msg += _(' (started at %s)' % opts['rev'])
1791 msg += _(' (started at %s)' % opts['rev'])
1791 ui.warn((msg + '\n') % headless)
1792 ui.warn((msg + '\n') % headless)
1792
1793
1793 if not heads:
1794 if not heads:
1794 return 1
1795 return 1
1795
1796
1796 heads = sorted(heads, key=lambda x: -x.rev())
1797 heads = sorted(heads, key=lambda x: -x.rev())
1797 displayer = cmdutil.show_changeset(ui, repo, opts)
1798 displayer = cmdutil.show_changeset(ui, repo, opts)
1798 for ctx in heads:
1799 for ctx in heads:
1799 displayer.show(ctx)
1800 displayer.show(ctx)
1800 displayer.close()
1801 displayer.close()
1801
1802
1802 def help_(ui, name=None, with_version=False, unknowncmd=False):
1803 def help_(ui, name=None, with_version=False, unknowncmd=False):
1803 """show help for a given topic or a help overview
1804 """show help for a given topic or a help overview
1804
1805
1805 With no arguments, print a list of commands with short help messages.
1806 With no arguments, print a list of commands with short help messages.
1806
1807
1807 Given a topic, extension, or command name, print help for that
1808 Given a topic, extension, or command name, print help for that
1808 topic.
1809 topic.
1809
1810
1810 Returns 0 if successful.
1811 Returns 0 if successful.
1811 """
1812 """
1812 option_lists = []
1813 option_lists = []
1813 textwidth = util.termwidth() - 2
1814 textwidth = util.termwidth() - 2
1814
1815
1815 def addglobalopts(aliases):
1816 def addglobalopts(aliases):
1816 if ui.verbose:
1817 if ui.verbose:
1817 option_lists.append((_("global options:"), globalopts))
1818 option_lists.append((_("global options:"), globalopts))
1818 if name == 'shortlist':
1819 if name == 'shortlist':
1819 option_lists.append((_('use "hg help" for the full list '
1820 option_lists.append((_('use "hg help" for the full list '
1820 'of commands'), ()))
1821 'of commands'), ()))
1821 else:
1822 else:
1822 if name == 'shortlist':
1823 if name == 'shortlist':
1823 msg = _('use "hg help" for the full list of commands '
1824 msg = _('use "hg help" for the full list of commands '
1824 'or "hg -v" for details')
1825 'or "hg -v" for details')
1825 elif aliases:
1826 elif aliases:
1826 msg = _('use "hg -v help%s" to show aliases and '
1827 msg = _('use "hg -v help%s" to show aliases and '
1827 'global options') % (name and " " + name or "")
1828 'global options') % (name and " " + name or "")
1828 else:
1829 else:
1829 msg = _('use "hg -v help %s" to show global options') % name
1830 msg = _('use "hg -v help %s" to show global options') % name
1830 option_lists.append((msg, ()))
1831 option_lists.append((msg, ()))
1831
1832
1832 def helpcmd(name):
1833 def helpcmd(name):
1833 if with_version:
1834 if with_version:
1834 version_(ui)
1835 version_(ui)
1835 ui.write('\n')
1836 ui.write('\n')
1836
1837
1837 try:
1838 try:
1838 aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd)
1839 aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd)
1839 except error.AmbiguousCommand, inst:
1840 except error.AmbiguousCommand, inst:
1840 # py3k fix: except vars can't be used outside the scope of the
1841 # py3k fix: except vars can't be used outside the scope of the
1841 # except block, nor can be used inside a lambda. python issue4617
1842 # except block, nor can be used inside a lambda. python issue4617
1842 prefix = inst.args[0]
1843 prefix = inst.args[0]
1843 select = lambda c: c.lstrip('^').startswith(prefix)
1844 select = lambda c: c.lstrip('^').startswith(prefix)
1844 helplist(_('list of commands:\n\n'), select)
1845 helplist(_('list of commands:\n\n'), select)
1845 return
1846 return
1846
1847
1847 # check if it's an invalid alias and display its error if it is
1848 # check if it's an invalid alias and display its error if it is
1848 if getattr(entry[0], 'badalias', False):
1849 if getattr(entry[0], 'badalias', False):
1849 if not unknowncmd:
1850 if not unknowncmd:
1850 entry[0](ui)
1851 entry[0](ui)
1851 return
1852 return
1852
1853
1853 # synopsis
1854 # synopsis
1854 if len(entry) > 2:
1855 if len(entry) > 2:
1855 if entry[2].startswith('hg'):
1856 if entry[2].startswith('hg'):
1856 ui.write("%s\n" % entry[2])
1857 ui.write("%s\n" % entry[2])
1857 else:
1858 else:
1858 ui.write('hg %s %s\n' % (aliases[0], entry[2]))
1859 ui.write('hg %s %s\n' % (aliases[0], entry[2]))
1859 else:
1860 else:
1860 ui.write('hg %s\n' % aliases[0])
1861 ui.write('hg %s\n' % aliases[0])
1861
1862
1862 # aliases
1863 # aliases
1863 if not ui.quiet and len(aliases) > 1:
1864 if not ui.quiet and len(aliases) > 1:
1864 ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))
1865 ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))
1865
1866
1866 # description
1867 # description
1867 doc = gettext(entry[0].__doc__)
1868 doc = gettext(entry[0].__doc__)
1868 if not doc:
1869 if not doc:
1869 doc = _("(no help text available)")
1870 doc = _("(no help text available)")
1870 if hasattr(entry[0], 'definition'): # aliased command
1871 if hasattr(entry[0], 'definition'): # aliased command
1871 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
1872 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
1872 if ui.quiet:
1873 if ui.quiet:
1873 doc = doc.splitlines()[0]
1874 doc = doc.splitlines()[0]
1874 keep = ui.verbose and ['verbose'] or []
1875 keep = ui.verbose and ['verbose'] or []
1875 formatted, pruned = minirst.format(doc, textwidth, keep=keep)
1876 formatted, pruned = minirst.format(doc, textwidth, keep=keep)
1876 ui.write("\n%s\n" % formatted)
1877 ui.write("\n%s\n" % formatted)
1877 if pruned:
1878 if pruned:
1878 ui.write(_('\nuse "hg -v help %s" to show verbose help\n') % name)
1879 ui.write(_('\nuse "hg -v help %s" to show verbose help\n') % name)
1879
1880
1880 if not ui.quiet:
1881 if not ui.quiet:
1881 # options
1882 # options
1882 if entry[1]:
1883 if entry[1]:
1883 option_lists.append((_("options:\n"), entry[1]))
1884 option_lists.append((_("options:\n"), entry[1]))
1884
1885
1885 addglobalopts(False)
1886 addglobalopts(False)
1886
1887
1887 def helplist(header, select=None):
1888 def helplist(header, select=None):
1888 h = {}
1889 h = {}
1889 cmds = {}
1890 cmds = {}
1890 for c, e in table.iteritems():
1891 for c, e in table.iteritems():
1891 f = c.split("|", 1)[0]
1892 f = c.split("|", 1)[0]
1892 if select and not select(f):
1893 if select and not select(f):
1893 continue
1894 continue
1894 if (not select and name != 'shortlist' and
1895 if (not select and name != 'shortlist' and
1895 e[0].__module__ != __name__):
1896 e[0].__module__ != __name__):
1896 continue
1897 continue
1897 if name == "shortlist" and not f.startswith("^"):
1898 if name == "shortlist" and not f.startswith("^"):
1898 continue
1899 continue
1899 f = f.lstrip("^")
1900 f = f.lstrip("^")
1900 if not ui.debugflag and f.startswith("debug"):
1901 if not ui.debugflag and f.startswith("debug"):
1901 continue
1902 continue
1902 doc = e[0].__doc__
1903 doc = e[0].__doc__
1903 if doc and 'DEPRECATED' in doc and not ui.verbose:
1904 if doc and 'DEPRECATED' in doc and not ui.verbose:
1904 continue
1905 continue
1905 doc = gettext(doc)
1906 doc = gettext(doc)
1906 if not doc:
1907 if not doc:
1907 doc = _("(no help text available)")
1908 doc = _("(no help text available)")
1908 h[f] = doc.splitlines()[0].rstrip()
1909 h[f] = doc.splitlines()[0].rstrip()
1909 cmds[f] = c.lstrip("^")
1910 cmds[f] = c.lstrip("^")
1910
1911
1911 if not h:
1912 if not h:
1912 ui.status(_('no commands defined\n'))
1913 ui.status(_('no commands defined\n'))
1913 return
1914 return
1914
1915
1915 ui.status(header)
1916 ui.status(header)
1916 fns = sorted(h)
1917 fns = sorted(h)
1917 m = max(map(len, fns))
1918 m = max(map(len, fns))
1918 for f in fns:
1919 for f in fns:
1919 if ui.verbose:
1920 if ui.verbose:
1920 commands = cmds[f].replace("|",", ")
1921 commands = cmds[f].replace("|",", ")
1921 ui.write(" %s:\n %s\n"%(commands, h[f]))
1922 ui.write(" %s:\n %s\n"%(commands, h[f]))
1922 else:
1923 else:
1923 ui.write('%s\n' % (util.wrap(h[f],
1924 ui.write('%s\n' % (util.wrap(h[f],
1924 initindent=' %-*s ' % (m, f),
1925 initindent=' %-*s ' % (m, f),
1925 hangindent=' ' * (m + 4))))
1926 hangindent=' ' * (m + 4))))
1926
1927
1927 if not ui.quiet:
1928 if not ui.quiet:
1928 addglobalopts(True)
1929 addglobalopts(True)
1929
1930
1930 def helptopic(name):
1931 def helptopic(name):
1931 for names, header, doc in help.helptable:
1932 for names, header, doc in help.helptable:
1932 if name in names:
1933 if name in names:
1933 break
1934 break
1934 else:
1935 else:
1935 raise error.UnknownCommand(name)
1936 raise error.UnknownCommand(name)
1936
1937
1937 # description
1938 # description
1938 if not doc:
1939 if not doc:
1939 doc = _("(no help text available)")
1940 doc = _("(no help text available)")
1940 if hasattr(doc, '__call__'):
1941 if hasattr(doc, '__call__'):
1941 doc = doc()
1942 doc = doc()
1942
1943
1943 ui.write("%s\n\n" % header)
1944 ui.write("%s\n\n" % header)
1944 ui.write("%s\n" % minirst.format(doc, textwidth, indent=4))
1945 ui.write("%s\n" % minirst.format(doc, textwidth, indent=4))
1945
1946
1946 def helpext(name):
1947 def helpext(name):
1947 try:
1948 try:
1948 mod = extensions.find(name)
1949 mod = extensions.find(name)
1949 doc = gettext(mod.__doc__) or _('no help text available')
1950 doc = gettext(mod.__doc__) or _('no help text available')
1950 except KeyError:
1951 except KeyError:
1951 mod = None
1952 mod = None
1952 doc = extensions.disabledext(name)
1953 doc = extensions.disabledext(name)
1953 if not doc:
1954 if not doc:
1954 raise error.UnknownCommand(name)
1955 raise error.UnknownCommand(name)
1955
1956
1956 if '\n' not in doc:
1957 if '\n' not in doc:
1957 head, tail = doc, ""
1958 head, tail = doc, ""
1958 else:
1959 else:
1959 head, tail = doc.split('\n', 1)
1960 head, tail = doc.split('\n', 1)
1960 ui.write(_('%s extension - %s\n\n') % (name.split('.')[-1], head))
1961 ui.write(_('%s extension - %s\n\n') % (name.split('.')[-1], head))
1961 if tail:
1962 if tail:
1962 ui.write(minirst.format(tail, textwidth))
1963 ui.write(minirst.format(tail, textwidth))
1963 ui.status('\n\n')
1964 ui.status('\n\n')
1964
1965
1965 if mod:
1966 if mod:
1966 try:
1967 try:
1967 ct = mod.cmdtable
1968 ct = mod.cmdtable
1968 except AttributeError:
1969 except AttributeError:
1969 ct = {}
1970 ct = {}
1970 modcmds = set([c.split('|', 1)[0] for c in ct])
1971 modcmds = set([c.split('|', 1)[0] for c in ct])
1971 helplist(_('list of commands:\n\n'), modcmds.__contains__)
1972 helplist(_('list of commands:\n\n'), modcmds.__contains__)
1972 else:
1973 else:
1973 ui.write(_('use "hg help extensions" for information on enabling '
1974 ui.write(_('use "hg help extensions" for information on enabling '
1974 'extensions\n'))
1975 'extensions\n'))
1975
1976
1976 def helpextcmd(name):
1977 def helpextcmd(name):
1977 cmd, ext, mod = extensions.disabledcmd(name, ui.config('ui', 'strict'))
1978 cmd, ext, mod = extensions.disabledcmd(name, ui.config('ui', 'strict'))
1978 doc = gettext(mod.__doc__).splitlines()[0]
1979 doc = gettext(mod.__doc__).splitlines()[0]
1979
1980
1980 msg = help.listexts(_("'%s' is provided by the following "
1981 msg = help.listexts(_("'%s' is provided by the following "
1981 "extension:") % cmd, {ext: doc}, len(ext),
1982 "extension:") % cmd, {ext: doc}, len(ext),
1982 indent=4)
1983 indent=4)
1983 ui.write(minirst.format(msg, textwidth))
1984 ui.write(minirst.format(msg, textwidth))
1984 ui.write('\n\n')
1985 ui.write('\n\n')
1985 ui.write(_('use "hg help extensions" for information on enabling '
1986 ui.write(_('use "hg help extensions" for information on enabling '
1986 'extensions\n'))
1987 'extensions\n'))
1987
1988
1988 if name and name != 'shortlist':
1989 if name and name != 'shortlist':
1989 i = None
1990 i = None
1990 if unknowncmd:
1991 if unknowncmd:
1991 queries = (helpextcmd,)
1992 queries = (helpextcmd,)
1992 else:
1993 else:
1993 queries = (helptopic, helpcmd, helpext, helpextcmd)
1994 queries = (helptopic, helpcmd, helpext, helpextcmd)
1994 for f in queries:
1995 for f in queries:
1995 try:
1996 try:
1996 f(name)
1997 f(name)
1997 i = None
1998 i = None
1998 break
1999 break
1999 except error.UnknownCommand, inst:
2000 except error.UnknownCommand, inst:
2000 i = inst
2001 i = inst
2001 if i:
2002 if i:
2002 raise i
2003 raise i
2003
2004
2004 else:
2005 else:
2005 # program name
2006 # program name
2006 if ui.verbose or with_version:
2007 if ui.verbose or with_version:
2007 version_(ui)
2008 version_(ui)
2008 else:
2009 else:
2009 ui.status(_("Mercurial Distributed SCM\n"))
2010 ui.status(_("Mercurial Distributed SCM\n"))
2010 ui.status('\n')
2011 ui.status('\n')
2011
2012
2012 # list of commands
2013 # list of commands
2013 if name == "shortlist":
2014 if name == "shortlist":
2014 header = _('basic commands:\n\n')
2015 header = _('basic commands:\n\n')
2015 else:
2016 else:
2016 header = _('list of commands:\n\n')
2017 header = _('list of commands:\n\n')
2017
2018
2018 helplist(header)
2019 helplist(header)
2019 if name != 'shortlist':
2020 if name != 'shortlist':
2020 exts, maxlength = extensions.enabled()
2021 exts, maxlength = extensions.enabled()
2021 text = help.listexts(_('enabled extensions:'), exts, maxlength)
2022 text = help.listexts(_('enabled extensions:'), exts, maxlength)
2022 if text:
2023 if text:
2023 ui.write("\n%s\n" % minirst.format(text, textwidth))
2024 ui.write("\n%s\n" % minirst.format(text, textwidth))
2024
2025
2025 # list all option lists
2026 # list all option lists
2026 opt_output = []
2027 opt_output = []
2027 multioccur = False
2028 multioccur = False
2028 for title, options in option_lists:
2029 for title, options in option_lists:
2029 opt_output.append(("\n%s" % title, None))
2030 opt_output.append(("\n%s" % title, None))
2030 for option in options:
2031 for option in options:
2031 if len(option) == 5:
2032 if len(option) == 5:
2032 shortopt, longopt, default, desc, optlabel = option
2033 shortopt, longopt, default, desc, optlabel = option
2033 else:
2034 else:
2034 shortopt, longopt, default, desc = option
2035 shortopt, longopt, default, desc = option
2035 optlabel = _("VALUE") # default label
2036 optlabel = _("VALUE") # default label
2036
2037
2037 if _("DEPRECATED") in desc and not ui.verbose:
2038 if _("DEPRECATED") in desc and not ui.verbose:
2038 continue
2039 continue
2039 if isinstance(default, list):
2040 if isinstance(default, list):
2040 numqualifier = " %s [+]" % optlabel
2041 numqualifier = " %s [+]" % optlabel
2041 multioccur = True
2042 multioccur = True
2042 elif (default is not None) and not isinstance(default, bool):
2043 elif (default is not None) and not isinstance(default, bool):
2043 numqualifier = " %s" % optlabel
2044 numqualifier = " %s" % optlabel
2044 else:
2045 else:
2045 numqualifier = ""
2046 numqualifier = ""
2046 opt_output.append(("%2s%s" %
2047 opt_output.append(("%2s%s" %
2047 (shortopt and "-%s" % shortopt,
2048 (shortopt and "-%s" % shortopt,
2048 longopt and " --%s%s" %
2049 longopt and " --%s%s" %
2049 (longopt, numqualifier)),
2050 (longopt, numqualifier)),
2050 "%s%s" % (desc,
2051 "%s%s" % (desc,
2051 default
2052 default
2052 and _(" (default: %s)") % default
2053 and _(" (default: %s)") % default
2053 or "")))
2054 or "")))
2054 if multioccur:
2055 if multioccur:
2055 msg = _("\n[+] marked option can be specified multiple times")
2056 msg = _("\n[+] marked option can be specified multiple times")
2056 if ui.verbose and name != 'shortlist':
2057 if ui.verbose and name != 'shortlist':
2057 opt_output.append((msg, None))
2058 opt_output.append((msg, None))
2058 else:
2059 else:
2059 opt_output.insert(-1, (msg, None))
2060 opt_output.insert(-1, (msg, None))
2060
2061
2061 if not name:
2062 if not name:
2062 ui.write(_("\nadditional help topics:\n\n"))
2063 ui.write(_("\nadditional help topics:\n\n"))
2063 topics = []
2064 topics = []
2064 for names, header, doc in help.helptable:
2065 for names, header, doc in help.helptable:
2065 topics.append((sorted(names, key=len, reverse=True)[0], header))
2066 topics.append((sorted(names, key=len, reverse=True)[0], header))
2066 topics_len = max([len(s[0]) for s in topics])
2067 topics_len = max([len(s[0]) for s in topics])
2067 for t, desc in topics:
2068 for t, desc in topics:
2068 ui.write(" %-*s %s\n" % (topics_len, t, desc))
2069 ui.write(" %-*s %s\n" % (topics_len, t, desc))
2069
2070
2070 if opt_output:
2071 if opt_output:
2071 colwidth = encoding.colwidth
2072 colwidth = encoding.colwidth
2072 # normalize: (opt or message, desc or None, width of opt)
2073 # normalize: (opt or message, desc or None, width of opt)
2073 entries = [desc and (opt, desc, colwidth(opt)) or (opt, None, 0)
2074 entries = [desc and (opt, desc, colwidth(opt)) or (opt, None, 0)
2074 for opt, desc in opt_output]
2075 for opt, desc in opt_output]
2075 hanging = max([e[2] for e in entries])
2076 hanging = max([e[2] for e in entries])
2076 for opt, desc, width in entries:
2077 for opt, desc, width in entries:
2077 if desc:
2078 if desc:
2078 initindent = ' %s%s ' % (opt, ' ' * (hanging - width))
2079 initindent = ' %s%s ' % (opt, ' ' * (hanging - width))
2079 hangindent = ' ' * (hanging + 3)
2080 hangindent = ' ' * (hanging + 3)
2080 ui.write('%s\n' % (util.wrap(desc,
2081 ui.write('%s\n' % (util.wrap(desc,
2081 initindent=initindent,
2082 initindent=initindent,
2082 hangindent=hangindent)))
2083 hangindent=hangindent)))
2083 else:
2084 else:
2084 ui.write("%s\n" % opt)
2085 ui.write("%s\n" % opt)
2085
2086
2086 def identify(ui, repo, source=None,
2087 def identify(ui, repo, source=None,
2087 rev=None, num=None, id=None, branch=None, tags=None):
2088 rev=None, num=None, id=None, branch=None, tags=None):
2088 """identify the working copy or specified revision
2089 """identify the working copy or specified revision
2089
2090
2090 With no revision, print a summary of the current state of the
2091 With no revision, print a summary of the current state of the
2091 repository.
2092 repository.
2092
2093
2093 Specifying a path to a repository root or Mercurial bundle will
2094 Specifying a path to a repository root or Mercurial bundle will
2094 cause lookup to operate on that repository/bundle.
2095 cause lookup to operate on that repository/bundle.
2095
2096
2096 This summary identifies the repository state using one or two
2097 This summary identifies the repository state using one or two
2097 parent hash identifiers, followed by a "+" if there are
2098 parent hash identifiers, followed by a "+" if there are
2098 uncommitted changes in the working directory, a list of tags for
2099 uncommitted changes in the working directory, a list of tags for
2099 this revision and a branch name for non-default branches.
2100 this revision and a branch name for non-default branches.
2100
2101
2101 Returns 0 if successful.
2102 Returns 0 if successful.
2102 """
2103 """
2103
2104
2104 if not repo and not source:
2105 if not repo and not source:
2105 raise util.Abort(_("There is no Mercurial repository here "
2106 raise util.Abort(_("There is no Mercurial repository here "
2106 "(.hg not found)"))
2107 "(.hg not found)"))
2107
2108
2108 hexfunc = ui.debugflag and hex or short
2109 hexfunc = ui.debugflag and hex or short
2109 default = not (num or id or branch or tags)
2110 default = not (num or id or branch or tags)
2110 output = []
2111 output = []
2111
2112
2112 revs = []
2113 revs = []
2113 if source:
2114 if source:
2114 source, branches = hg.parseurl(ui.expandpath(source))
2115 source, branches = hg.parseurl(ui.expandpath(source))
2115 repo = hg.repository(ui, source)
2116 repo = hg.repository(ui, source)
2116 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
2117 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
2117
2118
2118 if not repo.local():
2119 if not repo.local():
2119 if not rev and revs:
2120 if not rev and revs:
2120 rev = revs[0]
2121 rev = revs[0]
2121 if not rev:
2122 if not rev:
2122 rev = "tip"
2123 rev = "tip"
2123 if num or branch or tags:
2124 if num or branch or tags:
2124 raise util.Abort(
2125 raise util.Abort(
2125 "can't query remote revision number, branch, or tags")
2126 "can't query remote revision number, branch, or tags")
2126 output = [hexfunc(repo.lookup(rev))]
2127 output = [hexfunc(repo.lookup(rev))]
2127 elif not rev:
2128 elif not rev:
2128 ctx = repo[None]
2129 ctx = repo[None]
2129 parents = ctx.parents()
2130 parents = ctx.parents()
2130 changed = False
2131 changed = False
2131 if default or id or num:
2132 if default or id or num:
2132 changed = util.any(repo.status())
2133 changed = util.any(repo.status())
2133 if default or id:
2134 if default or id:
2134 output = ["%s%s" % ('+'.join([hexfunc(p.node()) for p in parents]),
2135 output = ["%s%s" % ('+'.join([hexfunc(p.node()) for p in parents]),
2135 (changed) and "+" or "")]
2136 (changed) and "+" or "")]
2136 if num:
2137 if num:
2137 output.append("%s%s" % ('+'.join([str(p.rev()) for p in parents]),
2138 output.append("%s%s" % ('+'.join([str(p.rev()) for p in parents]),
2138 (changed) and "+" or ""))
2139 (changed) and "+" or ""))
2139 else:
2140 else:
2140 ctx = repo[rev]
2141 ctx = repo[rev]
2141 if default or id:
2142 if default or id:
2142 output = [hexfunc(ctx.node())]
2143 output = [hexfunc(ctx.node())]
2143 if num:
2144 if num:
2144 output.append(str(ctx.rev()))
2145 output.append(str(ctx.rev()))
2145
2146
2146 if repo.local() and default and not ui.quiet:
2147 if repo.local() and default and not ui.quiet:
2147 b = encoding.tolocal(ctx.branch())
2148 b = encoding.tolocal(ctx.branch())
2148 if b != 'default':
2149 if b != 'default':
2149 output.append("(%s)" % b)
2150 output.append("(%s)" % b)
2150
2151
2151 # multiple tags for a single parent separated by '/'
2152 # multiple tags for a single parent separated by '/'
2152 t = "/".join(ctx.tags())
2153 t = "/".join(ctx.tags())
2153 if t:
2154 if t:
2154 output.append(t)
2155 output.append(t)
2155
2156
2156 if branch:
2157 if branch:
2157 output.append(encoding.tolocal(ctx.branch()))
2158 output.append(encoding.tolocal(ctx.branch()))
2158
2159
2159 if tags:
2160 if tags:
2160 output.extend(ctx.tags())
2161 output.extend(ctx.tags())
2161
2162
2162 ui.write("%s\n" % ' '.join(output))
2163 ui.write("%s\n" % ' '.join(output))
2163
2164
2164 def import_(ui, repo, patch1, *patches, **opts):
2165 def import_(ui, repo, patch1, *patches, **opts):
2165 """import an ordered set of patches
2166 """import an ordered set of patches
2166
2167
2167 Import a list of patches and commit them individually (unless
2168 Import a list of patches and commit them individually (unless
2168 --no-commit is specified).
2169 --no-commit is specified).
2169
2170
2170 If there are outstanding changes in the working directory, import
2171 If there are outstanding changes in the working directory, import
2171 will abort unless given the -f/--force flag.
2172 will abort unless given the -f/--force flag.
2172
2173
2173 You can import a patch straight from a mail message. Even patches
2174 You can import a patch straight from a mail message. Even patches
2174 as attachments work (to use the body part, it must have type
2175 as attachments work (to use the body part, it must have type
2175 text/plain or text/x-patch). From and Subject headers of email
2176 text/plain or text/x-patch). From and Subject headers of email
2176 message are used as default committer and commit message. All
2177 message are used as default committer and commit message. All
2177 text/plain body parts before first diff are added to commit
2178 text/plain body parts before first diff are added to commit
2178 message.
2179 message.
2179
2180
2180 If the imported patch was generated by :hg:`export`, user and
2181 If the imported patch was generated by :hg:`export`, user and
2181 description from patch override values from message headers and
2182 description from patch override values from message headers and
2182 body. Values given on command line with -m/--message and -u/--user
2183 body. Values given on command line with -m/--message and -u/--user
2183 override these.
2184 override these.
2184
2185
2185 If --exact is specified, import will set the working directory to
2186 If --exact is specified, import will set the working directory to
2186 the parent of each patch before applying it, and will abort if the
2187 the parent of each patch before applying it, and will abort if the
2187 resulting changeset has a different ID than the one recorded in
2188 resulting changeset has a different ID than the one recorded in
2188 the patch. This may happen due to character set problems or other
2189 the patch. This may happen due to character set problems or other
2189 deficiencies in the text patch format.
2190 deficiencies in the text patch format.
2190
2191
2191 With -s/--similarity, hg will attempt to discover renames and
2192 With -s/--similarity, hg will attempt to discover renames and
2192 copies in the patch in the same way as 'addremove'.
2193 copies in the patch in the same way as 'addremove'.
2193
2194
2194 To read a patch from standard input, use "-" as the patch name. If
2195 To read a patch from standard input, use "-" as the patch name. If
2195 a URL is specified, the patch will be downloaded from it.
2196 a URL is specified, the patch will be downloaded from it.
2196 See :hg:`help dates` for a list of formats valid for -d/--date.
2197 See :hg:`help dates` for a list of formats valid for -d/--date.
2197
2198
2198 Returns 0 on success.
2199 Returns 0 on success.
2199 """
2200 """
2200 patches = (patch1,) + patches
2201 patches = (patch1,) + patches
2201
2202
2202 date = opts.get('date')
2203 date = opts.get('date')
2203 if date:
2204 if date:
2204 opts['date'] = util.parsedate(date)
2205 opts['date'] = util.parsedate(date)
2205
2206
2206 try:
2207 try:
2207 sim = float(opts.get('similarity') or 0)
2208 sim = float(opts.get('similarity') or 0)
2208 except ValueError:
2209 except ValueError:
2209 raise util.Abort(_('similarity must be a number'))
2210 raise util.Abort(_('similarity must be a number'))
2210 if sim < 0 or sim > 100:
2211 if sim < 0 or sim > 100:
2211 raise util.Abort(_('similarity must be between 0 and 100'))
2212 raise util.Abort(_('similarity must be between 0 and 100'))
2212
2213
2213 if opts.get('exact') or not opts.get('force'):
2214 if opts.get('exact') or not opts.get('force'):
2214 cmdutil.bail_if_changed(repo)
2215 cmdutil.bail_if_changed(repo)
2215
2216
2216 d = opts["base"]
2217 d = opts["base"]
2217 strip = opts["strip"]
2218 strip = opts["strip"]
2218 wlock = lock = None
2219 wlock = lock = None
2219
2220
2220 def tryone(ui, hunk):
2221 def tryone(ui, hunk):
2221 tmpname, message, user, date, branch, nodeid, p1, p2 = \
2222 tmpname, message, user, date, branch, nodeid, p1, p2 = \
2222 patch.extract(ui, hunk)
2223 patch.extract(ui, hunk)
2223
2224
2224 if not tmpname:
2225 if not tmpname:
2225 return None
2226 return None
2226 commitid = _('to working directory')
2227 commitid = _('to working directory')
2227
2228
2228 try:
2229 try:
2229 cmdline_message = cmdutil.logmessage(opts)
2230 cmdline_message = cmdutil.logmessage(opts)
2230 if cmdline_message:
2231 if cmdline_message:
2231 # pickup the cmdline msg
2232 # pickup the cmdline msg
2232 message = cmdline_message
2233 message = cmdline_message
2233 elif message:
2234 elif message:
2234 # pickup the patch msg
2235 # pickup the patch msg
2235 message = message.strip()
2236 message = message.strip()
2236 else:
2237 else:
2237 # launch the editor
2238 # launch the editor
2238 message = None
2239 message = None
2239 ui.debug('message:\n%s\n' % message)
2240 ui.debug('message:\n%s\n' % message)
2240
2241
2241 wp = repo.parents()
2242 wp = repo.parents()
2242 if opts.get('exact'):
2243 if opts.get('exact'):
2243 if not nodeid or not p1:
2244 if not nodeid or not p1:
2244 raise util.Abort(_('not a Mercurial patch'))
2245 raise util.Abort(_('not a Mercurial patch'))
2245 p1 = repo.lookup(p1)
2246 p1 = repo.lookup(p1)
2246 p2 = repo.lookup(p2 or hex(nullid))
2247 p2 = repo.lookup(p2 or hex(nullid))
2247
2248
2248 if p1 != wp[0].node():
2249 if p1 != wp[0].node():
2249 hg.clean(repo, p1)
2250 hg.clean(repo, p1)
2250 repo.dirstate.setparents(p1, p2)
2251 repo.dirstate.setparents(p1, p2)
2251 elif p2:
2252 elif p2:
2252 try:
2253 try:
2253 p1 = repo.lookup(p1)
2254 p1 = repo.lookup(p1)
2254 p2 = repo.lookup(p2)
2255 p2 = repo.lookup(p2)
2255 if p1 == wp[0].node():
2256 if p1 == wp[0].node():
2256 repo.dirstate.setparents(p1, p2)
2257 repo.dirstate.setparents(p1, p2)
2257 except error.RepoError:
2258 except error.RepoError:
2258 pass
2259 pass
2259 if opts.get('exact') or opts.get('import_branch'):
2260 if opts.get('exact') or opts.get('import_branch'):
2260 repo.dirstate.setbranch(branch or 'default')
2261 repo.dirstate.setbranch(branch or 'default')
2261
2262
2262 files = {}
2263 files = {}
2263 try:
2264 try:
2264 patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
2265 patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
2265 files=files, eolmode=None)
2266 files=files, eolmode=None)
2266 finally:
2267 finally:
2267 files = patch.updatedir(ui, repo, files,
2268 files = patch.updatedir(ui, repo, files,
2268 similarity=sim / 100.0)
2269 similarity=sim / 100.0)
2269 if not opts.get('no_commit'):
2270 if not opts.get('no_commit'):
2270 if opts.get('exact'):
2271 if opts.get('exact'):
2271 m = None
2272 m = None
2272 else:
2273 else:
2273 m = cmdutil.matchfiles(repo, files or [])
2274 m = cmdutil.matchfiles(repo, files or [])
2274 n = repo.commit(message, opts.get('user') or user,
2275 n = repo.commit(message, opts.get('user') or user,
2275 opts.get('date') or date, match=m,
2276 opts.get('date') or date, match=m,
2276 editor=cmdutil.commiteditor)
2277 editor=cmdutil.commiteditor)
2277 if opts.get('exact'):
2278 if opts.get('exact'):
2278 if hex(n) != nodeid:
2279 if hex(n) != nodeid:
2279 repo.rollback()
2280 repo.rollback()
2280 raise util.Abort(_('patch is damaged'
2281 raise util.Abort(_('patch is damaged'
2281 ' or loses information'))
2282 ' or loses information'))
2282 # Force a dirstate write so that the next transaction
2283 # Force a dirstate write so that the next transaction
2283 # backups an up-do-date file.
2284 # backups an up-do-date file.
2284 repo.dirstate.write()
2285 repo.dirstate.write()
2285 if n:
2286 if n:
2286 commitid = short(n)
2287 commitid = short(n)
2287
2288
2288 return commitid
2289 return commitid
2289 finally:
2290 finally:
2290 os.unlink(tmpname)
2291 os.unlink(tmpname)
2291
2292
2292 try:
2293 try:
2293 wlock = repo.wlock()
2294 wlock = repo.wlock()
2294 lock = repo.lock()
2295 lock = repo.lock()
2295 lastcommit = None
2296 lastcommit = None
2296 for p in patches:
2297 for p in patches:
2297 pf = os.path.join(d, p)
2298 pf = os.path.join(d, p)
2298
2299
2299 if pf == '-':
2300 if pf == '-':
2300 ui.status(_("applying patch from stdin\n"))
2301 ui.status(_("applying patch from stdin\n"))
2301 pf = sys.stdin
2302 pf = sys.stdin
2302 else:
2303 else:
2303 ui.status(_("applying %s\n") % p)
2304 ui.status(_("applying %s\n") % p)
2304 pf = url.open(ui, pf)
2305 pf = url.open(ui, pf)
2305
2306
2306 haspatch = False
2307 haspatch = False
2307 for hunk in patch.split(pf):
2308 for hunk in patch.split(pf):
2308 commitid = tryone(ui, hunk)
2309 commitid = tryone(ui, hunk)
2309 if commitid:
2310 if commitid:
2310 haspatch = True
2311 haspatch = True
2311 if lastcommit:
2312 if lastcommit:
2312 ui.status(_('applied %s\n') % lastcommit)
2313 ui.status(_('applied %s\n') % lastcommit)
2313 lastcommit = commitid
2314 lastcommit = commitid
2314
2315
2315 if not haspatch:
2316 if not haspatch:
2316 raise util.Abort(_('no diffs found'))
2317 raise util.Abort(_('no diffs found'))
2317
2318
2318 finally:
2319 finally:
2319 release(lock, wlock)
2320 release(lock, wlock)
2320
2321
2321 def incoming(ui, repo, source="default", **opts):
2322 def incoming(ui, repo, source="default", **opts):
2322 """show new changesets found in source
2323 """show new changesets found in source
2323
2324
2324 Show new changesets found in the specified path/URL or the default
2325 Show new changesets found in the specified path/URL or the default
2325 pull location. These are the changesets that would have been pulled
2326 pull location. These are the changesets that would have been pulled
2326 if a pull at the time you issued this command.
2327 if a pull at the time you issued this command.
2327
2328
2328 For remote repository, using --bundle avoids downloading the
2329 For remote repository, using --bundle avoids downloading the
2329 changesets twice if the incoming is followed by a pull.
2330 changesets twice if the incoming is followed by a pull.
2330
2331
2331 See pull for valid source format details.
2332 See pull for valid source format details.
2332
2333
2333 Returns 0 if there are incoming changes, 1 otherwise.
2334 Returns 0 if there are incoming changes, 1 otherwise.
2334 """
2335 """
2335 limit = cmdutil.loglimit(opts)
2336 limit = cmdutil.loglimit(opts)
2336 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
2337 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
2337 other = hg.repository(hg.remoteui(repo, opts), source)
2338 other = hg.repository(hg.remoteui(repo, opts), source)
2338 ui.status(_('comparing with %s\n') % url.hidepassword(source))
2339 ui.status(_('comparing with %s\n') % url.hidepassword(source))
2339 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
2340 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
2340 if revs:
2341 if revs:
2341 revs = [other.lookup(rev) for rev in revs]
2342 revs = [other.lookup(rev) for rev in revs]
2342
2343
2343 tmp = discovery.findcommonincoming(repo, other, heads=revs,
2344 tmp = discovery.findcommonincoming(repo, other, heads=revs,
2344 force=opts.get('force'))
2345 force=opts.get('force'))
2345 common, incoming, rheads = tmp
2346 common, incoming, rheads = tmp
2346 if not incoming:
2347 if not incoming:
2347 try:
2348 try:
2348 os.unlink(opts["bundle"])
2349 os.unlink(opts["bundle"])
2349 except:
2350 except:
2350 pass
2351 pass
2351 ui.status(_("no changes found\n"))
2352 ui.status(_("no changes found\n"))
2352 return 1
2353 return 1
2353
2354
2354 cleanup = None
2355 cleanup = None
2355 try:
2356 try:
2356 fname = opts["bundle"]
2357 fname = opts["bundle"]
2357 if fname or not other.local():
2358 if fname or not other.local():
2358 # create a bundle (uncompressed if other repo is not local)
2359 # create a bundle (uncompressed if other repo is not local)
2359
2360
2360 if revs is None and other.capable('changegroupsubset'):
2361 if revs is None and other.capable('changegroupsubset'):
2361 revs = rheads
2362 revs = rheads
2362
2363
2363 if revs is None:
2364 if revs is None:
2364 cg = other.changegroup(incoming, "incoming")
2365 cg = other.changegroup(incoming, "incoming")
2365 else:
2366 else:
2366 cg = other.changegroupsubset(incoming, revs, 'incoming')
2367 cg = other.changegroupsubset(incoming, revs, 'incoming')
2367 bundletype = other.local() and "HG10BZ" or "HG10UN"
2368 bundletype = other.local() and "HG10BZ" or "HG10UN"
2368 fname = cleanup = changegroup.writebundle(cg, fname, bundletype)
2369 fname = cleanup = changegroup.writebundle(cg, fname, bundletype)
2369 # keep written bundle?
2370 # keep written bundle?
2370 if opts["bundle"]:
2371 if opts["bundle"]:
2371 cleanup = None
2372 cleanup = None
2372 if not other.local():
2373 if not other.local():
2373 # use the created uncompressed bundlerepo
2374 # use the created uncompressed bundlerepo
2374 other = bundlerepo.bundlerepository(ui, repo.root, fname)
2375 other = bundlerepo.bundlerepository(ui, repo.root, fname)
2375
2376
2376 o = other.changelog.nodesbetween(incoming, revs)[0]
2377 o = other.changelog.nodesbetween(incoming, revs)[0]
2377 if opts.get('newest_first'):
2378 if opts.get('newest_first'):
2378 o.reverse()
2379 o.reverse()
2379 displayer = cmdutil.show_changeset(ui, other, opts)
2380 displayer = cmdutil.show_changeset(ui, other, opts)
2380 count = 0
2381 count = 0
2381 for n in o:
2382 for n in o:
2382 if limit is not None and count >= limit:
2383 if limit is not None and count >= limit:
2383 break
2384 break
2384 parents = [p for p in other.changelog.parents(n) if p != nullid]
2385 parents = [p for p in other.changelog.parents(n) if p != nullid]
2385 if opts.get('no_merges') and len(parents) == 2:
2386 if opts.get('no_merges') and len(parents) == 2:
2386 continue
2387 continue
2387 count += 1
2388 count += 1
2388 displayer.show(other[n])
2389 displayer.show(other[n])
2389 displayer.close()
2390 displayer.close()
2390 finally:
2391 finally:
2391 if hasattr(other, 'close'):
2392 if hasattr(other, 'close'):
2392 other.close()
2393 other.close()
2393 if cleanup:
2394 if cleanup:
2394 os.unlink(cleanup)
2395 os.unlink(cleanup)
2395
2396
2396 def init(ui, dest=".", **opts):
2397 def init(ui, dest=".", **opts):
2397 """create a new repository in the given directory
2398 """create a new repository in the given directory
2398
2399
2399 Initialize a new repository in the given directory. If the given
2400 Initialize a new repository in the given directory. If the given
2400 directory does not exist, it will be created.
2401 directory does not exist, it will be created.
2401
2402
2402 If no directory is given, the current directory is used.
2403 If no directory is given, the current directory is used.
2403
2404
2404 It is possible to specify an ``ssh://`` URL as the destination.
2405 It is possible to specify an ``ssh://`` URL as the destination.
2405 See :hg:`help urls` for more information.
2406 See :hg:`help urls` for more information.
2406
2407
2407 Returns 0 on success.
2408 Returns 0 on success.
2408 """
2409 """
2409 hg.repository(hg.remoteui(ui, opts), dest, create=1)
2410 hg.repository(hg.remoteui(ui, opts), dest, create=1)
2410
2411
2411 def locate(ui, repo, *pats, **opts):
2412 def locate(ui, repo, *pats, **opts):
2412 """locate files matching specific patterns
2413 """locate files matching specific patterns
2413
2414
2414 Print files under Mercurial control in the working directory whose
2415 Print files under Mercurial control in the working directory whose
2415 names match the given patterns.
2416 names match the given patterns.
2416
2417
2417 By default, this command searches all directories in the working
2418 By default, this command searches all directories in the working
2418 directory. To search just the current directory and its
2419 directory. To search just the current directory and its
2419 subdirectories, use "--include .".
2420 subdirectories, use "--include .".
2420
2421
2421 If no patterns are given to match, this command prints the names
2422 If no patterns are given to match, this command prints the names
2422 of all files under Mercurial control in the working directory.
2423 of all files under Mercurial control in the working directory.
2423
2424
2424 If you want to feed the output of this command into the "xargs"
2425 If you want to feed the output of this command into the "xargs"
2425 command, use the -0 option to both this command and "xargs". This
2426 command, use the -0 option to both this command and "xargs". This
2426 will avoid the problem of "xargs" treating single filenames that
2427 will avoid the problem of "xargs" treating single filenames that
2427 contain whitespace as multiple filenames.
2428 contain whitespace as multiple filenames.
2428
2429
2429 Returns 0 if a match is found, 1 otherwise.
2430 Returns 0 if a match is found, 1 otherwise.
2430 """
2431 """
2431 end = opts.get('print0') and '\0' or '\n'
2432 end = opts.get('print0') and '\0' or '\n'
2432 rev = opts.get('rev') or None
2433 rev = opts.get('rev') or None
2433
2434
2434 ret = 1
2435 ret = 1
2435 m = cmdutil.match(repo, pats, opts, default='relglob')
2436 m = cmdutil.match(repo, pats, opts, default='relglob')
2436 m.bad = lambda x, y: False
2437 m.bad = lambda x, y: False
2437 for abs in repo[rev].walk(m):
2438 for abs in repo[rev].walk(m):
2438 if not rev and abs not in repo.dirstate:
2439 if not rev and abs not in repo.dirstate:
2439 continue
2440 continue
2440 if opts.get('fullpath'):
2441 if opts.get('fullpath'):
2441 ui.write(repo.wjoin(abs), end)
2442 ui.write(repo.wjoin(abs), end)
2442 else:
2443 else:
2443 ui.write(((pats and m.rel(abs)) or abs), end)
2444 ui.write(((pats and m.rel(abs)) or abs), end)
2444 ret = 0
2445 ret = 0
2445
2446
2446 return ret
2447 return ret
2447
2448
2448 def log(ui, repo, *pats, **opts):
2449 def log(ui, repo, *pats, **opts):
2449 """show revision history of entire repository or files
2450 """show revision history of entire repository or files
2450
2451
2451 Print the revision history of the specified files or the entire
2452 Print the revision history of the specified files or the entire
2452 project.
2453 project.
2453
2454
2454 File history is shown without following rename or copy history of
2455 File history is shown without following rename or copy history of
2455 files. Use -f/--follow with a filename to follow history across
2456 files. Use -f/--follow with a filename to follow history across
2456 renames and copies. --follow without a filename will only show
2457 renames and copies. --follow without a filename will only show
2457 ancestors or descendants of the starting revision. --follow-first
2458 ancestors or descendants of the starting revision. --follow-first
2458 only follows the first parent of merge revisions.
2459 only follows the first parent of merge revisions.
2459
2460
2460 If no revision range is specified, the default is tip:0 unless
2461 If no revision range is specified, the default is tip:0 unless
2461 --follow is set, in which case the working directory parent is
2462 --follow is set, in which case the working directory parent is
2462 used as the starting revision. You can specify a revision set for
2463 used as the starting revision. You can specify a revision set for
2463 log, see :hg:`help revsets` for more information.
2464 log, see :hg:`help revsets` for more information.
2464
2465
2465 See :hg:`help dates` for a list of formats valid for -d/--date.
2466 See :hg:`help dates` for a list of formats valid for -d/--date.
2466
2467
2467 By default this command prints revision number and changeset id,
2468 By default this command prints revision number and changeset id,
2468 tags, non-trivial parents, user, date and time, and a summary for
2469 tags, non-trivial parents, user, date and time, and a summary for
2469 each commit. When the -v/--verbose switch is used, the list of
2470 each commit. When the -v/--verbose switch is used, the list of
2470 changed files and full commit message are shown.
2471 changed files and full commit message are shown.
2471
2472
2472 NOTE: log -p/--patch may generate unexpected diff output for merge
2473 NOTE: log -p/--patch may generate unexpected diff output for merge
2473 changesets, as it will only compare the merge changeset against
2474 changesets, as it will only compare the merge changeset against
2474 its first parent. Also, only files different from BOTH parents
2475 its first parent. Also, only files different from BOTH parents
2475 will appear in files:.
2476 will appear in files:.
2476
2477
2477 Returns 0 on success.
2478 Returns 0 on success.
2478 """
2479 """
2479
2480
2480 matchfn = cmdutil.match(repo, pats, opts)
2481 matchfn = cmdutil.match(repo, pats, opts)
2481 limit = cmdutil.loglimit(opts)
2482 limit = cmdutil.loglimit(opts)
2482 count = 0
2483 count = 0
2483
2484
2484 endrev = None
2485 endrev = None
2485 if opts.get('copies') and opts.get('rev'):
2486 if opts.get('copies') and opts.get('rev'):
2486 endrev = max(cmdutil.revrange(repo, opts.get('rev'))) + 1
2487 endrev = max(cmdutil.revrange(repo, opts.get('rev'))) + 1
2487
2488
2488 df = False
2489 df = False
2489 if opts["date"]:
2490 if opts["date"]:
2490 df = util.matchdate(opts["date"])
2491 df = util.matchdate(opts["date"])
2491
2492
2492 branches = opts.get('branch', []) + opts.get('only_branch', [])
2493 branches = opts.get('branch', []) + opts.get('only_branch', [])
2493 opts['branch'] = [repo.lookupbranch(b) for b in branches]
2494 opts['branch'] = [repo.lookupbranch(b) for b in branches]
2494
2495
2495 displayer = cmdutil.show_changeset(ui, repo, opts, True)
2496 displayer = cmdutil.show_changeset(ui, repo, opts, True)
2496 def prep(ctx, fns):
2497 def prep(ctx, fns):
2497 rev = ctx.rev()
2498 rev = ctx.rev()
2498 parents = [p for p in repo.changelog.parentrevs(rev)
2499 parents = [p for p in repo.changelog.parentrevs(rev)
2499 if p != nullrev]
2500 if p != nullrev]
2500 if opts.get('no_merges') and len(parents) == 2:
2501 if opts.get('no_merges') and len(parents) == 2:
2501 return
2502 return
2502 if opts.get('only_merges') and len(parents) != 2:
2503 if opts.get('only_merges') and len(parents) != 2:
2503 return
2504 return
2504 if opts.get('branch') and ctx.branch() not in opts['branch']:
2505 if opts.get('branch') and ctx.branch() not in opts['branch']:
2505 return
2506 return
2506 if df and not df(ctx.date()[0]):
2507 if df and not df(ctx.date()[0]):
2507 return
2508 return
2508 if opts['user'] and not [k for k in opts['user'] if k in ctx.user()]:
2509 if opts['user'] and not [k for k in opts['user'] if k in ctx.user()]:
2509 return
2510 return
2510 if opts.get('keyword'):
2511 if opts.get('keyword'):
2511 for k in [kw.lower() for kw in opts['keyword']]:
2512 for k in [kw.lower() for kw in opts['keyword']]:
2512 if (k in ctx.user().lower() or
2513 if (k in ctx.user().lower() or
2513 k in ctx.description().lower() or
2514 k in ctx.description().lower() or
2514 k in " ".join(ctx.files()).lower()):
2515 k in " ".join(ctx.files()).lower()):
2515 break
2516 break
2516 else:
2517 else:
2517 return
2518 return
2518
2519
2519 copies = None
2520 copies = None
2520 if opts.get('copies') and rev:
2521 if opts.get('copies') and rev:
2521 copies = []
2522 copies = []
2522 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
2523 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
2523 for fn in ctx.files():
2524 for fn in ctx.files():
2524 rename = getrenamed(fn, rev)
2525 rename = getrenamed(fn, rev)
2525 if rename:
2526 if rename:
2526 copies.append((fn, rename[0]))
2527 copies.append((fn, rename[0]))
2527
2528
2528 revmatchfn = None
2529 revmatchfn = None
2529 if opts.get('patch') or opts.get('stat'):
2530 if opts.get('patch') or opts.get('stat'):
2530 revmatchfn = cmdutil.match(repo, fns, default='path')
2531 revmatchfn = cmdutil.match(repo, fns, default='path')
2531
2532
2532 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
2533 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
2533
2534
2534 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2535 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2535 if count == limit:
2536 if count == limit:
2536 break
2537 break
2537 if displayer.flush(ctx.rev()):
2538 if displayer.flush(ctx.rev()):
2538 count += 1
2539 count += 1
2539 displayer.close()
2540 displayer.close()
2540
2541
2541 def manifest(ui, repo, node=None, rev=None):
2542 def manifest(ui, repo, node=None, rev=None):
2542 """output the current or given revision of the project manifest
2543 """output the current or given revision of the project manifest
2543
2544
2544 Print a list of version controlled files for the given revision.
2545 Print a list of version controlled files for the given revision.
2545 If no revision is given, the first parent of the working directory
2546 If no revision is given, the first parent of the working directory
2546 is used, or the null revision if no revision is checked out.
2547 is used, or the null revision if no revision is checked out.
2547
2548
2548 With -v, print file permissions, symlink and executable bits.
2549 With -v, print file permissions, symlink and executable bits.
2549 With --debug, print file revision hashes.
2550 With --debug, print file revision hashes.
2550
2551
2551 Returns 0 on success.
2552 Returns 0 on success.
2552 """
2553 """
2553
2554
2554 if rev and node:
2555 if rev and node:
2555 raise util.Abort(_("please specify just one revision"))
2556 raise util.Abort(_("please specify just one revision"))
2556
2557
2557 if not node:
2558 if not node:
2558 node = rev
2559 node = rev
2559
2560
2560 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
2561 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
2561 ctx = repo[node]
2562 ctx = repo[node]
2562 for f in ctx:
2563 for f in ctx:
2563 if ui.debugflag:
2564 if ui.debugflag:
2564 ui.write("%40s " % hex(ctx.manifest()[f]))
2565 ui.write("%40s " % hex(ctx.manifest()[f]))
2565 if ui.verbose:
2566 if ui.verbose:
2566 ui.write(decor[ctx.flags(f)])
2567 ui.write(decor[ctx.flags(f)])
2567 ui.write("%s\n" % f)
2568 ui.write("%s\n" % f)
2568
2569
2569 def merge(ui, repo, node=None, **opts):
2570 def merge(ui, repo, node=None, **opts):
2570 """merge working directory with another revision
2571 """merge working directory with another revision
2571
2572
2572 The current working directory is updated with all changes made in
2573 The current working directory is updated with all changes made in
2573 the requested revision since the last common predecessor revision.
2574 the requested revision since the last common predecessor revision.
2574
2575
2575 Files that changed between either parent are marked as changed for
2576 Files that changed between either parent are marked as changed for
2576 the next commit and a commit must be performed before any further
2577 the next commit and a commit must be performed before any further
2577 updates to the repository are allowed. The next commit will have
2578 updates to the repository are allowed. The next commit will have
2578 two parents.
2579 two parents.
2579
2580
2580 If no revision is specified, the working directory's parent is a
2581 If no revision is specified, the working directory's parent is a
2581 head revision, and the current branch contains exactly one other
2582 head revision, and the current branch contains exactly one other
2582 head, the other head is merged with by default. Otherwise, an
2583 head, the other head is merged with by default. Otherwise, an
2583 explicit revision with which to merge with must be provided.
2584 explicit revision with which to merge with must be provided.
2584
2585
2585 To undo an uncommitted merge, use :hg:`update --clean .` which
2586 To undo an uncommitted merge, use :hg:`update --clean .` which
2586 will check out a clean copy of the original merge parent, losing
2587 will check out a clean copy of the original merge parent, losing
2587 all changes.
2588 all changes.
2588
2589
2589 Returns 0 on success, 1 if there are unresolved files.
2590 Returns 0 on success, 1 if there are unresolved files.
2590 """
2591 """
2591
2592
2592 if opts.get('rev') and node:
2593 if opts.get('rev') and node:
2593 raise util.Abort(_("please specify just one revision"))
2594 raise util.Abort(_("please specify just one revision"))
2594 if not node:
2595 if not node:
2595 node = opts.get('rev')
2596 node = opts.get('rev')
2596
2597
2597 if not node:
2598 if not node:
2598 branch = repo.changectx(None).branch()
2599 branch = repo.changectx(None).branch()
2599 bheads = repo.branchheads(branch)
2600 bheads = repo.branchheads(branch)
2600 if len(bheads) > 2:
2601 if len(bheads) > 2:
2601 raise util.Abort(_(
2602 raise util.Abort(_(
2602 'branch \'%s\' has %d heads - '
2603 'branch \'%s\' has %d heads - '
2603 'please merge with an explicit rev\n'
2604 'please merge with an explicit rev\n'
2604 '(run \'hg heads .\' to see heads)')
2605 '(run \'hg heads .\' to see heads)')
2605 % (branch, len(bheads)))
2606 % (branch, len(bheads)))
2606
2607
2607 parent = repo.dirstate.parents()[0]
2608 parent = repo.dirstate.parents()[0]
2608 if len(bheads) == 1:
2609 if len(bheads) == 1:
2609 if len(repo.heads()) > 1:
2610 if len(repo.heads()) > 1:
2610 raise util.Abort(_(
2611 raise util.Abort(_(
2611 'branch \'%s\' has one head - '
2612 'branch \'%s\' has one head - '
2612 'please merge with an explicit rev\n'
2613 'please merge with an explicit rev\n'
2613 '(run \'hg heads\' to see all heads)')
2614 '(run \'hg heads\' to see all heads)')
2614 % branch)
2615 % branch)
2615 msg = _('there is nothing to merge')
2616 msg = _('there is nothing to merge')
2616 if parent != repo.lookup(repo[None].branch()):
2617 if parent != repo.lookup(repo[None].branch()):
2617 msg = _('%s - use "hg update" instead') % msg
2618 msg = _('%s - use "hg update" instead') % msg
2618 raise util.Abort(msg)
2619 raise util.Abort(msg)
2619
2620
2620 if parent not in bheads:
2621 if parent not in bheads:
2621 raise util.Abort(_('working dir not at a head rev - '
2622 raise util.Abort(_('working dir not at a head rev - '
2622 'use "hg update" or merge with an explicit rev'))
2623 'use "hg update" or merge with an explicit rev'))
2623 node = parent == bheads[0] and bheads[-1] or bheads[0]
2624 node = parent == bheads[0] and bheads[-1] or bheads[0]
2624
2625
2625 if opts.get('preview'):
2626 if opts.get('preview'):
2626 # find nodes that are ancestors of p2 but not of p1
2627 # find nodes that are ancestors of p2 but not of p1
2627 p1 = repo.lookup('.')
2628 p1 = repo.lookup('.')
2628 p2 = repo.lookup(node)
2629 p2 = repo.lookup(node)
2629 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
2630 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
2630
2631
2631 displayer = cmdutil.show_changeset(ui, repo, opts)
2632 displayer = cmdutil.show_changeset(ui, repo, opts)
2632 for node in nodes:
2633 for node in nodes:
2633 displayer.show(repo[node])
2634 displayer.show(repo[node])
2634 displayer.close()
2635 displayer.close()
2635 return 0
2636 return 0
2636
2637
2637 return hg.merge(repo, node, force=opts.get('force'))
2638 return hg.merge(repo, node, force=opts.get('force'))
2638
2639
2639 def outgoing(ui, repo, dest=None, **opts):
2640 def outgoing(ui, repo, dest=None, **opts):
2640 """show changesets not found in the destination
2641 """show changesets not found in the destination
2641
2642
2642 Show changesets not found in the specified destination repository
2643 Show changesets not found in the specified destination repository
2643 or the default push location. These are the changesets that would
2644 or the default push location. These are the changesets that would
2644 be pushed if a push was requested.
2645 be pushed if a push was requested.
2645
2646
2646 See pull for details of valid destination formats.
2647 See pull for details of valid destination formats.
2647
2648
2648 Returns 0 if there are outgoing changes, 1 otherwise.
2649 Returns 0 if there are outgoing changes, 1 otherwise.
2649 """
2650 """
2650 limit = cmdutil.loglimit(opts)
2651 limit = cmdutil.loglimit(opts)
2651 dest = ui.expandpath(dest or 'default-push', dest or 'default')
2652 dest = ui.expandpath(dest or 'default-push', dest or 'default')
2652 dest, branches = hg.parseurl(dest, opts.get('branch'))
2653 dest, branches = hg.parseurl(dest, opts.get('branch'))
2653 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
2654 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
2654 if revs:
2655 if revs:
2655 revs = [repo.lookup(rev) for rev in revs]
2656 revs = [repo.lookup(rev) for rev in revs]
2656
2657
2657 other = hg.repository(hg.remoteui(repo, opts), dest)
2658 other = hg.repository(hg.remoteui(repo, opts), dest)
2658 ui.status(_('comparing with %s\n') % url.hidepassword(dest))
2659 ui.status(_('comparing with %s\n') % url.hidepassword(dest))
2659 o = discovery.findoutgoing(repo, other, force=opts.get('force'))
2660 o = discovery.findoutgoing(repo, other, force=opts.get('force'))
2660 if not o:
2661 if not o:
2661 ui.status(_("no changes found\n"))
2662 ui.status(_("no changes found\n"))
2662 return 1
2663 return 1
2663 o = repo.changelog.nodesbetween(o, revs)[0]
2664 o = repo.changelog.nodesbetween(o, revs)[0]
2664 if opts.get('newest_first'):
2665 if opts.get('newest_first'):
2665 o.reverse()
2666 o.reverse()
2666 displayer = cmdutil.show_changeset(ui, repo, opts)
2667 displayer = cmdutil.show_changeset(ui, repo, opts)
2667 count = 0
2668 count = 0
2668 for n in o:
2669 for n in o:
2669 if limit is not None and count >= limit:
2670 if limit is not None and count >= limit:
2670 break
2671 break
2671 parents = [p for p in repo.changelog.parents(n) if p != nullid]
2672 parents = [p for p in repo.changelog.parents(n) if p != nullid]
2672 if opts.get('no_merges') and len(parents) == 2:
2673 if opts.get('no_merges') and len(parents) == 2:
2673 continue
2674 continue
2674 count += 1
2675 count += 1
2675 displayer.show(repo[n])
2676 displayer.show(repo[n])
2676 displayer.close()
2677 displayer.close()
2677
2678
2678 def parents(ui, repo, file_=None, **opts):
2679 def parents(ui, repo, file_=None, **opts):
2679 """show the parents of the working directory or revision
2680 """show the parents of the working directory or revision
2680
2681
2681 Print the working directory's parent revisions. If a revision is
2682 Print the working directory's parent revisions. If a revision is
2682 given via -r/--rev, the parent of that revision will be printed.
2683 given via -r/--rev, the parent of that revision will be printed.
2683 If a file argument is given, the revision in which the file was
2684 If a file argument is given, the revision in which the file was
2684 last changed (before the working directory revision or the
2685 last changed (before the working directory revision or the
2685 argument to --rev if given) is printed.
2686 argument to --rev if given) is printed.
2686
2687
2687 Returns 0 on success.
2688 Returns 0 on success.
2688 """
2689 """
2689 rev = opts.get('rev')
2690 rev = opts.get('rev')
2690 if rev:
2691 if rev:
2691 ctx = repo[rev]
2692 ctx = repo[rev]
2692 else:
2693 else:
2693 ctx = repo[None]
2694 ctx = repo[None]
2694
2695
2695 if file_:
2696 if file_:
2696 m = cmdutil.match(repo, (file_,), opts)
2697 m = cmdutil.match(repo, (file_,), opts)
2697 if m.anypats() or len(m.files()) != 1:
2698 if m.anypats() or len(m.files()) != 1:
2698 raise util.Abort(_('can only specify an explicit filename'))
2699 raise util.Abort(_('can only specify an explicit filename'))
2699 file_ = m.files()[0]
2700 file_ = m.files()[0]
2700 filenodes = []
2701 filenodes = []
2701 for cp in ctx.parents():
2702 for cp in ctx.parents():
2702 if not cp:
2703 if not cp:
2703 continue
2704 continue
2704 try:
2705 try:
2705 filenodes.append(cp.filenode(file_))
2706 filenodes.append(cp.filenode(file_))
2706 except error.LookupError:
2707 except error.LookupError:
2707 pass
2708 pass
2708 if not filenodes:
2709 if not filenodes:
2709 raise util.Abort(_("'%s' not found in manifest!") % file_)
2710 raise util.Abort(_("'%s' not found in manifest!") % file_)
2710 fl = repo.file(file_)
2711 fl = repo.file(file_)
2711 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
2712 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
2712 else:
2713 else:
2713 p = [cp.node() for cp in ctx.parents()]
2714 p = [cp.node() for cp in ctx.parents()]
2714
2715
2715 displayer = cmdutil.show_changeset(ui, repo, opts)
2716 displayer = cmdutil.show_changeset(ui, repo, opts)
2716 for n in p:
2717 for n in p:
2717 if n != nullid:
2718 if n != nullid:
2718 displayer.show(repo[n])
2719 displayer.show(repo[n])
2719 displayer.close()
2720 displayer.close()
2720
2721
2721 def paths(ui, repo, search=None):
2722 def paths(ui, repo, search=None):
2722 """show aliases for remote repositories
2723 """show aliases for remote repositories
2723
2724
2724 Show definition of symbolic path name NAME. If no name is given,
2725 Show definition of symbolic path name NAME. If no name is given,
2725 show definition of all available names.
2726 show definition of all available names.
2726
2727
2727 Path names are defined in the [paths] section of
2728 Path names are defined in the [paths] section of
2728 ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a
2729 ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a
2729 repository, ``.hg/hgrc`` is used, too.
2730 repository, ``.hg/hgrc`` is used, too.
2730
2731
2731 The path names ``default`` and ``default-push`` have a special
2732 The path names ``default`` and ``default-push`` have a special
2732 meaning. When performing a push or pull operation, they are used
2733 meaning. When performing a push or pull operation, they are used
2733 as fallbacks if no location is specified on the command-line.
2734 as fallbacks if no location is specified on the command-line.
2734 When ``default-push`` is set, it will be used for push and
2735 When ``default-push`` is set, it will be used for push and
2735 ``default`` will be used for pull; otherwise ``default`` is used
2736 ``default`` will be used for pull; otherwise ``default`` is used
2736 as the fallback for both. When cloning a repository, the clone
2737 as the fallback for both. When cloning a repository, the clone
2737 source is written as ``default`` in ``.hg/hgrc``. Note that
2738 source is written as ``default`` in ``.hg/hgrc``. Note that
2738 ``default`` and ``default-push`` apply to all inbound (e.g.
2739 ``default`` and ``default-push`` apply to all inbound (e.g.
2739 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
2740 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
2740 :hg:`bundle`) operations.
2741 :hg:`bundle`) operations.
2741
2742
2742 See :hg:`help urls` for more information.
2743 See :hg:`help urls` for more information.
2743
2744
2744 Returns 0 on success.
2745 Returns 0 on success.
2745 """
2746 """
2746 if search:
2747 if search:
2747 for name, path in ui.configitems("paths"):
2748 for name, path in ui.configitems("paths"):
2748 if name == search:
2749 if name == search:
2749 ui.write("%s\n" % url.hidepassword(path))
2750 ui.write("%s\n" % url.hidepassword(path))
2750 return
2751 return
2751 ui.warn(_("not found!\n"))
2752 ui.warn(_("not found!\n"))
2752 return 1
2753 return 1
2753 else:
2754 else:
2754 for name, path in ui.configitems("paths"):
2755 for name, path in ui.configitems("paths"):
2755 ui.write("%s = %s\n" % (name, url.hidepassword(path)))
2756 ui.write("%s = %s\n" % (name, url.hidepassword(path)))
2756
2757
2757 def postincoming(ui, repo, modheads, optupdate, checkout):
2758 def postincoming(ui, repo, modheads, optupdate, checkout):
2758 if modheads == 0:
2759 if modheads == 0:
2759 return
2760 return
2760 if optupdate:
2761 if optupdate:
2761 if (modheads <= 1 or len(repo.branchheads()) == 1) or checkout:
2762 if (modheads <= 1 or len(repo.branchheads()) == 1) or checkout:
2762 return hg.update(repo, checkout)
2763 return hg.update(repo, checkout)
2763 else:
2764 else:
2764 ui.status(_("not updating, since new heads added\n"))
2765 ui.status(_("not updating, since new heads added\n"))
2765 if modheads > 1:
2766 if modheads > 1:
2766 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
2767 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
2767 else:
2768 else:
2768 ui.status(_("(run 'hg update' to get a working copy)\n"))
2769 ui.status(_("(run 'hg update' to get a working copy)\n"))
2769
2770
2770 def pull(ui, repo, source="default", **opts):
2771 def pull(ui, repo, source="default", **opts):
2771 """pull changes from the specified source
2772 """pull changes from the specified source
2772
2773
2773 Pull changes from a remote repository to a local one.
2774 Pull changes from a remote repository to a local one.
2774
2775
2775 This finds all changes from the repository at the specified path
2776 This finds all changes from the repository at the specified path
2776 or URL and adds them to a local repository (the current one unless
2777 or URL and adds them to a local repository (the current one unless
2777 -R is specified). By default, this does not update the copy of the
2778 -R is specified). By default, this does not update the copy of the
2778 project in the working directory.
2779 project in the working directory.
2779
2780
2780 Use :hg:`incoming` if you want to see what would have been added
2781 Use :hg:`incoming` if you want to see what would have been added
2781 by a pull at the time you issued this command. If you then decide
2782 by a pull at the time you issued this command. If you then decide
2782 to add those changes to the repository, you should use :hg:`pull
2783 to add those changes to the repository, you should use :hg:`pull
2783 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
2784 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
2784
2785
2785 If SOURCE is omitted, the 'default' path will be used.
2786 If SOURCE is omitted, the 'default' path will be used.
2786 See :hg:`help urls` for more information.
2787 See :hg:`help urls` for more information.
2787
2788
2788 Returns 0 on success, 1 if an update had unresolved files.
2789 Returns 0 on success, 1 if an update had unresolved files.
2789 """
2790 """
2790 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
2791 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
2791 other = hg.repository(hg.remoteui(repo, opts), source)
2792 other = hg.repository(hg.remoteui(repo, opts), source)
2792 ui.status(_('pulling from %s\n') % url.hidepassword(source))
2793 ui.status(_('pulling from %s\n') % url.hidepassword(source))
2793 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
2794 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
2794 if revs:
2795 if revs:
2795 try:
2796 try:
2796 revs = [other.lookup(rev) for rev in revs]
2797 revs = [other.lookup(rev) for rev in revs]
2797 except error.CapabilityError:
2798 except error.CapabilityError:
2798 err = _("Other repository doesn't support revision lookup, "
2799 err = _("Other repository doesn't support revision lookup, "
2799 "so a rev cannot be specified.")
2800 "so a rev cannot be specified.")
2800 raise util.Abort(err)
2801 raise util.Abort(err)
2801
2802
2802 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
2803 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
2803 if checkout:
2804 if checkout:
2804 checkout = str(repo.changelog.rev(other.lookup(checkout)))
2805 checkout = str(repo.changelog.rev(other.lookup(checkout)))
2805 return postincoming(ui, repo, modheads, opts.get('update'), checkout)
2806 return postincoming(ui, repo, modheads, opts.get('update'), checkout)
2806
2807
2807 def push(ui, repo, dest=None, **opts):
2808 def push(ui, repo, dest=None, **opts):
2808 """push changes to the specified destination
2809 """push changes to the specified destination
2809
2810
2810 Push changesets from the local repository to the specified
2811 Push changesets from the local repository to the specified
2811 destination.
2812 destination.
2812
2813
2813 This operation is symmetrical to pull: it is identical to a pull
2814 This operation is symmetrical to pull: it is identical to a pull
2814 in the destination repository from the current one.
2815 in the destination repository from the current one.
2815
2816
2816 By default, push will not allow creation of new heads at the
2817 By default, push will not allow creation of new heads at the
2817 destination, since multiple heads would make it unclear which head
2818 destination, since multiple heads would make it unclear which head
2818 to use. In this situation, it is recommended to pull and merge
2819 to use. In this situation, it is recommended to pull and merge
2819 before pushing.
2820 before pushing.
2820
2821
2821 Use --new-branch if you want to allow push to create a new named
2822 Use --new-branch if you want to allow push to create a new named
2822 branch that is not present at the destination. This allows you to
2823 branch that is not present at the destination. This allows you to
2823 only create a new branch without forcing other changes.
2824 only create a new branch without forcing other changes.
2824
2825
2825 Use -f/--force to override the default behavior and push all
2826 Use -f/--force to override the default behavior and push all
2826 changesets on all branches.
2827 changesets on all branches.
2827
2828
2828 If -r/--rev is used, the specified revision and all its ancestors
2829 If -r/--rev is used, the specified revision and all its ancestors
2829 will be pushed to the remote repository.
2830 will be pushed to the remote repository.
2830
2831
2831 Please see :hg:`help urls` for important details about ``ssh://``
2832 Please see :hg:`help urls` for important details about ``ssh://``
2832 URLs. If DESTINATION is omitted, a default path will be used.
2833 URLs. If DESTINATION is omitted, a default path will be used.
2833
2834
2834 Returns 0 if push was successful, 1 if nothing to push.
2835 Returns 0 if push was successful, 1 if nothing to push.
2835 """
2836 """
2836 dest = ui.expandpath(dest or 'default-push', dest or 'default')
2837 dest = ui.expandpath(dest or 'default-push', dest or 'default')
2837 dest, branches = hg.parseurl(dest, opts.get('branch'))
2838 dest, branches = hg.parseurl(dest, opts.get('branch'))
2838 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
2839 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
2839 other = hg.repository(hg.remoteui(repo, opts), dest)
2840 other = hg.repository(hg.remoteui(repo, opts), dest)
2840 ui.status(_('pushing to %s\n') % url.hidepassword(dest))
2841 ui.status(_('pushing to %s\n') % url.hidepassword(dest))
2841 if revs:
2842 if revs:
2842 revs = [repo.lookup(rev) for rev in revs]
2843 revs = [repo.lookup(rev) for rev in revs]
2843
2844
2844 # push subrepos depth-first for coherent ordering
2845 # push subrepos depth-first for coherent ordering
2845 c = repo['']
2846 c = repo['']
2846 subs = c.substate # only repos that are committed
2847 subs = c.substate # only repos that are committed
2847 for s in sorted(subs):
2848 for s in sorted(subs):
2848 if not c.sub(s).push(opts.get('force')):
2849 if not c.sub(s).push(opts.get('force')):
2849 return False
2850 return False
2850
2851
2851 r = repo.push(other, opts.get('force'), revs=revs,
2852 r = repo.push(other, opts.get('force'), revs=revs,
2852 newbranch=opts.get('new_branch'))
2853 newbranch=opts.get('new_branch'))
2853 return r == 0
2854 return r == 0
2854
2855
2855 def recover(ui, repo):
2856 def recover(ui, repo):
2856 """roll back an interrupted transaction
2857 """roll back an interrupted transaction
2857
2858
2858 Recover from an interrupted commit or pull.
2859 Recover from an interrupted commit or pull.
2859
2860
2860 This command tries to fix the repository status after an
2861 This command tries to fix the repository status after an
2861 interrupted operation. It should only be necessary when Mercurial
2862 interrupted operation. It should only be necessary when Mercurial
2862 suggests it.
2863 suggests it.
2863
2864
2864 Returns 0 if successful, 1 if nothing to recover or verify fails.
2865 Returns 0 if successful, 1 if nothing to recover or verify fails.
2865 """
2866 """
2866 if repo.recover():
2867 if repo.recover():
2867 return hg.verify(repo)
2868 return hg.verify(repo)
2868 return 1
2869 return 1
2869
2870
2870 def remove(ui, repo, *pats, **opts):
2871 def remove(ui, repo, *pats, **opts):
2871 """remove the specified files on the next commit
2872 """remove the specified files on the next commit
2872
2873
2873 Schedule the indicated files for removal from the repository.
2874 Schedule the indicated files for removal from the repository.
2874
2875
2875 This only removes files from the current branch, not from the
2876 This only removes files from the current branch, not from the
2876 entire project history. -A/--after can be used to remove only
2877 entire project history. -A/--after can be used to remove only
2877 files that have already been deleted, -f/--force can be used to
2878 files that have already been deleted, -f/--force can be used to
2878 force deletion, and -Af can be used to remove files from the next
2879 force deletion, and -Af can be used to remove files from the next
2879 revision without deleting them from the working directory.
2880 revision without deleting them from the working directory.
2880
2881
2881 The following table details the behavior of remove for different
2882 The following table details the behavior of remove for different
2882 file states (columns) and option combinations (rows). The file
2883 file states (columns) and option combinations (rows). The file
2883 states are Added [A], Clean [C], Modified [M] and Missing [!] (as
2884 states are Added [A], Clean [C], Modified [M] and Missing [!] (as
2884 reported by :hg:`status`). The actions are Warn, Remove (from
2885 reported by :hg:`status`). The actions are Warn, Remove (from
2885 branch) and Delete (from disk)::
2886 branch) and Delete (from disk)::
2886
2887
2887 A C M !
2888 A C M !
2888 none W RD W R
2889 none W RD W R
2889 -f R RD RD R
2890 -f R RD RD R
2890 -A W W W R
2891 -A W W W R
2891 -Af R R R R
2892 -Af R R R R
2892
2893
2893 This command schedules the files to be removed at the next commit.
2894 This command schedules the files to be removed at the next commit.
2894 To undo a remove before that, see :hg:`revert`.
2895 To undo a remove before that, see :hg:`revert`.
2895
2896
2896 Returns 0 on success, 1 if any warnings encountered.
2897 Returns 0 on success, 1 if any warnings encountered.
2897 """
2898 """
2898
2899
2899 ret = 0
2900 ret = 0
2900 after, force = opts.get('after'), opts.get('force')
2901 after, force = opts.get('after'), opts.get('force')
2901 if not pats and not after:
2902 if not pats and not after:
2902 raise util.Abort(_('no files specified'))
2903 raise util.Abort(_('no files specified'))
2903
2904
2904 m = cmdutil.match(repo, pats, opts)
2905 m = cmdutil.match(repo, pats, opts)
2905 s = repo.status(match=m, clean=True)
2906 s = repo.status(match=m, clean=True)
2906 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
2907 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
2907
2908
2908 for f in m.files():
2909 for f in m.files():
2909 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
2910 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
2910 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
2911 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
2911 ret = 1
2912 ret = 1
2912
2913
2913 def warn(files, reason):
2914 def warn(files, reason):
2914 for f in files:
2915 for f in files:
2915 ui.warn(_('not removing %s: file %s (use -f to force removal)\n')
2916 ui.warn(_('not removing %s: file %s (use -f to force removal)\n')
2916 % (m.rel(f), reason))
2917 % (m.rel(f), reason))
2917 ret = 1
2918 ret = 1
2918
2919
2919 if force:
2920 if force:
2920 remove, forget = modified + deleted + clean, added
2921 remove, forget = modified + deleted + clean, added
2921 elif after:
2922 elif after:
2922 remove, forget = deleted, []
2923 remove, forget = deleted, []
2923 warn(modified + added + clean, _('still exists'))
2924 warn(modified + added + clean, _('still exists'))
2924 else:
2925 else:
2925 remove, forget = deleted + clean, []
2926 remove, forget = deleted + clean, []
2926 warn(modified, _('is modified'))
2927 warn(modified, _('is modified'))
2927 warn(added, _('has been marked for add'))
2928 warn(added, _('has been marked for add'))
2928
2929
2929 for f in sorted(remove + forget):
2930 for f in sorted(remove + forget):
2930 if ui.verbose or not m.exact(f):
2931 if ui.verbose or not m.exact(f):
2931 ui.status(_('removing %s\n') % m.rel(f))
2932 ui.status(_('removing %s\n') % m.rel(f))
2932
2933
2933 repo[None].forget(forget)
2934 repo[None].forget(forget)
2934 repo[None].remove(remove, unlink=not after)
2935 repo[None].remove(remove, unlink=not after)
2935 return ret
2936 return ret
2936
2937
2937 def rename(ui, repo, *pats, **opts):
2938 def rename(ui, repo, *pats, **opts):
2938 """rename files; equivalent of copy + remove
2939 """rename files; equivalent of copy + remove
2939
2940
2940 Mark dest as copies of sources; mark sources for deletion. If dest
2941 Mark dest as copies of sources; mark sources for deletion. If dest
2941 is a directory, copies are put in that directory. If dest is a
2942 is a directory, copies are put in that directory. If dest is a
2942 file, there can only be one source.
2943 file, there can only be one source.
2943
2944
2944 By default, this command copies the contents of files as they
2945 By default, this command copies the contents of files as they
2945 exist in the working directory. If invoked with -A/--after, the
2946 exist in the working directory. If invoked with -A/--after, the
2946 operation is recorded, but no copying is performed.
2947 operation is recorded, but no copying is performed.
2947
2948
2948 This command takes effect at the next commit. To undo a rename
2949 This command takes effect at the next commit. To undo a rename
2949 before that, see :hg:`revert`.
2950 before that, see :hg:`revert`.
2950
2951
2951 Returns 0 on success, 1 if errors are encountered.
2952 Returns 0 on success, 1 if errors are encountered.
2952 """
2953 """
2953 wlock = repo.wlock(False)
2954 wlock = repo.wlock(False)
2954 try:
2955 try:
2955 return cmdutil.copy(ui, repo, pats, opts, rename=True)
2956 return cmdutil.copy(ui, repo, pats, opts, rename=True)
2956 finally:
2957 finally:
2957 wlock.release()
2958 wlock.release()
2958
2959
2959 def resolve(ui, repo, *pats, **opts):
2960 def resolve(ui, repo, *pats, **opts):
2960 """various operations to help finish a merge
2961 """various operations to help finish a merge
2961
2962
2962 This command includes several actions that are often useful while
2963 This command includes several actions that are often useful while
2963 performing a merge, after running ``merge`` but before running
2964 performing a merge, after running ``merge`` but before running
2964 ``commit``. (It is only meaningful if your working directory has
2965 ``commit``. (It is only meaningful if your working directory has
2965 two parents.) It is most relevant for merges with unresolved
2966 two parents.) It is most relevant for merges with unresolved
2966 conflicts, which are typically a result of non-interactive merging with
2967 conflicts, which are typically a result of non-interactive merging with
2967 ``internal:merge`` or a command-line merge tool like ``diff3``.
2968 ``internal:merge`` or a command-line merge tool like ``diff3``.
2968
2969
2969 The available actions are:
2970 The available actions are:
2970
2971
2971 1) list files that were merged with conflicts (U, for unresolved)
2972 1) list files that were merged with conflicts (U, for unresolved)
2972 and without conflicts (R, for resolved): ``hg resolve -l``
2973 and without conflicts (R, for resolved): ``hg resolve -l``
2973 (this is like ``status`` for merges)
2974 (this is like ``status`` for merges)
2974 2) record that you have resolved conflicts in certain files:
2975 2) record that you have resolved conflicts in certain files:
2975 ``hg resolve -m [file ...]`` (default: mark all unresolved files)
2976 ``hg resolve -m [file ...]`` (default: mark all unresolved files)
2976 3) forget that you have resolved conflicts in certain files:
2977 3) forget that you have resolved conflicts in certain files:
2977 ``hg resolve -u [file ...]`` (default: unmark all resolved files)
2978 ``hg resolve -u [file ...]`` (default: unmark all resolved files)
2978 4) discard your current attempt(s) at resolving conflicts and
2979 4) discard your current attempt(s) at resolving conflicts and
2979 restart the merge from scratch: ``hg resolve file...``
2980 restart the merge from scratch: ``hg resolve file...``
2980 (or ``-a`` for all unresolved files)
2981 (or ``-a`` for all unresolved files)
2981
2982
2982 Note that Mercurial will not let you commit files with unresolved merge
2983 Note that Mercurial will not let you commit files with unresolved merge
2983 conflicts. You must use ``hg resolve -m ...`` before you can commit
2984 conflicts. You must use ``hg resolve -m ...`` before you can commit
2984 after a conflicting merge.
2985 after a conflicting merge.
2985
2986
2986 Returns 0 on success, 1 if any files fail a resolve attempt.
2987 Returns 0 on success, 1 if any files fail a resolve attempt.
2987 """
2988 """
2988
2989
2989 all, mark, unmark, show, nostatus = \
2990 all, mark, unmark, show, nostatus = \
2990 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
2991 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
2991
2992
2992 if (show and (mark or unmark)) or (mark and unmark):
2993 if (show and (mark or unmark)) or (mark and unmark):
2993 raise util.Abort(_("too many options specified"))
2994 raise util.Abort(_("too many options specified"))
2994 if pats and all:
2995 if pats and all:
2995 raise util.Abort(_("can't specify --all and patterns"))
2996 raise util.Abort(_("can't specify --all and patterns"))
2996 if not (all or pats or show or mark or unmark):
2997 if not (all or pats or show or mark or unmark):
2997 raise util.Abort(_('no files or directories specified; '
2998 raise util.Abort(_('no files or directories specified; '
2998 'use --all to remerge all files'))
2999 'use --all to remerge all files'))
2999
3000
3000 ms = mergemod.mergestate(repo)
3001 ms = mergemod.mergestate(repo)
3001 m = cmdutil.match(repo, pats, opts)
3002 m = cmdutil.match(repo, pats, opts)
3002 ret = 0
3003 ret = 0
3003
3004
3004 for f in ms:
3005 for f in ms:
3005 if m(f):
3006 if m(f):
3006 if show:
3007 if show:
3007 if nostatus:
3008 if nostatus:
3008 ui.write("%s\n" % f)
3009 ui.write("%s\n" % f)
3009 else:
3010 else:
3010 ui.write("%s %s\n" % (ms[f].upper(), f),
3011 ui.write("%s %s\n" % (ms[f].upper(), f),
3011 label='resolve.' +
3012 label='resolve.' +
3012 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
3013 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
3013 elif mark:
3014 elif mark:
3014 ms.mark(f, "r")
3015 ms.mark(f, "r")
3015 elif unmark:
3016 elif unmark:
3016 ms.mark(f, "u")
3017 ms.mark(f, "u")
3017 else:
3018 else:
3018 wctx = repo[None]
3019 wctx = repo[None]
3019 mctx = wctx.parents()[-1]
3020 mctx = wctx.parents()[-1]
3020
3021
3021 # backup pre-resolve (merge uses .orig for its own purposes)
3022 # backup pre-resolve (merge uses .orig for its own purposes)
3022 a = repo.wjoin(f)
3023 a = repo.wjoin(f)
3023 util.copyfile(a, a + ".resolve")
3024 util.copyfile(a, a + ".resolve")
3024
3025
3025 # resolve file
3026 # resolve file
3026 if ms.resolve(f, wctx, mctx):
3027 if ms.resolve(f, wctx, mctx):
3027 ret = 1
3028 ret = 1
3028
3029
3029 # replace filemerge's .orig file with our resolve file
3030 # replace filemerge's .orig file with our resolve file
3030 util.rename(a + ".resolve", a + ".orig")
3031 util.rename(a + ".resolve", a + ".orig")
3031 return ret
3032 return ret
3032
3033
3033 def revert(ui, repo, *pats, **opts):
3034 def revert(ui, repo, *pats, **opts):
3034 """restore individual files or directories to an earlier state
3035 """restore individual files or directories to an earlier state
3035
3036
3036 NOTE: This command is most likely not what you are looking for. revert
3037 NOTE: This command is most likely not what you are looking for. revert
3037 will partially overwrite content in the working directory without changing
3038 will partially overwrite content in the working directory without changing
3038 the working directory parents. Use :hg:`update -r rev` to check out earlier
3039 the working directory parents. Use :hg:`update -r rev` to check out earlier
3039 revisions, or :hg:`update --clean .` to undo a merge which has added
3040 revisions, or :hg:`update --clean .` to undo a merge which has added
3040 another parent.
3041 another parent.
3041
3042
3042 With no revision specified, revert the named files or directories
3043 With no revision specified, revert the named files or directories
3043 to the contents they had in the parent of the working directory.
3044 to the contents they had in the parent of the working directory.
3044 This restores the contents of the affected files to an unmodified
3045 This restores the contents of the affected files to an unmodified
3045 state and unschedules adds, removes, copies, and renames. If the
3046 state and unschedules adds, removes, copies, and renames. If the
3046 working directory has two parents, you must explicitly specify a
3047 working directory has two parents, you must explicitly specify a
3047 revision.
3048 revision.
3048
3049
3049 Using the -r/--rev option, revert the given files or directories
3050 Using the -r/--rev option, revert the given files or directories
3050 to their contents as of a specific revision. This can be helpful
3051 to their contents as of a specific revision. This can be helpful
3051 to "roll back" some or all of an earlier change. See :hg:`help
3052 to "roll back" some or all of an earlier change. See :hg:`help
3052 dates` for a list of formats valid for -d/--date.
3053 dates` for a list of formats valid for -d/--date.
3053
3054
3054 Revert modifies the working directory. It does not commit any
3055 Revert modifies the working directory. It does not commit any
3055 changes, or change the parent of the working directory. If you
3056 changes, or change the parent of the working directory. If you
3056 revert to a revision other than the parent of the working
3057 revert to a revision other than the parent of the working
3057 directory, the reverted files will thus appear modified
3058 directory, the reverted files will thus appear modified
3058 afterwards.
3059 afterwards.
3059
3060
3060 If a file has been deleted, it is restored. If the executable mode
3061 If a file has been deleted, it is restored. If the executable mode
3061 of a file was changed, it is reset.
3062 of a file was changed, it is reset.
3062
3063
3063 If names are given, all files matching the names are reverted.
3064 If names are given, all files matching the names are reverted.
3064 If no arguments are given, no files are reverted.
3065 If no arguments are given, no files are reverted.
3065
3066
3066 Modified files are saved with a .orig suffix before reverting.
3067 Modified files are saved with a .orig suffix before reverting.
3067 To disable these backups, use --no-backup.
3068 To disable these backups, use --no-backup.
3068
3069
3069 Returns 0 on success.
3070 Returns 0 on success.
3070 """
3071 """
3071
3072
3072 if opts["date"]:
3073 if opts["date"]:
3073 if opts["rev"]:
3074 if opts["rev"]:
3074 raise util.Abort(_("you can't specify a revision and a date"))
3075 raise util.Abort(_("you can't specify a revision and a date"))
3075 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
3076 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
3076
3077
3077 if not pats and not opts.get('all'):
3078 if not pats and not opts.get('all'):
3078 raise util.Abort(_('no files or directories specified; '
3079 raise util.Abort(_('no files or directories specified; '
3079 'use --all to revert the whole repo'))
3080 'use --all to revert the whole repo'))
3080
3081
3081 parent, p2 = repo.dirstate.parents()
3082 parent, p2 = repo.dirstate.parents()
3082 if not opts.get('rev') and p2 != nullid:
3083 if not opts.get('rev') and p2 != nullid:
3083 raise util.Abort(_('uncommitted merge - please provide a '
3084 raise util.Abort(_('uncommitted merge - please provide a '
3084 'specific revision'))
3085 'specific revision'))
3085 ctx = repo[opts.get('rev')]
3086 ctx = repo[opts.get('rev')]
3086 node = ctx.node()
3087 node = ctx.node()
3087 mf = ctx.manifest()
3088 mf = ctx.manifest()
3088 if node == parent:
3089 if node == parent:
3089 pmf = mf
3090 pmf = mf
3090 else:
3091 else:
3091 pmf = None
3092 pmf = None
3092
3093
3093 # need all matching names in dirstate and manifest of target rev,
3094 # need all matching names in dirstate and manifest of target rev,
3094 # so have to walk both. do not print errors if files exist in one
3095 # so have to walk both. do not print errors if files exist in one
3095 # but not other.
3096 # but not other.
3096
3097
3097 names = {}
3098 names = {}
3098
3099
3099 wlock = repo.wlock()
3100 wlock = repo.wlock()
3100 try:
3101 try:
3101 # walk dirstate.
3102 # walk dirstate.
3102
3103
3103 m = cmdutil.match(repo, pats, opts)
3104 m = cmdutil.match(repo, pats, opts)
3104 m.bad = lambda x, y: False
3105 m.bad = lambda x, y: False
3105 for abs in repo.walk(m):
3106 for abs in repo.walk(m):
3106 names[abs] = m.rel(abs), m.exact(abs)
3107 names[abs] = m.rel(abs), m.exact(abs)
3107
3108
3108 # walk target manifest.
3109 # walk target manifest.
3109
3110
3110 def badfn(path, msg):
3111 def badfn(path, msg):
3111 if path in names:
3112 if path in names:
3112 return
3113 return
3113 path_ = path + '/'
3114 path_ = path + '/'
3114 for f in names:
3115 for f in names:
3115 if f.startswith(path_):
3116 if f.startswith(path_):
3116 return
3117 return
3117 ui.warn("%s: %s\n" % (m.rel(path), msg))
3118 ui.warn("%s: %s\n" % (m.rel(path), msg))
3118
3119
3119 m = cmdutil.match(repo, pats, opts)
3120 m = cmdutil.match(repo, pats, opts)
3120 m.bad = badfn
3121 m.bad = badfn
3121 for abs in repo[node].walk(m):
3122 for abs in repo[node].walk(m):
3122 if abs not in names:
3123 if abs not in names:
3123 names[abs] = m.rel(abs), m.exact(abs)
3124 names[abs] = m.rel(abs), m.exact(abs)
3124
3125
3125 m = cmdutil.matchfiles(repo, names)
3126 m = cmdutil.matchfiles(repo, names)
3126 changes = repo.status(match=m)[:4]
3127 changes = repo.status(match=m)[:4]
3127 modified, added, removed, deleted = map(set, changes)
3128 modified, added, removed, deleted = map(set, changes)
3128
3129
3129 # if f is a rename, also revert the source
3130 # if f is a rename, also revert the source
3130 cwd = repo.getcwd()
3131 cwd = repo.getcwd()
3131 for f in added:
3132 for f in added:
3132 src = repo.dirstate.copied(f)
3133 src = repo.dirstate.copied(f)
3133 if src and src not in names and repo.dirstate[src] == 'r':
3134 if src and src not in names and repo.dirstate[src] == 'r':
3134 removed.add(src)
3135 removed.add(src)
3135 names[src] = (repo.pathto(src, cwd), True)
3136 names[src] = (repo.pathto(src, cwd), True)
3136
3137
3137 def removeforget(abs):
3138 def removeforget(abs):
3138 if repo.dirstate[abs] == 'a':
3139 if repo.dirstate[abs] == 'a':
3139 return _('forgetting %s\n')
3140 return _('forgetting %s\n')
3140 return _('removing %s\n')
3141 return _('removing %s\n')
3141
3142
3142 revert = ([], _('reverting %s\n'))
3143 revert = ([], _('reverting %s\n'))
3143 add = ([], _('adding %s\n'))
3144 add = ([], _('adding %s\n'))
3144 remove = ([], removeforget)
3145 remove = ([], removeforget)
3145 undelete = ([], _('undeleting %s\n'))
3146 undelete = ([], _('undeleting %s\n'))
3146
3147
3147 disptable = (
3148 disptable = (
3148 # dispatch table:
3149 # dispatch table:
3149 # file state
3150 # file state
3150 # action if in target manifest
3151 # action if in target manifest
3151 # action if not in target manifest
3152 # action if not in target manifest
3152 # make backup if in target manifest
3153 # make backup if in target manifest
3153 # make backup if not in target manifest
3154 # make backup if not in target manifest
3154 (modified, revert, remove, True, True),
3155 (modified, revert, remove, True, True),
3155 (added, revert, remove, True, False),
3156 (added, revert, remove, True, False),
3156 (removed, undelete, None, False, False),
3157 (removed, undelete, None, False, False),
3157 (deleted, revert, remove, False, False),
3158 (deleted, revert, remove, False, False),
3158 )
3159 )
3159
3160
3160 for abs, (rel, exact) in sorted(names.items()):
3161 for abs, (rel, exact) in sorted(names.items()):
3161 mfentry = mf.get(abs)
3162 mfentry = mf.get(abs)
3162 target = repo.wjoin(abs)
3163 target = repo.wjoin(abs)
3163 def handle(xlist, dobackup):
3164 def handle(xlist, dobackup):
3164 xlist[0].append(abs)
3165 xlist[0].append(abs)
3165 if dobackup and not opts.get('no_backup') and util.lexists(target):
3166 if dobackup and not opts.get('no_backup') and util.lexists(target):
3166 bakname = "%s.orig" % rel
3167 bakname = "%s.orig" % rel
3167 ui.note(_('saving current version of %s as %s\n') %
3168 ui.note(_('saving current version of %s as %s\n') %
3168 (rel, bakname))
3169 (rel, bakname))
3169 if not opts.get('dry_run'):
3170 if not opts.get('dry_run'):
3170 util.rename(target, bakname)
3171 util.rename(target, bakname)
3171 if ui.verbose or not exact:
3172 if ui.verbose or not exact:
3172 msg = xlist[1]
3173 msg = xlist[1]
3173 if not isinstance(msg, basestring):
3174 if not isinstance(msg, basestring):
3174 msg = msg(abs)
3175 msg = msg(abs)
3175 ui.status(msg % rel)
3176 ui.status(msg % rel)
3176 for table, hitlist, misslist, backuphit, backupmiss in disptable:
3177 for table, hitlist, misslist, backuphit, backupmiss in disptable:
3177 if abs not in table:
3178 if abs not in table:
3178 continue
3179 continue
3179 # file has changed in dirstate
3180 # file has changed in dirstate
3180 if mfentry:
3181 if mfentry:
3181 handle(hitlist, backuphit)
3182 handle(hitlist, backuphit)
3182 elif misslist is not None:
3183 elif misslist is not None:
3183 handle(misslist, backupmiss)
3184 handle(misslist, backupmiss)
3184 break
3185 break
3185 else:
3186 else:
3186 if abs not in repo.dirstate:
3187 if abs not in repo.dirstate:
3187 if mfentry:
3188 if mfentry:
3188 handle(add, True)
3189 handle(add, True)
3189 elif exact:
3190 elif exact:
3190 ui.warn(_('file not managed: %s\n') % rel)
3191 ui.warn(_('file not managed: %s\n') % rel)
3191 continue
3192 continue
3192 # file has not changed in dirstate
3193 # file has not changed in dirstate
3193 if node == parent:
3194 if node == parent:
3194 if exact:
3195 if exact:
3195 ui.warn(_('no changes needed to %s\n') % rel)
3196 ui.warn(_('no changes needed to %s\n') % rel)
3196 continue
3197 continue
3197 if pmf is None:
3198 if pmf is None:
3198 # only need parent manifest in this unlikely case,
3199 # only need parent manifest in this unlikely case,
3199 # so do not read by default
3200 # so do not read by default
3200 pmf = repo[parent].manifest()
3201 pmf = repo[parent].manifest()
3201 if abs in pmf:
3202 if abs in pmf:
3202 if mfentry:
3203 if mfentry:
3203 # if version of file is same in parent and target
3204 # if version of file is same in parent and target
3204 # manifests, do nothing
3205 # manifests, do nothing
3205 if (pmf[abs] != mfentry or
3206 if (pmf[abs] != mfentry or
3206 pmf.flags(abs) != mf.flags(abs)):
3207 pmf.flags(abs) != mf.flags(abs)):
3207 handle(revert, False)
3208 handle(revert, False)
3208 else:
3209 else:
3209 handle(remove, False)
3210 handle(remove, False)
3210
3211
3211 if not opts.get('dry_run'):
3212 if not opts.get('dry_run'):
3212 def checkout(f):
3213 def checkout(f):
3213 fc = ctx[f]
3214 fc = ctx[f]
3214 repo.wwrite(f, fc.data(), fc.flags())
3215 repo.wwrite(f, fc.data(), fc.flags())
3215
3216
3216 audit_path = util.path_auditor(repo.root)
3217 audit_path = util.path_auditor(repo.root)
3217 for f in remove[0]:
3218 for f in remove[0]:
3218 if repo.dirstate[f] == 'a':
3219 if repo.dirstate[f] == 'a':
3219 repo.dirstate.forget(f)
3220 repo.dirstate.forget(f)
3220 continue
3221 continue
3221 audit_path(f)
3222 audit_path(f)
3222 try:
3223 try:
3223 util.unlink(repo.wjoin(f))
3224 util.unlink(repo.wjoin(f))
3224 except OSError:
3225 except OSError:
3225 pass
3226 pass
3226 repo.dirstate.remove(f)
3227 repo.dirstate.remove(f)
3227
3228
3228 normal = None
3229 normal = None
3229 if node == parent:
3230 if node == parent:
3230 # We're reverting to our parent. If possible, we'd like status
3231 # We're reverting to our parent. If possible, we'd like status
3231 # to report the file as clean. We have to use normallookup for
3232 # to report the file as clean. We have to use normallookup for
3232 # merges to avoid losing information about merged/dirty files.
3233 # merges to avoid losing information about merged/dirty files.
3233 if p2 != nullid:
3234 if p2 != nullid:
3234 normal = repo.dirstate.normallookup
3235 normal = repo.dirstate.normallookup
3235 else:
3236 else:
3236 normal = repo.dirstate.normal
3237 normal = repo.dirstate.normal
3237 for f in revert[0]:
3238 for f in revert[0]:
3238 checkout(f)
3239 checkout(f)
3239 if normal:
3240 if normal:
3240 normal(f)
3241 normal(f)
3241
3242
3242 for f in add[0]:
3243 for f in add[0]:
3243 checkout(f)
3244 checkout(f)
3244 repo.dirstate.add(f)
3245 repo.dirstate.add(f)
3245
3246
3246 normal = repo.dirstate.normallookup
3247 normal = repo.dirstate.normallookup
3247 if node == parent and p2 == nullid:
3248 if node == parent and p2 == nullid:
3248 normal = repo.dirstate.normal
3249 normal = repo.dirstate.normal
3249 for f in undelete[0]:
3250 for f in undelete[0]:
3250 checkout(f)
3251 checkout(f)
3251 normal(f)
3252 normal(f)
3252
3253
3253 finally:
3254 finally:
3254 wlock.release()
3255 wlock.release()
3255
3256
3256 def rollback(ui, repo, **opts):
3257 def rollback(ui, repo, **opts):
3257 """roll back the last transaction (dangerous)
3258 """roll back the last transaction (dangerous)
3258
3259
3259 This command should be used with care. There is only one level of
3260 This command should be used with care. There is only one level of
3260 rollback, and there is no way to undo a rollback. It will also
3261 rollback, and there is no way to undo a rollback. It will also
3261 restore the dirstate at the time of the last transaction, losing
3262 restore the dirstate at the time of the last transaction, losing
3262 any dirstate changes since that time. This command does not alter
3263 any dirstate changes since that time. This command does not alter
3263 the working directory.
3264 the working directory.
3264
3265
3265 Transactions are used to encapsulate the effects of all commands
3266 Transactions are used to encapsulate the effects of all commands
3266 that create new changesets or propagate existing changesets into a
3267 that create new changesets or propagate existing changesets into a
3267 repository. For example, the following commands are transactional,
3268 repository. For example, the following commands are transactional,
3268 and their effects can be rolled back:
3269 and their effects can be rolled back:
3269
3270
3270 - commit
3271 - commit
3271 - import
3272 - import
3272 - pull
3273 - pull
3273 - push (with this repository as the destination)
3274 - push (with this repository as the destination)
3274 - unbundle
3275 - unbundle
3275
3276
3276 This command is not intended for use on public repositories. Once
3277 This command is not intended for use on public repositories. Once
3277 changes are visible for pull by other users, rolling a transaction
3278 changes are visible for pull by other users, rolling a transaction
3278 back locally is ineffective (someone else may already have pulled
3279 back locally is ineffective (someone else may already have pulled
3279 the changes). Furthermore, a race is possible with readers of the
3280 the changes). Furthermore, a race is possible with readers of the
3280 repository; for example an in-progress pull from the repository
3281 repository; for example an in-progress pull from the repository
3281 may fail if a rollback is performed.
3282 may fail if a rollback is performed.
3282
3283
3283 Returns 0 on success, 1 if no rollback data is available.
3284 Returns 0 on success, 1 if no rollback data is available.
3284 """
3285 """
3285 return repo.rollback(opts.get('dry_run'))
3286 return repo.rollback(opts.get('dry_run'))
3286
3287
3287 def root(ui, repo):
3288 def root(ui, repo):
3288 """print the root (top) of the current working directory
3289 """print the root (top) of the current working directory
3289
3290
3290 Print the root directory of the current repository.
3291 Print the root directory of the current repository.
3291
3292
3292 Returns 0 on success.
3293 Returns 0 on success.
3293 """
3294 """
3294 ui.write(repo.root + "\n")
3295 ui.write(repo.root + "\n")
3295
3296
3296 def serve(ui, repo, **opts):
3297 def serve(ui, repo, **opts):
3297 """start stand-alone webserver
3298 """start stand-alone webserver
3298
3299
3299 Start a local HTTP repository browser and pull server. You can use
3300 Start a local HTTP repository browser and pull server. You can use
3300 this for ad-hoc sharing and browing of repositories. It is
3301 this for ad-hoc sharing and browing of repositories. It is
3301 recommended to use a real web server to serve a repository for
3302 recommended to use a real web server to serve a repository for
3302 longer periods of time.
3303 longer periods of time.
3303
3304
3304 Please note that the server does not implement access control.
3305 Please note that the server does not implement access control.
3305 This means that, by default, anybody can read from the server and
3306 This means that, by default, anybody can read from the server and
3306 nobody can write to it by default. Set the ``web.allow_push``
3307 nobody can write to it by default. Set the ``web.allow_push``
3307 option to ``*`` to allow everybody to push to the server. You
3308 option to ``*`` to allow everybody to push to the server. You
3308 should use a real web server if you need to authenticate users.
3309 should use a real web server if you need to authenticate users.
3309
3310
3310 By default, the server logs accesses to stdout and errors to
3311 By default, the server logs accesses to stdout and errors to
3311 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
3312 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
3312 files.
3313 files.
3313
3314
3314 To have the server choose a free port number to listen on, specify
3315 To have the server choose a free port number to listen on, specify
3315 a port number of 0; in this case, the server will print the port
3316 a port number of 0; in this case, the server will print the port
3316 number it uses.
3317 number it uses.
3317
3318
3318 Returns 0 on success.
3319 Returns 0 on success.
3319 """
3320 """
3320
3321
3321 if opts["stdio"]:
3322 if opts["stdio"]:
3322 if repo is None:
3323 if repo is None:
3323 raise error.RepoError(_("There is no Mercurial repository here"
3324 raise error.RepoError(_("There is no Mercurial repository here"
3324 " (.hg not found)"))
3325 " (.hg not found)"))
3325 s = sshserver.sshserver(ui, repo)
3326 s = sshserver.sshserver(ui, repo)
3326 s.serve_forever()
3327 s.serve_forever()
3327
3328
3328 # this way we can check if something was given in the command-line
3329 # this way we can check if something was given in the command-line
3329 if opts.get('port'):
3330 if opts.get('port'):
3330 opts['port'] = int(opts.get('port'))
3331 opts['port'] = int(opts.get('port'))
3331
3332
3332 baseui = repo and repo.baseui or ui
3333 baseui = repo and repo.baseui or ui
3333 optlist = ("name templates style address port prefix ipv6"
3334 optlist = ("name templates style address port prefix ipv6"
3334 " accesslog errorlog certificate encoding")
3335 " accesslog errorlog certificate encoding")
3335 for o in optlist.split():
3336 for o in optlist.split():
3336 val = opts.get(o, '')
3337 val = opts.get(o, '')
3337 if val in (None, ''): # should check against default options instead
3338 if val in (None, ''): # should check against default options instead
3338 continue
3339 continue
3339 baseui.setconfig("web", o, val)
3340 baseui.setconfig("web", o, val)
3340 if repo and repo.ui != baseui:
3341 if repo and repo.ui != baseui:
3341 repo.ui.setconfig("web", o, val)
3342 repo.ui.setconfig("web", o, val)
3342
3343
3343 o = opts.get('web_conf') or opts.get('webdir_conf')
3344 o = opts.get('web_conf') or opts.get('webdir_conf')
3344 if not o:
3345 if not o:
3345 if not repo:
3346 if not repo:
3346 raise error.RepoError(_("There is no Mercurial repository"
3347 raise error.RepoError(_("There is no Mercurial repository"
3347 " here (.hg not found)"))
3348 " here (.hg not found)"))
3348 o = repo.root
3349 o = repo.root
3349
3350
3350 app = hgweb.hgweb(o, baseui=ui)
3351 app = hgweb.hgweb(o, baseui=ui)
3351
3352
3352 class service(object):
3353 class service(object):
3353 def init(self):
3354 def init(self):
3354 util.set_signal_handler()
3355 util.set_signal_handler()
3355 self.httpd = hgweb.server.create_server(ui, app)
3356 self.httpd = hgweb.server.create_server(ui, app)
3356
3357
3357 if opts['port'] and not ui.verbose:
3358 if opts['port'] and not ui.verbose:
3358 return
3359 return
3359
3360
3360 if self.httpd.prefix:
3361 if self.httpd.prefix:
3361 prefix = self.httpd.prefix.strip('/') + '/'
3362 prefix = self.httpd.prefix.strip('/') + '/'
3362 else:
3363 else:
3363 prefix = ''
3364 prefix = ''
3364
3365
3365 port = ':%d' % self.httpd.port
3366 port = ':%d' % self.httpd.port
3366 if port == ':80':
3367 if port == ':80':
3367 port = ''
3368 port = ''
3368
3369
3369 bindaddr = self.httpd.addr
3370 bindaddr = self.httpd.addr
3370 if bindaddr == '0.0.0.0':
3371 if bindaddr == '0.0.0.0':
3371 bindaddr = '*'
3372 bindaddr = '*'
3372 elif ':' in bindaddr: # IPv6
3373 elif ':' in bindaddr: # IPv6
3373 bindaddr = '[%s]' % bindaddr
3374 bindaddr = '[%s]' % bindaddr
3374
3375
3375 fqaddr = self.httpd.fqaddr
3376 fqaddr = self.httpd.fqaddr
3376 if ':' in fqaddr:
3377 if ':' in fqaddr:
3377 fqaddr = '[%s]' % fqaddr
3378 fqaddr = '[%s]' % fqaddr
3378 if opts['port']:
3379 if opts['port']:
3379 write = ui.status
3380 write = ui.status
3380 else:
3381 else:
3381 write = ui.write
3382 write = ui.write
3382 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
3383 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
3383 (fqaddr, port, prefix, bindaddr, self.httpd.port))
3384 (fqaddr, port, prefix, bindaddr, self.httpd.port))
3384
3385
3385 def run(self):
3386 def run(self):
3386 self.httpd.serve_forever()
3387 self.httpd.serve_forever()
3387
3388
3388 service = service()
3389 service = service()
3389
3390
3390 cmdutil.service(opts, initfn=service.init, runfn=service.run)
3391 cmdutil.service(opts, initfn=service.init, runfn=service.run)
3391
3392
3392 def status(ui, repo, *pats, **opts):
3393 def status(ui, repo, *pats, **opts):
3393 """show changed files in the working directory
3394 """show changed files in the working directory
3394
3395
3395 Show status of files in the repository. If names are given, only
3396 Show status of files in the repository. If names are given, only
3396 files that match are shown. Files that are clean or ignored or
3397 files that match are shown. Files that are clean or ignored or
3397 the source of a copy/move operation, are not listed unless
3398 the source of a copy/move operation, are not listed unless
3398 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
3399 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
3399 Unless options described with "show only ..." are given, the
3400 Unless options described with "show only ..." are given, the
3400 options -mardu are used.
3401 options -mardu are used.
3401
3402
3402 Option -q/--quiet hides untracked (unknown and ignored) files
3403 Option -q/--quiet hides untracked (unknown and ignored) files
3403 unless explicitly requested with -u/--unknown or -i/--ignored.
3404 unless explicitly requested with -u/--unknown or -i/--ignored.
3404
3405
3405 NOTE: status may appear to disagree with diff if permissions have
3406 NOTE: status may appear to disagree with diff if permissions have
3406 changed or a merge has occurred. The standard diff format does not
3407 changed or a merge has occurred. The standard diff format does not
3407 report permission changes and diff only reports changes relative
3408 report permission changes and diff only reports changes relative
3408 to one merge parent.
3409 to one merge parent.
3409
3410
3410 If one revision is given, it is used as the base revision.
3411 If one revision is given, it is used as the base revision.
3411 If two revisions are given, the differences between them are
3412 If two revisions are given, the differences between them are
3412 shown. The --change option can also be used as a shortcut to list
3413 shown. The --change option can also be used as a shortcut to list
3413 the changed files of a revision from its first parent.
3414 the changed files of a revision from its first parent.
3414
3415
3415 The codes used to show the status of files are::
3416 The codes used to show the status of files are::
3416
3417
3417 M = modified
3418 M = modified
3418 A = added
3419 A = added
3419 R = removed
3420 R = removed
3420 C = clean
3421 C = clean
3421 ! = missing (deleted by non-hg command, but still tracked)
3422 ! = missing (deleted by non-hg command, but still tracked)
3422 ? = not tracked
3423 ? = not tracked
3423 I = ignored
3424 I = ignored
3424 = origin of the previous file listed as A (added)
3425 = origin of the previous file listed as A (added)
3425
3426
3426 Returns 0 on success.
3427 Returns 0 on success.
3427 """
3428 """
3428
3429
3429 revs = opts.get('rev')
3430 revs = opts.get('rev')
3430 change = opts.get('change')
3431 change = opts.get('change')
3431
3432
3432 if revs and change:
3433 if revs and change:
3433 msg = _('cannot specify --rev and --change at the same time')
3434 msg = _('cannot specify --rev and --change at the same time')
3434 raise util.Abort(msg)
3435 raise util.Abort(msg)
3435 elif change:
3436 elif change:
3436 node2 = repo.lookup(change)
3437 node2 = repo.lookup(change)
3437 node1 = repo[node2].parents()[0].node()
3438 node1 = repo[node2].parents()[0].node()
3438 else:
3439 else:
3439 node1, node2 = cmdutil.revpair(repo, revs)
3440 node1, node2 = cmdutil.revpair(repo, revs)
3440
3441
3441 cwd = (pats and repo.getcwd()) or ''
3442 cwd = (pats and repo.getcwd()) or ''
3442 end = opts.get('print0') and '\0' or '\n'
3443 end = opts.get('print0') and '\0' or '\n'
3443 copy = {}
3444 copy = {}
3444 states = 'modified added removed deleted unknown ignored clean'.split()
3445 states = 'modified added removed deleted unknown ignored clean'.split()
3445 show = [k for k in states if opts.get(k)]
3446 show = [k for k in states if opts.get(k)]
3446 if opts.get('all'):
3447 if opts.get('all'):
3447 show += ui.quiet and (states[:4] + ['clean']) or states
3448 show += ui.quiet and (states[:4] + ['clean']) or states
3448 if not show:
3449 if not show:
3449 show = ui.quiet and states[:4] or states[:5]
3450 show = ui.quiet and states[:4] or states[:5]
3450
3451
3451 stat = repo.status(node1, node2, cmdutil.match(repo, pats, opts),
3452 stat = repo.status(node1, node2, cmdutil.match(repo, pats, opts),
3452 'ignored' in show, 'clean' in show, 'unknown' in show)
3453 'ignored' in show, 'clean' in show, 'unknown' in show)
3453 changestates = zip(states, 'MAR!?IC', stat)
3454 changestates = zip(states, 'MAR!?IC', stat)
3454
3455
3455 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
3456 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
3456 ctxn = repo[nullid]
3457 ctxn = repo[nullid]
3457 ctx1 = repo[node1]
3458 ctx1 = repo[node1]
3458 ctx2 = repo[node2]
3459 ctx2 = repo[node2]
3459 added = stat[1]
3460 added = stat[1]
3460 if node2 is None:
3461 if node2 is None:
3461 added = stat[0] + stat[1] # merged?
3462 added = stat[0] + stat[1] # merged?
3462
3463
3463 for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].iteritems():
3464 for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].iteritems():
3464 if k in added:
3465 if k in added:
3465 copy[k] = v
3466 copy[k] = v
3466 elif v in added:
3467 elif v in added:
3467 copy[v] = k
3468 copy[v] = k
3468
3469
3469 for state, char, files in changestates:
3470 for state, char, files in changestates:
3470 if state in show:
3471 if state in show:
3471 format = "%s %%s%s" % (char, end)
3472 format = "%s %%s%s" % (char, end)
3472 if opts.get('no_status'):
3473 if opts.get('no_status'):
3473 format = "%%s%s" % end
3474 format = "%%s%s" % end
3474
3475
3475 for f in files:
3476 for f in files:
3476 ui.write(format % repo.pathto(f, cwd),
3477 ui.write(format % repo.pathto(f, cwd),
3477 label='status.' + state)
3478 label='status.' + state)
3478 if f in copy:
3479 if f in copy:
3479 ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end),
3480 ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end),
3480 label='status.copied')
3481 label='status.copied')
3481
3482
3482 def summary(ui, repo, **opts):
3483 def summary(ui, repo, **opts):
3483 """summarize working directory state
3484 """summarize working directory state
3484
3485
3485 This generates a brief summary of the working directory state,
3486 This generates a brief summary of the working directory state,
3486 including parents, branch, commit status, and available updates.
3487 including parents, branch, commit status, and available updates.
3487
3488
3488 With the --remote option, this will check the default paths for
3489 With the --remote option, this will check the default paths for
3489 incoming and outgoing changes. This can be time-consuming.
3490 incoming and outgoing changes. This can be time-consuming.
3490
3491
3491 Returns 0 on success.
3492 Returns 0 on success.
3492 """
3493 """
3493
3494
3494 ctx = repo[None]
3495 ctx = repo[None]
3495 parents = ctx.parents()
3496 parents = ctx.parents()
3496 pnode = parents[0].node()
3497 pnode = parents[0].node()
3497
3498
3498 for p in parents:
3499 for p in parents:
3499 # label with log.changeset (instead of log.parent) since this
3500 # label with log.changeset (instead of log.parent) since this
3500 # shows a working directory parent *changeset*:
3501 # shows a working directory parent *changeset*:
3501 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
3502 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
3502 label='log.changeset')
3503 label='log.changeset')
3503 ui.write(' '.join(p.tags()), label='log.tag')
3504 ui.write(' '.join(p.tags()), label='log.tag')
3504 if p.rev() == -1:
3505 if p.rev() == -1:
3505 if not len(repo):
3506 if not len(repo):
3506 ui.write(_(' (empty repository)'))
3507 ui.write(_(' (empty repository)'))
3507 else:
3508 else:
3508 ui.write(_(' (no revision checked out)'))
3509 ui.write(_(' (no revision checked out)'))
3509 ui.write('\n')
3510 ui.write('\n')
3510 if p.description():
3511 if p.description():
3511 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
3512 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
3512 label='log.summary')
3513 label='log.summary')
3513
3514
3514 branch = ctx.branch()
3515 branch = ctx.branch()
3515 bheads = repo.branchheads(branch)
3516 bheads = repo.branchheads(branch)
3516 m = _('branch: %s\n') % branch
3517 m = _('branch: %s\n') % branch
3517 if branch != 'default':
3518 if branch != 'default':
3518 ui.write(m, label='log.branch')
3519 ui.write(m, label='log.branch')
3519 else:
3520 else:
3520 ui.status(m, label='log.branch')
3521 ui.status(m, label='log.branch')
3521
3522
3522 st = list(repo.status(unknown=True))[:6]
3523 st = list(repo.status(unknown=True))[:6]
3523
3524
3524 c = repo.dirstate.copies()
3525 c = repo.dirstate.copies()
3525 copied, renamed = [], []
3526 copied, renamed = [], []
3526 for d, s in c.iteritems():
3527 for d, s in c.iteritems():
3527 if s in st[2]:
3528 if s in st[2]:
3528 st[2].remove(s)
3529 st[2].remove(s)
3529 renamed.append(d)
3530 renamed.append(d)
3530 else:
3531 else:
3531 copied.append(d)
3532 copied.append(d)
3532 if d in st[1]:
3533 if d in st[1]:
3533 st[1].remove(d)
3534 st[1].remove(d)
3534 st.insert(3, renamed)
3535 st.insert(3, renamed)
3535 st.insert(4, copied)
3536 st.insert(4, copied)
3536
3537
3537 ms = mergemod.mergestate(repo)
3538 ms = mergemod.mergestate(repo)
3538 st.append([f for f in ms if ms[f] == 'u'])
3539 st.append([f for f in ms if ms[f] == 'u'])
3539
3540
3540 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
3541 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
3541 st.append(subs)
3542 st.append(subs)
3542
3543
3543 labels = [ui.label(_('%d modified'), 'status.modified'),
3544 labels = [ui.label(_('%d modified'), 'status.modified'),
3544 ui.label(_('%d added'), 'status.added'),
3545 ui.label(_('%d added'), 'status.added'),
3545 ui.label(_('%d removed'), 'status.removed'),
3546 ui.label(_('%d removed'), 'status.removed'),
3546 ui.label(_('%d renamed'), 'status.copied'),
3547 ui.label(_('%d renamed'), 'status.copied'),
3547 ui.label(_('%d copied'), 'status.copied'),
3548 ui.label(_('%d copied'), 'status.copied'),
3548 ui.label(_('%d deleted'), 'status.deleted'),
3549 ui.label(_('%d deleted'), 'status.deleted'),
3549 ui.label(_('%d unknown'), 'status.unknown'),
3550 ui.label(_('%d unknown'), 'status.unknown'),
3550 ui.label(_('%d ignored'), 'status.ignored'),
3551 ui.label(_('%d ignored'), 'status.ignored'),
3551 ui.label(_('%d unresolved'), 'resolve.unresolved'),
3552 ui.label(_('%d unresolved'), 'resolve.unresolved'),
3552 ui.label(_('%d subrepos'), 'status.modified')]
3553 ui.label(_('%d subrepos'), 'status.modified')]
3553 t = []
3554 t = []
3554 for s, l in zip(st, labels):
3555 for s, l in zip(st, labels):
3555 if s:
3556 if s:
3556 t.append(l % len(s))
3557 t.append(l % len(s))
3557
3558
3558 t = ', '.join(t)
3559 t = ', '.join(t)
3559 cleanworkdir = False
3560 cleanworkdir = False
3560
3561
3561 if len(parents) > 1:
3562 if len(parents) > 1:
3562 t += _(' (merge)')
3563 t += _(' (merge)')
3563 elif branch != parents[0].branch():
3564 elif branch != parents[0].branch():
3564 t += _(' (new branch)')
3565 t += _(' (new branch)')
3565 elif (parents[0].extra().get('close') and
3566 elif (parents[0].extra().get('close') and
3566 pnode in repo.branchheads(branch, closed=True)):
3567 pnode in repo.branchheads(branch, closed=True)):
3567 t += _(' (head closed)')
3568 t += _(' (head closed)')
3568 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
3569 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
3569 t += _(' (clean)')
3570 t += _(' (clean)')
3570 cleanworkdir = True
3571 cleanworkdir = True
3571 elif pnode not in bheads:
3572 elif pnode not in bheads:
3572 t += _(' (new branch head)')
3573 t += _(' (new branch head)')
3573
3574
3574 if cleanworkdir:
3575 if cleanworkdir:
3575 ui.status(_('commit: %s\n') % t.strip())
3576 ui.status(_('commit: %s\n') % t.strip())
3576 else:
3577 else:
3577 ui.write(_('commit: %s\n') % t.strip())
3578 ui.write(_('commit: %s\n') % t.strip())
3578
3579
3579 # all ancestors of branch heads - all ancestors of parent = new csets
3580 # all ancestors of branch heads - all ancestors of parent = new csets
3580 new = [0] * len(repo)
3581 new = [0] * len(repo)
3581 cl = repo.changelog
3582 cl = repo.changelog
3582 for a in [cl.rev(n) for n in bheads]:
3583 for a in [cl.rev(n) for n in bheads]:
3583 new[a] = 1
3584 new[a] = 1
3584 for a in cl.ancestors(*[cl.rev(n) for n in bheads]):
3585 for a in cl.ancestors(*[cl.rev(n) for n in bheads]):
3585 new[a] = 1
3586 new[a] = 1
3586 for a in [p.rev() for p in parents]:
3587 for a in [p.rev() for p in parents]:
3587 if a >= 0:
3588 if a >= 0:
3588 new[a] = 0
3589 new[a] = 0
3589 for a in cl.ancestors(*[p.rev() for p in parents]):
3590 for a in cl.ancestors(*[p.rev() for p in parents]):
3590 new[a] = 0
3591 new[a] = 0
3591 new = sum(new)
3592 new = sum(new)
3592
3593
3593 if new == 0:
3594 if new == 0:
3594 ui.status(_('update: (current)\n'))
3595 ui.status(_('update: (current)\n'))
3595 elif pnode not in bheads:
3596 elif pnode not in bheads:
3596 ui.write(_('update: %d new changesets (update)\n') % new)
3597 ui.write(_('update: %d new changesets (update)\n') % new)
3597 else:
3598 else:
3598 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
3599 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
3599 (new, len(bheads)))
3600 (new, len(bheads)))
3600
3601
3601 if opts.get('remote'):
3602 if opts.get('remote'):
3602 t = []
3603 t = []
3603 source, branches = hg.parseurl(ui.expandpath('default'))
3604 source, branches = hg.parseurl(ui.expandpath('default'))
3604 other = hg.repository(hg.remoteui(repo, {}), source)
3605 other = hg.repository(hg.remoteui(repo, {}), source)
3605 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
3606 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
3606 ui.debug('comparing with %s\n' % url.hidepassword(source))
3607 ui.debug('comparing with %s\n' % url.hidepassword(source))
3607 repo.ui.pushbuffer()
3608 repo.ui.pushbuffer()
3608 common, incoming, rheads = discovery.findcommonincoming(repo, other)
3609 common, incoming, rheads = discovery.findcommonincoming(repo, other)
3609 repo.ui.popbuffer()
3610 repo.ui.popbuffer()
3610 if incoming:
3611 if incoming:
3611 t.append(_('1 or more incoming'))
3612 t.append(_('1 or more incoming'))
3612
3613
3613 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
3614 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
3614 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
3615 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
3615 other = hg.repository(hg.remoteui(repo, {}), dest)
3616 other = hg.repository(hg.remoteui(repo, {}), dest)
3616 ui.debug('comparing with %s\n' % url.hidepassword(dest))
3617 ui.debug('comparing with %s\n' % url.hidepassword(dest))
3617 repo.ui.pushbuffer()
3618 repo.ui.pushbuffer()
3618 o = discovery.findoutgoing(repo, other)
3619 o = discovery.findoutgoing(repo, other)
3619 repo.ui.popbuffer()
3620 repo.ui.popbuffer()
3620 o = repo.changelog.nodesbetween(o, None)[0]
3621 o = repo.changelog.nodesbetween(o, None)[0]
3621 if o:
3622 if o:
3622 t.append(_('%d outgoing') % len(o))
3623 t.append(_('%d outgoing') % len(o))
3623
3624
3624 if t:
3625 if t:
3625 ui.write(_('remote: %s\n') % (', '.join(t)))
3626 ui.write(_('remote: %s\n') % (', '.join(t)))
3626 else:
3627 else:
3627 ui.status(_('remote: (synced)\n'))
3628 ui.status(_('remote: (synced)\n'))
3628
3629
3629 def tag(ui, repo, name1, *names, **opts):
3630 def tag(ui, repo, name1, *names, **opts):
3630 """add one or more tags for the current or given revision
3631 """add one or more tags for the current or given revision
3631
3632
3632 Name a particular revision using <name>.
3633 Name a particular revision using <name>.
3633
3634
3634 Tags are used to name particular revisions of the repository and are
3635 Tags are used to name particular revisions of the repository and are
3635 very useful to compare different revisions, to go back to significant
3636 very useful to compare different revisions, to go back to significant
3636 earlier versions or to mark branch points as releases, etc.
3637 earlier versions or to mark branch points as releases, etc.
3637
3638
3638 If no revision is given, the parent of the working directory is
3639 If no revision is given, the parent of the working directory is
3639 used, or tip if no revision is checked out.
3640 used, or tip if no revision is checked out.
3640
3641
3641 To facilitate version control, distribution, and merging of tags,
3642 To facilitate version control, distribution, and merging of tags,
3642 they are stored as a file named ".hgtags" which is managed
3643 they are stored as a file named ".hgtags" which is managed
3643 similarly to other project files and can be hand-edited if
3644 similarly to other project files and can be hand-edited if
3644 necessary. The file '.hg/localtags' is used for local tags (not
3645 necessary. The file '.hg/localtags' is used for local tags (not
3645 shared among repositories).
3646 shared among repositories).
3646
3647
3647 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.
3648
3649
3649 Since tag names have priority over branch names during revision
3650 Since tag names have priority over branch names during revision
3650 lookup, using an existing branch name as a tag name is discouraged.
3651 lookup, using an existing branch name as a tag name is discouraged.
3651
3652
3652 Returns 0 on success.
3653 Returns 0 on success.
3653 """
3654 """
3654
3655
3655 rev_ = "."
3656 rev_ = "."
3656 names = [t.strip() for t in (name1,) + names]
3657 names = [t.strip() for t in (name1,) + names]
3657 if len(names) != len(set(names)):
3658 if len(names) != len(set(names)):
3658 raise util.Abort(_('tag names must be unique'))
3659 raise util.Abort(_('tag names must be unique'))
3659 for n in names:
3660 for n in names:
3660 if n in ['tip', '.', 'null']:
3661 if n in ['tip', '.', 'null']:
3661 raise util.Abort(_('the name \'%s\' is reserved') % n)
3662 raise util.Abort(_('the name \'%s\' is reserved') % n)
3662 if opts.get('rev') and opts.get('remove'):
3663 if opts.get('rev') and opts.get('remove'):
3663 raise util.Abort(_("--rev and --remove are incompatible"))
3664 raise util.Abort(_("--rev and --remove are incompatible"))
3664 if opts.get('rev'):
3665 if opts.get('rev'):
3665 rev_ = opts['rev']
3666 rev_ = opts['rev']
3666 message = opts.get('message')
3667 message = opts.get('message')
3667 if opts.get('remove'):
3668 if opts.get('remove'):
3668 expectedtype = opts.get('local') and 'local' or 'global'
3669 expectedtype = opts.get('local') and 'local' or 'global'
3669 for n in names:
3670 for n in names:
3670 if not repo.tagtype(n):
3671 if not repo.tagtype(n):
3671 raise util.Abort(_('tag \'%s\' does not exist') % n)
3672 raise util.Abort(_('tag \'%s\' does not exist') % n)
3672 if repo.tagtype(n) != expectedtype:
3673 if repo.tagtype(n) != expectedtype:
3673 if expectedtype == 'global':
3674 if expectedtype == 'global':
3674 raise util.Abort(_('tag \'%s\' is not a global tag') % n)
3675 raise util.Abort(_('tag \'%s\' is not a global tag') % n)
3675 else:
3676 else:
3676 raise util.Abort(_('tag \'%s\' is not a local tag') % n)
3677 raise util.Abort(_('tag \'%s\' is not a local tag') % n)
3677 rev_ = nullid
3678 rev_ = nullid
3678 if not message:
3679 if not message:
3679 # we don't translate commit messages
3680 # we don't translate commit messages
3680 message = 'Removed tag %s' % ', '.join(names)
3681 message = 'Removed tag %s' % ', '.join(names)
3681 elif not opts.get('force'):
3682 elif not opts.get('force'):
3682 for n in names:
3683 for n in names:
3683 if n in repo.tags():
3684 if n in repo.tags():
3684 raise util.Abort(_('tag \'%s\' already exists '
3685 raise util.Abort(_('tag \'%s\' already exists '
3685 '(use -f to force)') % n)
3686 '(use -f to force)') % n)
3686 if not rev_ and repo.dirstate.parents()[1] != nullid:
3687 if not rev_ and repo.dirstate.parents()[1] != nullid:
3687 raise util.Abort(_('uncommitted merge - please provide a '
3688 raise util.Abort(_('uncommitted merge - please provide a '
3688 'specific revision'))
3689 'specific revision'))
3689 r = repo[rev_].node()
3690 r = repo[rev_].node()
3690
3691
3691 if not message:
3692 if not message:
3692 # we don't translate commit messages
3693 # we don't translate commit messages
3693 message = ('Added tag %s for changeset %s' %
3694 message = ('Added tag %s for changeset %s' %
3694 (', '.join(names), short(r)))
3695 (', '.join(names), short(r)))
3695
3696
3696 date = opts.get('date')
3697 date = opts.get('date')
3697 if date:
3698 if date:
3698 date = util.parsedate(date)
3699 date = util.parsedate(date)
3699
3700
3700 if opts.get('edit'):
3701 if opts.get('edit'):
3701 message = ui.edit(message, ui.username())
3702 message = ui.edit(message, ui.username())
3702
3703
3703 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
3704 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
3704
3705
3705 def tags(ui, repo):
3706 def tags(ui, repo):
3706 """list repository tags
3707 """list repository tags
3707
3708
3708 This lists both regular and local tags. When the -v/--verbose
3709 This lists both regular and local tags. When the -v/--verbose
3709 switch is used, a third column "local" is printed for local tags.
3710 switch is used, a third column "local" is printed for local tags.
3710
3711
3711 Returns 0 on success.
3712 Returns 0 on success.
3712 """
3713 """
3713
3714
3714 hexfunc = ui.debugflag and hex or short
3715 hexfunc = ui.debugflag and hex or short
3715 tagtype = ""
3716 tagtype = ""
3716
3717
3717 for t, n in reversed(repo.tagslist()):
3718 for t, n in reversed(repo.tagslist()):
3718 if ui.quiet:
3719 if ui.quiet:
3719 ui.write("%s\n" % t)
3720 ui.write("%s\n" % t)
3720 continue
3721 continue
3721
3722
3722 try:
3723 try:
3723 hn = hexfunc(n)
3724 hn = hexfunc(n)
3724 r = "%5d:%s" % (repo.changelog.rev(n), hn)
3725 r = "%5d:%s" % (repo.changelog.rev(n), hn)
3725 except error.LookupError:
3726 except error.LookupError:
3726 r = " ?:%s" % hn
3727 r = " ?:%s" % hn
3727 else:
3728 else:
3728 spaces = " " * (30 - encoding.colwidth(t))
3729 spaces = " " * (30 - encoding.colwidth(t))
3729 if ui.verbose:
3730 if ui.verbose:
3730 if repo.tagtype(t) == 'local':
3731 if repo.tagtype(t) == 'local':
3731 tagtype = " local"
3732 tagtype = " local"
3732 else:
3733 else:
3733 tagtype = ""
3734 tagtype = ""
3734 ui.write("%s%s %s%s\n" % (t, spaces, r, tagtype))
3735 ui.write("%s%s %s%s\n" % (t, spaces, r, tagtype))
3735
3736
3736 def tip(ui, repo, **opts):
3737 def tip(ui, repo, **opts):
3737 """show the tip revision
3738 """show the tip revision
3738
3739
3739 The tip revision (usually just called the tip) is the changeset
3740 The tip revision (usually just called the tip) is the changeset
3740 most recently added to the repository (and therefore the most
3741 most recently added to the repository (and therefore the most
3741 recently changed head).
3742 recently changed head).
3742
3743
3743 If you have just made a commit, that commit will be the tip. If
3744 If you have just made a commit, that commit will be the tip. If
3744 you have just pulled changes from another repository, the tip of
3745 you have just pulled changes from another repository, the tip of
3745 that repository becomes the current tip. The "tip" tag is special
3746 that repository becomes the current tip. The "tip" tag is special
3746 and cannot be renamed or assigned to a different changeset.
3747 and cannot be renamed or assigned to a different changeset.
3747
3748
3748 Returns 0 on success.
3749 Returns 0 on success.
3749 """
3750 """
3750 displayer = cmdutil.show_changeset(ui, repo, opts)
3751 displayer = cmdutil.show_changeset(ui, repo, opts)
3751 displayer.show(repo[len(repo) - 1])
3752 displayer.show(repo[len(repo) - 1])
3752 displayer.close()
3753 displayer.close()
3753
3754
3754 def unbundle(ui, repo, fname1, *fnames, **opts):
3755 def unbundle(ui, repo, fname1, *fnames, **opts):
3755 """apply one or more changegroup files
3756 """apply one or more changegroup files
3756
3757
3757 Apply one or more compressed changegroup files generated by the
3758 Apply one or more compressed changegroup files generated by the
3758 bundle command.
3759 bundle command.
3759
3760
3760 Returns 0 on success, 1 if an update has unresolved files.
3761 Returns 0 on success, 1 if an update has unresolved files.
3761 """
3762 """
3762 fnames = (fname1,) + fnames
3763 fnames = (fname1,) + fnames
3763
3764
3764 lock = repo.lock()
3765 lock = repo.lock()
3765 try:
3766 try:
3766 for fname in fnames:
3767 for fname in fnames:
3767 f = url.open(ui, fname)
3768 f = url.open(ui, fname)
3768 gen = changegroup.readbundle(f, fname)
3769 gen = changegroup.readbundle(f, fname)
3769 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname,
3770 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname,
3770 lock=lock)
3771 lock=lock)
3771 finally:
3772 finally:
3772 lock.release()
3773 lock.release()
3773
3774
3774 return postincoming(ui, repo, modheads, opts.get('update'), None)
3775 return postincoming(ui, repo, modheads, opts.get('update'), None)
3775
3776
3776 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
3777 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
3777 """update working directory (or switch revisions)
3778 """update working directory (or switch revisions)
3778
3779
3779 Update the repository's working directory to the specified
3780 Update the repository's working directory to the specified
3780 changeset.
3781 changeset.
3781
3782
3782 If no changeset is specified, attempt to update to the tip of the
3783 If no changeset is specified, attempt to update to the tip of the
3783 current branch. If this changeset is a descendant of the working
3784 current branch. If this changeset is a descendant of the working
3784 directory's parent, update to it, otherwise abort.
3785 directory's parent, update to it, otherwise abort.
3785
3786
3786 The following rules apply when the working directory contains
3787 The following rules apply when the working directory contains
3787 uncommitted changes:
3788 uncommitted changes:
3788
3789
3789 1. If neither -c/--check nor -C/--clean is specified, and if
3790 1. If neither -c/--check nor -C/--clean is specified, and if
3790 the requested changeset is an ancestor or descendant of
3791 the requested changeset is an ancestor or descendant of
3791 the working directory's parent, the uncommitted changes
3792 the working directory's parent, the uncommitted changes
3792 are merged into the requested changeset and the merged
3793 are merged into the requested changeset and the merged
3793 result is left uncommitted. If the requested changeset is
3794 result is left uncommitted. If the requested changeset is
3794 not an ancestor or descendant (that is, it is on another
3795 not an ancestor or descendant (that is, it is on another
3795 branch), the update is aborted and the uncommitted changes
3796 branch), the update is aborted and the uncommitted changes
3796 are preserved.
3797 are preserved.
3797
3798
3798 2. With the -c/--check option, the update is aborted and the
3799 2. With the -c/--check option, the update is aborted and the
3799 uncommitted changes are preserved.
3800 uncommitted changes are preserved.
3800
3801
3801 3. With the -C/--clean option, uncommitted changes are discarded and
3802 3. With the -C/--clean option, uncommitted changes are discarded and
3802 the working directory is updated to the requested changeset.
3803 the working directory is updated to the requested changeset.
3803
3804
3804 Use null as the changeset to remove the working directory (like
3805 Use null as the changeset to remove the working directory (like
3805 :hg:`clone -U`).
3806 :hg:`clone -U`).
3806
3807
3807 If you want to update just one file to an older changeset, use :hg:`revert`.
3808 If you want to update just one file to an older changeset, use :hg:`revert`.
3808
3809
3809 See :hg:`help dates` for a list of formats valid for -d/--date.
3810 See :hg:`help dates` for a list of formats valid for -d/--date.
3810
3811
3811 Returns 0 on success, 1 if there are unresolved files.
3812 Returns 0 on success, 1 if there are unresolved files.
3812 """
3813 """
3813 if rev and node:
3814 if rev and node:
3814 raise util.Abort(_("please specify just one revision"))
3815 raise util.Abort(_("please specify just one revision"))
3815
3816
3816 if not rev:
3817 if not rev:
3817 rev = node
3818 rev = node
3818
3819
3819 if check and clean:
3820 if check and clean:
3820 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
3821 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
3821
3822
3822 if check:
3823 if check:
3823 # we could use dirty() but we can ignore merge and branch trivia
3824 # we could use dirty() but we can ignore merge and branch trivia
3824 c = repo[None]
3825 c = repo[None]
3825 if c.modified() or c.added() or c.removed():
3826 if c.modified() or c.added() or c.removed():
3826 raise util.Abort(_("uncommitted local changes"))
3827 raise util.Abort(_("uncommitted local changes"))
3827
3828
3828 if date:
3829 if date:
3829 if rev:
3830 if rev:
3830 raise util.Abort(_("you can't specify a revision and a date"))
3831 raise util.Abort(_("you can't specify a revision and a date"))
3831 rev = cmdutil.finddate(ui, repo, date)
3832 rev = cmdutil.finddate(ui, repo, date)
3832
3833
3833 if clean or check:
3834 if clean or check:
3834 return hg.clean(repo, rev)
3835 return hg.clean(repo, rev)
3835 else:
3836 else:
3836 return hg.update(repo, rev)
3837 return hg.update(repo, rev)
3837
3838
3838 def verify(ui, repo):
3839 def verify(ui, repo):
3839 """verify the integrity of the repository
3840 """verify the integrity of the repository
3840
3841
3841 Verify the integrity of the current repository.
3842 Verify the integrity of the current repository.
3842
3843
3843 This will perform an extensive check of the repository's
3844 This will perform an extensive check of the repository's
3844 integrity, validating the hashes and checksums of each entry in
3845 integrity, validating the hashes and checksums of each entry in
3845 the changelog, manifest, and tracked files, as well as the
3846 the changelog, manifest, and tracked files, as well as the
3846 integrity of their crosslinks and indices.
3847 integrity of their crosslinks and indices.
3847
3848
3848 Returns 0 on success, 1 if errors are encountered.
3849 Returns 0 on success, 1 if errors are encountered.
3849 """
3850 """
3850 return hg.verify(repo)
3851 return hg.verify(repo)
3851
3852
3852 def version_(ui):
3853 def version_(ui):
3853 """output version and copyright information"""
3854 """output version and copyright information"""
3854 ui.write(_("Mercurial Distributed SCM (version %s)\n")
3855 ui.write(_("Mercurial Distributed SCM (version %s)\n")
3855 % util.version())
3856 % util.version())
3856 ui.status(_(
3857 ui.status(_(
3857 "\nCopyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
3858 "\nCopyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
3858 "This is free software; see the source for copying conditions. "
3859 "This is free software; see the source for copying conditions. "
3859 "There is NO\nwarranty; "
3860 "There is NO\nwarranty; "
3860 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
3861 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
3861 ))
3862 ))
3862
3863
3863 # Command options and aliases are listed here, alphabetically
3864 # Command options and aliases are listed here, alphabetically
3864
3865
3865 globalopts = [
3866 globalopts = [
3866 ('R', 'repository', '',
3867 ('R', 'repository', '',
3867 _('repository root directory or name of overlay bundle file'),
3868 _('repository root directory or name of overlay bundle file'),
3868 _('REPO')),
3869 _('REPO')),
3869 ('', 'cwd', '',
3870 ('', 'cwd', '',
3870 _('change working directory'), _('DIR')),
3871 _('change working directory'), _('DIR')),
3871 ('y', 'noninteractive', None,
3872 ('y', 'noninteractive', None,
3872 _('do not prompt, assume \'yes\' for any required answers')),
3873 _('do not prompt, assume \'yes\' for any required answers')),
3873 ('q', 'quiet', None, _('suppress output')),
3874 ('q', 'quiet', None, _('suppress output')),
3874 ('v', 'verbose', None, _('enable additional output')),
3875 ('v', 'verbose', None, _('enable additional output')),
3875 ('', 'config', [],
3876 ('', 'config', [],
3876 _('set/override config option (use \'section.name=value\')'),
3877 _('set/override config option (use \'section.name=value\')'),
3877 _('CONFIG')),
3878 _('CONFIG')),
3878 ('', 'debug', None, _('enable debugging output')),
3879 ('', 'debug', None, _('enable debugging output')),
3879 ('', 'debugger', None, _('start debugger')),
3880 ('', 'debugger', None, _('start debugger')),
3880 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
3881 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
3881 _('ENCODE')),
3882 _('ENCODE')),
3882 ('', 'encodingmode', encoding.encodingmode,
3883 ('', 'encodingmode', encoding.encodingmode,
3883 _('set the charset encoding mode'), _('MODE')),
3884 _('set the charset encoding mode'), _('MODE')),
3884 ('', 'traceback', None, _('always print a traceback on exception')),
3885 ('', 'traceback', None, _('always print a traceback on exception')),
3885 ('', 'time', None, _('time how long the command takes')),
3886 ('', 'time', None, _('time how long the command takes')),
3886 ('', 'profile', None, _('print command execution profile')),
3887 ('', 'profile', None, _('print command execution profile')),
3887 ('', 'version', None, _('output version information and exit')),
3888 ('', 'version', None, _('output version information and exit')),
3888 ('h', 'help', None, _('display help and exit')),
3889 ('h', 'help', None, _('display help and exit')),
3889 ]
3890 ]
3890
3891
3891 dryrunopts = [('n', 'dry-run', None,
3892 dryrunopts = [('n', 'dry-run', None,
3892 _('do not perform actions, just print output'))]
3893 _('do not perform actions, just print output'))]
3893
3894
3894 remoteopts = [
3895 remoteopts = [
3895 ('e', 'ssh', '',
3896 ('e', 'ssh', '',
3896 _('specify ssh command to use'), _('CMD')),
3897 _('specify ssh command to use'), _('CMD')),
3897 ('', 'remotecmd', '',
3898 ('', 'remotecmd', '',
3898 _('specify hg command to run on the remote side'), _('CMD')),
3899 _('specify hg command to run on the remote side'), _('CMD')),
3899 ]
3900 ]
3900
3901
3901 walkopts = [
3902 walkopts = [
3902 ('I', 'include', [],
3903 ('I', 'include', [],
3903 _('include names matching the given patterns'), _('PATTERN')),
3904 _('include names matching the given patterns'), _('PATTERN')),
3904 ('X', 'exclude', [],
3905 ('X', 'exclude', [],
3905 _('exclude names matching the given patterns'), _('PATTERN')),
3906 _('exclude names matching the given patterns'), _('PATTERN')),
3906 ]
3907 ]
3907
3908
3908 commitopts = [
3909 commitopts = [
3909 ('m', 'message', '',
3910 ('m', 'message', '',
3910 _('use text as commit message'), _('TEXT')),
3911 _('use text as commit message'), _('TEXT')),
3911 ('l', 'logfile', '',
3912 ('l', 'logfile', '',
3912 _('read commit message from file'), _('FILE')),
3913 _('read commit message from file'), _('FILE')),
3913 ]
3914 ]
3914
3915
3915 commitopts2 = [
3916 commitopts2 = [
3916 ('d', 'date', '',
3917 ('d', 'date', '',
3917 _('record datecode as commit date'), _('DATE')),
3918 _('record datecode as commit date'), _('DATE')),
3918 ('u', 'user', '',
3919 ('u', 'user', '',
3919 _('record the specified user as committer'), _('USER')),
3920 _('record the specified user as committer'), _('USER')),
3920 ]
3921 ]
3921
3922
3922 templateopts = [
3923 templateopts = [
3923 ('', 'style', '',
3924 ('', 'style', '',
3924 _('display using template map file'), _('STYLE')),
3925 _('display using template map file'), _('STYLE')),
3925 ('', 'template', '',
3926 ('', 'template', '',
3926 _('display with template'), _('TEMPLATE')),
3927 _('display with template'), _('TEMPLATE')),
3927 ]
3928 ]
3928
3929
3929 logopts = [
3930 logopts = [
3930 ('p', 'patch', None, _('show patch')),
3931 ('p', 'patch', None, _('show patch')),
3931 ('g', 'git', None, _('use git extended diff format')),
3932 ('g', 'git', None, _('use git extended diff format')),
3932 ('l', 'limit', '',
3933 ('l', 'limit', '',
3933 _('limit number of changes displayed'), _('NUM')),
3934 _('limit number of changes displayed'), _('NUM')),
3934 ('M', 'no-merges', None, _('do not show merges')),
3935 ('M', 'no-merges', None, _('do not show merges')),
3935 ('', 'stat', None, _('output diffstat-style summary of changes')),
3936 ('', 'stat', None, _('output diffstat-style summary of changes')),
3936 ] + templateopts
3937 ] + templateopts
3937
3938
3938 diffopts = [
3939 diffopts = [
3939 ('a', 'text', None, _('treat all files as text')),
3940 ('a', 'text', None, _('treat all files as text')),
3940 ('g', 'git', None, _('use git extended diff format')),
3941 ('g', 'git', None, _('use git extended diff format')),
3941 ('', 'nodates', None, _('omit dates from diff headers'))
3942 ('', 'nodates', None, _('omit dates from diff headers'))
3942 ]
3943 ]
3943
3944
3944 diffopts2 = [
3945 diffopts2 = [
3945 ('p', 'show-function', None, _('show which function each change is in')),
3946 ('p', 'show-function', None, _('show which function each change is in')),
3946 ('', 'reverse', None, _('produce a diff that undoes the changes')),
3947 ('', 'reverse', None, _('produce a diff that undoes the changes')),
3947 ('w', 'ignore-all-space', None,
3948 ('w', 'ignore-all-space', None,
3948 _('ignore white space when comparing lines')),
3949 _('ignore white space when comparing lines')),
3949 ('b', 'ignore-space-change', None,
3950 ('b', 'ignore-space-change', None,
3950 _('ignore changes in the amount of white space')),
3951 _('ignore changes in the amount of white space')),
3951 ('B', 'ignore-blank-lines', None,
3952 ('B', 'ignore-blank-lines', None,
3952 _('ignore changes whose lines are all blank')),
3953 _('ignore changes whose lines are all blank')),
3953 ('U', 'unified', '',
3954 ('U', 'unified', '',
3954 _('number of lines of context to show'), _('NUM')),
3955 _('number of lines of context to show'), _('NUM')),
3955 ('', 'stat', None, _('output diffstat-style summary of changes')),
3956 ('', 'stat', None, _('output diffstat-style summary of changes')),
3956 ]
3957 ]
3957
3958
3958 similarityopts = [
3959 similarityopts = [
3959 ('s', 'similarity', '',
3960 ('s', 'similarity', '',
3960 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
3961 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
3961 ]
3962 ]
3962
3963
3963 table = {
3964 table = {
3964 "^add": (add, walkopts + dryrunopts, _('[OPTION]... [FILE]...')),
3965 "^add": (add, walkopts + dryrunopts, _('[OPTION]... [FILE]...')),
3965 "addremove":
3966 "addremove":
3966 (addremove, similarityopts + walkopts + dryrunopts,
3967 (addremove, similarityopts + walkopts + dryrunopts,
3967 _('[OPTION]... [FILE]...')),
3968 _('[OPTION]... [FILE]...')),
3968 "^annotate|blame":
3969 "^annotate|blame":
3969 (annotate,
3970 (annotate,
3970 [('r', 'rev', '',
3971 [('r', 'rev', '',
3971 _('annotate the specified revision'), _('REV')),
3972 _('annotate the specified revision'), _('REV')),
3972 ('', 'follow', None,
3973 ('', 'follow', None,
3973 _('follow copies/renames and list the filename (DEPRECATED)')),
3974 _('follow copies/renames and list the filename (DEPRECATED)')),
3974 ('', 'no-follow', None, _("don't follow copies and renames")),
3975 ('', 'no-follow', None, _("don't follow copies and renames")),
3975 ('a', 'text', None, _('treat all files as text')),
3976 ('a', 'text', None, _('treat all files as text')),
3976 ('u', 'user', None, _('list the author (long with -v)')),
3977 ('u', 'user', None, _('list the author (long with -v)')),
3977 ('f', 'file', None, _('list the filename')),
3978 ('f', 'file', None, _('list the filename')),
3978 ('d', 'date', None, _('list the date (short with -q)')),
3979 ('d', 'date', None, _('list the date (short with -q)')),
3979 ('n', 'number', None, _('list the revision number (default)')),
3980 ('n', 'number', None, _('list the revision number (default)')),
3980 ('c', 'changeset', None, _('list the changeset')),
3981 ('c', 'changeset', None, _('list the changeset')),
3981 ('l', 'line-number', None,
3982 ('l', 'line-number', None,
3982 _('show line number at the first appearance'))
3983 _('show line number at the first appearance'))
3983 ] + walkopts,
3984 ] + walkopts,
3984 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')),
3985 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')),
3985 "archive":
3986 "archive":
3986 (archive,
3987 (archive,
3987 [('', 'no-decode', None, _('do not pass files through decoders')),
3988 [('', 'no-decode', None, _('do not pass files through decoders')),
3988 ('p', 'prefix', '',
3989 ('p', 'prefix', '',
3989 _('directory prefix for files in archive'), _('PREFIX')),
3990 _('directory prefix for files in archive'), _('PREFIX')),
3990 ('r', 'rev', '',
3991 ('r', 'rev', '',
3991 _('revision to distribute'), _('REV')),
3992 _('revision to distribute'), _('REV')),
3992 ('t', 'type', '',
3993 ('t', 'type', '',
3993 _('type of distribution to create'), _('TYPE')),
3994 _('type of distribution to create'), _('TYPE')),
3994 ] + walkopts,
3995 ] + walkopts,
3995 _('[OPTION]... DEST')),
3996 _('[OPTION]... DEST')),
3996 "backout":
3997 "backout":
3997 (backout,
3998 (backout,
3998 [('', 'merge', None,
3999 [('', 'merge', None,
3999 _('merge with old dirstate parent after backout')),
4000 _('merge with old dirstate parent after backout')),
4000 ('', 'parent', '',
4001 ('', 'parent', '',
4001 _('parent to choose when backing out merge'), _('REV')),
4002 _('parent to choose when backing out merge'), _('REV')),
4002 ('r', 'rev', '',
4003 ('r', 'rev', '',
4003 _('revision to backout'), _('REV')),
4004 _('revision to backout'), _('REV')),
4004 ] + walkopts + commitopts + commitopts2,
4005 ] + walkopts + commitopts + commitopts2,
4005 _('[OPTION]... [-r] REV')),
4006 _('[OPTION]... [-r] REV')),
4006 "bisect":
4007 "bisect":
4007 (bisect,
4008 (bisect,
4008 [('r', 'reset', False, _('reset bisect state')),
4009 [('r', 'reset', False, _('reset bisect state')),
4009 ('g', 'good', False, _('mark changeset good')),
4010 ('g', 'good', False, _('mark changeset good')),
4010 ('b', 'bad', False, _('mark changeset bad')),
4011 ('b', 'bad', False, _('mark changeset bad')),
4011 ('s', 'skip', False, _('skip testing changeset')),
4012 ('s', 'skip', False, _('skip testing changeset')),
4012 ('c', 'command', '',
4013 ('c', 'command', '',
4013 _('use command to check changeset state'), _('CMD')),
4014 _('use command to check changeset state'), _('CMD')),
4014 ('U', 'noupdate', False, _('do not update to target'))],
4015 ('U', 'noupdate', False, _('do not update to target'))],
4015 _("[-gbsr] [-U] [-c CMD] [REV]")),
4016 _("[-gbsr] [-U] [-c CMD] [REV]")),
4016 "branch":
4017 "branch":
4017 (branch,
4018 (branch,
4018 [('f', 'force', None,
4019 [('f', 'force', None,
4019 _('set branch name even if it shadows an existing branch')),
4020 _('set branch name even if it shadows an existing branch')),
4020 ('C', 'clean', None, _('reset branch name to parent branch name'))],
4021 ('C', 'clean', None, _('reset branch name to parent branch name'))],
4021 _('[-fC] [NAME]')),
4022 _('[-fC] [NAME]')),
4022 "branches":
4023 "branches":
4023 (branches,
4024 (branches,
4024 [('a', 'active', False,
4025 [('a', 'active', False,
4025 _('show only branches that have unmerged heads')),
4026 _('show only branches that have unmerged heads')),
4026 ('c', 'closed', False,
4027 ('c', 'closed', False,
4027 _('show normal and closed branches'))],
4028 _('show normal and closed branches'))],
4028 _('[-ac]')),
4029 _('[-ac]')),
4029 "bundle":
4030 "bundle":
4030 (bundle,
4031 (bundle,
4031 [('f', 'force', None,
4032 [('f', 'force', None,
4032 _('run even when the destination is unrelated')),
4033 _('run even when the destination is unrelated')),
4033 ('r', 'rev', [],
4034 ('r', 'rev', [],
4034 _('a changeset intended to be added to the destination'),
4035 _('a changeset intended to be added to the destination'),
4035 _('REV')),
4036 _('REV')),
4036 ('b', 'branch', [],
4037 ('b', 'branch', [],
4037 _('a specific branch you would like to bundle'),
4038 _('a specific branch you would like to bundle'),
4038 _('BRANCH')),
4039 _('BRANCH')),
4039 ('', 'base', [],
4040 ('', 'base', [],
4040 _('a base changeset assumed to be available at the destination'),
4041 _('a base changeset assumed to be available at the destination'),
4041 _('REV')),
4042 _('REV')),
4042 ('a', 'all', None, _('bundle all changesets in the repository')),
4043 ('a', 'all', None, _('bundle all changesets in the repository')),
4043 ('t', 'type', 'bzip2',
4044 ('t', 'type', 'bzip2',
4044 _('bundle compression type to use'), _('TYPE')),
4045 _('bundle compression type to use'), _('TYPE')),
4045 ] + remoteopts,
4046 ] + remoteopts,
4046 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')),
4047 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')),
4047 "cat":
4048 "cat":
4048 (cat,
4049 (cat,
4049 [('o', 'output', '',
4050 [('o', 'output', '',
4050 _('print output to file with formatted name'), _('FORMAT')),
4051 _('print output to file with formatted name'), _('FORMAT')),
4051 ('r', 'rev', '',
4052 ('r', 'rev', '',
4052 _('print the given revision'), _('REV')),
4053 _('print the given revision'), _('REV')),
4053 ('', 'decode', None, _('apply any matching decode filter')),
4054 ('', 'decode', None, _('apply any matching decode filter')),
4054 ] + walkopts,
4055 ] + walkopts,
4055 _('[OPTION]... FILE...')),
4056 _('[OPTION]... FILE...')),
4056 "^clone":
4057 "^clone":
4057 (clone,
4058 (clone,
4058 [('U', 'noupdate', None,
4059 [('U', 'noupdate', None,
4059 _('the clone will include an empty working copy (only a repository)')),
4060 _('the clone will include an empty working copy (only a repository)')),
4060 ('u', 'updaterev', '',
4061 ('u', 'updaterev', '',
4061 _('revision, tag or branch to check out'), _('REV')),
4062 _('revision, tag or branch to check out'), _('REV')),
4062 ('r', 'rev', [],
4063 ('r', 'rev', [],
4063 _('include the specified changeset'), _('REV')),
4064 _('include the specified changeset'), _('REV')),
4064 ('b', 'branch', [],
4065 ('b', 'branch', [],
4065 _('clone only the specified branch'), _('BRANCH')),
4066 _('clone only the specified branch'), _('BRANCH')),
4066 ('', 'pull', None, _('use pull protocol to copy metadata')),
4067 ('', 'pull', None, _('use pull protocol to copy metadata')),
4067 ('', 'uncompressed', None,
4068 ('', 'uncompressed', None,
4068 _('use uncompressed transfer (fast over LAN)')),
4069 _('use uncompressed transfer (fast over LAN)')),
4069 ] + remoteopts,
4070 ] + remoteopts,
4070 _('[OPTION]... SOURCE [DEST]')),
4071 _('[OPTION]... SOURCE [DEST]')),
4071 "^commit|ci":
4072 "^commit|ci":
4072 (commit,
4073 (commit,
4073 [('A', 'addremove', None,
4074 [('A', 'addremove', None,
4074 _('mark new/missing files as added/removed before committing')),
4075 _('mark new/missing files as added/removed before committing')),
4075 ('', 'close-branch', None,
4076 ('', 'close-branch', None,
4076 _('mark a branch as closed, hiding it from the branch list')),
4077 _('mark a branch as closed, hiding it from the branch list')),
4077 ] + walkopts + commitopts + commitopts2,
4078 ] + walkopts + commitopts + commitopts2,
4078 _('[OPTION]... [FILE]...')),
4079 _('[OPTION]... [FILE]...')),
4079 "copy|cp":
4080 "copy|cp":
4080 (copy,
4081 (copy,
4081 [('A', 'after', None, _('record a copy that has already occurred')),
4082 [('A', 'after', None, _('record a copy that has already occurred')),
4082 ('f', 'force', None,
4083 ('f', 'force', None,
4083 _('forcibly copy over an existing managed file')),
4084 _('forcibly copy over an existing managed file')),
4084 ] + walkopts + dryrunopts,
4085 ] + walkopts + dryrunopts,
4085 _('[OPTION]... [SOURCE]... DEST')),
4086 _('[OPTION]... [SOURCE]... DEST')),
4086 "debugancestor": (debugancestor, [], _('[INDEX] REV1 REV2')),
4087 "debugancestor": (debugancestor, [], _('[INDEX] REV1 REV2')),
4087 "debugbuilddag":
4088 "debugbuilddag":
4088 (debugbuilddag,
4089 (debugbuilddag,
4089 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
4090 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
4090 ('a', 'appended-file', None, _('add single file all revs append to')),
4091 ('a', 'appended-file', None, _('add single file all revs append to')),
4091 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
4092 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
4092 ('n', 'new-file', None, _('add new file at each rev')),
4093 ('n', 'new-file', None, _('add new file at each rev')),
4093 ],
4094 ],
4094 _('[OPTION]... TEXT')),
4095 _('[OPTION]... TEXT')),
4095 "debugcheckstate": (debugcheckstate, [], ''),
4096 "debugcheckstate": (debugcheckstate, [], ''),
4096 "debugcommands": (debugcommands, [], _('[COMMAND]')),
4097 "debugcommands": (debugcommands, [], _('[COMMAND]')),
4097 "debugcomplete":
4098 "debugcomplete":
4098 (debugcomplete,
4099 (debugcomplete,
4099 [('o', 'options', None, _('show the command options'))],
4100 [('o', 'options', None, _('show the command options'))],
4100 _('[-o] CMD')),
4101 _('[-o] CMD')),
4101 "debugdag":
4102 "debugdag":
4102 (debugdag,
4103 (debugdag,
4103 [('t', 'tags', None, _('use tags as labels')),
4104 [('t', 'tags', None, _('use tags as labels')),
4104 ('b', 'branches', None, _('annotate with branch names')),
4105 ('b', 'branches', None, _('annotate with branch names')),
4105 ('', 'dots', None, _('use dots for runs')),
4106 ('', 'dots', None, _('use dots for runs')),
4106 ('s', 'spaces', None, _('separate elements by spaces')),
4107 ('s', 'spaces', None, _('separate elements by spaces')),
4107 ],
4108 ],
4108 _('[OPTION]... [FILE [REV]...]')),
4109 _('[OPTION]... [FILE [REV]...]')),
4109 "debugdate":
4110 "debugdate":
4110 (debugdate,
4111 (debugdate,
4111 [('e', 'extended', None, _('try extended date formats'))],
4112 [('e', 'extended', None, _('try extended date formats'))],
4112 _('[-e] DATE [RANGE]')),
4113 _('[-e] DATE [RANGE]')),
4113 "debugdata": (debugdata, [], _('FILE REV')),
4114 "debugdata": (debugdata, [], _('FILE REV')),
4114 "debugfsinfo": (debugfsinfo, [], _('[PATH]')),
4115 "debugfsinfo": (debugfsinfo, [], _('[PATH]')),
4115 "debugindex": (debugindex, [], _('FILE')),
4116 "debugindex": (debugindex, [], _('FILE')),
4116 "debugindexdot": (debugindexdot, [], _('FILE')),
4117 "debugindexdot": (debugindexdot, [], _('FILE')),
4117 "debuginstall": (debuginstall, [], ''),
4118 "debuginstall": (debuginstall, [], ''),
4118 "debugpushkey": (debugpushkey, [], _('REPO NAMESPACE [KEY OLD NEW]')),
4119 "debugpushkey": (debugpushkey, [], _('REPO NAMESPACE [KEY OLD NEW]')),
4119 "debugrebuildstate":
4120 "debugrebuildstate":
4120 (debugrebuildstate,
4121 (debugrebuildstate,
4121 [('r', 'rev', '',
4122 [('r', 'rev', '',
4122 _('revision to rebuild to'), _('REV'))],
4123 _('revision to rebuild to'), _('REV'))],
4123 _('[-r REV] [REV]')),
4124 _('[-r REV] [REV]')),
4124 "debugrename":
4125 "debugrename":
4125 (debugrename,
4126 (debugrename,
4126 [('r', 'rev', '',
4127 [('r', 'rev', '',
4127 _('revision to debug'), _('REV'))],
4128 _('revision to debug'), _('REV'))],
4128 _('[-r REV] FILE')),
4129 _('[-r REV] FILE')),
4129 "debugrevspec":
4130 "debugrevspec":
4130 (debugrevspec, [], ('REVSPEC')),
4131 (debugrevspec, [], ('REVSPEC')),
4131 "debugsetparents":
4132 "debugsetparents":
4132 (debugsetparents, [], _('REV1 [REV2]')),
4133 (debugsetparents, [], _('REV1 [REV2]')),
4133 "debugstate":
4134 "debugstate":
4134 (debugstate,
4135 (debugstate,
4135 [('', 'nodates', None, _('do not display the saved mtime'))],
4136 [('', 'nodates', None, _('do not display the saved mtime'))],
4136 _('[OPTION]...')),
4137 _('[OPTION]...')),
4137 "debugsub":
4138 "debugsub":
4138 (debugsub,
4139 (debugsub,
4139 [('r', 'rev', '',
4140 [('r', 'rev', '',
4140 _('revision to check'), _('REV'))],
4141 _('revision to check'), _('REV'))],
4141 _('[-r REV] [REV]')),
4142 _('[-r REV] [REV]')),
4142 "debugwalk": (debugwalk, walkopts, _('[OPTION]... [FILE]...')),
4143 "debugwalk": (debugwalk, walkopts, _('[OPTION]... [FILE]...')),
4143 "^diff":
4144 "^diff":
4144 (diff,
4145 (diff,
4145 [('r', 'rev', [],
4146 [('r', 'rev', [],
4146 _('revision'), _('REV')),
4147 _('revision'), _('REV')),
4147 ('c', 'change', '',
4148 ('c', 'change', '',
4148 _('change made by revision'), _('REV'))
4149 _('change made by revision'), _('REV'))
4149 ] + diffopts + diffopts2 + walkopts,
4150 ] + diffopts + diffopts2 + walkopts,
4150 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...')),
4151 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...')),
4151 "^export":
4152 "^export":
4152 (export,
4153 (export,
4153 [('o', 'output', '',
4154 [('o', 'output', '',
4154 _('print output to file with formatted name'), _('FORMAT')),
4155 _('print output to file with formatted name'), _('FORMAT')),
4155 ('', 'switch-parent', None, _('diff against the second parent')),
4156 ('', 'switch-parent', None, _('diff against the second parent')),
4156 ('r', 'rev', [],
4157 ('r', 'rev', [],
4157 _('revisions to export'), _('REV')),
4158 _('revisions to export'), _('REV')),
4158 ] + diffopts,
4159 ] + diffopts,
4159 _('[OPTION]... [-o OUTFILESPEC] REV...')),
4160 _('[OPTION]... [-o OUTFILESPEC] REV...')),
4160 "^forget":
4161 "^forget":
4161 (forget,
4162 (forget,
4162 [] + walkopts,
4163 [] + walkopts,
4163 _('[OPTION]... FILE...')),
4164 _('[OPTION]... FILE...')),
4164 "grep":
4165 "grep":
4165 (grep,
4166 (grep,
4166 [('0', 'print0', None, _('end fields with NUL')),
4167 [('0', 'print0', None, _('end fields with NUL')),
4167 ('', 'all', None, _('print all revisions that match')),
4168 ('', 'all', None, _('print all revisions that match')),
4168 ('f', 'follow', None,
4169 ('f', 'follow', None,
4169 _('follow changeset history,'
4170 _('follow changeset history,'
4170 ' or file history across copies and renames')),
4171 ' or file history across copies and renames')),
4171 ('i', 'ignore-case', None, _('ignore case when matching')),
4172 ('i', 'ignore-case', None, _('ignore case when matching')),
4172 ('l', 'files-with-matches', None,
4173 ('l', 'files-with-matches', None,
4173 _('print only filenames and revisions that match')),
4174 _('print only filenames and revisions that match')),
4174 ('n', 'line-number', None, _('print matching line numbers')),
4175 ('n', 'line-number', None, _('print matching line numbers')),
4175 ('r', 'rev', [],
4176 ('r', 'rev', [],
4176 _('only search files changed within revision range'), _('REV')),
4177 _('only search files changed within revision range'), _('REV')),
4177 ('u', 'user', None, _('list the author (long with -v)')),
4178 ('u', 'user', None, _('list the author (long with -v)')),
4178 ('d', 'date', None, _('list the date (short with -q)')),
4179 ('d', 'date', None, _('list the date (short with -q)')),
4179 ] + walkopts,
4180 ] + walkopts,
4180 _('[OPTION]... PATTERN [FILE]...')),
4181 _('[OPTION]... PATTERN [FILE]...')),
4181 "heads":
4182 "heads":
4182 (heads,
4183 (heads,
4183 [('r', 'rev', '',
4184 [('r', 'rev', '',
4184 _('show only heads which are descendants of REV'), _('REV')),
4185 _('show only heads which are descendants of REV'), _('REV')),
4185 ('t', 'topo', False, _('show topological heads only')),
4186 ('t', 'topo', False, _('show topological heads only')),
4186 ('a', 'active', False,
4187 ('a', 'active', False,
4187 _('show active branchheads only [DEPRECATED]')),
4188 _('show active branchheads only [DEPRECATED]')),
4188 ('c', 'closed', False,
4189 ('c', 'closed', False,
4189 _('show normal and closed branch heads')),
4190 _('show normal and closed branch heads')),
4190 ] + templateopts,
4191 ] + templateopts,
4191 _('[-ac] [-r REV] [REV]...')),
4192 _('[-ac] [-r REV] [REV]...')),
4192 "help": (help_, [], _('[TOPIC]')),
4193 "help": (help_, [], _('[TOPIC]')),
4193 "identify|id":
4194 "identify|id":
4194 (identify,
4195 (identify,
4195 [('r', 'rev', '',
4196 [('r', 'rev', '',
4196 _('identify the specified revision'), _('REV')),
4197 _('identify the specified revision'), _('REV')),
4197 ('n', 'num', None, _('show local revision number')),
4198 ('n', 'num', None, _('show local revision number')),
4198 ('i', 'id', None, _('show global revision id')),
4199 ('i', 'id', None, _('show global revision id')),
4199 ('b', 'branch', None, _('show branch')),
4200 ('b', 'branch', None, _('show branch')),
4200 ('t', 'tags', None, _('show tags'))],
4201 ('t', 'tags', None, _('show tags'))],
4201 _('[-nibt] [-r REV] [SOURCE]')),
4202 _('[-nibt] [-r REV] [SOURCE]')),
4202 "import|patch":
4203 "import|patch":
4203 (import_,
4204 (import_,
4204 [('p', 'strip', 1,
4205 [('p', 'strip', 1,
4205 _('directory strip option for patch. This has the same '
4206 _('directory strip option for patch. This has the same '
4206 'meaning as the corresponding patch option'),
4207 'meaning as the corresponding patch option'),
4207 _('NUM')),
4208 _('NUM')),
4208 ('b', 'base', '',
4209 ('b', 'base', '',
4209 _('base path'), _('PATH')),
4210 _('base path'), _('PATH')),
4210 ('f', 'force', None,
4211 ('f', 'force', None,
4211 _('skip check for outstanding uncommitted changes')),
4212 _('skip check for outstanding uncommitted changes')),
4212 ('', 'no-commit', None,
4213 ('', 'no-commit', None,
4213 _("don't commit, just update the working directory")),
4214 _("don't commit, just update the working directory")),
4214 ('', 'exact', None,
4215 ('', 'exact', None,
4215 _('apply patch to the nodes from which it was generated')),
4216 _('apply patch to the nodes from which it was generated')),
4216 ('', 'import-branch', None,
4217 ('', 'import-branch', None,
4217 _('use any branch information in patch (implied by --exact)'))] +
4218 _('use any branch information in patch (implied by --exact)'))] +
4218 commitopts + commitopts2 + similarityopts,
4219 commitopts + commitopts2 + similarityopts,
4219 _('[OPTION]... PATCH...')),
4220 _('[OPTION]... PATCH...')),
4220 "incoming|in":
4221 "incoming|in":
4221 (incoming,
4222 (incoming,
4222 [('f', 'force', None,
4223 [('f', 'force', None,
4223 _('run even if remote repository is unrelated')),
4224 _('run even if remote repository is unrelated')),
4224 ('n', 'newest-first', None, _('show newest record first')),
4225 ('n', 'newest-first', None, _('show newest record first')),
4225 ('', 'bundle', '',
4226 ('', 'bundle', '',
4226 _('file to store the bundles into'), _('FILE')),
4227 _('file to store the bundles into'), _('FILE')),
4227 ('r', 'rev', [],
4228 ('r', 'rev', [],
4228 _('a remote changeset intended to be added'), _('REV')),
4229 _('a remote changeset intended to be added'), _('REV')),
4229 ('b', 'branch', [],
4230 ('b', 'branch', [],
4230 _('a specific branch you would like to pull'), _('BRANCH')),
4231 _('a specific branch you would like to pull'), _('BRANCH')),
4231 ] + logopts + remoteopts,
4232 ] + logopts + remoteopts,
4232 _('[-p] [-n] [-M] [-f] [-r REV]...'
4233 _('[-p] [-n] [-M] [-f] [-r REV]...'
4233 ' [--bundle FILENAME] [SOURCE]')),
4234 ' [--bundle FILENAME] [SOURCE]')),
4234 "^init":
4235 "^init":
4235 (init,
4236 (init,
4236 remoteopts,
4237 remoteopts,
4237 _('[-e CMD] [--remotecmd CMD] [DEST]')),
4238 _('[-e CMD] [--remotecmd CMD] [DEST]')),
4238 "locate":
4239 "locate":
4239 (locate,
4240 (locate,
4240 [('r', 'rev', '',
4241 [('r', 'rev', '',
4241 _('search the repository as it is in REV'), _('REV')),
4242 _('search the repository as it is in REV'), _('REV')),
4242 ('0', 'print0', None,
4243 ('0', 'print0', None,
4243 _('end filenames with NUL, for use with xargs')),
4244 _('end filenames with NUL, for use with xargs')),
4244 ('f', 'fullpath', None,
4245 ('f', 'fullpath', None,
4245 _('print complete paths from the filesystem root')),
4246 _('print complete paths from the filesystem root')),
4246 ] + walkopts,
4247 ] + walkopts,
4247 _('[OPTION]... [PATTERN]...')),
4248 _('[OPTION]... [PATTERN]...')),
4248 "^log|history":
4249 "^log|history":
4249 (log,
4250 (log,
4250 [('f', 'follow', None,
4251 [('f', 'follow', None,
4251 _('follow changeset history,'
4252 _('follow changeset history,'
4252 ' or file history across copies and renames')),
4253 ' or file history across copies and renames')),
4253 ('', 'follow-first', None,
4254 ('', 'follow-first', None,
4254 _('only follow the first parent of merge changesets')),
4255 _('only follow the first parent of merge changesets')),
4255 ('d', 'date', '',
4256 ('d', 'date', '',
4256 _('show revisions matching date spec'), _('DATE')),
4257 _('show revisions matching date spec'), _('DATE')),
4257 ('C', 'copies', None, _('show copied files')),
4258 ('C', 'copies', None, _('show copied files')),
4258 ('k', 'keyword', [],
4259 ('k', 'keyword', [],
4259 _('do case-insensitive search for a given text'), _('TEXT')),
4260 _('do case-insensitive search for a given text'), _('TEXT')),
4260 ('r', 'rev', [],
4261 ('r', 'rev', [],
4261 _('show the specified revision or range'), _('REV')),
4262 _('show the specified revision or range'), _('REV')),
4262 ('', 'removed', None, _('include revisions where files were removed')),
4263 ('', 'removed', None, _('include revisions where files were removed')),
4263 ('m', 'only-merges', None, _('show only merges')),
4264 ('m', 'only-merges', None, _('show only merges')),
4264 ('u', 'user', [],
4265 ('u', 'user', [],
4265 _('revisions committed by user'), _('USER')),
4266 _('revisions committed by user'), _('USER')),
4266 ('', 'only-branch', [],
4267 ('', 'only-branch', [],
4267 _('show only changesets within the given named branch (DEPRECATED)'),
4268 _('show only changesets within the given named branch (DEPRECATED)'),
4268 _('BRANCH')),
4269 _('BRANCH')),
4269 ('b', 'branch', [],
4270 ('b', 'branch', [],
4270 _('show changesets within the given named branch'), _('BRANCH')),
4271 _('show changesets within the given named branch'), _('BRANCH')),
4271 ('P', 'prune', [],
4272 ('P', 'prune', [],
4272 _('do not display revision or any of its ancestors'), _('REV')),
4273 _('do not display revision or any of its ancestors'), _('REV')),
4273 ] + logopts + walkopts,
4274 ] + logopts + walkopts,
4274 _('[OPTION]... [FILE]')),
4275 _('[OPTION]... [FILE]')),
4275 "manifest":
4276 "manifest":
4276 (manifest,
4277 (manifest,
4277 [('r', 'rev', '',
4278 [('r', 'rev', '',
4278 _('revision to display'), _('REV'))],
4279 _('revision to display'), _('REV'))],
4279 _('[-r REV]')),
4280 _('[-r REV]')),
4280 "^merge":
4281 "^merge":
4281 (merge,
4282 (merge,
4282 [('f', 'force', None, _('force a merge with outstanding changes')),
4283 [('f', 'force', None, _('force a merge with outstanding changes')),
4283 ('r', 'rev', '',
4284 ('r', 'rev', '',
4284 _('revision to merge'), _('REV')),
4285 _('revision to merge'), _('REV')),
4285 ('P', 'preview', None,
4286 ('P', 'preview', None,
4286 _('review revisions to merge (no merge is performed)'))],
4287 _('review revisions to merge (no merge is performed)'))],
4287 _('[-P] [-f] [[-r] REV]')),
4288 _('[-P] [-f] [[-r] REV]')),
4288 "outgoing|out":
4289 "outgoing|out":
4289 (outgoing,
4290 (outgoing,
4290 [('f', 'force', None,
4291 [('f', 'force', None,
4291 _('run even when the destination is unrelated')),
4292 _('run even when the destination is unrelated')),
4292 ('r', 'rev', [],
4293 ('r', 'rev', [],
4293 _('a changeset intended to be included in the destination'),
4294 _('a changeset intended to be included in the destination'),
4294 _('REV')),
4295 _('REV')),
4295 ('n', 'newest-first', None, _('show newest record first')),
4296 ('n', 'newest-first', None, _('show newest record first')),
4296 ('b', 'branch', [],
4297 ('b', 'branch', [],
4297 _('a specific branch you would like to push'), _('BRANCH')),
4298 _('a specific branch you would like to push'), _('BRANCH')),
4298 ] + logopts + remoteopts,
4299 ] + logopts + remoteopts,
4299 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
4300 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
4300 "parents":
4301 "parents":
4301 (parents,
4302 (parents,
4302 [('r', 'rev', '',
4303 [('r', 'rev', '',
4303 _('show parents of the specified revision'), _('REV')),
4304 _('show parents of the specified revision'), _('REV')),
4304 ] + templateopts,
4305 ] + templateopts,
4305 _('[-r REV] [FILE]')),
4306 _('[-r REV] [FILE]')),
4306 "paths": (paths, [], _('[NAME]')),
4307 "paths": (paths, [], _('[NAME]')),
4307 "^pull":
4308 "^pull":
4308 (pull,
4309 (pull,
4309 [('u', 'update', None,
4310 [('u', 'update', None,
4310 _('update to new branch head if changesets were pulled')),
4311 _('update to new branch head if changesets were pulled')),
4311 ('f', 'force', None,
4312 ('f', 'force', None,
4312 _('run even when remote repository is unrelated')),
4313 _('run even when remote repository is unrelated')),
4313 ('r', 'rev', [],
4314 ('r', 'rev', [],
4314 _('a remote changeset intended to be added'), _('REV')),
4315 _('a remote changeset intended to be added'), _('REV')),
4315 ('b', 'branch', [],
4316 ('b', 'branch', [],
4316 _('a specific branch you would like to pull'), _('BRANCH')),
4317 _('a specific branch you would like to pull'), _('BRANCH')),
4317 ] + remoteopts,
4318 ] + remoteopts,
4318 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')),
4319 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')),
4319 "^push":
4320 "^push":
4320 (push,
4321 (push,
4321 [('f', 'force', None, _('force push')),
4322 [('f', 'force', None, _('force push')),
4322 ('r', 'rev', [],
4323 ('r', 'rev', [],
4323 _('a changeset intended to be included in the destination'),
4324 _('a changeset intended to be included in the destination'),
4324 _('REV')),
4325 _('REV')),
4325 ('b', 'branch', [],
4326 ('b', 'branch', [],
4326 _('a specific branch you would like to push'), _('BRANCH')),
4327 _('a specific branch you would like to push'), _('BRANCH')),
4327 ('', 'new-branch', False, _('allow pushing a new branch')),
4328 ('', 'new-branch', False, _('allow pushing a new branch')),
4328 ] + remoteopts,
4329 ] + remoteopts,
4329 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')),
4330 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')),
4330 "recover": (recover, []),
4331 "recover": (recover, []),
4331 "^remove|rm":
4332 "^remove|rm":
4332 (remove,
4333 (remove,
4333 [('A', 'after', None, _('record delete for missing files')),
4334 [('A', 'after', None, _('record delete for missing files')),
4334 ('f', 'force', None,
4335 ('f', 'force', None,
4335 _('remove (and delete) file even if added or modified')),
4336 _('remove (and delete) file even if added or modified')),
4336 ] + walkopts,
4337 ] + walkopts,
4337 _('[OPTION]... FILE...')),
4338 _('[OPTION]... FILE...')),
4338 "rename|mv":
4339 "rename|mv":
4339 (rename,
4340 (rename,
4340 [('A', 'after', None, _('record a rename that has already occurred')),
4341 [('A', 'after', None, _('record a rename that has already occurred')),
4341 ('f', 'force', None,
4342 ('f', 'force', None,
4342 _('forcibly copy over an existing managed file')),
4343 _('forcibly copy over an existing managed file')),
4343 ] + walkopts + dryrunopts,
4344 ] + walkopts + dryrunopts,
4344 _('[OPTION]... SOURCE... DEST')),
4345 _('[OPTION]... SOURCE... DEST')),
4345 "resolve":
4346 "resolve":
4346 (resolve,
4347 (resolve,
4347 [('a', 'all', None, _('select all unresolved files')),
4348 [('a', 'all', None, _('select all unresolved files')),
4348 ('l', 'list', None, _('list state of files needing merge')),
4349 ('l', 'list', None, _('list state of files needing merge')),
4349 ('m', 'mark', None, _('mark files as resolved')),
4350 ('m', 'mark', None, _('mark files as resolved')),
4350 ('u', 'unmark', None, _('unmark files as resolved')),
4351 ('u', 'unmark', None, _('unmark files as resolved')),
4351 ('n', 'no-status', None, _('hide status prefix'))]
4352 ('n', 'no-status', None, _('hide status prefix'))]
4352 + walkopts,
4353 + walkopts,
4353 _('[OPTION]... [FILE]...')),
4354 _('[OPTION]... [FILE]...')),
4354 "revert":
4355 "revert":
4355 (revert,
4356 (revert,
4356 [('a', 'all', None, _('revert all changes when no arguments given')),
4357 [('a', 'all', None, _('revert all changes when no arguments given')),
4357 ('d', 'date', '',
4358 ('d', 'date', '',
4358 _('tipmost revision matching date'), _('DATE')),
4359 _('tipmost revision matching date'), _('DATE')),
4359 ('r', 'rev', '',
4360 ('r', 'rev', '',
4360 _('revert to the specified revision'), _('REV')),
4361 _('revert to the specified revision'), _('REV')),
4361 ('', 'no-backup', None, _('do not save backup copies of files')),
4362 ('', 'no-backup', None, _('do not save backup copies of files')),
4362 ] + walkopts + dryrunopts,
4363 ] + walkopts + dryrunopts,
4363 _('[OPTION]... [-r REV] [NAME]...')),
4364 _('[OPTION]... [-r REV] [NAME]...')),
4364 "rollback": (rollback, dryrunopts),
4365 "rollback": (rollback, dryrunopts),
4365 "root": (root, []),
4366 "root": (root, []),
4366 "^serve":
4367 "^serve":
4367 (serve,
4368 (serve,
4368 [('A', 'accesslog', '',
4369 [('A', 'accesslog', '',
4369 _('name of access log file to write to'), _('FILE')),
4370 _('name of access log file to write to'), _('FILE')),
4370 ('d', 'daemon', None, _('run server in background')),
4371 ('d', 'daemon', None, _('run server in background')),
4371 ('', 'daemon-pipefds', '',
4372 ('', 'daemon-pipefds', '',
4372 _('used internally by daemon mode'), _('NUM')),
4373 _('used internally by daemon mode'), _('NUM')),
4373 ('E', 'errorlog', '',
4374 ('E', 'errorlog', '',
4374 _('name of error log file to write to'), _('FILE')),
4375 _('name of error log file to write to'), _('FILE')),
4375 # use string type, then we can check if something was passed
4376 # use string type, then we can check if something was passed
4376 ('p', 'port', '',
4377 ('p', 'port', '',
4377 _('port to listen on (default: 8000)'), _('PORT')),
4378 _('port to listen on (default: 8000)'), _('PORT')),
4378 ('a', 'address', '',
4379 ('a', 'address', '',
4379 _('address to listen on (default: all interfaces)'), _('ADDR')),
4380 _('address to listen on (default: all interfaces)'), _('ADDR')),
4380 ('', 'prefix', '',
4381 ('', 'prefix', '',
4381 _('prefix path to serve from (default: server root)'), _('PREFIX')),
4382 _('prefix path to serve from (default: server root)'), _('PREFIX')),
4382 ('n', 'name', '',
4383 ('n', 'name', '',
4383 _('name to show in web pages (default: working directory)'),
4384 _('name to show in web pages (default: working directory)'),
4384 _('NAME')),
4385 _('NAME')),
4385 ('', 'web-conf', '',
4386 ('', 'web-conf', '',
4386 _('name of the hgweb config file (serve more than one repository)'),
4387 _('name of the hgweb config file (serve more than one repository)'),
4387 _('FILE')),
4388 _('FILE')),
4388 ('', 'webdir-conf', '',
4389 ('', 'webdir-conf', '',
4389 _('name of the hgweb config file (DEPRECATED)'), _('FILE')),
4390 _('name of the hgweb config file (DEPRECATED)'), _('FILE')),
4390 ('', 'pid-file', '',
4391 ('', 'pid-file', '',
4391 _('name of file to write process ID to'), _('FILE')),
4392 _('name of file to write process ID to'), _('FILE')),
4392 ('', 'stdio', None, _('for remote clients')),
4393 ('', 'stdio', None, _('for remote clients')),
4393 ('t', 'templates', '',
4394 ('t', 'templates', '',
4394 _('web templates to use'), _('TEMPLATE')),
4395 _('web templates to use'), _('TEMPLATE')),
4395 ('', 'style', '',
4396 ('', 'style', '',
4396 _('template style to use'), _('STYLE')),
4397 _('template style to use'), _('STYLE')),
4397 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4398 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4398 ('', 'certificate', '',
4399 ('', 'certificate', '',
4399 _('SSL certificate file'), _('FILE'))],
4400 _('SSL certificate file'), _('FILE'))],
4400 _('[OPTION]...')),
4401 _('[OPTION]...')),
4401 "showconfig|debugconfig":
4402 "showconfig|debugconfig":
4402 (showconfig,
4403 (showconfig,
4403 [('u', 'untrusted', None, _('show untrusted configuration options'))],
4404 [('u', 'untrusted', None, _('show untrusted configuration options'))],
4404 _('[-u] [NAME]...')),
4405 _('[-u] [NAME]...')),
4405 "^summary|sum":
4406 "^summary|sum":
4406 (summary,
4407 (summary,
4407 [('', 'remote', None, _('check for push and pull'))], '[--remote]'),
4408 [('', 'remote', None, _('check for push and pull'))], '[--remote]'),
4408 "^status|st":
4409 "^status|st":
4409 (status,
4410 (status,
4410 [('A', 'all', None, _('show status of all files')),
4411 [('A', 'all', None, _('show status of all files')),
4411 ('m', 'modified', None, _('show only modified files')),
4412 ('m', 'modified', None, _('show only modified files')),
4412 ('a', 'added', None, _('show only added files')),
4413 ('a', 'added', None, _('show only added files')),
4413 ('r', 'removed', None, _('show only removed files')),
4414 ('r', 'removed', None, _('show only removed files')),
4414 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4415 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4415 ('c', 'clean', None, _('show only files without changes')),
4416 ('c', 'clean', None, _('show only files without changes')),
4416 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4417 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4417 ('i', 'ignored', None, _('show only ignored files')),
4418 ('i', 'ignored', None, _('show only ignored files')),
4418 ('n', 'no-status', None, _('hide status prefix')),
4419 ('n', 'no-status', None, _('hide status prefix')),
4419 ('C', 'copies', None, _('show source of copied files')),
4420 ('C', 'copies', None, _('show source of copied files')),
4420 ('0', 'print0', None,
4421 ('0', 'print0', None,
4421 _('end filenames with NUL, for use with xargs')),
4422 _('end filenames with NUL, for use with xargs')),
4422 ('', 'rev', [],
4423 ('', 'rev', [],
4423 _('show difference from revision'), _('REV')),
4424 _('show difference from revision'), _('REV')),
4424 ('', 'change', '',
4425 ('', 'change', '',
4425 _('list the changed files of a revision'), _('REV')),
4426 _('list the changed files of a revision'), _('REV')),
4426 ] + walkopts,
4427 ] + walkopts,
4427 _('[OPTION]... [FILE]...')),
4428 _('[OPTION]... [FILE]...')),
4428 "tag":
4429 "tag":
4429 (tag,
4430 (tag,
4430 [('f', 'force', None, _('replace existing tag')),
4431 [('f', 'force', None, _('replace existing tag')),
4431 ('l', 'local', None, _('make the tag local')),
4432 ('l', 'local', None, _('make the tag local')),
4432 ('r', 'rev', '',
4433 ('r', 'rev', '',
4433 _('revision to tag'), _('REV')),
4434 _('revision to tag'), _('REV')),
4434 ('', 'remove', None, _('remove a tag')),
4435 ('', 'remove', None, _('remove a tag')),
4435 # -l/--local is already there, commitopts cannot be used
4436 # -l/--local is already there, commitopts cannot be used
4436 ('e', 'edit', None, _('edit commit message')),
4437 ('e', 'edit', None, _('edit commit message')),
4437 ('m', 'message', '',
4438 ('m', 'message', '',
4438 _('use <text> as commit message'), _('TEXT')),
4439 _('use <text> as commit message'), _('TEXT')),
4439 ] + commitopts2,
4440 ] + commitopts2,
4440 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')),
4441 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')),
4441 "tags": (tags, [], ''),
4442 "tags": (tags, [], ''),
4442 "tip":
4443 "tip":
4443 (tip,
4444 (tip,
4444 [('p', 'patch', None, _('show patch')),
4445 [('p', 'patch', None, _('show patch')),
4445 ('g', 'git', None, _('use git extended diff format')),
4446 ('g', 'git', None, _('use git extended diff format')),
4446 ] + templateopts,
4447 ] + templateopts,
4447 _('[-p] [-g]')),
4448 _('[-p] [-g]')),
4448 "unbundle":
4449 "unbundle":
4449 (unbundle,
4450 (unbundle,
4450 [('u', 'update', None,
4451 [('u', 'update', None,
4451 _('update to new branch head if changesets were unbundled'))],
4452 _('update to new branch head if changesets were unbundled'))],
4452 _('[-u] FILE...')),
4453 _('[-u] FILE...')),
4453 "^update|up|checkout|co":
4454 "^update|up|checkout|co":
4454 (update,
4455 (update,
4455 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
4456 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
4456 ('c', 'check', None, _('check for uncommitted changes')),
4457 ('c', 'check', None, _('check for uncommitted changes')),
4457 ('d', 'date', '',
4458 ('d', 'date', '',
4458 _('tipmost revision matching date'), _('DATE')),
4459 _('tipmost revision matching date'), _('DATE')),
4459 ('r', 'rev', '',
4460 ('r', 'rev', '',
4460 _('revision'), _('REV'))],
4461 _('revision'), _('REV'))],
4461 _('[-c] [-C] [-d DATE] [[-r] REV]')),
4462 _('[-c] [-C] [-d DATE] [[-r] REV]')),
4462 "verify": (verify, []),
4463 "verify": (verify, []),
4463 "version": (version_, []),
4464 "version": (version_, []),
4464 }
4465 }
4465
4466
4466 norepo = ("clone init version help debugcommands debugcomplete debugdata"
4467 norepo = ("clone init version help debugcommands debugcomplete debugdata"
4467 " debugindex debugindexdot debugdate debuginstall debugfsinfo"
4468 " debugindex debugindexdot debugdate debuginstall debugfsinfo"
4468 " debugpushkey")
4469 " debugpushkey")
4469 optionalrepo = ("identify paths serve showconfig debugancestor debugdag")
4470 optionalrepo = ("identify paths serve showconfig debugancestor debugdag")
General Comments 0
You need to be logged in to leave comments. Login now