1 files changed, 19 insertions, 19 deletions

diff --git a/command.py b/command.py
index 4e0253fc..4dbe2e77 100644
--- a/command.py
+++ b/command.py
@@ -15,17 +15,19 @@
 
 import os
 import optparse
+import platform
+import re
 import sys
 
-import manifest_loader
-
 from error import NoSuchProjectError
+from error import InvalidProjectGroupsError
 
 class Command(object):
   """Base class for any command line action in repo.
   """
 
   common = False
+  manifest = None
   _optparse = None
 
   def WantPager(self, opt):
@@ -57,31 +59,24 @@ class Command(object):
     """Perform the action, after option parsing is complete.
     """
     raise NotImplementedError
- 
-  @property
-  def manifest(self):
-    return self.GetManifest()
-
-  def GetManifest(self, reparse=False, type=None):
-    return manifest_loader.GetManifest(self.repodir,
-                                       reparse=reparse,
-                                       type=type)
 
   def GetProjects(self, args, missing_ok=False):
     """A list of projects that match the arguments.
     """
     all = self.manifest.projects
+    result = []
 
     mp = self.manifest.manifestProject
-    if mp.relpath == '.':
-      all = dict(all)
-      all[mp.name] = mp
 
-    result = []
+    groups = mp.config.GetString('manifest.groups')
+    if not groups:
+      groups = 'default,platform-' + platform.system().lower()
+    groups = [x for x in re.split('[,\s]+', groups) if x]
 
     if not args:
       for project in all.values():
-        if missing_ok or project.Exists:
+        if ((missing_ok or project.Exists) and
+            project.MatchesGroups(groups)):
           result.append(project)
     else:
       by_path = None
@@ -97,9 +92,7 @@ class Command(object):
             for p in all.values():
               by_path[p.worktree] = p
 
-          try:
-            project = by_path[path]
-          except KeyError:
+          if os.path.exists(path):
             oldpath = None
             while path \
               and path != oldpath \
@@ -110,11 +103,18 @@ class Command(object):
               except KeyError:
                 oldpath = path
                 path = os.path.dirname(path)
+          else:
+            try:
+              project = by_path[path]
+            except KeyError:
+              pass
 
         if not project:
           raise NoSuchProjectError(arg)
         if not missing_ok and not project.Exists:
           raise NoSuchProjectError(arg)
+        if not project.MatchesGroups(groups):
+          raise InvalidProjectGroupsError(arg)
 
         result.append(project)