Merge pull request #129 from lutraconsulting/unfinished-pull-conflicts

return list of conflict files when resolving unfinished pull

Author: PeterPetrik

mergin/client.py

@@ -841,7 +841,10 @@ def resolve_unfinished_pull(self, directory):
         .. seealso:: self.has_unfinished_pull
 
         :param directory: project's directory
-        :type directory: String
+        :type directory: str
+        :returns: files where conflicts were found
+        :rtype: list[str]
         """
         mp = MerginProject(directory)
-        mp.resolve_unfinished_pull(self.username())
+        conflicts = mp.resolve_unfinished_pull(self.username())
+        return conflicts

mergin/merginproject.py

@@ -688,7 +688,14 @@ def resolve_unfinished_pull(self, user_name):
         server.
 
         .. seealso:: self.has_unfinished_pull
+
+        :param user_name: name of the user
+        :type user_name: str
+        :returns: files where conflicts were found
+        :rtype: list[str]
         """
+        conflicts = []
+
         if not self.has_unfinished_pull():
             self.log.warning("no unfinished pulls found")
             return
@@ -712,6 +719,7 @@ def resolve_unfinished_pull(self, user_name):
                 try:
                     # conflicted copy
                     conflict = self.create_conflicted_copy(dest, user_name)
+                    conflicts.append(conflict)
                     # original file synced with server
                     self.geodiff.make_copy_sqlite(src, basefile)
                     self.geodiff.make_copy_sqlite(src, dest)
@@ -721,4 +729,4 @@ def resolve_unfinished_pull(self, user_name):
 
         shutil.rmtree(self.unfinished_pull_dir)
         self.log.info("unfinished pull resolved successfuly!")
-        return
+        return conflicts