From eecb19bef62a51e35af704cd681a71b09ba9c57e Mon Sep 17 00:00:00 2001 From: Vadim Troshchinskiy Date: Fri, 27 Jun 2025 13:23:35 +0200 Subject: [PATCH] ref #2247: Improve progress reporting --- gitlib/GitLib/__init__.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gitlib/GitLib/__init__.py b/gitlib/GitLib/__init__.py index fe43e42..6d42950 100755 --- a/gitlib/GitLib/__init__.py +++ b/gitlib/GitLib/__init__.py @@ -112,15 +112,15 @@ class OgProgressPrinterWeb(git.RemoteProgress): def _get_stage_number(self, op): op = op & git.RemoteProgress.OP_MASK - if op == git.RemoteProgress.COMPRESSING: + if op == git.RemoteProgress.COUNTING: return 0 - elif op == git.RemoteProgress.CHECKING_OUT: + elif op == git.RemoteProgress.COMPRESSING: return 1 - elif op == git.RemoteProgress.COUNTING: - return 2 - elif op == git.RemoteProgress.RECEIVING: - return 3 elif op == git.RemoteProgress.WRITING: + return 2 + elif op == git.RemoteProgress.CHECKING_OUT: + return 3 + elif op == git.RemoteProgress.RECEIVING: return 4 elif op == git.RemoteProgress.RESOLVING: return 5 @@ -1390,7 +1390,7 @@ class OpengnsysGitLibrary: repo.index.commit("Initial commit") repo.git.push("--force") # Obliterate whatever might have been there - self.logger.debug("Fetching origin") + self.logger.debug("Fetching origin, callback=%s", self.progress_callback) origin.fetch(progress=self.progress_callback) repo.heads.master.set_tracking_branch(origin.refs.master)