amp 0.5.2 → 0.5.3

data/ampfile.rb

@@ -17,7 +17,7 @@ Amp::Command.new("silly") do |c|
 end
 
 # command :push do |c|
-#   c.before { system "rake test" }
+#  c.before { system "hg verify" }
 # end
 
 template :silly, <<-EOF
@@ -39,6 +39,8 @@ command "stats" do |c|
   end
 end
 
+# bisect_command
+
 namespace :docs do
   
   command "gen" do |c|

data/bin/amp

@@ -27,4 +27,7 @@ end
 
 require File.join(File.dirname(follow_link(__FILE__)), "..", "lib", "amp")
 
-Amp::Dispatch.run
+result = Amp::Dispatch.run
+
+# ensure status makes it out
+exit(result ? 0 : 1)

data/ext/amp/bz2/extconf.rb

@@ -19,7 +19,7 @@ end
 
 dir_config('bz2')
 if !have_library('bz2', 'BZ2_bzWriteOpen')
-   raise "libz2 not found"
+   raise "bzip2 headers not found. If you are on Linux, install the libbz2-dev package. If you are on Mac OS X, you should not see this error."
 end
 
 if enable_config("shared", true)

data/ext/amp/mercurial_patch/extconf.rb

@@ -2,4 +2,4 @@ require 'mkmf'
 if RUBY_VERSION =~ /1.9/ then  
     $CPPFLAGS += " -DRUBY_19"  
 end
-create_makefile("MercurialPatch")
+create_makefile("amp/CMercurialPatch")

data/ext/amp/mercurial_patch/mpatch.c

@@ -33,7 +33,7 @@ static uint32_t ntohl(uint32_t x)
 #endif
 
 
-VALUE rb_mAmp, rb_mDiffs, rb_mMercurialPatch;
+VALUE rb_mAmp, rb_mMercurial, rb_mDiffs, rb_mMercurialPatch;
 
 
 struct frag {
@@ -394,11 +394,12 @@ static VALUE amp_mpatch_patched_size(VALUE self, VALUE orig_r, VALUE bin_r)
 }
 
 
-void Init_MercurialPatch() {
+void Init_CMercurialPatch() {
     
     rb_mAmp = rb_define_module("Amp");
     rb_mDiffs = rb_define_module_under(rb_mAmp, "Diffs");
-    rb_mMercurialPatch = rb_define_module_under(rb_mDiffs, "MercurialPatch");
+    rb_mMercurial = rb_define_module_under(rb_mDiffs, "Mercurial");
+    rb_mMercurialPatch = rb_define_module_under(rb_mMercurial, "MercurialPatch");
     
     rb_define_singleton_method(rb_mMercurialPatch, "patched_size", amp_mpatch_patched_size, 2);
     rb_define_singleton_method(rb_mMercurialPatch, "apply_patches", amp_mpatch_apply_patches, 2);

data/ext/amp/priority_queue/extconf.rb

@@ -2,4 +2,4 @@ require 'mkmf'
 if RUBY_VERSION =~ /1.9/ then  
     $CPPFLAGS += " -DRUBY_19"  
 end
-create_makefile("CPriorityQueue")
+create_makefile("amp/CPriorityQueue")

data/ext/amp/support/extconf.rb

@@ -2,4 +2,4 @@ require 'mkmf'
 if RUBY_VERSION =~ /1.9/ then  
     $CPPFLAGS += " -DRUBY_19"  
 end
-create_makefile("Support")
+create_makefile("amp/CSupport")

data/ext/amp/support/support.c

@@ -221,7 +221,7 @@ static VALUE amp_string_unhexlify(VALUE self) {
  * this function is run. All we need to do is add the new methods, and look up the
  * symbols for to_dirstate_symbol.
  */
-void Init_Support() {
+void Init_CSupport() {
     if (little_endian == -1) little_endian = (ntohl(8) != 8);
 
     // methods added to String class

data/lib/amp.rb

@@ -1,8 +1,9 @@
 module Amp; end
 # The root directory of this application
 Amp::CODE_ROOT = File.expand_path File.dirname(__FILE__)
-$: << Amp::CODE_ROOT # now we don't need to do `require "#{curdir}..."
-
+Amp::EXT_ROOT = File.expand_path File.join(File.dirname(__FILE__), "..", "ext")
+$:.unshift Amp::CODE_ROOT # now we don't need to do `require "#{curdir}..."
+$:.unshift Amp::EXT_ROOT
 # Timing variable
 $start    ||= Time.now
 # Should we display anything?
@@ -12,15 +13,18 @@ $USE_RUBY ||= false
 # Are we a command-line app? Default to no.
 $cl ||= false
 
+
+
 require "amp/support/loaders.rb"
 
+need { 'amp/profiling_hacks' }
+
 #require 'profile'
 require 'fileutils'
 require 'stringio'
 
 local_start = Time.now
 
-
 ###############
 # The Amp Magic
 ###############
@@ -30,87 +34,138 @@ module Amp
   autoload :Generator,                 "amp/support/generator.rb"
   autoload :Opener,                    "amp/support/openers.rb"
   autoload :Match,                     "amp/support/match.rb"
-  autoload :Ignore,                    "amp/support/ignore.rb"
   autoload :AmpConfig,                 "amp/support/amp_config.rb"
   autoload :UI,                        "amp/support/amp_ui.rb"
-                                        
-  autoload :Journal,                   "amp/repository/journal.rb"
-  autoload :VersionedFile,             "amp/repository/versioned_file.rb"
-  autoload :VersionedWorkingFile,      "amp/repository/versioned_file.rb"
   
-  autoload :Revlog,                    "amp/revlogs/revlog.rb"      
-  autoload :Manifest,                  "amp/revlogs/manifest.rb"
-  autoload :FileLog,                   "amp/revlogs/file_log.rb"
-  autoload :Changeset,                 "amp/revlogs/changeset.rb"
-  autoload :WorkingDirectoryChangeset, "amp/revlogs/changeset.rb"
-  autoload :ChangeGroup,               "amp/revlogs/changegroup.rb"
-  autoload :ChangeLog,                 "amp/revlogs/changelog.rb"
+  module Git
+    autoload :Changeset,                 "amp/repository/git/repo_format/changeset.rb"
+    autoload :WorkingDirectoryChangeset, "amp/repository/git/repo_format/changeset.rb"
+    autoload :VersionedFile,             "amp/repository/git/repo_format/versioned_file.rb"
+    autoload :VersionedWorkingFile,      "amp/repository/git/repo_format/versioned_file.rb"
+  end
+  
+  module Mercurial
+    autoload :Ignore,                    "amp/support/mercurial/ignore.rb"
+    
+    autoload :Journal,                   "amp/repository/mercurial/repo_format/journal.rb"
+    autoload :VersionedFile,             "amp/repository/mercurial/revlogs/versioned_file.rb"
+    autoload :VersionedWorkingFile,      "amp/repository/mercurial/revlogs/versioned_file.rb"
+    
+    autoload :Revlog,                    "amp/repository/mercurial/revlogs/revlog.rb"      
+    autoload :Manifest,                  "amp/repository/mercurial/revlogs/manifest.rb"
+    autoload :FileLog,                   "amp/repository/mercurial/revlogs/file_log.rb"
+    autoload :ChangeLog,                 "amp/repository/mercurial/revlogs/changelog.rb"
+    autoload :ChangeGroup,               "amp/repository/mercurial/revlogs/changegroup.rb"
+    autoload :Changeset,                 "amp/repository/mercurial/repo_format/changeset.rb"
+    autoload :WorkingDirectoryChangeset, "amp/repository/mercurial/repo_format/changeset.rb"
+  end
   
   module Bundles
-    autoload :BundleChangeLog,         "amp/revlogs/bundle_revlogs.rb"
-    autoload :BundleFileLog,           "amp/revlogs/bundle_revlogs.rb"
-    autoload :BundleManifest,          "amp/revlogs/bundle_revlogs.rb"
-    autoload :BundleRevlog,            "amp/revlogs/bundle_revlogs.rb"
-  end                                      
-                                           
-  module Encoding                          
+    module Mercurial
+      autoload :BundleChangeLog,         "amp/repository/mercurial/revlogs/bundle_revlogs.rb"
+      autoload :BundleFileLog,           "amp/repository/mercurial/revlogs/bundle_revlogs.rb"
+      autoload :BundleManifest,          "amp/repository/mercurial/revlogs/bundle_revlogs.rb"
+      autoload :BundleRevlog,            "amp/repository/mercurial/revlogs/bundle_revlogs.rb"
+    end
+  end
+  
+  module Encoding
     autoload :Base85,                  "amp/encoding/base85.rb"
   end                                      
                                            
-  module Diffs                             
+  module Diffs
     autoload :BinaryDiff,              "amp/encoding/binary_diff.rb"
-    autoload :MercurialDiff,           "amp/encoding/mercurial_diff.rb"
-    autoload :MercurialPatch,          "amp/encoding/mercurial_patch.rb"
     autoload :SequenceMatcher,         "amp/encoding/difflib.rb"
+    
+    module Mercurial
+      autoload :MercurialDiff,           "amp/repository/mercurial/encoding/mercurial_diff.rb"
+      autoload :MercurialPatch,          "amp/repository/mercurial/encoding/mercurial_patch.rb"
+    end
   end
   
   module Graphs
-    autoload :AncestorCalculator,      "amp/graphs/ancestor.rb"
-    autoload :CopyCalculator,          "amp/graphs/copies.rb"
+    autoload :AncestorCalculator,        "amp/graphs/ancestor.rb"
+    module Mercurial
+      autoload :CopyCalculator,          "amp/graphs/copies.rb"
+    end
   end                                      
-                                           
-  module Merges                            
-    autoload :MergeState,              "amp/merges/merge_state.rb"
-    autoload :MergeUI,                 "amp/merges/merge_ui.rb"
-    autoload :ThreeWayMerger,          "amp/merges/simple_merge.rb"
+  
+  module Help
+    autoload :HelpUI,                   "amp/help/help.rb"
+    autoload :HelpEntry,                "amp/help/help.rb"
+    autoload :HelpRegistry,             "amp/help/help.rb"
+    autoload :CommandHelpEntry,         "amp/help/help.rb"
+    autoload :FileHelpEntry,            "amp/help/help.rb"
+  end
+                                       
+  module Merges
+    module Mercurial                      
+      autoload :MergeState,              "amp/repository/mercurial/repo_format/merge_state.rb"
+      autoload :MergeUI,                 "amp/repository/mercurial/merging/merge_ui.rb"
+      autoload :ThreeWayMerger,          "amp/repository/mercurial/merging/simple_merge.rb"
+    end
   end                                      
   
   module Repositories
-    autoload :BranchManager,           "amp/repository/branch_manager.rb"
-    autoload :BundleRepository,        "amp/repository/repositories/bundle_repository.rb"
-    autoload :DirState,                "amp/repository/dir_state.rb"
-    autoload :HTTPRepository,          "amp/repository/repositories/http_repository.rb"
-    autoload :HTTPSRepository,         "amp/repository/repositories/http_repository.rb"
-    autoload :LocalRepository,         "amp/repository/repositories/local_repository.rb"
-    autoload :Lock,                    "amp/repository/lock.rb"
-    autoload :Stores,                  "amp/repository/store.rb"
-    autoload :TagManager,              "amp/repository/tag_manager.rb"
-    autoload :Updatable,               "amp/repository/updatable.rb"
-    autoload :Verification,            "amp/repository/verification.rb"
-  end                                      
-                                           
-  module RevlogSupport                     
-    autoload :ChangeGroup,             "amp/revlogs/changegroup.rb"
-    autoload :Index,                   "amp/revlogs/index.rb"
-    autoload :IndexInlineNG,           "amp/revlogs/index.rb"
-    autoload :IndexVersion0,           "amp/revlogs/index.rb"
-    autoload :IndexVersionNG,          "amp/revlogs/index.rb"
-    autoload :Node,                    "amp/revlogs/node.rb"
-    autoload :Support,                 "amp/revlogs/revlog_support.rb"
+    autoload :GenericRepoPicker,         "amp/repository/generic_repo_picker.rb"
+    autoload :AbstractLocalRepository,   "amp/repository/abstract/abstract_local_repo.rb"
+    autoload :AbstractStagingArea,       "amp/repository/abstract/abstract_staging_area.rb"
+    autoload :AbstractChangeset,         "amp/repository/abstract/abstract_changeset.rb"
+    autoload :AbstractVersionedFile,     "amp/repository/abstract/abstract_versioned_file.rb"
+    autoload :CommonChangesetMethods,    "amp/repository/abstract/common_methods/changeset.rb"
+    autoload :CommonLocalRepoMethods,    "amp/repository/abstract/common_methods/local_repo.rb"
+    autoload :CommonStagingAreaMethods,  "amp/repository/abstract/common_methods/staging_area.rb"
+    autoload :CommonChangesetMethods,    "amp/repository/abstract/common_methods/changeset.rb"
+    autoload :CommonVersionedFileMethods,"amp/repository/abstract/common_methods/versioned_file.rb"
+    
+    module Git
+      autoload :LocalRepository,         "amp/repository/git/repositories/local_repository.rb"
+      autoload :GitPicker,               "amp/repository/git/repository.rb"
+      autoload :StagingArea,             "amp/repository/git/repo_format/staging_area.rb"
+    end
+    
+    module Mercurial
+      autoload :BranchManager,           "amp/repository/mercurial/repo_format/branch_manager.rb"
+      autoload :BundleRepository,        "amp/repository/mercurial/repositories/bundle_repository.rb"
+      autoload :DirState,                "amp/repository/mercurial/repo_format/dir_state.rb"
+      autoload :HTTPRepository,          "amp/repository/mercurial/repositories/http_repository.rb"
+      autoload :HTTPSRepository,         "amp/repository/mercurial/repositories/http_repository.rb"
+      autoload :LocalRepository,         "amp/repository/mercurial/repositories/local_repository.rb"
+      autoload :Lock,                    "amp/repository/mercurial/repo_format/lock.rb"
+      autoload :MercurialPicker,         "amp/repository/mercurial/repository.rb"
+      autoload :Repository,              "amp/repository/mercurial/repository.rb"
+      autoload :StagingArea,             "amp/repository/mercurial/repo_format/staging_area.rb"
+      autoload :Stores,                  "amp/repository/mercurial/repo_format/store.rb"
+      autoload :TagManager,              "amp/repository/mercurial/repo_format/tag_manager.rb"
+      autoload :Updatable,               "amp/repository/mercurial/repo_format/updatable.rb"
+      autoload :Verification,            "amp/repository/mercurial/repo_format/verification.rb"
+    end
   end
   
-  module Servers
-    autoload :FancyHTTPServer,         "amp/server/fancy_http_server.rb"
-    autoload :HTTPServer,              "amp/server/http_server.rb"
-    autoload :HTTPAuthorizedServer,    "amp/server/http_server.rb"
-    autoload :RepoUserManagement,      "amp/server/repo_user_management.rb"
-    autoload :User,                    "amp/server/amp_user.rb"
+  module Mercurial
+    module RevlogSupport
+      autoload :ChangeGroup,             "amp/repository/mercurial/revlogs/changegroup.rb"
+      autoload :Index,                   "amp/repository/mercurial/revlogs/index.rb"
+      autoload :IndexInlineNG,           "amp/repository/mercurial/revlogs/index.rb"
+      autoload :IndexVersion0,           "amp/repository/mercurial/revlogs/index.rb"
+      autoload :IndexVersionNG,          "amp/repository/mercurial/revlogs/index.rb"
+      autoload :Node,                    "amp/repository/mercurial/revlogs/node.rb"
+      autoload :Support,                 "amp/repository/mercurial/revlogs/revlog_support.rb"
+    end
   end
   
-  module Support
-    autoload :Logger,                  "amp/support/logger.rb"
-    autoload :MultiIO,                 "amp/support/multi_io.rb"
-    autoload :Template,                "amp/templates/template.rb"
+  module Servers
+    autoload :FancyHTTPServer,           "amp/server/fancy_http_server.rb"
+    autoload :HTTPServer,                "amp/server/http_server.rb"
+    autoload :HTTPAuthorizedServer,      "amp/server/http_server.rb"
+    autoload :RepoUserManagement,        "amp/server/repo_user_management.rb"
+    autoload :User,                      "amp/server/amp_user.rb"
+  end                                    
+                                         
+  module Support                         
+    autoload :Logger,                    "amp/support/logger.rb"
+    autoload :MultiIO,                   "amp/support/multi_io.rb"
+    autoload :Template,                  "amp/templates/template.rb"
   end
 end
 
@@ -128,6 +183,7 @@ end
 autoload :Archive,       "amp/dependencies/minitar.rb"
 autoload :Zip,           "amp/dependencies/zip/zip.rb"
 autoload :PriorityQueue, "amp/dependencies/priority_queue.rb"
+autoload :Maruku,        "amp/dependencies/maruku.rb"
 
 #############################
 # Files we need to just *run*
@@ -138,22 +194,24 @@ require "amp/dependencies/amp_support.rb"
 require "amp/support/ruby_19_compatibility.rb"
 require "amp/support/support.rb"              
 require "amp/templates/template.rb"
+require "amp/repository/mercurial/repository.rb" # we're just loading in
+require 'amp/repository/git/repository.rb'       # all of the base repositories
 
 if $cl # if it's a command line app
   include Amp::KernelMethods
   require       "amp/commands/command.rb"
   require_dir { "amp/commands/*.rb"              }
   require_dir { "amp/commands/commands/*.rb"     }
-  
 else
   # it's not a command line app
  require     'amp/support/docs.rb' # live documentation access
 end
+
 require      "amp/repository/repository.rb"
 
 module Amp
-  VERSION = '0.5.2'
-  VERSION_TITLE = "John Locke"
+  VERSION = '0.5.3'
+  VERSION_TITLE = "John Locke" # the next one should totally be "Suomalaisen Susijengi"
   
   def self.new_irb_session(bndng)
     require 'irb'
@@ -197,4 +255,4 @@ if ENV["TESTING"] == "true"
 end
 
 # Benchmarking stuff
-#need { 'amp/profiling_hacks' }
+

data/lib/amp/commands/command.rb

@@ -147,8 +147,8 @@ module Amp
     attr_accessor :name
     # Short, 1-line description of the command
     attr_accessor :description
-    # The Trollop parser
-    attr_accessor :parser
+    # The Trollop parser.
+    attr_reader   :parser
     
     ##
     # Creates a command in the Amp system. Simply instantiating a new
@@ -177,7 +177,7 @@ module Amp
       full_name = (self.class.current_namespaces + [name]).join(":")
       name = full_name.to_sym
       if self.class.all_commands[name]
-        yield self.class.all_commands[name] if block_given?
+        yield  self.class.all_commands[name] if block_given?
         return self.class.all_commands[name]
       end
       
@@ -190,9 +190,10 @@ module Amp
 
       @workflows = []
       @synonyms  = []
-      yield(self) if block_given?
+      yield self if block_given?
       workflow :all if @workflows.empty?
       @options += GLOBAL_OPTIONS
+      Amp::Help::CommandHelpEntry.new(full_name, self)
     end
     
     ##
@@ -225,10 +226,10 @@ module Amp
     #       default :"no-color", true
     #     end
     # @param [Symbol, #to_sym] opt the option to modify. Can be symbol or string.
-    # @param value the new default value for the option
+    # @param [Object] value the new default value for the option
     def default(opt, value)
       opt = opt.to_sym
-      the_opt = @options.select {|o| o[:name] == opt}.first
+      the_opt = @options.find {|o| o[:name] == opt }
       if the_opt
         the_opt[:options][:default] = value
       end
@@ -307,7 +308,8 @@ module Amp
       
       @before << block if block
       @before
-    end    
+    end
+    
     ##
     # This returns the list of actions to run after the command, in order (first
     # ones are run first). You can modify this array in any way you choose, and
@@ -456,14 +458,14 @@ module Amp
     # @return [Amp::Command] the command being run
     def run(options={}, args=[])
       # run the before commands
-      @before.each {|cmd| result = cmd.run options, args; return if !result || $break }
+      @before.each {|cmd| result = cmd.run options, args; return false if !result || $break }
       
       @code[options, args] # and of course the actual command...
       
       # top it off with the after commands
-      @after.each  {|cmd| result = cmd.run options, args; return if !result || $break }
+      @after.each  {|cmd| result = cmd.run options, args; return false if !result || $break }
       
-      self
+      true
     end
     
     NO_REPO_ALLOWED = {}

data/lib/amp/commands/command_support.rb

@@ -47,7 +47,7 @@ module Amp
     def revision_pair(repo, revisions)
       #revisions = [revisions] unless revisions.is_a?(Array)
       if !revisions || revisions.empty?
-        return repo.dirstate.parents.first, nil
+        return repo.parents.first, nil
       end
       stop = nil
       
@@ -133,5 +133,12 @@ module Amp
       message
     end
     
+    def parse_revision_range(input)
+      match = input.match /(\d+)(?:#{REV_SEP}(\d*))?/
+      fin   = match[2]
+      fin &&= fin.empty? ? nil : fin.to_i
+      [match[1].to_i, fin]
+    end
+    
   end
 end