# HG changeset patch # User smith@nwoca.org # Date 1418510689 0 # Node ID f9087f939b0a33b51ce2d9192a053cdbfac8e69f # Parent 5a3a875a1f3ebe5f8badac97901e758d03261347 correct handling of hgflow file when in subproject diff -r 5a3a875a1f3e -r f9087f939b0a init20.gradle --- a/init20.gradle Sat Dec 13 18:43:34 2014 +0000 +++ b/init20.gradle Sat Dec 13 22:44:49 2014 +0000 @@ -487,7 +487,7 @@ @ToString class BranchInfo { def name - def stream + def stream = "none" BranchInfo(name) { this.name = name @@ -515,9 +515,10 @@ } void determineStream() { - if (new File('.hgflow').exists()) { + def flowConfig = new File('.hgflow').exists() ? new File('.hgflow') : new File('../.hgflow') + if (flowConfig.exists()) { def flows = new Properties() - flows.load(new File('.hgflow').newReader()) + flows.load(flowConfig.newReader()) flows.stringPropertyNames().each { if (!it.startsWith("[") && name.startsWith(flows.getProperty(it))) { stream = it