the branch upgrade with set upstream to

Author: zhenwei-li

src/com/dvsnier/git/branch/branch.py

@@ -1,21 +1,24 @@
 # -*- coding:utf-8 -*-
 
+import logging
+
 from com.dvsnier.git.git import Git
 from com.dvsnier.process.execute import execute
-import logging
 
 
 class Branch(Git, object):
     'the git branch command class'
 
+    _current_branch_name = None
+
     def __init__(self):
         super(Branch, self).__init__()
 
     def get_branch(self):
         'the get current branch name'
         current_branch_list_str = execute(["git branch"])
         if len(current_branch_list_str) > 0:
-            branch_name_list = ' '.join(current_branch_list_str.split())
+            branch_name_list = ' '.join(str(current_branch_list_str).split())
             if len(branch_name_list) > 0:
                 branch_s = branch_name_list.split(' ')
                 for index in range(len(branch_s)):
@@ -46,3 +49,25 @@ def branch_to_file_and_commit_list_with_more(self):
         return execute([
             'git branch --list --all --sort=committerdate --format=\'%(HEAD) %(color:yellow)%(refname:short)%(color:reset)|%(color:red)%(objectname:short)%(color:reset)|%(color:reset)(%(color:green)%(committerdate:relative)%(color:reset))\''
         ])
+
+    def branch_set_upstream_to(self, branch_name):
+        ''' the track remote and local branch associations '''
+        if not branch_name or not len(branch_name.strip()) > 0:
+            logging.exception('the current branch name is invalid.' )
+            raise KeyError('the current branch name is invalid.')
+        return execute([
+            'git branch -u origin/{0} {0}'.format(branch_name)
+        ])
+
+    def get_current_branch_name(self):
+        ''' the obtain current branch name '''
+        return self._current_branch_name
+
+    def set_current_branch_name(self, branch_name):
+        ''' the set current branch name '''
+        if not branch_name or not len(branch_name.strip()) > 0:
+            logging.exception('the current branch name is invalid.' )
+            raise KeyError('the current branch name is invalid.')
+        self._current_branch_name = branch_name
+
+

tests/com/dvsnier/git/branch/test_branch.py

@@ -11,40 +11,69 @@ class Test_Branch(unittest.TestCase):
     ''' the test branch '''
 
     _git = None
+    _branch = None
 
     @classmethod
     def setUpClass(cls):
         print("...the set up...")
         print('')
         cls._git = Git()
         cls._git.config()
+        cls._branch = Branch()
 
     def setUp(self):
         super(Test_Branch, self).setUp()
 
-    def test_get_branch(self):
-        branch = Branch()
-        branch_name = branch.get_branch()
-        logging.info(branch_name)
-        self.assertIsNotNone(branch_name, 'test_get_branch is error.')
-        print("the test get_branch is succeed.")
+    def test_0_get_branch(self):
+        branch_name = Test_Branch._branch.get_branch()
+        logging.info('the current branch name is {}'.format(branch_name))
+        self.assertIsNotNone(branch_name, 'test_0_get_branch is error.')
+        # print("the test get_branch is succeed.")
 
-    def test_branch_to_file_and_commit_list(self):
-        branch = Branch()
-        branch_commit_list = branch.branch_to_file_and_commit_list()
+    def test_1_branch_to_file_and_commit_list(self):
+        branch_commit_list = Test_Branch._branch.branch_to_file_and_commit_list()
         logging.info(branch_commit_list)
         self.assertIsNotNone(branch_commit_list,
-                             'test_branch_to_file_and_commit_list is error.')
-        print("the test branch_to_file_and_commit_list is succeed.")
+                             'test_0_branch_to_file_and_commit_list is error.')
+        # print("the test branch_to_file_and_commit_list is succeed.")
 
-    def test_branch_to_file_and_commit_list_with_more(self):
-        branch = Branch()
-        branch_commit_list_more = branch.branch_to_file_and_commit_list_with_more()
+    def test_2_branch_to_file_and_commit_list_with_more(self):
+        branch_commit_list_more = Test_Branch._branch.branch_to_file_and_commit_list_with_more()
         logging.info(branch_commit_list_more)
         self.assertIsNotNone(
             branch_commit_list_more,
-            'test_branch_to_file_and_commit_list_with_more is error.')
-        print("the test branch_to_file_and_commit_list_with_more is succeed.")
+            'test_0_branch_to_file_and_commit_list_with_more is error.')
+        # print("the test branch_to_file_and_commit_list_with_more is succeed.")
+
+    def test_3_branch_set_upstream_to(self):
+        branch_name = Test_Branch._branch.get_branch()
+        # branch_name = None
+        # branch_name = ''
+        # branch_name = ' '
+        # branch_name = '0'
+        branch_set_upstream_to = Test_Branch._branch.branch_set_upstream_to(branch_name)
+        if branch_set_upstream_to:
+            logging.info(branch_set_upstream_to)
+        self.assertIsNotNone(branch_set_upstream_to, 'test_3_branch_set_upstream_to is error.')
+
+    def test_5_get_current_branch_name(self):
+        branch_name = Test_Branch._branch.get_branch()
+        # branch_name = None
+        # branch_name = ''
+        # branch_name = ' '
+        # branch_name = '0'
+        current_branch_name = Test_Branch._branch.get_current_branch_name()
+        if current_branch_name:
+            logging.info('the current branch name is {0}.'.format(current_branch_name))
+        self.assertIsNotNone(current_branch_name, 'test_5_get_current_branch_name is error.')
+
+    def test_4_set_current_branch_name(self):
+        branch_name = Test_Branch._branch.get_branch()
+        # branch_name = None
+        # branch_name = ''
+        # branch_name = ' '
+        # branch_name = '0'
+        Test_Branch._branch.set_current_branch_name(branch_name)
 
     def tearDown(self):
         super(Test_Branch, self).tearDown()
@@ -56,4 +85,5 @@ def tearDownClass(cls):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    suite = unittest.TestLoader().loadTestsFromTestCase(Test_Branch)
+    unittest.TextTestRunner(verbosity=2).run(suite)