amp 0.5.2 → 0.5.3

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

@@ -22,7 +22,7 @@ command :branch do |c|
       repo.dirstate.branch = _label
       Amp::UI.status("marked working directory as branch #{_label}")
     else
-      Amp::UI.say("#{repo.dirstate.branch}")
+      Amp::UI.say repo.dirstate.branch
     end
   end
 end

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

@@ -1,7 +1,7 @@
 command :branches do |c|
   c.workflow :hg
   c.desc "Prints the current branches (active and closed)"
-  
+  c.opt :active, "Only show active branches", :short => "-a"
   c.on_run do |opts, args|
     repo = opts[:repository]
 
@@ -10,12 +10,12 @@ command :branches do |c|
       [ active_branches.include?(tag), repo.changelog.rev(node), tag ]
     end
     branches.reverse!
-    branches.each do |is_active, node, tag|
+    branches.sort {|a, b| b[1] <=> a[1]}.each do |is_active, node, tag|
       if !opts[:active] || is_active
         hexable = repo.lookup(node)
         if is_active
           branch_status = ""
-        elsif !(repo.branch_heads(tag, :closed => false).include?(hexable))
+        elsif !(repo.branch_heads(:branch => tag, :closed => false).include?(hexable))
           notice = " (closed)"
         else
           notice = " (inactive)"

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

@@ -53,7 +53,7 @@ EOS
       base = base.map {|b| repo.lookup b }
       
       o   = []
-      has = {Amp::RevlogSupport::Node::NULL_ID => nil}
+      has = {Amp::Mercurial::RevlogSupport::Node::NULL_ID => nil}
       
       # iterates over each file node id
       base.each do |filename, node_id|
@@ -108,12 +108,12 @@ EOS
     
     # some error checking
     # yes, this calls Array#include, but the array is only 3 elements
-    unless Amp::RevlogSupport::ChangeGroup::BUNDLE_TYPES.include? bundle_type
+    unless Amp::Mercurial::RevlogSupport::ChangeGroup::BUNDLE_TYPES.include? bundle_type
       raise abort('unknown bundle type specified with --type')
     end
     
     File.open fname, 'w' do |file|
-      Amp::RevlogSupport::ChangeGroup.write_bundle cg, bundle_type, file
+      Amp::Mercurial::RevlogSupport::ChangeGroup.write_bundle cg, bundle_type, file
     end
   end  # end on_run
 end

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

@@ -32,7 +32,6 @@ HELP
     require 'uri'
     
     src, rev, checkout = *c.parse_url(args.shift)               # get the source url, revisions we want, and the checkout
-    # puts [src, rev, checkout].inspect
     source = Amp::Repositories.pick opts[:global_config], src # make it an actual repository
     dest   = (dest = args.shift) || File.basename(src)        # get the destination URL
     
@@ -54,10 +53,10 @@ HELP
         
         if source.local? && copy # then we're copying
           FileUtils.copy_entry src, dest # copy everything, pray it's pristine
-          dest_repo = Amp::Repositories::LocalRepository.new dest, false, opts[:global_config]
+          dest_repo = Amp::Repositories::Mercurial::LocalRepository.new dest, false, opts[:global_config]
         else # we have to pull
           # make the directory, cd into it, pull, and maaaaaaybe update
-          dest_repo = Amp::Repositories::LocalRepository.new dest, true, opts[:global_config]
+          dest_repo = Amp::Repositories::Mercurial::LocalRepository.new dest, true, opts[:global_config]
           dest_repo.clone source, :revs   => (rev ? rev.map {|r| source.lookup r } : []),
                                   :stream => opts[:stream] # the actual cloning which pulls
         end
@@ -91,8 +90,8 @@ HELP
       
       [source, dest_repo]
     rescue
-      p "RESCUE ME"
-      FileUtils.remove_entry dest # kill the dir if we've had any problems
+      #FileUtils.remove_entry dest # kill the dir if we've had any problems
+      raise
     end
   end
 end

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

@@ -1,7 +1,7 @@
 command :commit do |c|
   c.workflow :hg
   
-  c.desc "Commit yo shit"
+  c.desc "Commit files from the staging area to the repository"
   c.opt :force, "Forces files to be committed", :short => "-f"
   c.opt :include, "Includes the given patterns", :short => "-I", :type => :string
   c.opt :exclude, "Ignores the given patterns", :short => "-E", :type => :string
@@ -29,6 +29,7 @@ amp commit [options]+ [FILE]+
 EOS
   
   c.on_run do |opts, args|
+
     repo = opts[:repository]
     
     files    = args
@@ -37,6 +38,41 @@ EOS
     extra    = {}
     match    = Amp::Match.create(:files => files, :includer => included, :excluder => excluded) { !files.any? }
     opts.merge! :match => match, :extra => extra
+    
+    changes = calculate_dirstate_commit(repo, files, match)
+    opts[:modified], opts[:removed] = (changes[:modified] + changes[:added]), changes[:removed]
+    File.open("/log.txt","a") {|f| f.puts "committing: #{opts.inspect} #{args.inspect} #{changes.inspect}\n"}
     repo.commit opts
   end
+  
+  ##
+  # Calculates what changes to commit for the given list of files.
+  # Bases this upon the dirstate.
+  #
+  # @param [Array<String>] files the explicit files to check (if any)
+  # @param [Amp::Match] match the matcher object to fall back on
+  # @return [Hash] all the changes from the current dirstate.
+  def calculate_dirstate_commit(repo, files, match)
+    changes = nil
+    if files.any?
+      changes = {:modified => [], :removed => [], :added => []}
+      # split the files up so we can deal with them appropriately
+      files.each do |file|
+        case repo.staging_area.file_status file
+        when :normal, :merged, :added
+          changes[:modified] << file
+        when :removed
+          changes[:removed]  << file
+        when :untracked
+          Amp::UI.warn "#{file} not tracked!"
+        else
+          Amp::UI.err "#{file} has unknown state #{state[0]}"
+        end
+      end
+    else
+      changes = repo.status(:match => match)
+    end
+    changes
+  end
+  
 end

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

@@ -23,7 +23,8 @@ command :copy do |c|
     sources = args[0..-2]
     destination = args.last
     sources.each do |source|
-      repo.copy source, destination, opts
+      Amp::UI.say "#{source} => #{destination}"
+      repo.staging_area.copy source, destination, opts
     end
   end
 end

data/lib/amp/commands/commands/workflows/hg/debug/index.rb

@@ -13,7 +13,7 @@ namespace :debug do
         Amp::UI.say "|---------|------------|------------|----------|-----------|--------------|--------------|--------------|"
         Amp::UI.say "|   rev   |   offset   |   length   |   base   |  linkrev  |   nodeid     |    parent1   |    parent2   |"
         Amp::UI.say "|---------|------------|------------|----------|-----------|--------------|--------------|--------------|"
-        revlog = Amp::Revlog.new(opener, index_file)
+        revlog = Amp::Mercurial::Revlog.new(opener, index_file)
         idx = 0
         revlog.each do |entry|
           node    = entry.node_id

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

@@ -9,20 +9,15 @@ command :diff do |c|
     revs << "tip" if revs.size == 0
     revs << nil   if revs.size == 1
     
-    revs.map! {|key| repo[key]}
+    revs.map! {|key| repo[key] }
     
     differences = repo.status(:node_1 => revs[0], :node_2 => revs[1])
     files = differences[:added] + differences[:removed] + differences[:deleted] + differences[:modified]
     
     files.each do |filename|
-      vf_old, vf_new     = revs.map {|rev| rev.get_file filename} 
-      date_old, date_new = revs.map {|rev| rev.easy_date }
-      path_old, path_new = vf_old.path, vf_new.path || "/dev/null"
-      rev_old, rev_new   = vf_old.file_rev, vf_new.file_rev
+      vf_old, vf_new     = revs.map {|rev| rev.get_file filename}
       
-      diff = vf_new.file_log.unified_revision_diff rev_old, date_old, rev_new, 
-                                                   date_new, path_old, path_new, 
-                                                   :pretty => !opts[:"no-color"]
+      diff = vf_old.unified_diff_with vf_new, :pretty => !opts[:"no-color"]
       Amp::UI::say diff
     end
     

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

@@ -1,11 +1,12 @@
 command :forget do |c|
   c.workflow :hg
-  c.desc "Stop tracking a file"
+  c.desc "Remove the file from the staging area"
   
   c.on_run do |opts, args|
     repo = opts[:repository]
     
-    puts "Forgetting #{args.size} file#{args.size == 1 ? '' : 's'}"
-    repo.forget args
+    puts "Removing #{args.size} file#{args.size == 1 ? '' : 's'} from the staging area"
+    args.each {|f| repo.staging_area.normal f; print '.'}
+    puts
   end
-end
+end

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

@@ -9,13 +9,13 @@ command :identify do |c|
   c.on_run do |opts, args|
     repo = opts[:repository]
     opts[:id] = opts[:num] = true unless opts[:num] || opts[:id] || opts[:branch] || opts[:tags]
-    working_changeset = repo[nil]
-    parent_changeset = working_changeset.parents.first
     
-    Amp::UI.tell parent_changeset.node_id.short_hex + " " if opts[:id]
-    Amp::UI.tell parent_changeset.revision.to_s + " " if opts[:num]
-    Amp::UI.tell parent_changeset.branch + " " if opts[:branch]
-    Amp::UI.tell parent_changeset.tags.join(" ") + " " if opts[:tags]
+    changeset = repo[opts[:rev] || nil]
+    
+    Amp::UI.tell changeset.node_id.short_hex + " " if opts[:id]
+    Amp::UI.tell changeset.revision.to_s + " " if opts[:num]
+    Amp::UI.tell changeset.branch + " " if opts[:branch]
+    Amp::UI.tell changeset.tags.join(" ") + " " if opts[:tags]
     
     Amp::UI.say
     

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

@@ -84,7 +84,7 @@ EOS
           if opts[:exact]
             raise abort('not a mercurial patch') unless data[:node_id] && data[:p1]
             p1 = repo.lookup data[:p1]
-            p2 = repo.lookup data[:p2] || Amp::RevlogSupport::Node::NULL_ID.hexlify
+            p2 = repo.lookup data[:p2] || Amp::Mercurial::RevlogSupport::Node::NULL_ID.hexlify
             
             repo.update(p1, false, true, nil).success? if p1 != wp.first.node
             repo.dirstate.parents = [p1, p2]

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

@@ -65,10 +65,10 @@ HELP
       bundle_type = (remote.local? && "HG10GZ") || "HG10UN" # ???
       require 'tempfile'
       file = Tempfile.new("hg-incoming-bundle", Dir.pwd)
-      Amp::RevlogSupport::ChangeGroup.write_bundle(cg, bundle_type, file)
+      Amp::Mercurial::RevlogSupport::ChangeGroup.write_bundle(cg, bundle_type, file)
       cleanup = file.path
       unless remote.local?
-        remote = Amp::Repositories::BundleRepository.new(repo.root, opts[:global_config], cleanup)
+        remote = Amp::Repositories::Mercurial::BundleRepository.new(repo.root, opts[:global_config], cleanup)
       end
     end
     opts.merge! :template_type => :log

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

@@ -1,10 +1,11 @@
 command :log do |c|
   c.workflow :hg
   c.desc "Prints the commit history."
-  c.add_opt :verbose, "Verbose output", {:short => "-v"}
-  c.add_opt :limit, "Limit how many revisions to show", {:short => "-l", :type => :integer, :default => -1}
-  c.add_opt :template, "Which template to use while printing", {:short => "-t", :type => :string, :default => "default"}
-  c.add_opt :no_output, "Doesn't print output (useful for benchmarking)"
+  c.opt :verbose, "Verbose output", {:short => "-v"}
+  c.opt :limit, "Limit how many revisions to show", {:short => "-l", :type => :integer, :default => -1}
+  c.opt :template, "Which template to use while printing", {:short => "-t", :type => :string, :default => "default"}
+  c.opt :no_output, "Doesn't print output (useful for benchmarking)"
+  
   c.on_run do |options, args|
     repo = options[:repository]
     limit = options[:limit]

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

@@ -9,7 +9,7 @@ command :merge do |c|
     repo = opts[:repository]
     if !opts[:rev]
       branch = repo[nil].branch
-      bheads = repo.branch_heads[branch]
+      bheads = repo.branch_heads(:branch => branch)
       if bheads.size > 2
         raise abort("branch #{branch} has #{bheads.size} - please merge " +
                              " with an explicit revision")

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

@@ -10,13 +10,15 @@ command :move do |c|
   c.before do |opts, args|
     if args.size < 2
       Amp::UI.say "Usage: amp move source destination"
-      c.break
+      cut!
     elsif args.size > 2 && !File.directory?(args.last)
       Amp::UI.say "If you want to move more than 1 file, your destination must" +
                   " be a directory."
-      c.break
+      cut!
+    else
+      true
     end
-    true
+    
   end
   
   c.on_run do |opts, args|

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

@@ -49,7 +49,7 @@ HELP
     o.each do |node_id|
       # get the parents of the node so that we can check if it's a merge
       # (merges have two parents)
-      parents = repo.changelog.parents(node_id).select {|p| p.not_null? }
+      parents = repo[node_id].parents
     
       # We skip printing this if it's a merge (parents.size == 2)
       # and we're NOT printing merges (opts[:"no-merges"])

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

@@ -6,14 +6,13 @@ command :push do |c|
   c.opt :force, "Ignore remote heads", :short => "-f"
   
   c.on_run do |opts, args|
-    repo = opts[:repository]
-    dest = opts[:remote] || repo.config["paths","default-push"] || repo.config["paths","default"]
-    opts[:revs] ||= nil
-    remote = Amp::Support.parse_hg_url(dest, opts[:revs])
+    repo                 = opts[:repository]
+    dest                 = opts[:remote] || repo.config["paths","default-push"] || repo.config["paths","default"]
+    opts[:revs]        ||= nil
+    remote               = Amp::Support.parse_hg_url(dest, opts[:revs])
     dest, revs, checkout = remote[:url], remote[:revs], remote[:head]
-    remote_repo = Amp::Repositories.pick(repo.config, dest, false)
-    
-    revs = revs.map {|rev| repo.lookup rev } if revs
+    remote_repo          = Amp::Repositories.pick(repo.config, dest, false)
+    revs                 = revs.map {|rev| repo.lookup rev } if revs
     
     result = repo.push remote_repo, :force => opts[:force], :revs => revs
   end

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

@@ -1,7 +1,7 @@
 command :remove do |c|
   c.workflow :hg
   c.desc "Removes files from the repository on next commit"
-  c.opt :after, "record as delete for missing files (whether or not to actually delete files)", :short => "-A", :default => false
+  c.opt :"no-unlink", "Don't unlink the files", :short => "-A", :default => false
   c.opt :force, "Forces removal of files", :short => "-f", :default => false
   c.opt :include, "include names matching the given patterns", :short => "-I", :type => :string
   c.opt :exclude, "exclude names matching the given patterns", :short => "-X", :type => :string
@@ -31,7 +31,7 @@ command :remove do |c|
       (remove + forget).sort.each {|f| Amp::UI.status "removing #{f}..." }
     end
     
-    repo.remove(remove, :unlink => ! opts[:after]) # forgetting occurs here
+    repo.staging_area.remove(remove, :unlink => ! opts[:"no-unlink"]) # forgetting occurs here
     repo.forget(forget)
     
     remove += forget

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

@@ -9,10 +9,8 @@ command :resolve do |c|
   c.opt :exclude, "Specify patterns of files to exclude in the operation", :short => "-E", :type => :string
   
   c.before do |opts, args|
-    parse_args = lambda {|os| [:all, :mark, :unmark, :list].map {|i| os[i] } }
-    
     # Checks to make sure user input is valid
-    all, mark, unmark, list = *parse_args[ opts ]
+    all, mark, unmark, list = [:all, :mark, :unmark, :list].map {|i| opts[i] }
     
     if (list && (mark || unmark)) || (mark && unmark)
       raise abort("too many options specified")
@@ -31,10 +29,8 @@ command :resolve do |c|
   
   c.on_run do |opts, args|
     repo = opts[:repository]
-    parse_args = lambda {|os| [:all, :mark, :unmark, :list].map {|i| os[i] } }
     
-    all, mark, unmark, list = *parse_args[opts]
-    merge_state = Amp::Merges::MergeState.new(repo)
+    all, mark, unmark, list = [:all, :mark, :unmark, :list].map {|i| opts[i] }
     
     if opts[:all]
       # the block means "default to true" - so basically ignore all other input
@@ -47,34 +43,21 @@ command :resolve do |c|
     end                        
                           
     # iterate over each entry in the merge state file
-    merge_state.each do |file, status|
+    repo.uncommitted_merge_files.each do |file, status|
       # check to see if our user wants this file
       if match.call(file)
         if list
           Amp::UI.say "#{status.first} #{file}"
         elsif mark
           # the "r" means resolved
-          merge_state.mark(file, "r")
+          repo.mark_resolved(file)
           Amp::UI.say "#{file} marked as #{"resolved".blue}"
         elsif unmark
           # the "u" means unresolved
-          merge_state.mark(file, "u")
+          repo.mark_conflicted(file)
           Amp::UI.say "#{file} marked as #{"unresolved".red}"
         else
-          # retry the merge
-          working_changeset = repo[nil]
-          merge_changeset = working_changeset.parents.last
-          
-          # backup the current file to a .resolve file (but retain the extension
-          # so editors that rely on extensions won't bug out)
-          path = repo.working_join file
-          File.copy(path, path + ".resolve"  + File.extname(path))
-          
-          # try to merge the files!
-          merge_state.resolve(file, working_changeset, merge_changeset)
-          
-          # restore the backup to .orig (overwriting the old one)
-          File.move(path + ".resolve"  + File.extname(path), path + ".orig" + File.extname(path))
+          repo.try_resolve_conflict(file)
         end
       end
     end

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

@@ -7,7 +7,6 @@ amp root
   Prints the path to the current repository's root.
 EOF
   c.on_run do |opts, args|
-    repo = opts[:repository]
-    puts repo.root
+    puts opts[:repository].root
   end
 end

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

@@ -26,9 +26,11 @@ command :status do |c|
               'added'    => :blue,
               'removed'  => :red,
               'deleted'  => :magenta,
+              'copied'   => :blue,
+              'moved'    => :red,
               'unknown'  => :green,
               'ignored'  => :yellow,
-              'clean'    => :white
+              'clean'    => :white,
              }
     states = ['modified',
               'added'   ,
@@ -36,11 +38,13 @@ command :status do |c|
               'deleted' ,
               'unknown' ,
               'ignored' ,
-              'clean'   ]
+              'clean'   ,
+              'copied'  ,
+              'moved'   ]
     show = states.select {|k| options[k.to_sym] } # filter the list down
-    
     show = states if options[:all]
     show = states[0..4] if show.empty?
+    #show += states[7..8] unless options[:hg]
     
     statopts = {:node_1 => node1, :node_2 => node2 }
     
@@ -65,7 +69,6 @@ command :status do |c|
         changestates.each do |state, char, files|
           if show.include? state
             files.each do |f|
-              #Amp::Logger.info("#{char} #{f}")
               if options[:"no-color"]
                 Amp::UI.tell "#{char} #{File.join(cwd, f.to_s)[1..-1]}#{stop}" unless f.nil?
               else
@@ -82,21 +85,27 @@ command :status do |c|
           
           if options[:"no-color"]
             Amp::UI.say("#{state.upcase}" +
-                " => #{num_of_files} file#{num_of_files == 1 ? 's' : ''}")
+                " => #{num_of_files} file#{num_of_files == 1 ? '' : 's'}")
           else
             Amp::UI.say("#{state.upcase.send colors[state]}" +
-                " => #{num_of_files} file#{num_of_files == 1 ? 's' : ''}")
+                " => #{num_of_files} file#{num_of_files == 1 ? '' : 's'}")
           end
           
-          status[state.to_sym].each do |file|
-            #Amp::Logger.info("#{state[0,1].upcase} #{file}")
-            Amp::UI.say "\t#{File.join(cwd, file)[1..-1]}"
+          unless [:copied, :moved].include? state.to_sym
+            status[state.to_sym].each do |file|
+              Amp::UI.say "\t#{File.join(cwd, file)[1..-1]}"
+            end
+          else
+            status[state.to_sym].each do |(src, dst)|
+              Amp::UI.say "\t#{File.join(cwd, src)[1..-1]} => #{File.join(cwd, dst)[1..-1]}"
+            end
           end
-          
         end
         
-        Amp::UI.say
-        Amp::UI.say "#{status[:delta]} bytes were changed" if status[:delta]
+        unless show.map {|s| status[s.to_sym] }.all? {|s| s.empty? }
+          Amp::UI.say
+          Amp::UI.say "#{status[:delta]} bytes were changed" if status[:delta]
+        end
       end
     end