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