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