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