Change to just state ignore

Author: trent-codecov

upload/helpers.py

@@ -495,6 +495,17 @@ def insert_commit(commitid, branch, pr, repository, owner, parent_commit_id=None
             "state": "pending",
         },
     )
+
+    edited = False
+    if parent_commit_id and commit.parent_commit_id is None:
+        commit.parent_commit_id = parent_commit_id
+        edited = True
+    if branch and commit.branch != branch:
+        # A branch head may have been moved; this allows commits to be "moved"
+        commit.branch = branch
+        edited = True
+    if edited:
+        commit.save(update_fields=["parent_commit_id", "state", "branch"])
     return commit
 
 

upload/tests/test_upload.py

@@ -627,6 +627,54 @@ def test_insert_commit(self):
             assert commit.merged == False
             assert commit.parent_commit_id is None
 
+        with self.subTest("commit already in database"):
+            G(
+                Commit,
+                commitid="1c78206f1a46dc6db8412a491fc770eb7d0f8a47",
+                branch="apples",
+                pullid="456",
+                repository=repo,
+                parent_commit_id=None,
+            )
+            # parent_commit_id and branch should be updated
+            insert_commit(
+                "1c78206f1a46dc6db8412a491fc770eb7d0f8a47",
+                "oranges",
+                "123",
+                repo,
+                org,
+                parent_commit_id="different_parent_commit",
+            )
+
+            commit = Commit.objects.get(
+                commitid="1c78206f1a46dc6db8412a491fc770eb7d0f8a47"
+            )
+            assert commit.repository == repo
+            assert commit.branch == "oranges"
+            assert commit.pullid == 456
+            assert commit.merged is None
+            assert commit.parent_commit_id == "different_parent_commit"
+
+        with self.subTest("parent provided"):
+            parent = G(Commit)
+            insert_commit(
+                "8458a8c72aafb5fb4c5cd58f467a2f71298f1b61",
+                "test",
+                None,
+                repo,
+                org,
+                parent_commit_id=parent.commitid,
+            )
+
+            commit = Commit.objects.get(
+                commitid="8458a8c72aafb5fb4c5cd58f467a2f71298f1b61"
+            )
+            assert commit.repository == repo
+            assert commit.branch == "test"
+            assert commit.pullid is None
+            assert commit.merged is None
+            assert commit.parent_commit_id == parent.commitid
+
     def test_parse_request_headers(self):
         with self.subTest("Invalid content disposition"):
             with self.assertRaises(ValidationError):