changeset 37:01e81c77bca1

Add checks to avoid errors when calling commands outside of a project folder
author Jonatan Werpers <jonatan@werpers.com>
date Fri, 02 Nov 2018 14:43:27 +0100
parents 647cd9e354bf
children 16d56bf04117
files +mpm/checkin.m +mpm/checkout.m +mpm/status.m
diffstat 3 files changed, 34 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
diff -r 647cd9e354bf -r 01e81c77bca1 +mpm/checkin.m
--- a/+mpm/checkin.m	Fri Nov 02 13:21:20 2018 +0100
+++ b/+mpm/checkin.m	Fri Nov 02 14:43:27 2018 +0100
@@ -5,5 +5,11 @@
     end
 
     m = mpm.MatlabPathManager();
+
+    if ~m.isProject(projectFolder)
+        fprintf('No project found\n\n');
+        return
+    end
+
     m.checkin(projectFolder);
 end
diff -r 647cd9e354bf -r 01e81c77bca1 +mpm/checkout.m
--- a/+mpm/checkout.m	Fri Nov 02 13:21:20 2018 +0100
+++ b/+mpm/checkout.m	Fri Nov 02 14:43:27 2018 +0100
@@ -5,5 +5,11 @@
     end
 
     m = mpm.MatlabPathManager();
+
+    if ~m.isProject(projectFolder)
+        fprintf('No project found\n\n');
+        return
+    end
+    
     m.checkout(projectFolder);
 end
diff -r 647cd9e354bf -r 01e81c77bca1 +mpm/status.m
--- a/+mpm/status.m	Fri Nov 02 13:21:20 2018 +0100
+++ b/+mpm/status.m	Fri Nov 02 14:43:27 2018 +0100
@@ -4,10 +4,31 @@
     end
 
     m = mpm.MatlabPathManager();
+
+    fprintf('Project:\n')
+    if m.isProject(projectFolder)
+        printProjectStatus(m, projectFolder)
+    else
+        fprintf('\t(No project in folder)\n')
+    end
+    fprintf('\n')
+    
+    fprintf('Loaded subpaths:\n')
     loaded = m.loadedSubpaths();
+    if length(loaded) > 0
+        for i = 1:length(loaded);
+            fprintf('\t%s\n', loaded{i});
+        end
+    else
+        fprintf('\t(none)\n')
+    end
+
+    fprintf('\n')
+end
+
+function printProjectStatus(m, projectFolder)
     project = m.projectSubpaths(projectFolder);
 
-    fprintf('Project:\n')
     for i = 1:length(project)
         fprintf('\t%s ', project{i});
 
@@ -19,14 +40,4 @@
 
         fprintf('\n')
     end
-    fprintf('\n')
-
-    fprintf('Loaded subpaths:\n')
-    if length(loaded) > 0
-        for i = 1:length(loaded);
-            fprintf('\t%s\n', loaded{i});
-        end
-    else
-        fprintf('\t(none)\n')
-    end
 end