Support specifying a SHA1 as version

diff --git a/vcs.py b/vcs.py
index b700b6e22c8e027d42825a207885bb728a67bcfc..9c91e933654d0326f2c06d31f8a1be0f4a8a4600 100644 (file)
--- a/vcs.py
+++ b/vcs.py
@@ -36,13 +36,13 @@ class Git:
                        branch = repo.heads[branchname]
                else:
                        branch = repo.create_head(branchname, self.commit)
                        branch = repo.heads[branchname]
                else:
                        branch = repo.create_head(branchname, self.commit)

-                       if isBranch:
+                       if isBranch: # track remote branch

                                branch.set_tracking_branch(origin.refs[branchname])
                # update it to the latest remote commit
                branch.checkout()
                repo.git.rebase(self.commit)
                print "...done",
                                branch.set_tracking_branch(origin.refs[branchname])
                # update it to the latest remote commit
                branch.checkout()
                repo.git.rebase(self.commit)
                print "...done",

-               if repo.head.reference.commit != repo.refs[self.commit].commit:
+               if repo.head.reference.commit != repo.commit(self.commit):

                        print "(keeping local patches around)",
                print
 
                        print "(keeping local patches around)",
                print