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