##// END OF EJS Templates
drop {short,hex}(ctx.node()) calls in favor of ctx methods
Alexander Solovyov -
r14055:421d56a0 default
parent child Browse files
Show More
@@ -1,4901 +1,4900
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from node import hex, bin, nullid, nullrev, short
8 from node import hex, bin, nullid, nullrev, short
9 from lock import release
9 from lock import release
10 from i18n import _, gettext
10 from i18n import _, gettext
11 import os, re, sys, difflib, time, tempfile
11 import os, re, sys, difflib, time, tempfile
12 import hg, scmutil, util, revlog, extensions, copies, error, bookmarks
12 import hg, scmutil, util, revlog, extensions, copies, error, bookmarks
13 import patch, help, mdiff, url, encoding, templatekw, discovery
13 import patch, help, mdiff, url, encoding, templatekw, discovery
14 import archival, changegroup, cmdutil, sshserver, hbisect, hgweb, hgweb.server
14 import archival, changegroup, cmdutil, sshserver, hbisect, hgweb, hgweb.server
15 import merge as mergemod
15 import merge as mergemod
16 import minirst, revset, templatefilters
16 import minirst, revset, templatefilters
17 import dagparser
17 import dagparser
18
18
19 # Commands start here, listed alphabetically
19 # Commands start here, listed alphabetically
20
20
21 def add(ui, repo, *pats, **opts):
21 def add(ui, repo, *pats, **opts):
22 """add the specified files on the next commit
22 """add the specified files on the next commit
23
23
24 Schedule files to be version controlled and added to the
24 Schedule files to be version controlled and added to the
25 repository.
25 repository.
26
26
27 The files will be added to the repository at the next commit. To
27 The files will be added to the repository at the next commit. To
28 undo an add before that, see :hg:`forget`.
28 undo an add before that, see :hg:`forget`.
29
29
30 If no names are given, add all files to the repository.
30 If no names are given, add all files to the repository.
31
31
32 .. container:: verbose
32 .. container:: verbose
33
33
34 An example showing how new (unknown) files are added
34 An example showing how new (unknown) files are added
35 automatically by :hg:`add`::
35 automatically by :hg:`add`::
36
36
37 $ ls
37 $ ls
38 foo.c
38 foo.c
39 $ hg status
39 $ hg status
40 ? foo.c
40 ? foo.c
41 $ hg add
41 $ hg add
42 adding foo.c
42 adding foo.c
43 $ hg status
43 $ hg status
44 A foo.c
44 A foo.c
45
45
46 Returns 0 if all files are successfully added.
46 Returns 0 if all files are successfully added.
47 """
47 """
48
48
49 m = cmdutil.match(repo, pats, opts)
49 m = cmdutil.match(repo, pats, opts)
50 rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
50 rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
51 opts.get('subrepos'), prefix="")
51 opts.get('subrepos'), prefix="")
52 return rejected and 1 or 0
52 return rejected and 1 or 0
53
53
54 def addremove(ui, repo, *pats, **opts):
54 def addremove(ui, repo, *pats, **opts):
55 """add all new files, delete all missing files
55 """add all new files, delete all missing files
56
56
57 Add all new files and remove all missing files from the
57 Add all new files and remove all missing files from the
58 repository.
58 repository.
59
59
60 New files are ignored if they match any of the patterns in
60 New files are ignored if they match any of the patterns in
61 ``.hgignore``. As with add, these changes take effect at the next
61 ``.hgignore``. As with add, these changes take effect at the next
62 commit.
62 commit.
63
63
64 Use the -s/--similarity option to detect renamed files. With a
64 Use the -s/--similarity option to detect renamed files. With a
65 parameter greater than 0, this compares every removed file with
65 parameter greater than 0, this compares every removed file with
66 every added file and records those similar enough as renames. This
66 every added file and records those similar enough as renames. This
67 option takes a percentage between 0 (disabled) and 100 (files must
67 option takes a percentage between 0 (disabled) and 100 (files must
68 be identical) as its parameter. Detecting renamed files this way
68 be identical) as its parameter. Detecting renamed files this way
69 can be expensive. After using this option, :hg:`status -C` can be
69 can be expensive. After using this option, :hg:`status -C` can be
70 used to check which files were identified as moved or renamed.
70 used to check which files were identified as moved or renamed.
71
71
72 Returns 0 if all files are successfully added.
72 Returns 0 if all files are successfully added.
73 """
73 """
74 try:
74 try:
75 sim = float(opts.get('similarity') or 100)
75 sim = float(opts.get('similarity') or 100)
76 except ValueError:
76 except ValueError:
77 raise util.Abort(_('similarity must be a number'))
77 raise util.Abort(_('similarity must be a number'))
78 if sim < 0 or sim > 100:
78 if sim < 0 or sim > 100:
79 raise util.Abort(_('similarity must be between 0 and 100'))
79 raise util.Abort(_('similarity must be between 0 and 100'))
80 return cmdutil.addremove(repo, pats, opts, similarity=sim / 100.0)
80 return cmdutil.addremove(repo, pats, opts, similarity=sim / 100.0)
81
81
82 def annotate(ui, repo, *pats, **opts):
82 def annotate(ui, repo, *pats, **opts):
83 """show changeset information by line for each file
83 """show changeset information by line for each file
84
84
85 List changes in files, showing the revision id responsible for
85 List changes in files, showing the revision id responsible for
86 each line
86 each line
87
87
88 This command is useful for discovering when a change was made and
88 This command is useful for discovering when a change was made and
89 by whom.
89 by whom.
90
90
91 Without the -a/--text option, annotate will avoid processing files
91 Without the -a/--text option, annotate will avoid processing files
92 it detects as binary. With -a, annotate will annotate the file
92 it detects as binary. With -a, annotate will annotate the file
93 anyway, although the results will probably be neither useful
93 anyway, although the results will probably be neither useful
94 nor desirable.
94 nor desirable.
95
95
96 Returns 0 on success.
96 Returns 0 on success.
97 """
97 """
98 if opts.get('follow'):
98 if opts.get('follow'):
99 # --follow is deprecated and now just an alias for -f/--file
99 # --follow is deprecated and now just an alias for -f/--file
100 # to mimic the behavior of Mercurial before version 1.5
100 # to mimic the behavior of Mercurial before version 1.5
101 opts['file'] = 1
101 opts['file'] = 1
102
102
103 datefunc = ui.quiet and util.shortdate or util.datestr
103 datefunc = ui.quiet and util.shortdate or util.datestr
104 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
104 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
105
105
106 if not pats:
106 if not pats:
107 raise util.Abort(_('at least one filename or pattern is required'))
107 raise util.Abort(_('at least one filename or pattern is required'))
108
108
109 opmap = [('user', lambda x: ui.shortuser(x[0].user())),
109 opmap = [('user', lambda x: ui.shortuser(x[0].user())),
110 ('number', lambda x: str(x[0].rev())),
110 ('number', lambda x: str(x[0].rev())),
111 ('changeset', lambda x: short(x[0].node())),
111 ('changeset', lambda x: short(x[0].node())),
112 ('date', getdate),
112 ('date', getdate),
113 ('file', lambda x: x[0].path()),
113 ('file', lambda x: x[0].path()),
114 ]
114 ]
115
115
116 if (not opts.get('user') and not opts.get('changeset')
116 if (not opts.get('user') and not opts.get('changeset')
117 and not opts.get('date') and not opts.get('file')):
117 and not opts.get('date') and not opts.get('file')):
118 opts['number'] = 1
118 opts['number'] = 1
119
119
120 linenumber = opts.get('line_number') is not None
120 linenumber = opts.get('line_number') is not None
121 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
121 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
122 raise util.Abort(_('at least one of -n/-c is required for -l'))
122 raise util.Abort(_('at least one of -n/-c is required for -l'))
123
123
124 funcmap = [func for op, func in opmap if opts.get(op)]
124 funcmap = [func for op, func in opmap if opts.get(op)]
125 if linenumber:
125 if linenumber:
126 lastfunc = funcmap[-1]
126 lastfunc = funcmap[-1]
127 funcmap[-1] = lambda x: "%s:%s" % (lastfunc(x), x[1])
127 funcmap[-1] = lambda x: "%s:%s" % (lastfunc(x), x[1])
128
128
129 def bad(x, y):
129 def bad(x, y):
130 raise util.Abort("%s: %s" % (x, y))
130 raise util.Abort("%s: %s" % (x, y))
131
131
132 ctx = cmdutil.revsingle(repo, opts.get('rev'))
132 ctx = cmdutil.revsingle(repo, opts.get('rev'))
133 m = cmdutil.match(repo, pats, opts)
133 m = cmdutil.match(repo, pats, opts)
134 m.bad = bad
134 m.bad = bad
135 follow = not opts.get('no_follow')
135 follow = not opts.get('no_follow')
136 for abs in ctx.walk(m):
136 for abs in ctx.walk(m):
137 fctx = ctx[abs]
137 fctx = ctx[abs]
138 if not opts.get('text') and util.binary(fctx.data()):
138 if not opts.get('text') and util.binary(fctx.data()):
139 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
139 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
140 continue
140 continue
141
141
142 lines = fctx.annotate(follow=follow, linenumber=linenumber)
142 lines = fctx.annotate(follow=follow, linenumber=linenumber)
143 pieces = []
143 pieces = []
144
144
145 for f in funcmap:
145 for f in funcmap:
146 l = [f(n) for n, dummy in lines]
146 l = [f(n) for n, dummy in lines]
147 if l:
147 if l:
148 sized = [(x, encoding.colwidth(x)) for x in l]
148 sized = [(x, encoding.colwidth(x)) for x in l]
149 ml = max([w for x, w in sized])
149 ml = max([w for x, w in sized])
150 pieces.append(["%s%s" % (' ' * (ml - w), x) for x, w in sized])
150 pieces.append(["%s%s" % (' ' * (ml - w), x) for x, w in sized])
151
151
152 if pieces:
152 if pieces:
153 for p, l in zip(zip(*pieces), lines):
153 for p, l in zip(zip(*pieces), lines):
154 ui.write("%s: %s" % (" ".join(p), l[1]))
154 ui.write("%s: %s" % (" ".join(p), l[1]))
155
155
156 def archive(ui, repo, dest, **opts):
156 def archive(ui, repo, dest, **opts):
157 '''create an unversioned archive of a repository revision
157 '''create an unversioned archive of a repository revision
158
158
159 By default, the revision used is the parent of the working
159 By default, the revision used is the parent of the working
160 directory; use -r/--rev to specify a different revision.
160 directory; use -r/--rev to specify a different revision.
161
161
162 The archive type is automatically detected based on file
162 The archive type is automatically detected based on file
163 extension (or override using -t/--type).
163 extension (or override using -t/--type).
164
164
165 Valid types are:
165 Valid types are:
166
166
167 :``files``: a directory full of files (default)
167 :``files``: a directory full of files (default)
168 :``tar``: tar archive, uncompressed
168 :``tar``: tar archive, uncompressed
169 :``tbz2``: tar archive, compressed using bzip2
169 :``tbz2``: tar archive, compressed using bzip2
170 :``tgz``: tar archive, compressed using gzip
170 :``tgz``: tar archive, compressed using gzip
171 :``uzip``: zip archive, uncompressed
171 :``uzip``: zip archive, uncompressed
172 :``zip``: zip archive, compressed using deflate
172 :``zip``: zip archive, compressed using deflate
173
173
174 The exact name of the destination archive or directory is given
174 The exact name of the destination archive or directory is given
175 using a format string; see :hg:`help export` for details.
175 using a format string; see :hg:`help export` for details.
176
176
177 Each member added to an archive file has a directory prefix
177 Each member added to an archive file has a directory prefix
178 prepended. Use -p/--prefix to specify a format string for the
178 prepended. Use -p/--prefix to specify a format string for the
179 prefix. The default is the basename of the archive, with suffixes
179 prefix. The default is the basename of the archive, with suffixes
180 removed.
180 removed.
181
181
182 Returns 0 on success.
182 Returns 0 on success.
183 '''
183 '''
184
184
185 ctx = cmdutil.revsingle(repo, opts.get('rev'))
185 ctx = cmdutil.revsingle(repo, opts.get('rev'))
186 if not ctx:
186 if not ctx:
187 raise util.Abort(_('no working directory: please specify a revision'))
187 raise util.Abort(_('no working directory: please specify a revision'))
188 node = ctx.node()
188 node = ctx.node()
189 dest = cmdutil.make_filename(repo, dest, node)
189 dest = cmdutil.make_filename(repo, dest, node)
190 if os.path.realpath(dest) == repo.root:
190 if os.path.realpath(dest) == repo.root:
191 raise util.Abort(_('repository root cannot be destination'))
191 raise util.Abort(_('repository root cannot be destination'))
192
192
193 kind = opts.get('type') or archival.guesskind(dest) or 'files'
193 kind = opts.get('type') or archival.guesskind(dest) or 'files'
194 prefix = opts.get('prefix')
194 prefix = opts.get('prefix')
195
195
196 if dest == '-':
196 if dest == '-':
197 if kind == 'files':
197 if kind == 'files':
198 raise util.Abort(_('cannot archive plain files to stdout'))
198 raise util.Abort(_('cannot archive plain files to stdout'))
199 dest = sys.stdout
199 dest = sys.stdout
200 if not prefix:
200 if not prefix:
201 prefix = os.path.basename(repo.root) + '-%h'
201 prefix = os.path.basename(repo.root) + '-%h'
202
202
203 prefix = cmdutil.make_filename(repo, prefix, node)
203 prefix = cmdutil.make_filename(repo, prefix, node)
204 matchfn = cmdutil.match(repo, [], opts)
204 matchfn = cmdutil.match(repo, [], opts)
205 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
205 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
206 matchfn, prefix, subrepos=opts.get('subrepos'))
206 matchfn, prefix, subrepos=opts.get('subrepos'))
207
207
208 def backout(ui, repo, node=None, rev=None, **opts):
208 def backout(ui, repo, node=None, rev=None, **opts):
209 '''reverse effect of earlier changeset
209 '''reverse effect of earlier changeset
210
210
211 Prepare a new changeset with the effect of REV undone in the
211 Prepare a new changeset with the effect of REV undone in the
212 current working directory.
212 current working directory.
213
213
214 If REV is the parent of the working directory, then this new changeset
214 If REV is the parent of the working directory, then this new changeset
215 is committed automatically. Otherwise, hg needs to merge the
215 is committed automatically. Otherwise, hg needs to merge the
216 changes and the merged result is left uncommitted.
216 changes and the merged result is left uncommitted.
217
217
218 By default, the pending changeset will have one parent,
218 By default, the pending changeset will have one parent,
219 maintaining a linear history. With --merge, the pending changeset
219 maintaining a linear history. With --merge, the pending changeset
220 will instead have two parents: the old parent of the working
220 will instead have two parents: the old parent of the working
221 directory and a new child of REV that simply undoes REV.
221 directory and a new child of REV that simply undoes REV.
222
222
223 Before version 1.7, the behavior without --merge was equivalent to
223 Before version 1.7, the behavior without --merge was equivalent to
224 specifying --merge followed by :hg:`update --clean .` to cancel
224 specifying --merge followed by :hg:`update --clean .` to cancel
225 the merge and leave the child of REV as a head to be merged
225 the merge and leave the child of REV as a head to be merged
226 separately.
226 separately.
227
227
228 See :hg:`help dates` for a list of formats valid for -d/--date.
228 See :hg:`help dates` for a list of formats valid for -d/--date.
229
229
230 Returns 0 on success.
230 Returns 0 on success.
231 '''
231 '''
232 if rev and node:
232 if rev and node:
233 raise util.Abort(_("please specify just one revision"))
233 raise util.Abort(_("please specify just one revision"))
234
234
235 if not rev:
235 if not rev:
236 rev = node
236 rev = node
237
237
238 if not rev:
238 if not rev:
239 raise util.Abort(_("please specify a revision to backout"))
239 raise util.Abort(_("please specify a revision to backout"))
240
240
241 date = opts.get('date')
241 date = opts.get('date')
242 if date:
242 if date:
243 opts['date'] = util.parsedate(date)
243 opts['date'] = util.parsedate(date)
244
244
245 cmdutil.bail_if_changed(repo)
245 cmdutil.bail_if_changed(repo)
246 node = cmdutil.revsingle(repo, rev).node()
246 node = cmdutil.revsingle(repo, rev).node()
247
247
248 op1, op2 = repo.dirstate.parents()
248 op1, op2 = repo.dirstate.parents()
249 a = repo.changelog.ancestor(op1, node)
249 a = repo.changelog.ancestor(op1, node)
250 if a != node:
250 if a != node:
251 raise util.Abort(_('cannot backout change on a different branch'))
251 raise util.Abort(_('cannot backout change on a different branch'))
252
252
253 p1, p2 = repo.changelog.parents(node)
253 p1, p2 = repo.changelog.parents(node)
254 if p1 == nullid:
254 if p1 == nullid:
255 raise util.Abort(_('cannot backout a change with no parents'))
255 raise util.Abort(_('cannot backout a change with no parents'))
256 if p2 != nullid:
256 if p2 != nullid:
257 if not opts.get('parent'):
257 if not opts.get('parent'):
258 raise util.Abort(_('cannot backout a merge changeset without '
258 raise util.Abort(_('cannot backout a merge changeset without '
259 '--parent'))
259 '--parent'))
260 p = repo.lookup(opts['parent'])
260 p = repo.lookup(opts['parent'])
261 if p not in (p1, p2):
261 if p not in (p1, p2):
262 raise util.Abort(_('%s is not a parent of %s') %
262 raise util.Abort(_('%s is not a parent of %s') %
263 (short(p), short(node)))
263 (short(p), short(node)))
264 parent = p
264 parent = p
265 else:
265 else:
266 if opts.get('parent'):
266 if opts.get('parent'):
267 raise util.Abort(_('cannot use --parent on non-merge changeset'))
267 raise util.Abort(_('cannot use --parent on non-merge changeset'))
268 parent = p1
268 parent = p1
269
269
270 # the backout should appear on the same branch
270 # the backout should appear on the same branch
271 branch = repo.dirstate.branch()
271 branch = repo.dirstate.branch()
272 hg.clean(repo, node, show_stats=False)
272 hg.clean(repo, node, show_stats=False)
273 repo.dirstate.setbranch(branch)
273 repo.dirstate.setbranch(branch)
274 revert_opts = opts.copy()
274 revert_opts = opts.copy()
275 revert_opts['date'] = None
275 revert_opts['date'] = None
276 revert_opts['all'] = True
276 revert_opts['all'] = True
277 revert_opts['rev'] = hex(parent)
277 revert_opts['rev'] = hex(parent)
278 revert_opts['no_backup'] = None
278 revert_opts['no_backup'] = None
279 revert(ui, repo, **revert_opts)
279 revert(ui, repo, **revert_opts)
280 if not opts.get('merge') and op1 != node:
280 if not opts.get('merge') and op1 != node:
281 try:
281 try:
282 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
282 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
283 return hg.update(repo, op1)
283 return hg.update(repo, op1)
284 finally:
284 finally:
285 ui.setconfig('ui', 'forcemerge', '')
285 ui.setconfig('ui', 'forcemerge', '')
286
286
287 commit_opts = opts.copy()
287 commit_opts = opts.copy()
288 commit_opts['addremove'] = False
288 commit_opts['addremove'] = False
289 if not commit_opts['message'] and not commit_opts['logfile']:
289 if not commit_opts['message'] and not commit_opts['logfile']:
290 # we don't translate commit messages
290 # we don't translate commit messages
291 commit_opts['message'] = "Backed out changeset %s" % short(node)
291 commit_opts['message'] = "Backed out changeset %s" % short(node)
292 commit_opts['force_editor'] = True
292 commit_opts['force_editor'] = True
293 commit(ui, repo, **commit_opts)
293 commit(ui, repo, **commit_opts)
294 def nice(node):
294 def nice(node):
295 return '%d:%s' % (repo.changelog.rev(node), short(node))
295 return '%d:%s' % (repo.changelog.rev(node), short(node))
296 ui.status(_('changeset %s backs out changeset %s\n') %
296 ui.status(_('changeset %s backs out changeset %s\n') %
297 (nice(repo.changelog.tip()), nice(node)))
297 (nice(repo.changelog.tip()), nice(node)))
298 if opts.get('merge') and op1 != node:
298 if opts.get('merge') and op1 != node:
299 hg.clean(repo, op1, show_stats=False)
299 hg.clean(repo, op1, show_stats=False)
300 ui.status(_('merging with changeset %s\n')
300 ui.status(_('merging with changeset %s\n')
301 % nice(repo.changelog.tip()))
301 % nice(repo.changelog.tip()))
302 try:
302 try:
303 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
303 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
304 return hg.merge(repo, hex(repo.changelog.tip()))
304 return hg.merge(repo, hex(repo.changelog.tip()))
305 finally:
305 finally:
306 ui.setconfig('ui', 'forcemerge', '')
306 ui.setconfig('ui', 'forcemerge', '')
307 return 0
307 return 0
308
308
309 def bisect(ui, repo, rev=None, extra=None, command=None,
309 def bisect(ui, repo, rev=None, extra=None, command=None,
310 reset=None, good=None, bad=None, skip=None, extend=None,
310 reset=None, good=None, bad=None, skip=None, extend=None,
311 noupdate=None):
311 noupdate=None):
312 """subdivision search of changesets
312 """subdivision search of changesets
313
313
314 This command helps to find changesets which introduce problems. To
314 This command helps to find changesets which introduce problems. To
315 use, mark the earliest changeset you know exhibits the problem as
315 use, mark the earliest changeset you know exhibits the problem as
316 bad, then mark the latest changeset which is free from the problem
316 bad, then mark the latest changeset which is free from the problem
317 as good. Bisect will update your working directory to a revision
317 as good. Bisect will update your working directory to a revision
318 for testing (unless the -U/--noupdate option is specified). Once
318 for testing (unless the -U/--noupdate option is specified). Once
319 you have performed tests, mark the working directory as good or
319 you have performed tests, mark the working directory as good or
320 bad, and bisect will either update to another candidate changeset
320 bad, and bisect will either update to another candidate changeset
321 or announce that it has found the bad revision.
321 or announce that it has found the bad revision.
322
322
323 As a shortcut, you can also use the revision argument to mark a
323 As a shortcut, you can also use the revision argument to mark a
324 revision as good or bad without checking it out first.
324 revision as good or bad without checking it out first.
325
325
326 If you supply a command, it will be used for automatic bisection.
326 If you supply a command, it will be used for automatic bisection.
327 Its exit status will be used to mark revisions as good or bad:
327 Its exit status will be used to mark revisions as good or bad:
328 status 0 means good, 125 means to skip the revision, 127
328 status 0 means good, 125 means to skip the revision, 127
329 (command not found) will abort the bisection, and any other
329 (command not found) will abort the bisection, and any other
330 non-zero exit status means the revision is bad.
330 non-zero exit status means the revision is bad.
331
331
332 Returns 0 on success.
332 Returns 0 on success.
333 """
333 """
334 def extendbisectrange(nodes, good):
334 def extendbisectrange(nodes, good):
335 # bisect is incomplete when it ends on a merge node and
335 # bisect is incomplete when it ends on a merge node and
336 # one of the parent was not checked.
336 # one of the parent was not checked.
337 parents = repo[nodes[0]].parents()
337 parents = repo[nodes[0]].parents()
338 if len(parents) > 1:
338 if len(parents) > 1:
339 side = good and state['bad'] or state['good']
339 side = good and state['bad'] or state['good']
340 num = len(set(i.node() for i in parents) & set(side))
340 num = len(set(i.node() for i in parents) & set(side))
341 if num == 1:
341 if num == 1:
342 return parents[0].ancestor(parents[1])
342 return parents[0].ancestor(parents[1])
343 return None
343 return None
344
344
345 def print_result(nodes, good):
345 def print_result(nodes, good):
346 displayer = cmdutil.show_changeset(ui, repo, {})
346 displayer = cmdutil.show_changeset(ui, repo, {})
347 if len(nodes) == 1:
347 if len(nodes) == 1:
348 # narrowed it down to a single revision
348 # narrowed it down to a single revision
349 if good:
349 if good:
350 ui.write(_("The first good revision is:\n"))
350 ui.write(_("The first good revision is:\n"))
351 else:
351 else:
352 ui.write(_("The first bad revision is:\n"))
352 ui.write(_("The first bad revision is:\n"))
353 displayer.show(repo[nodes[0]])
353 displayer.show(repo[nodes[0]])
354 parents = repo[nodes[0]].parents()
355 extendnode = extendbisectrange(nodes, good)
354 extendnode = extendbisectrange(nodes, good)
356 if extendnode is not None:
355 if extendnode is not None:
357 ui.write(_('Not all ancestors of this changeset have been'
356 ui.write(_('Not all ancestors of this changeset have been'
358 ' checked.\nUse bisect --extend to continue the '
357 ' checked.\nUse bisect --extend to continue the '
359 'bisection from\nthe common ancestor, %s.\n')
358 'bisection from\nthe common ancestor, %s.\n')
360 % short(extendnode.node()))
359 % extendnode)
361 else:
360 else:
362 # multiple possible revisions
361 # multiple possible revisions
363 if good:
362 if good:
364 ui.write(_("Due to skipped revisions, the first "
363 ui.write(_("Due to skipped revisions, the first "
365 "good revision could be any of:\n"))
364 "good revision could be any of:\n"))
366 else:
365 else:
367 ui.write(_("Due to skipped revisions, the first "
366 ui.write(_("Due to skipped revisions, the first "
368 "bad revision could be any of:\n"))
367 "bad revision could be any of:\n"))
369 for n in nodes:
368 for n in nodes:
370 displayer.show(repo[n])
369 displayer.show(repo[n])
371 displayer.close()
370 displayer.close()
372
371
373 def check_state(state, interactive=True):
372 def check_state(state, interactive=True):
374 if not state['good'] or not state['bad']:
373 if not state['good'] or not state['bad']:
375 if (good or bad or skip or reset) and interactive:
374 if (good or bad or skip or reset) and interactive:
376 return
375 return
377 if not state['good']:
376 if not state['good']:
378 raise util.Abort(_('cannot bisect (no known good revisions)'))
377 raise util.Abort(_('cannot bisect (no known good revisions)'))
379 else:
378 else:
380 raise util.Abort(_('cannot bisect (no known bad revisions)'))
379 raise util.Abort(_('cannot bisect (no known bad revisions)'))
381 return True
380 return True
382
381
383 # backward compatibility
382 # backward compatibility
384 if rev in "good bad reset init".split():
383 if rev in "good bad reset init".split():
385 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
384 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
386 cmd, rev, extra = rev, extra, None
385 cmd, rev, extra = rev, extra, None
387 if cmd == "good":
386 if cmd == "good":
388 good = True
387 good = True
389 elif cmd == "bad":
388 elif cmd == "bad":
390 bad = True
389 bad = True
391 else:
390 else:
392 reset = True
391 reset = True
393 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
392 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
394 raise util.Abort(_('incompatible arguments'))
393 raise util.Abort(_('incompatible arguments'))
395
394
396 if reset:
395 if reset:
397 p = repo.join("bisect.state")
396 p = repo.join("bisect.state")
398 if os.path.exists(p):
397 if os.path.exists(p):
399 os.unlink(p)
398 os.unlink(p)
400 return
399 return
401
400
402 state = hbisect.load_state(repo)
401 state = hbisect.load_state(repo)
403
402
404 if command:
403 if command:
405 changesets = 1
404 changesets = 1
406 try:
405 try:
407 while changesets:
406 while changesets:
408 # update state
407 # update state
409 status = util.system(command)
408 status = util.system(command)
410 if status == 125:
409 if status == 125:
411 transition = "skip"
410 transition = "skip"
412 elif status == 0:
411 elif status == 0:
413 transition = "good"
412 transition = "good"
414 # status < 0 means process was killed
413 # status < 0 means process was killed
415 elif status == 127:
414 elif status == 127:
416 raise util.Abort(_("failed to execute %s") % command)
415 raise util.Abort(_("failed to execute %s") % command)
417 elif status < 0:
416 elif status < 0:
418 raise util.Abort(_("%s killed") % command)
417 raise util.Abort(_("%s killed") % command)
419 else:
418 else:
420 transition = "bad"
419 transition = "bad"
421 ctx = cmdutil.revsingle(repo, rev)
420 ctx = cmdutil.revsingle(repo, rev)
422 rev = None # clear for future iterations
421 rev = None # clear for future iterations
423 state[transition].append(ctx.node())
422 state[transition].append(ctx.node())
424 ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition))
423 ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition))
425 check_state(state, interactive=False)
424 check_state(state, interactive=False)
426 # bisect
425 # bisect
427 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
426 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
428 # update to next check
427 # update to next check
429 cmdutil.bail_if_changed(repo)
428 cmdutil.bail_if_changed(repo)
430 hg.clean(repo, nodes[0], show_stats=False)
429 hg.clean(repo, nodes[0], show_stats=False)
431 finally:
430 finally:
432 hbisect.save_state(repo, state)
431 hbisect.save_state(repo, state)
433 print_result(nodes, good)
432 print_result(nodes, good)
434 return
433 return
435
434
436 # update state
435 # update state
437
436
438 if rev:
437 if rev:
439 nodes = [repo.lookup(i) for i in cmdutil.revrange(repo, [rev])]
438 nodes = [repo.lookup(i) for i in cmdutil.revrange(repo, [rev])]
440 else:
439 else:
441 nodes = [repo.lookup('.')]
440 nodes = [repo.lookup('.')]
442
441
443 if good or bad or skip:
442 if good or bad or skip:
444 if good:
443 if good:
445 state['good'] += nodes
444 state['good'] += nodes
446 elif bad:
445 elif bad:
447 state['bad'] += nodes
446 state['bad'] += nodes
448 elif skip:
447 elif skip:
449 state['skip'] += nodes
448 state['skip'] += nodes
450 hbisect.save_state(repo, state)
449 hbisect.save_state(repo, state)
451
450
452 if not check_state(state):
451 if not check_state(state):
453 return
452 return
454
453
455 # actually bisect
454 # actually bisect
456 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
455 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
457 if extend:
456 if extend:
458 if not changesets:
457 if not changesets:
459 extendnode = extendbisectrange(nodes, good)
458 extendnode = extendbisectrange(nodes, good)
460 if extendnode is not None:
459 if extendnode is not None:
461 ui.write(_("Extending search to changeset %d:%s\n"
460 ui.write(_("Extending search to changeset %d:%s\n"
462 % (extendnode.rev(), short(extendnode.node()))))
461 % (extendnode.rev(), extendnode)))
463 if noupdate:
462 if noupdate:
464 return
463 return
465 cmdutil.bail_if_changed(repo)
464 cmdutil.bail_if_changed(repo)
466 return hg.clean(repo, extendnode.node())
465 return hg.clean(repo, extendnode.node())
467 raise util.Abort(_("nothing to extend"))
466 raise util.Abort(_("nothing to extend"))
468
467
469 if changesets == 0:
468 if changesets == 0:
470 print_result(nodes, good)
469 print_result(nodes, good)
471 else:
470 else:
472 assert len(nodes) == 1 # only a single node can be tested next
471 assert len(nodes) == 1 # only a single node can be tested next
473 node = nodes[0]
472 node = nodes[0]
474 # compute the approximate number of remaining tests
473 # compute the approximate number of remaining tests
475 tests, size = 0, 2
474 tests, size = 0, 2
476 while size <= changesets:
475 while size <= changesets:
477 tests, size = tests + 1, size * 2
476 tests, size = tests + 1, size * 2
478 rev = repo.changelog.rev(node)
477 rev = repo.changelog.rev(node)
479 ui.write(_("Testing changeset %d:%s "
478 ui.write(_("Testing changeset %d:%s "
480 "(%d changesets remaining, ~%d tests)\n")
479 "(%d changesets remaining, ~%d tests)\n")
481 % (rev, short(node), changesets, tests))
480 % (rev, short(node), changesets, tests))
482 if not noupdate:
481 if not noupdate:
483 cmdutil.bail_if_changed(repo)
482 cmdutil.bail_if_changed(repo)
484 return hg.clean(repo, node)
483 return hg.clean(repo, node)
485
484
486 def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False, rename=None):
485 def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False, rename=None):
487 '''track a line of development with movable markers
486 '''track a line of development with movable markers
488
487
489 Bookmarks are pointers to certain commits that move when
488 Bookmarks are pointers to certain commits that move when
490 committing. Bookmarks are local. They can be renamed, copied and
489 committing. Bookmarks are local. They can be renamed, copied and
491 deleted. It is possible to use bookmark names in :hg:`merge` and
490 deleted. It is possible to use bookmark names in :hg:`merge` and
492 :hg:`update` to merge and update respectively to a given bookmark.
491 :hg:`update` to merge and update respectively to a given bookmark.
493
492
494 You can use :hg:`bookmark NAME` to set a bookmark on the working
493 You can use :hg:`bookmark NAME` to set a bookmark on the working
495 directory's parent revision with the given name. If you specify
494 directory's parent revision with the given name. If you specify
496 a revision using -r REV (where REV may be an existing bookmark),
495 a revision using -r REV (where REV may be an existing bookmark),
497 the bookmark is assigned to that revision.
496 the bookmark is assigned to that revision.
498
497
499 Bookmarks can be pushed and pulled between repositories (see :hg:`help
498 Bookmarks can be pushed and pulled between repositories (see :hg:`help
500 push` and :hg:`help pull`). This requires both the local and remote
499 push` and :hg:`help pull`). This requires both the local and remote
501 repositories to support bookmarks. For versions prior to 1.8, this means
500 repositories to support bookmarks. For versions prior to 1.8, this means
502 the bookmarks extension must be enabled.
501 the bookmarks extension must be enabled.
503 '''
502 '''
504 hexfn = ui.debugflag and hex or short
503 hexfn = ui.debugflag and hex or short
505 marks = repo._bookmarks
504 marks = repo._bookmarks
506 cur = repo.changectx('.').node()
505 cur = repo.changectx('.').node()
507
506
508 if rename:
507 if rename:
509 if rename not in marks:
508 if rename not in marks:
510 raise util.Abort(_("bookmark '%s' does not exist") % rename)
509 raise util.Abort(_("bookmark '%s' does not exist") % rename)
511 if mark in marks and not force:
510 if mark in marks and not force:
512 raise util.Abort(_("bookmark '%s' already exists "
511 raise util.Abort(_("bookmark '%s' already exists "
513 "(use -f to force)") % mark)
512 "(use -f to force)") % mark)
514 if mark is None:
513 if mark is None:
515 raise util.Abort(_("new bookmark name required"))
514 raise util.Abort(_("new bookmark name required"))
516 marks[mark] = marks[rename]
515 marks[mark] = marks[rename]
517 if repo._bookmarkcurrent == rename:
516 if repo._bookmarkcurrent == rename:
518 bookmarks.setcurrent(repo, mark)
517 bookmarks.setcurrent(repo, mark)
519 del marks[rename]
518 del marks[rename]
520 bookmarks.write(repo)
519 bookmarks.write(repo)
521 return
520 return
522
521
523 if delete:
522 if delete:
524 if mark is None:
523 if mark is None:
525 raise util.Abort(_("bookmark name required"))
524 raise util.Abort(_("bookmark name required"))
526 if mark not in marks:
525 if mark not in marks:
527 raise util.Abort(_("bookmark '%s' does not exist") % mark)
526 raise util.Abort(_("bookmark '%s' does not exist") % mark)
528 if mark == repo._bookmarkcurrent:
527 if mark == repo._bookmarkcurrent:
529 bookmarks.setcurrent(repo, None)
528 bookmarks.setcurrent(repo, None)
530 del marks[mark]
529 del marks[mark]
531 bookmarks.write(repo)
530 bookmarks.write(repo)
532 return
531 return
533
532
534 if mark is not None:
533 if mark is not None:
535 if "\n" in mark:
534 if "\n" in mark:
536 raise util.Abort(_("bookmark name cannot contain newlines"))
535 raise util.Abort(_("bookmark name cannot contain newlines"))
537 mark = mark.strip()
536 mark = mark.strip()
538 if not mark:
537 if not mark:
539 raise util.Abort(_("bookmark names cannot consist entirely of "
538 raise util.Abort(_("bookmark names cannot consist entirely of "
540 "whitespace"))
539 "whitespace"))
541 if mark in marks and not force:
540 if mark in marks and not force:
542 raise util.Abort(_("bookmark '%s' already exists "
541 raise util.Abort(_("bookmark '%s' already exists "
543 "(use -f to force)") % mark)
542 "(use -f to force)") % mark)
544 if ((mark in repo.branchtags() or mark == repo.dirstate.branch())
543 if ((mark in repo.branchtags() or mark == repo.dirstate.branch())
545 and not force):
544 and not force):
546 raise util.Abort(
545 raise util.Abort(
547 _("a bookmark cannot have the name of an existing branch"))
546 _("a bookmark cannot have the name of an existing branch"))
548 if rev:
547 if rev:
549 marks[mark] = repo.lookup(rev)
548 marks[mark] = repo.lookup(rev)
550 else:
549 else:
551 marks[mark] = repo.changectx('.').node()
550 marks[mark] = repo.changectx('.').node()
552 if repo.changectx('.').node() == marks[mark]:
551 if repo.changectx('.').node() == marks[mark]:
553 bookmarks.setcurrent(repo, mark)
552 bookmarks.setcurrent(repo, mark)
554 bookmarks.write(repo)
553 bookmarks.write(repo)
555 return
554 return
556
555
557 if mark is None:
556 if mark is None:
558 if rev:
557 if rev:
559 raise util.Abort(_("bookmark name required"))
558 raise util.Abort(_("bookmark name required"))
560 if len(marks) == 0:
559 if len(marks) == 0:
561 ui.status(_("no bookmarks set\n"))
560 ui.status(_("no bookmarks set\n"))
562 else:
561 else:
563 for bmark, n in sorted(marks.iteritems()):
562 for bmark, n in sorted(marks.iteritems()):
564 current = repo._bookmarkcurrent
563 current = repo._bookmarkcurrent
565 if bmark == current and n == cur:
564 if bmark == current and n == cur:
566 prefix, label = '*', 'bookmarks.current'
565 prefix, label = '*', 'bookmarks.current'
567 else:
566 else:
568 prefix, label = ' ', ''
567 prefix, label = ' ', ''
569
568
570 if ui.quiet:
569 if ui.quiet:
571 ui.write("%s\n" % bmark, label=label)
570 ui.write("%s\n" % bmark, label=label)
572 else:
571 else:
573 ui.write(" %s %-25s %d:%s\n" % (
572 ui.write(" %s %-25s %d:%s\n" % (
574 prefix, bmark, repo.changelog.rev(n), hexfn(n)),
573 prefix, bmark, repo.changelog.rev(n), hexfn(n)),
575 label=label)
574 label=label)
576 return
575 return
577
576
578 def branch(ui, repo, label=None, **opts):
577 def branch(ui, repo, label=None, **opts):
579 """set or show the current branch name
578 """set or show the current branch name
580
579
581 With no argument, show the current branch name. With one argument,
580 With no argument, show the current branch name. With one argument,
582 set the working directory branch name (the branch will not exist
581 set the working directory branch name (the branch will not exist
583 in the repository until the next commit). Standard practice
582 in the repository until the next commit). Standard practice
584 recommends that primary development take place on the 'default'
583 recommends that primary development take place on the 'default'
585 branch.
584 branch.
586
585
587 Unless -f/--force is specified, branch will not let you set a
586 Unless -f/--force is specified, branch will not let you set a
588 branch name that already exists, even if it's inactive.
587 branch name that already exists, even if it's inactive.
589
588
590 Use -C/--clean to reset the working directory branch to that of
589 Use -C/--clean to reset the working directory branch to that of
591 the parent of the working directory, negating a previous branch
590 the parent of the working directory, negating a previous branch
592 change.
591 change.
593
592
594 Use the command :hg:`update` to switch to an existing branch. Use
593 Use the command :hg:`update` to switch to an existing branch. Use
595 :hg:`commit --close-branch` to mark this branch as closed.
594 :hg:`commit --close-branch` to mark this branch as closed.
596
595
597 Returns 0 on success.
596 Returns 0 on success.
598 """
597 """
599
598
600 if opts.get('clean'):
599 if opts.get('clean'):
601 label = repo[None].p1().branch()
600 label = repo[None].p1().branch()
602 repo.dirstate.setbranch(label)
601 repo.dirstate.setbranch(label)
603 ui.status(_('reset working directory to branch %s\n') % label)
602 ui.status(_('reset working directory to branch %s\n') % label)
604 elif label:
603 elif label:
605 if not opts.get('force') and label in repo.branchtags():
604 if not opts.get('force') and label in repo.branchtags():
606 if label not in [p.branch() for p in repo.parents()]:
605 if label not in [p.branch() for p in repo.parents()]:
607 raise util.Abort(_('a branch of the same name already exists'
606 raise util.Abort(_('a branch of the same name already exists'
608 " (use 'hg update' to switch to it)"))
607 " (use 'hg update' to switch to it)"))
609 repo.dirstate.setbranch(label)
608 repo.dirstate.setbranch(label)
610 ui.status(_('marked working directory as branch %s\n') % label)
609 ui.status(_('marked working directory as branch %s\n') % label)
611 else:
610 else:
612 ui.write("%s\n" % repo.dirstate.branch())
611 ui.write("%s\n" % repo.dirstate.branch())
613
612
614 def branches(ui, repo, active=False, closed=False):
613 def branches(ui, repo, active=False, closed=False):
615 """list repository named branches
614 """list repository named branches
616
615
617 List the repository's named branches, indicating which ones are
616 List the repository's named branches, indicating which ones are
618 inactive. If -c/--closed is specified, also list branches which have
617 inactive. If -c/--closed is specified, also list branches which have
619 been marked closed (see :hg:`commit --close-branch`).
618 been marked closed (see :hg:`commit --close-branch`).
620
619
621 If -a/--active is specified, only show active branches. A branch
620 If -a/--active is specified, only show active branches. A branch
622 is considered active if it contains repository heads.
621 is considered active if it contains repository heads.
623
622
624 Use the command :hg:`update` to switch to an existing branch.
623 Use the command :hg:`update` to switch to an existing branch.
625
624
626 Returns 0.
625 Returns 0.
627 """
626 """
628
627
629 hexfunc = ui.debugflag and hex or short
628 hexfunc = ui.debugflag and hex or short
630 activebranches = [repo[n].branch() for n in repo.heads()]
629 activebranches = [repo[n].branch() for n in repo.heads()]
631 def testactive(tag, node):
630 def testactive(tag, node):
632 realhead = tag in activebranches
631 realhead = tag in activebranches
633 open = node in repo.branchheads(tag, closed=False)
632 open = node in repo.branchheads(tag, closed=False)
634 return realhead and open
633 return realhead and open
635 branches = sorted([(testactive(tag, node), repo.changelog.rev(node), tag)
634 branches = sorted([(testactive(tag, node), repo.changelog.rev(node), tag)
636 for tag, node in repo.branchtags().items()],
635 for tag, node in repo.branchtags().items()],
637 reverse=True)
636 reverse=True)
638
637
639 for isactive, node, tag in branches:
638 for isactive, node, tag in branches:
640 if (not active) or isactive:
639 if (not active) or isactive:
641 if ui.quiet:
640 if ui.quiet:
642 ui.write("%s\n" % tag)
641 ui.write("%s\n" % tag)
643 else:
642 else:
644 hn = repo.lookup(node)
643 hn = repo.lookup(node)
645 if isactive:
644 if isactive:
646 label = 'branches.active'
645 label = 'branches.active'
647 notice = ''
646 notice = ''
648 elif hn not in repo.branchheads(tag, closed=False):
647 elif hn not in repo.branchheads(tag, closed=False):
649 if not closed:
648 if not closed:
650 continue
649 continue
651 label = 'branches.closed'
650 label = 'branches.closed'
652 notice = _(' (closed)')
651 notice = _(' (closed)')
653 else:
652 else:
654 label = 'branches.inactive'
653 label = 'branches.inactive'
655 notice = _(' (inactive)')
654 notice = _(' (inactive)')
656 if tag == repo.dirstate.branch():
655 if tag == repo.dirstate.branch():
657 label = 'branches.current'
656 label = 'branches.current'
658 rev = str(node).rjust(31 - encoding.colwidth(tag))
657 rev = str(node).rjust(31 - encoding.colwidth(tag))
659 rev = ui.label('%s:%s' % (rev, hexfunc(hn)), 'log.changeset')
658 rev = ui.label('%s:%s' % (rev, hexfunc(hn)), 'log.changeset')
660 tag = ui.label(tag, label)
659 tag = ui.label(tag, label)
661 ui.write("%s %s%s\n" % (tag, rev, notice))
660 ui.write("%s %s%s\n" % (tag, rev, notice))
662
661
663 def bundle(ui, repo, fname, dest=None, **opts):
662 def bundle(ui, repo, fname, dest=None, **opts):
664 """create a changegroup file
663 """create a changegroup file
665
664
666 Generate a compressed changegroup file collecting changesets not
665 Generate a compressed changegroup file collecting changesets not
667 known to be in another repository.
666 known to be in another repository.
668
667
669 If you omit the destination repository, then hg assumes the
668 If you omit the destination repository, then hg assumes the
670 destination will have all the nodes you specify with --base
669 destination will have all the nodes you specify with --base
671 parameters. To create a bundle containing all changesets, use
670 parameters. To create a bundle containing all changesets, use
672 -a/--all (or --base null).
671 -a/--all (or --base null).
673
672
674 You can change compression method with the -t/--type option.
673 You can change compression method with the -t/--type option.
675 The available compression methods are: none, bzip2, and
674 The available compression methods are: none, bzip2, and
676 gzip (by default, bundles are compressed using bzip2).
675 gzip (by default, bundles are compressed using bzip2).
677
676
678 The bundle file can then be transferred using conventional means
677 The bundle file can then be transferred using conventional means
679 and applied to another repository with the unbundle or pull
678 and applied to another repository with the unbundle or pull
680 command. This is useful when direct push and pull are not
679 command. This is useful when direct push and pull are not
681 available or when exporting an entire repository is undesirable.
680 available or when exporting an entire repository is undesirable.
682
681
683 Applying bundles preserves all changeset contents including
682 Applying bundles preserves all changeset contents including
684 permissions, copy/rename information, and revision history.
683 permissions, copy/rename information, and revision history.
685
684
686 Returns 0 on success, 1 if no changes found.
685 Returns 0 on success, 1 if no changes found.
687 """
686 """
688 revs = None
687 revs = None
689 if 'rev' in opts:
688 if 'rev' in opts:
690 revs = cmdutil.revrange(repo, opts['rev'])
689 revs = cmdutil.revrange(repo, opts['rev'])
691
690
692 if opts.get('all'):
691 if opts.get('all'):
693 base = ['null']
692 base = ['null']
694 else:
693 else:
695 base = cmdutil.revrange(repo, opts.get('base'))
694 base = cmdutil.revrange(repo, opts.get('base'))
696 if base:
695 if base:
697 if dest:
696 if dest:
698 raise util.Abort(_("--base is incompatible with specifying "
697 raise util.Abort(_("--base is incompatible with specifying "
699 "a destination"))
698 "a destination"))
700 base = [repo.lookup(rev) for rev in base]
699 base = [repo.lookup(rev) for rev in base]
701 # create the right base
700 # create the right base
702 # XXX: nodesbetween / changegroup* should be "fixed" instead
701 # XXX: nodesbetween / changegroup* should be "fixed" instead
703 o = []
702 o = []
704 has = set((nullid,))
703 has = set((nullid,))
705 for n in base:
704 for n in base:
706 has.update(repo.changelog.reachable(n))
705 has.update(repo.changelog.reachable(n))
707 if revs:
706 if revs:
708 revs = [repo.lookup(rev) for rev in revs]
707 revs = [repo.lookup(rev) for rev in revs]
709 visit = revs[:]
708 visit = revs[:]
710 has.difference_update(visit)
709 has.difference_update(visit)
711 else:
710 else:
712 visit = repo.changelog.heads()
711 visit = repo.changelog.heads()
713 seen = {}
712 seen = {}
714 while visit:
713 while visit:
715 n = visit.pop(0)
714 n = visit.pop(0)
716 parents = [p for p in repo.changelog.parents(n) if p not in has]
715 parents = [p for p in repo.changelog.parents(n) if p not in has]
717 if len(parents) == 0:
716 if len(parents) == 0:
718 if n not in has:
717 if n not in has:
719 o.append(n)
718 o.append(n)
720 else:
719 else:
721 for p in parents:
720 for p in parents:
722 if p not in seen:
721 if p not in seen:
723 seen[p] = 1
722 seen[p] = 1
724 visit.append(p)
723 visit.append(p)
725 else:
724 else:
726 dest = ui.expandpath(dest or 'default-push', dest or 'default')
725 dest = ui.expandpath(dest or 'default-push', dest or 'default')
727 dest, branches = hg.parseurl(dest, opts.get('branch'))
726 dest, branches = hg.parseurl(dest, opts.get('branch'))
728 other = hg.repository(hg.remoteui(repo, opts), dest)
727 other = hg.repository(hg.remoteui(repo, opts), dest)
729 revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
728 revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
730 if revs:
729 if revs:
731 revs = [repo.lookup(rev) for rev in revs]
730 revs = [repo.lookup(rev) for rev in revs]
732 o = discovery.findoutgoing(repo, other, force=opts.get('force'))
731 o = discovery.findoutgoing(repo, other, force=opts.get('force'))
733
732
734 if not o:
733 if not o:
735 ui.status(_("no changes found\n"))
734 ui.status(_("no changes found\n"))
736 return 1
735 return 1
737
736
738 if revs:
737 if revs:
739 cg = repo.changegroupsubset(o, revs, 'bundle')
738 cg = repo.changegroupsubset(o, revs, 'bundle')
740 else:
739 else:
741 cg = repo.changegroup(o, 'bundle')
740 cg = repo.changegroup(o, 'bundle')
742
741
743 bundletype = opts.get('type', 'bzip2').lower()
742 bundletype = opts.get('type', 'bzip2').lower()
744 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
743 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
745 bundletype = btypes.get(bundletype)
744 bundletype = btypes.get(bundletype)
746 if bundletype not in changegroup.bundletypes:
745 if bundletype not in changegroup.bundletypes:
747 raise util.Abort(_('unknown bundle type specified with --type'))
746 raise util.Abort(_('unknown bundle type specified with --type'))
748
747
749 changegroup.writebundle(cg, fname, bundletype)
748 changegroup.writebundle(cg, fname, bundletype)
750
749
751 def cat(ui, repo, file1, *pats, **opts):
750 def cat(ui, repo, file1, *pats, **opts):
752 """output the current or given revision of files
751 """output the current or given revision of files
753
752
754 Print the specified files as they were at the given revision. If
753 Print the specified files as they were at the given revision. If
755 no revision is given, the parent of the working directory is used,
754 no revision is given, the parent of the working directory is used,
756 or tip if no revision is checked out.
755 or tip if no revision is checked out.
757
756
758 Output may be to a file, in which case the name of the file is
757 Output may be to a file, in which case the name of the file is
759 given using a format string. The formatting rules are the same as
758 given using a format string. The formatting rules are the same as
760 for the export command, with the following additions:
759 for the export command, with the following additions:
761
760
762 :``%s``: basename of file being printed
761 :``%s``: basename of file being printed
763 :``%d``: dirname of file being printed, or '.' if in repository root
762 :``%d``: dirname of file being printed, or '.' if in repository root
764 :``%p``: root-relative path name of file being printed
763 :``%p``: root-relative path name of file being printed
765
764
766 Returns 0 on success.
765 Returns 0 on success.
767 """
766 """
768 ctx = cmdutil.revsingle(repo, opts.get('rev'))
767 ctx = cmdutil.revsingle(repo, opts.get('rev'))
769 err = 1
768 err = 1
770 m = cmdutil.match(repo, (file1,) + pats, opts)
769 m = cmdutil.match(repo, (file1,) + pats, opts)
771 for abs in ctx.walk(m):
770 for abs in ctx.walk(m):
772 fp = cmdutil.make_file(repo, opts.get('output'), ctx.node(), pathname=abs)
771 fp = cmdutil.make_file(repo, opts.get('output'), ctx.node(), pathname=abs)
773 data = ctx[abs].data()
772 data = ctx[abs].data()
774 if opts.get('decode'):
773 if opts.get('decode'):
775 data = repo.wwritedata(abs, data)
774 data = repo.wwritedata(abs, data)
776 fp.write(data)
775 fp.write(data)
777 fp.close()
776 fp.close()
778 err = 0
777 err = 0
779 return err
778 return err
780
779
781 def clone(ui, source, dest=None, **opts):
780 def clone(ui, source, dest=None, **opts):
782 """make a copy of an existing repository
781 """make a copy of an existing repository
783
782
784 Create a copy of an existing repository in a new directory.
783 Create a copy of an existing repository in a new directory.
785
784
786 If no destination directory name is specified, it defaults to the
785 If no destination directory name is specified, it defaults to the
787 basename of the source.
786 basename of the source.
788
787
789 The location of the source is added to the new repository's
788 The location of the source is added to the new repository's
790 ``.hg/hgrc`` file, as the default to be used for future pulls.
789 ``.hg/hgrc`` file, as the default to be used for future pulls.
791
790
792 See :hg:`help urls` for valid source format details.
791 See :hg:`help urls` for valid source format details.
793
792
794 It is possible to specify an ``ssh://`` URL as the destination, but no
793 It is possible to specify an ``ssh://`` URL as the destination, but no
795 ``.hg/hgrc`` and working directory will be created on the remote side.
794 ``.hg/hgrc`` and working directory will be created on the remote side.
796 Please see :hg:`help urls` for important details about ``ssh://`` URLs.
795 Please see :hg:`help urls` for important details about ``ssh://`` URLs.
797
796
798 A set of changesets (tags, or branch names) to pull may be specified
797 A set of changesets (tags, or branch names) to pull may be specified
799 by listing each changeset (tag, or branch name) with -r/--rev.
798 by listing each changeset (tag, or branch name) with -r/--rev.
800 If -r/--rev is used, the cloned repository will contain only a subset
799 If -r/--rev is used, the cloned repository will contain only a subset
801 of the changesets of the source repository. Only the set of changesets
800 of the changesets of the source repository. Only the set of changesets
802 defined by all -r/--rev options (including all their ancestors)
801 defined by all -r/--rev options (including all their ancestors)
803 will be pulled into the destination repository.
802 will be pulled into the destination repository.
804 No subsequent changesets (including subsequent tags) will be present
803 No subsequent changesets (including subsequent tags) will be present
805 in the destination.
804 in the destination.
806
805
807 Using -r/--rev (or 'clone src#rev dest') implies --pull, even for
806 Using -r/--rev (or 'clone src#rev dest') implies --pull, even for
808 local source repositories.
807 local source repositories.
809
808
810 For efficiency, hardlinks are used for cloning whenever the source
809 For efficiency, hardlinks are used for cloning whenever the source
811 and destination are on the same filesystem (note this applies only
810 and destination are on the same filesystem (note this applies only
812 to the repository data, not to the working directory). Some
811 to the repository data, not to the working directory). Some
813 filesystems, such as AFS, implement hardlinking incorrectly, but
812 filesystems, such as AFS, implement hardlinking incorrectly, but
814 do not report errors. In these cases, use the --pull option to
813 do not report errors. In these cases, use the --pull option to
815 avoid hardlinking.
814 avoid hardlinking.
816
815
817 In some cases, you can clone repositories and the working directory
816 In some cases, you can clone repositories and the working directory
818 using full hardlinks with ::
817 using full hardlinks with ::
819
818
820 $ cp -al REPO REPOCLONE
819 $ cp -al REPO REPOCLONE
821
820
822 This is the fastest way to clone, but it is not always safe. The
821 This is the fastest way to clone, but it is not always safe. The
823 operation is not atomic (making sure REPO is not modified during
822 operation is not atomic (making sure REPO is not modified during
824 the operation is up to you) and you have to make sure your editor
823 the operation is up to you) and you have to make sure your editor
825 breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,
824 breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,
826 this is not compatible with certain extensions that place their
825 this is not compatible with certain extensions that place their
827 metadata under the .hg directory, such as mq.
826 metadata under the .hg directory, such as mq.
828
827
829 Mercurial will update the working directory to the first applicable
828 Mercurial will update the working directory to the first applicable
830 revision from this list:
829 revision from this list:
831
830
832 a) null if -U or the source repository has no changesets
831 a) null if -U or the source repository has no changesets
833 b) if -u . and the source repository is local, the first parent of
832 b) if -u . and the source repository is local, the first parent of
834 the source repository's working directory
833 the source repository's working directory
835 c) the changeset specified with -u (if a branch name, this means the
834 c) the changeset specified with -u (if a branch name, this means the
836 latest head of that branch)
835 latest head of that branch)
837 d) the changeset specified with -r
836 d) the changeset specified with -r
838 e) the tipmost head specified with -b
837 e) the tipmost head specified with -b
839 f) the tipmost head specified with the url#branch source syntax
838 f) the tipmost head specified with the url#branch source syntax
840 g) the tipmost head of the default branch
839 g) the tipmost head of the default branch
841 h) tip
840 h) tip
842
841
843 Returns 0 on success.
842 Returns 0 on success.
844 """
843 """
845 if opts.get('noupdate') and opts.get('updaterev'):
844 if opts.get('noupdate') and opts.get('updaterev'):
846 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
845 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
847
846
848 r = hg.clone(hg.remoteui(ui, opts), source, dest,
847 r = hg.clone(hg.remoteui(ui, opts), source, dest,
849 pull=opts.get('pull'),
848 pull=opts.get('pull'),
850 stream=opts.get('uncompressed'),
849 stream=opts.get('uncompressed'),
851 rev=opts.get('rev'),
850 rev=opts.get('rev'),
852 update=opts.get('updaterev') or not opts.get('noupdate'),
851 update=opts.get('updaterev') or not opts.get('noupdate'),
853 branch=opts.get('branch'))
852 branch=opts.get('branch'))
854
853
855 return r is None
854 return r is None
856
855
857 def commit(ui, repo, *pats, **opts):
856 def commit(ui, repo, *pats, **opts):
858 """commit the specified files or all outstanding changes
857 """commit the specified files or all outstanding changes
859
858
860 Commit changes to the given files into the repository. Unlike a
859 Commit changes to the given files into the repository. Unlike a
861 centralized SCM, this operation is a local operation. See
860 centralized SCM, this operation is a local operation. See
862 :hg:`push` for a way to actively distribute your changes.
861 :hg:`push` for a way to actively distribute your changes.
863
862
864 If a list of files is omitted, all changes reported by :hg:`status`
863 If a list of files is omitted, all changes reported by :hg:`status`
865 will be committed.
864 will be committed.
866
865
867 If you are committing the result of a merge, do not provide any
866 If you are committing the result of a merge, do not provide any
868 filenames or -I/-X filters.
867 filenames or -I/-X filters.
869
868
870 If no commit message is specified, Mercurial starts your
869 If no commit message is specified, Mercurial starts your
871 configured editor where you can enter a message. In case your
870 configured editor where you can enter a message. In case your
872 commit fails, you will find a backup of your message in
871 commit fails, you will find a backup of your message in
873 ``.hg/last-message.txt``.
872 ``.hg/last-message.txt``.
874
873
875 See :hg:`help dates` for a list of formats valid for -d/--date.
874 See :hg:`help dates` for a list of formats valid for -d/--date.
876
875
877 Returns 0 on success, 1 if nothing changed.
876 Returns 0 on success, 1 if nothing changed.
878 """
877 """
879 extra = {}
878 extra = {}
880 if opts.get('close_branch'):
879 if opts.get('close_branch'):
881 if repo['.'].node() not in repo.branchheads():
880 if repo['.'].node() not in repo.branchheads():
882 # The topo heads set is included in the branch heads set of the
881 # The topo heads set is included in the branch heads set of the
883 # current branch, so it's sufficient to test branchheads
882 # current branch, so it's sufficient to test branchheads
884 raise util.Abort(_('can only close branch heads'))
883 raise util.Abort(_('can only close branch heads'))
885 extra['close'] = 1
884 extra['close'] = 1
886 e = cmdutil.commiteditor
885 e = cmdutil.commiteditor
887 if opts.get('force_editor'):
886 if opts.get('force_editor'):
888 e = cmdutil.commitforceeditor
887 e = cmdutil.commitforceeditor
889
888
890 def commitfunc(ui, repo, message, match, opts):
889 def commitfunc(ui, repo, message, match, opts):
891 return repo.commit(message, opts.get('user'), opts.get('date'), match,
890 return repo.commit(message, opts.get('user'), opts.get('date'), match,
892 editor=e, extra=extra)
891 editor=e, extra=extra)
893
892
894 branch = repo[None].branch()
893 branch = repo[None].branch()
895 bheads = repo.branchheads(branch)
894 bheads = repo.branchheads(branch)
896
895
897 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
896 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
898 if not node:
897 if not node:
899 stat = repo.status(match=cmdutil.match(repo, pats, opts))
898 stat = repo.status(match=cmdutil.match(repo, pats, opts))
900 if stat[3]:
899 if stat[3]:
901 ui.status(_("nothing changed (%d missing files, see 'hg status')\n")
900 ui.status(_("nothing changed (%d missing files, see 'hg status')\n")
902 % len(stat[3]))
901 % len(stat[3]))
903 else:
902 else:
904 ui.status(_("nothing changed\n"))
903 ui.status(_("nothing changed\n"))
905 return 1
904 return 1
906
905
907 ctx = repo[node]
906 ctx = repo[node]
908 parents = ctx.parents()
907 parents = ctx.parents()
909
908
910 if bheads and not [x for x in parents
909 if bheads and not [x for x in parents
911 if x.node() in bheads and x.branch() == branch]:
910 if x.node() in bheads and x.branch() == branch]:
912 ui.status(_('created new head\n'))
911 ui.status(_('created new head\n'))
913 # The message is not printed for initial roots. For the other
912 # The message is not printed for initial roots. For the other
914 # changesets, it is printed in the following situations:
913 # changesets, it is printed in the following situations:
915 #
914 #
916 # Par column: for the 2 parents with ...
915 # Par column: for the 2 parents with ...
917 # N: null or no parent
916 # N: null or no parent
918 # B: parent is on another named branch
917 # B: parent is on another named branch
919 # C: parent is a regular non head changeset
918 # C: parent is a regular non head changeset
920 # H: parent was a branch head of the current branch
919 # H: parent was a branch head of the current branch
921 # Msg column: whether we print "created new head" message
920 # Msg column: whether we print "created new head" message
922 # In the following, it is assumed that there already exists some
921 # In the following, it is assumed that there already exists some
923 # initial branch heads of the current branch, otherwise nothing is
922 # initial branch heads of the current branch, otherwise nothing is
924 # printed anyway.
923 # printed anyway.
925 #
924 #
926 # Par Msg Comment
925 # Par Msg Comment
927 # NN y additional topo root
926 # NN y additional topo root
928 #
927 #
929 # BN y additional branch root
928 # BN y additional branch root
930 # CN y additional topo head
929 # CN y additional topo head
931 # HN n usual case
930 # HN n usual case
932 #
931 #
933 # BB y weird additional branch root
932 # BB y weird additional branch root
934 # CB y branch merge
933 # CB y branch merge
935 # HB n merge with named branch
934 # HB n merge with named branch
936 #
935 #
937 # CC y additional head from merge
936 # CC y additional head from merge
938 # CH n merge with a head
937 # CH n merge with a head
939 #
938 #
940 # HH n head merge: head count decreases
939 # HH n head merge: head count decreases
941
940
942 if not opts.get('close_branch'):
941 if not opts.get('close_branch'):
943 for r in parents:
942 for r in parents:
944 if r.extra().get('close') and r.branch() == branch:
943 if r.extra().get('close') and r.branch() == branch:
945 ui.status(_('reopening closed branch head %d\n') % r)
944 ui.status(_('reopening closed branch head %d\n') % r)
946
945
947 if ui.debugflag:
946 if ui.debugflag:
948 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
947 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
949 elif ui.verbose:
948 elif ui.verbose:
950 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
949 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
951
950
952 def copy(ui, repo, *pats, **opts):
951 def copy(ui, repo, *pats, **opts):
953 """mark files as copied for the next commit
952 """mark files as copied for the next commit
954
953
955 Mark dest as having copies of source files. If dest is a
954 Mark dest as having copies of source files. If dest is a
956 directory, copies are put in that directory. If dest is a file,
955 directory, copies are put in that directory. If dest is a file,
957 the source must be a single file.
956 the source must be a single file.
958
957
959 By default, this command copies the contents of files as they
958 By default, this command copies the contents of files as they
960 exist in the working directory. If invoked with -A/--after, the
959 exist in the working directory. If invoked with -A/--after, the
961 operation is recorded, but no copying is performed.
960 operation is recorded, but no copying is performed.
962
961
963 This command takes effect with the next commit. To undo a copy
962 This command takes effect with the next commit. To undo a copy
964 before that, see :hg:`revert`.
963 before that, see :hg:`revert`.
965
964
966 Returns 0 on success, 1 if errors are encountered.
965 Returns 0 on success, 1 if errors are encountered.
967 """
966 """
968 wlock = repo.wlock(False)
967 wlock = repo.wlock(False)
969 try:
968 try:
970 return cmdutil.copy(ui, repo, pats, opts)
969 return cmdutil.copy(ui, repo, pats, opts)
971 finally:
970 finally:
972 wlock.release()
971 wlock.release()
973
972
974 def debugancestor(ui, repo, *args):
973 def debugancestor(ui, repo, *args):
975 """find the ancestor revision of two revisions in a given index"""
974 """find the ancestor revision of two revisions in a given index"""
976 if len(args) == 3:
975 if len(args) == 3:
977 index, rev1, rev2 = args
976 index, rev1, rev2 = args
978 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
977 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
979 lookup = r.lookup
978 lookup = r.lookup
980 elif len(args) == 2:
979 elif len(args) == 2:
981 if not repo:
980 if not repo:
982 raise util.Abort(_("there is no Mercurial repository here "
981 raise util.Abort(_("there is no Mercurial repository here "
983 "(.hg not found)"))
982 "(.hg not found)"))
984 rev1, rev2 = args
983 rev1, rev2 = args
985 r = repo.changelog
984 r = repo.changelog
986 lookup = repo.lookup
985 lookup = repo.lookup
987 else:
986 else:
988 raise util.Abort(_('either two or three arguments required'))
987 raise util.Abort(_('either two or three arguments required'))
989 a = r.ancestor(lookup(rev1), lookup(rev2))
988 a = r.ancestor(lookup(rev1), lookup(rev2))
990 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
989 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
991
990
992 def debugbuilddag(ui, repo, text,
991 def debugbuilddag(ui, repo, text,
993 mergeable_file=False,
992 mergeable_file=False,
994 appended_file=False,
993 appended_file=False,
995 overwritten_file=False,
994 overwritten_file=False,
996 new_file=False):
995 new_file=False):
997 """builds a repo with a given dag from scratch in the current empty repo
996 """builds a repo with a given dag from scratch in the current empty repo
998
997
999 Elements:
998 Elements:
1000
999
1001 - "+n" is a linear run of n nodes based on the current default parent
1000 - "+n" is a linear run of n nodes based on the current default parent
1002 - "." is a single node based on the current default parent
1001 - "." is a single node based on the current default parent
1003 - "$" resets the default parent to null (implied at the start);
1002 - "$" resets the default parent to null (implied at the start);
1004 otherwise the default parent is always the last node created
1003 otherwise the default parent is always the last node created
1005 - "<p" sets the default parent to the backref p
1004 - "<p" sets the default parent to the backref p
1006 - "*p" is a fork at parent p, which is a backref
1005 - "*p" is a fork at parent p, which is a backref
1007 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1006 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1008 - "/p2" is a merge of the preceding node and p2
1007 - "/p2" is a merge of the preceding node and p2
1009 - ":tag" defines a local tag for the preceding node
1008 - ":tag" defines a local tag for the preceding node
1010 - "@branch" sets the named branch for subsequent nodes
1009 - "@branch" sets the named branch for subsequent nodes
1011 - "!command" runs the command using your shell
1010 - "!command" runs the command using your shell
1012 - "!!my command\\n" is like "!", but to the end of the line
1011 - "!!my command\\n" is like "!", but to the end of the line
1013 - "#...\\n" is a comment up to the end of the line
1012 - "#...\\n" is a comment up to the end of the line
1014
1013
1015 Whitespace between the above elements is ignored.
1014 Whitespace between the above elements is ignored.
1016
1015
1017 A backref is either
1016 A backref is either
1018
1017
1019 - a number n, which references the node curr-n, where curr is the current
1018 - a number n, which references the node curr-n, where curr is the current
1020 node, or
1019 node, or
1021 - the name of a local tag you placed earlier using ":tag", or
1020 - the name of a local tag you placed earlier using ":tag", or
1022 - empty to denote the default parent.
1021 - empty to denote the default parent.
1023
1022
1024 All string valued-elements are either strictly alphanumeric, or must
1023 All string valued-elements are either strictly alphanumeric, or must
1025 be enclosed in double quotes ("..."), with "\\" as escape character.
1024 be enclosed in double quotes ("..."), with "\\" as escape character.
1026
1025
1027 Note that the --overwritten-file and --appended-file options imply the
1026 Note that the --overwritten-file and --appended-file options imply the
1028 use of "HGMERGE=internal:local" during DAG buildup.
1027 use of "HGMERGE=internal:local" during DAG buildup.
1029 """
1028 """
1030
1029
1031 if not (mergeable_file or appended_file or overwritten_file or new_file):
1030 if not (mergeable_file or appended_file or overwritten_file or new_file):
1032 raise util.Abort(_('need at least one of -m, -a, -o, -n'))
1031 raise util.Abort(_('need at least one of -m, -a, -o, -n'))
1033
1032
1034 if len(repo.changelog) > 0:
1033 if len(repo.changelog) > 0:
1035 raise util.Abort(_('repository is not empty'))
1034 raise util.Abort(_('repository is not empty'))
1036
1035
1037 if overwritten_file or appended_file:
1036 if overwritten_file or appended_file:
1038 # we don't want to fail in merges during buildup
1037 # we don't want to fail in merges during buildup
1039 os.environ['HGMERGE'] = 'internal:local'
1038 os.environ['HGMERGE'] = 'internal:local'
1040
1039
1041 def writefile(fname, text, fmode="wb"):
1040 def writefile(fname, text, fmode="wb"):
1042 f = open(fname, fmode)
1041 f = open(fname, fmode)
1043 try:
1042 try:
1044 f.write(text)
1043 f.write(text)
1045 finally:
1044 finally:
1046 f.close()
1045 f.close()
1047
1046
1048 if mergeable_file:
1047 if mergeable_file:
1049 linesperrev = 2
1048 linesperrev = 2
1050 # determine number of revs in DAG
1049 # determine number of revs in DAG
1051 n = 0
1050 n = 0
1052 for type, data in dagparser.parsedag(text):
1051 for type, data in dagparser.parsedag(text):
1053 if type == 'n':
1052 if type == 'n':
1054 n += 1
1053 n += 1
1055 # make a file with k lines per rev
1054 # make a file with k lines per rev
1056 writefile("mf", "\n".join(str(i) for i in xrange(0, n * linesperrev))
1055 writefile("mf", "\n".join(str(i) for i in xrange(0, n * linesperrev))
1057 + "\n")
1056 + "\n")
1058
1057
1059 at = -1
1058 at = -1
1060 atbranch = 'default'
1059 atbranch = 'default'
1061 for type, data in dagparser.parsedag(text):
1060 for type, data in dagparser.parsedag(text):
1062 if type == 'n':
1061 if type == 'n':
1063 ui.status('node %s\n' % str(data))
1062 ui.status('node %s\n' % str(data))
1064 id, ps = data
1063 id, ps = data
1065 p1 = ps[0]
1064 p1 = ps[0]
1066 if p1 != at:
1065 if p1 != at:
1067 update(ui, repo, node=str(p1), clean=True)
1066 update(ui, repo, node=str(p1), clean=True)
1068 at = p1
1067 at = p1
1069 if repo.dirstate.branch() != atbranch:
1068 if repo.dirstate.branch() != atbranch:
1070 branch(ui, repo, atbranch, force=True)
1069 branch(ui, repo, atbranch, force=True)
1071 if len(ps) > 1:
1070 if len(ps) > 1:
1072 p2 = ps[1]
1071 p2 = ps[1]
1073 merge(ui, repo, node=p2)
1072 merge(ui, repo, node=p2)
1074
1073
1075 if mergeable_file:
1074 if mergeable_file:
1076 f = open("mf", "rb+")
1075 f = open("mf", "rb+")
1077 try:
1076 try:
1078 lines = f.read().split("\n")
1077 lines = f.read().split("\n")
1079 lines[id * linesperrev] += " r%i" % id
1078 lines[id * linesperrev] += " r%i" % id
1080 f.seek(0)
1079 f.seek(0)
1081 f.write("\n".join(lines))
1080 f.write("\n".join(lines))
1082 finally:
1081 finally:
1083 f.close()
1082 f.close()
1084
1083
1085 if appended_file:
1084 if appended_file:
1086 writefile("af", "r%i\n" % id, "ab")
1085 writefile("af", "r%i\n" % id, "ab")
1087
1086
1088 if overwritten_file:
1087 if overwritten_file:
1089 writefile("of", "r%i\n" % id)
1088 writefile("of", "r%i\n" % id)
1090
1089
1091 if new_file:
1090 if new_file:
1092 writefile("nf%i" % id, "r%i\n" % id)
1091 writefile("nf%i" % id, "r%i\n" % id)
1093
1092
1094 commit(ui, repo, addremove=True, message="r%i" % id, date=(id, 0))
1093 commit(ui, repo, addremove=True, message="r%i" % id, date=(id, 0))
1095 at = id
1094 at = id
1096 elif type == 'l':
1095 elif type == 'l':
1097 id, name = data
1096 id, name = data
1098 ui.status('tag %s\n' % name)
1097 ui.status('tag %s\n' % name)
1099 tag(ui, repo, name, local=True)
1098 tag(ui, repo, name, local=True)
1100 elif type == 'a':
1099 elif type == 'a':
1101 ui.status('branch %s\n' % data)
1100 ui.status('branch %s\n' % data)
1102 atbranch = data
1101 atbranch = data
1103 elif type in 'cC':
1102 elif type in 'cC':
1104 r = util.system(data, cwd=repo.root)
1103 r = util.system(data, cwd=repo.root)
1105 if r:
1104 if r:
1106 desc, r = util.explain_exit(r)
1105 desc, r = util.explain_exit(r)
1107 raise util.Abort(_('%s command %s') % (data, desc))
1106 raise util.Abort(_('%s command %s') % (data, desc))
1108
1107
1109 def debugcommands(ui, cmd='', *args):
1108 def debugcommands(ui, cmd='', *args):
1110 """list all available commands and options"""
1109 """list all available commands and options"""
1111 for cmd, vals in sorted(table.iteritems()):
1110 for cmd, vals in sorted(table.iteritems()):
1112 cmd = cmd.split('|')[0].strip('^')
1111 cmd = cmd.split('|')[0].strip('^')
1113 opts = ', '.join([i[1] for i in vals[1]])
1112 opts = ', '.join([i[1] for i in vals[1]])
1114 ui.write('%s: %s\n' % (cmd, opts))
1113 ui.write('%s: %s\n' % (cmd, opts))
1115
1114
1116 def debugcomplete(ui, cmd='', **opts):
1115 def debugcomplete(ui, cmd='', **opts):
1117 """returns the completion list associated with the given command"""
1116 """returns the completion list associated with the given command"""
1118
1117
1119 if opts.get('options'):
1118 if opts.get('options'):
1120 options = []
1119 options = []
1121 otables = [globalopts]
1120 otables = [globalopts]
1122 if cmd:
1121 if cmd:
1123 aliases, entry = cmdutil.findcmd(cmd, table, False)
1122 aliases, entry = cmdutil.findcmd(cmd, table, False)
1124 otables.append(entry[1])
1123 otables.append(entry[1])
1125 for t in otables:
1124 for t in otables:
1126 for o in t:
1125 for o in t:
1127 if "(DEPRECATED)" in o[3]:
1126 if "(DEPRECATED)" in o[3]:
1128 continue
1127 continue
1129 if o[0]:
1128 if o[0]:
1130 options.append('-%s' % o[0])
1129 options.append('-%s' % o[0])
1131 options.append('--%s' % o[1])
1130 options.append('--%s' % o[1])
1132 ui.write("%s\n" % "\n".join(options))
1131 ui.write("%s\n" % "\n".join(options))
1133 return
1132 return
1134
1133
1135 cmdlist = cmdutil.findpossible(cmd, table)
1134 cmdlist = cmdutil.findpossible(cmd, table)
1136 if ui.verbose:
1135 if ui.verbose:
1137 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1136 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1138 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1137 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1139
1138
1140 def debugfsinfo(ui, path = "."):
1139 def debugfsinfo(ui, path = "."):
1141 """show information detected about current filesystem"""
1140 """show information detected about current filesystem"""
1142 open('.debugfsinfo', 'w').write('')
1141 open('.debugfsinfo', 'w').write('')
1143 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
1142 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
1144 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
1143 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
1145 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
1144 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
1146 and 'yes' or 'no'))
1145 and 'yes' or 'no'))
1147 os.unlink('.debugfsinfo')
1146 os.unlink('.debugfsinfo')
1148
1147
1149 def debugrebuildstate(ui, repo, rev="tip"):
1148 def debugrebuildstate(ui, repo, rev="tip"):
1150 """rebuild the dirstate as it would look like for the given revision"""
1149 """rebuild the dirstate as it would look like for the given revision"""
1151 ctx = cmdutil.revsingle(repo, rev)
1150 ctx = cmdutil.revsingle(repo, rev)
1152 wlock = repo.wlock()
1151 wlock = repo.wlock()
1153 try:
1152 try:
1154 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
1153 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
1155 finally:
1154 finally:
1156 wlock.release()
1155 wlock.release()
1157
1156
1158 def debugcheckstate(ui, repo):
1157 def debugcheckstate(ui, repo):
1159 """validate the correctness of the current dirstate"""
1158 """validate the correctness of the current dirstate"""
1160 parent1, parent2 = repo.dirstate.parents()
1159 parent1, parent2 = repo.dirstate.parents()
1161 m1 = repo[parent1].manifest()
1160 m1 = repo[parent1].manifest()
1162 m2 = repo[parent2].manifest()
1161 m2 = repo[parent2].manifest()
1163 errors = 0
1162 errors = 0
1164 for f in repo.dirstate:
1163 for f in repo.dirstate:
1165 state = repo.dirstate[f]
1164 state = repo.dirstate[f]
1166 if state in "nr" and f not in m1:
1165 if state in "nr" and f not in m1:
1167 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1166 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1168 errors += 1
1167 errors += 1
1169 if state in "a" and f in m1:
1168 if state in "a" and f in m1:
1170 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1169 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1171 errors += 1
1170 errors += 1
1172 if state in "m" and f not in m1 and f not in m2:
1171 if state in "m" and f not in m1 and f not in m2:
1173 ui.warn(_("%s in state %s, but not in either manifest\n") %
1172 ui.warn(_("%s in state %s, but not in either manifest\n") %
1174 (f, state))
1173 (f, state))
1175 errors += 1
1174 errors += 1
1176 for f in m1:
1175 for f in m1:
1177 state = repo.dirstate[f]
1176 state = repo.dirstate[f]
1178 if state not in "nrm":
1177 if state not in "nrm":
1179 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1178 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1180 errors += 1
1179 errors += 1
1181 if errors:
1180 if errors:
1182 error = _(".hg/dirstate inconsistent with current parent's manifest")
1181 error = _(".hg/dirstate inconsistent with current parent's manifest")
1183 raise util.Abort(error)
1182 raise util.Abort(error)
1184
1183
1185 def showconfig(ui, repo, *values, **opts):
1184 def showconfig(ui, repo, *values, **opts):
1186 """show combined config settings from all hgrc files
1185 """show combined config settings from all hgrc files
1187
1186
1188 With no arguments, print names and values of all config items.
1187 With no arguments, print names and values of all config items.
1189
1188
1190 With one argument of the form section.name, print just the value
1189 With one argument of the form section.name, print just the value
1191 of that config item.
1190 of that config item.
1192
1191
1193 With multiple arguments, print names and values of all config
1192 With multiple arguments, print names and values of all config
1194 items with matching section names.
1193 items with matching section names.
1195
1194
1196 With --debug, the source (filename and line number) is printed
1195 With --debug, the source (filename and line number) is printed
1197 for each config item.
1196 for each config item.
1198
1197
1199 Returns 0 on success.
1198 Returns 0 on success.
1200 """
1199 """
1201
1200
1202 for f in scmutil.rcpath():
1201 for f in scmutil.rcpath():
1203 ui.debug(_('read config from: %s\n') % f)
1202 ui.debug(_('read config from: %s\n') % f)
1204 untrusted = bool(opts.get('untrusted'))
1203 untrusted = bool(opts.get('untrusted'))
1205 if values:
1204 if values:
1206 sections = [v for v in values if '.' not in v]
1205 sections = [v for v in values if '.' not in v]
1207 items = [v for v in values if '.' in v]
1206 items = [v for v in values if '.' in v]
1208 if len(items) > 1 or items and sections:
1207 if len(items) > 1 or items and sections:
1209 raise util.Abort(_('only one config item permitted'))
1208 raise util.Abort(_('only one config item permitted'))
1210 for section, name, value in ui.walkconfig(untrusted=untrusted):
1209 for section, name, value in ui.walkconfig(untrusted=untrusted):
1211 value = str(value).replace('\n', '\\n')
1210 value = str(value).replace('\n', '\\n')
1212 sectname = section + '.' + name
1211 sectname = section + '.' + name
1213 if values:
1212 if values:
1214 for v in values:
1213 for v in values:
1215 if v == section:
1214 if v == section:
1216 ui.debug('%s: ' %
1215 ui.debug('%s: ' %
1217 ui.configsource(section, name, untrusted))
1216 ui.configsource(section, name, untrusted))
1218 ui.write('%s=%s\n' % (sectname, value))
1217 ui.write('%s=%s\n' % (sectname, value))
1219 elif v == sectname:
1218 elif v == sectname:
1220 ui.debug('%s: ' %
1219 ui.debug('%s: ' %
1221 ui.configsource(section, name, untrusted))
1220 ui.configsource(section, name, untrusted))
1222 ui.write(value, '\n')
1221 ui.write(value, '\n')
1223 else:
1222 else:
1224 ui.debug('%s: ' %
1223 ui.debug('%s: ' %
1225 ui.configsource(section, name, untrusted))
1224 ui.configsource(section, name, untrusted))
1226 ui.write('%s=%s\n' % (sectname, value))
1225 ui.write('%s=%s\n' % (sectname, value))
1227
1226
1228 def debugknown(ui, repopath, *ids, **opts):
1227 def debugknown(ui, repopath, *ids, **opts):
1229 """test whether node ids are known to a repo
1228 """test whether node ids are known to a repo
1230
1229
1231 Every ID must be a full-length hex node id string. Returns a list of 0s and 1s
1230 Every ID must be a full-length hex node id string. Returns a list of 0s and 1s
1232 indicating unknown/known.
1231 indicating unknown/known.
1233 """
1232 """
1234 repo = hg.repository(ui, repopath)
1233 repo = hg.repository(ui, repopath)
1235 if not repo.capable('known'):
1234 if not repo.capable('known'):
1236 raise util.Abort("known() not supported by target repository")
1235 raise util.Abort("known() not supported by target repository")
1237 flags = repo.known([bin(s) for s in ids])
1236 flags = repo.known([bin(s) for s in ids])
1238 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
1237 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
1239
1238
1240 def debugbundle(ui, bundlepath, all=None, **opts):
1239 def debugbundle(ui, bundlepath, all=None, **opts):
1241 """lists the contents of a bundle"""
1240 """lists the contents of a bundle"""
1242 f = url.open(ui, bundlepath)
1241 f = url.open(ui, bundlepath)
1243 try:
1242 try:
1244 gen = changegroup.readbundle(f, bundlepath)
1243 gen = changegroup.readbundle(f, bundlepath)
1245 if all:
1244 if all:
1246 ui.write("format: id, p1, p2, cset, len(delta)\n")
1245 ui.write("format: id, p1, p2, cset, len(delta)\n")
1247
1246
1248 def showchunks(named):
1247 def showchunks(named):
1249 ui.write("\n%s\n" % named)
1248 ui.write("\n%s\n" % named)
1250 while 1:
1249 while 1:
1251 chunkdata = gen.parsechunk()
1250 chunkdata = gen.parsechunk()
1252 if not chunkdata:
1251 if not chunkdata:
1253 break
1252 break
1254 node = chunkdata['node']
1253 node = chunkdata['node']
1255 p1 = chunkdata['p1']
1254 p1 = chunkdata['p1']
1256 p2 = chunkdata['p2']
1255 p2 = chunkdata['p2']
1257 cs = chunkdata['cs']
1256 cs = chunkdata['cs']
1258 delta = chunkdata['data']
1257 delta = chunkdata['data']
1259 ui.write("%s %s %s %s %s\n" %
1258 ui.write("%s %s %s %s %s\n" %
1260 (hex(node), hex(p1), hex(p2),
1259 (hex(node), hex(p1), hex(p2),
1261 hex(cs), len(delta)))
1260 hex(cs), len(delta)))
1262
1261
1263 showchunks("changelog")
1262 showchunks("changelog")
1264 showchunks("manifest")
1263 showchunks("manifest")
1265 while 1:
1264 while 1:
1266 fname = gen.chunk()
1265 fname = gen.chunk()
1267 if not fname:
1266 if not fname:
1268 break
1267 break
1269 showchunks(fname)
1268 showchunks(fname)
1270 else:
1269 else:
1271 while 1:
1270 while 1:
1272 chunkdata = gen.parsechunk()
1271 chunkdata = gen.parsechunk()
1273 if not chunkdata:
1272 if not chunkdata:
1274 break
1273 break
1275 node = chunkdata['node']
1274 node = chunkdata['node']
1276 ui.write("%s\n" % hex(node))
1275 ui.write("%s\n" % hex(node))
1277 finally:
1276 finally:
1278 f.close()
1277 f.close()
1279
1278
1280 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
1279 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
1281 """retrieves a bundle from a repo
1280 """retrieves a bundle from a repo
1282
1281
1283 Every ID must be a full-length hex node id string. Saves the bundle to the
1282 Every ID must be a full-length hex node id string. Saves the bundle to the
1284 given file.
1283 given file.
1285 """
1284 """
1286 repo = hg.repository(ui, repopath)
1285 repo = hg.repository(ui, repopath)
1287 if not repo.capable('getbundle'):
1286 if not repo.capable('getbundle'):
1288 raise util.Abort("getbundle() not supported by target repository")
1287 raise util.Abort("getbundle() not supported by target repository")
1289 args = {}
1288 args = {}
1290 if common:
1289 if common:
1291 args['common'] = [bin(s) for s in common]
1290 args['common'] = [bin(s) for s in common]
1292 if head:
1291 if head:
1293 args['heads'] = [bin(s) for s in head]
1292 args['heads'] = [bin(s) for s in head]
1294 bundle = repo.getbundle('debug', **args)
1293 bundle = repo.getbundle('debug', **args)
1295
1294
1296 bundletype = opts.get('type', 'bzip2').lower()
1295 bundletype = opts.get('type', 'bzip2').lower()
1297 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1296 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1298 bundletype = btypes.get(bundletype)
1297 bundletype = btypes.get(bundletype)
1299 if bundletype not in changegroup.bundletypes:
1298 if bundletype not in changegroup.bundletypes:
1300 raise util.Abort(_('unknown bundle type specified with --type'))
1299 raise util.Abort(_('unknown bundle type specified with --type'))
1301 changegroup.writebundle(bundle, bundlepath, bundletype)
1300 changegroup.writebundle(bundle, bundlepath, bundletype)
1302
1301
1303 def debugpushkey(ui, repopath, namespace, *keyinfo):
1302 def debugpushkey(ui, repopath, namespace, *keyinfo):
1304 '''access the pushkey key/value protocol
1303 '''access the pushkey key/value protocol
1305
1304
1306 With two args, list the keys in the given namespace.
1305 With two args, list the keys in the given namespace.
1307
1306
1308 With five args, set a key to new if it currently is set to old.
1307 With five args, set a key to new if it currently is set to old.
1309 Reports success or failure.
1308 Reports success or failure.
1310 '''
1309 '''
1311
1310
1312 target = hg.repository(ui, repopath)
1311 target = hg.repository(ui, repopath)
1313 if keyinfo:
1312 if keyinfo:
1314 key, old, new = keyinfo
1313 key, old, new = keyinfo
1315 r = target.pushkey(namespace, key, old, new)
1314 r = target.pushkey(namespace, key, old, new)
1316 ui.status(str(r) + '\n')
1315 ui.status(str(r) + '\n')
1317 return not r
1316 return not r
1318 else:
1317 else:
1319 for k, v in target.listkeys(namespace).iteritems():
1318 for k, v in target.listkeys(namespace).iteritems():
1320 ui.write("%s\t%s\n" % (k.encode('string-escape'),
1319 ui.write("%s\t%s\n" % (k.encode('string-escape'),
1321 v.encode('string-escape')))
1320 v.encode('string-escape')))
1322
1321
1323 def debugrevspec(ui, repo, expr):
1322 def debugrevspec(ui, repo, expr):
1324 '''parse and apply a revision specification'''
1323 '''parse and apply a revision specification'''
1325 if ui.verbose:
1324 if ui.verbose:
1326 tree = revset.parse(expr)[0]
1325 tree = revset.parse(expr)[0]
1327 ui.note(tree, "\n")
1326 ui.note(tree, "\n")
1328 func = revset.match(expr)
1327 func = revset.match(expr)
1329 for c in func(repo, range(len(repo))):
1328 for c in func(repo, range(len(repo))):
1330 ui.write("%s\n" % c)
1329 ui.write("%s\n" % c)
1331
1330
1332 def debugsetparents(ui, repo, rev1, rev2=None):
1331 def debugsetparents(ui, repo, rev1, rev2=None):
1333 """manually set the parents of the current working directory
1332 """manually set the parents of the current working directory
1334
1333
1335 This is useful for writing repository conversion tools, but should
1334 This is useful for writing repository conversion tools, but should
1336 be used with care.
1335 be used with care.
1337
1336
1338 Returns 0 on success.
1337 Returns 0 on success.
1339 """
1338 """
1340
1339
1341 r1 = cmdutil.revsingle(repo, rev1).node()
1340 r1 = cmdutil.revsingle(repo, rev1).node()
1342 r2 = cmdutil.revsingle(repo, rev2, 'null').node()
1341 r2 = cmdutil.revsingle(repo, rev2, 'null').node()
1343
1342
1344 wlock = repo.wlock()
1343 wlock = repo.wlock()
1345 try:
1344 try:
1346 repo.dirstate.setparents(r1, r2)
1345 repo.dirstate.setparents(r1, r2)
1347 finally:
1346 finally:
1348 wlock.release()
1347 wlock.release()
1349
1348
1350 def debugstate(ui, repo, nodates=None, datesort=None):
1349 def debugstate(ui, repo, nodates=None, datesort=None):
1351 """show the contents of the current dirstate"""
1350 """show the contents of the current dirstate"""
1352 timestr = ""
1351 timestr = ""
1353 showdate = not nodates
1352 showdate = not nodates
1354 if datesort:
1353 if datesort:
1355 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
1354 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
1356 else:
1355 else:
1357 keyfunc = None # sort by filename
1356 keyfunc = None # sort by filename
1358 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
1357 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
1359 if showdate:
1358 if showdate:
1360 if ent[3] == -1:
1359 if ent[3] == -1:
1361 # Pad or slice to locale representation
1360 # Pad or slice to locale representation
1362 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
1361 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
1363 time.localtime(0)))
1362 time.localtime(0)))
1364 timestr = 'unset'
1363 timestr = 'unset'
1365 timestr = (timestr[:locale_len] +
1364 timestr = (timestr[:locale_len] +
1366 ' ' * (locale_len - len(timestr)))
1365 ' ' * (locale_len - len(timestr)))
1367 else:
1366 else:
1368 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
1367 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
1369 time.localtime(ent[3]))
1368 time.localtime(ent[3]))
1370 if ent[1] & 020000:
1369 if ent[1] & 020000:
1371 mode = 'lnk'
1370 mode = 'lnk'
1372 else:
1371 else:
1373 mode = '%3o' % (ent[1] & 0777)
1372 mode = '%3o' % (ent[1] & 0777)
1374 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
1373 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
1375 for f in repo.dirstate.copies():
1374 for f in repo.dirstate.copies():
1376 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
1375 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
1377
1376
1378 def debugsub(ui, repo, rev=None):
1377 def debugsub(ui, repo, rev=None):
1379 ctx = cmdutil.revsingle(repo, rev, None)
1378 ctx = cmdutil.revsingle(repo, rev, None)
1380 for k, v in sorted(ctx.substate.items()):
1379 for k, v in sorted(ctx.substate.items()):
1381 ui.write('path %s\n' % k)
1380 ui.write('path %s\n' % k)
1382 ui.write(' source %s\n' % v[0])
1381 ui.write(' source %s\n' % v[0])
1383 ui.write(' revision %s\n' % v[1])
1382 ui.write(' revision %s\n' % v[1])
1384
1383
1385 def debugdag(ui, repo, file_=None, *revs, **opts):
1384 def debugdag(ui, repo, file_=None, *revs, **opts):
1386 """format the changelog or an index DAG as a concise textual description
1385 """format the changelog or an index DAG as a concise textual description
1387
1386
1388 If you pass a revlog index, the revlog's DAG is emitted. If you list
1387 If you pass a revlog index, the revlog's DAG is emitted. If you list
1389 revision numbers, they get labelled in the output as rN.
1388 revision numbers, they get labelled in the output as rN.
1390
1389
1391 Otherwise, the changelog DAG of the current repo is emitted.
1390 Otherwise, the changelog DAG of the current repo is emitted.
1392 """
1391 """
1393 spaces = opts.get('spaces')
1392 spaces = opts.get('spaces')
1394 dots = opts.get('dots')
1393 dots = opts.get('dots')
1395 if file_:
1394 if file_:
1396 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1395 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1397 revs = set((int(r) for r in revs))
1396 revs = set((int(r) for r in revs))
1398 def events():
1397 def events():
1399 for r in rlog:
1398 for r in rlog:
1400 yield 'n', (r, list(set(p for p in rlog.parentrevs(r) if p != -1)))
1399 yield 'n', (r, list(set(p for p in rlog.parentrevs(r) if p != -1)))
1401 if r in revs:
1400 if r in revs:
1402 yield 'l', (r, "r%i" % r)
1401 yield 'l', (r, "r%i" % r)
1403 elif repo:
1402 elif repo:
1404 cl = repo.changelog
1403 cl = repo.changelog
1405 tags = opts.get('tags')
1404 tags = opts.get('tags')
1406 branches = opts.get('branches')
1405 branches = opts.get('branches')
1407 if tags:
1406 if tags:
1408 labels = {}
1407 labels = {}
1409 for l, n in repo.tags().items():
1408 for l, n in repo.tags().items():
1410 labels.setdefault(cl.rev(n), []).append(l)
1409 labels.setdefault(cl.rev(n), []).append(l)
1411 def events():
1410 def events():
1412 b = "default"
1411 b = "default"
1413 for r in cl:
1412 for r in cl:
1414 if branches:
1413 if branches:
1415 newb = cl.read(cl.node(r))[5]['branch']
1414 newb = cl.read(cl.node(r))[5]['branch']
1416 if newb != b:
1415 if newb != b:
1417 yield 'a', newb
1416 yield 'a', newb
1418 b = newb
1417 b = newb
1419 yield 'n', (r, list(set(p for p in cl.parentrevs(r) if p != -1)))
1418 yield 'n', (r, list(set(p for p in cl.parentrevs(r) if p != -1)))
1420 if tags:
1419 if tags:
1421 ls = labels.get(r)
1420 ls = labels.get(r)
1422 if ls:
1421 if ls:
1423 for l in ls:
1422 for l in ls:
1424 yield 'l', (r, l)
1423 yield 'l', (r, l)
1425 else:
1424 else:
1426 raise util.Abort(_('need repo for changelog dag'))
1425 raise util.Abort(_('need repo for changelog dag'))
1427
1426
1428 for line in dagparser.dagtextlines(events(),
1427 for line in dagparser.dagtextlines(events(),
1429 addspaces=spaces,
1428 addspaces=spaces,
1430 wraplabels=True,
1429 wraplabels=True,
1431 wrapannotations=True,
1430 wrapannotations=True,
1432 wrapnonlinear=dots,
1431 wrapnonlinear=dots,
1433 usedots=dots,
1432 usedots=dots,
1434 maxlinewidth=70):
1433 maxlinewidth=70):
1435 ui.write(line)
1434 ui.write(line)
1436 ui.write("\n")
1435 ui.write("\n")
1437
1436
1438 def debugdata(ui, repo, file_, rev):
1437 def debugdata(ui, repo, file_, rev):
1439 """dump the contents of a data file revision"""
1438 """dump the contents of a data file revision"""
1440 r = None
1439 r = None
1441 if repo:
1440 if repo:
1442 filelog = repo.file(file_)
1441 filelog = repo.file(file_)
1443 if len(filelog):
1442 if len(filelog):
1444 r = filelog
1443 r = filelog
1445 if not r:
1444 if not r:
1446 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False),
1445 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False),
1447 file_[:-2] + ".i")
1446 file_[:-2] + ".i")
1448 try:
1447 try:
1449 ui.write(r.revision(r.lookup(rev)))
1448 ui.write(r.revision(r.lookup(rev)))
1450 except KeyError:
1449 except KeyError:
1451 raise util.Abort(_('invalid revision identifier %s') % rev)
1450 raise util.Abort(_('invalid revision identifier %s') % rev)
1452
1451
1453 def debugdate(ui, date, range=None, **opts):
1452 def debugdate(ui, date, range=None, **opts):
1454 """parse and display a date"""
1453 """parse and display a date"""
1455 if opts["extended"]:
1454 if opts["extended"]:
1456 d = util.parsedate(date, util.extendeddateformats)
1455 d = util.parsedate(date, util.extendeddateformats)
1457 else:
1456 else:
1458 d = util.parsedate(date)
1457 d = util.parsedate(date)
1459 ui.write("internal: %s %s\n" % d)
1458 ui.write("internal: %s %s\n" % d)
1460 ui.write("standard: %s\n" % util.datestr(d))
1459 ui.write("standard: %s\n" % util.datestr(d))
1461 if range:
1460 if range:
1462 m = util.matchdate(range)
1461 m = util.matchdate(range)
1463 ui.write("match: %s\n" % m(d[0]))
1462 ui.write("match: %s\n" % m(d[0]))
1464
1463
1465 def debugignore(ui, repo, *values, **opts):
1464 def debugignore(ui, repo, *values, **opts):
1466 """display the combined ignore pattern"""
1465 """display the combined ignore pattern"""
1467 ignore = repo.dirstate._ignore
1466 ignore = repo.dirstate._ignore
1468 if hasattr(ignore, 'includepat'):
1467 if hasattr(ignore, 'includepat'):
1469 ui.write("%s\n" % ignore.includepat)
1468 ui.write("%s\n" % ignore.includepat)
1470 else:
1469 else:
1471 raise util.Abort(_("no ignore patterns found"))
1470 raise util.Abort(_("no ignore patterns found"))
1472
1471
1473 def debugindex(ui, repo, file_, **opts):
1472 def debugindex(ui, repo, file_, **opts):
1474 """dump the contents of an index file"""
1473 """dump the contents of an index file"""
1475 r = None
1474 r = None
1476 if repo:
1475 if repo:
1477 filelog = repo.file(file_)
1476 filelog = repo.file(file_)
1478 if len(filelog):
1477 if len(filelog):
1479 r = filelog
1478 r = filelog
1480
1479
1481 format = opts.get('format', 0)
1480 format = opts.get('format', 0)
1482 if format not in (0, 1):
1481 if format not in (0, 1):
1483 raise util.Abort(_("unknown format %d") % format)
1482 raise util.Abort(_("unknown format %d") % format)
1484
1483
1485 if not r:
1484 if not r:
1486 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1485 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1487
1486
1488 if format == 0:
1487 if format == 0:
1489 ui.write(" rev offset length base linkrev"
1488 ui.write(" rev offset length base linkrev"
1490 " nodeid p1 p2\n")
1489 " nodeid p1 p2\n")
1491 elif format == 1:
1490 elif format == 1:
1492 ui.write(" rev flag offset length"
1491 ui.write(" rev flag offset length"
1493 " size base link p1 p2 nodeid\n")
1492 " size base link p1 p2 nodeid\n")
1494
1493
1495 for i in r:
1494 for i in r:
1496 node = r.node(i)
1495 node = r.node(i)
1497 if format == 0:
1496 if format == 0:
1498 try:
1497 try:
1499 pp = r.parents(node)
1498 pp = r.parents(node)
1500 except:
1499 except:
1501 pp = [nullid, nullid]
1500 pp = [nullid, nullid]
1502 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1501 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1503 i, r.start(i), r.length(i), r.base(i), r.linkrev(i),
1502 i, r.start(i), r.length(i), r.base(i), r.linkrev(i),
1504 short(node), short(pp[0]), short(pp[1])))
1503 short(node), short(pp[0]), short(pp[1])))
1505 elif format == 1:
1504 elif format == 1:
1506 pr = r.parentrevs(i)
1505 pr = r.parentrevs(i)
1507 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
1506 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
1508 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
1507 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
1509 r.base(i), r.linkrev(i), pr[0], pr[1], short(node)))
1508 r.base(i), r.linkrev(i), pr[0], pr[1], short(node)))
1510
1509
1511 def debugindexdot(ui, repo, file_):
1510 def debugindexdot(ui, repo, file_):
1512 """dump an index DAG as a graphviz dot file"""
1511 """dump an index DAG as a graphviz dot file"""
1513 r = None
1512 r = None
1514 if repo:
1513 if repo:
1515 filelog = repo.file(file_)
1514 filelog = repo.file(file_)
1516 if len(filelog):
1515 if len(filelog):
1517 r = filelog
1516 r = filelog
1518 if not r:
1517 if not r:
1519 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1518 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1520 ui.write("digraph G {\n")
1519 ui.write("digraph G {\n")
1521 for i in r:
1520 for i in r:
1522 node = r.node(i)
1521 node = r.node(i)
1523 pp = r.parents(node)
1522 pp = r.parents(node)
1524 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1523 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1525 if pp[1] != nullid:
1524 if pp[1] != nullid:
1526 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1525 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1527 ui.write("}\n")
1526 ui.write("}\n")
1528
1527
1529 def debuginstall(ui):
1528 def debuginstall(ui):
1530 '''test Mercurial installation
1529 '''test Mercurial installation
1531
1530
1532 Returns 0 on success.
1531 Returns 0 on success.
1533 '''
1532 '''
1534
1533
1535 def writetemp(contents):
1534 def writetemp(contents):
1536 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1535 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1537 f = os.fdopen(fd, "wb")
1536 f = os.fdopen(fd, "wb")
1538 f.write(contents)
1537 f.write(contents)
1539 f.close()
1538 f.close()
1540 return name
1539 return name
1541
1540
1542 problems = 0
1541 problems = 0
1543
1542
1544 # encoding
1543 # encoding
1545 ui.status(_("Checking encoding (%s)...\n") % encoding.encoding)
1544 ui.status(_("Checking encoding (%s)...\n") % encoding.encoding)
1546 try:
1545 try:
1547 encoding.fromlocal("test")
1546 encoding.fromlocal("test")
1548 except util.Abort, inst:
1547 except util.Abort, inst:
1549 ui.write(" %s\n" % inst)
1548 ui.write(" %s\n" % inst)
1550 ui.write(_(" (check that your locale is properly set)\n"))
1549 ui.write(_(" (check that your locale is properly set)\n"))
1551 problems += 1
1550 problems += 1
1552
1551
1553 # compiled modules
1552 # compiled modules
1554 ui.status(_("Checking installed modules (%s)...\n")
1553 ui.status(_("Checking installed modules (%s)...\n")
1555 % os.path.dirname(__file__))
1554 % os.path.dirname(__file__))
1556 try:
1555 try:
1557 import bdiff, mpatch, base85, osutil
1556 import bdiff, mpatch, base85, osutil
1558 except Exception, inst:
1557 except Exception, inst:
1559 ui.write(" %s\n" % inst)
1558 ui.write(" %s\n" % inst)
1560 ui.write(_(" One or more extensions could not be found"))
1559 ui.write(_(" One or more extensions could not be found"))
1561 ui.write(_(" (check that you compiled the extensions)\n"))
1560 ui.write(_(" (check that you compiled the extensions)\n"))
1562 problems += 1
1561 problems += 1
1563
1562
1564 # templates
1563 # templates
1565 ui.status(_("Checking templates...\n"))
1564 ui.status(_("Checking templates...\n"))
1566 try:
1565 try:
1567 import templater
1566 import templater
1568 templater.templater(templater.templatepath("map-cmdline.default"))
1567 templater.templater(templater.templatepath("map-cmdline.default"))
1569 except Exception, inst:
1568 except Exception, inst:
1570 ui.write(" %s\n" % inst)
1569 ui.write(" %s\n" % inst)
1571 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
1570 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
1572 problems += 1
1571 problems += 1
1573
1572
1574 # editor
1573 # editor
1575 ui.status(_("Checking commit editor...\n"))
1574 ui.status(_("Checking commit editor...\n"))
1576 editor = ui.geteditor()
1575 editor = ui.geteditor()
1577 cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
1576 cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
1578 if not cmdpath:
1577 if not cmdpath:
1579 if editor == 'vi':
1578 if editor == 'vi':
1580 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
1579 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
1581 ui.write(_(" (specify a commit editor in your configuration"
1580 ui.write(_(" (specify a commit editor in your configuration"
1582 " file)\n"))
1581 " file)\n"))
1583 else:
1582 else:
1584 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
1583 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
1585 ui.write(_(" (specify a commit editor in your configuration"
1584 ui.write(_(" (specify a commit editor in your configuration"
1586 " file)\n"))
1585 " file)\n"))
1587 problems += 1
1586 problems += 1
1588
1587
1589 # check username
1588 # check username
1590 ui.status(_("Checking username...\n"))
1589 ui.status(_("Checking username...\n"))
1591 try:
1590 try:
1592 ui.username()
1591 ui.username()
1593 except util.Abort, e:
1592 except util.Abort, e:
1594 ui.write(" %s\n" % e)
1593 ui.write(" %s\n" % e)
1595 ui.write(_(" (specify a username in your configuration file)\n"))
1594 ui.write(_(" (specify a username in your configuration file)\n"))
1596 problems += 1
1595 problems += 1
1597
1596
1598 if not problems:
1597 if not problems:
1599 ui.status(_("No problems detected\n"))
1598 ui.status(_("No problems detected\n"))
1600 else:
1599 else:
1601 ui.write(_("%s problems detected,"
1600 ui.write(_("%s problems detected,"
1602 " please check your install!\n") % problems)
1601 " please check your install!\n") % problems)
1603
1602
1604 return problems
1603 return problems
1605
1604
1606 def debugrename(ui, repo, file1, *pats, **opts):
1605 def debugrename(ui, repo, file1, *pats, **opts):
1607 """dump rename information"""
1606 """dump rename information"""
1608
1607
1609 ctx = cmdutil.revsingle(repo, opts.get('rev'))
1608 ctx = cmdutil.revsingle(repo, opts.get('rev'))
1610 m = cmdutil.match(repo, (file1,) + pats, opts)
1609 m = cmdutil.match(repo, (file1,) + pats, opts)
1611 for abs in ctx.walk(m):
1610 for abs in ctx.walk(m):
1612 fctx = ctx[abs]
1611 fctx = ctx[abs]
1613 o = fctx.filelog().renamed(fctx.filenode())
1612 o = fctx.filelog().renamed(fctx.filenode())
1614 rel = m.rel(abs)
1613 rel = m.rel(abs)
1615 if o:
1614 if o:
1616 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
1615 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
1617 else:
1616 else:
1618 ui.write(_("%s not renamed\n") % rel)
1617 ui.write(_("%s not renamed\n") % rel)
1619
1618
1620 def debugwalk(ui, repo, *pats, **opts):
1619 def debugwalk(ui, repo, *pats, **opts):
1621 """show how files match on given patterns"""
1620 """show how files match on given patterns"""
1622 m = cmdutil.match(repo, pats, opts)
1621 m = cmdutil.match(repo, pats, opts)
1623 items = list(repo.walk(m))
1622 items = list(repo.walk(m))
1624 if not items:
1623 if not items:
1625 return
1624 return
1626 fmt = 'f %%-%ds %%-%ds %%s' % (
1625 fmt = 'f %%-%ds %%-%ds %%s' % (
1627 max([len(abs) for abs in items]),
1626 max([len(abs) for abs in items]),
1628 max([len(m.rel(abs)) for abs in items]))
1627 max([len(m.rel(abs)) for abs in items]))
1629 for abs in items:
1628 for abs in items:
1630 line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '')
1629 line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '')
1631 ui.write("%s\n" % line.rstrip())
1630 ui.write("%s\n" % line.rstrip())
1632
1631
1633 def debugwireargs(ui, repopath, *vals, **opts):
1632 def debugwireargs(ui, repopath, *vals, **opts):
1634 repo = hg.repository(hg.remoteui(ui, opts), repopath)
1633 repo = hg.repository(hg.remoteui(ui, opts), repopath)
1635 for opt in remoteopts:
1634 for opt in remoteopts:
1636 del opts[opt[1]]
1635 del opts[opt[1]]
1637 args = {}
1636 args = {}
1638 for k, v in opts.iteritems():
1637 for k, v in opts.iteritems():
1639 if v:
1638 if v:
1640 args[k] = v
1639 args[k] = v
1641 # run twice to check that we don't mess up the stream for the next command
1640 # run twice to check that we don't mess up the stream for the next command
1642 res1 = repo.debugwireargs(*vals, **args)
1641 res1 = repo.debugwireargs(*vals, **args)
1643 res2 = repo.debugwireargs(*vals, **args)
1642 res2 = repo.debugwireargs(*vals, **args)
1644 ui.write("%s\n" % res1)
1643 ui.write("%s\n" % res1)
1645 if res1 != res2:
1644 if res1 != res2:
1646 ui.warn("%s\n" % res2)
1645 ui.warn("%s\n" % res2)
1647
1646
1648 def diff(ui, repo, *pats, **opts):
1647 def diff(ui, repo, *pats, **opts):
1649 """diff repository (or selected files)
1648 """diff repository (or selected files)
1650
1649
1651 Show differences between revisions for the specified files.
1650 Show differences between revisions for the specified files.
1652
1651
1653 Differences between files are shown using the unified diff format.
1652 Differences between files are shown using the unified diff format.
1654
1653
1655 .. note::
1654 .. note::
1656 diff may generate unexpected results for merges, as it will
1655 diff may generate unexpected results for merges, as it will
1657 default to comparing against the working directory's first
1656 default to comparing against the working directory's first
1658 parent changeset if no revisions are specified.
1657 parent changeset if no revisions are specified.
1659
1658
1660 When two revision arguments are given, then changes are shown
1659 When two revision arguments are given, then changes are shown
1661 between those revisions. If only one revision is specified then
1660 between those revisions. If only one revision is specified then
1662 that revision is compared to the working directory, and, when no
1661 that revision is compared to the working directory, and, when no
1663 revisions are specified, the working directory files are compared
1662 revisions are specified, the working directory files are compared
1664 to its parent.
1663 to its parent.
1665
1664
1666 Alternatively you can specify -c/--change with a revision to see
1665 Alternatively you can specify -c/--change with a revision to see
1667 the changes in that changeset relative to its first parent.
1666 the changes in that changeset relative to its first parent.
1668
1667
1669 Without the -a/--text option, diff will avoid generating diffs of
1668 Without the -a/--text option, diff will avoid generating diffs of
1670 files it detects as binary. With -a, diff will generate a diff
1669 files it detects as binary. With -a, diff will generate a diff
1671 anyway, probably with undesirable results.
1670 anyway, probably with undesirable results.
1672
1671
1673 Use the -g/--git option to generate diffs in the git extended diff
1672 Use the -g/--git option to generate diffs in the git extended diff
1674 format. For more information, read :hg:`help diffs`.
1673 format. For more information, read :hg:`help diffs`.
1675
1674
1676 Returns 0 on success.
1675 Returns 0 on success.
1677 """
1676 """
1678
1677
1679 revs = opts.get('rev')
1678 revs = opts.get('rev')
1680 change = opts.get('change')
1679 change = opts.get('change')
1681 stat = opts.get('stat')
1680 stat = opts.get('stat')
1682 reverse = opts.get('reverse')
1681 reverse = opts.get('reverse')
1683
1682
1684 if revs and change:
1683 if revs and change:
1685 msg = _('cannot specify --rev and --change at the same time')
1684 msg = _('cannot specify --rev and --change at the same time')
1686 raise util.Abort(msg)
1685 raise util.Abort(msg)
1687 elif change:
1686 elif change:
1688 node2 = cmdutil.revsingle(repo, change, None).node()
1687 node2 = cmdutil.revsingle(repo, change, None).node()
1689 node1 = repo[node2].p1().node()
1688 node1 = repo[node2].p1().node()
1690 else:
1689 else:
1691 node1, node2 = cmdutil.revpair(repo, revs)
1690 node1, node2 = cmdutil.revpair(repo, revs)
1692
1691
1693 if reverse:
1692 if reverse:
1694 node1, node2 = node2, node1
1693 node1, node2 = node2, node1
1695
1694
1696 diffopts = patch.diffopts(ui, opts)
1695 diffopts = patch.diffopts(ui, opts)
1697 m = cmdutil.match(repo, pats, opts)
1696 m = cmdutil.match(repo, pats, opts)
1698 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1697 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1699 listsubrepos=opts.get('subrepos'))
1698 listsubrepos=opts.get('subrepos'))
1700
1699
1701 def export(ui, repo, *changesets, **opts):
1700 def export(ui, repo, *changesets, **opts):
1702 """dump the header and diffs for one or more changesets
1701 """dump the header and diffs for one or more changesets
1703
1702
1704 Print the changeset header and diffs for one or more revisions.
1703 Print the changeset header and diffs for one or more revisions.
1705
1704
1706 The information shown in the changeset header is: author, date,
1705 The information shown in the changeset header is: author, date,
1707 branch name (if non-default), changeset hash, parent(s) and commit
1706 branch name (if non-default), changeset hash, parent(s) and commit
1708 comment.
1707 comment.
1709
1708
1710 .. note::
1709 .. note::
1711 export may generate unexpected diff output for merge
1710 export may generate unexpected diff output for merge
1712 changesets, as it will compare the merge changeset against its
1711 changesets, as it will compare the merge changeset against its
1713 first parent only.
1712 first parent only.
1714
1713
1715 Output may be to a file, in which case the name of the file is
1714 Output may be to a file, in which case the name of the file is
1716 given using a format string. The formatting rules are as follows:
1715 given using a format string. The formatting rules are as follows:
1717
1716
1718 :``%%``: literal "%" character
1717 :``%%``: literal "%" character
1719 :``%H``: changeset hash (40 hexadecimal digits)
1718 :``%H``: changeset hash (40 hexadecimal digits)
1720 :``%N``: number of patches being generated
1719 :``%N``: number of patches being generated
1721 :``%R``: changeset revision number
1720 :``%R``: changeset revision number
1722 :``%b``: basename of the exporting repository
1721 :``%b``: basename of the exporting repository
1723 :``%h``: short-form changeset hash (12 hexadecimal digits)
1722 :``%h``: short-form changeset hash (12 hexadecimal digits)
1724 :``%n``: zero-padded sequence number, starting at 1
1723 :``%n``: zero-padded sequence number, starting at 1
1725 :``%r``: zero-padded changeset revision number
1724 :``%r``: zero-padded changeset revision number
1726
1725
1727 Without the -a/--text option, export will avoid generating diffs
1726 Without the -a/--text option, export will avoid generating diffs
1728 of files it detects as binary. With -a, export will generate a
1727 of files it detects as binary. With -a, export will generate a
1729 diff anyway, probably with undesirable results.
1728 diff anyway, probably with undesirable results.
1730
1729
1731 Use the -g/--git option to generate diffs in the git extended diff
1730 Use the -g/--git option to generate diffs in the git extended diff
1732 format. See :hg:`help diffs` for more information.
1731 format. See :hg:`help diffs` for more information.
1733
1732
1734 With the --switch-parent option, the diff will be against the
1733 With the --switch-parent option, the diff will be against the
1735 second parent. It can be useful to review a merge.
1734 second parent. It can be useful to review a merge.
1736
1735
1737 Returns 0 on success.
1736 Returns 0 on success.
1738 """
1737 """
1739 changesets += tuple(opts.get('rev', []))
1738 changesets += tuple(opts.get('rev', []))
1740 if not changesets:
1739 if not changesets:
1741 raise util.Abort(_("export requires at least one changeset"))
1740 raise util.Abort(_("export requires at least one changeset"))
1742 revs = cmdutil.revrange(repo, changesets)
1741 revs = cmdutil.revrange(repo, changesets)
1743 if len(revs) > 1:
1742 if len(revs) > 1:
1744 ui.note(_('exporting patches:\n'))
1743 ui.note(_('exporting patches:\n'))
1745 else:
1744 else:
1746 ui.note(_('exporting patch:\n'))
1745 ui.note(_('exporting patch:\n'))
1747 cmdutil.export(repo, revs, template=opts.get('output'),
1746 cmdutil.export(repo, revs, template=opts.get('output'),
1748 switch_parent=opts.get('switch_parent'),
1747 switch_parent=opts.get('switch_parent'),
1749 opts=patch.diffopts(ui, opts))
1748 opts=patch.diffopts(ui, opts))
1750
1749
1751 def forget(ui, repo, *pats, **opts):
1750 def forget(ui, repo, *pats, **opts):
1752 """forget the specified files on the next commit
1751 """forget the specified files on the next commit
1753
1752
1754 Mark the specified files so they will no longer be tracked
1753 Mark the specified files so they will no longer be tracked
1755 after the next commit.
1754 after the next commit.
1756
1755
1757 This only removes files from the current branch, not from the
1756 This only removes files from the current branch, not from the
1758 entire project history, and it does not delete them from the
1757 entire project history, and it does not delete them from the
1759 working directory.
1758 working directory.
1760
1759
1761 To undo a forget before the next commit, see :hg:`add`.
1760 To undo a forget before the next commit, see :hg:`add`.
1762
1761
1763 Returns 0 on success.
1762 Returns 0 on success.
1764 """
1763 """
1765
1764
1766 if not pats:
1765 if not pats:
1767 raise util.Abort(_('no files specified'))
1766 raise util.Abort(_('no files specified'))
1768
1767
1769 m = cmdutil.match(repo, pats, opts)
1768 m = cmdutil.match(repo, pats, opts)
1770 s = repo.status(match=m, clean=True)
1769 s = repo.status(match=m, clean=True)
1771 forget = sorted(s[0] + s[1] + s[3] + s[6])
1770 forget = sorted(s[0] + s[1] + s[3] + s[6])
1772 errs = 0
1771 errs = 0
1773
1772
1774 for f in m.files():
1773 for f in m.files():
1775 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
1774 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
1776 ui.warn(_('not removing %s: file is already untracked\n')
1775 ui.warn(_('not removing %s: file is already untracked\n')
1777 % m.rel(f))
1776 % m.rel(f))
1778 errs = 1
1777 errs = 1
1779
1778
1780 for f in forget:
1779 for f in forget:
1781 if ui.verbose or not m.exact(f):
1780 if ui.verbose or not m.exact(f):
1782 ui.status(_('removing %s\n') % m.rel(f))
1781 ui.status(_('removing %s\n') % m.rel(f))
1783
1782
1784 repo[None].remove(forget, unlink=False)
1783 repo[None].remove(forget, unlink=False)
1785 return errs
1784 return errs
1786
1785
1787 def grep(ui, repo, pattern, *pats, **opts):
1786 def grep(ui, repo, pattern, *pats, **opts):
1788 """search for a pattern in specified files and revisions
1787 """search for a pattern in specified files and revisions
1789
1788
1790 Search revisions of files for a regular expression.
1789 Search revisions of files for a regular expression.
1791
1790
1792 This command behaves differently than Unix grep. It only accepts
1791 This command behaves differently than Unix grep. It only accepts
1793 Python/Perl regexps. It searches repository history, not the
1792 Python/Perl regexps. It searches repository history, not the
1794 working directory. It always prints the revision number in which a
1793 working directory. It always prints the revision number in which a
1795 match appears.
1794 match appears.
1796
1795
1797 By default, grep only prints output for the first revision of a
1796 By default, grep only prints output for the first revision of a
1798 file in which it finds a match. To get it to print every revision
1797 file in which it finds a match. To get it to print every revision
1799 that contains a change in match status ("-" for a match that
1798 that contains a change in match status ("-" for a match that
1800 becomes a non-match, or "+" for a non-match that becomes a match),
1799 becomes a non-match, or "+" for a non-match that becomes a match),
1801 use the --all flag.
1800 use the --all flag.
1802
1801
1803 Returns 0 if a match is found, 1 otherwise.
1802 Returns 0 if a match is found, 1 otherwise.
1804 """
1803 """
1805 reflags = 0
1804 reflags = 0
1806 if opts.get('ignore_case'):
1805 if opts.get('ignore_case'):
1807 reflags |= re.I
1806 reflags |= re.I
1808 try:
1807 try:
1809 regexp = re.compile(pattern, reflags)
1808 regexp = re.compile(pattern, reflags)
1810 except re.error, inst:
1809 except re.error, inst:
1811 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
1810 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
1812 return 1
1811 return 1
1813 sep, eol = ':', '\n'
1812 sep, eol = ':', '\n'
1814 if opts.get('print0'):
1813 if opts.get('print0'):
1815 sep = eol = '\0'
1814 sep = eol = '\0'
1816
1815
1817 getfile = util.lrucachefunc(repo.file)
1816 getfile = util.lrucachefunc(repo.file)
1818
1817
1819 def matchlines(body):
1818 def matchlines(body):
1820 begin = 0
1819 begin = 0
1821 linenum = 0
1820 linenum = 0
1822 while True:
1821 while True:
1823 match = regexp.search(body, begin)
1822 match = regexp.search(body, begin)
1824 if not match:
1823 if not match:
1825 break
1824 break
1826 mstart, mend = match.span()
1825 mstart, mend = match.span()
1827 linenum += body.count('\n', begin, mstart) + 1
1826 linenum += body.count('\n', begin, mstart) + 1
1828 lstart = body.rfind('\n', begin, mstart) + 1 or begin
1827 lstart = body.rfind('\n', begin, mstart) + 1 or begin
1829 begin = body.find('\n', mend) + 1 or len(body)
1828 begin = body.find('\n', mend) + 1 or len(body)
1830 lend = begin - 1
1829 lend = begin - 1
1831 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
1830 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
1832
1831
1833 class linestate(object):
1832 class linestate(object):
1834 def __init__(self, line, linenum, colstart, colend):
1833 def __init__(self, line, linenum, colstart, colend):
1835 self.line = line
1834 self.line = line
1836 self.linenum = linenum
1835 self.linenum = linenum
1837 self.colstart = colstart
1836 self.colstart = colstart
1838 self.colend = colend
1837 self.colend = colend
1839
1838
1840 def __hash__(self):
1839 def __hash__(self):
1841 return hash((self.linenum, self.line))
1840 return hash((self.linenum, self.line))
1842
1841
1843 def __eq__(self, other):
1842 def __eq__(self, other):
1844 return self.line == other.line
1843 return self.line == other.line
1845
1844
1846 matches = {}
1845 matches = {}
1847 copies = {}
1846 copies = {}
1848 def grepbody(fn, rev, body):
1847 def grepbody(fn, rev, body):
1849 matches[rev].setdefault(fn, [])
1848 matches[rev].setdefault(fn, [])
1850 m = matches[rev][fn]
1849 m = matches[rev][fn]
1851 for lnum, cstart, cend, line in matchlines(body):
1850 for lnum, cstart, cend, line in matchlines(body):
1852 s = linestate(line, lnum, cstart, cend)
1851 s = linestate(line, lnum, cstart, cend)
1853 m.append(s)
1852 m.append(s)
1854
1853
1855 def difflinestates(a, b):
1854 def difflinestates(a, b):
1856 sm = difflib.SequenceMatcher(None, a, b)
1855 sm = difflib.SequenceMatcher(None, a, b)
1857 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
1856 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
1858 if tag == 'insert':
1857 if tag == 'insert':
1859 for i in xrange(blo, bhi):
1858 for i in xrange(blo, bhi):
1860 yield ('+', b[i])
1859 yield ('+', b[i])
1861 elif tag == 'delete':
1860 elif tag == 'delete':
1862 for i in xrange(alo, ahi):
1861 for i in xrange(alo, ahi):
1863 yield ('-', a[i])
1862 yield ('-', a[i])
1864 elif tag == 'replace':
1863 elif tag == 'replace':
1865 for i in xrange(alo, ahi):
1864 for i in xrange(alo, ahi):
1866 yield ('-', a[i])
1865 yield ('-', a[i])
1867 for i in xrange(blo, bhi):
1866 for i in xrange(blo, bhi):
1868 yield ('+', b[i])
1867 yield ('+', b[i])
1869
1868
1870 def display(fn, ctx, pstates, states):
1869 def display(fn, ctx, pstates, states):
1871 rev = ctx.rev()
1870 rev = ctx.rev()
1872 datefunc = ui.quiet and util.shortdate or util.datestr
1871 datefunc = ui.quiet and util.shortdate or util.datestr
1873 found = False
1872 found = False
1874 filerevmatches = {}
1873 filerevmatches = {}
1875 def binary():
1874 def binary():
1876 flog = getfile(fn)
1875 flog = getfile(fn)
1877 return util.binary(flog.read(ctx.filenode(fn)))
1876 return util.binary(flog.read(ctx.filenode(fn)))
1878
1877
1879 if opts.get('all'):
1878 if opts.get('all'):
1880 iter = difflinestates(pstates, states)
1879 iter = difflinestates(pstates, states)
1881 else:
1880 else:
1882 iter = [('', l) for l in states]
1881 iter = [('', l) for l in states]
1883 for change, l in iter:
1882 for change, l in iter:
1884 cols = [fn, str(rev)]
1883 cols = [fn, str(rev)]
1885 before, match, after = None, None, None
1884 before, match, after = None, None, None
1886 if opts.get('line_number'):
1885 if opts.get('line_number'):
1887 cols.append(str(l.linenum))
1886 cols.append(str(l.linenum))
1888 if opts.get('all'):
1887 if opts.get('all'):
1889 cols.append(change)
1888 cols.append(change)
1890 if opts.get('user'):
1889 if opts.get('user'):
1891 cols.append(ui.shortuser(ctx.user()))
1890 cols.append(ui.shortuser(ctx.user()))
1892 if opts.get('date'):
1891 if opts.get('date'):
1893 cols.append(datefunc(ctx.date()))
1892 cols.append(datefunc(ctx.date()))
1894 if opts.get('files_with_matches'):
1893 if opts.get('files_with_matches'):
1895 c = (fn, rev)
1894 c = (fn, rev)
1896 if c in filerevmatches:
1895 if c in filerevmatches:
1897 continue
1896 continue
1898 filerevmatches[c] = 1
1897 filerevmatches[c] = 1
1899 else:
1898 else:
1900 before = l.line[:l.colstart]
1899 before = l.line[:l.colstart]
1901 match = l.line[l.colstart:l.colend]
1900 match = l.line[l.colstart:l.colend]
1902 after = l.line[l.colend:]
1901 after = l.line[l.colend:]
1903 ui.write(sep.join(cols))
1902 ui.write(sep.join(cols))
1904 if before is not None:
1903 if before is not None:
1905 if not opts.get('text') and binary():
1904 if not opts.get('text') and binary():
1906 ui.write(sep + " Binary file matches")
1905 ui.write(sep + " Binary file matches")
1907 else:
1906 else:
1908 ui.write(sep + before)
1907 ui.write(sep + before)
1909 ui.write(match, label='grep.match')
1908 ui.write(match, label='grep.match')
1910 ui.write(after)
1909 ui.write(after)
1911 ui.write(eol)
1910 ui.write(eol)
1912 found = True
1911 found = True
1913 return found
1912 return found
1914
1913
1915 skip = {}
1914 skip = {}
1916 revfiles = {}
1915 revfiles = {}
1917 matchfn = cmdutil.match(repo, pats, opts)
1916 matchfn = cmdutil.match(repo, pats, opts)
1918 found = False
1917 found = False
1919 follow = opts.get('follow')
1918 follow = opts.get('follow')
1920
1919
1921 def prep(ctx, fns):
1920 def prep(ctx, fns):
1922 rev = ctx.rev()
1921 rev = ctx.rev()
1923 pctx = ctx.p1()
1922 pctx = ctx.p1()
1924 parent = pctx.rev()
1923 parent = pctx.rev()
1925 matches.setdefault(rev, {})
1924 matches.setdefault(rev, {})
1926 matches.setdefault(parent, {})
1925 matches.setdefault(parent, {})
1927 files = revfiles.setdefault(rev, [])
1926 files = revfiles.setdefault(rev, [])
1928 for fn in fns:
1927 for fn in fns:
1929 flog = getfile(fn)
1928 flog = getfile(fn)
1930 try:
1929 try:
1931 fnode = ctx.filenode(fn)
1930 fnode = ctx.filenode(fn)
1932 except error.LookupError:
1931 except error.LookupError:
1933 continue
1932 continue
1934
1933
1935 copied = flog.renamed(fnode)
1934 copied = flog.renamed(fnode)
1936 copy = follow and copied and copied[0]
1935 copy = follow and copied and copied[0]
1937 if copy:
1936 if copy:
1938 copies.setdefault(rev, {})[fn] = copy
1937 copies.setdefault(rev, {})[fn] = copy
1939 if fn in skip:
1938 if fn in skip:
1940 if copy:
1939 if copy:
1941 skip[copy] = True
1940 skip[copy] = True
1942 continue
1941 continue
1943 files.append(fn)
1942 files.append(fn)
1944
1943
1945 if fn not in matches[rev]:
1944 if fn not in matches[rev]:
1946 grepbody(fn, rev, flog.read(fnode))
1945 grepbody(fn, rev, flog.read(fnode))
1947
1946
1948 pfn = copy or fn
1947 pfn = copy or fn
1949 if pfn not in matches[parent]:
1948 if pfn not in matches[parent]:
1950 try:
1949 try:
1951 fnode = pctx.filenode(pfn)
1950 fnode = pctx.filenode(pfn)
1952 grepbody(pfn, parent, flog.read(fnode))
1951 grepbody(pfn, parent, flog.read(fnode))
1953 except error.LookupError:
1952 except error.LookupError:
1954 pass
1953 pass
1955
1954
1956 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
1955 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
1957 rev = ctx.rev()
1956 rev = ctx.rev()
1958 parent = ctx.p1().rev()
1957 parent = ctx.p1().rev()
1959 for fn in sorted(revfiles.get(rev, [])):
1958 for fn in sorted(revfiles.get(rev, [])):
1960 states = matches[rev][fn]
1959 states = matches[rev][fn]
1961 copy = copies.get(rev, {}).get(fn)
1960 copy = copies.get(rev, {}).get(fn)
1962 if fn in skip:
1961 if fn in skip:
1963 if copy:
1962 if copy:
1964 skip[copy] = True
1963 skip[copy] = True
1965 continue
1964 continue
1966 pstates = matches.get(parent, {}).get(copy or fn, [])
1965 pstates = matches.get(parent, {}).get(copy or fn, [])
1967 if pstates or states:
1966 if pstates or states:
1968 r = display(fn, ctx, pstates, states)
1967 r = display(fn, ctx, pstates, states)
1969 found = found or r
1968 found = found or r
1970 if r and not opts.get('all'):
1969 if r and not opts.get('all'):
1971 skip[fn] = True
1970 skip[fn] = True
1972 if copy:
1971 if copy:
1973 skip[copy] = True
1972 skip[copy] = True
1974 del matches[rev]
1973 del matches[rev]
1975 del revfiles[rev]
1974 del revfiles[rev]
1976
1975
1977 return not found
1976 return not found
1978
1977
1979 def heads(ui, repo, *branchrevs, **opts):
1978 def heads(ui, repo, *branchrevs, **opts):
1980 """show current repository heads or show branch heads
1979 """show current repository heads or show branch heads
1981
1980
1982 With no arguments, show all repository branch heads.
1981 With no arguments, show all repository branch heads.
1983
1982
1984 Repository "heads" are changesets with no child changesets. They are
1983 Repository "heads" are changesets with no child changesets. They are
1985 where development generally takes place and are the usual targets
1984 where development generally takes place and are the usual targets
1986 for update and merge operations. Branch heads are changesets that have
1985 for update and merge operations. Branch heads are changesets that have
1987 no child changeset on the same branch.
1986 no child changeset on the same branch.
1988
1987
1989 If one or more REVs are given, only branch heads on the branches
1988 If one or more REVs are given, only branch heads on the branches
1990 associated with the specified changesets are shown.
1989 associated with the specified changesets are shown.
1991
1990
1992 If -c/--closed is specified, also show branch heads marked closed
1991 If -c/--closed is specified, also show branch heads marked closed
1993 (see :hg:`commit --close-branch`).
1992 (see :hg:`commit --close-branch`).
1994
1993
1995 If STARTREV is specified, only those heads that are descendants of
1994 If STARTREV is specified, only those heads that are descendants of
1996 STARTREV will be displayed.
1995 STARTREV will be displayed.
1997
1996
1998 If -t/--topo is specified, named branch mechanics will be ignored and only
1997 If -t/--topo is specified, named branch mechanics will be ignored and only
1999 changesets without children will be shown.
1998 changesets without children will be shown.
2000
1999
2001 Returns 0 if matching heads are found, 1 if not.
2000 Returns 0 if matching heads are found, 1 if not.
2002 """
2001 """
2003
2002
2004 start = None
2003 start = None
2005 if 'rev' in opts:
2004 if 'rev' in opts:
2006 start = cmdutil.revsingle(repo, opts['rev'], None).node()
2005 start = cmdutil.revsingle(repo, opts['rev'], None).node()
2007
2006
2008 if opts.get('topo'):
2007 if opts.get('topo'):
2009 heads = [repo[h] for h in repo.heads(start)]
2008 heads = [repo[h] for h in repo.heads(start)]
2010 else:
2009 else:
2011 heads = []
2010 heads = []
2012 for b, ls in repo.branchmap().iteritems():
2011 for b, ls in repo.branchmap().iteritems():
2013 if start is None:
2012 if start is None:
2014 heads += [repo[h] for h in ls]
2013 heads += [repo[h] for h in ls]
2015 continue
2014 continue
2016 startrev = repo.changelog.rev(start)
2015 startrev = repo.changelog.rev(start)
2017 descendants = set(repo.changelog.descendants(startrev))
2016 descendants = set(repo.changelog.descendants(startrev))
2018 descendants.add(startrev)
2017 descendants.add(startrev)
2019 rev = repo.changelog.rev
2018 rev = repo.changelog.rev
2020 heads += [repo[h] for h in ls if rev(h) in descendants]
2019 heads += [repo[h] for h in ls if rev(h) in descendants]
2021
2020
2022 if branchrevs:
2021 if branchrevs:
2023 branches = set(repo[br].branch() for br in branchrevs)
2022 branches = set(repo[br].branch() for br in branchrevs)
2024 heads = [h for h in heads if h.branch() in branches]
2023 heads = [h for h in heads if h.branch() in branches]
2025
2024
2026 if not opts.get('closed'):
2025 if not opts.get('closed'):
2027 heads = [h for h in heads if not h.extra().get('close')]
2026 heads = [h for h in heads if not h.extra().get('close')]
2028
2027
2029 if opts.get('active') and branchrevs:
2028 if opts.get('active') and branchrevs:
2030 dagheads = repo.heads(start)
2029 dagheads = repo.heads(start)
2031 heads = [h for h in heads if h.node() in dagheads]
2030 heads = [h for h in heads if h.node() in dagheads]
2032
2031
2033 if branchrevs:
2032 if branchrevs:
2034 haveheads = set(h.branch() for h in heads)
2033 haveheads = set(h.branch() for h in heads)
2035 if branches - haveheads:
2034 if branches - haveheads:
2036 headless = ', '.join(b for b in branches - haveheads)
2035 headless = ', '.join(b for b in branches - haveheads)
2037 msg = _('no open branch heads found on branches %s')
2036 msg = _('no open branch heads found on branches %s')
2038 if opts.get('rev'):
2037 if opts.get('rev'):
2039 msg += _(' (started at %s)' % opts['rev'])
2038 msg += _(' (started at %s)' % opts['rev'])
2040 ui.warn((msg + '\n') % headless)
2039 ui.warn((msg + '\n') % headless)
2041
2040
2042 if not heads:
2041 if not heads:
2043 return 1
2042 return 1
2044
2043
2045 heads = sorted(heads, key=lambda x: -x.rev())
2044 heads = sorted(heads, key=lambda x: -x.rev())
2046 displayer = cmdutil.show_changeset(ui, repo, opts)
2045 displayer = cmdutil.show_changeset(ui, repo, opts)
2047 for ctx in heads:
2046 for ctx in heads:
2048 displayer.show(ctx)
2047 displayer.show(ctx)
2049 displayer.close()
2048 displayer.close()
2050
2049
2051 def help_(ui, name=None, with_version=False, unknowncmd=False, full=True):
2050 def help_(ui, name=None, with_version=False, unknowncmd=False, full=True):
2052 """show help for a given topic or a help overview
2051 """show help for a given topic or a help overview
2053
2052
2054 With no arguments, print a list of commands with short help messages.
2053 With no arguments, print a list of commands with short help messages.
2055
2054
2056 Given a topic, extension, or command name, print help for that
2055 Given a topic, extension, or command name, print help for that
2057 topic.
2056 topic.
2058
2057
2059 Returns 0 if successful.
2058 Returns 0 if successful.
2060 """
2059 """
2061 option_lists = []
2060 option_lists = []
2062 textwidth = min(ui.termwidth(), 80) - 2
2061 textwidth = min(ui.termwidth(), 80) - 2
2063
2062
2064 def addglobalopts(aliases):
2063 def addglobalopts(aliases):
2065 if ui.verbose:
2064 if ui.verbose:
2066 option_lists.append((_("global options:"), globalopts))
2065 option_lists.append((_("global options:"), globalopts))
2067 if name == 'shortlist':
2066 if name == 'shortlist':
2068 option_lists.append((_('use "hg help" for the full list '
2067 option_lists.append((_('use "hg help" for the full list '
2069 'of commands'), ()))
2068 'of commands'), ()))
2070 else:
2069 else:
2071 if name == 'shortlist':
2070 if name == 'shortlist':
2072 msg = _('use "hg help" for the full list of commands '
2071 msg = _('use "hg help" for the full list of commands '
2073 'or "hg -v" for details')
2072 'or "hg -v" for details')
2074 elif name and not full:
2073 elif name and not full:
2075 msg = _('use "hg help %s" to show the full help text' % name)
2074 msg = _('use "hg help %s" to show the full help text' % name)
2076 elif aliases:
2075 elif aliases:
2077 msg = _('use "hg -v help%s" to show builtin aliases and '
2076 msg = _('use "hg -v help%s" to show builtin aliases and '
2078 'global options') % (name and " " + name or "")
2077 'global options') % (name and " " + name or "")
2079 else:
2078 else:
2080 msg = _('use "hg -v help %s" to show global options') % name
2079 msg = _('use "hg -v help %s" to show global options') % name
2081 option_lists.append((msg, ()))
2080 option_lists.append((msg, ()))
2082
2081
2083 def helpcmd(name):
2082 def helpcmd(name):
2084 if with_version:
2083 if with_version:
2085 version_(ui)
2084 version_(ui)
2086 ui.write('\n')
2085 ui.write('\n')
2087
2086
2088 try:
2087 try:
2089 aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd)
2088 aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd)
2090 except error.AmbiguousCommand, inst:
2089 except error.AmbiguousCommand, inst:
2091 # py3k fix: except vars can't be used outside the scope of the
2090 # py3k fix: except vars can't be used outside the scope of the
2092 # except block, nor can be used inside a lambda. python issue4617
2091 # except block, nor can be used inside a lambda. python issue4617
2093 prefix = inst.args[0]
2092 prefix = inst.args[0]
2094 select = lambda c: c.lstrip('^').startswith(prefix)
2093 select = lambda c: c.lstrip('^').startswith(prefix)
2095 helplist(_('list of commands:\n\n'), select)
2094 helplist(_('list of commands:\n\n'), select)
2096 return
2095 return
2097
2096
2098 # check if it's an invalid alias and display its error if it is
2097 # check if it's an invalid alias and display its error if it is
2099 if getattr(entry[0], 'badalias', False):
2098 if getattr(entry[0], 'badalias', False):
2100 if not unknowncmd:
2099 if not unknowncmd:
2101 entry[0](ui)
2100 entry[0](ui)
2102 return
2101 return
2103
2102
2104 # synopsis
2103 # synopsis
2105 if len(entry) > 2:
2104 if len(entry) > 2:
2106 if entry[2].startswith('hg'):
2105 if entry[2].startswith('hg'):
2107 ui.write("%s\n" % entry[2])
2106 ui.write("%s\n" % entry[2])
2108 else:
2107 else:
2109 ui.write('hg %s %s\n' % (aliases[0], entry[2]))
2108 ui.write('hg %s %s\n' % (aliases[0], entry[2]))
2110 else:
2109 else:
2111 ui.write('hg %s\n' % aliases[0])
2110 ui.write('hg %s\n' % aliases[0])
2112
2111
2113 # aliases
2112 # aliases
2114 if full and not ui.quiet and len(aliases) > 1:
2113 if full and not ui.quiet and len(aliases) > 1:
2115 ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))
2114 ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))
2116
2115
2117 # description
2116 # description
2118 doc = gettext(entry[0].__doc__)
2117 doc = gettext(entry[0].__doc__)
2119 if not doc:
2118 if not doc:
2120 doc = _("(no help text available)")
2119 doc = _("(no help text available)")
2121 if hasattr(entry[0], 'definition'): # aliased command
2120 if hasattr(entry[0], 'definition'): # aliased command
2122 if entry[0].definition.startswith('!'): # shell alias
2121 if entry[0].definition.startswith('!'): # shell alias
2123 doc = _('shell alias for::\n\n %s') % entry[0].definition[1:]
2122 doc = _('shell alias for::\n\n %s') % entry[0].definition[1:]
2124 else:
2123 else:
2125 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
2124 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
2126 if ui.quiet or not full:
2125 if ui.quiet or not full:
2127 doc = doc.splitlines()[0]
2126 doc = doc.splitlines()[0]
2128 keep = ui.verbose and ['verbose'] or []
2127 keep = ui.verbose and ['verbose'] or []
2129 formatted, pruned = minirst.format(doc, textwidth, keep=keep)
2128 formatted, pruned = minirst.format(doc, textwidth, keep=keep)
2130 ui.write("\n%s\n" % formatted)
2129 ui.write("\n%s\n" % formatted)
2131 if pruned:
2130 if pruned:
2132 ui.write(_('\nuse "hg -v help %s" to show verbose help\n') % name)
2131 ui.write(_('\nuse "hg -v help %s" to show verbose help\n') % name)
2133
2132
2134 if not ui.quiet:
2133 if not ui.quiet:
2135 # options
2134 # options
2136 if entry[1]:
2135 if entry[1]:
2137 option_lists.append((_("options:\n"), entry[1]))
2136 option_lists.append((_("options:\n"), entry[1]))
2138
2137
2139 addglobalopts(False)
2138 addglobalopts(False)
2140
2139
2141 def helplist(header, select=None):
2140 def helplist(header, select=None):
2142 h = {}
2141 h = {}
2143 cmds = {}
2142 cmds = {}
2144 for c, e in table.iteritems():
2143 for c, e in table.iteritems():
2145 f = c.split("|", 1)[0]
2144 f = c.split("|", 1)[0]
2146 if select and not select(f):
2145 if select and not select(f):
2147 continue
2146 continue
2148 if (not select and name != 'shortlist' and
2147 if (not select and name != 'shortlist' and
2149 e[0].__module__ != __name__):
2148 e[0].__module__ != __name__):
2150 continue
2149 continue
2151 if name == "shortlist" and not f.startswith("^"):
2150 if name == "shortlist" and not f.startswith("^"):
2152 continue
2151 continue
2153 f = f.lstrip("^")
2152 f = f.lstrip("^")
2154 if not ui.debugflag and f.startswith("debug"):
2153 if not ui.debugflag and f.startswith("debug"):
2155 continue
2154 continue
2156 doc = e[0].__doc__
2155 doc = e[0].__doc__
2157 if doc and 'DEPRECATED' in doc and not ui.verbose:
2156 if doc and 'DEPRECATED' in doc and not ui.verbose:
2158 continue
2157 continue
2159 doc = gettext(doc)
2158 doc = gettext(doc)
2160 if not doc:
2159 if not doc:
2161 doc = _("(no help text available)")
2160 doc = _("(no help text available)")
2162 h[f] = doc.splitlines()[0].rstrip()
2161 h[f] = doc.splitlines()[0].rstrip()
2163 cmds[f] = c.lstrip("^")
2162 cmds[f] = c.lstrip("^")
2164
2163
2165 if not h:
2164 if not h:
2166 ui.status(_('no commands defined\n'))
2165 ui.status(_('no commands defined\n'))
2167 return
2166 return
2168
2167
2169 ui.status(header)
2168 ui.status(header)
2170 fns = sorted(h)
2169 fns = sorted(h)
2171 m = max(map(len, fns))
2170 m = max(map(len, fns))
2172 for f in fns:
2171 for f in fns:
2173 if ui.verbose:
2172 if ui.verbose:
2174 commands = cmds[f].replace("|",", ")
2173 commands = cmds[f].replace("|",", ")
2175 ui.write(" %s:\n %s\n"%(commands, h[f]))
2174 ui.write(" %s:\n %s\n"%(commands, h[f]))
2176 else:
2175 else:
2177 ui.write('%s\n' % (util.wrap(h[f], textwidth,
2176 ui.write('%s\n' % (util.wrap(h[f], textwidth,
2178 initindent=' %-*s ' % (m, f),
2177 initindent=' %-*s ' % (m, f),
2179 hangindent=' ' * (m + 4))))
2178 hangindent=' ' * (m + 4))))
2180
2179
2181 if not ui.quiet:
2180 if not ui.quiet:
2182 addglobalopts(True)
2181 addglobalopts(True)
2183
2182
2184 def helptopic(name):
2183 def helptopic(name):
2185 for names, header, doc in help.helptable:
2184 for names, header, doc in help.helptable:
2186 if name in names:
2185 if name in names:
2187 break
2186 break
2188 else:
2187 else:
2189 raise error.UnknownCommand(name)
2188 raise error.UnknownCommand(name)
2190
2189
2191 # description
2190 # description
2192 if not doc:
2191 if not doc:
2193 doc = _("(no help text available)")
2192 doc = _("(no help text available)")
2194 if hasattr(doc, '__call__'):
2193 if hasattr(doc, '__call__'):
2195 doc = doc()
2194 doc = doc()
2196
2195
2197 ui.write("%s\n\n" % header)
2196 ui.write("%s\n\n" % header)
2198 ui.write("%s\n" % minirst.format(doc, textwidth, indent=4))
2197 ui.write("%s\n" % minirst.format(doc, textwidth, indent=4))
2199
2198
2200 def helpext(name):
2199 def helpext(name):
2201 try:
2200 try:
2202 mod = extensions.find(name)
2201 mod = extensions.find(name)
2203 doc = gettext(mod.__doc__) or _('no help text available')
2202 doc = gettext(mod.__doc__) or _('no help text available')
2204 except KeyError:
2203 except KeyError:
2205 mod = None
2204 mod = None
2206 doc = extensions.disabledext(name)
2205 doc = extensions.disabledext(name)
2207 if not doc:
2206 if not doc:
2208 raise error.UnknownCommand(name)
2207 raise error.UnknownCommand(name)
2209
2208
2210 if '\n' not in doc:
2209 if '\n' not in doc:
2211 head, tail = doc, ""
2210 head, tail = doc, ""
2212 else:
2211 else:
2213 head, tail = doc.split('\n', 1)
2212 head, tail = doc.split('\n', 1)
2214 ui.write(_('%s extension - %s\n\n') % (name.split('.')[-1], head))
2213 ui.write(_('%s extension - %s\n\n') % (name.split('.')[-1], head))
2215 if tail:
2214 if tail:
2216 ui.write(minirst.format(tail, textwidth))
2215 ui.write(minirst.format(tail, textwidth))
2217 ui.status('\n\n')
2216 ui.status('\n\n')
2218
2217
2219 if mod:
2218 if mod:
2220 try:
2219 try:
2221 ct = mod.cmdtable
2220 ct = mod.cmdtable
2222 except AttributeError:
2221 except AttributeError:
2223 ct = {}
2222 ct = {}
2224 modcmds = set([c.split('|', 1)[0] for c in ct])
2223 modcmds = set([c.split('|', 1)[0] for c in ct])
2225 helplist(_('list of commands:\n\n'), modcmds.__contains__)
2224 helplist(_('list of commands:\n\n'), modcmds.__contains__)
2226 else:
2225 else:
2227 ui.write(_('use "hg help extensions" for information on enabling '
2226 ui.write(_('use "hg help extensions" for information on enabling '
2228 'extensions\n'))
2227 'extensions\n'))
2229
2228
2230 def helpextcmd(name):
2229 def helpextcmd(name):
2231 cmd, ext, mod = extensions.disabledcmd(ui, name, ui.config('ui', 'strict'))
2230 cmd, ext, mod = extensions.disabledcmd(ui, name, ui.config('ui', 'strict'))
2232 doc = gettext(mod.__doc__).splitlines()[0]
2231 doc = gettext(mod.__doc__).splitlines()[0]
2233
2232
2234 msg = help.listexts(_("'%s' is provided by the following "
2233 msg = help.listexts(_("'%s' is provided by the following "
2235 "extension:") % cmd, {ext: doc}, len(ext),
2234 "extension:") % cmd, {ext: doc}, len(ext),
2236 indent=4)
2235 indent=4)
2237 ui.write(minirst.format(msg, textwidth))
2236 ui.write(minirst.format(msg, textwidth))
2238 ui.write('\n\n')
2237 ui.write('\n\n')
2239 ui.write(_('use "hg help extensions" for information on enabling '
2238 ui.write(_('use "hg help extensions" for information on enabling '
2240 'extensions\n'))
2239 'extensions\n'))
2241
2240
2242 help.addtopichook('revsets', revset.makedoc)
2241 help.addtopichook('revsets', revset.makedoc)
2243 help.addtopichook('templates', templatekw.makedoc)
2242 help.addtopichook('templates', templatekw.makedoc)
2244 help.addtopichook('templates', templatefilters.makedoc)
2243 help.addtopichook('templates', templatefilters.makedoc)
2245
2244
2246 if name and name != 'shortlist':
2245 if name and name != 'shortlist':
2247 i = None
2246 i = None
2248 if unknowncmd:
2247 if unknowncmd:
2249 queries = (helpextcmd,)
2248 queries = (helpextcmd,)
2250 else:
2249 else:
2251 queries = (helptopic, helpcmd, helpext, helpextcmd)
2250 queries = (helptopic, helpcmd, helpext, helpextcmd)
2252 for f in queries:
2251 for f in queries:
2253 try:
2252 try:
2254 f(name)
2253 f(name)
2255 i = None
2254 i = None
2256 break
2255 break
2257 except error.UnknownCommand, inst:
2256 except error.UnknownCommand, inst:
2258 i = inst
2257 i = inst
2259 if i:
2258 if i:
2260 raise i
2259 raise i
2261
2260
2262 else:
2261 else:
2263 # program name
2262 # program name
2264 if ui.verbose or with_version:
2263 if ui.verbose or with_version:
2265 version_(ui)
2264 version_(ui)
2266 else:
2265 else:
2267 ui.status(_("Mercurial Distributed SCM\n"))
2266 ui.status(_("Mercurial Distributed SCM\n"))
2268 ui.status('\n')
2267 ui.status('\n')
2269
2268
2270 # list of commands
2269 # list of commands
2271 if name == "shortlist":
2270 if name == "shortlist":
2272 header = _('basic commands:\n\n')
2271 header = _('basic commands:\n\n')
2273 else:
2272 else:
2274 header = _('list of commands:\n\n')
2273 header = _('list of commands:\n\n')
2275
2274
2276 helplist(header)
2275 helplist(header)
2277 if name != 'shortlist':
2276 if name != 'shortlist':
2278 exts, maxlength = extensions.enabled()
2277 exts, maxlength = extensions.enabled()
2279 text = help.listexts(_('enabled extensions:'), exts, maxlength)
2278 text = help.listexts(_('enabled extensions:'), exts, maxlength)
2280 if text:
2279 if text:
2281 ui.write("\n%s\n" % minirst.format(text, textwidth))
2280 ui.write("\n%s\n" % minirst.format(text, textwidth))
2282
2281
2283 # list all option lists
2282 # list all option lists
2284 opt_output = []
2283 opt_output = []
2285 multioccur = False
2284 multioccur = False
2286 for title, options in option_lists:
2285 for title, options in option_lists:
2287 opt_output.append(("\n%s" % title, None))
2286 opt_output.append(("\n%s" % title, None))
2288 for option in options:
2287 for option in options:
2289 if len(option) == 5:
2288 if len(option) == 5:
2290 shortopt, longopt, default, desc, optlabel = option
2289 shortopt, longopt, default, desc, optlabel = option
2291 else:
2290 else:
2292 shortopt, longopt, default, desc = option
2291 shortopt, longopt, default, desc = option
2293 optlabel = _("VALUE") # default label
2292 optlabel = _("VALUE") # default label
2294
2293
2295 if _("DEPRECATED") in desc and not ui.verbose:
2294 if _("DEPRECATED") in desc and not ui.verbose:
2296 continue
2295 continue
2297 if isinstance(default, list):
2296 if isinstance(default, list):
2298 numqualifier = " %s [+]" % optlabel
2297 numqualifier = " %s [+]" % optlabel
2299 multioccur = True
2298 multioccur = True
2300 elif (default is not None) and not isinstance(default, bool):
2299 elif (default is not None) and not isinstance(default, bool):
2301 numqualifier = " %s" % optlabel
2300 numqualifier = " %s" % optlabel
2302 else:
2301 else:
2303 numqualifier = ""
2302 numqualifier = ""
2304 opt_output.append(("%2s%s" %
2303 opt_output.append(("%2s%s" %
2305 (shortopt and "-%s" % shortopt,
2304 (shortopt and "-%s" % shortopt,
2306 longopt and " --%s%s" %
2305 longopt and " --%s%s" %
2307 (longopt, numqualifier)),
2306 (longopt, numqualifier)),
2308 "%s%s" % (desc,
2307 "%s%s" % (desc,
2309 default
2308 default
2310 and _(" (default: %s)") % default
2309 and _(" (default: %s)") % default
2311 or "")))
2310 or "")))
2312 if multioccur:
2311 if multioccur:
2313 msg = _("\n[+] marked option can be specified multiple times")
2312 msg = _("\n[+] marked option can be specified multiple times")
2314 if ui.verbose and name != 'shortlist':
2313 if ui.verbose and name != 'shortlist':
2315 opt_output.append((msg, None))
2314 opt_output.append((msg, None))
2316 else:
2315 else:
2317 opt_output.insert(-1, (msg, None))
2316 opt_output.insert(-1, (msg, None))
2318
2317
2319 if not name:
2318 if not name:
2320 ui.write(_("\nadditional help topics:\n\n"))
2319 ui.write(_("\nadditional help topics:\n\n"))
2321 topics = []
2320 topics = []
2322 for names, header, doc in help.helptable:
2321 for names, header, doc in help.helptable:
2323 topics.append((sorted(names, key=len, reverse=True)[0], header))
2322 topics.append((sorted(names, key=len, reverse=True)[0], header))
2324 topics_len = max([len(s[0]) for s in topics])
2323 topics_len = max([len(s[0]) for s in topics])
2325 for t, desc in topics:
2324 for t, desc in topics:
2326 ui.write(" %-*s %s\n" % (topics_len, t, desc))
2325 ui.write(" %-*s %s\n" % (topics_len, t, desc))
2327
2326
2328 if opt_output:
2327 if opt_output:
2329 colwidth = encoding.colwidth
2328 colwidth = encoding.colwidth
2330 # normalize: (opt or message, desc or None, width of opt)
2329 # normalize: (opt or message, desc or None, width of opt)
2331 entries = [desc and (opt, desc, colwidth(opt)) or (opt, None, 0)
2330 entries = [desc and (opt, desc, colwidth(opt)) or (opt, None, 0)
2332 for opt, desc in opt_output]
2331 for opt, desc in opt_output]
2333 hanging = max([e[2] for e in entries])
2332 hanging = max([e[2] for e in entries])
2334 for opt, desc, width in entries:
2333 for opt, desc, width in entries:
2335 if desc:
2334 if desc:
2336 initindent = ' %s%s ' % (opt, ' ' * (hanging - width))
2335 initindent = ' %s%s ' % (opt, ' ' * (hanging - width))
2337 hangindent = ' ' * (hanging + 3)
2336 hangindent = ' ' * (hanging + 3)
2338 ui.write('%s\n' % (util.wrap(desc, textwidth,
2337 ui.write('%s\n' % (util.wrap(desc, textwidth,
2339 initindent=initindent,
2338 initindent=initindent,
2340 hangindent=hangindent)))
2339 hangindent=hangindent)))
2341 else:
2340 else:
2342 ui.write("%s\n" % opt)
2341 ui.write("%s\n" % opt)
2343
2342
2344 def identify(ui, repo, source=None, rev=None,
2343 def identify(ui, repo, source=None, rev=None,
2345 num=None, id=None, branch=None, tags=None, bookmarks=None):
2344 num=None, id=None, branch=None, tags=None, bookmarks=None):
2346 """identify the working copy or specified revision
2345 """identify the working copy or specified revision
2347
2346
2348 Print a summary identifying the repository state at REV using one or
2347 Print a summary identifying the repository state at REV using one or
2349 two parent hash identifiers, followed by a "+" if the working
2348 two parent hash identifiers, followed by a "+" if the working
2350 directory has uncommitted changes, the branch name (if not default),
2349 directory has uncommitted changes, the branch name (if not default),
2351 a list of tags, and a list of bookmarks.
2350 a list of tags, and a list of bookmarks.
2352
2351
2353 When REV is not given, print a summary of the current state of the
2352 When REV is not given, print a summary of the current state of the
2354 repository.
2353 repository.
2355
2354
2356 Specifying a path to a repository root or Mercurial bundle will
2355 Specifying a path to a repository root or Mercurial bundle will
2357 cause lookup to operate on that repository/bundle.
2356 cause lookup to operate on that repository/bundle.
2358
2357
2359 Returns 0 if successful.
2358 Returns 0 if successful.
2360 """
2359 """
2361
2360
2362 if not repo and not source:
2361 if not repo and not source:
2363 raise util.Abort(_("there is no Mercurial repository here "
2362 raise util.Abort(_("there is no Mercurial repository here "
2364 "(.hg not found)"))
2363 "(.hg not found)"))
2365
2364
2366 hexfunc = ui.debugflag and hex or short
2365 hexfunc = ui.debugflag and hex or short
2367 default = not (num or id or branch or tags or bookmarks)
2366 default = not (num or id or branch or tags or bookmarks)
2368 output = []
2367 output = []
2369 revs = []
2368 revs = []
2370
2369
2371 if source:
2370 if source:
2372 source, branches = hg.parseurl(ui.expandpath(source))
2371 source, branches = hg.parseurl(ui.expandpath(source))
2373 repo = hg.repository(ui, source)
2372 repo = hg.repository(ui, source)
2374 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
2373 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
2375
2374
2376 if not repo.local():
2375 if not repo.local():
2377 if num or branch or tags:
2376 if num or branch or tags:
2378 raise util.Abort(
2377 raise util.Abort(
2379 _("can't query remote revision number, branch, or tags"))
2378 _("can't query remote revision number, branch, or tags"))
2380 if not rev and revs:
2379 if not rev and revs:
2381 rev = revs[0]
2380 rev = revs[0]
2382 if not rev:
2381 if not rev:
2383 rev = "tip"
2382 rev = "tip"
2384
2383
2385 remoterev = repo.lookup(rev)
2384 remoterev = repo.lookup(rev)
2386 if default or id:
2385 if default or id:
2387 output = [hexfunc(remoterev)]
2386 output = [hexfunc(remoterev)]
2388
2387
2389 def getbms():
2388 def getbms():
2390 bms = []
2389 bms = []
2391
2390
2392 if 'bookmarks' in repo.listkeys('namespaces'):
2391 if 'bookmarks' in repo.listkeys('namespaces'):
2393 hexremoterev = hex(remoterev)
2392 hexremoterev = hex(remoterev)
2394 bms = [bm for bm, bmr in repo.listkeys('bookmarks').iteritems()
2393 bms = [bm for bm, bmr in repo.listkeys('bookmarks').iteritems()
2395 if bmr == hexremoterev]
2394 if bmr == hexremoterev]
2396
2395
2397 return bms
2396 return bms
2398
2397
2399 if bookmarks:
2398 if bookmarks:
2400 output.extend(getbms())
2399 output.extend(getbms())
2401 elif default and not ui.quiet:
2400 elif default and not ui.quiet:
2402 # multiple bookmarks for a single parent separated by '/'
2401 # multiple bookmarks for a single parent separated by '/'
2403 bm = '/'.join(getbms())
2402 bm = '/'.join(getbms())
2404 if bm:
2403 if bm:
2405 output.append(bm)
2404 output.append(bm)
2406 else:
2405 else:
2407 if not rev:
2406 if not rev:
2408 ctx = repo[None]
2407 ctx = repo[None]
2409 parents = ctx.parents()
2408 parents = ctx.parents()
2410 changed = ""
2409 changed = ""
2411 if default or id or num:
2410 if default or id or num:
2412 changed = util.any(repo.status()) and "+" or ""
2411 changed = util.any(repo.status()) and "+" or ""
2413 if default or id:
2412 if default or id:
2414 output = ["%s%s" %
2413 output = ["%s%s" %
2415 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
2414 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
2416 if num:
2415 if num:
2417 output.append("%s%s" %
2416 output.append("%s%s" %
2418 ('+'.join([str(p.rev()) for p in parents]), changed))
2417 ('+'.join([str(p.rev()) for p in parents]), changed))
2419 else:
2418 else:
2420 ctx = cmdutil.revsingle(repo, rev)
2419 ctx = cmdutil.revsingle(repo, rev)
2421 if default or id:
2420 if default or id:
2422 output = [hexfunc(ctx.node())]
2421 output = [hexfunc(ctx.node())]
2423 if num:
2422 if num:
2424 output.append(str(ctx.rev()))
2423 output.append(str(ctx.rev()))
2425
2424
2426 if default and not ui.quiet:
2425 if default and not ui.quiet:
2427 b = ctx.branch()
2426 b = ctx.branch()
2428 if b != 'default':
2427 if b != 'default':
2429 output.append("(%s)" % b)
2428 output.append("(%s)" % b)
2430
2429
2431 # multiple tags for a single parent separated by '/'
2430 # multiple tags for a single parent separated by '/'
2432 t = '/'.join(ctx.tags())
2431 t = '/'.join(ctx.tags())
2433 if t:
2432 if t:
2434 output.append(t)
2433 output.append(t)
2435
2434
2436 # multiple bookmarks for a single parent separated by '/'
2435 # multiple bookmarks for a single parent separated by '/'
2437 bm = '/'.join(ctx.bookmarks())
2436 bm = '/'.join(ctx.bookmarks())
2438 if bm:
2437 if bm:
2439 output.append(bm)
2438 output.append(bm)
2440 else:
2439 else:
2441 if branch:
2440 if branch:
2442 output.append(ctx.branch())
2441 output.append(ctx.branch())
2443
2442
2444 if tags:
2443 if tags:
2445 output.extend(ctx.tags())
2444 output.extend(ctx.tags())
2446
2445
2447 if bookmarks:
2446 if bookmarks:
2448 output.extend(ctx.bookmarks())
2447 output.extend(ctx.bookmarks())
2449
2448
2450 ui.write("%s\n" % ' '.join(output))
2449 ui.write("%s\n" % ' '.join(output))
2451
2450
2452 def import_(ui, repo, patch1, *patches, **opts):
2451 def import_(ui, repo, patch1, *patches, **opts):
2453 """import an ordered set of patches
2452 """import an ordered set of patches
2454
2453
2455 Import a list of patches and commit them individually (unless
2454 Import a list of patches and commit them individually (unless
2456 --no-commit is specified).
2455 --no-commit is specified).
2457
2456
2458 If there are outstanding changes in the working directory, import
2457 If there are outstanding changes in the working directory, import
2459 will abort unless given the -f/--force flag.
2458 will abort unless given the -f/--force flag.
2460
2459
2461 You can import a patch straight from a mail message. Even patches
2460 You can import a patch straight from a mail message. Even patches
2462 as attachments work (to use the body part, it must have type
2461 as attachments work (to use the body part, it must have type
2463 text/plain or text/x-patch). From and Subject headers of email
2462 text/plain or text/x-patch). From and Subject headers of email
2464 message are used as default committer and commit message. All
2463 message are used as default committer and commit message. All
2465 text/plain body parts before first diff are added to commit
2464 text/plain body parts before first diff are added to commit
2466 message.
2465 message.
2467
2466
2468 If the imported patch was generated by :hg:`export`, user and
2467 If the imported patch was generated by :hg:`export`, user and
2469 description from patch override values from message headers and
2468 description from patch override values from message headers and
2470 body. Values given on command line with -m/--message and -u/--user
2469 body. Values given on command line with -m/--message and -u/--user
2471 override these.
2470 override these.
2472
2471
2473 If --exact is specified, import will set the working directory to
2472 If --exact is specified, import will set the working directory to
2474 the parent of each patch before applying it, and will abort if the
2473 the parent of each patch before applying it, and will abort if the
2475 resulting changeset has a different ID than the one recorded in
2474 resulting changeset has a different ID than the one recorded in
2476 the patch. This may happen due to character set problems or other
2475 the patch. This may happen due to character set problems or other
2477 deficiencies in the text patch format.
2476 deficiencies in the text patch format.
2478
2477
2479 With -s/--similarity, hg will attempt to discover renames and
2478 With -s/--similarity, hg will attempt to discover renames and
2480 copies in the patch in the same way as 'addremove'.
2479 copies in the patch in the same way as 'addremove'.
2481
2480
2482 To read a patch from standard input, use "-" as the patch name. If
2481 To read a patch from standard input, use "-" as the patch name. If
2483 a URL is specified, the patch will be downloaded from it.
2482 a URL is specified, the patch will be downloaded from it.
2484 See :hg:`help dates` for a list of formats valid for -d/--date.
2483 See :hg:`help dates` for a list of formats valid for -d/--date.
2485
2484
2486 Returns 0 on success.
2485 Returns 0 on success.
2487 """
2486 """
2488 patches = (patch1,) + patches
2487 patches = (patch1,) + patches
2489
2488
2490 date = opts.get('date')
2489 date = opts.get('date')
2491 if date:
2490 if date:
2492 opts['date'] = util.parsedate(date)
2491 opts['date'] = util.parsedate(date)
2493
2492
2494 try:
2493 try:
2495 sim = float(opts.get('similarity') or 0)
2494 sim = float(opts.get('similarity') or 0)
2496 except ValueError:
2495 except ValueError:
2497 raise util.Abort(_('similarity must be a number'))
2496 raise util.Abort(_('similarity must be a number'))
2498 if sim < 0 or sim > 100:
2497 if sim < 0 or sim > 100:
2499 raise util.Abort(_('similarity must be between 0 and 100'))
2498 raise util.Abort(_('similarity must be between 0 and 100'))
2500
2499
2501 if opts.get('exact') or not opts.get('force'):
2500 if opts.get('exact') or not opts.get('force'):
2502 cmdutil.bail_if_changed(repo)
2501 cmdutil.bail_if_changed(repo)
2503
2502
2504 d = opts["base"]
2503 d = opts["base"]
2505 strip = opts["strip"]
2504 strip = opts["strip"]
2506 wlock = lock = None
2505 wlock = lock = None
2507 msgs = []
2506 msgs = []
2508
2507
2509 def tryone(ui, hunk):
2508 def tryone(ui, hunk):
2510 tmpname, message, user, date, branch, nodeid, p1, p2 = \
2509 tmpname, message, user, date, branch, nodeid, p1, p2 = \
2511 patch.extract(ui, hunk)
2510 patch.extract(ui, hunk)
2512
2511
2513 if not tmpname:
2512 if not tmpname:
2514 return None
2513 return None
2515 commitid = _('to working directory')
2514 commitid = _('to working directory')
2516
2515
2517 try:
2516 try:
2518 cmdline_message = cmdutil.logmessage(opts)
2517 cmdline_message = cmdutil.logmessage(opts)
2519 if cmdline_message:
2518 if cmdline_message:
2520 # pickup the cmdline msg
2519 # pickup the cmdline msg
2521 message = cmdline_message
2520 message = cmdline_message
2522 elif message:
2521 elif message:
2523 # pickup the patch msg
2522 # pickup the patch msg
2524 message = message.strip()
2523 message = message.strip()
2525 else:
2524 else:
2526 # launch the editor
2525 # launch the editor
2527 message = None
2526 message = None
2528 ui.debug('message:\n%s\n' % message)
2527 ui.debug('message:\n%s\n' % message)
2529
2528
2530 wp = repo.parents()
2529 wp = repo.parents()
2531 if opts.get('exact'):
2530 if opts.get('exact'):
2532 if not nodeid or not p1:
2531 if not nodeid or not p1:
2533 raise util.Abort(_('not a Mercurial patch'))
2532 raise util.Abort(_('not a Mercurial patch'))
2534 p1 = repo.lookup(p1)
2533 p1 = repo.lookup(p1)
2535 p2 = repo.lookup(p2 or hex(nullid))
2534 p2 = repo.lookup(p2 or hex(nullid))
2536
2535
2537 if p1 != wp[0].node():
2536 if p1 != wp[0].node():
2538 hg.clean(repo, p1)
2537 hg.clean(repo, p1)
2539 repo.dirstate.setparents(p1, p2)
2538 repo.dirstate.setparents(p1, p2)
2540 elif p2:
2539 elif p2:
2541 try:
2540 try:
2542 p1 = repo.lookup(p1)
2541 p1 = repo.lookup(p1)
2543 p2 = repo.lookup(p2)
2542 p2 = repo.lookup(p2)
2544 if p1 == wp[0].node():
2543 if p1 == wp[0].node():
2545 repo.dirstate.setparents(p1, p2)
2544 repo.dirstate.setparents(p1, p2)
2546 except error.RepoError:
2545 except error.RepoError:
2547 pass
2546 pass
2548 if opts.get('exact') or opts.get('import_branch'):
2547 if opts.get('exact') or opts.get('import_branch'):
2549 repo.dirstate.setbranch(branch or 'default')
2548 repo.dirstate.setbranch(branch or 'default')
2550
2549
2551 files = {}
2550 files = {}
2552 try:
2551 try:
2553 patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
2552 patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
2554 files=files, eolmode=None)
2553 files=files, eolmode=None)
2555 finally:
2554 finally:
2556 files = cmdutil.updatedir(ui, repo, files,
2555 files = cmdutil.updatedir(ui, repo, files,
2557 similarity=sim / 100.0)
2556 similarity=sim / 100.0)
2558 if opts.get('no_commit'):
2557 if opts.get('no_commit'):
2559 if message:
2558 if message:
2560 msgs.append(message)
2559 msgs.append(message)
2561 else:
2560 else:
2562 if opts.get('exact'):
2561 if opts.get('exact'):
2563 m = None
2562 m = None
2564 else:
2563 else:
2565 m = cmdutil.matchfiles(repo, files or [])
2564 m = cmdutil.matchfiles(repo, files or [])
2566 n = repo.commit(message, opts.get('user') or user,
2565 n = repo.commit(message, opts.get('user') or user,
2567 opts.get('date') or date, match=m,
2566 opts.get('date') or date, match=m,
2568 editor=cmdutil.commiteditor)
2567 editor=cmdutil.commiteditor)
2569 if opts.get('exact'):
2568 if opts.get('exact'):
2570 if hex(n) != nodeid:
2569 if hex(n) != nodeid:
2571 repo.rollback()
2570 repo.rollback()
2572 raise util.Abort(_('patch is damaged'
2571 raise util.Abort(_('patch is damaged'
2573 ' or loses information'))
2572 ' or loses information'))
2574 # Force a dirstate write so that the next transaction
2573 # Force a dirstate write so that the next transaction
2575 # backups an up-do-date file.
2574 # backups an up-do-date file.
2576 repo.dirstate.write()
2575 repo.dirstate.write()
2577 if n:
2576 if n:
2578 commitid = short(n)
2577 commitid = short(n)
2579
2578
2580 return commitid
2579 return commitid
2581 finally:
2580 finally:
2582 os.unlink(tmpname)
2581 os.unlink(tmpname)
2583
2582
2584 try:
2583 try:
2585 wlock = repo.wlock()
2584 wlock = repo.wlock()
2586 lock = repo.lock()
2585 lock = repo.lock()
2587 lastcommit = None
2586 lastcommit = None
2588 for p in patches:
2587 for p in patches:
2589 pf = os.path.join(d, p)
2588 pf = os.path.join(d, p)
2590
2589
2591 if pf == '-':
2590 if pf == '-':
2592 ui.status(_("applying patch from stdin\n"))
2591 ui.status(_("applying patch from stdin\n"))
2593 pf = sys.stdin
2592 pf = sys.stdin
2594 else:
2593 else:
2595 ui.status(_("applying %s\n") % p)
2594 ui.status(_("applying %s\n") % p)
2596 pf = url.open(ui, pf)
2595 pf = url.open(ui, pf)
2597
2596
2598 haspatch = False
2597 haspatch = False
2599 for hunk in patch.split(pf):
2598 for hunk in patch.split(pf):
2600 commitid = tryone(ui, hunk)
2599 commitid = tryone(ui, hunk)
2601 if commitid:
2600 if commitid:
2602 haspatch = True
2601 haspatch = True
2603 if lastcommit:
2602 if lastcommit:
2604 ui.status(_('applied %s\n') % lastcommit)
2603 ui.status(_('applied %s\n') % lastcommit)
2605 lastcommit = commitid
2604 lastcommit = commitid
2606
2605
2607 if not haspatch:
2606 if not haspatch:
2608 raise util.Abort(_('no diffs found'))
2607 raise util.Abort(_('no diffs found'))
2609
2608
2610 if msgs:
2609 if msgs:
2611 repo.opener('last-message.txt', 'wb').write('\n* * *\n'.join(msgs))
2610 repo.opener('last-message.txt', 'wb').write('\n* * *\n'.join(msgs))
2612 finally:
2611 finally:
2613 release(lock, wlock)
2612 release(lock, wlock)
2614
2613
2615 def incoming(ui, repo, source="default", **opts):
2614 def incoming(ui, repo, source="default", **opts):
2616 """show new changesets found in source
2615 """show new changesets found in source
2617
2616
2618 Show new changesets found in the specified path/URL or the default
2617 Show new changesets found in the specified path/URL or the default
2619 pull location. These are the changesets that would have been pulled
2618 pull location. These are the changesets that would have been pulled
2620 if a pull at the time you issued this command.
2619 if a pull at the time you issued this command.
2621
2620
2622 For remote repository, using --bundle avoids downloading the
2621 For remote repository, using --bundle avoids downloading the
2623 changesets twice if the incoming is followed by a pull.
2622 changesets twice if the incoming is followed by a pull.
2624
2623
2625 See pull for valid source format details.
2624 See pull for valid source format details.
2626
2625
2627 Returns 0 if there are incoming changes, 1 otherwise.
2626 Returns 0 if there are incoming changes, 1 otherwise.
2628 """
2627 """
2629 if opts.get('bundle') and opts.get('subrepos'):
2628 if opts.get('bundle') and opts.get('subrepos'):
2630 raise util.Abort(_('cannot combine --bundle and --subrepos'))
2629 raise util.Abort(_('cannot combine --bundle and --subrepos'))
2631
2630
2632 if opts.get('bookmarks'):
2631 if opts.get('bookmarks'):
2633 source, branches = hg.parseurl(ui.expandpath(source),
2632 source, branches = hg.parseurl(ui.expandpath(source),
2634 opts.get('branch'))
2633 opts.get('branch'))
2635 other = hg.repository(hg.remoteui(repo, opts), source)
2634 other = hg.repository(hg.remoteui(repo, opts), source)
2636 if 'bookmarks' not in other.listkeys('namespaces'):
2635 if 'bookmarks' not in other.listkeys('namespaces'):
2637 ui.warn(_("remote doesn't support bookmarks\n"))
2636 ui.warn(_("remote doesn't support bookmarks\n"))
2638 return 0
2637 return 0
2639 ui.status(_('comparing with %s\n') % url.hidepassword(source))
2638 ui.status(_('comparing with %s\n') % url.hidepassword(source))
2640 return bookmarks.diff(ui, repo, other)
2639 return bookmarks.diff(ui, repo, other)
2641
2640
2642 ret = hg.incoming(ui, repo, source, opts)
2641 ret = hg.incoming(ui, repo, source, opts)
2643 return ret
2642 return ret
2644
2643
2645 def init(ui, dest=".", **opts):
2644 def init(ui, dest=".", **opts):
2646 """create a new repository in the given directory
2645 """create a new repository in the given directory
2647
2646
2648 Initialize a new repository in the given directory. If the given
2647 Initialize a new repository in the given directory. If the given
2649 directory does not exist, it will be created.
2648 directory does not exist, it will be created.
2650
2649
2651 If no directory is given, the current directory is used.
2650 If no directory is given, the current directory is used.
2652
2651
2653 It is possible to specify an ``ssh://`` URL as the destination.
2652 It is possible to specify an ``ssh://`` URL as the destination.
2654 See :hg:`help urls` for more information.
2653 See :hg:`help urls` for more information.
2655
2654
2656 Returns 0 on success.
2655 Returns 0 on success.
2657 """
2656 """
2658 hg.repository(hg.remoteui(ui, opts), ui.expandpath(dest), create=1)
2657 hg.repository(hg.remoteui(ui, opts), ui.expandpath(dest), create=1)
2659
2658
2660 def locate(ui, repo, *pats, **opts):
2659 def locate(ui, repo, *pats, **opts):
2661 """locate files matching specific patterns
2660 """locate files matching specific patterns
2662
2661
2663 Print files under Mercurial control in the working directory whose
2662 Print files under Mercurial control in the working directory whose
2664 names match the given patterns.
2663 names match the given patterns.
2665
2664
2666 By default, this command searches all directories in the working
2665 By default, this command searches all directories in the working
2667 directory. To search just the current directory and its
2666 directory. To search just the current directory and its
2668 subdirectories, use "--include .".
2667 subdirectories, use "--include .".
2669
2668
2670 If no patterns are given to match, this command prints the names
2669 If no patterns are given to match, this command prints the names
2671 of all files under Mercurial control in the working directory.
2670 of all files under Mercurial control in the working directory.
2672
2671
2673 If you want to feed the output of this command into the "xargs"
2672 If you want to feed the output of this command into the "xargs"
2674 command, use the -0 option to both this command and "xargs". This
2673 command, use the -0 option to both this command and "xargs". This
2675 will avoid the problem of "xargs" treating single filenames that
2674 will avoid the problem of "xargs" treating single filenames that
2676 contain whitespace as multiple filenames.
2675 contain whitespace as multiple filenames.
2677
2676
2678 Returns 0 if a match is found, 1 otherwise.
2677 Returns 0 if a match is found, 1 otherwise.
2679 """
2678 """
2680 end = opts.get('print0') and '\0' or '\n'
2679 end = opts.get('print0') and '\0' or '\n'
2681 rev = cmdutil.revsingle(repo, opts.get('rev'), None).node()
2680 rev = cmdutil.revsingle(repo, opts.get('rev'), None).node()
2682
2681
2683 ret = 1
2682 ret = 1
2684 m = cmdutil.match(repo, pats, opts, default='relglob')
2683 m = cmdutil.match(repo, pats, opts, default='relglob')
2685 m.bad = lambda x, y: False
2684 m.bad = lambda x, y: False
2686 for abs in repo[rev].walk(m):
2685 for abs in repo[rev].walk(m):
2687 if not rev and abs not in repo.dirstate:
2686 if not rev and abs not in repo.dirstate:
2688 continue
2687 continue
2689 if opts.get('fullpath'):
2688 if opts.get('fullpath'):
2690 ui.write(repo.wjoin(abs), end)
2689 ui.write(repo.wjoin(abs), end)
2691 else:
2690 else:
2692 ui.write(((pats and m.rel(abs)) or abs), end)
2691 ui.write(((pats and m.rel(abs)) or abs), end)
2693 ret = 0
2692 ret = 0
2694
2693
2695 return ret
2694 return ret
2696
2695
2697 def log(ui, repo, *pats, **opts):
2696 def log(ui, repo, *pats, **opts):
2698 """show revision history of entire repository or files
2697 """show revision history of entire repository or files
2699
2698
2700 Print the revision history of the specified files or the entire
2699 Print the revision history of the specified files or the entire
2701 project.
2700 project.
2702
2701
2703 File history is shown without following rename or copy history of
2702 File history is shown without following rename or copy history of
2704 files. Use -f/--follow with a filename to follow history across
2703 files. Use -f/--follow with a filename to follow history across
2705 renames and copies. --follow without a filename will only show
2704 renames and copies. --follow without a filename will only show
2706 ancestors or descendants of the starting revision. --follow-first
2705 ancestors or descendants of the starting revision. --follow-first
2707 only follows the first parent of merge revisions.
2706 only follows the first parent of merge revisions.
2708
2707
2709 If no revision range is specified, the default is ``tip:0`` unless
2708 If no revision range is specified, the default is ``tip:0`` unless
2710 --follow is set, in which case the working directory parent is
2709 --follow is set, in which case the working directory parent is
2711 used as the starting revision. You can specify a revision set for
2710 used as the starting revision. You can specify a revision set for
2712 log, see :hg:`help revsets` for more information.
2711 log, see :hg:`help revsets` for more information.
2713
2712
2714 See :hg:`help dates` for a list of formats valid for -d/--date.
2713 See :hg:`help dates` for a list of formats valid for -d/--date.
2715
2714
2716 By default this command prints revision number and changeset id,
2715 By default this command prints revision number and changeset id,
2717 tags, non-trivial parents, user, date and time, and a summary for
2716 tags, non-trivial parents, user, date and time, and a summary for
2718 each commit. When the -v/--verbose switch is used, the list of
2717 each commit. When the -v/--verbose switch is used, the list of
2719 changed files and full commit message are shown.
2718 changed files and full commit message are shown.
2720
2719
2721 .. note::
2720 .. note::
2722 log -p/--patch may generate unexpected diff output for merge
2721 log -p/--patch may generate unexpected diff output for merge
2723 changesets, as it will only compare the merge changeset against
2722 changesets, as it will only compare the merge changeset against
2724 its first parent. Also, only files different from BOTH parents
2723 its first parent. Also, only files different from BOTH parents
2725 will appear in files:.
2724 will appear in files:.
2726
2725
2727 Returns 0 on success.
2726 Returns 0 on success.
2728 """
2727 """
2729
2728
2730 matchfn = cmdutil.match(repo, pats, opts)
2729 matchfn = cmdutil.match(repo, pats, opts)
2731 limit = cmdutil.loglimit(opts)
2730 limit = cmdutil.loglimit(opts)
2732 count = 0
2731 count = 0
2733
2732
2734 endrev = None
2733 endrev = None
2735 if opts.get('copies') and opts.get('rev'):
2734 if opts.get('copies') and opts.get('rev'):
2736 endrev = max(cmdutil.revrange(repo, opts.get('rev'))) + 1
2735 endrev = max(cmdutil.revrange(repo, opts.get('rev'))) + 1
2737
2736
2738 df = False
2737 df = False
2739 if opts["date"]:
2738 if opts["date"]:
2740 df = util.matchdate(opts["date"])
2739 df = util.matchdate(opts["date"])
2741
2740
2742 branches = opts.get('branch', []) + opts.get('only_branch', [])
2741 branches = opts.get('branch', []) + opts.get('only_branch', [])
2743 opts['branch'] = [repo.lookupbranch(b) for b in branches]
2742 opts['branch'] = [repo.lookupbranch(b) for b in branches]
2744
2743
2745 displayer = cmdutil.show_changeset(ui, repo, opts, True)
2744 displayer = cmdutil.show_changeset(ui, repo, opts, True)
2746 def prep(ctx, fns):
2745 def prep(ctx, fns):
2747 rev = ctx.rev()
2746 rev = ctx.rev()
2748 parents = [p for p in repo.changelog.parentrevs(rev)
2747 parents = [p for p in repo.changelog.parentrevs(rev)
2749 if p != nullrev]
2748 if p != nullrev]
2750 if opts.get('no_merges') and len(parents) == 2:
2749 if opts.get('no_merges') and len(parents) == 2:
2751 return
2750 return
2752 if opts.get('only_merges') and len(parents) != 2:
2751 if opts.get('only_merges') and len(parents) != 2:
2753 return
2752 return
2754 if opts.get('branch') and ctx.branch() not in opts['branch']:
2753 if opts.get('branch') and ctx.branch() not in opts['branch']:
2755 return
2754 return
2756 if df and not df(ctx.date()[0]):
2755 if df and not df(ctx.date()[0]):
2757 return
2756 return
2758 if opts['user'] and not [k for k in opts['user']
2757 if opts['user'] and not [k for k in opts['user']
2759 if k.lower() in ctx.user().lower()]:
2758 if k.lower() in ctx.user().lower()]:
2760 return
2759 return
2761 if opts.get('keyword'):
2760 if opts.get('keyword'):
2762 for k in [kw.lower() for kw in opts['keyword']]:
2761 for k in [kw.lower() for kw in opts['keyword']]:
2763 if (k in ctx.user().lower() or
2762 if (k in ctx.user().lower() or
2764 k in ctx.description().lower() or
2763 k in ctx.description().lower() or
2765 k in " ".join(ctx.files()).lower()):
2764 k in " ".join(ctx.files()).lower()):
2766 break
2765 break
2767 else:
2766 else:
2768 return
2767 return
2769
2768
2770 copies = None
2769 copies = None
2771 if opts.get('copies') and rev:
2770 if opts.get('copies') and rev:
2772 copies = []
2771 copies = []
2773 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
2772 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
2774 for fn in ctx.files():
2773 for fn in ctx.files():
2775 rename = getrenamed(fn, rev)
2774 rename = getrenamed(fn, rev)
2776 if rename:
2775 if rename:
2777 copies.append((fn, rename[0]))
2776 copies.append((fn, rename[0]))
2778
2777
2779 revmatchfn = None
2778 revmatchfn = None
2780 if opts.get('patch') or opts.get('stat'):
2779 if opts.get('patch') or opts.get('stat'):
2781 if opts.get('follow') or opts.get('follow_first'):
2780 if opts.get('follow') or opts.get('follow_first'):
2782 # note: this might be wrong when following through merges
2781 # note: this might be wrong when following through merges
2783 revmatchfn = cmdutil.match(repo, fns, default='path')
2782 revmatchfn = cmdutil.match(repo, fns, default='path')
2784 else:
2783 else:
2785 revmatchfn = matchfn
2784 revmatchfn = matchfn
2786
2785
2787 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
2786 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
2788
2787
2789 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2788 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2790 if count == limit:
2789 if count == limit:
2791 break
2790 break
2792 if displayer.flush(ctx.rev()):
2791 if displayer.flush(ctx.rev()):
2793 count += 1
2792 count += 1
2794 displayer.close()
2793 displayer.close()
2795
2794
2796 def manifest(ui, repo, node=None, rev=None):
2795 def manifest(ui, repo, node=None, rev=None):
2797 """output the current or given revision of the project manifest
2796 """output the current or given revision of the project manifest
2798
2797
2799 Print a list of version controlled files for the given revision.
2798 Print a list of version controlled files for the given revision.
2800 If no revision is given, the first parent of the working directory
2799 If no revision is given, the first parent of the working directory
2801 is used, or the null revision if no revision is checked out.
2800 is used, or the null revision if no revision is checked out.
2802
2801
2803 With -v, print file permissions, symlink and executable bits.
2802 With -v, print file permissions, symlink and executable bits.
2804 With --debug, print file revision hashes.
2803 With --debug, print file revision hashes.
2805
2804
2806 Returns 0 on success.
2805 Returns 0 on success.
2807 """
2806 """
2808
2807
2809 if rev and node:
2808 if rev and node:
2810 raise util.Abort(_("please specify just one revision"))
2809 raise util.Abort(_("please specify just one revision"))
2811
2810
2812 if not node:
2811 if not node:
2813 node = rev
2812 node = rev
2814
2813
2815 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
2814 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
2816 ctx = cmdutil.revsingle(repo, node)
2815 ctx = cmdutil.revsingle(repo, node)
2817 for f in ctx:
2816 for f in ctx:
2818 if ui.debugflag:
2817 if ui.debugflag:
2819 ui.write("%40s " % hex(ctx.manifest()[f]))
2818 ui.write("%40s " % hex(ctx.manifest()[f]))
2820 if ui.verbose:
2819 if ui.verbose:
2821 ui.write(decor[ctx.flags(f)])
2820 ui.write(decor[ctx.flags(f)])
2822 ui.write("%s\n" % f)
2821 ui.write("%s\n" % f)
2823
2822
2824 def merge(ui, repo, node=None, **opts):
2823 def merge(ui, repo, node=None, **opts):
2825 """merge working directory with another revision
2824 """merge working directory with another revision
2826
2825
2827 The current working directory is updated with all changes made in
2826 The current working directory is updated with all changes made in
2828 the requested revision since the last common predecessor revision.
2827 the requested revision since the last common predecessor revision.
2829
2828
2830 Files that changed between either parent are marked as changed for
2829 Files that changed between either parent are marked as changed for
2831 the next commit and a commit must be performed before any further
2830 the next commit and a commit must be performed before any further
2832 updates to the repository are allowed. The next commit will have
2831 updates to the repository are allowed. The next commit will have
2833 two parents.
2832 two parents.
2834
2833
2835 ``--tool`` can be used to specify the merge tool used for file
2834 ``--tool`` can be used to specify the merge tool used for file
2836 merges. It overrides the HGMERGE environment variable and your
2835 merges. It overrides the HGMERGE environment variable and your
2837 configuration files. See :hg:`help merge-tools` for options.
2836 configuration files. See :hg:`help merge-tools` for options.
2838
2837
2839 If no revision is specified, the working directory's parent is a
2838 If no revision is specified, the working directory's parent is a
2840 head revision, and the current branch contains exactly one other
2839 head revision, and the current branch contains exactly one other
2841 head, the other head is merged with by default. Otherwise, an
2840 head, the other head is merged with by default. Otherwise, an
2842 explicit revision with which to merge with must be provided.
2841 explicit revision with which to merge with must be provided.
2843
2842
2844 :hg:`resolve` must be used to resolve unresolved files.
2843 :hg:`resolve` must be used to resolve unresolved files.
2845
2844
2846 To undo an uncommitted merge, use :hg:`update --clean .` which
2845 To undo an uncommitted merge, use :hg:`update --clean .` which
2847 will check out a clean copy of the original merge parent, losing
2846 will check out a clean copy of the original merge parent, losing
2848 all changes.
2847 all changes.
2849
2848
2850 Returns 0 on success, 1 if there are unresolved files.
2849 Returns 0 on success, 1 if there are unresolved files.
2851 """
2850 """
2852
2851
2853 if opts.get('rev') and node:
2852 if opts.get('rev') and node:
2854 raise util.Abort(_("please specify just one revision"))
2853 raise util.Abort(_("please specify just one revision"))
2855 if not node:
2854 if not node:
2856 node = opts.get('rev')
2855 node = opts.get('rev')
2857
2856
2858 if not node:
2857 if not node:
2859 branch = repo[None].branch()
2858 branch = repo[None].branch()
2860 bheads = repo.branchheads(branch)
2859 bheads = repo.branchheads(branch)
2861 if len(bheads) > 2:
2860 if len(bheads) > 2:
2862 raise util.Abort(_(
2861 raise util.Abort(_(
2863 'branch \'%s\' has %d heads - '
2862 'branch \'%s\' has %d heads - '
2864 'please merge with an explicit rev\n'
2863 'please merge with an explicit rev\n'
2865 '(run \'hg heads .\' to see heads)')
2864 '(run \'hg heads .\' to see heads)')
2866 % (branch, len(bheads)))
2865 % (branch, len(bheads)))
2867
2866
2868 parent = repo.dirstate.p1()
2867 parent = repo.dirstate.p1()
2869 if len(bheads) == 1:
2868 if len(bheads) == 1:
2870 if len(repo.heads()) > 1:
2869 if len(repo.heads()) > 1:
2871 raise util.Abort(_(
2870 raise util.Abort(_(
2872 'branch \'%s\' has one head - '
2871 'branch \'%s\' has one head - '
2873 'please merge with an explicit rev\n'
2872 'please merge with an explicit rev\n'
2874 '(run \'hg heads\' to see all heads)')
2873 '(run \'hg heads\' to see all heads)')
2875 % branch)
2874 % branch)
2876 msg = _('there is nothing to merge')
2875 msg = _('there is nothing to merge')
2877 if parent != repo.lookup(repo[None].branch()):
2876 if parent != repo.lookup(repo[None].branch()):
2878 msg = _('%s - use "hg update" instead') % msg
2877 msg = _('%s - use "hg update" instead') % msg
2879 raise util.Abort(msg)
2878 raise util.Abort(msg)
2880
2879
2881 if parent not in bheads:
2880 if parent not in bheads:
2882 raise util.Abort(_('working dir not at a head rev - '
2881 raise util.Abort(_('working dir not at a head rev - '
2883 'use "hg update" or merge with an explicit rev'))
2882 'use "hg update" or merge with an explicit rev'))
2884 node = parent == bheads[0] and bheads[-1] or bheads[0]
2883 node = parent == bheads[0] and bheads[-1] or bheads[0]
2885 else:
2884 else:
2886 node = cmdutil.revsingle(repo, node).node()
2885 node = cmdutil.revsingle(repo, node).node()
2887
2886
2888 if opts.get('preview'):
2887 if opts.get('preview'):
2889 # find nodes that are ancestors of p2 but not of p1
2888 # find nodes that are ancestors of p2 but not of p1
2890 p1 = repo.lookup('.')
2889 p1 = repo.lookup('.')
2891 p2 = repo.lookup(node)
2890 p2 = repo.lookup(node)
2892 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
2891 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
2893
2892
2894 displayer = cmdutil.show_changeset(ui, repo, opts)
2893 displayer = cmdutil.show_changeset(ui, repo, opts)
2895 for node in nodes:
2894 for node in nodes:
2896 displayer.show(repo[node])
2895 displayer.show(repo[node])
2897 displayer.close()
2896 displayer.close()
2898 return 0
2897 return 0
2899
2898
2900 try:
2899 try:
2901 # ui.forcemerge is an internal variable, do not document
2900 # ui.forcemerge is an internal variable, do not document
2902 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
2901 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
2903 return hg.merge(repo, node, force=opts.get('force'))
2902 return hg.merge(repo, node, force=opts.get('force'))
2904 finally:
2903 finally:
2905 ui.setconfig('ui', 'forcemerge', '')
2904 ui.setconfig('ui', 'forcemerge', '')
2906
2905
2907 def outgoing(ui, repo, dest=None, **opts):
2906 def outgoing(ui, repo, dest=None, **opts):
2908 """show changesets not found in the destination
2907 """show changesets not found in the destination
2909
2908
2910 Show changesets not found in the specified destination repository
2909 Show changesets not found in the specified destination repository
2911 or the default push location. These are the changesets that would
2910 or the default push location. These are the changesets that would
2912 be pushed if a push was requested.
2911 be pushed if a push was requested.
2913
2912
2914 See pull for details of valid destination formats.
2913 See pull for details of valid destination formats.
2915
2914
2916 Returns 0 if there are outgoing changes, 1 otherwise.
2915 Returns 0 if there are outgoing changes, 1 otherwise.
2917 """
2916 """
2918
2917
2919 if opts.get('bookmarks'):
2918 if opts.get('bookmarks'):
2920 dest = ui.expandpath(dest or 'default-push', dest or 'default')
2919 dest = ui.expandpath(dest or 'default-push', dest or 'default')
2921 dest, branches = hg.parseurl(dest, opts.get('branch'))
2920 dest, branches = hg.parseurl(dest, opts.get('branch'))
2922 other = hg.repository(hg.remoteui(repo, opts), dest)
2921 other = hg.repository(hg.remoteui(repo, opts), dest)
2923 if 'bookmarks' not in other.listkeys('namespaces'):
2922 if 'bookmarks' not in other.listkeys('namespaces'):
2924 ui.warn(_("remote doesn't support bookmarks\n"))
2923 ui.warn(_("remote doesn't support bookmarks\n"))
2925 return 0
2924 return 0
2926 ui.status(_('comparing with %s\n') % url.hidepassword(dest))
2925 ui.status(_('comparing with %s\n') % url.hidepassword(dest))
2927 return bookmarks.diff(ui, other, repo)
2926 return bookmarks.diff(ui, other, repo)
2928
2927
2929 ret = hg.outgoing(ui, repo, dest, opts)
2928 ret = hg.outgoing(ui, repo, dest, opts)
2930 return ret
2929 return ret
2931
2930
2932 def parents(ui, repo, file_=None, **opts):
2931 def parents(ui, repo, file_=None, **opts):
2933 """show the parents of the working directory or revision
2932 """show the parents of the working directory or revision
2934
2933
2935 Print the working directory's parent revisions. If a revision is
2934 Print the working directory's parent revisions. If a revision is
2936 given via -r/--rev, the parent of that revision will be printed.
2935 given via -r/--rev, the parent of that revision will be printed.
2937 If a file argument is given, the revision in which the file was
2936 If a file argument is given, the revision in which the file was
2938 last changed (before the working directory revision or the
2937 last changed (before the working directory revision or the
2939 argument to --rev if given) is printed.
2938 argument to --rev if given) is printed.
2940
2939
2941 Returns 0 on success.
2940 Returns 0 on success.
2942 """
2941 """
2943
2942
2944 ctx = cmdutil.revsingle(repo, opts.get('rev'), None)
2943 ctx = cmdutil.revsingle(repo, opts.get('rev'), None)
2945
2944
2946 if file_:
2945 if file_:
2947 m = cmdutil.match(repo, (file_,), opts)
2946 m = cmdutil.match(repo, (file_,), opts)
2948 if m.anypats() or len(m.files()) != 1:
2947 if m.anypats() or len(m.files()) != 1:
2949 raise util.Abort(_('can only specify an explicit filename'))
2948 raise util.Abort(_('can only specify an explicit filename'))
2950 file_ = m.files()[0]
2949 file_ = m.files()[0]
2951 filenodes = []
2950 filenodes = []
2952 for cp in ctx.parents():
2951 for cp in ctx.parents():
2953 if not cp:
2952 if not cp:
2954 continue
2953 continue
2955 try:
2954 try:
2956 filenodes.append(cp.filenode(file_))
2955 filenodes.append(cp.filenode(file_))
2957 except error.LookupError:
2956 except error.LookupError:
2958 pass
2957 pass
2959 if not filenodes:
2958 if not filenodes:
2960 raise util.Abort(_("'%s' not found in manifest!") % file_)
2959 raise util.Abort(_("'%s' not found in manifest!") % file_)
2961 fl = repo.file(file_)
2960 fl = repo.file(file_)
2962 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
2961 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
2963 else:
2962 else:
2964 p = [cp.node() for cp in ctx.parents()]
2963 p = [cp.node() for cp in ctx.parents()]
2965
2964
2966 displayer = cmdutil.show_changeset(ui, repo, opts)
2965 displayer = cmdutil.show_changeset(ui, repo, opts)
2967 for n in p:
2966 for n in p:
2968 if n != nullid:
2967 if n != nullid:
2969 displayer.show(repo[n])
2968 displayer.show(repo[n])
2970 displayer.close()
2969 displayer.close()
2971
2970
2972 def paths(ui, repo, search=None):
2971 def paths(ui, repo, search=None):
2973 """show aliases for remote repositories
2972 """show aliases for remote repositories
2974
2973
2975 Show definition of symbolic path name NAME. If no name is given,
2974 Show definition of symbolic path name NAME. If no name is given,
2976 show definition of all available names.
2975 show definition of all available names.
2977
2976
2978 Path names are defined in the [paths] section of your
2977 Path names are defined in the [paths] section of your
2979 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
2978 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
2980 repository, ``.hg/hgrc`` is used, too.
2979 repository, ``.hg/hgrc`` is used, too.
2981
2980
2982 The path names ``default`` and ``default-push`` have a special
2981 The path names ``default`` and ``default-push`` have a special
2983 meaning. When performing a push or pull operation, they are used
2982 meaning. When performing a push or pull operation, they are used
2984 as fallbacks if no location is specified on the command-line.
2983 as fallbacks if no location is specified on the command-line.
2985 When ``default-push`` is set, it will be used for push and
2984 When ``default-push`` is set, it will be used for push and
2986 ``default`` will be used for pull; otherwise ``default`` is used
2985 ``default`` will be used for pull; otherwise ``default`` is used
2987 as the fallback for both. When cloning a repository, the clone
2986 as the fallback for both. When cloning a repository, the clone
2988 source is written as ``default`` in ``.hg/hgrc``. Note that
2987 source is written as ``default`` in ``.hg/hgrc``. Note that
2989 ``default`` and ``default-push`` apply to all inbound (e.g.
2988 ``default`` and ``default-push`` apply to all inbound (e.g.
2990 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
2989 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
2991 :hg:`bundle`) operations.
2990 :hg:`bundle`) operations.
2992
2991
2993 See :hg:`help urls` for more information.
2992 See :hg:`help urls` for more information.
2994
2993
2995 Returns 0 on success.
2994 Returns 0 on success.
2996 """
2995 """
2997 if search:
2996 if search:
2998 for name, path in ui.configitems("paths"):
2997 for name, path in ui.configitems("paths"):
2999 if name == search:
2998 if name == search:
3000 ui.write("%s\n" % url.hidepassword(path))
2999 ui.write("%s\n" % url.hidepassword(path))
3001 return
3000 return
3002 ui.warn(_("not found!\n"))
3001 ui.warn(_("not found!\n"))
3003 return 1
3002 return 1
3004 else:
3003 else:
3005 for name, path in ui.configitems("paths"):
3004 for name, path in ui.configitems("paths"):
3006 ui.write("%s = %s\n" % (name, url.hidepassword(path)))
3005 ui.write("%s = %s\n" % (name, url.hidepassword(path)))
3007
3006
3008 def postincoming(ui, repo, modheads, optupdate, checkout):
3007 def postincoming(ui, repo, modheads, optupdate, checkout):
3009 if modheads == 0:
3008 if modheads == 0:
3010 return
3009 return
3011 if optupdate:
3010 if optupdate:
3012 if (modheads <= 1 or len(repo.branchheads()) == 1) or checkout:
3011 if (modheads <= 1 or len(repo.branchheads()) == 1) or checkout:
3013 return hg.update(repo, checkout)
3012 return hg.update(repo, checkout)
3014 else:
3013 else:
3015 ui.status(_("not updating, since new heads added\n"))
3014 ui.status(_("not updating, since new heads added\n"))
3016 if modheads > 1:
3015 if modheads > 1:
3017 currentbranchheads = len(repo.branchheads())
3016 currentbranchheads = len(repo.branchheads())
3018 if currentbranchheads == modheads:
3017 if currentbranchheads == modheads:
3019 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3018 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3020 elif currentbranchheads > 1:
3019 elif currentbranchheads > 1:
3021 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to merge)\n"))
3020 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to merge)\n"))
3022 else:
3021 else:
3023 ui.status(_("(run 'hg heads' to see heads)\n"))
3022 ui.status(_("(run 'hg heads' to see heads)\n"))
3024 else:
3023 else:
3025 ui.status(_("(run 'hg update' to get a working copy)\n"))
3024 ui.status(_("(run 'hg update' to get a working copy)\n"))
3026
3025
3027 def pull(ui, repo, source="default", **opts):
3026 def pull(ui, repo, source="default", **opts):
3028 """pull changes from the specified source
3027 """pull changes from the specified source
3029
3028
3030 Pull changes from a remote repository to a local one.
3029 Pull changes from a remote repository to a local one.
3031
3030
3032 This finds all changes from the repository at the specified path
3031 This finds all changes from the repository at the specified path
3033 or URL and adds them to a local repository (the current one unless
3032 or URL and adds them to a local repository (the current one unless
3034 -R is specified). By default, this does not update the copy of the
3033 -R is specified). By default, this does not update the copy of the
3035 project in the working directory.
3034 project in the working directory.
3036
3035
3037 Use :hg:`incoming` if you want to see what would have been added
3036 Use :hg:`incoming` if you want to see what would have been added
3038 by a pull at the time you issued this command. If you then decide
3037 by a pull at the time you issued this command. If you then decide
3039 to add those changes to the repository, you should use :hg:`pull
3038 to add those changes to the repository, you should use :hg:`pull
3040 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3039 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3041
3040
3042 If SOURCE is omitted, the 'default' path will be used.
3041 If SOURCE is omitted, the 'default' path will be used.
3043 See :hg:`help urls` for more information.
3042 See :hg:`help urls` for more information.
3044
3043
3045 Returns 0 on success, 1 if an update had unresolved files.
3044 Returns 0 on success, 1 if an update had unresolved files.
3046 """
3045 """
3047 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3046 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3048 other = hg.repository(hg.remoteui(repo, opts), source)
3047 other = hg.repository(hg.remoteui(repo, opts), source)
3049 ui.status(_('pulling from %s\n') % url.hidepassword(source))
3048 ui.status(_('pulling from %s\n') % url.hidepassword(source))
3050 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
3049 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
3051
3050
3052 if opts.get('bookmark'):
3051 if opts.get('bookmark'):
3053 if not revs:
3052 if not revs:
3054 revs = []
3053 revs = []
3055 rb = other.listkeys('bookmarks')
3054 rb = other.listkeys('bookmarks')
3056 for b in opts['bookmark']:
3055 for b in opts['bookmark']:
3057 if b not in rb:
3056 if b not in rb:
3058 raise util.Abort(_('remote bookmark %s not found!') % b)
3057 raise util.Abort(_('remote bookmark %s not found!') % b)
3059 revs.append(rb[b])
3058 revs.append(rb[b])
3060
3059
3061 if revs:
3060 if revs:
3062 try:
3061 try:
3063 revs = [other.lookup(rev) for rev in revs]
3062 revs = [other.lookup(rev) for rev in revs]
3064 except error.CapabilityError:
3063 except error.CapabilityError:
3065 err = _("other repository doesn't support revision lookup, "
3064 err = _("other repository doesn't support revision lookup, "
3066 "so a rev cannot be specified.")
3065 "so a rev cannot be specified.")
3067 raise util.Abort(err)
3066 raise util.Abort(err)
3068
3067
3069 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
3068 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
3070 bookmarks.updatefromremote(ui, repo, other)
3069 bookmarks.updatefromremote(ui, repo, other)
3071 if checkout:
3070 if checkout:
3072 checkout = str(repo.changelog.rev(other.lookup(checkout)))
3071 checkout = str(repo.changelog.rev(other.lookup(checkout)))
3073 repo._subtoppath = source
3072 repo._subtoppath = source
3074 try:
3073 try:
3075 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
3074 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
3076
3075
3077 finally:
3076 finally:
3078 del repo._subtoppath
3077 del repo._subtoppath
3079
3078
3080 # update specified bookmarks
3079 # update specified bookmarks
3081 if opts.get('bookmark'):
3080 if opts.get('bookmark'):
3082 for b in opts['bookmark']:
3081 for b in opts['bookmark']:
3083 # explicit pull overrides local bookmark if any
3082 # explicit pull overrides local bookmark if any
3084 ui.status(_("importing bookmark %s\n") % b)
3083 ui.status(_("importing bookmark %s\n") % b)
3085 repo._bookmarks[b] = repo[rb[b]].node()
3084 repo._bookmarks[b] = repo[rb[b]].node()
3086 bookmarks.write(repo)
3085 bookmarks.write(repo)
3087
3086
3088 return ret
3087 return ret
3089
3088
3090 def push(ui, repo, dest=None, **opts):
3089 def push(ui, repo, dest=None, **opts):
3091 """push changes to the specified destination
3090 """push changes to the specified destination
3092
3091
3093 Push changesets from the local repository to the specified
3092 Push changesets from the local repository to the specified
3094 destination.
3093 destination.
3095
3094
3096 This operation is symmetrical to pull: it is identical to a pull
3095 This operation is symmetrical to pull: it is identical to a pull
3097 in the destination repository from the current one.
3096 in the destination repository from the current one.
3098
3097
3099 By default, push will not allow creation of new heads at the
3098 By default, push will not allow creation of new heads at the
3100 destination, since multiple heads would make it unclear which head
3099 destination, since multiple heads would make it unclear which head
3101 to use. In this situation, it is recommended to pull and merge
3100 to use. In this situation, it is recommended to pull and merge
3102 before pushing.
3101 before pushing.
3103
3102
3104 Use --new-branch if you want to allow push to create a new named
3103 Use --new-branch if you want to allow push to create a new named
3105 branch that is not present at the destination. This allows you to
3104 branch that is not present at the destination. This allows you to
3106 only create a new branch without forcing other changes.
3105 only create a new branch without forcing other changes.
3107
3106
3108 Use -f/--force to override the default behavior and push all
3107 Use -f/--force to override the default behavior and push all
3109 changesets on all branches.
3108 changesets on all branches.
3110
3109
3111 If -r/--rev is used, the specified revision and all its ancestors
3110 If -r/--rev is used, the specified revision and all its ancestors
3112 will be pushed to the remote repository.
3111 will be pushed to the remote repository.
3113
3112
3114 Please see :hg:`help urls` for important details about ``ssh://``
3113 Please see :hg:`help urls` for important details about ``ssh://``
3115 URLs. If DESTINATION is omitted, a default path will be used.
3114 URLs. If DESTINATION is omitted, a default path will be used.
3116
3115
3117 Returns 0 if push was successful, 1 if nothing to push.
3116 Returns 0 if push was successful, 1 if nothing to push.
3118 """
3117 """
3119
3118
3120 if opts.get('bookmark'):
3119 if opts.get('bookmark'):
3121 for b in opts['bookmark']:
3120 for b in opts['bookmark']:
3122 # translate -B options to -r so changesets get pushed
3121 # translate -B options to -r so changesets get pushed
3123 if b in repo._bookmarks:
3122 if b in repo._bookmarks:
3124 opts.setdefault('rev', []).append(b)
3123 opts.setdefault('rev', []).append(b)
3125 else:
3124 else:
3126 # if we try to push a deleted bookmark, translate it to null
3125 # if we try to push a deleted bookmark, translate it to null
3127 # this lets simultaneous -r, -b options continue working
3126 # this lets simultaneous -r, -b options continue working
3128 opts.setdefault('rev', []).append("null")
3127 opts.setdefault('rev', []).append("null")
3129
3128
3130 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3129 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3131 dest, branches = hg.parseurl(dest, opts.get('branch'))
3130 dest, branches = hg.parseurl(dest, opts.get('branch'))
3132 ui.status(_('pushing to %s\n') % url.hidepassword(dest))
3131 ui.status(_('pushing to %s\n') % url.hidepassword(dest))
3133 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
3132 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
3134 other = hg.repository(hg.remoteui(repo, opts), dest)
3133 other = hg.repository(hg.remoteui(repo, opts), dest)
3135 if revs:
3134 if revs:
3136 revs = [repo.lookup(rev) for rev in revs]
3135 revs = [repo.lookup(rev) for rev in revs]
3137
3136
3138 repo._subtoppath = dest
3137 repo._subtoppath = dest
3139 try:
3138 try:
3140 # push subrepos depth-first for coherent ordering
3139 # push subrepos depth-first for coherent ordering
3141 c = repo['']
3140 c = repo['']
3142 subs = c.substate # only repos that are committed
3141 subs = c.substate # only repos that are committed
3143 for s in sorted(subs):
3142 for s in sorted(subs):
3144 if not c.sub(s).push(opts.get('force')):
3143 if not c.sub(s).push(opts.get('force')):
3145 return False
3144 return False
3146 finally:
3145 finally:
3147 del repo._subtoppath
3146 del repo._subtoppath
3148 result = repo.push(other, opts.get('force'), revs=revs,
3147 result = repo.push(other, opts.get('force'), revs=revs,
3149 newbranch=opts.get('new_branch'))
3148 newbranch=opts.get('new_branch'))
3150
3149
3151 result = (result == 0)
3150 result = (result == 0)
3152
3151
3153 if opts.get('bookmark'):
3152 if opts.get('bookmark'):
3154 rb = other.listkeys('bookmarks')
3153 rb = other.listkeys('bookmarks')
3155 for b in opts['bookmark']:
3154 for b in opts['bookmark']:
3156 # explicit push overrides remote bookmark if any
3155 # explicit push overrides remote bookmark if any
3157 if b in repo._bookmarks:
3156 if b in repo._bookmarks:
3158 ui.status(_("exporting bookmark %s\n") % b)
3157 ui.status(_("exporting bookmark %s\n") % b)
3159 new = repo[b].hex()
3158 new = repo[b].hex()
3160 elif b in rb:
3159 elif b in rb:
3161 ui.status(_("deleting remote bookmark %s\n") % b)
3160 ui.status(_("deleting remote bookmark %s\n") % b)
3162 new = '' # delete
3161 new = '' # delete
3163 else:
3162 else:
3164 ui.warn(_('bookmark %s does not exist on the local '
3163 ui.warn(_('bookmark %s does not exist on the local '
3165 'or remote repository!\n') % b)
3164 'or remote repository!\n') % b)
3166 return 2
3165 return 2
3167 old = rb.get(b, '')
3166 old = rb.get(b, '')
3168 r = other.pushkey('bookmarks', b, old, new)
3167 r = other.pushkey('bookmarks', b, old, new)
3169 if not r:
3168 if not r:
3170 ui.warn(_('updating bookmark %s failed!\n') % b)
3169 ui.warn(_('updating bookmark %s failed!\n') % b)
3171 if not result:
3170 if not result:
3172 result = 2
3171 result = 2
3173
3172
3174 return result
3173 return result
3175
3174
3176 def recover(ui, repo):
3175 def recover(ui, repo):
3177 """roll back an interrupted transaction
3176 """roll back an interrupted transaction
3178
3177
3179 Recover from an interrupted commit or pull.
3178 Recover from an interrupted commit or pull.
3180
3179
3181 This command tries to fix the repository status after an
3180 This command tries to fix the repository status after an
3182 interrupted operation. It should only be necessary when Mercurial
3181 interrupted operation. It should only be necessary when Mercurial
3183 suggests it.
3182 suggests it.
3184
3183
3185 Returns 0 if successful, 1 if nothing to recover or verify fails.
3184 Returns 0 if successful, 1 if nothing to recover or verify fails.
3186 """
3185 """
3187 if repo.recover():
3186 if repo.recover():
3188 return hg.verify(repo)
3187 return hg.verify(repo)
3189 return 1
3188 return 1
3190
3189
3191 def remove(ui, repo, *pats, **opts):
3190 def remove(ui, repo, *pats, **opts):
3192 """remove the specified files on the next commit
3191 """remove the specified files on the next commit
3193
3192
3194 Schedule the indicated files for removal from the repository.
3193 Schedule the indicated files for removal from the repository.
3195
3194
3196 This only removes files from the current branch, not from the
3195 This only removes files from the current branch, not from the
3197 entire project history. -A/--after can be used to remove only
3196 entire project history. -A/--after can be used to remove only
3198 files that have already been deleted, -f/--force can be used to
3197 files that have already been deleted, -f/--force can be used to
3199 force deletion, and -Af can be used to remove files from the next
3198 force deletion, and -Af can be used to remove files from the next
3200 revision without deleting them from the working directory.
3199 revision without deleting them from the working directory.
3201
3200
3202 The following table details the behavior of remove for different
3201 The following table details the behavior of remove for different
3203 file states (columns) and option combinations (rows). The file
3202 file states (columns) and option combinations (rows). The file
3204 states are Added [A], Clean [C], Modified [M] and Missing [!] (as
3203 states are Added [A], Clean [C], Modified [M] and Missing [!] (as
3205 reported by :hg:`status`). The actions are Warn, Remove (from
3204 reported by :hg:`status`). The actions are Warn, Remove (from
3206 branch) and Delete (from disk)::
3205 branch) and Delete (from disk)::
3207
3206
3208 A C M !
3207 A C M !
3209 none W RD W R
3208 none W RD W R
3210 -f R RD RD R
3209 -f R RD RD R
3211 -A W W W R
3210 -A W W W R
3212 -Af R R R R
3211 -Af R R R R
3213
3212
3214 This command schedules the files to be removed at the next commit.
3213 This command schedules the files to be removed at the next commit.
3215 To undo a remove before that, see :hg:`revert`.
3214 To undo a remove before that, see :hg:`revert`.
3216
3215
3217 Returns 0 on success, 1 if any warnings encountered.
3216 Returns 0 on success, 1 if any warnings encountered.
3218 """
3217 """
3219
3218
3220 ret = 0
3219 ret = 0
3221 after, force = opts.get('after'), opts.get('force')
3220 after, force = opts.get('after'), opts.get('force')
3222 if not pats and not after:
3221 if not pats and not after:
3223 raise util.Abort(_('no files specified'))
3222 raise util.Abort(_('no files specified'))
3224
3223
3225 m = cmdutil.match(repo, pats, opts)
3224 m = cmdutil.match(repo, pats, opts)
3226 s = repo.status(match=m, clean=True)
3225 s = repo.status(match=m, clean=True)
3227 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
3226 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
3228
3227
3229 for f in m.files():
3228 for f in m.files():
3230 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
3229 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
3231 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
3230 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
3232 ret = 1
3231 ret = 1
3233
3232
3234 if force:
3233 if force:
3235 remove, forget = modified + deleted + clean, added
3234 remove, forget = modified + deleted + clean, added
3236 elif after:
3235 elif after:
3237 remove, forget = deleted, []
3236 remove, forget = deleted, []
3238 for f in modified + added + clean:
3237 for f in modified + added + clean:
3239 ui.warn(_('not removing %s: file still exists (use -f'
3238 ui.warn(_('not removing %s: file still exists (use -f'
3240 ' to force removal)\n') % m.rel(f))
3239 ' to force removal)\n') % m.rel(f))
3241 ret = 1
3240 ret = 1
3242 else:
3241 else:
3243 remove, forget = deleted + clean, []
3242 remove, forget = deleted + clean, []
3244 for f in modified:
3243 for f in modified:
3245 ui.warn(_('not removing %s: file is modified (use -f'
3244 ui.warn(_('not removing %s: file is modified (use -f'
3246 ' to force removal)\n') % m.rel(f))
3245 ' to force removal)\n') % m.rel(f))
3247 ret = 1
3246 ret = 1
3248 for f in added:
3247 for f in added:
3249 ui.warn(_('not removing %s: file has been marked for add (use -f'
3248 ui.warn(_('not removing %s: file has been marked for add (use -f'
3250 ' to force removal)\n') % m.rel(f))
3249 ' to force removal)\n') % m.rel(f))
3251 ret = 1
3250 ret = 1
3252
3251
3253 for f in sorted(remove + forget):
3252 for f in sorted(remove + forget):
3254 if ui.verbose or not m.exact(f):
3253 if ui.verbose or not m.exact(f):
3255 ui.status(_('removing %s\n') % m.rel(f))
3254 ui.status(_('removing %s\n') % m.rel(f))
3256
3255
3257 repo[None].forget(forget)
3256 repo[None].forget(forget)
3258 repo[None].remove(remove, unlink=not after)
3257 repo[None].remove(remove, unlink=not after)
3259 return ret
3258 return ret
3260
3259
3261 def rename(ui, repo, *pats, **opts):
3260 def rename(ui, repo, *pats, **opts):
3262 """rename files; equivalent of copy + remove
3261 """rename files; equivalent of copy + remove
3263
3262
3264 Mark dest as copies of sources; mark sources for deletion. If dest
3263 Mark dest as copies of sources; mark sources for deletion. If dest
3265 is a directory, copies are put in that directory. If dest is a
3264 is a directory, copies are put in that directory. If dest is a
3266 file, there can only be one source.
3265 file, there can only be one source.
3267
3266
3268 By default, this command copies the contents of files as they
3267 By default, this command copies the contents of files as they
3269 exist in the working directory. If invoked with -A/--after, the
3268 exist in the working directory. If invoked with -A/--after, the
3270 operation is recorded, but no copying is performed.
3269 operation is recorded, but no copying is performed.
3271
3270
3272 This command takes effect at the next commit. To undo a rename
3271 This command takes effect at the next commit. To undo a rename
3273 before that, see :hg:`revert`.
3272 before that, see :hg:`revert`.
3274
3273
3275 Returns 0 on success, 1 if errors are encountered.
3274 Returns 0 on success, 1 if errors are encountered.
3276 """
3275 """
3277 wlock = repo.wlock(False)
3276 wlock = repo.wlock(False)
3278 try:
3277 try:
3279 return cmdutil.copy(ui, repo, pats, opts, rename=True)
3278 return cmdutil.copy(ui, repo, pats, opts, rename=True)
3280 finally:
3279 finally:
3281 wlock.release()
3280 wlock.release()
3282
3281
3283 def resolve(ui, repo, *pats, **opts):
3282 def resolve(ui, repo, *pats, **opts):
3284 """redo merges or set/view the merge status of files
3283 """redo merges or set/view the merge status of files
3285
3284
3286 Merges with unresolved conflicts are often the result of
3285 Merges with unresolved conflicts are often the result of
3287 non-interactive merging using the ``internal:merge`` configuration
3286 non-interactive merging using the ``internal:merge`` configuration
3288 setting, or a command-line merge tool like ``diff3``. The resolve
3287 setting, or a command-line merge tool like ``diff3``. The resolve
3289 command is used to manage the files involved in a merge, after
3288 command is used to manage the files involved in a merge, after
3290 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
3289 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
3291 working directory must have two parents).
3290 working directory must have two parents).
3292
3291
3293 The resolve command can be used in the following ways:
3292 The resolve command can be used in the following ways:
3294
3293
3295 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
3294 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
3296 files, discarding any previous merge attempts. Re-merging is not
3295 files, discarding any previous merge attempts. Re-merging is not
3297 performed for files already marked as resolved. Use ``--all/-a``
3296 performed for files already marked as resolved. Use ``--all/-a``
3298 to selects all unresolved files. ``--tool`` can be used to specify
3297 to selects all unresolved files. ``--tool`` can be used to specify
3299 the merge tool used for the given files. It overrides the HGMERGE
3298 the merge tool used for the given files. It overrides the HGMERGE
3300 environment variable and your configuration files.
3299 environment variable and your configuration files.
3301
3300
3302 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
3301 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
3303 (e.g. after having manually fixed-up the files). The default is
3302 (e.g. after having manually fixed-up the files). The default is
3304 to mark all unresolved files.
3303 to mark all unresolved files.
3305
3304
3306 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
3305 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
3307 default is to mark all resolved files.
3306 default is to mark all resolved files.
3308
3307
3309 - :hg:`resolve -l`: list files which had or still have conflicts.
3308 - :hg:`resolve -l`: list files which had or still have conflicts.
3310 In the printed list, ``U`` = unresolved and ``R`` = resolved.
3309 In the printed list, ``U`` = unresolved and ``R`` = resolved.
3311
3310
3312 Note that Mercurial will not let you commit files with unresolved
3311 Note that Mercurial will not let you commit files with unresolved
3313 merge conflicts. You must use :hg:`resolve -m ...` before you can
3312 merge conflicts. You must use :hg:`resolve -m ...` before you can
3314 commit after a conflicting merge.
3313 commit after a conflicting merge.
3315
3314
3316 Returns 0 on success, 1 if any files fail a resolve attempt.
3315 Returns 0 on success, 1 if any files fail a resolve attempt.
3317 """
3316 """
3318
3317
3319 all, mark, unmark, show, nostatus = \
3318 all, mark, unmark, show, nostatus = \
3320 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
3319 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
3321
3320
3322 if (show and (mark or unmark)) or (mark and unmark):
3321 if (show and (mark or unmark)) or (mark and unmark):
3323 raise util.Abort(_("too many options specified"))
3322 raise util.Abort(_("too many options specified"))
3324 if pats and all:
3323 if pats and all:
3325 raise util.Abort(_("can't specify --all and patterns"))
3324 raise util.Abort(_("can't specify --all and patterns"))
3326 if not (all or pats or show or mark or unmark):
3325 if not (all or pats or show or mark or unmark):
3327 raise util.Abort(_('no files or directories specified; '
3326 raise util.Abort(_('no files or directories specified; '
3328 'use --all to remerge all files'))
3327 'use --all to remerge all files'))
3329
3328
3330 ms = mergemod.mergestate(repo)
3329 ms = mergemod.mergestate(repo)
3331 m = cmdutil.match(repo, pats, opts)
3330 m = cmdutil.match(repo, pats, opts)
3332 ret = 0
3331 ret = 0
3333
3332
3334 for f in ms:
3333 for f in ms:
3335 if m(f):
3334 if m(f):
3336 if show:
3335 if show:
3337 if nostatus:
3336 if nostatus:
3338 ui.write("%s\n" % f)
3337 ui.write("%s\n" % f)
3339 else:
3338 else:
3340 ui.write("%s %s\n" % (ms[f].upper(), f),
3339 ui.write("%s %s\n" % (ms[f].upper(), f),
3341 label='resolve.' +
3340 label='resolve.' +
3342 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
3341 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
3343 elif mark:
3342 elif mark:
3344 ms.mark(f, "r")
3343 ms.mark(f, "r")
3345 elif unmark:
3344 elif unmark:
3346 ms.mark(f, "u")
3345 ms.mark(f, "u")
3347 else:
3346 else:
3348 wctx = repo[None]
3347 wctx = repo[None]
3349 mctx = wctx.parents()[-1]
3348 mctx = wctx.parents()[-1]
3350
3349
3351 # backup pre-resolve (merge uses .orig for its own purposes)
3350 # backup pre-resolve (merge uses .orig for its own purposes)
3352 a = repo.wjoin(f)
3351 a = repo.wjoin(f)
3353 util.copyfile(a, a + ".resolve")
3352 util.copyfile(a, a + ".resolve")
3354
3353
3355 try:
3354 try:
3356 # resolve file
3355 # resolve file
3357 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
3356 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
3358 if ms.resolve(f, wctx, mctx):
3357 if ms.resolve(f, wctx, mctx):
3359 ret = 1
3358 ret = 1
3360 finally:
3359 finally:
3361 ui.setconfig('ui', 'forcemerge', '')
3360 ui.setconfig('ui', 'forcemerge', '')
3362
3361
3363 # replace filemerge's .orig file with our resolve file
3362 # replace filemerge's .orig file with our resolve file
3364 util.rename(a + ".resolve", a + ".orig")
3363 util.rename(a + ".resolve", a + ".orig")
3365
3364
3366 ms.commit()
3365 ms.commit()
3367 return ret
3366 return ret
3368
3367
3369 def revert(ui, repo, *pats, **opts):
3368 def revert(ui, repo, *pats, **opts):
3370 """restore individual files or directories to an earlier state
3369 """restore individual files or directories to an earlier state
3371
3370
3372 .. note::
3371 .. note::
3373 This command is most likely not what you are looking for.
3372 This command is most likely not what you are looking for.
3374 Revert will partially overwrite content in the working
3373 Revert will partially overwrite content in the working
3375 directory without changing the working directory parents. Use
3374 directory without changing the working directory parents. Use
3376 :hg:`update -r rev` to check out earlier revisions, or
3375 :hg:`update -r rev` to check out earlier revisions, or
3377 :hg:`update --clean .` to undo a merge which has added another
3376 :hg:`update --clean .` to undo a merge which has added another
3378 parent.
3377 parent.
3379
3378
3380 With no revision specified, revert the named files or directories
3379 With no revision specified, revert the named files or directories
3381 to the contents they had in the parent of the working directory.
3380 to the contents they had in the parent of the working directory.
3382 This restores the contents of the affected files to an unmodified
3381 This restores the contents of the affected files to an unmodified
3383 state and unschedules adds, removes, copies, and renames. If the
3382 state and unschedules adds, removes, copies, and renames. If the
3384 working directory has two parents, you must explicitly specify a
3383 working directory has two parents, you must explicitly specify a
3385 revision.
3384 revision.
3386
3385
3387 Using the -r/--rev option, revert the given files or directories
3386 Using the -r/--rev option, revert the given files or directories
3388 to their contents as of a specific revision. This can be helpful
3387 to their contents as of a specific revision. This can be helpful
3389 to "roll back" some or all of an earlier change. See :hg:`help
3388 to "roll back" some or all of an earlier change. See :hg:`help
3390 dates` for a list of formats valid for -d/--date.
3389 dates` for a list of formats valid for -d/--date.
3391
3390
3392 Revert modifies the working directory. It does not commit any
3391 Revert modifies the working directory. It does not commit any
3393 changes, or change the parent of the working directory. If you
3392 changes, or change the parent of the working directory. If you
3394 revert to a revision other than the parent of the working
3393 revert to a revision other than the parent of the working
3395 directory, the reverted files will thus appear modified
3394 directory, the reverted files will thus appear modified
3396 afterwards.
3395 afterwards.
3397
3396
3398 If a file has been deleted, it is restored. Files scheduled for
3397 If a file has been deleted, it is restored. Files scheduled for
3399 addition are just unscheduled and left as they are. If the
3398 addition are just unscheduled and left as they are. If the
3400 executable mode of a file was changed, it is reset.
3399 executable mode of a file was changed, it is reset.
3401
3400
3402 If names are given, all files matching the names are reverted.
3401 If names are given, all files matching the names are reverted.
3403 If no arguments are given, no files are reverted.
3402 If no arguments are given, no files are reverted.
3404
3403
3405 Modified files are saved with a .orig suffix before reverting.
3404 Modified files are saved with a .orig suffix before reverting.
3406 To disable these backups, use --no-backup.
3405 To disable these backups, use --no-backup.
3407
3406
3408 Returns 0 on success.
3407 Returns 0 on success.
3409 """
3408 """
3410
3409
3411 if opts.get("date"):
3410 if opts.get("date"):
3412 if opts.get("rev"):
3411 if opts.get("rev"):
3413 raise util.Abort(_("you can't specify a revision and a date"))
3412 raise util.Abort(_("you can't specify a revision and a date"))
3414 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
3413 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
3415
3414
3416 parent, p2 = repo.dirstate.parents()
3415 parent, p2 = repo.dirstate.parents()
3417 if not opts.get('rev') and p2 != nullid:
3416 if not opts.get('rev') and p2 != nullid:
3418 raise util.Abort(_('uncommitted merge - '
3417 raise util.Abort(_('uncommitted merge - '
3419 'use "hg update", see "hg help revert"'))
3418 'use "hg update", see "hg help revert"'))
3420
3419
3421 if not pats and not opts.get('all'):
3420 if not pats and not opts.get('all'):
3422 raise util.Abort(_('no files or directories specified; '
3421 raise util.Abort(_('no files or directories specified; '
3423 'use --all to revert the whole repo'))
3422 'use --all to revert the whole repo'))
3424
3423
3425 ctx = cmdutil.revsingle(repo, opts.get('rev'))
3424 ctx = cmdutil.revsingle(repo, opts.get('rev'))
3426 node = ctx.node()
3425 node = ctx.node()
3427 mf = ctx.manifest()
3426 mf = ctx.manifest()
3428 if node == parent:
3427 if node == parent:
3429 pmf = mf
3428 pmf = mf
3430 else:
3429 else:
3431 pmf = None
3430 pmf = None
3432
3431
3433 # need all matching names in dirstate and manifest of target rev,
3432 # need all matching names in dirstate and manifest of target rev,
3434 # so have to walk both. do not print errors if files exist in one
3433 # so have to walk both. do not print errors if files exist in one
3435 # but not other.
3434 # but not other.
3436
3435
3437 names = {}
3436 names = {}
3438
3437
3439 wlock = repo.wlock()
3438 wlock = repo.wlock()
3440 try:
3439 try:
3441 # walk dirstate.
3440 # walk dirstate.
3442
3441
3443 m = cmdutil.match(repo, pats, opts)
3442 m = cmdutil.match(repo, pats, opts)
3444 m.bad = lambda x, y: False
3443 m.bad = lambda x, y: False
3445 for abs in repo.walk(m):
3444 for abs in repo.walk(m):
3446 names[abs] = m.rel(abs), m.exact(abs)
3445 names[abs] = m.rel(abs), m.exact(abs)
3447
3446
3448 # walk target manifest.
3447 # walk target manifest.
3449
3448
3450 def badfn(path, msg):
3449 def badfn(path, msg):
3451 if path in names:
3450 if path in names:
3452 return
3451 return
3453 path_ = path + '/'
3452 path_ = path + '/'
3454 for f in names:
3453 for f in names:
3455 if f.startswith(path_):
3454 if f.startswith(path_):
3456 return
3455 return
3457 ui.warn("%s: %s\n" % (m.rel(path), msg))
3456 ui.warn("%s: %s\n" % (m.rel(path), msg))
3458
3457
3459 m = cmdutil.match(repo, pats, opts)
3458 m = cmdutil.match(repo, pats, opts)
3460 m.bad = badfn
3459 m.bad = badfn
3461 for abs in repo[node].walk(m):
3460 for abs in repo[node].walk(m):
3462 if abs not in names:
3461 if abs not in names:
3463 names[abs] = m.rel(abs), m.exact(abs)
3462 names[abs] = m.rel(abs), m.exact(abs)
3464
3463
3465 m = cmdutil.matchfiles(repo, names)
3464 m = cmdutil.matchfiles(repo, names)
3466 changes = repo.status(match=m)[:4]
3465 changes = repo.status(match=m)[:4]
3467 modified, added, removed, deleted = map(set, changes)
3466 modified, added, removed, deleted = map(set, changes)
3468
3467
3469 # if f is a rename, also revert the source
3468 # if f is a rename, also revert the source
3470 cwd = repo.getcwd()
3469 cwd = repo.getcwd()
3471 for f in added:
3470 for f in added:
3472 src = repo.dirstate.copied(f)
3471 src = repo.dirstate.copied(f)
3473 if src and src not in names and repo.dirstate[src] == 'r':
3472 if src and src not in names and repo.dirstate[src] == 'r':
3474 removed.add(src)
3473 removed.add(src)
3475 names[src] = (repo.pathto(src, cwd), True)
3474 names[src] = (repo.pathto(src, cwd), True)
3476
3475
3477 def removeforget(abs):
3476 def removeforget(abs):
3478 if repo.dirstate[abs] == 'a':
3477 if repo.dirstate[abs] == 'a':
3479 return _('forgetting %s\n')
3478 return _('forgetting %s\n')
3480 return _('removing %s\n')
3479 return _('removing %s\n')
3481
3480
3482 revert = ([], _('reverting %s\n'))
3481 revert = ([], _('reverting %s\n'))
3483 add = ([], _('adding %s\n'))
3482 add = ([], _('adding %s\n'))
3484 remove = ([], removeforget)
3483 remove = ([], removeforget)
3485 undelete = ([], _('undeleting %s\n'))
3484 undelete = ([], _('undeleting %s\n'))
3486
3485
3487 disptable = (
3486 disptable = (
3488 # dispatch table:
3487 # dispatch table:
3489 # file state
3488 # file state
3490 # action if in target manifest
3489 # action if in target manifest
3491 # action if not in target manifest
3490 # action if not in target manifest
3492 # make backup if in target manifest
3491 # make backup if in target manifest
3493 # make backup if not in target manifest
3492 # make backup if not in target manifest
3494 (modified, revert, remove, True, True),
3493 (modified, revert, remove, True, True),
3495 (added, revert, remove, True, False),
3494 (added, revert, remove, True, False),
3496 (removed, undelete, None, False, False),
3495 (removed, undelete, None, False, False),
3497 (deleted, revert, remove, False, False),
3496 (deleted, revert, remove, False, False),
3498 )
3497 )
3499
3498
3500 for abs, (rel, exact) in sorted(names.items()):
3499 for abs, (rel, exact) in sorted(names.items()):
3501 mfentry = mf.get(abs)
3500 mfentry = mf.get(abs)
3502 target = repo.wjoin(abs)
3501 target = repo.wjoin(abs)
3503 def handle(xlist, dobackup):
3502 def handle(xlist, dobackup):
3504 xlist[0].append(abs)
3503 xlist[0].append(abs)
3505 if (dobackup and not opts.get('no_backup') and
3504 if (dobackup and not opts.get('no_backup') and
3506 os.path.lexists(target)):
3505 os.path.lexists(target)):
3507 bakname = "%s.orig" % rel
3506 bakname = "%s.orig" % rel
3508 ui.note(_('saving current version of %s as %s\n') %
3507 ui.note(_('saving current version of %s as %s\n') %
3509 (rel, bakname))
3508 (rel, bakname))
3510 if not opts.get('dry_run'):
3509 if not opts.get('dry_run'):
3511 util.rename(target, bakname)
3510 util.rename(target, bakname)
3512 if ui.verbose or not exact:
3511 if ui.verbose or not exact:
3513 msg = xlist[1]
3512 msg = xlist[1]
3514 if not isinstance(msg, basestring):
3513 if not isinstance(msg, basestring):
3515 msg = msg(abs)
3514 msg = msg(abs)
3516 ui.status(msg % rel)
3515 ui.status(msg % rel)
3517 for table, hitlist, misslist, backuphit, backupmiss in disptable:
3516 for table, hitlist, misslist, backuphit, backupmiss in disptable:
3518 if abs not in table:
3517 if abs not in table:
3519 continue
3518 continue
3520 # file has changed in dirstate
3519 # file has changed in dirstate
3521 if mfentry:
3520 if mfentry:
3522 handle(hitlist, backuphit)
3521 handle(hitlist, backuphit)
3523 elif misslist is not None:
3522 elif misslist is not None:
3524 handle(misslist, backupmiss)
3523 handle(misslist, backupmiss)
3525 break
3524 break
3526 else:
3525 else:
3527 if abs not in repo.dirstate:
3526 if abs not in repo.dirstate:
3528 if mfentry:
3527 if mfentry:
3529 handle(add, True)
3528 handle(add, True)
3530 elif exact:
3529 elif exact:
3531 ui.warn(_('file not managed: %s\n') % rel)
3530 ui.warn(_('file not managed: %s\n') % rel)
3532 continue
3531 continue
3533 # file has not changed in dirstate
3532 # file has not changed in dirstate
3534 if node == parent:
3533 if node == parent:
3535 if exact:
3534 if exact:
3536 ui.warn(_('no changes needed to %s\n') % rel)
3535 ui.warn(_('no changes needed to %s\n') % rel)
3537 continue
3536 continue
3538 if pmf is None:
3537 if pmf is None:
3539 # only need parent manifest in this unlikely case,
3538 # only need parent manifest in this unlikely case,
3540 # so do not read by default
3539 # so do not read by default
3541 pmf = repo[parent].manifest()
3540 pmf = repo[parent].manifest()
3542 if abs in pmf:
3541 if abs in pmf:
3543 if mfentry:
3542 if mfentry:
3544 # if version of file is same in parent and target
3543 # if version of file is same in parent and target
3545 # manifests, do nothing
3544 # manifests, do nothing
3546 if (pmf[abs] != mfentry or
3545 if (pmf[abs] != mfentry or
3547 pmf.flags(abs) != mf.flags(abs)):
3546 pmf.flags(abs) != mf.flags(abs)):
3548 handle(revert, False)
3547 handle(revert, False)
3549 else:
3548 else:
3550 handle(remove, False)
3549 handle(remove, False)
3551
3550
3552 if not opts.get('dry_run'):
3551 if not opts.get('dry_run'):
3553 def checkout(f):
3552 def checkout(f):
3554 fc = ctx[f]
3553 fc = ctx[f]
3555 repo.wwrite(f, fc.data(), fc.flags())
3554 repo.wwrite(f, fc.data(), fc.flags())
3556
3555
3557 audit_path = scmutil.path_auditor(repo.root)
3556 audit_path = scmutil.path_auditor(repo.root)
3558 for f in remove[0]:
3557 for f in remove[0]:
3559 if repo.dirstate[f] == 'a':
3558 if repo.dirstate[f] == 'a':
3560 repo.dirstate.forget(f)
3559 repo.dirstate.forget(f)
3561 continue
3560 continue
3562 audit_path(f)
3561 audit_path(f)
3563 try:
3562 try:
3564 util.unlinkpath(repo.wjoin(f))
3563 util.unlinkpath(repo.wjoin(f))
3565 except OSError:
3564 except OSError:
3566 pass
3565 pass
3567 repo.dirstate.remove(f)
3566 repo.dirstate.remove(f)
3568
3567
3569 normal = None
3568 normal = None
3570 if node == parent:
3569 if node == parent:
3571 # We're reverting to our parent. If possible, we'd like status
3570 # We're reverting to our parent. If possible, we'd like status
3572 # to report the file as clean. We have to use normallookup for
3571 # to report the file as clean. We have to use normallookup for
3573 # merges to avoid losing information about merged/dirty files.
3572 # merges to avoid losing information about merged/dirty files.
3574 if p2 != nullid:
3573 if p2 != nullid:
3575 normal = repo.dirstate.normallookup
3574 normal = repo.dirstate.normallookup
3576 else:
3575 else:
3577 normal = repo.dirstate.normal
3576 normal = repo.dirstate.normal
3578 for f in revert[0]:
3577 for f in revert[0]:
3579 checkout(f)
3578 checkout(f)
3580 if normal:
3579 if normal:
3581 normal(f)
3580 normal(f)
3582
3581
3583 for f in add[0]:
3582 for f in add[0]:
3584 checkout(f)
3583 checkout(f)
3585 repo.dirstate.add(f)
3584 repo.dirstate.add(f)
3586
3585
3587 normal = repo.dirstate.normallookup
3586 normal = repo.dirstate.normallookup
3588 if node == parent and p2 == nullid:
3587 if node == parent and p2 == nullid:
3589 normal = repo.dirstate.normal
3588 normal = repo.dirstate.normal
3590 for f in undelete[0]:
3589 for f in undelete[0]:
3591 checkout(f)
3590 checkout(f)
3592 normal(f)
3591 normal(f)
3593
3592
3594 finally:
3593 finally:
3595 wlock.release()
3594 wlock.release()
3596
3595
3597 def rollback(ui, repo, **opts):
3596 def rollback(ui, repo, **opts):
3598 """roll back the last transaction (dangerous)
3597 """roll back the last transaction (dangerous)
3599
3598
3600 This command should be used with care. There is only one level of
3599 This command should be used with care. There is only one level of
3601 rollback, and there is no way to undo a rollback. It will also
3600 rollback, and there is no way to undo a rollback. It will also
3602 restore the dirstate at the time of the last transaction, losing
3601 restore the dirstate at the time of the last transaction, losing
3603 any dirstate changes since that time. This command does not alter
3602 any dirstate changes since that time. This command does not alter
3604 the working directory.
3603 the working directory.
3605
3604
3606 Transactions are used to encapsulate the effects of all commands
3605 Transactions are used to encapsulate the effects of all commands
3607 that create new changesets or propagate existing changesets into a
3606 that create new changesets or propagate existing changesets into a
3608 repository. For example, the following commands are transactional,
3607 repository. For example, the following commands are transactional,
3609 and their effects can be rolled back:
3608 and their effects can be rolled back:
3610
3609
3611 - commit
3610 - commit
3612 - import
3611 - import
3613 - pull
3612 - pull
3614 - push (with this repository as the destination)
3613 - push (with this repository as the destination)
3615 - unbundle
3614 - unbundle
3616
3615
3617 This command is not intended for use on public repositories. Once
3616 This command is not intended for use on public repositories. Once
3618 changes are visible for pull by other users, rolling a transaction
3617 changes are visible for pull by other users, rolling a transaction
3619 back locally is ineffective (someone else may already have pulled
3618 back locally is ineffective (someone else may already have pulled
3620 the changes). Furthermore, a race is possible with readers of the
3619 the changes). Furthermore, a race is possible with readers of the
3621 repository; for example an in-progress pull from the repository
3620 repository; for example an in-progress pull from the repository
3622 may fail if a rollback is performed.
3621 may fail if a rollback is performed.
3623
3622
3624 Returns 0 on success, 1 if no rollback data is available.
3623 Returns 0 on success, 1 if no rollback data is available.
3625 """
3624 """
3626 return repo.rollback(opts.get('dry_run'))
3625 return repo.rollback(opts.get('dry_run'))
3627
3626
3628 def root(ui, repo):
3627 def root(ui, repo):
3629 """print the root (top) of the current working directory
3628 """print the root (top) of the current working directory
3630
3629
3631 Print the root directory of the current repository.
3630 Print the root directory of the current repository.
3632
3631
3633 Returns 0 on success.
3632 Returns 0 on success.
3634 """
3633 """
3635 ui.write(repo.root + "\n")
3634 ui.write(repo.root + "\n")
3636
3635
3637 def serve(ui, repo, **opts):
3636 def serve(ui, repo, **opts):
3638 """start stand-alone webserver
3637 """start stand-alone webserver
3639
3638
3640 Start a local HTTP repository browser and pull server. You can use
3639 Start a local HTTP repository browser and pull server. You can use
3641 this for ad-hoc sharing and browsing of repositories. It is
3640 this for ad-hoc sharing and browsing of repositories. It is
3642 recommended to use a real web server to serve a repository for
3641 recommended to use a real web server to serve a repository for
3643 longer periods of time.
3642 longer periods of time.
3644
3643
3645 Please note that the server does not implement access control.
3644 Please note that the server does not implement access control.
3646 This means that, by default, anybody can read from the server and
3645 This means that, by default, anybody can read from the server and
3647 nobody can write to it by default. Set the ``web.allow_push``
3646 nobody can write to it by default. Set the ``web.allow_push``
3648 option to ``*`` to allow everybody to push to the server. You
3647 option to ``*`` to allow everybody to push to the server. You
3649 should use a real web server if you need to authenticate users.
3648 should use a real web server if you need to authenticate users.
3650
3649
3651 By default, the server logs accesses to stdout and errors to
3650 By default, the server logs accesses to stdout and errors to
3652 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
3651 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
3653 files.
3652 files.
3654
3653
3655 To have the server choose a free port number to listen on, specify
3654 To have the server choose a free port number to listen on, specify
3656 a port number of 0; in this case, the server will print the port
3655 a port number of 0; in this case, the server will print the port
3657 number it uses.
3656 number it uses.
3658
3657
3659 Returns 0 on success.
3658 Returns 0 on success.
3660 """
3659 """
3661
3660
3662 if opts["stdio"]:
3661 if opts["stdio"]:
3663 if repo is None:
3662 if repo is None:
3664 raise error.RepoError(_("There is no Mercurial repository here"
3663 raise error.RepoError(_("There is no Mercurial repository here"
3665 " (.hg not found)"))
3664 " (.hg not found)"))
3666 s = sshserver.sshserver(ui, repo)
3665 s = sshserver.sshserver(ui, repo)
3667 s.serve_forever()
3666 s.serve_forever()
3668
3667
3669 # this way we can check if something was given in the command-line
3668 # this way we can check if something was given in the command-line
3670 if opts.get('port'):
3669 if opts.get('port'):
3671 opts['port'] = util.getport(opts.get('port'))
3670 opts['port'] = util.getport(opts.get('port'))
3672
3671
3673 baseui = repo and repo.baseui or ui
3672 baseui = repo and repo.baseui or ui
3674 optlist = ("name templates style address port prefix ipv6"
3673 optlist = ("name templates style address port prefix ipv6"
3675 " accesslog errorlog certificate encoding")
3674 " accesslog errorlog certificate encoding")
3676 for o in optlist.split():
3675 for o in optlist.split():
3677 val = opts.get(o, '')
3676 val = opts.get(o, '')
3678 if val in (None, ''): # should check against default options instead
3677 if val in (None, ''): # should check against default options instead
3679 continue
3678 continue
3680 baseui.setconfig("web", o, val)
3679 baseui.setconfig("web", o, val)
3681 if repo and repo.ui != baseui:
3680 if repo and repo.ui != baseui:
3682 repo.ui.setconfig("web", o, val)
3681 repo.ui.setconfig("web", o, val)
3683
3682
3684 o = opts.get('web_conf') or opts.get('webdir_conf')
3683 o = opts.get('web_conf') or opts.get('webdir_conf')
3685 if not o:
3684 if not o:
3686 if not repo:
3685 if not repo:
3687 raise error.RepoError(_("There is no Mercurial repository"
3686 raise error.RepoError(_("There is no Mercurial repository"
3688 " here (.hg not found)"))
3687 " here (.hg not found)"))
3689 o = repo.root
3688 o = repo.root
3690
3689
3691 app = hgweb.hgweb(o, baseui=ui)
3690 app = hgweb.hgweb(o, baseui=ui)
3692
3691
3693 class service(object):
3692 class service(object):
3694 def init(self):
3693 def init(self):
3695 util.set_signal_handler()
3694 util.set_signal_handler()
3696 self.httpd = hgweb.server.create_server(ui, app)
3695 self.httpd = hgweb.server.create_server(ui, app)
3697
3696
3698 if opts['port'] and not ui.verbose:
3697 if opts['port'] and not ui.verbose:
3699 return
3698 return
3700
3699
3701 if self.httpd.prefix:
3700 if self.httpd.prefix:
3702 prefix = self.httpd.prefix.strip('/') + '/'
3701 prefix = self.httpd.prefix.strip('/') + '/'
3703 else:
3702 else:
3704 prefix = ''
3703 prefix = ''
3705
3704
3706 port = ':%d' % self.httpd.port
3705 port = ':%d' % self.httpd.port
3707 if port == ':80':
3706 if port == ':80':
3708 port = ''
3707 port = ''
3709
3708
3710 bindaddr = self.httpd.addr
3709 bindaddr = self.httpd.addr
3711 if bindaddr == '0.0.0.0':
3710 if bindaddr == '0.0.0.0':
3712 bindaddr = '*'
3711 bindaddr = '*'
3713 elif ':' in bindaddr: # IPv6
3712 elif ':' in bindaddr: # IPv6
3714 bindaddr = '[%s]' % bindaddr
3713 bindaddr = '[%s]' % bindaddr
3715
3714
3716 fqaddr = self.httpd.fqaddr
3715 fqaddr = self.httpd.fqaddr
3717 if ':' in fqaddr:
3716 if ':' in fqaddr:
3718 fqaddr = '[%s]' % fqaddr
3717 fqaddr = '[%s]' % fqaddr
3719 if opts['port']:
3718 if opts['port']:
3720 write = ui.status
3719 write = ui.status
3721 else:
3720 else:
3722 write = ui.write
3721 write = ui.write
3723 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
3722 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
3724 (fqaddr, port, prefix, bindaddr, self.httpd.port))
3723 (fqaddr, port, prefix, bindaddr, self.httpd.port))
3725
3724
3726 def run(self):
3725 def run(self):
3727 self.httpd.serve_forever()
3726 self.httpd.serve_forever()
3728
3727
3729 service = service()
3728 service = service()
3730
3729
3731 cmdutil.service(opts, initfn=service.init, runfn=service.run)
3730 cmdutil.service(opts, initfn=service.init, runfn=service.run)
3732
3731
3733 def status(ui, repo, *pats, **opts):
3732 def status(ui, repo, *pats, **opts):
3734 """show changed files in the working directory
3733 """show changed files in the working directory
3735
3734
3736 Show status of files in the repository. If names are given, only
3735 Show status of files in the repository. If names are given, only
3737 files that match are shown. Files that are clean or ignored or
3736 files that match are shown. Files that are clean or ignored or
3738 the source of a copy/move operation, are not listed unless
3737 the source of a copy/move operation, are not listed unless
3739 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
3738 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
3740 Unless options described with "show only ..." are given, the
3739 Unless options described with "show only ..." are given, the
3741 options -mardu are used.
3740 options -mardu are used.
3742
3741
3743 Option -q/--quiet hides untracked (unknown and ignored) files
3742 Option -q/--quiet hides untracked (unknown and ignored) files
3744 unless explicitly requested with -u/--unknown or -i/--ignored.
3743 unless explicitly requested with -u/--unknown or -i/--ignored.
3745
3744
3746 .. note::
3745 .. note::
3747 status may appear to disagree with diff if permissions have
3746 status may appear to disagree with diff if permissions have
3748 changed or a merge has occurred. The standard diff format does
3747 changed or a merge has occurred. The standard diff format does
3749 not report permission changes and diff only reports changes
3748 not report permission changes and diff only reports changes
3750 relative to one merge parent.
3749 relative to one merge parent.
3751
3750
3752 If one revision is given, it is used as the base revision.
3751 If one revision is given, it is used as the base revision.
3753 If two revisions are given, the differences between them are
3752 If two revisions are given, the differences between them are
3754 shown. The --change option can also be used as a shortcut to list
3753 shown. The --change option can also be used as a shortcut to list
3755 the changed files of a revision from its first parent.
3754 the changed files of a revision from its first parent.
3756
3755
3757 The codes used to show the status of files are::
3756 The codes used to show the status of files are::
3758
3757
3759 M = modified
3758 M = modified
3760 A = added
3759 A = added
3761 R = removed
3760 R = removed
3762 C = clean
3761 C = clean
3763 ! = missing (deleted by non-hg command, but still tracked)
3762 ! = missing (deleted by non-hg command, but still tracked)
3764 ? = not tracked
3763 ? = not tracked
3765 I = ignored
3764 I = ignored
3766 = origin of the previous file listed as A (added)
3765 = origin of the previous file listed as A (added)
3767
3766
3768 Returns 0 on success.
3767 Returns 0 on success.
3769 """
3768 """
3770
3769
3771 revs = opts.get('rev')
3770 revs = opts.get('rev')
3772 change = opts.get('change')
3771 change = opts.get('change')
3773
3772
3774 if revs and change:
3773 if revs and change:
3775 msg = _('cannot specify --rev and --change at the same time')
3774 msg = _('cannot specify --rev and --change at the same time')
3776 raise util.Abort(msg)
3775 raise util.Abort(msg)
3777 elif change:
3776 elif change:
3778 node2 = repo.lookup(change)
3777 node2 = repo.lookup(change)
3779 node1 = repo[node2].p1().node()
3778 node1 = repo[node2].p1().node()
3780 else:
3779 else:
3781 node1, node2 = cmdutil.revpair(repo, revs)
3780 node1, node2 = cmdutil.revpair(repo, revs)
3782
3781
3783 cwd = (pats and repo.getcwd()) or ''
3782 cwd = (pats and repo.getcwd()) or ''
3784 end = opts.get('print0') and '\0' or '\n'
3783 end = opts.get('print0') and '\0' or '\n'
3785 copy = {}
3784 copy = {}
3786 states = 'modified added removed deleted unknown ignored clean'.split()
3785 states = 'modified added removed deleted unknown ignored clean'.split()
3787 show = [k for k in states if opts.get(k)]
3786 show = [k for k in states if opts.get(k)]
3788 if opts.get('all'):
3787 if opts.get('all'):
3789 show += ui.quiet and (states[:4] + ['clean']) or states
3788 show += ui.quiet and (states[:4] + ['clean']) or states
3790 if not show:
3789 if not show:
3791 show = ui.quiet and states[:4] or states[:5]
3790 show = ui.quiet and states[:4] or states[:5]
3792
3791
3793 stat = repo.status(node1, node2, cmdutil.match(repo, pats, opts),
3792 stat = repo.status(node1, node2, cmdutil.match(repo, pats, opts),
3794 'ignored' in show, 'clean' in show, 'unknown' in show,
3793 'ignored' in show, 'clean' in show, 'unknown' in show,
3795 opts.get('subrepos'))
3794 opts.get('subrepos'))
3796 changestates = zip(states, 'MAR!?IC', stat)
3795 changestates = zip(states, 'MAR!?IC', stat)
3797
3796
3798 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
3797 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
3799 ctxn = repo[nullid]
3798 ctxn = repo[nullid]
3800 ctx1 = repo[node1]
3799 ctx1 = repo[node1]
3801 ctx2 = repo[node2]
3800 ctx2 = repo[node2]
3802 added = stat[1]
3801 added = stat[1]
3803 if node2 is None:
3802 if node2 is None:
3804 added = stat[0] + stat[1] # merged?
3803 added = stat[0] + stat[1] # merged?
3805
3804
3806 for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].iteritems():
3805 for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].iteritems():
3807 if k in added:
3806 if k in added:
3808 copy[k] = v
3807 copy[k] = v
3809 elif v in added:
3808 elif v in added:
3810 copy[v] = k
3809 copy[v] = k
3811
3810
3812 for state, char, files in changestates:
3811 for state, char, files in changestates:
3813 if state in show:
3812 if state in show:
3814 format = "%s %%s%s" % (char, end)
3813 format = "%s %%s%s" % (char, end)
3815 if opts.get('no_status'):
3814 if opts.get('no_status'):
3816 format = "%%s%s" % end
3815 format = "%%s%s" % end
3817
3816
3818 for f in files:
3817 for f in files:
3819 ui.write(format % repo.pathto(f, cwd),
3818 ui.write(format % repo.pathto(f, cwd),
3820 label='status.' + state)
3819 label='status.' + state)
3821 if f in copy:
3820 if f in copy:
3822 ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end),
3821 ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end),
3823 label='status.copied')
3822 label='status.copied')
3824
3823
3825 def summary(ui, repo, **opts):
3824 def summary(ui, repo, **opts):
3826 """summarize working directory state
3825 """summarize working directory state
3827
3826
3828 This generates a brief summary of the working directory state,
3827 This generates a brief summary of the working directory state,
3829 including parents, branch, commit status, and available updates.
3828 including parents, branch, commit status, and available updates.
3830
3829
3831 With the --remote option, this will check the default paths for
3830 With the --remote option, this will check the default paths for
3832 incoming and outgoing changes. This can be time-consuming.
3831 incoming and outgoing changes. This can be time-consuming.
3833
3832
3834 Returns 0 on success.
3833 Returns 0 on success.
3835 """
3834 """
3836
3835
3837 ctx = repo[None]
3836 ctx = repo[None]
3838 parents = ctx.parents()
3837 parents = ctx.parents()
3839 pnode = parents[0].node()
3838 pnode = parents[0].node()
3840
3839
3841 for p in parents:
3840 for p in parents:
3842 # label with log.changeset (instead of log.parent) since this
3841 # label with log.changeset (instead of log.parent) since this
3843 # shows a working directory parent *changeset*:
3842 # shows a working directory parent *changeset*:
3844 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
3843 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
3845 label='log.changeset')
3844 label='log.changeset')
3846 ui.write(' '.join(p.tags()), label='log.tag')
3845 ui.write(' '.join(p.tags()), label='log.tag')
3847 if p.bookmarks():
3846 if p.bookmarks():
3848 ui.write(' ' + ' '.join(p.bookmarks()), label='log.bookmark')
3847 ui.write(' ' + ' '.join(p.bookmarks()), label='log.bookmark')
3849 if p.rev() == -1:
3848 if p.rev() == -1:
3850 if not len(repo):
3849 if not len(repo):
3851 ui.write(_(' (empty repository)'))
3850 ui.write(_(' (empty repository)'))
3852 else:
3851 else:
3853 ui.write(_(' (no revision checked out)'))
3852 ui.write(_(' (no revision checked out)'))
3854 ui.write('\n')
3853 ui.write('\n')
3855 if p.description():
3854 if p.description():
3856 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
3855 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
3857 label='log.summary')
3856 label='log.summary')
3858
3857
3859 branch = ctx.branch()
3858 branch = ctx.branch()
3860 bheads = repo.branchheads(branch)
3859 bheads = repo.branchheads(branch)
3861 m = _('branch: %s\n') % branch
3860 m = _('branch: %s\n') % branch
3862 if branch != 'default':
3861 if branch != 'default':
3863 ui.write(m, label='log.branch')
3862 ui.write(m, label='log.branch')
3864 else:
3863 else:
3865 ui.status(m, label='log.branch')
3864 ui.status(m, label='log.branch')
3866
3865
3867 st = list(repo.status(unknown=True))[:6]
3866 st = list(repo.status(unknown=True))[:6]
3868
3867
3869 c = repo.dirstate.copies()
3868 c = repo.dirstate.copies()
3870 copied, renamed = [], []
3869 copied, renamed = [], []
3871 for d, s in c.iteritems():
3870 for d, s in c.iteritems():
3872 if s in st[2]:
3871 if s in st[2]:
3873 st[2].remove(s)
3872 st[2].remove(s)
3874 renamed.append(d)
3873 renamed.append(d)
3875 else:
3874 else:
3876 copied.append(d)
3875 copied.append(d)
3877 if d in st[1]:
3876 if d in st[1]:
3878 st[1].remove(d)
3877 st[1].remove(d)
3879 st.insert(3, renamed)
3878 st.insert(3, renamed)
3880 st.insert(4, copied)
3879 st.insert(4, copied)
3881
3880
3882 ms = mergemod.mergestate(repo)
3881 ms = mergemod.mergestate(repo)
3883 st.append([f for f in ms if ms[f] == 'u'])
3882 st.append([f for f in ms if ms[f] == 'u'])
3884
3883
3885 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
3884 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
3886 st.append(subs)
3885 st.append(subs)
3887
3886
3888 labels = [ui.label(_('%d modified'), 'status.modified'),
3887 labels = [ui.label(_('%d modified'), 'status.modified'),
3889 ui.label(_('%d added'), 'status.added'),
3888 ui.label(_('%d added'), 'status.added'),
3890 ui.label(_('%d removed'), 'status.removed'),
3889 ui.label(_('%d removed'), 'status.removed'),
3891 ui.label(_('%d renamed'), 'status.copied'),
3890 ui.label(_('%d renamed'), 'status.copied'),
3892 ui.label(_('%d copied'), 'status.copied'),
3891 ui.label(_('%d copied'), 'status.copied'),
3893 ui.label(_('%d deleted'), 'status.deleted'),
3892 ui.label(_('%d deleted'), 'status.deleted'),
3894 ui.label(_('%d unknown'), 'status.unknown'),
3893 ui.label(_('%d unknown'), 'status.unknown'),
3895 ui.label(_('%d ignored'), 'status.ignored'),
3894 ui.label(_('%d ignored'), 'status.ignored'),
3896 ui.label(_('%d unresolved'), 'resolve.unresolved'),
3895 ui.label(_('%d unresolved'), 'resolve.unresolved'),
3897 ui.label(_('%d subrepos'), 'status.modified')]
3896 ui.label(_('%d subrepos'), 'status.modified')]
3898 t = []
3897 t = []
3899 for s, l in zip(st, labels):
3898 for s, l in zip(st, labels):
3900 if s:
3899 if s:
3901 t.append(l % len(s))
3900 t.append(l % len(s))
3902
3901
3903 t = ', '.join(t)
3902 t = ', '.join(t)
3904 cleanworkdir = False
3903 cleanworkdir = False
3905
3904
3906 if len(parents) > 1:
3905 if len(parents) > 1:
3907 t += _(' (merge)')
3906 t += _(' (merge)')
3908 elif branch != parents[0].branch():
3907 elif branch != parents[0].branch():
3909 t += _(' (new branch)')
3908 t += _(' (new branch)')
3910 elif (parents[0].extra().get('close') and
3909 elif (parents[0].extra().get('close') and
3911 pnode in repo.branchheads(branch, closed=True)):
3910 pnode in repo.branchheads(branch, closed=True)):
3912 t += _(' (head closed)')
3911 t += _(' (head closed)')
3913 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
3912 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
3914 t += _(' (clean)')
3913 t += _(' (clean)')
3915 cleanworkdir = True
3914 cleanworkdir = True
3916 elif pnode not in bheads:
3915 elif pnode not in bheads:
3917 t += _(' (new branch head)')
3916 t += _(' (new branch head)')
3918
3917
3919 if cleanworkdir:
3918 if cleanworkdir:
3920 ui.status(_('commit: %s\n') % t.strip())
3919 ui.status(_('commit: %s\n') % t.strip())
3921 else:
3920 else:
3922 ui.write(_('commit: %s\n') % t.strip())
3921 ui.write(_('commit: %s\n') % t.strip())
3923
3922
3924 # all ancestors of branch heads - all ancestors of parent = new csets
3923 # all ancestors of branch heads - all ancestors of parent = new csets
3925 new = [0] * len(repo)
3924 new = [0] * len(repo)
3926 cl = repo.changelog
3925 cl = repo.changelog
3927 for a in [cl.rev(n) for n in bheads]:
3926 for a in [cl.rev(n) for n in bheads]:
3928 new[a] = 1
3927 new[a] = 1
3929 for a in cl.ancestors(*[cl.rev(n) for n in bheads]):
3928 for a in cl.ancestors(*[cl.rev(n) for n in bheads]):
3930 new[a] = 1
3929 new[a] = 1
3931 for a in [p.rev() for p in parents]:
3930 for a in [p.rev() for p in parents]:
3932 if a >= 0:
3931 if a >= 0:
3933 new[a] = 0
3932 new[a] = 0
3934 for a in cl.ancestors(*[p.rev() for p in parents]):
3933 for a in cl.ancestors(*[p.rev() for p in parents]):
3935 new[a] = 0
3934 new[a] = 0
3936 new = sum(new)
3935 new = sum(new)
3937
3936
3938 if new == 0:
3937 if new == 0:
3939 ui.status(_('update: (current)\n'))
3938 ui.status(_('update: (current)\n'))
3940 elif pnode not in bheads:
3939 elif pnode not in bheads:
3941 ui.write(_('update: %d new changesets (update)\n') % new)
3940 ui.write(_('update: %d new changesets (update)\n') % new)
3942 else:
3941 else:
3943 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
3942 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
3944 (new, len(bheads)))
3943 (new, len(bheads)))
3945
3944
3946 if opts.get('remote'):
3945 if opts.get('remote'):
3947 t = []
3946 t = []
3948 source, branches = hg.parseurl(ui.expandpath('default'))
3947 source, branches = hg.parseurl(ui.expandpath('default'))
3949 other = hg.repository(hg.remoteui(repo, {}), source)
3948 other = hg.repository(hg.remoteui(repo, {}), source)
3950 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
3949 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
3951 ui.debug('comparing with %s\n' % url.hidepassword(source))
3950 ui.debug('comparing with %s\n' % url.hidepassword(source))
3952 repo.ui.pushbuffer()
3951 repo.ui.pushbuffer()
3953 common, incoming, rheads = discovery.findcommonincoming(repo, other)
3952 common, incoming, rheads = discovery.findcommonincoming(repo, other)
3954 repo.ui.popbuffer()
3953 repo.ui.popbuffer()
3955 if incoming:
3954 if incoming:
3956 t.append(_('1 or more incoming'))
3955 t.append(_('1 or more incoming'))
3957
3956
3958 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
3957 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
3959 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
3958 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
3960 other = hg.repository(hg.remoteui(repo, {}), dest)
3959 other = hg.repository(hg.remoteui(repo, {}), dest)
3961 ui.debug('comparing with %s\n' % url.hidepassword(dest))
3960 ui.debug('comparing with %s\n' % url.hidepassword(dest))
3962 repo.ui.pushbuffer()
3961 repo.ui.pushbuffer()
3963 o = discovery.findoutgoing(repo, other)
3962 o = discovery.findoutgoing(repo, other)
3964 repo.ui.popbuffer()
3963 repo.ui.popbuffer()
3965 o = repo.changelog.nodesbetween(o, None)[0]
3964 o = repo.changelog.nodesbetween(o, None)[0]
3966 if o:
3965 if o:
3967 t.append(_('%d outgoing') % len(o))
3966 t.append(_('%d outgoing') % len(o))
3968 if 'bookmarks' in other.listkeys('namespaces'):
3967 if 'bookmarks' in other.listkeys('namespaces'):
3969 lmarks = repo.listkeys('bookmarks')
3968 lmarks = repo.listkeys('bookmarks')
3970 rmarks = other.listkeys('bookmarks')
3969 rmarks = other.listkeys('bookmarks')
3971 diff = set(rmarks) - set(lmarks)
3970 diff = set(rmarks) - set(lmarks)
3972 if len(diff) > 0:
3971 if len(diff) > 0:
3973 t.append(_('%d incoming bookmarks') % len(diff))
3972 t.append(_('%d incoming bookmarks') % len(diff))
3974 diff = set(lmarks) - set(rmarks)
3973 diff = set(lmarks) - set(rmarks)
3975 if len(diff) > 0:
3974 if len(diff) > 0:
3976 t.append(_('%d outgoing bookmarks') % len(diff))
3975 t.append(_('%d outgoing bookmarks') % len(diff))
3977
3976
3978 if t:
3977 if t:
3979 ui.write(_('remote: %s\n') % (', '.join(t)))
3978 ui.write(_('remote: %s\n') % (', '.join(t)))
3980 else:
3979 else:
3981 ui.status(_('remote: (synced)\n'))
3980 ui.status(_('remote: (synced)\n'))
3982
3981
3983 def tag(ui, repo, name1, *names, **opts):
3982 def tag(ui, repo, name1, *names, **opts):
3984 """add one or more tags for the current or given revision
3983 """add one or more tags for the current or given revision
3985
3984
3986 Name a particular revision using <name>.
3985 Name a particular revision using <name>.
3987
3986
3988 Tags are used to name particular revisions of the repository and are
3987 Tags are used to name particular revisions of the repository and are
3989 very useful to compare different revisions, to go back to significant
3988 very useful to compare different revisions, to go back to significant
3990 earlier versions or to mark branch points as releases, etc. Changing
3989 earlier versions or to mark branch points as releases, etc. Changing
3991 an existing tag is normally disallowed; use -f/--force to override.
3990 an existing tag is normally disallowed; use -f/--force to override.
3992
3991
3993 If no revision is given, the parent of the working directory is
3992 If no revision is given, the parent of the working directory is
3994 used, or tip if no revision is checked out.
3993 used, or tip if no revision is checked out.
3995
3994
3996 To facilitate version control, distribution, and merging of tags,
3995 To facilitate version control, distribution, and merging of tags,
3997 they are stored as a file named ".hgtags" which is managed similarly
3996 they are stored as a file named ".hgtags" which is managed similarly
3998 to other project files and can be hand-edited if necessary. This
3997 to other project files and can be hand-edited if necessary. This
3999 also means that tagging creates a new commit. The file
3998 also means that tagging creates a new commit. The file
4000 ".hg/localtags" is used for local tags (not shared among
3999 ".hg/localtags" is used for local tags (not shared among
4001 repositories).
4000 repositories).
4002
4001
4003 Tag commits are usually made at the head of a branch. If the parent
4002 Tag commits are usually made at the head of a branch. If the parent
4004 of the working directory is not a branch head, :hg:`tag` aborts; use
4003 of the working directory is not a branch head, :hg:`tag` aborts; use
4005 -f/--force to force the tag commit to be based on a non-head
4004 -f/--force to force the tag commit to be based on a non-head
4006 changeset.
4005 changeset.
4007
4006
4008 See :hg:`help dates` for a list of formats valid for -d/--date.
4007 See :hg:`help dates` for a list of formats valid for -d/--date.
4009
4008
4010 Since tag names have priority over branch names during revision
4009 Since tag names have priority over branch names during revision
4011 lookup, using an existing branch name as a tag name is discouraged.
4010 lookup, using an existing branch name as a tag name is discouraged.
4012
4011
4013 Returns 0 on success.
4012 Returns 0 on success.
4014 """
4013 """
4015
4014
4016 rev_ = "."
4015 rev_ = "."
4017 names = [t.strip() for t in (name1,) + names]
4016 names = [t.strip() for t in (name1,) + names]
4018 if len(names) != len(set(names)):
4017 if len(names) != len(set(names)):
4019 raise util.Abort(_('tag names must be unique'))
4018 raise util.Abort(_('tag names must be unique'))
4020 for n in names:
4019 for n in names:
4021 if n in ['tip', '.', 'null']:
4020 if n in ['tip', '.', 'null']:
4022 raise util.Abort(_('the name \'%s\' is reserved') % n)
4021 raise util.Abort(_('the name \'%s\' is reserved') % n)
4023 if not n:
4022 if not n:
4024 raise util.Abort(_('tag names cannot consist entirely of whitespace'))
4023 raise util.Abort(_('tag names cannot consist entirely of whitespace'))
4025 if opts.get('rev') and opts.get('remove'):
4024 if opts.get('rev') and opts.get('remove'):
4026 raise util.Abort(_("--rev and --remove are incompatible"))
4025 raise util.Abort(_("--rev and --remove are incompatible"))
4027 if opts.get('rev'):
4026 if opts.get('rev'):
4028 rev_ = opts['rev']
4027 rev_ = opts['rev']
4029 message = opts.get('message')
4028 message = opts.get('message')
4030 if opts.get('remove'):
4029 if opts.get('remove'):
4031 expectedtype = opts.get('local') and 'local' or 'global'
4030 expectedtype = opts.get('local') and 'local' or 'global'
4032 for n in names:
4031 for n in names:
4033 if not repo.tagtype(n):
4032 if not repo.tagtype(n):
4034 raise util.Abort(_('tag \'%s\' does not exist') % n)
4033 raise util.Abort(_('tag \'%s\' does not exist') % n)
4035 if repo.tagtype(n) != expectedtype:
4034 if repo.tagtype(n) != expectedtype:
4036 if expectedtype == 'global':
4035 if expectedtype == 'global':
4037 raise util.Abort(_('tag \'%s\' is not a global tag') % n)
4036 raise util.Abort(_('tag \'%s\' is not a global tag') % n)
4038 else:
4037 else:
4039 raise util.Abort(_('tag \'%s\' is not a local tag') % n)
4038 raise util.Abort(_('tag \'%s\' is not a local tag') % n)
4040 rev_ = nullid
4039 rev_ = nullid
4041 if not message:
4040 if not message:
4042 # we don't translate commit messages
4041 # we don't translate commit messages
4043 message = 'Removed tag %s' % ', '.join(names)
4042 message = 'Removed tag %s' % ', '.join(names)
4044 elif not opts.get('force'):
4043 elif not opts.get('force'):
4045 for n in names:
4044 for n in names:
4046 if n in repo.tags():
4045 if n in repo.tags():
4047 raise util.Abort(_('tag \'%s\' already exists '
4046 raise util.Abort(_('tag \'%s\' already exists '
4048 '(use -f to force)') % n)
4047 '(use -f to force)') % n)
4049 if not opts.get('local'):
4048 if not opts.get('local'):
4050 p1, p2 = repo.dirstate.parents()
4049 p1, p2 = repo.dirstate.parents()
4051 if p2 != nullid:
4050 if p2 != nullid:
4052 raise util.Abort(_('uncommitted merge'))
4051 raise util.Abort(_('uncommitted merge'))
4053 bheads = repo.branchheads()
4052 bheads = repo.branchheads()
4054 if not opts.get('force') and bheads and p1 not in bheads:
4053 if not opts.get('force') and bheads and p1 not in bheads:
4055 raise util.Abort(_('not at a branch head (use -f to force)'))
4054 raise util.Abort(_('not at a branch head (use -f to force)'))
4056 r = cmdutil.revsingle(repo, rev_).node()
4055 r = cmdutil.revsingle(repo, rev_).node()
4057
4056
4058 if not message:
4057 if not message:
4059 # we don't translate commit messages
4058 # we don't translate commit messages
4060 message = ('Added tag %s for changeset %s' %
4059 message = ('Added tag %s for changeset %s' %
4061 (', '.join(names), short(r)))
4060 (', '.join(names), short(r)))
4062
4061
4063 date = opts.get('date')
4062 date = opts.get('date')
4064 if date:
4063 if date:
4065 date = util.parsedate(date)
4064 date = util.parsedate(date)
4066
4065
4067 if opts.get('edit'):
4066 if opts.get('edit'):
4068 message = ui.edit(message, ui.username())
4067 message = ui.edit(message, ui.username())
4069
4068
4070 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
4069 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
4071
4070
4072 def tags(ui, repo):
4071 def tags(ui, repo):
4073 """list repository tags
4072 """list repository tags
4074
4073
4075 This lists both regular and local tags. When the -v/--verbose
4074 This lists both regular and local tags. When the -v/--verbose
4076 switch is used, a third column "local" is printed for local tags.
4075 switch is used, a third column "local" is printed for local tags.
4077
4076
4078 Returns 0 on success.
4077 Returns 0 on success.
4079 """
4078 """
4080
4079
4081 hexfunc = ui.debugflag and hex or short
4080 hexfunc = ui.debugflag and hex or short
4082 tagtype = ""
4081 tagtype = ""
4083
4082
4084 for t, n in reversed(repo.tagslist()):
4083 for t, n in reversed(repo.tagslist()):
4085 if ui.quiet:
4084 if ui.quiet:
4086 ui.write("%s\n" % t)
4085 ui.write("%s\n" % t)
4087 continue
4086 continue
4088
4087
4089 hn = hexfunc(n)
4088 hn = hexfunc(n)
4090 r = "%5d:%s" % (repo.changelog.rev(n), hn)
4089 r = "%5d:%s" % (repo.changelog.rev(n), hn)
4091 spaces = " " * (30 - encoding.colwidth(t))
4090 spaces = " " * (30 - encoding.colwidth(t))
4092
4091
4093 if ui.verbose:
4092 if ui.verbose:
4094 if repo.tagtype(t) == 'local':
4093 if repo.tagtype(t) == 'local':
4095 tagtype = " local"
4094 tagtype = " local"
4096 else:
4095 else:
4097 tagtype = ""
4096 tagtype = ""
4098 ui.write("%s%s %s%s\n" % (t, spaces, r, tagtype))
4097 ui.write("%s%s %s%s\n" % (t, spaces, r, tagtype))
4099
4098
4100 def tip(ui, repo, **opts):
4099 def tip(ui, repo, **opts):
4101 """show the tip revision
4100 """show the tip revision
4102
4101
4103 The tip revision (usually just called the tip) is the changeset
4102 The tip revision (usually just called the tip) is the changeset
4104 most recently added to the repository (and therefore the most
4103 most recently added to the repository (and therefore the most
4105 recently changed head).
4104 recently changed head).
4106
4105
4107 If you have just made a commit, that commit will be the tip. If
4106 If you have just made a commit, that commit will be the tip. If
4108 you have just pulled changes from another repository, the tip of
4107 you have just pulled changes from another repository, the tip of
4109 that repository becomes the current tip. The "tip" tag is special
4108 that repository becomes the current tip. The "tip" tag is special
4110 and cannot be renamed or assigned to a different changeset.
4109 and cannot be renamed or assigned to a different changeset.
4111
4110
4112 Returns 0 on success.
4111 Returns 0 on success.
4113 """
4112 """
4114 displayer = cmdutil.show_changeset(ui, repo, opts)
4113 displayer = cmdutil.show_changeset(ui, repo, opts)
4115 displayer.show(repo[len(repo) - 1])
4114 displayer.show(repo[len(repo) - 1])
4116 displayer.close()
4115 displayer.close()
4117
4116
4118 def unbundle(ui, repo, fname1, *fnames, **opts):
4117 def unbundle(ui, repo, fname1, *fnames, **opts):
4119 """apply one or more changegroup files
4118 """apply one or more changegroup files
4120
4119
4121 Apply one or more compressed changegroup files generated by the
4120 Apply one or more compressed changegroup files generated by the
4122 bundle command.
4121 bundle command.
4123
4122
4124 Returns 0 on success, 1 if an update has unresolved files.
4123 Returns 0 on success, 1 if an update has unresolved files.
4125 """
4124 """
4126 fnames = (fname1,) + fnames
4125 fnames = (fname1,) + fnames
4127
4126
4128 lock = repo.lock()
4127 lock = repo.lock()
4129 wc = repo['.']
4128 wc = repo['.']
4130 try:
4129 try:
4131 for fname in fnames:
4130 for fname in fnames:
4132 f = url.open(ui, fname)
4131 f = url.open(ui, fname)
4133 gen = changegroup.readbundle(f, fname)
4132 gen = changegroup.readbundle(f, fname)
4134 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname,
4133 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname,
4135 lock=lock)
4134 lock=lock)
4136 bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
4135 bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
4137 finally:
4136 finally:
4138 lock.release()
4137 lock.release()
4139 return postincoming(ui, repo, modheads, opts.get('update'), None)
4138 return postincoming(ui, repo, modheads, opts.get('update'), None)
4140
4139
4141 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
4140 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
4142 """update working directory (or switch revisions)
4141 """update working directory (or switch revisions)
4143
4142
4144 Update the repository's working directory to the specified
4143 Update the repository's working directory to the specified
4145 changeset. If no changeset is specified, update to the tip of the
4144 changeset. If no changeset is specified, update to the tip of the
4146 current named branch.
4145 current named branch.
4147
4146
4148 If the changeset is not a descendant of the working directory's
4147 If the changeset is not a descendant of the working directory's
4149 parent, the update is aborted. With the -c/--check option, the
4148 parent, the update is aborted. With the -c/--check option, the
4150 working directory is checked for uncommitted changes; if none are
4149 working directory is checked for uncommitted changes; if none are
4151 found, the working directory is updated to the specified
4150 found, the working directory is updated to the specified
4152 changeset.
4151 changeset.
4153
4152
4154 The following rules apply when the working directory contains
4153 The following rules apply when the working directory contains
4155 uncommitted changes:
4154 uncommitted changes:
4156
4155
4157 1. If neither -c/--check nor -C/--clean is specified, and if
4156 1. If neither -c/--check nor -C/--clean is specified, and if
4158 the requested changeset is an ancestor or descendant of
4157 the requested changeset is an ancestor or descendant of
4159 the working directory's parent, the uncommitted changes
4158 the working directory's parent, the uncommitted changes
4160 are merged into the requested changeset and the merged
4159 are merged into the requested changeset and the merged
4161 result is left uncommitted. If the requested changeset is
4160 result is left uncommitted. If the requested changeset is
4162 not an ancestor or descendant (that is, it is on another
4161 not an ancestor or descendant (that is, it is on another
4163 branch), the update is aborted and the uncommitted changes
4162 branch), the update is aborted and the uncommitted changes
4164 are preserved.
4163 are preserved.
4165
4164
4166 2. With the -c/--check option, the update is aborted and the
4165 2. With the -c/--check option, the update is aborted and the
4167 uncommitted changes are preserved.
4166 uncommitted changes are preserved.
4168
4167
4169 3. With the -C/--clean option, uncommitted changes are discarded and
4168 3. With the -C/--clean option, uncommitted changes are discarded and
4170 the working directory is updated to the requested changeset.
4169 the working directory is updated to the requested changeset.
4171
4170
4172 Use null as the changeset to remove the working directory (like
4171 Use null as the changeset to remove the working directory (like
4173 :hg:`clone -U`).
4172 :hg:`clone -U`).
4174
4173
4175 If you want to update just one file to an older changeset, use
4174 If you want to update just one file to an older changeset, use
4176 :hg:`revert`.
4175 :hg:`revert`.
4177
4176
4178 See :hg:`help dates` for a list of formats valid for -d/--date.
4177 See :hg:`help dates` for a list of formats valid for -d/--date.
4179
4178
4180 Returns 0 on success, 1 if there are unresolved files.
4179 Returns 0 on success, 1 if there are unresolved files.
4181 """
4180 """
4182 if rev and node:
4181 if rev and node:
4183 raise util.Abort(_("please specify just one revision"))
4182 raise util.Abort(_("please specify just one revision"))
4184
4183
4185 if rev is None or rev == '':
4184 if rev is None or rev == '':
4186 rev = node
4185 rev = node
4187
4186
4188 # if we defined a bookmark, we have to remember the original bookmark name
4187 # if we defined a bookmark, we have to remember the original bookmark name
4189 brev = rev
4188 brev = rev
4190 rev = cmdutil.revsingle(repo, rev, rev).rev()
4189 rev = cmdutil.revsingle(repo, rev, rev).rev()
4191
4190
4192 if check and clean:
4191 if check and clean:
4193 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
4192 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
4194
4193
4195 if check:
4194 if check:
4196 # we could use dirty() but we can ignore merge and branch trivia
4195 # we could use dirty() but we can ignore merge and branch trivia
4197 c = repo[None]
4196 c = repo[None]
4198 if c.modified() or c.added() or c.removed():
4197 if c.modified() or c.added() or c.removed():
4199 raise util.Abort(_("uncommitted local changes"))
4198 raise util.Abort(_("uncommitted local changes"))
4200
4199
4201 if date:
4200 if date:
4202 if rev is not None:
4201 if rev is not None:
4203 raise util.Abort(_("you can't specify a revision and a date"))
4202 raise util.Abort(_("you can't specify a revision and a date"))
4204 rev = cmdutil.finddate(ui, repo, date)
4203 rev = cmdutil.finddate(ui, repo, date)
4205
4204
4206 if clean or check:
4205 if clean or check:
4207 ret = hg.clean(repo, rev)
4206 ret = hg.clean(repo, rev)
4208 else:
4207 else:
4209 ret = hg.update(repo, rev)
4208 ret = hg.update(repo, rev)
4210
4209
4211 if brev in repo._bookmarks:
4210 if brev in repo._bookmarks:
4212 bookmarks.setcurrent(repo, brev)
4211 bookmarks.setcurrent(repo, brev)
4213
4212
4214 return ret
4213 return ret
4215
4214
4216 def verify(ui, repo):
4215 def verify(ui, repo):
4217 """verify the integrity of the repository
4216 """verify the integrity of the repository
4218
4217
4219 Verify the integrity of the current repository.
4218 Verify the integrity of the current repository.
4220
4219
4221 This will perform an extensive check of the repository's
4220 This will perform an extensive check of the repository's
4222 integrity, validating the hashes and checksums of each entry in
4221 integrity, validating the hashes and checksums of each entry in
4223 the changelog, manifest, and tracked files, as well as the
4222 the changelog, manifest, and tracked files, as well as the
4224 integrity of their crosslinks and indices.
4223 integrity of their crosslinks and indices.
4225
4224
4226 Returns 0 on success, 1 if errors are encountered.
4225 Returns 0 on success, 1 if errors are encountered.
4227 """
4226 """
4228 return hg.verify(repo)
4227 return hg.verify(repo)
4229
4228
4230 def version_(ui):
4229 def version_(ui):
4231 """output version and copyright information"""
4230 """output version and copyright information"""
4232 ui.write(_("Mercurial Distributed SCM (version %s)\n")
4231 ui.write(_("Mercurial Distributed SCM (version %s)\n")
4233 % util.version())
4232 % util.version())
4234 ui.status(_(
4233 ui.status(_(
4235 "(see http://mercurial.selenic.com for more information)\n"
4234 "(see http://mercurial.selenic.com for more information)\n"
4236 "\nCopyright (C) 2005-2011 Matt Mackall and others\n"
4235 "\nCopyright (C) 2005-2011 Matt Mackall and others\n"
4237 "This is free software; see the source for copying conditions. "
4236 "This is free software; see the source for copying conditions. "
4238 "There is NO\nwarranty; "
4237 "There is NO\nwarranty; "
4239 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
4238 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
4240 ))
4239 ))
4241
4240
4242 # Command options and aliases are listed here, alphabetically
4241 # Command options and aliases are listed here, alphabetically
4243
4242
4244 globalopts = [
4243 globalopts = [
4245 ('R', 'repository', '',
4244 ('R', 'repository', '',
4246 _('repository root directory or name of overlay bundle file'),
4245 _('repository root directory or name of overlay bundle file'),
4247 _('REPO')),
4246 _('REPO')),
4248 ('', 'cwd', '',
4247 ('', 'cwd', '',
4249 _('change working directory'), _('DIR')),
4248 _('change working directory'), _('DIR')),
4250 ('y', 'noninteractive', None,
4249 ('y', 'noninteractive', None,
4251 _('do not prompt, assume \'yes\' for any required answers')),
4250 _('do not prompt, assume \'yes\' for any required answers')),
4252 ('q', 'quiet', None, _('suppress output')),
4251 ('q', 'quiet', None, _('suppress output')),
4253 ('v', 'verbose', None, _('enable additional output')),
4252 ('v', 'verbose', None, _('enable additional output')),
4254 ('', 'config', [],
4253 ('', 'config', [],
4255 _('set/override config option (use \'section.name=value\')'),
4254 _('set/override config option (use \'section.name=value\')'),
4256 _('CONFIG')),
4255 _('CONFIG')),
4257 ('', 'debug', None, _('enable debugging output')),
4256 ('', 'debug', None, _('enable debugging output')),
4258 ('', 'debugger', None, _('start debugger')),
4257 ('', 'debugger', None, _('start debugger')),
4259 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
4258 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
4260 _('ENCODE')),
4259 _('ENCODE')),
4261 ('', 'encodingmode', encoding.encodingmode,
4260 ('', 'encodingmode', encoding.encodingmode,
4262 _('set the charset encoding mode'), _('MODE')),
4261 _('set the charset encoding mode'), _('MODE')),
4263 ('', 'traceback', None, _('always print a traceback on exception')),
4262 ('', 'traceback', None, _('always print a traceback on exception')),
4264 ('', 'time', None, _('time how long the command takes')),
4263 ('', 'time', None, _('time how long the command takes')),
4265 ('', 'profile', None, _('print command execution profile')),
4264 ('', 'profile', None, _('print command execution profile')),
4266 ('', 'version', None, _('output version information and exit')),
4265 ('', 'version', None, _('output version information and exit')),
4267 ('h', 'help', None, _('display help and exit')),
4266 ('h', 'help', None, _('display help and exit')),
4268 ]
4267 ]
4269
4268
4270 dryrunopts = [('n', 'dry-run', None,
4269 dryrunopts = [('n', 'dry-run', None,
4271 _('do not perform actions, just print output'))]
4270 _('do not perform actions, just print output'))]
4272
4271
4273 remoteopts = [
4272 remoteopts = [
4274 ('e', 'ssh', '',
4273 ('e', 'ssh', '',
4275 _('specify ssh command to use'), _('CMD')),
4274 _('specify ssh command to use'), _('CMD')),
4276 ('', 'remotecmd', '',
4275 ('', 'remotecmd', '',
4277 _('specify hg command to run on the remote side'), _('CMD')),
4276 _('specify hg command to run on the remote side'), _('CMD')),
4278 ('', 'insecure', None,
4277 ('', 'insecure', None,
4279 _('do not verify server certificate (ignoring web.cacerts config)')),
4278 _('do not verify server certificate (ignoring web.cacerts config)')),
4280 ]
4279 ]
4281
4280
4282 walkopts = [
4281 walkopts = [
4283 ('I', 'include', [],
4282 ('I', 'include', [],
4284 _('include names matching the given patterns'), _('PATTERN')),
4283 _('include names matching the given patterns'), _('PATTERN')),
4285 ('X', 'exclude', [],
4284 ('X', 'exclude', [],
4286 _('exclude names matching the given patterns'), _('PATTERN')),
4285 _('exclude names matching the given patterns'), _('PATTERN')),
4287 ]
4286 ]
4288
4287
4289 commitopts = [
4288 commitopts = [
4290 ('m', 'message', '',
4289 ('m', 'message', '',
4291 _('use text as commit message'), _('TEXT')),
4290 _('use text as commit message'), _('TEXT')),
4292 ('l', 'logfile', '',
4291 ('l', 'logfile', '',
4293 _('read commit message from file'), _('FILE')),
4292 _('read commit message from file'), _('FILE')),
4294 ]
4293 ]
4295
4294
4296 commitopts2 = [
4295 commitopts2 = [
4297 ('d', 'date', '',
4296 ('d', 'date', '',
4298 _('record the specified date as commit date'), _('DATE')),
4297 _('record the specified date as commit date'), _('DATE')),
4299 ('u', 'user', '',
4298 ('u', 'user', '',
4300 _('record the specified user as committer'), _('USER')),
4299 _('record the specified user as committer'), _('USER')),
4301 ]
4300 ]
4302
4301
4303 templateopts = [
4302 templateopts = [
4304 ('', 'style', '',
4303 ('', 'style', '',
4305 _('display using template map file'), _('STYLE')),
4304 _('display using template map file'), _('STYLE')),
4306 ('', 'template', '',
4305 ('', 'template', '',
4307 _('display with template'), _('TEMPLATE')),
4306 _('display with template'), _('TEMPLATE')),
4308 ]
4307 ]
4309
4308
4310 logopts = [
4309 logopts = [
4311 ('p', 'patch', None, _('show patch')),
4310 ('p', 'patch', None, _('show patch')),
4312 ('g', 'git', None, _('use git extended diff format')),
4311 ('g', 'git', None, _('use git extended diff format')),
4313 ('l', 'limit', '',
4312 ('l', 'limit', '',
4314 _('limit number of changes displayed'), _('NUM')),
4313 _('limit number of changes displayed'), _('NUM')),
4315 ('M', 'no-merges', None, _('do not show merges')),
4314 ('M', 'no-merges', None, _('do not show merges')),
4316 ('', 'stat', None, _('output diffstat-style summary of changes')),
4315 ('', 'stat', None, _('output diffstat-style summary of changes')),
4317 ] + templateopts
4316 ] + templateopts
4318
4317
4319 diffopts = [
4318 diffopts = [
4320 ('a', 'text', None, _('treat all files as text')),
4319 ('a', 'text', None, _('treat all files as text')),
4321 ('g', 'git', None, _('use git extended diff format')),
4320 ('g', 'git', None, _('use git extended diff format')),
4322 ('', 'nodates', None, _('omit dates from diff headers'))
4321 ('', 'nodates', None, _('omit dates from diff headers'))
4323 ]
4322 ]
4324
4323
4325 diffopts2 = [
4324 diffopts2 = [
4326 ('p', 'show-function', None, _('show which function each change is in')),
4325 ('p', 'show-function', None, _('show which function each change is in')),
4327 ('', 'reverse', None, _('produce a diff that undoes the changes')),
4326 ('', 'reverse', None, _('produce a diff that undoes the changes')),
4328 ('w', 'ignore-all-space', None,
4327 ('w', 'ignore-all-space', None,
4329 _('ignore white space when comparing lines')),
4328 _('ignore white space when comparing lines')),
4330 ('b', 'ignore-space-change', None,
4329 ('b', 'ignore-space-change', None,
4331 _('ignore changes in the amount of white space')),
4330 _('ignore changes in the amount of white space')),
4332 ('B', 'ignore-blank-lines', None,
4331 ('B', 'ignore-blank-lines', None,
4333 _('ignore changes whose lines are all blank')),
4332 _('ignore changes whose lines are all blank')),
4334 ('U', 'unified', '',
4333 ('U', 'unified', '',
4335 _('number of lines of context to show'), _('NUM')),
4334 _('number of lines of context to show'), _('NUM')),
4336 ('', 'stat', None, _('output diffstat-style summary of changes')),
4335 ('', 'stat', None, _('output diffstat-style summary of changes')),
4337 ]
4336 ]
4338
4337
4339 similarityopts = [
4338 similarityopts = [
4340 ('s', 'similarity', '',
4339 ('s', 'similarity', '',
4341 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
4340 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
4342 ]
4341 ]
4343
4342
4344 subrepoopts = [
4343 subrepoopts = [
4345 ('S', 'subrepos', None,
4344 ('S', 'subrepos', None,
4346 _('recurse into subrepositories'))
4345 _('recurse into subrepositories'))
4347 ]
4346 ]
4348
4347
4349 table = {
4348 table = {
4350 "^add": (add, walkopts + subrepoopts + dryrunopts,
4349 "^add": (add, walkopts + subrepoopts + dryrunopts,
4351 _('[OPTION]... [FILE]...')),
4350 _('[OPTION]... [FILE]...')),
4352 "addremove":
4351 "addremove":
4353 (addremove, similarityopts + walkopts + dryrunopts,
4352 (addremove, similarityopts + walkopts + dryrunopts,
4354 _('[OPTION]... [FILE]...')),
4353 _('[OPTION]... [FILE]...')),
4355 "^annotate|blame":
4354 "^annotate|blame":
4356 (annotate,
4355 (annotate,
4357 [('r', 'rev', '',
4356 [('r', 'rev', '',
4358 _('annotate the specified revision'), _('REV')),
4357 _('annotate the specified revision'), _('REV')),
4359 ('', 'follow', None,
4358 ('', 'follow', None,
4360 _('follow copies/renames and list the filename (DEPRECATED)')),
4359 _('follow copies/renames and list the filename (DEPRECATED)')),
4361 ('', 'no-follow', None, _("don't follow copies and renames")),
4360 ('', 'no-follow', None, _("don't follow copies and renames")),
4362 ('a', 'text', None, _('treat all files as text')),
4361 ('a', 'text', None, _('treat all files as text')),
4363 ('u', 'user', None, _('list the author (long with -v)')),
4362 ('u', 'user', None, _('list the author (long with -v)')),
4364 ('f', 'file', None, _('list the filename')),
4363 ('f', 'file', None, _('list the filename')),
4365 ('d', 'date', None, _('list the date (short with -q)')),
4364 ('d', 'date', None, _('list the date (short with -q)')),
4366 ('n', 'number', None, _('list the revision number (default)')),
4365 ('n', 'number', None, _('list the revision number (default)')),
4367 ('c', 'changeset', None, _('list the changeset')),
4366 ('c', 'changeset', None, _('list the changeset')),
4368 ('l', 'line-number', None,
4367 ('l', 'line-number', None,
4369 _('show line number at the first appearance'))
4368 _('show line number at the first appearance'))
4370 ] + walkopts,
4369 ] + walkopts,
4371 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')),
4370 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')),
4372 "archive":
4371 "archive":
4373 (archive,
4372 (archive,
4374 [('', 'no-decode', None, _('do not pass files through decoders')),
4373 [('', 'no-decode', None, _('do not pass files through decoders')),
4375 ('p', 'prefix', '',
4374 ('p', 'prefix', '',
4376 _('directory prefix for files in archive'), _('PREFIX')),
4375 _('directory prefix for files in archive'), _('PREFIX')),
4377 ('r', 'rev', '',
4376 ('r', 'rev', '',
4378 _('revision to distribute'), _('REV')),
4377 _('revision to distribute'), _('REV')),
4379 ('t', 'type', '',
4378 ('t', 'type', '',
4380 _('type of distribution to create'), _('TYPE')),
4379 _('type of distribution to create'), _('TYPE')),
4381 ] + subrepoopts + walkopts,
4380 ] + subrepoopts + walkopts,
4382 _('[OPTION]... DEST')),
4381 _('[OPTION]... DEST')),
4383 "backout":
4382 "backout":
4384 (backout,
4383 (backout,
4385 [('', 'merge', None,
4384 [('', 'merge', None,
4386 _('merge with old dirstate parent after backout')),
4385 _('merge with old dirstate parent after backout')),
4387 ('', 'parent', '',
4386 ('', 'parent', '',
4388 _('parent to choose when backing out merge'), _('REV')),
4387 _('parent to choose when backing out merge'), _('REV')),
4389 ('t', 'tool', '',
4388 ('t', 'tool', '',
4390 _('specify merge tool')),
4389 _('specify merge tool')),
4391 ('r', 'rev', '',
4390 ('r', 'rev', '',
4392 _('revision to backout'), _('REV')),
4391 _('revision to backout'), _('REV')),
4393 ] + walkopts + commitopts + commitopts2,
4392 ] + walkopts + commitopts + commitopts2,
4394 _('[OPTION]... [-r] REV')),
4393 _('[OPTION]... [-r] REV')),
4395 "bisect":
4394 "bisect":
4396 (bisect,
4395 (bisect,
4397 [('r', 'reset', False, _('reset bisect state')),
4396 [('r', 'reset', False, _('reset bisect state')),
4398 ('g', 'good', False, _('mark changeset good')),
4397 ('g', 'good', False, _('mark changeset good')),
4399 ('b', 'bad', False, _('mark changeset bad')),
4398 ('b', 'bad', False, _('mark changeset bad')),
4400 ('s', 'skip', False, _('skip testing changeset')),
4399 ('s', 'skip', False, _('skip testing changeset')),
4401 ('e', 'extend', False, _('extend the bisect range')),
4400 ('e', 'extend', False, _('extend the bisect range')),
4402 ('c', 'command', '',
4401 ('c', 'command', '',
4403 _('use command to check changeset state'), _('CMD')),
4402 _('use command to check changeset state'), _('CMD')),
4404 ('U', 'noupdate', False, _('do not update to target'))],
4403 ('U', 'noupdate', False, _('do not update to target'))],
4405 _("[-gbsr] [-U] [-c CMD] [REV]")),
4404 _("[-gbsr] [-U] [-c CMD] [REV]")),
4406 "bookmarks":
4405 "bookmarks":
4407 (bookmark,
4406 (bookmark,
4408 [('f', 'force', False, _('force')),
4407 [('f', 'force', False, _('force')),
4409 ('r', 'rev', '', _('revision'), _('REV')),
4408 ('r', 'rev', '', _('revision'), _('REV')),
4410 ('d', 'delete', False, _('delete a given bookmark')),
4409 ('d', 'delete', False, _('delete a given bookmark')),
4411 ('m', 'rename', '', _('rename a given bookmark'), _('NAME'))],
4410 ('m', 'rename', '', _('rename a given bookmark'), _('NAME'))],
4412 _('hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]')),
4411 _('hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]')),
4413 "branch":
4412 "branch":
4414 (branch,
4413 (branch,
4415 [('f', 'force', None,
4414 [('f', 'force', None,
4416 _('set branch name even if it shadows an existing branch')),
4415 _('set branch name even if it shadows an existing branch')),
4417 ('C', 'clean', None, _('reset branch name to parent branch name'))],
4416 ('C', 'clean', None, _('reset branch name to parent branch name'))],
4418 _('[-fC] [NAME]')),
4417 _('[-fC] [NAME]')),
4419 "branches":
4418 "branches":
4420 (branches,
4419 (branches,
4421 [('a', 'active', False,
4420 [('a', 'active', False,
4422 _('show only branches that have unmerged heads')),
4421 _('show only branches that have unmerged heads')),
4423 ('c', 'closed', False,
4422 ('c', 'closed', False,
4424 _('show normal and closed branches'))],
4423 _('show normal and closed branches'))],
4425 _('[-ac]')),
4424 _('[-ac]')),
4426 "bundle":
4425 "bundle":
4427 (bundle,
4426 (bundle,
4428 [('f', 'force', None,
4427 [('f', 'force', None,
4429 _('run even when the destination is unrelated')),
4428 _('run even when the destination is unrelated')),
4430 ('r', 'rev', [],
4429 ('r', 'rev', [],
4431 _('a changeset intended to be added to the destination'),
4430 _('a changeset intended to be added to the destination'),
4432 _('REV')),
4431 _('REV')),
4433 ('b', 'branch', [],
4432 ('b', 'branch', [],
4434 _('a specific branch you would like to bundle'),
4433 _('a specific branch you would like to bundle'),
4435 _('BRANCH')),
4434 _('BRANCH')),
4436 ('', 'base', [],
4435 ('', 'base', [],
4437 _('a base changeset assumed to be available at the destination'),
4436 _('a base changeset assumed to be available at the destination'),
4438 _('REV')),
4437 _('REV')),
4439 ('a', 'all', None, _('bundle all changesets in the repository')),
4438 ('a', 'all', None, _('bundle all changesets in the repository')),
4440 ('t', 'type', 'bzip2',
4439 ('t', 'type', 'bzip2',
4441 _('bundle compression type to use'), _('TYPE')),
4440 _('bundle compression type to use'), _('TYPE')),
4442 ] + remoteopts,
4441 ] + remoteopts,
4443 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')),
4442 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')),
4444 "cat":
4443 "cat":
4445 (cat,
4444 (cat,
4446 [('o', 'output', '',
4445 [('o', 'output', '',
4447 _('print output to file with formatted name'), _('FORMAT')),
4446 _('print output to file with formatted name'), _('FORMAT')),
4448 ('r', 'rev', '',
4447 ('r', 'rev', '',
4449 _('print the given revision'), _('REV')),
4448 _('print the given revision'), _('REV')),
4450 ('', 'decode', None, _('apply any matching decode filter')),
4449 ('', 'decode', None, _('apply any matching decode filter')),
4451 ] + walkopts,
4450 ] + walkopts,
4452 _('[OPTION]... FILE...')),
4451 _('[OPTION]... FILE...')),
4453 "^clone":
4452 "^clone":
4454 (clone,
4453 (clone,
4455 [('U', 'noupdate', None,
4454 [('U', 'noupdate', None,
4456 _('the clone will include an empty working copy (only a repository)')),
4455 _('the clone will include an empty working copy (only a repository)')),
4457 ('u', 'updaterev', '',
4456 ('u', 'updaterev', '',
4458 _('revision, tag or branch to check out'), _('REV')),
4457 _('revision, tag or branch to check out'), _('REV')),
4459 ('r', 'rev', [],
4458 ('r', 'rev', [],
4460 _('include the specified changeset'), _('REV')),
4459 _('include the specified changeset'), _('REV')),
4461 ('b', 'branch', [],
4460 ('b', 'branch', [],
4462 _('clone only the specified branch'), _('BRANCH')),
4461 _('clone only the specified branch'), _('BRANCH')),
4463 ('', 'pull', None, _('use pull protocol to copy metadata')),
4462 ('', 'pull', None, _('use pull protocol to copy metadata')),
4464 ('', 'uncompressed', None,
4463 ('', 'uncompressed', None,
4465 _('use uncompressed transfer (fast over LAN)')),
4464 _('use uncompressed transfer (fast over LAN)')),
4466 ] + remoteopts,
4465 ] + remoteopts,
4467 _('[OPTION]... SOURCE [DEST]')),
4466 _('[OPTION]... SOURCE [DEST]')),
4468 "^commit|ci":
4467 "^commit|ci":
4469 (commit,
4468 (commit,
4470 [('A', 'addremove', None,
4469 [('A', 'addremove', None,
4471 _('mark new/missing files as added/removed before committing')),
4470 _('mark new/missing files as added/removed before committing')),
4472 ('', 'close-branch', None,
4471 ('', 'close-branch', None,
4473 _('mark a branch as closed, hiding it from the branch list')),
4472 _('mark a branch as closed, hiding it from the branch list')),
4474 ] + walkopts + commitopts + commitopts2,
4473 ] + walkopts + commitopts + commitopts2,
4475 _('[OPTION]... [FILE]...')),
4474 _('[OPTION]... [FILE]...')),
4476 "copy|cp":
4475 "copy|cp":
4477 (copy,
4476 (copy,
4478 [('A', 'after', None, _('record a copy that has already occurred')),
4477 [('A', 'after', None, _('record a copy that has already occurred')),
4479 ('f', 'force', None,
4478 ('f', 'force', None,
4480 _('forcibly copy over an existing managed file')),
4479 _('forcibly copy over an existing managed file')),
4481 ] + walkopts + dryrunopts,
4480 ] + walkopts + dryrunopts,
4482 _('[OPTION]... [SOURCE]... DEST')),
4481 _('[OPTION]... [SOURCE]... DEST')),
4483 "debugancestor": (debugancestor, [], _('[INDEX] REV1 REV2')),
4482 "debugancestor": (debugancestor, [], _('[INDEX] REV1 REV2')),
4484 "debugbuilddag":
4483 "debugbuilddag":
4485 (debugbuilddag,
4484 (debugbuilddag,
4486 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
4485 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
4487 ('a', 'appended-file', None, _('add single file all revs append to')),
4486 ('a', 'appended-file', None, _('add single file all revs append to')),
4488 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
4487 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
4489 ('n', 'new-file', None, _('add new file at each rev')),
4488 ('n', 'new-file', None, _('add new file at each rev')),
4490 ],
4489 ],
4491 _('[OPTION]... TEXT')),
4490 _('[OPTION]... TEXT')),
4492 "debugbundle":
4491 "debugbundle":
4493 (debugbundle,
4492 (debugbundle,
4494 [('a', 'all', None, _('show all details')),
4493 [('a', 'all', None, _('show all details')),
4495 ],
4494 ],
4496 _('FILE')),
4495 _('FILE')),
4497 "debugcheckstate": (debugcheckstate, [], ''),
4496 "debugcheckstate": (debugcheckstate, [], ''),
4498 "debugcommands": (debugcommands, [], _('[COMMAND]')),
4497 "debugcommands": (debugcommands, [], _('[COMMAND]')),
4499 "debugcomplete":
4498 "debugcomplete":
4500 (debugcomplete,
4499 (debugcomplete,
4501 [('o', 'options', None, _('show the command options'))],
4500 [('o', 'options', None, _('show the command options'))],
4502 _('[-o] CMD')),
4501 _('[-o] CMD')),
4503 "debugdag":
4502 "debugdag":
4504 (debugdag,
4503 (debugdag,
4505 [('t', 'tags', None, _('use tags as labels')),
4504 [('t', 'tags', None, _('use tags as labels')),
4506 ('b', 'branches', None, _('annotate with branch names')),
4505 ('b', 'branches', None, _('annotate with branch names')),
4507 ('', 'dots', None, _('use dots for runs')),
4506 ('', 'dots', None, _('use dots for runs')),
4508 ('s', 'spaces', None, _('separate elements by spaces')),
4507 ('s', 'spaces', None, _('separate elements by spaces')),
4509 ],
4508 ],
4510 _('[OPTION]... [FILE [REV]...]')),
4509 _('[OPTION]... [FILE [REV]...]')),
4511 "debugdate":
4510 "debugdate":
4512 (debugdate,
4511 (debugdate,
4513 [('e', 'extended', None, _('try extended date formats'))],
4512 [('e', 'extended', None, _('try extended date formats'))],
4514 _('[-e] DATE [RANGE]')),
4513 _('[-e] DATE [RANGE]')),
4515 "debugdata": (debugdata, [], _('FILE REV')),
4514 "debugdata": (debugdata, [], _('FILE REV')),
4516 "debugfsinfo": (debugfsinfo, [], _('[PATH]')),
4515 "debugfsinfo": (debugfsinfo, [], _('[PATH]')),
4517 "debuggetbundle":
4516 "debuggetbundle":
4518 (debuggetbundle,
4517 (debuggetbundle,
4519 [('H', 'head', [], _('id of head node'), _('ID')),
4518 [('H', 'head', [], _('id of head node'), _('ID')),
4520 ('C', 'common', [], _('id of common node'), _('ID')),
4519 ('C', 'common', [], _('id of common node'), _('ID')),
4521 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
4520 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
4522 ],
4521 ],
4523 _('REPO FILE [-H|-C ID]...')),
4522 _('REPO FILE [-H|-C ID]...')),
4524 "debugignore": (debugignore, [], ''),
4523 "debugignore": (debugignore, [], ''),
4525 "debugindex": (debugindex,
4524 "debugindex": (debugindex,
4526 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
4525 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
4527 _('FILE')),
4526 _('FILE')),
4528 "debugindexdot": (debugindexdot, [], _('FILE')),
4527 "debugindexdot": (debugindexdot, [], _('FILE')),
4529 "debuginstall": (debuginstall, [], ''),
4528 "debuginstall": (debuginstall, [], ''),
4530 "debugknown": (debugknown, [], _('REPO ID...')),
4529 "debugknown": (debugknown, [], _('REPO ID...')),
4531 "debugpushkey": (debugpushkey, [], _('REPO NAMESPACE [KEY OLD NEW]')),
4530 "debugpushkey": (debugpushkey, [], _('REPO NAMESPACE [KEY OLD NEW]')),
4532 "debugrebuildstate":
4531 "debugrebuildstate":
4533 (debugrebuildstate,
4532 (debugrebuildstate,
4534 [('r', 'rev', '',
4533 [('r', 'rev', '',
4535 _('revision to rebuild to'), _('REV'))],
4534 _('revision to rebuild to'), _('REV'))],
4536 _('[-r REV] [REV]')),
4535 _('[-r REV] [REV]')),
4537 "debugrename":
4536 "debugrename":
4538 (debugrename,
4537 (debugrename,
4539 [('r', 'rev', '',
4538 [('r', 'rev', '',
4540 _('revision to debug'), _('REV'))],
4539 _('revision to debug'), _('REV'))],
4541 _('[-r REV] FILE')),
4540 _('[-r REV] FILE')),
4542 "debugrevspec":
4541 "debugrevspec":
4543 (debugrevspec, [], ('REVSPEC')),
4542 (debugrevspec, [], ('REVSPEC')),
4544 "debugsetparents":
4543 "debugsetparents":
4545 (debugsetparents, [], _('REV1 [REV2]')),
4544 (debugsetparents, [], _('REV1 [REV2]')),
4546 "debugstate":
4545 "debugstate":
4547 (debugstate,
4546 (debugstate,
4548 [('', 'nodates', None, _('do not display the saved mtime')),
4547 [('', 'nodates', None, _('do not display the saved mtime')),
4549 ('', 'datesort', None, _('sort by saved mtime'))],
4548 ('', 'datesort', None, _('sort by saved mtime'))],
4550 _('[OPTION]...')),
4549 _('[OPTION]...')),
4551 "debugsub":
4550 "debugsub":
4552 (debugsub,
4551 (debugsub,
4553 [('r', 'rev', '',
4552 [('r', 'rev', '',
4554 _('revision to check'), _('REV'))],
4553 _('revision to check'), _('REV'))],
4555 _('[-r REV] [REV]')),
4554 _('[-r REV] [REV]')),
4556 "debugwalk": (debugwalk, walkopts, _('[OPTION]... [FILE]...')),
4555 "debugwalk": (debugwalk, walkopts, _('[OPTION]... [FILE]...')),
4557 "debugwireargs":
4556 "debugwireargs":
4558 (debugwireargs,
4557 (debugwireargs,
4559 [('', 'three', '', 'three'),
4558 [('', 'three', '', 'three'),
4560 ('', 'four', '', 'four'),
4559 ('', 'four', '', 'four'),
4561 ('', 'five', '', 'five'),
4560 ('', 'five', '', 'five'),
4562 ] + remoteopts,
4561 ] + remoteopts,
4563 _('REPO [OPTIONS]... [ONE [TWO]]')),
4562 _('REPO [OPTIONS]... [ONE [TWO]]')),
4564 "^diff":
4563 "^diff":
4565 (diff,
4564 (diff,
4566 [('r', 'rev', [],
4565 [('r', 'rev', [],
4567 _('revision'), _('REV')),
4566 _('revision'), _('REV')),
4568 ('c', 'change', '',
4567 ('c', 'change', '',
4569 _('change made by revision'), _('REV'))
4568 _('change made by revision'), _('REV'))
4570 ] + diffopts + diffopts2 + walkopts + subrepoopts,
4569 ] + diffopts + diffopts2 + walkopts + subrepoopts,
4571 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...')),
4570 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...')),
4572 "^export":
4571 "^export":
4573 (export,
4572 (export,
4574 [('o', 'output', '',
4573 [('o', 'output', '',
4575 _('print output to file with formatted name'), _('FORMAT')),
4574 _('print output to file with formatted name'), _('FORMAT')),
4576 ('', 'switch-parent', None, _('diff against the second parent')),
4575 ('', 'switch-parent', None, _('diff against the second parent')),
4577 ('r', 'rev', [],
4576 ('r', 'rev', [],
4578 _('revisions to export'), _('REV')),
4577 _('revisions to export'), _('REV')),
4579 ] + diffopts,
4578 ] + diffopts,
4580 _('[OPTION]... [-o OUTFILESPEC] REV...')),
4579 _('[OPTION]... [-o OUTFILESPEC] REV...')),
4581 "^forget":
4580 "^forget":
4582 (forget,
4581 (forget,
4583 [] + walkopts,
4582 [] + walkopts,
4584 _('[OPTION]... FILE...')),
4583 _('[OPTION]... FILE...')),
4585 "grep":
4584 "grep":
4586 (grep,
4585 (grep,
4587 [('0', 'print0', None, _('end fields with NUL')),
4586 [('0', 'print0', None, _('end fields with NUL')),
4588 ('', 'all', None, _('print all revisions that match')),
4587 ('', 'all', None, _('print all revisions that match')),
4589 ('a', 'text', None, _('treat all files as text')),
4588 ('a', 'text', None, _('treat all files as text')),
4590 ('f', 'follow', None,
4589 ('f', 'follow', None,
4591 _('follow changeset history,'
4590 _('follow changeset history,'
4592 ' or file history across copies and renames')),
4591 ' or file history across copies and renames')),
4593 ('i', 'ignore-case', None, _('ignore case when matching')),
4592 ('i', 'ignore-case', None, _('ignore case when matching')),
4594 ('l', 'files-with-matches', None,
4593 ('l', 'files-with-matches', None,
4595 _('print only filenames and revisions that match')),
4594 _('print only filenames and revisions that match')),
4596 ('n', 'line-number', None, _('print matching line numbers')),
4595 ('n', 'line-number', None, _('print matching line numbers')),
4597 ('r', 'rev', [],
4596 ('r', 'rev', [],
4598 _('only search files changed within revision range'), _('REV')),
4597 _('only search files changed within revision range'), _('REV')),
4599 ('u', 'user', None, _('list the author (long with -v)')),
4598 ('u', 'user', None, _('list the author (long with -v)')),
4600 ('d', 'date', None, _('list the date (short with -q)')),
4599 ('d', 'date', None, _('list the date (short with -q)')),
4601 ] + walkopts,
4600 ] + walkopts,
4602 _('[OPTION]... PATTERN [FILE]...')),
4601 _('[OPTION]... PATTERN [FILE]...')),
4603 "heads":
4602 "heads":
4604 (heads,
4603 (heads,
4605 [('r', 'rev', '',
4604 [('r', 'rev', '',
4606 _('show only heads which are descendants of STARTREV'),
4605 _('show only heads which are descendants of STARTREV'),
4607 _('STARTREV')),
4606 _('STARTREV')),
4608 ('t', 'topo', False, _('show topological heads only')),
4607 ('t', 'topo', False, _('show topological heads only')),
4609 ('a', 'active', False,
4608 ('a', 'active', False,
4610 _('show active branchheads only (DEPRECATED)')),
4609 _('show active branchheads only (DEPRECATED)')),
4611 ('c', 'closed', False,
4610 ('c', 'closed', False,
4612 _('show normal and closed branch heads')),
4611 _('show normal and closed branch heads')),
4613 ] + templateopts,
4612 ] + templateopts,
4614 _('[-ac] [-r STARTREV] [REV]...')),
4613 _('[-ac] [-r STARTREV] [REV]...')),
4615 "help": (help_, [], _('[TOPIC]')),
4614 "help": (help_, [], _('[TOPIC]')),
4616 "identify|id":
4615 "identify|id":
4617 (identify,
4616 (identify,
4618 [('r', 'rev', '',
4617 [('r', 'rev', '',
4619 _('identify the specified revision'), _('REV')),
4618 _('identify the specified revision'), _('REV')),
4620 ('n', 'num', None, _('show local revision number')),
4619 ('n', 'num', None, _('show local revision number')),
4621 ('i', 'id', None, _('show global revision id')),
4620 ('i', 'id', None, _('show global revision id')),
4622 ('b', 'branch', None, _('show branch')),
4621 ('b', 'branch', None, _('show branch')),
4623 ('t', 'tags', None, _('show tags')),
4622 ('t', 'tags', None, _('show tags')),
4624 ('B', 'bookmarks', None, _('show bookmarks'))],
4623 ('B', 'bookmarks', None, _('show bookmarks'))],
4625 _('[-nibtB] [-r REV] [SOURCE]')),
4624 _('[-nibtB] [-r REV] [SOURCE]')),
4626 "import|patch":
4625 "import|patch":
4627 (import_,
4626 (import_,
4628 [('p', 'strip', 1,
4627 [('p', 'strip', 1,
4629 _('directory strip option for patch. This has the same '
4628 _('directory strip option for patch. This has the same '
4630 'meaning as the corresponding patch option'),
4629 'meaning as the corresponding patch option'),
4631 _('NUM')),
4630 _('NUM')),
4632 ('b', 'base', '',
4631 ('b', 'base', '',
4633 _('base path'), _('PATH')),
4632 _('base path'), _('PATH')),
4634 ('f', 'force', None,
4633 ('f', 'force', None,
4635 _('skip check for outstanding uncommitted changes')),
4634 _('skip check for outstanding uncommitted changes')),
4636 ('', 'no-commit', None,
4635 ('', 'no-commit', None,
4637 _("don't commit, just update the working directory")),
4636 _("don't commit, just update the working directory")),
4638 ('', 'exact', None,
4637 ('', 'exact', None,
4639 _('apply patch to the nodes from which it was generated')),
4638 _('apply patch to the nodes from which it was generated')),
4640 ('', 'import-branch', None,
4639 ('', 'import-branch', None,
4641 _('use any branch information in patch (implied by --exact)'))] +
4640 _('use any branch information in patch (implied by --exact)'))] +
4642 commitopts + commitopts2 + similarityopts,
4641 commitopts + commitopts2 + similarityopts,
4643 _('[OPTION]... PATCH...')),
4642 _('[OPTION]... PATCH...')),
4644 "incoming|in":
4643 "incoming|in":
4645 (incoming,
4644 (incoming,
4646 [('f', 'force', None,
4645 [('f', 'force', None,
4647 _('run even if remote repository is unrelated')),
4646 _('run even if remote repository is unrelated')),
4648 ('n', 'newest-first', None, _('show newest record first')),
4647 ('n', 'newest-first', None, _('show newest record first')),
4649 ('', 'bundle', '',
4648 ('', 'bundle', '',
4650 _('file to store the bundles into'), _('FILE')),
4649 _('file to store the bundles into'), _('FILE')),
4651 ('r', 'rev', [],
4650 ('r', 'rev', [],
4652 _('a remote changeset intended to be added'), _('REV')),
4651 _('a remote changeset intended to be added'), _('REV')),
4653 ('B', 'bookmarks', False, _("compare bookmarks")),
4652 ('B', 'bookmarks', False, _("compare bookmarks")),
4654 ('b', 'branch', [],
4653 ('b', 'branch', [],
4655 _('a specific branch you would like to pull'), _('BRANCH')),
4654 _('a specific branch you would like to pull'), _('BRANCH')),
4656 ] + logopts + remoteopts + subrepoopts,
4655 ] + logopts + remoteopts + subrepoopts,
4657 _('[-p] [-n] [-M] [-f] [-r REV]...'
4656 _('[-p] [-n] [-M] [-f] [-r REV]...'
4658 ' [--bundle FILENAME] [SOURCE]')),
4657 ' [--bundle FILENAME] [SOURCE]')),
4659 "^init":
4658 "^init":
4660 (init,
4659 (init,
4661 remoteopts,
4660 remoteopts,
4662 _('[-e CMD] [--remotecmd CMD] [DEST]')),
4661 _('[-e CMD] [--remotecmd CMD] [DEST]')),
4663 "locate":
4662 "locate":
4664 (locate,
4663 (locate,
4665 [('r', 'rev', '',
4664 [('r', 'rev', '',
4666 _('search the repository as it is in REV'), _('REV')),
4665 _('search the repository as it is in REV'), _('REV')),
4667 ('0', 'print0', None,
4666 ('0', 'print0', None,
4668 _('end filenames with NUL, for use with xargs')),
4667 _('end filenames with NUL, for use with xargs')),
4669 ('f', 'fullpath', None,
4668 ('f', 'fullpath', None,
4670 _('print complete paths from the filesystem root')),
4669 _('print complete paths from the filesystem root')),
4671 ] + walkopts,
4670 ] + walkopts,
4672 _('[OPTION]... [PATTERN]...')),
4671 _('[OPTION]... [PATTERN]...')),
4673 "^log|history":
4672 "^log|history":
4674 (log,
4673 (log,
4675 [('f', 'follow', None,
4674 [('f', 'follow', None,
4676 _('follow changeset history,'
4675 _('follow changeset history,'
4677 ' or file history across copies and renames')),
4676 ' or file history across copies and renames')),
4678 ('', 'follow-first', None,
4677 ('', 'follow-first', None,
4679 _('only follow the first parent of merge changesets')),
4678 _('only follow the first parent of merge changesets')),
4680 ('d', 'date', '',
4679 ('d', 'date', '',
4681 _('show revisions matching date spec'), _('DATE')),
4680 _('show revisions matching date spec'), _('DATE')),
4682 ('C', 'copies', None, _('show copied files')),
4681 ('C', 'copies', None, _('show copied files')),
4683 ('k', 'keyword', [],
4682 ('k', 'keyword', [],
4684 _('do case-insensitive search for a given text'), _('TEXT')),
4683 _('do case-insensitive search for a given text'), _('TEXT')),
4685 ('r', 'rev', [],
4684 ('r', 'rev', [],
4686 _('show the specified revision or range'), _('REV')),
4685 _('show the specified revision or range'), _('REV')),
4687 ('', 'removed', None, _('include revisions where files were removed')),
4686 ('', 'removed', None, _('include revisions where files were removed')),
4688 ('m', 'only-merges', None, _('show only merges')),
4687 ('m', 'only-merges', None, _('show only merges')),
4689 ('u', 'user', [],
4688 ('u', 'user', [],
4690 _('revisions committed by user'), _('USER')),
4689 _('revisions committed by user'), _('USER')),
4691 ('', 'only-branch', [],
4690 ('', 'only-branch', [],
4692 _('show only changesets within the given named branch (DEPRECATED)'),
4691 _('show only changesets within the given named branch (DEPRECATED)'),
4693 _('BRANCH')),
4692 _('BRANCH')),
4694 ('b', 'branch', [],
4693 ('b', 'branch', [],
4695 _('show changesets within the given named branch'), _('BRANCH')),
4694 _('show changesets within the given named branch'), _('BRANCH')),
4696 ('P', 'prune', [],
4695 ('P', 'prune', [],
4697 _('do not display revision or any of its ancestors'), _('REV')),
4696 _('do not display revision or any of its ancestors'), _('REV')),
4698 ] + logopts + walkopts,
4697 ] + logopts + walkopts,
4699 _('[OPTION]... [FILE]')),
4698 _('[OPTION]... [FILE]')),
4700 "manifest":
4699 "manifest":
4701 (manifest,
4700 (manifest,
4702 [('r', 'rev', '',
4701 [('r', 'rev', '',
4703 _('revision to display'), _('REV'))],
4702 _('revision to display'), _('REV'))],
4704 _('[-r REV]')),
4703 _('[-r REV]')),
4705 "^merge":
4704 "^merge":
4706 (merge,
4705 (merge,
4707 [('f', 'force', None, _('force a merge with outstanding changes')),
4706 [('f', 'force', None, _('force a merge with outstanding changes')),
4708 ('t', 'tool', '', _('specify merge tool')),
4707 ('t', 'tool', '', _('specify merge tool')),
4709 ('r', 'rev', '',
4708 ('r', 'rev', '',
4710 _('revision to merge'), _('REV')),
4709 _('revision to merge'), _('REV')),
4711 ('P', 'preview', None,
4710 ('P', 'preview', None,
4712 _('review revisions to merge (no merge is performed)'))],
4711 _('review revisions to merge (no merge is performed)'))],
4713 _('[-P] [-f] [[-r] REV]')),
4712 _('[-P] [-f] [[-r] REV]')),
4714 "outgoing|out":
4713 "outgoing|out":
4715 (outgoing,
4714 (outgoing,
4716 [('f', 'force', None,
4715 [('f', 'force', None,
4717 _('run even when the destination is unrelated')),
4716 _('run even when the destination is unrelated')),
4718 ('r', 'rev', [],
4717 ('r', 'rev', [],
4719 _('a changeset intended to be included in the destination'),
4718 _('a changeset intended to be included in the destination'),
4720 _('REV')),
4719 _('REV')),
4721 ('n', 'newest-first', None, _('show newest record first')),
4720 ('n', 'newest-first', None, _('show newest record first')),
4722 ('B', 'bookmarks', False, _("compare bookmarks")),
4721 ('B', 'bookmarks', False, _("compare bookmarks")),
4723 ('b', 'branch', [],
4722 ('b', 'branch', [],
4724 _('a specific branch you would like to push'), _('BRANCH')),
4723 _('a specific branch you would like to push'), _('BRANCH')),
4725 ] + logopts + remoteopts + subrepoopts,
4724 ] + logopts + remoteopts + subrepoopts,
4726 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
4725 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
4727 "parents":
4726 "parents":
4728 (parents,
4727 (parents,
4729 [('r', 'rev', '',
4728 [('r', 'rev', '',
4730 _('show parents of the specified revision'), _('REV')),
4729 _('show parents of the specified revision'), _('REV')),
4731 ] + templateopts,
4730 ] + templateopts,
4732 _('[-r REV] [FILE]')),
4731 _('[-r REV] [FILE]')),
4733 "paths": (paths, [], _('[NAME]')),
4732 "paths": (paths, [], _('[NAME]')),
4734 "^pull":
4733 "^pull":
4735 (pull,
4734 (pull,
4736 [('u', 'update', None,
4735 [('u', 'update', None,
4737 _('update to new branch head if changesets were pulled')),
4736 _('update to new branch head if changesets were pulled')),
4738 ('f', 'force', None,
4737 ('f', 'force', None,
4739 _('run even when remote repository is unrelated')),
4738 _('run even when remote repository is unrelated')),
4740 ('r', 'rev', [],
4739 ('r', 'rev', [],
4741 _('a remote changeset intended to be added'), _('REV')),
4740 _('a remote changeset intended to be added'), _('REV')),
4742 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4741 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4743 ('b', 'branch', [],
4742 ('b', 'branch', [],
4744 _('a specific branch you would like to pull'), _('BRANCH')),
4743 _('a specific branch you would like to pull'), _('BRANCH')),
4745 ] + remoteopts,
4744 ] + remoteopts,
4746 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')),
4745 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')),
4747 "^push":
4746 "^push":
4748 (push,
4747 (push,
4749 [('f', 'force', None, _('force push')),
4748 [('f', 'force', None, _('force push')),
4750 ('r', 'rev', [],
4749 ('r', 'rev', [],
4751 _('a changeset intended to be included in the destination'),
4750 _('a changeset intended to be included in the destination'),
4752 _('REV')),
4751 _('REV')),
4753 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4752 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4754 ('b', 'branch', [],
4753 ('b', 'branch', [],
4755 _('a specific branch you would like to push'), _('BRANCH')),
4754 _('a specific branch you would like to push'), _('BRANCH')),
4756 ('', 'new-branch', False, _('allow pushing a new branch')),
4755 ('', 'new-branch', False, _('allow pushing a new branch')),
4757 ] + remoteopts,
4756 ] + remoteopts,
4758 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')),
4757 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')),
4759 "recover": (recover, []),
4758 "recover": (recover, []),
4760 "^remove|rm":
4759 "^remove|rm":
4761 (remove,
4760 (remove,
4762 [('A', 'after', None, _('record delete for missing files')),
4761 [('A', 'after', None, _('record delete for missing files')),
4763 ('f', 'force', None,
4762 ('f', 'force', None,
4764 _('remove (and delete) file even if added or modified')),
4763 _('remove (and delete) file even if added or modified')),
4765 ] + walkopts,
4764 ] + walkopts,
4766 _('[OPTION]... FILE...')),
4765 _('[OPTION]... FILE...')),
4767 "rename|move|mv":
4766 "rename|move|mv":
4768 (rename,
4767 (rename,
4769 [('A', 'after', None, _('record a rename that has already occurred')),
4768 [('A', 'after', None, _('record a rename that has already occurred')),
4770 ('f', 'force', None,
4769 ('f', 'force', None,
4771 _('forcibly copy over an existing managed file')),
4770 _('forcibly copy over an existing managed file')),
4772 ] + walkopts + dryrunopts,
4771 ] + walkopts + dryrunopts,
4773 _('[OPTION]... SOURCE... DEST')),
4772 _('[OPTION]... SOURCE... DEST')),
4774 "resolve":
4773 "resolve":
4775 (resolve,
4774 (resolve,
4776 [('a', 'all', None, _('select all unresolved files')),
4775 [('a', 'all', None, _('select all unresolved files')),
4777 ('l', 'list', None, _('list state of files needing merge')),
4776 ('l', 'list', None, _('list state of files needing merge')),
4778 ('m', 'mark', None, _('mark files as resolved')),
4777 ('m', 'mark', None, _('mark files as resolved')),
4779 ('u', 'unmark', None, _('mark files as unresolved')),
4778 ('u', 'unmark', None, _('mark files as unresolved')),
4780 ('t', 'tool', '', _('specify merge tool')),
4779 ('t', 'tool', '', _('specify merge tool')),
4781 ('n', 'no-status', None, _('hide status prefix'))]
4780 ('n', 'no-status', None, _('hide status prefix'))]
4782 + walkopts,
4781 + walkopts,
4783 _('[OPTION]... [FILE]...')),
4782 _('[OPTION]... [FILE]...')),
4784 "revert":
4783 "revert":
4785 (revert,
4784 (revert,
4786 [('a', 'all', None, _('revert all changes when no arguments given')),
4785 [('a', 'all', None, _('revert all changes when no arguments given')),
4787 ('d', 'date', '',
4786 ('d', 'date', '',
4788 _('tipmost revision matching date'), _('DATE')),
4787 _('tipmost revision matching date'), _('DATE')),
4789 ('r', 'rev', '',
4788 ('r', 'rev', '',
4790 _('revert to the specified revision'), _('REV')),
4789 _('revert to the specified revision'), _('REV')),
4791 ('', 'no-backup', None, _('do not save backup copies of files')),
4790 ('', 'no-backup', None, _('do not save backup copies of files')),
4792 ] + walkopts + dryrunopts,
4791 ] + walkopts + dryrunopts,
4793 _('[OPTION]... [-r REV] [NAME]...')),
4792 _('[OPTION]... [-r REV] [NAME]...')),
4794 "rollback": (rollback, dryrunopts),
4793 "rollback": (rollback, dryrunopts),
4795 "root": (root, []),
4794 "root": (root, []),
4796 "^serve":
4795 "^serve":
4797 (serve,
4796 (serve,
4798 [('A', 'accesslog', '',
4797 [('A', 'accesslog', '',
4799 _('name of access log file to write to'), _('FILE')),
4798 _('name of access log file to write to'), _('FILE')),
4800 ('d', 'daemon', None, _('run server in background')),
4799 ('d', 'daemon', None, _('run server in background')),
4801 ('', 'daemon-pipefds', '',
4800 ('', 'daemon-pipefds', '',
4802 _('used internally by daemon mode'), _('NUM')),
4801 _('used internally by daemon mode'), _('NUM')),
4803 ('E', 'errorlog', '',
4802 ('E', 'errorlog', '',
4804 _('name of error log file to write to'), _('FILE')),
4803 _('name of error log file to write to'), _('FILE')),
4805 # use string type, then we can check if something was passed
4804 # use string type, then we can check if something was passed
4806 ('p', 'port', '',
4805 ('p', 'port', '',
4807 _('port to listen on (default: 8000)'), _('PORT')),
4806 _('port to listen on (default: 8000)'), _('PORT')),
4808 ('a', 'address', '',
4807 ('a', 'address', '',
4809 _('address to listen on (default: all interfaces)'), _('ADDR')),
4808 _('address to listen on (default: all interfaces)'), _('ADDR')),
4810 ('', 'prefix', '',
4809 ('', 'prefix', '',
4811 _('prefix path to serve from (default: server root)'), _('PREFIX')),
4810 _('prefix path to serve from (default: server root)'), _('PREFIX')),
4812 ('n', 'name', '',
4811 ('n', 'name', '',
4813 _('name to show in web pages (default: working directory)'),
4812 _('name to show in web pages (default: working directory)'),
4814 _('NAME')),
4813 _('NAME')),
4815 ('', 'web-conf', '',
4814 ('', 'web-conf', '',
4816 _('name of the hgweb config file (see "hg help hgweb")'),
4815 _('name of the hgweb config file (see "hg help hgweb")'),
4817 _('FILE')),
4816 _('FILE')),
4818 ('', 'webdir-conf', '',
4817 ('', 'webdir-conf', '',
4819 _('name of the hgweb config file (DEPRECATED)'), _('FILE')),
4818 _('name of the hgweb config file (DEPRECATED)'), _('FILE')),
4820 ('', 'pid-file', '',
4819 ('', 'pid-file', '',
4821 _('name of file to write process ID to'), _('FILE')),
4820 _('name of file to write process ID to'), _('FILE')),
4822 ('', 'stdio', None, _('for remote clients')),
4821 ('', 'stdio', None, _('for remote clients')),
4823 ('t', 'templates', '',
4822 ('t', 'templates', '',
4824 _('web templates to use'), _('TEMPLATE')),
4823 _('web templates to use'), _('TEMPLATE')),
4825 ('', 'style', '',
4824 ('', 'style', '',
4826 _('template style to use'), _('STYLE')),
4825 _('template style to use'), _('STYLE')),
4827 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4826 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4828 ('', 'certificate', '',
4827 ('', 'certificate', '',
4829 _('SSL certificate file'), _('FILE'))],
4828 _('SSL certificate file'), _('FILE'))],
4830 _('[OPTION]...')),
4829 _('[OPTION]...')),
4831 "showconfig|debugconfig":
4830 "showconfig|debugconfig":
4832 (showconfig,
4831 (showconfig,
4833 [('u', 'untrusted', None, _('show untrusted configuration options'))],
4832 [('u', 'untrusted', None, _('show untrusted configuration options'))],
4834 _('[-u] [NAME]...')),
4833 _('[-u] [NAME]...')),
4835 "^summary|sum":
4834 "^summary|sum":
4836 (summary,
4835 (summary,
4837 [('', 'remote', None, _('check for push and pull'))], '[--remote]'),
4836 [('', 'remote', None, _('check for push and pull'))], '[--remote]'),
4838 "^status|st":
4837 "^status|st":
4839 (status,
4838 (status,
4840 [('A', 'all', None, _('show status of all files')),
4839 [('A', 'all', None, _('show status of all files')),
4841 ('m', 'modified', None, _('show only modified files')),
4840 ('m', 'modified', None, _('show only modified files')),
4842 ('a', 'added', None, _('show only added files')),
4841 ('a', 'added', None, _('show only added files')),
4843 ('r', 'removed', None, _('show only removed files')),
4842 ('r', 'removed', None, _('show only removed files')),
4844 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4843 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4845 ('c', 'clean', None, _('show only files without changes')),
4844 ('c', 'clean', None, _('show only files without changes')),
4846 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4845 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4847 ('i', 'ignored', None, _('show only ignored files')),
4846 ('i', 'ignored', None, _('show only ignored files')),
4848 ('n', 'no-status', None, _('hide status prefix')),
4847 ('n', 'no-status', None, _('hide status prefix')),
4849 ('C', 'copies', None, _('show source of copied files')),
4848 ('C', 'copies', None, _('show source of copied files')),
4850 ('0', 'print0', None,
4849 ('0', 'print0', None,
4851 _('end filenames with NUL, for use with xargs')),
4850 _('end filenames with NUL, for use with xargs')),
4852 ('', 'rev', [],
4851 ('', 'rev', [],
4853 _('show difference from revision'), _('REV')),
4852 _('show difference from revision'), _('REV')),
4854 ('', 'change', '',
4853 ('', 'change', '',
4855 _('list the changed files of a revision'), _('REV')),
4854 _('list the changed files of a revision'), _('REV')),
4856 ] + walkopts + subrepoopts,
4855 ] + walkopts + subrepoopts,
4857 _('[OPTION]... [FILE]...')),
4856 _('[OPTION]... [FILE]...')),
4858 "tag":
4857 "tag":
4859 (tag,
4858 (tag,
4860 [('f', 'force', None, _('force tag')),
4859 [('f', 'force', None, _('force tag')),
4861 ('l', 'local', None, _('make the tag local')),
4860 ('l', 'local', None, _('make the tag local')),
4862 ('r', 'rev', '',
4861 ('r', 'rev', '',
4863 _('revision to tag'), _('REV')),
4862 _('revision to tag'), _('REV')),
4864 ('', 'remove', None, _('remove a tag')),
4863 ('', 'remove', None, _('remove a tag')),
4865 # -l/--local is already there, commitopts cannot be used
4864 # -l/--local is already there, commitopts cannot be used
4866 ('e', 'edit', None, _('edit commit message')),
4865 ('e', 'edit', None, _('edit commit message')),
4867 ('m', 'message', '',
4866 ('m', 'message', '',
4868 _('use <text> as commit message'), _('TEXT')),
4867 _('use <text> as commit message'), _('TEXT')),
4869 ] + commitopts2,
4868 ] + commitopts2,
4870 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')),
4869 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')),
4871 "tags": (tags, [], ''),
4870 "tags": (tags, [], ''),
4872 "tip":
4871 "tip":
4873 (tip,
4872 (tip,
4874 [('p', 'patch', None, _('show patch')),
4873 [('p', 'patch', None, _('show patch')),
4875 ('g', 'git', None, _('use git extended diff format')),
4874 ('g', 'git', None, _('use git extended diff format')),
4876 ] + templateopts,
4875 ] + templateopts,
4877 _('[-p] [-g]')),
4876 _('[-p] [-g]')),
4878 "unbundle":
4877 "unbundle":
4879 (unbundle,
4878 (unbundle,
4880 [('u', 'update', None,
4879 [('u', 'update', None,
4881 _('update to new branch head if changesets were unbundled'))],
4880 _('update to new branch head if changesets were unbundled'))],
4882 _('[-u] FILE...')),
4881 _('[-u] FILE...')),
4883 "^update|up|checkout|co":
4882 "^update|up|checkout|co":
4884 (update,
4883 (update,
4885 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
4884 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
4886 ('c', 'check', None,
4885 ('c', 'check', None,
4887 _('update across branches if no uncommitted changes')),
4886 _('update across branches if no uncommitted changes')),
4888 ('d', 'date', '',
4887 ('d', 'date', '',
4889 _('tipmost revision matching date'), _('DATE')),
4888 _('tipmost revision matching date'), _('DATE')),
4890 ('r', 'rev', '',
4889 ('r', 'rev', '',
4891 _('revision'), _('REV'))],
4890 _('revision'), _('REV'))],
4892 _('[-c] [-C] [-d DATE] [[-r] REV]')),
4891 _('[-c] [-C] [-d DATE] [[-r] REV]')),
4893 "verify": (verify, []),
4892 "verify": (verify, []),
4894 "version": (version_, []),
4893 "version": (version_, []),
4895 }
4894 }
4896
4895
4897 norepo = ("clone init version help debugcommands debugcomplete"
4896 norepo = ("clone init version help debugcommands debugcomplete"
4898 " debugdate debuginstall debugfsinfo debugpushkey debugwireargs"
4897 " debugdate debuginstall debugfsinfo debugpushkey debugwireargs"
4899 " debugknown debuggetbundle debugbundle")
4898 " debugknown debuggetbundle debugbundle")
4900 optionalrepo = ("identify paths serve showconfig debugancestor debugdag"
4899 optionalrepo = ("identify paths serve showconfig debugancestor debugdag"
4901 " debugdata debugindex debugindexdot")
4900 " debugdata debugindex debugindexdot")
@@ -1,833 +1,831
1 #
1 #
2 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
2 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 import os, mimetypes, re, cgi, copy
8 import os, mimetypes, re, cgi, copy
9 import webutil
9 import webutil
10 from mercurial import error, encoding, archival, templater, templatefilters
10 from mercurial import error, encoding, archival, templater, templatefilters
11 from mercurial.node import short, hex
11 from mercurial.node import short, hex
12 from mercurial.util import binary
12 from mercurial.util import binary
13 from common import paritygen, staticfile, get_contact, ErrorResponse
13 from common import paritygen, staticfile, get_contact, ErrorResponse
14 from common import HTTP_OK, HTTP_FORBIDDEN, HTTP_NOT_FOUND
14 from common import HTTP_OK, HTTP_FORBIDDEN, HTTP_NOT_FOUND
15 from mercurial import graphmod
15 from mercurial import graphmod
16 from mercurial import help as helpmod
16 from mercurial import help as helpmod
17 from mercurial.i18n import _
17 from mercurial.i18n import _
18
18
19 # __all__ is populated with the allowed commands. Be sure to add to it if
19 # __all__ is populated with the allowed commands. Be sure to add to it if
20 # you're adding a new command, or the new command won't work.
20 # you're adding a new command, or the new command won't work.
21
21
22 __all__ = [
22 __all__ = [
23 'log', 'rawfile', 'file', 'changelog', 'shortlog', 'changeset', 'rev',
23 'log', 'rawfile', 'file', 'changelog', 'shortlog', 'changeset', 'rev',
24 'manifest', 'tags', 'bookmarks', 'branches', 'summary', 'filediff', 'diff',
24 'manifest', 'tags', 'bookmarks', 'branches', 'summary', 'filediff', 'diff',
25 'annotate', 'filelog', 'archive', 'static', 'graph', 'help',
25 'annotate', 'filelog', 'archive', 'static', 'graph', 'help',
26 ]
26 ]
27
27
28 def log(web, req, tmpl):
28 def log(web, req, tmpl):
29 if 'file' in req.form and req.form['file'][0]:
29 if 'file' in req.form and req.form['file'][0]:
30 return filelog(web, req, tmpl)
30 return filelog(web, req, tmpl)
31 else:
31 else:
32 return changelog(web, req, tmpl)
32 return changelog(web, req, tmpl)
33
33
34 def rawfile(web, req, tmpl):
34 def rawfile(web, req, tmpl):
35 path = webutil.cleanpath(web.repo, req.form.get('file', [''])[0])
35 path = webutil.cleanpath(web.repo, req.form.get('file', [''])[0])
36 if not path:
36 if not path:
37 content = manifest(web, req, tmpl)
37 content = manifest(web, req, tmpl)
38 req.respond(HTTP_OK, web.ctype)
38 req.respond(HTTP_OK, web.ctype)
39 return content
39 return content
40
40
41 try:
41 try:
42 fctx = webutil.filectx(web.repo, req)
42 fctx = webutil.filectx(web.repo, req)
43 except error.LookupError, inst:
43 except error.LookupError, inst:
44 try:
44 try:
45 content = manifest(web, req, tmpl)
45 content = manifest(web, req, tmpl)
46 req.respond(HTTP_OK, web.ctype)
46 req.respond(HTTP_OK, web.ctype)
47 return content
47 return content
48 except ErrorResponse:
48 except ErrorResponse:
49 raise inst
49 raise inst
50
50
51 path = fctx.path()
51 path = fctx.path()
52 text = fctx.data()
52 text = fctx.data()
53 mt = mimetypes.guess_type(path)[0]
53 mt = mimetypes.guess_type(path)[0]
54 if mt is None:
54 if mt is None:
55 mt = binary(text) and 'application/octet-stream' or 'text/plain'
55 mt = binary(text) and 'application/octet-stream' or 'text/plain'
56 if mt.startswith('text/'):
56 if mt.startswith('text/'):
57 mt += '; charset="%s"' % encoding.encoding
57 mt += '; charset="%s"' % encoding.encoding
58
58
59 req.respond(HTTP_OK, mt, path, len(text))
59 req.respond(HTTP_OK, mt, path, len(text))
60 return [text]
60 return [text]
61
61
62 def _filerevision(web, tmpl, fctx):
62 def _filerevision(web, tmpl, fctx):
63 f = fctx.path()
63 f = fctx.path()
64 text = fctx.data()
64 text = fctx.data()
65 parity = paritygen(web.stripecount)
65 parity = paritygen(web.stripecount)
66
66
67 if binary(text):
67 if binary(text):
68 mt = mimetypes.guess_type(f)[0] or 'application/octet-stream'
68 mt = mimetypes.guess_type(f)[0] or 'application/octet-stream'
69 text = '(binary:%s)' % mt
69 text = '(binary:%s)' % mt
70
70
71 def lines():
71 def lines():
72 for lineno, t in enumerate(text.splitlines(True)):
72 for lineno, t in enumerate(text.splitlines(True)):
73 yield {"line": t,
73 yield {"line": t,
74 "lineid": "l%d" % (lineno + 1),
74 "lineid": "l%d" % (lineno + 1),
75 "linenumber": "% 6d" % (lineno + 1),
75 "linenumber": "% 6d" % (lineno + 1),
76 "parity": parity.next()}
76 "parity": parity.next()}
77
77
78 return tmpl("filerevision",
78 return tmpl("filerevision",
79 file=f,
79 file=f,
80 path=webutil.up(f),
80 path=webutil.up(f),
81 text=lines(),
81 text=lines(),
82 rev=fctx.rev(),
82 rev=fctx.rev(),
83 node=hex(fctx.node()),
83 node=fctx.hex(),
84 author=fctx.user(),
84 author=fctx.user(),
85 date=fctx.date(),
85 date=fctx.date(),
86 desc=fctx.description(),
86 desc=fctx.description(),
87 branch=webutil.nodebranchnodefault(fctx),
87 branch=webutil.nodebranchnodefault(fctx),
88 parent=webutil.parents(fctx),
88 parent=webutil.parents(fctx),
89 child=webutil.children(fctx),
89 child=webutil.children(fctx),
90 rename=webutil.renamelink(fctx),
90 rename=webutil.renamelink(fctx),
91 permissions=fctx.manifest().flags(f))
91 permissions=fctx.manifest().flags(f))
92
92
93 def file(web, req, tmpl):
93 def file(web, req, tmpl):
94 path = webutil.cleanpath(web.repo, req.form.get('file', [''])[0])
94 path = webutil.cleanpath(web.repo, req.form.get('file', [''])[0])
95 if not path:
95 if not path:
96 return manifest(web, req, tmpl)
96 return manifest(web, req, tmpl)
97 try:
97 try:
98 return _filerevision(web, tmpl, webutil.filectx(web.repo, req))
98 return _filerevision(web, tmpl, webutil.filectx(web.repo, req))
99 except error.LookupError, inst:
99 except error.LookupError, inst:
100 try:
100 try:
101 return manifest(web, req, tmpl)
101 return manifest(web, req, tmpl)
102 except ErrorResponse:
102 except ErrorResponse:
103 raise inst
103 raise inst
104
104
105 def _search(web, req, tmpl):
105 def _search(web, req, tmpl):
106
106
107 query = req.form['rev'][0]
107 query = req.form['rev'][0]
108 revcount = web.maxchanges
108 revcount = web.maxchanges
109 if 'revcount' in req.form:
109 if 'revcount' in req.form:
110 revcount = int(req.form.get('revcount', [revcount])[0])
110 revcount = int(req.form.get('revcount', [revcount])[0])
111 revcount = max(revcount, 1)
111 revcount = max(revcount, 1)
112 tmpl.defaults['sessionvars']['revcount'] = revcount
112 tmpl.defaults['sessionvars']['revcount'] = revcount
113
113
114 lessvars = copy.copy(tmpl.defaults['sessionvars'])
114 lessvars = copy.copy(tmpl.defaults['sessionvars'])
115 lessvars['revcount'] = max(revcount / 2, 1)
115 lessvars['revcount'] = max(revcount / 2, 1)
116 lessvars['rev'] = query
116 lessvars['rev'] = query
117 morevars = copy.copy(tmpl.defaults['sessionvars'])
117 morevars = copy.copy(tmpl.defaults['sessionvars'])
118 morevars['revcount'] = revcount * 2
118 morevars['revcount'] = revcount * 2
119 morevars['rev'] = query
119 morevars['rev'] = query
120
120
121 def changelist(**map):
121 def changelist(**map):
122 count = 0
122 count = 0
123 qw = query.lower().split()
123 qw = query.lower().split()
124
124
125 def revgen():
125 def revgen():
126 for i in xrange(len(web.repo) - 1, 0, -100):
126 for i in xrange(len(web.repo) - 1, 0, -100):
127 l = []
127 l = []
128 for j in xrange(max(0, i - 100), i + 1):
128 for j in xrange(max(0, i - 100), i + 1):
129 ctx = web.repo[j]
129 ctx = web.repo[j]
130 l.append(ctx)
130 l.append(ctx)
131 l.reverse()
131 l.reverse()
132 for e in l:
132 for e in l:
133 yield e
133 yield e
134
134
135 for ctx in revgen():
135 for ctx in revgen():
136 miss = 0
136 miss = 0
137 for q in qw:
137 for q in qw:
138 if not (q in ctx.user().lower() or
138 if not (q in ctx.user().lower() or
139 q in ctx.description().lower() or
139 q in ctx.description().lower() or
140 q in " ".join(ctx.files()).lower()):
140 q in " ".join(ctx.files()).lower()):
141 miss = 1
141 miss = 1
142 break
142 break
143 if miss:
143 if miss:
144 continue
144 continue
145
145
146 count += 1
146 count += 1
147 n = ctx.node()
147 n = ctx.node()
148 showtags = webutil.showtag(web.repo, tmpl, 'changelogtag', n)
148 showtags = webutil.showtag(web.repo, tmpl, 'changelogtag', n)
149 files = webutil.listfilediffs(tmpl, ctx.files(), n, web.maxfiles)
149 files = webutil.listfilediffs(tmpl, ctx.files(), n, web.maxfiles)
150
150
151 yield tmpl('searchentry',
151 yield tmpl('searchentry',
152 parity=parity.next(),
152 parity=parity.next(),
153 author=ctx.user(),
153 author=ctx.user(),
154 parent=webutil.parents(ctx),
154 parent=webutil.parents(ctx),
155 child=webutil.children(ctx),
155 child=webutil.children(ctx),
156 changelogtag=showtags,
156 changelogtag=showtags,
157 desc=ctx.description(),
157 desc=ctx.description(),
158 date=ctx.date(),
158 date=ctx.date(),
159 files=files,
159 files=files,
160 rev=ctx.rev(),
160 rev=ctx.rev(),
161 node=hex(n),
161 node=hex(n),
162 tags=webutil.nodetagsdict(web.repo, n),
162 tags=webutil.nodetagsdict(web.repo, n),
163 bookmarks=webutil.nodebookmarksdict(web.repo, n),
163 bookmarks=webutil.nodebookmarksdict(web.repo, n),
164 inbranch=webutil.nodeinbranch(web.repo, ctx),
164 inbranch=webutil.nodeinbranch(web.repo, ctx),
165 branches=webutil.nodebranchdict(web.repo, ctx))
165 branches=webutil.nodebranchdict(web.repo, ctx))
166
166
167 if count >= revcount:
167 if count >= revcount:
168 break
168 break
169
169
170 tip = web.repo['tip']
170 tip = web.repo['tip']
171 parity = paritygen(web.stripecount)
171 parity = paritygen(web.stripecount)
172
172
173 return tmpl('search', query=query, node=tip.hex(),
173 return tmpl('search', query=query, node=tip.hex(),
174 entries=changelist, archives=web.archivelist("tip"),
174 entries=changelist, archives=web.archivelist("tip"),
175 morevars=morevars, lessvars=lessvars)
175 morevars=morevars, lessvars=lessvars)
176
176
177 def changelog(web, req, tmpl, shortlog=False):
177 def changelog(web, req, tmpl, shortlog=False):
178
178
179 if 'node' in req.form:
179 if 'node' in req.form:
180 ctx = webutil.changectx(web.repo, req)
180 ctx = webutil.changectx(web.repo, req)
181 else:
181 else:
182 if 'rev' in req.form:
182 if 'rev' in req.form:
183 hi = req.form['rev'][0]
183 hi = req.form['rev'][0]
184 else:
184 else:
185 hi = len(web.repo) - 1
185 hi = len(web.repo) - 1
186 try:
186 try:
187 ctx = web.repo[hi]
187 ctx = web.repo[hi]
188 except error.RepoError:
188 except error.RepoError:
189 return _search(web, req, tmpl) # XXX redirect to 404 page?
189 return _search(web, req, tmpl) # XXX redirect to 404 page?
190
190
191 def changelist(limit=0, **map):
191 def changelist(limit=0, **map):
192 l = [] # build a list in forward order for efficiency
192 l = [] # build a list in forward order for efficiency
193 for i in xrange(start, end):
193 for i in xrange(start, end):
194 ctx = web.repo[i]
194 ctx = web.repo[i]
195 n = ctx.node()
195 n = ctx.node()
196 showtags = webutil.showtag(web.repo, tmpl, 'changelogtag', n)
196 showtags = webutil.showtag(web.repo, tmpl, 'changelogtag', n)
197 files = webutil.listfilediffs(tmpl, ctx.files(), n, web.maxfiles)
197 files = webutil.listfilediffs(tmpl, ctx.files(), n, web.maxfiles)
198
198
199 l.insert(0, {"parity": parity.next(),
199 l.insert(0, {"parity": parity.next(),
200 "author": ctx.user(),
200 "author": ctx.user(),
201 "parent": webutil.parents(ctx, i - 1),
201 "parent": webutil.parents(ctx, i - 1),
202 "child": webutil.children(ctx, i + 1),
202 "child": webutil.children(ctx, i + 1),
203 "changelogtag": showtags,
203 "changelogtag": showtags,
204 "desc": ctx.description(),
204 "desc": ctx.description(),
205 "date": ctx.date(),
205 "date": ctx.date(),
206 "files": files,
206 "files": files,
207 "rev": i,
207 "rev": i,
208 "node": hex(n),
208 "node": hex(n),
209 "tags": webutil.nodetagsdict(web.repo, n),
209 "tags": webutil.nodetagsdict(web.repo, n),
210 "bookmarks": webutil.nodebookmarksdict(web.repo, n),
210 "bookmarks": webutil.nodebookmarksdict(web.repo, n),
211 "inbranch": webutil.nodeinbranch(web.repo, ctx),
211 "inbranch": webutil.nodeinbranch(web.repo, ctx),
212 "branches": webutil.nodebranchdict(web.repo, ctx)
212 "branches": webutil.nodebranchdict(web.repo, ctx)
213 })
213 })
214
214
215 if limit > 0:
215 if limit > 0:
216 l = l[:limit]
216 l = l[:limit]
217
217
218 for e in l:
218 for e in l:
219 yield e
219 yield e
220
220
221 revcount = shortlog and web.maxshortchanges or web.maxchanges
221 revcount = shortlog and web.maxshortchanges or web.maxchanges
222 if 'revcount' in req.form:
222 if 'revcount' in req.form:
223 revcount = int(req.form.get('revcount', [revcount])[0])
223 revcount = int(req.form.get('revcount', [revcount])[0])
224 revcount = max(revcount, 1)
224 revcount = max(revcount, 1)
225 tmpl.defaults['sessionvars']['revcount'] = revcount
225 tmpl.defaults['sessionvars']['revcount'] = revcount
226
226
227 lessvars = copy.copy(tmpl.defaults['sessionvars'])
227 lessvars = copy.copy(tmpl.defaults['sessionvars'])
228 lessvars['revcount'] = max(revcount / 2, 1)
228 lessvars['revcount'] = max(revcount / 2, 1)
229 morevars = copy.copy(tmpl.defaults['sessionvars'])
229 morevars = copy.copy(tmpl.defaults['sessionvars'])
230 morevars['revcount'] = revcount * 2
230 morevars['revcount'] = revcount * 2
231
231
232 count = len(web.repo)
232 count = len(web.repo)
233 pos = ctx.rev()
233 pos = ctx.rev()
234 start = max(0, pos - revcount + 1)
234 start = max(0, pos - revcount + 1)
235 end = min(count, start + revcount)
235 end = min(count, start + revcount)
236 pos = end - 1
236 pos = end - 1
237 parity = paritygen(web.stripecount, offset=start - end)
237 parity = paritygen(web.stripecount, offset=start - end)
238
238
239 changenav = webutil.revnavgen(pos, revcount, count, web.repo.changectx)
239 changenav = webutil.revnavgen(pos, revcount, count, web.repo.changectx)
240
240
241 return tmpl(shortlog and 'shortlog' or 'changelog', changenav=changenav,
241 return tmpl(shortlog and 'shortlog' or 'changelog', changenav=changenav,
242 node=hex(ctx.node()), rev=pos, changesets=count,
242 node=ctx.hex(), rev=pos, changesets=count,
243 entries=lambda **x: changelist(limit=0,**x),
243 entries=lambda **x: changelist(limit=0,**x),
244 latestentry=lambda **x: changelist(limit=1,**x),
244 latestentry=lambda **x: changelist(limit=1,**x),
245 archives=web.archivelist("tip"), revcount=revcount,
245 archives=web.archivelist("tip"), revcount=revcount,
246 morevars=morevars, lessvars=lessvars)
246 morevars=morevars, lessvars=lessvars)
247
247
248 def shortlog(web, req, tmpl):
248 def shortlog(web, req, tmpl):
249 return changelog(web, req, tmpl, shortlog = True)
249 return changelog(web, req, tmpl, shortlog = True)
250
250
251 def changeset(web, req, tmpl):
251 def changeset(web, req, tmpl):
252 ctx = webutil.changectx(web.repo, req)
252 ctx = webutil.changectx(web.repo, req)
253 showtags = webutil.showtag(web.repo, tmpl, 'changesettag', ctx.node())
253 showtags = webutil.showtag(web.repo, tmpl, 'changesettag', ctx.node())
254 showbookmarks = webutil.showbookmark(web.repo, tmpl, 'changesetbookmark',
254 showbookmarks = webutil.showbookmark(web.repo, tmpl, 'changesetbookmark',
255 ctx.node())
255 ctx.node())
256 showbranch = webutil.nodebranchnodefault(ctx)
256 showbranch = webutil.nodebranchnodefault(ctx)
257
257
258 files = []
258 files = []
259 parity = paritygen(web.stripecount)
259 parity = paritygen(web.stripecount)
260 for f in ctx.files():
260 for f in ctx.files():
261 template = f in ctx and 'filenodelink' or 'filenolink'
261 template = f in ctx and 'filenodelink' or 'filenolink'
262 files.append(tmpl(template,
262 files.append(tmpl(template,
263 node=ctx.hex(), file=f,
263 node=ctx.hex(), file=f,
264 parity=parity.next()))
264 parity=parity.next()))
265
265
266 parity = paritygen(web.stripecount)
266 parity = paritygen(web.stripecount)
267 style = web.config('web', 'style', 'paper')
267 style = web.config('web', 'style', 'paper')
268 if 'style' in req.form:
268 if 'style' in req.form:
269 style = req.form['style'][0]
269 style = req.form['style'][0]
270
270
271 diffs = webutil.diffs(web.repo, tmpl, ctx, None, parity, style)
271 diffs = webutil.diffs(web.repo, tmpl, ctx, None, parity, style)
272 return tmpl('changeset',
272 return tmpl('changeset',
273 diff=diffs,
273 diff=diffs,
274 rev=ctx.rev(),
274 rev=ctx.rev(),
275 node=ctx.hex(),
275 node=ctx.hex(),
276 parent=webutil.parents(ctx),
276 parent=webutil.parents(ctx),
277 child=webutil.children(ctx),
277 child=webutil.children(ctx),
278 changesettag=showtags,
278 changesettag=showtags,
279 changesetbookmark=showbookmarks,
279 changesetbookmark=showbookmarks,
280 changesetbranch=showbranch,
280 changesetbranch=showbranch,
281 author=ctx.user(),
281 author=ctx.user(),
282 desc=ctx.description(),
282 desc=ctx.description(),
283 date=ctx.date(),
283 date=ctx.date(),
284 files=files,
284 files=files,
285 archives=web.archivelist(ctx.hex()),
285 archives=web.archivelist(ctx.hex()),
286 tags=webutil.nodetagsdict(web.repo, ctx.node()),
286 tags=webutil.nodetagsdict(web.repo, ctx.node()),
287 bookmarks=webutil.nodebookmarksdict(web.repo, ctx.node()),
287 bookmarks=webutil.nodebookmarksdict(web.repo, ctx.node()),
288 branch=webutil.nodebranchnodefault(ctx),
288 branch=webutil.nodebranchnodefault(ctx),
289 inbranch=webutil.nodeinbranch(web.repo, ctx),
289 inbranch=webutil.nodeinbranch(web.repo, ctx),
290 branches=webutil.nodebranchdict(web.repo, ctx))
290 branches=webutil.nodebranchdict(web.repo, ctx))
291
291
292 rev = changeset
292 rev = changeset
293
293
294 def manifest(web, req, tmpl):
294 def manifest(web, req, tmpl):
295 ctx = webutil.changectx(web.repo, req)
295 ctx = webutil.changectx(web.repo, req)
296 path = webutil.cleanpath(web.repo, req.form.get('file', [''])[0])
296 path = webutil.cleanpath(web.repo, req.form.get('file', [''])[0])
297 mf = ctx.manifest()
297 mf = ctx.manifest()
298 node = ctx.node()
298 node = ctx.node()
299
299
300 files = {}
300 files = {}
301 dirs = {}
301 dirs = {}
302 parity = paritygen(web.stripecount)
302 parity = paritygen(web.stripecount)
303
303
304 if path and path[-1] != "/":
304 if path and path[-1] != "/":
305 path += "/"
305 path += "/"
306 l = len(path)
306 l = len(path)
307 abspath = "/" + path
307 abspath = "/" + path
308
308
309 for f, n in mf.iteritems():
309 for f, n in mf.iteritems():
310 if f[:l] != path:
310 if f[:l] != path:
311 continue
311 continue
312 remain = f[l:]
312 remain = f[l:]
313 elements = remain.split('/')
313 elements = remain.split('/')
314 if len(elements) == 1:
314 if len(elements) == 1:
315 files[remain] = f
315 files[remain] = f
316 else:
316 else:
317 h = dirs # need to retain ref to dirs (root)
317 h = dirs # need to retain ref to dirs (root)
318 for elem in elements[0:-1]:
318 for elem in elements[0:-1]:
319 if elem not in h:
319 if elem not in h:
320 h[elem] = {}
320 h[elem] = {}
321 h = h[elem]
321 h = h[elem]
322 if len(h) > 1:
322 if len(h) > 1:
323 break
323 break
324 h[None] = None # denotes files present
324 h[None] = None # denotes files present
325
325
326 if mf and not files and not dirs:
326 if mf and not files and not dirs:
327 raise ErrorResponse(HTTP_NOT_FOUND, 'path not found: ' + path)
327 raise ErrorResponse(HTTP_NOT_FOUND, 'path not found: ' + path)
328
328
329 def filelist(**map):
329 def filelist(**map):
330 for f in sorted(files):
330 for f in sorted(files):
331 full = files[f]
331 full = files[f]
332
332
333 fctx = ctx.filectx(full)
333 fctx = ctx.filectx(full)
334 yield {"file": full,
334 yield {"file": full,
335 "parity": parity.next(),
335 "parity": parity.next(),
336 "basename": f,
336 "basename": f,
337 "date": fctx.date(),
337 "date": fctx.date(),
338 "size": fctx.size(),
338 "size": fctx.size(),
339 "permissions": mf.flags(full)}
339 "permissions": mf.flags(full)}
340
340
341 def dirlist(**map):
341 def dirlist(**map):
342 for d in sorted(dirs):
342 for d in sorted(dirs):
343
343
344 emptydirs = []
344 emptydirs = []
345 h = dirs[d]
345 h = dirs[d]
346 while isinstance(h, dict) and len(h) == 1:
346 while isinstance(h, dict) and len(h) == 1:
347 k, v = h.items()[0]
347 k, v = h.items()[0]
348 if v:
348 if v:
349 emptydirs.append(k)
349 emptydirs.append(k)
350 h = v
350 h = v
351
351
352 path = "%s%s" % (abspath, d)
352 path = "%s%s" % (abspath, d)
353 yield {"parity": parity.next(),
353 yield {"parity": parity.next(),
354 "path": path,
354 "path": path,
355 "emptydirs": "/".join(emptydirs),
355 "emptydirs": "/".join(emptydirs),
356 "basename": d}
356 "basename": d}
357
357
358 return tmpl("manifest",
358 return tmpl("manifest",
359 rev=ctx.rev(),
359 rev=ctx.rev(),
360 node=hex(node),
360 node=hex(node),
361 path=abspath,
361 path=abspath,
362 up=webutil.up(abspath),
362 up=webutil.up(abspath),
363 upparity=parity.next(),
363 upparity=parity.next(),
364 fentries=filelist,
364 fentries=filelist,
365 dentries=dirlist,
365 dentries=dirlist,
366 archives=web.archivelist(hex(node)),
366 archives=web.archivelist(hex(node)),
367 tags=webutil.nodetagsdict(web.repo, node),
367 tags=webutil.nodetagsdict(web.repo, node),
368 bookmarks=webutil.nodebookmarksdict(web.repo, node),
368 bookmarks=webutil.nodebookmarksdict(web.repo, node),
369 inbranch=webutil.nodeinbranch(web.repo, ctx),
369 inbranch=webutil.nodeinbranch(web.repo, ctx),
370 branches=webutil.nodebranchdict(web.repo, ctx))
370 branches=webutil.nodebranchdict(web.repo, ctx))
371
371
372 def tags(web, req, tmpl):
372 def tags(web, req, tmpl):
373 i = web.repo.tagslist()
373 i = web.repo.tagslist()
374 i.reverse()
374 i.reverse()
375 parity = paritygen(web.stripecount)
375 parity = paritygen(web.stripecount)
376
376
377 def entries(notip=False, limit=0, **map):
377 def entries(notip=False, limit=0, **map):
378 count = 0
378 count = 0
379 for k, n in i:
379 for k, n in i:
380 if notip and k == "tip":
380 if notip and k == "tip":
381 continue
381 continue
382 if limit > 0 and count >= limit:
382 if limit > 0 and count >= limit:
383 continue
383 continue
384 count = count + 1
384 count = count + 1
385 yield {"parity": parity.next(),
385 yield {"parity": parity.next(),
386 "tag": k,
386 "tag": k,
387 "date": web.repo[n].date(),
387 "date": web.repo[n].date(),
388 "node": hex(n)}
388 "node": hex(n)}
389
389
390 return tmpl("tags",
390 return tmpl("tags",
391 node=hex(web.repo.changelog.tip()),
391 node=hex(web.repo.changelog.tip()),
392 entries=lambda **x: entries(False, 0, **x),
392 entries=lambda **x: entries(False, 0, **x),
393 entriesnotip=lambda **x: entries(True, 0, **x),
393 entriesnotip=lambda **x: entries(True, 0, **x),
394 latestentry=lambda **x: entries(True, 1, **x))
394 latestentry=lambda **x: entries(True, 1, **x))
395
395
396 def bookmarks(web, req, tmpl):
396 def bookmarks(web, req, tmpl):
397 i = web.repo._bookmarks.items()
397 i = web.repo._bookmarks.items()
398 parity = paritygen(web.stripecount)
398 parity = paritygen(web.stripecount)
399
399
400 def entries(limit=0, **map):
400 def entries(limit=0, **map):
401 count = 0
401 count = 0
402 for k, n in sorted(i):
402 for k, n in sorted(i):
403 if limit > 0 and count >= limit:
403 if limit > 0 and count >= limit:
404 continue
404 continue
405 count = count + 1
405 count = count + 1
406 yield {"parity": parity.next(),
406 yield {"parity": parity.next(),
407 "bookmark": k,
407 "bookmark": k,
408 "date": web.repo[n].date(),
408 "date": web.repo[n].date(),
409 "node": hex(n)}
409 "node": hex(n)}
410
410
411 return tmpl("bookmarks",
411 return tmpl("bookmarks",
412 node=hex(web.repo.changelog.tip()),
412 node=hex(web.repo.changelog.tip()),
413 entries=lambda **x: entries(0, **x),
413 entries=lambda **x: entries(0, **x),
414 latestentry=lambda **x: entries(1, **x))
414 latestentry=lambda **x: entries(1, **x))
415
415
416 def branches(web, req, tmpl):
416 def branches(web, req, tmpl):
417 tips = (web.repo[n] for t, n in web.repo.branchtags().iteritems())
417 tips = (web.repo[n] for t, n in web.repo.branchtags().iteritems())
418 heads = web.repo.heads()
418 heads = web.repo.heads()
419 parity = paritygen(web.stripecount)
419 parity = paritygen(web.stripecount)
420 sortkey = lambda ctx: ('close' not in ctx.extra(), ctx.rev())
420 sortkey = lambda ctx: ('close' not in ctx.extra(), ctx.rev())
421
421
422 def entries(limit, **map):
422 def entries(limit, **map):
423 count = 0
423 count = 0
424 for ctx in sorted(tips, key=sortkey, reverse=True):
424 for ctx in sorted(tips, key=sortkey, reverse=True):
425 if limit > 0 and count >= limit:
425 if limit > 0 and count >= limit:
426 return
426 return
427 count += 1
427 count += 1
428 if ctx.node() not in heads:
428 if ctx.node() not in heads:
429 status = 'inactive'
429 status = 'inactive'
430 elif not web.repo.branchheads(ctx.branch()):
430 elif not web.repo.branchheads(ctx.branch()):
431 status = 'closed'
431 status = 'closed'
432 else:
432 else:
433 status = 'open'
433 status = 'open'
434 yield {'parity': parity.next(),
434 yield {'parity': parity.next(),
435 'branch': ctx.branch(),
435 'branch': ctx.branch(),
436 'status': status,
436 'status': status,
437 'node': ctx.hex(),
437 'node': ctx.hex(),
438 'date': ctx.date()}
438 'date': ctx.date()}
439
439
440 return tmpl('branches', node=hex(web.repo.changelog.tip()),
440 return tmpl('branches', node=hex(web.repo.changelog.tip()),
441 entries=lambda **x: entries(0, **x),
441 entries=lambda **x: entries(0, **x),
442 latestentry=lambda **x: entries(1, **x))
442 latestentry=lambda **x: entries(1, **x))
443
443
444 def summary(web, req, tmpl):
444 def summary(web, req, tmpl):
445 i = web.repo.tagslist()
445 i = web.repo.tagslist()
446 i.reverse()
446 i.reverse()
447
447
448 def tagentries(**map):
448 def tagentries(**map):
449 parity = paritygen(web.stripecount)
449 parity = paritygen(web.stripecount)
450 count = 0
450 count = 0
451 for k, n in i:
451 for k, n in i:
452 if k == "tip": # skip tip
452 if k == "tip": # skip tip
453 continue
453 continue
454
454
455 count += 1
455 count += 1
456 if count > 10: # limit to 10 tags
456 if count > 10: # limit to 10 tags
457 break
457 break
458
458
459 yield tmpl("tagentry",
459 yield tmpl("tagentry",
460 parity=parity.next(),
460 parity=parity.next(),
461 tag=k,
461 tag=k,
462 node=hex(n),
462 node=hex(n),
463 date=web.repo[n].date())
463 date=web.repo[n].date())
464
464
465 def bookmarks(**map):
465 def bookmarks(**map):
466 parity = paritygen(web.stripecount)
466 parity = paritygen(web.stripecount)
467 b = web.repo._bookmarks.items()
467 b = web.repo._bookmarks.items()
468 for k, n in sorted(b)[:10]: # limit to 10 bookmarks
468 for k, n in sorted(b)[:10]: # limit to 10 bookmarks
469 yield {'parity': parity.next(),
469 yield {'parity': parity.next(),
470 'bookmark': k,
470 'bookmark': k,
471 'date': web.repo[n].date(),
471 'date': web.repo[n].date(),
472 'node': hex(n)}
472 'node': hex(n)}
473
473
474 def branches(**map):
474 def branches(**map):
475 parity = paritygen(web.stripecount)
475 parity = paritygen(web.stripecount)
476
476
477 b = web.repo.branchtags()
477 b = web.repo.branchtags()
478 l = [(-web.repo.changelog.rev(n), n, t) for t, n in b.iteritems()]
478 l = [(-web.repo.changelog.rev(n), n, t) for t, n in b.iteritems()]
479 for r, n, t in sorted(l):
479 for r, n, t in sorted(l):
480 yield {'parity': parity.next(),
480 yield {'parity': parity.next(),
481 'branch': t,
481 'branch': t,
482 'node': hex(n),
482 'node': hex(n),
483 'date': web.repo[n].date()}
483 'date': web.repo[n].date()}
484
484
485 def changelist(**map):
485 def changelist(**map):
486 parity = paritygen(web.stripecount, offset=start - end)
486 parity = paritygen(web.stripecount, offset=start - end)
487 l = [] # build a list in forward order for efficiency
487 l = [] # build a list in forward order for efficiency
488 for i in xrange(start, end):
488 for i in xrange(start, end):
489 ctx = web.repo[i]
489 ctx = web.repo[i]
490 n = ctx.node()
490 n = ctx.node()
491 hn = hex(n)
491 hn = hex(n)
492
492
493 l.insert(0, tmpl(
493 l.insert(0, tmpl(
494 'shortlogentry',
494 'shortlogentry',
495 parity=parity.next(),
495 parity=parity.next(),
496 author=ctx.user(),
496 author=ctx.user(),
497 desc=ctx.description(),
497 desc=ctx.description(),
498 date=ctx.date(),
498 date=ctx.date(),
499 rev=i,
499 rev=i,
500 node=hn,
500 node=hn,
501 tags=webutil.nodetagsdict(web.repo, n),
501 tags=webutil.nodetagsdict(web.repo, n),
502 bookmarks=webutil.nodebookmarksdict(web.repo, n),
502 bookmarks=webutil.nodebookmarksdict(web.repo, n),
503 inbranch=webutil.nodeinbranch(web.repo, ctx),
503 inbranch=webutil.nodeinbranch(web.repo, ctx),
504 branches=webutil.nodebranchdict(web.repo, ctx)))
504 branches=webutil.nodebranchdict(web.repo, ctx)))
505
505
506 yield l
506 yield l
507
507
508 tip = web.repo['tip']
508 tip = web.repo['tip']
509 count = len(web.repo)
509 count = len(web.repo)
510 start = max(0, count - web.maxchanges)
510 start = max(0, count - web.maxchanges)
511 end = min(count, start + web.maxchanges)
511 end = min(count, start + web.maxchanges)
512
512
513 return tmpl("summary",
513 return tmpl("summary",
514 desc=web.config("web", "description", "unknown"),
514 desc=web.config("web", "description", "unknown"),
515 owner=get_contact(web.config) or "unknown",
515 owner=get_contact(web.config) or "unknown",
516 lastchange=tip.date(),
516 lastchange=tip.date(),
517 tags=tagentries,
517 tags=tagentries,
518 bookmarks=bookmarks,
518 bookmarks=bookmarks,
519 branches=branches,
519 branches=branches,
520 shortlog=changelist,
520 shortlog=changelist,
521 node=tip.hex(),
521 node=tip.hex(),
522 archives=web.archivelist("tip"))
522 archives=web.archivelist("tip"))
523
523
524 def filediff(web, req, tmpl):
524 def filediff(web, req, tmpl):
525 fctx, ctx = None, None
525 fctx, ctx = None, None
526 try:
526 try:
527 fctx = webutil.filectx(web.repo, req)
527 fctx = webutil.filectx(web.repo, req)
528 except LookupError:
528 except LookupError:
529 ctx = webutil.changectx(web.repo, req)
529 ctx = webutil.changectx(web.repo, req)
530 path = webutil.cleanpath(web.repo, req.form['file'][0])
530 path = webutil.cleanpath(web.repo, req.form['file'][0])
531 if path not in ctx.files():
531 if path not in ctx.files():
532 raise
532 raise
533
533
534 if fctx is not None:
534 if fctx is not None:
535 n = fctx.node()
535 n = fctx.node()
536 path = fctx.path()
536 path = fctx.path()
537 else:
537 else:
538 n = ctx.node()
538 n = ctx.node()
539 # path already defined in except clause
539 # path already defined in except clause
540
540
541 parity = paritygen(web.stripecount)
541 parity = paritygen(web.stripecount)
542 style = web.config('web', 'style', 'paper')
542 style = web.config('web', 'style', 'paper')
543 if 'style' in req.form:
543 if 'style' in req.form:
544 style = req.form['style'][0]
544 style = req.form['style'][0]
545
545
546 diffs = webutil.diffs(web.repo, tmpl, fctx or ctx, [path], parity, style)
546 diffs = webutil.diffs(web.repo, tmpl, fctx or ctx, [path], parity, style)
547 rename = fctx and webutil.renamelink(fctx) or []
547 rename = fctx and webutil.renamelink(fctx) or []
548 ctx = fctx and fctx or ctx
548 ctx = fctx and fctx or ctx
549 return tmpl("filediff",
549 return tmpl("filediff",
550 file=path,
550 file=path,
551 node=hex(n),
551 node=hex(n),
552 rev=ctx.rev(),
552 rev=ctx.rev(),
553 date=ctx.date(),
553 date=ctx.date(),
554 desc=ctx.description(),
554 desc=ctx.description(),
555 author=ctx.user(),
555 author=ctx.user(),
556 rename=rename,
556 rename=rename,
557 branch=webutil.nodebranchnodefault(ctx),
557 branch=webutil.nodebranchnodefault(ctx),
558 parent=webutil.parents(ctx),
558 parent=webutil.parents(ctx),
559 child=webutil.children(ctx),
559 child=webutil.children(ctx),
560 diff=diffs)
560 diff=diffs)
561
561
562 diff = filediff
562 diff = filediff
563
563
564 def annotate(web, req, tmpl):
564 def annotate(web, req, tmpl):
565 fctx = webutil.filectx(web.repo, req)
565 fctx = webutil.filectx(web.repo, req)
566 f = fctx.path()
566 f = fctx.path()
567 parity = paritygen(web.stripecount)
567 parity = paritygen(web.stripecount)
568
568
569 def annotate(**map):
569 def annotate(**map):
570 last = None
570 last = None
571 if binary(fctx.data()):
571 if binary(fctx.data()):
572 mt = (mimetypes.guess_type(fctx.path())[0]
572 mt = (mimetypes.guess_type(fctx.path())[0]
573 or 'application/octet-stream')
573 or 'application/octet-stream')
574 lines = enumerate([((fctx.filectx(fctx.filerev()), 1),
574 lines = enumerate([((fctx.filectx(fctx.filerev()), 1),
575 '(binary:%s)' % mt)])
575 '(binary:%s)' % mt)])
576 else:
576 else:
577 lines = enumerate(fctx.annotate(follow=True, linenumber=True))
577 lines = enumerate(fctx.annotate(follow=True, linenumber=True))
578 for lineno, ((f, targetline), l) in lines:
578 for lineno, ((f, targetline), l) in lines:
579 fnode = f.filenode()
579 fnode = f.filenode()
580
580
581 if last != fnode:
581 if last != fnode:
582 last = fnode
582 last = fnode
583
583
584 yield {"parity": parity.next(),
584 yield {"parity": parity.next(),
585 "node": hex(f.node()),
585 "node": f.hex(),
586 "rev": f.rev(),
586 "rev": f.rev(),
587 "author": f.user(),
587 "author": f.user(),
588 "desc": f.description(),
588 "desc": f.description(),
589 "file": f.path(),
589 "file": f.path(),
590 "targetline": targetline,
590 "targetline": targetline,
591 "line": l,
591 "line": l,
592 "lineid": "l%d" % (lineno + 1),
592 "lineid": "l%d" % (lineno + 1),
593 "linenumber": "% 6d" % (lineno + 1),
593 "linenumber": "% 6d" % (lineno + 1),
594 "revdate": f.date()}
594 "revdate": f.date()}
595
595
596 return tmpl("fileannotate",
596 return tmpl("fileannotate",
597 file=f,
597 file=f,
598 annotate=annotate,
598 annotate=annotate,
599 path=webutil.up(f),
599 path=webutil.up(f),
600 rev=fctx.rev(),
600 rev=fctx.rev(),
601 node=hex(fctx.node()),
601 node=fctx.hex(),
602 author=fctx.user(),
602 author=fctx.user(),
603 date=fctx.date(),
603 date=fctx.date(),
604 desc=fctx.description(),
604 desc=fctx.description(),
605 rename=webutil.renamelink(fctx),
605 rename=webutil.renamelink(fctx),
606 branch=webutil.nodebranchnodefault(fctx),
606 branch=webutil.nodebranchnodefault(fctx),
607 parent=webutil.parents(fctx),
607 parent=webutil.parents(fctx),
608 child=webutil.children(fctx),
608 child=webutil.children(fctx),
609 permissions=fctx.manifest().flags(f))
609 permissions=fctx.manifest().flags(f))
610
610
611 def filelog(web, req, tmpl):
611 def filelog(web, req, tmpl):
612
612
613 try:
613 try:
614 fctx = webutil.filectx(web.repo, req)
614 fctx = webutil.filectx(web.repo, req)
615 f = fctx.path()
615 f = fctx.path()
616 fl = fctx.filelog()
616 fl = fctx.filelog()
617 except error.LookupError:
617 except error.LookupError:
618 f = webutil.cleanpath(web.repo, req.form['file'][0])
618 f = webutil.cleanpath(web.repo, req.form['file'][0])
619 fl = web.repo.file(f)
619 fl = web.repo.file(f)
620 numrevs = len(fl)
620 numrevs = len(fl)
621 if not numrevs: # file doesn't exist at all
621 if not numrevs: # file doesn't exist at all
622 raise
622 raise
623 rev = webutil.changectx(web.repo, req).rev()
623 rev = webutil.changectx(web.repo, req).rev()
624 first = fl.linkrev(0)
624 first = fl.linkrev(0)
625 if rev < first: # current rev is from before file existed
625 if rev < first: # current rev is from before file existed
626 raise
626 raise
627 frev = numrevs - 1
627 frev = numrevs - 1
628 while fl.linkrev(frev) > rev:
628 while fl.linkrev(frev) > rev:
629 frev -= 1
629 frev -= 1
630 fctx = web.repo.filectx(f, fl.linkrev(frev))
630 fctx = web.repo.filectx(f, fl.linkrev(frev))
631
631
632 revcount = web.maxshortchanges
632 revcount = web.maxshortchanges
633 if 'revcount' in req.form:
633 if 'revcount' in req.form:
634 revcount = int(req.form.get('revcount', [revcount])[0])
634 revcount = int(req.form.get('revcount', [revcount])[0])
635 revcount = max(revcount, 1)
635 revcount = max(revcount, 1)
636 tmpl.defaults['sessionvars']['revcount'] = revcount
636 tmpl.defaults['sessionvars']['revcount'] = revcount
637
637
638 lessvars = copy.copy(tmpl.defaults['sessionvars'])
638 lessvars = copy.copy(tmpl.defaults['sessionvars'])
639 lessvars['revcount'] = max(revcount / 2, 1)
639 lessvars['revcount'] = max(revcount / 2, 1)
640 morevars = copy.copy(tmpl.defaults['sessionvars'])
640 morevars = copy.copy(tmpl.defaults['sessionvars'])
641 morevars['revcount'] = revcount * 2
641 morevars['revcount'] = revcount * 2
642
642
643 count = fctx.filerev() + 1
643 count = fctx.filerev() + 1
644 start = max(0, fctx.filerev() - revcount + 1) # first rev on this page
644 start = max(0, fctx.filerev() - revcount + 1) # first rev on this page
645 end = min(count, start + revcount) # last rev on this page
645 end = min(count, start + revcount) # last rev on this page
646 parity = paritygen(web.stripecount, offset=start - end)
646 parity = paritygen(web.stripecount, offset=start - end)
647
647
648 def entries(limit=0, **map):
648 def entries(limit=0, **map):
649 l = []
649 l = []
650
650
651 repo = web.repo
651 repo = web.repo
652 for i in xrange(start, end):
652 for i in xrange(start, end):
653 iterfctx = fctx.filectx(i)
653 iterfctx = fctx.filectx(i)
654
654
655 l.insert(0, {"parity": parity.next(),
655 l.insert(0, {"parity": parity.next(),
656 "filerev": i,
656 "filerev": i,
657 "file": f,
657 "file": f,
658 "node": hex(iterfctx.node()),
658 "node": iterfctx.hex(),
659 "author": iterfctx.user(),
659 "author": iterfctx.user(),
660 "date": iterfctx.date(),
660 "date": iterfctx.date(),
661 "rename": webutil.renamelink(iterfctx),
661 "rename": webutil.renamelink(iterfctx),
662 "parent": webutil.parents(iterfctx),
662 "parent": webutil.parents(iterfctx),
663 "child": webutil.children(iterfctx),
663 "child": webutil.children(iterfctx),
664 "desc": iterfctx.description(),
664 "desc": iterfctx.description(),
665 "tags": webutil.nodetagsdict(repo, iterfctx.node()),
665 "tags": webutil.nodetagsdict(repo, iterfctx.node()),
666 "bookmarks": webutil.nodebookmarksdict(
666 "bookmarks": webutil.nodebookmarksdict(
667 repo, iterfctx.node()),
667 repo, iterfctx.node()),
668 "branch": webutil.nodebranchnodefault(iterfctx),
668 "branch": webutil.nodebranchnodefault(iterfctx),
669 "inbranch": webutil.nodeinbranch(repo, iterfctx),
669 "inbranch": webutil.nodeinbranch(repo, iterfctx),
670 "branches": webutil.nodebranchdict(repo, iterfctx)})
670 "branches": webutil.nodebranchdict(repo, iterfctx)})
671
671
672 if limit > 0:
672 if limit > 0:
673 l = l[:limit]
673 l = l[:limit]
674
674
675 for e in l:
675 for e in l:
676 yield e
676 yield e
677
677
678 nodefunc = lambda x: fctx.filectx(fileid=x)
678 nodefunc = lambda x: fctx.filectx(fileid=x)
679 nav = webutil.revnavgen(end - 1, revcount, count, nodefunc)
679 nav = webutil.revnavgen(end - 1, revcount, count, nodefunc)
680 return tmpl("filelog", file=f, node=hex(fctx.node()), nav=nav,
680 return tmpl("filelog", file=f, node=fctx.hex(), nav=nav,
681 entries=lambda **x: entries(limit=0, **x),
681 entries=lambda **x: entries(limit=0, **x),
682 latestentry=lambda **x: entries(limit=1, **x),
682 latestentry=lambda **x: entries(limit=1, **x),
683 revcount=revcount, morevars=morevars, lessvars=lessvars)
683 revcount=revcount, morevars=morevars, lessvars=lessvars)
684
684
685 def archive(web, req, tmpl):
685 def archive(web, req, tmpl):
686 type_ = req.form.get('type', [None])[0]
686 type_ = req.form.get('type', [None])[0]
687 allowed = web.configlist("web", "allow_archive")
687 allowed = web.configlist("web", "allow_archive")
688 key = req.form['node'][0]
688 key = req.form['node'][0]
689
689
690 if type_ not in web.archives:
690 if type_ not in web.archives:
691 msg = 'Unsupported archive type: %s' % type_
691 msg = 'Unsupported archive type: %s' % type_
692 raise ErrorResponse(HTTP_NOT_FOUND, msg)
692 raise ErrorResponse(HTTP_NOT_FOUND, msg)
693
693
694 if not ((type_ in allowed or
694 if not ((type_ in allowed or
695 web.configbool("web", "allow" + type_, False))):
695 web.configbool("web", "allow" + type_, False))):
696 msg = 'Archive type not allowed: %s' % type_
696 msg = 'Archive type not allowed: %s' % type_
697 raise ErrorResponse(HTTP_FORBIDDEN, msg)
697 raise ErrorResponse(HTTP_FORBIDDEN, msg)
698
698
699 reponame = re.sub(r"\W+", "-", os.path.basename(web.reponame))
699 reponame = re.sub(r"\W+", "-", os.path.basename(web.reponame))
700 cnode = web.repo.lookup(key)
700 cnode = web.repo.lookup(key)
701 arch_version = key
701 arch_version = key
702 if cnode == key or key == 'tip':
702 if cnode == key or key == 'tip':
703 arch_version = short(cnode)
703 arch_version = short(cnode)
704 name = "%s-%s" % (reponame, arch_version)
704 name = "%s-%s" % (reponame, arch_version)
705 mimetype, artype, extension, encoding = web.archive_specs[type_]
705 mimetype, artype, extension, encoding = web.archive_specs[type_]
706 headers = [
706 headers = [
707 ('Content-Type', mimetype),
707 ('Content-Type', mimetype),
708 ('Content-Disposition', 'attachment; filename=%s%s' % (name, extension))
708 ('Content-Disposition', 'attachment; filename=%s%s' % (name, extension))
709 ]
709 ]
710 if encoding:
710 if encoding:
711 headers.append(('Content-Encoding', encoding))
711 headers.append(('Content-Encoding', encoding))
712 req.header(headers)
712 req.header(headers)
713 req.respond(HTTP_OK)
713 req.respond(HTTP_OK)
714 archival.archive(web.repo, req, cnode, artype, prefix=name)
714 archival.archive(web.repo, req, cnode, artype, prefix=name)
715 return []
715 return []
716
716
717
717
718 def static(web, req, tmpl):
718 def static(web, req, tmpl):
719 fname = req.form['file'][0]
719 fname = req.form['file'][0]
720 # a repo owner may set web.static in .hg/hgrc to get any file
720 # a repo owner may set web.static in .hg/hgrc to get any file
721 # readable by the user running the CGI script
721 # readable by the user running the CGI script
722 static = web.config("web", "static", None, untrusted=False)
722 static = web.config("web", "static", None, untrusted=False)
723 if not static:
723 if not static:
724 tp = web.templatepath or templater.templatepath()
724 tp = web.templatepath or templater.templatepath()
725 if isinstance(tp, str):
725 if isinstance(tp, str):
726 tp = [tp]
726 tp = [tp]
727 static = [os.path.join(p, 'static') for p in tp]
727 static = [os.path.join(p, 'static') for p in tp]
728 return [staticfile(static, fname, req)]
728 return [staticfile(static, fname, req)]
729
729
730 def graph(web, req, tmpl):
730 def graph(web, req, tmpl):
731
731
732 rev = webutil.changectx(web.repo, req).rev()
732 rev = webutil.changectx(web.repo, req).rev()
733 bg_height = 39
733 bg_height = 39
734 revcount = web.maxshortchanges
734 revcount = web.maxshortchanges
735 if 'revcount' in req.form:
735 if 'revcount' in req.form:
736 revcount = int(req.form.get('revcount', [revcount])[0])
736 revcount = int(req.form.get('revcount', [revcount])[0])
737 revcount = max(revcount, 1)
737 revcount = max(revcount, 1)
738 tmpl.defaults['sessionvars']['revcount'] = revcount
738 tmpl.defaults['sessionvars']['revcount'] = revcount
739
739
740 lessvars = copy.copy(tmpl.defaults['sessionvars'])
740 lessvars = copy.copy(tmpl.defaults['sessionvars'])
741 lessvars['revcount'] = max(revcount / 2, 1)
741 lessvars['revcount'] = max(revcount / 2, 1)
742 morevars = copy.copy(tmpl.defaults['sessionvars'])
742 morevars = copy.copy(tmpl.defaults['sessionvars'])
743 morevars['revcount'] = revcount * 2
743 morevars['revcount'] = revcount * 2
744
744
745 max_rev = len(web.repo) - 1
745 max_rev = len(web.repo) - 1
746 revcount = min(max_rev, revcount)
746 revcount = min(max_rev, revcount)
747 revnode = web.repo.changelog.node(rev)
747 revnode = web.repo.changelog.node(rev)
748 revnode_hex = hex(revnode)
748 revnode_hex = hex(revnode)
749 uprev = min(max_rev, rev + revcount)
749 uprev = min(max_rev, rev + revcount)
750 downrev = max(0, rev - revcount)
750 downrev = max(0, rev - revcount)
751 count = len(web.repo)
751 count = len(web.repo)
752 changenav = webutil.revnavgen(rev, revcount, count, web.repo.changectx)
752 changenav = webutil.revnavgen(rev, revcount, count, web.repo.changectx)
753 startrev = rev
753 startrev = rev
754 # if starting revision is less than 60 set it to uprev
754 # if starting revision is less than 60 set it to uprev
755 if rev < web.maxshortchanges:
755 if rev < web.maxshortchanges:
756 startrev = uprev
756 startrev = uprev
757
757
758 dag = graphmod.dagwalker(web.repo, range(startrev, downrev - 1, -1))
758 dag = graphmod.dagwalker(web.repo, range(startrev, downrev - 1, -1))
759 tree = list(graphmod.colored(dag))
759 tree = list(graphmod.colored(dag))
760 canvasheight = (len(tree) + 1) * bg_height - 27
760 canvasheight = (len(tree) + 1) * bg_height - 27
761 data = []
761 data = []
762 for (id, type, ctx, vtx, edges) in tree:
762 for (id, type, ctx, vtx, edges) in tree:
763 if type != graphmod.CHANGESET:
763 if type != graphmod.CHANGESET:
764 continue
764 continue
765 node = short(ctx.node())
765 node = str(ctx)
766 age = templatefilters.age(ctx.date())
766 age = templatefilters.age(ctx.date())
767 desc = templatefilters.firstline(ctx.description())
767 desc = templatefilters.firstline(ctx.description())
768 desc = cgi.escape(templatefilters.nonempty(desc))
768 desc = cgi.escape(templatefilters.nonempty(desc))
769 user = cgi.escape(templatefilters.person(ctx.user()))
769 user = cgi.escape(templatefilters.person(ctx.user()))
770 branch = ctx.branch()
770 branch = ctx.branch()
771 branch = branch, web.repo.branchtags().get(branch) == ctx.node()
771 branch = branch, web.repo.branchtags().get(branch) == ctx.node()
772 data.append((node, vtx, edges, desc, user, age, branch, ctx.tags(),
772 data.append((node, vtx, edges, desc, user, age, branch, ctx.tags(),
773 ctx.bookmarks()))
773 ctx.bookmarks()))
774
774
775 return tmpl('graph', rev=rev, revcount=revcount, uprev=uprev,
775 return tmpl('graph', rev=rev, revcount=revcount, uprev=uprev,
776 lessvars=lessvars, morevars=morevars, downrev=downrev,
776 lessvars=lessvars, morevars=morevars, downrev=downrev,
777 canvasheight=canvasheight, jsdata=data, bg_height=bg_height,
777 canvasheight=canvasheight, jsdata=data, bg_height=bg_height,
778 node=revnode_hex, changenav=changenav)
778 node=revnode_hex, changenav=changenav)
779
779
780 def _getdoc(e):
780 def _getdoc(e):
781 doc = e[0].__doc__
781 doc = e[0].__doc__
782 if doc:
782 if doc:
783 doc = doc.split('\n')[0]
783 doc = doc.split('\n')[0]
784 else:
784 else:
785 doc = _('(no help text available)')
785 doc = _('(no help text available)')
786 return doc
786 return doc
787
787
788 def help(web, req, tmpl):
788 def help(web, req, tmpl):
789 from mercurial import commands # avoid cycle
789 from mercurial import commands # avoid cycle
790
790
791 topicname = req.form.get('node', [None])[0]
791 topicname = req.form.get('node', [None])[0]
792 if not topicname:
792 if not topicname:
793 topic = []
794
795 def topics(**map):
793 def topics(**map):
796 for entries, summary, _ in helpmod.helptable:
794 for entries, summary, _ in helpmod.helptable:
797 entries = sorted(entries, key=len)
795 entries = sorted(entries, key=len)
798 yield {'topic': entries[-1], 'summary': summary}
796 yield {'topic': entries[-1], 'summary': summary}
799
797
800 early, other = [], []
798 early, other = [], []
801 primary = lambda s: s.split('|')[0]
799 primary = lambda s: s.split('|')[0]
802 for c, e in commands.table.iteritems():
800 for c, e in commands.table.iteritems():
803 doc = _getdoc(e)
801 doc = _getdoc(e)
804 if 'DEPRECATED' in doc or c.startswith('debug'):
802 if 'DEPRECATED' in doc or c.startswith('debug'):
805 continue
803 continue
806 cmd = primary(c)
804 cmd = primary(c)
807 if cmd.startswith('^'):
805 if cmd.startswith('^'):
808 early.append((cmd[1:], doc))
806 early.append((cmd[1:], doc))
809 else:
807 else:
810 other.append((cmd, doc))
808 other.append((cmd, doc))
811
809
812 early.sort()
810 early.sort()
813 other.sort()
811 other.sort()
814
812
815 def earlycommands(**map):
813 def earlycommands(**map):
816 for c, doc in early:
814 for c, doc in early:
817 yield {'topic': c, 'summary': doc}
815 yield {'topic': c, 'summary': doc}
818
816
819 def othercommands(**map):
817 def othercommands(**map):
820 for c, doc in other:
818 for c, doc in other:
821 yield {'topic': c, 'summary': doc}
819 yield {'topic': c, 'summary': doc}
822
820
823 return tmpl('helptopics', topics=topics, earlycommands=earlycommands,
821 return tmpl('helptopics', topics=topics, earlycommands=earlycommands,
824 othercommands=othercommands, title='Index')
822 othercommands=othercommands, title='Index')
825
823
826 u = webutil.wsgiui()
824 u = webutil.wsgiui()
827 u.pushbuffer()
825 u.pushbuffer()
828 try:
826 try:
829 commands.help_(u, topicname)
827 commands.help_(u, topicname)
830 except error.UnknownCommand:
828 except error.UnknownCommand:
831 raise ErrorResponse(HTTP_NOT_FOUND)
829 raise ErrorResponse(HTTP_NOT_FOUND)
832 doc = u.popbuffer()
830 doc = u.popbuffer()
833 return tmpl('help', topic=topicname, doc=doc)
831 return tmpl('help', topic=topicname, doc=doc)
@@ -1,233 +1,233
1 # hgweb/webutil.py - utility library for the web interface.
1 # hgweb/webutil.py - utility library for the web interface.
2 #
2 #
3 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
3 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
4 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
5 #
5 #
6 # This software may be used and distributed according to the terms of the
6 # This software may be used and distributed according to the terms of the
7 # GNU General Public License version 2 or any later version.
7 # GNU General Public License version 2 or any later version.
8
8
9 import os, copy
9 import os, copy
10 from mercurial import match, patch, scmutil, error, ui
10 from mercurial import match, patch, scmutil, error, ui
11 from mercurial.node import hex, nullid
11 from mercurial.node import hex, nullid
12
12
13 def up(p):
13 def up(p):
14 if p[0] != "/":
14 if p[0] != "/":
15 p = "/" + p
15 p = "/" + p
16 if p[-1] == "/":
16 if p[-1] == "/":
17 p = p[:-1]
17 p = p[:-1]
18 up = os.path.dirname(p)
18 up = os.path.dirname(p)
19 if up == "/":
19 if up == "/":
20 return "/"
20 return "/"
21 return up + "/"
21 return up + "/"
22
22
23 def revnavgen(pos, pagelen, limit, nodefunc):
23 def revnavgen(pos, pagelen, limit, nodefunc):
24 def seq(factor, limit=None):
24 def seq(factor, limit=None):
25 if limit:
25 if limit:
26 yield limit
26 yield limit
27 if limit >= 20 and limit <= 40:
27 if limit >= 20 and limit <= 40:
28 yield 50
28 yield 50
29 else:
29 else:
30 yield 1 * factor
30 yield 1 * factor
31 yield 3 * factor
31 yield 3 * factor
32 for f in seq(factor * 10):
32 for f in seq(factor * 10):
33 yield f
33 yield f
34
34
35 navbefore = []
35 navbefore = []
36 navafter = []
36 navafter = []
37
37
38 last = 0
38 last = 0
39 for f in seq(1, pagelen):
39 for f in seq(1, pagelen):
40 if f < pagelen or f <= last:
40 if f < pagelen or f <= last:
41 continue
41 continue
42 if f > limit:
42 if f > limit:
43 break
43 break
44 last = f
44 last = f
45 if pos + f < limit:
45 if pos + f < limit:
46 navafter.append(("+%d" % f, hex(nodefunc(pos + f).node())))
46 navafter.append(("+%d" % f, hex(nodefunc(pos + f).node())))
47 if pos - f >= 0:
47 if pos - f >= 0:
48 navbefore.insert(0, ("-%d" % f, hex(nodefunc(pos - f).node())))
48 navbefore.insert(0, ("-%d" % f, hex(nodefunc(pos - f).node())))
49
49
50 navafter.append(("tip", "tip"))
50 navafter.append(("tip", "tip"))
51 try:
51 try:
52 navbefore.insert(0, ("(0)", hex(nodefunc('0').node())))
52 navbefore.insert(0, ("(0)", hex(nodefunc('0').node())))
53 except error.RepoError:
53 except error.RepoError:
54 pass
54 pass
55
55
56 def gen(l):
56 def gen(l):
57 def f(**map):
57 def f(**map):
58 for label, node in l:
58 for label, node in l:
59 yield {"label": label, "node": node}
59 yield {"label": label, "node": node}
60 return f
60 return f
61
61
62 return (dict(before=gen(navbefore), after=gen(navafter)),)
62 return (dict(before=gen(navbefore), after=gen(navafter)),)
63
63
64 def _siblings(siblings=[], hiderev=None):
64 def _siblings(siblings=[], hiderev=None):
65 siblings = [s for s in siblings if s.node() != nullid]
65 siblings = [s for s in siblings if s.node() != nullid]
66 if len(siblings) == 1 and siblings[0].rev() == hiderev:
66 if len(siblings) == 1 and siblings[0].rev() == hiderev:
67 return
67 return
68 for s in siblings:
68 for s in siblings:
69 d = {'node': hex(s.node()), 'rev': s.rev()}
69 d = {'node': s.hex(), 'rev': s.rev()}
70 d['user'] = s.user()
70 d['user'] = s.user()
71 d['date'] = s.date()
71 d['date'] = s.date()
72 d['description'] = s.description()
72 d['description'] = s.description()
73 d['branch'] = s.branch()
73 d['branch'] = s.branch()
74 if hasattr(s, 'path'):
74 if hasattr(s, 'path'):
75 d['file'] = s.path()
75 d['file'] = s.path()
76 yield d
76 yield d
77
77
78 def parents(ctx, hide=None):
78 def parents(ctx, hide=None):
79 return _siblings(ctx.parents(), hide)
79 return _siblings(ctx.parents(), hide)
80
80
81 def children(ctx, hide=None):
81 def children(ctx, hide=None):
82 return _siblings(ctx.children(), hide)
82 return _siblings(ctx.children(), hide)
83
83
84 def renamelink(fctx):
84 def renamelink(fctx):
85 r = fctx.renamed()
85 r = fctx.renamed()
86 if r:
86 if r:
87 return [dict(file=r[0], node=hex(r[1]))]
87 return [dict(file=r[0], node=hex(r[1]))]
88 return []
88 return []
89
89
90 def nodetagsdict(repo, node):
90 def nodetagsdict(repo, node):
91 return [{"name": i} for i in repo.nodetags(node)]
91 return [{"name": i} for i in repo.nodetags(node)]
92
92
93 def nodebookmarksdict(repo, node):
93 def nodebookmarksdict(repo, node):
94 return [{"name": i} for i in repo.nodebookmarks(node)]
94 return [{"name": i} for i in repo.nodebookmarks(node)]
95
95
96 def nodebranchdict(repo, ctx):
96 def nodebranchdict(repo, ctx):
97 branches = []
97 branches = []
98 branch = ctx.branch()
98 branch = ctx.branch()
99 # If this is an empty repo, ctx.node() == nullid,
99 # If this is an empty repo, ctx.node() == nullid,
100 # ctx.branch() == 'default', but branchtags() is
100 # ctx.branch() == 'default', but branchtags() is
101 # an empty dict. Using dict.get avoids a traceback.
101 # an empty dict. Using dict.get avoids a traceback.
102 if repo.branchtags().get(branch) == ctx.node():
102 if repo.branchtags().get(branch) == ctx.node():
103 branches.append({"name": branch})
103 branches.append({"name": branch})
104 return branches
104 return branches
105
105
106 def nodeinbranch(repo, ctx):
106 def nodeinbranch(repo, ctx):
107 branches = []
107 branches = []
108 branch = ctx.branch()
108 branch = ctx.branch()
109 if branch != 'default' and repo.branchtags().get(branch) != ctx.node():
109 if branch != 'default' and repo.branchtags().get(branch) != ctx.node():
110 branches.append({"name": branch})
110 branches.append({"name": branch})
111 return branches
111 return branches
112
112
113 def nodebranchnodefault(ctx):
113 def nodebranchnodefault(ctx):
114 branches = []
114 branches = []
115 branch = ctx.branch()
115 branch = ctx.branch()
116 if branch != 'default':
116 if branch != 'default':
117 branches.append({"name": branch})
117 branches.append({"name": branch})
118 return branches
118 return branches
119
119
120 def showtag(repo, tmpl, t1, node=nullid, **args):
120 def showtag(repo, tmpl, t1, node=nullid, **args):
121 for t in repo.nodetags(node):
121 for t in repo.nodetags(node):
122 yield tmpl(t1, tag=t, **args)
122 yield tmpl(t1, tag=t, **args)
123
123
124 def showbookmark(repo, tmpl, t1, node=nullid, **args):
124 def showbookmark(repo, tmpl, t1, node=nullid, **args):
125 for t in repo.nodebookmarks(node):
125 for t in repo.nodebookmarks(node):
126 yield tmpl(t1, bookmark=t, **args)
126 yield tmpl(t1, bookmark=t, **args)
127
127
128 def cleanpath(repo, path):
128 def cleanpath(repo, path):
129 path = path.lstrip('/')
129 path = path.lstrip('/')
130 return scmutil.canonpath(repo.root, '', path)
130 return scmutil.canonpath(repo.root, '', path)
131
131
132 def changectx(repo, req):
132 def changectx(repo, req):
133 changeid = "tip"
133 changeid = "tip"
134 if 'node' in req.form:
134 if 'node' in req.form:
135 changeid = req.form['node'][0]
135 changeid = req.form['node'][0]
136 elif 'manifest' in req.form:
136 elif 'manifest' in req.form:
137 changeid = req.form['manifest'][0]
137 changeid = req.form['manifest'][0]
138
138
139 try:
139 try:
140 ctx = repo[changeid]
140 ctx = repo[changeid]
141 except error.RepoError:
141 except error.RepoError:
142 man = repo.manifest
142 man = repo.manifest
143 ctx = repo[man.linkrev(man.rev(man.lookup(changeid)))]
143 ctx = repo[man.linkrev(man.rev(man.lookup(changeid)))]
144
144
145 return ctx
145 return ctx
146
146
147 def filectx(repo, req):
147 def filectx(repo, req):
148 path = cleanpath(repo, req.form['file'][0])
148 path = cleanpath(repo, req.form['file'][0])
149 if 'node' in req.form:
149 if 'node' in req.form:
150 changeid = req.form['node'][0]
150 changeid = req.form['node'][0]
151 else:
151 else:
152 changeid = req.form['filenode'][0]
152 changeid = req.form['filenode'][0]
153 try:
153 try:
154 fctx = repo[changeid][path]
154 fctx = repo[changeid][path]
155 except error.RepoError:
155 except error.RepoError:
156 fctx = repo.filectx(path, fileid=changeid)
156 fctx = repo.filectx(path, fileid=changeid)
157
157
158 return fctx
158 return fctx
159
159
160 def listfilediffs(tmpl, files, node, max):
160 def listfilediffs(tmpl, files, node, max):
161 for f in files[:max]:
161 for f in files[:max]:
162 yield tmpl('filedifflink', node=hex(node), file=f)
162 yield tmpl('filedifflink', node=hex(node), file=f)
163 if len(files) > max:
163 if len(files) > max:
164 yield tmpl('fileellipses')
164 yield tmpl('fileellipses')
165
165
166 def diffs(repo, tmpl, ctx, files, parity, style):
166 def diffs(repo, tmpl, ctx, files, parity, style):
167
167
168 def countgen():
168 def countgen():
169 start = 1
169 start = 1
170 while True:
170 while True:
171 yield start
171 yield start
172 start += 1
172 start += 1
173
173
174 blockcount = countgen()
174 blockcount = countgen()
175 def prettyprintlines(diff):
175 def prettyprintlines(diff):
176 blockno = blockcount.next()
176 blockno = blockcount.next()
177 for lineno, l in enumerate(diff.splitlines(True)):
177 for lineno, l in enumerate(diff.splitlines(True)):
178 lineno = "%d.%d" % (blockno, lineno + 1)
178 lineno = "%d.%d" % (blockno, lineno + 1)
179 if l.startswith('+'):
179 if l.startswith('+'):
180 ltype = "difflineplus"
180 ltype = "difflineplus"
181 elif l.startswith('-'):
181 elif l.startswith('-'):
182 ltype = "difflineminus"
182 ltype = "difflineminus"
183 elif l.startswith('@'):
183 elif l.startswith('@'):
184 ltype = "difflineat"
184 ltype = "difflineat"
185 else:
185 else:
186 ltype = "diffline"
186 ltype = "diffline"
187 yield tmpl(ltype,
187 yield tmpl(ltype,
188 line=l,
188 line=l,
189 lineid="l%s" % lineno,
189 lineid="l%s" % lineno,
190 linenumber="% 8s" % lineno)
190 linenumber="% 8s" % lineno)
191
191
192 if files:
192 if files:
193 m = match.exact(repo.root, repo.getcwd(), files)
193 m = match.exact(repo.root, repo.getcwd(), files)
194 else:
194 else:
195 m = match.always(repo.root, repo.getcwd())
195 m = match.always(repo.root, repo.getcwd())
196
196
197 diffopts = patch.diffopts(repo.ui, untrusted=True)
197 diffopts = patch.diffopts(repo.ui, untrusted=True)
198 parents = ctx.parents()
198 parents = ctx.parents()
199 node1 = parents and parents[0].node() or nullid
199 node1 = parents and parents[0].node() or nullid
200 node2 = ctx.node()
200 node2 = ctx.node()
201
201
202 block = []
202 block = []
203 for chunk in patch.diff(repo, node1, node2, m, opts=diffopts):
203 for chunk in patch.diff(repo, node1, node2, m, opts=diffopts):
204 if chunk.startswith('diff') and block:
204 if chunk.startswith('diff') and block:
205 yield tmpl('diffblock', parity=parity.next(),
205 yield tmpl('diffblock', parity=parity.next(),
206 lines=prettyprintlines(''.join(block)))
206 lines=prettyprintlines(''.join(block)))
207 block = []
207 block = []
208 if chunk.startswith('diff') and style != 'raw':
208 if chunk.startswith('diff') and style != 'raw':
209 chunk = ''.join(chunk.splitlines(True)[1:])
209 chunk = ''.join(chunk.splitlines(True)[1:])
210 block.append(chunk)
210 block.append(chunk)
211 yield tmpl('diffblock', parity=parity.next(),
211 yield tmpl('diffblock', parity=parity.next(),
212 lines=prettyprintlines(''.join(block)))
212 lines=prettyprintlines(''.join(block)))
213
213
214 class sessionvars(object):
214 class sessionvars(object):
215 def __init__(self, vars, start='?'):
215 def __init__(self, vars, start='?'):
216 self.start = start
216 self.start = start
217 self.vars = vars
217 self.vars = vars
218 def __getitem__(self, key):
218 def __getitem__(self, key):
219 return self.vars[key]
219 return self.vars[key]
220 def __setitem__(self, key, value):
220 def __setitem__(self, key, value):
221 self.vars[key] = value
221 self.vars[key] = value
222 def __copy__(self):
222 def __copy__(self):
223 return sessionvars(copy.copy(self.vars), self.start)
223 return sessionvars(copy.copy(self.vars), self.start)
224 def __iter__(self):
224 def __iter__(self):
225 separator = self.start
225 separator = self.start
226 for key, value in self.vars.iteritems():
226 for key, value in self.vars.iteritems():
227 yield {'name': key, 'value': str(value), 'separator': separator}
227 yield {'name': key, 'value': str(value), 'separator': separator}
228 separator = '&'
228 separator = '&'
229
229
230 class wsgiui(ui.ui):
230 class wsgiui(ui.ui):
231 # default termwidth breaks under mod_wsgi
231 # default termwidth breaks under mod_wsgi
232 def termwidth(self):
232 def termwidth(self):
233 return 80
233 return 80
General Comments 0
You need to be logged in to leave comments. Login now