Mercurial > public > develkit
changeset 144:7fead80bdd6a
handle merge working directories (multiple parent branches)
| author | Dave Smith <smith@nwoca.org> |
|---|---|
| date | Fri, 25 Oct 2013 21:27:11 +0100 |
| parents | 1963264c39c4 |
| children | cea4e793a3f4 |
| files | init.gradle |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/init.gradle Fri Oct 25 21:21:28 2013 +0100 +++ b/init.gradle Fri Oct 25 21:27:11 2013 +0100 @@ -27,6 +27,7 @@ try { gradle.ext.branchName = "hg branch".execute().text.trim() def parents = "hg parents --template \"{branch} \"".execute().text.trim().split(" ") + println "working directory parents: $parents " def parent = parents.find { it != 'default' } gradle.ext.branchName = parent ?: gradle.branchName gradle.ext.hgRepositoryUrl = ("hg path".execute().text.split('=') ?: ['',''] )[1].trim() @@ -37,7 +38,7 @@ def flows = new Properties() flows.load(file('.hgflow').newReader()) flows.stringPropertyNames().each { - if (!it.startsWith("[") && gradle.ext.branchName.startsWith(flows.getProperty(it))) { + if (!it.startsWith("[") && gradle.branchName.startsWith(flows.getProperty(it))) { gradle.ext.branchStream = it } }