##// END OF EJS Templates
Add hg outgoing command
mpm@selenic.com -
r920:270756aa default
parent child Browse files
Show More
@@ -1,1556 +1,1567 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 demandload(globals(), "os re sys signal shutil")
9 demandload(globals(), "os re sys signal shutil")
10 demandload(globals(), "fancyopts ui hg util lock")
10 demandload(globals(), "fancyopts ui hg util lock")
11 demandload(globals(), "fnmatch hgweb mdiff random signal time traceback")
11 demandload(globals(), "fnmatch hgweb mdiff random signal time traceback")
12 demandload(globals(), "errno socket version struct atexit")
12 demandload(globals(), "errno socket version struct atexit")
13
13
14 class UnknownCommand(Exception):
14 class UnknownCommand(Exception):
15 """Exception raised if command is not in the command table."""
15 """Exception raised if command is not in the command table."""
16
16
17 def filterfiles(filters, files):
17 def filterfiles(filters, files):
18 l = [x for x in files if x in filters]
18 l = [x for x in files if x in filters]
19
19
20 for t in filters:
20 for t in filters:
21 if t and t[-1] != "/":
21 if t and t[-1] != "/":
22 t += "/"
22 t += "/"
23 l += [x for x in files if x.startswith(t)]
23 l += [x for x in files if x.startswith(t)]
24 return l
24 return l
25
25
26 def relfilter(repo, files):
26 def relfilter(repo, files):
27 cwd = repo.getcwd()
27 cwd = repo.getcwd()
28 if cwd:
28 if cwd:
29 return filterfiles([util.pconvert(cwd)], files)
29 return filterfiles([util.pconvert(cwd)], files)
30 return files
30 return files
31
31
32 def relpath(repo, args):
32 def relpath(repo, args):
33 cwd = repo.getcwd()
33 cwd = repo.getcwd()
34 if cwd:
34 if cwd:
35 return [util.normpath(os.path.join(cwd, x)) for x in args]
35 return [util.normpath(os.path.join(cwd, x)) for x in args]
36 return args
36 return args
37
37
38 def matchpats(repo, cwd, pats = [], opts = {}, head = ''):
38 def matchpats(repo, cwd, pats = [], opts = {}, head = ''):
39 return util.matcher(repo, cwd, pats or ['.'], opts.get('include'),
39 return util.matcher(repo, cwd, pats or ['.'], opts.get('include'),
40 opts.get('exclude'), head)
40 opts.get('exclude'), head)
41
41
42 def makewalk(repo, pats, opts, head = ''):
42 def makewalk(repo, pats, opts, head = ''):
43 cwd = repo.getcwd()
43 cwd = repo.getcwd()
44 files, matchfn = matchpats(repo, cwd, pats, opts, head)
44 files, matchfn = matchpats(repo, cwd, pats, opts, head)
45 def walk():
45 def walk():
46 for src, fn in repo.walk(files = files, match = matchfn):
46 for src, fn in repo.walk(files = files, match = matchfn):
47 yield src, fn, util.pathto(cwd, fn)
47 yield src, fn, util.pathto(cwd, fn)
48 return files, matchfn, walk()
48 return files, matchfn, walk()
49
49
50 def walk(repo, pats, opts, head = ''):
50 def walk(repo, pats, opts, head = ''):
51 files, matchfn, results = makewalk(repo, pats, opts, head)
51 files, matchfn, results = makewalk(repo, pats, opts, head)
52 for r in results: yield r
52 for r in results: yield r
53
53
54 revrangesep = ':'
54 revrangesep = ':'
55
55
56 def revrange(ui, repo, revs, revlog=None):
56 def revrange(ui, repo, revs, revlog=None):
57 if revlog is None:
57 if revlog is None:
58 revlog = repo.changelog
58 revlog = repo.changelog
59 revcount = revlog.count()
59 revcount = revlog.count()
60 def fix(val, defval):
60 def fix(val, defval):
61 if not val:
61 if not val:
62 return defval
62 return defval
63 try:
63 try:
64 num = int(val)
64 num = int(val)
65 if str(num) != val:
65 if str(num) != val:
66 raise ValueError
66 raise ValueError
67 if num < 0:
67 if num < 0:
68 num += revcount
68 num += revcount
69 if not (0 <= num < revcount):
69 if not (0 <= num < revcount):
70 raise ValueError
70 raise ValueError
71 except ValueError:
71 except ValueError:
72 try:
72 try:
73 num = repo.changelog.rev(repo.lookup(val))
73 num = repo.changelog.rev(repo.lookup(val))
74 except KeyError:
74 except KeyError:
75 try:
75 try:
76 num = revlog.rev(revlog.lookup(val))
76 num = revlog.rev(revlog.lookup(val))
77 except KeyError:
77 except KeyError:
78 raise util.Abort('invalid revision identifier %s', val)
78 raise util.Abort('invalid revision identifier %s', val)
79 return num
79 return num
80 for spec in revs:
80 for spec in revs:
81 if spec.find(revrangesep) >= 0:
81 if spec.find(revrangesep) >= 0:
82 start, end = spec.split(revrangesep, 1)
82 start, end = spec.split(revrangesep, 1)
83 start = fix(start, 0)
83 start = fix(start, 0)
84 end = fix(end, revcount - 1)
84 end = fix(end, revcount - 1)
85 if end > start:
85 if end > start:
86 end += 1
86 end += 1
87 step = 1
87 step = 1
88 else:
88 else:
89 end -= 1
89 end -= 1
90 step = -1
90 step = -1
91 for rev in xrange(start, end, step):
91 for rev in xrange(start, end, step):
92 yield str(rev)
92 yield str(rev)
93 else:
93 else:
94 yield spec
94 yield spec
95
95
96 def make_filename(repo, r, pat, node=None,
96 def make_filename(repo, r, pat, node=None,
97 total=None, seqno=None, revwidth=None):
97 total=None, seqno=None, revwidth=None):
98 node_expander = {
98 node_expander = {
99 'H': lambda: hg.hex(node),
99 'H': lambda: hg.hex(node),
100 'R': lambda: str(r.rev(node)),
100 'R': lambda: str(r.rev(node)),
101 'h': lambda: hg.short(node),
101 'h': lambda: hg.short(node),
102 }
102 }
103 expander = {
103 expander = {
104 '%': lambda: '%',
104 '%': lambda: '%',
105 'b': lambda: os.path.basename(repo.root),
105 'b': lambda: os.path.basename(repo.root),
106 }
106 }
107
107
108 try:
108 try:
109 if node:
109 if node:
110 expander.update(node_expander)
110 expander.update(node_expander)
111 if node and revwidth is not None:
111 if node and revwidth is not None:
112 expander['r'] = lambda: str(r.rev(node)).zfill(revwidth)
112 expander['r'] = lambda: str(r.rev(node)).zfill(revwidth)
113 if total is not None:
113 if total is not None:
114 expander['N'] = lambda: str(total)
114 expander['N'] = lambda: str(total)
115 if seqno is not None:
115 if seqno is not None:
116 expander['n'] = lambda: str(seqno)
116 expander['n'] = lambda: str(seqno)
117 if total is not None and seqno is not None:
117 if total is not None and seqno is not None:
118 expander['n'] = lambda:str(seqno).zfill(len(str(total)))
118 expander['n'] = lambda:str(seqno).zfill(len(str(total)))
119
119
120 newname = []
120 newname = []
121 patlen = len(pat)
121 patlen = len(pat)
122 i = 0
122 i = 0
123 while i < patlen:
123 while i < patlen:
124 c = pat[i]
124 c = pat[i]
125 if c == '%':
125 if c == '%':
126 i += 1
126 i += 1
127 c = pat[i]
127 c = pat[i]
128 c = expander[c]()
128 c = expander[c]()
129 newname.append(c)
129 newname.append(c)
130 i += 1
130 i += 1
131 return ''.join(newname)
131 return ''.join(newname)
132 except KeyError, inst:
132 except KeyError, inst:
133 raise util.Abort("invalid format spec '%%%s' in output file name",
133 raise util.Abort("invalid format spec '%%%s' in output file name",
134 inst.args[0])
134 inst.args[0])
135
135
136 def make_file(repo, r, pat, node=None,
136 def make_file(repo, r, pat, node=None,
137 total=None, seqno=None, revwidth=None, mode='wb'):
137 total=None, seqno=None, revwidth=None, mode='wb'):
138 if not pat or pat == '-':
138 if not pat or pat == '-':
139 if 'w' in mode: return sys.stdout
139 if 'w' in mode: return sys.stdout
140 else: return sys.stdin
140 else: return sys.stdin
141 if hasattr(pat, 'write') and 'w' in mode:
141 if hasattr(pat, 'write') and 'w' in mode:
142 return pat
142 return pat
143 if hasattr(pat, 'read') and 'r' in mode:
143 if hasattr(pat, 'read') and 'r' in mode:
144 return pat
144 return pat
145 return open(make_filename(repo, r, pat, node, total, seqno, revwidth),
145 return open(make_filename(repo, r, pat, node, total, seqno, revwidth),
146 mode)
146 mode)
147
147
148 def dodiff(fp, ui, repo, files=None, node1=None, node2=None, match=util.always, changes=None):
148 def dodiff(fp, ui, repo, files=None, node1=None, node2=None, match=util.always, changes=None):
149 def date(c):
149 def date(c):
150 return time.asctime(time.gmtime(float(c[2].split(' ')[0])))
150 return time.asctime(time.gmtime(float(c[2].split(' ')[0])))
151
151
152 if not changes:
152 if not changes:
153 (c, a, d, u) = repo.changes(node1, node2, files, match = match)
153 (c, a, d, u) = repo.changes(node1, node2, files, match = match)
154 else:
154 else:
155 (c, a, d, u) = changes
155 (c, a, d, u) = changes
156 if files:
156 if files:
157 c, a, d = map(lambda x: filterfiles(files, x), (c, a, d))
157 c, a, d = map(lambda x: filterfiles(files, x), (c, a, d))
158
158
159 if not c and not a and not d:
159 if not c and not a and not d:
160 return
160 return
161
161
162 if node2:
162 if node2:
163 change = repo.changelog.read(node2)
163 change = repo.changelog.read(node2)
164 mmap2 = repo.manifest.read(change[0])
164 mmap2 = repo.manifest.read(change[0])
165 date2 = date(change)
165 date2 = date(change)
166 def read(f):
166 def read(f):
167 return repo.file(f).read(mmap2[f])
167 return repo.file(f).read(mmap2[f])
168 else:
168 else:
169 date2 = time.asctime()
169 date2 = time.asctime()
170 if not node1:
170 if not node1:
171 node1 = repo.dirstate.parents()[0]
171 node1 = repo.dirstate.parents()[0]
172 def read(f):
172 def read(f):
173 return repo.wfile(f).read()
173 return repo.wfile(f).read()
174
174
175 if ui.quiet:
175 if ui.quiet:
176 r = None
176 r = None
177 else:
177 else:
178 hexfunc = ui.verbose and hg.hex or hg.short
178 hexfunc = ui.verbose and hg.hex or hg.short
179 r = [hexfunc(node) for node in [node1, node2] if node]
179 r = [hexfunc(node) for node in [node1, node2] if node]
180
180
181 change = repo.changelog.read(node1)
181 change = repo.changelog.read(node1)
182 mmap = repo.manifest.read(change[0])
182 mmap = repo.manifest.read(change[0])
183 date1 = date(change)
183 date1 = date(change)
184
184
185 for f in c:
185 for f in c:
186 to = None
186 to = None
187 if f in mmap:
187 if f in mmap:
188 to = repo.file(f).read(mmap[f])
188 to = repo.file(f).read(mmap[f])
189 tn = read(f)
189 tn = read(f)
190 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r))
190 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r))
191 for f in a:
191 for f in a:
192 to = None
192 to = None
193 tn = read(f)
193 tn = read(f)
194 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r))
194 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r))
195 for f in d:
195 for f in d:
196 to = repo.file(f).read(mmap[f])
196 to = repo.file(f).read(mmap[f])
197 tn = None
197 tn = None
198 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r))
198 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r))
199
199
200 def show_changeset(ui, repo, rev=0, changenode=None, filelog=None, brinfo=None):
200 def show_changeset(ui, repo, rev=0, changenode=None, filelog=None, brinfo=None):
201 """show a single changeset or file revision"""
201 """show a single changeset or file revision"""
202 changelog = repo.changelog
202 changelog = repo.changelog
203 if filelog:
203 if filelog:
204 log = filelog
204 log = filelog
205 filerev = rev
205 filerev = rev
206 node = filenode = filelog.node(filerev)
206 node = filenode = filelog.node(filerev)
207 changerev = filelog.linkrev(filenode)
207 changerev = filelog.linkrev(filenode)
208 changenode = changenode or changelog.node(changerev)
208 changenode = changenode or changelog.node(changerev)
209 else:
209 else:
210 log = changelog
210 log = changelog
211 changerev = rev
211 changerev = rev
212 if changenode is None:
212 if changenode is None:
213 changenode = changelog.node(changerev)
213 changenode = changelog.node(changerev)
214 elif not changerev:
214 elif not changerev:
215 rev = changerev = changelog.rev(changenode)
215 rev = changerev = changelog.rev(changenode)
216 node = changenode
216 node = changenode
217
217
218 if ui.quiet:
218 if ui.quiet:
219 ui.write("%d:%s\n" % (rev, hg.hex(node)))
219 ui.write("%d:%s\n" % (rev, hg.hex(node)))
220 return
220 return
221
221
222 changes = changelog.read(changenode)
222 changes = changelog.read(changenode)
223
223
224 parents = [(log.rev(p), ui.verbose and hg.hex(p) or hg.short(p))
224 parents = [(log.rev(p), ui.verbose and hg.hex(p) or hg.short(p))
225 for p in log.parents(node)
225 for p in log.parents(node)
226 if ui.debugflag or p != hg.nullid]
226 if ui.debugflag or p != hg.nullid]
227 if not ui.debugflag and len(parents) == 1 and parents[0][0] == rev-1:
227 if not ui.debugflag and len(parents) == 1 and parents[0][0] == rev-1:
228 parents = []
228 parents = []
229
229
230 if ui.verbose:
230 if ui.verbose:
231 ui.write("changeset: %d:%s\n" % (changerev, hg.hex(changenode)))
231 ui.write("changeset: %d:%s\n" % (changerev, hg.hex(changenode)))
232 else:
232 else:
233 ui.write("changeset: %d:%s\n" % (changerev, hg.short(changenode)))
233 ui.write("changeset: %d:%s\n" % (changerev, hg.short(changenode)))
234
234
235 for tag in repo.nodetags(changenode):
235 for tag in repo.nodetags(changenode):
236 ui.status("tag: %s\n" % tag)
236 ui.status("tag: %s\n" % tag)
237 for parent in parents:
237 for parent in parents:
238 ui.write("parent: %d:%s\n" % parent)
238 ui.write("parent: %d:%s\n" % parent)
239 if filelog:
239 if filelog:
240 ui.debug("file rev: %d:%s\n" % (filerev, hg.hex(filenode)))
240 ui.debug("file rev: %d:%s\n" % (filerev, hg.hex(filenode)))
241
241
242 if brinfo and changenode in brinfo:
242 if brinfo and changenode in brinfo:
243 br = brinfo[changenode]
243 br = brinfo[changenode]
244 ui.write("branch: %s\n" % " ".join(br))
244 ui.write("branch: %s\n" % " ".join(br))
245
245
246 ui.debug("manifest: %d:%s\n" % (repo.manifest.rev(changes[0]),
246 ui.debug("manifest: %d:%s\n" % (repo.manifest.rev(changes[0]),
247 hg.hex(changes[0])))
247 hg.hex(changes[0])))
248 ui.status("user: %s\n" % changes[1])
248 ui.status("user: %s\n" % changes[1])
249 ui.status("date: %s\n" % time.asctime(
249 ui.status("date: %s\n" % time.asctime(
250 time.localtime(float(changes[2].split(' ')[0]))))
250 time.localtime(float(changes[2].split(' ')[0]))))
251
251
252 if ui.debugflag:
252 if ui.debugflag:
253 files = repo.changes(changelog.parents(changenode)[0], changenode)
253 files = repo.changes(changelog.parents(changenode)[0], changenode)
254 for key, value in zip(["files:", "files+:", "files-:"], files):
254 for key, value in zip(["files:", "files+:", "files-:"], files):
255 if value:
255 if value:
256 ui.note("%-12s %s\n" % (key, " ".join(value)))
256 ui.note("%-12s %s\n" % (key, " ".join(value)))
257 else:
257 else:
258 ui.note("files: %s\n" % " ".join(changes[3]))
258 ui.note("files: %s\n" % " ".join(changes[3]))
259
259
260 description = changes[4].strip()
260 description = changes[4].strip()
261 if description:
261 if description:
262 if ui.verbose:
262 if ui.verbose:
263 ui.status("description:\n")
263 ui.status("description:\n")
264 ui.status(description)
264 ui.status(description)
265 ui.status("\n\n")
265 ui.status("\n\n")
266 else:
266 else:
267 ui.status("summary: %s\n" % description.splitlines()[0])
267 ui.status("summary: %s\n" % description.splitlines()[0])
268 ui.status("\n")
268 ui.status("\n")
269
269
270 def show_version(ui):
270 def show_version(ui):
271 """output version and copyright information"""
271 """output version and copyright information"""
272 ui.write("Mercurial Distributed SCM (version %s)\n"
272 ui.write("Mercurial Distributed SCM (version %s)\n"
273 % version.get_version())
273 % version.get_version())
274 ui.status(
274 ui.status(
275 "\nCopyright (C) 2005 Matt Mackall <mpm@selenic.com>\n"
275 "\nCopyright (C) 2005 Matt Mackall <mpm@selenic.com>\n"
276 "This is free software; see the source for copying conditions. "
276 "This is free software; see the source for copying conditions. "
277 "There is NO\nwarranty; "
277 "There is NO\nwarranty; "
278 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
278 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
279 )
279 )
280
280
281 def help_(ui, cmd=None):
281 def help_(ui, cmd=None):
282 """show help for a given command or all commands"""
282 """show help for a given command or all commands"""
283 if cmd and cmd != 'shortlist':
283 if cmd and cmd != 'shortlist':
284 key, i = find(cmd)
284 key, i = find(cmd)
285 # synopsis
285 # synopsis
286 ui.write("%s\n\n" % i[2])
286 ui.write("%s\n\n" % i[2])
287
287
288 # description
288 # description
289 doc = i[0].__doc__
289 doc = i[0].__doc__
290 if ui.quiet:
290 if ui.quiet:
291 doc = doc.splitlines(0)[0]
291 doc = doc.splitlines(0)[0]
292 ui.write("%s\n" % doc.rstrip())
292 ui.write("%s\n" % doc.rstrip())
293
293
294 # aliases
294 # aliases
295 if not ui.quiet:
295 if not ui.quiet:
296 aliases = ', '.join(key.split('|')[1:])
296 aliases = ', '.join(key.split('|')[1:])
297 if aliases:
297 if aliases:
298 ui.write("\naliases: %s\n" % aliases)
298 ui.write("\naliases: %s\n" % aliases)
299
299
300 # options
300 # options
301 if not ui.quiet and i[1]:
301 if not ui.quiet and i[1]:
302 ui.write("\noptions:\n\n")
302 ui.write("\noptions:\n\n")
303 for s, l, d, c in i[1]:
303 for s, l, d, c in i[1]:
304 opt = ' '
304 opt = ' '
305 if s:
305 if s:
306 opt = opt + '-' + s + ' '
306 opt = opt + '-' + s + ' '
307 if l:
307 if l:
308 opt = opt + '--' + l + ' '
308 opt = opt + '--' + l + ' '
309 if d:
309 if d:
310 opt = opt + '(' + str(d) + ')'
310 opt = opt + '(' + str(d) + ')'
311 ui.write(opt, "\n")
311 ui.write(opt, "\n")
312 if c:
312 if c:
313 ui.write(' %s\n' % c)
313 ui.write(' %s\n' % c)
314
314
315 else:
315 else:
316 # program name
316 # program name
317 if ui.verbose:
317 if ui.verbose:
318 show_version(ui)
318 show_version(ui)
319 else:
319 else:
320 ui.status("Mercurial Distributed SCM\n")
320 ui.status("Mercurial Distributed SCM\n")
321 ui.status('\n')
321 ui.status('\n')
322
322
323 # list of commands
323 # list of commands
324 if cmd == "shortlist":
324 if cmd == "shortlist":
325 ui.status('basic commands (use "hg help" '
325 ui.status('basic commands (use "hg help" '
326 'for the full list or option "-v" for details):\n\n')
326 'for the full list or option "-v" for details):\n\n')
327 elif ui.verbose:
327 elif ui.verbose:
328 ui.status('list of commands:\n\n')
328 ui.status('list of commands:\n\n')
329 else:
329 else:
330 ui.status('list of commands (use "hg help -v" '
330 ui.status('list of commands (use "hg help -v" '
331 'to show aliases and global options):\n\n')
331 'to show aliases and global options):\n\n')
332
332
333 h = {}
333 h = {}
334 cmds = {}
334 cmds = {}
335 for c, e in table.items():
335 for c, e in table.items():
336 f = c.split("|")[0]
336 f = c.split("|")[0]
337 if cmd == "shortlist" and not f.startswith("^"):
337 if cmd == "shortlist" and not f.startswith("^"):
338 continue
338 continue
339 f = f.lstrip("^")
339 f = f.lstrip("^")
340 if not ui.debugflag and f.startswith("debug"):
340 if not ui.debugflag and f.startswith("debug"):
341 continue
341 continue
342 d = ""
342 d = ""
343 if e[0].__doc__:
343 if e[0].__doc__:
344 d = e[0].__doc__.splitlines(0)[0].rstrip()
344 d = e[0].__doc__.splitlines(0)[0].rstrip()
345 h[f] = d
345 h[f] = d
346 cmds[f]=c.lstrip("^")
346 cmds[f]=c.lstrip("^")
347
347
348 fns = h.keys()
348 fns = h.keys()
349 fns.sort()
349 fns.sort()
350 m = max(map(len, fns))
350 m = max(map(len, fns))
351 for f in fns:
351 for f in fns:
352 if ui.verbose:
352 if ui.verbose:
353 commands = cmds[f].replace("|",", ")
353 commands = cmds[f].replace("|",", ")
354 ui.write(" %s:\n %s\n"%(commands,h[f]))
354 ui.write(" %s:\n %s\n"%(commands,h[f]))
355 else:
355 else:
356 ui.write(' %-*s %s\n' % (m, f, h[f]))
356 ui.write(' %-*s %s\n' % (m, f, h[f]))
357
357
358 # global options
358 # global options
359 if ui.verbose:
359 if ui.verbose:
360 ui.write("\nglobal options:\n\n")
360 ui.write("\nglobal options:\n\n")
361 for s, l, d, c in globalopts:
361 for s, l, d, c in globalopts:
362 opt = ' '
362 opt = ' '
363 if s:
363 if s:
364 opt = opt + '-' + s + ' '
364 opt = opt + '-' + s + ' '
365 if l:
365 if l:
366 opt = opt + '--' + l + ' '
366 opt = opt + '--' + l + ' '
367 if d:
367 if d:
368 opt = opt + '(' + str(d) + ')'
368 opt = opt + '(' + str(d) + ')'
369 ui.write(opt, "\n")
369 ui.write(opt, "\n")
370 if c:
370 if c:
371 ui.write(' %s\n' % c)
371 ui.write(' %s\n' % c)
372
372
373 # Commands start here, listed alphabetically
373 # Commands start here, listed alphabetically
374
374
375 def add(ui, repo, *pats, **opts):
375 def add(ui, repo, *pats, **opts):
376 '''add the specified files on the next commit'''
376 '''add the specified files on the next commit'''
377 names = []
377 names = []
378 q = dict(zip(pats, pats))
378 q = dict(zip(pats, pats))
379 for src, abs, rel in walk(repo, pats, opts):
379 for src, abs, rel in walk(repo, pats, opts):
380 if rel in q or abs in q:
380 if rel in q or abs in q:
381 names.append(abs)
381 names.append(abs)
382 elif repo.dirstate.state(abs) == '?':
382 elif repo.dirstate.state(abs) == '?':
383 ui.status('adding %s\n' % rel)
383 ui.status('adding %s\n' % rel)
384 names.append(abs)
384 names.append(abs)
385 repo.add(names)
385 repo.add(names)
386
386
387 def addremove(ui, repo, *pats, **opts):
387 def addremove(ui, repo, *pats, **opts):
388 """add all new files, delete all missing files"""
388 """add all new files, delete all missing files"""
389 q = dict(zip(pats, pats))
389 q = dict(zip(pats, pats))
390 add, remove = [], []
390 add, remove = [], []
391 for src, abs, rel in walk(repo, pats, opts):
391 for src, abs, rel in walk(repo, pats, opts):
392 if src == 'f' and repo.dirstate.state(abs) == '?':
392 if src == 'f' and repo.dirstate.state(abs) == '?':
393 add.append(abs)
393 add.append(abs)
394 if rel not in q: ui.status('adding ', rel, '\n')
394 if rel not in q: ui.status('adding ', rel, '\n')
395 if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel):
395 if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel):
396 remove.append(abs)
396 remove.append(abs)
397 if rel not in q: ui.status('removing ', rel, '\n')
397 if rel not in q: ui.status('removing ', rel, '\n')
398 repo.add(add)
398 repo.add(add)
399 repo.remove(remove)
399 repo.remove(remove)
400
400
401 def annotate(ui, repo, *pats, **opts):
401 def annotate(ui, repo, *pats, **opts):
402 """show changeset information per file line"""
402 """show changeset information per file line"""
403 def getnode(rev):
403 def getnode(rev):
404 return hg.short(repo.changelog.node(rev))
404 return hg.short(repo.changelog.node(rev))
405
405
406 def getname(rev):
406 def getname(rev):
407 try:
407 try:
408 return bcache[rev]
408 return bcache[rev]
409 except KeyError:
409 except KeyError:
410 cl = repo.changelog.read(repo.changelog.node(rev))
410 cl = repo.changelog.read(repo.changelog.node(rev))
411 name = cl[1]
411 name = cl[1]
412 f = name.find('@')
412 f = name.find('@')
413 if f >= 0:
413 if f >= 0:
414 name = name[:f]
414 name = name[:f]
415 f = name.find('<')
415 f = name.find('<')
416 if f >= 0:
416 if f >= 0:
417 name = name[f+1:]
417 name = name[f+1:]
418 bcache[rev] = name
418 bcache[rev] = name
419 return name
419 return name
420
420
421 if not pats:
421 if not pats:
422 raise util.Abort('at least one file name or pattern required')
422 raise util.Abort('at least one file name or pattern required')
423
423
424 bcache = {}
424 bcache = {}
425 opmap = [['user', getname], ['number', str], ['changeset', getnode]]
425 opmap = [['user', getname], ['number', str], ['changeset', getnode]]
426 if not opts['user'] and not opts['changeset']:
426 if not opts['user'] and not opts['changeset']:
427 opts['number'] = 1
427 opts['number'] = 1
428
428
429 if opts['rev']:
429 if opts['rev']:
430 node = repo.changelog.lookup(opts['rev'])
430 node = repo.changelog.lookup(opts['rev'])
431 else:
431 else:
432 node = repo.dirstate.parents()[0]
432 node = repo.dirstate.parents()[0]
433 change = repo.changelog.read(node)
433 change = repo.changelog.read(node)
434 mmap = repo.manifest.read(change[0])
434 mmap = repo.manifest.read(change[0])
435 for src, abs, rel in walk(repo, pats, opts):
435 for src, abs, rel in walk(repo, pats, opts):
436 if abs not in mmap:
436 if abs not in mmap:
437 ui.warn("warning: %s is not in the repository!\n" % rel)
437 ui.warn("warning: %s is not in the repository!\n" % rel)
438 continue
438 continue
439
439
440 lines = repo.file(abs).annotate(mmap[abs])
440 lines = repo.file(abs).annotate(mmap[abs])
441 pieces = []
441 pieces = []
442
442
443 for o, f in opmap:
443 for o, f in opmap:
444 if opts[o]:
444 if opts[o]:
445 l = [f(n) for n, dummy in lines]
445 l = [f(n) for n, dummy in lines]
446 if l:
446 if l:
447 m = max(map(len, l))
447 m = max(map(len, l))
448 pieces.append(["%*s" % (m, x) for x in l])
448 pieces.append(["%*s" % (m, x) for x in l])
449
449
450 if pieces:
450 if pieces:
451 for p, l in zip(zip(*pieces), lines):
451 for p, l in zip(zip(*pieces), lines):
452 ui.write("%s: %s" % (" ".join(p), l[1]))
452 ui.write("%s: %s" % (" ".join(p), l[1]))
453
453
454 def cat(ui, repo, file1, rev=None, **opts):
454 def cat(ui, repo, file1, rev=None, **opts):
455 """output the latest or given revision of a file"""
455 """output the latest or given revision of a file"""
456 r = repo.file(relpath(repo, [file1])[0])
456 r = repo.file(relpath(repo, [file1])[0])
457 if rev:
457 if rev:
458 try:
458 try:
459 # assume all revision numbers are for changesets
459 # assume all revision numbers are for changesets
460 n = repo.lookup(rev)
460 n = repo.lookup(rev)
461 change = repo.changelog.read(n)
461 change = repo.changelog.read(n)
462 m = repo.manifest.read(change[0])
462 m = repo.manifest.read(change[0])
463 n = m[relpath(repo, [file1])[0]]
463 n = m[relpath(repo, [file1])[0]]
464 except hg.RepoError, KeyError:
464 except hg.RepoError, KeyError:
465 n = r.lookup(rev)
465 n = r.lookup(rev)
466 else:
466 else:
467 n = r.tip()
467 n = r.tip()
468 fp = make_file(repo, r, opts['output'], node=n)
468 fp = make_file(repo, r, opts['output'], node=n)
469 fp.write(r.read(n))
469 fp.write(r.read(n))
470
470
471 def clone(ui, source, dest=None, **opts):
471 def clone(ui, source, dest=None, **opts):
472 """make a copy of an existing repository"""
472 """make a copy of an existing repository"""
473 if dest is None:
473 if dest is None:
474 dest = os.path.basename(os.path.normpath(source))
474 dest = os.path.basename(os.path.normpath(source))
475
475
476 if os.path.exists(dest):
476 if os.path.exists(dest):
477 ui.warn("abort: destination '%s' already exists\n" % dest)
477 ui.warn("abort: destination '%s' already exists\n" % dest)
478 return 1
478 return 1
479
479
480 dest = os.path.realpath(dest)
480 dest = os.path.realpath(dest)
481
481
482 class Dircleanup:
482 class Dircleanup:
483 def __init__(self, dir_):
483 def __init__(self, dir_):
484 self.rmtree = shutil.rmtree
484 self.rmtree = shutil.rmtree
485 self.dir_ = dir_
485 self.dir_ = dir_
486 os.mkdir(dir_)
486 os.mkdir(dir_)
487 def close(self):
487 def close(self):
488 self.dir_ = None
488 self.dir_ = None
489 def __del__(self):
489 def __del__(self):
490 if self.dir_:
490 if self.dir_:
491 self.rmtree(self.dir_, True)
491 self.rmtree(self.dir_, True)
492
492
493 d = Dircleanup(dest)
493 d = Dircleanup(dest)
494 abspath = source
494 abspath = source
495 source = ui.expandpath(source)
495 source = ui.expandpath(source)
496 other = hg.repository(ui, source)
496 other = hg.repository(ui, source)
497
497
498 if other.dev() != -1:
498 if other.dev() != -1:
499 abspath = os.path.abspath(source)
499 abspath = os.path.abspath(source)
500 copyfile = (os.stat(dest).st_dev == other.dev()
500 copyfile = (os.stat(dest).st_dev == other.dev()
501 and getattr(os, 'link', None) or shutil.copy2)
501 and getattr(os, 'link', None) or shutil.copy2)
502 if copyfile is not shutil.copy2:
502 if copyfile is not shutil.copy2:
503 ui.note("cloning by hardlink\n")
503 ui.note("cloning by hardlink\n")
504 # we use a lock here because because we're not nicely ordered
504 # we use a lock here because because we're not nicely ordered
505 l = lock.lock(os.path.join(source, ".hg", "lock"))
505 l = lock.lock(os.path.join(source, ".hg", "lock"))
506
506
507 util.copytree(os.path.join(source, ".hg"), os.path.join(dest, ".hg"),
507 util.copytree(os.path.join(source, ".hg"), os.path.join(dest, ".hg"),
508 copyfile)
508 copyfile)
509 try:
509 try:
510 os.unlink(os.path.join(dest, ".hg", "dirstate"))
510 os.unlink(os.path.join(dest, ".hg", "dirstate"))
511 except OSError:
511 except OSError:
512 pass
512 pass
513
513
514 repo = hg.repository(ui, dest)
514 repo = hg.repository(ui, dest)
515
515
516 else:
516 else:
517 repo = hg.repository(ui, dest, create=1)
517 repo = hg.repository(ui, dest, create=1)
518 repo.pull(other)
518 repo.pull(other)
519
519
520 f = repo.opener("hgrc", "w")
520 f = repo.opener("hgrc", "w")
521 f.write("[paths]\n")
521 f.write("[paths]\n")
522 f.write("default = %s\n" % abspath)
522 f.write("default = %s\n" % abspath)
523
523
524 if not opts['noupdate']:
524 if not opts['noupdate']:
525 update(ui, repo)
525 update(ui, repo)
526
526
527 d.close()
527 d.close()
528
528
529 def commit(ui, repo, *pats, **opts):
529 def commit(ui, repo, *pats, **opts):
530 """commit the specified files or all outstanding changes"""
530 """commit the specified files or all outstanding changes"""
531 if opts['text']:
531 if opts['text']:
532 ui.warn("Warning: -t and --text is deprecated,"
532 ui.warn("Warning: -t and --text is deprecated,"
533 " please use -m or --message instead.\n")
533 " please use -m or --message instead.\n")
534 message = opts['message'] or opts['text']
534 message = opts['message'] or opts['text']
535 logfile = opts['logfile']
535 logfile = opts['logfile']
536 if not message and logfile:
536 if not message and logfile:
537 try:
537 try:
538 if logfile == '-':
538 if logfile == '-':
539 message = sys.stdin.read()
539 message = sys.stdin.read()
540 else:
540 else:
541 message = open(logfile).read()
541 message = open(logfile).read()
542 except IOError, why:
542 except IOError, why:
543 ui.warn("Can't read commit message %s: %s\n" % (logfile, why))
543 ui.warn("Can't read commit message %s: %s\n" % (logfile, why))
544
544
545 if opts['addremove']:
545 if opts['addremove']:
546 addremove(ui, repo, *pats, **opts)
546 addremove(ui, repo, *pats, **opts)
547 cwd = repo.getcwd()
547 cwd = repo.getcwd()
548 if not pats and cwd:
548 if not pats and cwd:
549 opts['include'] = [os.path.join(cwd, i) for i in opts['include']]
549 opts['include'] = [os.path.join(cwd, i) for i in opts['include']]
550 opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']]
550 opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']]
551 fns, match = matchpats(repo, (pats and repo.getcwd()) or '', pats, opts)
551 fns, match = matchpats(repo, (pats and repo.getcwd()) or '', pats, opts)
552 if pats:
552 if pats:
553 c, a, d, u = repo.changes(files = fns, match = match)
553 c, a, d, u = repo.changes(files = fns, match = match)
554 files = c + a + [fn for fn in d if repo.dirstate.state(fn) == 'r']
554 files = c + a + [fn for fn in d if repo.dirstate.state(fn) == 'r']
555 else:
555 else:
556 files = []
556 files = []
557 repo.commit(files, message, opts['user'], opts['date'], match)
557 repo.commit(files, message, opts['user'], opts['date'], match)
558
558
559 def copy(ui, repo, source, dest):
559 def copy(ui, repo, source, dest):
560 """mark a file as copied or renamed for the next commit"""
560 """mark a file as copied or renamed for the next commit"""
561 return repo.copy(*relpath(repo, (source, dest)))
561 return repo.copy(*relpath(repo, (source, dest)))
562
562
563 def debugcheckstate(ui, repo):
563 def debugcheckstate(ui, repo):
564 """validate the correctness of the current dirstate"""
564 """validate the correctness of the current dirstate"""
565 parent1, parent2 = repo.dirstate.parents()
565 parent1, parent2 = repo.dirstate.parents()
566 repo.dirstate.read()
566 repo.dirstate.read()
567 dc = repo.dirstate.map
567 dc = repo.dirstate.map
568 keys = dc.keys()
568 keys = dc.keys()
569 keys.sort()
569 keys.sort()
570 m1n = repo.changelog.read(parent1)[0]
570 m1n = repo.changelog.read(parent1)[0]
571 m2n = repo.changelog.read(parent2)[0]
571 m2n = repo.changelog.read(parent2)[0]
572 m1 = repo.manifest.read(m1n)
572 m1 = repo.manifest.read(m1n)
573 m2 = repo.manifest.read(m2n)
573 m2 = repo.manifest.read(m2n)
574 errors = 0
574 errors = 0
575 for f in dc:
575 for f in dc:
576 state = repo.dirstate.state(f)
576 state = repo.dirstate.state(f)
577 if state in "nr" and f not in m1:
577 if state in "nr" and f not in m1:
578 ui.warn("%s in state %s, but not in manifest1\n" % (f, state))
578 ui.warn("%s in state %s, but not in manifest1\n" % (f, state))
579 errors += 1
579 errors += 1
580 if state in "a" and f in m1:
580 if state in "a" and f in m1:
581 ui.warn("%s in state %s, but also in manifest1\n" % (f, state))
581 ui.warn("%s in state %s, but also in manifest1\n" % (f, state))
582 errors += 1
582 errors += 1
583 if state in "m" and f not in m1 and f not in m2:
583 if state in "m" and f not in m1 and f not in m2:
584 ui.warn("%s in state %s, but not in either manifest\n" %
584 ui.warn("%s in state %s, but not in either manifest\n" %
585 (f, state))
585 (f, state))
586 errors += 1
586 errors += 1
587 for f in m1:
587 for f in m1:
588 state = repo.dirstate.state(f)
588 state = repo.dirstate.state(f)
589 if state not in "nrm":
589 if state not in "nrm":
590 ui.warn("%s in manifest1, but listed as state %s" % (f, state))
590 ui.warn("%s in manifest1, but listed as state %s" % (f, state))
591 errors += 1
591 errors += 1
592 if errors:
592 if errors:
593 raise util.Abort(".hg/dirstate inconsistent with current parent's manifest")
593 raise util.Abort(".hg/dirstate inconsistent with current parent's manifest")
594
594
595 def debugstate(ui, repo):
595 def debugstate(ui, repo):
596 """show the contents of the current dirstate"""
596 """show the contents of the current dirstate"""
597 repo.dirstate.read()
597 repo.dirstate.read()
598 dc = repo.dirstate.map
598 dc = repo.dirstate.map
599 keys = dc.keys()
599 keys = dc.keys()
600 keys.sort()
600 keys.sort()
601 for file_ in keys:
601 for file_ in keys:
602 ui.write("%c %3o %10d %s %s\n"
602 ui.write("%c %3o %10d %s %s\n"
603 % (dc[file_][0], dc[file_][1] & 0777, dc[file_][2],
603 % (dc[file_][0], dc[file_][1] & 0777, dc[file_][2],
604 time.strftime("%x %X",
604 time.strftime("%x %X",
605 time.localtime(dc[file_][3])), file_))
605 time.localtime(dc[file_][3])), file_))
606
606
607 def debugindex(ui, file_):
607 def debugindex(ui, file_):
608 """dump the contents of an index file"""
608 """dump the contents of an index file"""
609 r = hg.revlog(hg.opener(""), file_, "")
609 r = hg.revlog(hg.opener(""), file_, "")
610 ui.write(" rev offset length base linkrev" +
610 ui.write(" rev offset length base linkrev" +
611 " p1 p2 nodeid\n")
611 " p1 p2 nodeid\n")
612 for i in range(r.count()):
612 for i in range(r.count()):
613 e = r.index[i]
613 e = r.index[i]
614 ui.write("% 6d % 9d % 7d % 6d % 7d %s.. %s.. %s..\n" % (
614 ui.write("% 6d % 9d % 7d % 6d % 7d %s.. %s.. %s..\n" % (
615 i, e[0], e[1], e[2], e[3],
615 i, e[0], e[1], e[2], e[3],
616 hg.hex(e[4][:5]), hg.hex(e[5][:5]), hg.hex(e[6][:5])))
616 hg.hex(e[4][:5]), hg.hex(e[5][:5]), hg.hex(e[6][:5])))
617
617
618 def debugindexdot(ui, file_):
618 def debugindexdot(ui, file_):
619 """dump an index DAG as a .dot file"""
619 """dump an index DAG as a .dot file"""
620 r = hg.revlog(hg.opener(""), file_, "")
620 r = hg.revlog(hg.opener(""), file_, "")
621 ui.write("digraph G {\n")
621 ui.write("digraph G {\n")
622 for i in range(r.count()):
622 for i in range(r.count()):
623 e = r.index[i]
623 e = r.index[i]
624 ui.write("\t%d -> %d\n" % (r.rev(e[4]), i))
624 ui.write("\t%d -> %d\n" % (r.rev(e[4]), i))
625 if e[5] != hg.nullid:
625 if e[5] != hg.nullid:
626 ui.write("\t%d -> %d\n" % (r.rev(e[5]), i))
626 ui.write("\t%d -> %d\n" % (r.rev(e[5]), i))
627 ui.write("}\n")
627 ui.write("}\n")
628
628
629 def debugwalk(ui, repo, *pats, **opts):
629 def debugwalk(ui, repo, *pats, **opts):
630 items = list(walk(repo, pats, opts))
630 items = list(walk(repo, pats, opts))
631 if not items: return
631 if not items: return
632 fmt = '%%s %%-%ds %%s' % max([len(abs) for (src, abs, rel) in items])
632 fmt = '%%s %%-%ds %%s' % max([len(abs) for (src, abs, rel) in items])
633 for i in items: print fmt % i
633 for i in items: print fmt % i
634
634
635 def diff(ui, repo, *pats, **opts):
635 def diff(ui, repo, *pats, **opts):
636 """diff working directory (or selected files)"""
636 """diff working directory (or selected files)"""
637 revs = []
637 revs = []
638 if opts['rev']:
638 if opts['rev']:
639 revs = map(lambda x: repo.lookup(x), opts['rev'])
639 revs = map(lambda x: repo.lookup(x), opts['rev'])
640
640
641 if len(revs) > 2:
641 if len(revs) > 2:
642 raise util.Abort("too many revisions to diff")
642 raise util.Abort("too many revisions to diff")
643
643
644 files = []
644 files = []
645 match = util.always
645 match = util.always
646 if pats:
646 if pats:
647 roots, match, results = makewalk(repo, pats, opts)
647 roots, match, results = makewalk(repo, pats, opts)
648 for src, abs, rel in results:
648 for src, abs, rel in results:
649 files.append(abs)
649 files.append(abs)
650 dodiff(sys.stdout, ui, repo, files, *revs, **{'match': match})
650 dodiff(sys.stdout, ui, repo, files, *revs, **{'match': match})
651
651
652 def doexport(ui, repo, changeset, seqno, total, revwidth, opts):
652 def doexport(ui, repo, changeset, seqno, total, revwidth, opts):
653 node = repo.lookup(changeset)
653 node = repo.lookup(changeset)
654 prev, other = repo.changelog.parents(node)
654 prev, other = repo.changelog.parents(node)
655 change = repo.changelog.read(node)
655 change = repo.changelog.read(node)
656
656
657 fp = make_file(repo, repo.changelog, opts['output'],
657 fp = make_file(repo, repo.changelog, opts['output'],
658 node=node, total=total, seqno=seqno,
658 node=node, total=total, seqno=seqno,
659 revwidth=revwidth)
659 revwidth=revwidth)
660 if fp != sys.stdout:
660 if fp != sys.stdout:
661 ui.note("%s\n" % fp.name)
661 ui.note("%s\n" % fp.name)
662
662
663 fp.write("# HG changeset patch\n")
663 fp.write("# HG changeset patch\n")
664 fp.write("# User %s\n" % change[1])
664 fp.write("# User %s\n" % change[1])
665 fp.write("# Node ID %s\n" % hg.hex(node))
665 fp.write("# Node ID %s\n" % hg.hex(node))
666 fp.write("# Parent %s\n" % hg.hex(prev))
666 fp.write("# Parent %s\n" % hg.hex(prev))
667 if other != hg.nullid:
667 if other != hg.nullid:
668 fp.write("# Parent %s\n" % hg.hex(other))
668 fp.write("# Parent %s\n" % hg.hex(other))
669 fp.write(change[4].rstrip())
669 fp.write(change[4].rstrip())
670 fp.write("\n\n")
670 fp.write("\n\n")
671
671
672 dodiff(fp, ui, repo, None, prev, node)
672 dodiff(fp, ui, repo, None, prev, node)
673 if fp != sys.stdout: fp.close()
673 if fp != sys.stdout: fp.close()
674
674
675 def export(ui, repo, *changesets, **opts):
675 def export(ui, repo, *changesets, **opts):
676 """dump the header and diffs for one or more changesets"""
676 """dump the header and diffs for one or more changesets"""
677 if not changesets:
677 if not changesets:
678 raise util.Abort("export requires at least one changeset")
678 raise util.Abort("export requires at least one changeset")
679 seqno = 0
679 seqno = 0
680 revs = list(revrange(ui, repo, changesets))
680 revs = list(revrange(ui, repo, changesets))
681 total = len(revs)
681 total = len(revs)
682 revwidth = max(len(revs[0]), len(revs[-1]))
682 revwidth = max(len(revs[0]), len(revs[-1]))
683 ui.note(len(revs) > 1 and "Exporting patches:\n" or "Exporting patch:\n")
683 ui.note(len(revs) > 1 and "Exporting patches:\n" or "Exporting patch:\n")
684 for cset in revs:
684 for cset in revs:
685 seqno += 1
685 seqno += 1
686 doexport(ui, repo, cset, seqno, total, revwidth, opts)
686 doexport(ui, repo, cset, seqno, total, revwidth, opts)
687
687
688 def forget(ui, repo, *pats, **opts):
688 def forget(ui, repo, *pats, **opts):
689 """don't add the specified files on the next commit"""
689 """don't add the specified files on the next commit"""
690 q = dict(zip(pats, pats))
690 q = dict(zip(pats, pats))
691 forget = []
691 forget = []
692 for src, abs, rel in walk(repo, pats, opts):
692 for src, abs, rel in walk(repo, pats, opts):
693 if repo.dirstate.state(abs) == 'a':
693 if repo.dirstate.state(abs) == 'a':
694 forget.append(abs)
694 forget.append(abs)
695 if rel not in q: ui.status('forgetting ', rel, '\n')
695 if rel not in q: ui.status('forgetting ', rel, '\n')
696 repo.forget(forget)
696 repo.forget(forget)
697
697
698 def heads(ui, repo, **opts):
698 def heads(ui, repo, **opts):
699 """show current repository heads"""
699 """show current repository heads"""
700 heads = repo.changelog.heads()
700 heads = repo.changelog.heads()
701 br = None
701 br = None
702 if opts['branches']:
702 if opts['branches']:
703 br = repo.branchlookup(heads)
703 br = repo.branchlookup(heads)
704 for n in repo.changelog.heads():
704 for n in repo.changelog.heads():
705 show_changeset(ui, repo, changenode=n, brinfo=br)
705 show_changeset(ui, repo, changenode=n, brinfo=br)
706
706
707 def identify(ui, repo):
707 def identify(ui, repo):
708 """print information about the working copy"""
708 """print information about the working copy"""
709 parents = [p for p in repo.dirstate.parents() if p != hg.nullid]
709 parents = [p for p in repo.dirstate.parents() if p != hg.nullid]
710 if not parents:
710 if not parents:
711 ui.write("unknown\n")
711 ui.write("unknown\n")
712 return
712 return
713
713
714 hexfunc = ui.verbose and hg.hex or hg.short
714 hexfunc = ui.verbose and hg.hex or hg.short
715 (c, a, d, u) = repo.changes()
715 (c, a, d, u) = repo.changes()
716 output = ["%s%s" % ('+'.join([hexfunc(parent) for parent in parents]),
716 output = ["%s%s" % ('+'.join([hexfunc(parent) for parent in parents]),
717 (c or a or d) and "+" or "")]
717 (c or a or d) and "+" or "")]
718
718
719 if not ui.quiet:
719 if not ui.quiet:
720 # multiple tags for a single parent separated by '/'
720 # multiple tags for a single parent separated by '/'
721 parenttags = ['/'.join(tags)
721 parenttags = ['/'.join(tags)
722 for tags in map(repo.nodetags, parents) if tags]
722 for tags in map(repo.nodetags, parents) if tags]
723 # tags for multiple parents separated by ' + '
723 # tags for multiple parents separated by ' + '
724 if parenttags:
724 if parenttags:
725 output.append(' + '.join(parenttags))
725 output.append(' + '.join(parenttags))
726
726
727 ui.write("%s\n" % ' '.join(output))
727 ui.write("%s\n" % ' '.join(output))
728
728
729 def import_(ui, repo, patch1, *patches, **opts):
729 def import_(ui, repo, patch1, *patches, **opts):
730 """import an ordered set of patches"""
730 """import an ordered set of patches"""
731 patches = (patch1,) + patches
731 patches = (patch1,) + patches
732
732
733 d = opts["base"]
733 d = opts["base"]
734 strip = opts["strip"]
734 strip = opts["strip"]
735
735
736 for patch in patches:
736 for patch in patches:
737 ui.status("applying %s\n" % patch)
737 ui.status("applying %s\n" % patch)
738 pf = os.path.join(d, patch)
738 pf = os.path.join(d, patch)
739
739
740 message = []
740 message = []
741 user = None
741 user = None
742 hgpatch = False
742 hgpatch = False
743 for line in file(pf):
743 for line in file(pf):
744 line = line.rstrip()
744 line = line.rstrip()
745 if line.startswith("--- ") or line.startswith("diff -r"):
745 if line.startswith("--- ") or line.startswith("diff -r"):
746 break
746 break
747 elif hgpatch:
747 elif hgpatch:
748 # parse values when importing the result of an hg export
748 # parse values when importing the result of an hg export
749 if line.startswith("# User "):
749 if line.startswith("# User "):
750 user = line[7:]
750 user = line[7:]
751 ui.debug('User: %s\n' % user)
751 ui.debug('User: %s\n' % user)
752 elif not line.startswith("# ") and line:
752 elif not line.startswith("# ") and line:
753 message.append(line)
753 message.append(line)
754 hgpatch = False
754 hgpatch = False
755 elif line == '# HG changeset patch':
755 elif line == '# HG changeset patch':
756 hgpatch = True
756 hgpatch = True
757 message = [] # We may have collected garbage
757 message = [] # We may have collected garbage
758 else:
758 else:
759 message.append(line)
759 message.append(line)
760
760
761 # make sure message isn't empty
761 # make sure message isn't empty
762 if not message:
762 if not message:
763 message = "imported patch %s\n" % patch
763 message = "imported patch %s\n" % patch
764 else:
764 else:
765 message = "%s\n" % '\n'.join(message)
765 message = "%s\n" % '\n'.join(message)
766 ui.debug('message:\n%s\n' % message)
766 ui.debug('message:\n%s\n' % message)
767
767
768 f = os.popen("patch -p%d < '%s'" % (strip, pf))
768 f = os.popen("patch -p%d < '%s'" % (strip, pf))
769 files = []
769 files = []
770 for l in f.read().splitlines():
770 for l in f.read().splitlines():
771 l.rstrip('\r\n');
771 l.rstrip('\r\n');
772 ui.status("%s\n" % l)
772 ui.status("%s\n" % l)
773 if l.startswith('patching file '):
773 if l.startswith('patching file '):
774 pf = l[14:]
774 pf = l[14:]
775 if pf not in files:
775 if pf not in files:
776 files.append(pf)
776 files.append(pf)
777 patcherr = f.close()
777 patcherr = f.close()
778 if patcherr:
778 if patcherr:
779 raise util.Abort("patch failed")
779 raise util.Abort("patch failed")
780
780
781 if len(files) > 0:
781 if len(files) > 0:
782 addremove(ui, repo, *files)
782 addremove(ui, repo, *files)
783 repo.commit(files, message, user)
783 repo.commit(files, message, user)
784
784
785 def init(ui, dest="."):
785 def init(ui, dest="."):
786 """create a new repository in the given directory"""
786 """create a new repository in the given directory"""
787 if not os.path.exists(dest):
787 if not os.path.exists(dest):
788 os.mkdir(dest)
788 os.mkdir(dest)
789 hg.repository(ui, dest, create=1)
789 hg.repository(ui, dest, create=1)
790
790
791 def locate(ui, repo, *pats, **opts):
791 def locate(ui, repo, *pats, **opts):
792 """locate files matching specific patterns"""
792 """locate files matching specific patterns"""
793 end = '\n'
793 end = '\n'
794 if opts['print0']: end = '\0'
794 if opts['print0']: end = '\0'
795
795
796 for src, abs, rel in walk(repo, pats, opts, '(?:.*/|)'):
796 for src, abs, rel in walk(repo, pats, opts, '(?:.*/|)'):
797 if repo.dirstate.state(abs) == '?': continue
797 if repo.dirstate.state(abs) == '?': continue
798 if opts['fullpath']:
798 if opts['fullpath']:
799 ui.write(os.path.join(repo.root, abs), end)
799 ui.write(os.path.join(repo.root, abs), end)
800 else:
800 else:
801 ui.write(rel, end)
801 ui.write(rel, end)
802
802
803 def log(ui, repo, f=None, **opts):
803 def log(ui, repo, f=None, **opts):
804 """show the revision history of the repository or a single file"""
804 """show the revision history of the repository or a single file"""
805 if f:
805 if f:
806 files = relpath(repo, [f])
806 files = relpath(repo, [f])
807 filelog = repo.file(files[0])
807 filelog = repo.file(files[0])
808 log = filelog
808 log = filelog
809 lookup = filelog.lookup
809 lookup = filelog.lookup
810 else:
810 else:
811 files = None
811 files = None
812 filelog = None
812 filelog = None
813 log = repo.changelog
813 log = repo.changelog
814 lookup = repo.lookup
814 lookup = repo.lookup
815 revlist = []
815 revlist = []
816 revs = [log.rev(lookup(rev)) for rev in opts['rev']]
816 revs = [log.rev(lookup(rev)) for rev in opts['rev']]
817 while revs:
817 while revs:
818 if len(revs) == 1:
818 if len(revs) == 1:
819 revlist.append(revs.pop(0))
819 revlist.append(revs.pop(0))
820 else:
820 else:
821 a = revs.pop(0)
821 a = revs.pop(0)
822 b = revs.pop(0)
822 b = revs.pop(0)
823 off = a > b and -1 or 1
823 off = a > b and -1 or 1
824 revlist.extend(range(a, b + off, off))
824 revlist.extend(range(a, b + off, off))
825
825
826 for i in revlist or range(log.count() - 1, -1, -1):
826 for i in revlist or range(log.count() - 1, -1, -1):
827 show_changeset(ui, repo, filelog=filelog, rev=i)
827 show_changeset(ui, repo, filelog=filelog, rev=i)
828 if opts['patch']:
828 if opts['patch']:
829 if filelog:
829 if filelog:
830 filenode = filelog.node(i)
830 filenode = filelog.node(i)
831 i = filelog.linkrev(filenode)
831 i = filelog.linkrev(filenode)
832 changenode = repo.changelog.node(i)
832 changenode = repo.changelog.node(i)
833 prev, other = repo.changelog.parents(changenode)
833 prev, other = repo.changelog.parents(changenode)
834 dodiff(sys.stdout, ui, repo, files, prev, changenode)
834 dodiff(sys.stdout, ui, repo, files, prev, changenode)
835 ui.write("\n\n")
835 ui.write("\n\n")
836
836
837 def manifest(ui, repo, rev=None):
837 def manifest(ui, repo, rev=None):
838 """output the latest or given revision of the project manifest"""
838 """output the latest or given revision of the project manifest"""
839 if rev:
839 if rev:
840 try:
840 try:
841 # assume all revision numbers are for changesets
841 # assume all revision numbers are for changesets
842 n = repo.lookup(rev)
842 n = repo.lookup(rev)
843 change = repo.changelog.read(n)
843 change = repo.changelog.read(n)
844 n = change[0]
844 n = change[0]
845 except hg.RepoError:
845 except hg.RepoError:
846 n = repo.manifest.lookup(rev)
846 n = repo.manifest.lookup(rev)
847 else:
847 else:
848 n = repo.manifest.tip()
848 n = repo.manifest.tip()
849 m = repo.manifest.read(n)
849 m = repo.manifest.read(n)
850 mf = repo.manifest.readflags(n)
850 mf = repo.manifest.readflags(n)
851 files = m.keys()
851 files = m.keys()
852 files.sort()
852 files.sort()
853
853
854 for f in files:
854 for f in files:
855 ui.write("%40s %3s %s\n" % (hg.hex(m[f]), mf[f] and "755" or "644", f))
855 ui.write("%40s %3s %s\n" % (hg.hex(m[f]), mf[f] and "755" or "644", f))
856
856
857 def outgoing(ui, repo, dest="default-push"):
858 """show changesets not found in destination"""
859 dest = ui.expandpath(dest)
860 other = hg.repository(ui, dest)
861 o = repo.findoutgoing(other)
862 o = repo.newer(o)
863 o.reverse()
864 for n in o:
865 show_changeset(ui, repo, changenode=n)
866
857 def parents(ui, repo, rev=None):
867 def parents(ui, repo, rev=None):
858 """show the parents of the working dir or revision"""
868 """show the parents of the working dir or revision"""
859 if rev:
869 if rev:
860 p = repo.changelog.parents(repo.lookup(rev))
870 p = repo.changelog.parents(repo.lookup(rev))
861 else:
871 else:
862 p = repo.dirstate.parents()
872 p = repo.dirstate.parents()
863
873
864 for n in p:
874 for n in p:
865 if n != hg.nullid:
875 if n != hg.nullid:
866 show_changeset(ui, repo, changenode=n)
876 show_changeset(ui, repo, changenode=n)
867
877
868 def paths(ui, search = None):
878 def paths(ui, search = None):
869 """show path or list of available paths"""
879 """show path or list of available paths"""
870 try:
880 try:
871 repo = hg.repository(ui=ui)
881 repo = hg.repository(ui=ui)
872 except:
882 except:
873 pass
883 pass
874
884
875 if search:
885 if search:
876 for name, path in ui.configitems("paths"):
886 for name, path in ui.configitems("paths"):
877 if name == search:
887 if name == search:
878 ui.write("%s\n" % path)
888 ui.write("%s\n" % path)
879 return
889 return
880 ui.warn("not found!\n")
890 ui.warn("not found!\n")
881 return 1
891 return 1
882 else:
892 else:
883 for name, path in ui.configitems("paths"):
893 for name, path in ui.configitems("paths"):
884 ui.write("%s = %s\n" % (name, path))
894 ui.write("%s = %s\n" % (name, path))
885
895
886 def pull(ui, repo, source="default", **opts):
896 def pull(ui, repo, source="default", **opts):
887 """pull changes from the specified source"""
897 """pull changes from the specified source"""
888 source = ui.expandpath(source)
898 source = ui.expandpath(source)
889 ui.status('pulling from %s\n' % (source))
899 ui.status('pulling from %s\n' % (source))
890
900
891 other = hg.repository(ui, source)
901 other = hg.repository(ui, source)
892 r = repo.pull(other)
902 r = repo.pull(other)
893 if not r:
903 if not r:
894 if opts['update']:
904 if opts['update']:
895 return update(ui, repo)
905 return update(ui, repo)
896 else:
906 else:
897 ui.status("(run 'hg update' to get a working copy)\n")
907 ui.status("(run 'hg update' to get a working copy)\n")
898
908
899 return r
909 return r
900
910
901 def push(ui, repo, dest="default-push", force=False):
911 def push(ui, repo, dest="default-push", force=False):
902 """push changes to the specified destination"""
912 """push changes to the specified destination"""
903 dest = ui.expandpath(dest)
913 dest = ui.expandpath(dest)
904 ui.status('pushing to %s\n' % (dest))
914 ui.status('pushing to %s\n' % (dest))
905
915
906 other = hg.repository(ui, dest)
916 other = hg.repository(ui, dest)
907 r = repo.push(other, force)
917 r = repo.push(other, force)
908 return r
918 return r
909
919
910 def rawcommit(ui, repo, *flist, **rc):
920 def rawcommit(ui, repo, *flist, **rc):
911 "raw commit interface"
921 "raw commit interface"
912 if rc['text']:
922 if rc['text']:
913 ui.warn("Warning: -t and --text is deprecated,"
923 ui.warn("Warning: -t and --text is deprecated,"
914 " please use -m or --message instead.\n")
924 " please use -m or --message instead.\n")
915 message = rc['message'] or rc['text']
925 message = rc['message'] or rc['text']
916 if not message and rc['logfile']:
926 if not message and rc['logfile']:
917 try:
927 try:
918 message = open(rc['logfile']).read()
928 message = open(rc['logfile']).read()
919 except IOError:
929 except IOError:
920 pass
930 pass
921 if not message and not rc['logfile']:
931 if not message and not rc['logfile']:
922 ui.warn("abort: missing commit message\n")
932 ui.warn("abort: missing commit message\n")
923 return 1
933 return 1
924
934
925 files = relpath(repo, list(flist))
935 files = relpath(repo, list(flist))
926 if rc['files']:
936 if rc['files']:
927 files += open(rc['files']).read().splitlines()
937 files += open(rc['files']).read().splitlines()
928
938
929 rc['parent'] = map(repo.lookup, rc['parent'])
939 rc['parent'] = map(repo.lookup, rc['parent'])
930
940
931 repo.rawcommit(files, message, rc['user'], rc['date'], *rc['parent'])
941 repo.rawcommit(files, message, rc['user'], rc['date'], *rc['parent'])
932
942
933 def recover(ui, repo):
943 def recover(ui, repo):
934 """roll back an interrupted transaction"""
944 """roll back an interrupted transaction"""
935 repo.recover()
945 repo.recover()
936
946
937 def remove(ui, repo, file1, *files):
947 def remove(ui, repo, file1, *files):
938 """remove the specified files on the next commit"""
948 """remove the specified files on the next commit"""
939 repo.remove(relpath(repo, (file1,) + files))
949 repo.remove(relpath(repo, (file1,) + files))
940
950
941 def revert(ui, repo, *names, **opts):
951 def revert(ui, repo, *names, **opts):
942 """revert modified files or dirs back to their unmodified states"""
952 """revert modified files or dirs back to their unmodified states"""
943 node = opts['rev'] and repo.lookup(opts['rev']) or \
953 node = opts['rev'] and repo.lookup(opts['rev']) or \
944 repo.dirstate.parents()[0]
954 repo.dirstate.parents()[0]
945 root = os.path.realpath(repo.root)
955 root = os.path.realpath(repo.root)
946
956
947 def trimpath(p):
957 def trimpath(p):
948 p = os.path.realpath(p)
958 p = os.path.realpath(p)
949 if p.startswith(root):
959 if p.startswith(root):
950 rest = p[len(root):]
960 rest = p[len(root):]
951 if not rest:
961 if not rest:
952 return rest
962 return rest
953 if p.startswith(os.sep):
963 if p.startswith(os.sep):
954 return rest[1:]
964 return rest[1:]
955 return p
965 return p
956
966
957 relnames = map(trimpath, names or [os.getcwd()])
967 relnames = map(trimpath, names or [os.getcwd()])
958 chosen = {}
968 chosen = {}
959
969
960 def choose(name):
970 def choose(name):
961 def body(name):
971 def body(name):
962 for r in relnames:
972 for r in relnames:
963 if not name.startswith(r):
973 if not name.startswith(r):
964 continue
974 continue
965 rest = name[len(r):]
975 rest = name[len(r):]
966 if not rest:
976 if not rest:
967 return r, True
977 return r, True
968 depth = rest.count(os.sep)
978 depth = rest.count(os.sep)
969 if not r:
979 if not r:
970 if depth == 0 or not opts['nonrecursive']:
980 if depth == 0 or not opts['nonrecursive']:
971 return r, True
981 return r, True
972 elif rest[0] == os.sep:
982 elif rest[0] == os.sep:
973 if depth == 1 or not opts['nonrecursive']:
983 if depth == 1 or not opts['nonrecursive']:
974 return r, True
984 return r, True
975 return None, False
985 return None, False
976 relname, ret = body(name)
986 relname, ret = body(name)
977 if ret:
987 if ret:
978 chosen[relname] = 1
988 chosen[relname] = 1
979 return ret
989 return ret
980
990
981 r = repo.update(node, False, True, choose, False)
991 r = repo.update(node, False, True, choose, False)
982 for n in relnames:
992 for n in relnames:
983 if n not in chosen:
993 if n not in chosen:
984 ui.warn('error: no matches for %s\n' % n)
994 ui.warn('error: no matches for %s\n' % n)
985 r = 1
995 r = 1
986 sys.stdout.flush()
996 sys.stdout.flush()
987 return r
997 return r
988
998
989 def root(ui, repo):
999 def root(ui, repo):
990 """print the root (top) of the current working dir"""
1000 """print the root (top) of the current working dir"""
991 ui.write(repo.root + "\n")
1001 ui.write(repo.root + "\n")
992
1002
993 def serve(ui, repo, **opts):
1003 def serve(ui, repo, **opts):
994 """export the repository via HTTP"""
1004 """export the repository via HTTP"""
995
1005
996 if opts["stdio"]:
1006 if opts["stdio"]:
997 fin, fout = sys.stdin, sys.stdout
1007 fin, fout = sys.stdin, sys.stdout
998 sys.stdout = sys.stderr
1008 sys.stdout = sys.stderr
999
1009
1000 def getarg():
1010 def getarg():
1001 argline = fin.readline()[:-1]
1011 argline = fin.readline()[:-1]
1002 arg, l = argline.split()
1012 arg, l = argline.split()
1003 val = fin.read(int(l))
1013 val = fin.read(int(l))
1004 return arg, val
1014 return arg, val
1005 def respond(v):
1015 def respond(v):
1006 fout.write("%d\n" % len(v))
1016 fout.write("%d\n" % len(v))
1007 fout.write(v)
1017 fout.write(v)
1008 fout.flush()
1018 fout.flush()
1009
1019
1010 lock = None
1020 lock = None
1011
1021
1012 while 1:
1022 while 1:
1013 cmd = fin.readline()[:-1]
1023 cmd = fin.readline()[:-1]
1014 if cmd == '':
1024 if cmd == '':
1015 return
1025 return
1016 if cmd == "heads":
1026 if cmd == "heads":
1017 h = repo.heads()
1027 h = repo.heads()
1018 respond(" ".join(map(hg.hex, h)) + "\n")
1028 respond(" ".join(map(hg.hex, h)) + "\n")
1019 if cmd == "lock":
1029 if cmd == "lock":
1020 lock = repo.lock()
1030 lock = repo.lock()
1021 respond("")
1031 respond("")
1022 if cmd == "unlock":
1032 if cmd == "unlock":
1023 if lock:
1033 if lock:
1024 lock.release()
1034 lock.release()
1025 lock = None
1035 lock = None
1026 respond("")
1036 respond("")
1027 elif cmd == "branches":
1037 elif cmd == "branches":
1028 arg, nodes = getarg()
1038 arg, nodes = getarg()
1029 nodes = map(hg.bin, nodes.split(" "))
1039 nodes = map(hg.bin, nodes.split(" "))
1030 r = []
1040 r = []
1031 for b in repo.branches(nodes):
1041 for b in repo.branches(nodes):
1032 r.append(" ".join(map(hg.hex, b)) + "\n")
1042 r.append(" ".join(map(hg.hex, b)) + "\n")
1033 respond("".join(r))
1043 respond("".join(r))
1034 elif cmd == "between":
1044 elif cmd == "between":
1035 arg, pairs = getarg()
1045 arg, pairs = getarg()
1036 pairs = [map(hg.bin, p.split("-")) for p in pairs.split(" ")]
1046 pairs = [map(hg.bin, p.split("-")) for p in pairs.split(" ")]
1037 r = []
1047 r = []
1038 for b in repo.between(pairs):
1048 for b in repo.between(pairs):
1039 r.append(" ".join(map(hg.hex, b)) + "\n")
1049 r.append(" ".join(map(hg.hex, b)) + "\n")
1040 respond("".join(r))
1050 respond("".join(r))
1041 elif cmd == "changegroup":
1051 elif cmd == "changegroup":
1042 nodes = []
1052 nodes = []
1043 arg, roots = getarg()
1053 arg, roots = getarg()
1044 nodes = map(hg.bin, roots.split(" "))
1054 nodes = map(hg.bin, roots.split(" "))
1045
1055
1046 cg = repo.changegroup(nodes)
1056 cg = repo.changegroup(nodes)
1047 while 1:
1057 while 1:
1048 d = cg.read(4096)
1058 d = cg.read(4096)
1049 if not d:
1059 if not d:
1050 break
1060 break
1051 fout.write(d)
1061 fout.write(d)
1052
1062
1053 fout.flush()
1063 fout.flush()
1054
1064
1055 elif cmd == "addchangegroup":
1065 elif cmd == "addchangegroup":
1056 if not lock:
1066 if not lock:
1057 respond("not locked")
1067 respond("not locked")
1058 continue
1068 continue
1059 respond("")
1069 respond("")
1060
1070
1061 r = repo.addchangegroup(fin)
1071 r = repo.addchangegroup(fin)
1062 respond("")
1072 respond("")
1063
1073
1064 def openlog(opt, default):
1074 def openlog(opt, default):
1065 if opts[opt] and opts[opt] != '-':
1075 if opts[opt] and opts[opt] != '-':
1066 return open(opts[opt], 'w')
1076 return open(opts[opt], 'w')
1067 else:
1077 else:
1068 return default
1078 return default
1069
1079
1070 httpd = hgweb.create_server(repo.root, opts["name"], opts["templates"],
1080 httpd = hgweb.create_server(repo.root, opts["name"], opts["templates"],
1071 opts["address"], opts["port"], opts["ipv6"],
1081 opts["address"], opts["port"], opts["ipv6"],
1072 openlog('accesslog', sys.stdout),
1082 openlog('accesslog', sys.stdout),
1073 openlog('errorlog', sys.stderr))
1083 openlog('errorlog', sys.stderr))
1074 if ui.verbose:
1084 if ui.verbose:
1075 addr, port = httpd.socket.getsockname()
1085 addr, port = httpd.socket.getsockname()
1076 if addr == '0.0.0.0':
1086 if addr == '0.0.0.0':
1077 addr = socket.gethostname()
1087 addr = socket.gethostname()
1078 else:
1088 else:
1079 try:
1089 try:
1080 addr = socket.gethostbyaddr(addr)[0]
1090 addr = socket.gethostbyaddr(addr)[0]
1081 except socket.error:
1091 except socket.error:
1082 pass
1092 pass
1083 if port != 80:
1093 if port != 80:
1084 ui.status('listening at http://%s:%d/\n' % (addr, port))
1094 ui.status('listening at http://%s:%d/\n' % (addr, port))
1085 else:
1095 else:
1086 ui.status('listening at http://%s/\n' % addr)
1096 ui.status('listening at http://%s/\n' % addr)
1087 httpd.serve_forever()
1097 httpd.serve_forever()
1088
1098
1089 def status(ui, repo, *pats, **opts):
1099 def status(ui, repo, *pats, **opts):
1090 '''show changed files in the working directory
1100 '''show changed files in the working directory
1091
1101
1092 M = modified
1102 M = modified
1093 A = added
1103 A = added
1094 R = removed
1104 R = removed
1095 ? = not tracked
1105 ? = not tracked
1096 '''
1106 '''
1097
1107
1098 cwd = repo.getcwd()
1108 cwd = repo.getcwd()
1099 files, matchfn = matchpats(repo, cwd, pats, opts)
1109 files, matchfn = matchpats(repo, cwd, pats, opts)
1100 (c, a, d, u) = [[util.pathto(cwd, x) for x in n]
1110 (c, a, d, u) = [[util.pathto(cwd, x) for x in n]
1101 for n in repo.changes(files=files, match=matchfn)]
1111 for n in repo.changes(files=files, match=matchfn)]
1102
1112
1103 changetypes = [('modified', 'M', c),
1113 changetypes = [('modified', 'M', c),
1104 ('added', 'A', a),
1114 ('added', 'A', a),
1105 ('removed', 'R', d),
1115 ('removed', 'R', d),
1106 ('unknown', '?', u)]
1116 ('unknown', '?', u)]
1107
1117
1108 for opt, char, changes in ([ct for ct in changetypes if opts[ct[0]]]
1118 for opt, char, changes in ([ct for ct in changetypes if opts[ct[0]]]
1109 or changetypes):
1119 or changetypes):
1110 for f in changes:
1120 for f in changes:
1111 ui.write("%s %s\n" % (char, f))
1121 ui.write("%s %s\n" % (char, f))
1112
1122
1113 def tag(ui, repo, name, rev=None, **opts):
1123 def tag(ui, repo, name, rev=None, **opts):
1114 """add a tag for the current tip or a given revision"""
1124 """add a tag for the current tip or a given revision"""
1115 if opts['text']:
1125 if opts['text']:
1116 ui.warn("Warning: -t and --text is deprecated,"
1126 ui.warn("Warning: -t and --text is deprecated,"
1117 " please use -m or --message instead.\n")
1127 " please use -m or --message instead.\n")
1118 if name == "tip":
1128 if name == "tip":
1119 ui.warn("abort: 'tip' is a reserved name!\n")
1129 ui.warn("abort: 'tip' is a reserved name!\n")
1120 return -1
1130 return -1
1121 if rev:
1131 if rev:
1122 r = hg.hex(repo.lookup(rev))
1132 r = hg.hex(repo.lookup(rev))
1123 else:
1133 else:
1124 r = hg.hex(repo.changelog.tip())
1134 r = hg.hex(repo.changelog.tip())
1125
1135
1126 if name.find(revrangesep) >= 0:
1136 if name.find(revrangesep) >= 0:
1127 ui.warn("abort: '%s' cannot be used in a tag name\n" % revrangesep)
1137 ui.warn("abort: '%s' cannot be used in a tag name\n" % revrangesep)
1128 return -1
1138 return -1
1129
1139
1130 if opts['local']:
1140 if opts['local']:
1131 repo.opener("localtags", "a").write("%s %s\n" % (r, name))
1141 repo.opener("localtags", "a").write("%s %s\n" % (r, name))
1132 return
1142 return
1133
1143
1134 (c, a, d, u) = repo.changes()
1144 (c, a, d, u) = repo.changes()
1135 for x in (c, a, d, u):
1145 for x in (c, a, d, u):
1136 if ".hgtags" in x:
1146 if ".hgtags" in x:
1137 ui.warn("abort: working copy of .hgtags is changed!\n")
1147 ui.warn("abort: working copy of .hgtags is changed!\n")
1138 ui.status("(please commit .hgtags manually)\n")
1148 ui.status("(please commit .hgtags manually)\n")
1139 return -1
1149 return -1
1140
1150
1141 repo.wfile(".hgtags", "ab").write("%s %s\n" % (r, name))
1151 repo.wfile(".hgtags", "ab").write("%s %s\n" % (r, name))
1142 if repo.dirstate.state(".hgtags") == '?':
1152 if repo.dirstate.state(".hgtags") == '?':
1143 repo.add([".hgtags"])
1153 repo.add([".hgtags"])
1144
1154
1145 message = (opts['message'] or opts['text'] or
1155 message = (opts['message'] or opts['text'] or
1146 "Added tag %s for changeset %s" % (name, r))
1156 "Added tag %s for changeset %s" % (name, r))
1147 repo.commit([".hgtags"], message, opts['user'], opts['date'])
1157 repo.commit([".hgtags"], message, opts['user'], opts['date'])
1148
1158
1149 def tags(ui, repo):
1159 def tags(ui, repo):
1150 """list repository tags"""
1160 """list repository tags"""
1151
1161
1152 l = repo.tagslist()
1162 l = repo.tagslist()
1153 l.reverse()
1163 l.reverse()
1154 for t, n in l:
1164 for t, n in l:
1155 try:
1165 try:
1156 r = "%5d:%s" % (repo.changelog.rev(n), hg.hex(n))
1166 r = "%5d:%s" % (repo.changelog.rev(n), hg.hex(n))
1157 except KeyError:
1167 except KeyError:
1158 r = " ?:?"
1168 r = " ?:?"
1159 ui.write("%-30s %s\n" % (t, r))
1169 ui.write("%-30s %s\n" % (t, r))
1160
1170
1161 def tip(ui, repo):
1171 def tip(ui, repo):
1162 """show the tip revision"""
1172 """show the tip revision"""
1163 n = repo.changelog.tip()
1173 n = repo.changelog.tip()
1164 show_changeset(ui, repo, changenode=n)
1174 show_changeset(ui, repo, changenode=n)
1165
1175
1166 def undo(ui, repo):
1176 def undo(ui, repo):
1167 """undo the last commit or pull
1177 """undo the last commit or pull
1168
1178
1169 Roll back the last pull or commit transaction on the
1179 Roll back the last pull or commit transaction on the
1170 repository, restoring the project to its earlier state.
1180 repository, restoring the project to its earlier state.
1171
1181
1172 This command should be used with care. There is only one level of
1182 This command should be used with care. There is only one level of
1173 undo and there is no redo.
1183 undo and there is no redo.
1174
1184
1175 This command is not intended for use on public repositories. Once
1185 This command is not intended for use on public repositories. Once
1176 a change is visible for pull by other users, undoing it locally is
1186 a change is visible for pull by other users, undoing it locally is
1177 ineffective.
1187 ineffective.
1178 """
1188 """
1179 repo.undo()
1189 repo.undo()
1180
1190
1181 def update(ui, repo, node=None, merge=False, clean=False, branch=None):
1191 def update(ui, repo, node=None, merge=False, clean=False, branch=None):
1182 '''update or merge working directory
1192 '''update or merge working directory
1183
1193
1184 If there are no outstanding changes in the working directory and
1194 If there are no outstanding changes in the working directory and
1185 there is a linear relationship between the current version and the
1195 there is a linear relationship between the current version and the
1186 requested version, the result is the requested version.
1196 requested version, the result is the requested version.
1187
1197
1188 Otherwise the result is a merge between the contents of the
1198 Otherwise the result is a merge between the contents of the
1189 current working directory and the requested version. Files that
1199 current working directory and the requested version. Files that
1190 changed between either parent are marked as changed for the next
1200 changed between either parent are marked as changed for the next
1191 commit and a commit must be performed before any further updates
1201 commit and a commit must be performed before any further updates
1192 are allowed.
1202 are allowed.
1193 '''
1203 '''
1194 if branch:
1204 if branch:
1195 br = repo.branchlookup(branch=branch)
1205 br = repo.branchlookup(branch=branch)
1196 found = []
1206 found = []
1197 for x in br:
1207 for x in br:
1198 if branch in br[x]:
1208 if branch in br[x]:
1199 found.append(x)
1209 found.append(x)
1200 if len(found) > 1:
1210 if len(found) > 1:
1201 ui.warn("Found multiple heads for %s\n" % branch)
1211 ui.warn("Found multiple heads for %s\n" % branch)
1202 for x in found:
1212 for x in found:
1203 show_changeset(ui, repo, changenode=x, brinfo=br)
1213 show_changeset(ui, repo, changenode=x, brinfo=br)
1204 return 1
1214 return 1
1205 if len(found) == 1:
1215 if len(found) == 1:
1206 node = found[0]
1216 node = found[0]
1207 ui.warn("Using head %s for branch %s\n" % (hg.short(node), branch))
1217 ui.warn("Using head %s for branch %s\n" % (hg.short(node), branch))
1208 else:
1218 else:
1209 ui.warn("branch %s not found\n" % (branch))
1219 ui.warn("branch %s not found\n" % (branch))
1210 return 1
1220 return 1
1211 else:
1221 else:
1212 node = node and repo.lookup(node) or repo.changelog.tip()
1222 node = node and repo.lookup(node) or repo.changelog.tip()
1213 return repo.update(node, allow=merge, force=clean)
1223 return repo.update(node, allow=merge, force=clean)
1214
1224
1215 def verify(ui, repo):
1225 def verify(ui, repo):
1216 """verify the integrity of the repository"""
1226 """verify the integrity of the repository"""
1217 return repo.verify()
1227 return repo.verify()
1218
1228
1219 # Command options and aliases are listed here, alphabetically
1229 # Command options and aliases are listed here, alphabetically
1220
1230
1221 table = {
1231 table = {
1222 "^add":
1232 "^add":
1223 (add,
1233 (add,
1224 [('I', 'include', [], 'include path in search'),
1234 [('I', 'include', [], 'include path in search'),
1225 ('X', 'exclude', [], 'exclude path from search')],
1235 ('X', 'exclude', [], 'exclude path from search')],
1226 "hg add [OPTION]... [FILE]..."),
1236 "hg add [OPTION]... [FILE]..."),
1227 "addremove":
1237 "addremove":
1228 (addremove,
1238 (addremove,
1229 [('I', 'include', [], 'include path in search'),
1239 [('I', 'include', [], 'include path in search'),
1230 ('X', 'exclude', [], 'exclude path from search')],
1240 ('X', 'exclude', [], 'exclude path from search')],
1231 "hg addremove [OPTION]... [FILE]..."),
1241 "hg addremove [OPTION]... [FILE]..."),
1232 "^annotate":
1242 "^annotate":
1233 (annotate,
1243 (annotate,
1234 [('r', 'rev', '', 'revision'),
1244 [('r', 'rev', '', 'revision'),
1235 ('u', 'user', None, 'show user'),
1245 ('u', 'user', None, 'show user'),
1236 ('n', 'number', None, 'show revision number'),
1246 ('n', 'number', None, 'show revision number'),
1237 ('c', 'changeset', None, 'show changeset'),
1247 ('c', 'changeset', None, 'show changeset'),
1238 ('I', 'include', [], 'include path in search'),
1248 ('I', 'include', [], 'include path in search'),
1239 ('X', 'exclude', [], 'exclude path from search')],
1249 ('X', 'exclude', [], 'exclude path from search')],
1240 'hg annotate [OPTION]... FILE...'),
1250 'hg annotate [OPTION]... FILE...'),
1241 "cat":
1251 "cat":
1242 (cat,
1252 (cat,
1243 [('o', 'output', "", 'output to file')],
1253 [('o', 'output', "", 'output to file')],
1244 'hg cat [-o OUTFILE] FILE [REV]'),
1254 'hg cat [-o OUTFILE] FILE [REV]'),
1245 "^clone":
1255 "^clone":
1246 (clone,
1256 (clone,
1247 [('U', 'noupdate', None, 'skip update after cloning')],
1257 [('U', 'noupdate', None, 'skip update after cloning')],
1248 'hg clone [-U] SOURCE [DEST]'),
1258 'hg clone [-U] SOURCE [DEST]'),
1249 "^commit|ci":
1259 "^commit|ci":
1250 (commit,
1260 (commit,
1251 [('A', 'addremove', None, 'run add/remove during commit'),
1261 [('A', 'addremove', None, 'run add/remove during commit'),
1252 ('I', 'include', [], 'include path in search'),
1262 ('I', 'include', [], 'include path in search'),
1253 ('X', 'exclude', [], 'exclude path from search'),
1263 ('X', 'exclude', [], 'exclude path from search'),
1254 ('m', 'message', "", 'commit message'),
1264 ('m', 'message', "", 'commit message'),
1255 ('t', 'text', "", 'commit message (deprecated: use -m)'),
1265 ('t', 'text', "", 'commit message (deprecated: use -m)'),
1256 ('l', 'logfile', "", 'commit message file'),
1266 ('l', 'logfile', "", 'commit message file'),
1257 ('d', 'date', "", 'date code'),
1267 ('d', 'date', "", 'date code'),
1258 ('u', 'user', "", 'user')],
1268 ('u', 'user', "", 'user')],
1259 'hg commit [OPTION]... [FILE]...'),
1269 'hg commit [OPTION]... [FILE]...'),
1260 "copy": (copy, [], 'hg copy SOURCE DEST'),
1270 "copy": (copy, [], 'hg copy SOURCE DEST'),
1261 "debugcheckstate": (debugcheckstate, [], 'debugcheckstate'),
1271 "debugcheckstate": (debugcheckstate, [], 'debugcheckstate'),
1262 "debugstate": (debugstate, [], 'debugstate'),
1272 "debugstate": (debugstate, [], 'debugstate'),
1263 "debugindex": (debugindex, [], 'debugindex FILE'),
1273 "debugindex": (debugindex, [], 'debugindex FILE'),
1264 "debugindexdot": (debugindexdot, [], 'debugindexdot FILE'),
1274 "debugindexdot": (debugindexdot, [], 'debugindexdot FILE'),
1265 "debugwalk":
1275 "debugwalk":
1266 (debugwalk,
1276 (debugwalk,
1267 [('I', 'include', [], 'include path in search'),
1277 [('I', 'include', [], 'include path in search'),
1268 ('X', 'exclude', [], 'exclude path from search')],
1278 ('X', 'exclude', [], 'exclude path from search')],
1269 'debugwalk [OPTION]... [FILE]...'),
1279 'debugwalk [OPTION]... [FILE]...'),
1270 "^diff":
1280 "^diff":
1271 (diff,
1281 (diff,
1272 [('r', 'rev', [], 'revision'),
1282 [('r', 'rev', [], 'revision'),
1273 ('I', 'include', [], 'include path in search'),
1283 ('I', 'include', [], 'include path in search'),
1274 ('X', 'exclude', [], 'exclude path from search')],
1284 ('X', 'exclude', [], 'exclude path from search')],
1275 'hg diff [-I] [-X] [-r REV1 [-r REV2]] [FILE]...'),
1285 'hg diff [-I] [-X] [-r REV1 [-r REV2]] [FILE]...'),
1276 "^export":
1286 "^export":
1277 (export,
1287 (export,
1278 [('o', 'output', "", 'output to file')],
1288 [('o', 'output', "", 'output to file')],
1279 "hg export [-o OUTFILE] REV..."),
1289 "hg export [-o OUTFILE] REV..."),
1280 "forget":
1290 "forget":
1281 (forget,
1291 (forget,
1282 [('I', 'include', [], 'include path in search'),
1292 [('I', 'include', [], 'include path in search'),
1283 ('X', 'exclude', [], 'exclude path from search')],
1293 ('X', 'exclude', [], 'exclude path from search')],
1284 "hg forget [OPTION]... FILE..."),
1294 "hg forget [OPTION]... FILE..."),
1285 "heads":
1295 "heads":
1286 (heads,
1296 (heads,
1287 [('b', 'branches', None, 'find branch info')],
1297 [('b', 'branches', None, 'find branch info')],
1288 'hg [-b] heads'),
1298 'hg [-b] heads'),
1289 "help": (help_, [], 'hg help [COMMAND]'),
1299 "help": (help_, [], 'hg help [COMMAND]'),
1290 "identify|id": (identify, [], 'hg identify'),
1300 "identify|id": (identify, [], 'hg identify'),
1291 "import|patch":
1301 "import|patch":
1292 (import_,
1302 (import_,
1293 [('p', 'strip', 1, 'path strip'),
1303 [('p', 'strip', 1, 'path strip'),
1294 ('b', 'base', "", 'base path')],
1304 ('b', 'base', "", 'base path')],
1295 "hg import [-p NUM] [-b BASE] PATCH..."),
1305 "hg import [-p NUM] [-b BASE] PATCH..."),
1296 "^init": (init, [], 'hg init [DEST]'),
1306 "^init": (init, [], 'hg init [DEST]'),
1297 "locate":
1307 "locate":
1298 (locate,
1308 (locate,
1299 [('r', 'rev', '', 'revision'),
1309 [('r', 'rev', '', 'revision'),
1300 ('0', 'print0', None, 'end records with NUL'),
1310 ('0', 'print0', None, 'end records with NUL'),
1301 ('f', 'fullpath', None, 'print complete paths'),
1311 ('f', 'fullpath', None, 'print complete paths'),
1302 ('I', 'include', [], 'include path in search'),
1312 ('I', 'include', [], 'include path in search'),
1303 ('X', 'exclude', [], 'exclude path from search')],
1313 ('X', 'exclude', [], 'exclude path from search')],
1304 'hg locate [OPTION]... [PATTERN]...'),
1314 'hg locate [OPTION]... [PATTERN]...'),
1305 "^log|history":
1315 "^log|history":
1306 (log,
1316 (log,
1307 [('r', 'rev', [], 'revision'),
1317 [('r', 'rev', [], 'revision'),
1308 ('p', 'patch', None, 'show patch')],
1318 ('p', 'patch', None, 'show patch')],
1309 'hg log [-r REV1 [-r REV2]] [-p] [FILE]'),
1319 'hg log [-r REV1 [-r REV2]] [-p] [FILE]'),
1310 "manifest": (manifest, [], 'hg manifest [REV]'),
1320 "manifest": (manifest, [], 'hg manifest [REV]'),
1321 "outgoing": (outgoing, [], 'hg outgoing [DEST]'),
1311 "parents": (parents, [], 'hg parents [REV]'),
1322 "parents": (parents, [], 'hg parents [REV]'),
1312 "paths": (paths, [], 'hg paths [name]'),
1323 "paths": (paths, [], 'hg paths [name]'),
1313 "^pull":
1324 "^pull":
1314 (pull,
1325 (pull,
1315 [('u', 'update', None, 'update working directory')],
1326 [('u', 'update', None, 'update working directory')],
1316 'hg pull [-u] [SOURCE]'),
1327 'hg pull [-u] [SOURCE]'),
1317 "^push":
1328 "^push":
1318 (push,
1329 (push,
1319 [('f', 'force', None, 'force push')],
1330 [('f', 'force', None, 'force push')],
1320 'hg push [-f] [DEST]'),
1331 'hg push [-f] [DEST]'),
1321 "rawcommit":
1332 "rawcommit":
1322 (rawcommit,
1333 (rawcommit,
1323 [('p', 'parent', [], 'parent'),
1334 [('p', 'parent', [], 'parent'),
1324 ('d', 'date', "", 'date code'),
1335 ('d', 'date', "", 'date code'),
1325 ('u', 'user', "", 'user'),
1336 ('u', 'user', "", 'user'),
1326 ('F', 'files', "", 'file list'),
1337 ('F', 'files', "", 'file list'),
1327 ('m', 'message', "", 'commit message'),
1338 ('m', 'message', "", 'commit message'),
1328 ('t', 'text', "", 'commit message (deprecated: use -m)'),
1339 ('t', 'text', "", 'commit message (deprecated: use -m)'),
1329 ('l', 'logfile', "", 'commit message file')],
1340 ('l', 'logfile', "", 'commit message file')],
1330 'hg rawcommit [OPTION]... [FILE]...'),
1341 'hg rawcommit [OPTION]... [FILE]...'),
1331 "recover": (recover, [], "hg recover"),
1342 "recover": (recover, [], "hg recover"),
1332 "^remove|rm": (remove, [], "hg remove FILE..."),
1343 "^remove|rm": (remove, [], "hg remove FILE..."),
1333 "^revert":
1344 "^revert":
1334 (revert,
1345 (revert,
1335 [("n", "nonrecursive", None, "don't recurse into subdirs"),
1346 [("n", "nonrecursive", None, "don't recurse into subdirs"),
1336 ("r", "rev", "", "revision")],
1347 ("r", "rev", "", "revision")],
1337 "hg revert [-n] [-r REV] [NAME]..."),
1348 "hg revert [-n] [-r REV] [NAME]..."),
1338 "root": (root, [], "hg root"),
1349 "root": (root, [], "hg root"),
1339 "^serve":
1350 "^serve":
1340 (serve,
1351 (serve,
1341 [('A', 'accesslog', '', 'access log file'),
1352 [('A', 'accesslog', '', 'access log file'),
1342 ('E', 'errorlog', '', 'error log file'),
1353 ('E', 'errorlog', '', 'error log file'),
1343 ('p', 'port', 8000, 'listen port'),
1354 ('p', 'port', 8000, 'listen port'),
1344 ('a', 'address', '', 'interface address'),
1355 ('a', 'address', '', 'interface address'),
1345 ('n', 'name', os.getcwd(), 'repository name'),
1356 ('n', 'name', os.getcwd(), 'repository name'),
1346 ('', 'stdio', None, 'for remote clients'),
1357 ('', 'stdio', None, 'for remote clients'),
1347 ('t', 'templates', "", 'template map'),
1358 ('t', 'templates', "", 'template map'),
1348 ('6', 'ipv6', None, 'use IPv6 in addition to IPv4')],
1359 ('6', 'ipv6', None, 'use IPv6 in addition to IPv4')],
1349 "hg serve [OPTION]..."),
1360 "hg serve [OPTION]..."),
1350 "^status":
1361 "^status":
1351 (status,
1362 (status,
1352 [('m', 'modified', None, 'show only modified files'),
1363 [('m', 'modified', None, 'show only modified files'),
1353 ('a', 'added', None, 'show only added files'),
1364 ('a', 'added', None, 'show only added files'),
1354 ('r', 'removed', None, 'show only removed files'),
1365 ('r', 'removed', None, 'show only removed files'),
1355 ('u', 'unknown', None, 'show only unknown (not tracked) files'),
1366 ('u', 'unknown', None, 'show only unknown (not tracked) files'),
1356 ('I', 'include', [], 'include path in search'),
1367 ('I', 'include', [], 'include path in search'),
1357 ('X', 'exclude', [], 'exclude path from search')],
1368 ('X', 'exclude', [], 'exclude path from search')],
1358 "hg status [OPTION]... [FILE]..."),
1369 "hg status [OPTION]... [FILE]..."),
1359 "tag":
1370 "tag":
1360 (tag,
1371 (tag,
1361 [('l', 'local', None, 'make the tag local'),
1372 [('l', 'local', None, 'make the tag local'),
1362 ('m', 'message', "", 'commit message'),
1373 ('m', 'message', "", 'commit message'),
1363 ('t', 'text', "", 'commit message (deprecated: use -m)'),
1374 ('t', 'text', "", 'commit message (deprecated: use -m)'),
1364 ('d', 'date', "", 'date code'),
1375 ('d', 'date', "", 'date code'),
1365 ('u', 'user', "", 'user')],
1376 ('u', 'user', "", 'user')],
1366 'hg tag [OPTION]... NAME [REV]'),
1377 'hg tag [OPTION]... NAME [REV]'),
1367 "tags": (tags, [], 'hg tags'),
1378 "tags": (tags, [], 'hg tags'),
1368 "tip": (tip, [], 'hg tip'),
1379 "tip": (tip, [], 'hg tip'),
1369 "undo": (undo, [], 'hg undo'),
1380 "undo": (undo, [], 'hg undo'),
1370 "^update|up|checkout|co":
1381 "^update|up|checkout|co":
1371 (update,
1382 (update,
1372 [('b', 'branch', "", 'checkout the head of a specific branch'),
1383 [('b', 'branch', "", 'checkout the head of a specific branch'),
1373 ('m', 'merge', None, 'allow merging of conflicts'),
1384 ('m', 'merge', None, 'allow merging of conflicts'),
1374 ('C', 'clean', None, 'overwrite locally modified files')],
1385 ('C', 'clean', None, 'overwrite locally modified files')],
1375 'hg update [-b TAG] [-m] [-C] [REV]'),
1386 'hg update [-b TAG] [-m] [-C] [REV]'),
1376 "verify": (verify, [], 'hg verify'),
1387 "verify": (verify, [], 'hg verify'),
1377 "version": (show_version, [], 'hg version'),
1388 "version": (show_version, [], 'hg version'),
1378 }
1389 }
1379
1390
1380 globalopts = [('v', 'verbose', None, 'verbose mode'),
1391 globalopts = [('v', 'verbose', None, 'verbose mode'),
1381 ('', 'debug', None, 'debug mode'),
1392 ('', 'debug', None, 'debug mode'),
1382 ('q', 'quiet', None, 'quiet mode'),
1393 ('q', 'quiet', None, 'quiet mode'),
1383 ('', 'profile', None, 'profile'),
1394 ('', 'profile', None, 'profile'),
1384 ('R', 'repository', "", 'repository root directory'),
1395 ('R', 'repository', "", 'repository root directory'),
1385 ('', 'traceback', None, 'print traceback on exception'),
1396 ('', 'traceback', None, 'print traceback on exception'),
1386 ('y', 'noninteractive', None, 'run non-interactively'),
1397 ('y', 'noninteractive', None, 'run non-interactively'),
1387 ('', 'version', None, 'output version information and exit'),
1398 ('', 'version', None, 'output version information and exit'),
1388 ('', 'time', None, 'time how long the command takes'),
1399 ('', 'time', None, 'time how long the command takes'),
1389 ]
1400 ]
1390
1401
1391 norepo = "clone init version help debugindex debugindexdot paths"
1402 norepo = "clone init version help debugindex debugindexdot paths"
1392
1403
1393 def find(cmd):
1404 def find(cmd):
1394 for e in table.keys():
1405 for e in table.keys():
1395 if re.match("(%s)$" % e, cmd):
1406 if re.match("(%s)$" % e, cmd):
1396 return e, table[e]
1407 return e, table[e]
1397
1408
1398 raise UnknownCommand(cmd)
1409 raise UnknownCommand(cmd)
1399
1410
1400 class SignalInterrupt(Exception):
1411 class SignalInterrupt(Exception):
1401 """Exception raised on SIGTERM and SIGHUP."""
1412 """Exception raised on SIGTERM and SIGHUP."""
1402
1413
1403 def catchterm(*args):
1414 def catchterm(*args):
1404 raise SignalInterrupt
1415 raise SignalInterrupt
1405
1416
1406 def run():
1417 def run():
1407 sys.exit(dispatch(sys.argv[1:]))
1418 sys.exit(dispatch(sys.argv[1:]))
1408
1419
1409 class ParseError(Exception):
1420 class ParseError(Exception):
1410 """Exception raised on errors in parsing the command line."""
1421 """Exception raised on errors in parsing the command line."""
1411
1422
1412 def parse(args):
1423 def parse(args):
1413 options = {}
1424 options = {}
1414 cmdoptions = {}
1425 cmdoptions = {}
1415
1426
1416 try:
1427 try:
1417 args = fancyopts.fancyopts(args, globalopts, options)
1428 args = fancyopts.fancyopts(args, globalopts, options)
1418 except fancyopts.getopt.GetoptError, inst:
1429 except fancyopts.getopt.GetoptError, inst:
1419 raise ParseError(None, inst)
1430 raise ParseError(None, inst)
1420
1431
1421 if options["version"]:
1432 if options["version"]:
1422 return ("version", show_version, [], options, cmdoptions)
1433 return ("version", show_version, [], options, cmdoptions)
1423 elif not args:
1434 elif not args:
1424 return ("help", help_, ["shortlist"], options, cmdoptions)
1435 return ("help", help_, ["shortlist"], options, cmdoptions)
1425 else:
1436 else:
1426 cmd, args = args[0], args[1:]
1437 cmd, args = args[0], args[1:]
1427
1438
1428 i = find(cmd)[1]
1439 i = find(cmd)[1]
1429
1440
1430 # combine global options into local
1441 # combine global options into local
1431 c = list(i[1])
1442 c = list(i[1])
1432 for o in globalopts:
1443 for o in globalopts:
1433 c.append((o[0], o[1], options[o[1]], o[3]))
1444 c.append((o[0], o[1], options[o[1]], o[3]))
1434
1445
1435 try:
1446 try:
1436 args = fancyopts.fancyopts(args, c, cmdoptions)
1447 args = fancyopts.fancyopts(args, c, cmdoptions)
1437 except fancyopts.getopt.GetoptError, inst:
1448 except fancyopts.getopt.GetoptError, inst:
1438 raise ParseError(cmd, inst)
1449 raise ParseError(cmd, inst)
1439
1450
1440 # separate global options back out
1451 # separate global options back out
1441 for o in globalopts:
1452 for o in globalopts:
1442 n = o[1]
1453 n = o[1]
1443 options[n] = cmdoptions[n]
1454 options[n] = cmdoptions[n]
1444 del cmdoptions[n]
1455 del cmdoptions[n]
1445
1456
1446 return (cmd, i[0], args, options, cmdoptions)
1457 return (cmd, i[0], args, options, cmdoptions)
1447
1458
1448 def dispatch(args):
1459 def dispatch(args):
1449 signal.signal(signal.SIGTERM, catchterm)
1460 signal.signal(signal.SIGTERM, catchterm)
1450 try:
1461 try:
1451 signal.signal(signal.SIGHUP, catchterm)
1462 signal.signal(signal.SIGHUP, catchterm)
1452 except AttributeError:
1463 except AttributeError:
1453 pass
1464 pass
1454
1465
1455 try:
1466 try:
1456 cmd, func, args, options, cmdoptions = parse(args)
1467 cmd, func, args, options, cmdoptions = parse(args)
1457 except ParseError, inst:
1468 except ParseError, inst:
1458 u = ui.ui()
1469 u = ui.ui()
1459 if inst.args[0]:
1470 if inst.args[0]:
1460 u.warn("hg %s: %s\n" % (inst.args[0], inst.args[1]))
1471 u.warn("hg %s: %s\n" % (inst.args[0], inst.args[1]))
1461 help_(u, inst.args[0])
1472 help_(u, inst.args[0])
1462 else:
1473 else:
1463 u.warn("hg: %s\n" % inst.args[1])
1474 u.warn("hg: %s\n" % inst.args[1])
1464 help_(u, 'shortlist')
1475 help_(u, 'shortlist')
1465 sys.exit(-1)
1476 sys.exit(-1)
1466 except UnknownCommand, inst:
1477 except UnknownCommand, inst:
1467 u = ui.ui()
1478 u = ui.ui()
1468 u.warn("hg: unknown command '%s'\n" % inst.args[0])
1479 u.warn("hg: unknown command '%s'\n" % inst.args[0])
1469 help_(u, 'shortlist')
1480 help_(u, 'shortlist')
1470 sys.exit(1)
1481 sys.exit(1)
1471
1482
1472 if options["time"]:
1483 if options["time"]:
1473 def get_times():
1484 def get_times():
1474 t = os.times()
1485 t = os.times()
1475 if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()
1486 if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()
1476 t = (t[0], t[1], t[2], t[3], time.clock())
1487 t = (t[0], t[1], t[2], t[3], time.clock())
1477 return t
1488 return t
1478 s = get_times()
1489 s = get_times()
1479 def print_time():
1490 def print_time():
1480 t = get_times()
1491 t = get_times()
1481 u = ui.ui()
1492 u = ui.ui()
1482 u.warn("Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n" %
1493 u.warn("Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n" %
1483 (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))
1494 (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))
1484 atexit.register(print_time)
1495 atexit.register(print_time)
1485
1496
1486 u = ui.ui(options["verbose"], options["debug"], options["quiet"],
1497 u = ui.ui(options["verbose"], options["debug"], options["quiet"],
1487 not options["noninteractive"])
1498 not options["noninteractive"])
1488
1499
1489 try:
1500 try:
1490 try:
1501 try:
1491 if cmd not in norepo.split():
1502 if cmd not in norepo.split():
1492 path = options["repository"] or ""
1503 path = options["repository"] or ""
1493 repo = hg.repository(ui=u, path=path)
1504 repo = hg.repository(ui=u, path=path)
1494 d = lambda: func(u, repo, *args, **cmdoptions)
1505 d = lambda: func(u, repo, *args, **cmdoptions)
1495 else:
1506 else:
1496 d = lambda: func(u, *args, **cmdoptions)
1507 d = lambda: func(u, *args, **cmdoptions)
1497
1508
1498 if options['profile']:
1509 if options['profile']:
1499 import hotshot, hotshot.stats
1510 import hotshot, hotshot.stats
1500 prof = hotshot.Profile("hg.prof")
1511 prof = hotshot.Profile("hg.prof")
1501 r = prof.runcall(d)
1512 r = prof.runcall(d)
1502 prof.close()
1513 prof.close()
1503 stats = hotshot.stats.load("hg.prof")
1514 stats = hotshot.stats.load("hg.prof")
1504 stats.strip_dirs()
1515 stats.strip_dirs()
1505 stats.sort_stats('time', 'calls')
1516 stats.sort_stats('time', 'calls')
1506 stats.print_stats(40)
1517 stats.print_stats(40)
1507 return r
1518 return r
1508 else:
1519 else:
1509 return d()
1520 return d()
1510 except:
1521 except:
1511 if options['traceback']:
1522 if options['traceback']:
1512 traceback.print_exc()
1523 traceback.print_exc()
1513 raise
1524 raise
1514 except hg.RepoError, inst:
1525 except hg.RepoError, inst:
1515 u.warn("abort: ", inst, "!\n")
1526 u.warn("abort: ", inst, "!\n")
1516 except SignalInterrupt:
1527 except SignalInterrupt:
1517 u.warn("killed!\n")
1528 u.warn("killed!\n")
1518 except KeyboardInterrupt:
1529 except KeyboardInterrupt:
1519 try:
1530 try:
1520 u.warn("interrupted!\n")
1531 u.warn("interrupted!\n")
1521 except IOError, inst:
1532 except IOError, inst:
1522 if inst.errno == errno.EPIPE:
1533 if inst.errno == errno.EPIPE:
1523 if u.debugflag:
1534 if u.debugflag:
1524 u.warn("\nbroken pipe\n")
1535 u.warn("\nbroken pipe\n")
1525 else:
1536 else:
1526 raise
1537 raise
1527 except IOError, inst:
1538 except IOError, inst:
1528 if hasattr(inst, "code"):
1539 if hasattr(inst, "code"):
1529 u.warn("abort: %s\n" % inst)
1540 u.warn("abort: %s\n" % inst)
1530 elif hasattr(inst, "reason"):
1541 elif hasattr(inst, "reason"):
1531 u.warn("abort: error: %s\n" % inst.reason[1])
1542 u.warn("abort: error: %s\n" % inst.reason[1])
1532 elif hasattr(inst, "args") and inst[0] == errno.EPIPE:
1543 elif hasattr(inst, "args") and inst[0] == errno.EPIPE:
1533 if u.debugflag: u.warn("broken pipe\n")
1544 if u.debugflag: u.warn("broken pipe\n")
1534 else:
1545 else:
1535 raise
1546 raise
1536 except OSError, inst:
1547 except OSError, inst:
1537 if hasattr(inst, "filename"):
1548 if hasattr(inst, "filename"):
1538 u.warn("abort: %s: %s\n" % (inst.strerror, inst.filename))
1549 u.warn("abort: %s: %s\n" % (inst.strerror, inst.filename))
1539 else:
1550 else:
1540 u.warn("abort: %s\n" % inst.strerror)
1551 u.warn("abort: %s\n" % inst.strerror)
1541 except util.Abort, inst:
1552 except util.Abort, inst:
1542 u.warn('abort: ', inst.args[0] % inst.args[1:], '\n')
1553 u.warn('abort: ', inst.args[0] % inst.args[1:], '\n')
1543 sys.exit(1)
1554 sys.exit(1)
1544 except TypeError, inst:
1555 except TypeError, inst:
1545 # was this an argument error?
1556 # was this an argument error?
1546 tb = traceback.extract_tb(sys.exc_info()[2])
1557 tb = traceback.extract_tb(sys.exc_info()[2])
1547 if len(tb) > 2: # no
1558 if len(tb) > 2: # no
1548 raise
1559 raise
1549 u.debug(inst, "\n")
1560 u.debug(inst, "\n")
1550 u.warn("%s: invalid arguments\n" % cmd)
1561 u.warn("%s: invalid arguments\n" % cmd)
1551 help_(u, cmd)
1562 help_(u, cmd)
1552 except UnknownCommand, inst:
1563 except UnknownCommand, inst:
1553 u.warn("hg: unknown command '%s'\n" % inst.args[0])
1564 u.warn("hg: unknown command '%s'\n" % inst.args[0])
1554 help_(u, 'shortlist')
1565 help_(u, 'shortlist')
1555
1566
1556 sys.exit(-1)
1567 sys.exit(-1)
General Comments 0
You need to be logged in to leave comments. Login now