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