Bug #9555

Whitespace in code

Added by Ken Barber 8 months ago. Updated 3 months ago.

Status:Closed Start date:09/16/2011
Priority:Low Due date:
Assignee:Ken Barber % Done:

0%
Category:-
Target version:-
Keywords:whitespace Affected Facter version:
Branch:https://github.com/puppetlabs/facter/pull/75
Votes: 0

Description

So there is some mismatched whitespace throughout the facter code due to an older 4 space convention I believe. This ticket is to cover that fix. It doesn’t affect every file – just some of the core ones I believe. Anyway – someone will have to go through the files and fix this.

I figured its better to fix this sooner rather then later :–).

History

#1
Updated by Ken Barber 8 months ago

  • Target version set to 2.0.0

#2
Updated by Ken Barber 8 months ago

  • Branch set to kbarber/facter/ticket/9555-fix_whitespace

I get the feeling whitespace changes aren’t as straight-forward as I thought with git.

There is a merge strategy option ‘-X ignore-all-spaces’ but it effectively means your overwriting your local space changes as apposed to the changes we are pulling in – ie. its the wrong direction.

When people rebase at least, they can use:

git rebase --ignore-whitespace master

And it will allow them to manually go and fix changes on the rebase. This is something.

I think largely when you try to merge changes with whitespace mismatch we’re going to get conflicts that need to be resolved. Its a pain basically. The biggest pain would be forward porting changes on the 1.6.x branch to 1.7.

Anyway – I’ve got a patch in a topic branch so we can see how bad the change is.

#3
Updated by Ken Barber 8 months ago

  • Status changed from Unreviewed to Investigating

#4
Updated by Ken Barber 8 months ago

  • Assignee set to Ken Barber

#5
Updated by Ken Barber 8 months ago

  • Status changed from Investigating to Merged - Pending Release
  • Target version changed from 2.0.0 to 1.6.x
  • Keywords set to whitespace
  • Branch changed from kbarber/facter/ticket/9555-fix_whitespace to https://github.com/puppetlabs/facter/pull/74
  • Affected Facter version changed from 1.6.1rc3 to 1.6.1

This is ready to go. Please merge ASAP to avoid horrible rebases. This may include minimal changes for master … but it shouldn’t be that widespread yet if done very soon.

#6
Updated by Ben Hughes 8 months ago

  • Status changed from Merged - Pending Release to In Topic Branch Pending Review

#7
Updated by Ken Barber 8 months ago

  • Status changed from In Topic Branch Pending Review to Merged - Pending Release

Merged into 1.6.x and master.

#8
Updated by Ken Barber 8 months ago

  • Status changed from Merged - Pending Release to In Topic Branch Pending Review
  • Branch changed from https://github.com/puppetlabs/facter/pull/74 to https://github.com/puppetlabs/facter/pull/75

I had missed the spec tests in the last pull request. This new one amends that.

#9
Updated by Ken Barber 8 months ago

  • Status changed from In Topic Branch Pending Review to Merged - Pending Release

#10
Updated by Garrett Honeycutt 8 months ago

I went through the rest of the code and got rid of the trailing whitespace

https://github.com/puppetlabs/facter/pull/77

#11
Updated by Michael Stahnke 8 months ago

  • Status changed from Merged - Pending Release to Closed
  • Target version changed from 1.6.x to 1.6.2

Released as part of 1.6.2.

#12
Updated by Garrett Honeycutt 7 months ago

  • Status changed from Closed to Re-opened

Removed more trailing whitespace

https://github.com/puppetlabs/facter/pull/82

#13
Updated by Garrett Honeycutt 7 months ago

  • Status changed from Re-opened to In Topic Branch Pending Review

#14
Updated by Garrett Honeycutt 7 months ago

  • Status changed from In Topic Branch Pending Review to Merged - Pending Release

#15
Updated by Garrett Honeycutt 7 months ago

  • Status changed from Merged - Pending Release to Closed

#16
Updated by Garrett Honeycutt 3 months ago

  • Status changed from Closed to Re-opened
  • Target version deleted (1.6.2)
  • Affected Facter version deleted (1.6.1)

#17
Updated by Garrett Honeycutt 3 months ago

  • Status changed from Re-opened to In Topic Branch Pending Review

https://github.com/puppetlabs/facter/pull/169

#18
Updated by Ken Barber 3 months ago

  • Status changed from In Topic Branch Pending Review to Closed

Can you please open a new ticket for this?

Also available in: Atom PDF