Implement Gitlab 6.1 new methods

 - Project: tree, blob
 - ProjectCommit: diff, blob

3 files changed, 39 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c43b2ff..d8586ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Version 0.4
  * Fix strings encoding (Closes #6)
  * Allow to get a project commit (GitLab 6.1)
  * ProjectMergeRequest: fix Note() method
+ * Gitlab 6.1 methods: diff, blob (commit), tree, blob (project)
 
 Version 0.3
 
diff --git a/gitlab b/gitlab
index 370cef1..44e0217 100755
--- a/gitlab
+++ b/gitlab
@@ -169,7 +169,7 @@ def do_get(cls, d):
         die("%s objects can't be retrieved" % what)
 
     id = None
-    if cls not in [gitlab.CurrentUser]:
+    if cls not in [gitlab.CurrentUser, gitlab.ProjectCommitDiff]:
         id = get_id()
 
     try:
diff --git a/gitlab.py b/gitlab.py
index 78af89d..9414fc2 100644
--- a/gitlab.py
+++ b/gitlab.py
@@ -651,6 +651,25 @@ class ProjectCommit(GitlabObject):
     requiredListAttrs = ['project_id']
     shortPrintAttr = 'title'
 
+    def diff(self):
+        url = '/projects/%(project_id)s/repository/commits/%(commit_id)s/diff' % \
+                {'project_id': self.project_id, 'commit_id': self.id}
+        r = self.gitlab.rawGet(url)
+        if r.status_code == 200:
+            return r.json()
+
+        raise GitlabGetError()
+
+    def blob(self, filepath):
+        url = '/projects/%(project_id)s/repository/blobs/%(commit_id)s' % \
+                {'project_id': self.project_id, 'commit_id': self.id}
+        url += '?filepath=%s' % filepath
+        r = self.gitlab.rawGet(url)
+        if r.status_code == 200:
+            return r.content
+
+        raise GitlabGetError()
+
 
 class ProjectKey(GitlabObject):
     _url = '/projects/%(project_id)s/keys'
@@ -865,6 +884,24 @@ class Project(GitlabObject):
                                      project_id=self.id,
                                      **kwargs)
 
+    def tree(self, path='', ref_name=''):
+        url = "%s/%s/repository/tree" % (self._url, self.id)
+        url += '?path=%s&ref_name=%s' % (path, ref_name)
+        r = self.gitlab.rawGet(url)
+        if r.status_code == 200:
+            return r.json()
+
+        raise GitlabGetError()
+
+    def blob(self, sha, filepath):
+        url = "%s/%s/repository/blobs/%s" % (self._url, self.id, sha)
+        url += '?filepath=%s' % (filepath)
+        r = self.gitlab.rawGet(url)
+        if r.status_code == 200:
+            return r.content
+
+        raise GitlabGetError()
+
 
 class TeamMember(GitlabObject):
     _url = '/user_teams/%(team_id)s/members'