diff --git a/gitup/__init__.py b/gitup/__init__.py index ca5ff34..ee669d8 100644 --- a/gitup/__init__.py +++ b/gitup/__init__.py @@ -10,5 +10,5 @@ gitup: the git repository updater __author__ = "Ben Kurtovic" __copyright__ = "Copyright (C) 2011-2014 Ben Kurtovic" __license__ = "MIT License" -__version__ = "0.2.2" +__version__ = "0.2.3" __email__ = "ben.kurtovic@gmail.com" diff --git a/gitup/update.py b/gitup/update.py index dd8a06e..9feb875 100644 --- a/gitup/update.py +++ b/gitup/update.py @@ -34,15 +34,23 @@ class _ProgressMonitor(RemoteProgress): def update(self, op_code, cur_count, max_count=None, message=''): """Called whenever progress changes. Overrides default behavior.""" if op_code & (self.COMPRESSING | self.RECEIVING): + cur_count = str(int(cur_count)) + if max_count: + max_count = str(int(max_count)) if op_code & self.BEGIN: print("\b, " if self._started else " (", end="") if not self._started: self._started = True if op_code & self.END: end = ")" - else: + elif max_count: end = "\b" * (1 + len(cur_count) + len(max_count)) - print("{0}/{1}".format(cur_count, max_count), end=end) + else: + end = "\b" * len(cur_count) + if max_count: + print("{0}/{1}".format(cur_count, max_count), end=end) + else: + print(str(cur_count), end=end) class _Stasher(object): diff --git a/setup.py b/setup.py index 4a907ad..04fc1dd 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ setup( name = "gitup", packages = find_packages(), entry_points = {"console_scripts": ["gitup = gitup.script:run"]}, - install_requires = ["GitPython >= 0.3.2.RC1", "colorama >= 0.2.7"], + install_requires = ["GitPython >= 0.3.6", "colorama >= 0.3.3"], version = __version__, author = "Ben Kurtovic", author_email = "ben.kurtovic@gmail.com",