Mercurial > hg-stable
comparison mercurial/localrepo.py @ 14154:497493b777ad
merge with mpm
| author | Sune Foldager <cryo@cyanite.org> |
|---|---|
| date | Sun, 01 May 2011 19:44:28 +0200 |
| parents | 3a3584967a93 3c3c53d8343a |
| children | 921683f14ad7 |
comparison
equal
deleted
inserted
replaced
| 14153:f8047a059ca0 | 14154:497493b777ad |
|---|---|
| 1709 total=self.total) | 1709 total=self.total) |
| 1710 self.count += 1 | 1710 self.count += 1 |
| 1711 pr = prog() | 1711 pr = prog() |
| 1712 source.callback = pr | 1712 source.callback = pr |
| 1713 | 1713 |
| 1714 source.changelogheader() | |
| 1714 if (cl.addgroup(source, csmap, trp) is None | 1715 if (cl.addgroup(source, csmap, trp) is None |
| 1715 and not emptyok): | 1716 and not emptyok): |
| 1716 raise util.Abort(_("received changelog group is empty")) | 1717 raise util.Abort(_("received changelog group is empty")) |
| 1717 clend = len(cl) | 1718 clend = len(cl) |
| 1718 changesets = clend - clstart | 1719 changesets = clend - clstart |
| 1728 pr.total = changesets # manifests <= changesets | 1729 pr.total = changesets # manifests <= changesets |
| 1729 # no need to check for empty manifest group here: | 1730 # no need to check for empty manifest group here: |
| 1730 # if the result of the merge of 1 and 2 is the same in 3 and 4, | 1731 # if the result of the merge of 1 and 2 is the same in 3 and 4, |
| 1731 # no new manifest will be created and the manifest group will | 1732 # no new manifest will be created and the manifest group will |
| 1732 # be empty during the pull | 1733 # be empty during the pull |
| 1734 source.manifestheader() | |
| 1733 self.manifest.addgroup(source, revmap, trp) | 1735 self.manifest.addgroup(source, revmap, trp) |
| 1734 self.ui.progress(_('manifests'), None) | 1736 self.ui.progress(_('manifests'), None) |
| 1735 | 1737 |
| 1736 needfiles = {} | 1738 needfiles = {} |
| 1737 if self.ui.configbool('server', 'validate', default=False): | 1739 if self.ui.configbool('server', 'validate', default=False): |
| 1749 pr.count = 1 | 1751 pr.count = 1 |
| 1750 pr.total = efiles | 1752 pr.total = efiles |
| 1751 source.callback = None | 1753 source.callback = None |
| 1752 | 1754 |
| 1753 while 1: | 1755 while 1: |
| 1754 f = source.chunk() | 1756 chunkdata = source.filelogheader() |
| 1755 if not f: | 1757 if not chunkdata: |
| 1756 break | 1758 break |
| 1759 f = chunkdata["filename"] | |
| 1757 self.ui.debug("adding %s revisions\n" % f) | 1760 self.ui.debug("adding %s revisions\n" % f) |
| 1758 pr() | 1761 pr() |
| 1759 fl = self.file(f) | 1762 fl = self.file(f) |
| 1760 o = len(fl) | 1763 o = len(fl) |
| 1761 if fl.addgroup(source, revmap, trp) is None: | 1764 if fl.addgroup(source, revmap, trp) is None: |