amp 0.5.1 → 0.5.2

data/History.txt

@@ -1,6 +1,21 @@
-=== 0.1.1 / 2009-07-24
+=== 0.5.2 / 2009-11-28
+
+* Bug Fixes
+
+  * Fixed amp commands that do not rely on a repository (such as `amp init`) (seydar)
+  * Bug fixes in pulling, still investigating.
+
+=== 0.5.1 / 2009-11-27
+
+* Bug Fixes
+
+  * Ported Guy Decoux's BZ2 library to Ruby 1.9.1+. (adgar)
+  * Building on Ruby 1.9+ should work. (adgar)
+
+=== 0.5.0 / 2009-11-22
 
 * First public release
 
   * Full implementation of Mercurial in Ruby.
   * Spiffy command system.
+  * Lots more.

data/LICENSE

@@ -8,6 +8,9 @@ associated with it.
 2. BZ2 (Ruby License) - Guy Decoux 
 	This code has been copied verbatim into our repository.
 	
+	11/27/2009 - Michael Edgar added Ruby 1.9+ compatibility. This involved adding conditional compilation
+				 due to changes in Ruby (MRI)'s C API.
+	
 	"This extension module is copyrighted free software by Guy Decoux
 
     You can redistribute it and/or modify it under the same term as

data/README.md

@@ -1,4 +1,4 @@
-Amp Release v0.5.0 (John Locke)
+Amp Release v0.5.1 (John Locke)
 ==============================
 
 **Homepage**:   [http://amp.carboni.ca](http://amp.carboni.ca)   

data/lib/amp.rb

@@ -152,7 +152,7 @@ end
 require      "amp/repository/repository.rb"
 
 module Amp
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
   VERSION_TITLE = "John Locke"
   
   def self.new_irb_session(bndng)

data/lib/amp/commands/commands/workflows/hg/clone.rb

@@ -91,6 +91,7 @@ HELP
       
       [source, dest_repo]
     rescue
+      p "RESCUE ME"
       FileUtils.remove_entry dest # kill the dir if we've had any problems
     end
   end

data/lib/amp/commands/dispatch.rb

@@ -69,7 +69,7 @@ module Amp
       begin
         cmd_opts[:repository] = Repositories.pick(local_config, global_opts[:repository])
       rescue
-        unless Command::NO_REPO_ALLOWED[cmd] || Command::MAYBE_REPO_ALLOWED[cmd]
+        unless Command::NO_REPO_ALLOWED[cmd.to_sym] || Command::MAYBE_REPO_ALLOWED[cmd.to_sym]
           raise
         end
       end
@@ -123,8 +123,6 @@ module Amp
       rescue AbortError => e
         puts e.to_s
       end
-      
-      #Amp::Support::Logger.outdent.info("</#{command.name}>")
     end
     
     ##

data/lib/amp/revlogs/revlog.rb

@@ -48,6 +48,7 @@ module Amp
         # the use of @index.index is deliberate!
         @index.index << RevlogSupport::IndexEntry.new(0,0,0,-1,-1,-1,-1,NULL_ID)
       end
+      
     end
     alias_method :revlog_initialize, :initialize
     
@@ -718,6 +719,7 @@ module Amp
       data_offset = data_start_for_index trindex
       tr.add @data_file, data_offset
       df = open(@data_file, 'w')
+      
       begin
         calc = @index.entry_size
         self.size.times do |r|
@@ -730,11 +732,23 @@ module Amp
       ensure
         df.close
       end
+      
       fp.close
       
-      ############ TODO
-      # FINISH THIS METHOD
-      ############ TODO
+      open(@index_file, 'w') do |fp| # automatically atomic
+        @version &= ~ RevlogSupport::Support::REVLOG_NG_INLINE_DATA
+        @inline   = false
+        each do |i|
+          # THE FOLLOWING LINE IS NOT CORRECT
+          # IT IS DIRECTLY TRANSLATED PYTHON CODE
+          # I HAVE NO IDEA HOW WE DID THIS BEFORE
+          e = @io.pack_entry @index[i], @node, @version, i
+          fp.write e
+        end
+      end
+      
+      tr.replace @index_file, trindex * calc
+      @chunk_cache = nil # reset the cache
     end
     
     ##
@@ -754,6 +768,7 @@ module Amp
       prev = curr - 1
       base = self[prev].base_rev
       offset = data_end_for_index prev
+      
       if curr > 0
         if d.nil? || d.empty?
           ptext = decompress_revision node_id_for_index(prev)
@@ -763,12 +778,14 @@ module Amp
         len = data[:compression].size + data[:text].size
         dist = len + offset - data_start_for_index(base)
       end
+      
       # Compressed diff > size of actual file
       if curr == 0 || dist > text.size * 2
         data = RevlogSupport::Support.compress text
         len = data[:compression].size + data[:text].size
         base = curr
       end
+      
       entry = RevlogSupport::IndexEntry.new(RevlogSupport::Support.offset_version(offset, 0), 
                 len, text.size, base, link, rev(p1), rev(p2), node)
       @index << entry
@@ -920,10 +937,7 @@ module Amp
             end
             chk = add_revision(text, journal, link, parent1, parent2, 
                                   nil, index_file_handle)
-            # if (! data_file_handle) && (! @index.inline?)
-            #   data_file_handle = open(@data_file, "a")
-            #   index_file_handle = open(@index_file, "a")
-            # end
+            
             if chk != node
               raise RevlogSupport::RevlogError.new("consistency error "+
                         "adding group")

data/lib/amp/revlogs/revlog_support.rb

@@ -85,11 +85,11 @@ module Amp
           position = 0
           while position < size
             newposition = position + 2**20
-            p << deflater.deflate(text[position..(newposition-1)], Zlib::NO_FLUSH)
+            parts << deflater.deflate(text[position..(newposition-1)], Zlib::NO_FLUSH)
             position = newposition
           end
-          p << deflater.flush
-          binary = p.join if p.map {|e| e.size}.sum < size # only add it if
+          parts << deflater.flush
+          binary = parts.join if parts.map {|e| e.size}.sum < size # only add it if
                                                  # compression made it smaller
         else #tiny, just compress it
           binary = Zlib::Deflate.deflate text

data/site/src/index.haml

@@ -15,7 +15,7 @@
             .rounded.bigbox.pink
               %h1#latest-version
                 Get Amp
-                %span.red-text v0.2.3
+                %span.red-text v0.5.1
               %ul{:style => "margin-left:2px;"}
                 %li== 1. Get #{ruby_link}. 2. sudo gem install #{blue_amp} --no-wrappers
         .floatleft{ :style => "width:100%;padding:10px 0em 6px;" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amp
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Michael Edgar
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-27 00:00:00 -05:00
+date: 2009-11-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency