From 049322702b5629c1058249370d38ae8d23f47bdd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 30 Oct 2017 10:25:08 +0100 Subject: [PATCH] fetchgit -> fetchGit Almost all other primops are camelCase so no reason not to use that here. --- doc/manual/release-notes/rl-1.12.xml | 2 +- src/libexpr/primops/fetchgit.cc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/manual/release-notes/rl-1.12.xml b/doc/manual/release-notes/rl-1.12.xml index adfbaa157..d8fc2bcf8 100644 --- a/doc/manual/release-notes/rl-1.12.xml +++ b/doc/manual/release-notes/rl-1.12.xml @@ -184,7 +184,7 @@ - builtins.fetchgit. + builtins.fetchGit. (38539b943a060d9cdfc24d6e5d997c0885b8aa2f) diff --git a/src/libexpr/primops/fetchgit.cc b/src/libexpr/primops/fetchgit.cc index 4c5799bfe..18107f5cd 100644 --- a/src/libexpr/primops/fetchgit.cc +++ b/src/libexpr/primops/fetchgit.cc @@ -88,10 +88,10 @@ Path exportGit(ref store, const std::string & uri, return storePath; } -static void prim_fetchgit(EvalState & state, const Pos & pos, Value * * args, Value & v) +static void prim_fetchGit(EvalState & state, const Pos & pos, Value * * args, Value & v) { // FIXME: cut&paste from fetch(). - if (state.restricted) throw Error("'fetchgit' is not allowed in restricted mode"); + if (state.restricted) throw Error("'fetchGit' is not allowed in restricted mode"); std::string url; std::string ref = "master"; @@ -118,7 +118,7 @@ static void prim_fetchgit(EvalState & state, const Pos & pos, Value * * args, Va else if (n == "name") name = state.forceStringNoCtx(*attr.value, *attr.pos); else - throw EvalError("unsupported argument '%s' to 'fetchgit', at %s", attr.name, *attr.pos); + throw EvalError("unsupported argument '%s' to 'fetchGit', at %s", attr.name, *attr.pos); } if (url.empty()) @@ -132,6 +132,6 @@ static void prim_fetchgit(EvalState & state, const Pos & pos, Value * * args, Va mkString(v, storePath, PathSet({storePath})); } -static RegisterPrimOp r("__fetchgit", 1, prim_fetchgit); +static RegisterPrimOp r("fetchGit", 1, prim_fetchGit); }