Name git pins

[pinch] / pinch.py

diff --git a/pinch.py b/pinch.py
index 80e631b9b4001574693887a13a40b022969ff333..ae2c7ec14a3e983015e2f3ddb57df6bfb4df899a 100644 (file)
--- a/pinch.py
+++ b/pinch.py
@@ -1,3 +1,4 @@
+import argparse
 import configparser
 import filecmp
 import functools
@@ -7,7 +8,6 @@ import os
 import os.path
 import shutil
 import subprocess
-import sys
 import tempfile
 import types
 import urllib.parse
@@ -243,7 +243,9 @@ def git_fetch(v: Verification, channel: Channel) -> None:
         have_rev = process.returncode == 0
 
     if not have_rev:
-        v.status('Fetching ref "%s" from %s' % (channel.git_ref, channel.git_repo))
+        v.status(
+            'Fetching ref "%s" from %s' %
+            (channel.git_ref, channel.git_repo))
         # We don't use --force here because we want to abort and freak out if forced
         # updates are happening.
         process = subprocess.run(['git',
@@ -278,6 +280,19 @@ def git_fetch(v: Verification, channel: Channel) -> None:
                               channel.git_ref])
     v.result(process.returncode == 0)
 
+    if hasattr(channel, 'old_git_revision'):
+        v.status(
+            'Verifying rev is an ancestor of previous rev %s' %
+            channel.old_git_revision)
+        process = subprocess.run(['git',
+                                  '-C',
+                                  channel.git_cachedir,
+                                  'merge-base',
+                                  '--is-ancestor',
+                                  channel.old_git_revision,
+                                  channel.git_revision])
+        v.result(process.returncode == 0)
+
 
 def compare_tarball_and_git(
         v: Verification,
@@ -384,6 +399,22 @@ def pin_channel(v: Verification, channel: Channel) -> None:
     check_channel_contents(v, channel)
 
 
+def git_revision_name(v: Verification, channel: Channel) -> str:
+    v.status('Getting commit date')
+    process = subprocess.run(['git',
+                              '-C',
+                              channel.git_cachedir,
+                              'lo',
+                              '-n1',
+                              '--format=%ct-%h',
+                              '--abbrev=11',
+                              channel.git_revision],
+                             capture_output=True)
+    v.result(process.returncode == 0 and process.stdout != '')
+    return '%s-%s' % (os.path.basename(channel.git_repo),
+                      process.stdout.decode().strip())
+
+
 def make_channel(conf: configparser.SectionProxy) -> Channel:
     channel = Channel(**dict(conf.items()))
     if hasattr(channel, 'git_revision'):
@@ -392,22 +423,34 @@ def make_channel(conf: configparser.SectionProxy) -> Channel:
     return channel
 
 
-def main(argv: List[str]) -> None:
+def pin(args: argparse.Namespace) -> None:
     v = Verification()
     config = configparser.ConfigParser()
-    config.read_file(open(argv[1]), argv[1])
+    config.read_file(open(args.channels_file), args.channels_file)
     for section in config.sections():
         channel = make_channel(config[section])
         if 'channel_url' in config[section]:
             pin_channel(v, channel)
+            config[section]['name'] = channel.release_name
             config[section]['tarball_url'] = channel.table['nixexprs.tar.xz'].absolute_url
             config[section]['tarball_sha256'] = channel.table['nixexprs.tar.xz'].digest
         else:
             git_fetch(v, channel)
+            config[section]['name'] = git_revision_name(v, channel)
         config[section]['git_revision'] = channel.git_revision
 
-    with open(argv[1], 'w') as configfile:
+    with open(args.channels_file, 'w') as configfile:
         config.write(configfile)
 
 
-main(sys.argv)
+def main() -> None:
+    parser = argparse.ArgumentParser(prog='pinch')
+    subparsers = parser.add_subparsers(dest='mode', required=True)
+    parser_pin = subparsers.add_parser('pin')
+    parser_pin.add_argument('channels_file', type=str)
+    parser_pin.set_defaults(func=pin)
+    args = parser.parse_args()
+    args.func(args)
+
+
+main()