##// END OF EJS Templates
test-bundle2: add obsolescence information to be exchanged...
Pierre-Yves David -
r22323:b31d29b2 default
parent child Browse files
Show More
@@ -1,3 +1,7 b''
1
2 $ getmainid() {
3 > hg -R main log --template '{node}\n' --rev "$1"
4 > }
1
5
2 Create an extension to test bundle2 API
6 Create an extension to test bundle2 API
3
7
@@ -16,6 +20,9 b' Create an extension to test bundle2 API'
16 > from mercurial import discovery
20 > from mercurial import discovery
17 > from mercurial import changegroup
21 > from mercurial import changegroup
18 > from mercurial import error
22 > from mercurial import error
23 > from mercurial import obsolete
24 >
25 > obsolete._enabled = True
19 >
26 >
20 > try:
27 > try:
21 > import msvcrt
28 > import msvcrt
@@ -758,13 +765,18 b' with reply'
758 added 0 changesets with 0 changes to 3 files
765 added 0 changesets with 0 changes to 3 files
759 \x00\x00\x00\x00\x00\x00 (no-eol) (esc)
766 \x00\x00\x00\x00\x00\x00 (no-eol) (esc)
760
767
768 $ cd ..
769
761 Real world exchange
770 Real world exchange
762 =====================
771 =====================
763
772
773 Add more obsolescence information
774
775 $ hg -R main debugobsolete -d '0 0' 1111111111111111111111111111111111111111 `getmainid 9520eea781bc`
776 $ hg -R main debugobsolete -d '0 0' 2222222222222222222222222222222222222222 `getmainid 24b6387c8c8c`
764
777
765 clone --pull
778 clone --pull
766
779
767 $ cd ..
768 $ hg -R main phase --public cd010b8cd998
780 $ hg -R main phase --public cd010b8cd998
769 $ hg clone main other --pull --rev 9520eea781bc
781 $ hg clone main other --pull --rev 9520eea781bc
770 adding changesets
782 adding changesets
@@ -778,6 +790,9 b' clone --pull'
778 |
790 |
779 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
791 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
780
792
793 $ hg -R other debugobsolete
794 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'}
781
796
782 pull
797 pull
783
798
@@ -797,6 +812,9 b' pull'
797 |/
812 |/
798 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
813 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
799
814
815 $ hg -R other debugobsolete
816 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
817 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
800
818
801 pull empty (with phase movement)
819 pull empty (with phase movement)
802
820
@@ -811,6 +829,10 b' pull empty (with phase movement)'
811 |/
829 |/
812 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
830 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
813
831
832 $ hg -R other debugobsolete
833 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
834 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
835
814 pull empty
836 pull empty
815
837
816 $ hg -R other pull -r 24b6387c8c8c
838 $ hg -R other pull -r 24b6387c8c8c
@@ -823,14 +845,22 b' pull empty'
823 |/
845 |/
824 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
846 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
825
847
848 $ hg -R other debugobsolete
849 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
850 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
826
851
827 add extra data to test their exchange during push
852 add extra data to test their exchange during push
828
853
829 $ hg -R main bookmark --rev eea13746799a book_eea1
854 $ hg -R main bookmark --rev eea13746799a book_eea1
855 $ hg -R main debugobsolete -d '0 0' 3333333333333333333333333333333333333333 `getmainid eea13746799a`
830 $ hg -R main bookmark --rev 02de42196ebe book_02de
856 $ hg -R main bookmark --rev 02de42196ebe book_02de
857 $ hg -R main debugobsolete -d '0 0' 4444444444444444444444444444444444444444 `getmainid 02de42196ebe`
831 $ hg -R main bookmark --rev 42ccdea3bb16 book_42cc
858 $ hg -R main bookmark --rev 42ccdea3bb16 book_42cc
859 $ hg -R main debugobsolete -d '0 0' 5555555555555555555555555555555555555555 `getmainid 42ccdea3bb16`
832 $ hg -R main bookmark --rev 5fddd98957c8 book_5fdd
860 $ hg -R main bookmark --rev 5fddd98957c8 book_5fdd
861 $ hg -R main debugobsolete -d '0 0' 6666666666666666666666666666666666666666 `getmainid 5fddd98957c8`
833 $ hg -R main bookmark --rev 32af7686d403 book_32af
862 $ hg -R main bookmark --rev 32af7686d403 book_32af
863 $ hg -R main debugobsolete -d '0 0' 7777777777777777777777777777777777777777 `getmainid 32af7686d403`
834
864
835 $ hg -R other bookmark --rev cd010b8cd998 book_eea1
865 $ hg -R other bookmark --rev cd010b8cd998 book_eea1
836 $ hg -R other bookmark --rev cd010b8cd998 book_02de
866 $ hg -R other bookmark --rev cd010b8cd998 book_02de
@@ -859,6 +889,14 b' push'
859 |/
889 |/
860 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_02de book_32af book_42cc book_5fdd A
890 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_02de book_32af book_42cc book_5fdd A
861
891
892 $ hg -R other debugobsolete
893 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
894 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
895 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
896 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
897 5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
898 6666666666666666666666666666666666666666 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
899 7777777777777777777777777777777777777777 32af7686d403cf45b5d95f2d70cebea587ac806a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
862
900
863 pull over ssh
901 pull over ssh
864
902
@@ -872,6 +910,14 b' pull over ssh'
872 updating bookmark book_02de
910 updating bookmark book_02de
873 (run 'hg heads' to see heads, 'hg merge' to merge)
911 (run 'hg heads' to see heads, 'hg merge' to merge)
874 importing bookmark book_02de
912 importing bookmark book_02de
913 $ hg -R other debugobsolete
914 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
915 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
916 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
917 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
918 5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
919 6666666666666666666666666666666666666666 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
920 7777777777777777777777777777777777777777 32af7686d403cf45b5d95f2d70cebea587ac806a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
875
921
876 pull over http
922 pull over http
877
923
@@ -889,6 +935,14 b' pull over http'
889 (run 'hg heads .' to see heads, 'hg merge' to merge)
935 (run 'hg heads .' to see heads, 'hg merge' to merge)
890 importing bookmark book_42cc
936 importing bookmark book_42cc
891 $ cat main-error.log
937 $ cat main-error.log
938 $ hg -R other debugobsolete
939 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
940 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
941 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
942 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
943 5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
944 6666666666666666666666666666666666666666 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
945 7777777777777777777777777777777777777777 32af7686d403cf45b5d95f2d70cebea587ac806a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
892
946
893 push over ssh
947 push over ssh
894
948
@@ -916,6 +970,14 b' push over ssh'
916 |/
970 |/
917 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_32af A
971 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_32af A
918
972
973 $ hg -R other debugobsolete
974 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
975 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
976 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
977 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
978 5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
979 6666666666666666666666666666666666666666 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
980 7777777777777777777777777777777777777777 32af7686d403cf45b5d95f2d70cebea587ac806a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
919
981
920 push over http
982 push over http
921
983
@@ -953,6 +1015,14 b' Check final content.'
953 |/
1015 |/
954 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
1016 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
955
1017
1018 $ hg -R other debugobsolete
1019 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1020 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1021 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1022 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1023 5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1024 6666666666666666666666666666666666666666 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1025 7777777777777777777777777777777777777777 32af7686d403cf45b5d95f2d70cebea587ac806a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
956
1026
957 Error Handling
1027 Error Handling
958 ==============
1028 ==============
General Comments 0
You need to be logged in to leave comments. Login now