comparison tests/test-largefiles-misc.t @ 24163:bb11081562d7

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 02 Mar 2015 01:20:14 -0600
parents 79c2c29c71ae d414c28db84d
children 13c1e66f9653
comparison
equal deleted inserted replaced
24162:758dd85b6ad6 24163:bb11081562d7
913 $ hg -R pull-dst -q pull -u http://localhost:$HGPORT 913 $ hg -R pull-dst -q pull -u http://localhost:$HGPORT
914 914
915 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS 915 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
916 #endif 916 #endif
917 917
918 Test overridden functions work correctly even for repos disabling
919 largefiles (issue4547)
920
921 $ hg showconfig extensions | grep largefiles
922 extensions.largefiles=!
923
924 (test updating implied by clone)
925
926 $ hg init enabled-but-no-largefiles
927 $ echo normal1 > enabled-but-no-largefiles/normal1
928 $ hg -R enabled-but-no-largefiles add enabled-but-no-largefiles/normal1
929 $ hg -R enabled-but-no-largefiles commit -m '#0@enabled-but-no-largefiles'
930 Invoking status precommit hook
931 A normal1
932 $ cat >> enabled-but-no-largefiles/.hg/hgrc <<EOF
933 > [extensions]
934 > # enable locally
935 > largefiles=
936 > EOF
937 $ hg clone -q enabled-but-no-largefiles no-largefiles
938
939 (test rebasing implied by pull: precommit while rebasing unexpectedly
940 shows "normal3" as "?", because lfdirstate isn't yet written out at
941 that time)
942
943 $ echo normal2 > enabled-but-no-largefiles/normal2
944 $ hg -R enabled-but-no-largefiles add enabled-but-no-largefiles/normal2
945 $ hg -R enabled-but-no-largefiles commit -m '#1@enabled-but-no-largefiles'
946 Invoking status precommit hook
947 A normal2
948
949 $ echo normal3 > no-largefiles/normal3
950 $ hg -R no-largefiles add no-largefiles/normal3
951 $ hg -R no-largefiles commit -m '#1@no-largefiles'
952 Invoking status precommit hook
953 A normal3
954
955 $ hg -R no-largefiles -q pull --rebase
956 Invoking status precommit hook
957 ? normal3
958
959 (test reverting)
960
961 $ hg init subrepo-root
962 $ cat >> subrepo-root/.hg/hgrc <<EOF
963 > [extensions]
964 > # enable locally
965 > largefiles=
966 > EOF
967 $ echo large > subrepo-root/large
968 $ hg -R subrepo-root add --large subrepo-root/large
969 $ hg clone -q no-largefiles subrepo-root/no-largefiles
970 $ cat > subrepo-root/.hgsub <<EOF
971 > no-largefiles = no-largefiles
972 > EOF
973 $ hg -R subrepo-root add subrepo-root/.hgsub
974 $ hg -R subrepo-root commit -m '#0'
975 Invoking status precommit hook
976 A .hgsub
977 A large
978 ? .hgsubstate
979 $ echo dirty >> subrepo-root/large
980 $ echo dirty >> subrepo-root/no-largefiles/normal1
981 $ hg -R subrepo-root status -S
982 M large
983 M no-largefiles/normal1
984 $ hg -R subrepo-root revert --all
985 reverting subrepo-root/.hglf/large (glob)
986 reverting subrepo no-largefiles
987 reverting subrepo-root/no-largefiles/normal1 (glob)
988
918 $ cd .. 989 $ cd ..
919 990
920 991
921 Test "pull --rebase" when rebase is enabled before largefiles (issue3861) 992 Test "pull --rebase" when rebase is enabled before largefiles (issue3861)
922 ========================================================================= 993 =========================================================================