Added simple test for starting and saving a branch

Author: migurski

app.py

@@ -8,6 +8,8 @@
 from flask import Flask, redirect, request, Response, render_template, session
 from jekyll import load_jekyll_doc, dump_jekyll_doc
 
+import bizarro
+
 _default_branch = 'master'
 _repo_path = 'sample-site'
 
@@ -109,9 +111,7 @@ def start_branch():
     r = get_repo()
     branch_desc = request.form.get('branch')
     branch_name = name_branch(branch_desc)
-    branch = r.create_head(branch_name, commit=r.branches[_default_branch])
-
-    r.remotes.origin.push(branch.name)
+    branch = bizarro.repo.start_branch(r, _default_branch, branch_name)
 
     safe_branch = branch_name2path(branch.name)
 
@@ -219,12 +219,13 @@ def branch_save(branch, path):
 
     r = get_repo()
     b = r.branches[branch]
-    b.checkout()
-    c = r.commit()
+    c = b.commit
 
     if c.hexsha != request.form.get('hexsha'):
         raise Exception('Out of date SHA: %s' % request.form.get('hexsha'))
 
+    b.checkout()
+
     with open(join(r.working_dir, path), 'w') as file:
         front = dict(title=request.form.get('title'))
         body = request.form.get('body').replace('\r\n', '\n')

bizarro/__init__.py

@@ -0,0 +1 @@
+import repo

bizarro/repo.py

@@ -0,0 +1,24 @@
+def start_branch(clone, default_branch_name, new_branch_name):
+    ''' Start a new repository branch, push it to origin and return it.
+    '''
+    clone.remotes.origin.fetch()
+    
+    if 'origin/' + new_branch_name in clone.refs:
+        start_point = clone.refs['origin/' + new_branch_name]
+    else:
+        start_point = clone.branches[default_branch_name]
+    
+    branch = clone.create_head(new_branch_name, commit=start_point)
+    clone.remotes.origin.push(new_branch_name)
+    
+    return branch
+
+def save_working_file(clone, path, message, base_sha):
+    ''' Save a file in the working dir and push it to origin.
+    '''
+    if clone.active_branch.commit.hexsha != base_sha:
+        raise Exception('Out of date SHA: %s' % base_sha)
+    
+    clone.index.add([path])
+    clone.index.commit(message)
+    clone.remotes.origin.push(clone.active_branch.name)

test.py

@@ -2,8 +2,11 @@
 from subprocess import Popen, PIPE
 from unittest import TestCase, main
 from shutil import rmtree
+from os.path import join
+from uuid import uuid4
 
 from git import Repo
+import bizarro
 
 #
 # Tarball of a single-commit Git repo with files index.md and sub/index.md
@@ -14,23 +17,53 @@
 class TestRepo (TestCase):
 
     def setUp(self):
-        dirname = mkdtemp()
+        dirname = mkdtemp(prefix='bizarro-')
 
         tar = Popen(('tar', '-C', dirname, '-xzf', '-'), stdin=PIPE)
         tar.stdin.write(_tarball)
         tar.stdin.close()
         tar.wait()
 
-        self.repo = Repo(dirname)
+        self.origin = Repo(dirname)
+        self.clone1 = self.origin.clone(mkdtemp(prefix='bizarro-'))
+        self.clone2 = self.origin.clone(mkdtemp(prefix='bizarro-'))
 
     def test_repo_features(self):
-        self.assertTrue(self.repo.bare)
+        self.assertTrue(self.origin.bare)
 
-        branch_names = [b.name for b in self.repo.branches]
+        branch_names = [b.name for b in self.origin.branches]
         self.assertEqual(set(branch_names), set(['master', 'title', 'body']))
 
+    def test_start_branch(self):
+        branch1 = bizarro.repo.start_branch(self.clone1, 'master', 'hello')
+        
+        self.assertTrue('hello' in self.clone1.branches)
+        self.assertTrue('hello' in self.origin.branches)
+        
+        #
+        # Make a change to the branch and push it.
+        #
+        branch1.checkout()
+        message = str(uuid4())
+        
+        with open(join(self.clone1.working_dir, 'index.md'), 'a') as file:
+            file.write('\n\n...')
+        
+        bizarro.repo.save_working_file(self.clone1, 'index.md', message, branch1.commit.hexsha)
+        
+        #
+        # See if the branch made it to clone 2
+        #
+        branch2 = bizarro.repo.start_branch(self.clone2, 'master', 'hello')
+
+        self.assertTrue('hello' in self.clone2.branches)
+        self.assertEquals(branch2.commit.hexsha, branch1.commit.hexsha)
+        self.assertEquals(branch2.commit.message, message)
+    
     def tearDown(self):
-        rmtree(self.repo.git_dir)
+        rmtree(self.origin.git_dir)
+        rmtree(self.clone1.working_dir)
+        rmtree(self.clone2.working_dir)
 
 if __name__ == '__main__':
     main()