Merge 880a4e7 into 5b5e1c2

manic/sourcetree.py

@@ -331,12 +331,13 @@ def checkout(self, verbosity, load_all, load_comp=None):
             printlog('Checking out externals: ', end='')
 
         if load_all:
-            load_comps = self._all_components.keys()
+            tmp_comps = self._all_components.keys()
         elif load_comp is not None:
-            load_comps = [load_comp]
+            tmp_comps = [load_comp]
         else:
-            load_comps = self._required_compnames
+            tmp_comps = self._required_compnames
 
+        load_comps = self.order_comps_by_local_path(tmp_comps)
         # checkout the primary externals
         for comp in load_comps:
             if verbosity < VERBOSITY_VERBOSE:
@@ -351,3 +352,18 @@ def checkout(self, verbosity, load_all, load_comp=None):
         # now give each external an opportunitity to checkout it's externals.
         for comp in load_comps:
             self._all_components[comp].checkout_externals(verbosity, load_all)
+
+    def order_comps_by_local_path(self, comps_in):
+        """
+        put the comps into an order so that comp local_paths
+        that are nested are checked out in correct order
+        """
+        comps_out = []
+        local_paths = []
+        for comp in comps_in:
+            local_paths.append(self._all_components[comp].get_local_path())
+        for path in sorted(local_paths, key=len):
+            for comp in comps_in:
+                if self._all_components[comp].get_local_path() == path:
+                    comps_out.append(comp)
+        return comps_out