##// END OF EJS Templates
bundle2: pull obsmarkers relevant to the pulled set through bundle2...
Pierre-Yves David -
r22354:a89add6c default
parent child Browse files
Show More
@@ -835,6 +835,11 b' def _pullbundle2(pullop):'
835 else:
835 else:
836 if pullop.heads is None and list(pullop.common) == [nullid]:
836 if pullop.heads is None and list(pullop.common) == [nullid]:
837 pullop.repo.ui.status(_("requesting all changes\n"))
837 pullop.repo.ui.status(_("requesting all changes\n"))
838 if obsolete._enabled:
839 remoteversions = bundle2.obsmarkersversion(remotecaps)
840 if obsolete.commonversion(remoteversions) is not None:
841 kwargs['obsmarkers'] = True
842 pullop.todosteps.remove('obsmarkers')
838 _pullbundle2extraprepare(pullop, kwargs)
843 _pullbundle2extraprepare(pullop, kwargs)
839 if kwargs.keys() == ['format']:
844 if kwargs.keys() == ['format']:
840 return # nothing to pull
845 return # nothing to pull
@@ -783,6 +783,7 b' clone --pull'
783 adding manifests
783 adding manifests
784 adding file changes
784 adding file changes
785 added 2 changesets with 2 changes to 2 files
785 added 2 changesets with 2 changes to 2 files
786 1 new obsolescence markers
786 updating to branch default
787 updating to branch default
787 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
788 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
788 $ hg -R other log -G
789 $ hg -R other log -G
@@ -792,7 +793,6 b' clone --pull'
792
793
793 $ hg -R other debugobsolete
794 $ hg -R other debugobsolete
794 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
795 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
795 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
796
796
797 pull
797 pull
798
798
@@ -804,6 +804,7 b' pull'
804 adding manifests
804 adding manifests
805 adding file changes
805 adding file changes
806 added 1 changesets with 1 changes to 1 files (+1 heads)
806 added 1 changesets with 1 changes to 1 files (+1 heads)
807 1 new obsolescence markers
807 (run 'hg heads' to see heads, 'hg merge' to merge)
808 (run 'hg heads' to see heads, 'hg merge' to merge)
808 $ hg -R other log -G
809 $ hg -R other log -G
809 o 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F
810 o 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F
@@ -904,6 +905,7 b' pull over ssh'
904 adding manifests
905 adding manifests
905 adding file changes
906 adding file changes
906 added 1 changesets with 1 changes to 1 files (+1 heads)
907 added 1 changesets with 1 changes to 1 files (+1 heads)
908 1 new obsolescence markers
907 updating bookmark book_02de
909 updating bookmark book_02de
908 (run 'hg heads' to see heads, 'hg merge' to merge)
910 (run 'hg heads' to see heads, 'hg merge' to merge)
909 importing bookmark book_02de
911 importing bookmark book_02de
@@ -912,9 +914,6 b' pull over ssh'
912 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
914 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
913 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
915 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
914 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
916 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
915 5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
916 6666666666666666666666666666666666666666 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
917 7777777777777777777777777777777777777777 32af7686d403cf45b5d95f2d70cebea587ac806a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
918
917
919 pull over http
918 pull over http
920
919
@@ -928,6 +927,7 b' pull over http'
928 adding manifests
927 adding manifests
929 adding file changes
928 adding file changes
930 added 1 changesets with 1 changes to 1 files (+1 heads)
929 added 1 changesets with 1 changes to 1 files (+1 heads)
930 1 new obsolescence markers
931 updating bookmark book_42cc
931 updating bookmark book_42cc
932 (run 'hg heads .' to see heads, 'hg merge' to merge)
932 (run 'hg heads .' to see heads, 'hg merge' to merge)
933 importing bookmark book_42cc
933 importing bookmark book_42cc
@@ -938,8 +938,6 b' pull over http'
938 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
938 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
939 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
939 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
940 5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
940 5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
941 6666666666666666666666666666666666666666 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
942 7777777777777777777777777777777777777777 32af7686d403cf45b5d95f2d70cebea587ac806a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
943
941
944 push over ssh
942 push over ssh
945
943
@@ -950,6 +948,7 b' push over ssh'
950 remote: adding manifests
948 remote: adding manifests
951 remote: adding file changes
949 remote: adding file changes
952 remote: added 1 changesets with 1 changes to 1 files
950 remote: added 1 changesets with 1 changes to 1 files
951 remote: 1 new obsolescence markers
953 updating bookmark book_5fdd
952 updating bookmark book_5fdd
954 exporting bookmark book_5fdd
953 exporting bookmark book_5fdd
955 $ hg -R other log -G
954 $ hg -R other log -G
@@ -974,7 +973,6 b' push over ssh'
974 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
973 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
975 5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
974 5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
976 6666666666666666666666666666666666666666 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
975 6666666666666666666666666666666666666666 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
977 7777777777777777777777777777777777777777 32af7686d403cf45b5d95f2d70cebea587ac806a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
978
976
979 push over http
977 push over http
980
978
@@ -989,6 +987,7 b' push over http'
989 remote: adding manifests
987 remote: adding manifests
990 remote: adding file changes
988 remote: adding file changes
991 remote: added 1 changesets with 1 changes to 1 files
989 remote: added 1 changesets with 1 changes to 1 files
990 remote: 1 new obsolescence markers
992 updating bookmark book_32af
991 updating bookmark book_32af
993 exporting bookmark book_32af
992 exporting bookmark book_32af
994 $ cat other-error.log
993 $ cat other-error.log
General Comments 0
You need to be logged in to leave comments. Login now