##// END OF EJS Templates
changegroup: don't send empty subdirectory manifest groups...
Martin von Zweigbergk -
r29371:1b699c7e default
parent child Browse files
Show More
@@ -728,10 +728,11 b' class cg1packer(object):'
728 dir = min(tmfnodes)
728 dir = min(tmfnodes)
729 nodes = tmfnodes[dir]
729 nodes = tmfnodes[dir]
730 prunednodes = self.prune(dirlog(dir), nodes, commonrevs)
730 prunednodes = self.prune(dirlog(dir), nodes, commonrevs)
731 for x in self._packmanifests(dir, prunednodes,
731 if not dir or prunednodes:
732 makelookupmflinknode(dir)):
732 for x in self._packmanifests(dir, prunednodes,
733 size += len(x)
733 makelookupmflinknode(dir)):
734 yield x
734 size += len(x)
735 yield x
735 del tmfnodes[dir]
736 del tmfnodes[dir]
736 self._verbosenote(_('%8.i (manifests)\n') % size)
737 self._verbosenote(_('%8.i (manifests)\n') % size)
737 yield self._manifestsdone()
738 yield self._manifestsdone()
@@ -742,3 +742,45 b' Bundle with changegroup2 is not supporte'
742 $ hg -R deeprepo bundle --all -t v2 deeprepo.bundle
742 $ hg -R deeprepo bundle --all -t v2 deeprepo.bundle
743 abort: repository does not support bundle version 02
743 abort: repository does not support bundle version 02
744 [255]
744 [255]
745
746 Pull does not include changegroup for manifest the client already has from
747 other branch
748
749 $ mkdir grafted-dir-repo
750 $ cd grafted-dir-repo
751 $ hg --config experimental.treemanifest=1 init
752 $ mkdir dir
753 $ echo a > dir/file
754 $ echo a > file
755 $ hg ci -Am initial
756 adding dir/file
757 adding file
758 $ echo b > dir/file
759 $ hg ci -m updated
760 $ hg co '.^'
761 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
762 $ hg revert -r tip dir/
763 reverting dir/file (glob)
764 $ echo b > file # to make sure root manifest is sent
765 $ hg ci -m grafted
766 created new head
767 $ cd ..
768
769 $ hg --config experimental.treemanifest=1 clone --pull -r 1 \
770 > grafted-dir-repo grafted-dir-repo-clone
771 adding changesets
772 adding manifests
773 adding file changes
774 added 2 changesets with 3 changes to 2 files
775 updating to branch default
776 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
777 $ cd grafted-dir-repo-clone
778 $ hg pull -r 2
779 pulling from $TESTTMP/grafted-dir-repo (glob)
780 searching for changes
781 adding changesets
782 adding manifests
783 adding file changes
784 added 1 changesets with 1 changes to 1 files (+1 heads)
785 (run 'hg heads' to see heads, 'hg merge' to merge)
786
General Comments 0
You need to be logged in to leave comments. Login now