mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-04 16:34:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'BYK-fix-hg-errors'

Browse source
This commit is contained in:
Anthony Scopatz 2015-07-16 08:56:42 -07:00
commit 29fa205a20
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
xonsh/environ.py
View file

@ -1,7 +1,6 @@
"""Environment for the xonsh shell."""
import os
import re
import locale
import socket
import string
import locale
@ -9,8 +8,7 @@ import builtins
import subprocess
from warnings import warn
from functools import wraps
from collections import MutableMapping, MutableSequence, MutableSet, \
defaultdict, namedtuple
from collections import MutableMapping, MutableSequence, MutableSet, namedtuple
from xonsh import __version__ as XONSH_VERSION
from xonsh.tools import TERM_COLORS, ON_WINDOWS, ON_MAC, string_types, is_int,\
@ -323,7 +321,7 @@ def get_hg_branch(cwd=None, root=None):
return "{0}, {1}".format(
*(b.strip(os.linesep) for b in (branch, active_bookmark)))
return branch.strip(os.linesep)
return branch.strip(os.linesep) if branch else None
def current_branch(pad=True):
@ -353,10 +351,10 @@ def git_dirty_working_directory(cwd=None):
@ensure_hg
def hg_dirty_working_directory(cwd=None, root=None):
id = call_hg_command(['identify', '--id'], cwd).strip(os.linesep)
id = call_hg_command(['identify', '--id'], cwd)
if id is None:
return False
return id.endswith('+')
return id.strip(os.linesep).endswith('+')
def dirty_working_directory(cwd=None):