[PATCH] largefiles: fix symlink handling, with testcase

Carter, Eli Eli.Carter at tektronix.com
Wed Oct 26 13:50:30 CDT 2011


Updated patch with correction and more verbose commit message.

> From: Matt Mackall [mailto:mpm at selenic.com]
... 
> For the list: this should use os.lstat().st_size instead, os.path.getsize is a
> symlink-naive API.

# HG changeset patch
# User Eli Carter <eli.carter at tektronix.com>
# Date 1319654913 18000
# Branch largefiles-bigsymlink-bug
# Node ID f4d11985890d885e7c43f2fe2b3dae511385264e
# Parent  c1930992e1112f2bc0a6a38a84d43a34de72e180
largefiles: bugfix for symlink handling with testcase

The code was using the size of a symlink's target, thus wrongly making symlinks
to large files into largefiles themselves.  This can be demonstrated by
deleting the symlink and then doing an 'hg up' or 'hg up -C' to restore the
symlink.

diff -r c1930992e111 -r f4d11985890d hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py	Mon Oct 24 17:01:49 2011 -0500
+++ b/hgext/largefiles/overrides.py	Wed Oct 26 13:48:33 2011 -0500
@@ -87,7 +87,7 @@
 
         if exact or not exists:
             abovemin = (lfsize and
-                        os.path.getsize(repo.wjoin(f)) >= lfsize * 1024 * 1024)
+                        os.lstat(repo.wjoin(f)).st_size >= lfsize * 1024 * 1024)
             if large or abovemin or (lfmatcher and lfmatcher(f)):
                 lfnames.append(f)
                 if ui.verbose or not exact:
diff -r c1930992e111 -r f4d11985890d tests/test-largefiles.t
--- a/tests/test-largefiles.t	Mon Oct 24 17:01:49 2011 -0500
+++ b/tests/test-largefiles.t	Wed Oct 26 13:48:33 2011 -0500
@@ -792,3 +792,26 @@
   1 largefiles updated, 0 removed
   $ cd ..
   $ HOME="$ORIGHOME"
+
+Symlink to a large largefile should behave the same as a symlink to a normal file
+  $ hg init largesymlink
+  $ cd largesymlink
+  $ dd if=/dev/zero bs=1k count=10k of=largefile 2>/dev/null
+  $ hg add --large largefile
+  $ hg commit -m "commit a large file"
+  $ ln -s largefile largelink
+  $ hg add largelink
+  $ hg commit -m "commit a large symlink"
+  $ rm -f largelink
+  $ hg up >/dev/null
+  $ test -e largelink
+  [1]
+  $ test -L largelink
+  [1]
+  $ rm -f largelink # make next part of the test independent of the previous
+  $ hg up -C >/dev/null
+  $ test -e largelink
+  $ test -L largelink
+  $ cd ..
+
+


More information about the Mercurial-devel mailing list