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