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