Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 2347:5b178298b7f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use a more reliable way to find what are the new changesets on pull/unbundle The number of csets and the hooks where wrong (negative number of csets) when we unbundled a bundle which contains csets we already had. Remove unused variables.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 24 May 2006 10:59:30 +0200
parents 925610b2d90a
children 16276b1c0658
comparison
equal deleted inserted replaced
2346:925610b2d90a 2347:5b178298b7f4
1506 1506
1507 oldheads = len(cl.heads()) 1507 oldheads = len(cl.heads())
1508 1508
1509 # pull off the changeset group 1509 # pull off the changeset group
1510 self.ui.status(_("adding changesets\n")) 1510 self.ui.status(_("adding changesets\n"))
1511 co = cl.tip() 1511 cor = cl.count() - 1
1512 chunkiter = changegroup.chunkiter(source) 1512 chunkiter = changegroup.chunkiter(source)
1513 cn = cl.addgroup(chunkiter, csmap, tr, 1) # unique 1513 cl.addgroup(chunkiter, csmap, tr, 1) # unique
1514 cnr, cor = map(cl.rev, (cn, co)) 1514 cnr = cl.count() - 1
1515 if cn == nullid:
1516 cnr = cor
1517 changesets = cnr - cor 1515 changesets = cnr - cor
1518 1516
1519 mf = None 1517 mf = None
1520 try: 1518 try:
1521 mf = appendfile.appendmanifest(self.opener, 1519 mf = appendfile.appendmanifest(self.opener,
1522 self.manifest.version) 1520 self.manifest.version)
1523 1521
1524 # pull off the manifest group 1522 # pull off the manifest group
1525 self.ui.status(_("adding manifests\n")) 1523 self.ui.status(_("adding manifests\n"))
1526 mm = mf.tip()
1527 chunkiter = changegroup.chunkiter(source) 1524 chunkiter = changegroup.chunkiter(source)
1528 mo = mf.addgroup(chunkiter, revmap, tr) 1525 mf.addgroup(chunkiter, revmap, tr)
1529 1526
1530 # process the files 1527 # process the files
1531 self.ui.status(_("adding file changes\n")) 1528 self.ui.status(_("adding file changes\n"))
1532 while 1: 1529 while 1:
1533 f = changegroup.getchunk(source) 1530 f = changegroup.getchunk(source)
1535 break 1532 break
1536 self.ui.debug(_("adding %s revisions\n") % f) 1533 self.ui.debug(_("adding %s revisions\n") % f)
1537 fl = self.file(f) 1534 fl = self.file(f)
1538 o = fl.count() 1535 o = fl.count()
1539 chunkiter = changegroup.chunkiter(source) 1536 chunkiter = changegroup.chunkiter(source)
1540 n = fl.addgroup(chunkiter, revmap, tr) 1537 fl.addgroup(chunkiter, revmap, tr)
1541 revisions += fl.count() - o 1538 revisions += fl.count() - o
1542 files += 1 1539 files += 1
1543 1540
1544 # write order here is important so concurrent readers will see 1541 # write order here is important so concurrent readers will see
1545 # consistent view of repo 1542 # consistent view of repo