Merge pull request openSUSE#1921 from dmach/fix-tardiff-xz

Fix 'git-obs pr review interactive' command - support xz and obscpio tardiffs, fix head branch checkout

Author: dmach

osc/commands_git/pr_review_interactive.py

@@ -308,11 +308,12 @@ def tardiff(self, owner: str, repo: str, number: int, *, pr_obj: ".PullRequest")
 
         # the repo might be outdated, make sure the commits are available
         base_git.fetch()
+        base_git.switch(pr_obj.base_branch)
+        base_git.reset(pr_obj.base_commit, hard=True)
 
         head_path = self.get_git_repo_path(owner, repo, number, subdir="head")
         if os.path.exists(head_path):
             # update the 'base' and 'head' worktrees to the latest revisions from the pull request
-            base_git.reset(pr_obj.head_commit, hard=True)
             pr_branch = base_git.fetch_pull_request(number, commit=pr_obj.head_commit, force=True)
         else:
             # IMPORTANT: git lfs is extremly difficult to use to query files from random branches and commits.

osc/gitea_api/tardiff.py

@@ -17,10 +17,12 @@ class TarDiff:
         ".jar",
         ".lz",
         ".lzma",
+        ".obscpio",
         ".tbz",
         ".tbz2",
         ".tgz",
         ".txz",
+        ".xz",
         ".zip",
         ".zst",
     ]