Show More
@@ -914,8 +914,9 b' def clone(ui, source, dest=None, **opts)' | |||
|
914 | 914 | See pull for valid source format details. |
|
915 | 915 | |
|
916 | 916 | It is possible to specify an ssh:// URL as the destination, but no |
|
917 |
.hg/hgrc will be created on the remote side. |
|
|
918 |
for the pull command for important details |
|
|
917 | .hg/hgrc and working directory will be created on the remote side. | |
|
918 | Look at the help text for the pull command for important details | |
|
919 | about ssh:// URLs. | |
|
919 | 920 | """ |
|
920 | 921 | setremoteconfig(ui, opts) |
|
921 | 922 | hg.clone(ui, ui.expandpath(source), dest, |
@@ -388,7 +388,7 b' def update(repo, node, branchmerge, forc' | |||
|
388 | 388 | raise util.Abort(_("update spans branches, use 'hg merge' " |
|
389 | 389 | "or 'hg update -C' to lose changes")) |
|
390 | 390 | if branchmerge and not forcemerge: |
|
391 | if wc.modified() or wc.added() or wc.removed(): | |
|
391 | if wc.files(): | |
|
392 | 392 | raise util.Abort(_("outstanding uncommitted changes")) |
|
393 | 393 | |
|
394 | 394 | ### calculate phase |
@@ -467,7 +467,7 b' class revlog(object):' | |||
|
467 | 467 | def tip(self): return self.node(len(self.index) - 1) |
|
468 | 468 | def count(self): return len(self.index) |
|
469 | 469 | def node(self, rev): |
|
470 |
return |
|
|
470 | return rev == nullrev and nullid or self.index[rev][-1] | |
|
471 | 471 | def rev(self, node): |
|
472 | 472 | try: |
|
473 | 473 | return self.nodemap[node] |
@@ -490,8 +490,8 b' class revlog(object):' | |||
|
490 | 490 | return (self.rev(d[0]), self.rev(d[1])) |
|
491 | 491 | return d |
|
492 | 492 | def start(self, rev): |
|
493 |
if rev |
|
|
494 |
return |
|
|
493 | if rev == nullrev: | |
|
494 | return 0 | |
|
495 | 495 | if self.version != REVLOGV0: |
|
496 | 496 | return self.ngoffset(self.index[rev][0]) |
|
497 | 497 | return self.index[rev][0] |
@@ -500,6 +500,8 b' class revlog(object):' | |||
|
500 | 500 | |
|
501 | 501 | def size(self, rev): |
|
502 | 502 | """return the length of the uncompressed text for a given revision""" |
|
503 | if rev == nullrev: | |
|
504 | return 0 | |
|
503 | 505 | l = -1 |
|
504 | 506 | if self.version != REVLOGV0: |
|
505 | 507 | l = self.index[rev][2] |
@@ -530,11 +532,15 b' class revlog(object):' | |||
|
530 | 532 | """ |
|
531 | 533 | |
|
532 | 534 | def length(self, rev): |
|
533 |
if rev |
|
|
535 | if rev == nullrev: | |
|
534 | 536 | return 0 |
|
535 | 537 | else: |
|
536 | 538 | return self.index[rev][1] |
|
537 | def base(self, rev): return (rev < 0) and rev or self.index[rev][-5] | |
|
539 | def base(self, rev): | |
|
540 | if (rev == nullrev): | |
|
541 | return nullrev | |
|
542 | else: | |
|
543 | return self.index[rev][-5] | |
|
538 | 544 | |
|
539 | 545 | def reachable(self, rev, stop=None): |
|
540 | 546 | reachable = {} |
General Comments 0
You need to be logged in to leave comments.
Login now