From patchwork Sun Jul 4 11:54:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 31126 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6764D27BC81; Sun, 4 Jul 2021 12:55:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2BAA727BC78 for ; Sun, 4 Jul 2021 12:55:22 +0100 (BST) Received: from localhost ([::1]:60240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m00iX-000462-95 for patchwork@mira.cbaines.net; Sun, 04 Jul 2021 07:55:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m00iF-0003oR-2O for guix-patches@gnu.org; Sun, 04 Jul 2021 07:55:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57150) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m00iE-0006z4-RN for guix-patches@gnu.org; Sun, 04 Jul 2021 07:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m00iE-0000cY-R6 for guix-patches@gnu.org; Sun, 04 Jul 2021 07:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48999] [PATCH v2 2/3] import: utils: Add predicates for checking VCS repositories. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Jul 2021 11:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48999 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48999@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , zimoun Received: via spool by 48999-submit@debbugs.gnu.org id=B48999.16253996662301 (code B ref 48999); Sun, 04 Jul 2021 11:55:02 +0000 Received: (at 48999) by debbugs.gnu.org; 4 Jul 2021 11:54:26 +0000 Received: from localhost ([127.0.0.1]:40458 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m00he-0000b3-1x for submit@debbugs.gnu.org; Sun, 04 Jul 2021 07:54:26 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:45484 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m00hc-0000an-93 for 48999@debbugs.gnu.org; Sun, 04 Jul 2021 07:54:24 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1625399658; bh=SUKiCktpIliPTlYO8GWL93wkIVLqZ5R0FlszaIM3rEs=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=Rb0aWdAPebKvEL/t+UpT2eCtw55cQXVCTxB+QEGz5Nr13MamNNHIV56uQwfoenaeD qAyU5fjH+bjQrz3OboC489mj93AEr8RbtP1Eqn0qb/TKGq/aZZiKxYb3YMpzTGC8N3 M8ExhT6vBPOcnpIyCzmrrzi/+JcUeUKutJCvTWSc= In-Reply-To: References: Message-Id: <6f3fa1769c57d6c81765939a40b1c505d0cefb66.1625399149.git.public@yoctocell.xyz> Date: Sun, 04 Jul 2021 13:54:18 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/import/utils.scm (git-repository?, hg-repository?): New procedures. --- guix/import/utils.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index d817318a91..bcf26ae363 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020 Helio Machado <0x2b3bfa0+guix@googlemail.com> ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +44,7 @@ #:use-module (ice-9 rdelim) #:use-module (ice-9 receive) #:use-module (ice-9 regex) + #:use-module (ice-9 ftw) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) #:use-module (srfi srfi-11) @@ -74,6 +76,9 @@ guix-name + git-repository? + hg-repository? + recursive-import)) (define (factorize-uri uri version) @@ -422,6 +427,16 @@ separated by PRED." (chr (char-downcase chr))) name))) +(define (git-repository? directory) + "Check whether DIRECTORY is a Git repository." + (let ((contents (scandir directory))) + (if (member ".git" contents) #t #f))) + +(define (hg-repository? directory) + "Check whether DIRECTORY is a Hg repository." + (let ((contents (scandir directory))) + (if (member ".hg" contents) #t #f))) + (define (topological-sort nodes node-dependencies node-name)