From 268663da0b2726d94d54f95299ed2c4a0bd7351b Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 21:11:21 +0100
Subject: Dgit.pm: Move reflog_cache_* from dgit

We are going to want this for git-debrebase merge resolutions.

NFC other than the usual change to literal `git'.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 dgit | 50 ++++++--------------------------------------------
 1 file changed, 6 insertions(+), 44 deletions(-)

(limited to 'dgit')

diff --git a/dgit b/dgit
index 6879e54..991fd9a 100755
--- a/dgit
+++ b/dgit
@@ -5228,29 +5228,7 @@ END
     my $dgitview = git_rev_parse 'HEAD';
 
     changedir $maindir;
-    # When we no longer need to support squeeze, use --create-reflog
-    # instead of this:
-    ensuredir "$maindir_gitcommon/logs/refs/dgit-intern";
-    my $makelogfh = new IO::File "$maindir_gitcommon/logs/refs/$splitbraincache", '>>'
-      or die $!;
-
-    my $oldcache = git_get_ref "refs/$splitbraincache";
-    if ($oldcache eq $dgitview) {
-	my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
-	# git update-ref doesn't always update, in this case.  *sigh*
-	my $dummy = make_commit_text <<END;
-tree $tree
-parent $dgitview
-author Dgit <dgit\@example.com> 1000000000 +0000
-committer Dgit <dgit\@example.com> 1000000000 +0000
-
-Dummy commit - do not use
-END
-	runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
-	    "refs/$splitbraincache", $dummy;
-    }
-    runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
-	$dgitview;
+    reflog_cache_insert "refs/$splitbraincache", $cachekey, $dgitview;
 
     changedir "$playground/work";
 
@@ -5753,26 +5731,12 @@ sub quilt_check_splitbrain_cache ($$) {
     push @cachekey, $srcshash->hexdigest();
     $splitbrain_cachekey = "@cachekey";
 
-    my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
-	       $splitbraincache);
     printdebug "splitbrain cachekey $splitbrain_cachekey\n";
-    debugcmd "|(probably)",@cmd;
-    my $child = open GC, "-|";  defined $child or die $!;
-    if (!$child) {
-	chdir $maindir or die $!;
-	if (!stat "$maindir_gitcommon/logs/refs/$splitbraincache") {
-	    $! == ENOENT or die $!;
-	    printdebug ">(no reflog)\n";
-	    finish 0;
-	}
-	exec @cmd; die $!;
-    }
-    while (<GC>) {
-	chomp;
-	printdebug ">| ", $_, "\n" if $debuglevel > 1;
-	next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
-	    
-	my $cachehit = $1;
+
+    my $cachehit = reflog_cache_lookup
+	"refs/$splitbraincache", $splitbrain_cachekey;
+
+    if ($cachehit) {
 	unpack_playtree_mkwork($headref);
 	my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
 	if ($cachehit ne $headref) {
@@ -5784,8 +5748,6 @@ sub quilt_check_splitbrain_cache ($$) {
 	progress "dgit view: found cached, no changes required";
 	return ($headref, $splitbrain_cachekey);
     }
-    die $! if GC->error;
-    failedcmd unless close GC;
 
     printdebug "splitbrain cache miss\n";
     return (undef, $splitbrain_cachekey);
-- 
cgit v1.2.3