amp 0.5.0

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

@@ -0,0 +1,11 @@
+command :forget do |c|
+  c.workflow :hg
+  c.desc "Stop tracking a file"
+  
+  c.on_run do |opts, args|
+    repo = opts[:repository]
+    
+    puts "Forgetting #{args.size} file#{args.size == 1 ? '' : 's'}"
+    repo.forget args
+  end
+end

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

@@ -0,0 +1,25 @@
+command :heads do |c|
+  c.workflow :hg
+  c.desc "Prints the heads of the repository."
+  c.opt :rev, "show only heads which are descendants of rev", {:short => "-r"}
+  c.opt :active, "show only active heads", {:short => "-a"}
+  c.opt :template, "Which template to use while printing", {:short => "-t", :type => :string, :default => "default"}
+  
+  c.on_run do |options, args|
+    repo   = options[:repository]
+    start  = options[:rev] ? repo.lookup(options[:rev]) : nil
+    closed = options[:active]
+    
+    if args.size == 0
+      heads = repo.heads start, :closed => closed
+    else
+      #branch shit
+    end
+    
+    options.merge! :template_type => :log
+    heads.each do |n|
+      Amp::UI::say repo[n].to_templated_s(options)
+    end
+    
+  end
+end

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

@@ -0,0 +1,23 @@
+command :identify do |c|
+  c.workflow :hg
+  c.desc "Identifies the current (or another) revision"
+  c.opt :num, "show local revision number", :short => "-n"
+  c.opt :id,  "show global revision ID", :short => "-i"
+  c.opt :branch, "show branch", :short => "-b"
+  c.opt :tags, "show tags", :short => "-t"
+  c.opt :rev, "specifies which revision to report upon", :type => :string, :short => "-r"
+  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]
+    
+    Amp::UI.say
+    
+  end
+end

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

@@ -0,0 +1,135 @@
+command :import do |c|
+  c.workflow :hg
+  c.desc "Import an ordered set of patches"
+  c.help <<-EOS
+amp import [options]+ [FILE]+
+  
+  Import a list of patches and commit them individually.
+
+  If there are outstanding changes in the working directory, import
+  will abort unless given the -f flag.
+
+  You can import a patch straight from a mail message. Even patches
+  as attachments work (body part must be type text/plain or
+  text/x-patch to be used). From and Subject headers of email
+  message are used as default committer and commit message. All
+  text/plain body parts before first diff are added to commit
+  message.
+
+  If the imported patch was generated by amp export, user and description
+  from patch override values from message headers and body. Values
+  given on command line with -m and -u override these.
+
+  If --exact is specified, import will set the working directory
+  to the parent of each patch before applying it, and will abort
+  if the resulting changeset has a different ID than the one
+  recorded in the patch. This may happen due to character set
+  problems or other deficiencies in the text patch format.
+
+  With --similarity, amp will attempt to discover renames and copies
+  in the patch in the same way as 'addremove'.
+
+  To read a patch from standard input, use patch name "-".
+  
+  Where options are:
+EOS
+  
+  c.on_run do |opts, args|
+    require 'date'
+    require 'open-uri'
+    
+    repo = opts[:repository]
+    patches = args
+    
+    opts[:date] &&= DateTime.parse(opts[:date])
+    opts[:similarity] = Float(opts[:similarity] || 0)
+    
+    if opts[:similarity] < 0 || opts[:similarity] > 100
+      raise abort('similarity must be between 0 and 100')
+    end
+    
+    if opts[:exact] || !opts[:force]
+      raise abort("Outstanding changes or uncommitted merges exist") if repo.changed?
+    end
+    
+    d     = opts[:base]
+    strip = opts[:strip]
+    repo.lock_working_and_store do
+      patches.each do |patch|
+        patch_file = File.join d, patch
+        
+        if patch_file == '-'
+          Amp::UI.status 'applying patch from STDIN'
+          patch_file = $stdin
+        else
+          Amp::UI.status "applying #{patch_file}"
+          patch_file = Kernel.open patch_file # uses open-uri's version of #open
+        end
+        
+        data = Amp::Patch.extract patch_file
+        # python uses an array for this:
+        #  tmpname, message, user, date, branch, nodeid, p1, p2 = *data
+        # WRONG BITCH! We're using a hash
+        raise abort('no patch found') if data[:tmp_name].nil?
+        
+        begin
+          message = if (msg = c.log_message opts[:message], opts[:log_file])
+                      msg
+                    elsif !data[:message].empty?
+                      data[:message].strip
+                    end # defaults to nil
+          Amp::UI.debug "message: #{message}"
+          
+          wp = repo.parents
+          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
+            
+            repo.update(p1, false, true, nil).success? if p1 != wp.first.node
+            repo.dirstate.parents = [p1, p2]
+          elsif p2
+            begin
+              p1 = repo.lookup p1
+              p2 = repo.lookup p2
+              repo.dirstate.parents = [p1, p2] if p1 == wp[0].node
+            rescue Amp::RepoError
+              # Do nothing...
+            end
+          end
+          
+          if opts[:exact] || opts[:"import-branch"]
+            repo.dirstate.branch = data[:branch] || 'default'
+          end
+          
+          files = {}
+          begin
+            fuzz = Amp::Patch.patch data[:tmp_name], :strip => data[:strip],
+                                                     :cwd   => repo.root   ,
+                                                     :file  => files
+          ensure
+            files = Amp::Patch.update_dir repo, files, opts.pick(:similarity)
+          end
+          
+          unless opts[:"no-commit"]
+            n = repo.commit files, :message => message                   ,
+                                   :user    => opts[:user] || data[:user],
+                                   :date    => opts[:date] || data[:date]
+            if opts[:exact]
+              if n.hexlify != data[:node_id]
+                repo.rollback!
+                raise abort('patch is damaged or loses information')
+              end
+            end
+            
+            # Force a dirstate write so that the next transaction
+            # backups an up-do-date file.
+            repo.dirstate.write
+          end
+        ensure
+          File.safe_unlink data[:tmp_name]
+        end
+      end
+    end
+  end  # end on_run
+end

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

@@ -0,0 +1,85 @@
+command :incoming do |c|
+  c.workflow :hg
+  c.desc "Show new changesets found in source"
+
+  c.help <<-HELP
+amp incoming [options]+ source
+  
+  Show new changesets found in the specified path/URL or the default
+  pull location. These are the changesets that would be pulled if a pull
+  was requested.
+  
+  For remote repository, using --bundle or -b avoids downloading the changesets
+  twice if the incoming is followed by a pull.
+  
+  See pull for valid source format details.
+HELP
+
+  c.opt :force,          "Run even when remote repository is unrelated", :short => '-f'
+  c.opt :"newest-first", "Show newest record first",                     :short => '-n'
+  c.opt :bundle,         "File to store the bundles into",               :short => '-b', :type  => :string
+  c.opt :rev,            "A specific revision up to which you would like to pull", :short => '-r', :type => :string
+  c.opt :patch,          "Show patch",                                   :short => '-p'
+  c.opt :limit,          "Limit number of changes displayed",            :short => '-l'
+  c.opt :"no-merges",    "Do not show merges",                           :short => '-M'
+  c.opt :style,          "Display using template map file",              :short => '-s'
+  c.opt :template, "Which template to use while printing", {:short => "-t", :type => :string, :default => "default"}
+
+  c.opt :ssh,            "Specify ssh command to use",                   :short => '-e'
+  c.opt :remotecmd,      "Specify hg command to run on the remote side", :short => '-c'
+
+  c.on_run do |opts, args|  
+    repo = opts[:repository]
+    
+    url = args.shift || repo.config['paths', 'default-push'] || repo.config['paths', 'default']
+    url = Amp::Support::parse_hg_url url, opts[:rev]
+    #source, revs, checkout
+    
+    remote = Amp::Repositories.pick opts[:global_config], url[:url]
+    Amp::UI::status "comparing with #{url[:url].hide_password}"
+  
+    url[:revs] = url[:revs].map {|r| remote.lookup r } if url[:revs] && url[:revs].any?
+    common, incoming, remote_heads = *repo.common_nodes(remote, :heads => url[:revs],
+                                                                :force => opts[:force])
+    
+  
+    if incoming.empty?
+      File.safe_unlink opts[:bundle]
+      Amp::UI::status 'no changes found'
+      break
+    end
+  
+    cleanup = nil
+    file = opts[:bundle]
+  
+    if file || !remote.local?
+      # create a bundle (uncompressed if the other repo is not local)
+    
+      url[:revs] = remote_heads if url[:revs].nil? && remote.capable?('changegroupsubset')
+      cg = if url[:revs].nil? || !url[:revs].any?
+             remote.changegroup incoming, 'incoming'
+           else
+             remote.changegroup_subset incoming, url[:revs], 'incoming'
+           end
+      
+      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)
+      cleanup = file.path
+      unless remote.local?
+        remote = Amp::Repositories::BundleRepository.new(repo.root, opts[:global_config], cleanup)
+      end
+    end
+    opts.merge! :template_type => :log
+    remote.changelog.nodes_between(incoming, url[:revs])[:between].each do |n|
+      puts remote[n].to_templated_s(opts)
+    end
+
+    if remote.respond_to?(:close)
+      remote.close
+    end
+    #File.safe_unlink cleanup if cleanup
+  
+  end
+end

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

@@ -0,0 +1,18 @@
+command :info do |c|
+  c.workflow :hg
+  c.desc "Print information about one or more changesets"
+  c.opt :template, "Which template to use while printing", {:short => "-t", :type => :string, :default => "default"}
+  
+  c.on_run do |opts, args|
+    #arguments are the revisions
+    repo = opts[:repository]
+    
+    args.empty? && args = ['tip']
+    opts.merge! :template_type => :log
+    
+    args.each do |arg|
+      index = arg
+      puts repo[index].to_templated_s(opts)
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+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.on_run do |options, args|
+    repo = options[:repository]
+    limit = options[:limit]
+    limit = repo.size if limit == -1
+    
+    start = repo.size - 1
+    stop  = start - limit + 1
+    
+    options.merge! :template_type => :log
+    start.downto stop do |x|
+      puts repo[x].to_templated_s(options) unless options[:no_output]
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+command :manifest do |c|
+  c.workflow :hg
+  c.desc "Prints the manifest at a given revision (defaults to working directory)"
+  c.add_opt :rev, "Specifies the revision to check", {:short => "-r", :type => :integer}
+  c.on_run do |options, arguments|
+    revision = options[:rev] || "tip"
+    repo = options[:repository]
+        
+    repo[revision].each do |k, _|
+      puts "#{k}"
+    end
+  end
+end

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

@@ -0,0 +1,53 @@
+command :merge do |c|
+  c.workflow :hg
+  
+  c.desc "merge working directory with another revision"
+  c.opt :force, "force a merge with outstanding changes", :short => "-f"
+  c.opt :rev, "revision to merge", :type => :integer, :short => "-r"
+  
+  c.before do |opts, args|
+    repo = opts[:repository]
+    if !opts[:rev]
+      branch = repo[nil].branch
+      bheads = repo.branch_heads[branch]
+      if bheads.size > 2
+        raise abort("branch #{branch} has #{bheads.size} - please merge " +
+                             " with an explicit revision")
+        c.break
+      end
+      parent = repo.dirstate.parents.first
+      if bheads.size == 1
+        if repo.heads.size > 1
+          raise abort("branch #{branch} has one head - please merge with " +
+                               "an explicit revision")
+          c.break
+        end
+        message = "there is nothing to merge"
+        if parent != repo.lookup(repo[nil].branch)
+          message = "#{message} - use \"amp update\" instead"
+        end
+        raise abort(message)
+      end
+      unless bheads.include? parent
+        raise abort("working dir not at a head revision - use \"amp update\" or "+
+                             "merge with an explicit revision" + bheads.inspect)
+      end
+      opts[:node] = (parent == bheads.first) ? bheads.last : bheads.first
+    end
+    
+    true
+  end
+  
+  c.on_run do |opts, args|
+    repo = opts[:repository]
+    node = opts[:node]
+    stats = repo.update(node, true, opts[:force], false)
+    c.print_update_stats stats
+    if stats[:unresolved]
+      Amp::UI.status("use 'amp resolve' to retry unresolved file merges or use "+
+                     "'amp update --clean' to abandon changes")
+    elsif true # check for a reminder setting to disable this remidner
+      Amp::UI.status("(branch merge, don't forget to commit)")
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+command :move do |c|
+  c.workflow :hg
+  c.desc "Moves a file from one place to another"
+  c.opt :force, "Forces the move, ignoring overwrites", :short => "-f"
+  c.opt :"dry-run", "Doesn't actually move files - only prints what would happen", :short => "-n"
+  
+  c.synonym :mv
+  c.synonym :rename
+  
+  c.before do |opts, args|
+    if args.size < 2
+      Amp::UI.say "Usage: amp move source destination"
+      c.break
+    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
+    end
+    true
+  end
+  
+  c.on_run do |opts, args|
+    opts.merge!(:rename => true)
+    Amp::Command["copy"].run(opts, args)
+  end
+end
+
+

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

@@ -0,0 +1,61 @@
+command :outgoing do |c|
+  c.workflow :hg
+  c.opt :limit, "How much of the logs to show",              :short => '-l', :type => :integer
+  c.opt :rev, "Revision to clone up to (implies pull=True)", :short => '-r', :type => :integer
+  c.opt :force, "Force getting new heads",                   :short => '-f'
+  c.opt :"newest-first", 'Show the newest heads first'
+  c.opt :"no-merges", "Don't show merges"
+  c.desc "Prints the list of all changesets that can be pushed"
+  c.help <<-HELP
+amp outgoing [options]+ dest
+  show changesets not found in destination
+  
+  Show changesets not found in the specified destination repository or
+  the default push location. These are the changesets that would be pushed
+  if a push was requested.
+  
+  See pull for valid destination format details.
+HELP
+
+  c.on_run do |opts, args|
+    repo   = opts[:repository]
+    
+    dest = args.shift
+    path = c.expand_path dest || 'default-push', dest || 'default', repo.config
+    url  = Amp::Support::parse_hg_url path, opts[:rev]
+    # dest, revs, checkout
+    if url[:revs] && url[:revs].any? # url[:revs] isn't guaranteed to be an array
+      url[:revs] = url[:revs].map {|r| repo.lookup rev }
+    end
+    
+    remote = Amp::Repositories.pick nil, url[:url]
+    Amp::UI::status "comparing with #{url[:url].hide_password}"
+  
+    o = repo.find_outgoing_roots remote, :force => opts[:force]
+    (Amp::UI::status "no changes found"; return 1) if o.empty?
+  
+    o = repo.changelog.nodes_between(o, url[:revs])[:between]
+    
+    # reverse the order, because the newest are usually last
+    # this is noticed if you get bitbucket email notifications
+    o.reverse! if opts[:"newest-first"]
+  
+    # trim the list if it's bigger than our limit
+    o = opts[:limit] ? o[0..opts[:limit]-1] : o
+    
+    Amp::UI::say # give us some space
+    
+    # print each changeset using the template in templates/
+    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? }
+    
+      # We skip printing this if it's a merge (parents.size == 2)
+      # and we're NOT printing merges (opts[:"no-merges"])
+      next if opts[:"no-merges"] && parents.size == 2
+      opts.merge! :template_type => :log
+      Amp::UI::tell repo[node_id].to_templated_s(opts)
+    end
+  end
+end