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