Merge pull request openSUSE#1978 from dmach/git-obs-pr-dump-skip-no-update

Fix 'git-obs pr dump' to skip the dump if the target has the same updated_at timestamp as the pull request in Gitea

Author: dmach

osc/commands_git/pr_dump.py

@@ -127,6 +127,17 @@ def run(self, args):
             # sanitize path for os.path.join()
             path = path.strip("/")
 
+            metadata_dir = os.path.join(path, "metadata")
+            try:
+                with open(os.path.join(metadata_dir, "pr.json")) as f:
+                    pr_data = json.load(f)
+                    if pr_data["updated_at"] == pr_obj.updated_at:
+                        # no update, skip the dump
+                        continue
+            except FileNotFoundError:
+                # no local metadata cached, we can't skip the dump
+                pass
+
             review_obj_list = pr_obj.get_reviews(self.gitea_conn)
 
             # see https://github.com/go-gitea/gitea/blob/main/modules/structs/pull_review.go - look for "type ReviewStateType string"
@@ -238,7 +249,6 @@ def run(self, args):
                         ET.Comment("The state='comment' attribute value is a custom extension to the OBS XML schema."),
                     )
 
-            metadata_dir = os.path.join(path, "metadata")
             try:
                 # remove old metadata first to ensure that we never keep any of the old files on an update
                 shutil.rmtree(metadata_dir)

osc/gitea_api/issue_timeline_entry.py

@@ -9,6 +9,10 @@
 
 
 class IssueTimelineEntry(GiteaModel):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._pull_request_review_cache = None
+
     @property
     def type(self) -> str:
         return self._data["type"]
@@ -50,9 +54,12 @@ def review_obj(self) -> Optional[PullRequestReview]:
 
         if not self.review_id:
             return None
+        if self._pull_request_review_cache is None:
+            review_obj_list = PullRequestReview.list(self._conn, self.pr_owner, self.pr_repo, self.pr_number)
+            self._pull_request_review_cache = {i._data["id"]: i for i in review_obj_list}
         try:
-            return PullRequestReview.get(self._conn, self.pr_owner, self.pr_repo, self.pr_number, str(self.review_id))
-        except PullRequestReviewDoesNotExist:
+            return self._pull_request_review_cache[self.review_id]
+        except KeyError:
             # reviews can be removed from the database, but their IDs remain in other places
             return None
 

osc/gitea_api/pr.py

@@ -154,6 +154,10 @@ def body(self) -> str:
     def state(self) -> str:
         return self._data["state"]
 
+    @property
+    def updated_at(self) -> str:
+        return self._data["updated_at"]
+
     @property
     def user(self) -> str:
         return self._data["user"]["login"]