Fix doctring indentation issue in #241

[sandhu]

Added code to only apply the prefix if the current indent level is <=
the default prefix spacing.

[bbatsov]

We need to implement some indentation tests first. See my comments here #283

If you get the ball rolling on the tests, I'll gladly accept the patch. As it stands, with no indentation tests every change is a potential problem and I'd rather avoid those.

[sandhu]

Fair point. I'll look into creating the tests.

[bbatsov]

@sandhu Ping :-)

[bbatsov]

Btw, I just added some basic indentation tests to get you started.

[expez]

@sandhu Did you get around to looking at the tests for this fix?

[sandhu]

Sorry. Seem to have missed the ping from @bbatsov as well.

Will take a look at them this weekend and update the PR.

[sandhu]

Added the doc string indentation tests

[expez]

Cool. Could you squash the commits?

[sandhu]

Done.

[expez]

There's still an empty merge commit.

[sandhu]

I've removed the merge commit, but I now have merge conflicts. Will add it back in.

[sandhu]

I've added the merge commit back in since it shows conflicts without it there.

[expez]

We don't want merge commits polluting our history. In the contribution guidelines there's this link about how to rebase to avoid creating merge commits.

git rebase is a very powerful tool so even if this is pissing you off, your future self will benefit from having learned about it :)

[bbatsov]

You should rebase on top of the current master.

On Saturday, June 13, 2015, Achint Sandhu [email protected] wrote:

I've added the merge commit back in since it shows conflicts without it
there.

—
Reply to this email directly or view it on GitHub
#289 (comment)
.

Best Regards,
Bozhidar Batsov

http://www.batsov.com

[sandhu]

I don't generally rebase since it's not an accurate reflection of the history, but since it's your repo, I'm happy to play along. :-)

Just pushed a rebased version.

[bbatsov]

Thanks!

[sandhu]

No worries. Thanks for the merge.