;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; ;;; GNU Guix is free software; you can redistribute it and/or modify it ;;; under the terms of the GNU General Public License as published by ;;; the Free Software Foundation; either version 3 of the License, or (at ;;; your option) any later version. ;;; ;;; GNU Guix is distributed in the hope that it will be useful, but ;;; WITHOUT ANY WARRANTY; without even the implied warranty of ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;;; GNU General Public License for more details. ;;; ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see . (define-module (test-git) #:use-module (git) #:use-module (guix git) #:use-module (guix tests git) #:use-module (guix build utils) #:use-module (srfi srfi-1) #:use-module (srfi srfi-64)) ;; Test the (guix
aboutsummaryrefslogtreecommitdiff

ary-git-repository directory '((add "a.txt" "A") (commit "first commit") (branch "devel") (checkout "devel") (add "devel/1.txt" "1") (commit "first devel commit") (add "devel/2.txt" "2") (commit "second devel commit") (checkout "master") (add "b.txt" "B") (commit "second commit") (add "c.txt" "C") (commit "third commit") (merge "devel" "merge") (add "d.txt" "D") (commit "fourth commit")) (with-repository directory repository (let ((master1 (find-commit repository "first commit")) (master2 (find-commit repository "second commit")) (master3 (find-commit repository "third commit")) (master4 (find-commit repository "fourth commit")) (devel1 (find-commit repository "first devel")) (devel2 (find-commit repository "second devel")) (merge (find-commit repository "merge"))) (and (equal? (commit-difference master4 merge) (list master4)) (lset= eq? (commit-difference master3 master1) (list master3 master2)) (lset= eq? (commit-difference devel2 master1) (list devel2 devel1)) ;; The merge occurred between MASTER2 and MASTER4 so here we ;; expect to see all the commits from the "devel" branch in ;; addition to those on "master". (lset= eq? (commit-difference master4 master2) (list master4 merge master3 devel1 devel2))))))) (test-end "git")