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