Mercurial > hg
annotate tests/test-lfconvert.t @ 49280:311fcc5a65f6
thirdparty: remove Python 2-specific selectors2 copy
The selectors module was added in Python 3.4. Because we require Python 3.6, it
will always be available. Therefore the selectors2 module is not imported.
I’ve verified that the selectors2-specific workaround in commandserver.py is not
necessary with the selectors module from the standard library. It returns an
empty list if timeout was exceeded.
The pytype directive was needed to silence the following error:
File "/tmp/mercurial-ci/mercurial/worker.py", line 299, in _posixworker: No attribute 'close' on int [attribute-error]
In Union[_typeshed.HasFileno, int]
File "/tmp/mercurial-ci/mercurial/worker.py", line 299, in _posixworker: No attribute 'close' on _typeshed.HasFileno [attribute-error]
In Union[_typeshed.HasFileno, int]
author | Manuel Jacob <me@manueljacob.de> |
---|---|
date | Sat, 28 May 2022 22:08:13 +0200 |
parents | 7ee07e1a25c0 |
children | c84844cd523a |
rev | line source |
---|---|
17823
0fc1ce271ee6
largefiles: fix a traceback in lfconvert if a largefile is missing (issue3519)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16913
diff
changeset
|
1 $ USERCACHE="$TESTTMP/cache"; export USERCACHE |
0fc1ce271ee6
largefiles: fix a traceback in lfconvert if a largefile is missing (issue3519)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16913
diff
changeset
|
2 $ mkdir "${USERCACHE}" |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
3 $ cat >> $HGRCPATH <<EOF |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
4 > [extensions] |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
5 > largefiles = |
15339
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
6 > share = |
20115
db6b958c4f35
tests: use strip extension instead of mq where it makes sense
Martin Geisler <martin@geisler.net>
parents:
19950
diff
changeset
|
7 > strip = |
17877
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
8 > convert = |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
9 > [largefiles] |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
10 > minsize = 0.5 |
15579
6c5e6ebe0812
largefiles: use "ui.configlist()" to get largefiles.patterns configuration
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15389
diff
changeset
|
11 > patterns = **.other |
6c5e6ebe0812
largefiles: use "ui.configlist()" to get largefiles.patterns configuration
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
15389
diff
changeset
|
12 > **.dat |
17823
0fc1ce271ee6
largefiles: fix a traceback in lfconvert if a largefile is missing (issue3519)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16913
diff
changeset
|
13 > usercache=${USERCACHE} |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
14 > EOF |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
15 |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
16 "lfconvert" works |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
17 $ hg init bigfile-repo |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
18 $ cd bigfile-repo |
15341
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
19 $ cat >> .hg/hgrc <<EOF |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
20 > [extensions] |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
21 > largefiles = ! |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
22 > EOF |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
23 $ mkdir sub |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
24 $ dd if=/dev/zero bs=1k count=256 > large 2> /dev/null |
15810
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
25 $ dd if=/dev/zero bs=1k count=256 > large2 2> /dev/null |
15341
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
26 $ echo normal > normal1 |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
27 $ echo alsonormal > sub/normal2 |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
28 $ dd if=/dev/zero bs=1k count=10 > sub/maybelarge.dat 2> /dev/null |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
29 $ hg addremove |
15341
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
30 adding large |
15810
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
31 adding large2 |
15341
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
32 adding normal1 |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
33 adding sub/maybelarge.dat |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
34 adding sub/normal2 |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
35 $ hg commit -m"add large, normal1" large normal1 |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
36 $ hg commit -m"add sub/*" sub |
16908
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
37 |
15810
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
38 Test tag parsing |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
39 $ cat >> .hgtags <<EOF |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
40 > IncorrectlyFormattedTag! |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
41 > invalidhash sometag |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
42 > 0123456789abcdef anothertag |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
43 > EOF |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
44 $ hg add .hgtags |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
45 $ hg commit -m"add large2" large2 .hgtags |
16908
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
46 |
15810
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
47 Test link+rename largefile codepath |
15341
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
48 $ [ -d .hg/largefiles ] && echo fail || echo pass |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
49 pass |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
50 $ cd .. |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
51 $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
52 initializing destination largefiles-repo |
15810
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
53 skipping incorrectly formatted tag IncorrectlyFormattedTag! |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
54 skipping incorrectly formatted id invalidhash |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
55 no mapping for id 0123456789abcdef |
16908
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
56 #if symlink |
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
57 $ hg --cwd bigfile-repo rename large2 large3 |
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
58 $ ln -sf large bigfile-repo/large3 |
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
59 $ hg --cwd bigfile-repo commit -m"make large2 a symlink" large2 large3 |
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
60 $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo-symlink |
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
61 initializing destination largefiles-repo-symlink |
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
62 skipping incorrectly formatted tag IncorrectlyFormattedTag! |
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
63 skipping incorrectly formatted id invalidhash |
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
64 no mapping for id 0123456789abcdef |
15810
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
65 abort: renamed/copied largefile large3 becomes symlink |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
66 [255] |
16908
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
67 #endif |
15810
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
68 $ cd bigfile-repo |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
69 $ hg strip --no-backup 2 |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
70 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
71 $ cd .. |
16908
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
72 $ rm -rf largefiles-repo largefiles-repo-symlink |
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16310
diff
changeset
|
73 |
15810
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
74 $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo |
3d11da212e30
largefiles: add tests for uncovered codepaths (issue3092)
Levi Bard <levi@unity3d.com>
parents:
15591
diff
changeset
|
75 initializing destination largefiles-repo |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
76 |
15341
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
77 "lfconvert" converts content correctly |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
78 $ cd largefiles-repo |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
79 $ hg up |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
80 getting changed largefiles |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
81 2 largefiles updated, 0 removed |
18459
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18356
diff
changeset
|
82 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15341
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
83 $ hg locate |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
84 .hglf/large |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
85 .hglf/sub/maybelarge.dat |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
86 normal1 |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
87 sub/normal2 |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
88 $ cat normal1 |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
89 normal |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
90 $ cat sub/normal2 |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
91 alsonormal |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25325
diff
changeset
|
92 $ md5sum.py large sub/maybelarge.dat |
15389
3bece03bf3c6
tests: use md5sum.py instead of sha1sum, add check
Matt Mackall <mpm@selenic.com>
parents:
15364
diff
changeset
|
93 ec87a838931d4d5d2e94a04644788a55 large |
3bece03bf3c6
tests: use md5sum.py instead of sha1sum, add check
Matt Mackall <mpm@selenic.com>
parents:
15364
diff
changeset
|
94 1276481102f218c981e0324180bafd9f sub/maybelarge.dat |
15341
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
95 |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
96 "lfconvert" adds 'largefiles' to .hg/requires. |
48464
5e6542143d40
test: use `hg debugrequires` instead of `cat` in some tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48321
diff
changeset
|
97 $ hg debugrequires |
18356
752f77ef7202
localrepo: store requirements sorted
Mads Kiilerich <mads@kiilerich.com>
parents:
18159
diff
changeset
|
98 dotencode |
48321
f35529784079
dirstate-v2: fix confusion between requirement and format config variable
Raphaël Gomès <rgomes@octobus.net>
parents:
48295
diff
changeset
|
99 dirstate-v2 (dirstate-v2 !) |
18356
752f77ef7202
localrepo: store requirements sorted
Mads Kiilerich <mads@kiilerich.com>
parents:
18159
diff
changeset
|
100 fncache |
26915
d92993d6210c
test: using generaldelta in 'test-lfconvert.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26618
diff
changeset
|
101 generaldelta |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
102 largefiles |
46884
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
103 persistent-nodemap (rust !) |
46874
84a93fa7ecfd
revlog-compression: use zstd by default (if available)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45906
diff
changeset
|
104 revlog-compression-zstd (zstd !) |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
105 revlogv1 |
48669
7ee07e1a25c0
share-safe: enable by default (BC)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48464
diff
changeset
|
106 share-safe |
40895
ed8e4748b9da
test: enable sparse-revlog for test-lfconvert.t
Boris Feld <boris.feld@octobus.net>
parents:
40471
diff
changeset
|
107 sparserevlog |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
108 store |
39113
e8532d00b729
tests: add conditional output when simplestore extensions is loaded
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37439
diff
changeset
|
109 testonly-simplestore (reposimplestore !) |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
110 |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
111 "lfconvert" includes a newline at the end of the standin files. |
15341
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
112 $ cat .hglf/large .hglf/sub/maybelarge.dat |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
113 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 |
15341
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
114 34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c |
15339
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
115 $ cd .. |
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
116 |
15342
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
117 add some changesets to rename/remove/merge |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
118 $ cd bigfile-repo |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
119 $ hg mv -q sub stuff |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
120 $ hg commit -m"rename sub/ to stuff/" |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
121 $ hg update -q 1 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
122 $ echo blah >> normal3 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
123 $ echo blah >> sub/normal2 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
124 $ echo blah >> sub/maybelarge.dat |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25325
diff
changeset
|
125 $ md5sum.py sub/maybelarge.dat |
15389
3bece03bf3c6
tests: use md5sum.py instead of sha1sum, add check
Matt Mackall <mpm@selenic.com>
parents:
15364
diff
changeset
|
126 1dd0b99ff80e19cff409702a1d3f5e15 sub/maybelarge.dat |
15342
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
127 $ hg commit -A -m"add normal3, modify sub/*" |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
128 adding normal3 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
129 created new head |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
130 $ hg rm large normal3 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
131 $ hg commit -q -m"remove large, normal3" |
40471
844a40687d83
test: remove changes preparing the drop of `HGMERGE`
Boris Feld <boris.feld@octobus.net>
parents:
40468
diff
changeset
|
132 $ hg merge |
40468
1f0c5c9a1765
test: drop usage of `HGMERGE` in `test-lfconvert.t`
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
133 tool internal:merge (for pattern stuff/maybelarge.dat) can't handle binary |
1f0c5c9a1765
test: drop usage of `HGMERGE` in `test-lfconvert.t`
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
134 no tool found to merge stuff/maybelarge.dat |
42565
4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
41180
diff
changeset
|
135 file 'stuff/maybelarge.dat' needs to be resolved. |
4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
41180
diff
changeset
|
136 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
41180
diff
changeset
|
137 What do you want to do? u |
26618
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
138 merging sub/normal2 and stuff/normal2 to stuff/normal2 |
15342
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
139 0 files updated, 1 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
140 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
15342
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
141 [1] |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
142 $ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
143 $ hg resolve -m stuff/maybelarge.dat |
21947
b081decd9062
resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21267
diff
changeset
|
144 (no more unresolved files) |
15342
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
145 $ hg commit -m"merge" |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
20115
diff
changeset
|
146 $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n" |
15342
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
147 @ 5:4884f215abda merge |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
148 |\ |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
149 | o 4:7285f817b77e remove large, normal3 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
150 | | |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
151 | o 3:67e3892e3534 add normal3, modify sub/* |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
152 | | |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
153 o | 2:c96c8beb5d56 rename sub/ to stuff/ |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
154 |/ |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
155 o 1:020c65d24e11 add sub/* |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
156 | |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
157 o 0:117b8328f97a add large, normal1 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
158 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
159 $ cd .. |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
160 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
161 lfconvert with rename, merge, and remove |
15343
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
162 $ rm -rf largefiles-repo |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
163 $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
164 initializing destination largefiles-repo |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
165 $ cd largefiles-repo |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
20115
diff
changeset
|
166 $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n" |
42621
99ebde4fec99
commit: improve the files field of changelog for merges
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
42565
diff
changeset
|
167 o 5:9cc5aa7204f0 merge |
15342
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
168 |\ |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
169 | o 4:a5a02de7a8e4 remove large, normal3 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
170 | | |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
171 | o 3:55759520c76f add normal3, modify sub/* |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
172 | | |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
173 o | 2:261ad3f3f037 rename sub/ to stuff/ |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
174 |/ |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
175 o 1:334e5237836d add sub/* |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
176 | |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
177 o 0:d4892ec57ce2 add large, normal1 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
178 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
179 $ hg locate -r 2 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
180 .hglf/large |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
181 .hglf/stuff/maybelarge.dat |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
182 normal1 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
183 stuff/normal2 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
184 $ hg locate -r 3 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
185 .hglf/large |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
186 .hglf/sub/maybelarge.dat |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
187 normal1 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
188 normal3 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
189 sub/normal2 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
190 $ hg locate -r 4 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
191 .hglf/sub/maybelarge.dat |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
192 normal1 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
193 sub/normal2 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
194 $ hg locate -r 5 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
195 .hglf/stuff/maybelarge.dat |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
196 normal1 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
197 stuff/normal2 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
198 $ hg update |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
199 getting changed largefiles |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
200 1 largefiles updated, 0 removed |
18459
c9db897d5a43
largefiles: fix largefiles+subrepo update (issue3752)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
18356
diff
changeset
|
201 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15342
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
202 $ cat stuff/normal2 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
203 alsonormal |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
204 blah |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
25325
diff
changeset
|
205 $ md5sum.py stuff/maybelarge.dat |
15389
3bece03bf3c6
tests: use md5sum.py instead of sha1sum, add check
Matt Mackall <mpm@selenic.com>
parents:
15364
diff
changeset
|
206 1dd0b99ff80e19cff409702a1d3f5e15 stuff/maybelarge.dat |
15342
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
207 $ cat .hglf/stuff/maybelarge.dat |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
208 76236b6a2c6102826c61af4297dd738fb3b1de38 |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
209 $ cd .. |
b2e00d67f590
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca>
parents:
15341
diff
changeset
|
210 |
15339
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
211 "lfconvert" error cases |
15340
0e58513cc59a
largefiles: rearrange how lfconvert detects non-local repos
Greg Ward <greg@gerg.ca>
parents:
15339
diff
changeset
|
212 $ hg lfconvert http://localhost/foo foo |
0e58513cc59a
largefiles: rearrange how lfconvert detects non-local repos
Greg Ward <greg@gerg.ca>
parents:
15339
diff
changeset
|
213 abort: http://localhost/foo is not a local Mercurial repo |
0e58513cc59a
largefiles: rearrange how lfconvert detects non-local repos
Greg Ward <greg@gerg.ca>
parents:
15339
diff
changeset
|
214 [255] |
0e58513cc59a
largefiles: rearrange how lfconvert detects non-local repos
Greg Ward <greg@gerg.ca>
parents:
15339
diff
changeset
|
215 $ hg lfconvert foo ssh://localhost/foo |
0e58513cc59a
largefiles: rearrange how lfconvert detects non-local repos
Greg Ward <greg@gerg.ca>
parents:
15339
diff
changeset
|
216 abort: ssh://localhost/foo is not a local Mercurial repo |
0e58513cc59a
largefiles: rearrange how lfconvert detects non-local repos
Greg Ward <greg@gerg.ca>
parents:
15339
diff
changeset
|
217 [255] |
15339
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
218 $ hg lfconvert nosuchrepo foo |
45906
95c4cca641f6
errors: remove trailing "!" from some error messages for consistency
Martin von Zweigbergk <martinvonz@google.com>
parents:
45455
diff
changeset
|
219 abort: repository nosuchrepo not found |
15339
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
220 [255] |
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
221 $ hg share -q -U bigfile-repo shared |
15364
572c22c88be6
tests: fix check-code detection of anchored expressions, fix echo -n usage
Matt Mackall <mpm@selenic.com>
parents:
15343
diff
changeset
|
222 $ printf 'bogus' > shared/.hg/sharedpath |
15339
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
223 $ hg lfconvert shared foo |
45906
95c4cca641f6
errors: remove trailing "!" from some error messages for consistency
Martin von Zweigbergk <martinvonz@google.com>
parents:
45455
diff
changeset
|
224 abort: .hg/sharedpath points to nonexistent directory $TESTTMP/bogus |
15339
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
225 [255] |
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
226 $ hg lfconvert bigfile-repo largefiles-repo |
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
227 initializing destination largefiles-repo |
45906
95c4cca641f6
errors: remove trailing "!" from some error messages for consistency
Martin von Zweigbergk <martinvonz@google.com>
parents:
45455
diff
changeset
|
228 abort: repository largefiles-repo already exists |
15339
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
229 [255] |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
230 |
15343
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
231 add another largefile to the new largefiles repo |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
232 $ cd largefiles-repo |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
233 $ dd if=/dev/zero bs=1k count=1k > anotherlarge 2> /dev/null |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
234 $ hg add --lfsize=1 anotherlarge |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
235 $ hg commit -m "add anotherlarge (should be a largefile)" |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
236 $ cat .hglf/anotherlarge |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
237 3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3 |
25325
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
238 $ hg tag mytag |
15343
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
239 $ cd .. |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
240 |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
241 round-trip: converting back to a normal (non-largefiles) repo with |
35036
281214150561
convert: avoid wrong lfconvert defaults by moving configitems to core
Matt Harbison <matt_harbison@yahoo.com>
parents:
34866
diff
changeset
|
242 "lfconvert --to-normal" should give the same as ../bigfile-repo. The |
281214150561
convert: avoid wrong lfconvert defaults by moving configitems to core
Matt Harbison <matt_harbison@yahoo.com>
parents:
34866
diff
changeset
|
243 convert extension is disabled to show config items can be loaded without it. |
15339
be1377d19018
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca>
parents:
15338
diff
changeset
|
244 $ cd largefiles-repo |
35036
281214150561
convert: avoid wrong lfconvert defaults by moving configitems to core
Matt Harbison <matt_harbison@yahoo.com>
parents:
34866
diff
changeset
|
245 $ hg --config extensions.convert=! lfconvert --to-normal . ../normal-repo |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
246 initializing destination ../normal-repo |
25325
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
247 0 additional largefiles cached |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
248 scanning source... |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
249 sorting... |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
250 converting... |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
251 7 add large, normal1 |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
252 6 add sub/* |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
253 5 rename sub/ to stuff/ |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
254 4 add normal3, modify sub/* |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
255 3 remove large, normal3 |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
256 2 merge |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
257 1 add anotherlarge (should be a largefile) |
42621
99ebde4fec99
commit: improve the files field of changelog for merges
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
42565
diff
changeset
|
258 0 Added tag mytag for changeset 17126745edfd |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
259 $ cd ../normal-repo |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
260 $ cat >> .hg/hgrc <<EOF |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
261 > [extensions] |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
262 > largefiles = ! |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
263 > EOF |
15343
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
264 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
20115
diff
changeset
|
265 $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n" |
25325
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
266 o 7:b5fedc110b9d Added tag mytag for changeset 867ab992ecf4 |
15343
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
267 | |
25325
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
268 o 6:867ab992ecf4 add anotherlarge (should be a largefile) |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
269 | |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
270 o 5:4884f215abda merge |
15343
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
271 |\ |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
272 | o 4:7285f817b77e remove large, normal3 |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
273 | | |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
274 | o 3:67e3892e3534 add normal3, modify sub/* |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
275 | | |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
276 o | 2:c96c8beb5d56 rename sub/ to stuff/ |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
277 |/ |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
278 o 1:020c65d24e11 add sub/* |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
279 | |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
280 o 0:117b8328f97a add large, normal1 |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
281 |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
282 $ hg update |
25325
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
283 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
284 $ hg locate |
25325
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
285 .hgtags |
15341
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
286 anotherlarge |
7ef13e53434e
largefiles: beef up test-lfconvert.t so it's more thorough
Greg Ward <greg@gerg.ca>
parents:
15340
diff
changeset
|
287 normal1 |
15343
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
288 stuff/maybelarge.dat |
7fe8b7e097a4
largefiles: test "lfconvert --to-normal" with rename/remove/merge
Greg Ward <greg@gerg.ca>
parents:
15342
diff
changeset
|
289 stuff/normal2 |
15338
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
290 $ [ -d .hg/largefiles ] && echo fail || echo pass |
f4b29792fcda
largefiles: extract test-lfconvert.t from test-largefiles.t
Greg Ward <greg@gerg.ca>
parents:
diff
changeset
|
291 pass |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16908
diff
changeset
|
292 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16908
diff
changeset
|
293 $ cd .. |
17823
0fc1ce271ee6
largefiles: fix a traceback in lfconvert if a largefile is missing (issue3519)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16913
diff
changeset
|
294 |
17878
d1d0140287b8
largefiles: don't copy largefiles from working dir to the store while converting
Matt Harbison <matt_harbison@yahoo.com>
parents:
17877
diff
changeset
|
295 Clearing the usercache ensures that commitctx doesn't try to cache largefiles |
d1d0140287b8
largefiles: don't copy largefiles from working dir to the store while converting
Matt Harbison <matt_harbison@yahoo.com>
parents:
17877
diff
changeset
|
296 from the working dir on a convert. |
d1d0140287b8
largefiles: don't copy largefiles from working dir to the store while converting
Matt Harbison <matt_harbison@yahoo.com>
parents:
17877
diff
changeset
|
297 $ rm "${USERCACHE}"/* |
17877
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
298 $ hg convert largefiles-repo |
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
299 assuming destination largefiles-repo-hg |
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
300 initializing destination largefiles-repo-hg repository |
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
301 scanning source... |
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
302 sorting... |
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
303 converting... |
25325
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
304 7 add large, normal1 |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
305 6 add sub/* |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
306 5 rename sub/ to stuff/ |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
307 4 add normal3, modify sub/* |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
308 3 remove large, normal3 |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
309 2 merge |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
310 1 add anotherlarge (should be a largefile) |
42621
99ebde4fec99
commit: improve the files field of changelog for merges
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
42565
diff
changeset
|
311 0 Added tag mytag for changeset 17126745edfd |
17877
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
312 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
20115
diff
changeset
|
313 $ hg -R largefiles-repo-hg log -G --template "{rev}:{node|short} {desc|firstline}\n" |
25325
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
314 o 7:2f08f66459b7 Added tag mytag for changeset 17126745edfd |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
315 | |
17877
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
316 o 6:17126745edfd add anotherlarge (should be a largefile) |
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
317 | |
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
318 o 5:9cc5aa7204f0 merge |
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
319 |\ |
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
320 | o 4:a5a02de7a8e4 remove large, normal3 |
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
321 | | |
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
322 | o 3:55759520c76f add normal3, modify sub/* |
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
323 | | |
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
324 o | 2:261ad3f3f037 rename sub/ to stuff/ |
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
325 |/ |
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
326 o 1:334e5237836d add sub/* |
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
327 | |
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
328 o 0:d4892ec57ce2 add large, normal1 |
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
329 |
17878
d1d0140287b8
largefiles: don't copy largefiles from working dir to the store while converting
Matt Harbison <matt_harbison@yahoo.com>
parents:
17877
diff
changeset
|
330 Verify will fail (for now) if the usercache is purged before converting, since |
d1d0140287b8
largefiles: don't copy largefiles from working dir to the store while converting
Matt Harbison <matt_harbison@yahoo.com>
parents:
17877
diff
changeset
|
331 largefiles are not cached in the converted repo's local store by the conversion |
d1d0140287b8
largefiles: don't copy largefiles from working dir to the store while converting
Matt Harbison <matt_harbison@yahoo.com>
parents:
17877
diff
changeset
|
332 process. |
25508
b8fd605b0c88
largefiles: ignore hidden changesets with 'verify --large --lfa'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25472
diff
changeset
|
333 $ cd largefiles-repo-hg |
b8fd605b0c88
largefiles: ignore hidden changesets with 'verify --large --lfa'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25472
diff
changeset
|
334 $ cat >> .hg/hgrc <<EOF |
b8fd605b0c88
largefiles: ignore hidden changesets with 'verify --large --lfa'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25472
diff
changeset
|
335 > [experimental] |
34866
1644623ab096
config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents:
34198
diff
changeset
|
336 > evolution.createmarkers=True |
25508
b8fd605b0c88
largefiles: ignore hidden changesets with 'verify --large --lfa'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25472
diff
changeset
|
337 > EOF |
b8fd605b0c88
largefiles: ignore hidden changesets with 'verify --large --lfa'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25472
diff
changeset
|
338 $ hg debugobsolete `hg log -r tip -T "{node}"` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42621
diff
changeset
|
339 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
26915
diff
changeset
|
340 obsoleted 1 changesets |
25508
b8fd605b0c88
largefiles: ignore hidden changesets with 'verify --large --lfa'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25472
diff
changeset
|
341 $ cd .. |
b8fd605b0c88
largefiles: ignore hidden changesets with 'verify --large --lfa'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25472
diff
changeset
|
342 |
17877
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
343 $ hg -R largefiles-repo-hg verify --large --lfa |
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
344 checking changesets |
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
345 checking manifests |
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
346 crosschecking files in changesets and manifests |
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
347 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39113
diff
changeset
|
348 checked 8 changesets with 13 changes to 9 files |
25508
b8fd605b0c88
largefiles: ignore hidden changesets with 'verify --large --lfa'
Matt Harbison <matt_harbison@yahoo.com>
parents:
25472
diff
changeset
|
349 searching 7 changesets for largefiles |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35036
diff
changeset
|
350 changeset 0:d4892ec57ce2: large references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/2e000fa7e85759c7f4c254d4d9c33ef481e459a7 |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35036
diff
changeset
|
351 changeset 1:334e5237836d: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35036
diff
changeset
|
352 changeset 2:261ad3f3f037: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35036
diff
changeset
|
353 changeset 3:55759520c76f: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38 |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35036
diff
changeset
|
354 changeset 5:9cc5aa7204f0: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38 |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35036
diff
changeset
|
355 changeset 6:17126745edfd: anotherlarge references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3 |
17877
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
356 verified existence of 6 revisions of 4 largefiles |
17878
d1d0140287b8
largefiles: don't copy largefiles from working dir to the store while converting
Matt Harbison <matt_harbison@yahoo.com>
parents:
17877
diff
changeset
|
357 [1] |
17877
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
358 $ hg -R largefiles-repo-hg showconfig paths |
22316
816be4ca4ae2
config: exit non zero on non-existent config option (issue4247)
Aaron Kushner <akushner@fb.com>
parents:
21947
diff
changeset
|
359 [1] |
17877
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
360 |
92bbb21d4b13
largefiles: respect the rev when reading standins in copytostore() (issue3630)
Matt Harbison <matt_harbison@yahoo.com>
parents:
17824
diff
changeset
|
361 |
17823
0fc1ce271ee6
largefiles: fix a traceback in lfconvert if a largefile is missing (issue3519)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16913
diff
changeset
|
362 Avoid a traceback if a largefile isn't available (issue3519) |
0fc1ce271ee6
largefiles: fix a traceback in lfconvert if a largefile is missing (issue3519)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16913
diff
changeset
|
363 |
17824
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17823
diff
changeset
|
364 Ensure the largefile can be cached in the source if necessary |
17823
0fc1ce271ee6
largefiles: fix a traceback in lfconvert if a largefile is missing (issue3519)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16913
diff
changeset
|
365 $ hg clone -U largefiles-repo issue3519 |
17878
d1d0140287b8
largefiles: don't copy largefiles from working dir to the store while converting
Matt Harbison <matt_harbison@yahoo.com>
parents:
17877
diff
changeset
|
366 $ rm -f "${USERCACHE}"/* |
41180
69804c040a04
convert: don't drop commits that are empty in the source when using --filemap
Matt Harbison <matt_harbison@yahoo.com>
parents:
40919
diff
changeset
|
367 $ hg -R issue3519 branch -q mybranch |
69804c040a04
convert: don't drop commits that are empty in the source when using --filemap
Matt Harbison <matt_harbison@yahoo.com>
parents:
40919
diff
changeset
|
368 $ hg -R issue3519 ci -m 'change branch name only' |
17823
0fc1ce271ee6
largefiles: fix a traceback in lfconvert if a largefile is missing (issue3519)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16913
diff
changeset
|
369 $ hg lfconvert --to-normal issue3519 normalized3519 |
0fc1ce271ee6
largefiles: fix a traceback in lfconvert if a largefile is missing (issue3519)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16913
diff
changeset
|
370 initializing destination normalized3519 |
25325
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
371 4 additional largefiles cached |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
372 scanning source... |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
373 sorting... |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
374 converting... |
41180
69804c040a04
convert: don't drop commits that are empty in the source when using --filemap
Matt Harbison <matt_harbison@yahoo.com>
parents:
40919
diff
changeset
|
375 8 add large, normal1 |
69804c040a04
convert: don't drop commits that are empty in the source when using --filemap
Matt Harbison <matt_harbison@yahoo.com>
parents:
40919
diff
changeset
|
376 7 add sub/* |
69804c040a04
convert: don't drop commits that are empty in the source when using --filemap
Matt Harbison <matt_harbison@yahoo.com>
parents:
40919
diff
changeset
|
377 6 rename sub/ to stuff/ |
69804c040a04
convert: don't drop commits that are empty in the source when using --filemap
Matt Harbison <matt_harbison@yahoo.com>
parents:
40919
diff
changeset
|
378 5 add normal3, modify sub/* |
69804c040a04
convert: don't drop commits that are empty in the source when using --filemap
Matt Harbison <matt_harbison@yahoo.com>
parents:
40919
diff
changeset
|
379 4 remove large, normal3 |
69804c040a04
convert: don't drop commits that are empty in the source when using --filemap
Matt Harbison <matt_harbison@yahoo.com>
parents:
40919
diff
changeset
|
380 3 merge |
69804c040a04
convert: don't drop commits that are empty in the source when using --filemap
Matt Harbison <matt_harbison@yahoo.com>
parents:
40919
diff
changeset
|
381 2 add anotherlarge (should be a largefile) |
42621
99ebde4fec99
commit: improve the files field of changelog for merges
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
42565
diff
changeset
|
382 1 Added tag mytag for changeset 17126745edfd |
41180
69804c040a04
convert: don't drop commits that are empty in the source when using --filemap
Matt Harbison <matt_harbison@yahoo.com>
parents:
40919
diff
changeset
|
383 0 change branch name only |
69804c040a04
convert: don't drop commits that are empty in the source when using --filemap
Matt Harbison <matt_harbison@yahoo.com>
parents:
40919
diff
changeset
|
384 |
69804c040a04
convert: don't drop commits that are empty in the source when using --filemap
Matt Harbison <matt_harbison@yahoo.com>
parents:
40919
diff
changeset
|
385 Ensure empty commits aren't lost in the conversion |
69804c040a04
convert: don't drop commits that are empty in the source when using --filemap
Matt Harbison <matt_harbison@yahoo.com>
parents:
40919
diff
changeset
|
386 $ hg -R normalized3519 log -r tip -T '{desc}\n' |
69804c040a04
convert: don't drop commits that are empty in the source when using --filemap
Matt Harbison <matt_harbison@yahoo.com>
parents:
40919
diff
changeset
|
387 change branch name only |
17824
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17823
diff
changeset
|
388 |
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17823
diff
changeset
|
389 Ensure the abort message is useful if a largefile is entirely unavailable |
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17823
diff
changeset
|
390 $ rm -rf normalized3519 |
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17823
diff
changeset
|
391 $ rm "${USERCACHE}"/* |
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17823
diff
changeset
|
392 $ rm issue3519/.hg/largefiles/* |
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17823
diff
changeset
|
393 $ rm largefiles-repo/.hg/largefiles/* |
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17823
diff
changeset
|
394 $ hg lfconvert --to-normal issue3519 normalized3519 |
221c9c3146eb
largefiles: always create the cache and standin directories when cloning
Matt Harbison <matt_harbison@yahoo.com>
parents:
17823
diff
changeset
|
395 initializing destination normalized3519 |
45455
b0d45612c552
largefiles: walk history in ascending order while downloading all lfiles
Yuya Nishihara <yuya@tcha.org>
parents:
42893
diff
changeset
|
396 large: largefile 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 not available from file:/*/$TESTTMP/largefiles-repo (glob) |
20471
ea005e754c9c
tests: lines with largefile .* file://$TESTTMP also match on windows
Simon Heimberg <simohe@besonet.ch>
parents:
20117
diff
changeset
|
397 large: largefile 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 not available from file:/*/$TESTTMP/largefiles-repo (glob) |
45455
b0d45612c552
largefiles: walk history in ascending order while downloading all lfiles
Yuya Nishihara <yuya@tcha.org>
parents:
42893
diff
changeset
|
398 sub/maybelarge.dat: largefile 34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c not available from file:/*/$TESTTMP/largefiles-repo (glob) |
25325
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
399 large: largefile 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 not available from file:/*/$TESTTMP/largefiles-repo (glob) |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
400 stuff/maybelarge.dat: largefile 34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c not available from file:/*/$TESTTMP/largefiles-repo (glob) |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
401 large: largefile 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 not available from file:/*/$TESTTMP/largefiles-repo (glob) |
45455
b0d45612c552
largefiles: walk history in ascending order while downloading all lfiles
Yuya Nishihara <yuya@tcha.org>
parents:
42893
diff
changeset
|
402 sub/maybelarge.dat: largefile 76236b6a2c6102826c61af4297dd738fb3b1de38 not available from file:/*/$TESTTMP/largefiles-repo (glob) |
b0d45612c552
largefiles: walk history in ascending order while downloading all lfiles
Yuya Nishihara <yuya@tcha.org>
parents:
42893
diff
changeset
|
403 sub/maybelarge.dat: largefile 76236b6a2c6102826c61af4297dd738fb3b1de38 not available from file:/*/$TESTTMP/largefiles-repo (glob) |
b0d45612c552
largefiles: walk history in ascending order while downloading all lfiles
Yuya Nishihara <yuya@tcha.org>
parents:
42893
diff
changeset
|
404 stuff/maybelarge.dat: largefile 76236b6a2c6102826c61af4297dd738fb3b1de38 not available from file:/*/$TESTTMP/largefiles-repo (glob) |
b0d45612c552
largefiles: walk history in ascending order while downloading all lfiles
Yuya Nishihara <yuya@tcha.org>
parents:
42893
diff
changeset
|
405 anotherlarge: largefile 3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3 not available from file:/*/$TESTTMP/largefiles-repo (glob) |
b0d45612c552
largefiles: walk history in ascending order while downloading all lfiles
Yuya Nishihara <yuya@tcha.org>
parents:
42893
diff
changeset
|
406 stuff/maybelarge.dat: largefile 76236b6a2c6102826c61af4297dd738fb3b1de38 not available from file:/*/$TESTTMP/largefiles-repo (glob) |
25325
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
407 0 additional largefiles cached |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
408 11 largefiles failed to download |
fcd2f9b06629
largefiles: use the convert extension for 'lfconvert --to-normal'
Matt Harbison <matt_harbison@yahoo.com>
parents:
22316
diff
changeset
|
409 abort: all largefiles must be present locally |
17823
0fc1ce271ee6
largefiles: fix a traceback in lfconvert if a largefile is missing (issue3519)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16913
diff
changeset
|
410 [255] |
0fc1ce271ee6
largefiles: fix a traceback in lfconvert if a largefile is missing (issue3519)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16913
diff
changeset
|
411 |
0fc1ce271ee6
largefiles: fix a traceback in lfconvert if a largefile is missing (issue3519)
Matt Harbison <matt_harbison@yahoo.com>
parents:
16913
diff
changeset
|
412 |