jit 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: f5c2cd92ea33331677eeff3e83280c1ae12fda655d906bc64872e8f6f657c010
-  data.tar.gz: 154e5620d4540ded17b667edd7757450d9ad27fe8cf5bdd2f218fe8984407a75
+SHA1:
+  metadata.gz: aa9a39f5359292f9749f7103c29f3a6eadf1dfc1
+  data.tar.gz: 061d790a80ac6f7307a749527c4683f95c28b7d3
 SHA512:
-  metadata.gz: 616339725efbc5a38303469c729d512e5223b0850d139bd7d317205df5271be691bb506b052a3a60630f08459a97e737dfba051bbfcd4cc79eb1bdf285d2ca77
-  data.tar.gz: 951f13df966b69f1e29596aa24e3117c41efb3c330c167974c64773f83f413bd2afbd060849dc7af5479a55b8c9d02790837366870fe16944f0942a2ab3ff757
+  metadata.gz: 47ae83e85a0b9f76e57d61dd76acca5402665b98ffd44f085ada67a2c49d9ae69ed81d43059d3d8aca824ccb084714b55f629b1af51992256ddce1eeeac3701e
+  data.tar.gz: 6207ab63be2d26bb76d97451b98212c7f1e37c014cc200698643bb7921139dc80cddc890211d40cd0480399b78db2bc7b5cecb09ccb24a818e99ad90b424923d

data/lib/command/branch.rb

@@ -96,10 +96,7 @@ module Command
 
       ahead  = divergence.ahead
       behind = divergence.behind
-
-      return "" if ahead == 0 and behind == 0
-
-      info = []
+      info   = []
 
       if @options[:verbose] > 1
         info.push(fmt(:blue, repo.refs.short_name(divergence.upstream)))
@@ -107,7 +104,7 @@ module Command
       info.push("ahead #{ ahead }") if ahead > 0
       info.push("behind #{ behind }") if behind > 0
 
-      " [#{ info.join(", ") }]"
+      info.empty? ? "" : " [#{ info.join(", ") }]"
     end
 
     def create_branch

data/lib/command/status.rb

@@ -68,17 +68,10 @@ module Command
       print_upstream_status
       print_pending_commit_status
 
-      print_changes("Changes to be committed",
-          @status.index_changes, :green)
-
-      print_changes("Unmerged paths",
-          @status.conflicts, :red, :conflict)
-
-      print_changes("Changes not staged for commit",
-          @status.workspace_changes, :red)
-
-      print_changes("Untracked files",
-          @status.untracked_files, :red)
+      print_changes("Changes to be committed", @status.index_changes, :green)
+      print_changes("Unmerged paths", @status.conflicts, :red, :conflict)
+      print_changes("Changes not staged for commit", @status.workspace_changes, :red)
+      print_changes("Untracked files", @status.untracked_files, :red)
 
       print_commit_status
     end
@@ -135,15 +128,18 @@ module Command
         end
         puts ""
       when :cherry_pick
-        print_pending_type("cherry-pick")
+        print_pending_type(:cherry_pick)
       when :revert
-        print_pending_type("revert")
+        print_pending_type(:revert)
       end
     end
 
-    def print_pending_type(op)
-      oid = repo.database.short_oid(repo.pending_commit.merge_oid)
-      puts "You are currently #{ op }ing commit #{ oid }."
+    def print_pending_type(merge_type)
+      oid   = repo.pending_commit.merge_oid(merge_type)
+      short = repo.database.short_oid(oid)
+      op    = merge_type.to_s.sub("_", "-")
+
+      puts "You are currently #{ op }ing commit #{ short }."
 
       if @status.conflicts.empty?
         hint "all conflicts fixed: run 'jit #{ op } --continue'"

data/lib/config.rb

@@ -131,11 +131,13 @@ class Config
 
   def subsections(name)
     name, _  = Section.normalize([name])
-    sections = @lines.keys
+    sections = []
 
-    sections.select { |main, _| main == name }
-            .reject { |_, sub| sub == nil }
-            .map(&:last)
+    @lines.each_key do |main, sub|
+      sections.push(sub) if main == name and sub != ""
+    end
+
+    sections
   end
 
   def section?(key)

data/lib/database.rb

@@ -11,6 +11,7 @@ require_relative "./database/tree"
 require_relative "./database/tree_diff"
 
 require_relative "./database/backends"
+require_relative "./path_filter"
 
 class Database
   TYPES = {
@@ -70,7 +71,7 @@ class Database
     return unless entry
     return list[prefix.to_s] = entry unless entry.tree?
 
-    load(entry.oid).each_entry do |name, item|
+    load(entry.oid).entries.each do |name, item|
       build_list(list, item, prefix.join(name))
     end
   end
@@ -83,9 +84,9 @@ class Database
     oid[0..6]
   end
 
-  def tree_diff(a, b, prune = [])
-    diff = TreeDiff.new(self, prune)
-    diff.compare_oids(a, b)
+  def tree_diff(a, b, filter = PathFilter.new)
+    diff = TreeDiff.new(self)
+    diff.compare_oids(a, b, filter)
     diff.changes
   end
 

data/lib/database/tree.rb

@@ -4,7 +4,8 @@ class Database
     ENTRY_FORMAT = "Z*H40"
     TREE_MODE    = 040000
 
-    attr_accessor :oid, :entries
+    attr_accessor :oid
+    attr_reader :entries
 
     def self.parse(scanner)
       entries = {}
@@ -36,10 +37,6 @@ class Database
       @entries = entries
     end
 
-    def each_entry(&block)
-      @entries.each(&block)
-    end
-
     def add_entry(parents, entry)
       if parents.empty?
         @entries[entry.basename] = entry

data/lib/database/tree_diff.rb

@@ -1,42 +1,25 @@
-require "pathname"
-
 class Database
   class TreeDiff
 
     attr_reader :changes
 
-    def initialize(database, prune = [])
+    def initialize(database)
       @database = database
       @changes  = {}
-
-      build_routing_table(prune)
     end
 
-    def compare_oids(a, b, prefix = Pathname.new(""))
+    def compare_oids(a, b, filter)
       return if a == b
 
       a_entries = a ? oid_to_tree(a).entries : {}
       b_entries = b ? oid_to_tree(b).entries : {}
 
-      detect_deletions(a_entries, b_entries, prefix)
-      detect_additions(a_entries, b_entries, prefix)
+      detect_deletions(a_entries, b_entries, filter)
+      detect_additions(a_entries, b_entries, filter)
     end
 
     private
 
-    def build_routing_table(prune)
-      @routes = {}
-
-      prune.each do |path|
-        table = @routes
-        path.each_filename { |name| table = table[name] ||= {} }
-      end
-    end
-
-    def routes_for_prefix(prefix)
-      prefix.each_filename.reduce(@routes) { |table, name| table[name] || {} }
-    end
-
     def oid_to_tree(oid)
       object = @database.load(oid)
 
@@ -46,40 +29,32 @@ class Database
       end
     end
 
-    def detect_deletions(a, b, prefix)
-      routes = routes_for_prefix(prefix)
-
-      a.each do |name, entry|
-        next unless routes.empty? or routes.has_key?(name)
-
-        path  = prefix.join(name)
+    def detect_deletions(a, b, filter)
+      filter.each_entry(a) do |name, entry|
         other = b[name]
-
         next if entry == other
 
+        sub_filter = filter.join(name)
+
         tree_a, tree_b = [entry, other].map { |e| e&.tree? ? e.oid : nil }
-        compare_oids(tree_a, tree_b, path)
+        compare_oids(tree_a, tree_b, sub_filter)
 
         blobs = [entry, other].map { |e| e&.tree? ? nil : e }
-        @changes[path] = blobs if blobs.any?
+        @changes[sub_filter.path] = blobs if blobs.any?
       end
     end
 
-    def detect_additions(a, b, prefix)
-      routes = routes_for_prefix(prefix)
-
-      b.each do |name, entry|
-        next unless routes.empty? or routes.has_key?(name)
-
-        path  = prefix.join(name)
+    def detect_additions(a, b, filter)
+      filter.each_entry(b) do |name, entry|
         other = a[name]
-
         next if other
 
+        sub_filter = filter.join(name)
+
         if entry.tree?
-          compare_oids(nil, entry.oid, path)
+          compare_oids(nil, entry.oid, sub_filter)
         else
-          @changes[path] = [nil, entry]
+          @changes[sub_filter.path] = [nil, entry]
         end
       end
     end

data/lib/diff.rb

@@ -28,19 +28,19 @@ module Diff
   end
 
   def self.diff(a, b)
-    Myers.diff(lines(a), lines(b))
+    Myers.diff(Diff.lines(a), Diff.lines(b))
   end
 
   def self.diff_hunks(a, b)
-    Hunk.filter(diff(a, b))
+    Hunk.filter(Diff.diff(a, b))
   end
 
   def self.combined(as, b)
-    diffs = as.map { |a| diff(a, b) }
+    diffs = as.map { |a| Diff.diff(a, b) }
     Combined.new(diffs).to_a
   end
 
   def self.combined_hunks(as, b)
-    Hunk.filter(combined(as, b))
+    Hunk.filter(Diff.combined(as, b))
   end
 end

data/lib/diff/hunk.rb

@@ -17,11 +17,11 @@ module Diff
         b_start  = (offset < 0) ? nil : edits[offset].b_line.number
 
         hunks.push(Hunk.new(a_starts, b_start, []))
-        offset = build_hunk(hunks.last, edits, offset)
+        offset = Hunk.build(hunks.last, edits, offset)
       end
     end
 
-    def self.build_hunk(hunk, edits, offset)
+    def self.build(hunk, edits, offset)
       counter = -1
 
       until counter == 0

data/lib/diff/myers.rb

@@ -2,7 +2,7 @@ module Diff
   class Myers
 
     def self.diff(a, b)
-      new(a, b).diff
+      Myers.new(a, b).diff
     end
 
     def initialize(a, b)

data/lib/editor.rb

@@ -4,7 +4,7 @@ class Editor
   DEFAULT_EDITOR = "vi"
 
   def self.edit(path, command)
-    editor = new(path, command)
+    editor = Editor.new(path, command)
     yield editor
     editor.edit_file
   end

data/lib/index/entry.rb

@@ -19,7 +19,7 @@ class Index
   Entry = Struct.new(*entry_fields) do
     def self.create(pathname, oid, stat)
       path  = pathname.to_s
-      mode  = mode_for_stat(stat)
+      mode  = Entry.mode_for_stat(stat)
       flags = [path.bytesize, MAX_PATH_SIZE].min
 
       Entry.new(

data/lib/merge/common_ancestors.rb

@@ -73,5 +73,6 @@ module Merge
       index = list.find_index { |c| c.date < commit.date }
       list.insert(index || list.size, commit)
     end
+
   end
 end

data/lib/merge/diff3.rb

@@ -42,7 +42,7 @@ module Merge
       a = a.lines if a.is_a?(String)
       b = b.lines if b.is_a?(String)
 
-      new(o, a, b).merge
+      Diff3.new(o, a, b).merge
     end
 
     def initialize(o, a, b)

data/lib/pack/expander.rb

@@ -9,7 +9,7 @@ module Pack
     attr_reader :source_size, :target_size
 
     def self.expand(source, delta)
-      new(delta).expand(source)
+      Expander.new(delta).expand(source)
     end
 
     def initialize(delta)

data/lib/pack/numbers.rb

@@ -59,19 +59,28 @@ module Pack
 
     module PackedInt56LE
       def self.write(value)
-        bytes = (0..6).map { |i| (value >> (8 * i)) & 0xff }
+        bytes = [0]
 
-        flags  = bytes.map.with_index { |b, i| b == 0 ? 0 : 1 << i }
-        header = flags.reduce(0) { |a, b| a | b }
+        (0...7).each do |i|
+          byte = (value >> (8 * i)) & 0xff
+          next if byte == 0
 
-        [header] + bytes.reject { |b| b == 0 }
+          bytes[0] |= 1 << i
+          bytes.push(byte)
+        end
+
+        bytes
       end
 
       def self.read(input, header)
-        flags = (0..6).reject { |i| header & (1 << i) == 0 }
-        bytes = flags.map { |i| input.readbyte << (8 * i) }
+        value = 0
 
-        bytes.reduce(0) { |a, b| a | b }
+        (0...7).each do |i|
+          next if header & (1 << i) == 0
+          value |= input.readbyte << (8 * i)
+        end
+
+        value
       end
     end
 

data/lib/pack/xdelta.rb

@@ -15,7 +15,7 @@ module Pack
         index[slice].push(offset)
       end
 
-      new(source, index)
+      XDelta.new(source, index)
     end
 
     def initialize(source, index)

data/lib/path_filter.rb

@@ -0,0 +1,44 @@
+require "pathname"
+
+class PathFilter
+  Trie = Struct.new(:matched, :children) do
+    def self.from_paths(paths)
+      root = Trie.node
+      root.matched = true if paths.empty?
+
+      paths.each do |path|
+        trie = root
+        path.each_filename { |name| trie = trie.children[name] }
+        trie.matched = true
+      end
+
+      root
+    end
+
+    def self.node
+      Trie.new(false, Hash.new { |hash, key| hash[key] = Trie.node })
+    end
+  end
+
+  attr_reader :path
+
+  def self.build(paths)
+    PathFilter.new(Trie.from_paths(paths))
+  end
+
+  def initialize(routes = Trie.new(true), path = Pathname.new(""))
+    @routes = routes
+    @path   = path
+  end
+
+  def each_entry(entries)
+    entries.each do |name, entry|
+      yield name, entry if @routes.matched or @routes.children.has_key?(name)
+    end
+  end
+
+  def join(name)
+    next_routes = @routes.matched ? @routes : @routes.children[name]
+    PathFilter.new(next_routes, @path.join(name))
+  end
+end

data/lib/refs.rb

@@ -101,7 +101,6 @@ class Refs
       raise InvalidBranch, "A branch named '#{ branch_name }' already exists."
     end
 
-    FileUtils.mkdir_p(path.dirname)
     update_ref_file(path, start_oid)
   end
 
@@ -115,6 +114,8 @@ class Refs
     raise InvalidBranch, "branch '#{ branch_name }' not found." unless oid
 
     File.unlink(path)
+    delete_parent_directories(path)
+
     oid
   ensure
     lockfile.rollback
@@ -195,6 +196,17 @@ class Refs
     prefix ? prefix.join(name) : nil
   end
 
+  def delete_parent_directories(path)
+    path.dirname.ascend do |dir|
+      break if dir == @heads_path
+      begin
+        Dir.rmdir(dir)
+      rescue Errno::ENOTEMPTY
+        break
+      end
+    end
+  end
+
   def read_oid_or_symref(path)
     data  = File.read(path).strip
     match = SYMREF.match(data)

data/lib/remotes/protocol.rb

@@ -23,8 +23,8 @@ class Remotes
       return @output.write("0000") if line == nil
 
       line = append_caps(line)
-
       size = line.bytesize + 5
+
       @output.write(size.to_s(16).rjust(4, "0"))
       @output.write(line)
       @output.write("\n")

data/lib/remotes/refspec.rb

@@ -10,8 +10,8 @@ class Remotes
   Refspec = Struct.new(:source, :target, :forced) do
     def self.parse(spec)
       match  = REFSPEC_FORMAT.match(spec)
-      source = canonical(match[2])
-      target = canonical(match[4]) || source
+      source = Refspec.canonical(match[2])
+      target = Refspec.canonical(match[4]) || source
 
       Refspec.new(source, target, match[1] == "+")
     end
@@ -20,15 +20,15 @@ class Remotes
       return nil if name.to_s == ""
       return name unless Revision.valid_ref?(name)
 
-      first  = Pathname.new(name).each_filename.first
+      first  = Pathname.new(name).descend.first
       dirs   = [Refs::REFS_DIR, Refs::HEADS_DIR, Refs::REMOTES_DIR]
-      prefix = dirs.find { |dir| first == dir.basename.to_s }
+      prefix = dirs.find { |dir| dir.basename == first }
 
       (prefix&.dirname || Refs::HEADS_DIR).join(name).to_s
     end
 
     def self.expand(specs, refs)
-      specs = specs.map { |spec| parse(spec) }
+      specs = specs.map { |spec| Refspec.parse(spec) }
 
       specs.reduce({}) do |mappings, spec|
         mappings.merge(spec.match_refs(refs))
@@ -36,7 +36,7 @@ class Remotes
     end
 
     def self.invert(specs, ref)
-      specs = specs.map { |spec| parse(spec) }
+      specs = specs.map { |spec| Refspec.parse(spec) }
 
       map = specs.reduce({}) do |mappings, spec|
         spec.source, spec.target = spec.target, spec.source

data/lib/repository/pending_commit.rb

@@ -23,7 +23,7 @@ class Repository
     end
 
     def in_progress?
-      not merge_type.nil?
+      merge_type != nil
     end
 
     def merge_type

data/lib/rev_list.rb

@@ -1,6 +1,7 @@
 require "pathname"
 require "set"
 
+require_relative "./path_filter"
 require_relative "./revision"
 
 class RevList
@@ -31,6 +32,8 @@ class RevList
 
     revs.each { |rev| handle_revision(rev) }
     handle_revision(Revision::HEAD) if @queue.empty?
+
+    @filter = PathFilter.build(@prune)
   end
 
   def each
@@ -42,7 +45,7 @@ class RevList
 
   def tree_diff(old_oid, new_oid)
     key = [old_oid, new_oid]
-    @diffs[key] ||= @repo.database.tree_diff(old_oid, new_oid, @prune)
+    @diffs[key] ||= @repo.database.tree_diff(old_oid, new_oid, @filter)
   end
 
   private
@@ -141,16 +144,10 @@ class RevList
 
     until queue.empty?
       oid = queue.shift
+      next unless mark(oid, :uninteresting)
 
-      while oid
-        break unless mark(oid, :uninteresting)
-
-        parent = @commits[oid]
-        break unless parent
-
-        oid = parent.parents.first
-        queue.concat(parent.parents.drop(1))
-      end
+      commit = @commits[oid]
+      queue.concat(commit.parents) if commit
     end
   end
 
@@ -224,7 +221,7 @@ class RevList
 
     tree = @repo.database.load(entry.oid)
 
-    tree.each_entry do |name, item|
+    tree.entries.each do |name, item|
       traverse_tree(item, path.join(name)) { |object| yield object }
     end
   end

data/lib/revision.rb

@@ -54,16 +54,16 @@ class Revision
 
   def self.parse(revision)
     if match = PARENT.match(revision)
-      rev = parse(match[1])
+      rev = Revision.parse(match[1])
       n = (match[2] == "") ? 1 : match[2].to_i
       rev ? Parent.new(rev, n) : nil
     elsif match = ANCESTOR.match(revision)
-      rev = parse(match[1])
+      rev = Revision.parse(match[1])
       rev ? Ancestor.new(rev, match[2].to_i) : nil
     elsif match = UPSTREAM.match(revision)
-      rev = parse(match[1])
+      rev = Revision.parse(match[1])
       rev ? Upstream.new(rev) : nil
-    elsif valid_ref?(revision)
+    elsif Revision.valid_ref?(revision)
       name = REF_ALIASES[revision] || revision
       Ref.new(name)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jit
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - James Coglan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: jcoglan@gmail.com
@@ -91,6 +91,7 @@ files:
 - lib/pack/writer.rb
 - lib/pack/xdelta.rb
 - lib/pager.rb
+- lib/path_filter.rb
 - lib/progress.rb
 - lib/refs.rb
 - lib/remotes.rb
@@ -129,7 +130,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: The information manager from London