bitfab 0.62.6 → 0.62.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b300b5a65bacd9fd60231bcab3ba96751c111ae7e5f12075a6149c163927cf65
-  data.tar.gz: b3b61e0146d500bebc4719ca485e42e175bd0e8f78053d3fa451bb256d494407
+  metadata.gz: 0e4a1e837039a5679b239d2c976e5a0ed657b2270c317a9101ded3416acc48fa
+  data.tar.gz: c9168929101f6b1bea5c853a80384a242d64f69dec8c99fb3b4a202ae62bd7b8
 SHA512:
-  metadata.gz: f16224c7b475fdfea0e847780b18d7e503b100250ec66523382a3f1bfa45e8b60281d52042de6dd0ac5f5b90bfea4a5585481fdaaa94500d019ce346ec81cb1d
-  data.tar.gz: 836b9a8bdcfd24612213eefef798713e758b337b283ee1ff89ee62b1d17e60f12e8ba883b3532cd2a47430ee3968637e96375f9912f3c35d7df8290f9a7f460d
+  metadata.gz: 3474b103e94a7cce451ab5955652836bf84c0300c3719ece113a14b0114ee41ff322314da45f4d9015b7040672fa84439ba3bc268712c6fab7f58af3f3cda026
+  data.tar.gz: 442acb8bb6b2a72154c40ae99ec3d34a55d0d212eaba2e27f60bebd000d8453b7dbc0e683c872d9bbf9689e016866c90f3afb2d312ff846020f1d886b5d85565

data/lib/bitfab/replay.rb

@@ -562,7 +562,6 @@ module Bitfab
     # via BITFAB_CODE_CHANGE_PATH. Returns [description, files] or nil.
     # Best-effort: any error (no env var, missing file, bad JSON) yields nil so
     # the replay proceeds with no code change rather than raising.
-    TRUNK_CANDIDATES = ["origin/HEAD", "origin/main", "origin/master", "main", "master"].freeze
     CC_MAX_FILES = 60
     CC_MAX_FILE_BYTES = 500_000
     CC_MAX_TOTAL_BYTES = 2_000_000
@@ -618,7 +617,8 @@ module Bitfab
     # Auto-capture the code change to attach when the caller passed none. Lives
     # in replay() (the one call guaranteed to run on every replay) so it works no
     # matter how the replay was launched. Precedence: a BITFAB_CODE_CHANGE_PATH
-    # override, else the git diff vs trunk. Best-effort: any failure yields nil.
+    # override, else the git diff of the working tree vs HEAD (or vs the
+    # merge-base with BITFAB_CODE_CHANGE_BASE). Best-effort: any failure yields nil.
     # An explicit code_change_files always wins over this.
     def resolve_auto_code_change(label = nil)
       return nil if ENV["BITFAB_DISABLE_CODE_CHANGE_CAPTURE"]
@@ -657,23 +657,18 @@ module Bitfab
       !git(root, ["rev-parse", "--verify", "#{ref}^{object}"]).nil?
     end
 
-    # Returns [base, from_trunk]; from_trunk is false on the HEAD fallback.
+    # Returns [base, against]. HEAD by default, so only uncommitted edits show;
+    # BITFAB_CODE_CHANGE_BASE moves the base to the merge-base with that ref.
     def cc_resolve_base(root)
       forced = ENV["BITFAB_CODE_CHANGE_BASE"]
       if forced && cc_ref_exists?(root, forced)
         mb = git(root, ["merge-base", "HEAD", forced])
-        return [mb.strip, true] if mb && !mb.strip.empty?
+        return [mb.strip, "vs #{forced}"] if mb && !mb.strip.empty?
 
         rp = git(root, ["rev-parse", "--verify", forced])
-        return (rp && !rp.strip.empty?) ? [rp.strip, true] : nil
+        return (rp && !rp.strip.empty?) ? [rp.strip, "vs #{forced}"] : nil
       end
-      TRUNK_CANDIDATES.each do |candidate|
-        next unless cc_ref_exists?(root, candidate)
-
-        mb = git(root, ["merge-base", "HEAD", candidate])
-        return [mb.strip, true] if mb && !mb.strip.empty?
-      end
-      cc_ref_exists?(root, "HEAD") ? ["HEAD", false] : nil
+      cc_ref_exists?(root, "HEAD") ? ["HEAD", "uncommitted (vs HEAD)"] : nil
     end
 
     def cc_blob_bytes(root, base, path)
@@ -697,7 +692,7 @@ module Bitfab
       resolved = cc_resolve_base(root)
       return nil if resolved.nil?
 
-      base, from_trunk = resolved
+      base, against = resolved
 
       tracked = git(root, ["diff", "--name-status", "--find-renames", "-z", base, "--", ":!.bitfab"]) || ""
       untracked = git(root, ["ls-files", "--others", "--exclude-standard", "-z", "--", ":!.bitfab"]) || ""
@@ -737,7 +732,6 @@ module Bitfab
       subject = subject ? subject.strip : ""
       head = ((label && !label.strip.empty?) ? label.strip : nil) || (subject.empty? ? nil : subject) || "Working-tree change"
       word = (files.length == 1) ? "file" : "files"
-      against = from_trunk ? "vs trunk" : "uncommitted (vs HEAD)"
       ["#{head} (#{files.length} #{word} changed #{against})", files]
     rescue
       nil

data/lib/bitfab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bitfab
-  VERSION = "0.62.6"
+  VERSION = "0.62.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitfab
 version: !ruby/object:Gem::Version
-  version: 0.62.6
+  version: 0.62.7
 platform: ruby
 authors:
 - Harvest Team