From 1575934568a916386a2de2b80d225fb47ad5d8eb Mon Sep 17 00:00:00 2001 From: Vadim Troshchinskiy Date: Mon, 16 Dec 2024 13:10:10 +0100 Subject: [PATCH] Make --pull work like the other commands --- gitlib/gitlib.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gitlib/gitlib.py b/gitlib/gitlib.py index 0e24859..48dad07 100755 --- a/gitlib/gitlib.py +++ b/gitlib/gitlib.py @@ -1534,16 +1534,21 @@ class OpengnsysGitLibrary: if origin: self.logger.debug("Fetching from origin") - origin.fetch() + origin.fetch(progress=OgProgressPrinter(self.logger)) else: self.logger.error("Origin not found, can't fetch") - def pullRepo(self, path): + def pull(self, path = None, device = None): """ Pull changes from ogrepository This unconditionally overwrites remote changes. There is no conflict resolution. """ + + + if path is None: + path = self.fs.ensure_mounted(device) + repo = git.Repo(path) self.logger.debug("Downloading from ogrepository")