Patchwork [stable] largefiles: use 'default' path for pulling largefiles, not 'default-push'

login
register
mail settings
Submitter Mads Kiilerich
Date Jan. 23, 2015, 5:43 p.m.
Message ID <15c7904f9f3603f7683d.1422035000@ssl.google-analytics.com>
Download mbox | patch
Permalink /patch/7538/
State Accepted
Commit 164bd5218ddb6381366d5ce849c9cea4ee431e6f
Headers show

Comments

Mads Kiilerich - Jan. 23, 2015, 5:43 p.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1422034897 -3600
#      Fri Jan 23 18:41:37 2015 +0100
# Branch stable
# Node ID 15c7904f9f3603f7683d9a972f8a7a04bcf83a3b
# Parent  de519517f597abd733961a8c549074eecb6c0ab3
largefiles: use 'default' path for pulling largefiles, not 'default-push'

The put parameter has been unused since day 0.
Matt Mackall - Jan. 23, 2015, 10:13 p.m.
On Fri, 2015-01-23 at 18:43 +0100, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski@unity3d.com>
> # Date 1422034897 -3600
> #      Fri Jan 23 18:41:37 2015 +0100
> # Branch stable
> # Node ID 15c7904f9f3603f7683d9a972f8a7a04bcf83a3b
> # Parent  de519517f597abd733961a8c549074eecb6c0ab3
> largefiles: use 'default' path for pulling largefiles, not 'default-push'

Queued for stable, thanks.

Patch

diff --git a/hgext/largefiles/basestore.py b/hgext/largefiles/basestore.py
--- a/hgext/largefiles/basestore.py
+++ b/hgext/largefiles/basestore.py
@@ -181,8 +181,10 @@  def _openstore(repo, remote=None, put=Fa
         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,