Show More
@@ -191,7 +191,7 b' Create an extension to test bundle2 API' | |||
|
191 | 191 | > bundle2-exp=True |
|
192 | 192 | > [ui] |
|
193 | 193 | > ssh=python "$TESTDIR/dummyssh" |
|
194 | > logtemplate={rev}:{node|short} {phase} {author} {desc|firstline} | |
|
194 | > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} | |
|
195 | 195 | > [web] |
|
196 | 196 | > push_ssl = false |
|
197 | 197 | > allow_push = * |
@@ -668,23 +668,23 b' Support for changegroup' | |||
|
668 | 668 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
669 | 669 | |
|
670 | 670 | $ hg log -G |
|
671 | o 8:02de42196ebe draft Nicolas Dumazet <nicdumz.commits@gmail.com> H | |
|
671 | o 8:02de42196ebe draft Nicolas Dumazet <nicdumz.commits@gmail.com> H | |
|
672 | 672 | | |
|
673 | | o 7:eea13746799a draft Nicolas Dumazet <nicdumz.commits@gmail.com> G | |
|
673 | | o 7:eea13746799a draft Nicolas Dumazet <nicdumz.commits@gmail.com> G | |
|
674 | 674 | |/| |
|
675 | o | 6:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F | |
|
675 | o | 6:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F | |
|
676 | 676 | | | |
|
677 | | o 5:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E | |
|
677 | | o 5:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E | |
|
678 | 678 | |/ |
|
679 | | o 4:32af7686d403 draft Nicolas Dumazet <nicdumz.commits@gmail.com> D | |
|
679 | | o 4:32af7686d403 draft Nicolas Dumazet <nicdumz.commits@gmail.com> D | |
|
680 | 680 | | | |
|
681 | | o 3:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits@gmail.com> C | |
|
681 | | o 3:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits@gmail.com> C | |
|
682 | 682 | | | |
|
683 | | o 2:42ccdea3bb16 draft Nicolas Dumazet <nicdumz.commits@gmail.com> B | |
|
683 | | o 2:42ccdea3bb16 draft Nicolas Dumazet <nicdumz.commits@gmail.com> B | |
|
684 | 684 | |/ |
|
685 | o 1:cd010b8cd998 draft Nicolas Dumazet <nicdumz.commits@gmail.com> A | |
|
685 | o 1:cd010b8cd998 draft Nicolas Dumazet <nicdumz.commits@gmail.com> A | |
|
686 | 686 | |
|
687 | @ 0:3903775176ed draft test a | |
|
687 | @ 0:3903775176ed draft test a | |
|
688 | 688 | |
|
689 | 689 | |
|
690 | 690 | $ hg bundle2 --debug --rev '8+7+5+4' ../rev.hg2 |
@@ -774,9 +774,9 b' clone --pull' | |||
|
774 | 774 | updating to branch default |
|
775 | 775 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
776 | 776 | $ hg -R other log -G |
|
777 | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E | |
|
777 | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E | |
|
778 | 778 | | |
|
779 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A | |
|
779 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A | |
|
780 | 780 | |
|
781 | 781 | |
|
782 | 782 | pull |
@@ -791,11 +791,11 b' pull' | |||
|
791 | 791 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
792 | 792 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
793 | 793 | $ hg -R other log -G |
|
794 | o 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F | |
|
794 | o 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F | |
|
795 | 795 | | |
|
796 | | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E | |
|
796 | | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E | |
|
797 | 797 | |/ |
|
798 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A | |
|
798 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A | |
|
799 | 799 | |
|
800 | 800 | |
|
801 | 801 | pull empty (with phase movement) |
@@ -805,11 +805,11 b' pull empty (with phase movement)' | |||
|
805 | 805 | pulling from $TESTTMP/main (glob) |
|
806 | 806 | no changes found |
|
807 | 807 | $ hg -R other log -G |
|
808 | o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | |
|
808 | o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | |
|
809 | 809 | | |
|
810 | | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E | |
|
810 | | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E | |
|
811 | 811 | |/ |
|
812 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A | |
|
812 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A | |
|
813 | 813 | |
|
814 | 814 | pull empty |
|
815 | 815 | |
@@ -817,82 +817,104 b' pull empty' | |||
|
817 | 817 | pulling from $TESTTMP/main (glob) |
|
818 | 818 | no changes found |
|
819 | 819 | $ hg -R other log -G |
|
820 | o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | |
|
820 | o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | |
|
821 | 821 | | |
|
822 | | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E | |
|
822 | | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E | |
|
823 | 823 | |/ |
|
824 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A | |
|
824 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A | |
|
825 | 825 | |
|
826 | 826 | |
|
827 | push | |
|
827 | add extra data to test their exchange during push | |
|
828 | ||
|
829 | $ hg -R main bookmark --rev eea13746799a book_eea1 | |
|
830 | $ hg -R main bookmark --rev 02de42196ebe book_02de | |
|
831 | $ hg -R main bookmark --rev 42ccdea3bb16 book_42cc | |
|
832 | $ hg -R main bookmark --rev 5fddd98957c8 book_5fdd | |
|
833 | $ hg -R main bookmark --rev 32af7686d403 book_32af | |
|
834 | ||
|
835 | $ hg -R other bookmark --rev cd010b8cd998 book_eea1 | |
|
836 | $ hg -R other bookmark --rev cd010b8cd998 book_02de | |
|
837 | $ hg -R other bookmark --rev cd010b8cd998 book_42cc | |
|
838 | $ hg -R other bookmark --rev cd010b8cd998 book_5fdd | |
|
839 | $ hg -R other bookmark --rev cd010b8cd998 book_32af | |
|
828 | 840 | |
|
829 | 841 | $ hg -R main phase --public eea13746799a |
|
830 | $ hg -R main push other --rev eea13746799a | |
|
842 | ||
|
843 | push | |
|
844 | $ hg -R main push other --rev eea13746799a --bookmark book_eea1 | |
|
831 | 845 | pushing to other |
|
832 | 846 | searching for changes |
|
833 | 847 | remote: adding changesets |
|
834 | 848 | remote: adding manifests |
|
835 | 849 | remote: adding file changes |
|
836 | 850 | remote: added 1 changesets with 0 changes to 0 files (-1 heads) |
|
851 | updating bookmark book_eea1 | |
|
852 | exporting bookmark book_eea1 | |
|
837 | 853 |
$ |
|
838 | o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> G | |
|
854 | o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> book_eea1 G | |
|
839 | 855 | |\ |
|
840 | | o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | |
|
856 | | o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | |
|
841 | 857 | | | |
|
842 | @ | 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E | |
|
858 | @ | 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E | |
|
843 | 859 | |/ |
|
844 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A | |
|
860 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_02de book_32af book_42cc book_5fdd A | |
|
845 | 861 | |
|
846 | 862 | |
|
847 | 863 | pull over ssh |
|
848 | 864 | |
|
849 |
$ hg -R other pull ssh://user@dummy/main -r 02de42196ebe -- |
|
|
865 | $ hg -R other pull ssh://user@dummy/main -r 02de42196ebe --bookmark book_02de | |
|
850 | 866 | pulling from ssh://user@dummy/main |
|
851 | 867 | searching for changes |
|
852 | 868 | adding changesets |
|
853 | 869 | adding manifests |
|
854 | 870 | adding file changes |
|
855 | 871 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
872 | updating bookmark book_02de | |
|
856 | 873 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
874 | importing bookmark book_02de | |
|
857 | 875 | |
|
858 | 876 | pull over http |
|
859 | 877 | |
|
860 | 878 | $ hg -R main serve -p $HGPORT -d --pid-file=main.pid -E main-error.log |
|
861 | 879 | $ cat main.pid >> $DAEMON_PIDS |
|
862 | 880 | |
|
863 | $ hg -R other pull http://localhost:$HGPORT/ -r 42ccdea3bb16 | |
|
881 | $ hg -R other pull http://localhost:$HGPORT/ -r 42ccdea3bb16 --bookmark book_42cc | |
|
864 | 882 | pulling from http://localhost:$HGPORT/ |
|
865 | 883 | searching for changes |
|
866 | 884 | adding changesets |
|
867 | 885 | adding manifests |
|
868 | 886 | adding file changes |
|
869 | 887 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
888 | updating bookmark book_42cc | |
|
870 | 889 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
890 | importing bookmark book_42cc | |
|
871 | 891 |
$ |
|
872 | 892 | |
|
873 | 893 | push over ssh |
|
874 | 894 | |
|
875 | $ hg -R main push ssh://user@dummy/other -r 5fddd98957c8 | |
|
895 | $ hg -R main push ssh://user@dummy/other -r 5fddd98957c8 --bookmark book_5fdd | |
|
876 | 896 | pushing to ssh://user@dummy/other |
|
877 | 897 | searching for changes |
|
878 | 898 | remote: adding changesets |
|
879 | 899 | remote: adding manifests |
|
880 | 900 | remote: adding file changes |
|
881 | 901 | remote: added 1 changesets with 1 changes to 1 files |
|
902 | updating bookmark book_5fdd | |
|
903 | exporting bookmark book_5fdd | |
|
882 | 904 | $ hg -R other log -G |
|
883 | o 6:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits@gmail.com> C | |
|
905 | o 6:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_5fdd C | |
|
884 | 906 | | |
|
885 | o 5:42ccdea3bb16 draft Nicolas Dumazet <nicdumz.commits@gmail.com> B | |
|
907 | o 5:42ccdea3bb16 draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_42cc B | |
|
886 | 908 | | |
|
887 | | o 4:02de42196ebe draft Nicolas Dumazet <nicdumz.commits@gmail.com> H | |
|
909 | | o 4:02de42196ebe draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_02de H | |
|
888 | 910 | | | |
|
889 | | | o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> G | |
|
911 | | | o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> book_eea1 G | |
|
890 | 912 | | |/| |
|
891 | | o | 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | |
|
913 | | o | 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | |
|
892 | 914 | |/ / |
|
893 | | @ 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E | |
|
915 | | @ 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E | |
|
894 | 916 | |/ |
|
895 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A | |
|
917 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_32af A | |
|
896 | 918 | |
|
897 | 919 | |
|
898 | 920 | push over http |
@@ -901,33 +923,35 b' push over http' | |||
|
901 | 923 | $ cat other.pid >> $DAEMON_PIDS |
|
902 | 924 | |
|
903 | 925 | $ hg -R main phase --public 32af7686d403 |
|
904 | $ hg -R main push http://localhost:$HGPORT2/ -r 32af7686d403 | |
|
926 | $ hg -R main push http://localhost:$HGPORT2/ -r 32af7686d403 --bookmark book_32af | |
|
905 | 927 | pushing to http://localhost:$HGPORT2/ |
|
906 | 928 | searching for changes |
|
907 | 929 | remote: adding changesets |
|
908 | 930 | remote: adding manifests |
|
909 | 931 | remote: adding file changes |
|
910 | 932 | remote: added 1 changesets with 1 changes to 1 files |
|
933 | updating bookmark book_32af | |
|
934 | exporting bookmark book_32af | |
|
911 | 935 | $ cat other-error.log |
|
912 | 936 | |
|
913 | 937 | Check final content. |
|
914 | 938 | |
|
915 | 939 | $ hg -R other log -G |
|
916 | o 7:32af7686d403 public Nicolas Dumazet <nicdumz.commits@gmail.com> D | |
|
940 | o 7:32af7686d403 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_32af D | |
|
917 | 941 | | |
|
918 | o 6:5fddd98957c8 public Nicolas Dumazet <nicdumz.commits@gmail.com> C | |
|
942 | o 6:5fddd98957c8 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_5fdd C | |
|
919 | 943 | | |
|
920 | o 5:42ccdea3bb16 public Nicolas Dumazet <nicdumz.commits@gmail.com> B | |
|
944 | o 5:42ccdea3bb16 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_42cc B | |
|
921 | 945 | | |
|
922 | | o 4:02de42196ebe draft Nicolas Dumazet <nicdumz.commits@gmail.com> H | |
|
946 | | o 4:02de42196ebe draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_02de H | |
|
923 | 947 | | | |
|
924 | | | o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> G | |
|
948 | | | o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> book_eea1 G | |
|
925 | 949 | | |/| |
|
926 | | o | 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | |
|
950 | | o | 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | |
|
927 | 951 | |/ / |
|
928 | | @ 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E | |
|
952 | | @ 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E | |
|
929 | 953 | |/ |
|
930 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A | |
|
954 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A | |
|
931 | 955 | |
|
932 | 956 | |
|
933 | 957 | Error Handling |
General Comments 0
You need to be logged in to leave comments.
Login now