jit 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3456259298664412f5d90d68ba0a102320bd6b59a9ace12b3817b76cdd553a89
-  data.tar.gz: 57d5cec5ebd3150ccc5abd83a458d60ed59cc1065b0a0dc8a6fd4df40153ea53
+  metadata.gz: a23448f0810b2084307896eb1e1406b86b24c04c579a47d685da99d71ca35a3a
+  data.tar.gz: f36e92883aeb81d4ab383e47d74047b9c508c0f8b83db2e630749cf32967230a
 SHA512:
-  metadata.gz: bca4b9acaec9bc125b22adbcfe0179794a0f2f27e196c70be266cb1081296bda1a18c740e274cb17fa1f676499cd1d2bdd4187cfa751f8a380ffabdc7d529a50
-  data.tar.gz: 074d431d5f9a5b1b66e1fcb72223aa92a457fdd08be43d6f3361b7ecf2c3184fb1b3c13dd0437960b0763e604a673fb7114aaff140a613c0574808113f57fb89
+  metadata.gz: 7ea0e84691e98799b8cdd265aad34829580bfe248c934ddbc6ff24bb5c008029d07a1935471b05abec87d0568e0cc6a562279285157fc794f420a9847dd09eb7
+  data.tar.gz: 1e1b050921161d866dd2e0f42a57a6b7b0b432f930c86eae29f77d608fad121fb4851f4a07d11dff0c76d8b98402261750347907255123b00102238478f2859a

data/lib/command/diff.rb

@@ -27,6 +27,8 @@ module Command
 
       if @options[:cached]
         diff_head_index
+      elsif @args.size == 2
+        diff_commits
       else
         diff_index_workspace
       end
@@ -36,6 +38,13 @@ module Command
 
     private
 
+    def diff_commits
+      return unless @options[:patch]
+
+      a, b = @args.map { |rev| Revision.new(repo, rev).resolve }
+      print_commit_diff(a, b)
+    end
+
     def diff_head_index
       return unless @options[:patch]
 
@@ -85,17 +94,12 @@ module Command
 
     def from_head(path)
       entry = @status.head_tree.fetch(path)
-      blob  = repo.database.load(entry.oid)
-
-      Target.new(path, entry.oid, entry.mode.to_s(8), blob.data)
+      from_entry(path, entry)
     end
 
     def from_index(path, stage = 0)
       entry = repo.index.entry_for_path(path, stage)
-      return nil unless entry
-
-      blob = repo.database.load(entry.oid)
-      Target.new(path, entry.oid, entry.mode.to_s(8), blob.data)
+      entry ? from_entry(path, entry) : nil
     end
 
     def from_file(path)
@@ -106,9 +110,5 @@ module Command
       Target.new(path, oid, mode.to_s(8), blob.data)
     end
 
-    def from_nothing(path)
-      Target.new(path, NULL_OID, nil, "")
-    end
-
   end
 end

data/lib/command/log.rb

@@ -145,15 +145,8 @@ module Command
       return unless @options[:patch]
       return show_merge_patch(commit) if commit.merge?
 
-      diff  = @rev_list.tree_diff(commit.parent, commit.oid)
-      paths = diff.keys.sort_by(&:to_s)
-
       blank_line
-
-      paths.each do |path|
-        old_item, new_item = diff[path]
-        print_diff(from_diff_item(path, old_item), from_diff_item(path, new_item))
-      end
+      print_commit_diff(commit.parent, commit.oid, @rev_list)
     end
 
     def show_merge_patch(commit)
@@ -168,21 +161,12 @@ module Command
       blank_line
 
       paths.each do |path|
-        parents = diffs.map { |diff| from_diff_item(path, diff[path][0]) }
-        child   = from_diff_item(path, diffs.first[path][1])
+        parents = diffs.map { |diff| from_entry(path, diff[path][0]) }
+        child   = from_entry(path, diffs.first[path][1])
 
         print_combined_diff(parents, child)
       end
     end
 
-    def from_diff_item(path, item)
-      if item
-        blob = repo.database.load(item.oid)
-        Target.new(path, item.oid, item.mode.to_s(8), blob.data)
-      else
-        Target.new(path, NULL_OID, nil, "")
-      end
-    end
-
   end
 end

data/lib/command/receive_pack.rb

@@ -64,6 +64,9 @@ module Command
     end
 
     def validate_update(ref, old_oid, new_oid)
+      raise "funny refname" unless Revision.valid_ref?(ref)
+      raise "missing necessary objects" if new_oid and not repo.database.has?(new_oid)
+
       if repo.config.get(["receive", "denyDeletes"])
         raise "deletion prohibited" unless new_oid
       end

data/lib/command/shared/print_diff.rb

@@ -28,6 +28,17 @@ module Command
 
     private
 
+    def from_entry(path, entry)
+      return from_nothing(path) unless entry
+
+      blob = repo.database.load(entry.oid)
+      Target.new(path, entry.oid, entry.mode.to_s(8), blob.data)
+    end
+
+    def from_nothing(path)
+      Target.new(path, NULL_OID, nil, "")
+    end
+
     def diff_fmt(name, text)
       key   = ["color", "diff", name]
       style = repo.config.get(key)&.split(/ +/) || DIFF_FORMATS.fetch(name)
@@ -43,6 +54,17 @@ module Command
       repo.database.short_oid(oid)
     end
 
+    def print_commit_diff(a, b, differ = nil)
+      differ ||= repo.database
+      diff     = differ.tree_diff(a, b)
+      paths    = diff.keys.sort_by(&:to_s)
+
+      paths.each do |path|
+        old_entry, new_entry = diff[path]
+        print_diff(from_entry(path, old_entry), from_entry(path, new_entry))
+      end
+    end
+
     def print_diff(a, b)
       return if a.oid == b.oid and a.mode == b.mode
 

data/lib/command/shared/receive_objects.rb

@@ -17,6 +17,7 @@ module Command
       processor = factory.new(repo.database, reader, stream, progress)
 
       processor.process_pack
+      repo.database.reload
     end
 
     def select_processor_class(reader, unpack_limit)

data/lib/database.rb

@@ -24,7 +24,7 @@ class Database
 
   extend Forwardable
   def_delegators :@backend, :has?, :load_info, :load_raw,
-                            :prefix_match, :pack_path
+                            :prefix_match, :pack_path, :reload
 
   def initialize(pathname)
     @objects = {}

data/lib/database/backends.rb

@@ -12,7 +12,12 @@ class Database
     def initialize(pathname)
       @pathname = pathname
       @loose    = Loose.new(pathname)
-      @stores   = [@loose] + packed
+
+      reload
+    end
+
+    def reload
+      @stores = [@loose] + packed
     end
 
     def pack_path

data/lib/database/packed.rb

@@ -1,8 +1,5 @@
 require "forwardable"
-
-require_relative "../pack/expander"
-require_relative "../pack/index"
-require_relative "../pack/reader"
+require_relative "../pack"
 
 class Database
   class Packed

data/lib/pack.rb

@@ -1,4 +1,5 @@
 require_relative "./pack/reader"
+require_relative "./pack/index"
 require_relative "./pack/writer"
 require_relative "./pack/stream"
 require_relative "./pack/indexer"

data/lib/pack/compressor.rb

@@ -23,9 +23,9 @@ module Pack
     def build_deltas
       @progress&.start("Compressing objects", @objects.size)
 
-      @objects.sort! { |a, b| b.sort_key <=> a.sort_key }
+      @objects.sort_by!(&:sort_key)
 
-      @objects.each do |entry|
+      @objects.reverse_each do |entry|
         build_delta(entry)
         @progress&.tick
       end

data/lib/pack/index.rb

@@ -44,7 +44,7 @@ module Pack
       loop do
         oid = @input.read(20).unpack("H40").first
         return oids unless oid.start_with?(name)
-        oids << oid
+        oids.push(oid)
       end
     end
 

data/lib/refs.rb

@@ -160,7 +160,8 @@ class Refs
       path.dirname.ascend.any? { |parent| parent == dir }
     end
 
-    path.relative_path_from(prefix).to_s
+    path = path.relative_path_from(prefix) if prefix
+    path.to_s
   end
 
   def long_name(ref)

data/lib/revision.rb

@@ -33,6 +33,7 @@ class Revision
       ^\.
     | \/\.
     | \.\.
+    | ^\/
     | \/$
     | \.lock$
     | @\{

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: jit
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - James Coglan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-10 00:00:00.000000000 Z
+date: 2021-06-18 00:00:00.000000000 Z
 dependencies: []
-description: 
+description:
 email: jcoglan@gmail.com
 executables:
 - jit
@@ -115,7 +115,7 @@ homepage: https://shop.jcoglan.com/building-git/
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -130,8 +130,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: The information manager from London
 test_files: []