Patchwork [03,of,12,topics] flake8: fix E127 style

login
register
mail settings
Submitter Sean Farley
Date Aug. 31, 2016, 3:58 a.m.
Message ID <a6f4b32f655ba8958756.1472615889@laptop.local>
Download mbox | patch
Permalink /patch/16501/
State Accepted
Headers show

Comments

Sean Farley - Aug. 31, 2016, 3:58 a.m.
# HG changeset patch
# User Sean Farley <sean@farley.io>
# Date 1472591416 25200
#      Tue Aug 30 14:10:16 2016 -0700
# Node ID a6f4b32f655ba895875640534b051c5ebe632695
# Parent  78dd9f1db1b1cf5a869e1240bb4ed523e930c907
# EXP-Topic flake8
flake8: fix E127 style
Augie Fackler - Aug. 31, 2016, 12:56 p.m.
On Tue, Aug 30, 2016 at 08:58:09PM -0700, Sean Farley wrote:
> # HG changeset patch
> # User Sean Farley <sean@farley.io>
> # Date 1472591416 25200
> #      Tue Aug 30 14:10:16 2016 -0700
> # Node ID a6f4b32f655ba895875640534b051c5ebe632695
> # Parent  78dd9f1db1b1cf5a869e1240bb4ed523e930c907
> # EXP-Topic flake8
> flake8: fix E127 style

I might suggest describing what e127 is in the log message? This kind
of buries the lede in terms of actual content changes IMO.

>
> diff --git a/hgext3rd/topic/topicmap.py b/hgext3rd/topic/topicmap.py
> --- a/hgext3rd/topic/topicmap.py
> +++ b/hgext3rd/topic/topicmap.py
> @@ -125,11 +125,11 @@ class topiccache(oldbranchcache):
>              if (self.tipnode == repo.changelog.node(self.tiprev)):
>                  fh = scmutil.filteredhash(repo, self.tiprev)
>                  if fh is None:
>                      fh = nullid
>                  if ((self.filteredhash == fh)
> -                     and (self.phaseshash == _phaseshash(repo, self.tiprev))):
> +                    and (self.phaseshash == _phaseshash(repo, self.tiprev))):
>                      return True
>              return False
>          except IndexError:
>              return False
>
> diff --git a/setup.cfg b/setup.cfg
> --- a/setup.cfg
> +++ b/setup.cfg
> @@ -1,2 +1,2 @@
>  [flake8]
> -ignore = E261, E266, E302, E129, E731, E124, E713, E301, E501, E111, E123, E222, W503, W391, E127
> +ignore = E261, E266, E302, E129, E731, E124, E713, E301, E501, E111, E123, E222, W503, W391
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Sean Farley - Aug. 31, 2016, 5:22 p.m.
Augie Fackler <raf@durin42.com> writes:

> On Tue, Aug 30, 2016 at 08:58:09PM -0700, Sean Farley wrote:
>> # HG changeset patch
>> # User Sean Farley <sean@farley.io>
>> # Date 1472591416 25200
>> #      Tue Aug 30 14:10:16 2016 -0700
>> # Node ID a6f4b32f655ba895875640534b051c5ebe632695
>> # Parent  78dd9f1db1b1cf5a869e1240bb4ed523e930c907
>> # EXP-Topic flake8
>> flake8: fix E127 style
>
> I might suggest describing what e127 is in the log message? This kind
> of buries the lede in terms of actual content changes IMO.

Good point. I guess I should have marked this as RFC-ish. For reference,
this style is about indentation not lining up with the previous line.
Pierre-Yves David - Sept. 6, 2016, 11:43 a.m.
On 08/31/2016 02:56 PM, Augie Fackler wrote:
> On Tue, Aug 30, 2016 at 08:58:09PM -0700, Sean Farley wrote:
>> # HG changeset patch
>> # User Sean Farley <sean@farley.io>
>> # Date 1472591416 25200
>> #      Tue Aug 30 14:10:16 2016 -0700
>> # Node ID a6f4b32f655ba895875640534b051c5ebe632695
>> # Parent  78dd9f1db1b1cf5a869e1240bb4ed523e930c907
>> # EXP-Topic flake8
>> flake8: fix E127 style
>
> I might suggest describing what e127 is in the log message? This kind
> of buries the lede in terms of actual content changes IMO.

+1, I'll take patch anyway when the rules is obvious but that would have 
helped.

Cheers,

Patch

diff --git a/hgext3rd/topic/topicmap.py b/hgext3rd/topic/topicmap.py
--- a/hgext3rd/topic/topicmap.py
+++ b/hgext3rd/topic/topicmap.py
@@ -125,11 +125,11 @@  class topiccache(oldbranchcache):
             if (self.tipnode == repo.changelog.node(self.tiprev)):
                 fh = scmutil.filteredhash(repo, self.tiprev)
                 if fh is None:
                     fh = nullid
                 if ((self.filteredhash == fh)
-                     and (self.phaseshash == _phaseshash(repo, self.tiprev))):
+                    and (self.phaseshash == _phaseshash(repo, self.tiprev))):
                     return True
             return False
         except IndexError:
             return False
 
diff --git a/setup.cfg b/setup.cfg
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,2 @@ 
 [flake8]
-ignore = E261, E266, E302, E129, E731, E124, E713, E301, E501, E111, E123, E222, W503, W391, E127
+ignore = E261, E266, E302, E129, E731, E124, E713, E301, E501, E111, E123, E222, W503, W391