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