[Treepkg-commits] r534 - trunk/treepkg

[scm-commit@wald.intevation.org]

Author: bricks
Date: 2011-09-02 13:50:37 +0200 (Fri, 02 Sep 2011)
New Revision: 534

Modified:
   trunk/treepkg/git.py
Log:
Pull needs the local dir
Also use the repo to pull and not the workincopy object


Modified: trunk/treepkg/git.py
===================================================================
--- trunk/treepkg/git.py	2011-09-02 11:46:29 UTC (rev 533)
+++ trunk/treepkg/git.py	2011-09-02 11:50:37 UTC (rev 534)
@@ -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)