Improve handling of PMR based workflows.

Author: hsorby

src/mapclient/tools/pmr/pmrtool.py

@@ -384,17 +384,25 @@ def linkWorkspaceDirToUrl(self, local_workspace_dir, remote_workspace_url):
         # Do the writing.
         cmd.write_remote(workspace)
 
-    def is_pmr_workflow(self, local_workspace_dir):
-        git_dir = os.path.join(local_workspace_dir, '.git')
-        if os.path.isdir(git_dir):
+    def is_pmr_workflow_accessible(self, local_workspace_dir):
+        if self.is_pmr_workflow(local_workspace_dir):
             remote_workspace_url = get_workspace_url(local_workspace_dir)
             credentials = self.request_temporary_password(remote_workspace_url)
+            if credentials is None:
+                return False
+
             cmd = self._cmd_class()
             cmd.set_authorization(create_authentication_header(credentials['user'], credentials['key']))
             workspace = CmdWorkspace(local_workspace_dir, cmd)
 
-            if workspace.cmd is None:
-                return False
+            return workspace.cmd is not None
+
+        return False
+
+    def is_pmr_workflow(self, local_workspace_dir):
+        git_dir = os.path.join(local_workspace_dir, '.git')
+        if os.path.isdir(git_dir):
+            remote_workspace_url = get_workspace_url(local_workspace_dir)
 
             url_parsed = urlparse(remote_workspace_url)
             for host_domain in self._pmr_info.hosts():

src/mapclient/tools/pmr/widgets/workspacewidget.py

@@ -94,7 +94,7 @@ def _pull_from_pmr(self):
         pmr_info = PMR()
         pmr_tool = PMRTool(pmr_info, use_external_git=om.getOption(USE_EXTERNAL_GIT))
         workflow_dir = m.location()
-        if pmr_tool.is_pmr_workflow(workflow_dir):
+        if pmr_tool.is_pmr_workflow_accessible(workflow_dir):
             pmr_tool.pullFromRemote(workflow_dir)
             return True
 
@@ -108,7 +108,7 @@ def _push_to_pmr(self):
         pmr_info = PMR()
         pmr_tool = PMRTool(pmr_info, use_external_git=om.getOption(USE_EXTERNAL_GIT))
         workflow_dir = m.location()
-        if pmr_tool.is_pmr_workflow(workflow_dir):
+        if pmr_tool.is_pmr_workflow_accessible(workflow_dir):
             pmr_tool.pushToRemote(workflow_dir)
             return True
 

src/mapclient/view/workflow/workflowwidget.py

@@ -582,7 +582,7 @@ def _commitChanges(self, workflowDir, comment):
         except Exception:
             logger.exception('Error')
             raise ClientRuntimeError(
-                'Error Saving', 'The commit to PMR did not succeed')
+                'Error Saving', 'The commit to workflow did not succeed')
 
         return committed_changes