Show More
@@ -1510,7 +1510,8 b' class localrepository(object):' | |||||
1510 | self.ui.status(_("adding changesets\n")) |
|
1510 | self.ui.status(_("adding changesets\n")) | |
1511 | cor = cl.count() - 1 |
|
1511 | cor = cl.count() - 1 | |
1512 | chunkiter = changegroup.chunkiter(source) |
|
1512 | chunkiter = changegroup.chunkiter(source) | |
1513 |
cl.addgroup(chunkiter, csmap, tr, 1) |
|
1513 | if cl.addgroup(chunkiter, csmap, tr, 1) is None: | |
|
1514 | raise util.Abort(_("received changelog group is empty")) | |||
1514 | cnr = cl.count() - 1 |
|
1515 | cnr = cl.count() - 1 | |
1515 | changesets = cnr - cor |
|
1516 | changesets = cnr - cor | |
1516 |
|
1517 | |||
@@ -1522,6 +1523,10 b' class localrepository(object):' | |||||
1522 | # pull off the manifest group |
|
1523 | # pull off the manifest group | |
1523 | self.ui.status(_("adding manifests\n")) |
|
1524 | self.ui.status(_("adding manifests\n")) | |
1524 | chunkiter = changegroup.chunkiter(source) |
|
1525 | chunkiter = changegroup.chunkiter(source) | |
|
1526 | # no need to check for empty manifest group here: | |||
|
1527 | # if the result of the merge of 1 and 2 is the same in 3 and 4, | |||
|
1528 | # no new manifest will be created and the manifest group will | |||
|
1529 | # be empty during the pull | |||
1525 | mf.addgroup(chunkiter, revmap, tr) |
|
1530 | mf.addgroup(chunkiter, revmap, tr) | |
1526 |
|
1531 | |||
1527 | # process the files |
|
1532 | # process the files | |
@@ -1534,7 +1539,8 b' class localrepository(object):' | |||||
1534 | fl = self.file(f) |
|
1539 | fl = self.file(f) | |
1535 | o = fl.count() |
|
1540 | o = fl.count() | |
1536 | chunkiter = changegroup.chunkiter(source) |
|
1541 | chunkiter = changegroup.chunkiter(source) | |
1537 | fl.addgroup(chunkiter, revmap, tr) |
|
1542 | if fl.addgroup(chunkiter, revmap, tr) is None: | |
|
1543 | raise util.Abort(_("received file revlog group is empty")) | |||
1538 | revisions += fl.count() - o |
|
1544 | revisions += fl.count() - o | |
1539 | files += 1 |
|
1545 | files += 1 | |
1540 |
|
1546 |
@@ -1196,8 +1196,6 b' class revlog(object):' | |||||
1196 | start = self.start(base) |
|
1196 | start = self.start(base) | |
1197 | end = self.end(t) |
|
1197 | end = self.end(t) | |
1198 |
|
1198 | |||
1199 | if node is None: |
|
|||
1200 | raise RevlogError(_("group to be added is empty")) |
|
|||
1201 | return node |
|
1199 | return node | |
1202 |
|
1200 | |||
1203 | def strip(self, rev, minlink): |
|
1201 | def strip(self, rev, minlink): |
General Comments 0
You need to be logged in to leave comments.
Login now