l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[modules/git] Fix recursion error

Browse source 
Endless loop caused by stupid bug when trying to find the root git
repository.
This commit is contained in:
Tobias Witek 2019-01-20 14:17:10 +01:00
parent 503f4be67c
commit 212966945c
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bumblebee/modules/git.py
View file

@ -22,7 +22,7 @@ class Module(bumblebee.engine.Module):
super(Module, self).__init__(engine, config, super(Module, self).__init__(engine, config,
bumblebee.output.Widget(full_text=self.gitinfo) bumblebee.output.Widget(full_text=self.gitinfo)
) )
self._fmt = self.parameter("format", "{branch}") self._fmt = self.parameter("format", "{branch} - {directory}")
def gitinfo(self, widget): def gitinfo(self, widget):
info = "" info = ""
@ -35,16 +35,17 @@ class Module(bumblebee.engine.Module):
directory = self._get_git_root(directory) directory = self._get_git_root(directory)
repo = pygit2.Repository(directory) repo = pygit2.Repository(directory)
data["branch"] = repo.head.shorthand data["branch"] = repo.head.shorthand
data["directory"] = directory
except Exception as e: except Exception as e:
return e return e
return string.Formatter().vformat(self._fmt, (), data) return string.Formatter().vformat(self._fmt, (), data)
def _get_git_root(self, directory): def _get_git_root(self, directory):
while directory != "/": while len(directory) > 1:
if os.path.exists(os.path.join(directory, ".git")): if os.path.exists(os.path.join(directory, ".git")):
return directory return directory
directory = "/".join(directory.split("/")[0:-1]) directory = "/".join(directory.split("/")[0:-1])
return None return "/"
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4