2.1.1: Pin faster

diff --git a/Changelog b/Changelog
index 11afedc0ab06c58d35641b635946256e36e9446d..2a12d5aae9bda2860db6a2524d9ed05fcfc5f3d6 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,9 @@
 ## [Unreleased]
 
 ## [Unreleased]
 

+## [2.1.1] - 2020-07-01
+### Changed
+- Pin faster: Skip archive comparison if git rev is unchanged
+

 
 ## [2.1.0] - 2020-06-30
 ### Added
 
 ## [2.1.0] - 2020-06-30
 ### Added

diff --git a/default.nix b/default.nix
index dcd9c6627680d7d873ce8d402911114d680b89e5..6ad80dfb5fc36060b30e55825168023a6dae4e26 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -3,7 +3,7 @@ pkgs.python3Packages.callPackage
 ({ lib, buildPythonPackage, nix, git, autopep8, mypy, pylint, }:
   buildPythonPackage rec {
     pname = "pinch";
 ({ lib, buildPythonPackage, nix, git, autopep8, mypy, pylint, }:
   buildPythonPackage rec {
     pname = "pinch";

-    version = "2.1.0";
+    version = "2.1.1";

     src = lib.cleanSource ./.;
     checkInputs = [ nix git mypy ] ++ lib.optionals lint [ autopep8 pylint ];
     doCheck = true;
     src = lib.cleanSource ./.;
     checkInputs = [ nix git mypy ] ++ lib.optionals lint [ autopep8 pylint ];
     doCheck = true;

diff --git a/pinch.py b/pinch.py
index a7f3449a6dfaabf175343eb97879cbdcf9552095..ed33c928ae6a466c5e27a70ccf2a52d592bc8bc8 100644 (file)
--- a/pinch.py
+++ b/pinch.py
@@ -186,6 +186,8 @@ class ChannelSearchPath(NamedTuple):
 
         channel_html, forwarded_url = fetch_channel(v, self)
         table, new_gitpin = parse_channel(v, channel_html)
 
         channel_html, forwarded_url = fetch_channel(v, self)
         table, new_gitpin = parse_channel(v, channel_html)

+        if old_pin is not None and old_pin.git_revision == new_gitpin.git_revision:
+            return old_pin

         fetch_resources(v, new_gitpin, forwarded_url, table)
         ensure_git_rev_available(v, self, new_gitpin, old_revision)
         check_channel_contents(v, self, table, new_gitpin)
         fetch_resources(v, new_gitpin, forwarded_url, table)
         ensure_git_rev_available(v, self, new_gitpin, old_revision)
         check_channel_contents(v, self, table, new_gitpin)

diff --git a/setup.py b/setup.py
index a46092146c88746bbf63502e3ae9d741c39563f8..40618e93ae4fdb48fbae30920c3d64c653f72db9 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="pinch",
 
 setup(
     name="pinch",

-    version="2.1.0",
+    version="2.1.1",

     py_modules=['pinch'],
     entry_points={"console_scripts": ["pinch = pinch:main"]},
 )
     py_modules=['pinch'],
     entry_points={"console_scripts": ["pinch = pinch:main"]},
 )