2014-05-17 00:18:57 +04:00
|
|
|
This file used to contains all largefile tests.
|
|
|
|
Do not add any new tests in this file as it his already far too long to run.
|
|
|
|
|
|
|
|
It contains all the testing of the basic concepts of large file in a single block.
|
|
|
|
|
2012-06-30 21:31:03 +04:00
|
|
|
$ USERCACHE="$TESTTMP/cache"; export USERCACHE
|
2012-07-03 03:49:51 +04:00
|
|
|
$ mkdir "${USERCACHE}"
|
2011-10-10 19:34:17 +04:00
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
|
|
> [extensions]
|
|
|
|
> largefiles=
|
2011-10-13 17:15:32 +04:00
|
|
|
> purge=
|
|
|
|
> rebase=
|
2011-10-28 20:48:24 +04:00
|
|
|
> transplant=
|
2011-12-27 03:11:22 +04:00
|
|
|
> [phases]
|
|
|
|
> publish=False
|
2011-10-13 17:15:32 +04:00
|
|
|
> [largefiles]
|
2011-10-19 04:06:23 +04:00
|
|
|
> minsize=2
|
2011-10-13 17:15:32 +04:00
|
|
|
> patterns=glob:**.dat
|
2012-01-05 19:26:22 +04:00
|
|
|
> usercache=${USERCACHE}
|
2012-01-07 22:11:31 +04:00
|
|
|
> [hooks]
|
2012-09-03 20:25:50 +04:00
|
|
|
> precommit=sh -c "echo \\"Invoking status precommit hook\\"; hg status"
|
2011-10-10 19:34:17 +04:00
|
|
|
> EOF
|
|
|
|
|
|
|
|
Create the repo with a couple of revisions of both large and normal
|
2012-12-28 14:55:57 +04:00
|
|
|
files.
|
|
|
|
Test status and dirstate of largefiles and that summary output is correct.
|
2011-10-10 19:34:17 +04:00
|
|
|
|
|
|
|
$ hg init a
|
|
|
|
$ cd a
|
|
|
|
$ mkdir sub
|
|
|
|
$ echo normal1 > normal1
|
|
|
|
$ echo normal2 > sub/normal2
|
|
|
|
$ echo large1 > large1
|
|
|
|
$ echo large2 > sub/large2
|
|
|
|
$ hg add normal1 sub/normal2
|
|
|
|
$ hg add --large large1 sub/large2
|
|
|
|
$ hg commit -m "add files"
|
2012-01-07 22:11:31 +04:00
|
|
|
Invoking status precommit hook
|
|
|
|
A large1
|
|
|
|
A normal1
|
|
|
|
A sub/large2
|
|
|
|
A sub/normal2
|
2012-12-28 14:55:57 +04:00
|
|
|
$ touch large1 sub/large2
|
|
|
|
$ sleep 1
|
|
|
|
$ hg st
|
|
|
|
$ hg debugstate --nodates
|
|
|
|
n 644 41 .hglf/large1
|
|
|
|
n 644 41 .hglf/sub/large2
|
|
|
|
n 644 8 normal1
|
|
|
|
n 644 8 sub/normal2
|
2013-04-28 01:19:52 +04:00
|
|
|
$ hg debugstate --large --nodates
|
2012-12-28 14:55:57 +04:00
|
|
|
n 644 7 large1
|
|
|
|
n 644 7 sub/large2
|
2011-10-10 19:34:17 +04:00
|
|
|
$ echo normal11 > normal1
|
|
|
|
$ echo normal22 > sub/normal2
|
|
|
|
$ echo large11 > large1
|
|
|
|
$ echo large22 > sub/large2
|
2012-01-07 22:11:31 +04:00
|
|
|
$ hg commit -m "edit files"
|
|
|
|
Invoking status precommit hook
|
2011-10-11 15:15:29 +04:00
|
|
|
M large1
|
|
|
|
M normal1
|
|
|
|
M sub/large2
|
|
|
|
M sub/normal2
|
2012-01-08 15:35:47 +04:00
|
|
|
$ hg sum --large
|
|
|
|
parent: 1:ce8896473775 tip
|
|
|
|
edit files
|
|
|
|
branch: default
|
|
|
|
commit: (clean)
|
|
|
|
update: (current)
|
2012-10-30 22:59:28 +04:00
|
|
|
largefiles: (no remote repo)
|
2011-10-10 19:34:17 +04:00
|
|
|
|
2011-10-21 06:14:11 +04:00
|
|
|
Commit preserved largefile contents.
|
2011-10-10 19:34:17 +04:00
|
|
|
|
|
|
|
$ cat normal1
|
|
|
|
normal11
|
|
|
|
$ cat large1
|
|
|
|
large11
|
|
|
|
$ cat sub/normal2
|
|
|
|
normal22
|
|
|
|
$ cat sub/large2
|
|
|
|
large22
|
|
|
|
|
2012-05-06 15:14:58 +04:00
|
|
|
Test status, subdir and unknown files
|
|
|
|
|
|
|
|
$ echo unknown > sub/unknown
|
|
|
|
$ hg st --all
|
|
|
|
? sub/unknown
|
|
|
|
C large1
|
|
|
|
C normal1
|
|
|
|
C sub/large2
|
|
|
|
C sub/normal2
|
|
|
|
$ hg st --all sub
|
|
|
|
? sub/unknown
|
|
|
|
C sub/large2
|
|
|
|
C sub/normal2
|
|
|
|
$ rm sub/unknown
|
|
|
|
|
2012-12-13 22:19:06 +04:00
|
|
|
Test messages and exit codes for remove warning cases
|
2012-09-10 04:18:08 +04:00
|
|
|
|
|
|
|
$ hg remove -A large1
|
2012-12-13 22:19:06 +04:00
|
|
|
not removing large1: file still exists
|
2012-09-10 04:18:08 +04:00
|
|
|
[1]
|
|
|
|
$ echo 'modified' > large1
|
|
|
|
$ hg remove large1
|
2012-12-13 22:19:06 +04:00
|
|
|
not removing large1: file is modified (use -f to force removal)
|
2012-09-10 04:18:08 +04:00
|
|
|
[1]
|
2012-12-13 22:19:06 +04:00
|
|
|
$ echo 'new' > normalnew
|
|
|
|
$ hg add normalnew
|
|
|
|
$ echo 'new' > largenew
|
|
|
|
$ hg add --large normalnew
|
|
|
|
normalnew already tracked!
|
|
|
|
$ hg remove normalnew largenew
|
|
|
|
not removing largenew: file is untracked
|
|
|
|
not removing normalnew: file has been marked for add (use forget to undo)
|
|
|
|
[1]
|
|
|
|
$ rm normalnew largenew
|
2012-09-10 04:18:08 +04:00
|
|
|
$ hg up -Cq
|
|
|
|
|
2011-10-21 06:14:11 +04:00
|
|
|
Remove both largefiles and normal files.
|
2012-08-08 20:10:30 +04:00
|
|
|
|
2011-10-10 19:34:17 +04:00
|
|
|
$ hg remove normal1 large1
|
2012-03-22 18:58:47 +04:00
|
|
|
$ hg status large1
|
|
|
|
R large1
|
2011-10-10 19:34:17 +04:00
|
|
|
$ hg commit -m "remove files"
|
2012-01-07 22:11:31 +04:00
|
|
|
Invoking status precommit hook
|
|
|
|
R large1
|
|
|
|
R normal1
|
2011-10-10 19:34:17 +04:00
|
|
|
$ ls
|
|
|
|
sub
|
2012-01-08 14:19:51 +04:00
|
|
|
$ echo "testlargefile" > large1-test
|
|
|
|
$ hg add --large large1-test
|
|
|
|
$ hg st
|
|
|
|
A large1-test
|
|
|
|
$ hg rm large1-test
|
|
|
|
not removing large1-test: file has been marked for add (use forget to undo)
|
2012-09-10 04:18:08 +04:00
|
|
|
[1]
|
2012-01-08 14:19:51 +04:00
|
|
|
$ hg st
|
|
|
|
A large1-test
|
|
|
|
$ hg forget large1-test
|
|
|
|
$ hg st
|
|
|
|
? large1-test
|
2012-09-10 04:18:08 +04:00
|
|
|
$ hg remove large1-test
|
|
|
|
not removing large1-test: file is untracked
|
|
|
|
[1]
|
2012-09-06 06:42:23 +04:00
|
|
|
$ hg forget large1-test
|
|
|
|
not removing large1-test: file is already untracked
|
|
|
|
[1]
|
2012-01-08 14:19:51 +04:00
|
|
|
$ rm large1-test
|
2011-10-10 19:34:17 +04:00
|
|
|
|
2011-11-30 18:11:00 +04:00
|
|
|
Copy both largefiles and normal files (testing that status output is correct).
|
2011-10-10 19:34:17 +04:00
|
|
|
|
|
|
|
$ hg cp sub/normal2 normal1
|
|
|
|
$ hg cp sub/large2 large1
|
2012-01-07 22:11:31 +04:00
|
|
|
$ hg commit -m "copy files"
|
|
|
|
Invoking status precommit hook
|
2011-11-30 18:11:00 +04:00
|
|
|
A large1
|
|
|
|
A normal1
|
2011-10-10 19:34:17 +04:00
|
|
|
$ cat normal1
|
|
|
|
normal22
|
|
|
|
$ cat large1
|
|
|
|
large22
|
|
|
|
|
|
|
|
Test moving largefiles and verify that normal files are also unaffected.
|
|
|
|
|
|
|
|
$ hg mv normal1 normal3
|
|
|
|
$ hg mv large1 large3
|
|
|
|
$ hg mv sub/normal2 sub/normal4
|
|
|
|
$ hg mv sub/large2 sub/large4
|
|
|
|
$ hg commit -m "move files"
|
2012-01-07 22:11:31 +04:00
|
|
|
Invoking status precommit hook
|
|
|
|
A large3
|
|
|
|
A normal3
|
|
|
|
A sub/large4
|
|
|
|
A sub/normal4
|
|
|
|
R large1
|
|
|
|
R normal1
|
|
|
|
R sub/large2
|
|
|
|
R sub/normal2
|
2011-10-10 19:34:17 +04:00
|
|
|
$ cat normal3
|
|
|
|
normal22
|
|
|
|
$ cat large3
|
|
|
|
large22
|
|
|
|
$ cat sub/normal4
|
|
|
|
normal22
|
|
|
|
$ cat sub/large4
|
|
|
|
large22
|
|
|
|
|
2012-07-23 07:37:53 +04:00
|
|
|
|
2013-01-07 05:00:43 +04:00
|
|
|
#if serve
|
2012-04-15 18:05:57 +04:00
|
|
|
Test display of largefiles in hgweb
|
|
|
|
|
|
|
|
$ hg serve -d -p $HGPORT --pid-file ../hg.pid
|
|
|
|
$ cat ../hg.pid >> $DAEMON_PIDS
|
2012-06-21 05:05:02 +04:00
|
|
|
$ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file/tip/?style=raw'
|
2012-04-15 18:05:57 +04:00
|
|
|
200 Script output follows
|
2013-01-07 05:00:43 +04:00
|
|
|
|
|
|
|
|
2012-04-15 18:05:57 +04:00
|
|
|
drwxr-xr-x sub
|
|
|
|
-rw-r--r-- 41 large3
|
|
|
|
-rw-r--r-- 9 normal3
|
2013-01-07 05:00:43 +04:00
|
|
|
|
|
|
|
|
2012-06-21 05:05:02 +04:00
|
|
|
$ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file/tip/sub/?style=raw'
|
2012-04-15 18:05:57 +04:00
|
|
|
200 Script output follows
|
2013-01-07 05:00:43 +04:00
|
|
|
|
|
|
|
|
2012-04-15 18:05:57 +04:00
|
|
|
-rw-r--r-- 41 large4
|
|
|
|
-rw-r--r-- 9 normal4
|
2013-01-07 05:00:43 +04:00
|
|
|
|
|
|
|
|
2012-08-21 00:36:51 +04:00
|
|
|
$ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
|
2012-07-02 03:48:12 +04:00
|
|
|
#endif
|
2012-04-15 18:05:57 +04:00
|
|
|
|
2011-10-10 19:34:17 +04:00
|
|
|
Test archiving the various revisions. These hit corner cases known with
|
|
|
|
archiving.
|
|
|
|
|
|
|
|
$ hg archive -r 0 ../archive0
|
|
|
|
$ hg archive -r 1 ../archive1
|
|
|
|
$ hg archive -r 2 ../archive2
|
|
|
|
$ hg archive -r 3 ../archive3
|
|
|
|
$ hg archive -r 4 ../archive4
|
|
|
|
$ cd ../archive0
|
2012-08-08 20:10:16 +04:00
|
|
|
$ cat normal1
|
2011-10-10 19:34:17 +04:00
|
|
|
normal1
|
|
|
|
$ cat large1
|
|
|
|
large1
|
|
|
|
$ cat sub/normal2
|
|
|
|
normal2
|
|
|
|
$ cat sub/large2
|
|
|
|
large2
|
|
|
|
$ cd ../archive1
|
|
|
|
$ cat normal1
|
|
|
|
normal11
|
|
|
|
$ cat large1
|
|
|
|
large11
|
|
|
|
$ cat sub/normal2
|
|
|
|
normal22
|
|
|
|
$ cat sub/large2
|
|
|
|
large22
|
|
|
|
$ cd ../archive2
|
|
|
|
$ ls
|
|
|
|
sub
|
|
|
|
$ cat sub/normal2
|
|
|
|
normal22
|
|
|
|
$ cat sub/large2
|
|
|
|
large22
|
|
|
|
$ cd ../archive3
|
|
|
|
$ cat normal1
|
|
|
|
normal22
|
|
|
|
$ cat large1
|
|
|
|
large22
|
|
|
|
$ cat sub/normal2
|
|
|
|
normal22
|
|
|
|
$ cat sub/large2
|
|
|
|
large22
|
|
|
|
$ cd ../archive4
|
|
|
|
$ cat normal3
|
|
|
|
normal22
|
|
|
|
$ cat large3
|
|
|
|
large22
|
|
|
|
$ cat sub/normal4
|
|
|
|
normal22
|
|
|
|
$ cat sub/large4
|
|
|
|
large22
|
2011-10-13 17:15:32 +04:00
|
|
|
|
2011-10-21 06:14:11 +04:00
|
|
|
Commit corner case: specify files to commit.
|
2011-10-13 17:15:32 +04:00
|
|
|
|
|
|
|
$ cd ../a
|
|
|
|
$ echo normal3 > normal3
|
|
|
|
$ echo large3 > large3
|
|
|
|
$ echo normal4 > sub/normal4
|
|
|
|
$ echo large4 > sub/large4
|
|
|
|
$ hg commit normal3 large3 sub/normal4 sub/large4 -m "edit files again"
|
2012-01-07 22:11:31 +04:00
|
|
|
Invoking status precommit hook
|
|
|
|
M large3
|
|
|
|
M normal3
|
|
|
|
M sub/large4
|
|
|
|
M sub/normal4
|
2011-10-13 17:15:32 +04:00
|
|
|
$ cat normal3
|
|
|
|
normal3
|
|
|
|
$ cat large3
|
|
|
|
large3
|
|
|
|
$ cat sub/normal4
|
|
|
|
normal4
|
|
|
|
$ cat sub/large4
|
|
|
|
large4
|
|
|
|
|
2011-10-21 06:14:11 +04:00
|
|
|
One more commit corner case: commit from a subdirectory.
|
2011-10-13 17:15:32 +04:00
|
|
|
|
|
|
|
$ cd ../a
|
|
|
|
$ echo normal33 > normal3
|
|
|
|
$ echo large33 > large3
|
|
|
|
$ echo normal44 > sub/normal4
|
|
|
|
$ echo large44 > sub/large4
|
|
|
|
$ cd sub
|
|
|
|
$ hg commit -m "edit files yet again"
|
2012-01-07 22:11:31 +04:00
|
|
|
Invoking status precommit hook
|
|
|
|
M large3
|
|
|
|
M normal3
|
|
|
|
M sub/large4
|
|
|
|
M sub/normal4
|
2011-10-13 17:15:32 +04:00
|
|
|
$ cat ../normal3
|
|
|
|
normal33
|
|
|
|
$ cat ../large3
|
|
|
|
large33
|
|
|
|
$ cat normal4
|
|
|
|
normal44
|
|
|
|
$ cat large4
|
|
|
|
large44
|
|
|
|
|
2011-10-21 06:14:11 +04:00
|
|
|
Committing standins is not allowed.
|
2011-10-13 17:15:32 +04:00
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
$ echo large3 > large3
|
|
|
|
$ hg commit .hglf/large3 -m "try to commit standin"
|
2011-10-14 04:24:29 +04:00
|
|
|
abort: file ".hglf/large3" is a largefile standin
|
|
|
|
(commit the largefile itself instead)
|
2011-10-13 17:15:32 +04:00
|
|
|
[255]
|
|
|
|
|
2011-10-21 06:14:11 +04:00
|
|
|
Corner cases for adding largefiles.
|
2011-10-13 17:15:32 +04:00
|
|
|
|
|
|
|
$ echo large5 > large5
|
|
|
|
$ hg add --large large5
|
|
|
|
$ hg add --large large5
|
|
|
|
large5 already a largefile
|
|
|
|
$ mkdir sub2
|
|
|
|
$ echo large6 > sub2/large6
|
|
|
|
$ echo large7 > sub2/large7
|
|
|
|
$ hg add --large sub2
|
2011-11-07 06:25:10 +04:00
|
|
|
adding sub2/large6 as a largefile (glob)
|
|
|
|
adding sub2/large7 as a largefile (glob)
|
2011-10-13 17:15:32 +04:00
|
|
|
$ hg st
|
|
|
|
M large3
|
|
|
|
A large5
|
|
|
|
A sub2/large6
|
|
|
|
A sub2/large7
|
|
|
|
|
2012-12-10 17:58:42 +04:00
|
|
|
Committing directories containing only largefiles.
|
|
|
|
|
|
|
|
$ mkdir -p z/y/x/m
|
|
|
|
$ touch z/y/x/m/large1
|
|
|
|
$ touch z/y/x/large2
|
|
|
|
$ hg add --large z/y/x/m/large1 z/y/x/large2
|
|
|
|
$ hg commit -m "Subdir with directory only containing largefiles" z
|
|
|
|
Invoking status precommit hook
|
|
|
|
M large3
|
|
|
|
A large5
|
|
|
|
A sub2/large6
|
|
|
|
A sub2/large7
|
|
|
|
A z/y/x/large2
|
|
|
|
A z/y/x/m/large1
|
2014-05-08 21:45:22 +04:00
|
|
|
|
|
|
|
(and a bit of log testing)
|
|
|
|
|
|
|
|
$ hg log -T '{rev}\n' z/y/x/m/large1
|
|
|
|
7
|
|
|
|
$ hg log -T '{rev}\n' z/y/x/m # with only a largefile
|
|
|
|
7
|
|
|
|
|
2012-12-10 17:58:42 +04:00
|
|
|
$ hg rollback --quiet
|
|
|
|
$ touch z/y/x/m/normal
|
|
|
|
$ hg add z/y/x/m/normal
|
|
|
|
$ hg commit -m "Subdir with mixed contents" z
|
|
|
|
Invoking status precommit hook
|
|
|
|
M large3
|
|
|
|
A large5
|
|
|
|
A sub2/large6
|
|
|
|
A sub2/large7
|
|
|
|
A z/y/x/large2
|
|
|
|
A z/y/x/m/large1
|
|
|
|
A z/y/x/m/normal
|
|
|
|
$ hg st
|
|
|
|
M large3
|
|
|
|
A large5
|
|
|
|
A sub2/large6
|
|
|
|
A sub2/large7
|
|
|
|
$ hg rollback --quiet
|
|
|
|
$ hg revert z/y/x/large2 z/y/x/m/large1
|
|
|
|
$ rm z/y/x/large2 z/y/x/m/large1
|
|
|
|
$ hg commit -m "Subdir with normal contents" z
|
|
|
|
Invoking status precommit hook
|
|
|
|
M large3
|
|
|
|
A large5
|
|
|
|
A sub2/large6
|
|
|
|
A sub2/large7
|
|
|
|
A z/y/x/m/normal
|
|
|
|
$ hg st
|
|
|
|
M large3
|
|
|
|
A large5
|
|
|
|
A sub2/large6
|
|
|
|
A sub2/large7
|
|
|
|
$ hg rollback --quiet
|
|
|
|
$ hg revert --quiet z
|
|
|
|
$ hg commit -m "Empty subdir" z
|
|
|
|
abort: z: no match under directory!
|
|
|
|
[255]
|
|
|
|
$ rm -rf z
|
|
|
|
$ hg ci -m "standin" .hglf
|
|
|
|
abort: file ".hglf" is a largefile standin
|
|
|
|
(commit the largefile itself instead)
|
|
|
|
[255]
|
|
|
|
|
2012-03-22 18:58:47 +04:00
|
|
|
Test "hg status" with combination of 'file pattern' and 'directory
|
|
|
|
pattern' for largefiles:
|
|
|
|
|
|
|
|
$ hg status sub2/large6 sub2
|
|
|
|
A sub2/large6
|
|
|
|
A sub2/large7
|
|
|
|
|
2011-10-21 06:14:11 +04:00
|
|
|
Config settings (pattern **.dat, minsize 2 MB) are respected.
|
2011-10-13 17:15:32 +04:00
|
|
|
|
|
|
|
$ echo testdata > test.dat
|
2011-10-21 06:24:24 +04:00
|
|
|
$ dd bs=1k count=2k if=/dev/zero of=reallylarge > /dev/null 2> /dev/null
|
2011-10-13 17:15:32 +04:00
|
|
|
$ hg add
|
|
|
|
adding reallylarge as a largefile
|
|
|
|
adding test.dat as a largefile
|
|
|
|
|
2011-10-21 06:22:24 +04:00
|
|
|
Test that minsize and --lfsize handle float values;
|
|
|
|
also tests that --lfsize overrides largefiles.minsize.
|
|
|
|
(0.250 MB = 256 kB = 262144 B)
|
|
|
|
|
|
|
|
$ dd if=/dev/zero of=ratherlarge bs=1024 count=256 > /dev/null 2> /dev/null
|
|
|
|
$ dd if=/dev/zero of=medium bs=1024 count=128 > /dev/null 2> /dev/null
|
|
|
|
$ hg --config largefiles.minsize=.25 add
|
|
|
|
adding ratherlarge as a largefile
|
|
|
|
adding medium
|
|
|
|
$ hg forget medium
|
|
|
|
$ hg --config largefiles.minsize=.25 add --lfsize=.125
|
|
|
|
adding medium as a largefile
|
|
|
|
$ dd if=/dev/zero of=notlarge bs=1024 count=127 > /dev/null 2> /dev/null
|
|
|
|
$ hg --config largefiles.minsize=.25 add --lfsize=.125
|
|
|
|
adding notlarge
|
|
|
|
$ hg forget notlarge
|
2011-10-13 17:15:32 +04:00
|
|
|
|
|
|
|
Test forget on largefiles.
|
|
|
|
|
2011-10-21 06:22:24 +04:00
|
|
|
$ hg forget large3 large5 test.dat reallylarge ratherlarge medium
|
2012-01-07 22:11:31 +04:00
|
|
|
$ hg commit -m "add/edit more largefiles"
|
|
|
|
Invoking status precommit hook
|
2011-10-13 17:15:32 +04:00
|
|
|
A sub2/large6
|
|
|
|
A sub2/large7
|
|
|
|
R large3
|
|
|
|
? large5
|
2011-10-21 06:22:24 +04:00
|
|
|
? medium
|
|
|
|
? notlarge
|
|
|
|
? ratherlarge
|
2011-10-13 17:15:32 +04:00
|
|
|
? reallylarge
|
|
|
|
? test.dat
|
|
|
|
$ hg st
|
|
|
|
? large3
|
|
|
|
? large5
|
2011-10-21 06:22:24 +04:00
|
|
|
? medium
|
|
|
|
? notlarge
|
|
|
|
? ratherlarge
|
2011-10-13 17:15:32 +04:00
|
|
|
? reallylarge
|
|
|
|
? test.dat
|
|
|
|
|
2011-10-21 06:14:11 +04:00
|
|
|
Purge with largefiles: verify that largefiles are still in the working
|
|
|
|
dir after a purge.
|
2011-10-13 17:15:32 +04:00
|
|
|
|
|
|
|
$ hg purge --all
|
|
|
|
$ cat sub/large4
|
|
|
|
large44
|
|
|
|
$ cat sub2/large6
|
|
|
|
large6
|
|
|
|
$ cat sub2/large7
|
|
|
|
large7
|
|
|
|
|
2014-04-13 21:01:00 +04:00
|
|
|
Test addremove: verify that files that should be added as largefiles are added as
|
|
|
|
such and that already-existing largefiles are not added as normal files by
|
2012-01-07 15:42:54 +04:00
|
|
|
accident.
|
|
|
|
|
|
|
|
$ rm normal3
|
|
|
|
$ rm sub/large4
|
|
|
|
$ echo "testing addremove with patterns" > testaddremove.dat
|
|
|
|
$ echo "normaladdremove" > normaladdremove
|
|
|
|
$ hg addremove
|
|
|
|
removing sub/large4
|
|
|
|
adding testaddremove.dat as a largefile
|
|
|
|
removing normal3
|
|
|
|
adding normaladdremove
|
|
|
|
|
2012-07-19 14:30:59 +04:00
|
|
|
Test addremove with -R
|
|
|
|
|
|
|
|
$ hg up -C
|
|
|
|
getting changed largefiles
|
|
|
|
1 largefiles updated, 0 removed
|
2013-01-23 03:51:53 +04:00
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2012-07-19 14:30:59 +04:00
|
|
|
$ rm normal3
|
|
|
|
$ rm sub/large4
|
|
|
|
$ echo "testing addremove with patterns" > testaddremove.dat
|
|
|
|
$ echo "normaladdremove" > normaladdremove
|
|
|
|
$ cd ..
|
|
|
|
$ hg -R a addremove
|
|
|
|
removing sub/large4
|
|
|
|
adding a/testaddremove.dat as a largefile (glob)
|
|
|
|
removing normal3
|
|
|
|
adding normaladdremove
|
|
|
|
$ cd a
|
|
|
|
|
2012-07-19 18:00:15 +04:00
|
|
|
Test 3364
|
|
|
|
$ hg clone . ../addrm
|
|
|
|
updating to branch default
|
|
|
|
getting changed largefiles
|
|
|
|
3 largefiles updated, 0 removed
|
2013-01-23 03:51:53 +04:00
|
|
|
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2012-07-19 18:00:15 +04:00
|
|
|
$ cd ../addrm
|
|
|
|
$ cat >> .hg/hgrc <<EOF
|
|
|
|
> [hooks]
|
2012-09-03 20:25:50 +04:00
|
|
|
> post-commit.stat=sh -c "echo \\"Invoking status postcommit hook\\"; hg status -A"
|
2012-07-19 18:00:15 +04:00
|
|
|
> EOF
|
|
|
|
$ touch foo
|
|
|
|
$ hg add --large foo
|
|
|
|
$ hg ci -m "add foo"
|
|
|
|
Invoking status precommit hook
|
|
|
|
A foo
|
|
|
|
Invoking status postcommit hook
|
|
|
|
C foo
|
|
|
|
C normal3
|
|
|
|
C sub/large4
|
|
|
|
C sub/normal4
|
|
|
|
C sub2/large6
|
|
|
|
C sub2/large7
|
|
|
|
$ rm foo
|
|
|
|
$ hg st
|
|
|
|
! foo
|
|
|
|
hmm.. no precommit invoked, but there is a postcommit??
|
|
|
|
$ hg ci -m "will not checkin"
|
|
|
|
nothing changed
|
|
|
|
Invoking status postcommit hook
|
|
|
|
! foo
|
|
|
|
C normal3
|
|
|
|
C sub/large4
|
|
|
|
C sub/normal4
|
|
|
|
C sub2/large6
|
|
|
|
C sub2/large7
|
|
|
|
[1]
|
|
|
|
$ hg addremove
|
|
|
|
removing foo
|
|
|
|
$ hg st
|
|
|
|
R foo
|
|
|
|
$ hg ci -m "used to say nothing changed"
|
|
|
|
Invoking status precommit hook
|
|
|
|
R foo
|
|
|
|
Invoking status postcommit hook
|
|
|
|
C normal3
|
|
|
|
C sub/large4
|
|
|
|
C sub/normal4
|
|
|
|
C sub2/large6
|
|
|
|
C sub2/large7
|
|
|
|
$ hg st
|
2012-07-19 19:12:05 +04:00
|
|
|
|
|
|
|
Test 3507 (both normal files and largefiles were a problem)
|
|
|
|
|
|
|
|
$ touch normal
|
|
|
|
$ touch large
|
|
|
|
$ hg add normal
|
|
|
|
$ hg add --large large
|
|
|
|
$ hg ci -m "added"
|
|
|
|
Invoking status precommit hook
|
|
|
|
A large
|
|
|
|
A normal
|
|
|
|
Invoking status postcommit hook
|
|
|
|
C large
|
|
|
|
C normal
|
|
|
|
C normal3
|
|
|
|
C sub/large4
|
|
|
|
C sub/normal4
|
|
|
|
C sub2/large6
|
|
|
|
C sub2/large7
|
|
|
|
$ hg remove normal
|
|
|
|
$ hg addremove --traceback
|
|
|
|
$ hg ci -m "addremoved normal"
|
|
|
|
Invoking status precommit hook
|
|
|
|
R normal
|
|
|
|
Invoking status postcommit hook
|
|
|
|
C large
|
|
|
|
C normal3
|
|
|
|
C sub/large4
|
|
|
|
C sub/normal4
|
|
|
|
C sub2/large6
|
|
|
|
C sub2/large7
|
|
|
|
$ hg up -C '.^'
|
|
|
|
getting changed largefiles
|
|
|
|
0 largefiles updated, 0 removed
|
2013-01-23 03:51:53 +04:00
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2012-07-19 19:12:05 +04:00
|
|
|
$ hg remove large
|
|
|
|
$ hg addremove --traceback
|
|
|
|
$ hg ci -m "removed large"
|
|
|
|
Invoking status precommit hook
|
|
|
|
R large
|
|
|
|
created new head
|
|
|
|
Invoking status postcommit hook
|
|
|
|
C normal
|
|
|
|
C normal3
|
|
|
|
C sub/large4
|
|
|
|
C sub/normal4
|
|
|
|
C sub2/large6
|
|
|
|
C sub2/large7
|
|
|
|
|
2014-08-15 19:47:03 +04:00
|
|
|
Test commit -A (issue3542)
|
largefiles: handle commit -A properly, after a --large commit (issue3542)
Previous to this, 'commit -A' would add as normal files, files that were already
committed as largefiles, resulting in files being listed twice by 'status -A'.
It also missed when (only) a largefile was deleted, even though status reported
it as '!'. This also has the side effect of properly reporting the state of the
affected largefiles in the post commit hook after a remove that also affected a
normal file (the largefiles used to be 'R', now are properly absent).
Since scmutil.addremove() is called both by the ui command (after some trivial
argument validation) and during the commit process when -A is specified, it
seems like a more appropriate method to wrap than the addremove command.
Currently, a repo is only enabled to use largefiles after an add that explicitly
identifies some file as large, and a subsequent commit. Therefore, this patch
only changes behavior after such a largefile enabling commit.
Note that in the test, if the final commit had a '-v', 'removing large8' would
be printed twice. Both of these originate in removelargefiles(). The first
print is in verbose mode after traversing remove + forget, the second is because
the '_isaddremove' attr is set and 'after' is not.
2012-07-31 04:56:41 +04:00
|
|
|
$ echo large8 > large8
|
|
|
|
$ hg add --large large8
|
|
|
|
$ hg ci -Am 'this used to add large8 as normal and commit both'
|
|
|
|
Invoking status precommit hook
|
|
|
|
A large8
|
|
|
|
Invoking status postcommit hook
|
|
|
|
C large8
|
|
|
|
C normal
|
|
|
|
C normal3
|
|
|
|
C sub/large4
|
|
|
|
C sub/normal4
|
|
|
|
C sub2/large6
|
|
|
|
C sub2/large7
|
|
|
|
$ rm large8
|
|
|
|
$ hg ci -Am 'this used to not notice the rm'
|
|
|
|
removing large8
|
|
|
|
Invoking status precommit hook
|
|
|
|
R large8
|
|
|
|
Invoking status postcommit hook
|
|
|
|
C normal
|
|
|
|
C normal3
|
|
|
|
C sub/large4
|
|
|
|
C sub/normal4
|
|
|
|
C sub2/large6
|
|
|
|
C sub2/large7
|
|
|
|
|
2012-07-20 07:35:13 +04:00
|
|
|
Test that a standin can't be added as a large file
|
|
|
|
|
|
|
|
$ touch large
|
|
|
|
$ hg add --large large
|
|
|
|
$ hg ci -m "add"
|
|
|
|
Invoking status precommit hook
|
|
|
|
A large
|
|
|
|
Invoking status postcommit hook
|
|
|
|
C large
|
|
|
|
C normal
|
|
|
|
C normal3
|
|
|
|
C sub/large4
|
|
|
|
C sub/normal4
|
|
|
|
C sub2/large6
|
|
|
|
C sub2/large7
|
|
|
|
$ hg remove large
|
|
|
|
$ touch large
|
|
|
|
$ hg addremove --config largefiles.patterns=**large --traceback
|
|
|
|
adding large as a largefile
|
|
|
|
|
2012-07-21 03:08:26 +04:00
|
|
|
Test that outgoing --large works (with revsets too)
|
|
|
|
$ hg outgoing --rev '.^' --large
|
2012-07-21 07:50:52 +04:00
|
|
|
comparing with $TESTTMP/a (glob)
|
|
|
|
searching for changes
|
|
|
|
changeset: 8:c02fd3b77ec4
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: add foo
|
|
|
|
|
|
|
|
changeset: 9:289dd08c9bbb
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: used to say nothing changed
|
|
|
|
|
|
|
|
changeset: 10:34f23ac6ac12
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: added
|
|
|
|
|
|
|
|
changeset: 12:710c1b2f523c
|
|
|
|
parent: 10:34f23ac6ac12
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: removed large
|
|
|
|
|
largefiles: handle commit -A properly, after a --large commit (issue3542)
Previous to this, 'commit -A' would add as normal files, files that were already
committed as largefiles, resulting in files being listed twice by 'status -A'.
It also missed when (only) a largefile was deleted, even though status reported
it as '!'. This also has the side effect of properly reporting the state of the
affected largefiles in the post commit hook after a remove that also affected a
normal file (the largefiles used to be 'R', now are properly absent).
Since scmutil.addremove() is called both by the ui command (after some trivial
argument validation) and during the commit process when -A is specified, it
seems like a more appropriate method to wrap than the addremove command.
Currently, a repo is only enabled to use largefiles after an add that explicitly
identifies some file as large, and a subsequent commit. Therefore, this patch
only changes behavior after such a largefile enabling commit.
Note that in the test, if the final commit had a '-v', 'removing large8' would
be printed twice. Both of these originate in removelargefiles(). The first
print is in verbose mode after traversing remove + forget, the second is because
the '_isaddremove' attr is set and 'after' is not.
2012-07-31 04:56:41 +04:00
|
|
|
changeset: 13:0a3e75774479
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: this used to add large8 as normal and commit both
|
|
|
|
|
|
|
|
changeset: 14:84f3d378175c
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: this used to not notice the rm
|
|
|
|
|
2014-07-07 13:45:46 +04:00
|
|
|
largefiles to upload (1 entities):
|
2012-12-12 05:38:14 +04:00
|
|
|
large8
|
2012-07-21 07:50:52 +04:00
|
|
|
|
2012-07-19 18:00:15 +04:00
|
|
|
$ cd ../a
|
|
|
|
|
2011-10-21 06:14:11 +04:00
|
|
|
Clone a largefiles repo.
|
2011-10-13 17:15:32 +04:00
|
|
|
|
2011-11-22 20:51:43 +04:00
|
|
|
$ hg clone . ../b
|
2011-10-13 17:15:32 +04:00
|
|
|
updating to branch default
|
|
|
|
getting changed largefiles
|
|
|
|
3 largefiles updated, 0 removed
|
2013-01-23 03:51:53 +04:00
|
|
|
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2011-11-22 20:51:43 +04:00
|
|
|
$ cd ../b
|
2011-10-28 20:50:54 +04:00
|
|
|
$ hg log --template '{rev}:{node|short} {desc|firstline}\n'
|
|
|
|
7:daea875e9014 add/edit more largefiles
|
|
|
|
6:4355d653f84f edit files yet again
|
|
|
|
5:9d5af5072dbd edit files again
|
|
|
|
4:74c02385b94c move files
|
|
|
|
3:9e8fbc4bce62 copy files
|
|
|
|
2:51a0ae4d5864 remove files
|
|
|
|
1:ce8896473775 edit files
|
|
|
|
0:30d30fe6a5be add files
|
2011-10-13 17:15:32 +04:00
|
|
|
$ cat normal3
|
|
|
|
normal33
|
2014-03-07 02:52:07 +04:00
|
|
|
|
|
|
|
Test graph log
|
|
|
|
|
|
|
|
$ hg log -G --template '{rev}:{node|short} {desc|firstline}\n'
|
|
|
|
@ 7:daea875e9014 add/edit more largefiles
|
|
|
|
|
|
|
|
|
o 6:4355d653f84f edit files yet again
|
|
|
|
|
|
|
|
|
o 5:9d5af5072dbd edit files again
|
|
|
|
|
|
|
|
|
o 4:74c02385b94c move files
|
|
|
|
|
|
|
|
|
o 3:9e8fbc4bce62 copy files
|
|
|
|
|
|
|
|
|
o 2:51a0ae4d5864 remove files
|
|
|
|
|
|
|
|
|
o 1:ce8896473775 edit files
|
|
|
|
|
|
|
|
|
o 0:30d30fe6a5be add files
|
|
|
|
|
2014-08-14 02:18:41 +04:00
|
|
|
|
|
|
|
Test log with --patch
|
2014-08-14 02:51:33 +04:00
|
|
|
|
2014-08-14 02:18:41 +04:00
|
|
|
$ hg log --patch -r 6::7
|
|
|
|
changeset: 6:4355d653f84f
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: edit files yet again
|
|
|
|
|
|
|
|
diff -r 9d5af5072dbd -r 4355d653f84f .hglf/large3
|
|
|
|
--- a/.hglf/large3 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/.hglf/large3 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-baaf12afde9d8d67f25dab6dced0d2bf77dba47c
|
|
|
|
+7838695e10da2bb75ac1156565f40a2595fa2fa0
|
|
|
|
diff -r 9d5af5072dbd -r 4355d653f84f .hglf/sub/large4
|
|
|
|
--- a/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-aeb2210d19f02886dde00dac279729a48471e2f9
|
|
|
|
+971fb41e78fea4f8e0ba5244784239371cb00591
|
|
|
|
diff -r 9d5af5072dbd -r 4355d653f84f normal3
|
|
|
|
--- a/normal3 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/normal3 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-normal3
|
|
|
|
+normal33
|
|
|
|
diff -r 9d5af5072dbd -r 4355d653f84f sub/normal4
|
|
|
|
--- a/sub/normal4 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/sub/normal4 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-normal4
|
|
|
|
+normal44
|
|
|
|
|
|
|
|
changeset: 7:daea875e9014
|
|
|
|
tag: tip
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: add/edit more largefiles
|
|
|
|
|
|
|
|
diff -r 4355d653f84f -r daea875e9014 .hglf/large3
|
|
|
|
--- a/.hglf/large3 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -1,1 +0,0 @@
|
|
|
|
-7838695e10da2bb75ac1156565f40a2595fa2fa0
|
|
|
|
diff -r 4355d653f84f -r daea875e9014 .hglf/sub2/large6
|
|
|
|
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/.hglf/sub2/large6 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+0d6d75887db61b2c7e6c74b5dd8fc6ad50c0cc30
|
|
|
|
diff -r 4355d653f84f -r daea875e9014 .hglf/sub2/large7
|
|
|
|
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/.hglf/sub2/large7 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+bb3151689acb10f0c3125c560d5e63df914bc1af
|
|
|
|
|
|
|
|
|
|
|
|
$ hg log --patch -r 6::7 sub/
|
|
|
|
changeset: 6:4355d653f84f
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: edit files yet again
|
|
|
|
|
|
|
|
diff -r 9d5af5072dbd -r 4355d653f84f .hglf/sub/large4
|
|
|
|
--- a/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-aeb2210d19f02886dde00dac279729a48471e2f9
|
|
|
|
+971fb41e78fea4f8e0ba5244784239371cb00591
|
|
|
|
diff -r 9d5af5072dbd -r 4355d653f84f sub/normal4
|
|
|
|
--- a/sub/normal4 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/sub/normal4 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-normal4
|
|
|
|
+normal44
|
|
|
|
|
2014-08-14 02:51:33 +04:00
|
|
|
|
|
|
|
log with both --follow and --patch
|
|
|
|
|
|
|
|
$ hg log --follow --patch --limit 2
|
|
|
|
changeset: 7:daea875e9014
|
|
|
|
tag: tip
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: add/edit more largefiles
|
|
|
|
|
|
|
|
diff -r 4355d653f84f -r daea875e9014 .hglf/large3
|
|
|
|
--- a/.hglf/large3 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -1,1 +0,0 @@
|
|
|
|
-7838695e10da2bb75ac1156565f40a2595fa2fa0
|
|
|
|
diff -r 4355d653f84f -r daea875e9014 .hglf/sub2/large6
|
|
|
|
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/.hglf/sub2/large6 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+0d6d75887db61b2c7e6c74b5dd8fc6ad50c0cc30
|
|
|
|
diff -r 4355d653f84f -r daea875e9014 .hglf/sub2/large7
|
|
|
|
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/.hglf/sub2/large7 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+bb3151689acb10f0c3125c560d5e63df914bc1af
|
|
|
|
|
|
|
|
changeset: 6:4355d653f84f
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: edit files yet again
|
|
|
|
|
|
|
|
diff -r 9d5af5072dbd -r 4355d653f84f .hglf/large3
|
|
|
|
--- a/.hglf/large3 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/.hglf/large3 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-baaf12afde9d8d67f25dab6dced0d2bf77dba47c
|
|
|
|
+7838695e10da2bb75ac1156565f40a2595fa2fa0
|
|
|
|
diff -r 9d5af5072dbd -r 4355d653f84f .hglf/sub/large4
|
|
|
|
--- a/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-aeb2210d19f02886dde00dac279729a48471e2f9
|
|
|
|
+971fb41e78fea4f8e0ba5244784239371cb00591
|
|
|
|
diff -r 9d5af5072dbd -r 4355d653f84f normal3
|
|
|
|
--- a/normal3 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/normal3 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-normal3
|
|
|
|
+normal33
|
|
|
|
diff -r 9d5af5072dbd -r 4355d653f84f sub/normal4
|
|
|
|
--- a/sub/normal4 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/sub/normal4 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-normal4
|
|
|
|
+normal44
|
|
|
|
|
2014-08-14 02:55:45 +04:00
|
|
|
$ hg log --follow --patch sub/large4
|
|
|
|
changeset: 6:4355d653f84f
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: edit files yet again
|
|
|
|
|
|
|
|
diff -r 9d5af5072dbd -r 4355d653f84f .hglf/sub/large4
|
|
|
|
--- a/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-aeb2210d19f02886dde00dac279729a48471e2f9
|
|
|
|
+971fb41e78fea4f8e0ba5244784239371cb00591
|
|
|
|
|
|
|
|
changeset: 5:9d5af5072dbd
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: edit files again
|
|
|
|
|
|
|
|
diff -r 74c02385b94c -r 9d5af5072dbd .hglf/sub/large4
|
|
|
|
--- a/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
|
|
|
|
+aeb2210d19f02886dde00dac279729a48471e2f9
|
|
|
|
|
|
|
|
changeset: 4:74c02385b94c
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: move files
|
|
|
|
|
|
|
|
diff -r 9e8fbc4bce62 -r 74c02385b94c .hglf/sub/large4
|
|
|
|
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
|
|
|
|
|
|
|
|
changeset: 1:ce8896473775
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: edit files
|
|
|
|
|
|
|
|
diff -r 30d30fe6a5be -r ce8896473775 .hglf/sub/large2
|
|
|
|
--- a/.hglf/sub/large2 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/.hglf/sub/large2 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-1deebade43c8c498a3c8daddac0244dc55d1331d
|
|
|
|
+eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
|
|
|
|
|
|
|
|
changeset: 0:30d30fe6a5be
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: add files
|
|
|
|
|
|
|
|
diff -r 000000000000 -r 30d30fe6a5be .hglf/sub/large2
|
|
|
|
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/.hglf/sub/large2 Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+1deebade43c8c498a3c8daddac0244dc55d1331d
|
|
|
|
|
2011-10-13 17:15:32 +04:00
|
|
|
$ cat sub/normal4
|
|
|
|
normal44
|
|
|
|
$ cat sub/large4
|
|
|
|
large44
|
|
|
|
$ cat sub2/large6
|
|
|
|
large6
|
|
|
|
$ cat sub2/large7
|
|
|
|
large7
|
2013-07-24 09:20:44 +04:00
|
|
|
$ hg log -qf sub2/large7
|
|
|
|
7:daea875e9014
|
2014-03-07 02:52:07 +04:00
|
|
|
$ hg log -Gqf sub2/large7
|
2014-03-06 03:55:09 +04:00
|
|
|
@ 7:daea875e9014
|
|
|
|
|
|
2011-10-13 17:15:32 +04:00
|
|
|
$ cd ..
|
2014-05-01 17:12:49 +04:00
|
|
|
|
|
|
|
Test log from outside repo
|
|
|
|
|
|
|
|
$ hg log b/sub -T '{rev}:{node|short} {desc|firstline}\n'
|
|
|
|
6:4355d653f84f edit files yet again
|
|
|
|
5:9d5af5072dbd edit files again
|
|
|
|
4:74c02385b94c move files
|
|
|
|
1:ce8896473775 edit files
|
|
|
|
0:30d30fe6a5be add files
|
|
|
|
|
|
|
|
Test clone at revision
|
|
|
|
|
2011-10-13 17:15:32 +04:00
|
|
|
$ hg clone a -r 3 c
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 4 changesets with 10 changes to 4 files
|
|
|
|
updating to branch default
|
|
|
|
getting changed largefiles
|
|
|
|
2 largefiles updated, 0 removed
|
2013-01-23 03:51:53 +04:00
|
|
|
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2011-10-13 17:15:32 +04:00
|
|
|
$ cd c
|
2011-10-28 20:50:54 +04:00
|
|
|
$ hg log --template '{rev}:{node|short} {desc|firstline}\n'
|
|
|
|
3:9e8fbc4bce62 copy files
|
|
|
|
2:51a0ae4d5864 remove files
|
|
|
|
1:ce8896473775 edit files
|
|
|
|
0:30d30fe6a5be add files
|
2011-10-13 17:15:32 +04:00
|
|
|
$ cat normal1
|
|
|
|
normal22
|
|
|
|
$ cat large1
|
|
|
|
large22
|
|
|
|
$ cat sub/normal2
|
|
|
|
normal22
|
|
|
|
$ cat sub/large2
|
|
|
|
large22
|
|
|
|
|
2011-10-21 06:14:11 +04:00
|
|
|
Old revisions of a clone have correct largefiles content (this also
|
|
|
|
tests update).
|
2011-10-13 17:15:32 +04:00
|
|
|
|
2012-08-08 20:10:16 +04:00
|
|
|
$ hg update -r 1
|
2011-10-13 17:15:32 +04:00
|
|
|
getting changed largefiles
|
|
|
|
1 largefiles updated, 0 removed
|
2013-01-23 03:51:53 +04:00
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2011-10-13 17:15:32 +04:00
|
|
|
$ cat large1
|
|
|
|
large11
|
|
|
|
$ cat sub/large2
|
|
|
|
large22
|
2012-05-12 01:11:43 +04:00
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
Test cloning with --all-largefiles flag
|
|
|
|
|
2012-07-03 03:49:51 +04:00
|
|
|
$ rm "${USERCACHE}"/*
|
2012-05-12 01:11:43 +04:00
|
|
|
$ hg clone --all-largefiles a a-backup
|
|
|
|
updating to branch default
|
|
|
|
getting changed largefiles
|
|
|
|
3 largefiles updated, 0 removed
|
2013-01-23 03:51:53 +04:00
|
|
|
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2012-05-12 01:11:43 +04:00
|
|
|
8 additional largefiles cached
|
2011-10-13 17:15:32 +04:00
|
|
|
|
2012-09-08 21:31:06 +04:00
|
|
|
$ rm "${USERCACHE}"/*
|
|
|
|
$ hg clone --all-largefiles -u 0 a a-clone0
|
|
|
|
updating to branch default
|
|
|
|
getting changed largefiles
|
|
|
|
2 largefiles updated, 0 removed
|
2013-01-23 03:51:53 +04:00
|
|
|
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2012-09-08 21:31:06 +04:00
|
|
|
9 additional largefiles cached
|
|
|
|
$ hg -R a-clone0 sum
|
|
|
|
parent: 0:30d30fe6a5be
|
|
|
|
add files
|
|
|
|
branch: default
|
|
|
|
commit: (clean)
|
|
|
|
update: 7 new changesets (update)
|
|
|
|
|
|
|
|
$ rm "${USERCACHE}"/*
|
|
|
|
$ hg clone --all-largefiles -u 1 a a-clone1
|
|
|
|
updating to branch default
|
|
|
|
getting changed largefiles
|
|
|
|
2 largefiles updated, 0 removed
|
2013-01-23 03:51:53 +04:00
|
|
|
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2012-09-08 21:31:06 +04:00
|
|
|
8 additional largefiles cached
|
2013-01-28 18:19:44 +04:00
|
|
|
$ hg -R a-clone1 verify --large --lfa --lfc
|
|
|
|
checking changesets
|
|
|
|
checking manifests
|
|
|
|
crosschecking files in changesets and manifests
|
|
|
|
checking files
|
|
|
|
10 files, 8 changesets, 24 total revisions
|
|
|
|
searching 8 changesets for largefiles
|
|
|
|
verified contents of 13 revisions of 6 largefiles
|
2012-09-08 21:31:06 +04:00
|
|
|
$ hg -R a-clone1 sum
|
|
|
|
parent: 1:ce8896473775
|
|
|
|
edit files
|
|
|
|
branch: default
|
|
|
|
commit: (clean)
|
|
|
|
update: 6 new changesets (update)
|
|
|
|
|
|
|
|
$ rm "${USERCACHE}"/*
|
|
|
|
$ hg clone --all-largefiles -U a a-clone-u
|
2012-09-09 11:37:38 +04:00
|
|
|
11 additional largefiles cached
|
2012-09-08 21:31:06 +04:00
|
|
|
$ hg -R a-clone-u sum
|
|
|
|
parent: -1:000000000000 (no revision checked out)
|
|
|
|
branch: default
|
|
|
|
commit: (clean)
|
|
|
|
update: 8 new changesets (update)
|
|
|
|
|
2013-02-05 02:26:44 +04:00
|
|
|
Show computed destination directory:
|
|
|
|
|
2012-09-09 20:09:53 +04:00
|
|
|
$ mkdir xyz
|
|
|
|
$ cd xyz
|
|
|
|
$ hg clone ../a
|
|
|
|
destination directory: a
|
|
|
|
updating to branch default
|
|
|
|
getting changed largefiles
|
|
|
|
3 largefiles updated, 0 removed
|
2013-01-23 03:51:53 +04:00
|
|
|
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2012-09-09 20:09:53 +04:00
|
|
|
$ cd ..
|
|
|
|
|
2013-02-05 02:26:44 +04:00
|
|
|
Clone URL without path:
|
|
|
|
|
|
|
|
$ hg clone file://
|
|
|
|
abort: repository / not found!
|
|
|
|
[255]
|
|
|
|
|
2012-09-09 20:43:24 +04:00
|
|
|
Ensure base clone command argument validation
|
|
|
|
|
|
|
|
$ hg clone -U -u 0 a a-clone-failure
|
|
|
|
abort: cannot specify both --noupdate and --updaterev
|
|
|
|
[255]
|
|
|
|
|
2012-05-14 00:59:22 +04:00
|
|
|
$ hg clone --all-largefiles a ssh://localhost/a
|
|
|
|
abort: --all-largefiles is incompatible with non-local destination ssh://localhost/a
|
|
|
|
[255]
|
|
|
|
|
2012-10-21 05:43:46 +04:00
|
|
|
Test pulling with --all-largefiles flag. Also test that the largefiles are
|
|
|
|
downloaded from 'default' instead of 'default-push' when no source is specified
|
|
|
|
(issue3584)
|
2012-05-12 13:45:22 +04:00
|
|
|
|
|
|
|
$ rm -Rf a-backup
|
|
|
|
$ hg clone -r 1 a a-backup
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 2 changesets with 8 changes to 4 files
|
|
|
|
updating to branch default
|
|
|
|
getting changed largefiles
|
|
|
|
2 largefiles updated, 0 removed
|
2013-01-23 03:51:53 +04:00
|
|
|
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2012-07-03 03:49:51 +04:00
|
|
|
$ rm "${USERCACHE}"/*
|
2012-05-12 13:45:22 +04:00
|
|
|
$ cd a-backup
|
2012-10-21 05:43:46 +04:00
|
|
|
$ hg pull --all-largefiles --config paths.default-push=bogus/path
|
2012-06-30 21:31:03 +04:00
|
|
|
pulling from $TESTTMP/a (glob)
|
2012-05-12 13:45:22 +04:00
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 6 changesets with 16 changes to 8 files
|
|
|
|
(run 'hg update' to get a working copy)
|
2013-04-15 03:59:11 +04:00
|
|
|
6 largefiles cached
|
2013-04-15 03:53:37 +04:00
|
|
|
|
2013-04-15 03:57:16 +04:00
|
|
|
redo pull with --lfrev and check it pulls largefiles for the right revs
|
|
|
|
|
|
|
|
$ hg rollback
|
|
|
|
repository tip rolled back to revision 1 (undo pull)
|
2013-04-15 03:59:04 +04:00
|
|
|
$ hg pull -v --lfrev 'heads(pulled())+min(pulled())'
|
2013-04-15 03:57:16 +04:00
|
|
|
pulling from $TESTTMP/a (glob)
|
|
|
|
searching for changes
|
|
|
|
all local heads known remotely
|
|
|
|
6 changesets found
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 6 changesets with 16 changes to 8 files
|
2014-02-15 04:23:12 +04:00
|
|
|
calling hook changegroup.lfiles: hgext.largefiles.reposetup.checkrequireslfiles
|
2013-04-15 03:57:16 +04:00
|
|
|
(run 'hg update' to get a working copy)
|
|
|
|
pulling largefiles for revision 7
|
|
|
|
found 971fb41e78fea4f8e0ba5244784239371cb00591 in store
|
|
|
|
found 0d6d75887db61b2c7e6c74b5dd8fc6ad50c0cc30 in store
|
|
|
|
found bb3151689acb10f0c3125c560d5e63df914bc1af in store
|
2013-04-15 03:59:04 +04:00
|
|
|
pulling largefiles for revision 2
|
|
|
|
found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store
|
2013-04-15 03:57:16 +04:00
|
|
|
0 largefiles cached
|
|
|
|
|
2013-04-15 03:53:37 +04:00
|
|
|
lfpull
|
|
|
|
|
|
|
|
$ hg lfpull -r : --config largefiles.usercache=usercache-lfpull
|
|
|
|
2 largefiles cached
|
|
|
|
$ hg lfpull -v -r 4+2 --config largefiles.usercache=usercache-lfpull
|
|
|
|
pulling largefiles for revision 4
|
|
|
|
found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store
|
|
|
|
found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store
|
|
|
|
pulling largefiles for revision 2
|
|
|
|
found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store
|
|
|
|
0 largefiles cached
|
|
|
|
|
|
|
|
$ ls usercache-lfpull/* | sort
|
|
|
|
usercache-lfpull/1deebade43c8c498a3c8daddac0244dc55d1331d
|
|
|
|
usercache-lfpull/4669e532d5b2c093a78eca010077e708a071bb64
|
|
|
|
|
2012-05-12 13:45:22 +04:00
|
|
|
$ cd ..
|
|
|
|
|
2011-10-21 06:14:11 +04:00
|
|
|
Rebasing between two repositories does not revert largefiles to old
|
2011-10-13 17:15:32 +04:00
|
|
|
revisions (this was a very bad bug that took a lot of work to fix).
|
|
|
|
|
|
|
|
$ hg clone a d
|
|
|
|
updating to branch default
|
|
|
|
getting changed largefiles
|
|
|
|
3 largefiles updated, 0 removed
|
2013-01-23 03:51:53 +04:00
|
|
|
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2011-10-13 17:15:32 +04:00
|
|
|
$ cd b
|
|
|
|
$ echo large4-modified > sub/large4
|
|
|
|
$ echo normal3-modified > normal3
|
|
|
|
$ hg commit -m "modify normal file and largefile in repo b"
|
2012-01-07 22:11:31 +04:00
|
|
|
Invoking status precommit hook
|
|
|
|
M normal3
|
|
|
|
M sub/large4
|
2011-10-13 17:15:32 +04:00
|
|
|
$ cd ../d
|
|
|
|
$ echo large6-modified > sub2/large6
|
|
|
|
$ echo normal4-modified > sub/normal4
|
|
|
|
$ hg commit -m "modify normal file largefile in repo d"
|
2012-01-07 22:11:31 +04:00
|
|
|
Invoking status precommit hook
|
|
|
|
M sub/normal4
|
|
|
|
M sub2/large6
|
2011-10-19 19:02:59 +04:00
|
|
|
$ cd ..
|
|
|
|
$ hg clone d e
|
|
|
|
updating to branch default
|
|
|
|
getting changed largefiles
|
|
|
|
3 largefiles updated, 0 removed
|
2013-01-23 03:51:53 +04:00
|
|
|
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2011-10-19 19:02:59 +04:00
|
|
|
$ cd d
|
2012-10-21 05:43:46 +04:00
|
|
|
|
|
|
|
More rebase testing, but also test that the largefiles are downloaded from
|
2013-02-28 16:44:22 +04:00
|
|
|
'default-push' when no source is specified (issue3584). (The largefile from the
|
|
|
|
pulled revision is however not downloaded but found in the local cache.)
|
|
|
|
Largefiles are fetched for the new pulled revision, not for existing revisions,
|
|
|
|
rebased or not.
|
|
|
|
|
|
|
|
$ [ ! -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ]
|
2012-10-21 05:43:46 +04:00
|
|
|
$ hg pull --rebase --all-largefiles --config paths.default-push=bogus/path --config paths.default=../b
|
|
|
|
pulling from $TESTTMP/b (glob)
|
2011-10-13 17:15:32 +04:00
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 2 changes to 2 files (+1 heads)
|
2012-01-07 22:11:31 +04:00
|
|
|
Invoking status precommit hook
|
|
|
|
M sub/normal4
|
|
|
|
M sub2/large6
|
2012-06-10 16:14:52 +04:00
|
|
|
saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
|
2013-04-15 03:59:11 +04:00
|
|
|
0 largefiles cached
|
2013-11-18 03:21:58 +04:00
|
|
|
nothing to rebase - working directory parent is also destination
|
2013-02-28 16:44:22 +04:00
|
|
|
$ [ -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ]
|
2011-10-28 20:50:54 +04:00
|
|
|
$ hg log --template '{rev}:{node|short} {desc|firstline}\n'
|
|
|
|
9:598410d3eb9a modify normal file largefile in repo d
|
|
|
|
8:a381d2c8c80e modify normal file and largefile in repo b
|
|
|
|
7:daea875e9014 add/edit more largefiles
|
|
|
|
6:4355d653f84f edit files yet again
|
|
|
|
5:9d5af5072dbd edit files again
|
|
|
|
4:74c02385b94c move files
|
|
|
|
3:9e8fbc4bce62 copy files
|
|
|
|
2:51a0ae4d5864 remove files
|
|
|
|
1:ce8896473775 edit files
|
|
|
|
0:30d30fe6a5be add files
|
2014-03-07 02:52:07 +04:00
|
|
|
$ hg log -G --template '{rev}:{node|short} {desc|firstline}\n'
|
|
|
|
@ 9:598410d3eb9a modify normal file largefile in repo d
|
|
|
|
|
|
|
|
|
o 8:a381d2c8c80e modify normal file and largefile in repo b
|
|
|
|
|
|
|
|
|
o 7:daea875e9014 add/edit more largefiles
|
|
|
|
|
|
|
|
|
o 6:4355d653f84f edit files yet again
|
|
|
|
|
|
|
|
|
o 5:9d5af5072dbd edit files again
|
|
|
|
|
|
|
|
|
o 4:74c02385b94c move files
|
|
|
|
|
|
|
|
|
o 3:9e8fbc4bce62 copy files
|
|
|
|
|
|
|
|
|
o 2:51a0ae4d5864 remove files
|
|
|
|
|
|
|
|
|
o 1:ce8896473775 edit files
|
|
|
|
|
|
|
|
|
o 0:30d30fe6a5be add files
|
|
|
|
|
2011-10-13 17:15:32 +04:00
|
|
|
$ cat normal3
|
|
|
|
normal3-modified
|
|
|
|
$ cat sub/normal4
|
|
|
|
normal4-modified
|
|
|
|
$ cat sub/large4
|
|
|
|
large4-modified
|
|
|
|
$ cat sub2/large6
|
|
|
|
large6-modified
|
|
|
|
$ cat sub2/large7
|
|
|
|
large7
|
2011-10-19 19:02:59 +04:00
|
|
|
$ cd ../e
|
|
|
|
$ hg pull ../b
|
|
|
|
pulling from ../b
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 2 changes to 2 files (+1 heads)
|
|
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
|
|
$ hg rebase
|
2012-01-07 22:11:31 +04:00
|
|
|
Invoking status precommit hook
|
|
|
|
M sub/normal4
|
|
|
|
M sub2/large6
|
2012-06-10 16:14:52 +04:00
|
|
|
saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
|
2012-01-07 18:35:15 +04:00
|
|
|
$ hg log --template '{rev}:{node|short} {desc|firstline}\n'
|
|
|
|
9:598410d3eb9a modify normal file largefile in repo d
|
|
|
|
8:a381d2c8c80e modify normal file and largefile in repo b
|
|
|
|
7:daea875e9014 add/edit more largefiles
|
|
|
|
6:4355d653f84f edit files yet again
|
|
|
|
5:9d5af5072dbd edit files again
|
|
|
|
4:74c02385b94c move files
|
|
|
|
3:9e8fbc4bce62 copy files
|
|
|
|
2:51a0ae4d5864 remove files
|
|
|
|
1:ce8896473775 edit files
|
|
|
|
0:30d30fe6a5be add files
|
2011-10-19 19:02:59 +04:00
|
|
|
$ cat normal3
|
|
|
|
normal3-modified
|
|
|
|
$ cat sub/normal4
|
|
|
|
normal4-modified
|
|
|
|
$ cat sub/large4
|
|
|
|
large4-modified
|
|
|
|
$ cat sub2/large6
|
|
|
|
large6-modified
|
|
|
|
$ cat sub2/large7
|
|
|
|
large7
|
|
|
|
|
2013-01-15 04:05:12 +04:00
|
|
|
Log on largefiles
|
|
|
|
|
|
|
|
- same output
|
|
|
|
$ hg log --template '{rev}:{node|short} {desc|firstline}\n' .hglf/sub/large4
|
|
|
|
8:a381d2c8c80e modify normal file and largefile in repo b
|
|
|
|
6:4355d653f84f edit files yet again
|
|
|
|
5:9d5af5072dbd edit files again
|
|
|
|
4:74c02385b94c move files
|
2014-03-07 02:52:07 +04:00
|
|
|
$ hg log -G --template '{rev}:{node|short} {desc|firstline}\n' .hglf/sub/large4
|
|
|
|
o 8:a381d2c8c80e modify normal file and largefile in repo b
|
|
|
|
|
|
|
|
|
o 6:4355d653f84f edit files yet again
|
|
|
|
|
|
|
|
|
o 5:9d5af5072dbd edit files again
|
|
|
|
|
|
|
|
|
o 4:74c02385b94c move files
|
|
|
|
|
|
2013-01-15 04:05:12 +04:00
|
|
|
$ hg log --template '{rev}:{node|short} {desc|firstline}\n' sub/large4
|
|
|
|
8:a381d2c8c80e modify normal file and largefile in repo b
|
|
|
|
6:4355d653f84f edit files yet again
|
|
|
|
5:9d5af5072dbd edit files again
|
|
|
|
4:74c02385b94c move files
|
2014-03-07 02:52:07 +04:00
|
|
|
$ hg log -G --template '{rev}:{node|short} {desc|firstline}\n' .hglf/sub/large4
|
|
|
|
o 8:a381d2c8c80e modify normal file and largefile in repo b
|
|
|
|
|
|
|
|
|
o 6:4355d653f84f edit files yet again
|
|
|
|
|
|
|
|
|
o 5:9d5af5072dbd edit files again
|
|
|
|
|
|
|
|
|
o 4:74c02385b94c move files
|
|
|
|
|
|
2013-01-15 04:05:12 +04:00
|
|
|
|
|
|
|
- .hglf only matches largefiles, without .hglf it matches 9 bco sub/normal
|
|
|
|
$ hg log --template '{rev}:{node|short} {desc|firstline}\n' .hglf/sub
|
|
|
|
8:a381d2c8c80e modify normal file and largefile in repo b
|
|
|
|
6:4355d653f84f edit files yet again
|
|
|
|
5:9d5af5072dbd edit files again
|
|
|
|
4:74c02385b94c move files
|
|
|
|
1:ce8896473775 edit files
|
|
|
|
0:30d30fe6a5be add files
|
2014-03-07 02:52:07 +04:00
|
|
|
$ hg log -G --template '{rev}:{node|short} {desc|firstline}\n' .hglf/sub
|
|
|
|
o 8:a381d2c8c80e modify normal file and largefile in repo b
|
|
|
|
|
|
|
|
|
o 6:4355d653f84f edit files yet again
|
|
|
|
|
|
|
|
|
o 5:9d5af5072dbd edit files again
|
|
|
|
|
|
|
|
|
o 4:74c02385b94c move files
|
|
|
|
|
|
|
|
|
o 1:ce8896473775 edit files
|
|
|
|
|
|
|
|
|
o 0:30d30fe6a5be add files
|
|
|
|
|
2013-01-15 04:05:12 +04:00
|
|
|
$ hg log --template '{rev}:{node|short} {desc|firstline}\n' sub
|
|
|
|
9:598410d3eb9a modify normal file largefile in repo d
|
|
|
|
8:a381d2c8c80e modify normal file and largefile in repo b
|
|
|
|
6:4355d653f84f edit files yet again
|
|
|
|
5:9d5af5072dbd edit files again
|
|
|
|
4:74c02385b94c move files
|
|
|
|
1:ce8896473775 edit files
|
|
|
|
0:30d30fe6a5be add files
|
2014-03-07 02:52:07 +04:00
|
|
|
$ hg log -G --template '{rev}:{node|short} {desc|firstline}\n' sub
|
|
|
|
@ 9:598410d3eb9a modify normal file largefile in repo d
|
|
|
|
|
|
2014-03-06 03:55:09 +04:00
|
|
|
o 8:a381d2c8c80e modify normal file and largefile in repo b
|
|
|
|
|
|
2014-03-07 02:52:07 +04:00
|
|
|
o 6:4355d653f84f edit files yet again
|
|
|
|
|
|
|
|
|
o 5:9d5af5072dbd edit files again
|
|
|
|
|
|
|
|
|
o 4:74c02385b94c move files
|
|
|
|
|
|
|
|
|
o 1:ce8896473775 edit files
|
|
|
|
|
|
|
|
|
o 0:30d30fe6a5be add files
|
|
|
|
|
2013-01-15 04:05:12 +04:00
|
|
|
- globbing gives same result
|
|
|
|
$ hg log --template '{rev}:{node|short} {desc|firstline}\n' 'glob:sub/*'
|
|
|
|
9:598410d3eb9a modify normal file largefile in repo d
|
|
|
|
8:a381d2c8c80e modify normal file and largefile in repo b
|
|
|
|
6:4355d653f84f edit files yet again
|
|
|
|
5:9d5af5072dbd edit files again
|
|
|
|
4:74c02385b94c move files
|
|
|
|
1:ce8896473775 edit files
|
|
|
|
0:30d30fe6a5be add files
|
2014-03-07 02:52:07 +04:00
|
|
|
$ hg log -G --template '{rev}:{node|short} {desc|firstline}\n' 'glob:sub/*'
|
|
|
|
@ 9:598410d3eb9a modify normal file largefile in repo d
|
|
|
|
|
|
2014-03-06 03:55:09 +04:00
|
|
|
o 8:a381d2c8c80e modify normal file and largefile in repo b
|
|
|
|
|
|
2014-03-07 02:52:07 +04:00
|
|
|
o 6:4355d653f84f edit files yet again
|
|
|
|
|
|
|
|
|
o 5:9d5af5072dbd edit files again
|
|
|
|
|
|
|
|
|
o 4:74c02385b94c move files
|
|
|
|
|
|
|
|
|
o 1:ce8896473775 edit files
|
|
|
|
|
|
|
|
|
o 0:30d30fe6a5be add files
|
|
|
|
|
2011-10-21 06:14:11 +04:00
|
|
|
Rollback on largefiles.
|
2011-10-19 19:02:59 +04:00
|
|
|
|
2012-08-08 20:10:16 +04:00
|
|
|
$ echo large4-modified-again > sub/large4
|
2011-10-19 19:02:59 +04:00
|
|
|
$ hg commit -m "Modify large4 again"
|
2012-01-07 22:11:31 +04:00
|
|
|
Invoking status precommit hook
|
|
|
|
M sub/large4
|
2011-10-19 19:02:59 +04:00
|
|
|
$ hg rollback
|
|
|
|
repository tip rolled back to revision 9 (undo commit)
|
|
|
|
working directory now based on revision 9
|
|
|
|
$ hg st
|
|
|
|
M sub/large4
|
2012-01-07 18:35:15 +04:00
|
|
|
$ hg log --template '{rev}:{node|short} {desc|firstline}\n'
|
|
|
|
9:598410d3eb9a modify normal file largefile in repo d
|
|
|
|
8:a381d2c8c80e modify normal file and largefile in repo b
|
|
|
|
7:daea875e9014 add/edit more largefiles
|
|
|
|
6:4355d653f84f edit files yet again
|
|
|
|
5:9d5af5072dbd edit files again
|
|
|
|
4:74c02385b94c move files
|
|
|
|
3:9e8fbc4bce62 copy files
|
|
|
|
2:51a0ae4d5864 remove files
|
|
|
|
1:ce8896473775 edit files
|
|
|
|
0:30d30fe6a5be add files
|
2011-10-19 19:02:59 +04:00
|
|
|
$ cat sub/large4
|
|
|
|
large4-modified-again
|
|
|
|
|
2011-10-25 05:33:23 +04:00
|
|
|
"update --check" refuses to update with uncommitted changes.
|
|
|
|
$ hg update --check 8
|
2013-09-24 07:33:02 +04:00
|
|
|
abort: uncommitted changes
|
2011-10-25 05:33:23 +04:00
|
|
|
[255]
|
|
|
|
|
2013-01-10 18:33:14 +04:00
|
|
|
"update --clean" leaves correct largefiles in working copy, even when there is
|
|
|
|
.orig files from revert in .hglf.
|
2011-10-19 19:02:59 +04:00
|
|
|
|
2013-01-10 18:33:14 +04:00
|
|
|
$ echo mistake > sub2/large7
|
|
|
|
$ hg revert sub2/large7
|
2013-04-18 20:56:18 +04:00
|
|
|
$ cat sub2/large7
|
|
|
|
large7
|
|
|
|
$ cat sub2/large7.orig
|
|
|
|
mistake
|
|
|
|
$ test ! -f .hglf/sub2/large7.orig
|
|
|
|
|
2013-01-10 18:33:14 +04:00
|
|
|
$ hg -q update --clean -r null
|
2012-08-08 20:10:16 +04:00
|
|
|
$ hg update --clean
|
2011-10-19 19:02:59 +04:00
|
|
|
getting changed largefiles
|
2013-01-10 18:33:14 +04:00
|
|
|
3 largefiles updated, 0 removed
|
2013-01-23 03:51:53 +04:00
|
|
|
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2011-10-19 19:02:59 +04:00
|
|
|
$ cat normal3
|
|
|
|
normal3-modified
|
|
|
|
$ cat sub/normal4
|
|
|
|
normal4-modified
|
|
|
|
$ cat sub/large4
|
|
|
|
large4-modified
|
|
|
|
$ cat sub2/large6
|
|
|
|
large6-modified
|
|
|
|
$ cat sub2/large7
|
|
|
|
large7
|
2013-01-10 18:33:14 +04:00
|
|
|
$ cat sub2/large7.orig
|
|
|
|
mistake
|
2013-04-18 20:56:18 +04:00
|
|
|
$ test ! -f .hglf/sub2/large7.orig
|
2013-01-10 18:33:14 +04:00
|
|
|
|
2013-04-18 20:56:18 +04:00
|
|
|
verify that largefile .orig file no longer is overwritten on every update -C:
|
2013-01-10 18:33:14 +04:00
|
|
|
$ hg update --clean
|
|
|
|
getting changed largefiles
|
|
|
|
0 largefiles updated, 0 removed
|
2013-01-23 03:51:53 +04:00
|
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2013-01-10 18:33:14 +04:00
|
|
|
$ cat sub2/large7.orig
|
2013-04-18 20:56:18 +04:00
|
|
|
mistake
|
|
|
|
$ rm sub2/large7.orig
|
2011-10-19 19:02:59 +04:00
|
|
|
|
2011-10-25 05:33:23 +04:00
|
|
|
Now "update check" is happy.
|
|
|
|
$ hg update --check 8
|
|
|
|
getting changed largefiles
|
|
|
|
1 largefiles updated, 0 removed
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2013-01-23 03:51:53 +04:00
|
|
|
$ hg update --check
|
2011-10-25 05:33:23 +04:00
|
|
|
getting changed largefiles
|
|
|
|
1 largefiles updated, 0 removed
|
2013-01-23 03:51:53 +04:00
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2011-10-25 05:33:23 +04:00
|
|
|
|
2012-01-17 14:29:32 +04:00
|
|
|
Test removing empty largefiles directories on update
|
|
|
|
$ test -d sub2 && echo "sub2 exists"
|
|
|
|
sub2 exists
|
|
|
|
$ hg update -q null
|
|
|
|
$ test -d sub2 && echo "error: sub2 should not exist anymore"
|
|
|
|
[1]
|
|
|
|
$ hg update -q
|
|
|
|
|
2012-01-19 13:07:13 +04:00
|
|
|
Test hg remove removes empty largefiles directories
|
|
|
|
$ test -d sub2 && echo "sub2 exists"
|
|
|
|
sub2 exists
|
|
|
|
$ hg remove sub2/*
|
|
|
|
$ test -d sub2 && echo "error: sub2 should not exist anymore"
|
|
|
|
[1]
|
|
|
|
$ hg revert sub2/large6 sub2/large7
|
|
|
|
|
2011-10-25 16:56:59 +04:00
|
|
|
"revert" works on largefiles (and normal files too).
|
|
|
|
$ echo hack3 >> normal3
|
|
|
|
$ echo hack4 >> sub/normal4
|
|
|
|
$ echo hack4 >> sub/large4
|
2012-01-25 19:52:16 +04:00
|
|
|
$ rm sub2/large6
|
|
|
|
$ hg revert sub2/large6
|
2011-10-25 16:56:59 +04:00
|
|
|
$ hg rm sub2/large6
|
|
|
|
$ echo new >> sub2/large8
|
|
|
|
$ hg add --large sub2/large8
|
|
|
|
# XXX we don't really want to report that we're reverting the standin;
|
|
|
|
# that's just an implementation detail. But I don't see an obvious fix. ;-(
|
|
|
|
$ hg revert sub
|
2011-11-07 06:25:10 +04:00
|
|
|
reverting .hglf/sub/large4 (glob)
|
|
|
|
reverting sub/normal4 (glob)
|
2011-10-25 16:56:59 +04:00
|
|
|
$ hg status
|
|
|
|
M normal3
|
|
|
|
A sub2/large8
|
|
|
|
R sub2/large6
|
|
|
|
? sub/large4.orig
|
|
|
|
? sub/normal4.orig
|
|
|
|
$ cat sub/normal4
|
|
|
|
normal4-modified
|
|
|
|
$ cat sub/large4
|
|
|
|
large4-modified
|
|
|
|
$ hg revert -a --no-backup
|
2011-11-07 06:25:10 +04:00
|
|
|
undeleting .hglf/sub2/large6 (glob)
|
|
|
|
forgetting .hglf/sub2/large8 (glob)
|
2011-10-25 16:56:59 +04:00
|
|
|
reverting normal3
|
|
|
|
$ hg status
|
|
|
|
? sub/large4.orig
|
|
|
|
? sub/normal4.orig
|
|
|
|
? sub2/large8
|
|
|
|
$ cat normal3
|
|
|
|
normal3-modified
|
|
|
|
$ cat sub2/large6
|
|
|
|
large6-modified
|
|
|
|
$ rm sub/*.orig sub2/large8
|
|
|
|
|
|
|
|
revert some files to an older revision
|
|
|
|
$ hg revert --no-backup -r 8 sub2
|
2011-11-07 06:25:10 +04:00
|
|
|
reverting .hglf/sub2/large6 (glob)
|
2011-10-25 16:56:59 +04:00
|
|
|
$ cat sub2/large6
|
|
|
|
large6
|
2012-07-21 02:13:19 +04:00
|
|
|
$ hg revert --no-backup -C -r '.^' sub2
|
2011-10-25 16:56:59 +04:00
|
|
|
$ hg revert --no-backup sub2
|
2011-11-07 06:25:10 +04:00
|
|
|
reverting .hglf/sub2/large6 (glob)
|
2011-10-25 16:56:59 +04:00
|
|
|
$ hg status
|
|
|
|
|
2011-10-26 23:22:19 +04:00
|
|
|
"verify --large" actually verifies largefiles
|
2011-10-19 19:02:59 +04:00
|
|
|
|
2013-01-28 18:19:44 +04:00
|
|
|
- Where Do We Come From? What Are We? Where Are We Going?
|
|
|
|
$ pwd
|
|
|
|
$TESTTMP/e
|
|
|
|
$ hg paths
|
2013-01-30 22:40:07 +04:00
|
|
|
default = $TESTTMP/d (glob)
|
2013-01-28 18:19:44 +04:00
|
|
|
|
2011-10-19 19:02:59 +04:00
|
|
|
$ hg verify --large
|
|
|
|
checking changesets
|
|
|
|
checking manifests
|
|
|
|
crosschecking files in changesets and manifests
|
|
|
|
checking files
|
|
|
|
10 files, 10 changesets, 28 total revisions
|
|
|
|
searching 1 changesets for largefiles
|
|
|
|
verified existence of 3 revisions of 3 largefiles
|
2011-10-19 19:40:27 +04:00
|
|
|
|
2013-01-28 18:19:44 +04:00
|
|
|
- introduce missing blob in local store repo and make sure that this is caught:
|
|
|
|
$ mv $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 .
|
|
|
|
$ hg verify --large
|
|
|
|
checking changesets
|
|
|
|
checking manifests
|
|
|
|
crosschecking files in changesets and manifests
|
|
|
|
checking files
|
|
|
|
10 files, 10 changesets, 28 total revisions
|
|
|
|
searching 1 changesets for largefiles
|
2013-02-05 02:48:34 +04:00
|
|
|
changeset 9:598410d3eb9a: sub/large4 references missing $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob)
|
2013-01-28 18:19:44 +04:00
|
|
|
verified existence of 3 revisions of 3 largefiles
|
2013-01-28 18:19:44 +04:00
|
|
|
[1]
|
|
|
|
|
|
|
|
- introduce corruption and make sure that it is caught when checking content:
|
|
|
|
$ echo '5 cents' > $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928
|
|
|
|
$ hg verify -q --large --lfc
|
2013-02-05 02:48:34 +04:00
|
|
|
changeset 9:598410d3eb9a: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob)
|
2013-01-28 18:19:44 +04:00
|
|
|
[1]
|
|
|
|
|
|
|
|
- cleanup
|
|
|
|
$ mv e166e74c7303192238d60af5a9c4ce9bef0b7928 $TESTTMP/d/.hg/largefiles/
|
|
|
|
|
|
|
|
- verifying all revisions will fail because we didn't clone all largefiles to d:
|
|
|
|
$ echo 'T-shirt' > $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
|
2013-01-25 02:57:44 +04:00
|
|
|
$ hg verify -q --lfa --lfc
|
2013-02-05 02:48:34 +04:00
|
|
|
changeset 0:30d30fe6a5be: large1 references missing $TESTTMP/d/.hg/largefiles/4669e532d5b2c093a78eca010077e708a071bb64 (glob)
|
|
|
|
changeset 0:30d30fe6a5be: sub/large2 references missing $TESTTMP/d/.hg/largefiles/1deebade43c8c498a3c8daddac0244dc55d1331d (glob)
|
|
|
|
changeset 1:ce8896473775: large1 references missing $TESTTMP/d/.hg/largefiles/5f78770c0e77ba4287ad6ef3071c9bf9c379742f (glob)
|
|
|
|
changeset 1:ce8896473775: sub/large2 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
|
|
|
|
changeset 3:9e8fbc4bce62: large1 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
|
|
|
|
changeset 4:74c02385b94c: large3 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
|
|
|
|
changeset 4:74c02385b94c: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
|
2013-03-01 03:03:51 +04:00
|
|
|
changeset 5:9d5af5072dbd: large3 references missing $TESTTMP/d/.hg/largefiles/baaf12afde9d8d67f25dab6dced0d2bf77dba47c (glob)
|
|
|
|
changeset 5:9d5af5072dbd: sub/large4 references missing $TESTTMP/d/.hg/largefiles/aeb2210d19f02886dde00dac279729a48471e2f9 (glob)
|
|
|
|
changeset 6:4355d653f84f: large3 references missing $TESTTMP/d/.hg/largefiles/7838695e10da2bb75ac1156565f40a2595fa2fa0 (glob)
|
2013-01-28 18:19:44 +04:00
|
|
|
[1]
|
2013-01-28 18:19:44 +04:00
|
|
|
|
|
|
|
- cleanup
|
|
|
|
$ rm $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
|
2013-02-28 16:45:18 +04:00
|
|
|
$ rm -f .hglf/sub/*.orig
|
|
|
|
|
|
|
|
Update to revision with missing largefile - and make sure it really is missing
|
|
|
|
|
|
|
|
$ rm ${USERCACHE}/7838695e10da2bb75ac1156565f40a2595fa2fa0
|
|
|
|
$ hg up -r 6
|
|
|
|
getting changed largefiles
|
2014-01-28 00:39:25 +04:00
|
|
|
large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:/*/$TESTTMP/d (glob)
|
2013-02-28 16:45:18 +04:00
|
|
|
1 largefiles updated, 2 removed
|
|
|
|
4 files updated, 0 files merged, 2 files removed, 0 files unresolved
|
|
|
|
$ rm normal3
|
|
|
|
$ echo >> sub/normal4
|
|
|
|
$ hg ci -m 'commit with missing files'
|
|
|
|
Invoking status precommit hook
|
|
|
|
M sub/normal4
|
|
|
|
! large3
|
|
|
|
! normal3
|
|
|
|
created new head
|
|
|
|
$ hg st
|
|
|
|
! large3
|
|
|
|
! normal3
|
|
|
|
$ hg up -r.
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ hg st
|
|
|
|
! large3
|
|
|
|
! normal3
|
|
|
|
$ hg up -Cr.
|
|
|
|
getting changed largefiles
|
2014-01-28 00:39:25 +04:00
|
|
|
large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:/*/$TESTTMP/d (glob)
|
2013-02-28 16:45:18 +04:00
|
|
|
0 largefiles updated, 0 removed
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ hg st
|
|
|
|
! large3
|
|
|
|
$ hg rollback
|
|
|
|
repository tip rolled back to revision 9 (undo commit)
|
|
|
|
working directory now based on revision 6
|
2013-01-28 18:19:44 +04:00
|
|
|
|
2013-02-28 16:45:18 +04:00
|
|
|
Merge with revision with missing largefile - and make sure it tries to fetch it.
|
|
|
|
|
|
|
|
$ hg up -Cqr null
|
|
|
|
$ echo f > f
|
|
|
|
$ hg ci -Am branch
|
|
|
|
adding f
|
|
|
|
Invoking status precommit hook
|
|
|
|
A f
|
|
|
|
created new head
|
|
|
|
$ hg merge -r 6
|
|
|
|
getting changed largefiles
|
2014-01-28 00:39:25 +04:00
|
|
|
large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:/*/$TESTTMP/d (glob)
|
2013-02-28 16:45:18 +04:00
|
|
|
1 largefiles updated, 0 removed
|
largefiles: update largefiles even if rebase is aborted by conflict
Before this patch, largefiles in the working directory aren't updated
correctly, if rebase is aborted by conflict. This prevents users from
viewing appropriate largefiles while resolving conflicts.
While rebase, largefiles in the working directory are updated only at
successful committing in the special code path of
"lfilesrepo.commit()".
To update largefiles even if rebase is aborted by conflict, this patch
centralizes the logic of updating largefiles in the working directory
into the "mergeupdate" wrapping "merge.update".
This is a temporary way to fix with less changes. For fundamental
resolution of this kind of problems in the future, largefiles in the
working directory should be updated with other (normal) files
simultaneously while "merge.update" execution: maybe by hooking
"applyupdates".
"Action list based updating" introduced by hooking "applyupdates" will
also improve performance of updating, because it automatically
decreases target files to be checked.
Just after this patch, there are some improper things in "Case 0" code
path of "lfilesrepo.commit()":
- "updatelfiles" invocation is redundant for rebase
- detailed comment doesn't meet to rebase behavior
These will be resolved after the subsequent patch for transplant,
because this code path is shared with transplant.
Even though replacing "merge.update" in rebase extension by "hg.merge"
can also avoid this problem, this patch chooses centralizing the logic
into "mergeupdate", because:
- "merge.update" invocation in rebase extension can't be directly
replaced by "hg.merge", because:
- rebase requires some extra arguments, which "hg.merge" doesn't
take (e.g. "ancestor")
- rebase doesn't require statistics information forcibly displayed
in "hg.merge"
- introducing "mergeupdate" can resolve also problem of some other
code paths directly using "merge.update"
largefiles in the working directory aren't updated regardless of
the result of commands below, before this patch:
- backout (for revisions other than the parent revision of the
working directory without "--merge")
- graft
- histedit (for revisions other than the parent of the working
directory
When "partial" is specified, "merge.update" doesn't update dirstate
entries for standins, even though standins themselves are updated.
In this case, "normallookup" should be used to mark largefiles as
"possibly dirty" forcibly, because applying "normal" on lfdirstate
treats them as "clean" unexpectedly.
This is reason why "normallookup=partial" is specified for
"lfcommands.updatelfiles".
This patch doesn't test "hg rebase --continue", because it doesn't
work correctly if largefiles in the working directory are modified
manually while resolving conflicts. This will be fixed in the next
step of refactoring for largefiles.
All changes of tests/*.t files other than test-largefiles-update.t in
this patch come from invoking "updatelfiles" not after but before
statistics output of "hg.update", "hg.clean" and "hg.merge".
2014-08-24 18:47:26 +04:00
|
|
|
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
2013-02-28 16:45:18 +04:00
|
|
|
|
|
|
|
$ hg rollback -q
|
|
|
|
$ hg up -Cq
|
|
|
|
|
2013-02-28 16:44:24 +04:00
|
|
|
Pulling 0 revisions with --all-largefiles should not fetch for all revisions
|
|
|
|
|
|
|
|
$ hg pull --all-largefiles
|
|
|
|
pulling from $TESTTMP/d (glob)
|
|
|
|
searching for changes
|
|
|
|
no changes found
|
2013-01-28 18:19:44 +04:00
|
|
|
|
2012-01-18 14:33:14 +04:00
|
|
|
Merging does not revert to old versions of largefiles and also check
|
|
|
|
that merging after having pulled from a non-default remote works
|
|
|
|
correctly.
|
2011-10-19 19:40:27 +04:00
|
|
|
|
|
|
|
$ cd ..
|
2012-01-18 14:33:14 +04:00
|
|
|
$ hg clone -r 7 e temp
|
2011-10-19 19:40:27 +04:00
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 8 changesets with 24 changes to 10 files
|
|
|
|
updating to branch default
|
|
|
|
getting changed largefiles
|
|
|
|
3 largefiles updated, 0 removed
|
2013-01-23 03:51:53 +04:00
|
|
|
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2012-01-18 14:33:14 +04:00
|
|
|
$ hg clone temp f
|
|
|
|
updating to branch default
|
|
|
|
getting changed largefiles
|
|
|
|
3 largefiles updated, 0 removed
|
2013-01-23 03:51:53 +04:00
|
|
|
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2012-01-18 14:33:14 +04:00
|
|
|
# Delete the largefiles in the largefiles system cache so that we have an
|
|
|
|
# opportunity to test that caching after a pull works.
|
2012-07-02 03:48:12 +04:00
|
|
|
$ rm "${USERCACHE}"/*
|
2011-10-19 19:40:27 +04:00
|
|
|
$ cd f
|
|
|
|
$ echo "large4-merge-test" > sub/large4
|
|
|
|
$ hg commit -m "Modify large4 to test merge"
|
2012-01-07 22:11:31 +04:00
|
|
|
Invoking status precommit hook
|
|
|
|
M sub/large4
|
2013-02-10 01:07:42 +04:00
|
|
|
# Test --cache-largefiles flag
|
2013-04-15 03:59:11 +04:00
|
|
|
$ hg pull --lfrev 'heads(pulled())' ../e
|
2011-10-19 19:40:27 +04:00
|
|
|
pulling from ../e
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 2 changesets with 4 changes to 4 files (+1 heads)
|
|
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
2012-01-18 14:33:14 +04:00
|
|
|
2 largefiles cached
|
2011-10-19 19:40:27 +04:00
|
|
|
$ hg merge
|
|
|
|
largefile sub/large4 has a merge conflict
|
2013-11-17 00:46:29 +04:00
|
|
|
ancestor was 971fb41e78fea4f8e0ba5244784239371cb00591
|
|
|
|
keep (l)ocal d846f26643bfa8ec210be40cc93cc6b7ff1128ea or
|
|
|
|
take (o)ther e166e74c7303192238d60af5a9c4ce9bef0b7928? l
|
2011-10-19 19:40:27 +04:00
|
|
|
getting changed largefiles
|
|
|
|
1 largefiles updated, 0 removed
|
largefiles: update largefiles even if rebase is aborted by conflict
Before this patch, largefiles in the working directory aren't updated
correctly, if rebase is aborted by conflict. This prevents users from
viewing appropriate largefiles while resolving conflicts.
While rebase, largefiles in the working directory are updated only at
successful committing in the special code path of
"lfilesrepo.commit()".
To update largefiles even if rebase is aborted by conflict, this patch
centralizes the logic of updating largefiles in the working directory
into the "mergeupdate" wrapping "merge.update".
This is a temporary way to fix with less changes. For fundamental
resolution of this kind of problems in the future, largefiles in the
working directory should be updated with other (normal) files
simultaneously while "merge.update" execution: maybe by hooking
"applyupdates".
"Action list based updating" introduced by hooking "applyupdates" will
also improve performance of updating, because it automatically
decreases target files to be checked.
Just after this patch, there are some improper things in "Case 0" code
path of "lfilesrepo.commit()":
- "updatelfiles" invocation is redundant for rebase
- detailed comment doesn't meet to rebase behavior
These will be resolved after the subsequent patch for transplant,
because this code path is shared with transplant.
Even though replacing "merge.update" in rebase extension by "hg.merge"
can also avoid this problem, this patch chooses centralizing the logic
into "mergeupdate", because:
- "merge.update" invocation in rebase extension can't be directly
replaced by "hg.merge", because:
- rebase requires some extra arguments, which "hg.merge" doesn't
take (e.g. "ancestor")
- rebase doesn't require statistics information forcibly displayed
in "hg.merge"
- introducing "mergeupdate" can resolve also problem of some other
code paths directly using "merge.update"
largefiles in the working directory aren't updated regardless of
the result of commands below, before this patch:
- backout (for revisions other than the parent revision of the
working directory without "--merge")
- graft
- histedit (for revisions other than the parent of the working
directory
When "partial" is specified, "merge.update" doesn't update dirstate
entries for standins, even though standins themselves are updated.
In this case, "normallookup" should be used to mark largefiles as
"possibly dirty" forcibly, because applying "normal" on lfdirstate
treats them as "clean" unexpectedly.
This is reason why "normallookup=partial" is specified for
"lfcommands.updatelfiles".
This patch doesn't test "hg rebase --continue", because it doesn't
work correctly if largefiles in the working directory are modified
manually while resolving conflicts. This will be fixed in the next
step of refactoring for largefiles.
All changes of tests/*.t files other than test-largefiles-update.t in
this patch come from invoking "updatelfiles" not after but before
statistics output of "hg.update", "hg.clean" and "hg.merge".
2014-08-24 18:47:26 +04:00
|
|
|
3 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
2011-10-19 19:40:27 +04:00
|
|
|
$ hg commit -m "Merge repos e and f"
|
2012-01-07 22:11:31 +04:00
|
|
|
Invoking status precommit hook
|
|
|
|
M normal3
|
|
|
|
M sub/normal4
|
|
|
|
M sub2/large6
|
2011-10-19 19:40:27 +04:00
|
|
|
$ cat normal3
|
|
|
|
normal3-modified
|
|
|
|
$ cat sub/normal4
|
|
|
|
normal4-modified
|
|
|
|
$ cat sub/large4
|
|
|
|
large4-merge-test
|
|
|
|
$ cat sub2/large6
|
|
|
|
large6-modified
|
|
|
|
$ cat sub2/large7
|
|
|
|
large7
|
2011-10-28 20:17:44 +04:00
|
|
|
|
2011-12-09 20:34:58 +04:00
|
|
|
Test status after merging with a branch that introduces a new largefile:
|
|
|
|
|
|
|
|
$ echo large > large
|
|
|
|
$ hg add --large large
|
|
|
|
$ hg commit -m 'add largefile'
|
2012-01-07 22:11:31 +04:00
|
|
|
Invoking status precommit hook
|
|
|
|
A large
|
2011-12-09 20:34:58 +04:00
|
|
|
$ hg update -q ".^"
|
|
|
|
$ echo change >> normal3
|
|
|
|
$ hg commit -m 'some change'
|
2012-01-07 22:11:31 +04:00
|
|
|
Invoking status precommit hook
|
|
|
|
M normal3
|
2011-12-09 20:34:58 +04:00
|
|
|
created new head
|
|
|
|
$ hg merge
|
|
|
|
getting changed largefiles
|
|
|
|
1 largefiles updated, 0 removed
|
largefiles: update largefiles even if rebase is aborted by conflict
Before this patch, largefiles in the working directory aren't updated
correctly, if rebase is aborted by conflict. This prevents users from
viewing appropriate largefiles while resolving conflicts.
While rebase, largefiles in the working directory are updated only at
successful committing in the special code path of
"lfilesrepo.commit()".
To update largefiles even if rebase is aborted by conflict, this patch
centralizes the logic of updating largefiles in the working directory
into the "mergeupdate" wrapping "merge.update".
This is a temporary way to fix with less changes. For fundamental
resolution of this kind of problems in the future, largefiles in the
working directory should be updated with other (normal) files
simultaneously while "merge.update" execution: maybe by hooking
"applyupdates".
"Action list based updating" introduced by hooking "applyupdates" will
also improve performance of updating, because it automatically
decreases target files to be checked.
Just after this patch, there are some improper things in "Case 0" code
path of "lfilesrepo.commit()":
- "updatelfiles" invocation is redundant for rebase
- detailed comment doesn't meet to rebase behavior
These will be resolved after the subsequent patch for transplant,
because this code path is shared with transplant.
Even though replacing "merge.update" in rebase extension by "hg.merge"
can also avoid this problem, this patch chooses centralizing the logic
into "mergeupdate", because:
- "merge.update" invocation in rebase extension can't be directly
replaced by "hg.merge", because:
- rebase requires some extra arguments, which "hg.merge" doesn't
take (e.g. "ancestor")
- rebase doesn't require statistics information forcibly displayed
in "hg.merge"
- introducing "mergeupdate" can resolve also problem of some other
code paths directly using "merge.update"
largefiles in the working directory aren't updated regardless of
the result of commands below, before this patch:
- backout (for revisions other than the parent revision of the
working directory without "--merge")
- graft
- histedit (for revisions other than the parent of the working
directory
When "partial" is specified, "merge.update" doesn't update dirstate
entries for standins, even though standins themselves are updated.
In this case, "normallookup" should be used to mark largefiles as
"possibly dirty" forcibly, because applying "normal" on lfdirstate
treats them as "clean" unexpectedly.
This is reason why "normallookup=partial" is specified for
"lfcommands.updatelfiles".
This patch doesn't test "hg rebase --continue", because it doesn't
work correctly if largefiles in the working directory are modified
manually while resolving conflicts. This will be fixed in the next
step of refactoring for largefiles.
All changes of tests/*.t files other than test-largefiles-update.t in
this patch come from invoking "updatelfiles" not after but before
statistics output of "hg.update", "hg.clean" and "hg.merge".
2014-08-24 18:47:26 +04:00
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
2011-12-09 20:34:58 +04:00
|
|
|
$ hg status
|
|
|
|
M large
|
|
|
|
|
2013-01-11 19:30:29 +04:00
|
|
|
- make sure update of merge with removed largefiles fails as expected
|
|
|
|
$ hg rm sub2/large6
|
|
|
|
$ hg up -r.
|
|
|
|
abort: outstanding uncommitted merges
|
|
|
|
[255]
|
|
|
|
|
2013-01-11 19:30:29 +04:00
|
|
|
- revert should be able to revert files introduced in a pending merge
|
|
|
|
$ hg revert --all -r .
|
2013-01-30 22:40:07 +04:00
|
|
|
removing .hglf/large (glob)
|
|
|
|
undeleting .hglf/sub2/large6 (glob)
|
2013-01-11 19:30:29 +04:00
|
|
|
|
2011-10-28 20:17:44 +04:00
|
|
|
Test that a normal file and a largefile with the same name and path cannot
|
|
|
|
coexist.
|
|
|
|
|
|
|
|
$ rm sub2/large7
|
|
|
|
$ echo "largeasnormal" > sub2/large7
|
|
|
|
$ hg add sub2/large7
|
|
|
|
sub2/large7 already a largefile
|
2011-10-28 20:48:24 +04:00
|
|
|
|
|
|
|
Test that transplanting a largefile change works correctly.
|
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
$ hg clone -r 8 d g
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 9 changesets with 26 changes to 10 files
|
|
|
|
updating to branch default
|
|
|
|
getting changed largefiles
|
|
|
|
3 largefiles updated, 0 removed
|
2013-01-23 03:51:53 +04:00
|
|
|
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2011-10-28 20:48:24 +04:00
|
|
|
$ cd g
|
2012-08-08 20:10:16 +04:00
|
|
|
$ hg transplant -s ../d 598410d3eb9a
|
2011-10-28 20:48:24 +04:00
|
|
|
searching for changes
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 2 changes to 2 files
|
2012-03-09 18:26:13 +04:00
|
|
|
getting changed largefiles
|
largefiles: update largefiles even if rebase is aborted by conflict
Before this patch, largefiles in the working directory aren't updated
correctly, if rebase is aborted by conflict. This prevents users from
viewing appropriate largefiles while resolving conflicts.
While rebase, largefiles in the working directory are updated only at
successful committing in the special code path of
"lfilesrepo.commit()".
To update largefiles even if rebase is aborted by conflict, this patch
centralizes the logic of updating largefiles in the working directory
into the "mergeupdate" wrapping "merge.update".
This is a temporary way to fix with less changes. For fundamental
resolution of this kind of problems in the future, largefiles in the
working directory should be updated with other (normal) files
simultaneously while "merge.update" execution: maybe by hooking
"applyupdates".
"Action list based updating" introduced by hooking "applyupdates" will
also improve performance of updating, because it automatically
decreases target files to be checked.
Just after this patch, there are some improper things in "Case 0" code
path of "lfilesrepo.commit()":
- "updatelfiles" invocation is redundant for rebase
- detailed comment doesn't meet to rebase behavior
These will be resolved after the subsequent patch for transplant,
because this code path is shared with transplant.
Even though replacing "merge.update" in rebase extension by "hg.merge"
can also avoid this problem, this patch chooses centralizing the logic
into "mergeupdate", because:
- "merge.update" invocation in rebase extension can't be directly
replaced by "hg.merge", because:
- rebase requires some extra arguments, which "hg.merge" doesn't
take (e.g. "ancestor")
- rebase doesn't require statistics information forcibly displayed
in "hg.merge"
- introducing "mergeupdate" can resolve also problem of some other
code paths directly using "merge.update"
largefiles in the working directory aren't updated regardless of
the result of commands below, before this patch:
- backout (for revisions other than the parent revision of the
working directory without "--merge")
- graft
- histedit (for revisions other than the parent of the working
directory
When "partial" is specified, "merge.update" doesn't update dirstate
entries for standins, even though standins themselves are updated.
In this case, "normallookup" should be used to mark largefiles as
"possibly dirty" forcibly, because applying "normal" on lfdirstate
treats them as "clean" unexpectedly.
This is reason why "normallookup=partial" is specified for
"lfcommands.updatelfiles".
This patch doesn't test "hg rebase --continue", because it doesn't
work correctly if largefiles in the working directory are modified
manually while resolving conflicts. This will be fixed in the next
step of refactoring for largefiles.
All changes of tests/*.t files other than test-largefiles-update.t in
this patch come from invoking "updatelfiles" not after but before
statistics output of "hg.update", "hg.clean" and "hg.merge".
2014-08-24 18:47:26 +04:00
|
|
|
0 largefiles updated, 0 removed
|
2011-10-28 20:50:54 +04:00
|
|
|
$ hg log --template '{rev}:{node|short} {desc|firstline}\n'
|
|
|
|
9:598410d3eb9a modify normal file largefile in repo d
|
|
|
|
8:a381d2c8c80e modify normal file and largefile in repo b
|
|
|
|
7:daea875e9014 add/edit more largefiles
|
|
|
|
6:4355d653f84f edit files yet again
|
|
|
|
5:9d5af5072dbd edit files again
|
|
|
|
4:74c02385b94c move files
|
|
|
|
3:9e8fbc4bce62 copy files
|
|
|
|
2:51a0ae4d5864 remove files
|
|
|
|
1:ce8896473775 edit files
|
|
|
|
0:30d30fe6a5be add files
|
2011-10-28 20:48:24 +04:00
|
|
|
$ cat normal3
|
|
|
|
normal3-modified
|
|
|
|
$ cat sub/normal4
|
|
|
|
normal4-modified
|
|
|
|
$ cat sub/large4
|
|
|
|
large4-modified
|
|
|
|
$ cat sub2/large6
|
|
|
|
large6-modified
|
|
|
|
$ cat sub2/large7
|
|
|
|
large7
|
2011-11-30 18:11:00 +04:00
|
|
|
|
2012-04-16 19:03:39 +04:00
|
|
|
Cat a largefile
|
|
|
|
$ hg cat normal3
|
|
|
|
normal3-modified
|
|
|
|
$ hg cat sub/large4
|
|
|
|
large4-modified
|
2012-07-02 03:48:12 +04:00
|
|
|
$ rm "${USERCACHE}"/*
|
2012-04-16 19:03:39 +04:00
|
|
|
$ hg cat -r a381d2c8c80e -o cat.out sub/large4
|
|
|
|
$ cat cat.out
|
|
|
|
large4-modified
|
|
|
|
$ rm cat.out
|
|
|
|
$ hg cat -r a381d2c8c80e normal3
|
|
|
|
normal3-modified
|
2012-07-21 03:14:41 +04:00
|
|
|
$ hg cat -r '.^' normal3
|
|
|
|
normal3-modified
|
2013-01-25 21:20:13 +04:00
|
|
|
$ hg cat -r '.^' sub/large4 doesntexist
|
2012-07-21 03:14:41 +04:00
|
|
|
large4-modified
|
2013-01-25 21:20:13 +04:00
|
|
|
doesntexist: no such file in rev a381d2c8c80e
|
2013-04-15 03:43:31 +04:00
|
|
|
$ hg --cwd sub cat -r '.^' large4
|
|
|
|
large4-modified
|
|
|
|
$ hg --cwd sub cat -r '.^' ../normal3
|
|
|
|
normal3-modified
|
2013-04-28 01:19:52 +04:00
|
|
|
Cat a standin
|
|
|
|
$ hg cat .hglf/sub/large4
|
|
|
|
e166e74c7303192238d60af5a9c4ce9bef0b7928
|
|
|
|
$ hg cat .hglf/normal3
|
|
|
|
.hglf/normal3: no such file in rev 598410d3eb9a
|
|
|
|
[1]
|
2012-04-16 19:03:39 +04:00
|
|
|
|
2011-11-30 18:11:00 +04:00
|
|
|
Test that renaming a largefile results in correct output for status
|
|
|
|
|
|
|
|
$ hg rename sub/large4 large4-renamed
|
2012-01-07 22:11:31 +04:00
|
|
|
$ hg commit -m "test rename output"
|
|
|
|
Invoking status precommit hook
|
2011-11-30 18:11:00 +04:00
|
|
|
A large4-renamed
|
|
|
|
R sub/large4
|
|
|
|
$ cat large4-renamed
|
|
|
|
large4-modified
|
|
|
|
$ cd sub2
|
|
|
|
$ hg rename large6 large6-renamed
|
|
|
|
$ hg st
|
|
|
|
A sub2/large6-renamed
|
|
|
|
R sub2/large6
|
2011-12-02 21:20:32 +04:00
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
Test --normal flag
|
|
|
|
|
2012-04-23 03:56:48 +04:00
|
|
|
$ dd if=/dev/zero bs=2k count=11k > new-largefile 2> /dev/null
|
2011-12-02 21:20:32 +04:00
|
|
|
$ hg add --normal --large new-largefile
|
|
|
|
abort: --normal cannot be used with --large
|
|
|
|
[255]
|
|
|
|
$ hg add --normal new-largefile
|
|
|
|
new-largefile: up to 69 MB of RAM may be required to manage this file
|
|
|
|
(use 'hg revert new-largefile' to cancel the pending addition)
|
|
|
|
$ cd ..
|
2011-10-19 01:40:59 +04:00
|
|
|
|
2011-10-26 22:48:33 +04:00
|
|
|
|
2012-06-10 20:50:42 +04:00
|
|
|
|