[PATCH 3 of 7] color: move git-subrepo support into the subrepo module

Yuya Nishihara yuya at tcha.org
Mon Feb 27 09:39:01 EST 2017


On Sat, 25 Feb 2017 14:11:35 +0100, Pierre-Yves David wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
> # Date 1487695804 -3600
> #      Tue Feb 21 17:50:04 2017 +0100
> # Node ID 81c3db1bc60255c7a5a1455106f4fb69b96b3658
> # Parent  03ad2d8bdc83713c1aee2ac729c4710c3bcd06a2
> # EXP-Topic color
> color: move git-subrepo support into the subrepo module

> --- a/mercurial/subrepo.py	Thu Dec 22 14:30:46 2016 +0100
> +++ b/mercurial/subrepo.py	Tue Feb 21 17:50:04 2017 +0100
> @@ -1410,6 +1410,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')

Fixed excessive indent in flight.


More information about the Mercurial-devel mailing list