upgrade wakatime package to v1.0.0 for mercurial support
This commit is contained in:
parent
fcbbf05933
commit
8bd54a7427
4 changed files with 37 additions and 7 deletions
|
@ -3,6 +3,12 @@ History
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
|
||||||
|
1.0.0 (2014-02-05)
|
||||||
|
++++++++++++++++++
|
||||||
|
|
||||||
|
- detect project name and branch name from mercurial revision control
|
||||||
|
|
||||||
|
|
||||||
0.5.3 (2014-01-15)
|
0.5.3 (2014-01-15)
|
||||||
++++++++++++++++++
|
++++++++++++++++++
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
|
|
||||||
__title__ = 'wakatime'
|
__title__ = 'wakatime'
|
||||||
__version__ = '0.5.3'
|
__version__ = '1.0.0'
|
||||||
__author__ = 'Alan Hamlett'
|
__author__ = 'Alan Hamlett'
|
||||||
__license__ = 'BSD'
|
__license__ = 'BSD'
|
||||||
__copyright__ = 'Copyright 2013 Alan Hamlett'
|
__copyright__ = 'Copyright 2013 Alan Hamlett'
|
||||||
|
|
|
@ -13,10 +13,6 @@ import logging
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from .base import BaseProject
|
from .base import BaseProject
|
||||||
try:
|
|
||||||
from collections import OrderedDict
|
|
||||||
except ImportError:
|
|
||||||
from ..packages.ordereddict import OrderedDict
|
|
||||||
|
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
|
@ -18,13 +18,41 @@ from .base import BaseProject
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
# str is unicode in Python3
|
||||||
|
try:
|
||||||
|
unicode
|
||||||
|
except NameError:
|
||||||
|
unicode = str
|
||||||
|
|
||||||
|
|
||||||
class Mercurial(BaseProject):
|
class Mercurial(BaseProject):
|
||||||
|
|
||||||
def process(self):
|
def process(self):
|
||||||
return False
|
self.configDir = self._find_hg_config_dir(self.path)
|
||||||
|
return self.configDir is not None
|
||||||
|
|
||||||
def name(self):
|
def name(self):
|
||||||
|
if self.configDir:
|
||||||
|
return unicode(os.path.basename(os.path.dirname(self.configDir)))
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def branch(self):
|
def branch(self):
|
||||||
return None
|
if self.configDir:
|
||||||
|
branch_file = os.path.join(self.configDir, 'branch')
|
||||||
|
try:
|
||||||
|
with open(branch_file) as fh:
|
||||||
|
return unicode(fh.readline().strip().rsplit('/', 1)[-1])
|
||||||
|
except IOError:
|
||||||
|
pass
|
||||||
|
return unicode('default')
|
||||||
|
|
||||||
|
def _find_hg_config_dir(self, path):
|
||||||
|
path = os.path.realpath(path)
|
||||||
|
if os.path.isfile(path):
|
||||||
|
path = os.path.split(path)[0]
|
||||||
|
if os.path.isdir(os.path.join(path, '.hg')):
|
||||||
|
return os.path.join(path, '.hg')
|
||||||
|
split_path = os.path.split(path)
|
||||||
|
if split_path[1] == '':
|
||||||
|
return None
|
||||||
|
return self._find_hg_config_dir(split_path[0])
|
||||||
|
|
Loading…
Reference in a new issue