| Message ID | 1350280066-23320-1-git-send-email-albert.u.boot@aribaud.net |
|---|---|
| State | Superseded, archived |
| Headers | show |
Hi Albert, On Sun, Oct 14, 2012 at 10:47 PM, Albert ARIBAUD <albert.u.boot@aribaud.net> wrote: > Colored logs confuse patman when analyzing logs. > Add --no-color option in git log commands in case > the default config has color. > > Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net> > --- > tools/patman/gitutil.py | 2 +- > tools/patman/patchstream.py | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Thanks for the patch, it's good to find this problem. > > diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py > index 59eca99..72d37a0 100644 > --- a/tools/patman/gitutil.py > +++ b/tools/patman/gitutil.py > @@ -38,7 +38,7 @@ def CountCommitsToBranch(): > Return: > Number of patches that exist on top of the branch > """ > - pipe = [['git', 'log', '--oneline', '@{upstream}..'], > + pipe = [['git', 'log', '--no-color', '--oneline', '@{upstream}..'], > ['wc', '-l']] > stdout = command.RunPipe(pipe, capture=True, oneline=True) > patch_count = int(stdout) > diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py > index 0503bac..4314537 100644 > --- a/tools/patman/patchstream.py > +++ b/tools/patman/patchstream.py > @@ -344,7 +344,7 @@ def GetMetaData(start, count): > start: Commit to start from: 0=HEAD, 1=next one, etc. > count: Number of commits to list > """ > - pipe = [['git', 'log', '--reverse', 'HEAD~%d' % start, '-n%d' % count]] > + pipe = [['git', 'log', '--no-color', '--reverse', 'HEAD~%d' % start, '-n%d' % count]] The functionality is good, but can I ask for 80 columns on this one please? > stdout = command.RunPipe(pipe, capture=True) > series = Series() > ps = PatchStream(series, is_log=True) > -- > 1.7.9.5 > Regards, Simon
Hi Simon, On Mon, 15 Oct 2012 10:20:59 -0700, Simon Glass <sjg@chromium.org> wrote: > Hi Albert, > > On Sun, Oct 14, 2012 at 10:47 PM, Albert ARIBAUD > <albert.u.boot@aribaud.net> wrote: > > Colored logs confuse patman when analyzing logs. > > Add --no-color option in git log commands in case > > the default config has color. > > > > Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net> > > --- > > tools/patman/gitutil.py | 2 +- > > tools/patman/patchstream.py | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > Thanks for the patch, it's good to find this problem. > > > > > diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py > > index 59eca99..72d37a0 100644 > > --- a/tools/patman/gitutil.py > > +++ b/tools/patman/gitutil.py > > @@ -38,7 +38,7 @@ def CountCommitsToBranch(): > > Return: > > Number of patches that exist on top of the branch > > """ > > - pipe = [['git', 'log', '--oneline', '@{upstream}..'], > > + pipe = [['git', 'log', '--no-color', '--oneline', '@{upstream}..'], > > ['wc', '-l']] > > stdout = command.RunPipe(pipe, capture=True, oneline=True) > > patch_count = int(stdout) > > diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py > > index 0503bac..4314537 100644 > > --- a/tools/patman/patchstream.py > > +++ b/tools/patman/patchstream.py > > @@ -344,7 +344,7 @@ def GetMetaData(start, count): > > start: Commit to start from: 0=HEAD, 1=next one, etc. > > count: Number of commits to list > > """ > > - pipe = [['git', 'log', '--reverse', 'HEAD~%d' % start, '-n%d' % count]] > > + pipe = [['git', 'log', '--no-color', '--reverse', 'HEAD~%d' % start, '-n%d' % count]] > > The functionality is good, but can I ask for 80 columns on this one please? Done. :) > > stdout = command.RunPipe(pipe, capture=True) > > series = Series() > > ps = PatchStream(series, is_log=True) > > -- > > 1.7.9.5 > > > > Regards, > Simon Amicalement,
diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index 59eca99..72d37a0 100644 --- a/tools/patman/gitutil.py +++ b/tools/patman/gitutil.py @@ -38,7 +38,7 @@ def CountCommitsToBranch(): Return: Number of patches that exist on top of the branch """ - pipe = [['git', 'log', '--oneline', '@{upstream}..'], + pipe = [['git', 'log', '--no-color', '--oneline', '@{upstream}..'], ['wc', '-l']] stdout = command.RunPipe(pipe, capture=True, oneline=True) patch_count = int(stdout) diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py index 0503bac..4314537 100644 --- a/tools/patman/patchstream.py +++ b/tools/patman/patchstream.py @@ -344,7 +344,7 @@ def GetMetaData(start, count): start: Commit to start from: 0=HEAD, 1=next one, etc. count: Number of commits to list """ - pipe = [['git', 'log', '--reverse', 'HEAD~%d' % start, '-n%d' % count]] + pipe = [['git', 'log', '--no-color', '--reverse', 'HEAD~%d' % start, '-n%d' % count]] stdout = command.RunPipe(pipe, capture=True) series = Series() ps = PatchStream(series, is_log=True)
Colored logs confuse patman when analyzing logs. Add --no-color option in git log commands in case the default config has color. Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net> --- tools/patman/gitutil.py | 2 +- tools/patman/patchstream.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)