Merge pull request #205 from AKSW/feature/stayOnCurrentBranchAfterCommit

Stay on current branch after commit
AKSW · Nov 26, 2018 · 6259bfc · 6259bfc
2 parents 8adb1df + 71f3a24
commit 6259bfc
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 3 deletions.
diff --git a/quit/core.py b/quit/core.py
@@ -490,9 +490,6 @@ def commit(self, graph, delta, message, parent_commit_ref, target_ref, query=Non
         if oid:
             self._commits.set(oid.hex, blobs_new)
             commit = self.repository.revision(oid.hex)
-            if not self.repository.is_bare:
-                self.repository._repository.checkout(
-                    target_ref, strategy=pygit2.GIT_CHECKOUT_FORCE)
             self.syncSingle(commit)
 
         return oid.hex

diff --git a/quit/git.py b/quit/git.py
@@ -667,6 +667,17 @@ def commit(self, message, author_name, author_email, **kwargs):
         oid = tree.write()
         self.dirty = True
 
+        branch = re.sub("refs/heads/", "", ref)
+        if not self.repository.is_bare and (branch == self.repository.current_head or
+           self.repository.current_head is None):
+            try:
+                tree = self.repository._repository.get(oid)
+                self.repository._repository.checkout_tree(tree)
+            except pygit2.GitError as e:
+                logger.info("Local changes in working directory of currently checked out branch: "
+                            "{}, {}".format(branch, e))
+                pass
+
         return self.repository._repository.create_commit(
             ref, author, commiter, message, oid, parents
         )

diff --git a/tests/helpers.py b/tests/helpers.py
@@ -22,6 +22,7 @@ def _addAll(index, path, dir=''):
     index = repository.index
     index.read()
     _addAll(index, repository.workdir)
+    index.write()
 
     # Create commit
     tree = index.write_tree()

diff --git a/tests/test_app.py b/tests/test_app.py
@@ -1930,6 +1930,53 @@ def testInsertDataAndSelectFromNonEmptyGraph(self):
                 "p": {'type': 'uri', 'value': 'http://ex.org/b'},
                 "o": {'type': 'uri', 'value': 'http://ex.org/c'}})
 
+    def testInsertDataIntoRepositoryDontOverwriteLocalFile(self):
+        """Test inserting data wile locally changing the graph file.
+
+        1. Prepare a repository
+        2. Start Quit
+        3. execute INSERT DATA query
+        4. change file in filesystem
+        """
+        # Prepate a git Repository
+        graphContent = '<http://ex.org/x> <http://ex.org/y> <http://ex.org/z> .\n'
+        with TemporaryRepositoryFactory().withGraph("http://example.org/", graphContent) as repo:
+
+            # Start Quit
+            args = quitApp.parseArgs(['-t', repo.workdir])
+            objects = quitApp.initialize(args)
+            config = objects['config']
+            app = create_app(config).test_client()
+
+            with open(path.join(repo.workdir, "graph.nt"), "w") as graphFile:
+                graphContent += '<http://ex.org/z> <http://ex.org/z> <http://ex.org/z> .\n'
+                graphFile.write(graphContent)
+
+            # execute INSERT DATA query
+            update = "INSERT DATA {graph <http://example.org/> {<http://ex.org/a> <http://ex.org/b> <http://ex.org/c> .}}"
+            app.post('/sparql', data=dict(update=update))
+
+            # execute SELECT query
+            select = "SELECT * WHERE {graph <http://example.org/> {?s ?p ?o .}} ORDER BY ?s ?p ?o"
+            select_resp = app.post('/sparql', data=dict(query=select), headers=dict(accept="application/sparql-results+json"))
+
+            obj = json.loads(select_resp.data.decode("utf-8"))
+
+            self.assertEqual(len(obj["results"]["bindings"]), 2)
+
+            self.assertDictEqual(obj["results"]["bindings"][0], {
+                "s": {'type': 'uri', 'value': 'http://ex.org/a'},
+                "p": {'type': 'uri', 'value': 'http://ex.org/b'},
+                "o": {'type': 'uri', 'value': 'http://ex.org/c'}})
+
+            self.assertDictEqual(obj["results"]["bindings"][1], {
+                "s": {'type': 'uri', 'value': 'http://ex.org/x'},
+                "p": {'type': 'uri', 'value': 'http://ex.org/y'},
+                "o": {'type': 'uri', 'value': 'http://ex.org/z'}})
+
+            with open(path.join(repo.workdir, "graph.nt"), "r") as graphFile:
+                self.assertEqual(graphFile.read(), graphContent)
+
     def testInsertDeleteFromEmptyGraph(self):
         """Test inserting and deleting data and selecting it, starting with an empty graph.