Merge remote-tracking branch 'szpak/topic/pushDryRun'

build.gradle

@@ -79,5 +79,5 @@ test {
 }
 
 wrapper {
-	gradleVersion = '2.1'
+	gradleVersion = '2.2.1'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Oct 19 15:59:24 CDT 2014
+#Thu Dec 11 23:51:19 CET 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip

src/main/groovy/org/ajoberstar/grgit/operation/PushOp.groovy

@@ -88,6 +88,15 @@ class PushOp implements Callable<Void> {
 	 */
 	boolean force = false
 
+	/**
+	 * {@code true} if result of this operation should be just estimation
+	 * of real operation result, no real push is performed.
+	 * {@code false} (the default) if real push to remote repo should be performed.
+	 *
+	 * @since 0.4.1
+	 */
+	boolean dryRun = false
+
 	PushOp(Repository repo) {
 		this.repo = repo
 	}
@@ -100,6 +109,7 @@ class PushOp implements Callable<Void> {
 		if (all) { cmd.setPushAll() }
 		if (tags) { cmd.setPushTags() }
 		cmd.force = force
+		cmd.dryRun = dryRun
 		try {
 			cmd.call()
 			return null

src/test/groovy/org/ajoberstar/grgit/operation/PushOpSpec.groovy

@@ -102,4 +102,23 @@ class PushOpSpec extends MultiGitOpSpec {
 		GitTestUtil.resolve(localGrgit, 'refs/heads/my-branch') == GitTestUtil.resolve(remoteGrgit, 'refs/heads/other-branch')
 		!GitTestUtil.tags(remoteGrgit)
 	}
+
+	def 'push in dryRun mode does not push commits'() {
+		given:
+		def remoteMasterHead = GitTestUtil.resolve(remoteGrgit, 'refs/heads/master')
+		when:
+		localGrgit.push(dryRun: true)
+		then:
+		GitTestUtil.resolve(localGrgit, 'refs/heads/master') != GitTestUtil.resolve(remoteGrgit, 'refs/heads/master')
+		GitTestUtil.resolve(remoteGrgit, 'refs/heads/master') == remoteMasterHead
+	}
+
+	def 'push in dryRun mode does not push tags'() {
+		given:
+		def remoteMasterHead = GitTestUtil.resolve(remoteGrgit, 'refs/heads/master')
+		when:
+		localGrgit.push(dryRun: true, tags: true)
+		then:
+		!GitTestUtil.tags(remoteGrgit)
+	}
 }

src/test/groovy/org/ajoberstar/grgit/operation/StatusOpSpec.groovy

@@ -74,7 +74,7 @@ class StatusOpSpec extends SimpleGitOpSpec {
 		grgit.status() == new Status(staged: [modified: ['1.txt', '2.txt']])
 	}
 
-	def 'staged new files detected'() {
+	def 'staged removed files detected'() {
 		given:
 		assert repoFile('3.txt').delete()
 		assert repoFile('0.txt').delete()