Release 1.4.1

[git-cache] / git_cache.py

diff --git a/git_cache.py b/git_cache.py
index 1363f119b484555b1c4c48ae9983e7175a068608..1ed26017ceb18f0831d8b5566068c6eb11fdcf7a 100644 (file)
--- a/git_cache.py
+++ b/git_cache.py
@@ -4,6 +4,7 @@
 # implementation details for my comfort.  So we re-implement here half of
 # nix's builtins.fetchGit.  :(
 
 # implementation details for my comfort.  So we re-implement here half of
 # nix's builtins.fetchGit.  :(
 

+import argparse

 import functools
 import hashlib
 import logging
 import functools
 import hashlib
 import logging


@@ -74,8 +75,9 @@ def is_ancestor(repo: Repo, descendant: RefOrRev, ancestor: RefOrRev) -> bool:
 def verify_ancestry(
         repo: Repo,
         descendant: RefOrRev,
 def verify_ancestry(
         repo: Repo,
         descendant: RefOrRev,

-        ancestor: RefOrRev) -> None:
-    if not is_ancestor(repo, descendant, ancestor):
+        ancestor: RefOrRev,
+        force: bool = False) -> None:
+    if not force and not is_ancestor(repo, descendant, ancestor):

         raise Exception('%s is not an ancestor of %s' % (ancestor, descendant))
 
 
         raise Exception('%s is not an ancestor of %s' % (ancestor, descendant))
 
 


@@ -98,47 +100,107 @@ def _previous_fetched_rev(repo: Repo, ref: Ref) -> Optional[Rev]:
         repo) if entry.ref == ref)
 
 
         repo) if entry.ref == ref)
 
 

-def _log_fetch(repo: Repo, ref: Ref, rev: Rev) -> None:
-    prev_rev = _previous_fetched_rev(repo, ref)
-    if prev_rev is not None:
-        verify_ancestry(repo, rev, prev_rev)
+def _log_fetch(repo: Repo, ref: Ref, rev: Rev, force: bool = False) -> None:
+    if not force:
+        prev_rev = _previous_fetched_rev(repo, ref)
+        if prev_rev is not None:
+            verify_ancestry(repo, rev, prev_rev)

     filename = _log_filename(repo)
     os.makedirs(os.path.dirname(filename), exist_ok=True)
     with open(filename, 'a') as f:
     filename = _log_filename(repo)
     os.makedirs(os.path.dirname(filename), exist_ok=True)
     with open(filename, 'a') as f:

-        f.write('%s fetch %s %s\n' %
-                (time.strftime('%Y-%m%d-%H:%M:%S%z'), rev, ref))
+        f.write('%s %s %s %s\n' %
+                (time.strftime('%Y-%m%d-%H:%M:%S%z'),
+                 ('FORCEDFETCH' if force else 'fetch'), rev, ref))
+
+
+def _show_force_warning() -> None:
+    print('''
+**************************************************************************
+*               WARNING: git-cache INVOKED WITH --force!                 *
+*                                                                        *
+* This mode allows previously-fetched refs to be overwritten to point to *
+* non-descendants -- commits that don't have the previous version of the *
+* the ref in their history!                                              *
+*                                                                        *
+* This should only be invoked by a human operator who knows what they're *
+* doing to correct a specific, known, problem.  Care should be taken to  *
+* prevent recurrence.                                                    *
+*                                                                        *
+* Press ^C to abort.                                                     *
+*                                                                        *
+''', end='', file=sys.stderr)
+    warn_time_override = os.environ.get('FORCE_WARNING_TIME', None)
+    warn_time: int
+    if warn_time_override is None:
+        warn_time = 15
+    else:
+        warn_time = int(warn_time_override)
+        print(
+            '''*   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!   *
+*   !!              WARNING DISPLAY TIME OVERRIDDEN                 !!   *
+*   !!                                                              !!   *
+*   !! This message is intended to be displayed long enough for a   !!   *
+*   !! human operator to read it and have a chance to abort.  An    !!   *
+*   !! override for the delay time is provided FOR THE UNIT TESTS   !!   *
+*   !! to avoid delaying software builds unnecessarily.  This is    !!   *
+*   !! INTENDED FOR USE IN UNIT TESTS ONLY; THIS MESSAGE SHOULD     !!   *
+*   !! NEVER BE SEEN OUTSIDE BUILD LOGS!                            !!   *
+*   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!   *
+*                                                                        *
+''', end='', file=sys.stderr)
+
+    for i in range(warn_time, 0, -1):
+        msg = '* %-70s *' % ("Continuing in %d seconds..." % i)
+        print(msg, file=sys.stderr)
+        time.sleep(1)
+    print('*' * 74, file=sys.stderr)

 
 
 @backoff.on_exception(
     backoff.expo,
     subprocess.CalledProcessError,
     max_time=lambda: int(os.environ.get('BACKOFF_MAX_TIME', '30')))
 
 
 @backoff.on_exception(
     backoff.expo,
     subprocess.CalledProcessError,
     max_time=lambda: int(os.environ.get('BACKOFF_MAX_TIME', '30')))

-def _git_fetch(cachedir: Path, repo: Repo, ref: Ref) -> None:
-    # We don't use --force here because we want to abort and freak out if forced
-    # updates are happening.
-    subprocess.run(['git', '-C', cachedir, 'fetch', repo,
-                    '%s:%s' % (ref, ref)], check=True)
+def _git_fetch(
+        cachedir: Path,
+        repo: Repo,
+        ref: Ref,
+        force: bool = False) -> None:
+    subprocess.run(['git', '-C', cachedir, 'fetch'] +
+                   (['--force'] if force else []) +
+                   [repo, '%s:%s' % (ref, ref)], check=True)

 
 
 
 

-def fetch(repo: Repo, ref: Ref) -> Tuple[Path, Rev]:
+def fetch(repo: Repo, ref: Ref, force: bool = False) -> Tuple[Path, Rev]:
+    if force:
+        _show_force_warning()

     cachedir = git_cachedir(repo)
     if not os.path.exists(cachedir):
         logging.debug("Initializing git repo")
     cachedir = git_cachedir(repo)
     if not os.path.exists(cachedir):
         logging.debug("Initializing git repo")

-        subprocess.run(['git', 'init', '--bare', cachedir],
-                       check=True, stdout=sys.stderr)
+        subprocess.run(['git',
+                        '-c',
+                        'init.defaultBranch=git-cache--no-default-branch',
+                        'init',
+                        '--bare',
+                        cachedir],
+                       check=True,
+                       stdout=sys.stderr)

 
     logging.debug('Fetching ref "%s" from %s', ref, repo)
 
     logging.debug('Fetching ref "%s" from %s', ref, repo)

-    _git_fetch(cachedir, repo, ref)
+    _git_fetch(cachedir, repo, ref, force=force)

 
     with open(os.path.join(cachedir, 'refs', 'heads', ref)) as rev_file:
         rev = Rev(rev_file.read(999).strip())
 
     with open(os.path.join(cachedir, 'refs', 'heads', ref)) as rev_file:
         rev = Rev(rev_file.read(999).strip())

-    verify_ancestry(repo, ref, rev)
-    _log_fetch(repo, ref, rev)
+    verify_ancestry(repo, ref, rev, force=force)
+    _log_fetch(repo, ref, rev, force=force)

 
     return cachedir, rev
 
 
 
     return cachedir, rev
 
 

-def ensure_rev_available(repo: Repo, ref: Ref, rev: Rev) -> Path:
+def ensure_rev_available(
+        repo: Repo,
+        ref: Ref,
+        rev: Rev,
+        force: bool = False) -> Path:

     cachedir = git_cachedir(repo)
     if os.path.exists(cachedir) and is_ancestor(repo, ref, rev):
         return cachedir
     cachedir = git_cachedir(repo)
     if os.path.exists(cachedir) and is_ancestor(repo, ref, rev):
         return cachedir


@@ -146,22 +208,47 @@ def ensure_rev_available(repo: Repo, ref: Ref, rev: Rev) -> Path:
     logging.debug(
         'We do not have rev %s.  We will fetch ref "%s" and hope it appears.',
         rev, ref)
     logging.debug(
         'We do not have rev %s.  We will fetch ref "%s" and hope it appears.',
         rev, ref)

-    fetch(repo, ref)
+    fetch(repo, ref, force=force)

     logging.debug('Verifying that fetch retrieved rev %s', rev)
     subprocess.run(['git', '-C', cachedir, 'cat-file', '-e', rev], check=True)
     logging.debug('Verifying that fetch retrieved rev %s', rev)
     subprocess.run(['git', '-C', cachedir, 'cat-file', '-e', rev], check=True)

-    verify_ancestry(repo, ref, rev)
+    verify_ancestry(repo, ref, rev, force=force)

 
     return cachedir
 
 
 def _main() -> None:
 
     return cachedir
 
 
 def _main() -> None:

-    if len(sys.argv) == 3:
-        print('{1} {0}'.format(*fetch(Repo(sys.argv[1]), Ref(sys.argv[2]))))
-    elif len(sys.argv) == 4:
-        print(ensure_rev_available(
-            Repo(sys.argv[1]), Ref(sys.argv[2]), Rev(sys.argv[3])))
+    parser = argparse.ArgumentParser(
+        description='Cache remote git repositories locally.',
+        epilog='example usage: git-cache https://github.com/NixOS/nixpkgs.git master')
+    parser.add_argument(
+        '--force',
+        action='store_true',
+        help='Recover from a force-push in the remote repo')
+    parser.add_argument(
+        'repo',
+        metavar='Repo',
+        type=Repo,
+        help='Git repository URL')
+    parser.add_argument(
+        'ref',
+        metavar='Ref',
+        type=Ref,
+        help='Ref (branch or tag) in the git repo')
+    parser.add_argument(
+        'rev',
+        metavar='Rev',
+        type=Rev,
+        nargs='?',
+        help='Ensure that this revision is present.  ' +
+        'If this revision is already present locally, no network operations are performed.')
+    args = parser.parse_args()
+
+    if args.rev is None:
+        print('{1} {0}'.format(*fetch(args.repo, args.ref, force=args.force)))

     else:
     else:

-        usage = '''usage: git-cache repo ref [rev]
-example: git-cache https://github.com/NixOS/nixpkgs.git master'''
-        print(usage, file=sys.stderr)
-        sys.exit(1)
+        print(
+            ensure_rev_available(
+                args.repo,
+                args.ref,
+                args.rev,
+                force=args.force))