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