facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

color: move git-subrepo support into the subrepo module

Browse Source 
Now that all ui instance carry a '_colormode' attribute, we can access and
comply to it directly in the subrepo code. The actual implementation could
probably be a bit smarter, but we stick close to the current one for the sake
of simplicity.
This commit is contained in:
Pierre-Yves David 2017-02-21 17:50:04 +01:00
parent d02ff2c6a2
commit be432559a1
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hgext/color.py
View File

@ -177,7 +177,6 @@ from mercurial import (
commands,
dispatch,
extensions,
subrepo,
ui as uimod,
)
@ -198,14 +197,7 @@ def uisetup(ui):
if mode and mode != 'debug':
color.configstyles(ui_)
return orig(ui_, opts, cmd, cmdfunc)
def colorgit(orig, gitsub, commands, env=None, stream=False, cwd=None):
if gitsub.ui._colormode and len(commands) and commands[0] == "diff":
# insert the argument in the front,
# the end of git diff arguments is used for paths
commands.insert(1, '--color')
return orig(gitsub, commands, env, stream, cwd)
extensions.wrapfunction(dispatch, '_runcommand', colorcmd)
extensions.wrapfunction(subrepo.gitsubrepo, '_gitnodir', colorgit)
def extsetup(ui):
commands.globalopts.append(

4
mercurial/subrepo.py
View File

@ -1414,6 +1414,10 @@ class gitsubrepo(abstractsubrepo):
errpipe = None
if self.ui.quiet:
errpipe = open(os.devnull, 'w')
if self.ui._colormode and len(commands) and commands[0] == "diff":
# insert the argument in the front,
# the end of git diff arguments is used for paths
commands.insert(1, '--color')
p = subprocess.Popen([self._gitexecutable] + commands, bufsize=-1,
cwd=cwd, env=env, close_fds=util.closefds,
stdout=subprocess.PIPE, stderr=errpipe)