Special support for Mergify config changes

README.md

@@ -15,7 +15,7 @@ Because this is new, it is still up to a human to identify the pull request as p
 
 ### Hub
 
-You need to have Hub installed, see <https://hub.github.com/>.
+You need to have `hub` installed, see <https://hub.github.com/>.
 
 ### Project forks
 

src/main/resources/2.7.x.conf

@@ -7,7 +7,6 @@ templatecontrol {
     copy = [
       { path = "/LICENSE", template = "LICENSE" },
       { path = "/NOTICE", template = "NOTICE" },
-      { path = "/.mergify.yml", template = ".mergify.yml" },
       { path = "/.github/settings.yml", template = "settings.yml" },
       {
         path = "/.travis.yml",

src/main/scala/templatecontrol/Config.scala

@@ -2,6 +2,7 @@ package templatecontrol
 
 import better.files.File
 import com.typesafe.config.Config
+import com.typesafe.config.ConfigFactory
 import net.ceedubs.ficus.Ficus._
 import net.ceedubs.ficus.readers.ArbitraryTypeReader._
 import net.ceedubs.ficus.readers.ValueReader
@@ -35,7 +36,14 @@ final case class TemplateControlConfig(
     github: GithubConfig,
     branchConfigs: Seq[BranchConfig],
     noPush: Boolean = false,
-)
+    noPr: Boolean = false,
+) {
+  def branchConfigFor(branchName: String): BranchConfig = {
+    branchConfigs
+      .find(_.name == branchName)
+      .getOrElse(BranchConfig(branchName, ConfigFactory.parseString("{ copy = [], finders = [] }")))
+  }
+}
 
 object TemplateControlConfig {
 

src/main/scala/templatecontrol/GitProject.scala

@@ -22,10 +22,11 @@ trait GitProject {
   def branches(): Seq[Ref]
   def createBranch(branchName: String, startPoint: String): Ref
   def checkout(branchName: String): Ref
+  def fastForward(remote: String, branchName: String): MergeResult
   def add(): DirCache
   def commit(message: String): RevCommit
   def branchCreate(branchName: String): Ref
-  def push(name: String, force: Boolean = false): Iterable[PushResult]
+  def push(remote: String, name: String, force: Boolean = false): Iterable[PushResult]
   def status(): Status
   def log(): Iterable[RevCommit]
   def close(): Unit

src/main/scala/templatecontrol/Task.scala

@@ -53,7 +53,7 @@ final class CopyTask(c: Config) extends Task {
   }
 
   def execute(workingDir: File): Seq[TaskResult] = {
-    val repoName = workingDir.path.getFileName.toString
+    val repoName = workingDir.name
     copyConfigs.filter(c => !c.exclude.contains(repoName)).flatMap { c =>
       val source: File = findTemplate(c.template)
       val dest: File   = file"${workingDir.path.toAbsolutePath}${c.path}"