# HG changeset patch # User Bjoern Ricks # Date 1314964237 0 # Node ID 7d5abf0bba91783f98889d86c7c7bb408eb9997f # Parent 44c0f84049834c8f0a34155790c491039040947b Pull needs the local dir Also use the repo to pull and not the workincopy object diff -r 44c0f8404983 -r 7d5abf0bba91 treepkg/git.py --- a/treepkg/git.py Fri Sep 02 11:46:29 2011 +0000 +++ b/treepkg/git.py Fri Sep 02 11:50:37 2011 +0000 @@ -78,7 +78,7 @@ def update(self, localdir): """Runs git pull on the localdir.""" - self.pull() + self.pull(localdir) output = capture_output(cmdexpand("git branch"), cwd=localdir) branches = output.splitlines() cur_branch = None @@ -203,11 +203,12 @@ def __init__(self, url, pattern, localdir): self.url = url self.pattern = pattern - repo = GitRepository(url) - self.workingcopy = GitWorkingCopy(repo, localdir) + self.localdir = localdir + self.repo = GitRepository(url) + self.workingcopy = GitWorkingCopy(self.repo, localdir) def list_tags(self): - self.workingcopy.pull() + self.repo.pull(localdir) tags = self.workingcopy.list_tags(self.pattern) return sorted(tags)