changeset 23941:164bd5218ddb stable

largefiles: use 'default' path for pulling largefiles, not 'default-push' The put parameter has been unused since day 0.
author Mads Kiilerich <madski@unity3d.com>
date Fri, 23 Jan 2015 18:41:37 +0100
parents d0ef40776999
children fefa5f2a1730
files hgext/largefiles/basestore.py
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/largefiles/basestore.py	Fri Jan 23 06:28:28 2015 +0100
+++ b/hgext/largefiles/basestore.py	Fri Jan 23 18:41:37 2015 +0100
@@ -181,8 +181,10 @@
         lfpullsource = getattr(repo, 'lfpullsource', None)
         if lfpullsource:
             path = ui.expandpath(lfpullsource)
+        elif put:
+            path = ui.expandpath('default-push', 'default')
         else:
-            path = ui.expandpath('default-push', 'default')
+            path = ui.expandpath('default')
 
         # ui.expandpath() leaves 'default-push' and 'default' alone if
         # they cannot be expanded: fallback to the empty string,