[PATCH STABLE] largefiles: in putlfile, ensure tempfile's directory exists prior to creation

Hao Lian hao at fogcreek.com
Fri May 4 13:43:20 CDT 2012


# HG changeset patch
# User hlian
# Date 1336156600 14400
# Branch stable
# Node ID 06540b79f7736b9627702397e2c2f59d9645b655
# Parent  91323a78aac252b630144f66e1039321cd41c9ef
largefiles: in putlfile, ensure tempfile's directory exists prior to creation

Let R be a repo served by an hg daemon on a machine with an empty largefiles
cache. Pushing a largefiles repo to R will result in a no-such-file-or-directory
OSError because putlfile will attempt to create a temporary file in
R/.hg/largefiles, which does not yet exist.

This patch also adds a regression test for this scenario.

diff --git a/hgext/largefiles/proto.py b/hgext/largefiles/proto.py
--- a/hgext/largefiles/proto.py
+++ b/hgext/largefiles/proto.py
@@ -20,8 +20,10 @@
     user cache.'''
     proto.redirect()
 
-    tmpfp = util.atomictempfile(lfutil.storepath(repo, sha),
-                                createmode=repo.store.createmode)
+    path = lfutil.storepath(repo, sha)
+    util.makedirs(os.path.dirname(path))
+    tmpfp = util.atomictempfile(path, createmode=repo.store.createmode)
+
     try:
         try:
             proto.getfile(tmpfp)
diff --git a/tests/test-largefiles.t b/tests/test-largefiles.t
--- a/tests/test-largefiles.t
+++ b/tests/test-largefiles.t
@@ -937,6 +937,31 @@
   [255]
   $ rm -rf empty
 
+Push a largefiles repository to a served empty repository
+  $ hg init r8
+  $ echo c3 > r8/f1
+  $ hg add --large r8/f1 -R r8
+  $ hg commit -m "m1" -R r8
+  Invoking status precommit hook
+  A f1
+  $ hg init empty
+  $ hg serve -R empty -d -p $HGPORT2 --pid-file hg.pid \
+  >   --config 'web.allow_push=*' --config web.push_ssl=False
+  $ cat hg.pid >> $DAEMON_PIDS
+  $ rm ${USERCACHE}/*
+  $ hg push -R r8 http://localhost:$HGPORT2
+  pushing to http://localhost:$HGPORT2/
+  searching for changes
+  searching for changes
+  remote: adding changesets
+  remote: adding manifests
+  remote: adding file changes
+  remote: added 1 changesets with 1 changes to 1 files
+  $ rm -rf empty
+
+used all HGPORTs, kill all daemons
+  $ "$TESTDIR/killdaemons.py"
+
 Clone a local repository owned by another user
 We have to simulate that here by setting $HOME and removing write permissions
   $ ORIGHOME="$HOME"


More information about the Mercurial-devel mailing list