mercurial-crew: tests/test-largefiles.t annotate

annotate tests/test-largefiles.t @ 15944:f19d5c852f9b stable

largefiles: add --normal option to hg add (issue3061)

author	Na'Tosha Bard <natosha@unity3d.com>
date	Fri, 02 Dec 2011 18:20:32 +0100
parents	2dc599583ebe
children	bf502ccc46d7

rev	line source
15446 c5c9ca3719f9 tests: use 'hghave serve' to guard tests that requires serve daemon management Mads Kiilerich <mads@kiilerich.com> parents: 15443 diff changeset	1 $ "$TESTDIR/hghave" symlink unix-permissions serve \|\| exit 80
15778 f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149) Kevin Gessner <kevin@fogcreek.com> parents: 15742 diff changeset	2 $ USERCACHE=`pwd`/cache; export USERCACHE
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149) Kevin Gessner <kevin@fogcreek.com> parents: 15742 diff changeset	3 $ mkdir -p ${USERCACHE}
15216 7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	4 $ cat >> $HGRCPATH <<EOF
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	5 > [extensions]
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	6 > largefiles=
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	7 > purge=
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	8 > rebase=
15383 155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	9 > transplant=
15742 65df60a3f96b phases: prevent rebase to rebase immutable changeset. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15630 diff changeset	10 > [phases]
65df60a3f96b phases: prevent rebase to rebase immutable changeset. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15630 diff changeset	11 > publish=False
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	12 > [largefiles]
15304 9aa9d4bb3d88 largefiles: rename config setting 'size' to 'minsize' Greg Ward <greg@gerg.ca> parents: 15303 diff changeset	13 > minsize=2
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	14 > patterns=glob:**.dat
15778 f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149) Kevin Gessner <kevin@fogcreek.com> parents: 15742 diff changeset	15 > usercache=${USERCACHE}
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	16 > [hooks]
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	17 > precommit=echo "Invoking status precommit hook"; hg status
15216 7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	18 > EOF
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	19
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	20 Create the repo with a couple of revisions of both large and normal
15787 0c7b83a057aa largefiles: fix output of hg summary (issue3060) Na'Tosha Bard <natosha@unity3d.com> parents: 15786 diff changeset	21 files, testing that status correctly shows largefiles and that summary output
0c7b83a057aa largefiles: fix output of hg summary (issue3060) Na'Tosha Bard <natosha@unity3d.com> parents: 15786 diff changeset	22 is correct.
15216 7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	23
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	24 $ hg init a
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	25 $ cd a
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	26 $ mkdir sub
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	27 $ echo normal1 > normal1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	28 $ echo normal2 > sub/normal2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	29 $ echo large1 > large1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	30 $ echo large2 > sub/large2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	31 $ hg add normal1 sub/normal2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	32 $ hg add --large large1 sub/large2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	33 $ hg commit -m "add files"
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	34 Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	35 A large1
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	36 A normal1
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	37 A sub/large2
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	38 A sub/normal2
15216 7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	39 $ echo normal11 > normal1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	40 $ echo normal22 > sub/normal2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	41 $ echo large11 > large1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	42 $ echo large22 > sub/large2
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	43 $ hg commit -m "edit files"
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	44 Invoking status precommit hook
15225 b450a4d427ef largefiles: add test for status Na'Tosha Bard <natosha@unity3d.com> parents: 15216 diff changeset	45 M large1
b450a4d427ef largefiles: add test for status Na'Tosha Bard <natosha@unity3d.com> parents: 15216 diff changeset	46 M normal1
b450a4d427ef largefiles: add test for status Na'Tosha Bard <natosha@unity3d.com> parents: 15216 diff changeset	47 M sub/large2
b450a4d427ef largefiles: add test for status Na'Tosha Bard <natosha@unity3d.com> parents: 15216 diff changeset	48 M sub/normal2
15787 0c7b83a057aa largefiles: fix output of hg summary (issue3060) Na'Tosha Bard <natosha@unity3d.com> parents: 15786 diff changeset	49 $ hg sum --large
0c7b83a057aa largefiles: fix output of hg summary (issue3060) Na'Tosha Bard <natosha@unity3d.com> parents: 15786 diff changeset	50 parent: 1:ce8896473775 tip
0c7b83a057aa largefiles: fix output of hg summary (issue3060) Na'Tosha Bard <natosha@unity3d.com> parents: 15786 diff changeset	51 edit files
0c7b83a057aa largefiles: fix output of hg summary (issue3060) Na'Tosha Bard <natosha@unity3d.com> parents: 15786 diff changeset	52 branch: default
0c7b83a057aa largefiles: fix output of hg summary (issue3060) Na'Tosha Bard <natosha@unity3d.com> parents: 15786 diff changeset	53 commit: (clean)
0c7b83a057aa largefiles: fix output of hg summary (issue3060) Na'Tosha Bard <natosha@unity3d.com> parents: 15786 diff changeset	54 update: (current)
0c7b83a057aa largefiles: fix output of hg summary (issue3060) Na'Tosha Bard <natosha@unity3d.com> parents: 15786 diff changeset	55 largefiles: No remote repo
15216 7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	56
15328 9b4ab5f7ad2a largefiles: polish comments in test script Greg Ward <greg@gerg.ca> parents: 15318 diff changeset	57 Commit preserved largefile contents.
15216 7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	58
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	59 $ cat normal1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	60 normal11
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	61 $ cat large1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	62 large11
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	63 $ cat sub/normal2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	64 normal22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	65 $ cat sub/large2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	66 large22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	67
15328 9b4ab5f7ad2a largefiles: polish comments in test script Greg Ward <greg@gerg.ca> parents: 15318 diff changeset	68 Remove both largefiles and normal files.
15216 7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	69
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	70 $ hg remove normal1 large1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	71 $ hg commit -m "remove files"
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	72 Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	73 R large1
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	74 R normal1
15216 7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	75 $ ls
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	76 sub
15786 aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176) Na'Tosha Bard <natosha@unity3d.com> parents: 15629 diff changeset	77 $ echo "testlargefile" > large1-test
aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176) Na'Tosha Bard <natosha@unity3d.com> parents: 15629 diff changeset	78 $ hg add --large large1-test
aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176) Na'Tosha Bard <natosha@unity3d.com> parents: 15629 diff changeset	79 $ hg st
aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176) Na'Tosha Bard <natosha@unity3d.com> parents: 15629 diff changeset	80 A large1-test
aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176) Na'Tosha Bard <natosha@unity3d.com> parents: 15629 diff changeset	81 $ hg rm large1-test
aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176) Na'Tosha Bard <natosha@unity3d.com> parents: 15629 diff changeset	82 not removing large1-test: file has been marked for add (use forget to undo)
aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176) Na'Tosha Bard <natosha@unity3d.com> parents: 15629 diff changeset	83 $ hg st
aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176) Na'Tosha Bard <natosha@unity3d.com> parents: 15629 diff changeset	84 A large1-test
aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176) Na'Tosha Bard <natosha@unity3d.com> parents: 15629 diff changeset	85 $ hg forget large1-test
aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176) Na'Tosha Bard <natosha@unity3d.com> parents: 15629 diff changeset	86 $ hg st
aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176) Na'Tosha Bard <natosha@unity3d.com> parents: 15629 diff changeset	87 ? large1-test
aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176) Na'Tosha Bard <natosha@unity3d.com> parents: 15629 diff changeset	88 $ rm large1-test
15216 7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	89
15598 a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15575 diff changeset	90 Copy both largefiles and normal files (testing that status output is correct).
15216 7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	91
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	92 $ hg cp sub/normal2 normal1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	93 $ hg cp sub/large2 large1
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	94 $ hg commit -m "copy files"
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	95 Invoking status precommit hook
15598 a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15575 diff changeset	96 A large1
a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15575 diff changeset	97 A normal1
15216 7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	98 $ cat normal1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	99 normal22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	100 $ cat large1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	101 large22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	102
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	103 Test moving largefiles and verify that normal files are also unaffected.
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	104
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	105 $ hg mv normal1 normal3
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	106 $ hg mv large1 large3
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	107 $ hg mv sub/normal2 sub/normal4
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	108 $ hg mv sub/large2 sub/large4
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	109 $ hg commit -m "move files"
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	110 Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	111 A large3
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	112 A normal3
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	113 A sub/large4
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	114 A sub/normal4
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	115 R large1
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	116 R normal1
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	117 R sub/large2
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	118 R sub/normal2
15216 7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	119 $ cat normal3
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	120 normal22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	121 $ cat large3
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	122 large22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	123 $ cat sub/normal4
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	124 normal22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	125 $ cat sub/large4
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	126 large22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	127
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	128 Test archiving the various revisions. These hit corner cases known with
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	129 archiving.
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	130
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	131 $ hg archive -r 0 ../archive0
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	132 $ hg archive -r 1 ../archive1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	133 $ hg archive -r 2 ../archive2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	134 $ hg archive -r 3 ../archive3
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	135 $ hg archive -r 4 ../archive4
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	136 $ cd ../archive0
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	137 $ cat normal1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	138 normal1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	139 $ cat large1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	140 large1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	141 $ cat sub/normal2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	142 normal2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	143 $ cat sub/large2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	144 large2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	145 $ cd ../archive1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	146 $ cat normal1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	147 normal11
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	148 $ cat large1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	149 large11
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	150 $ cat sub/normal2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	151 normal22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	152 $ cat sub/large2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	153 large22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	154 $ cd ../archive2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	155 $ ls
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	156 sub
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	157 $ cat sub/normal2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	158 normal22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	159 $ cat sub/large2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	160 large22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	161 $ cd ../archive3
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	162 $ cat normal1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	163 normal22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	164 $ cat large1
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	165 large22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	166 $ cat sub/normal2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	167 normal22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	168 $ cat sub/large2
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	169 large22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	170 $ cd ../archive4
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	171 $ cat normal3
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	172 normal22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	173 $ cat large3
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	174 large22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	175 $ cat sub/normal4
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	176 normal22
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	177 $ cat sub/large4
7678790279da largefiles: add beginnings of test (covers commit, remove, move, copy, and archive) Na'Tosha Bard <natosha@unity3d.com> parents: diff changeset	178 large22
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	179
15328 9b4ab5f7ad2a largefiles: polish comments in test script Greg Ward <greg@gerg.ca> parents: 15318 diff changeset	180 Commit corner case: specify files to commit.
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	181
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	182 $ cd ../a
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	183 $ echo normal3 > normal3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	184 $ echo large3 > large3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	185 $ echo normal4 > sub/normal4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	186 $ echo large4 > sub/large4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	187 $ hg commit normal3 large3 sub/normal4 sub/large4 -m "edit files again"
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	188 Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	189 M large3
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	190 M normal3
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	191 M sub/large4
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	192 M sub/normal4
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	193 $ cat normal3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	194 normal3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	195 $ cat large3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	196 large3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	197 $ cat sub/normal4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	198 normal4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	199 $ cat sub/large4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	200 large4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	201
15328 9b4ab5f7ad2a largefiles: polish comments in test script Greg Ward <greg@gerg.ca> parents: 15318 diff changeset	202 One more commit corner case: commit from a subdirectory.
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	203
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	204 $ cd ../a
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	205 $ echo normal33 > normal3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	206 $ echo large33 > large3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	207 $ echo normal44 > sub/normal4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	208 $ echo large44 > sub/large4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	209 $ cd sub
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	210 $ hg commit -m "edit files yet again"
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	211 Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	212 M large3
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	213 M normal3
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	214 M sub/large4
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	215 M sub/normal4
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	216 $ cat ../normal3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	217 normal33
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	218 $ cat ../large3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	219 large33
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	220 $ cat normal4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	221 normal44
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	222 $ cat large4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	223 large44
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	224
15328 9b4ab5f7ad2a largefiles: polish comments in test script Greg Ward <greg@gerg.ca> parents: 15318 diff changeset	225 Committing standins is not allowed.
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	226
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	227 $ cd ..
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	228 $ echo large3 > large3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	229 $ hg commit .hglf/large3 -m "try to commit standin"
15253 67d010779907 largefiles: improve error reporting Greg Ward <greg@gerg.ca> parents: 15251 diff changeset	230 abort: file ".hglf/large3" is a largefile standin
67d010779907 largefiles: improve error reporting Greg Ward <greg@gerg.ca> parents: 15251 diff changeset	231 (commit the largefile itself instead)
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	232 [255]
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	233
15328 9b4ab5f7ad2a largefiles: polish comments in test script Greg Ward <greg@gerg.ca> parents: 15318 diff changeset	234 Corner cases for adding largefiles.
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	235
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	236 $ echo large5 > large5
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	237 $ hg add --large large5
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	238 $ hg add --large large5
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	239 large5 already a largefile
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	240 $ mkdir sub2
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	241 $ echo large6 > sub2/large6
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	242 $ echo large7 > sub2/large7
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	243 $ hg add --large sub2
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15446 diff changeset	244 adding sub2/large6 as a largefile (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15446 diff changeset	245 adding sub2/large7 as a largefile (glob)
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	246 $ hg st
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	247 M large3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	248 A large5
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	249 A sub2/large6
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	250 A sub2/large7
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	251
15328 9b4ab5f7ad2a largefiles: polish comments in test script Greg Ward <greg@gerg.ca> parents: 15318 diff changeset	252 Config settings (pattern **.dat, minsize 2 MB) are respected.
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	253
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	254 $ echo testdata > test.dat
15330 1e6fcce4aab3 largefiles: use smaller files in test script Greg Ward <greg@gerg.ca> parents: 15329 diff changeset	255 $ dd bs=1k count=2k if=/dev/zero of=reallylarge > /dev/null 2> /dev/null
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	256 $ hg add
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	257 adding reallylarge as a largefile
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	258 adding test.dat as a largefile
15329 944f9b7cfe4e largefiles: test that minimum size can be a float Greg Ward <greg@gerg.ca> parents: 15328 diff changeset	259
944f9b7cfe4e largefiles: test that minimum size can be a float Greg Ward <greg@gerg.ca> parents: 15328 diff changeset	260 Test that minsize and --lfsize handle float values;
944f9b7cfe4e largefiles: test that minimum size can be a float Greg Ward <greg@gerg.ca> parents: 15328 diff changeset	261 also tests that --lfsize overrides largefiles.minsize.
944f9b7cfe4e largefiles: test that minimum size can be a float Greg Ward <greg@gerg.ca> parents: 15328 diff changeset	262 (0.250 MB = 256 kB = 262144 B)
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	263
15329 944f9b7cfe4e largefiles: test that minimum size can be a float Greg Ward <greg@gerg.ca> parents: 15328 diff changeset	264 $ dd if=/dev/zero of=ratherlarge bs=1024 count=256 > /dev/null 2> /dev/null
944f9b7cfe4e largefiles: test that minimum size can be a float Greg Ward <greg@gerg.ca> parents: 15328 diff changeset	265 $ dd if=/dev/zero of=medium bs=1024 count=128 > /dev/null 2> /dev/null
944f9b7cfe4e largefiles: test that minimum size can be a float Greg Ward <greg@gerg.ca> parents: 15328 diff changeset	266 $ hg --config largefiles.minsize=.25 add
944f9b7cfe4e largefiles: test that minimum size can be a float Greg Ward <greg@gerg.ca> parents: 15328 diff changeset	267 adding ratherlarge as a largefile
944f9b7cfe4e largefiles: test that minimum size can be a float Greg Ward <greg@gerg.ca> parents: 15328 diff changeset	268 adding medium
944f9b7cfe4e largefiles: test that minimum size can be a float Greg Ward <greg@gerg.ca> parents: 15328 diff changeset	269 $ hg forget medium
944f9b7cfe4e largefiles: test that minimum size can be a float Greg Ward <greg@gerg.ca> parents: 15328 diff changeset	270 $ hg --config largefiles.minsize=.25 add --lfsize=.125
944f9b7cfe4e largefiles: test that minimum size can be a float Greg Ward <greg@gerg.ca> parents: 15328 diff changeset	271 adding medium as a largefile
944f9b7cfe4e largefiles: test that minimum size can be a float Greg Ward <greg@gerg.ca> parents: 15328 diff changeset	272 $ dd if=/dev/zero of=notlarge bs=1024 count=127 > /dev/null 2> /dev/null
944f9b7cfe4e largefiles: test that minimum size can be a float Greg Ward <greg@gerg.ca> parents: 15328 diff changeset	273 $ hg --config largefiles.minsize=.25 add --lfsize=.125
944f9b7cfe4e largefiles: test that minimum size can be a float Greg Ward <greg@gerg.ca> parents: 15328 diff changeset	274 adding notlarge
944f9b7cfe4e largefiles: test that minimum size can be a float Greg Ward <greg@gerg.ca> parents: 15328 diff changeset	275 $ hg forget notlarge
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	276
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	277 Test forget on largefiles.
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	278
15329 944f9b7cfe4e largefiles: test that minimum size can be a float Greg Ward <greg@gerg.ca> parents: 15328 diff changeset	279 $ hg forget large3 large5 test.dat reallylarge ratherlarge medium
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	280 $ hg commit -m "add/edit more largefiles"
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	281 Invoking status precommit hook
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	282 A sub2/large6
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	283 A sub2/large7
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	284 R large3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	285 ? large5
15329 944f9b7cfe4e largefiles: test that minimum size can be a float Greg Ward <greg@gerg.ca> parents: 15328 diff changeset	286 ? medium
944f9b7cfe4e largefiles: test that minimum size can be a float Greg Ward <greg@gerg.ca> parents: 15328 diff changeset	287 ? notlarge
944f9b7cfe4e largefiles: test that minimum size can be a float Greg Ward <greg@gerg.ca> parents: 15328 diff changeset	288 ? ratherlarge
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	289 ? reallylarge
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	290 ? test.dat
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	291 $ hg st
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	292 ? large3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	293 ? large5
15329 944f9b7cfe4e largefiles: test that minimum size can be a float Greg Ward <greg@gerg.ca> parents: 15328 diff changeset	294 ? medium
944f9b7cfe4e largefiles: test that minimum size can be a float Greg Ward <greg@gerg.ca> parents: 15328 diff changeset	295 ? notlarge
944f9b7cfe4e largefiles: test that minimum size can be a float Greg Ward <greg@gerg.ca> parents: 15328 diff changeset	296 ? ratherlarge
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	297 ? reallylarge
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	298 ? test.dat
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	299
15328 9b4ab5f7ad2a largefiles: polish comments in test script Greg Ward <greg@gerg.ca> parents: 15318 diff changeset	300 Purge with largefiles: verify that largefiles are still in the working
9b4ab5f7ad2a largefiles: polish comments in test script Greg Ward <greg@gerg.ca> parents: 15318 diff changeset	301 dir after a purge.
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	302
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	303 $ hg purge --all
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	304 $ cat sub/large4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	305 large44
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	306 $ cat sub2/large6
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	307 large6
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	308 $ cat sub2/large7
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	309 large7
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	310
15792 7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	311 Test addremove: verify that files that should be added as largfiles are added as
7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	312 such and that already-existing largfiles are not added as normal files by
7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	313 accident.
7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	314
7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	315 $ rm normal3
7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	316 $ rm sub/large4
7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	317 $ echo "testing addremove with patterns" > testaddremove.dat
7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	318 $ echo "normaladdremove" > normaladdremove
7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	319 $ hg addremove
7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	320 removing sub/large4
7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	321 adding testaddremove.dat as a largefile
7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	322 removing normal3
7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	323 adding normaladdremove
7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	324
15328 9b4ab5f7ad2a largefiles: polish comments in test script Greg Ward <greg@gerg.ca> parents: 15318 diff changeset	325 Clone a largefiles repo.
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	326
15548 f76584098c88 largefiles: fix 'hg clone . ../foo' OSError abort Martin Geisler <mg@lazybytes.net> parents: 15384 diff changeset	327 $ hg clone . ../b
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	328 updating to branch default
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	329 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	330 getting changed largefiles
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	331 3 largefiles updated, 0 removed
15548 f76584098c88 largefiles: fix 'hg clone . ../foo' OSError abort Martin Geisler <mg@lazybytes.net> parents: 15384 diff changeset	332 $ cd ../b
15384 bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	333 $ hg log --template '{rev}:{node\|short} {desc\|firstline}\n'
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	334 7:daea875e9014 add/edit more largefiles
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	335 6:4355d653f84f edit files yet again
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	336 5:9d5af5072dbd edit files again
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	337 4:74c02385b94c move files
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	338 3:9e8fbc4bce62 copy files
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	339 2:51a0ae4d5864 remove files
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	340 1:ce8896473775 edit files
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	341 0:30d30fe6a5be add files
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	342 $ cat normal3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	343 normal33
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	344 $ cat sub/normal4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	345 normal44
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	346 $ cat sub/large4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	347 large44
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	348 $ cat sub2/large6
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	349 large6
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	350 $ cat sub2/large7
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	351 large7
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	352 $ cd ..
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	353 $ hg clone a -r 3 c
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	354 adding changesets
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	355 adding manifests
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	356 adding file changes
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	357 added 4 changesets with 10 changes to 4 files
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	358 updating to branch default
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	359 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	360 getting changed largefiles
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	361 2 largefiles updated, 0 removed
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	362 $ cd c
15384 bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	363 $ hg log --template '{rev}:{node\|short} {desc\|firstline}\n'
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	364 3:9e8fbc4bce62 copy files
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	365 2:51a0ae4d5864 remove files
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	366 1:ce8896473775 edit files
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	367 0:30d30fe6a5be add files
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	368 $ cat normal1
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	369 normal22
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	370 $ cat large1
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	371 large22
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	372 $ cat sub/normal2
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	373 normal22
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	374 $ cat sub/large2
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	375 large22
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	376
15328 9b4ab5f7ad2a largefiles: polish comments in test script Greg Ward <greg@gerg.ca> parents: 15318 diff changeset	377 Old revisions of a clone have correct largefiles content (this also
9b4ab5f7ad2a largefiles: polish comments in test script Greg Ward <greg@gerg.ca> parents: 15318 diff changeset	378 tests update).
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	379
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	380 $ hg update -r 1
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	381 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	382 getting changed largefiles
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	383 1 largefiles updated, 0 removed
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	384 $ cat large1
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	385 large11
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	386 $ cat sub/large2
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	387 large22
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	388
15328 9b4ab5f7ad2a largefiles: polish comments in test script Greg Ward <greg@gerg.ca> parents: 15318 diff changeset	389 Rebasing between two repositories does not revert largefiles to old
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	390 revisions (this was a very bad bug that took a lot of work to fix).
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	391
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	392 $ cd ..
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	393 $ hg clone a d
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	394 updating to branch default
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	395 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	396 getting changed largefiles
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	397 3 largefiles updated, 0 removed
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	398 $ cd b
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	399 $ echo large4-modified > sub/large4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	400 $ echo normal3-modified > normal3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	401 $ hg commit -m "modify normal file and largefile in repo b"
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	402 Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	403 M normal3
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	404 M sub/large4
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	405 $ cd ../d
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	406 $ echo large6-modified > sub2/large6
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	407 $ echo normal4-modified > sub/normal4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	408 $ hg commit -m "modify normal file largefile in repo d"
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	409 Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	410 M sub/normal4
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	411 M sub2/large6
15297 3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	412 $ cd ..
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	413 $ hg clone d e
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	414 updating to branch default
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	415 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	416 getting changed largefiles
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	417 3 largefiles updated, 0 removed
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	418 $ cd d
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	419 $ hg pull --rebase ../b
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	420 pulling from ../b
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	421 searching for changes
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	422 adding changesets
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	423 adding manifests
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	424 adding file changes
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	425 added 1 changesets with 2 changes to 2 files (+1 heads)
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	426 getting changed largefiles
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	427 1 largefiles updated, 0 removed
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	428 Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	429 M sub/normal4
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	430 M sub2/large6
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	431 saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	432 nothing to rebase
15384 bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	433 $ hg log --template '{rev}:{node\|short} {desc\|firstline}\n'
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	434 9:598410d3eb9a modify normal file largefile in repo d
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	435 8:a381d2c8c80e modify normal file and largefile in repo b
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	436 7:daea875e9014 add/edit more largefiles
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	437 6:4355d653f84f edit files yet again
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	438 5:9d5af5072dbd edit files again
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	439 4:74c02385b94c move files
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	440 3:9e8fbc4bce62 copy files
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	441 2:51a0ae4d5864 remove files
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	442 1:ce8896473775 edit files
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	443 0:30d30fe6a5be add files
15251 173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	444 $ cat normal3
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	445 normal3-modified
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	446 $ cat sub/normal4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	447 normal4-modified
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	448 $ cat sub/large4
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	449 large4-modified
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	450 $ cat sub2/large6
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	451 large6-modified
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	452 $ cat sub2/large7
173b00827279 largefiles: flush out tests to cover more operations and known cornercases Na'Tosha Bard <natosha@unity3d.com> parents: 15225 diff changeset	453 large7
15297 3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	454 $ cd ../e
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	455 $ hg pull ../b
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	456 pulling from ../b
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	457 searching for changes
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	458 adding changesets
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	459 adding manifests
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	460 adding file changes
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	461 added 1 changesets with 2 changes to 2 files (+1 heads)
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	462 (run 'hg heads' to see heads, 'hg merge' to merge)
15916 c96148346af8 largefiles: cache new largefiles for new heads when pulling Na'Tosha Bard <natosha@unity3d.com> parents: 15909 diff changeset	463 caching new largefiles
c96148346af8 largefiles: cache new largefiles for new heads when pulling Na'Tosha Bard <natosha@unity3d.com> parents: 15909 diff changeset	464 0 largefiles cached
15297 3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	465 $ hg rebase
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	466 getting changed largefiles
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	467 1 largefiles updated, 0 removed
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	468 Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	469 M sub/normal4
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	470 M sub2/large6
15297 3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	471 saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg
15784 3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere Na'Tosha Bard <natosha@unity3d.com> parents: 15778 diff changeset	472 $ hg log --template '{rev}:{node\|short} {desc\|firstline}\n'
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere Na'Tosha Bard <natosha@unity3d.com> parents: 15778 diff changeset	473 9:598410d3eb9a modify normal file largefile in repo d
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere Na'Tosha Bard <natosha@unity3d.com> parents: 15778 diff changeset	474 8:a381d2c8c80e modify normal file and largefile in repo b
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere Na'Tosha Bard <natosha@unity3d.com> parents: 15778 diff changeset	475 7:daea875e9014 add/edit more largefiles
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere Na'Tosha Bard <natosha@unity3d.com> parents: 15778 diff changeset	476 6:4355d653f84f edit files yet again
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere Na'Tosha Bard <natosha@unity3d.com> parents: 15778 diff changeset	477 5:9d5af5072dbd edit files again
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere Na'Tosha Bard <natosha@unity3d.com> parents: 15778 diff changeset	478 4:74c02385b94c move files
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere Na'Tosha Bard <natosha@unity3d.com> parents: 15778 diff changeset	479 3:9e8fbc4bce62 copy files
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere Na'Tosha Bard <natosha@unity3d.com> parents: 15778 diff changeset	480 2:51a0ae4d5864 remove files
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere Na'Tosha Bard <natosha@unity3d.com> parents: 15778 diff changeset	481 1:ce8896473775 edit files
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere Na'Tosha Bard <natosha@unity3d.com> parents: 15778 diff changeset	482 0:30d30fe6a5be add files
15297 3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	483 $ cat normal3
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	484 normal3-modified
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	485 $ cat sub/normal4
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	486 normal4-modified
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	487 $ cat sub/large4
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	488 large4-modified
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	489 $ cat sub2/large6
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	490 large6-modified
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	491 $ cat sub2/large7
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	492 large7
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	493
15328 9b4ab5f7ad2a largefiles: polish comments in test script Greg Ward <greg@gerg.ca> parents: 15318 diff changeset	494 Rollback on largefiles.
15297 3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	495
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	496 $ echo large4-modified-again > sub/large4
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	497 $ hg commit -m "Modify large4 again"
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	498 Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	499 M sub/large4
15297 3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	500 $ hg rollback
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	501 repository tip rolled back to revision 9 (undo commit)
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	502 working directory now based on revision 9
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	503 $ hg st
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	504 M sub/large4
15784 3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere Na'Tosha Bard <natosha@unity3d.com> parents: 15778 diff changeset	505 $ hg log --template '{rev}:{node\|short} {desc\|firstline}\n'
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere Na'Tosha Bard <natosha@unity3d.com> parents: 15778 diff changeset	506 9:598410d3eb9a modify normal file largefile in repo d
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere Na'Tosha Bard <natosha@unity3d.com> parents: 15778 diff changeset	507 8:a381d2c8c80e modify normal file and largefile in repo b
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere Na'Tosha Bard <natosha@unity3d.com> parents: 15778 diff changeset	508 7:daea875e9014 add/edit more largefiles
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere Na'Tosha Bard <natosha@unity3d.com> parents: 15778 diff changeset	509 6:4355d653f84f edit files yet again
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere Na'Tosha Bard <natosha@unity3d.com> parents: 15778 diff changeset	510 5:9d5af5072dbd edit files again
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere Na'Tosha Bard <natosha@unity3d.com> parents: 15778 diff changeset	511 4:74c02385b94c move files
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere Na'Tosha Bard <natosha@unity3d.com> parents: 15778 diff changeset	512 3:9e8fbc4bce62 copy files
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere Na'Tosha Bard <natosha@unity3d.com> parents: 15778 diff changeset	513 2:51a0ae4d5864 remove files
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere Na'Tosha Bard <natosha@unity3d.com> parents: 15778 diff changeset	514 1:ce8896473775 edit files
3fe39d6d2bd8 largefiles: clean up and shorten test output by using the same log format everywhere Na'Tosha Bard <natosha@unity3d.com> parents: 15778 diff changeset	515 0:30d30fe6a5be add files
15297 3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	516 $ cat sub/large4
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	517 large4-modified-again
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	518
15365 ca1412c15efe largefiles: test "update --check" Greg Ward <greg@gerg.ca> parents: 15338 diff changeset	519 "update --check" refuses to update with uncommitted changes.
ca1412c15efe largefiles: test "update --check" Greg Ward <greg@gerg.ca> parents: 15338 diff changeset	520 $ hg update --check 8
ca1412c15efe largefiles: test "update --check" Greg Ward <greg@gerg.ca> parents: 15338 diff changeset	521 abort: uncommitted local changes
ca1412c15efe largefiles: test "update --check" Greg Ward <greg@gerg.ca> parents: 15338 diff changeset	522 [255]
ca1412c15efe largefiles: test "update --check" Greg Ward <greg@gerg.ca> parents: 15338 diff changeset	523
15328 9b4ab5f7ad2a largefiles: polish comments in test script Greg Ward <greg@gerg.ca> parents: 15318 diff changeset	524 "update --clean" leaves correct largefiles in working copy.
15297 3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	525
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	526 $ hg update --clean
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	527 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	528 getting changed largefiles
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	529 1 largefiles updated, 0 removed
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	530 $ cat normal3
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	531 normal3-modified
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	532 $ cat sub/normal4
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	533 normal4-modified
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	534 $ cat sub/large4
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	535 large4-modified
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	536 $ cat sub2/large6
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	537 large6-modified
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	538 $ cat sub2/large7
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	539 large7
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	540
15365 ca1412c15efe largefiles: test "update --check" Greg Ward <greg@gerg.ca> parents: 15338 diff changeset	541 Now "update check" is happy.
ca1412c15efe largefiles: test "update --check" Greg Ward <greg@gerg.ca> parents: 15338 diff changeset	542 $ hg update --check 8
ca1412c15efe largefiles: test "update --check" Greg Ward <greg@gerg.ca> parents: 15338 diff changeset	543 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
ca1412c15efe largefiles: test "update --check" Greg Ward <greg@gerg.ca> parents: 15338 diff changeset	544 getting changed largefiles
ca1412c15efe largefiles: test "update --check" Greg Ward <greg@gerg.ca> parents: 15338 diff changeset	545 1 largefiles updated, 0 removed
ca1412c15efe largefiles: test "update --check" Greg Ward <greg@gerg.ca> parents: 15338 diff changeset	546 $ hg update --check
ca1412c15efe largefiles: test "update --check" Greg Ward <greg@gerg.ca> parents: 15338 diff changeset	547 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
ca1412c15efe largefiles: test "update --check" Greg Ward <greg@gerg.ca> parents: 15338 diff changeset	548 getting changed largefiles
ca1412c15efe largefiles: test "update --check" Greg Ward <greg@gerg.ca> parents: 15338 diff changeset	549 1 largefiles updated, 0 removed
ca1412c15efe largefiles: test "update --check" Greg Ward <greg@gerg.ca> parents: 15338 diff changeset	550
15902 29defa7d20f6 largefiles: remove empty directories upon update (issue3202) Patrick Mezard <pmezard@gmail.com> parents: 15787 diff changeset	551 Test removing empty largefiles directories on update
29defa7d20f6 largefiles: remove empty directories upon update (issue3202) Patrick Mezard <pmezard@gmail.com> parents: 15787 diff changeset	552 $ test -d sub2 && echo "sub2 exists"
29defa7d20f6 largefiles: remove empty directories upon update (issue3202) Patrick Mezard <pmezard@gmail.com> parents: 15787 diff changeset	553 sub2 exists
29defa7d20f6 largefiles: remove empty directories upon update (issue3202) Patrick Mezard <pmezard@gmail.com> parents: 15787 diff changeset	554 $ hg update -q null
29defa7d20f6 largefiles: remove empty directories upon update (issue3202) Patrick Mezard <pmezard@gmail.com> parents: 15787 diff changeset	555 $ test -d sub2 && echo "error: sub2 should not exist anymore"
29defa7d20f6 largefiles: remove empty directories upon update (issue3202) Patrick Mezard <pmezard@gmail.com> parents: 15787 diff changeset	556 [1]
29defa7d20f6 largefiles: remove empty directories upon update (issue3202) Patrick Mezard <pmezard@gmail.com> parents: 15787 diff changeset	557 $ hg update -q
29defa7d20f6 largefiles: remove empty directories upon update (issue3202) Patrick Mezard <pmezard@gmail.com> parents: 15787 diff changeset	558
15930 2dc599583ebe largefiles: test and simplify empty directory removal in remove Patrick Mezard <pmezard@gmail.com> parents: 15916 diff changeset	559 Test hg remove removes empty largefiles directories
2dc599583ebe largefiles: test and simplify empty directory removal in remove Patrick Mezard <pmezard@gmail.com> parents: 15916 diff changeset	560 $ test -d sub2 && echo "sub2 exists"
2dc599583ebe largefiles: test and simplify empty directory removal in remove Patrick Mezard <pmezard@gmail.com> parents: 15916 diff changeset	561 sub2 exists
2dc599583ebe largefiles: test and simplify empty directory removal in remove Patrick Mezard <pmezard@gmail.com> parents: 15916 diff changeset	562 $ hg remove sub2/*
2dc599583ebe largefiles: test and simplify empty directory removal in remove Patrick Mezard <pmezard@gmail.com> parents: 15916 diff changeset	563 $ test -d sub2 && echo "error: sub2 should not exist anymore"
2dc599583ebe largefiles: test and simplify empty directory removal in remove Patrick Mezard <pmezard@gmail.com> parents: 15916 diff changeset	564 [1]
2dc599583ebe largefiles: test and simplify empty directory removal in remove Patrick Mezard <pmezard@gmail.com> parents: 15916 diff changeset	565 $ hg revert sub2/large6 sub2/large7
2dc599583ebe largefiles: test and simplify empty directory removal in remove Patrick Mezard <pmezard@gmail.com> parents: 15916 diff changeset	566
15366 06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	567 "revert" works on largefiles (and normal files too).
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	568 $ echo hack3 >> normal3
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	569 $ echo hack4 >> sub/normal4
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	570 $ echo hack4 >> sub/large4
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	571 $ hg rm sub2/large6
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	572 $ echo new >> sub2/large8
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	573 $ hg add --large sub2/large8
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	574 # XXX we don't really want to report that we're reverting the standin;
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	575 # that's just an implementation detail. But I don't see an obvious fix. ;-(
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	576 $ hg revert sub
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15446 diff changeset	577 reverting .hglf/sub/large4 (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15446 diff changeset	578 reverting sub/normal4 (glob)
15366 06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	579 $ hg status
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	580 M normal3
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	581 A sub2/large8
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	582 R sub2/large6
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	583 ? sub/large4.orig
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	584 ? sub/normal4.orig
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	585 $ cat sub/normal4
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	586 normal4-modified
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	587 $ cat sub/large4
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	588 large4-modified
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	589 $ hg revert -a --no-backup
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15446 diff changeset	590 undeleting .hglf/sub2/large6 (glob)
9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15446 diff changeset	591 forgetting .hglf/sub2/large8 (glob)
15366 06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	592 reverting normal3
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	593 $ hg status
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	594 ? sub/large4.orig
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	595 ? sub/normal4.orig
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	596 ? sub2/large8
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	597 $ cat normal3
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	598 normal3-modified
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	599 $ cat sub2/large6
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	600 large6-modified
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	601 $ rm sub/*.orig sub2/large8
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	602
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	603 revert some files to an older revision
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	604 $ hg revert --no-backup -r 8 sub2
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15446 diff changeset	605 reverting .hglf/sub2/large6 (glob)
15366 06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	606 $ cat sub2/large6
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	607 large6
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	608 $ hg revert --no-backup sub2
15447 9910f60a37ee tests: make (glob) on windows accept \ instead of / Mads Kiilerich <mads@kiilerich.com> parents: 15446 diff changeset	609 reverting .hglf/sub2/large6 (glob)
15366 06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	610 $ hg status
06b8db3f25c6 largefiles: test reverting largefiles (coverage creeping ever upwards) Greg Ward <greg@gerg.ca> parents: 15365 diff changeset	611
15370 8af6c6d91c92 largefiles: fix typo Eli Carter <eli.carter@tektronix.com> parents: 15369 diff changeset	612 "verify --large" actually verifies largefiles
15297 3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	613
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	614 $ hg verify --large
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	615 checking changesets
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	616 checking manifests
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	617 crosschecking files in changesets and manifests
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	618 checking files
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	619 10 files, 10 changesets, 28 total revisions
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	620 searching 1 changesets for largefiles
3ef434028416 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) Na'Tosha Bard <natosha@unity3d.com> parents: 15253 diff changeset	621 verified existence of 3 revisions of 3 largefiles
15298 54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	622
15916 c96148346af8 largefiles: cache new largefiles for new heads when pulling Na'Tosha Bard <natosha@unity3d.com> parents: 15909 diff changeset	623 Merging does not revert to old versions of largefiles and also check
c96148346af8 largefiles: cache new largefiles for new heads when pulling Na'Tosha Bard <natosha@unity3d.com> parents: 15909 diff changeset	624 that merging after having pulled from a non-default remote works
c96148346af8 largefiles: cache new largefiles for new heads when pulling Na'Tosha Bard <natosha@unity3d.com> parents: 15909 diff changeset	625 correctly.
15298 54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	626
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	627 $ cd ..
15916 c96148346af8 largefiles: cache new largefiles for new heads when pulling Na'Tosha Bard <natosha@unity3d.com> parents: 15909 diff changeset	628 $ hg clone -r 7 e temp
15298 54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	629 adding changesets
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	630 adding manifests
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	631 adding file changes
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	632 added 8 changesets with 24 changes to 10 files
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	633 updating to branch default
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	634 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	635 getting changed largefiles
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	636 3 largefiles updated, 0 removed
15916 c96148346af8 largefiles: cache new largefiles for new heads when pulling Na'Tosha Bard <natosha@unity3d.com> parents: 15909 diff changeset	637 $ hg clone temp f
c96148346af8 largefiles: cache new largefiles for new heads when pulling Na'Tosha Bard <natosha@unity3d.com> parents: 15909 diff changeset	638 updating to branch default
c96148346af8 largefiles: cache new largefiles for new heads when pulling Na'Tosha Bard <natosha@unity3d.com> parents: 15909 diff changeset	639 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
c96148346af8 largefiles: cache new largefiles for new heads when pulling Na'Tosha Bard <natosha@unity3d.com> parents: 15909 diff changeset	640 getting changed largefiles
c96148346af8 largefiles: cache new largefiles for new heads when pulling Na'Tosha Bard <natosha@unity3d.com> parents: 15909 diff changeset	641 3 largefiles updated, 0 removed
c96148346af8 largefiles: cache new largefiles for new heads when pulling Na'Tosha Bard <natosha@unity3d.com> parents: 15909 diff changeset	642 # Delete the largefiles in the largefiles system cache so that we have an
c96148346af8 largefiles: cache new largefiles for new heads when pulling Na'Tosha Bard <natosha@unity3d.com> parents: 15909 diff changeset	643 # opportunity to test that caching after a pull works.
c96148346af8 largefiles: cache new largefiles for new heads when pulling Na'Tosha Bard <natosha@unity3d.com> parents: 15909 diff changeset	644 $ rm ${USERCACHE}/*
15298 54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	645 $ cd f
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	646 $ echo "large4-merge-test" > sub/large4
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	647 $ hg commit -m "Modify large4 to test merge"
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	648 Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	649 M sub/large4
15298 54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	650 $ hg pull ../e
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	651 pulling from ../e
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	652 searching for changes
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	653 adding changesets
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	654 adding manifests
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	655 adding file changes
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	656 added 2 changesets with 4 changes to 4 files (+1 heads)
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	657 (run 'hg heads' to see heads, 'hg merge' to merge)
15916 c96148346af8 largefiles: cache new largefiles for new heads when pulling Na'Tosha Bard <natosha@unity3d.com> parents: 15909 diff changeset	658 caching new largefiles
c96148346af8 largefiles: cache new largefiles for new heads when pulling Na'Tosha Bard <natosha@unity3d.com> parents: 15909 diff changeset	659 2 largefiles cached
15298 54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	660 $ hg merge
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	661 merging sub/large4
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	662 largefile sub/large4 has a merge conflict
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	663 keep (l)ocal or take (o)ther? l
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	664 3 files updated, 1 files merged, 0 files removed, 0 files unresolved
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	665 (branch merge, don't forget to commit)
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	666 getting changed largefiles
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	667 1 largefiles updated, 0 removed
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	668 $ hg commit -m "Merge repos e and f"
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	669 Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	670 M normal3
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	671 M sub/normal4
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	672 M sub2/large6
15298 54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	673 $ cat normal3
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	674 normal3-modified
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	675 $ cat sub/normal4
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	676 normal4-modified
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	677 $ cat sub/large4
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	678 large4-merge-test
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	679 $ cat sub2/large6
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	680 large6-modified
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	681 $ cat sub2/large7
54c581d98636 largefiles: test that merging does not result in wrong versions of largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15297 diff changeset	682 large7
15382 b59e6b1e0c95 largefiles: test that a largefile cannot accidentally be re-added as a regular file Na'Tosha Bard <natosha@unity3d.com> parents: 15378 diff changeset	683
15629 5b66e55c0d93 largefiles: fix 'hg status' abort after merge Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	684 Test status after merging with a branch that introduces a new largefile:
5b66e55c0d93 largefiles: fix 'hg status' abort after merge Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	685
5b66e55c0d93 largefiles: fix 'hg status' abort after merge Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	686 $ echo large > large
5b66e55c0d93 largefiles: fix 'hg status' abort after merge Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	687 $ hg add --large large
5b66e55c0d93 largefiles: fix 'hg status' abort after merge Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	688 $ hg commit -m 'add largefile'
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	689 Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	690 A large
15629 5b66e55c0d93 largefiles: fix 'hg status' abort after merge Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	691 $ hg update -q ".^"
5b66e55c0d93 largefiles: fix 'hg status' abort after merge Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	692 $ echo change >> normal3
5b66e55c0d93 largefiles: fix 'hg status' abort after merge Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	693 $ hg commit -m 'some change'
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	694 Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	695 M normal3
15629 5b66e55c0d93 largefiles: fix 'hg status' abort after merge Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	696 created new head
5b66e55c0d93 largefiles: fix 'hg status' abort after merge Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	697 $ hg merge
5b66e55c0d93 largefiles: fix 'hg status' abort after merge Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	698 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5b66e55c0d93 largefiles: fix 'hg status' abort after merge Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	699 (branch merge, don't forget to commit)
5b66e55c0d93 largefiles: fix 'hg status' abort after merge Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	700 getting changed largefiles
5b66e55c0d93 largefiles: fix 'hg status' abort after merge Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	701 1 largefiles updated, 0 removed
5b66e55c0d93 largefiles: fix 'hg status' abort after merge Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	702 $ hg status
5b66e55c0d93 largefiles: fix 'hg status' abort after merge Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	703 M large
5b66e55c0d93 largefiles: fix 'hg status' abort after merge Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	704
15382 b59e6b1e0c95 largefiles: test that a largefile cannot accidentally be re-added as a regular file Na'Tosha Bard <natosha@unity3d.com> parents: 15378 diff changeset	705 Test that a normal file and a largefile with the same name and path cannot
b59e6b1e0c95 largefiles: test that a largefile cannot accidentally be re-added as a regular file Na'Tosha Bard <natosha@unity3d.com> parents: 15378 diff changeset	706 coexist.
b59e6b1e0c95 largefiles: test that a largefile cannot accidentally be re-added as a regular file Na'Tosha Bard <natosha@unity3d.com> parents: 15378 diff changeset	707
b59e6b1e0c95 largefiles: test that a largefile cannot accidentally be re-added as a regular file Na'Tosha Bard <natosha@unity3d.com> parents: 15378 diff changeset	708 $ rm sub2/large7
b59e6b1e0c95 largefiles: test that a largefile cannot accidentally be re-added as a regular file Na'Tosha Bard <natosha@unity3d.com> parents: 15378 diff changeset	709 $ echo "largeasnormal" > sub2/large7
b59e6b1e0c95 largefiles: test that a largefile cannot accidentally be re-added as a regular file Na'Tosha Bard <natosha@unity3d.com> parents: 15378 diff changeset	710 $ hg add sub2/large7
b59e6b1e0c95 largefiles: test that a largefile cannot accidentally be re-added as a regular file Na'Tosha Bard <natosha@unity3d.com> parents: 15378 diff changeset	711 sub2/large7 already a largefile
15383 155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	712
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	713 Test that transplanting a largefile change works correctly.
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	714
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	715 $ cd ..
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	716 $ hg clone -r 8 d g
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	717 adding changesets
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	718 adding manifests
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	719 adding file changes
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	720 added 9 changesets with 26 changes to 10 files
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	721 updating to branch default
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	722 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	723 getting changed largefiles
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	724 3 largefiles updated, 0 removed
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	725 $ cd g
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	726 $ hg transplant -s ../d 598410d3eb9a
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	727 searching for changes
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	728 searching for changes
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	729 adding changesets
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	730 adding manifests
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	731 adding file changes
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	732 added 1 changesets with 2 changes to 2 files
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	733 getting changed largefiles
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	734 1 largefiles updated, 0 removed
15384 bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	735 $ hg log --template '{rev}:{node\|short} {desc\|firstline}\n'
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	736 9:598410d3eb9a modify normal file largefile in repo d
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	737 8:a381d2c8c80e modify normal file and largefile in repo b
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	738 7:daea875e9014 add/edit more largefiles
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	739 6:4355d653f84f edit files yet again
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	740 5:9d5af5072dbd edit files again
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	741 4:74c02385b94c move files
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	742 3:9e8fbc4bce62 copy files
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	743 2:51a0ae4d5864 remove files
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	744 1:ce8896473775 edit files
bf55991af17e largefiles: shorten test suite by using log --template Na'Tosha Bard <natosha@unity3d.com> parents: 15383 diff changeset	745 0:30d30fe6a5be add files
15383 155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	746 $ cat normal3
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	747 normal3-modified
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	748 $ cat sub/normal4
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	749 normal4-modified
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	750 $ cat sub/large4
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	751 large4-modified
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	752 $ cat sub2/large6
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	753 large6-modified
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	754 $ cat sub2/large7
155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15382 diff changeset	755 large7
15598 a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15575 diff changeset	756
a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15575 diff changeset	757 Test that renaming a largefile results in correct output for status
a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15575 diff changeset	758
a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15575 diff changeset	759 $ hg rename sub/large4 large4-renamed
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	760 $ hg commit -m "test rename output"
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	761 Invoking status precommit hook
15598 a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15575 diff changeset	762 A large4-renamed
a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15575 diff changeset	763 R sub/large4
a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15575 diff changeset	764 $ cat large4-renamed
a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15575 diff changeset	765 large4-modified
a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15575 diff changeset	766 $ cd sub2
a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15575 diff changeset	767 $ hg rename large6 large6-renamed
a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15575 diff changeset	768 $ hg st
a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15575 diff changeset	769 A sub2/large6-renamed
a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15575 diff changeset	770 R sub2/large6
15944 f19d5c852f9b largefiles: add --normal option to hg add (issue3061) Na'Tosha Bard <natosha@unity3d.com> parents: 15930 diff changeset	771 $ cd ..
f19d5c852f9b largefiles: add --normal option to hg add (issue3061) Na'Tosha Bard <natosha@unity3d.com> parents: 15930 diff changeset	772
f19d5c852f9b largefiles: add --normal option to hg add (issue3061) Na'Tosha Bard <natosha@unity3d.com> parents: 15930 diff changeset	773 Test --normal flag
f19d5c852f9b largefiles: add --normal option to hg add (issue3061) Na'Tosha Bard <natosha@unity3d.com> parents: 15930 diff changeset	774
f19d5c852f9b largefiles: add --normal option to hg add (issue3061) Na'Tosha Bard <natosha@unity3d.com> parents: 15930 diff changeset	775 $ dd if=/dev/urandom bs=2k count=11k > new-largefile 2> /dev/null
f19d5c852f9b largefiles: add --normal option to hg add (issue3061) Na'Tosha Bard <natosha@unity3d.com> parents: 15930 diff changeset	776 $ hg add --normal --large new-largefile
f19d5c852f9b largefiles: add --normal option to hg add (issue3061) Na'Tosha Bard <natosha@unity3d.com> parents: 15930 diff changeset	777 abort: --normal cannot be used with --large
f19d5c852f9b largefiles: add --normal option to hg add (issue3061) Na'Tosha Bard <natosha@unity3d.com> parents: 15930 diff changeset	778 [255]
f19d5c852f9b largefiles: add --normal option to hg add (issue3061) Na'Tosha Bard <natosha@unity3d.com> parents: 15930 diff changeset	779 $ hg add --normal new-largefile
f19d5c852f9b largefiles: add --normal option to hg add (issue3061) Na'Tosha Bard <natosha@unity3d.com> parents: 15930 diff changeset	780 new-largefile: up to 69 MB of RAM may be required to manage this file
f19d5c852f9b largefiles: add --normal option to hg add (issue3061) Na'Tosha Bard <natosha@unity3d.com> parents: 15930 diff changeset	781 (use 'hg revert new-largefile' to cancel the pending addition)
f19d5c852f9b largefiles: add --normal option to hg add (issue3061) Na'Tosha Bard <natosha@unity3d.com> parents: 15930 diff changeset	782 $ cd ..
15303 07811b3b119b largefiles: include 'largefiles' in converted repository requirements Eli Carter <eli.carter@tektronix.com> parents: 15301 diff changeset	783
15336 83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	784 vanilla clients not locked out from largefiles servers on vanilla repos
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	785 $ mkdir r1
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	786 $ cd r1
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	787 $ hg init
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	788 $ echo c1 > f1
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	789 $ hg add f1
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	790 $ hg commit -m "m1"
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	791 Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	792 A f1
15336 83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	793 $ cd ..
15378 fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test Thomas Arendsen Hein <thomas@intevation.de> parents: 15377 diff changeset	794 $ hg serve -R r1 -d -p $HGPORT --pid-file hg.pid
fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test Thomas Arendsen Hein <thomas@intevation.de> parents: 15377 diff changeset	795 $ cat hg.pid >> $DAEMON_PIDS
15377 107ff02b134d tests: make largefiles test use $HGPORT instead of 8001 Thomas Arendsen Hein <thomas@intevation.de> parents: 15374 diff changeset	796 $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT r2
15336 83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	797 requesting all changes
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	798 adding changesets
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	799 adding manifests
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	800 adding file changes
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	801 added 1 changesets with 1 changes to 1 files
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	802 updating to branch default
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	803 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	804
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	805 largefiles clients still work with vanilla servers
15378 fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test Thomas Arendsen Hein <thomas@intevation.de> parents: 15377 diff changeset	806 $ hg --config extensions.largefiles=! serve -R r1 -d -p $HGPORT1 --pid-file hg.pid
fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test Thomas Arendsen Hein <thomas@intevation.de> parents: 15377 diff changeset	807 $ cat hg.pid >> $DAEMON_PIDS
fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test Thomas Arendsen Hein <thomas@intevation.de> parents: 15377 diff changeset	808 $ hg clone http://localhost:$HGPORT1 r3
15336 83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	809 requesting all changes
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	810 adding changesets
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	811 adding manifests
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	812 adding file changes
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	813 added 1 changesets with 1 changes to 1 files
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	814 updating to branch default
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	815 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	816
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	817 vanilla clients locked out from largefiles http repos
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	818 $ mkdir r4
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	819 $ cd r4
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	820 $ hg init
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	821 $ echo c1 > f1
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	822 $ hg add --large f1
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	823 $ hg commit -m "m1"
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	824 Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	825 A f1
15336 83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	826 $ cd ..
15378 fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test Thomas Arendsen Hein <thomas@intevation.de> parents: 15377 diff changeset	827 $ hg serve -R r4 -d -p $HGPORT2 --pid-file hg.pid
fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test Thomas Arendsen Hein <thomas@intevation.de> parents: 15377 diff changeset	828 $ cat hg.pid >> $DAEMON_PIDS
fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test Thomas Arendsen Hein <thomas@intevation.de> parents: 15377 diff changeset	829 $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT2 r5
15336 83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	830 abort: remote error:
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	831
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	832 This repository uses the largefiles extension.
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	833
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	834 Please enable it in your Mercurial config file.
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	835 [255]
15378 fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test Thomas Arendsen Hein <thomas@intevation.de> parents: 15377 diff changeset	836
fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test Thomas Arendsen Hein <thomas@intevation.de> parents: 15377 diff changeset	837 used all HGPORTs, kill all daemons
fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test Thomas Arendsen Hein <thomas@intevation.de> parents: 15377 diff changeset	838 $ "$TESTDIR/killdaemons.py"
15336 83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	839
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	840 vanilla clients locked out from largefiles ssh repos
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	841 $ hg --config extensions.largefiles=! clone -e "python $TESTDIR/dummyssh" ssh://user@dummy/r4 r5
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	842 abort: remote error:
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	843
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	844 This repository uses the largefiles extension.
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	845
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	846 Please enable it in your Mercurial config file.
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	847 [255]
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	848
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	849 largefiles clients refuse to push largefiles repos to vanilla servers
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	850 $ mkdir r6
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	851 $ cd r6
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	852 $ hg init
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	853 $ echo c1 > f1
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	854 $ hg add f1
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	855 $ hg commit -m "m1"
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	856 Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	857 A f1
15336 83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	858 $ cat >> .hg/hgrc <<!
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	859 > [web]
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	860 > push_ssl = false
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	861 > allow_push = *
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	862 > !
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	863 $ cd ..
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	864 $ hg clone r6 r7
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	865 updating to branch default
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	866 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	867 $ cd r7
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	868 $ echo c2 > f2
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	869 $ hg add --large f2
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	870 $ hg commit -m "m2"
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	871 Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	872 A f2
15378 fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test Thomas Arendsen Hein <thomas@intevation.de> parents: 15377 diff changeset	873 $ hg --config extensions.largefiles=! -R ../r6 serve -d -p $HGPORT --pid-file ../hg.pid
fbebc039687c tests: use $DAEMON_PIDS and killdaemons in largefiles test Thomas Arendsen Hein <thomas@intevation.de> parents: 15377 diff changeset	874 $ cat ../hg.pid >> $DAEMON_PIDS
15377 107ff02b134d tests: make largefiles test use $HGPORT instead of 8001 Thomas Arendsen Hein <thomas@intevation.de> parents: 15374 diff changeset	875 $ hg push http://localhost:$HGPORT
107ff02b134d tests: make largefiles test use $HGPORT instead of 8001 Thomas Arendsen Hein <thomas@intevation.de> parents: 15374 diff changeset	876 pushing to http://localhost:$HGPORT/
15336 83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	877 searching for changes
15377 107ff02b134d tests: make largefiles test use $HGPORT instead of 8001 Thomas Arendsen Hein <thomas@intevation.de> parents: 15374 diff changeset	878 abort: http://localhost:$HGPORT/ does not appear to be a largefile store
15336 83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	879 [255]
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	880 $ cd ..
83debcd7064b largefiles: test interaction between largefiles and vanilla clients and servers Andrew Pritchard <awpritchard@gmail.com> parents: 15332 diff changeset	881
15778 f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149) Kevin Gessner <kevin@fogcreek.com> parents: 15742 diff changeset	882 putlfile errors are shown (issue3123)
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149) Kevin Gessner <kevin@fogcreek.com> parents: 15742 diff changeset	883 Corrupt the cached largefile in r7
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149) Kevin Gessner <kevin@fogcreek.com> parents: 15742 diff changeset	884 $ echo corruption > $USERCACHE/4cdac4d8b084d0b599525cf732437fb337d422a8
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149) Kevin Gessner <kevin@fogcreek.com> parents: 15742 diff changeset	885 $ hg init empty
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149) Kevin Gessner <kevin@fogcreek.com> parents: 15742 diff changeset	886 $ hg serve -R empty -d -p $HGPORT1 --pid-file hg.pid \
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149) Kevin Gessner <kevin@fogcreek.com> parents: 15742 diff changeset	887 > --config 'web.allow_push=*' --config web.push_ssl=False
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149) Kevin Gessner <kevin@fogcreek.com> parents: 15742 diff changeset	888 $ cat hg.pid >> $DAEMON_PIDS
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149) Kevin Gessner <kevin@fogcreek.com> parents: 15742 diff changeset	889 $ hg push -R r7 http://localhost:$HGPORT1
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149) Kevin Gessner <kevin@fogcreek.com> parents: 15742 diff changeset	890 pushing to http://localhost:$HGPORT1/
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149) Kevin Gessner <kevin@fogcreek.com> parents: 15742 diff changeset	891 searching for changes
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149) Kevin Gessner <kevin@fogcreek.com> parents: 15742 diff changeset	892 remote: largefiles: failed to put 4cdac4d8b084d0b599525cf732437fb337d422a8 into store: largefile contents do not match hash
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149) Kevin Gessner <kevin@fogcreek.com> parents: 15742 diff changeset	893 abort: remotestore: could not put $TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 to remote store http://localhost:$HGPORT1/
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149) Kevin Gessner <kevin@fogcreek.com> parents: 15742 diff changeset	894 [255]
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149) Kevin Gessner <kevin@fogcreek.com> parents: 15742 diff changeset	895 $ rm -rf empty
f15c646bffc7 largefiles: display remote errors from putlfile (issue3123) (issue3149) Kevin Gessner <kevin@fogcreek.com> parents: 15742 diff changeset	896
15318 acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	897 Clone a local repository owned by another user
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	898 We have to simulate that here by setting $HOME and removing write permissions
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	899 $ ORIGHOME="$HOME"
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	900 $ mkdir alice
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	901 $ HOME="`pwd`/alice"
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	902 $ cd alice
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	903 $ hg init pubrepo
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	904 $ cd pubrepo
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	905 $ dd if=/dev/urandom bs=1k count=11k > a-large-file 2> /dev/null
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	906 $ hg add --large a-large-file
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	907 $ hg commit -m "Add a large file"
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	908 Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	909 A a-large-file
15318 acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	910 $ cd ..
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	911 $ chmod -R a-w pubrepo
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	912 $ cd ..
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	913 $ mkdir bob
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	914 $ HOME="`pwd`/bob"
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	915 $ cd bob
15374 6cb8b46ea90a tests: fix spurious largefiles test failure on Cygwin Matt Mackall <mpm@selenic.com> parents: 15372 diff changeset	916 $ hg clone --pull ../alice/pubrepo pubrepo
15318 acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	917 requesting all changes
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	918 adding changesets
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	919 adding manifests
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	920 adding file changes
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	921 added 1 changesets with 1 changes to 1 files
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	922 updating to branch default
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	923 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	924 getting changed largefiles
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	925 1 largefiles updated, 0 removed
acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	926 $ cd ..
15490 dd856380cce3 tests: don't leave temporary directories without write permission behind Mads Kiilerich <mads@kiilerich.com> parents: 15447 diff changeset	927 $ chmod -R u+w alice/pubrepo
15318 acecb419e5b0 largefiles: testcase to simulate inter-user clone on local machine Eli Carter <eli.carter@tektronix.com> parents: 15313 diff changeset	928 $ HOME="$ORIGHOME"
15369 b4ea79f88268 largefiles: bugfix for symlink handling with testcase Eli Carter <eli.carter@tektronix.com> parents: 15366 diff changeset	929
b4ea79f88268 largefiles: bugfix for symlink handling with testcase Eli Carter <eli.carter@tektronix.com> parents: 15366 diff changeset	930 Symlink to a large largefile should behave the same as a symlink to a normal file
b4ea79f88268 largefiles: bugfix for symlink handling with testcase Eli Carter <eli.carter@tektronix.com> parents: 15366 diff changeset	931 $ hg init largesymlink
b4ea79f88268 largefiles: bugfix for symlink handling with testcase Eli Carter <eli.carter@tektronix.com> parents: 15366 diff changeset	932 $ cd largesymlink
b4ea79f88268 largefiles: bugfix for symlink handling with testcase Eli Carter <eli.carter@tektronix.com> parents: 15366 diff changeset	933 $ dd if=/dev/zero bs=1k count=10k of=largefile 2>/dev/null
b4ea79f88268 largefiles: bugfix for symlink handling with testcase Eli Carter <eli.carter@tektronix.com> parents: 15366 diff changeset	934 $ hg add --large largefile
b4ea79f88268 largefiles: bugfix for symlink handling with testcase Eli Carter <eli.carter@tektronix.com> parents: 15366 diff changeset	935 $ hg commit -m "commit a large file"
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	936 Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	937 A largefile
15369 b4ea79f88268 largefiles: bugfix for symlink handling with testcase Eli Carter <eli.carter@tektronix.com> parents: 15366 diff changeset	938 $ ln -s largefile largelink
b4ea79f88268 largefiles: bugfix for symlink handling with testcase Eli Carter <eli.carter@tektronix.com> parents: 15366 diff changeset	939 $ hg add largelink
b4ea79f88268 largefiles: bugfix for symlink handling with testcase Eli Carter <eli.carter@tektronix.com> parents: 15366 diff changeset	940 $ hg commit -m "commit a large symlink"
15795 8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	941 Invoking status precommit hook
8bed8551d535 largefiles: add precommit hook to check for inappropriate locking Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	942 A largelink
15369 b4ea79f88268 largefiles: bugfix for symlink handling with testcase Eli Carter <eli.carter@tektronix.com> parents: 15366 diff changeset	943 $ rm -f largelink
b4ea79f88268 largefiles: bugfix for symlink handling with testcase Eli Carter <eli.carter@tektronix.com> parents: 15366 diff changeset	944 $ hg up >/dev/null
15372 695ac6aca77f check-code: fix issues with finding patterns in unified tests, fix tests Matt Mackall <mpm@selenic.com> parents: 15370 diff changeset	945 $ test -f largelink
15369 b4ea79f88268 largefiles: bugfix for symlink handling with testcase Eli Carter <eli.carter@tektronix.com> parents: 15366 diff changeset	946 [1]
b4ea79f88268 largefiles: bugfix for symlink handling with testcase Eli Carter <eli.carter@tektronix.com> parents: 15366 diff changeset	947 $ test -L largelink
b4ea79f88268 largefiles: bugfix for symlink handling with testcase Eli Carter <eli.carter@tektronix.com> parents: 15366 diff changeset	948 [1]
b4ea79f88268 largefiles: bugfix for symlink handling with testcase Eli Carter <eli.carter@tektronix.com> parents: 15366 diff changeset	949 $ rm -f largelink # make next part of the test independent of the previous
b4ea79f88268 largefiles: bugfix for symlink handling with testcase Eli Carter <eli.carter@tektronix.com> parents: 15366 diff changeset	950 $ hg up -C >/dev/null
15372 695ac6aca77f check-code: fix issues with finding patterns in unified tests, fix tests Matt Mackall <mpm@selenic.com> parents: 15370 diff changeset	951 $ test -f largelink
15369 b4ea79f88268 largefiles: bugfix for symlink handling with testcase Eli Carter <eli.carter@tektronix.com> parents: 15366 diff changeset	952 $ test -L largelink
b4ea79f88268 largefiles: bugfix for symlink handling with testcase Eli Carter <eli.carter@tektronix.com> parents: 15366 diff changeset	953 $ cd ..
b4ea79f88268 largefiles: bugfix for symlink handling with testcase Eli Carter <eli.carter@tektronix.com> parents: 15366 diff changeset	954
b4ea79f88268 largefiles: bugfix for symlink handling with testcase Eli Carter <eli.carter@tektronix.com> parents: 15366 diff changeset	955

Mercurial > hg > mercurial-crew

annotate tests/test-largefiles.t @ 15944:f19d5c852f9b stable