mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-06 17:30:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

faster get_git_branch

Browse source
This commit is contained in:
laerus 2016-09-14 10:41:23 +03:00
parent 752fe1f7f0
commit a26898a8a3
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
xonsh/prompt/vc_branch.py
View file

@ -12,6 +12,16 @@ import xonsh.platform as xp
import xonsh.prompt import xonsh.prompt
def get_git_branch():
timeout = builtins.__xonsh_env__.get('VC_BRANCH_TIMEOUT')
try:
status = subprocess.check_output(['git', 'status'], timeout=timeout,
stderr=subprocess.DEVNULL)
except (subprocess.CalledProcessError, subprocess.TimeoutExpired):
return None
else:
return status.split()[2].decode()
def _get_parent_dir_for(path, dir_name, timeout): def _get_parent_dir_for(path, dir_name, timeout):
# walk up the directory tree to see if we are inside an hg repo # walk up the directory tree to see if we are inside an hg repo
# the timeout makes sure that we don't thrash the file system # the timeout makes sure that we don't thrash the file system
@ -85,12 +95,7 @@ def current_branch(pad=NotImplemented):
branch = None branch = None
cmds = builtins.__xonsh_commands_cache__ cmds = builtins.__xonsh_commands_cache__
if cmds.lazy_locate_binary('git') or cmds.is_empty(): if cmds.lazy_locate_binary('git') or cmds.is_empty():
try: branch = get_git_branch()
status = xonsh.prompt.gitstatus.gitstatus()
except subprocess.CalledProcessError:
branch = None
else:
branch = status.branch
elif (cmds.lazy_locate_binary('hg') or cmds.is_empty()) and not branch: elif (cmds.lazy_locate_binary('hg') or cmds.is_empty()) and not branch:
branch = get_hg_branch() branch = get_hg_branch()
if isinstance(branch, subprocess.TimeoutExpired): if isinstance(branch, subprocess.TimeoutExpired):