Use starting-revision filter instead of branch
The "branch" filter was renamed to "starting-revision"
in change I85703b6d. Amend the ETL calls to use the
new filter name.
Change-Id: I81c31e68cc8f51c45e9590ef4628132fcb917d59
diff --git a/README.md b/README.md
index 7abdcfd..5676b03 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@
see: https://gerrit.googlesource.com/plugins/analytics/+/master/README.md
- -u --url Gerrit server URL with the analytics plugins installed
- -m --manifest Repo manifest XML path. Absolute path of the Repo manifest XML to import project
-from. Each project will be imported with the branch specified in the `revision` attribute.
+from. Each project will be imported from the revision specified in the `revision` attribute.
- -n --manifest-branch (*optional*) Manifest branch. Manifest file git branch.
- -l --manifest-label (*optional*) Manifest label. A `manifest_label` is an aggregation of projects imported from the same manifest.
Add it to allow filtering by `manifest_label`.
diff --git a/gitcommits/src/main/scala/com/gerritforge/analytics/gitcommits/model/GerritEndpointConfig.scala b/gitcommits/src/main/scala/com/gerritforge/analytics/gitcommits/model/GerritEndpointConfig.scala
index 53e26c7..5a1c0f7 100644
--- a/gitcommits/src/main/scala/com/gerritforge/analytics/gitcommits/model/GerritEndpointConfig.scala
+++ b/gitcommits/src/main/scala/com/gerritforge/analytics/gitcommits/model/GerritEndpointConfig.scala
@@ -80,7 +80,7 @@
def contributorsUrl(project: GerritProjectWithRef): Option[String] =
baseUrl.map { url =>
- val refFilter = project.refName.fold("")(ref => s"&branch=$ref")
+ val refFilter = project.refName.fold("")(ref => s"&starting-revision=$ref")
s"$url/projects/${project.id}/analytics~contributors$queryString$refFilter"
}
}
diff --git a/gitcommits/src/test/scala/com/gerritforge/analytics/gitcommits/model/GerritEndpointConfigTest.scala b/gitcommits/src/test/scala/com/gerritforge/analytics/gitcommits/model/GerritEndpointConfigTest.scala
index eb2563d..fb7b23f 100644
--- a/gitcommits/src/test/scala/com/gerritforge/analytics/gitcommits/model/GerritEndpointConfigTest.scala
+++ b/gitcommits/src/test/scala/com/gerritforge/analytics/gitcommits/model/GerritEndpointConfigTest.scala
@@ -37,7 +37,7 @@
"contributorsUrl" should "" in {
val conf = GerritEndpointConfig(baseUrl = Some("testBaseUrl"), prefix = None)
conf.contributorsUrl(GerritProjectWithRef("opensbi","opensbi",Some("refs/tags/v0.8"))) should be
- (Some(s"testBaseUrl/projects/opensbi/analytics~contributors?&branch=refs/tags/v0.8"))
+ (Some(s"testBaseUrl/projects/opensbi/analytics~contributors?&starting-revision=refs/tags/v0.8"))
}
"projectsFromManifest" should "return projects contained in a repo manifest XML" in {
