[PATCH 1 of 2 STABLE] largefiles: update largefiles in a subrepo when updating the parent
Matt Harbison
matt_harbison at yahoo.com
Thu Jan 3 20:42:26 CST 2013
# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1357181569 18000
# Branch stable
# Node ID 5da07921976bf249809cc0934c80c52025cf5e09
# Parent cd64a8a2d0da5178de30105ff69ccff32a73a536
largefiles: update largefiles in a subrepo when updating the parent
Starting with 17c030014ddf, largefiles in a subrepo weren't checked out when
updating the parent repo. That cset changed hg.clean() and hg.update() to call
the newly introduced hg.updaterepo(), and also changed hgsubrepo.get() to call
updaterepo() directly. Since only clean and update were overridden, largefiles
in subrepos were no longer being updated.
The original issue was noticed by Francois Tréton <ftreton at dxo.com> [1].
Unfortunately, this changes the relative order of printing the largefile changes
and the normal updated/merged/removed/unresolved line, though the actual
operations remain in the same order. The alternative is to conditionally call
hg.clean() or hg.update() in hgsubrepo.get(). However, making the override as
narrow as possible seems better, and avoids the potential trap of something in
the future calling an updaterepo() that isn't overridden.
[1] http://www.selenic.com/pipermail/mercurial/2013-January/044829.html
diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -638,18 +638,20 @@
finally:
wlock.release()
-def hgupdate(orig, repo, node):
- # Only call updatelfiles the standins that have changed to save time
- oldstandins = lfutil.getstandinsstate(repo)
- result = orig(repo, node)
- newstandins = lfutil.getstandinsstate(repo)
- filelist = lfutil.getlfilestoupdate(oldstandins, newstandins)
+def hgupdaterepo(orig, repo, node, overwrite):
+ if not overwrite:
+ # Only call updatelfiles on the standins that have changed to save time
+ oldstandins = lfutil.getstandinsstate(repo)
+
+ result = orig(repo, node, overwrite)
+ filelist = None
+
+ if not overwrite:
+ newstandins = lfutil.getstandinsstate(repo)
+ filelist = lfutil.getlfilestoupdate(oldstandins, newstandins)
+
lfcommands.updatelfiles(repo.ui, repo, filelist=filelist, printmessage=True)
- return result
-def hgclean(orig, repo, node, show_stats=True):
- result = orig(repo, node, show_stats)
- lfcommands.updatelfiles(repo.ui, repo)
return result
def hgmerge(orig, repo, node, force=None, remind=True):
diff --git a/hgext/largefiles/uisetup.py b/hgext/largefiles/uisetup.py
--- a/hgext/largefiles/uisetup.py
+++ b/hgext/largefiles/uisetup.py
@@ -104,11 +104,7 @@
entry = extensions.wrapfunction(commands, 'revert',
overrides.overriderevert)
- # clone uses hg._update instead of hg.update even though they are the
- # same function... so wrap both of them)
- extensions.wrapfunction(hg, 'update', overrides.hgupdate)
- extensions.wrapfunction(hg, '_update', overrides.hgupdate)
- extensions.wrapfunction(hg, 'clean', overrides.hgclean)
+ extensions.wrapfunction(hg, 'updaterepo', overrides.hgupdaterepo)
extensions.wrapfunction(hg, 'merge', overrides.hgmerge)
extensions.wrapfunction(archival, 'archive', overrides.overridearchive)
diff --git a/tests/test-issue3084.t b/tests/test-issue3084.t
--- a/tests/test-issue3084.t
+++ b/tests/test-issue3084.t
@@ -16,9 +16,9 @@
$ hg commit -m "Add foo as a largefile"
$ hg update -r 0
- 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
getting changed largefiles
0 largefiles updated, 1 removed
+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo "normal" > foo
$ hg add foo
diff --git a/tests/test-largefiles-cache.t b/tests/test-largefiles-cache.t
--- a/tests/test-largefiles-cache.t
+++ b/tests/test-largefiles-cache.t
@@ -45,29 +45,29 @@
"missing"(!) file.
$ hg update
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
large: can't get file locally
(no default or default-push path set in hgrc)
0 largefiles updated, 0 removed
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg status
! large
Update working directory to null: this cleanup .hg/largefiles/dirstate
$ hg update null
- 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
getting changed largefiles
0 largefiles updated, 0 removed
+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Update working directory to tip, again.
$ hg update
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
large: can't get file locally
(no default or default-push path set in hgrc)
0 largefiles updated, 0 removed
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg status
! large
$ cd ..
diff --git a/tests/test-largefiles-small-disk.t b/tests/test-largefiles-small-disk.t
--- a/tests/test-largefiles-small-disk.t
+++ b/tests/test-largefiles-small-disk.t
@@ -57,7 +57,6 @@
adding file changes
added 1 changesets with 1 changes to 1 files
updating to branch default
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
abort: No space left on device
[255]
diff --git a/tests/test-largefiles.t b/tests/test-largefiles.t
--- a/tests/test-largefiles.t
+++ b/tests/test-largefiles.t
@@ -485,9 +485,9 @@
Test addremove with -R
$ hg up -C
- 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
1 largefiles updated, 0 removed
+ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm normal3
$ rm sub/large4
$ echo "testing addremove with patterns" > testaddremove.dat
@@ -503,9 +503,9 @@
Test 3364
$ hg clone . ../addrm
updating to branch default
- 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
3 largefiles updated, 0 removed
+ 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ../addrm
$ cat >> .hg/hgrc <<EOF
> [hooks]
@@ -583,9 +583,9 @@
C sub2/large6
C sub2/large7
$ hg up -C '.^'
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
0 largefiles updated, 0 removed
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg remove large
$ hg addremove --traceback
$ hg ci -m "removed large"
@@ -694,9 +694,9 @@
$ hg clone . ../b
updating to branch default
- 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
3 largefiles updated, 0 removed
+ 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ../b
$ hg log --template '{rev}:{node|short} {desc|firstline}\n'
7:daea875e9014 add/edit more largefiles
@@ -724,9 +724,9 @@
adding file changes
added 4 changesets with 10 changes to 4 files
updating to branch default
- 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
2 largefiles updated, 0 removed
+ 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd c
$ hg log --template '{rev}:{node|short} {desc|firstline}\n'
3:9e8fbc4bce62 copy files
@@ -746,9 +746,9 @@
tests update).
$ hg update -r 1
- 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
1 largefiles updated, 0 removed
+ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat large1
large11
$ cat sub/large2
@@ -760,17 +760,17 @@
$ rm "${USERCACHE}"/*
$ hg clone --all-largefiles a a-backup
updating to branch default
- 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
3 largefiles updated, 0 removed
+ 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
8 additional largefiles cached
$ rm "${USERCACHE}"/*
$ hg clone --all-largefiles -u 0 a a-clone0
updating to branch default
- 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
2 largefiles updated, 0 removed
+ 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
9 additional largefiles cached
$ hg -R a-clone0 sum
parent: 0:30d30fe6a5be
@@ -782,9 +782,9 @@
$ rm "${USERCACHE}"/*
$ hg clone --all-largefiles -u 1 a a-clone1
updating to branch default
- 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
2 largefiles updated, 0 removed
+ 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
8 additional largefiles cached
$ hg -R a-clone1 sum
parent: 1:ce8896473775
@@ -807,9 +807,9 @@
$ hg clone ../a
destination directory: a
updating to branch default
- 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
3 largefiles updated, 0 removed
+ 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ..
Ensure base clone command argument validation
@@ -833,9 +833,9 @@
adding file changes
added 2 changesets with 8 changes to 4 files
updating to branch default
- 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
2 largefiles updated, 0 removed
+ 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm "${USERCACHE}"/*
$ cd a-backup
$ hg pull --all-largefiles --config paths.default-push=bogus/path
@@ -856,9 +856,9 @@
$ hg clone a d
updating to branch default
- 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
3 largefiles updated, 0 removed
+ 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd b
$ echo large4-modified > sub/large4
$ echo normal3-modified > normal3
@@ -876,9 +876,9 @@
$ cd ..
$ hg clone d e
updating to branch default
- 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
3 largefiles updated, 0 removed
+ 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd d
More rebase testing, but also test that the largefiles are downloaded from
@@ -1008,9 +1008,9 @@
"update --clean" leaves correct largefiles in working copy.
$ hg update --clean
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
1 largefiles updated, 0 removed
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat normal3
normal3-modified
$ cat sub/normal4
@@ -1024,13 +1024,13 @@
Now "update check" is happy.
$ hg update --check 8
- 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
1 largefiles updated, 0 removed
+ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg update --check
- 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
1 largefiles updated, 0 removed
+ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Test removing empty largefiles directories on update
$ test -d sub2 && echo "sub2 exists"
@@ -1119,14 +1119,14 @@
adding file changes
added 8 changesets with 24 changes to 10 files
updating to branch default
- 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
3 largefiles updated, 0 removed
+ 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg clone temp f
updating to branch default
- 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
3 largefiles updated, 0 removed
+ 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
# Delete the largefiles in the largefiles system cache so that we have an
# opportunity to test that caching after a pull works.
$ rm "${USERCACHE}"/*
@@ -1207,9 +1207,9 @@
adding file changes
added 9 changesets with 26 changes to 10 files
updating to branch default
- 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
3 largefiles updated, 0 removed
+ 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd g
$ hg transplant -s ../d 598410d3eb9a
searching for changes
@@ -1493,9 +1493,9 @@
adding file changes
added 1 changesets with 1 changes to 1 files
updating to branch default
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
1 largefiles updated, 0 removed
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ..
$ chmod -R u+w alice/pubrepo
$ HOME="$ORIGHOME"
@@ -1665,6 +1665,18 @@
lf_subrepo_archive/subrepo/large.txt
lf_subrepo_archive/subrepo/normal.txt
+Test that largefiles in subrepos are checked out
+
+ $ hg clone . ../update_on_clone
+ updating to branch default
+ cloning subrepo subrepo from $TESTTMP/statusmatch/subrepo
+ getting changed largefiles
+ 1 largefiles updated, 0 removed
+ getting changed largefiles
+ 1 largefiles updated, 0 removed
+ 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg -R ../update_on_clone status -S
+
Test archiving a revision that references a subrepo that is not yet
cloned (see test-subrepo-recursion.t):
diff --git a/tests/test-lfconvert.t b/tests/test-lfconvert.t
--- a/tests/test-lfconvert.t
+++ b/tests/test-lfconvert.t
@@ -78,9 +78,9 @@
"lfconvert" converts content correctly
$ cd largefiles-repo
$ hg up
- 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
2 largefiles updated, 0 removed
+ 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg locate
.hglf/large
.hglf/sub/maybelarge.dat
@@ -187,9 +187,9 @@
normal1
stuff/normal2
$ hg update
- 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
1 largefiles updated, 0 removed
+ 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat stuff/normal2
alsonormal
blah
More information about the Mercurial-devel
mailing list