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