| marmoute |
| hg-reviewers |
Historically, the revision to branch mapping cache was updated on demand
and shared via bundle2 to avoid the cost of rebuilding on first use.
Use the new register_changeset callback and update rbc directly on
every change. Make the transfer of the bundle part redundant, but keep
it for the moment to avoid the test churn.
Over all, "hg unbundle" for large bundles is less than 1.8% slower for
different larger repositories and that seems to a reasonable trade off.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/branchmap.py (6 lines) | |||
| M | mercurial/bundle2.py (33 lines) | |||
| M | mercurial/localrepo.py (2 lines) | |||
| M | relnotes/next (3 lines) | |||
| M | tests/test-acl.t (7 lines) | |||
| M | tests/test-inherit-mode.t (2 lines) | |||
| M | tests/test-rebase-conflicts.t (2 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | joerg.sonnenberger | ||
| Closed | joerg.sonnenberger | ||
| Closed | joerg.sonnenberger | ||
| Closed | joerg.sonnenberger |
| self._names.append(b) | self._names.append(b) | ||||
| self._namesreverse[b] = branchidx | self._namesreverse[b] = branchidx | ||||
| reponode = changelog.node(rev) | reponode = changelog.node(rev) | ||||
| if close: | if close: | ||||
| branchidx |= _rbccloseflag | branchidx |= _rbccloseflag | ||||
| self._setcachedata(rev, reponode, branchidx) | self._setcachedata(rev, reponode, branchidx) | ||||
| return b, close | return b, close | ||||
| def setdata(self, branch, rev, node, close): | def setdata(self, rev, changelogrevision): | ||||
| """add new data information to the cache""" | """add new data information to the cache""" | ||||
| branch, close = changelogrevision.branchinfo | |||||
| if branch in self._namesreverse: | if branch in self._namesreverse: | ||||
| branchidx = self._namesreverse[branch] | branchidx = self._namesreverse[branch] | ||||
| else: | else: | ||||
| branchidx = len(self._names) | branchidx = len(self._names) | ||||
| self._names.append(branch) | self._names.append(branch) | ||||
| self._namesreverse[branch] = branchidx | self._namesreverse[branch] = branchidx | ||||
| if close: | if close: | ||||
| branchidx |= _rbccloseflag | branchidx |= _rbccloseflag | ||||
| self._setcachedata(rev, node, branchidx) | self._setcachedata(rev, self._repo.changelog.node(rev), branchidx) | ||||
| # If no cache data were readable (non exists, bad permission, etc) | # If no cache data were readable (non exists, bad permission, etc) | ||||
| # the cache was bypassing itself by setting: | # the cache was bypassing itself by setting: | ||||
| # | # | ||||
| # self.branchinfo = self._branchinfo | # self.branchinfo = self._branchinfo | ||||
| # | # | ||||
| # Since we now have data in the cache, we need to drop this bypassing. | # Since we now have data in the cache, we need to drop this bypassing. | ||||
| if 'branchinfo' in vars(self): | if 'branchinfo' in vars(self): | ||||
| del self.branchinfo | del self.branchinfo | ||||
| op.ui.debug(b'applied %i hgtags fnodes cache entries\n' % count) | op.ui.debug(b'applied %i hgtags fnodes cache entries\n' % count) | ||||
| rbcstruct = struct.Struct(b'>III') | rbcstruct = struct.Struct(b'>III') | ||||
| @parthandler(b'cache:rev-branch-cache') | @parthandler(b'cache:rev-branch-cache') | ||||
| def handlerbc(op, inpart): | def handlerbc(op, inpart): | ||||
| """receive a rev-branch-cache payload and update the local cache | """Legacy part, ignored for compatibility with bundles from or | ||||
| for Mercurial before 5.7. Newer Mercurial computes the cache | |||||
| The payload is a series of data related to each branch | efficiently enough during unbundling that the additional transfer | ||||
| is unnecessary.""" | |||||
| 1) branch name length | |||||
| 2) number of open heads | |||||
| 3) number of closed heads | |||||
| 4) open heads nodes | |||||
| 5) closed heads nodes | |||||
| """ | |||||
| total = 0 | |||||
| rawheader = inpart.read(rbcstruct.size) | |||||
| cache = op.repo.revbranchcache() | |||||
| cl = op.repo.unfiltered().changelog | |||||
| while rawheader: | |||||
| header = rbcstruct.unpack(rawheader) | |||||
| total += header[1] + header[2] | |||||
| utf8branch = inpart.read(header[0]) | |||||
| branch = encoding.tolocal(utf8branch) | |||||
| for x in pycompat.xrange(header[1]): | |||||
| node = inpart.read(20) | |||||
| rev = cl.rev(node) | |||||
| cache.setdata(branch, rev, node, False) | |||||
| for x in pycompat.xrange(header[2]): | |||||
| node = inpart.read(20) | |||||
| rev = cl.rev(node) | |||||
| cache.setdata(branch, rev, node, True) | |||||
| rawheader = inpart.read(rbcstruct.size) | |||||
| cache.write() | |||||
| @parthandler(b'pushvars') | @parthandler(b'pushvars') | ||||
| def bundle2getvars(op, part): | def bundle2getvars(op, part): | ||||
| '''unbundle a bundle2 containing shellvars on the server''' | '''unbundle a bundle2 containing shellvars on the server''' | ||||
| # An option to disable unbundling on server-side for security reasons | # An option to disable unbundling on server-side for security reasons | ||||
| if op.ui.configbool(b'push', b'pushvars.server'): | if op.ui.configbool(b'push', b'pushvars.server'): | ||||
| hookargs = {} | hookargs = {} | ||||
| @unfilteredmethod | @unfilteredmethod | ||||
| def revbranchcache(self): | def revbranchcache(self): | ||||
| if not self._revbranchcache: | if not self._revbranchcache: | ||||
| self._revbranchcache = branchmap.revbranchcache(self.unfiltered()) | self._revbranchcache = branchmap.revbranchcache(self.unfiltered()) | ||||
| return self._revbranchcache | return self._revbranchcache | ||||
| def register_changeset(self, rev, changelogrevision): | def register_changeset(self, rev, changelogrevision): | ||||
| pass | self.revbranchcache().setdata(rev, changelogrevision) | ||||
| def branchtip(self, branch, ignoremissing=False): | def branchtip(self, branch, ignoremissing=False): | ||||
| """return the tip node for a given branch | """return the tip node for a given branch | ||||
| If ignoremissing is True, then this method will not raise an error. | If ignoremissing is True, then this method will not raise an error. | ||||
| This is helpful for callers that only expect None for a missing branch | This is helpful for callers that only expect None for a missing branch | ||||
| (e.g. namespace). | (e.g. namespace). | ||||
| is also supported by "premerge" as | is also supported by "premerge" as | ||||
| `merge-tools.<tool>.premerge=keep-mergediff`. | `merge-tools.<tool>.premerge=keep-mergediff`. | ||||
| * External hooks are now called with `HGPLAIN=1` preset. | * External hooks are now called with `HGPLAIN=1` preset. | ||||
| * The `branchmap` cache is updated more intelligently and can be | * The `branchmap` cache is updated more intelligently and can be | ||||
| significantly faster for repositories with many branches and changesets. | significantly faster for repositories with many branches and changesets. | ||||
| * The `rev-branch-cache` is now updated incrementally whenever changesets | |||||
| are added. | |||||
| == New Experimental Features == | == New Experimental Features == | ||||
| * `experimental.single-head-per-branch:public-changes-only` can be used | * `experimental.single-head-per-branch:public-changes-only` can be used | ||||
| restrict the single head check to public revision. This is useful for | restrict the single head check to public revision. This is useful for | ||||
| overlay repository that have both a publishing and non-publishing view | overlay repository that have both a publishing and non-publishing view | ||||
| of the same storage. | of the same storage. | ||||
| adding foo/file.txt revisions | adding foo/file.txt revisions | ||||
| adding quux/file.py revisions | adding quux/file.py revisions | ||||
| calling hook pretxnchangegroup.acl: hgext.acl.hook | calling hook pretxnchangegroup.acl: hgext.acl.hook | ||||
| acl: changes have source "push" - skipping | acl: changes have source "push" - skipping | ||||
| bundle2-input-part: total payload size 1553 | bundle2-input-part: total payload size 1553 | ||||
| bundle2-input-part: "phase-heads" supported | bundle2-input-part: "phase-heads" supported | ||||
| bundle2-input-part: total payload size 24 | bundle2-input-part: total payload size 24 | ||||
| bundle2-input-bundle: 5 parts total | bundle2-input-bundle: 5 parts total | ||||
| truncating cache/rbc-revs-v1 to 8 | |||||
| updating the branch cache | updating the branch cache | ||||
| added 3 changesets with 3 changes to 3 files | added 3 changesets with 3 changes to 3 files | ||||
| bundle2-output-bundle: "HG20", 1 parts total | bundle2-output-bundle: "HG20", 1 parts total | ||||
| bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | ||||
| bundle2-input-bundle: no-transaction | bundle2-input-bundle: no-transaction | ||||
| bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | ||||
| bundle2-input-bundle: 1 parts total | bundle2-input-bundle: 1 parts total | ||||
| listing keys for "phases" | listing keys for "phases" | ||||
| acl: branch access granted: "f9cafe1212c8" on branch "default" | acl: branch access granted: "f9cafe1212c8" on branch "default" | ||||
| acl: path access granted: "f9cafe1212c8" | acl: path access granted: "f9cafe1212c8" | ||||
| acl: branch access granted: "911600dab2ae" on branch "default" | acl: branch access granted: "911600dab2ae" on branch "default" | ||||
| acl: path access granted: "911600dab2ae" | acl: path access granted: "911600dab2ae" | ||||
| bundle2-input-part: total payload size 1553 | bundle2-input-part: total payload size 1553 | ||||
| bundle2-input-part: "phase-heads" supported | bundle2-input-part: "phase-heads" supported | ||||
| bundle2-input-part: total payload size 24 | bundle2-input-part: total payload size 24 | ||||
| bundle2-input-bundle: 5 parts total | bundle2-input-bundle: 5 parts total | ||||
| truncating cache/rbc-revs-v1 to 8 | |||||
| updating the branch cache | updating the branch cache | ||||
| added 3 changesets with 3 changes to 3 files | added 3 changesets with 3 changes to 3 files | ||||
| bundle2-output-bundle: "HG20", 1 parts total | bundle2-output-bundle: "HG20", 1 parts total | ||||
| bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | ||||
| bundle2-input-bundle: no-transaction | bundle2-input-bundle: no-transaction | ||||
| bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | ||||
| bundle2-input-bundle: 1 parts total | bundle2-input-bundle: 1 parts total | ||||
| listing keys for "phases" | listing keys for "phases" | ||||
| bundle2-input-part: "bookmarks" supported | bundle2-input-part: "bookmarks" supported | ||||
| bundle2-input-part: total payload size 37 | bundle2-input-part: total payload size 37 | ||||
| calling hook prepushkey.acl: hgext.acl.hook | calling hook prepushkey.acl: hgext.acl.hook | ||||
| acl: checking access for user "fred" | acl: checking access for user "fred" | ||||
| acl: acl.allow.bookmarks not enabled | acl: acl.allow.bookmarks not enabled | ||||
| acl: acl.deny.bookmarks not enabled | acl: acl.deny.bookmarks not enabled | ||||
| acl: bookmark access granted: "ef1ea85a6374b77d6da9dcda9541f498f2d17df7" on bookmark "moving-bookmark" | acl: bookmark access granted: "ef1ea85a6374b77d6da9dcda9541f498f2d17df7" on bookmark "moving-bookmark" | ||||
| bundle2-input-bundle: 7 parts total | bundle2-input-bundle: 7 parts total | ||||
| truncating cache/rbc-revs-v1 to 8 | |||||
| updating the branch cache | updating the branch cache | ||||
| invalid branch cache (served.hidden): tip differs | invalid branch cache (served.hidden): tip differs | ||||
| added 1 changesets with 1 changes to 1 files | added 1 changesets with 1 changes to 1 files | ||||
| bundle2-output-bundle: "HG20", 1 parts total | bundle2-output-bundle: "HG20", 1 parts total | ||||
| bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | ||||
| bundle2-input-bundle: no-transaction | bundle2-input-bundle: no-transaction | ||||
| bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | ||||
| bundle2-input-bundle: 1 parts total | bundle2-input-bundle: 1 parts total | ||||
| acl: branch access granted: "f9cafe1212c8" on branch "default" | acl: branch access granted: "f9cafe1212c8" on branch "default" | ||||
| acl: path access granted: "f9cafe1212c8" | acl: path access granted: "f9cafe1212c8" | ||||
| acl: branch access granted: "911600dab2ae" on branch "default" | acl: branch access granted: "911600dab2ae" on branch "default" | ||||
| acl: path access granted: "911600dab2ae" | acl: path access granted: "911600dab2ae" | ||||
| bundle2-input-part: total payload size 1553 | bundle2-input-part: total payload size 1553 | ||||
| bundle2-input-part: "phase-heads" supported | bundle2-input-part: "phase-heads" supported | ||||
| bundle2-input-part: total payload size 24 | bundle2-input-part: total payload size 24 | ||||
| bundle2-input-bundle: 5 parts total | bundle2-input-bundle: 5 parts total | ||||
| truncating cache/rbc-revs-v1 to 8 | |||||
| updating the branch cache | updating the branch cache | ||||
| added 3 changesets with 3 changes to 3 files | added 3 changesets with 3 changes to 3 files | ||||
| bundle2-output-bundle: "HG20", 1 parts total | bundle2-output-bundle: "HG20", 1 parts total | ||||
| bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | ||||
| bundle2-input-bundle: no-transaction | bundle2-input-bundle: no-transaction | ||||
| bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | ||||
| bundle2-input-bundle: 1 parts total | bundle2-input-bundle: 1 parts total | ||||
| listing keys for "phases" | listing keys for "phases" | ||||
| acl: branch access granted: "f9cafe1212c8" on branch "default" | acl: branch access granted: "f9cafe1212c8" on branch "default" | ||||
| acl: path access granted: "f9cafe1212c8" | acl: path access granted: "f9cafe1212c8" | ||||
| acl: branch access granted: "911600dab2ae" on branch "default" | acl: branch access granted: "911600dab2ae" on branch "default" | ||||
| acl: path access granted: "911600dab2ae" | acl: path access granted: "911600dab2ae" | ||||
| bundle2-input-part: total payload size 1553 | bundle2-input-part: total payload size 1553 | ||||
| bundle2-input-part: "phase-heads" supported | bundle2-input-part: "phase-heads" supported | ||||
| bundle2-input-part: total payload size 24 | bundle2-input-part: total payload size 24 | ||||
| bundle2-input-bundle: 5 parts total | bundle2-input-bundle: 5 parts total | ||||
| truncating cache/rbc-revs-v1 to 8 | |||||
| updating the branch cache | updating the branch cache | ||||
| added 3 changesets with 3 changes to 3 files | added 3 changesets with 3 changes to 3 files | ||||
| bundle2-output-bundle: "HG20", 1 parts total | bundle2-output-bundle: "HG20", 1 parts total | ||||
| bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | ||||
| bundle2-input-bundle: no-transaction | bundle2-input-bundle: no-transaction | ||||
| bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | ||||
| bundle2-input-bundle: 1 parts total | bundle2-input-bundle: 1 parts total | ||||
| listing keys for "phases" | listing keys for "phases" | ||||
| acl: branch access granted: "f9cafe1212c8" on branch "default" | acl: branch access granted: "f9cafe1212c8" on branch "default" | ||||
| acl: path access granted: "f9cafe1212c8" | acl: path access granted: "f9cafe1212c8" | ||||
| acl: branch access granted: "911600dab2ae" on branch "default" | acl: branch access granted: "911600dab2ae" on branch "default" | ||||
| acl: path access granted: "911600dab2ae" | acl: path access granted: "911600dab2ae" | ||||
| bundle2-input-part: total payload size 1553 | bundle2-input-part: total payload size 1553 | ||||
| bundle2-input-part: "phase-heads" supported | bundle2-input-part: "phase-heads" supported | ||||
| bundle2-input-part: total payload size 24 | bundle2-input-part: total payload size 24 | ||||
| bundle2-input-bundle: 5 parts total | bundle2-input-bundle: 5 parts total | ||||
| truncating cache/rbc-revs-v1 to 8 | |||||
| updating the branch cache | updating the branch cache | ||||
| added 3 changesets with 3 changes to 3 files | added 3 changesets with 3 changes to 3 files | ||||
| bundle2-output-bundle: "HG20", 1 parts total | bundle2-output-bundle: "HG20", 1 parts total | ||||
| bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | ||||
| bundle2-input-bundle: no-transaction | bundle2-input-bundle: no-transaction | ||||
| bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | ||||
| bundle2-input-bundle: 1 parts total | bundle2-input-bundle: 1 parts total | ||||
| listing keys for "phases" | listing keys for "phases" | ||||
| acl: branch access granted: "f9cafe1212c8" on branch "default" | acl: branch access granted: "f9cafe1212c8" on branch "default" | ||||
| acl: path access granted: "f9cafe1212c8" | acl: path access granted: "f9cafe1212c8" | ||||
| acl: branch access granted: "911600dab2ae" on branch "default" | acl: branch access granted: "911600dab2ae" on branch "default" | ||||
| acl: path access granted: "911600dab2ae" | acl: path access granted: "911600dab2ae" | ||||
| bundle2-input-part: total payload size 1553 | bundle2-input-part: total payload size 1553 | ||||
| bundle2-input-part: "phase-heads" supported | bundle2-input-part: "phase-heads" supported | ||||
| bundle2-input-part: total payload size 24 | bundle2-input-part: total payload size 24 | ||||
| bundle2-input-bundle: 5 parts total | bundle2-input-bundle: 5 parts total | ||||
| truncating cache/rbc-revs-v1 to 8 | |||||
| updating the branch cache | updating the branch cache | ||||
| added 3 changesets with 3 changes to 3 files | added 3 changesets with 3 changes to 3 files | ||||
| bundle2-output-bundle: "HG20", 1 parts total | bundle2-output-bundle: "HG20", 1 parts total | ||||
| bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload | ||||
| bundle2-input-bundle: no-transaction | bundle2-input-bundle: no-transaction | ||||
| bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported | ||||
| bundle2-input-bundle: 1 parts total | bundle2-input-bundle: 1 parts total | ||||
| listing keys for "phases" | listing keys for "phases" | ||||
| after push | after push | ||||
| group can still write everything | group can still write everything | ||||
| $ "$PYTHON" ../printmodes.py ../push | $ "$PYTHON" ../printmodes.py ../push | ||||
| 00770 ../push/.hg/ | 00770 ../push/.hg/ | ||||
| 00660 ../push/.hg/00changelog.i | 00660 ../push/.hg/00changelog.i | ||||
| 00770 ../push/.hg/cache/ | 00770 ../push/.hg/cache/ | ||||
| 00660 ../push/.hg/cache/branch2-base | 00660 ../push/.hg/cache/branch2-base | ||||
| 00660 ../push/.hg/cache/rbc-names-v1 | |||||
| 00660 ../push/.hg/cache/rbc-revs-v1 | |||||
| 00660 ../push/.hg/dirstate | 00660 ../push/.hg/dirstate | ||||
| 00660 ../push/.hg/requires | 00660 ../push/.hg/requires | ||||
| 00770 ../push/.hg/store/ | 00770 ../push/.hg/store/ | ||||
| 00660 ../push/.hg/store/00changelog.i | 00660 ../push/.hg/store/00changelog.i | ||||
| 00660 ../push/.hg/store/00manifest.i | 00660 ../push/.hg/store/00manifest.i | ||||
| 00770 ../push/.hg/store/data/ | 00770 ../push/.hg/store/data/ | ||||
| 00770 ../push/.hg/store/data/dir/ | 00770 ../push/.hg/store/data/dir/ | ||||
| 00660 ../push/.hg/store/data/dir/bar.i (reporevlogstore !) | 00660 ../push/.hg/store/data/dir/bar.i (reporevlogstore !) | ||||
| add changeset 19c888675e13 | add changeset 19c888675e13 | ||||
| add changeset 2a7f09cac94c | add changeset 2a7f09cac94c | ||||
| adding manifests | adding manifests | ||||
| adding file changes | adding file changes | ||||
| adding f1.txt revisions | adding f1.txt revisions | ||||
| bundle2-input-part: total payload size 1686 | bundle2-input-part: total payload size 1686 | ||||
| bundle2-input-part: "cache:rev-branch-cache" (advisory) supported | bundle2-input-part: "cache:rev-branch-cache" (advisory) supported | ||||
| bundle2-input-part: total payload size 74 | bundle2-input-part: total payload size 74 | ||||
| truncating cache/rbc-revs-v1 to 56 | |||||
| bundle2-input-part: "phase-heads" supported | bundle2-input-part: "phase-heads" supported | ||||
| bundle2-input-part: total payload size 24 | bundle2-input-part: total payload size 24 | ||||
| bundle2-input-bundle: 3 parts total | bundle2-input-bundle: 3 parts total | ||||
| truncating cache/rbc-revs-v1 to 72 | |||||
| added 2 changesets with 2 changes to 1 files | added 2 changesets with 2 changes to 1 files | ||||
| updating the branch cache | updating the branch cache | ||||
| invalid branch cache (served): tip differs | invalid branch cache (served): tip differs | ||||
| invalid branch cache (served.hidden): tip differs | invalid branch cache (served.hidden): tip differs | ||||
| rebase completed | rebase completed | ||||
| Test minimization of merge conflicts | Test minimization of merge conflicts | ||||
| $ hg up -q null | $ hg up -q null | ||||