From d22f466823192963c22eb8f51ae930cb5af8fa9a Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 30 Aug 2018 23:14:51 +0300 Subject: Add support for git repositories to brep-load --- mod/page.cxx | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) (limited to 'mod/page.cxx') diff --git a/mod/page.cxx b/mod/page.cxx index 3a6e989..46b5e71 100644 --- a/mod/page.cxx +++ b/mod/page.cxx @@ -401,7 +401,7 @@ namespace brep // set names; for (const auto& da: d) - names.emplace (da.name ()); + names.emplace (da.name); bool mult (names.size () > 1); @@ -411,7 +411,7 @@ namespace brep bool first (true); for (const auto& da: d) { - package_name n (da.name ()); + const package_name& n (da.name); if (names.find (n) != names.end ()) { names.erase (n); @@ -421,24 +421,32 @@ namespace brep else s << " | "; - shared_ptr p (da.package.load ()); - assert (p->internal () || !p->other_repositories.empty ()); - - shared_ptr r ( - p->internal () - ? p->internal_repository.load () - : p->other_repositories[0].load ()); - - auto en (mime_url_encode (n.string (), false)); - - if (r->url) - s << A(HREF=*r->url + en) << n << ~A; - else if (p->internal ()) - s << A(HREF=root_ / path (en)) << n << ~A; + // Try to display the dependency as a link if it is resolved. + // Otherwise display it as plain text. + // + if (da.package != nullptr) + { + shared_ptr p (da.package.load ()); + assert (p->internal () || !p->other_repositories.empty ()); + + shared_ptr r ( + p->internal () + ? p->internal_repository.load () + : p->other_repositories[0].load ()); + + auto en (mime_url_encode (n.string (), false)); + + if (r->interface_url) + s << A(HREF=*r->interface_url + en) << n << ~A; + else if (p->internal ()) + s << A(HREF=root_ / path (en)) << n << ~A; + else + // Display the dependency as plain text if no repository URL + // available. + // + s << n; + } else - // Display the dependency as a plain text if no repository URL - // available. - // s << n; } } -- cgit v1.1