Merge pull request #3 from SOSETH/bugfixes

Bugfixes

Author: uubk

src/gitsync/api.py

@@ -29,6 +29,9 @@ def get_url_from_project(self) -> str:
     def get_active_branches(self, active_time=timedelta(days=40)) -> List[str]:
         pass
 
+    def get_all_branches(self) -> List[str]:
+        pass
+
     def get_tags(self) -> Set[str]:
         pass
 

src/gitsync/github.py

@@ -11,6 +11,7 @@ def __init__(self, project: Repository, provider):
         super().__init__()
         self.__project__ = project
         self.__provider__ = provider
+        self.__branches__ = []
 
     def get_url_from_project(self) -> str:
         url = self.__project__.clone_url
@@ -25,16 +26,30 @@ def get_url_from_project(self) -> str:
             + url.path
         return url
 
+    def get_all_branches(self) -> List[str]:
+        if self.__branches__:
+            return [x.name for x in self.__branches__]
+
+        for branch in self.__project__.get_branches():
+            self.__branch_commits__[branch.name] = branch.commit.sha
+            self.__branches__.append(branch)
+
+        return [x.name for x in self.__branches__]
+
     def get_active_branches(self, active_time=timedelta(days=40)) -> List[str]:
+        if not self.__branches__:
+            self.get_all_branches()
+
         branches = set()
 
-        for branch in self.__project__.get_branches():
+        for branch in self.__branches__:
             last_commit = branch.commit.commit.committer.date
             if datetime.now() - last_commit <= active_time:
                 branches.add(branch.name)
             elif branch.protected:
                 branches.add(branch.name)
-            self.__branch_commits__[branch.name] = branch.commit.sha
+            elif branch.name == self.__project__.default_branch:
+                branches.add(branch.name)
 
         return list(branches)
 

src/gitsync/gitlab.py

@@ -11,6 +11,7 @@ def __init__(self, project: Project, provider):
         super().__init__()
         self.__project__ = project
         self.__provider__ = provider
+        self.__branches__ = []
 
     def get_url_from_project(self) -> str:
         url = self.__project__.http_url_to_repo
@@ -25,7 +26,20 @@ def get_url_from_project(self) -> str:
             + url.path
         return url
 
+    def get_all_branches(self) -> List[str]:
+        if self.__branches__:
+            return [x.name for x in self.__branches__]
+
+        for branch in self.__project__.branches.list(iterator=True):
+            self.__branch_commits__[branch.name] = branch.commit['id']
+            self.__branches__.append(branch)
+
+        return [x.name for x in self.__branches__]
+
     def get_active_branches(self, active_time=timedelta(days=40)) -> List[str]:
+        if not self.__branches__:
+            self.get_all_branches()
+
         branches = set([x.name for x in self.__project__.protectedbranches.list()])
         new_branches = set()
 
@@ -34,7 +48,7 @@ def get_active_branches(self, active_time=timedelta(days=40)) -> List[str]:
                 new_branches.add(branch)
         branches = new_branches
 
-        for branch in self.__project__.branches.list(iterator=True):
+        for branch in self.__branches__:
             last_commit = datetime.fromisoformat(branch.commit['committed_date'])
             if datetime.now(timezone.utc) - last_commit <= active_time:
                 branches.add(branch.name)

src/gitsync/repo.py

@@ -19,7 +19,10 @@ def is_ancestor(self, commit_a: Commit, commit_b: Commit) -> bool:
         return self.__repo__.is_ancestor(commit_a, commit_b)
 
     def push(self, commit: str, name: str, remote: str) -> bool:
-        self.__repo__.create_head(name, commit)
+        if name not in self.__repo__.heads:
+            self.__repo__.create_head(name, commit)
+        else:
+            self.__repo__.heads[name].commit = commit
         remote = self.__repo__.remote(remote)
         result = remote.push(name + ':' + name)
         if len(result) < 1:

src/gitsync/util.py

@@ -9,4 +9,4 @@ def filter_url(url: str) -> str:
         return url
     else:
         groups = matches.groups()
-        return groups[0] + '*****:*****' + groups[2]
+        return groups[0] + '*****:*****' + groups[3]

src/gitsynccmd/__init__.py

@@ -40,7 +40,8 @@ def do_sync():
 
             origin = providers[repo['origin']['provider']].get_project(repo['origin']['name'])
             branches = origin.get_active_branches()
-            branch_commits = {x: origin.get_last_commit_on_branch(x) for x in branches}
+            all_branches = origin.get_all_branches()
+            branch_commits = {x: origin.get_last_commit_on_branch(x) for x in origin.get_all_branches()}
             tags = origin.get_tags()
 
             mirror_refs = {}
@@ -54,7 +55,7 @@ def do_sync():
                 mirror_tags[name] = mirror_ref.get_tags()
 
                 for x in mirror_ref.get_active_branches():
-                    if x not in branches:
+                    if x not in all_branches:
                         log.info("Branch {} available on mirror but not on origin".format(x))
                         branches.append(x)
                         need_sync = True
@@ -79,19 +80,21 @@ def do_sync():
                         git_repo.add_remote(downstream.get_url_from_project(), name)
 
                         for x in branches:
-                            upstream_commit = branch_commits[x]
-                            upstream_commit_ref = git_repo.get_commit(upstream_commit)
+                            upstream_commit = branch_commits[x] if x in branch_commits else ''
+                            upstream_commit_ref = git_repo.get_commit(upstream_commit) if x in branch_commits else ''
                             downstream_commit = downstream.get_last_commit_on_branch(x)
                             downstream_commit_ref = git_repo.get_commit(downstream_commit)
 
                             if upstream_commit == downstream_commit:
                                 continue
 
-                            if git_repo.is_ancestor(downstream_commit_ref, upstream_commit_ref):
+                            if upstream_commit_ref != '' and git_repo.is_ancestor(downstream_commit_ref,
+                                                                                  upstream_commit_ref):
                                 # Upstream is newer
                                 log.info("Pushing origin commits to mirror")
                                 git_repo.push(upstream_commit, x, name)
-                            elif git_repo.is_ancestor(upstream_commit_ref, downstream_commit_ref):
+                            elif upstream_commit_ref == '' or git_repo.is_ancestor(upstream_commit_ref,
+                                                                                   downstream_commit_ref):
                                 # Downstream is newer
                                 log.info("Pushing mirror commits to origin")
                                 git_repo.push(downstream_commit, x, 'origin')