Mercurial > hg

changeset 15943:f9efb325ea32 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
largefiles: fix caching largefiles from an aliased repo (issue3212)
author Na'Tosha Bard <natosha@unity3d.com>
date Fri, 20 Jan 2012 11:56:12 +0100
parents d7a34c07e69b
children f19d5c852f9b
files hgext/largefiles/basestore.py
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/largefiles/basestore.py	Sat Jan 14 01:56:27 2012 +0100
+++ b/hgext/largefiles/basestore.py	Fri Jan 20 11:56:12 2012 +0100
@@ -166,8 +166,11 @@
     ui = repo.ui
 
     if not remote:
-        path = (getattr(repo, 'lfpullsource', None) or
-                ui.expandpath('default-push', 'default'))
+        lfpullsource = getattr(repo, 'lfpullsource', None)
+        if lfpullsource:
+            path = ui.expandpath(lfpullsource)
+        else:
+            path = ui.expandpath('default-push', 'default')
 
         # ui.expandpath() leaves 'default-push' and 'default' alone if
         # they cannot be expanded: fallback to the empty string,