Mercurial > hgsubversion

changeset 1302:0326686199f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wrappers: use meta.layout instead of accessing config directly
author Sean Farley <sean.michael.farley@gmail.com>
date Mon, 24 Mar 2014 11:20:54 -0500
parents 9e46dfddd3a9
children cdb1f1923a1a
files hgsubversion/wrappers.py
diffstat 1 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/hgsubversion/wrappers.py
+++ b/hgsubversion/wrappers.py
@@ -399,13 +399,12 @@ def pull(repo, source, heads=[], force=F
 
         stopat_rev = util.parse_revnum(svn, checkout)
 
-        layout = layouts.detect.layout_from_config(meta, allow_auto=True)
-        if layout == 'auto':
-            layout = meta.layout_from_subversion(svn, (stopat_rev or None))
-            repo.ui.note('using %s layout\n' % layout)
+        if meta.layout == 'auto':
+            meta.layout = meta.layout_from_subversion(svn, (stopat_rev or None))
+            repo.ui.note('using %s layout\n' % meta.layout)
 
         if meta.branch:
-            if layout != 'single':
+            if meta.layout != 'single':
                 msg = ('branch cannot be specified for Subversion clones using '
                        'standard directory layout')
                 raise hgutil.Abort(msg)
@@ -422,7 +421,7 @@ def pull(repo, source, heads=[], force=F
                                                           'startrev', 0))
 
             if start > 0:
-                if layout == 'standard':
+                if meta.layout == 'standard':
                     raise hgutil.Abort('non-zero start revisions are only '
                                        'supported for single-directory clones.')
                 ui.note('starting at revision %d; any prior will be ignored\n'