comparison tests/test-largefiles.t @ 17661:67deea9c1c42

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 27 Sep 2012 15:51:14 -0500
parents ccd28eca37f6 ae57920ac188
children 60229b466e5a
comparison
equal deleted inserted replaced
17654:1dc37491e9fb 17661:67deea9c1c42
541 C sub/large4 541 C sub/large4
542 C sub/normal4 542 C sub/normal4
543 C sub2/large6 543 C sub2/large6
544 C sub2/large7 544 C sub2/large7
545 545
546 Test commit -A (issue 3542)
547 $ echo large8 > large8
548 $ hg add --large large8
549 $ hg ci -Am 'this used to add large8 as normal and commit both'
550 Invoking status precommit hook
551 A large8
552 Invoking status postcommit hook
553 C large8
554 C normal
555 C normal3
556 C sub/large4
557 C sub/normal4
558 C sub2/large6
559 C sub2/large7
560 $ rm large8
561 $ hg ci -Am 'this used to not notice the rm'
562 removing large8
563 Invoking status precommit hook
564 R large8
565 Invoking status postcommit hook
566 C normal
567 C normal3
568 C sub/large4
569 C sub/normal4
570 C sub2/large6
571 C sub2/large7
572
546 Test that a standin can't be added as a large file 573 Test that a standin can't be added as a large file
547 574
548 $ touch large 575 $ touch large
549 $ hg add --large large 576 $ hg add --large large
550 $ hg ci -m "add" 577 $ hg ci -m "add"
586 parent: 10:34f23ac6ac12 613 parent: 10:34f23ac6ac12
587 user: test 614 user: test
588 date: Thu Jan 01 00:00:00 1970 +0000 615 date: Thu Jan 01 00:00:00 1970 +0000
589 summary: removed large 616 summary: removed large
590 617
618 changeset: 13:0a3e75774479
619 user: test
620 date: Thu Jan 01 00:00:00 1970 +0000
621 summary: this used to add large8 as normal and commit both
622
623 changeset: 14:84f3d378175c
624 user: test
625 date: Thu Jan 01 00:00:00 1970 +0000
626 summary: this used to not notice the rm
627
591 searching for changes 628 searching for changes
592 largefiles to upload: 629 largefiles to upload:
630 large8
593 large 631 large
594 foo 632 foo
595 633
596 $ cd ../a 634 $ cd ../a
597 635
1543 lf_subrepo_archive/subrepo 1581 lf_subrepo_archive/subrepo
1544 lf_subrepo_archive/subrepo/large.txt 1582 lf_subrepo_archive/subrepo/large.txt
1545 lf_subrepo_archive/subrepo/normal.txt 1583 lf_subrepo_archive/subrepo/normal.txt
1546 1584
1547 $ cd .. 1585 $ cd ..
1586
1587 Test that addremove picks up largefiles prior to the initial commit (issue3541)
1588
1589 $ hg init addrm2
1590 $ cd addrm2
1591 $ touch large.dat
1592 $ touch large2.dat
1593 $ touch normal
1594 $ hg add --large large.dat
1595 $ hg addremove -v
1596 adding large2.dat as a largefile
1597 adding normal
1598
1599 Test that forgetting all largefiles reverts to islfilesrepo() == False
1600 (addremove will add *.dat as normal files now)
1601 $ hg forget large.dat
1602 $ hg forget large2.dat
1603 $ hg addremove -v
1604 adding large.dat
1605 adding large2.dat
1606
1607 Test commit's addremove option prior to the first commit
1608 $ hg forget large.dat
1609 $ hg forget large2.dat
1610 $ hg add --large large.dat
1611 $ hg ci -Am "commit"
1612 adding large2.dat as a largefile
1613 Invoking status precommit hook
1614 A large.dat
1615 A large2.dat
1616 A normal
1617 $ find .hglf/ | sort
1618 .hglf/
1619 .hglf/large.dat
1620 .hglf/large2.dat
1621
1622 $ cd ..