Skip to content

Format diff task #988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iamdanfox merged 13 commits into from
Oct 23, 2019
Merged

Format diff task #988

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
374fbda
Format diff task
CRogers Oct 21, 2019
8d8a5ca
use new class name
iamdanfox Oct 22, 2019
79d51dd
Add generated changelog entries
iamdanfox Oct 22, 2019
9b07712
WIP test
iamdanfox Oct 22, 2019
3cb742b
git add and git commit
iamdanfox Oct 22, 2019
65026aa
Nice description
iamdanfox Oct 22, 2019
6f89efc
-Drecreate=true
iamdanfox Oct 22, 2019
4110d46
Move group and onlyIf
iamdanfox Oct 22, 2019
bf66fd2
Don't require the feature flag
iamdanfox Oct 22, 2019
86f457c
Redundant modifier
iamdanfox Oct 22, 2019
da5fb85
Merge remote-tracking branch 'origin/develop' into format-diff
iamdanfox Oct 23, 2019
3e68a7d
Use the upstream formatDiff task
iamdanfox Oct 23, 2019
4fbd7ff
test passes
iamdanfox Oct 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
git add and git commit
  • Loading branch information
@iamdanfox
iamdanfox committed Oct 22, 2019
commit 3cb742bab2d71a48d2e521a76c3e33d3bd66838c
9 changes: 5 additions & 4 deletions ...-baseline-java/src/test/groovy/com/palantir/baseline/BaselineFormatIntegrationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,9 @@ class BaselineFormatIntegrationTest extends AbstractPluginTest {
def 'formatDiff updates only relevant chunks of files'() {
when:
buildFile << standardBuildFile
"git init".execute(Collections.emptyList(), projectDir)
"git config user.name Foo".execute(Collections.emptyList(), projectDir)
"git config user.email [email protected]".execute(Collections.emptyList(), projectDir)
"git init".execute(Collections.emptyList(), projectDir).waitFor()
"git config user.name Foo".execute(Collections.emptyList(), projectDir).waitFor()
"git config user.email [email protected]".execute(Collections.emptyList(), projectDir).waitFor()

file('src/main/java/Main.java') << '''
class Main {
Expand All @@ -237,7 +237,8 @@ class BaselineFormatIntegrationTest extends AbstractPluginTest {
}
'''.stripIndent()

"git commit --allow-empty -m Commit".execute(Collections.emptyList(), projectDir)
"git add .".execute(Collections.emptyList(), projectDir).waitFor()
"git commit -m Commit".execute(Collections.emptyList(), projectDir).waitFor()

file('src/main/java/Main.java').text = '''
class Main {
Expand Down