Mercurial > hg
annotate tests/test-largefiles.t @ 17702:57fe5aca86af
Merge with crew-stable
author | Bryan O'Sullivan <bryano@fb.com> |
---|---|
date | Tue, 02 Oct 2012 14:31:25 -0700 |
parents | 60229b466e5a b3f0f9a39c4e |
children | 6047947afb6b |
rev | line source |
---|---|
17088
31f7dd50ed40
test-largefiles: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17017
diff
changeset
|
1 $ USERCACHE="$TESTTMP/cache"; export USERCACHE |
17092
5d0d99952494
tests: make rm of usercache in test-largefiles.t more robust
Mads Kiilerich <mads@kiilerich.com>
parents:
17089
diff
changeset
|
2 $ mkdir "${USERCACHE}" |
15216
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
3 $ 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
|
4 > [extensions] |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
5 > largefiles= |
15251
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
6 > purge= |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
7 > 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
|
8 > transplant= |
15742
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15630
diff
changeset
|
9 > [phases] |
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15630
diff
changeset
|
10 > 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
|
11 > [largefiles] |
15304
9aa9d4bb3d88
largefiles: rename config setting 'size' to 'minsize'
Greg Ward <greg@gerg.ca>
parents:
15303
diff
changeset
|
12 > 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
|
13 > patterns=glob:**.dat |
15778
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15742
diff
changeset
|
14 > usercache=${USERCACHE} |
15795
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
15 > [hooks] |
17462
8085fed2bf0a
tests: correct quoting of double quotes in here documents used to write hooks
Jim Hague <jim.hague@acm.org>
parents:
17411
diff
changeset
|
16 > precommit=sh -c "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
|
17 > EOF |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
18 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
19 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
|
20 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
|
21 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
|
22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
23 $ 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
|
24 $ cd a |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
25 $ mkdir sub |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
26 $ 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
|
27 $ 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
|
28 $ 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
|
29 $ 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
|
30 $ 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
|
31 $ 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
|
32 $ 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
|
33 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
34 A large1 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
35 A normal1 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
36 A sub/large2 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
37 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
|
38 $ 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
|
39 $ 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
|
40 $ 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
|
41 $ echo large22 > sub/large2 |
15795
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
42 $ hg commit -m "edit files" |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
43 Invoking status precommit hook |
15225
b450a4d427ef
largefiles: add test for status
Na'Tosha Bard <natosha@unity3d.com>
parents:
15216
diff
changeset
|
44 M large1 |
b450a4d427ef
largefiles: add test for status
Na'Tosha Bard <natosha@unity3d.com>
parents:
15216
diff
changeset
|
45 M normal1 |
b450a4d427ef
largefiles: add test for status
Na'Tosha Bard <natosha@unity3d.com>
parents:
15216
diff
changeset
|
46 M sub/large2 |
b450a4d427ef
largefiles: add test for status
Na'Tosha Bard <natosha@unity3d.com>
parents:
15216
diff
changeset
|
47 M sub/normal2 |
15787
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
48 $ hg sum --large |
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
49 parent: 1:ce8896473775 tip |
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
50 edit files |
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
51 branch: default |
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
52 commit: (clean) |
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
53 update: (current) |
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
54 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
|
55 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
56 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
|
57 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
58 $ cat normal1 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
59 normal11 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
60 $ cat large1 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
61 large11 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
62 $ 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
|
63 normal22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
64 $ 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
|
65 large22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
66 |
16586
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
67 Test status, subdir and unknown files |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
68 |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
69 $ echo unknown > sub/unknown |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
70 $ hg st --all |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
71 ? sub/unknown |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
72 C large1 |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
73 C normal1 |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
74 C sub/large2 |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
75 C sub/normal2 |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
76 $ hg st --all sub |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
77 ? sub/unknown |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
78 C sub/large2 |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
79 C sub/normal2 |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
80 $ rm sub/unknown |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
81 |
17576
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
82 Test exit codes for remove warning cases (modified and still exiting) |
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
83 |
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
84 $ hg remove -A large1 |
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
85 not removing large1: file still exists (use forget to undo) |
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
86 [1] |
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
87 $ echo 'modified' > large1 |
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
88 $ hg remove large1 |
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
89 not removing large1: file is modified (use forget to undo) |
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
90 [1] |
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
91 $ hg up -Cq |
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
92 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
93 Remove both largefiles and normal files. |
17594
536fee6a5486
largefiles: fix trailing spaces in test-largefiles.t
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17579
diff
changeset
|
94 |
15216
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
95 $ hg remove normal1 large1 |
16281
d8cc67114dc3
largefiles: suppress unexpected warning of 'hg status' for removed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16141
diff
changeset
|
96 $ hg status large1 |
d8cc67114dc3
largefiles: suppress unexpected warning of 'hg status' for removed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16141
diff
changeset
|
97 R large1 |
15216
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
98 $ 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
|
99 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
100 R large1 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
101 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
|
102 $ ls |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
103 sub |
15786
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15629
diff
changeset
|
104 $ echo "testlargefile" > large1-test |
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15629
diff
changeset
|
105 $ 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
|
106 $ hg st |
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15629
diff
changeset
|
107 A large1-test |
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15629
diff
changeset
|
108 $ hg rm large1-test |
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15629
diff
changeset
|
109 not removing large1-test: file has been marked for add (use forget to undo) |
17576
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
110 [1] |
15786
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15629
diff
changeset
|
111 $ hg st |
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15629
diff
changeset
|
112 A large1-test |
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15629
diff
changeset
|
113 $ hg forget large1-test |
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15629
diff
changeset
|
114 $ hg st |
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15629
diff
changeset
|
115 ? large1-test |
17576
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
116 $ hg remove large1-test |
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
117 not removing large1-test: file is untracked |
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
118 [1] |
17579
cbacb5a813dd
largefiles: preserve the exit status of the forget command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17576
diff
changeset
|
119 $ hg forget large1-test |
cbacb5a813dd
largefiles: preserve the exit status of the forget command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17576
diff
changeset
|
120 not removing large1-test: file is already untracked |
cbacb5a813dd
largefiles: preserve the exit status of the forget command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17576
diff
changeset
|
121 [1] |
15786
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15629
diff
changeset
|
122 $ 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
|
123 |
15598
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
124 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
|
125 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
126 $ 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
|
127 $ 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
|
128 $ hg commit -m "copy files" |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
129 Invoking status precommit hook |
15598
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
130 A large1 |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
131 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
|
132 $ cat normal1 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
133 normal22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
134 $ cat large1 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
135 large22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
136 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
137 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
|
138 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
139 $ 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
|
140 $ 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
|
141 $ 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
|
142 $ 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
|
143 $ 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
|
144 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
145 A large3 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
146 A normal3 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
147 A sub/large4 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
148 A sub/normal4 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
149 R large1 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
150 R normal1 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
151 R sub/large2 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
152 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
|
153 $ cat normal3 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
154 normal22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
155 $ cat large3 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
156 large22 |
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/normal4 |
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/large4 |
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 |
17245
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
162 Test copies and moves from a directory other than root (issue3516) |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
163 |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
164 $ cd .. |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
165 $ hg init lf_cpmv |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
166 $ cd lf_cpmv |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
167 $ mkdir dira |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
168 $ mkdir dira/dirb |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
169 $ touch dira/dirb/largefile |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
170 $ hg add --large dira/dirb/largefile |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
171 $ hg commit -m "added" |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
172 Invoking status precommit hook |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
173 A dira/dirb/largefile |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
174 $ cd dira |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
175 $ hg cp dirb/largefile foo/largefile |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
176 $ hg ci -m "deep copy" |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
177 Invoking status precommit hook |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
178 A dira/foo/largefile |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
179 $ find . | sort |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
180 . |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
181 ./dirb |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
182 ./dirb/largefile |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
183 ./foo |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
184 ./foo/largefile |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
185 $ hg mv foo/largefile baz/largefile |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
186 $ hg ci -m "moved" |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
187 Invoking status precommit hook |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
188 A dira/baz/largefile |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
189 R dira/foo/largefile |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
190 $ find . | sort |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
191 . |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
192 ./baz |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
193 ./baz/largefile |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
194 ./dirb |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
195 ./dirb/largefile |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
196 ./foo |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
197 $ cd ../../a |
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
198 |
17089
0c1d10351869
tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
17088
diff
changeset
|
199 #if hgweb |
16449
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
200 Test display of largefiles in hgweb |
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
201 |
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
202 $ hg serve -d -p $HGPORT --pid-file ../hg.pid |
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
203 $ cat ../hg.pid >> $DAEMON_PIDS |
17017
953faba28e91
tests: prepare get-with-headers.py for MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
16986
diff
changeset
|
204 $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file/tip/?style=raw' |
16449
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
205 200 Script output follows |
17594
536fee6a5486
largefiles: fix trailing spaces in test-largefiles.t
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17579
diff
changeset
|
206 |
536fee6a5486
largefiles: fix trailing spaces in test-largefiles.t
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17579
diff
changeset
|
207 |
16449
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
208 drwxr-xr-x sub |
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
209 -rw-r--r-- 41 large3 |
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
210 -rw-r--r-- 9 normal3 |
17594
536fee6a5486
largefiles: fix trailing spaces in test-largefiles.t
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17579
diff
changeset
|
211 |
536fee6a5486
largefiles: fix trailing spaces in test-largefiles.t
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17579
diff
changeset
|
212 |
17017
953faba28e91
tests: prepare get-with-headers.py for MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
16986
diff
changeset
|
213 $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file/tip/sub/?style=raw' |
16449
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
214 200 Script output follows |
17594
536fee6a5486
largefiles: fix trailing spaces in test-largefiles.t
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17579
diff
changeset
|
215 |
536fee6a5486
largefiles: fix trailing spaces in test-largefiles.t
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17579
diff
changeset
|
216 |
16449
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
217 -rw-r--r-- 41 large4 |
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
218 -rw-r--r-- 9 normal4 |
17594
536fee6a5486
largefiles: fix trailing spaces in test-largefiles.t
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17579
diff
changeset
|
219 |
536fee6a5486
largefiles: fix trailing spaces in test-largefiles.t
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17579
diff
changeset
|
220 |
17466
d5a3bda6e170
killdaemons: take file argument explicitely
Patrick Mezard <patrick@mezard.eu>
parents:
17439
diff
changeset
|
221 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS |
17089
0c1d10351869
tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
17088
diff
changeset
|
222 #endif |
16449
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
223 |
15216
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
224 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
|
225 archiving. |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
226 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
227 $ 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
|
228 $ 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
|
229 $ 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
|
230 $ 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
|
231 $ 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
|
232 $ cd ../archive0 |
17594
536fee6a5486
largefiles: fix trailing spaces in test-largefiles.t
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17579
diff
changeset
|
233 $ cat normal1 |
15216
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
234 normal1 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
235 $ cat large1 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
236 large1 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
237 $ 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
|
238 normal2 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
239 $ 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
|
240 large2 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
241 $ cd ../archive1 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
242 $ cat normal1 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
243 normal11 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
244 $ cat large1 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
245 large11 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
246 $ 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
|
247 normal22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
248 $ 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
|
249 large22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
250 $ cd ../archive2 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
251 $ ls |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
252 sub |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
253 $ 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
|
254 normal22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
255 $ 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
|
256 large22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
257 $ cd ../archive3 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
258 $ cat normal1 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
259 normal22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
260 $ cat large1 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
261 large22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
262 $ 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
|
263 normal22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
264 $ 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
|
265 large22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
266 $ cd ../archive4 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
267 $ cat normal3 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
268 normal22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
269 $ cat large3 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
270 large22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
271 $ 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
|
272 normal22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
273 $ 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
|
274 large22 |
15251
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
275 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
276 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
|
277 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
278 $ cd ../a |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
279 $ 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
|
280 $ 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
|
281 $ 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
|
282 $ 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
|
283 $ 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
|
284 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
285 M large3 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
286 M normal3 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
287 M sub/large4 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
288 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
|
289 $ cat normal3 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
290 normal3 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
291 $ cat large3 |
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 $ 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
|
294 normal4 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
295 $ 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
|
296 large4 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
297 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
298 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
|
299 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
300 $ cd ../a |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
301 $ 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
|
302 $ 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
|
303 $ 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
|
304 $ 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
|
305 $ cd sub |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
306 $ 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
|
307 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
308 M large3 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
309 M normal3 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
310 M sub/large4 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
311 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
|
312 $ cat ../normal3 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
313 normal33 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
314 $ cat ../large3 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
315 large33 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
316 $ cat normal4 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
317 normal44 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
318 $ cat large4 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
319 large44 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
320 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
321 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
|
322 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
323 $ cd .. |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
324 $ 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
|
325 $ hg commit .hglf/large3 -m "try to commit standin" |
15253
67d010779907
largefiles: improve error reporting
Greg Ward <greg@gerg.ca>
parents:
15251
diff
changeset
|
326 abort: file ".hglf/large3" is a largefile standin |
67d010779907
largefiles: improve error reporting
Greg Ward <greg@gerg.ca>
parents:
15251
diff
changeset
|
327 (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
|
328 [255] |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
329 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
330 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
|
331 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
332 $ 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
|
333 $ 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
|
334 $ 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
|
335 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
|
336 $ mkdir sub2 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
337 $ 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
|
338 $ 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
|
339 $ hg add --large sub2 |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
340 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
|
341 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
|
342 $ hg st |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
343 M large3 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
344 A large5 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
345 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
|
346 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
|
347 |
16282
50247a7a9983
largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16281
diff
changeset
|
348 Test "hg status" with combination of 'file pattern' and 'directory |
50247a7a9983
largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16281
diff
changeset
|
349 pattern' for largefiles: |
50247a7a9983
largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16281
diff
changeset
|
350 |
50247a7a9983
largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16281
diff
changeset
|
351 $ hg status sub2/large6 sub2 |
50247a7a9983
largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16281
diff
changeset
|
352 A sub2/large6 |
50247a7a9983
largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16281
diff
changeset
|
353 A sub2/large7 |
50247a7a9983
largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16281
diff
changeset
|
354 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
355 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
|
356 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
357 $ echo testdata > test.dat |
15330
1e6fcce4aab3
largefiles: use smaller files in test script
Greg Ward <greg@gerg.ca>
parents:
15329
diff
changeset
|
358 $ 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
|
359 $ hg add |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
360 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
|
361 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
|
362 |
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
363 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
|
364 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
|
365 (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
|
366 |
15329
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
367 $ 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
|
368 $ 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
|
369 $ 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
|
370 adding ratherlarge as a largefile |
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
371 adding medium |
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
372 $ hg forget medium |
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
373 $ 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
|
374 adding medium as a largefile |
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
375 $ 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
|
376 $ 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
|
377 adding notlarge |
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
378 $ 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
|
379 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
380 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
|
381 |
15329
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
382 $ 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
|
383 $ 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
|
384 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
|
385 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
|
386 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
|
387 R large3 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
388 ? large5 |
15329
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
389 ? medium |
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
390 ? notlarge |
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
391 ? ratherlarge |
15251
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
392 ? reallylarge |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
393 ? test.dat |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
394 $ hg st |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
395 ? large3 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
396 ? large5 |
15329
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
397 ? medium |
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
398 ? notlarge |
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
399 ? ratherlarge |
15251
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
400 ? reallylarge |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
401 ? test.dat |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
402 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
403 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
|
404 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
|
405 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
406 $ 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
|
407 $ 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
|
408 large44 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
409 $ 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
|
410 large6 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
411 $ 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
|
412 large7 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
413 |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
414 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
|
415 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
|
416 accident. |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
417 |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
418 $ rm normal3 |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
419 $ rm sub/large4 |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
420 $ echo "testing addremove with patterns" > testaddremove.dat |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
421 $ echo "normaladdremove" > normaladdremove |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
422 $ hg addremove |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
423 removing sub/large4 |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
424 adding testaddremove.dat as a largefile |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
425 removing normal3 |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
426 adding normaladdremove |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
427 |
17229
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
428 Test addremove with -R |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
429 |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
430 $ hg up -C |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
431 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
432 getting changed largefiles |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
433 1 largefiles updated, 0 removed |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
434 $ rm normal3 |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
435 $ rm sub/large4 |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
436 $ echo "testing addremove with patterns" > testaddremove.dat |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
437 $ echo "normaladdremove" > normaladdremove |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
438 $ cd .. |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
439 $ hg -R a addremove |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
440 removing sub/large4 |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
441 adding a/testaddremove.dat as a largefile (glob) |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
442 removing normal3 |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
443 adding normaladdremove |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
444 $ cd a |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
445 |
17230
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
446 Test 3364 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
447 $ hg clone . ../addrm |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
448 updating to branch default |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
449 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
450 getting changed largefiles |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
451 3 largefiles updated, 0 removed |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
452 $ cd ../addrm |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
453 $ cat >> .hg/hgrc <<EOF |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
454 > [hooks] |
17462
8085fed2bf0a
tests: correct quoting of double quotes in here documents used to write hooks
Jim Hague <jim.hague@acm.org>
parents:
17411
diff
changeset
|
455 > post-commit.stat=sh -c "echo \\"Invoking status postcommit hook\\"; hg status -A" |
17230
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
456 > EOF |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
457 $ touch foo |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
458 $ hg add --large foo |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
459 $ hg ci -m "add foo" |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
460 Invoking status precommit hook |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
461 A foo |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
462 Invoking status postcommit hook |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
463 C foo |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
464 C normal3 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
465 C sub/large4 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
466 C sub/normal4 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
467 C sub2/large6 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
468 C sub2/large7 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
469 $ rm foo |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
470 $ hg st |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
471 ! foo |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
472 hmm.. no precommit invoked, but there is a postcommit?? |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
473 $ hg ci -m "will not checkin" |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
474 nothing changed |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
475 Invoking status postcommit hook |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
476 ! foo |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
477 C normal3 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
478 C sub/large4 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
479 C sub/normal4 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
480 C sub2/large6 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
481 C sub2/large7 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
482 [1] |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
483 $ hg addremove |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
484 removing foo |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
485 $ hg st |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
486 R foo |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
487 $ hg ci -m "used to say nothing changed" |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
488 Invoking status precommit hook |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
489 R foo |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
490 Invoking status postcommit hook |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
491 C normal3 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
492 C sub/large4 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
493 C sub/normal4 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
494 C sub2/large6 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
495 C sub2/large7 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
496 $ hg st |
17231
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
497 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
498 Test 3507 (both normal files and largefiles were a problem) |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
499 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
500 $ touch normal |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
501 $ touch large |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
502 $ hg add normal |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
503 $ hg add --large large |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
504 $ hg ci -m "added" |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
505 Invoking status precommit hook |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
506 A large |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
507 A normal |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
508 Invoking status postcommit hook |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
509 C large |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
510 C normal |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
511 C normal3 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
512 C sub/large4 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
513 C sub/normal4 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
514 C sub2/large6 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
515 C sub2/large7 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
516 $ hg remove normal |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
517 $ hg addremove --traceback |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
518 $ hg ci -m "addremoved normal" |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
519 Invoking status precommit hook |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
520 R normal |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
521 Invoking status postcommit hook |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
522 C large |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
523 C normal3 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
524 C sub/large4 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
525 C sub/normal4 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
526 C sub2/large6 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
527 C sub2/large7 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
528 $ hg up -C '.^' |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
529 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
530 getting changed largefiles |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
531 0 largefiles updated, 0 removed |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
532 $ hg remove large |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
533 $ hg addremove --traceback |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
534 $ hg ci -m "removed large" |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
535 Invoking status precommit hook |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
536 R large |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
537 created new head |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
538 Invoking status postcommit hook |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
539 C normal |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
540 C normal3 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
541 C sub/large4 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
542 C sub/normal4 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
543 C sub2/large6 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
544 C sub2/large7 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
545 |
17658
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
546 Test commit -A (issue 3542) |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
547 $ echo large8 > large8 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
548 $ hg add --large large8 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
549 $ hg ci -Am 'this used to add large8 as normal and commit both' |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
550 Invoking status precommit hook |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
551 A large8 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
552 Invoking status postcommit hook |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
553 C large8 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
554 C normal |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
555 C normal3 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
556 C sub/large4 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
557 C sub/normal4 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
558 C sub2/large6 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
559 C sub2/large7 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
560 $ rm large8 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
561 $ hg ci -Am 'this used to not notice the rm' |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
562 removing large8 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
563 Invoking status precommit hook |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
564 R large8 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
565 Invoking status postcommit hook |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
566 C normal |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
567 C normal3 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
568 C sub/large4 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
569 C sub/normal4 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
570 C sub2/large6 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
571 C sub2/large7 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
572 |
17232
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
573 Test that a standin can't be added as a large file |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
574 |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
575 $ touch large |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
576 $ hg add --large large |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
577 $ hg ci -m "add" |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
578 Invoking status precommit hook |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
579 A large |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
580 Invoking status postcommit hook |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
581 C large |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
582 C normal |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
583 C normal3 |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
584 C sub/large4 |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
585 C sub/normal4 |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
586 C sub2/large6 |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
587 C sub2/large7 |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
588 $ hg remove large |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
589 $ touch large |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
590 $ hg addremove --config largefiles.patterns=**large --traceback |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
591 adding large as a largefile |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
592 |
17271
a09cc6aeed4a
largefiles: support revsets for outgoing --large
Matt Harbison <matt_harbison@yahoo.com>
parents:
17270
diff
changeset
|
593 Test that outgoing --large works (with revsets too) |
a09cc6aeed4a
largefiles: support revsets for outgoing --large
Matt Harbison <matt_harbison@yahoo.com>
parents:
17270
diff
changeset
|
594 $ hg outgoing --rev '.^' --large |
17270
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
595 comparing with $TESTTMP/a (glob) |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
596 searching for changes |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
597 changeset: 8:c02fd3b77ec4 |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
598 user: test |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
599 date: Thu Jan 01 00:00:00 1970 +0000 |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
600 summary: add foo |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
601 |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
602 changeset: 9:289dd08c9bbb |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
603 user: test |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
604 date: Thu Jan 01 00:00:00 1970 +0000 |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
605 summary: used to say nothing changed |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
606 |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
607 changeset: 10:34f23ac6ac12 |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
608 user: test |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
609 date: Thu Jan 01 00:00:00 1970 +0000 |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
610 summary: added |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
611 |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
612 changeset: 12:710c1b2f523c |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
613 parent: 10:34f23ac6ac12 |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
614 user: test |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
615 date: Thu Jan 01 00:00:00 1970 +0000 |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
616 summary: removed large |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
617 |
17658
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
618 changeset: 13:0a3e75774479 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
619 user: test |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
620 date: Thu Jan 01 00:00:00 1970 +0000 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
621 summary: this used to add large8 as normal and commit both |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
622 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
623 changeset: 14:84f3d378175c |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
624 user: test |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
625 date: Thu Jan 01 00:00:00 1970 +0000 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
626 summary: this used to not notice the rm |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
627 |
17270
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
628 searching for changes |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
629 largefiles to upload: |
17658
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
630 large8 |
17270
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
631 large |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
632 foo |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
633 |
17230
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
634 $ cd ../a |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
635 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
636 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
|
637 |
15548
f76584098c88
largefiles: fix 'hg clone . ../foo' OSError abort
Martin Geisler <mg@lazybytes.net>
parents:
15384
diff
changeset
|
638 $ 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
|
639 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
|
640 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
|
641 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
|
642 3 largefiles updated, 0 removed |
15548
f76584098c88
largefiles: fix 'hg clone . ../foo' OSError abort
Martin Geisler <mg@lazybytes.net>
parents:
15384
diff
changeset
|
643 $ cd ../b |
15384
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
644 $ 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
|
645 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
|
646 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
|
647 5:9d5af5072dbd edit files again |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
648 4:74c02385b94c move files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
649 3:9e8fbc4bce62 copy files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
650 2:51a0ae4d5864 remove files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
651 1:ce8896473775 edit files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
652 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
|
653 $ cat normal3 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
654 normal33 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
655 $ 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
|
656 normal44 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
657 $ 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
|
658 large44 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
659 $ 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
|
660 large6 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
661 $ 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
|
662 large7 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
663 $ cd .. |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
664 $ 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
|
665 adding changesets |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
666 adding manifests |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
667 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
|
668 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
|
669 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
|
670 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
|
671 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
|
672 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
|
673 $ cd c |
15384
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
674 $ 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
|
675 3:9e8fbc4bce62 copy files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
676 2:51a0ae4d5864 remove files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
677 1:ce8896473775 edit files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
678 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
|
679 $ cat normal1 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
680 normal22 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
681 $ cat large1 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
682 large22 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
683 $ 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
|
684 normal22 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
685 $ 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
|
686 large22 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
687 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
688 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
|
689 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
|
690 |
17594
536fee6a5486
largefiles: fix trailing spaces in test-largefiles.t
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17579
diff
changeset
|
691 $ hg update -r 1 |
15251
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
692 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
|
693 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
|
694 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
|
695 $ cat large1 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
696 large11 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
697 $ 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
|
698 large22 |
16644
98a9266db803
largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16603
diff
changeset
|
699 $ cd .. |
98a9266db803
largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16603
diff
changeset
|
700 |
98a9266db803
largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16603
diff
changeset
|
701 Test cloning with --all-largefiles flag |
98a9266db803
largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16603
diff
changeset
|
702 |
17092
5d0d99952494
tests: make rm of usercache in test-largefiles.t more robust
Mads Kiilerich <mads@kiilerich.com>
parents:
17089
diff
changeset
|
703 $ rm "${USERCACHE}"/* |
16644
98a9266db803
largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16603
diff
changeset
|
704 $ hg clone --all-largefiles a a-backup |
98a9266db803
largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16603
diff
changeset
|
705 updating to branch default |
98a9266db803
largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16603
diff
changeset
|
706 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
98a9266db803
largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16603
diff
changeset
|
707 getting changed largefiles |
98a9266db803
largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16603
diff
changeset
|
708 3 largefiles updated, 0 removed |
98a9266db803
largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16603
diff
changeset
|
709 8 additional largefiles cached |
15251
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
710 |
17598
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
711 $ rm "${USERCACHE}"/* |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
712 $ hg clone --all-largefiles -u 0 a a-clone0 |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
713 updating to branch default |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
714 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
715 getting changed largefiles |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
716 2 largefiles updated, 0 removed |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
717 9 additional largefiles cached |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
718 $ hg -R a-clone0 sum |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
719 parent: 0:30d30fe6a5be |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
720 add files |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
721 branch: default |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
722 commit: (clean) |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
723 update: 7 new changesets (update) |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
724 |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
725 $ rm "${USERCACHE}"/* |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
726 $ hg clone --all-largefiles -u 1 a a-clone1 |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
727 updating to branch default |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
728 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
729 getting changed largefiles |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
730 2 largefiles updated, 0 removed |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
731 8 additional largefiles cached |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
732 $ hg -R a-clone1 sum |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
733 parent: 1:ce8896473775 |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
734 edit files |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
735 branch: default |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
736 commit: (clean) |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
737 update: 6 new changesets (update) |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
738 |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
739 $ rm "${USERCACHE}"/* |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
740 $ hg clone --all-largefiles -U a a-clone-u |
17599
56136786000f
largefiles: restore caching of largefiles with 'clone -U --all-largefiles'
Matt Harbison <matt_harbison@yahoo.com>
parents:
17598
diff
changeset
|
741 11 additional largefiles cached |
17598
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
742 $ hg -R a-clone-u sum |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
743 parent: -1:000000000000 (no revision checked out) |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
744 branch: default |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
745 commit: (clean) |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
746 update: 8 new changesets (update) |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
747 |
17600
3a1c6b64e052
largefiles: don't convert dest=None to dest=hg.defaultdest() in clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17599
diff
changeset
|
748 $ mkdir xyz |
3a1c6b64e052
largefiles: don't convert dest=None to dest=hg.defaultdest() in clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17599
diff
changeset
|
749 $ cd xyz |
3a1c6b64e052
largefiles: don't convert dest=None to dest=hg.defaultdest() in clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17599
diff
changeset
|
750 $ hg clone ../a |
3a1c6b64e052
largefiles: don't convert dest=None to dest=hg.defaultdest() in clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17599
diff
changeset
|
751 destination directory: a |
3a1c6b64e052
largefiles: don't convert dest=None to dest=hg.defaultdest() in clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17599
diff
changeset
|
752 updating to branch default |
3a1c6b64e052
largefiles: don't convert dest=None to dest=hg.defaultdest() in clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17599
diff
changeset
|
753 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3a1c6b64e052
largefiles: don't convert dest=None to dest=hg.defaultdest() in clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17599
diff
changeset
|
754 getting changed largefiles |
3a1c6b64e052
largefiles: don't convert dest=None to dest=hg.defaultdest() in clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17599
diff
changeset
|
755 3 largefiles updated, 0 removed |
3a1c6b64e052
largefiles: don't convert dest=None to dest=hg.defaultdest() in clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17599
diff
changeset
|
756 $ cd .. |
3a1c6b64e052
largefiles: don't convert dest=None to dest=hg.defaultdest() in clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17599
diff
changeset
|
757 |
17601
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17600
diff
changeset
|
758 Ensure base clone command argument validation |
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17600
diff
changeset
|
759 |
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17600
diff
changeset
|
760 $ hg clone -U -u 0 a a-clone-failure |
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17600
diff
changeset
|
761 abort: cannot specify both --noupdate and --updaterev |
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17600
diff
changeset
|
762 [255] |
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17600
diff
changeset
|
763 |
16723
68da5ae6e470
largefiles: don't attempt to clone all largefiles to non-local destinations
Levi Bard <levi@unity3d.com>
parents:
16692
diff
changeset
|
764 $ hg clone --all-largefiles a ssh://localhost/a |
68da5ae6e470
largefiles: don't attempt to clone all largefiles to non-local destinations
Levi Bard <levi@unity3d.com>
parents:
16692
diff
changeset
|
765 abort: --all-largefiles is incompatible with non-local destination ssh://localhost/a |
68da5ae6e470
largefiles: don't attempt to clone all largefiles to non-local destinations
Levi Bard <levi@unity3d.com>
parents:
16692
diff
changeset
|
766 [255] |
68da5ae6e470
largefiles: don't attempt to clone all largefiles to non-local destinations
Levi Bard <levi@unity3d.com>
parents:
16692
diff
changeset
|
767 |
16692
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
768 Test pulling with --all-largefiles flag |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
769 |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
770 $ rm -Rf a-backup |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
771 $ hg clone -r 1 a a-backup |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
772 adding changesets |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
773 adding manifests |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
774 adding file changes |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
775 added 2 changesets with 8 changes to 4 files |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
776 updating to branch default |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
777 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
778 getting changed largefiles |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
779 2 largefiles updated, 0 removed |
17092
5d0d99952494
tests: make rm of usercache in test-largefiles.t more robust
Mads Kiilerich <mads@kiilerich.com>
parents:
17089
diff
changeset
|
780 $ rm "${USERCACHE}"/* |
16692
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
781 $ cd a-backup |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
782 $ hg pull --all-largefiles |
17088
31f7dd50ed40
test-largefiles: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17017
diff
changeset
|
783 pulling from $TESTTMP/a (glob) |
16692
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
784 searching for changes |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
785 adding changesets |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
786 adding manifests |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
787 adding file changes |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
788 added 6 changesets with 16 changes to 8 files |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
789 (run 'hg update' to get a working copy) |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
790 caching new largefiles |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
791 3 largefiles cached |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
792 3 additional largefiles cached |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
793 $ cd .. |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
794 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
795 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
|
796 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
|
797 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
798 $ 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
|
799 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
|
800 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
|
801 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
|
802 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
|
803 $ cd b |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
804 $ 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
|
805 $ 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
|
806 $ 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
|
807 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
808 M normal3 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
809 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
|
810 $ cd ../d |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
811 $ 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
|
812 $ 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
|
813 $ 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
|
814 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
815 M sub/normal4 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
816 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
|
817 $ 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
|
818 $ 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
|
819 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
|
820 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
|
821 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
|
822 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
|
823 $ 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
|
824 $ 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
|
825 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
|
826 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
|
827 adding changesets |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
828 adding manifests |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
829 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
|
830 added 1 changesets with 2 changes to 2 files (+1 heads) |
15795
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
831 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
832 M sub/normal4 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
833 M sub2/large6 |
16900
3f1a153daadb
tests: glob the remaining 'saved backup bundle to' to prepare for windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16723
diff
changeset
|
834 saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg (glob) |
15251
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
835 nothing to rebase |
15384
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
836 $ 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
|
837 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
|
838 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
|
839 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
|
840 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
|
841 5:9d5af5072dbd edit files again |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
842 4:74c02385b94c move files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
843 3:9e8fbc4bce62 copy files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
844 2:51a0ae4d5864 remove files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
845 1:ce8896473775 edit files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
846 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
|
847 $ cat normal3 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
848 normal3-modified |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
849 $ 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
|
850 normal4-modified |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
851 $ 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
|
852 large4-modified |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
853 $ 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
|
854 large6-modified |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
855 $ 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
|
856 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
|
857 $ 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
|
858 $ 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
|
859 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
|
860 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
|
861 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
|
862 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
|
863 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
|
864 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
|
865 (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
|
866 caching new largefiles |
c96148346af8
largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents:
15909
diff
changeset
|
867 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
|
868 $ hg rebase |
15795
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
869 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
870 M sub/normal4 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
871 M sub2/large6 |
16900
3f1a153daadb
tests: glob the remaining 'saved backup bundle to' to prepare for windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16723
diff
changeset
|
872 saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg (glob) |
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
|
873 $ 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
|
874 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
|
875 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
|
876 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
|
877 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
|
878 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
|
879 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
|
880 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
|
881 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
|
882 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
|
883 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
|
884 $ 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
|
885 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
|
886 $ 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
|
887 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
|
888 $ 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
|
889 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
|
890 $ 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
|
891 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
|
892 $ 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
|
893 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
|
894 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
895 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
|
896 |
17594
536fee6a5486
largefiles: fix trailing spaces in test-largefiles.t
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17579
diff
changeset
|
897 $ echo large4-modified-again > 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
|
898 $ 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
|
899 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
900 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
|
901 $ 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
|
902 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
|
903 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
|
904 $ 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
|
905 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
|
906 $ 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
|
907 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
|
908 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
|
909 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
|
910 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
|
911 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
|
912 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
|
913 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
|
914 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
|
915 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
|
916 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
|
917 $ 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
|
918 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
|
919 |
15365
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
920 "update --check" refuses to update with uncommitted changes. |
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
921 $ hg update --check 8 |
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
922 abort: uncommitted local changes |
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
923 [255] |
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
924 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
925 "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
|
926 |
17594
536fee6a5486
largefiles: fix trailing spaces in test-largefiles.t
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17579
diff
changeset
|
927 $ hg update --clean |
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
|
928 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
|
929 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
|
930 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
|
931 $ 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
|
932 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
|
933 $ 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
|
934 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
|
935 $ 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
|
936 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
|
937 $ 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
|
938 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
|
939 $ 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
|
940 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
|
941 |
15365
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
942 Now "update check" is happy. |
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
943 $ hg update --check 8 |
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
944 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
|
945 getting changed largefiles |
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
946 1 largefiles updated, 0 removed |
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
947 $ hg update --check |
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
948 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
|
949 getting changed largefiles |
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
950 1 largefiles updated, 0 removed |
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
951 |
15900
29defa7d20f6
largefiles: remove empty directories upon update (issue3202)
Patrick Mezard <pmezard@gmail.com>
parents:
15787
diff
changeset
|
952 Test removing empty largefiles directories on update |
29defa7d20f6
largefiles: remove empty directories upon update (issue3202)
Patrick Mezard <pmezard@gmail.com>
parents:
15787
diff
changeset
|
953 $ test -d sub2 && echo "sub2 exists" |
29defa7d20f6
largefiles: remove empty directories upon update (issue3202)
Patrick Mezard <pmezard@gmail.com>
parents:
15787
diff
changeset
|
954 sub2 exists |
29defa7d20f6
largefiles: remove empty directories upon update (issue3202)
Patrick Mezard <pmezard@gmail.com>
parents:
15787
diff
changeset
|
955 $ hg update -q null |
29defa7d20f6
largefiles: remove empty directories upon update (issue3202)
Patrick Mezard <pmezard@gmail.com>
parents:
15787
diff
changeset
|
956 $ 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
|
957 [1] |
29defa7d20f6
largefiles: remove empty directories upon update (issue3202)
Patrick Mezard <pmezard@gmail.com>
parents:
15787
diff
changeset
|
958 $ hg update -q |
29defa7d20f6
largefiles: remove empty directories upon update (issue3202)
Patrick Mezard <pmezard@gmail.com>
parents:
15787
diff
changeset
|
959 |
15930
2dc599583ebe
largefiles: test and simplify empty directory removal in remove
Patrick Mezard <pmezard@gmail.com>
parents:
15916
diff
changeset
|
960 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
|
961 $ 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
|
962 sub2 exists |
2dc599583ebe
largefiles: test and simplify empty directory removal in remove
Patrick Mezard <pmezard@gmail.com>
parents:
15916
diff
changeset
|
963 $ hg remove sub2/* |
2dc599583ebe
largefiles: test and simplify empty directory removal in remove
Patrick Mezard <pmezard@gmail.com>
parents:
15916
diff
changeset
|
964 $ 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
|
965 [1] |
2dc599583ebe
largefiles: test and simplify empty directory removal in remove
Patrick Mezard <pmezard@gmail.com>
parents:
15916
diff
changeset
|
966 $ 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
|
967 |
15366
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
968 "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
|
969 $ echo hack3 >> normal3 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
970 $ echo hack4 >> sub/normal4 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
971 $ echo hack4 >> sub/large4 |
15983
32b9aee3602c
largefiles: fix revert on missing largefile (issue3217)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15982
diff
changeset
|
972 $ rm sub2/large6 |
32b9aee3602c
largefiles: fix revert on missing largefile (issue3217)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15982
diff
changeset
|
973 $ hg revert sub2/large6 |
15366
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
974 $ hg rm sub2/large6 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
975 $ echo new >> sub2/large8 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
976 $ hg add --large sub2/large8 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
977 # 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
|
978 # 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
|
979 $ hg revert sub |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
980 reverting .hglf/sub/large4 (glob) |
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
981 reverting sub/normal4 (glob) |
15366
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
982 $ hg status |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
983 M normal3 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
984 A sub2/large8 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
985 R sub2/large6 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
986 ? sub/large4.orig |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
987 ? sub/normal4.orig |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
988 $ cat sub/normal4 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
989 normal4-modified |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
990 $ cat sub/large4 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
991 large4-modified |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
992 $ hg revert -a --no-backup |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
993 undeleting .hglf/sub2/large6 (glob) |
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
994 forgetting .hglf/sub2/large8 (glob) |
15366
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
995 reverting normal3 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
996 $ hg status |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
997 ? sub/large4.orig |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
998 ? sub/normal4.orig |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
999 ? sub2/large8 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1000 $ cat normal3 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1001 normal3-modified |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1002 $ cat sub2/large6 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1003 large6-modified |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1004 $ rm sub/*.orig sub2/large8 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1005 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1006 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
|
1007 $ 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
|
1008 reverting .hglf/sub2/large6 (glob) |
15366
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1009 $ cat sub2/large6 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1010 large6 |
17268
8c31b652bdfe
largefiles: support revsets for revert
Matt Harbison <matt_harbison@yahoo.com>
parents:
17245
diff
changeset
|
1011 $ hg revert --no-backup -C -r '.^' sub2 |
8c31b652bdfe
largefiles: support revsets for revert
Matt Harbison <matt_harbison@yahoo.com>
parents:
17245
diff
changeset
|
1012 reverting .hglf/sub2/large6 (glob) |
15366
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1013 $ hg revert --no-backup sub2 |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
1014 reverting .hglf/sub2/large6 (glob) |
15366
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1015 $ hg status |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1016 |
15370
8af6c6d91c92
largefiles: fix typo
Eli Carter <eli.carter@tektronix.com>
parents:
15369
diff
changeset
|
1017 "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
|
1018 |
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
|
1019 $ 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
|
1020 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
|
1021 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
|
1022 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
|
1023 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
|
1024 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
|
1025 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
|
1026 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
|
1027 |
15916
c96148346af8
largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents:
15909
diff
changeset
|
1028 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
|
1029 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
|
1030 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
|
1031 |
54c581d98636
largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15297
diff
changeset
|
1032 $ cd .. |
15916
c96148346af8
largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents:
15909
diff
changeset
|
1033 $ 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
|
1034 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
|
1035 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
|
1036 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
|
1037 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
|
1038 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
|
1039 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
|
1040 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
|
1041 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
|
1042 $ hg clone temp f |
c96148346af8
largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents:
15909
diff
changeset
|
1043 updating to branch default |
c96148346af8
largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents:
15909
diff
changeset
|
1044 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
|
1045 getting changed largefiles |
c96148346af8
largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents:
15909
diff
changeset
|
1046 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
|
1047 # 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
|
1048 # opportunity to test that caching after a pull works. |
17089
0c1d10351869
tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
17088
diff
changeset
|
1049 $ 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
|
1050 $ 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
|
1051 $ 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
|
1052 $ 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
|
1053 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1054 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
|
1055 $ 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
|
1056 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
|
1057 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
|
1058 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
|
1059 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
|
1060 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
|
1061 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
|
1062 (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
|
1063 caching new largefiles |
c96148346af8
largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents:
15909
diff
changeset
|
1064 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
|
1065 $ 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
|
1066 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
|
1067 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
|
1068 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
|
1069 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
|
1070 (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
|
1071 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
|
1072 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
|
1073 $ 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
|
1074 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1075 M normal3 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1076 M sub/normal4 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1077 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
|
1078 $ 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
|
1079 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
|
1080 $ 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
|
1081 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
|
1082 $ 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
|
1083 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
|
1084 $ 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
|
1085 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
|
1086 $ 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
|
1087 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
|
1088 |
15629
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1089 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
|
1090 |
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1091 $ echo large > large |
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1092 $ hg add --large large |
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1093 $ 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
|
1094 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1095 A large |
15629
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1096 $ hg update -q ".^" |
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1097 $ echo change >> normal3 |
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1098 $ 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
|
1099 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1100 M normal3 |
15629
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1101 created new head |
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1102 $ hg merge |
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1103 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
|
1104 (branch merge, don't forget to commit) |
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1105 getting changed largefiles |
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1106 1 largefiles updated, 0 removed |
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1107 $ hg status |
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1108 M large |
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1109 |
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
|
1110 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
|
1111 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
|
1112 |
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
|
1113 $ 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
|
1114 $ 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
|
1115 $ 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
|
1116 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
|
1117 |
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
|
1118 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
|
1119 |
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
|
1120 $ 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
|
1121 $ 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
|
1122 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
|
1123 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
|
1124 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
|
1125 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
|
1126 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
|
1127 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
|
1128 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
|
1129 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
|
1130 $ cd g |
17594
536fee6a5486
largefiles: fix trailing spaces in test-largefiles.t
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17579
diff
changeset
|
1131 $ hg transplant -s ../d 598410d3eb9a |
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
|
1132 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
|
1133 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
|
1134 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
|
1135 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
|
1136 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
|
1137 added 1 changesets with 2 changes to 2 files |
16246
169525f8ffbb
largefiles: only update changed largefiles when transplanting
Na'Tosha Bard <natosha@unity3d.com>
parents:
16141
diff
changeset
|
1138 getting changed largefiles |
169525f8ffbb
largefiles: only update changed largefiles when transplanting
Na'Tosha Bard <natosha@unity3d.com>
parents:
16141
diff
changeset
|
1139 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
|
1140 $ 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
|
1141 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
|
1142 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
|
1143 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
|
1144 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
|
1145 5:9d5af5072dbd edit files again |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
1146 4:74c02385b94c move files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
1147 3:9e8fbc4bce62 copy files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
1148 2:51a0ae4d5864 remove files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
1149 1:ce8896473775 edit files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
1150 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
|
1151 $ 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
|
1152 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
|
1153 $ 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
|
1154 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
|
1155 $ 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
|
1156 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
|
1157 $ 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
|
1158 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
|
1159 $ 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
|
1160 large7 |
15598
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
1161 |
16439
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16351
diff
changeset
|
1162 Cat a largefile |
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16351
diff
changeset
|
1163 $ hg cat normal3 |
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16351
diff
changeset
|
1164 normal3-modified |
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16351
diff
changeset
|
1165 $ hg cat sub/large4 |
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16351
diff
changeset
|
1166 large4-modified |
17089
0c1d10351869
tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
17088
diff
changeset
|
1167 $ rm "${USERCACHE}"/* |
16439
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16351
diff
changeset
|
1168 $ hg cat -r a381d2c8c80e -o cat.out sub/large4 |
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16351
diff
changeset
|
1169 $ cat cat.out |
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16351
diff
changeset
|
1170 large4-modified |
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16351
diff
changeset
|
1171 $ rm cat.out |
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16351
diff
changeset
|
1172 $ hg cat -r a381d2c8c80e normal3 |
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16351
diff
changeset
|
1173 normal3-modified |
17269
acfab0754584
largefiles: support revsets for cat
Matt Harbison <matt_harbison@yahoo.com>
parents:
17268
diff
changeset
|
1174 $ hg cat -r '.^' normal3 |
acfab0754584
largefiles: support revsets for cat
Matt Harbison <matt_harbison@yahoo.com>
parents:
17268
diff
changeset
|
1175 normal3-modified |
acfab0754584
largefiles: support revsets for cat
Matt Harbison <matt_harbison@yahoo.com>
parents:
17268
diff
changeset
|
1176 $ hg cat -r '.^' sub/large4 |
acfab0754584
largefiles: support revsets for cat
Matt Harbison <matt_harbison@yahoo.com>
parents:
17268
diff
changeset
|
1177 large4-modified |
16439
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16351
diff
changeset
|
1178 |
15598
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
1179 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
|
1180 |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
1181 $ 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
|
1182 $ 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
|
1183 Invoking status precommit hook |
15598
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
1184 A large4-renamed |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
1185 R sub/large4 |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
1186 $ cat large4-renamed |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
1187 large4-modified |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
1188 $ cd sub2 |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
1189 $ hg rename large6 large6-renamed |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
1190 $ hg st |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
1191 A sub2/large6-renamed |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
1192 R sub2/large6 |
15944
f19d5c852f9b
largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15930
diff
changeset
|
1193 $ cd .. |
f19d5c852f9b
largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15930
diff
changeset
|
1194 |
f19d5c852f9b
largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15930
diff
changeset
|
1195 Test --normal flag |
f19d5c852f9b
largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15930
diff
changeset
|
1196 |
16494
e1f0305eabe4
tests: don't use /dev/urandom for largefiles testing
Mads Kiilerich <mads@kiilerich.com>
parents:
16449
diff
changeset
|
1197 $ dd if=/dev/zero bs=2k count=11k > new-largefile 2> /dev/null |
15944
f19d5c852f9b
largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15930
diff
changeset
|
1198 $ 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
|
1199 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
|
1200 [255] |
f19d5c852f9b
largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15930
diff
changeset
|
1201 $ hg add --normal new-largefile |
f19d5c852f9b
largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15930
diff
changeset
|
1202 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
|
1203 (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
|
1204 $ cd .. |
15303
07811b3b119b
largefiles: include 'largefiles' in converted repository requirements
Eli Carter <eli.carter@tektronix.com>
parents:
15301
diff
changeset
|
1205 |
17089
0c1d10351869
tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
17088
diff
changeset
|
1206 #if serve |
15336
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1207 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
|
1208 $ mkdir r1 |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1209 $ cd r1 |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1210 $ hg init |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1211 $ echo c1 > f1 |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1212 $ hg add f1 |
15795
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1213 $ hg commit -m "m1" |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1214 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1215 A f1 |
15336
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1216 $ cd .. |
15378
fbebc039687c
tests: use $DAEMON_PIDS and killdaemons in largefiles test
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15377
diff
changeset
|
1217 $ 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
|
1218 $ 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
|
1219 $ 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
|
1220 requesting all changes |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1221 adding changesets |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1222 adding manifests |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1223 adding file changes |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1224 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
|
1225 updating to branch default |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1226 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
|
1227 |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1228 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
|
1229 $ 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
|
1230 $ 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
|
1231 $ 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
|
1232 requesting all changes |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1233 adding changesets |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1234 adding manifests |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1235 adding file changes |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1236 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
|
1237 updating to branch default |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1238 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17089
0c1d10351869
tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
17088
diff
changeset
|
1239 #endif |
0c1d10351869
tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
17088
diff
changeset
|
1240 |
15336
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1241 |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1242 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
|
1243 $ mkdir r4 |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1244 $ cd r4 |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1245 $ hg init |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1246 $ echo c1 > f1 |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1247 $ hg add --large f1 |
15795
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1248 $ hg commit -m "m1" |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1249 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1250 A f1 |
15336
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1251 $ cd .. |
17089
0c1d10351869
tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
17088
diff
changeset
|
1252 |
17411
a02e36568e88
largefiles: adjust localstore to handle batch statlfile requests (issue3583)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17271
diff
changeset
|
1253 largefiles can be pushed locally (issue3583) |
a02e36568e88
largefiles: adjust localstore to handle batch statlfile requests (issue3583)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17271
diff
changeset
|
1254 $ hg init dest |
a02e36568e88
largefiles: adjust localstore to handle batch statlfile requests (issue3583)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17271
diff
changeset
|
1255 $ cd r4 |
17575
98d6a10bc401
largefiles: preserve exit code from outgoing command (issue3611)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17462
diff
changeset
|
1256 $ hg outgoing ../dest |
98d6a10bc401
largefiles: preserve exit code from outgoing command (issue3611)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17462
diff
changeset
|
1257 comparing with ../dest |
98d6a10bc401
largefiles: preserve exit code from outgoing command (issue3611)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17462
diff
changeset
|
1258 searching for changes |
98d6a10bc401
largefiles: preserve exit code from outgoing command (issue3611)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17462
diff
changeset
|
1259 changeset: 0:639881c12b4c |
98d6a10bc401
largefiles: preserve exit code from outgoing command (issue3611)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17462
diff
changeset
|
1260 tag: tip |
98d6a10bc401
largefiles: preserve exit code from outgoing command (issue3611)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17462
diff
changeset
|
1261 user: test |
98d6a10bc401
largefiles: preserve exit code from outgoing command (issue3611)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17462
diff
changeset
|
1262 date: Thu Jan 01 00:00:00 1970 +0000 |
98d6a10bc401
largefiles: preserve exit code from outgoing command (issue3611)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17462
diff
changeset
|
1263 summary: m1 |
98d6a10bc401
largefiles: preserve exit code from outgoing command (issue3611)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17462
diff
changeset
|
1264 |
17411
a02e36568e88
largefiles: adjust localstore to handle batch statlfile requests (issue3583)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17271
diff
changeset
|
1265 $ hg push ../dest |
a02e36568e88
largefiles: adjust localstore to handle batch statlfile requests (issue3583)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17271
diff
changeset
|
1266 pushing to ../dest |
a02e36568e88
largefiles: adjust localstore to handle batch statlfile requests (issue3583)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17271
diff
changeset
|
1267 searching for changes |
a02e36568e88
largefiles: adjust localstore to handle batch statlfile requests (issue3583)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17271
diff
changeset
|
1268 searching for changes |
a02e36568e88
largefiles: adjust localstore to handle batch statlfile requests (issue3583)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17271
diff
changeset
|
1269 adding changesets |
a02e36568e88
largefiles: adjust localstore to handle batch statlfile requests (issue3583)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17271
diff
changeset
|
1270 adding manifests |
a02e36568e88
largefiles: adjust localstore to handle batch statlfile requests (issue3583)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17271
diff
changeset
|
1271 adding file changes |
a02e36568e88
largefiles: adjust localstore to handle batch statlfile requests (issue3583)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17271
diff
changeset
|
1272 added 1 changesets with 1 changes to 1 files |
17594
536fee6a5486
largefiles: fix trailing spaces in test-largefiles.t
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17579
diff
changeset
|
1273 |
17575
98d6a10bc401
largefiles: preserve exit code from outgoing command (issue3611)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17462
diff
changeset
|
1274 exit code with nothing outgoing (issue3611) |
98d6a10bc401
largefiles: preserve exit code from outgoing command (issue3611)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17462
diff
changeset
|
1275 $ hg outgoing ../dest |
98d6a10bc401
largefiles: preserve exit code from outgoing command (issue3611)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17462
diff
changeset
|
1276 comparing with ../dest |
98d6a10bc401
largefiles: preserve exit code from outgoing command (issue3611)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17462
diff
changeset
|
1277 searching for changes |
98d6a10bc401
largefiles: preserve exit code from outgoing command (issue3611)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17462
diff
changeset
|
1278 no changes found |
98d6a10bc401
largefiles: preserve exit code from outgoing command (issue3611)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17462
diff
changeset
|
1279 [1] |
17411
a02e36568e88
largefiles: adjust localstore to handle batch statlfile requests (issue3583)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17271
diff
changeset
|
1280 $ cd .. |
a02e36568e88
largefiles: adjust localstore to handle batch statlfile requests (issue3583)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17271
diff
changeset
|
1281 |
17089
0c1d10351869
tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
17088
diff
changeset
|
1282 #if serve |
15378
fbebc039687c
tests: use $DAEMON_PIDS and killdaemons in largefiles test
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15377
diff
changeset
|
1283 $ 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
|
1284 $ 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
|
1285 $ 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
|
1286 abort: remote error: |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1287 |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1288 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
|
1289 |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1290 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
|
1291 [255] |
15378
fbebc039687c
tests: use $DAEMON_PIDS and killdaemons in largefiles test
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15377
diff
changeset
|
1292 |
fbebc039687c
tests: use $DAEMON_PIDS and killdaemons in largefiles test
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15377
diff
changeset
|
1293 used all HGPORTs, kill all daemons |
17466
d5a3bda6e170
killdaemons: take file argument explicitely
Patrick Mezard <patrick@mezard.eu>
parents:
17439
diff
changeset
|
1294 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS |
17089
0c1d10351869
tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
17088
diff
changeset
|
1295 #endif |
15336
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1296 |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1297 vanilla clients locked out from largefiles ssh repos |
16541
bb3334806ace
tests: quote dummyssh in a way that works on windows too
Mads Kiilerich <mads@kiilerich.com>
parents:
16516
diff
changeset
|
1298 $ hg --config extensions.largefiles=! clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/r4 r5 |
15336
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1299 abort: remote error: |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1300 |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1301 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
|
1302 |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1303 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
|
1304 [255] |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1305 |
17089
0c1d10351869
tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
17088
diff
changeset
|
1306 #if serve |
0c1d10351869
tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
17088
diff
changeset
|
1307 |
15336
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1308 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
|
1309 $ mkdir r6 |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1310 $ cd r6 |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1311 $ hg init |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1312 $ echo c1 > f1 |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1313 $ hg add f1 |
15795
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1314 $ hg commit -m "m1" |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1315 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1316 A f1 |
15336
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1317 $ cat >> .hg/hgrc <<! |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1318 > [web] |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1319 > push_ssl = false |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1320 > allow_push = * |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1321 > ! |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1322 $ cd .. |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1323 $ hg clone r6 r7 |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1324 updating to branch default |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1325 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
|
1326 $ cd r7 |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1327 $ echo c2 > f2 |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1328 $ hg add --large f2 |
15795
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1329 $ hg commit -m "m2" |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1330 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1331 A f2 |
15378
fbebc039687c
tests: use $DAEMON_PIDS and killdaemons in largefiles test
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15377
diff
changeset
|
1332 $ 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
|
1333 $ 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
|
1334 $ 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
|
1335 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
|
1336 searching for changes |
15377
107ff02b134d
tests: make largefiles test use $HGPORT instead of 8001
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15374
diff
changeset
|
1337 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
|
1338 [255] |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1339 $ cd .. |
83debcd7064b
largefiles: test interaction between largefiles and vanilla clients and servers
Andrew Pritchard <awpritchard@gmail.com>
parents:
15332
diff
changeset
|
1340 |
15778
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15742
diff
changeset
|
1341 putlfile errors are shown (issue3123) |
17234
0cfece81e051
test-largefiles: fix test failing on vfat file systems
Adrian Buehlmann <adrian@cadifra.com>
parents:
17232
diff
changeset
|
1342 Corrupt the cached largefile in r7 and in the usercache (required for testing on vfat) |
0cfece81e051
test-largefiles: fix test failing on vfat file systems
Adrian Buehlmann <adrian@cadifra.com>
parents:
17232
diff
changeset
|
1343 $ echo corruption > "$TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8" |
17089
0c1d10351869
tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
17088
diff
changeset
|
1344 $ echo corruption > "$USERCACHE/4cdac4d8b084d0b599525cf732437fb337d422a8" |
15778
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15742
diff
changeset
|
1345 $ hg init empty |
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15742
diff
changeset
|
1346 $ 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
|
1347 > --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
|
1348 $ cat hg.pid >> $DAEMON_PIDS |
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15742
diff
changeset
|
1349 $ 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
|
1350 pushing to http://localhost:$HGPORT1/ |
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15742
diff
changeset
|
1351 searching for changes |
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15742
diff
changeset
|
1352 remote: largefiles: failed to put 4cdac4d8b084d0b599525cf732437fb337d422a8 into store: largefile contents do not match hash |
17088
31f7dd50ed40
test-largefiles: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17017
diff
changeset
|
1353 abort: remotestore: could not put $TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 to remote store http://localhost:$HGPORT1/ (glob) |
15778
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15742
diff
changeset
|
1354 [255] |
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15742
diff
changeset
|
1355 $ rm -rf empty |
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15742
diff
changeset
|
1356 |
16594
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16586
diff
changeset
|
1357 Push a largefiles repository to a served empty repository |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16586
diff
changeset
|
1358 $ hg init r8 |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16586
diff
changeset
|
1359 $ echo c3 > r8/f1 |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16586
diff
changeset
|
1360 $ hg add --large r8/f1 -R r8 |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16586
diff
changeset
|
1361 $ hg commit -m "m1" -R r8 |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16586
diff
changeset
|
1362 Invoking status precommit hook |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16586
diff
changeset
|
1363 A f1 |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16586
diff
changeset
|
1364 $ hg init empty |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16586
diff
changeset
|
1365 $ hg serve -R empty -d -p $HGPORT2 --pid-file hg.pid \ |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16586
diff
changeset
|
1366 > --config 'web.allow_push=*' --config web.push_ssl=False |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16586
diff
changeset
|
1367 $ cat hg.pid >> $DAEMON_PIDS |
17089
0c1d10351869
tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
17088
diff
changeset
|
1368 $ rm "${USERCACHE}"/* |
16594
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16586
diff
changeset
|
1369 $ hg push -R r8 http://localhost:$HGPORT2 |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16586
diff
changeset
|
1370 pushing to http://localhost:$HGPORT2/ |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16586
diff
changeset
|
1371 searching for changes |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16586
diff
changeset
|
1372 searching for changes |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16586
diff
changeset
|
1373 remote: adding changesets |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16586
diff
changeset
|
1374 remote: adding manifests |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16586
diff
changeset
|
1375 remote: adding file changes |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16586
diff
changeset
|
1376 remote: added 1 changesets with 1 changes to 1 files |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16586
diff
changeset
|
1377 $ rm -rf empty |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16586
diff
changeset
|
1378 |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16586
diff
changeset
|
1379 used all HGPORTs, kill all daemons |
17466
d5a3bda6e170
killdaemons: take file argument explicitely
Patrick Mezard <patrick@mezard.eu>
parents:
17439
diff
changeset
|
1380 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS |
16594
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16586
diff
changeset
|
1381 |
17089
0c1d10351869
tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
17088
diff
changeset
|
1382 #endif |
0c1d10351869
tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
17088
diff
changeset
|
1383 |
0c1d10351869
tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
17088
diff
changeset
|
1384 |
16986
79902f7e27df
tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16908
diff
changeset
|
1385 #if unix-permissions |
79902f7e27df
tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16908
diff
changeset
|
1386 |
15318
acecb419e5b0
largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents:
15313
diff
changeset
|
1387 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
|
1388 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
|
1389 $ ORIGHOME="$HOME" |
acecb419e5b0
largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents:
15313
diff
changeset
|
1390 $ mkdir alice |
acecb419e5b0
largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents:
15313
diff
changeset
|
1391 $ HOME="`pwd`/alice" |
acecb419e5b0
largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents:
15313
diff
changeset
|
1392 $ cd alice |
acecb419e5b0
largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents:
15313
diff
changeset
|
1393 $ hg init pubrepo |
acecb419e5b0
largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents:
15313
diff
changeset
|
1394 $ cd pubrepo |
16494
e1f0305eabe4
tests: don't use /dev/urandom for largefiles testing
Mads Kiilerich <mads@kiilerich.com>
parents:
16449
diff
changeset
|
1395 $ dd if=/dev/zero bs=1k count=11k > a-large-file 2> /dev/null |
15318
acecb419e5b0
largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents:
15313
diff
changeset
|
1396 $ 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
|
1397 $ 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
|
1398 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1399 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
|
1400 $ cd .. |
acecb419e5b0
largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents:
15313
diff
changeset
|
1401 $ 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
|
1402 $ cd .. |
acecb419e5b0
largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents:
15313
diff
changeset
|
1403 $ mkdir bob |
acecb419e5b0
largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents:
15313
diff
changeset
|
1404 $ HOME="`pwd`/bob" |
acecb419e5b0
largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents:
15313
diff
changeset
|
1405 $ cd bob |
15374
6cb8b46ea90a
tests: fix spurious largefiles test failure on Cygwin
Matt Mackall <mpm@selenic.com>
parents:
15372
diff
changeset
|
1406 $ 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
|
1407 requesting all changes |
acecb419e5b0
largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents:
15313
diff
changeset
|
1408 adding changesets |
acecb419e5b0
largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents:
15313
diff
changeset
|
1409 adding manifests |
acecb419e5b0
largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents:
15313
diff
changeset
|
1410 adding file changes |
acecb419e5b0
largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents:
15313
diff
changeset
|
1411 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
|
1412 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
|
1413 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
|
1414 getting changed largefiles |
acecb419e5b0
largefiles: testcase to simulate inter-user clone on local machine
Eli Carter <eli.carter@tektronix.com>
parents:
15313
diff
changeset
|
1415 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
|
1416 $ cd .. |
15514
dd856380cce3
tests: don't leave temporary directories without write permission behind
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
1417 $ 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
|
1418 $ HOME="$ORIGHOME" |
15369
b4ea79f88268
largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents:
15366
diff
changeset
|
1419 |
16986
79902f7e27df
tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16908
diff
changeset
|
1420 #endif |
79902f7e27df
tests: convert some hghave unix-permissions to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16908
diff
changeset
|
1421 |
16908
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16900
diff
changeset
|
1422 #if symlink |
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16900
diff
changeset
|
1423 |
15369
b4ea79f88268
largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents:
15366
diff
changeset
|
1424 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
|
1425 $ hg init largesymlink |
b4ea79f88268
largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents:
15366
diff
changeset
|
1426 $ cd largesymlink |
b4ea79f88268
largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents:
15366
diff
changeset
|
1427 $ 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
|
1428 $ hg add --large largefile |
b4ea79f88268
largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents:
15366
diff
changeset
|
1429 $ 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
|
1430 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1431 A largefile |
15369
b4ea79f88268
largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents:
15366
diff
changeset
|
1432 $ ln -s largefile largelink |
b4ea79f88268
largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents:
15366
diff
changeset
|
1433 $ hg add largelink |
b4ea79f88268
largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents:
15366
diff
changeset
|
1434 $ 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
|
1435 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1436 A largelink |
15369
b4ea79f88268
largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents:
15366
diff
changeset
|
1437 $ rm -f largelink |
b4ea79f88268
largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents:
15366
diff
changeset
|
1438 $ 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
|
1439 $ test -f largelink |
15369
b4ea79f88268
largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents:
15366
diff
changeset
|
1440 [1] |
b4ea79f88268
largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents:
15366
diff
changeset
|
1441 $ test -L largelink |
b4ea79f88268
largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents:
15366
diff
changeset
|
1442 [1] |
b4ea79f88268
largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents:
15366
diff
changeset
|
1443 $ 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
|
1444 $ 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
|
1445 $ test -f largelink |
15369
b4ea79f88268
largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents:
15366
diff
changeset
|
1446 $ test -L largelink |
b4ea79f88268
largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents:
15366
diff
changeset
|
1447 $ cd .. |
b4ea79f88268
largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents:
15366
diff
changeset
|
1448 |
16908
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16900
diff
changeset
|
1449 #endif |
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16900
diff
changeset
|
1450 |
16110
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1451 test for pattern matching on 'hg status': |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1452 to boost performance, largefiles checks whether specified patterns are |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1453 related to largefiles in working directory (NOT to STANDIN) or not. |
15369
b4ea79f88268
largefiles: bugfix for symlink handling with testcase
Eli Carter <eli.carter@tektronix.com>
parents:
15366
diff
changeset
|
1454 |
16110
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1455 $ hg init statusmatch |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1456 $ cd statusmatch |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1457 |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1458 $ mkdir -p a/b/c/d |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1459 $ echo normal > a/b/c/d/e.normal.txt |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1460 $ hg add a/b/c/d/e.normal.txt |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1461 $ echo large > a/b/c/d/e.large.txt |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1462 $ hg add --large a/b/c/d/e.large.txt |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1463 $ mkdir -p a/b/c/x |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1464 $ echo normal > a/b/c/x/y.normal.txt |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1465 $ hg add a/b/c/x/y.normal.txt |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1466 $ hg commit -m 'add files' |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1467 Invoking status precommit hook |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1468 A a/b/c/d/e.large.txt |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1469 A a/b/c/d/e.normal.txt |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1470 A a/b/c/x/y.normal.txt |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1471 |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1472 (1) no pattern: no performance boost |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1473 $ hg status -A |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1474 C a/b/c/d/e.large.txt |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1475 C a/b/c/d/e.normal.txt |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1476 C a/b/c/x/y.normal.txt |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1477 |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1478 (2) pattern not related to largefiles: performance boost |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1479 $ hg status -A a/b/c/x |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1480 C a/b/c/x/y.normal.txt |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1481 |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1482 (3) pattern related to largefiles: no performance boost |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1483 $ hg status -A a/b/c/d |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1484 C a/b/c/d/e.large.txt |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1485 C a/b/c/d/e.normal.txt |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1486 |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1487 (4) pattern related to STANDIN (not to largefiles): performance boost |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1488 $ hg status -A .hglf/a |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1489 C .hglf/a/b/c/d/e.large.txt |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1490 |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1491 (5) mixed case: no performance boost |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1492 $ hg status -A a/b/c/x a/b/c/d |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1493 C a/b/c/d/e.large.txt |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1494 C a/b/c/d/e.normal.txt |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1495 C a/b/c/x/y.normal.txt |
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1496 |
16141
f346de4dff57
largefiles: don't break filesets
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
16110
diff
changeset
|
1497 verify that largefiles doesn't break filesets |
f346de4dff57
largefiles: don't break filesets
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
16110
diff
changeset
|
1498 |
f346de4dff57
largefiles: don't break filesets
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
16110
diff
changeset
|
1499 $ hg log --rev . --exclude "set:binary()" |
f346de4dff57
largefiles: don't break filesets
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
16110
diff
changeset
|
1500 changeset: 0:41bd42f10efa |
f346de4dff57
largefiles: don't break filesets
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
16110
diff
changeset
|
1501 tag: tip |
f346de4dff57
largefiles: don't break filesets
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
16110
diff
changeset
|
1502 user: test |
f346de4dff57
largefiles: don't break filesets
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
16110
diff
changeset
|
1503 date: Thu Jan 01 00:00:00 1970 +0000 |
f346de4dff57
largefiles: don't break filesets
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
16110
diff
changeset
|
1504 summary: add files |
f346de4dff57
largefiles: don't break filesets
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
16110
diff
changeset
|
1505 |
16515
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16494
diff
changeset
|
1506 verify that large files in subrepos handled properly |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16494
diff
changeset
|
1507 $ hg init subrepo |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16494
diff
changeset
|
1508 $ echo "subrepo = subrepo" > .hgsub |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16494
diff
changeset
|
1509 $ hg add .hgsub |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16494
diff
changeset
|
1510 $ hg ci -m "add subrepo" |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16494
diff
changeset
|
1511 Invoking status precommit hook |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16494
diff
changeset
|
1512 A .hgsub |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16494
diff
changeset
|
1513 ? .hgsubstate |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16494
diff
changeset
|
1514 $ echo "rev 1" > subrepo/large.txt |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16494
diff
changeset
|
1515 $ hg -R subrepo add --large subrepo/large.txt |
16516
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1516 $ hg sum |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1517 parent: 1:8ee150ea2e9c tip |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1518 add subrepo |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1519 branch: default |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1520 commit: 1 subrepos |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1521 update: (current) |
16515
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16494
diff
changeset
|
1522 $ hg st |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16494
diff
changeset
|
1523 $ hg st -S |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16494
diff
changeset
|
1524 A subrepo/large.txt |
16516
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1525 $ hg ci -S -m "commit top repo" |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1526 committing subrepository subrepo |
16515
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16494
diff
changeset
|
1527 Invoking status precommit hook |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16494
diff
changeset
|
1528 A large.txt |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16494
diff
changeset
|
1529 Invoking status precommit hook |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16494
diff
changeset
|
1530 M .hgsubstate |
16516
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1531 # No differences |
16515
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16494
diff
changeset
|
1532 $ hg st -S |
16516
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1533 $ hg sum |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1534 parent: 2:ce4cd0c527a6 tip |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1535 commit top repo |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1536 branch: default |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1537 commit: (clean) |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1538 update: (current) |
16515
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16494
diff
changeset
|
1539 $ echo "rev 2" > subrepo/large.txt |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16494
diff
changeset
|
1540 $ hg st -S |
12dabc22de77
largefiles: fix status -S reporting of subrepos (issue3231)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16494
diff
changeset
|
1541 M subrepo/large.txt |
16516
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1542 $ hg sum |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1543 parent: 2:ce4cd0c527a6 tip |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1544 commit top repo |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1545 branch: default |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1546 commit: 1 subrepos |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1547 update: (current) |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1548 $ hg ci -m "this commit should fail without -S" |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1549 abort: uncommitted changes in subrepo subrepo |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1550 (use --subrepos for recursive commit) |
597ddcb41b32
largefiles: notice dirty large files in a subrepo
Matt Harbison <matt_harbison@yahoo.com>
parents:
16515
diff
changeset
|
1551 [255] |
16578
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16541
diff
changeset
|
1552 |
16581
48dfd9ae924a
test-largefiles: better formatting of comments
Martin Geisler <mg@aragost.com>
parents:
16580
diff
changeset
|
1553 Add a normal file to the subrepo, then test archiving |
48dfd9ae924a
test-largefiles: better formatting of comments
Martin Geisler <mg@aragost.com>
parents:
16580
diff
changeset
|
1554 |
16578
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16541
diff
changeset
|
1555 $ echo 'normal file' > subrepo/normal.txt |
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16541
diff
changeset
|
1556 $ hg -R subrepo add subrepo/normal.txt |
16581
48dfd9ae924a
test-largefiles: better formatting of comments
Martin Geisler <mg@aragost.com>
parents:
16580
diff
changeset
|
1557 |
48dfd9ae924a
test-largefiles: better formatting of comments
Martin Geisler <mg@aragost.com>
parents:
16580
diff
changeset
|
1558 Lock in subrepo, otherwise the change isn't archived |
48dfd9ae924a
test-largefiles: better formatting of comments
Martin Geisler <mg@aragost.com>
parents:
16580
diff
changeset
|
1559 |
16578
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16541
diff
changeset
|
1560 $ hg ci -S -m "add normal file to top level" |
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16541
diff
changeset
|
1561 committing subrepository subrepo |
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16541
diff
changeset
|
1562 Invoking status precommit hook |
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16541
diff
changeset
|
1563 M large.txt |
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16541
diff
changeset
|
1564 A normal.txt |
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16541
diff
changeset
|
1565 Invoking status precommit hook |
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16541
diff
changeset
|
1566 M .hgsubstate |
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16541
diff
changeset
|
1567 $ hg archive -S lf_subrepo_archive |
16580
80da0352a037
test-largefiles: sort output to ensure test stability
Martin Geisler <mg@aragost.com>
parents:
16578
diff
changeset
|
1568 $ find lf_subrepo_archive | sort |
16578
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16541
diff
changeset
|
1569 lf_subrepo_archive |
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16541
diff
changeset
|
1570 lf_subrepo_archive/.hg_archival.txt |
16580
80da0352a037
test-largefiles: sort output to ensure test stability
Martin Geisler <mg@aragost.com>
parents:
16578
diff
changeset
|
1571 lf_subrepo_archive/.hgsub |
16578
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16541
diff
changeset
|
1572 lf_subrepo_archive/.hgsubstate |
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16541
diff
changeset
|
1573 lf_subrepo_archive/a |
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16541
diff
changeset
|
1574 lf_subrepo_archive/a/b |
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16541
diff
changeset
|
1575 lf_subrepo_archive/a/b/c |
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16541
diff
changeset
|
1576 lf_subrepo_archive/a/b/c/d |
16580
80da0352a037
test-largefiles: sort output to ensure test stability
Martin Geisler <mg@aragost.com>
parents:
16578
diff
changeset
|
1577 lf_subrepo_archive/a/b/c/d/e.large.txt |
16578
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16541
diff
changeset
|
1578 lf_subrepo_archive/a/b/c/d/e.normal.txt |
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16541
diff
changeset
|
1579 lf_subrepo_archive/a/b/c/x |
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16541
diff
changeset
|
1580 lf_subrepo_archive/a/b/c/x/y.normal.txt |
16580
80da0352a037
test-largefiles: sort output to ensure test stability
Martin Geisler <mg@aragost.com>
parents:
16578
diff
changeset
|
1581 lf_subrepo_archive/subrepo |
80da0352a037
test-largefiles: sort output to ensure test stability
Martin Geisler <mg@aragost.com>
parents:
16578
diff
changeset
|
1582 lf_subrepo_archive/subrepo/large.txt |
80da0352a037
test-largefiles: sort output to ensure test stability
Martin Geisler <mg@aragost.com>
parents:
16578
diff
changeset
|
1583 lf_subrepo_archive/subrepo/normal.txt |
16578
43fb170a23bd
largefiles: make archive -S store largefiles instead of standins
Matt Harbison <matt_harbison@yahoo.com>
parents:
16541
diff
changeset
|
1584 |
17695
75f25bd4c7d4
largefiles: download missing subrepo revs when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17659
diff
changeset
|
1585 Test archiving a revision that references a subrepo that is not yet |
75f25bd4c7d4
largefiles: download missing subrepo revs when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17659
diff
changeset
|
1586 cloned (see test-subrepo-recursion.t): |
75f25bd4c7d4
largefiles: download missing subrepo revs when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17659
diff
changeset
|
1587 |
75f25bd4c7d4
largefiles: download missing subrepo revs when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17659
diff
changeset
|
1588 $ hg clone -U . ../empty |
75f25bd4c7d4
largefiles: download missing subrepo revs when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17659
diff
changeset
|
1589 $ cd ../empty |
75f25bd4c7d4
largefiles: download missing subrepo revs when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17659
diff
changeset
|
1590 $ hg archive --subrepos -r tip ../archive.tar.gz 2>&1 | "$TESTDIR/filtercr.py" |
75f25bd4c7d4
largefiles: download missing subrepo revs when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17659
diff
changeset
|
1591 cloning subrepo subrepo from $TESTTMP/statusmatch/subrepo |
75f25bd4c7d4
largefiles: download missing subrepo revs when archiving
Matt Harbison <matt_harbison@yahoo.com>
parents:
17659
diff
changeset
|
1592 |
16110
41417443b7d0
largefiles: check whether specified patterns are related to largefiles strictly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15983
diff
changeset
|
1593 $ cd .. |
17659
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1594 |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1595 Test that addremove picks up largefiles prior to the initial commit (issue3541) |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1596 |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1597 $ hg init addrm2 |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1598 $ cd addrm2 |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1599 $ touch large.dat |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1600 $ touch large2.dat |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1601 $ touch normal |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1602 $ hg add --large large.dat |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1603 $ hg addremove -v |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1604 adding large2.dat as a largefile |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1605 adding normal |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1606 |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1607 Test that forgetting all largefiles reverts to islfilesrepo() == False |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1608 (addremove will add *.dat as normal files now) |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1609 $ hg forget large.dat |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1610 $ hg forget large2.dat |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1611 $ hg addremove -v |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1612 adding large.dat |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1613 adding large2.dat |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1614 |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1615 Test commit's addremove option prior to the first commit |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1616 $ hg forget large.dat |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1617 $ hg forget large2.dat |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1618 $ hg add --large large.dat |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1619 $ hg ci -Am "commit" |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1620 adding large2.dat as a largefile |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1621 Invoking status precommit hook |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1622 A large.dat |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1623 A large2.dat |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1624 A normal |
17678
07d577dae285
test-largefiles.t: fix find quirk on OSX
Patrick Mezard <patrick@mezard.eu>
parents:
17659
diff
changeset
|
1625 $ find .hglf | sort |
07d577dae285
test-largefiles.t: fix find quirk on OSX
Patrick Mezard <patrick@mezard.eu>
parents:
17659
diff
changeset
|
1626 .hglf |
17659
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1627 .hglf/large.dat |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1628 .hglf/large2.dat |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1629 |
ae57920ac188
largefiles: enable islfilesrepo() prior to a commit (issue3541)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17658
diff
changeset
|
1630 $ cd .. |