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