gollum_rails 1.4.0.rc1 → 1.4.0.rc2

data/lib/gollum_rails/setup.rb

@@ -1,81 +1,81 @@
-module GollumRails
-
-  # Setup functionality for Rails initializer
-  #  
-  # will be generated by Rails generator: `rails g gollum_rails:install`
-  #
-  # manually:
-  #
-  #   GollumRails::Setup.build do |config|
-  #     config.repository = '<path_to_your_repository>'
-  #     config.wiki = :default
-  #     config.startup
-  #   end
-  #
-  # TODO:
-  #   * more options
-  #
-  # FIXME:
-  #   currently nothing
-  #
-  class Setup
-
-    # static baby
-    class << self
-      
-
-      # Gets / Sets the repository
-      attr_accessor :repository
-
-      # Startup action for building wiki components
-      #
-      # Returns true or throws an exception if the path is invalid
-      def startup=(action)
-        if action
-          Adapters::Gollum::Connector.enabled = true
-          if @repository == :application
-            initialize_wiki Rails.application.config.wiki_repository
-          else
-            initialize_wiki @repository
-          end
-        end
-
-      end
-      
-      # defines block builder for Rails initializer.
-      # executes public methods inside own class
-      #
-      def build(&block)
-        block.call self
-      end
-
-      #######
-      private
-      #######
-
-      # Checks if provided path is present and valid
-      #
-      # Example
-      #   path_valid? '/'
-      #   # =>true
-      #  
-      #   path_valid? nil
-      #   # =>false
-      def path_valid?(path)
-        return !(path.nil? || path.empty? || ! path.is_a?(String))
-      end
-
-      def initialize_wiki(path)
-        if path_valid? path
-          repository = Grit::Repo.new path.to_s
-          GollumRails::Adapters::Gollum::Wiki.new repository
-          true
-        else
-          raise GollumInternalError, 'no repository path specified'
-        end
-
-      end
-
-    end
-  end
-end
+module GollumRails
+
+  # Setup functionality for Rails initializer
+  #  
+  # will be generated by Rails generator: `rails g gollum_rails:install`
+  #
+  # manually:
+  #
+  #   GollumRails::Setup.build do |config|
+  #     config.repository = '<path_to_your_repository>'
+  #     config.wiki = :default
+  #     config.startup
+  #   end
+  #
+  # TODO:
+  #   * more options
+  #
+  # FIXME:
+  #   currently nothing
+  #
+  class Setup
+
+    # static baby
+    class << self
+      
+
+      # Gets / Sets the repository
+      attr_accessor :repository
+
+      # Startup action for building wiki components
+      #
+      # Returns true or throws an exception if the path is invalid
+      def startup=(action)
+        if action
+          Adapters::Gollum::Connector.enabled = true
+          if @repository == :application
+            initialize_wiki Rails.application.config.wiki_repository
+          else
+            initialize_wiki @repository
+          end
+        end
+
+      end
+      
+      # defines block builder for Rails initializer.
+      # executes public methods inside own class
+      #
+      def build(&block)
+        block.call self
+      end
+
+      #######
+      private
+      #######
+
+      # Checks if provided path is present and valid
+      #
+      # Example
+      #   path_valid? '/'
+      #   # =>true
+      #  
+      #   path_valid? nil
+      #   # =>false
+      def path_valid?(path)
+        return !(path.nil? || path.empty? || ! path.is_a?(String))
+      end
+
+      def initialize_wiki(path)
+        if path_valid? path
+          repository = Grit::Repo.new path.to_s
+          GollumRails::Adapters::Gollum::Wiki.new repository
+          true
+        else
+          raise GollumInternalError, 'no repository path specified'
+        end
+
+      end
+
+    end
+  end
+end

data/lib/grit/git-ruby/internal/pack.rb

@@ -1,397 +1,397 @@
-#
-# converted from the gitrb project
-#
-# authors:
-#    Matthias Lederhofer <matled@gmx.net>
-#    Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
-#    Scott Chacon <schacon@gmail.com>
-#
-# provides native ruby access to git objects and pack files
-#
-
-require 'zlib'
-require 'grit/git-ruby/internal/raw_object'
-require 'grit/git-ruby/internal/file_window'
-
-PACK_IDX_SIGNATURE = [0xFF, 0x74, 0x4F, 0x63]
-
-module Grit
-  module GitRuby
-    module Internal
-      class PackFormatError < StandardError
-      end
-
-      class PackStorage
-        OBJ_OFS_DELTA = 6
-        OBJ_REF_DELTA = 7
-
-        FanOutCount = 256
-        SHA1Size = 20
-        IdxOffsetSize = 4
-        OffsetSize = 4
-        ExtendedOffsetSize = 8
-        CrcSize = 4
-        OffsetStart = FanOutCount * IdxOffsetSize
-        SHA1Start = OffsetStart + OffsetSize
-        EntrySize = OffsetSize + SHA1Size
-        EntrySizeV2 = SHA1Size + CrcSize + OffsetSize
-
-        def initialize(file)
-          if file =~ /\.idx$/
-            file = file[0...-3] + 'pack'
-          end
-          @name = file
-          @cache = {}
-          init_pack
-        end
-
-        def with_idx(index_file = nil)
-          index_file ||= @name[0...-4] + 'idx'
-
-          begin
-            idxfile = File.open(index_file, 'rb')
-          rescue Errno::ENOENT => boom
-            # file went away. bail out without yielding.
-            return
-          end
-
-          # read header
-          sig = idxfile.read(4).unpack("C*")
-          ver = idxfile.read(4).unpack("N")[0]
-
-          if sig == PACK_IDX_SIGNATURE
-            if(ver != 2)
-              raise PackFormatError, "pack #@name has unknown pack file version #{ver}"
-            end
-            @version = 2
-          else
-            @version = 1
-          end
-
-          idx = FileWindow.new(idxfile, @version)
-          yield idx
-          idx.unmap
-        ensure
-          idxfile.close if idxfile
-        end
-
-        def with_packfile
-          begin
-            packfile = File.open(@name, 'rb')
-          rescue Errno::ENOENT
-            # file went away. bail out without yielding.
-            return
-          end
-          yield packfile
-        ensure
-          packfile.close if packfile
-        end
-
-        def cache_objects
-          @cache = {}
-          with_packfile do |packfile|
-            each_entry do |sha, offset|
-              data, type = unpack_object(packfile, offset, {:caching => true})
-              if data
-                @cache[sha] = RawObject.new(OBJ_TYPES[type], data)
-              end
-            end
-          end
-        end
-
-        def name
-          @name
-        end
-
-        def close
-          # shouldnt be anything open now
-        end
-
-        # given an index file, list out the shas that it's packfile contains
-        def get_shas
-          shas = []
-          each_sha1 { |sha| shas << sha.unpack("H*")[0] }
-          shas
-        end
-
-        def [](sha1)
-          if obj = @cache[sha1]
-            return obj
-          end
-
-          offset = find_object(sha1)
-          return nil if !offset
-          @cache[sha1] = obj = parse_object(offset)
-          return obj
-        end
-
-        def init_pack
-          with_idx do |idx|
-            @offsets = [0]
-            FanOutCount.times do |i|
-              pos = idx[i * IdxOffsetSize,IdxOffsetSize].unpack('N')[0]
-              if pos < @offsets[i]
-                raise PackFormatError, "pack #@name has discontinuous index #{i}"
-              end
-              @offsets << pos
-            end
-            @size = @offsets[-1]
-          end
-        end
-
-        def each_entry
-          with_idx do |idx|
-            if @version == 2
-              data = read_data_v2(idx)
-              data.each do |sha1, crc, offset|
-                yield sha1, offset
-              end
-            else
-              pos = OffsetStart
-              @size.times do
-                offset = idx[pos,OffsetSize].unpack('N')[0]
-                sha1 = idx[pos+OffsetSize,SHA1Size]
-                pos += EntrySize
-                yield sha1, offset
-              end
-            end
-          end
-        end
-
-        def read_data_v2(idx)
-          data = []
-          pos = OffsetStart
-          @size.times do |i|
-            data[i] = [idx[pos,SHA1Size], 0, 0]
-            pos += SHA1Size
-          end
-          @size.times do |i|
-            crc = idx[pos,CrcSize]
-            data[i][1] = crc
-            pos += CrcSize
-          end
-          @size.times do |i|
-            offset = idx[pos,OffsetSize].unpack('N')[0]
-            data[i][2] = offset
-            pos += OffsetSize
-          end
-          data
-        end
-        private :read_data_v2
-
-        def each_sha1
-          with_idx do |idx|
-            if @version == 2
-              data = read_data_v2(idx)
-              data.each do |sha1, crc, offset|
-                yield sha1
-              end
-            else
-              pos = SHA1Start
-              @size.times do
-                sha1 = idx[pos,SHA1Size]
-                pos += EntrySize
-                yield sha1
-              end
-            end
-          end
-        end
-
-        def find_object_in_index(idx, sha1)
-          slot = sha1.getord(0)
-          return nil if !slot
-          first, last = @offsets[slot,2]
-          while first < last
-            mid = (first + last) / 2
-            if @version == 2
-              midsha1 = idx[OffsetStart + (mid * SHA1Size), SHA1Size]
-              cmp = midsha1 <=> sha1
-
-              if cmp < 0
-                first = mid + 1
-              elsif cmp > 0
-                last = mid
-              else
-                pos = OffsetStart + (@size * (SHA1Size + CrcSize)) + (mid * OffsetSize)
-                offset = idx[pos, OffsetSize].unpack('N')[0]
-                if offset & 0x80000000 > 0
-                  offset &= 0x7fffffff
-                  pos = OffsetStart + (@size * (SHA1Size + CrcSize + OffsetSize)) + (offset * ExtendedOffsetSize)
-                  words = idx[pos, ExtendedOffsetSize].unpack('NN')
-                  offset = (words[0] << 32) | words[1]
-                end
-                return offset
-              end
-            else
-              midsha1 = idx[SHA1Start + mid * EntrySize,SHA1Size]
-              cmp = midsha1 <=> sha1
-
-              if cmp < 0
-                first = mid + 1
-              elsif cmp > 0
-                last = mid
-              else
-                pos = OffsetStart + mid * EntrySize
-                offset = idx[pos,OffsetSize].unpack('N')[0]
-                return offset
-              end
-            end
-          end
-          nil
-        end
-
-        def find_object(sha1)
-          obj = nil
-          with_idx do |idx|
-            obj = find_object_in_index(idx, sha1)
-          end
-          obj
-        end
-        private :find_object
-
-        def parse_object(offset)
-          obj = nil
-          with_packfile do |packfile|
-            data, type = unpack_object(packfile, offset)
-            obj = RawObject.new(OBJ_TYPES[type], data)
-          end
-          obj
-        end
-        protected :parse_object
-
-        def unpack_object(packfile, offset, options = {})
-          obj_offset = offset
-          packfile.seek(offset)
-
-          c = packfile.read(1).getord(0)
-          size = c & 0xf
-          type = (c >> 4) & 7
-          shift = 4
-          offset += 1
-          while c & 0x80 != 0
-            c = packfile.read(1).getord(0)
-            size |= ((c & 0x7f) << shift)
-            shift += 7
-            offset += 1
-          end
-
-          return [false, false] if !(type == OBJ_COMMIT || type == OBJ_TREE) && options[:caching]
-
-          case type
-          when OBJ_OFS_DELTA, OBJ_REF_DELTA
-            data, type = unpack_deltified(packfile, type, offset, obj_offset, size, options)
-            #puts type
-          when OBJ_COMMIT, OBJ_TREE, OBJ_BLOB, OBJ_TAG
-            data = unpack_compressed(offset, size)
-          else
-            raise PackFormatError, "invalid type #{type}"
-          end
-          [data, type]
-        end
-        private :unpack_object
-
-        def unpack_deltified(packfile, type, offset, obj_offset, size, options = {})
-          packfile.seek(offset)
-          data = packfile.read(SHA1Size)
-
-          if type == OBJ_OFS_DELTA
-            i = 0
-            c = data.getord(i)
-            base_offset = c & 0x7f
-            while c & 0x80 != 0
-              c = data.getord(i += 1)
-              base_offset += 1
-              base_offset <<= 7
-              base_offset |= c & 0x7f
-            end
-            base_offset = obj_offset - base_offset
-            offset += i + 1
-          else
-            base_offset = find_object(data)
-            offset += SHA1Size
-          end
-
-          base, type = unpack_object(packfile, base_offset)
-
-          return [false, false] if !(type == OBJ_COMMIT || type == OBJ_TREE) && options[:caching]
-
-          delta = unpack_compressed(offset, size)
-          [patch_delta(base, delta), type]
-        end
-        private :unpack_deltified
-
-        def unpack_compressed(offset, destsize)
-          outdata = ""
-          with_packfile do |packfile|
-            packfile.seek(offset)
-            zstr = Zlib::Inflate.new
-            while outdata.size < destsize
-              indata = packfile.read(4096)
-              if indata.size == 0
-                raise PackFormatError, 'error reading pack data'
-              end
-              outdata << zstr.inflate(indata)
-            end
-            if outdata.size > destsize
-              raise PackFormatError, 'error reading pack data'
-            end
-            zstr.close
-          end
-          outdata
-        end
-        private :unpack_compressed
-
-        def patch_delta(base, delta)
-          src_size, pos = patch_delta_header_size(delta, 0)
-          if src_size != base.size
-            raise PackFormatError, 'invalid delta data'
-          end
-
-          dest_size, pos = patch_delta_header_size(delta, pos)
-          dest = ""
-          while pos < delta.size
-            c = delta.getord(pos)
-            pos += 1
-            if c & 0x80 != 0
-              pos -= 1
-              cp_off = cp_size = 0
-              cp_off = delta.getord(pos += 1) if c & 0x01 != 0
-              cp_off |= delta.getord(pos += 1) << 8 if c & 0x02 != 0
-              cp_off |= delta.getord(pos += 1) << 16 if c & 0x04 != 0
-              cp_off |= delta.getord(pos += 1) << 24 if c & 0x08 != 0
-              cp_size = delta.getord(pos += 1) if c & 0x10 != 0
-              cp_size |= delta.getord(pos += 1) << 8 if c & 0x20 != 0
-              cp_size |= delta.getord(pos += 1) << 16 if c & 0x40 != 0
-              cp_size = 0x10000 if cp_size == 0
-              pos += 1
-              dest << base[cp_off,cp_size]
-            elsif c != 0
-              dest << delta[pos,c]
-              pos += c
-            else
-              raise PackFormatError, 'invalid delta data'
-            end
-          end
-          dest
-        end
-        private :patch_delta
-
-        def patch_delta_header_size(delta, pos)
-          size = 0
-          shift = 0
-          begin
-            c = delta.getord(pos)
-            if c == nil
-              raise PackFormatError, 'invalid delta header'
-            end
-            pos += 1
-            size |= (c & 0x7f) << shift
-            shift += 7
-          end while c & 0x80 != 0
-          [size, pos]
-        end
-        private :patch_delta_header_size
-      end
-    end
-  end
-end
+#
+# converted from the gitrb project
+#
+# authors:
+#    Matthias Lederhofer <matled@gmx.net>
+#    Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
+#    Scott Chacon <schacon@gmail.com>
+#
+# provides native ruby access to git objects and pack files
+#
+
+require 'zlib'
+require 'grit/git-ruby/internal/raw_object'
+require 'grit/git-ruby/internal/file_window'
+
+PACK_IDX_SIGNATURE = [0xFF, 0x74, 0x4F, 0x63]
+
+module Grit
+  module GitRuby
+    module Internal
+      class PackFormatError < StandardError
+      end
+
+      class PackStorage
+        OBJ_OFS_DELTA = 6
+        OBJ_REF_DELTA = 7
+
+        FanOutCount = 256
+        SHA1Size = 20
+        IdxOffsetSize = 4
+        OffsetSize = 4
+        ExtendedOffsetSize = 8
+        CrcSize = 4
+        OffsetStart = FanOutCount * IdxOffsetSize
+        SHA1Start = OffsetStart + OffsetSize
+        EntrySize = OffsetSize + SHA1Size
+        EntrySizeV2 = SHA1Size + CrcSize + OffsetSize
+
+        def initialize(file)
+          if file =~ /\.idx$/
+            file = file[0...-3] + 'pack'
+          end
+          @name = file
+          @cache = {}
+          init_pack
+        end
+
+        def with_idx(index_file = nil)
+          index_file ||= @name[0...-4] + 'idx'
+
+          begin
+            idxfile = File.open(index_file, 'rb')
+          rescue Errno::ENOENT => boom
+            # file went away. bail out without yielding.
+            return
+          end
+
+          # read header
+          sig = idxfile.read(4).unpack("C*")
+          ver = idxfile.read(4).unpack("N")[0]
+
+          if sig == PACK_IDX_SIGNATURE
+            if(ver != 2)
+              raise PackFormatError, "pack #@name has unknown pack file version #{ver}"
+            end
+            @version = 2
+          else
+            @version = 1
+          end
+
+          idx = FileWindow.new(idxfile, @version)
+          yield idx
+          idx.unmap
+        ensure
+          idxfile.close if idxfile
+        end
+
+        def with_packfile
+          begin
+            packfile = File.open(@name, 'rb')
+          rescue Errno::ENOENT
+            # file went away. bail out without yielding.
+            return
+          end
+          yield packfile
+        ensure
+          packfile.close if packfile
+        end
+
+        def cache_objects
+          @cache = {}
+          with_packfile do |packfile|
+            each_entry do |sha, offset|
+              data, type = unpack_object(packfile, offset, {:caching => true})
+              if data
+                @cache[sha] = RawObject.new(OBJ_TYPES[type], data)
+              end
+            end
+          end
+        end
+
+        def name
+          @name
+        end
+
+        def close
+          # shouldnt be anything open now
+        end
+
+        # given an index file, list out the shas that it's packfile contains
+        def get_shas
+          shas = []
+          each_sha1 { |sha| shas << sha.unpack("H*")[0] }
+          shas
+        end
+
+        def [](sha1)
+          if obj = @cache[sha1]
+            return obj
+          end
+
+          offset = find_object(sha1)
+          return nil if !offset
+          @cache[sha1] = obj = parse_object(offset)
+          return obj
+        end
+
+        def init_pack
+          with_idx do |idx|
+            @offsets = [0]
+            FanOutCount.times do |i|
+              pos = idx[i * IdxOffsetSize,IdxOffsetSize].unpack('N')[0]
+              if pos < @offsets[i]
+                raise PackFormatError, "pack #@name has discontinuous index #{i}"
+              end
+              @offsets << pos
+            end
+            @size = @offsets[-1]
+          end
+        end
+
+        def each_entry
+          with_idx do |idx|
+            if @version == 2
+              data = read_data_v2(idx)
+              data.each do |sha1, crc, offset|
+                yield sha1, offset
+              end
+            else
+              pos = OffsetStart
+              @size.times do
+                offset = idx[pos,OffsetSize].unpack('N')[0]
+                sha1 = idx[pos+OffsetSize,SHA1Size]
+                pos += EntrySize
+                yield sha1, offset
+              end
+            end
+          end
+        end
+
+        def read_data_v2(idx)
+          data = []
+          pos = OffsetStart
+          @size.times do |i|
+            data[i] = [idx[pos,SHA1Size], 0, 0]
+            pos += SHA1Size
+          end
+          @size.times do |i|
+            crc = idx[pos,CrcSize]
+            data[i][1] = crc
+            pos += CrcSize
+          end
+          @size.times do |i|
+            offset = idx[pos,OffsetSize].unpack('N')[0]
+            data[i][2] = offset
+            pos += OffsetSize
+          end
+          data
+        end
+        private :read_data_v2
+
+        def each_sha1
+          with_idx do |idx|
+            if @version == 2
+              data = read_data_v2(idx)
+              data.each do |sha1, crc, offset|
+                yield sha1
+              end
+            else
+              pos = SHA1Start
+              @size.times do
+                sha1 = idx[pos,SHA1Size]
+                pos += EntrySize
+                yield sha1
+              end
+            end
+          end
+        end
+
+        def find_object_in_index(idx, sha1)
+          slot = sha1.getord(0)
+          return nil if !slot
+          first, last = @offsets[slot,2]
+          while first < last
+            mid = (first + last) / 2
+            if @version == 2
+              midsha1 = idx[OffsetStart + (mid * SHA1Size), SHA1Size]
+              cmp = midsha1 <=> sha1
+
+              if cmp < 0
+                first = mid + 1
+              elsif cmp > 0
+                last = mid
+              else
+                pos = OffsetStart + (@size * (SHA1Size + CrcSize)) + (mid * OffsetSize)
+                offset = idx[pos, OffsetSize].unpack('N')[0]
+                if offset & 0x80000000 > 0
+                  offset &= 0x7fffffff
+                  pos = OffsetStart + (@size * (SHA1Size + CrcSize + OffsetSize)) + (offset * ExtendedOffsetSize)
+                  words = idx[pos, ExtendedOffsetSize].unpack('NN')
+                  offset = (words[0] << 32) | words[1]
+                end
+                return offset
+              end
+            else
+              midsha1 = idx[SHA1Start + mid * EntrySize,SHA1Size]
+              cmp = midsha1 <=> sha1
+
+              if cmp < 0
+                first = mid + 1
+              elsif cmp > 0
+                last = mid
+              else
+                pos = OffsetStart + mid * EntrySize
+                offset = idx[pos,OffsetSize].unpack('N')[0]
+                return offset
+              end
+            end
+          end
+          nil
+        end
+
+        def find_object(sha1)
+          obj = nil
+          with_idx do |idx|
+            obj = find_object_in_index(idx, sha1)
+          end
+          obj
+        end
+        private :find_object
+
+        def parse_object(offset)
+          obj = nil
+          with_packfile do |packfile|
+            data, type = unpack_object(packfile, offset)
+            obj = RawObject.new(OBJ_TYPES[type], data)
+          end
+          obj
+        end
+        protected :parse_object
+
+        def unpack_object(packfile, offset, options = {})
+          obj_offset = offset
+          packfile.seek(offset)
+
+          c = packfile.read(1).getord(0)
+          size = c & 0xf
+          type = (c >> 4) & 7
+          shift = 4
+          offset += 1
+          while c & 0x80 != 0
+            c = packfile.read(1).getord(0)
+            size |= ((c & 0x7f) << shift)
+            shift += 7
+            offset += 1
+          end
+
+          return [false, false] if !(type == OBJ_COMMIT || type == OBJ_TREE) && options[:caching]
+
+          case type
+          when OBJ_OFS_DELTA, OBJ_REF_DELTA
+            data, type = unpack_deltified(packfile, type, offset, obj_offset, size, options)
+            #puts type
+          when OBJ_COMMIT, OBJ_TREE, OBJ_BLOB, OBJ_TAG
+            data = unpack_compressed(offset, size)
+          else
+            raise PackFormatError, "invalid type #{type}"
+          end
+          [data, type]
+        end
+        private :unpack_object
+
+        def unpack_deltified(packfile, type, offset, obj_offset, size, options = {})
+          packfile.seek(offset)
+          data = packfile.read(SHA1Size)
+
+          if type == OBJ_OFS_DELTA
+            i = 0
+            c = data.getord(i)
+            base_offset = c & 0x7f
+            while c & 0x80 != 0
+              c = data.getord(i += 1)
+              base_offset += 1
+              base_offset <<= 7
+              base_offset |= c & 0x7f
+            end
+            base_offset = obj_offset - base_offset
+            offset += i + 1
+          else
+            base_offset = find_object(data)
+            offset += SHA1Size
+          end
+
+          base, type = unpack_object(packfile, base_offset)
+
+          return [false, false] if !(type == OBJ_COMMIT || type == OBJ_TREE) && options[:caching]
+
+          delta = unpack_compressed(offset, size)
+          [patch_delta(base, delta), type]
+        end
+        private :unpack_deltified
+
+        def unpack_compressed(offset, destsize)
+          outdata = ""
+          with_packfile do |packfile|
+            packfile.seek(offset)
+            zstr = Zlib::Inflate.new
+            while outdata.size < destsize
+              indata = packfile.read(4096)
+              if indata.size == 0
+                raise PackFormatError, 'error reading pack data'
+              end
+              outdata << zstr.inflate(indata)
+            end
+            if outdata.size > destsize
+              raise PackFormatError, 'error reading pack data'
+            end
+            zstr.close
+          end
+          outdata
+        end
+        private :unpack_compressed
+
+        def patch_delta(base, delta)
+          src_size, pos = patch_delta_header_size(delta, 0)
+          if src_size != base.size
+            raise PackFormatError, 'invalid delta data'
+          end
+
+          dest_size, pos = patch_delta_header_size(delta, pos)
+          dest = ""
+          while pos < delta.size
+            c = delta.getord(pos)
+            pos += 1
+            if c & 0x80 != 0
+              pos -= 1
+              cp_off = cp_size = 0
+              cp_off = delta.getord(pos += 1) if c & 0x01 != 0
+              cp_off |= delta.getord(pos += 1) << 8 if c & 0x02 != 0
+              cp_off |= delta.getord(pos += 1) << 16 if c & 0x04 != 0
+              cp_off |= delta.getord(pos += 1) << 24 if c & 0x08 != 0
+              cp_size = delta.getord(pos += 1) if c & 0x10 != 0
+              cp_size |= delta.getord(pos += 1) << 8 if c & 0x20 != 0
+              cp_size |= delta.getord(pos += 1) << 16 if c & 0x40 != 0
+              cp_size = 0x10000 if cp_size == 0
+              pos += 1
+              dest << base[cp_off,cp_size]
+            elsif c != 0
+              dest << delta[pos,c]
+              pos += c
+            else
+              raise PackFormatError, 'invalid delta data'
+            end
+          end
+          dest
+        end
+        private :patch_delta
+
+        def patch_delta_header_size(delta, pos)
+          size = 0
+          shift = 0
+          begin
+            c = delta.getord(pos)
+            if c == nil
+              raise PackFormatError, 'invalid delta header'
+            end
+            pos += 1
+            size |= (c & 0x7f) << shift
+            shift += 7
+          end while c & 0x80 != 0
+          [size, pos]
+        end
+        private :patch_delta_header_size
+      end
+    end
+  end
+end