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