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