Mercurial > hg
annotate tests/test-largefiles.t @ 26920:4d1a96bb831f
test: enable generaldelta early in 'test-treemanifest.t'
Having generaldelta on results in minor test output changes (as we are staring
at the revlog).
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Mon, 19 Oct 2015 11:28:31 +0200 |
parents | b68797f244e4 |
children | 12f727a5b434 |
rev | line source |
---|---|
21424
d13b4ecdb680
test: split test-largefile.t in multiple file
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21275
diff
changeset
|
1 This file used to contains all largefile tests. |
d13b4ecdb680
test: split test-largefile.t in multiple file
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21275
diff
changeset
|
2 Do not add any new tests in this file as it his already far too long to run. |
d13b4ecdb680
test: split test-largefile.t in multiple file
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21275
diff
changeset
|
3 |
d13b4ecdb680
test: split test-largefile.t in multiple file
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21275
diff
changeset
|
4 It contains all the testing of the basic concepts of large file in a single block. |
d13b4ecdb680
test: split test-largefile.t in multiple file
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21275
diff
changeset
|
5 |
17088
31f7dd50ed40
test-largefiles: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17017
diff
changeset
|
6 $ 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
|
7 $ 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
|
8 $ 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
|
9 > [extensions] |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
10 > largefiles= |
15251
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
11 > purge= |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
12 > 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
|
13 > transplant= |
15742
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15630
diff
changeset
|
14 > [phases] |
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15630
diff
changeset
|
15 > 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
|
16 > [largefiles] |
15304
9aa9d4bb3d88
largefiles: rename config setting 'size' to 'minsize'
Greg Ward <greg@gerg.ca>
parents:
15303
diff
changeset
|
17 > 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
|
18 > patterns=glob:**.dat |
15778
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15742
diff
changeset
|
19 > usercache=${USERCACHE} |
15795
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
20 > [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
|
21 > precommit=sh -c "echo \\"Invoking status precommit hook\\"; hg status" |
25354
4b61521c3db0
test: use bundle2 for exchange in test-largefile
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
22 > [experimental] |
4b61521c3db0
test: use bundle2 for exchange in test-largefile
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
23 > # drop me once bundle2 is the default, |
4b61521c3db0
test: use bundle2 for exchange in test-largefile
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
24 > # added to get test change early. |
4b61521c3db0
test: use bundle2 for exchange in test-largefile
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
25 > bundle2-exp = True |
15216
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
26 > EOF |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
27 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
28 Create the repo with a couple of revisions of both large and normal |
18144
e16982a74bf7
largefiles: introduce basic debugstate --large functionality
Mads Kiilerich <madski@unity3d.com>
parents:
18066
diff
changeset
|
29 files. |
e16982a74bf7
largefiles: introduce basic debugstate --large functionality
Mads Kiilerich <madski@unity3d.com>
parents:
18066
diff
changeset
|
30 Test status and dirstate of largefiles and that summary 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
|
31 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
32 $ 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
|
33 $ cd a |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
34 $ mkdir sub |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
35 $ 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
|
36 $ 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
|
37 $ 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
|
38 $ 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
|
39 $ 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
|
40 $ 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
|
41 $ 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
|
42 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
43 A large1 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
44 A normal1 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
45 A sub/large2 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
46 A sub/normal2 |
18144
e16982a74bf7
largefiles: introduce basic debugstate --large functionality
Mads Kiilerich <madski@unity3d.com>
parents:
18066
diff
changeset
|
47 $ touch large1 sub/large2 |
e16982a74bf7
largefiles: introduce basic debugstate --large functionality
Mads Kiilerich <madski@unity3d.com>
parents:
18066
diff
changeset
|
48 $ sleep 1 |
e16982a74bf7
largefiles: introduce basic debugstate --large functionality
Mads Kiilerich <madski@unity3d.com>
parents:
18066
diff
changeset
|
49 $ hg st |
e16982a74bf7
largefiles: introduce basic debugstate --large functionality
Mads Kiilerich <madski@unity3d.com>
parents:
18066
diff
changeset
|
50 $ hg debugstate --nodates |
23840
ddc17eaf0f1b
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'
Mads Kiilerich <madski@unity3d.com>
parents:
23835
diff
changeset
|
51 n 644 41 set .hglf/large1 |
ddc17eaf0f1b
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'
Mads Kiilerich <madski@unity3d.com>
parents:
23835
diff
changeset
|
52 n 644 41 set .hglf/sub/large2 |
ddc17eaf0f1b
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'
Mads Kiilerich <madski@unity3d.com>
parents:
23835
diff
changeset
|
53 n 644 8 set normal1 |
ddc17eaf0f1b
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'
Mads Kiilerich <madski@unity3d.com>
parents:
23835
diff
changeset
|
54 n 644 8 set sub/normal2 |
21088
e095626e8676
largefiles: full debugdirstate functionality for largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
21087
diff
changeset
|
55 $ hg debugstate --large --nodates |
23840
ddc17eaf0f1b
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'
Mads Kiilerich <madski@unity3d.com>
parents:
23835
diff
changeset
|
56 n 644 7 set large1 |
ddc17eaf0f1b
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'
Mads Kiilerich <madski@unity3d.com>
parents:
23835
diff
changeset
|
57 n 644 7 set sub/large2 |
15216
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
58 $ 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
|
59 $ 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
|
60 $ 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
|
61 $ echo large22 > sub/large2 |
15795
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
62 $ hg commit -m "edit files" |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
63 Invoking status precommit hook |
15225
b450a4d427ef
largefiles: add test for status
Na'Tosha Bard <natosha@unity3d.com>
parents:
15216
diff
changeset
|
64 M large1 |
b450a4d427ef
largefiles: add test for status
Na'Tosha Bard <natosha@unity3d.com>
parents:
15216
diff
changeset
|
65 M normal1 |
b450a4d427ef
largefiles: add test for status
Na'Tosha Bard <natosha@unity3d.com>
parents:
15216
diff
changeset
|
66 M sub/large2 |
b450a4d427ef
largefiles: add test for status
Na'Tosha Bard <natosha@unity3d.com>
parents:
15216
diff
changeset
|
67 M sub/normal2 |
15787
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
68 $ hg sum --large |
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
69 parent: 1:ce8896473775 tip |
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
70 edit files |
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
71 branch: default |
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
72 commit: (clean) |
0c7b83a057aa
largefiles: fix output of hg summary (issue3060)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15786
diff
changeset
|
73 update: (current) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25354
diff
changeset
|
74 phases: 2 draft |
17894
afa7e6fa820b
i18n: change output of largefiles for summary to distinguish from one for outgoing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17847
diff
changeset
|
75 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
|
76 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
77 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
|
78 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
79 $ cat normal1 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
80 normal11 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
81 $ cat large1 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
82 large11 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
83 $ 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
|
84 normal22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
85 $ 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
|
86 large22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
87 |
16586
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
88 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
|
89 |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
90 $ echo unknown > sub/unknown |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
91 $ hg st --all |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
92 ? sub/unknown |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
93 C large1 |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
94 C normal1 |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
95 C sub/large2 |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
96 C sub/normal2 |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
97 $ hg st --all sub |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
98 ? sub/unknown |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
99 C sub/large2 |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
100 C sub/normal2 |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
101 $ rm sub/unknown |
ebd2ead59f1c
largefiles: fix "hg status dir" missing regular files (issue3421)
Patrick Mezard <patrick@mezard.eu>
parents:
16541
diff
changeset
|
102 |
18066
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18064
diff
changeset
|
103 Test messages and exit codes for remove warning cases |
17576
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
104 |
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
105 $ hg remove -A large1 |
18066
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18064
diff
changeset
|
106 not removing large1: file still exists |
17576
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
107 [1] |
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
108 $ echo 'modified' > large1 |
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
109 $ hg remove large1 |
18066
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18064
diff
changeset
|
110 not removing large1: file is modified (use -f to force removal) |
17576
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
111 [1] |
18066
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18064
diff
changeset
|
112 $ echo 'new' > normalnew |
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18064
diff
changeset
|
113 $ hg add normalnew |
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18064
diff
changeset
|
114 $ echo 'new' > largenew |
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18064
diff
changeset
|
115 $ hg add --large normalnew |
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18064
diff
changeset
|
116 normalnew already tracked! |
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18064
diff
changeset
|
117 $ hg remove normalnew largenew |
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18064
diff
changeset
|
118 not removing largenew: file is untracked |
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18064
diff
changeset
|
119 not removing normalnew: file has been marked for add (use forget to undo) |
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18064
diff
changeset
|
120 [1] |
abe9799a86d6
largefiles: align rm warnings with warnings used in core
Mads Kiilerich <madski@unity3d.com>
parents:
18064
diff
changeset
|
121 $ rm normalnew largenew |
17576
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
122 $ hg up -Cq |
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
123 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
124 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
|
125 |
15216
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
126 $ 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
|
127 $ 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
|
128 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
|
129 $ 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
|
130 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
131 R large1 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
132 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
|
133 $ ls |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
134 sub |
15786
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15629
diff
changeset
|
135 $ echo "testlargefile" > large1-test |
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15629
diff
changeset
|
136 $ 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
|
137 $ hg st |
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15629
diff
changeset
|
138 A large1-test |
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15629
diff
changeset
|
139 $ hg rm large1-test |
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15629
diff
changeset
|
140 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
|
141 [1] |
15786
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15629
diff
changeset
|
142 $ hg st |
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15629
diff
changeset
|
143 A large1-test |
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15629
diff
changeset
|
144 $ hg forget large1-test |
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15629
diff
changeset
|
145 $ hg st |
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15629
diff
changeset
|
146 ? large1-test |
17576
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
147 $ hg remove large1-test |
e0081bb5450e
largefiles: exit from remove with 1 on warnings
Matt Harbison <matt_harbison@yahoo.com>
parents:
17575
diff
changeset
|
148 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
|
149 [1] |
17579
cbacb5a813dd
largefiles: preserve the exit status of the forget command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17576
diff
changeset
|
150 $ hg forget large1-test |
cbacb5a813dd
largefiles: preserve the exit status of the forget command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17576
diff
changeset
|
151 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
|
152 [1] |
15786
aca0f2b3c7e3
largefiles: fix confusion upon removal of added largefile (issue3176)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15629
diff
changeset
|
153 $ 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
|
154 |
15598
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
155 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
|
156 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
157 $ 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
|
158 $ 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
|
159 $ hg commit -m "copy files" |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
160 Invoking status precommit hook |
15598
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
161 A large1 |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
162 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
|
163 $ cat normal1 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
164 normal22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
165 $ cat large1 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
166 large22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
167 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
168 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
|
169 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
170 $ 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
|
171 $ 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
|
172 $ 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
|
173 $ 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
|
174 $ 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
|
175 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
176 A large3 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
177 A normal3 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
178 A sub/large4 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
179 A sub/normal4 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
180 R large1 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
181 R normal1 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
182 R sub/large2 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
183 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
|
184 $ cat normal3 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
185 normal22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
186 $ cat large3 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
187 large22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
188 $ 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
|
189 normal22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
190 $ 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
|
191 large22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
192 |
17245
6e84171a61c8
largefiles: fix path handling for cp/mv (issue3516)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17234
diff
changeset
|
193 |
18228
1528ff6ac7ee
test-largefiles.t: fix wrong '#if hgweb' - it should be '#if serve'
Mads Kiilerich <mads@kiilerich.com>
parents:
18159
diff
changeset
|
194 #if serve |
16449
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
195 Test display of largefiles in hgweb |
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
196 |
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
197 $ 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
|
198 $ cat ../hg.pid >> $DAEMON_PIDS |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
199 $ 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
|
200 200 Script output follows |
18228
1528ff6ac7ee
test-largefiles.t: fix wrong '#if hgweb' - it should be '#if serve'
Mads Kiilerich <mads@kiilerich.com>
parents:
18159
diff
changeset
|
201 |
1528ff6ac7ee
test-largefiles.t: fix wrong '#if hgweb' - it should be '#if serve'
Mads Kiilerich <mads@kiilerich.com>
parents:
18159
diff
changeset
|
202 |
16449
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
203 drwxr-xr-x sub |
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
204 -rw-r--r-- 41 large3 |
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
205 -rw-r--r-- 9 normal3 |
18228
1528ff6ac7ee
test-largefiles.t: fix wrong '#if hgweb' - it should be '#if serve'
Mads Kiilerich <mads@kiilerich.com>
parents:
18159
diff
changeset
|
206 |
1528ff6ac7ee
test-largefiles.t: fix wrong '#if hgweb' - it should be '#if serve'
Mads Kiilerich <mads@kiilerich.com>
parents:
18159
diff
changeset
|
207 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25382
diff
changeset
|
208 $ 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
|
209 200 Script output follows |
18228
1528ff6ac7ee
test-largefiles.t: fix wrong '#if hgweb' - it should be '#if serve'
Mads Kiilerich <mads@kiilerich.com>
parents:
18159
diff
changeset
|
210 |
1528ff6ac7ee
test-largefiles.t: fix wrong '#if hgweb' - it should be '#if serve'
Mads Kiilerich <mads@kiilerich.com>
parents:
18159
diff
changeset
|
211 |
16449
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
212 -rw-r--r-- 41 large4 |
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
213 -rw-r--r-- 9 normal4 |
18228
1528ff6ac7ee
test-largefiles.t: fix wrong '#if hgweb' - it should be '#if serve'
Mads Kiilerich <mads@kiilerich.com>
parents:
18159
diff
changeset
|
214 |
1528ff6ac7ee
test-largefiles.t: fix wrong '#if hgweb' - it should be '#if serve'
Mads Kiilerich <mads@kiilerich.com>
parents:
18159
diff
changeset
|
215 |
25474
8c14f87bd0ae
tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents:
25472
diff
changeset
|
216 $ killdaemons.py |
17089
0c1d10351869
tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
17088
diff
changeset
|
217 #endif |
16449
874a680a3e23
largefiles: hide .hglf/ prefix for largefiles in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
16439
diff
changeset
|
218 |
15216
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
219 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
|
220 archiving. |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
221 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
222 $ 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
|
223 $ 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
|
224 $ 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
|
225 $ 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
|
226 $ 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
|
227 $ cd ../archive0 |
17594
536fee6a5486
largefiles: fix trailing spaces in test-largefiles.t
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17579
diff
changeset
|
228 $ 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
|
229 normal1 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
230 $ cat large1 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
231 large1 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
232 $ 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
|
233 normal2 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
234 $ 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
|
235 large2 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
236 $ cd ../archive1 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
237 $ cat normal1 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
238 normal11 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
239 $ cat large1 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
240 large11 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
241 $ 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
|
242 normal22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
243 $ 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
|
244 large22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
245 $ cd ../archive2 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
246 $ ls |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
247 sub |
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/normal2 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
249 normal22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
250 $ 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
|
251 large22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
252 $ cd ../archive3 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
253 $ cat normal1 |
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 large1 |
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 $ 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
|
258 normal22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
259 $ 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
|
260 large22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
261 $ cd ../archive4 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
262 $ cat normal3 |
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 large3 |
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 $ 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
|
267 normal22 |
7678790279da
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com>
parents:
diff
changeset
|
268 $ 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
|
269 large22 |
15251
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
270 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
271 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
|
272 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
273 $ cd ../a |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
274 $ 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
|
275 $ 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
|
276 $ 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
|
277 $ 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
|
278 $ 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
|
279 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
280 M large3 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
281 M normal3 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
282 M sub/large4 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
283 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
|
284 $ cat normal3 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
285 normal3 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
286 $ cat large3 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
287 large3 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
288 $ 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
|
289 normal4 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
290 $ 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
|
291 large4 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
292 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
293 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
|
294 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
295 $ cd ../a |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
296 $ 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
|
297 $ 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
|
298 $ 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
|
299 $ 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
|
300 $ cd sub |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
301 $ 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
|
302 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
303 M large3 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
304 M normal3 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
305 M sub/large4 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
306 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
|
307 $ cat ../normal3 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
308 normal33 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
309 $ cat ../large3 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
310 large33 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
311 $ cat normal4 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
312 normal44 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
313 $ cat large4 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
314 large44 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
315 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
316 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
|
317 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
318 $ cd .. |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
319 $ 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
|
320 $ hg commit .hglf/large3 -m "try to commit standin" |
15253
67d010779907
largefiles: improve error reporting
Greg Ward <greg@gerg.ca>
parents:
15251
diff
changeset
|
321 abort: file ".hglf/large3" is a largefile standin |
67d010779907
largefiles: improve error reporting
Greg Ward <greg@gerg.ca>
parents:
15251
diff
changeset
|
322 (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
|
323 [255] |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
324 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
325 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
|
326 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
327 $ 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
|
328 $ 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
|
329 $ 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
|
330 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
|
331 $ mkdir sub2 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
332 $ 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
|
333 $ 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
|
334 $ hg add --large sub2 |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
335 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
|
336 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
|
337 $ hg st |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
338 M large3 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
339 A large5 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
340 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
|
341 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
|
342 |
18064
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
343 Committing directories containing only largefiles. |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
344 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
345 $ mkdir -p z/y/x/m |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
346 $ touch z/y/x/m/large1 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
347 $ touch z/y/x/large2 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
348 $ hg add --large z/y/x/m/large1 z/y/x/large2 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
349 $ hg commit -m "Subdir with directory only containing largefiles" z |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
350 Invoking status precommit hook |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
351 M large3 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
352 A large5 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
353 A sub2/large6 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
354 A sub2/large7 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
355 A z/y/x/large2 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
356 A z/y/x/m/large1 |
21275
c7e9fb881a5a
largefiles: include largefiles when doing log on a directory (issue4241)
Mads Kiilerich <madski@unity3d.com>
parents:
21209
diff
changeset
|
357 |
c7e9fb881a5a
largefiles: include largefiles when doing log on a directory (issue4241)
Mads Kiilerich <madski@unity3d.com>
parents:
21209
diff
changeset
|
358 (and a bit of log testing) |
c7e9fb881a5a
largefiles: include largefiles when doing log on a directory (issue4241)
Mads Kiilerich <madski@unity3d.com>
parents:
21209
diff
changeset
|
359 |
c7e9fb881a5a
largefiles: include largefiles when doing log on a directory (issue4241)
Mads Kiilerich <madski@unity3d.com>
parents:
21209
diff
changeset
|
360 $ hg log -T '{rev}\n' z/y/x/m/large1 |
c7e9fb881a5a
largefiles: include largefiles when doing log on a directory (issue4241)
Mads Kiilerich <madski@unity3d.com>
parents:
21209
diff
changeset
|
361 7 |
c7e9fb881a5a
largefiles: include largefiles when doing log on a directory (issue4241)
Mads Kiilerich <madski@unity3d.com>
parents:
21209
diff
changeset
|
362 $ hg log -T '{rev}\n' z/y/x/m # with only a largefile |
c7e9fb881a5a
largefiles: include largefiles when doing log on a directory (issue4241)
Mads Kiilerich <madski@unity3d.com>
parents:
21209
diff
changeset
|
363 7 |
c7e9fb881a5a
largefiles: include largefiles when doing log on a directory (issue4241)
Mads Kiilerich <madski@unity3d.com>
parents:
21209
diff
changeset
|
364 |
18064
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
365 $ hg rollback --quiet |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
366 $ touch z/y/x/m/normal |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
367 $ hg add z/y/x/m/normal |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
368 $ hg commit -m "Subdir with mixed contents" z |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
369 Invoking status precommit hook |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
370 M large3 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
371 A large5 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
372 A sub2/large6 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
373 A sub2/large7 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
374 A z/y/x/large2 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
375 A z/y/x/m/large1 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
376 A z/y/x/m/normal |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
377 $ hg st |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
378 M large3 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
379 A large5 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
380 A sub2/large6 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
381 A sub2/large7 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
382 $ hg rollback --quiet |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
383 $ hg revert z/y/x/large2 z/y/x/m/large1 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
384 $ rm z/y/x/large2 z/y/x/m/large1 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
385 $ hg commit -m "Subdir with normal contents" z |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
386 Invoking status precommit hook |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
387 M large3 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
388 A large5 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
389 A sub2/large6 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
390 A sub2/large7 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
391 A z/y/x/m/normal |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
392 $ hg st |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
393 M large3 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
394 A large5 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
395 A sub2/large6 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
396 A sub2/large7 |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
397 $ hg rollback --quiet |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
398 $ hg revert --quiet z |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
399 $ hg commit -m "Empty subdir" z |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
400 abort: z: no match under directory! |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
401 [255] |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
402 $ rm -rf z |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
403 $ hg ci -m "standin" .hglf |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
404 abort: file ".hglf" is a largefile standin |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
405 (commit the largefile itself instead) |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
406 [255] |
7e2b9f6a2cd0
largefiles: commit directories that only contain largefiles (issue3548)
Levi Bard <levi@unity3d.com>
parents:
17894
diff
changeset
|
407 |
16282
50247a7a9983
largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16281
diff
changeset
|
408 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
|
409 pattern' for largefiles: |
50247a7a9983
largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16281
diff
changeset
|
410 |
50247a7a9983
largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16281
diff
changeset
|
411 $ 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
|
412 A sub2/large6 |
50247a7a9983
largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16281
diff
changeset
|
413 A sub2/large7 |
50247a7a9983
largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16281
diff
changeset
|
414 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
415 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
|
416 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
417 $ echo testdata > test.dat |
15330
1e6fcce4aab3
largefiles: use smaller files in test script
Greg Ward <greg@gerg.ca>
parents:
15329
diff
changeset
|
418 $ 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
|
419 $ hg add |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
420 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
|
421 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
|
422 |
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
423 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
|
424 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
|
425 (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
|
426 |
15329
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
427 $ 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
|
428 $ 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
|
429 $ 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
|
430 adding ratherlarge as a largefile |
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
431 adding medium |
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
432 $ hg forget medium |
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
433 $ 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
|
434 adding medium as a largefile |
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
435 $ 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
|
436 $ 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
|
437 adding notlarge |
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
438 $ 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
|
439 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
440 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
|
441 |
15329
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
442 $ 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
|
443 $ 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
|
444 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
|
445 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
|
446 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
|
447 R large3 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
448 ? large5 |
15329
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
449 ? medium |
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
450 ? notlarge |
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
451 ? ratherlarge |
15251
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
452 ? reallylarge |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
453 ? test.dat |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
454 $ hg st |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
455 ? large3 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
456 ? large5 |
15329
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
457 ? medium |
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
458 ? notlarge |
944f9b7cfe4e
largefiles: test that minimum size can be a float
Greg Ward <greg@gerg.ca>
parents:
15328
diff
changeset
|
459 ? ratherlarge |
15251
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
460 ? reallylarge |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
461 ? test.dat |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
462 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
463 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
|
464 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
|
465 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
466 $ 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
|
467 $ 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
|
468 large44 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
469 $ 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
|
470 large6 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
471 $ 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
|
472 large7 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
473 |
21024
7731a2281cf0
spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents:
20994
diff
changeset
|
474 Test addremove: verify that files that should be added as largefiles are added as |
7731a2281cf0
spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents:
20994
diff
changeset
|
475 such and that already-existing largefiles are not added as normal files by |
15792
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
476 accident. |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
477 |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
478 $ rm normal3 |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
479 $ rm sub/large4 |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
480 $ echo "testing addremove with patterns" > testaddremove.dat |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
481 $ echo "normaladdremove" > normaladdremove |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
482 $ hg addremove |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
483 removing sub/large4 |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
484 adding testaddremove.dat as a largefile |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
485 removing normal3 |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
486 adding normaladdremove |
7cbba3adabc7
largefiles: implement addremove (issue3064)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15788
diff
changeset
|
487 |
17229
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
488 Test addremove with -R |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
489 |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
490 $ hg up -C |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
491 getting changed largefiles |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
492 1 largefiles updated, 0 removed |
18459
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18368
diff
changeset
|
493 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17229
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
494 $ rm normal3 |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
495 $ rm sub/large4 |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
496 $ echo "testing addremove with patterns" > testaddremove.dat |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
497 $ echo "normaladdremove" > normaladdremove |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
498 $ cd .. |
23658
55c92618fdd4
largefiles: eliminate a duplicate message when removing files in verbose mode
Matt Harbison <matt_harbison@yahoo.com>
parents:
23517
diff
changeset
|
499 $ hg -R a -v addremove |
17229
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
500 removing sub/large4 |
23767
749dc66e9329
largefiles: align the output messages for an added file with core methods
Matt Harbison <matt_harbison@yahoo.com>
parents:
23748
diff
changeset
|
501 adding testaddremove.dat as a largefile |
17229
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
502 removing normal3 |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
503 adding normaladdremove |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
504 $ cd a |
a6d9b2d33040
largefiles: fix addremove with -R option
Matt Harbison <matt_harbison@yahoo.com>
parents:
17092
diff
changeset
|
505 |
17230
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
506 Test 3364 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
507 $ hg clone . ../addrm |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
508 updating to branch default |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
509 getting changed largefiles |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
510 3 largefiles updated, 0 removed |
18459
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18368
diff
changeset
|
511 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17230
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
512 $ cd ../addrm |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
513 $ cat >> .hg/hgrc <<EOF |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
514 > [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
|
515 > 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
|
516 > EOF |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
517 $ touch foo |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
518 $ hg add --large foo |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
519 $ hg ci -m "add foo" |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
520 Invoking status precommit hook |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
521 A foo |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
522 Invoking status postcommit hook |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
523 C foo |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
524 C normal3 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
525 C sub/large4 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
526 C sub/normal4 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
527 C sub2/large6 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
528 C sub2/large7 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
529 $ rm foo |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
530 $ hg st |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
531 ! foo |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
532 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
|
533 $ 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
|
534 nothing changed |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
535 Invoking status postcommit hook |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
536 ! foo |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
537 C normal3 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
538 C sub/large4 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
539 C sub/normal4 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
540 C sub2/large6 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
541 C sub2/large7 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
542 [1] |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
543 $ hg addremove |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
544 removing foo |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
545 $ hg st |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
546 R foo |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
547 $ 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
|
548 Invoking status precommit hook |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
549 R foo |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
550 Invoking status postcommit hook |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
551 C normal3 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
552 C sub/large4 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
553 C sub/normal4 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
554 C sub2/large6 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
555 C sub2/large7 |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
556 $ hg st |
17231
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
557 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
558 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
|
559 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
560 $ touch normal |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
561 $ touch large |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
562 $ hg add normal |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
563 $ 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
|
564 $ 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
|
565 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
|
566 A large |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
567 A normal |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
568 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
|
569 C large |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
570 C normal |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
571 C normal3 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
572 C sub/large4 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
573 C sub/normal4 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
574 C sub2/large6 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
575 C sub2/large7 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
576 $ hg remove normal |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
577 $ hg addremove --traceback |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
578 $ 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
|
579 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
|
580 R normal |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
581 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
|
582 C large |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
583 C normal3 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
584 C sub/large4 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
585 C sub/normal4 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
586 C sub2/large6 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
587 C sub2/large7 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
588 $ hg up -C '.^' |
18459
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18368
diff
changeset
|
589 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17231
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
590 $ hg remove large |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
591 $ hg addremove --traceback |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
592 $ 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
|
593 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
|
594 R large |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
595 created new head |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
596 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
|
597 C normal |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
598 C normal3 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
599 C sub/large4 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
600 C sub/normal4 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
601 C sub2/large6 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
602 C sub2/large7 |
2446b63c89ec
largefiles: fix a traceback when addremove follows a remove (issue3507)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17230
diff
changeset
|
603 |
22183
4dd9f606d0a6
tests: fixup issue markers to make check-commit happy
Matt Mackall <mpm@selenic.com>
parents:
22171
diff
changeset
|
604 Test commit -A (issue3542) |
17658
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
605 $ echo large8 > large8 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
606 $ 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
|
607 $ 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
|
608 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
|
609 A large8 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
610 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
|
611 C large8 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
612 C normal |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
613 C normal3 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
614 C sub/large4 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
615 C sub/normal4 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
616 C sub2/large6 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
617 C sub2/large7 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
618 $ rm large8 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
619 $ 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
|
620 removing large8 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
621 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
|
622 R large8 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
623 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
|
624 C normal |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
625 C normal3 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
626 C sub/large4 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
627 C sub/normal4 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
628 C sub2/large6 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
629 C sub2/large7 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
630 |
17232
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
631 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
|
632 |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
633 $ touch large |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
634 $ 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
|
635 $ 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
|
636 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
|
637 A large |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
638 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
|
639 C large |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
640 C normal |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
641 C normal3 |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
642 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
|
643 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
|
644 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
|
645 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
|
646 $ 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
|
647 $ touch large |
25248e2ebaee
largefiles: ensure addlargefiles() doesn't add a standin as a largefile
Matt Harbison <matt_harbison@yahoo.com>
parents:
17231
diff
changeset
|
648 $ 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
|
649 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
|
650 |
17271
a09cc6aeed4a
largefiles: support revsets for outgoing --large
Matt Harbison <matt_harbison@yahoo.com>
parents:
17270
diff
changeset
|
651 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
|
652 $ 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
|
653 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
|
654 searching for changes |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
655 changeset: 8:c02fd3b77ec4 |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
656 user: test |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
657 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
|
658 summary: add foo |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
659 |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
660 changeset: 9:289dd08c9bbb |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
661 user: test |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
662 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
|
663 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
|
664 |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
665 changeset: 10:34f23ac6ac12 |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
666 user: test |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
667 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
|
668 summary: added |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
669 |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
670 changeset: 12:710c1b2f523c |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
671 parent: 10:34f23ac6ac12 |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
672 user: test |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
673 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
|
674 summary: removed large |
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
675 |
17658
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
676 changeset: 13:0a3e75774479 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
677 user: test |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
678 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
|
679 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
|
680 |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
681 changeset: 14:84f3d378175c |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
682 user: test |
a02c1ffddae9
largefiles: handle commit -A properly, after a --large commit (issue3542)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17601
diff
changeset
|
683 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
|
684 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
|
685 |
21884
a858d3de0d32
largefiles: confirm existence of outgoing largefile entities in remote store
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21883
diff
changeset
|
686 largefiles to upload (1 entities): |
18368
de685145f5c2
largefiles: upload files in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents:
18341
diff
changeset
|
687 large8 |
17270
32246faba53a
largefiles: fix a traceback introduced with recent peer changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
17269
diff
changeset
|
688 |
17230
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
689 $ cd ../a |
fc4c155658b7
largefiles: defer lfdirstate.drop() until after commit (issue3364)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17229
diff
changeset
|
690 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
691 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
|
692 |
15548
f76584098c88
largefiles: fix 'hg clone . ../foo' OSError abort
Martin Geisler <mg@lazybytes.net>
parents:
15384
diff
changeset
|
693 $ 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
|
694 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
|
695 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
|
696 3 largefiles updated, 0 removed |
18459
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18368
diff
changeset
|
697 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15548
f76584098c88
largefiles: fix 'hg clone . ../foo' OSError abort
Martin Geisler <mg@lazybytes.net>
parents:
15384
diff
changeset
|
698 $ cd ../b |
15384
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
699 $ 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
|
700 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
|
701 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
|
702 5:9d5af5072dbd edit files again |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
703 4:74c02385b94c move files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
704 3:9e8fbc4bce62 copy files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
705 2:51a0ae4d5864 remove files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
706 1:ce8896473775 edit files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
707 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
|
708 $ cat normal3 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
709 normal33 |
21109
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
710 |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
711 Test graph log |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
712 |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
713 $ hg log -G --template '{rev}:{node|short} {desc|firstline}\n' |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
714 @ 7:daea875e9014 add/edit more largefiles |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
715 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
716 o 6:4355d653f84f edit files yet again |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
717 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
718 o 5:9d5af5072dbd edit files again |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
719 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
720 o 4:74c02385b94c move files |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
721 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
722 o 3:9e8fbc4bce62 copy files |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
723 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
724 o 2:51a0ae4d5864 remove files |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
725 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
726 o 1:ce8896473775 edit files |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
727 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
728 o 0:30d30fe6a5be add files |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
729 |
22169
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
730 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
731 Test log with --patch |
22170
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
732 |
22169
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
733 $ hg log --patch -r 6::7 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
734 changeset: 6:4355d653f84f |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
735 user: test |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
736 date: Thu Jan 01 00:00:00 1970 +0000 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
737 summary: edit files yet again |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
738 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
739 diff -r 9d5af5072dbd -r 4355d653f84f .hglf/large3 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
740 --- a/.hglf/large3 Thu Jan 01 00:00:00 1970 +0000 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
741 +++ b/.hglf/large3 Thu Jan 01 00:00:00 1970 +0000 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
742 @@ -1,1 +1,1 @@ |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
743 -baaf12afde9d8d67f25dab6dced0d2bf77dba47c |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
744 +7838695e10da2bb75ac1156565f40a2595fa2fa0 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
745 diff -r 9d5af5072dbd -r 4355d653f84f .hglf/sub/large4 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
746 --- a/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
747 +++ b/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
748 @@ -1,1 +1,1 @@ |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
749 -aeb2210d19f02886dde00dac279729a48471e2f9 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
750 +971fb41e78fea4f8e0ba5244784239371cb00591 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
751 diff -r 9d5af5072dbd -r 4355d653f84f normal3 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
752 --- a/normal3 Thu Jan 01 00:00:00 1970 +0000 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
753 +++ b/normal3 Thu Jan 01 00:00:00 1970 +0000 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
754 @@ -1,1 +1,1 @@ |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
755 -normal3 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
756 +normal33 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
757 diff -r 9d5af5072dbd -r 4355d653f84f sub/normal4 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
758 --- a/sub/normal4 Thu Jan 01 00:00:00 1970 +0000 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
759 +++ b/sub/normal4 Thu Jan 01 00:00:00 1970 +0000 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
760 @@ -1,1 +1,1 @@ |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
761 -normal4 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
762 +normal44 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
763 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
764 changeset: 7:daea875e9014 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
765 tag: tip |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
766 user: test |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
767 date: Thu Jan 01 00:00:00 1970 +0000 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
768 summary: add/edit more largefiles |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
769 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
770 diff -r 4355d653f84f -r daea875e9014 .hglf/large3 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
771 --- a/.hglf/large3 Thu Jan 01 00:00:00 1970 +0000 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
772 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
773 @@ -1,1 +0,0 @@ |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
774 -7838695e10da2bb75ac1156565f40a2595fa2fa0 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
775 diff -r 4355d653f84f -r daea875e9014 .hglf/sub2/large6 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
776 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
777 +++ b/.hglf/sub2/large6 Thu Jan 01 00:00:00 1970 +0000 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
778 @@ -0,0 +1,1 @@ |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
779 +0d6d75887db61b2c7e6c74b5dd8fc6ad50c0cc30 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
780 diff -r 4355d653f84f -r daea875e9014 .hglf/sub2/large7 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
781 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
782 +++ b/.hglf/sub2/large7 Thu Jan 01 00:00:00 1970 +0000 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
783 @@ -0,0 +1,1 @@ |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
784 +bb3151689acb10f0c3125c560d5e63df914bc1af |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
785 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
786 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
787 $ hg log --patch -r 6::7 sub/ |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
788 changeset: 6:4355d653f84f |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
789 user: test |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
790 date: Thu Jan 01 00:00:00 1970 +0000 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
791 summary: edit files yet again |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
792 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
793 diff -r 9d5af5072dbd -r 4355d653f84f .hglf/sub/large4 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
794 --- a/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
795 +++ b/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
796 @@ -1,1 +1,1 @@ |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
797 -aeb2210d19f02886dde00dac279729a48471e2f9 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
798 +971fb41e78fea4f8e0ba5244784239371cb00591 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
799 diff -r 9d5af5072dbd -r 4355d653f84f sub/normal4 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
800 --- a/sub/normal4 Thu Jan 01 00:00:00 1970 +0000 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
801 +++ b/sub/normal4 Thu Jan 01 00:00:00 1970 +0000 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
802 @@ -1,1 +1,1 @@ |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
803 -normal4 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
804 +normal44 |
35cc5b07b3fc
largefiles: in overridelog, use non-lf matcher for patch generation (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
21884
diff
changeset
|
805 |
22170
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
806 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
807 log with both --follow and --patch |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
808 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
809 $ hg log --follow --patch --limit 2 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
810 changeset: 7:daea875e9014 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
811 tag: tip |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
812 user: test |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
813 date: Thu Jan 01 00:00:00 1970 +0000 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
814 summary: add/edit more largefiles |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
815 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
816 diff -r 4355d653f84f -r daea875e9014 .hglf/large3 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
817 --- a/.hglf/large3 Thu Jan 01 00:00:00 1970 +0000 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
818 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
819 @@ -1,1 +0,0 @@ |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
820 -7838695e10da2bb75ac1156565f40a2595fa2fa0 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
821 diff -r 4355d653f84f -r daea875e9014 .hglf/sub2/large6 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
822 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
823 +++ b/.hglf/sub2/large6 Thu Jan 01 00:00:00 1970 +0000 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
824 @@ -0,0 +1,1 @@ |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
825 +0d6d75887db61b2c7e6c74b5dd8fc6ad50c0cc30 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
826 diff -r 4355d653f84f -r daea875e9014 .hglf/sub2/large7 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
827 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
828 +++ b/.hglf/sub2/large7 Thu Jan 01 00:00:00 1970 +0000 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
829 @@ -0,0 +1,1 @@ |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
830 +bb3151689acb10f0c3125c560d5e63df914bc1af |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
831 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
832 changeset: 6:4355d653f84f |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
833 user: test |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
834 date: Thu Jan 01 00:00:00 1970 +0000 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
835 summary: edit files yet again |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
836 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
837 diff -r 9d5af5072dbd -r 4355d653f84f .hglf/large3 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
838 --- a/.hglf/large3 Thu Jan 01 00:00:00 1970 +0000 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
839 +++ b/.hglf/large3 Thu Jan 01 00:00:00 1970 +0000 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
840 @@ -1,1 +1,1 @@ |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
841 -baaf12afde9d8d67f25dab6dced0d2bf77dba47c |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
842 +7838695e10da2bb75ac1156565f40a2595fa2fa0 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
843 diff -r 9d5af5072dbd -r 4355d653f84f .hglf/sub/large4 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
844 --- a/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
845 +++ b/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
846 @@ -1,1 +1,1 @@ |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
847 -aeb2210d19f02886dde00dac279729a48471e2f9 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
848 +971fb41e78fea4f8e0ba5244784239371cb00591 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
849 diff -r 9d5af5072dbd -r 4355d653f84f normal3 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
850 --- a/normal3 Thu Jan 01 00:00:00 1970 +0000 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
851 +++ b/normal3 Thu Jan 01 00:00:00 1970 +0000 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
852 @@ -1,1 +1,1 @@ |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
853 -normal3 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
854 +normal33 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
855 diff -r 9d5af5072dbd -r 4355d653f84f sub/normal4 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
856 --- a/sub/normal4 Thu Jan 01 00:00:00 1970 +0000 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
857 +++ b/sub/normal4 Thu Jan 01 00:00:00 1970 +0000 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
858 @@ -1,1 +1,1 @@ |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
859 -normal4 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
860 +normal44 |
0e1b02f984c7
largefiles: don't override matchandpats for always matchers (issue4334)
Siddharth Agarwal <sid0@fb.com>
parents:
22169
diff
changeset
|
861 |
22171
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
862 $ hg log --follow --patch sub/large4 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
863 changeset: 6:4355d653f84f |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
864 user: test |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
865 date: Thu Jan 01 00:00:00 1970 +0000 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
866 summary: edit files yet again |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
867 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
868 diff -r 9d5af5072dbd -r 4355d653f84f .hglf/sub/large4 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
869 --- a/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
870 +++ b/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
871 @@ -1,1 +1,1 @@ |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
872 -aeb2210d19f02886dde00dac279729a48471e2f9 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
873 +971fb41e78fea4f8e0ba5244784239371cb00591 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
874 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
875 changeset: 5:9d5af5072dbd |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
876 user: test |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
877 date: Thu Jan 01 00:00:00 1970 +0000 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
878 summary: edit files again |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
879 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
880 diff -r 74c02385b94c -r 9d5af5072dbd .hglf/sub/large4 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
881 --- a/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
882 +++ b/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
883 @@ -1,1 +1,1 @@ |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
884 -eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
885 +aeb2210d19f02886dde00dac279729a48471e2f9 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
886 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
887 changeset: 4:74c02385b94c |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
888 user: test |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
889 date: Thu Jan 01 00:00:00 1970 +0000 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
890 summary: move files |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
891 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
892 diff -r 9e8fbc4bce62 -r 74c02385b94c .hglf/sub/large4 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
893 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
894 +++ b/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
895 @@ -0,0 +1,1 @@ |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
896 +eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
897 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
898 changeset: 1:ce8896473775 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
899 user: test |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
900 date: Thu Jan 01 00:00:00 1970 +0000 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
901 summary: edit files |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
902 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
903 diff -r 30d30fe6a5be -r ce8896473775 .hglf/sub/large2 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
904 --- a/.hglf/sub/large2 Thu Jan 01 00:00:00 1970 +0000 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
905 +++ b/.hglf/sub/large2 Thu Jan 01 00:00:00 1970 +0000 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
906 @@ -1,1 +1,1 @@ |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
907 -1deebade43c8c498a3c8daddac0244dc55d1331d |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
908 +eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
909 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
910 changeset: 0:30d30fe6a5be |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
911 user: test |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
912 date: Thu Jan 01 00:00:00 1970 +0000 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
913 summary: add files |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
914 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
915 diff -r 000000000000 -r 30d30fe6a5be .hglf/sub/large2 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
916 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
917 +++ b/.hglf/sub/large2 Thu Jan 01 00:00:00 1970 +0000 |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
918 @@ -0,0 +1,1 @@ |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
919 +1deebade43c8c498a3c8daddac0244dc55d1331d |
371cc920ca12
test-largefiles: add test for hg log --follow --patch with path
Siddharth Agarwal <sid0@fb.com>
parents:
22170
diff
changeset
|
920 |
15251
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
921 $ 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
|
922 normal44 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
923 $ 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
|
924 large44 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
925 $ 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
|
926 large6 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
927 $ 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
|
928 large7 |
19472
32e502b26983
largefiles: overridematch() should replace the file path instead of extending (issue3934)
Wei, Elson <elson.wei@gmail.com>
parents:
19117
diff
changeset
|
929 $ hg log -qf sub2/large7 |
32e502b26983
largefiles: overridematch() should replace the file path instead of extending (issue3934)
Wei, Elson <elson.wei@gmail.com>
parents:
19117
diff
changeset
|
930 7:daea875e9014 |
21109
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
931 $ hg log -Gqf sub2/large7 |
21110
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21109
diff
changeset
|
932 @ 7:daea875e9014 |
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21109
diff
changeset
|
933 | |
15251
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
934 $ cd .. |
21209
c5d35995d192
largefiles: better handling of log from other working directory (issue4236)
Mads Kiilerich <madski@unity3d.com>
parents:
21196
diff
changeset
|
935 |
c5d35995d192
largefiles: better handling of log from other working directory (issue4236)
Mads Kiilerich <madski@unity3d.com>
parents:
21196
diff
changeset
|
936 Test log from outside repo |
c5d35995d192
largefiles: better handling of log from other working directory (issue4236)
Mads Kiilerich <madski@unity3d.com>
parents:
21196
diff
changeset
|
937 |
c5d35995d192
largefiles: better handling of log from other working directory (issue4236)
Mads Kiilerich <madski@unity3d.com>
parents:
21196
diff
changeset
|
938 $ hg log b/sub -T '{rev}:{node|short} {desc|firstline}\n' |
c5d35995d192
largefiles: better handling of log from other working directory (issue4236)
Mads Kiilerich <madski@unity3d.com>
parents:
21196
diff
changeset
|
939 6:4355d653f84f edit files yet again |
c5d35995d192
largefiles: better handling of log from other working directory (issue4236)
Mads Kiilerich <madski@unity3d.com>
parents:
21196
diff
changeset
|
940 5:9d5af5072dbd edit files again |
c5d35995d192
largefiles: better handling of log from other working directory (issue4236)
Mads Kiilerich <madski@unity3d.com>
parents:
21196
diff
changeset
|
941 4:74c02385b94c move files |
c5d35995d192
largefiles: better handling of log from other working directory (issue4236)
Mads Kiilerich <madski@unity3d.com>
parents:
21196
diff
changeset
|
942 1:ce8896473775 edit files |
c5d35995d192
largefiles: better handling of log from other working directory (issue4236)
Mads Kiilerich <madski@unity3d.com>
parents:
21196
diff
changeset
|
943 0:30d30fe6a5be add files |
c5d35995d192
largefiles: better handling of log from other working directory (issue4236)
Mads Kiilerich <madski@unity3d.com>
parents:
21196
diff
changeset
|
944 |
c5d35995d192
largefiles: better handling of log from other working directory (issue4236)
Mads Kiilerich <madski@unity3d.com>
parents:
21196
diff
changeset
|
945 Test clone at revision |
c5d35995d192
largefiles: better handling of log from other working directory (issue4236)
Mads Kiilerich <madski@unity3d.com>
parents:
21196
diff
changeset
|
946 |
15251
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
947 $ 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
|
948 adding changesets |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
949 adding manifests |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
950 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
|
951 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
|
952 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
|
953 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
|
954 2 largefiles updated, 0 removed |
18459
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18368
diff
changeset
|
955 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15251
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
956 $ cd c |
15384
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
957 $ 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
|
958 3:9e8fbc4bce62 copy files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
959 2:51a0ae4d5864 remove files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
960 1:ce8896473775 edit files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
961 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
|
962 $ cat normal1 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
963 normal22 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
964 $ cat large1 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
965 large22 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
966 $ 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
|
967 normal22 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
968 $ 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
|
969 large22 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
970 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
971 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
|
972 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
|
973 |
17594
536fee6a5486
largefiles: fix trailing spaces in test-largefiles.t
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17579
diff
changeset
|
974 $ 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
|
975 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
|
976 1 largefiles updated, 0 removed |
18459
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18368
diff
changeset
|
977 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15251
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
978 $ cat large1 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
979 large11 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
980 $ 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
|
981 large22 |
16644
98a9266db803
largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16603
diff
changeset
|
982 $ cd .. |
98a9266db803
largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16603
diff
changeset
|
983 |
98a9266db803
largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16603
diff
changeset
|
984 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
|
985 |
17092
5d0d99952494
tests: make rm of usercache in test-largefiles.t more robust
Mads Kiilerich <mads@kiilerich.com>
parents:
17089
diff
changeset
|
986 $ rm "${USERCACHE}"/* |
16644
98a9266db803
largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16603
diff
changeset
|
987 $ 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
|
988 updating to branch default |
98a9266db803
largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16603
diff
changeset
|
989 getting changed largefiles |
98a9266db803
largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16603
diff
changeset
|
990 3 largefiles updated, 0 removed |
18459
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18368
diff
changeset
|
991 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
16644
98a9266db803
largefiles: add --all-largefiles flag to clone (issue3188)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16603
diff
changeset
|
992 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
|
993 |
17598
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
994 $ rm "${USERCACHE}"/* |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
995 $ 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
|
996 updating to branch default |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
997 getting changed largefiles |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
998 2 largefiles updated, 0 removed |
18459
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18368
diff
changeset
|
999 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17598
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
1000 9 additional largefiles cached |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
1001 $ 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
|
1002 parent: 0:30d30fe6a5be |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
1003 add files |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
1004 branch: default |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
1005 commit: (clean) |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
1006 update: 7 new changesets (update) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25354
diff
changeset
|
1007 phases: 8 draft |
17598
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
1008 |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
1009 $ rm "${USERCACHE}"/* |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
1010 $ 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
|
1011 updating to branch default |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
1012 getting changed largefiles |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
1013 2 largefiles updated, 0 removed |
18459
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18368
diff
changeset
|
1014 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17598
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
1015 8 additional largefiles cached |
18485
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1016 $ hg -R a-clone1 verify --large --lfa --lfc |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1017 checking changesets |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1018 checking manifests |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1019 crosschecking files in changesets and manifests |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1020 checking files |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1021 10 files, 8 changesets, 24 total revisions |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1022 searching 8 changesets for largefiles |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1023 verified contents of 13 revisions of 6 largefiles |
17598
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
1024 $ 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
|
1025 parent: 1:ce8896473775 |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
1026 edit files |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
1027 branch: default |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
1028 commit: (clean) |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
1029 update: 6 new changesets (update) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25354
diff
changeset
|
1030 phases: 8 draft |
17598
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
1031 |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
1032 $ rm "${USERCACHE}"/* |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
1033 $ 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
|
1034 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
|
1035 $ 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
|
1036 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
|
1037 branch: default |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
1038 commit: (clean) |
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
1039 update: 8 new changesets (update) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25354
diff
changeset
|
1040 phases: 8 draft |
17598
b7302d65006c
largefiles: restore normal 'clone -u' and 'clone -U' functionality
Matt Harbison <matt_harbison@yahoo.com>
parents:
17594
diff
changeset
|
1041 |
18553
b6b9475c563a
largefiles: don't crash when trying to find default dest for url without path
Mads Kiilerich <madski@unity3d.com>
parents:
18506
diff
changeset
|
1042 Show computed destination directory: |
b6b9475c563a
largefiles: don't crash when trying to find default dest for url without path
Mads Kiilerich <madski@unity3d.com>
parents:
18506
diff
changeset
|
1043 |
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
|
1044 $ 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
|
1045 $ 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
|
1046 $ 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
|
1047 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
|
1048 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
|
1049 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
|
1050 3 largefiles updated, 0 removed |
18459
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18368
diff
changeset
|
1051 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
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
|
1052 $ 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
|
1053 |
18553
b6b9475c563a
largefiles: don't crash when trying to find default dest for url without path
Mads Kiilerich <madski@unity3d.com>
parents:
18506
diff
changeset
|
1054 Clone URL without path: |
b6b9475c563a
largefiles: don't crash when trying to find default dest for url without path
Mads Kiilerich <madski@unity3d.com>
parents:
18506
diff
changeset
|
1055 |
b6b9475c563a
largefiles: don't crash when trying to find default dest for url without path
Mads Kiilerich <madski@unity3d.com>
parents:
18506
diff
changeset
|
1056 $ hg clone file:// |
b6b9475c563a
largefiles: don't crash when trying to find default dest for url without path
Mads Kiilerich <madski@unity3d.com>
parents:
18506
diff
changeset
|
1057 abort: repository / not found! |
b6b9475c563a
largefiles: don't crash when trying to find default dest for url without path
Mads Kiilerich <madski@unity3d.com>
parents:
18506
diff
changeset
|
1058 [255] |
b6b9475c563a
largefiles: don't crash when trying to find default dest for url without path
Mads Kiilerich <madski@unity3d.com>
parents:
18506
diff
changeset
|
1059 |
17601
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17600
diff
changeset
|
1060 Ensure base clone command argument validation |
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17600
diff
changeset
|
1061 |
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17600
diff
changeset
|
1062 $ 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
|
1063 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
|
1064 [255] |
6e2ab601be3f
largefiles: delegate to the wrapped clone command
Matt Harbison <matt_harbison@yahoo.com>
parents:
17600
diff
changeset
|
1065 |
16723
68da5ae6e470
largefiles: don't attempt to clone all largefiles to non-local destinations
Levi Bard <levi@unity3d.com>
parents:
16692
diff
changeset
|
1066 $ 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
|
1067 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
|
1068 [255] |
68da5ae6e470
largefiles: don't attempt to clone all largefiles to non-local destinations
Levi Bard <levi@unity3d.com>
parents:
16692
diff
changeset
|
1069 |
17847
1e4eb1faba6e
largefiles: use 'default' instead of 'default-push' when pulling (issue3584)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17843
diff
changeset
|
1070 Test pulling with --all-largefiles flag. Also test that the largefiles are |
1e4eb1faba6e
largefiles: use 'default' instead of 'default-push' when pulling (issue3584)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17843
diff
changeset
|
1071 downloaded from 'default' instead of 'default-push' when no source is specified |
1e4eb1faba6e
largefiles: use 'default' instead of 'default-push' when pulling (issue3584)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17843
diff
changeset
|
1072 (issue3584) |
16692
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
1073 |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
1074 $ rm -Rf a-backup |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
1075 $ 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
|
1076 adding changesets |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
1077 adding manifests |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
1078 adding file changes |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
1079 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
|
1080 updating to branch default |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
1081 getting changed largefiles |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
1082 2 largefiles updated, 0 removed |
18459
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18368
diff
changeset
|
1083 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17092
5d0d99952494
tests: make rm of usercache in test-largefiles.t more robust
Mads Kiilerich <mads@kiilerich.com>
parents:
17089
diff
changeset
|
1084 $ rm "${USERCACHE}"/* |
16692
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
1085 $ cd a-backup |
17847
1e4eb1faba6e
largefiles: use 'default' instead of 'default-push' when pulling (issue3584)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17843
diff
changeset
|
1086 $ hg pull --all-largefiles --config paths.default-push=bogus/path |
17088
31f7dd50ed40
test-largefiles: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17017
diff
changeset
|
1087 pulling from $TESTTMP/a (glob) |
16692
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
1088 searching for changes |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
1089 adding changesets |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
1090 adding manifests |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
1091 adding file changes |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
1092 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
|
1093 (run 'hg update' to get a working copy) |
18981
83ead8cb0ff2
largefiles: implement pull --all-largefiles as a special case of --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18980
diff
changeset
|
1094 6 largefiles cached |
18976
6734951e2d24
largefiles: introduce lfpull command for pulling missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18974
diff
changeset
|
1095 |
18978
8abaadab9abb
largefiles: introduce pull --lfrev option
Mads Kiilerich <madski@unity3d.com>
parents:
18976
diff
changeset
|
1096 redo pull with --lfrev and check it pulls largefiles for the right revs |
8abaadab9abb
largefiles: introduce pull --lfrev option
Mads Kiilerich <madski@unity3d.com>
parents:
18976
diff
changeset
|
1097 |
8abaadab9abb
largefiles: introduce pull --lfrev option
Mads Kiilerich <madski@unity3d.com>
parents:
18976
diff
changeset
|
1098 $ hg rollback |
8abaadab9abb
largefiles: introduce pull --lfrev option
Mads Kiilerich <madski@unity3d.com>
parents:
18976
diff
changeset
|
1099 repository tip rolled back to revision 1 (undo pull) |
18979
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
1100 $ hg pull -v --lfrev 'heads(pulled())+min(pulled())' |
18978
8abaadab9abb
largefiles: introduce pull --lfrev option
Mads Kiilerich <madski@unity3d.com>
parents:
18976
diff
changeset
|
1101 pulling from $TESTTMP/a (glob) |
8abaadab9abb
largefiles: introduce pull --lfrev option
Mads Kiilerich <madski@unity3d.com>
parents:
18976
diff
changeset
|
1102 searching for changes |
8abaadab9abb
largefiles: introduce pull --lfrev option
Mads Kiilerich <madski@unity3d.com>
parents:
18976
diff
changeset
|
1103 all local heads known remotely |
8abaadab9abb
largefiles: introduce pull --lfrev option
Mads Kiilerich <madski@unity3d.com>
parents:
18976
diff
changeset
|
1104 6 changesets found |
25354
4b61521c3db0
test: use bundle2 for exchange in test-largefile
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
1105 uncompressed size of bundle content: |
4b61521c3db0
test: use bundle2 for exchange in test-largefile
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
1106 1333 (changelog) |
4b61521c3db0
test: use bundle2 for exchange in test-largefile
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
1107 1599 (manifests) |
4b61521c3db0
test: use bundle2 for exchange in test-largefile
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
1108 254 .hglf/large1 |
4b61521c3db0
test: use bundle2 for exchange in test-largefile
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
1109 564 .hglf/large3 |
4b61521c3db0
test: use bundle2 for exchange in test-largefile
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
1110 572 .hglf/sub/large4 |
4b61521c3db0
test: use bundle2 for exchange in test-largefile
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
1111 182 .hglf/sub2/large6 |
4b61521c3db0
test: use bundle2 for exchange in test-largefile
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
1112 182 .hglf/sub2/large7 |
4b61521c3db0
test: use bundle2 for exchange in test-largefile
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
1113 212 normal1 |
4b61521c3db0
test: use bundle2 for exchange in test-largefile
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
1114 457 normal3 |
4b61521c3db0
test: use bundle2 for exchange in test-largefile
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25111
diff
changeset
|
1115 465 sub/normal4 |
18978
8abaadab9abb
largefiles: introduce pull --lfrev option
Mads Kiilerich <madski@unity3d.com>
parents:
18976
diff
changeset
|
1116 adding changesets |
8abaadab9abb
largefiles: introduce pull --lfrev option
Mads Kiilerich <madski@unity3d.com>
parents:
18976
diff
changeset
|
1117 adding manifests |
8abaadab9abb
largefiles: introduce pull --lfrev option
Mads Kiilerich <madski@unity3d.com>
parents:
18976
diff
changeset
|
1118 adding file changes |
8abaadab9abb
largefiles: introduce pull --lfrev option
Mads Kiilerich <madski@unity3d.com>
parents:
18976
diff
changeset
|
1119 added 6 changesets with 16 changes to 8 files |
20548
5bd6a9fec103
hooks: for python hooks, consistently use __name__ etc as name, not the repr
Mads Kiilerich <madski@unity3d.com>
parents:
20471
diff
changeset
|
1120 calling hook changegroup.lfiles: hgext.largefiles.reposetup.checkrequireslfiles |
18978
8abaadab9abb
largefiles: introduce pull --lfrev option
Mads Kiilerich <madski@unity3d.com>
parents:
18976
diff
changeset
|
1121 (run 'hg update' to get a working copy) |
8abaadab9abb
largefiles: introduce pull --lfrev option
Mads Kiilerich <madski@unity3d.com>
parents:
18976
diff
changeset
|
1122 pulling largefiles for revision 7 |
8abaadab9abb
largefiles: introduce pull --lfrev option
Mads Kiilerich <madski@unity3d.com>
parents:
18976
diff
changeset
|
1123 found 971fb41e78fea4f8e0ba5244784239371cb00591 in store |
8abaadab9abb
largefiles: introduce pull --lfrev option
Mads Kiilerich <madski@unity3d.com>
parents:
18976
diff
changeset
|
1124 found 0d6d75887db61b2c7e6c74b5dd8fc6ad50c0cc30 in store |
8abaadab9abb
largefiles: introduce pull --lfrev option
Mads Kiilerich <madski@unity3d.com>
parents:
18976
diff
changeset
|
1125 found bb3151689acb10f0c3125c560d5e63df914bc1af in store |
18979
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
1126 pulling largefiles for revision 2 |
1176832fc757
largefiles: introduce pulled() revset expression for use in --lfrev
Mads Kiilerich <madski@unity3d.com>
parents:
18978
diff
changeset
|
1127 found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store |
18978
8abaadab9abb
largefiles: introduce pull --lfrev option
Mads Kiilerich <madski@unity3d.com>
parents:
18976
diff
changeset
|
1128 0 largefiles cached |
8abaadab9abb
largefiles: introduce pull --lfrev option
Mads Kiilerich <madski@unity3d.com>
parents:
18976
diff
changeset
|
1129 |
18976
6734951e2d24
largefiles: introduce lfpull command for pulling missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18974
diff
changeset
|
1130 lfpull |
6734951e2d24
largefiles: introduce lfpull command for pulling missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18974
diff
changeset
|
1131 |
6734951e2d24
largefiles: introduce lfpull command for pulling missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18974
diff
changeset
|
1132 $ hg lfpull -r : --config largefiles.usercache=usercache-lfpull |
6734951e2d24
largefiles: introduce lfpull command for pulling missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18974
diff
changeset
|
1133 2 largefiles cached |
6734951e2d24
largefiles: introduce lfpull command for pulling missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18974
diff
changeset
|
1134 $ hg lfpull -v -r 4+2 --config largefiles.usercache=usercache-lfpull |
6734951e2d24
largefiles: introduce lfpull command for pulling missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18974
diff
changeset
|
1135 pulling largefiles for revision 4 |
6734951e2d24
largefiles: introduce lfpull command for pulling missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18974
diff
changeset
|
1136 found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store |
6734951e2d24
largefiles: introduce lfpull command for pulling missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18974
diff
changeset
|
1137 found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store |
6734951e2d24
largefiles: introduce lfpull command for pulling missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18974
diff
changeset
|
1138 pulling largefiles for revision 2 |
6734951e2d24
largefiles: introduce lfpull command for pulling missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18974
diff
changeset
|
1139 found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store |
6734951e2d24
largefiles: introduce lfpull command for pulling missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18974
diff
changeset
|
1140 0 largefiles cached |
6734951e2d24
largefiles: introduce lfpull command for pulling missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18974
diff
changeset
|
1141 |
6734951e2d24
largefiles: introduce lfpull command for pulling missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18974
diff
changeset
|
1142 $ ls usercache-lfpull/* | sort |
6734951e2d24
largefiles: introduce lfpull command for pulling missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18974
diff
changeset
|
1143 usercache-lfpull/1deebade43c8c498a3c8daddac0244dc55d1331d |
6734951e2d24
largefiles: introduce lfpull command for pulling missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18974
diff
changeset
|
1144 usercache-lfpull/4669e532d5b2c093a78eca010077e708a071bb64 |
6734951e2d24
largefiles: introduce lfpull command for pulling missing largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18974
diff
changeset
|
1145 |
16692
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
1146 $ cd .. |
b9969574540a
largefiles: add --all-largefiles flag to pull
Na'Tosha Bard <natosha@unity3d.com>
parents:
16644
diff
changeset
|
1147 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
1148 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
|
1149 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
|
1150 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
1151 $ 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
|
1152 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
|
1153 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
|
1154 3 largefiles updated, 0 removed |
18459
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18368
diff
changeset
|
1155 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15251
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
1156 $ cd b |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
1157 $ 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
|
1158 $ 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
|
1159 $ 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
|
1160 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1161 M normal3 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1162 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
|
1163 $ cd ../d |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
1164 $ 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
|
1165 $ 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
|
1166 $ 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
|
1167 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1168 M sub/normal4 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1169 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
|
1170 $ 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
|
1171 $ 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
|
1172 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
|
1173 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
|
1174 3 largefiles updated, 0 removed |
18459
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18368
diff
changeset
|
1175 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
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
|
1176 $ cd d |
17847
1e4eb1faba6e
largefiles: use 'default' instead of 'default-push' when pulling (issue3584)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17843
diff
changeset
|
1177 |
1e4eb1faba6e
largefiles: use 'default' instead of 'default-push' when pulling (issue3584)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17843
diff
changeset
|
1178 More rebase testing, but also test that the largefiles are downloaded from |
18721
2dc7f63181b9
largefiles: fix off-by-one error on pull --all-largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18553
diff
changeset
|
1179 'default-push' when no source is specified (issue3584). (The largefile from the |
2dc7f63181b9
largefiles: fix off-by-one error on pull --all-largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18553
diff
changeset
|
1180 pulled revision is however not downloaded but found in the local cache.) |
2dc7f63181b9
largefiles: fix off-by-one error on pull --all-largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18553
diff
changeset
|
1181 Largefiles are fetched for the new pulled revision, not for existing revisions, |
2dc7f63181b9
largefiles: fix off-by-one error on pull --all-largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18553
diff
changeset
|
1182 rebased or not. |
2dc7f63181b9
largefiles: fix off-by-one error on pull --all-largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18553
diff
changeset
|
1183 |
2dc7f63181b9
largefiles: fix off-by-one error on pull --all-largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18553
diff
changeset
|
1184 $ [ ! -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ] |
17847
1e4eb1faba6e
largefiles: use 'default' instead of 'default-push' when pulling (issue3584)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17843
diff
changeset
|
1185 $ hg pull --rebase --all-largefiles --config paths.default-push=bogus/path --config paths.default=../b |
1e4eb1faba6e
largefiles: use 'default' instead of 'default-push' when pulling (issue3584)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17843
diff
changeset
|
1186 pulling from $TESTTMP/b (glob) |
15251
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
1187 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
|
1188 adding changesets |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
1189 adding manifests |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
1190 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
|
1191 added 1 changesets with 2 changes to 2 files (+1 heads) |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23348
diff
changeset
|
1192 rebasing 8:f574fb32bb45 "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
|
1193 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1194 M sub/normal4 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1195 M sub2/large6 |
23835
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
23767
diff
changeset
|
1196 saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-dd1d9f80-backup.hg (glob) |
24029
e1dbe0b215ae
largefiles: set the extension as enabled locally after a clone requiring it
Matt Harbison <matt_harbison@yahoo.com>
parents:
23840
diff
changeset
|
1197 0 largefiles cached |
18721
2dc7f63181b9
largefiles: fix off-by-one error on pull --all-largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18553
diff
changeset
|
1198 $ [ -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ] |
15384
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
1199 $ 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
|
1200 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
|
1201 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
|
1202 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
|
1203 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
|
1204 5:9d5af5072dbd edit files again |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
1205 4:74c02385b94c move files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
1206 3:9e8fbc4bce62 copy files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
1207 2:51a0ae4d5864 remove files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
1208 1:ce8896473775 edit files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
1209 0:30d30fe6a5be add files |
21109
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1210 $ hg log -G --template '{rev}:{node|short} {desc|firstline}\n' |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1211 @ 9:598410d3eb9a modify normal file largefile in repo d |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1212 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1213 o 8:a381d2c8c80e modify normal file and largefile in repo b |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1214 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1215 o 7:daea875e9014 add/edit more largefiles |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1216 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1217 o 6:4355d653f84f edit files yet again |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1218 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1219 o 5:9d5af5072dbd edit files again |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1220 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1221 o 4:74c02385b94c move files |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1222 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1223 o 3:9e8fbc4bce62 copy files |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1224 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1225 o 2:51a0ae4d5864 remove files |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1226 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1227 o 1:ce8896473775 edit files |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1228 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1229 o 0:30d30fe6a5be add files |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1230 |
15251
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
1231 $ cat normal3 |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
1232 normal3-modified |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
1233 $ 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
|
1234 normal4-modified |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
1235 $ 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
|
1236 large4-modified |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
1237 $ 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
|
1238 large6-modified |
173b00827279
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com>
parents:
15225
diff
changeset
|
1239 $ 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
|
1240 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
|
1241 $ 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
|
1242 $ 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
|
1243 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
|
1244 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
|
1245 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
|
1246 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
|
1247 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
|
1248 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
|
1249 (run 'hg heads' to see heads, 'hg merge' to merge) |
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
|
1250 $ hg rebase |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23348
diff
changeset
|
1251 rebasing 8:f574fb32bb45 "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
|
1252 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1253 M sub/normal4 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1254 M sub2/large6 |
23835
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
23767
diff
changeset
|
1255 saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-dd1d9f80-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
|
1256 $ 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
|
1257 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
|
1258 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
|
1259 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
|
1260 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
|
1261 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
|
1262 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
|
1263 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
|
1264 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
|
1265 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
|
1266 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
|
1267 $ 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
|
1268 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
|
1269 $ 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
|
1270 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
|
1271 $ 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
|
1272 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
|
1273 $ 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
|
1274 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
|
1275 $ 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
|
1276 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
|
1277 |
18341
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1278 Log on largefiles |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1279 |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1280 - same output |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1281 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' .hglf/sub/large4 |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1282 8:a381d2c8c80e modify normal file and largefile in repo b |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1283 6:4355d653f84f edit files yet again |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1284 5:9d5af5072dbd edit files again |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1285 4:74c02385b94c move files |
21109
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1286 $ hg log -G --template '{rev}:{node|short} {desc|firstline}\n' .hglf/sub/large4 |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1287 o 8:a381d2c8c80e modify normal file and largefile in repo b |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1288 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1289 o 6:4355d653f84f edit files yet again |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1290 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1291 o 5:9d5af5072dbd edit files again |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1292 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1293 o 4:74c02385b94c move files |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1294 | |
18341
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1295 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' sub/large4 |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1296 8:a381d2c8c80e modify normal file and largefile in repo b |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1297 6:4355d653f84f edit files yet again |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1298 5:9d5af5072dbd edit files again |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1299 4:74c02385b94c move files |
21109
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1300 $ hg log -G --template '{rev}:{node|short} {desc|firstline}\n' .hglf/sub/large4 |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1301 o 8:a381d2c8c80e modify normal file and largefile in repo b |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1302 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1303 o 6:4355d653f84f edit files yet again |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1304 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1305 o 5:9d5af5072dbd edit files again |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1306 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1307 o 4:74c02385b94c move files |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1308 | |
18341
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1309 |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1310 - .hglf only matches largefiles, without .hglf it matches 9 bco sub/normal |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1311 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' .hglf/sub |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1312 8:a381d2c8c80e modify normal file and largefile in repo b |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1313 6:4355d653f84f edit files yet again |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1314 5:9d5af5072dbd edit files again |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1315 4:74c02385b94c move files |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1316 1:ce8896473775 edit files |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1317 0:30d30fe6a5be add files |
21109
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1318 $ hg log -G --template '{rev}:{node|short} {desc|firstline}\n' .hglf/sub |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1319 o 8:a381d2c8c80e modify normal file and largefile in repo b |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1320 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1321 o 6:4355d653f84f edit files yet again |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1322 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1323 o 5:9d5af5072dbd edit files again |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1324 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1325 o 4:74c02385b94c move files |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1326 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1327 o 1:ce8896473775 edit files |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1328 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1329 o 0:30d30fe6a5be add files |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1330 |
18341
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1331 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' sub |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1332 9:598410d3eb9a modify normal file largefile in repo d |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1333 8:a381d2c8c80e modify normal file and largefile in repo b |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1334 6:4355d653f84f edit files yet again |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1335 5:9d5af5072dbd edit files again |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1336 4:74c02385b94c move files |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1337 1:ce8896473775 edit files |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1338 0:30d30fe6a5be add files |
21109
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1339 $ hg log -G --template '{rev}:{node|short} {desc|firstline}\n' sub |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1340 @ 9:598410d3eb9a modify normal file largefile in repo d |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1341 | |
21110
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21109
diff
changeset
|
1342 o 8:a381d2c8c80e modify normal file and largefile in repo b |
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21109
diff
changeset
|
1343 | |
21109
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1344 o 6:4355d653f84f edit files yet again |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1345 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1346 o 5:9d5af5072dbd edit files again |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1347 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1348 o 4:74c02385b94c move files |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1349 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1350 o 1:ce8896473775 edit files |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1351 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1352 o 0:30d30fe6a5be add files |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1353 |
18341
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1354 - globbing gives same result |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1355 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' 'glob:sub/*' |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1356 9:598410d3eb9a modify normal file largefile in repo d |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1357 8:a381d2c8c80e modify normal file and largefile in repo b |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1358 6:4355d653f84f edit files yet again |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1359 5:9d5af5072dbd edit files again |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1360 4:74c02385b94c move files |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1361 1:ce8896473775 edit files |
ed23d6100dd3
largefiles: make log match largefiles in the non-standin location too
Mads Kiilerich <mads@kiilerich.com>
parents:
18300
diff
changeset
|
1362 0:30d30fe6a5be add files |
21109
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1363 $ hg log -G --template '{rev}:{node|short} {desc|firstline}\n' 'glob:sub/*' |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1364 @ 9:598410d3eb9a modify normal file largefile in repo d |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1365 | |
21110
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21109
diff
changeset
|
1366 o 8:a381d2c8c80e modify normal file and largefile in repo b |
49e13e76ec5a
largefiles: changed overridelog to work with graphlog
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21109
diff
changeset
|
1367 | |
21109
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1368 o 6:4355d653f84f edit files yet again |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1369 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1370 o 5:9d5af5072dbd edit files again |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1371 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1372 o 4:74c02385b94c move files |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1373 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1374 o 1:ce8896473775 edit files |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1375 | |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1376 o 0:30d30fe6a5be add files |
4b15a369e067
largefiles: added test coverage for graph log
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
21088
diff
changeset
|
1377 |
15328
9b4ab5f7ad2a
largefiles: polish comments in test script
Greg Ward <greg@gerg.ca>
parents:
15318
diff
changeset
|
1378 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
|
1379 |
17594
536fee6a5486
largefiles: fix trailing spaces in test-largefiles.t
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17579
diff
changeset
|
1380 $ 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
|
1381 $ 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
|
1382 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1383 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
|
1384 $ 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
|
1385 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
|
1386 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
|
1387 $ 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
|
1388 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
|
1389 $ 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
|
1390 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
|
1391 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
|
1392 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
|
1393 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
|
1394 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
|
1395 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
|
1396 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
|
1397 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
|
1398 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
|
1399 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
|
1400 $ 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
|
1401 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
|
1402 |
15365
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
1403 "update --check" refuses to update with uncommitted changes. |
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
1404 $ hg update --check 8 |
19801
41abe2e3e3b7
update: standardize error message for dirty update --check
Siddharth Agarwal <sid0@fb.com>
parents:
19779
diff
changeset
|
1405 abort: uncommitted changes |
15365
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
1406 [255] |
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
1407 |
18292
40185df018d7
largefiles: make update with backup files in .hglf slightly less broken
Mads Kiilerich <madski@unity3d.com>
parents:
18064
diff
changeset
|
1408 "update --clean" leaves correct largefiles in working copy, even when there is |
40185df018d7
largefiles: make update with backup files in .hglf slightly less broken
Mads Kiilerich <madski@unity3d.com>
parents:
18064
diff
changeset
|
1409 .orig files from revert in .hglf. |
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
|
1410 |
18292
40185df018d7
largefiles: make update with backup files in .hglf slightly less broken
Mads Kiilerich <madski@unity3d.com>
parents:
18064
diff
changeset
|
1411 $ echo mistake > sub2/large7 |
40185df018d7
largefiles: make update with backup files in .hglf slightly less broken
Mads Kiilerich <madski@unity3d.com>
parents:
18064
diff
changeset
|
1412 $ hg revert sub2/large7 |
21083
20b0c49c032c
largefiles: update should only create a .orig backup of a largefile once
Mads Kiilerich <madski@unity3d.com>
parents:
21052
diff
changeset
|
1413 $ cat sub2/large7 |
20b0c49c032c
largefiles: update should only create a .orig backup of a largefile once
Mads Kiilerich <madski@unity3d.com>
parents:
21052
diff
changeset
|
1414 large7 |
20b0c49c032c
largefiles: update should only create a .orig backup of a largefile once
Mads Kiilerich <madski@unity3d.com>
parents:
21052
diff
changeset
|
1415 $ cat sub2/large7.orig |
20b0c49c032c
largefiles: update should only create a .orig backup of a largefile once
Mads Kiilerich <madski@unity3d.com>
parents:
21052
diff
changeset
|
1416 mistake |
20b0c49c032c
largefiles: update should only create a .orig backup of a largefile once
Mads Kiilerich <madski@unity3d.com>
parents:
21052
diff
changeset
|
1417 $ test ! -f .hglf/sub2/large7.orig |
20b0c49c032c
largefiles: update should only create a .orig backup of a largefile once
Mads Kiilerich <madski@unity3d.com>
parents:
21052
diff
changeset
|
1418 |
18292
40185df018d7
largefiles: make update with backup files in .hglf slightly less broken
Mads Kiilerich <madski@unity3d.com>
parents:
18064
diff
changeset
|
1419 $ hg -q update --clean -r null |
17594
536fee6a5486
largefiles: fix trailing spaces in test-largefiles.t
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17579
diff
changeset
|
1420 $ 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
|
1421 getting changed largefiles |
18292
40185df018d7
largefiles: make update with backup files in .hglf slightly less broken
Mads Kiilerich <madski@unity3d.com>
parents:
18064
diff
changeset
|
1422 3 largefiles updated, 0 removed |
18459
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18368
diff
changeset
|
1423 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
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
|
1424 $ 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
|
1425 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
|
1426 $ 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
|
1427 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
|
1428 $ 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
|
1429 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
|
1430 $ 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
|
1431 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
|
1432 $ 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
|
1433 large7 |
18292
40185df018d7
largefiles: make update with backup files in .hglf slightly less broken
Mads Kiilerich <madski@unity3d.com>
parents:
18064
diff
changeset
|
1434 $ cat sub2/large7.orig |
40185df018d7
largefiles: make update with backup files in .hglf slightly less broken
Mads Kiilerich <madski@unity3d.com>
parents:
18064
diff
changeset
|
1435 mistake |
21083
20b0c49c032c
largefiles: update should only create a .orig backup of a largefile once
Mads Kiilerich <madski@unity3d.com>
parents:
21052
diff
changeset
|
1436 $ test ! -f .hglf/sub2/large7.orig |
18292
40185df018d7
largefiles: make update with backup files in .hglf slightly less broken
Mads Kiilerich <madski@unity3d.com>
parents:
18064
diff
changeset
|
1437 |
21083
20b0c49c032c
largefiles: update should only create a .orig backup of a largefile once
Mads Kiilerich <madski@unity3d.com>
parents:
21052
diff
changeset
|
1438 verify that largefile .orig file no longer is overwritten on every update -C: |
18292
40185df018d7
largefiles: make update with backup files in .hglf slightly less broken
Mads Kiilerich <madski@unity3d.com>
parents:
18064
diff
changeset
|
1439 $ hg update --clean |
18459
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18368
diff
changeset
|
1440 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
18292
40185df018d7
largefiles: make update with backup files in .hglf slightly less broken
Mads Kiilerich <madski@unity3d.com>
parents:
18064
diff
changeset
|
1441 $ cat sub2/large7.orig |
21083
20b0c49c032c
largefiles: update should only create a .orig backup of a largefile once
Mads Kiilerich <madski@unity3d.com>
parents:
21052
diff
changeset
|
1442 mistake |
20b0c49c032c
largefiles: update should only create a .orig backup of a largefile once
Mads Kiilerich <madski@unity3d.com>
parents:
21052
diff
changeset
|
1443 $ rm sub2/large7.orig |
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
|
1444 |
15365
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
1445 Now "update check" is happy. |
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
1446 $ hg update --check 8 |
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
1447 getting changed largefiles |
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
1448 1 largefiles updated, 0 removed |
18459
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18368
diff
changeset
|
1449 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15365
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
1450 $ hg update --check |
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
1451 getting changed largefiles |
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
1452 1 largefiles updated, 0 removed |
18459
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18368
diff
changeset
|
1453 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15365
ca1412c15efe
largefiles: test "update --check"
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
1454 |
15900
29defa7d20f6
largefiles: remove empty directories upon update (issue3202)
Patrick Mezard <pmezard@gmail.com>
parents:
15787
diff
changeset
|
1455 Test removing empty largefiles directories on update |
29defa7d20f6
largefiles: remove empty directories upon update (issue3202)
Patrick Mezard <pmezard@gmail.com>
parents:
15787
diff
changeset
|
1456 $ test -d sub2 && echo "sub2 exists" |
29defa7d20f6
largefiles: remove empty directories upon update (issue3202)
Patrick Mezard <pmezard@gmail.com>
parents:
15787
diff
changeset
|
1457 sub2 exists |
29defa7d20f6
largefiles: remove empty directories upon update (issue3202)
Patrick Mezard <pmezard@gmail.com>
parents:
15787
diff
changeset
|
1458 $ hg update -q null |
29defa7d20f6
largefiles: remove empty directories upon update (issue3202)
Patrick Mezard <pmezard@gmail.com>
parents:
15787
diff
changeset
|
1459 $ 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
|
1460 [1] |
29defa7d20f6
largefiles: remove empty directories upon update (issue3202)
Patrick Mezard <pmezard@gmail.com>
parents:
15787
diff
changeset
|
1461 $ hg update -q |
29defa7d20f6
largefiles: remove empty directories upon update (issue3202)
Patrick Mezard <pmezard@gmail.com>
parents:
15787
diff
changeset
|
1462 |
15930
2dc599583ebe
largefiles: test and simplify empty directory removal in remove
Patrick Mezard <pmezard@gmail.com>
parents:
15916
diff
changeset
|
1463 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
|
1464 $ 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
|
1465 sub2 exists |
2dc599583ebe
largefiles: test and simplify empty directory removal in remove
Patrick Mezard <pmezard@gmail.com>
parents:
15916
diff
changeset
|
1466 $ hg remove sub2/* |
2dc599583ebe
largefiles: test and simplify empty directory removal in remove
Patrick Mezard <pmezard@gmail.com>
parents:
15916
diff
changeset
|
1467 $ 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
|
1468 [1] |
2dc599583ebe
largefiles: test and simplify empty directory removal in remove
Patrick Mezard <pmezard@gmail.com>
parents:
15916
diff
changeset
|
1469 $ 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
|
1470 |
15366
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1471 "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
|
1472 $ echo hack3 >> normal3 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1473 $ echo hack4 >> sub/normal4 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1474 $ echo hack4 >> sub/large4 |
15983
32b9aee3602c
largefiles: fix revert on missing largefile (issue3217)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15982
diff
changeset
|
1475 $ rm sub2/large6 |
32b9aee3602c
largefiles: fix revert on missing largefile (issue3217)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15982
diff
changeset
|
1476 $ hg revert sub2/large6 |
15366
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1477 $ hg rm sub2/large6 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1478 $ echo new >> sub2/large8 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1479 $ hg add --large sub2/large8 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1480 # 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
|
1481 # 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
|
1482 $ hg revert sub |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
1483 reverting .hglf/sub/large4 (glob) |
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
1484 reverting sub/normal4 (glob) |
15366
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1485 $ hg status |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1486 M normal3 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1487 A sub2/large8 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1488 R sub2/large6 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1489 ? sub/large4.orig |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1490 ? sub/normal4.orig |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1491 $ cat sub/normal4 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1492 normal4-modified |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1493 $ cat sub/large4 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1494 large4-modified |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1495 $ hg revert -a --no-backup |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
1496 undeleting .hglf/sub2/large6 (glob) |
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
1497 forgetting .hglf/sub2/large8 (glob) |
15366
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1498 reverting normal3 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1499 $ hg status |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1500 ? sub/large4.orig |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1501 ? sub/normal4.orig |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1502 ? sub2/large8 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1503 $ cat normal3 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1504 normal3-modified |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1505 $ cat sub2/large6 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1506 large6-modified |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1507 $ rm sub/*.orig sub2/large8 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1508 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1509 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
|
1510 $ 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
|
1511 reverting .hglf/sub2/large6 (glob) |
15366
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1512 $ cat sub2/large6 |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1513 large6 |
17268
8c31b652bdfe
largefiles: support revsets for revert
Matt Harbison <matt_harbison@yahoo.com>
parents:
17245
diff
changeset
|
1514 $ hg revert --no-backup -C -r '.^' sub2 |
15366
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1515 $ hg revert --no-backup sub2 |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
1516 reverting .hglf/sub2/large6 (glob) |
15366
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1517 $ hg status |
06b8db3f25c6
largefiles: test reverting largefiles (coverage creeping ever upwards)
Greg Ward <greg@gerg.ca>
parents:
15365
diff
changeset
|
1518 |
15370
8af6c6d91c92
largefiles: fix typo
Eli Carter <eli.carter@tektronix.com>
parents:
15369
diff
changeset
|
1519 "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
|
1520 |
18485
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1521 - Where Do We Come From? What Are We? Where Are We Going? |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1522 $ pwd |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1523 $TESTTMP/e |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1524 $ hg paths |
18506
ef60083b5536
tests: fix for windows - slashes and no serve
Mads Kiilerich <madski@unity3d.com>
parents:
18491
diff
changeset
|
1525 default = $TESTTMP/d (glob) |
18485
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1526 |
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
|
1527 $ 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
|
1528 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
|
1529 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
|
1530 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
|
1531 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
|
1532 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
|
1533 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
|
1534 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
|
1535 |
18485
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1536 - introduce missing blob in local store repo and make sure that this is caught: |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1537 $ mv $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 . |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1538 $ hg verify --large |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1539 checking changesets |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1540 checking manifests |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1541 crosschecking files in changesets and manifests |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1542 checking files |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1543 10 files, 10 changesets, 28 total revisions |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1544 searching 1 changesets for largefiles |
18557
945ba91c5e16
tests: fix windows test failure with largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18554
diff
changeset
|
1545 changeset 9:598410d3eb9a: sub/large4 references missing $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob) |
18486
1067a6240f86
largefiles: verify all files in each revision and report errors in any revision
Mads Kiilerich <madski@unity3d.com>
parents:
18485
diff
changeset
|
1546 verified existence of 3 revisions of 3 largefiles |
18485
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1547 [1] |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1548 |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1549 - introduce corruption and make sure that it is caught when checking content: |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1550 $ echo '5 cents' > $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1551 $ hg verify -q --large --lfc |
18557
945ba91c5e16
tests: fix windows test failure with largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18554
diff
changeset
|
1552 changeset 9:598410d3eb9a: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob) |
18485
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1553 [1] |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1554 |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1555 - cleanup |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1556 $ mv e166e74c7303192238d60af5a9c4ce9bef0b7928 $TESTTMP/d/.hg/largefiles/ |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1557 |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1558 - verifying all revisions will fail because we didn't clone all largefiles to d: |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1559 $ echo 'T-shirt' > $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 |
18547
2e3ec9e6ee6e
largefiles: make verify --lfa and --lfc work without --large
Mads Kiilerich <madski@unity3d.com>
parents:
18546
diff
changeset
|
1560 $ hg verify -q --lfa --lfc |
18557
945ba91c5e16
tests: fix windows test failure with largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18554
diff
changeset
|
1561 changeset 0:30d30fe6a5be: large1 references missing $TESTTMP/d/.hg/largefiles/4669e532d5b2c093a78eca010077e708a071bb64 (glob) |
945ba91c5e16
tests: fix windows test failure with largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18554
diff
changeset
|
1562 changeset 0:30d30fe6a5be: sub/large2 references missing $TESTTMP/d/.hg/largefiles/1deebade43c8c498a3c8daddac0244dc55d1331d (glob) |
945ba91c5e16
tests: fix windows test failure with largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18554
diff
changeset
|
1563 changeset 1:ce8896473775: large1 references missing $TESTTMP/d/.hg/largefiles/5f78770c0e77ba4287ad6ef3071c9bf9c379742f (glob) |
945ba91c5e16
tests: fix windows test failure with largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18554
diff
changeset
|
1564 changeset 1:ce8896473775: sub/large2 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob) |
945ba91c5e16
tests: fix windows test failure with largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18554
diff
changeset
|
1565 changeset 3:9e8fbc4bce62: large1 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob) |
945ba91c5e16
tests: fix windows test failure with largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18554
diff
changeset
|
1566 changeset 4:74c02385b94c: large3 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob) |
945ba91c5e16
tests: fix windows test failure with largefiles
Mads Kiilerich <madski@unity3d.com>
parents:
18554
diff
changeset
|
1567 changeset 4:74c02385b94c: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob) |
18833
b1a42a6087ca
tests: append missing glob to filename output and check-code it
Simon Heimberg <simohe@besonet.ch>
parents:
18731
diff
changeset
|
1568 changeset 5:9d5af5072dbd: large3 references missing $TESTTMP/d/.hg/largefiles/baaf12afde9d8d67f25dab6dced0d2bf77dba47c (glob) |
b1a42a6087ca
tests: append missing glob to filename output and check-code it
Simon Heimberg <simohe@besonet.ch>
parents:
18731
diff
changeset
|
1569 changeset 5:9d5af5072dbd: sub/large4 references missing $TESTTMP/d/.hg/largefiles/aeb2210d19f02886dde00dac279729a48471e2f9 (glob) |
b1a42a6087ca
tests: append missing glob to filename output and check-code it
Simon Heimberg <simohe@besonet.ch>
parents:
18731
diff
changeset
|
1570 changeset 6:4355d653f84f: large3 references missing $TESTTMP/d/.hg/largefiles/7838695e10da2bb75ac1156565f40a2595fa2fa0 (glob) |
18486
1067a6240f86
largefiles: verify all files in each revision and report errors in any revision
Mads Kiilerich <madski@unity3d.com>
parents:
18485
diff
changeset
|
1571 [1] |
18485
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1572 |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1573 - cleanup |
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1574 $ rm $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 |
18726
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1575 $ rm -f .hglf/sub/*.orig |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1576 |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1577 Update to revision with missing largefile - and make sure it really is missing |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1578 |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1579 $ rm ${USERCACHE}/7838695e10da2bb75ac1156565f40a2595fa2fa0 |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1580 $ hg up -r 6 |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1581 getting changed largefiles |
20471
ea005e754c9c
tests: lines with largefile .* file://$TESTTMP also match on windows
Simon Heimberg <simohe@besonet.ch>
parents:
20297
diff
changeset
|
1582 large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:/*/$TESTTMP/d (glob) |
18726
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1583 1 largefiles updated, 2 removed |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1584 4 files updated, 0 files merged, 2 files removed, 0 files unresolved |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1585 $ rm normal3 |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1586 $ echo >> sub/normal4 |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1587 $ hg ci -m 'commit with missing files' |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1588 Invoking status precommit hook |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1589 M sub/normal4 |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1590 ! large3 |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1591 ! normal3 |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1592 created new head |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1593 $ hg st |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1594 ! large3 |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1595 ! normal3 |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1596 $ hg up -r. |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1597 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1598 $ hg st |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1599 ! large3 |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1600 ! normal3 |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1601 $ hg up -Cr. |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1602 getting changed largefiles |
20471
ea005e754c9c
tests: lines with largefile .* file://$TESTTMP also match on windows
Simon Heimberg <simohe@besonet.ch>
parents:
20297
diff
changeset
|
1603 large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:/*/$TESTTMP/d (glob) |
18726
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1604 0 largefiles updated, 0 removed |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1605 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1606 $ hg st |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1607 ! large3 |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1608 $ hg rollback |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1609 repository tip rolled back to revision 9 (undo commit) |
431b246cfb12
largefiles: missing largefiles should not be committed as removed
Mads Kiilerich <madski@unity3d.com>
parents:
18722
diff
changeset
|
1610 working directory now based on revision 6 |
18485
39cecda9ff77
tests: better test coverage of largefiles localstore verify
Mads Kiilerich <madski@unity3d.com>
parents:
18484
diff
changeset
|
1611 |
18729
4e53ac3f466a
largefiles: updatelfiles should use working dir standins, not standins from p1
Mads Kiilerich <madski@unity3d.com>
parents:
18726
diff
changeset
|
1612 Merge with revision with missing largefile - and make sure it tries to fetch it. |
4e53ac3f466a
largefiles: updatelfiles should use working dir standins, not standins from p1
Mads Kiilerich <madski@unity3d.com>
parents:
18726
diff
changeset
|
1613 |
4e53ac3f466a
largefiles: updatelfiles should use working dir standins, not standins from p1
Mads Kiilerich <madski@unity3d.com>
parents:
18726
diff
changeset
|
1614 $ hg up -Cqr null |
4e53ac3f466a
largefiles: updatelfiles should use working dir standins, not standins from p1
Mads Kiilerich <madski@unity3d.com>
parents:
18726
diff
changeset
|
1615 $ echo f > f |
4e53ac3f466a
largefiles: updatelfiles should use working dir standins, not standins from p1
Mads Kiilerich <madski@unity3d.com>
parents:
18726
diff
changeset
|
1616 $ hg ci -Am branch |
4e53ac3f466a
largefiles: updatelfiles should use working dir standins, not standins from p1
Mads Kiilerich <madski@unity3d.com>
parents:
18726
diff
changeset
|
1617 adding f |
4e53ac3f466a
largefiles: updatelfiles should use working dir standins, not standins from p1
Mads Kiilerich <madski@unity3d.com>
parents:
18726
diff
changeset
|
1618 Invoking status precommit hook |
4e53ac3f466a
largefiles: updatelfiles should use working dir standins, not standins from p1
Mads Kiilerich <madski@unity3d.com>
parents:
18726
diff
changeset
|
1619 A f |
4e53ac3f466a
largefiles: updatelfiles should use working dir standins, not standins from p1
Mads Kiilerich <madski@unity3d.com>
parents:
18726
diff
changeset
|
1620 created new head |
4e53ac3f466a
largefiles: updatelfiles should use working dir standins, not standins from p1
Mads Kiilerich <madski@unity3d.com>
parents:
18726
diff
changeset
|
1621 $ hg merge -r 6 |
4e53ac3f466a
largefiles: updatelfiles should use working dir standins, not standins from p1
Mads Kiilerich <madski@unity3d.com>
parents:
18726
diff
changeset
|
1622 getting changed largefiles |
20471
ea005e754c9c
tests: lines with largefile .* file://$TESTTMP also match on windows
Simon Heimberg <simohe@besonet.ch>
parents:
20297
diff
changeset
|
1623 large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:/*/$TESTTMP/d (glob) |
18729
4e53ac3f466a
largefiles: updatelfiles should use working dir standins, not standins from p1
Mads Kiilerich <madski@unity3d.com>
parents:
18726
diff
changeset
|
1624 1 largefiles updated, 0 removed |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22190
diff
changeset
|
1625 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22190
diff
changeset
|
1626 (branch merge, don't forget to commit) |
18729
4e53ac3f466a
largefiles: updatelfiles should use working dir standins, not standins from p1
Mads Kiilerich <madski@unity3d.com>
parents:
18726
diff
changeset
|
1627 |
4e53ac3f466a
largefiles: updatelfiles should use working dir standins, not standins from p1
Mads Kiilerich <madski@unity3d.com>
parents:
18726
diff
changeset
|
1628 $ hg rollback -q |
4e53ac3f466a
largefiles: updatelfiles should use working dir standins, not standins from p1
Mads Kiilerich <madski@unity3d.com>
parents:
18726
diff
changeset
|
1629 $ hg up -Cq |
4e53ac3f466a
largefiles: updatelfiles should use working dir standins, not standins from p1
Mads Kiilerich <madski@unity3d.com>
parents:
18726
diff
changeset
|
1630 |
18722
f0aa8bbffe60
largefiles: fix download of largefiles from an empty list of changesets
Mads Kiilerich <madski@unity3d.com>
parents:
18721
diff
changeset
|
1631 Pulling 0 revisions with --all-largefiles should not fetch for all revisions |
f0aa8bbffe60
largefiles: fix download of largefiles from an empty list of changesets
Mads Kiilerich <madski@unity3d.com>
parents:
18721
diff
changeset
|
1632 |
f0aa8bbffe60
largefiles: fix download of largefiles from an empty list of changesets
Mads Kiilerich <madski@unity3d.com>
parents:
18721
diff
changeset
|
1633 $ hg pull --all-largefiles |
f0aa8bbffe60
largefiles: fix download of largefiles from an empty list of changesets
Mads Kiilerich <madski@unity3d.com>
parents:
18721
diff
changeset
|
1634 pulling from $TESTTMP/d (glob) |
f0aa8bbffe60
largefiles: fix download of largefiles from an empty list of changesets
Mads Kiilerich <madski@unity3d.com>
parents:
18721
diff
changeset
|
1635 searching for changes |
f0aa8bbffe60
largefiles: fix download of largefiles from an empty list of changesets
Mads Kiilerich <madski@unity3d.com>
parents:
18721
diff
changeset
|
1636 no changes found |
f0aa8bbffe60
largefiles: fix download of largefiles from an empty list of changesets
Mads Kiilerich <madski@unity3d.com>
parents:
18721
diff
changeset
|
1637 |
15916
c96148346af8
largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents:
15909
diff
changeset
|
1638 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
|
1639 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
|
1640 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
|
1641 |
54c581d98636
largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15297
diff
changeset
|
1642 $ cd .. |
15916
c96148346af8
largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents:
15909
diff
changeset
|
1643 $ 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
|
1644 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
|
1645 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
|
1646 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
|
1647 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
|
1648 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
|
1649 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
|
1650 3 largefiles updated, 0 removed |
18459
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18368
diff
changeset
|
1651 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15916
c96148346af8
largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents:
15909
diff
changeset
|
1652 $ hg clone temp f |
c96148346af8
largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents:
15909
diff
changeset
|
1653 updating to branch default |
c96148346af8
largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents:
15909
diff
changeset
|
1654 getting changed largefiles |
c96148346af8
largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents:
15909
diff
changeset
|
1655 3 largefiles updated, 0 removed |
18459
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18368
diff
changeset
|
1656 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15916
c96148346af8
largefiles: cache new largefiles for new heads when pulling
Na'Tosha Bard <natosha@unity3d.com>
parents:
15909
diff
changeset
|
1657 # 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
|
1658 # 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
|
1659 $ 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
|
1660 $ 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
|
1661 $ 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
|
1662 $ 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
|
1663 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1664 M sub/large4 |
18704
d69585a5c5c0
largefiles: don't cache largefiles for pulled heads by default
Na'Tosha Bard <natosha@unity3d.com>
parents:
18631
diff
changeset
|
1665 # Test --cache-largefiles flag |
18980
9717a326d270
largefiles: drop --cache-largefiles again
Mads Kiilerich <madski@unity3d.com>
parents:
18979
diff
changeset
|
1666 $ hg pull --lfrev 'heads(pulled())' ../e |
15298
54c581d98636
largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15297
diff
changeset
|
1667 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
|
1668 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
|
1669 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
|
1670 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
|
1671 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
|
1672 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
|
1673 (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
|
1674 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
|
1675 $ 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
|
1676 largefile sub/large4 has a merge conflict |
20297
8f412d034173
largefiles: show hashes before prompting for conflict resolution
Mads Kiilerich <madski@unity3d.com>
parents:
20296
diff
changeset
|
1677 ancestor was 971fb41e78fea4f8e0ba5244784239371cb00591 |
8f412d034173
largefiles: show hashes before prompting for conflict resolution
Mads Kiilerich <madski@unity3d.com>
parents:
20296
diff
changeset
|
1678 keep (l)ocal d846f26643bfa8ec210be40cc93cc6b7ff1128ea or |
8f412d034173
largefiles: show hashes before prompting for conflict resolution
Mads Kiilerich <madski@unity3d.com>
parents:
20296
diff
changeset
|
1679 take (o)ther e166e74c7303192238d60af5a9c4ce9bef0b7928? l |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22190
diff
changeset
|
1680 getting changed largefiles |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22190
diff
changeset
|
1681 1 largefiles updated, 0 removed |
15298
54c581d98636
largefiles: test that merging does not result in wrong versions of largefiles
Na'Tosha Bard <natosha@unity3d.com>
parents:
15297
diff
changeset
|
1682 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
|
1683 (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
|
1684 $ 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
|
1685 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1686 M normal3 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1687 M sub/normal4 |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1688 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
|
1689 $ 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
|
1690 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
|
1691 $ 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
|
1692 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
|
1693 $ 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
|
1694 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
|
1695 $ 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
|
1696 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
|
1697 $ 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
|
1698 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
|
1699 |
15629
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1700 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
|
1701 |
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1702 $ echo large > large |
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1703 $ hg add --large large |
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1704 $ 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
|
1705 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1706 A large |
15629
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1707 $ hg update -q ".^" |
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1708 $ echo change >> normal3 |
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1709 $ 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
|
1710 Invoking status precommit hook |
8bed8551d535
largefiles: add precommit hook to check for inappropriate locking
Levi Bard <levi@unity3d.com>
parents:
15792
diff
changeset
|
1711 M normal3 |
15629
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1712 created new head |
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1713 $ hg merge |
22288
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22190
diff
changeset
|
1714 getting changed largefiles |
4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22190
diff
changeset
|
1715 1 largefiles updated, 0 removed |
15629
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1716 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
|
1717 (branch merge, don't forget to commit) |
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1718 $ hg status |
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1719 M large |
5b66e55c0d93
largefiles: fix 'hg status' abort after merge
Martin Geisler <mg@aragost.com>
parents:
15598
diff
changeset
|
1720 |
18300
745bc16ccef2
largefiles: fix update from a merge with removed files
Mads Kiilerich <madski@unity3d.com>
parents:
18299
diff
changeset
|
1721 - make sure update of merge with removed largefiles fails as expected |
745bc16ccef2
largefiles: fix update from a merge with removed files
Mads Kiilerich <madski@unity3d.com>
parents:
18299
diff
changeset
|
1722 $ hg rm sub2/large6 |
745bc16ccef2
largefiles: fix update from a merge with removed files
Mads Kiilerich <madski@unity3d.com>
parents:
18299
diff
changeset
|
1723 $ hg up -r. |
22841
18b3869179f9
merge: make error message consistent with other commands
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
22288
diff
changeset
|
1724 abort: outstanding uncommitted merge |
18300
745bc16ccef2
largefiles: fix update from a merge with removed files
Mads Kiilerich <madski@unity3d.com>
parents:
18299
diff
changeset
|
1725 [255] |
745bc16ccef2
largefiles: fix update from a merge with removed files
Mads Kiilerich <madski@unity3d.com>
parents:
18299
diff
changeset
|
1726 |
18299
a7a88a458a4c
largefiles: fix revert removing a largefile from a merge
Mads Kiilerich <madski@unity3d.com>
parents:
18294
diff
changeset
|
1727 - revert should be able to revert files introduced in a pending merge |
a7a88a458a4c
largefiles: fix revert removing a largefile from a merge
Mads Kiilerich <madski@unity3d.com>
parents:
18294
diff
changeset
|
1728 $ hg revert --all -r . |
18506
ef60083b5536
tests: fix for windows - slashes and no serve
Mads Kiilerich <madski@unity3d.com>
parents:
18491
diff
changeset
|
1729 removing .hglf/large (glob) |
ef60083b5536
tests: fix for windows - slashes and no serve
Mads Kiilerich <madski@unity3d.com>
parents:
18491
diff
changeset
|
1730 undeleting .hglf/sub2/large6 (glob) |
18299
a7a88a458a4c
largefiles: fix revert removing a largefile from a merge
Mads Kiilerich <madski@unity3d.com>
parents:
18294
diff
changeset
|
1731 |
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
|
1732 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
|
1733 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
|
1734 |
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
|
1735 $ 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
|
1736 $ 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
|
1737 $ hg add sub2/large7 |
23767
749dc66e9329
largefiles: align the output messages for an added file with core methods
Matt Harbison <matt_harbison@yahoo.com>
parents:
23748
diff
changeset
|
1738 sub2/large7 already a largefile (glob) |
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
|
1739 |
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
|
1740 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
|
1741 |
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
|
1742 $ 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
|
1743 $ 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
|
1744 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
|
1745 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
|
1746 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
|
1747 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
|
1748 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
|
1749 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
|
1750 3 largefiles updated, 0 removed |
18459
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18368
diff
changeset
|
1751 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
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
|
1752 $ cd g |
17594
536fee6a5486
largefiles: fix trailing spaces in test-largefiles.t
Thomas Arendsen Hein <thomas@intevation.de>
parents:
17579
diff
changeset
|
1753 $ 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
|
1754 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
|
1755 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
|
1756 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
|
1757 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
|
1758 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
|
1759 added 1 changesets with 2 changes to 2 files |
15384
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
1760 $ 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
|
1761 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
|
1762 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
|
1763 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
|
1764 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
|
1765 5:9d5af5072dbd edit files again |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
1766 4:74c02385b94c move files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
1767 3:9e8fbc4bce62 copy files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
1768 2:51a0ae4d5864 remove files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
1769 1:ce8896473775 edit files |
bf55991af17e
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com>
parents:
15383
diff
changeset
|
1770 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
|
1771 $ 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
|
1772 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
|
1773 $ 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
|
1774 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
|
1775 $ 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
|
1776 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
|
1777 $ 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
|
1778 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
|
1779 $ 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
|
1780 large7 |
15598
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
1781 |
16439
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16351
diff
changeset
|
1782 Cat a largefile |
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16351
diff
changeset
|
1783 $ hg cat normal3 |
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16351
diff
changeset
|
1784 normal3-modified |
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16351
diff
changeset
|
1785 $ hg cat sub/large4 |
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16351
diff
changeset
|
1786 large4-modified |
17089
0c1d10351869
tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
17088
diff
changeset
|
1787 $ rm "${USERCACHE}"/* |
16439
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16351
diff
changeset
|
1788 $ 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
|
1789 $ cat cat.out |
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16351
diff
changeset
|
1790 large4-modified |
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16351
diff
changeset
|
1791 $ rm cat.out |
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16351
diff
changeset
|
1792 $ hg cat -r a381d2c8c80e normal3 |
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16351
diff
changeset
|
1793 normal3-modified |
17269
acfab0754584
largefiles: support revsets for cat
Matt Harbison <matt_harbison@yahoo.com>
parents:
17268
diff
changeset
|
1794 $ hg cat -r '.^' normal3 |
acfab0754584
largefiles: support revsets for cat
Matt Harbison <matt_harbison@yahoo.com>
parents:
17268
diff
changeset
|
1795 normal3-modified |
18491
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18490
diff
changeset
|
1796 $ hg cat -r '.^' sub/large4 doesntexist |
17269
acfab0754584
largefiles: support revsets for cat
Matt Harbison <matt_harbison@yahoo.com>
parents:
17268
diff
changeset
|
1797 large4-modified |
18491
b7da9c042b9e
largefiles: fix cat when using relative paths from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18490
diff
changeset
|
1798 doesntexist: no such file in rev a381d2c8c80e |
18974
d78a136a8036
largefiles: fix cat of non-largefiles from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18969
diff
changeset
|
1799 $ hg --cwd sub cat -r '.^' large4 |
d78a136a8036
largefiles: fix cat of non-largefiles from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18969
diff
changeset
|
1800 large4-modified |
d78a136a8036
largefiles: fix cat of non-largefiles from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18969
diff
changeset
|
1801 $ hg --cwd sub cat -r '.^' ../normal3 |
d78a136a8036
largefiles: fix cat of non-largefiles from subdirectory
Mads Kiilerich <madski@unity3d.com>
parents:
18969
diff
changeset
|
1802 normal3-modified |
21087
3fb2affb023f
largefiles: make cat on standins do something
Mads Kiilerich <madski@unity3d.com>
parents:
21083
diff
changeset
|
1803 Cat a standin |
3fb2affb023f
largefiles: make cat on standins do something
Mads Kiilerich <madski@unity3d.com>
parents:
21083
diff
changeset
|
1804 $ hg cat .hglf/sub/large4 |
3fb2affb023f
largefiles: make cat on standins do something
Mads Kiilerich <madski@unity3d.com>
parents:
21083
diff
changeset
|
1805 e166e74c7303192238d60af5a9c4ce9bef0b7928 |
3fb2affb023f
largefiles: make cat on standins do something
Mads Kiilerich <madski@unity3d.com>
parents:
21083
diff
changeset
|
1806 $ hg cat .hglf/normal3 |
23348
bbe56e07e07a
tests: fix globs for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
23273
diff
changeset
|
1807 .hglf/normal3: no such file in rev 598410d3eb9a (glob) |
21087
3fb2affb023f
largefiles: make cat on standins do something
Mads Kiilerich <madski@unity3d.com>
parents:
21083
diff
changeset
|
1808 [1] |
16439
290850e7aa43
largefiles: fix cat for largefiles (issue3352)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16351
diff
changeset
|
1809 |
15598
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
1810 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
|
1811 |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
1812 $ 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
|
1813 $ 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
|
1814 Invoking status precommit hook |
15598
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
1815 A large4-renamed |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
1816 R sub/large4 |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
1817 $ cat large4-renamed |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
1818 large4-modified |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
1819 $ cd sub2 |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
1820 $ hg rename large6 large6-renamed |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
1821 $ hg st |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
1822 A sub2/large6-renamed |
a77ce45584ef
largefiles: fix rename (issue3093)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15575
diff
changeset
|
1823 R sub2/large6 |
15944
f19d5c852f9b
largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15930
diff
changeset
|
1824 $ cd .. |
f19d5c852f9b
largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15930
diff
changeset
|
1825 |
f19d5c852f9b
largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15930
diff
changeset
|
1826 Test --normal flag |
f19d5c852f9b
largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15930
diff
changeset
|
1827 |
16494
e1f0305eabe4
tests: don't use /dev/urandom for largefiles testing
Mads Kiilerich <mads@kiilerich.com>
parents:
16449
diff
changeset
|
1828 $ 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
|
1829 $ 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
|
1830 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
|
1831 [255] |
f19d5c852f9b
largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15930
diff
changeset
|
1832 $ hg add --normal new-largefile |
f19d5c852f9b
largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15930
diff
changeset
|
1833 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
|
1834 (use 'hg revert new-largefile' to cancel the pending addition) |
26816
e82bce7ec843
largefiles: test coverage of explicit commit of normal/largefile switch
Mads Kiilerich <madski@unity3d.com>
parents:
25474
diff
changeset
|
1835 |
e82bce7ec843
largefiles: test coverage of explicit commit of normal/largefile switch
Mads Kiilerich <madski@unity3d.com>
parents:
25474
diff
changeset
|
1836 Test explicit commit of switch between normal and largefile - make sure both |
e82bce7ec843
largefiles: test coverage of explicit commit of normal/largefile switch
Mads Kiilerich <madski@unity3d.com>
parents:
25474
diff
changeset
|
1837 the add and the remove is committed. |
e82bce7ec843
largefiles: test coverage of explicit commit of normal/largefile switch
Mads Kiilerich <madski@unity3d.com>
parents:
25474
diff
changeset
|
1838 |
e82bce7ec843
largefiles: test coverage of explicit commit of normal/largefile switch
Mads Kiilerich <madski@unity3d.com>
parents:
25474
diff
changeset
|
1839 $ hg up -qC |
e82bce7ec843
largefiles: test coverage of explicit commit of normal/largefile switch
Mads Kiilerich <madski@unity3d.com>
parents:
25474
diff
changeset
|
1840 $ hg forget normal3 large4-renamed |
e82bce7ec843
largefiles: test coverage of explicit commit of normal/largefile switch
Mads Kiilerich <madski@unity3d.com>
parents:
25474
diff
changeset
|
1841 $ hg add --large normal3 |
e82bce7ec843
largefiles: test coverage of explicit commit of normal/largefile switch
Mads Kiilerich <madski@unity3d.com>
parents:
25474
diff
changeset
|
1842 $ hg add large4-renamed |
e82bce7ec843
largefiles: test coverage of explicit commit of normal/largefile switch
Mads Kiilerich <madski@unity3d.com>
parents:
25474
diff
changeset
|
1843 $ hg commit -m 'swap' normal3 large4-renamed |
e82bce7ec843
largefiles: test coverage of explicit commit of normal/largefile switch
Mads Kiilerich <madski@unity3d.com>
parents:
25474
diff
changeset
|
1844 Invoking status precommit hook |
e82bce7ec843
largefiles: test coverage of explicit commit of normal/largefile switch
Mads Kiilerich <madski@unity3d.com>
parents:
25474
diff
changeset
|
1845 A large4-renamed |
e82bce7ec843
largefiles: test coverage of explicit commit of normal/largefile switch
Mads Kiilerich <madski@unity3d.com>
parents:
25474
diff
changeset
|
1846 A normal3 |
e82bce7ec843
largefiles: test coverage of explicit commit of normal/largefile switch
Mads Kiilerich <madski@unity3d.com>
parents:
25474
diff
changeset
|
1847 ? new-largefile |
e82bce7ec843
largefiles: test coverage of explicit commit of normal/largefile switch
Mads Kiilerich <madski@unity3d.com>
parents:
25474
diff
changeset
|
1848 ? sub2/large6-renamed |
e82bce7ec843
largefiles: test coverage of explicit commit of normal/largefile switch
Mads Kiilerich <madski@unity3d.com>
parents:
25474
diff
changeset
|
1849 $ hg mani |
e82bce7ec843
largefiles: test coverage of explicit commit of normal/largefile switch
Mads Kiilerich <madski@unity3d.com>
parents:
25474
diff
changeset
|
1850 .hglf/normal3 |
e82bce7ec843
largefiles: test coverage of explicit commit of normal/largefile switch
Mads Kiilerich <madski@unity3d.com>
parents:
25474
diff
changeset
|
1851 .hglf/sub2/large6 |
e82bce7ec843
largefiles: test coverage of explicit commit of normal/largefile switch
Mads Kiilerich <madski@unity3d.com>
parents:
25474
diff
changeset
|
1852 .hglf/sub2/large7 |
26817
b68797f244e4
largefiles: fix explicit commit of normal/largefile switch
Mads Kiilerich <madski@unity3d.com>
parents:
26816
diff
changeset
|
1853 large4-renamed |
26816
e82bce7ec843
largefiles: test coverage of explicit commit of normal/largefile switch
Mads Kiilerich <madski@unity3d.com>
parents:
25474
diff
changeset
|
1854 sub/normal4 |
e82bce7ec843
largefiles: test coverage of explicit commit of normal/largefile switch
Mads Kiilerich <madski@unity3d.com>
parents:
25474
diff
changeset
|
1855 |
15944
f19d5c852f9b
largefiles: add --normal option to hg add (issue3061)
Na'Tosha Bard <natosha@unity3d.com>
parents:
15930
diff
changeset
|
1856 $ cd .. |
15303
07811b3b119b
largefiles: include 'largefiles' in converted repository requirements
Eli Carter <eli.carter@tektronix.com>
parents:
15301
diff
changeset
|
1857 |
17089
0c1d10351869
tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
17088
diff
changeset
|
1858 |
0c1d10351869
tests: enable test-largefiles.t on Windows MSYS
Mads Kiilerich <mads@kiilerich.com>
parents:
17088
diff
changeset
|
1859 |