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