| Restricted Project |
pushrebase can't use the standard rev.manifest() or rev[filepath] accessors
because they aren't aware of treemanifests. Let's refactor our manifest and
filectx accessor patterns into a separate function and use it in the two places
that need manifests.
test-treemanifest-server.t was failing before this. One test was modified
because the does-it-have-the-tree check is now done earlier, before the lock is
taken, so we abort before the output is printed.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| os.unlink(bundlefile) | os.unlink(bundlefile) | ||||
| except Exception: | except Exception: | ||||
| # we would rather see the original exception | # we would rather see the original exception | ||||
| pass | pass | ||||
| raise | raise | ||||
| return bundlefile | return bundlefile | ||||
| def _getrenamesrcs(rev): | def _getrenamesrcs(op, rev): | ||||
| '''get all rename sources in a revision''' | '''get all rename sources in a revision''' | ||||
| srcs = set() | srcs = set() | ||||
| revmf = rev.manifest() | revmf = _getmanifest(op, rev) | ||||
| for f in rev.files(): | for f in rev.files(): | ||||
| if f in revmf: | if f in revmf: | ||||
| renamed = rev[f].renamed() | fctx = _getfilectx(rev, revmf, f) | ||||
| renamed = fctx.renamed() | |||||
| if renamed: | if renamed: | ||||
| srcs.add(renamed[0]) | srcs.add(renamed[0]) | ||||
| return srcs | return srcs | ||||
| def _getrevs(bundle, onto, renamesrccache): | def _getrevs(op, bundle, onto, renamesrccache): | ||||
| 'extracts and validates the revs to be imported' | 'extracts and validates the revs to be imported' | ||||
| validaterevset(bundle, 'bundle()') | validaterevset(bundle, 'bundle()') | ||||
| revs = [bundle[r] for r in bundle.revs('sort(bundle())')] | revs = [bundle[r] for r in bundle.revs('sort(bundle())')] | ||||
| onto = bundle[onto.hex()] | onto = bundle[onto.hex()] | ||||
| # Fast forward update, no rebase needed | # Fast forward update, no rebase needed | ||||
| if list(bundle.set('bundle() & %d::', onto.rev())): | if list(bundle.set('bundle() & %d::', onto.rev())): | ||||
| return revs, onto | return revs, onto | ||||
| for bundlerev in revs: | for bundlerev in revs: | ||||
| bundlefiles.update(bundlerev.files()) | bundlefiles.update(bundlerev.files()) | ||||
| # Also include sources of renames. | # Also include sources of renames. | ||||
| bundlerevnode = bundlerev.node() | bundlerevnode = bundlerev.node() | ||||
| if bundlerevnode in renamesrccache: | if bundlerevnode in renamesrccache: | ||||
| bundlefiles.update(renamesrccache[bundlerevnode]) | bundlefiles.update(renamesrccache[bundlerevnode]) | ||||
| else: | else: | ||||
| bundlefiles.update(_getrenamesrcs(bundlerev)) | bundlefiles.update(_getrenamesrcs(op, bundlerev)) | ||||
| def findconflicts(): | def findconflicts(): | ||||
| # Returns all the files touched in the bundle that are also touched | # Returns all the files touched in the bundle that are also touched | ||||
| # between the old onto (ex: our old bookmark location) and the new | # between the old onto (ex: our old bookmark location) and the new | ||||
| # onto (ex: the server's actual bookmark location). | # onto (ex: the server's actual bookmark location). | ||||
| filematcher = scmutil.matchfiles(bundle, bundlefiles) | filematcher = scmutil.matchfiles(bundle, bundlefiles) | ||||
| return onto.manifest().diff(oldonto.manifest(), filematcher).keys() | return onto.manifest().diff(oldonto.manifest(), filematcher).keys() | ||||
| conflicts = findconflictsfast() | conflicts = findconflictsfast() | ||||
| if conflicts: | if conflicts: | ||||
| raise error.Abort(_('conflicting changes in:\n%s') % | raise error.Abort(_('conflicting changes in:\n%s') % | ||||
| ''.join(' %s\n' % f for f in sorted(conflicts))) | ''.join(' %s\n' % f for f in sorted(conflicts))) | ||||
| return revs, oldonto | return revs, oldonto | ||||
| def _graft(op, rev, mapping, lastdestnode): | def _getmanifest(op, rev): | ||||
| '''duplicate changeset "rev" with parents from "mapping"''' | repo = rev._repo | ||||
| repo = op.repo | |||||
| oldp1 = rev.p1().node() | |||||
| oldp2 = rev.p2().node() | |||||
| newp1 = mapping.get(oldp1, oldp1) | |||||
| newp2 = mapping.get(oldp2, oldp2) | |||||
| if (not op.records[treepackrecords] and | if (not op.records[treepackrecords] and | ||||
| not repo.ui.configbool("pushrebase", "forcetreereceive")): | not repo.ui.configbool("pushrebase", "forcetreereceive")): | ||||
| m = rev.manifest() | m = rev.manifest() | ||||
| else: | else: | ||||
| store = rev._repo.manifestlog.datastore | store = repo.manifestlog.datastore | ||||
| import cstore | import cstore | ||||
| m = cstore.treemanifest(store, rev.manifestnode()) | m = cstore.treemanifest(store, rev.manifestnode()) | ||||
| if store.getmissing([('', rev.manifestnode())]): | if store.getmissing([('', rev.manifestnode())]): | ||||
| raise error.Abort(_('error: pushes must contain tree manifests ' | raise error.Abort(_('error: pushes must contain tree manifests ' | ||||
| 'when the server has ' | 'when the server has ' | ||||
| 'pushrebase.forcetreereceive enabled')) | 'pushrebase.forcetreereceive enabled')) | ||||
| return m | |||||
| def _getfilectx(rev, mf, path): | |||||
| fileid = mf.get(path) | |||||
| return context.filectx(rev._repo, path, fileid=fileid, | |||||
| changectx=rev) | |||||
| def _graft(op, rev, mapping, lastdestnode): | |||||
| '''duplicate changeset "rev" with parents from "mapping"''' | |||||
| repo = op.repo | |||||
| oldp1 = rev.p1().node() | |||||
| oldp2 = rev.p2().node() | |||||
| newp1 = mapping.get(oldp1, oldp1) | |||||
| newp2 = mapping.get(oldp2, oldp2) | |||||
| m = _getmanifest(op, rev) | |||||
| def getfilectx(repo, memctx, path): | def getfilectx(repo, memctx, path): | ||||
| if path in m: | if path in m: | ||||
| # We can't use the normal rev[path] accessor here since it will try | # We can't use the normal rev[path] accessor here since it will try | ||||
| # to go through the flat manifest, which may not exist. | # to go through the flat manifest, which may not exist. | ||||
| fileid = m.get(path) | fctx = _getfilectx(rev, m, path) | ||||
| fctx = context.filectx(rev._repo, path, fileid=fileid, | |||||
| changectx=rev) | |||||
| flags = m.flags(path) | flags = m.flags(path) | ||||
| copied = fctx.renamed() | copied = fctx.renamed() | ||||
| if copied: | if copied: | ||||
| copied = copied[0] | copied = copied[0] | ||||
| return context.memfilectx(repo, fctx.path(), fctx.data(), | return context.memfilectx(repo, fctx.path(), fctx.data(), | ||||
| islink='l' in flags, | islink='l' in flags, | ||||
| isexec='x' in flags, | isexec='x' in flags, | ||||
| copied=copied) | copied=copied) | ||||
| prepushrebasehooks(op, params, bundle, bundlefile) | prepushrebasehooks(op, params, bundle, bundlefile) | ||||
| op.repo.ui.setconfig('pushrebase', pushrebasemarker, True) | op.repo.ui.setconfig('pushrebase', pushrebasemarker, True) | ||||
| bundlerepocache, preontocache = prefetchcaches(op, params, bundle) | bundlerepocache, preontocache = prefetchcaches(op, params, bundle) | ||||
| # Create a cache of rename sources while we don't have the lock. | # Create a cache of rename sources while we don't have the lock. | ||||
| renamesrccache = {bundle[r].node(): _getrenamesrcs(bundle[r]) | renamesrccache = {bundle[r].node(): _getrenamesrcs(op, bundle[r]) | ||||
| for r in bundle.revs('bundle()')} | for r in bundle.revs('bundle()')} | ||||
| # Opening the transaction takes the lock, so do it after prepushrebase | # Opening the transaction takes the lock, so do it after prepushrebase | ||||
| # and after we've fetched all the cache information we'll need. | # and after we've fetched all the cache information we'll need. | ||||
| tr = op.gettransaction() | tr = op.gettransaction() | ||||
| hookargs = dict(tr.hookargs) | hookargs = dict(tr.hookargs) | ||||
| # Recreate the bundle repo, since taking the lock in gettransaction() | # Recreate the bundle repo, since taking the lock in gettransaction() | ||||
| # may have caused it to become out of date. | # may have caused it to become out of date. | ||||
| # (but grab a copy of the cache first) | # (but grab a copy of the cache first) | ||||
| bundle.close() | bundle.close() | ||||
| bundle = _createbundlerepo(op, bundlepath) | bundle = _createbundlerepo(op, bundlepath) | ||||
| prefillcaches(op, bundle, bundlerepocache) | prefillcaches(op, bundle, bundlerepocache) | ||||
| onto = getontotarget(op, params, bundle) | onto = getontotarget(op, params, bundle) | ||||
| revs, oldonto = _getrevs(bundle, onto, renamesrccache) | revs, oldonto = _getrevs(op, bundle, onto, renamesrccache) | ||||
| op.repo.hook("prechangegroup", **hookargs) | op.repo.hook("prechangegroup", **hookargs) | ||||
| printpushmessage(op, revs, bundle) | printpushmessage(op, revs, bundle) | ||||
| # Prepopulate the revlog _cache with the original onto's fulltext. This | # Prepopulate the revlog _cache with the original onto's fulltext. This | ||||
| # means reading the new onto's manifest will likely have a much shorter | # means reading the new onto's manifest will likely have a much shorter | ||||
| # delta chain to traverse. | # delta chain to traverse. | ||||
| > EOF | > EOF | ||||
| $ cat >> .hg/hgrc <<EOF | $ cat >> .hg/hgrc <<EOF | ||||
| > [extensions] | > [extensions] | ||||
| > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py | > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py | ||||
| > EOF | > EOF | ||||
| $ hg push --to mybook | $ hg push --to mybook | ||||
| pushing to ssh://user@dummy/master | pushing to ssh://user@dummy/master | ||||
| searching for changes | searching for changes | ||||
| remote: pushing 1 changeset: | |||||
| remote: 15486e46ccf6 add subdir2/z | |||||
| remote: error: pushes must contain tree manifests when the server has pushrebase.forcetreereceive enabled | remote: error: pushes must contain tree manifests when the server has pushrebase.forcetreereceive enabled | ||||
| abort: push failed on remote | abort: push failed on remote | ||||
| [255] | [255] | ||||
| Test pushing only trees with commit hooks | Test pushing only trees with commit hooks | ||||
| $ cat >> .hg/hgrc <<EOF | $ cat >> .hg/hgrc <<EOF | ||||
| > [treemanifest] | > [treemanifest] | ||||
| > sendflat=False | > sendflat=False | ||||