Show More
@@ -440,16 +440,6 b' def _rebundle(bundlerepo, bundleroots, u' | |||||
440 | cgpart.addparam('version', version) |
|
440 | cgpart.addparam('version', version) | |
441 | parts.append(cgpart) |
|
441 | parts.append(cgpart) | |
442 |
|
442 | |||
443 | try: |
|
|||
444 | treemod = extensions.find('treemanifest') |
|
|||
445 | except KeyError: |
|
|||
446 | pass |
|
|||
447 | else: |
|
|||
448 | if treemod._cansendtrees(bundlerepo, outgoing.missing): |
|
|||
449 | treepart = treemod.createtreepackpart(bundlerepo, outgoing, |
|
|||
450 | treemod.TREEGROUP_PARTTYPE2) |
|
|||
451 | parts.append(treepart) |
|
|||
452 |
|
||||
453 | return parts |
|
443 | return parts | |
454 |
|
444 | |||
455 | def _getbundleroots(oldrepo, bundlerepo, bundlerevs): |
|
445 | def _getbundleroots(oldrepo, bundlerepo, bundlerevs): | |
@@ -858,7 +848,6 b' def partgen(pushop, bundler):' | |||||
858 | return |
|
848 | return | |
859 |
|
849 | |||
860 | pushop.stepsdone.add('changesets') |
|
850 | pushop.stepsdone.add('changesets') | |
861 | pushop.stepsdone.add('treepack') |
|
|||
862 | if not pushop.outgoing.missing: |
|
851 | if not pushop.outgoing.missing: | |
863 | pushop.ui.status(_('no changes found\n')) |
|
852 | pushop.ui.status(_('no changes found\n')) | |
864 | pushop.cgresult = 0 |
|
853 | pushop.cgresult = 0 | |
@@ -953,13 +942,6 b' def processparts(orig, repo, op, unbundl' | |||||
953 |
|
942 | |||
954 | handleallparts = repo.ui.configbool('infinitepush', 'storeallparts') |
|
943 | handleallparts = repo.ui.configbool('infinitepush', 'storeallparts') | |
955 |
|
944 | |||
956 | partforwardingwhitelist = [] |
|
|||
957 | try: |
|
|||
958 | treemfmod = extensions.find('treemanifest') |
|
|||
959 | partforwardingwhitelist.append(treemfmod.TREEGROUP_PARTTYPE2) |
|
|||
960 | except KeyError: |
|
|||
961 | pass |
|
|||
962 |
|
||||
963 | bundler = bundle2.bundle20(repo.ui) |
|
945 | bundler = bundle2.bundle20(repo.ui) | |
964 | cgparams = None |
|
946 | cgparams = None | |
965 | with bundle2.partiterator(repo, op, unbundler) as parts: |
|
947 | with bundle2.partiterator(repo, op, unbundler) as parts: | |
@@ -987,7 +969,7 b' def processparts(orig, repo, op, unbundl' | |||||
987 | op.records.add(scratchbranchparttype + '_skipphaseheads', |
|
969 | op.records.add(scratchbranchparttype + '_skipphaseheads', | |
988 | True) |
|
970 | True) | |
989 | else: |
|
971 | else: | |
990 |
if handleallparts |
|
972 | if handleallparts: | |
991 | # Ideally we would not process any parts, and instead just |
|
973 | # Ideally we would not process any parts, and instead just | |
992 | # forward them to the bundle for storage, but since this |
|
974 | # forward them to the bundle for storage, but since this | |
993 | # differs from previous behavior, we need to put it behind a |
|
975 | # differs from previous behavior, we need to put it behind a |
@@ -68,19 +68,6 b' def getscratchbranchparts(repo, peer, ou' | |||||
68 | advisoryparams=params.iteritems(), |
|
68 | advisoryparams=params.iteritems(), | |
69 | data=cg)) |
|
69 | data=cg)) | |
70 |
|
70 | |||
71 | try: |
|
|||
72 | treemod = extensions.find('treemanifest') |
|
|||
73 | mfnodes = [] |
|
|||
74 | for node in outgoing.missing: |
|
|||
75 | mfnodes.append(('', repo[node].manifestnode())) |
|
|||
76 |
|
||||
77 | # Only include the tree parts if they all exist |
|
|||
78 | if not repo.manifestlog.datastore.getmissing(mfnodes): |
|
|||
79 | parts.append(treemod.createtreepackpart( |
|
|||
80 | repo, outgoing, treemod.TREEGROUP_PARTTYPE2)) |
|
|||
81 | except KeyError: |
|
|||
82 | pass |
|
|||
83 |
|
||||
84 | return parts |
|
71 | return parts | |
85 |
|
72 | |||
86 | def _validaterevset(repo, revset, bookmark): |
|
73 | def _validaterevset(repo, revset, bookmark): |
General Comments 0
You need to be logged in to leave comments.
Login now