Hello community, here is the log from the commit of package ghc-githash for openSUSE:Factory checked in at 2020-09-07 21:21:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-githash (Old) and /work/SRC/openSUSE:Factory/.ghc-githash.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-githash" Mon Sep 7 21:21:44 2020 rev:2 rq:831207 version:0.1.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-githash/ghc-githash.changes 2020-01-03 17:34:42.675225653 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-githash.new.3399/ghc-githash.changes 2020-09-07 21:21:48.593007586 +0200 @@ -1,0 +2,8 @@ +Tue Sep 1 14:41:29 UTC 2020 - [email protected] + +- Update githash to version 0.1.4.0. + ## 0.1.4.0 + + * Add git-describe output + +------------------------------------------------------------------- Old: ---- githash-0.1.3.3.tar.gz New: ---- githash-0.1.4.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-githash.spec ++++++ --- /var/tmp/diff_new_pack.tD96rW/_old 2020-09-07 21:21:50.265008353 +0200 +++ /var/tmp/diff_new_pack.tD96rW/_new 2020-09-07 21:21:50.269008356 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-githash # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global pkg_name githash %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.1.3.3 +Version: 0.1.4.0 Release: 0 Summary: Compile git revision info into Haskell projects License: BSD-3-Clause @@ -52,7 +52,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} +%autosetup -n %{pkg_name}-%{version} %build %ghc_lib_build ++++++ githash-0.1.3.3.tar.gz -> githash-0.1.4.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/githash-0.1.3.3/ChangeLog.md new/githash-0.1.4.0/ChangeLog.md --- old/githash-0.1.3.3/ChangeLog.md 2019-09-15 11:41:51.000000000 +0200 +++ new/githash-0.1.4.0/ChangeLog.md 2020-04-02 06:27:28.000000000 +0200 @@ -1,5 +1,9 @@ # ChangeLog for githash +## 0.1.4.0 + +* Add git-describe output + ## 0.1.3.3 * Add git-worktree support [#13](https://github.com/snoyberg/githash/issues/13) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/githash-0.1.3.3/LICENSE new/githash-0.1.4.0/LICENSE --- old/githash-0.1.3.3/LICENSE 2018-07-27 09:22:28.000000000 +0200 +++ new/githash-0.1.4.0/LICENSE 2020-04-02 06:06:54.000000000 +0200 @@ -11,7 +11,7 @@ this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of gitrev nor the names of its +* Neither the name of githash nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -25,4 +25,3 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/githash-0.1.3.3/README.md new/githash-0.1.4.0/README.md --- old/githash-0.1.3.3/README.md 2018-07-27 09:22:28.000000000 +0200 +++ new/githash-0.1.4.0/README.md 2020-04-02 06:28:27.000000000 +0200 @@ -1,7 +1,6 @@ # githash -[](https://travis-ci.org/snoyberg/githash) -[](https://ci.appveyor.com/project/snoyberg/githash/branch/master) +[](https://dev.azure.com/snoyberg/githash/_build/latest?definitionId=11&branchName=master) Some handy Template Haskell splices for including the current git hash and branch in the code of your project. Useful for including in panic diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/githash-0.1.3.3/githash.cabal new/githash-0.1.4.0/githash.cabal --- old/githash-0.1.3.3/githash.cabal 2019-09-15 11:41:57.000000000 +0200 +++ new/githash-0.1.4.0/githash.cabal 2020-04-02 06:32:26.000000000 +0200 @@ -1,13 +1,13 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.31.2. +-- This file has been generated from package.yaml by hpack version 0.33.0. -- -- see: https://github.com/sol/hpack -- --- hash: dad169c97d7c1d2d5d696f8ca7a5cbdce36b8b181a3c695ffb05681aaa6a226b +-- hash: d5c62b9ed845682638a72f717272a1a46871ad89fc816b8f602622a6a2e17941 name: githash -version: 0.1.3.3 +version: 0.1.4.0 synopsis: Compile git revision info into Haskell projects description: Please see the README and documentation at <https://www.stackage.org/package/githash> category: Development diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/githash-0.1.3.3/src/GitHash.hs new/githash-0.1.4.0/src/GitHash.hs --- old/githash-0.1.3.3/src/GitHash.hs 2019-09-15 11:41:51.000000000 +0200 +++ new/githash-0.1.4.0/src/GitHash.hs 2020-04-02 06:27:28.000000000 +0200 @@ -47,6 +47,7 @@ , giCommitDate , giCommitCount , giCommitMessage + , giDescribe -- * Creators , getGitInfo , getGitRoot @@ -81,6 +82,7 @@ , _giCommitCount :: !Int , _giFiles :: ![FilePath] , _giCommitMessage :: !String + , _giDescribe :: !String } deriving (Lift, Show) @@ -111,6 +113,12 @@ giCommitMessage :: GitInfo -> String giCommitMessage = _giCommitMessage +-- | The output of @git describe --always@ for the most recent commit. +-- +-- @since 0.1.4.0 +giDescribe :: GitInfo -> String +giDescribe = _giDescribe + -- | Get a list of files from within a @.git@ directory. getGitFilesRegular :: FilePath -> IO [FilePath] getGitFilesRegular git = do @@ -202,6 +210,8 @@ _giCommitMessage <- run ["log", "-1", "--pretty=%B"] + _giDescribe <- run ["describe", "--always"] + return GitInfo {..} -- | Get the root directory of the Git repo containing the given file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/githash-0.1.3.3/test/GitHashSpec.hs new/githash-0.1.4.0/test/GitHashSpec.hs --- old/githash-0.1.3.3/test/GitHashSpec.hs 2019-09-03 06:52:53.000000000 +0200 +++ new/githash-0.1.4.0/test/GitHashSpec.hs 2020-04-02 06:27:28.000000000 +0200 @@ -22,3 +22,4 @@ seq (giDirty gi) () `shouldBe` () giCommitDate gi `shouldNotBe` [] giCommitCount gi `shouldSatisfy` (>= 1) + giDescribe gi `shouldStartWith` "githash-" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/githash-0.1.3.3/test/NormalRepoSpec.hs new/githash-0.1.4.0/test/NormalRepoSpec.hs --- old/githash-0.1.3.3/test/NormalRepoSpec.hs 2019-09-03 06:42:26.000000000 +0200 +++ new/githash-0.1.4.0/test/NormalRepoSpec.hs 2020-04-02 06:27:28.000000000 +0200 @@ -29,6 +29,7 @@ giCommitDate gi `shouldNotBe` [] giCommitCount gi `shouldBe` 1 giCommitMessage gi `shouldBe` "Initial commit" + length (giDescribe gi) `shouldBe` 7 describe "getGitRoot" $ do it "it gets the expected git root for a regular git repository" $ \fp -> getGitRoot fp `shouldReturn` Right fp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/githash-0.1.3.3/test/RepoWithASubmoduleSpec.hs new/githash-0.1.4.0/test/RepoWithASubmoduleSpec.hs --- old/githash-0.1.3.3/test/RepoWithASubmoduleSpec.hs 2019-09-03 06:42:43.000000000 +0200 +++ new/githash-0.1.4.0/test/RepoWithASubmoduleSpec.hs 2020-04-02 06:27:28.000000000 +0200 @@ -31,6 +31,7 @@ giCommitDate gi `shouldNotBe` [] giCommitCount gi `shouldBe` 1 giCommitMessage gi `shouldBe` "Initial commit" + length (giDescribe gi) `shouldBe` 7 sensible fp1 sensible fp2 describe "getGitRoot" $ do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/githash-0.1.3.3/test/WorktreeRepoSpec.hs new/githash-0.1.4.0/test/WorktreeRepoSpec.hs --- old/githash-0.1.3.3/test/WorktreeRepoSpec.hs 2019-09-15 11:41:51.000000000 +0200 +++ new/githash-0.1.4.0/test/WorktreeRepoSpec.hs 2020-04-02 06:27:28.000000000 +0200 @@ -29,6 +29,7 @@ giCommitDate gi `shouldNotBe` [] giCommitCount gi `shouldBe` 1 giCommitMessage gi `shouldBe` "Initial commit" + length (giDescribe gi) `shouldBe` 7 describe "getGitRoot" $ do it "it gets the expected git root for a git-worktree repository" $ \fp -> getGitRoot fp `shouldReturn` Right fp
