##// END OF EJS Templates
bundle2: use a smarter template for test...
Pierre-Yves David -
r21647:1a6909f4 default
parent child Browse files
Show More
@@ -190,6 +190,7 b' Create an extension to test bundle2 API'
190 190 > bundle2-exp=True
191 191 > [ui]
192 192 > ssh=python "$TESTDIR/dummyssh"
193 > logtemplate={rev}:{node|short} {phase} {author} {desc|firstline}
193 194 > [web]
194 195 > push_ssl = false
195 196 > allow_push = *
@@ -664,57 +665,23 b' Support for changegroup'
664 665 (run 'hg heads' to see heads, 'hg merge' to merge)
665 666
666 667 $ hg log -G
667 o changeset: 8:02de42196ebe
668 | tag: tip
669 | parent: 6:24b6387c8c8c
670 | user: Nicolas Dumazet <nicdumz.commits@gmail.com>
671 | date: Sat Apr 30 15:24:48 2011 +0200
672 | summary: H
673 |
674 | o changeset: 7:eea13746799a
675 |/| parent: 6:24b6387c8c8c
676 | | parent: 5:9520eea781bc
677 | | user: Nicolas Dumazet <nicdumz.commits@gmail.com>
678 | | date: Sat Apr 30 15:24:48 2011 +0200
679 | | summary: G
680 | |
681 o | changeset: 6:24b6387c8c8c
682 | | parent: 1:cd010b8cd998
683 | | user: Nicolas Dumazet <nicdumz.commits@gmail.com>
684 | | date: Sat Apr 30 15:24:48 2011 +0200
685 | | summary: F
686 | |
687 | o changeset: 5:9520eea781bc
688 |/ parent: 1:cd010b8cd998
689 | user: Nicolas Dumazet <nicdumz.commits@gmail.com>
690 | date: Sat Apr 30 15:24:48 2011 +0200
691 | summary: E
668 o 8:02de42196ebe draft Nicolas Dumazet <nicdumz.commits@gmail.com> H
692 669 |
693 | o changeset: 4:32af7686d403
694 | | user: Nicolas Dumazet <nicdumz.commits@gmail.com>
695 | | date: Sat Apr 30 15:24:48 2011 +0200
696 | | summary: D
670 | o 7:eea13746799a draft Nicolas Dumazet <nicdumz.commits@gmail.com> G
671 |/|
672 o | 6:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F
697 673 | |
698 | o changeset: 3:5fddd98957c8
699 | | user: Nicolas Dumazet <nicdumz.commits@gmail.com>
700 | | date: Sat Apr 30 15:24:48 2011 +0200
701 | | summary: C
674 | o 5:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E
675 |/
676 | o 4:32af7686d403 draft Nicolas Dumazet <nicdumz.commits@gmail.com> D
702 677 | |
703 | o changeset: 2:42ccdea3bb16
704 |/ user: Nicolas Dumazet <nicdumz.commits@gmail.com>
705 | date: Sat Apr 30 15:24:48 2011 +0200
706 | summary: B
707 |
708 o changeset: 1:cd010b8cd998
709 parent: -1:000000000000
710 user: Nicolas Dumazet <nicdumz.commits@gmail.com>
711 date: Sat Apr 30 15:24:48 2011 +0200
712 summary: A
678 | o 3:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits@gmail.com> C
679 | |
680 | o 2:42ccdea3bb16 draft Nicolas Dumazet <nicdumz.commits@gmail.com> B
681 |/
682 o 1:cd010b8cd998 draft Nicolas Dumazet <nicdumz.commits@gmail.com> A
713 683
714 @ changeset: 0:3903775176ed
715 user: test
716 date: Thu Jan 01 00:00:00 1970 +0000
717 summary: a
684 @ 0:3903775176ed draft test a
718 685
719 686
720 687 $ hg bundle2 --debug --rev '8+7+5+4' ../rev.hg2
@@ -803,16 +770,9 b' clone --pull'
803 770 updating to branch default
804 771 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
805 772 $ hg -R other log -G
806 @ changeset: 1:9520eea781bc
807 | tag: tip
808 | user: Nicolas Dumazet <nicdumz.commits@gmail.com>
809 | date: Sat Apr 30 15:24:48 2011 +0200
810 | summary: E
773 @ 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E
811 774 |
812 o changeset: 0:cd010b8cd998
813 user: Nicolas Dumazet <nicdumz.commits@gmail.com>
814 date: Sat Apr 30 15:24:48 2011 +0200
815 summary: A
775 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
816 776
817 777
818 778 pull
@@ -895,51 +855,21 b' push over http'
895 855 Check final content.
896 856
897 857 $ hg -R other log -G
898 o changeset: 7:32af7686d403
899 | tag: tip
900 | user: Nicolas Dumazet <nicdumz.commits@gmail.com>
901 | date: Sat Apr 30 15:24:48 2011 +0200
902 | summary: D
858 o 7:32af7686d403 public Nicolas Dumazet <nicdumz.commits@gmail.com> D
903 859 |
904 o changeset: 6:5fddd98957c8
905 | user: Nicolas Dumazet <nicdumz.commits@gmail.com>
906 | date: Sat Apr 30 15:24:48 2011 +0200
907 | summary: C
860 o 6:5fddd98957c8 public Nicolas Dumazet <nicdumz.commits@gmail.com> C
908 861 |
909 o changeset: 5:42ccdea3bb16
910 | parent: 0:cd010b8cd998
911 | user: Nicolas Dumazet <nicdumz.commits@gmail.com>
912 | date: Sat Apr 30 15:24:48 2011 +0200
913 | summary: B
862 o 5:42ccdea3bb16 public Nicolas Dumazet <nicdumz.commits@gmail.com> B
914 863 |
915 | o changeset: 4:02de42196ebe
916 | | parent: 2:24b6387c8c8c
917 | | user: Nicolas Dumazet <nicdumz.commits@gmail.com>
918 | | date: Sat Apr 30 15:24:48 2011 +0200
919 | | summary: H
864 | o 4:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H
920 865 | |
921 | | o changeset: 3:eea13746799a
922 | |/| parent: 2:24b6387c8c8c
923 | | | parent: 1:9520eea781bc
924 | | | user: Nicolas Dumazet <nicdumz.commits@gmail.com>
925 | | | date: Sat Apr 30 15:24:48 2011 +0200
926 | | | summary: G
927 | | |
928 | o | changeset: 2:24b6387c8c8c
929 |/ / parent: 0:cd010b8cd998
930 | | user: Nicolas Dumazet <nicdumz.commits@gmail.com>
931 | | date: Sat Apr 30 15:24:48 2011 +0200
932 | | summary: F
933 | |
934 | @ changeset: 1:9520eea781bc
935 |/ user: Nicolas Dumazet <nicdumz.commits@gmail.com>
936 | date: Sat Apr 30 15:24:48 2011 +0200
937 | summary: E
938 |
939 o changeset: 0:cd010b8cd998
940 user: Nicolas Dumazet <nicdumz.commits@gmail.com>
941 date: Sat Apr 30 15:24:48 2011 +0200
942 summary: A
866 | | o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> G
867 | |/|
868 | o | 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F
869 |/ /
870 | @ 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E
871 |/
872 o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
943 873
944 874
945 875 Error Handling
General Comments 0
You need to be logged in to leave comments. Login now