changeset 15913:c35dcde25174

largefiles: refactor lfutil.findfiles to be more logical
author Na'Tosha Bard <natosha@unity3d.com>
date Wed, 18 Jan 2012 13:41:03 +0100
parents 2bd54ffaa27e
children 264087940d5b
files hgext/largefiles/lfutil.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/largefiles/lfutil.py	Tue Jan 17 19:10:59 2012 -0500
+++ b/hgext/largefiles/lfutil.py	Wed Jan 18 13:41:03 2012 +0100
@@ -117,14 +117,14 @@
 def findfile(repo, hash):
     if instore(repo, hash):
         repo.ui.note(_('Found %s in store\n') % hash)
+        return storepath(repo, hash)
     elif inusercache(repo.ui, hash):
         repo.ui.note(_('Found %s in system cache\n') % hash)
         path = storepath(repo, hash)
         util.makedirs(os.path.dirname(path))
         link(usercachepath(repo.ui, hash), path)
-    else:
-        return None
-    return storepath(repo, hash)
+        return path
+    return None
 
 class largefiles_dirstate(dirstate.dirstate):
     def __getitem__(self, key):