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