bitfab 0.36.8 → 0.36.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87c160ba40f51aca6fded283a601f2e917b948403436879e7dcca1793673a4aa
-  data.tar.gz: 730c4a41a9f26ee51e2e25490d8dd89aa1205a0acb091f0ce9e2560b40583622
+  metadata.gz: 23d0d3e96160502ecf10da7fe952d08fec34439595e4c61e50ce9ea7c086a11c
+  data.tar.gz: 7bb58eab2f4749bd073593ec4c359d8460d1a1012eab60727999ad765a3e6d1e
 SHA512:
-  metadata.gz: 58ca8e468386578b6792e8aef86a74ab7f601b432e7333391931a028b8dd0a7e1006a317be2aeccc58fcdef5a89ab550fe950c89527ecf0babe888ed5cb32d1e
-  data.tar.gz: 56aa1281a7583d0c106b64044def3494221e33e9e1b45f25b2ee0113c43a72f6fc76c55ca2c0230b0430f92c2e55e7a0a7174ca980ac53c972b72a632d912155
+  metadata.gz: 7360217eac4dfaa7ae66c645415598a9b794e2433434b425de54a1922243a93012270d9146309aca8d3ee65e9084da047cd6c6a5751cade83e1eb7b7d7458ab7
+  data.tar.gz: ee2575e01da6352effba7a1943621aa44280aabd5ead4aed76ce85561db6ccd8251c28c369de846fce1879e8ff4a08da9a6211b924d40f0a78430bec98302e76

data/lib/bitfab/replay.rb

@@ -570,28 +570,28 @@ module Bitfab
 
       base, from_trunk = resolved
 
-      tracked = git(root, ["diff", "--name-status", "--no-renames", "-z", base, "--", ":!.bitfab"]) || ""
+      tracked = git(root, ["diff", "--name-status", "--find-renames", "-z", base, "--", ":!.bitfab"]) || ""
       untracked = git(root, ["ls-files", "--others", "--exclude-standard", "-z", "--", ":!.bitfab"]) || ""
 
       entries = cc_parse_name_status_z(tracked)
-      untracked.split("\0").reject(&:empty?).each { |p| entries << ["A", p] }
+      untracked.split("\0").reject(&:empty?).each { |p| entries << ["A", p, p] }
       return nil if entries.empty?
 
       files = []
       total = 0
-      entries.each do |status, path|
+      entries.each do |status, before_path, path|
         break if files.length >= CC_MAX_FILES
 
         # Skip oversized files by size BEFORE reading their full contents, so a
         # huge changed file can't OOM/stall replay just to be discarded.
-        before_bytes = (status == "A") ? 0 : cc_blob_bytes(root, base, path)
+        before_bytes = (status == "A") ? 0 : cc_blob_bytes(root, base, before_path)
         after_bytes = (status == "D") ? 0 : cc_working_bytes(root, path)
         next if before_bytes > CC_MAX_FILE_BYTES || after_bytes > CC_MAX_FILE_BYTES
 
         # Normalize CRLF -> LF on both sides: git's blob is already LF-normalized
         # (autocrlf clean), so a raw CRLF working file would otherwise skew every
         # line as changed. Comparing/storing LF keeps the diff meaningful.
-        before = (status == "A") ? "" : (git(root, ["show", "#{base}:#{path}"]) || "").gsub("\r\n", "\n")
+        before = (status == "A") ? "" : (git(root, ["show", "#{base}:#{before_path}"]) || "").gsub("\r\n", "\n")
         after = (status == "D") ? "" : cc_read_working_file(root, path).gsub("\r\n", "\n")
         next if before == after
 
@@ -619,8 +619,15 @@ module Bitfab
       out = []
       i = 0
       while i + 1 < parts.length
-        out << [parts[i][0], parts[i + 1]]
+        status = parts[i][0]
+        before_path = parts[i + 1]
         i += 2
+        if ["R", "C"].include?(status) && i < parts.length
+          out << [status, before_path, parts[i]]
+          i += 1
+        else
+          out << [status, before_path, before_path]
+        end
       end
       out
     end

data/lib/bitfab/version.rb

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

metadata

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