Mercurial > public > mercurial-scm > hg
comparison mercurial/changegroup.py @ 39241:aad4b46e89bb
manifest: remove addgroup() from manifestlog and imanifestlog
addgroup() is part of the storage interface for manifests.
Unfortunately, we don't yet have a formal storage interface
for manifests. (One will be established in subsequent commits.)
One thing is for sure, addgroup() doesn't belong on imanifestlog -
at least not unless we extend that interface to encompass storage.
For now, let's access addgroup() on the _revlog attribute, just like
we do for tree manifests. Even though this violates visibility,
it is consistent.
Differential Revision: https://phab.mercurial-scm.org/D4274
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Fri, 10 Aug 2018 14:20:47 -0700 |
| parents | 0617a700ef7b |
| children | 0d97530eb535 |
comparison
equal
deleted
inserted
replaced
| 39240:2af6b2d8d1d8 | 39241:aad4b46e89bb |
|---|---|
| 251 # if the result of the merge of 1 and 2 is the same in 3 and 4, | 251 # if the result of the merge of 1 and 2 is the same in 3 and 4, |
| 252 # no new manifest will be created and the manifest group will | 252 # no new manifest will be created and the manifest group will |
| 253 # be empty during the pull | 253 # be empty during the pull |
| 254 self.manifestheader() | 254 self.manifestheader() |
| 255 deltas = self.deltaiter() | 255 deltas = self.deltaiter() |
| 256 repo.manifestlog.addgroup(deltas, revmap, trp) | 256 # TODO this violates storage abstraction. |
| 257 repo.manifestlog._revlog.addgroup(deltas, revmap, trp) | |
| 257 prog.complete() | 258 prog.complete() |
| 258 self.callback = None | 259 self.callback = None |
| 259 | 260 |
| 260 def apply(self, repo, tr, srctype, url, targetphase=phases.draft, | 261 def apply(self, repo, tr, srctype, url, targetphase=phases.draft, |
| 261 expectedtotal=None): | 262 expectedtotal=None): |