support slashes in Mercurial and Git branch names

Author: alanhamlett

tests/samples/projects/git-branch-with-slash/dot_git/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/branch/with/slash

tests/samples/projects/git-branch-with-slash/dot_git/config

@@ -0,0 +1,7 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
+	precomposeunicode = true

tests/samples/projects/git-branch-with-slash/emptyfile.txt

@@ -0,0 +1 @@
+branch/with/slash

tests/samples/projects/hg-branch-with-slash/.hg/branch

@@ -399,6 +399,25 @@ def test_mercurial_project_detected(self):
             self.assertEquals('hg', self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['project'])
             self.assertEquals('test-hg-branch', self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['branch'])
 
+    def test_mercurial_project_branch_with_slash_detected(self):
+        response = Response()
+        response.status_code = 0
+        self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].return_value = response
+
+        with mock.patch('wakatime.projects.git.Git.process') as mock_git:
+            mock_git.return_value = False
+
+            now = u(int(time.time()))
+            entity = 'tests/samples/projects/hg-branch-with-slash/emptyfile.txt'
+            config = 'tests/samples/configs/good_config.cfg'
+
+            args = ['--file', entity, '--config', config, '--time', now]
+
+            execute(args)
+
+            self.assertEquals('hg-branch-with-slash', self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['project'])
+            self.assertEquals('branch/with/slash', self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['branch'])
+
     @log_capture()
     def test_ioerror_when_reading_mercurial_branch(self, logs):
         logging.disable(logging.NOTSET)
@@ -668,6 +687,17 @@ def test_git_path_from_gitdir_link_file_handles_invalid_link(self, logs):
         self.assertNothingPrinted()
         self.assertNothingLogged(logs)
 
+    def test_git_branch_with_slash(self):
+        tempdir = tempfile.mkdtemp()
+        shutil.copytree('tests/samples/projects/git-branch-with-slash', os.path.join(tempdir, 'git'))
+        shutil.move(os.path.join(tempdir, 'git', 'dot_git'), os.path.join(tempdir, 'git', '.git'))
+
+        self.shared(
+            expected_project='git',
+            expected_branch='branch/with/slash',
+            entity=os.path.join(tempdir, 'git', 'emptyfile.txt'),
+        )
+
     @log_capture()
     def test_project_map(self, logs):
         logging.disable(logging.NOTSET)

tests/samples/projects/hg-branch-with-slash/emptyfile.txt

@@ -78,7 +78,7 @@ def _find_git_config_file(self, path):
 
     def _get_branch_from_head_file(self, line):
         if u(line.strip()).startswith('ref: '):
-            return u(line.strip().rsplit('/', 1)[-1])
+            return u(line.strip().split('/', 2)[-1])
         return None
 
     def _submodules_supported_for_path(self, path):

tests/test_project.py

@@ -36,11 +36,11 @@ def branch(self):
             branch_file = os.path.join(self.configDir, 'branch')
             try:
                 with open(branch_file, 'r', encoding='utf-8') as fh:
-                    return u(fh.readline().strip().rsplit('/', 1)[-1])
+                    return u(fh.readline().strip())
             except UnicodeDecodeError:  # pragma: nocover
                 try:
                     with open(branch_file, 'r', encoding=sys.getfilesystemencoding()) as fh:
-                        return u(fh.readline().strip().rsplit('/', 1)[-1])
+                        return u(fh.readline().strip())
                 except:
                     log.traceback(logging.WARNING)
             except IOError:  # pragma: nocover