git-trac 0.0.20080204 → 0.0.20080205

data/lib/git/trac.rb

@@ -12,4 +12,5 @@ end
 require 'git/trac/repository'
 require 'git/trac/ticket'
 require 'git/trac/attachment'
+require 'git/trac/patch'
 require 'git/trac/runner'

data/lib/git/trac/attachment.rb

@@ -23,7 +23,7 @@ module Git
           elsif element.name = "dt"
             texts = []
             element.traverse_text {|x| texts << x.to_s}
-            if texts.first =~ /\A([\w-]*)(\.\d+)?\.(diff|patch)\Z/
+            if texts.first =~ /./
               time = Time.parse("#{texts[3]} +0000").utc
               collection << new(ticket, texts[0], texts[2], time)
               last = collection.last
@@ -81,46 +81,46 @@ module Git
         @body ||= repository.agent.get_file(url)
       end
 
-      def p_level
-        if body[0,10] == "diff --git"
-          1
-        else
-          0
-        end
-      end
-
       def repository
         ticket.repository
       end
 
-      # Rewrite filenames in a patch to be relative to +root+.  For each .. at
-      # the end of +root+, a path is stripped off the original filename.  The
-      # rewritten patch is returned as a string.
-      def patch_with_root(root = nil)
-        if root && !root.empty? && p_level.zero?
-          patch = ""
-          body.each_line do |line|
-            line.sub!(/^([+-]{3} |Index: )([^\/].*)$/) do
-              head = $1
-              original = File.join(root, $2)
-              while original.sub!(%r{(.*/|^)\.\./[^/]*/},'\\1')
-              end
-              head + original
-            end
-            patch << line
-          end
-          patch
-        else
-          body
+      def patch
+        @patch ||= Git::Trac::Patch.new(repository, lambda { body })
+      end
+
+      def cleanup(options = {})
+        repository.each_ref("refs/remotes/#{tag_name}") do |object, ref|
+          repository.exec("git","update-ref","-d",ref,object)
+          repository.cleanup_branches(object)
+          return object
         end
       end
 
-      def apply(options = {})
-        repository.popen3("git","apply", "-p#{p_level}", "--cached", "--whitespace=nowarn") do |inn,out,err|
-          inn.puts patch_with_root(options[:root])
-          inn.close
-          err.read.empty?
+      def fetch(options = {})
+        cleanup(options)
+        FileUtils.mkdir_p(ticket.trac_dir)
+        repository.with_index("tracindex#{$$}") do
+          parent = repository.exec("git","rev-list","--max-count=1","--before=#{timestamp}",options[:branch] || 'trunk').chomp
+          repository.exec("git","read-tree",parent)
+          applied = patch.apply(options) or return [nil,applied]
+          tree = repository.exec("git","write-tree").chomp
+          ENV["GIT_AUTHOR_NAME"] = ENV["GIT_COMMITTER_NAME"] = username
+          ENV["GIT_AUTHOR_EMAIL"] = ENV["GIT_COMMITTER_EMAIL"] = email
+          ENV["GIT_AUTHOR_DATE"] = ENV["GIT_COMMITTER_DATE"] = timestamp
+          commit = repository.popen3("git commit-tree #{tree} -p #{parent}") do |i,o,e|
+            i.puts "#{ticket.number}/#{filename}"
+            i.puts "\n#{description}" if description
+            i.close
+            o.read.chomp
+          end
+          File.open(tag_path,"w") do |f|
+            f.puts commit
+          end
+          return [commit, applied]
         end
+      ensure
+        %w(GIT_AUTHOR_NAME GIT_COMMITTER_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_EMAIL GIT_AUTHOR_DATE GIT_COMMITTER_DATE).each {|e| ENV[e] = nil}
       end
 
     end

data/lib/git/trac/pager.rb

@@ -0,0 +1,62 @@
+module Git
+  module Trac
+
+    class Repository
+
+      DIFF_COLORS = {
+        :reset      => "\033[m",
+        :plain      => "",
+        :meta       => "\033[1m",
+        :frag       => "\033[36m",
+        :old        => "\033[31m",
+        :new        => "\033[32m",
+        :commit     => "\033[33m",
+        :whitespace => "\033[41m"
+      }
+
+      def pager(body, diff = false)
+        pager = ENV["GIT_PAGER"] || config("core","pager") || ENV["PAGER"] || "less"
+        return colorize_diff_output($stdout, body) if pager.empty? && diff
+        return $stdout.puts(body) if !$stdout.tty? || pager.empty?
+        ENV["LESS"] ||= "FRSX"
+
+        IO.popen(pager, "w") do |io|
+          if diff && !%w(false no 0).include?(config("color","pager").to_s.downcase)
+            colorize_diff_output(io, body)
+          else
+            io.puts body
+          end
+        end
+      end
+
+      private
+
+      def colorize_diff_output(io, body)
+        if %w(true yes 1 always auto).include?(config("color","diff").to_s.downcase)
+          state = nil
+          body.each_line do |line|
+            if state.nil? && line !~ /^(diff|Index:) /
+              io.puts line
+              next
+            end
+            color = case line
+                    when /^diff/   then state = true;   :meta
+                    when /^index/i then state = true;   :meta
+                    when /^@@/     then state = false;  :frag
+                    when /^\+/     then state ? :meta : :new
+                    when /^-/      then state ? :meta : :old
+                    when /^ /      then state = false;  :normal
+                    when ""        then state = nil
+                    else                state ? :meta : :normal
+                    end
+            io.puts "#{DIFF_COLORS[color]}#{line}"
+          end
+        else
+          io.puts body
+        end
+      end
+
+    end
+
+  end
+end

data/lib/git/trac/patch.rb

@@ -0,0 +1,86 @@
+module Git
+  module Trac
+
+    class Patch
+
+      attr_reader :repository
+
+      def initialize(repository, body)
+        @repository, @body = repository, body
+      end
+
+      def body
+        @body.respond_to?(:call) ? @body.call : body
+      end
+
+      alias to_s body
+
+      def p_level
+        if body[0,10] == "diff --git" || body[0,6] == "--- a/"
+          1
+        else
+          0
+        end
+      end
+
+      # Rewrite filenames in a patch to be relative to +root+.  For each .. at
+      # the end of +root+, a path is stripped off the original filename.  The
+      # rewritten patch is returned as a string.
+      def with_root(root = nil)
+        if root && !root.empty? && p_level.zero?
+          patch = ""
+          body.each_line do |line|
+            line.sub!(/^([+-]{3} |Index: )(?!\/dev\/null)(.*)$/) do
+              head = $1
+              original = File.join(root, $2)
+              while original.sub!(%r{(.*/|^)\.\./[^/]*/},'\\1')
+              end
+              head + original
+            end
+            patch << line
+          end
+          patch
+        else
+          body
+        end
+      end
+
+      def apply(options = {})
+        repository.popen3("git","apply", "-p#{p_level}", "--cached", "--whitespace=nowarn") do |inn,out,err|
+          inn.puts with_root(options[:root])
+          inn.close
+          if err.read.empty?
+            if options[:root]
+              return options[:root].sub(%r{((?:^\.\.|/\.\.)+)/([^.].*)},'\\2/\\1')
+            else
+              return "."
+            end
+          end
+        end
+        if options[:depth].to_i > 0 && p_level.zero?
+          repository.in_work_tree do
+            last_roots = [options[:root]]
+            options = options.dup
+            1.upto(options.delete(:depth).to_i) do |d|
+              parent = File.join(*(%w(..)*d+[options[:root]]).compact)
+              result = apply(options.merge(:root => parent)) and return result
+              roots = []
+              last_roots.each do |root|
+                Dir.entries(root || ".").each do |dir|
+                  path = File.join(*[root,dir].compact)
+                  next if dir =~ /\A\./ || !File.directory?(path)
+                  roots << path
+                  result = apply(options.merge(:root => path)) and return result
+                end
+              end
+              last_roots = roots
+            end
+          end
+        end
+        false
+      end
+
+    end
+
+  end
+end

data/lib/git/trac/repository.rb

@@ -192,6 +192,15 @@ module Git
         hash
       end
 
+      def cleanup_branches(*revs)
+        return if revs.empty?
+        each_ref("refs/heads") do |object, ref|
+          if revs.include?(object) && current_checkout != File.basename(ref)
+            exec("git","branch","-D",File.basename(ref))
+          end
+        end
+      end
+
       # See if the current commit or an ancestor was previously tagged as a
       # trac ticket.  Also check git config branch.branchname.tracticket
       def guess_current_ticket_number
@@ -220,3 +229,5 @@ module Git
 
   end
 end
+
+require 'git/trac/pager.rb'

data/lib/git/trac/runner.rb

@@ -135,6 +135,22 @@ Available commands:
           self.class.name[/[^:]*$/].gsub(/(.)([A-Z])/) { $1+"-"+$2 }.downcase
         end
 
+        def add_local_option(opts)
+          opts.on("--[no-]local","don't run git-svn fetch") do |bool|
+            options[:local] = bool
+          end
+        end
+
+        def svn_fetch_unless_local
+          unless options[:local]
+            @repository.in_work_tree do
+              unless system("git","svn","fetch")
+                abort "git svn fetch failed (use --local to skip)"
+              end
+            end
+          end
+        end
+
       end
 
       class Download < Base #:nodoc:
@@ -153,9 +169,6 @@ directory.
         def add_options(opts)
           require_ticket_number
           opts.separator("Options:")
-          opts.on("--filter PATTERN","only get matching filenames (deprecated)") do |pattern|
-            options[:filter] = pattern
-          end
           opts.on("--root DIR","prefix patch paths with DIR") do |dir|
             options[:root] = dir
           end
@@ -163,15 +176,10 @@ directory.
 
         def run
           each_ticket_argument do |number, filename|
-            filter = if filename
-                       "\\A#{Regexp.escape(filename)}"
-                     else
-                       options[:filter]
-                     end
             @repository.ticket(number).attachments.each do |attach|
-              next if filter && attach.filename !~ /#{filter}/
+              next if filename && attach.filename != filename
               File.open(attach.filename, "w") do |f|
-                f.puts attach.patch_with_root(options[:root])
+                f.puts attach.patch.with_root(options[:root])
               end
             end
           end
@@ -182,12 +190,12 @@ directory.
       class Show < Base #:nodoc:
 
         def banner_arguments
-          "[ticket]"
+          "[ticket[/filename]]"
         end
 
         def description
           <<-EOF
-Show a crude ticket summary.
+Show a crude ticket summary or a patch.
           EOF
         end
 
@@ -196,13 +204,31 @@ Show a crude ticket summary.
         end
 
         def run
-          number = get_ticket_number
-          csv = @repository.ticket(number).csv
-          csv.reject {|k,v| k == "description"}.sort.each do |(k,v)|
-            puts "#{k}: #{v}" if v
+          each_ticket_argument do |number, filename|
+            ticket = @repository.ticket(number)
+            attachments = ticket.attachments
+            if filename
+              attachment = attachments.detect {|a|a.filename == filename}
+              abort "no such attachment" unless attachment
+              @repository.pager(attachment.body, true)
+            else
+              body = ""
+              csv = ticket.csv
+              csv.reject {|k,v| k == "description"}.sort.each do |(k,v)|
+                body << "#{k}: #{v}\n" if v
+              end
+              body << "attachments:\n"
+              attachments.each do |attachment|
+                body << "#{number}/#{attachment.filename}"
+                body << " (#{attachment.description})" if attachment.description
+                body << "\n"
+              end
+              body << "description:\n"
+              body << csv["description"]
+              body << "\n" unless body =~ /\n\z/
+              @repository.pager(body)
+            end
           end
-          puts "description:"
-          puts csv["description"]
         end
 
       end
@@ -218,13 +244,11 @@ Show a crude ticket summary.
 Download all branches that look like patches.  For each patch, find the
 revision of trunk that most recently proceeds the the time of upload, apply
 the patch to it, create a new commit, and add a remote head of the form
-refs/remotes/trac/ticketnumber/file_name_ext.  Patches with the same root
-name (filename.diff, filename.2.diff, filename.patch, etc.) will committed in
-parent child relationships based on upload time.  This means filename.2.diff
-might cite filename.diff as a parent.  For each root name, a branch is created
-pointing to the newest patch.  Existing branches will not be overridden, but
-there is an implied `git cleanup <patch>` that runs beforehand which could
-potentially remove conflicted branches first.
+refs/remotes/trac/ticketnumber/file_name.ext.  For each unique base name
+(filename without extension), a branch is created pointing to the newest
+patch.  Existing branches will not be overridden, but there is an implied
+`git cleanup <patch>` that runs beforehand which could potentially remove
+conflicting branches first.
           EOF
         end
 
@@ -233,33 +257,29 @@ potentially remove conflicted branches first.
           opts.on("--branch BRANCH","apply against branch BRANCH") do |b|
             options[:branch] = b
           end
-          opts.on("--filter PATTERN","only fetch matching filenames (deprecated)") do |pattern|
-            options[:filter] = pattern
+          opts.on("--depth NUM","search NUM directories deep for a root") do |n|
+            options[:depth] = n
           end
           opts.on("--root DIR","apply patches relative to DIR") do |dir|
             options[:root] = dir
           end
-          opts.on("--[no-]local","don't run git-svn fetch") do |bool|
-            options[:local] = bool
-          end
+          add_local_option(opts)
         end
 
         def run
-          unless options[:local]
-            @repository.in_work_tree do
-              system("git","svn","fetch")
-            end
-          end
+          svn_fetch_unless_local
           each_ticket_argument do |number, filename|
             loop_opts = options.dup
             if filename
               loop_opts[:filter] = "\\A#{Regexp.escape(filename)}"
             end
-            @repository.ticket(number).fetch(loop_opts) do |attachment, branch|
-              if branch
-                puts "#{attachment.filename}: #{branch}"
+            @repository.ticket(number).fetch(loop_opts) do |attachment, dir|
+              if dir == "."
+                puts "#{attachment.tag_name}"
+              elsif dir
+                puts "#{attachment.tag_name} (#{dir})"
               else
-                $stderr.puts "#{attachment.filename} FAILED"
+                $stderr.puts "#{attachment.tag_name} FAILED"
               end
             end
           end
@@ -294,8 +314,7 @@ been closed, but you can also specify ticket numbers explicitly or use --all.
             end
           elsif @argv.any?
             each_ticket_argument do |number, filename|
-              filter = "\\A#{Regexp.escape(filename.to_s)}"
-              @repository.ticket(number).cleanup(:filter => filter)
+              @repository.ticket(number).cleanup(:attachment => filename)
             end
           else
             @repository.working_tickets.each do |t|
@@ -330,18 +349,12 @@ it against a production trac server.
           opts.on("--[no-]force", "do not prompt before uploading") do |force|
             options[:force] = force
           end
-          opts.on("--[no-]local","don't run git-svn fetch") do |bool|
-            options[:local] = bool
-          end
+          add_local_option(opts)
         end
 
         def run
           number = get_ticket_number
-          unless options[:local]
-            @repository.in_work_tree do
-              system("git","svn","fetch")
-            end
-          end
+          svn_fetch_unless_local
           ticket = @repository.ticket(number)
           if $stdin.tty? && !options[:force]
             block = lambda do

data/lib/git/trac/ticket.rb

@@ -122,69 +122,30 @@ module Git
       def cleanup(options = {})
         revs = []
         repository.each_ref("refs/remotes/trac/#{number}") do |object, ref|
-          if File.basename(ref) =~ /#{options[:filter]}/
+          if File.basename(ref) == options[:attachment] || !options[:attachment]
             revs << object
             repository.exec("git","update-ref","-d",ref,object)
           end
         end
-        unless revs.empty?
-          repository.each_ref("refs/heads") do |object, ref|
-            if revs.include?(object) && repository.current_checkout != File.basename(ref)
-              repository.exec("git","branch","-D",File.basename(ref))
-            end
-          end
-          true
-        end
+        repository.cleanup_branches(*revs)
+        revs.any?
       end
 
       def fetch(options = {})
         cleanup(options)
         seen = {}
-        repository.with_index("tracindex#{$$}") do
-          FileUtils.mkdir_p(trac_dir)
-          attachments.select do |attachment|
-            attachment.filename =~ /#{options[:filter]}/
-          end.map do |attachment|
-            parent = repository.exec("git","rev-list","--max-count=1","--before=#{attachment.timestamp}",options[:branch] || 'trunk').chomp
-            repository.exec("git","read-tree",parent)
-            unless attachment.apply(options)
-              yield attachment, false if block_given?
-              next
-            end
-            tree = repository.exec("git","write-tree").chomp
-            ENV["GIT_AUTHOR_NAME"] = ENV["GIT_COMMITTER_NAME"] = attachment.username
-            ENV["GIT_AUTHOR_EMAIL"] = ENV["GIT_COMMITTER_EMAIL"] = attachment.email
-            ENV["GIT_AUTHOR_DATE"] = ENV["GIT_COMMITTER_DATE"] = attachment.timestamp
-            if repeated = seen[attachment.name]
-              if repeated.last == parent
-                parents = " -p #{repeated.first}"
-              else
-                parents = " -p #{repeated.first} -p #{parent}"
-              end
-            else
-              parents = " -p #{parent}"
-            end
-            commit = repository.popen3("git commit-tree #{tree}#{parents}") do |i,o,e|
-              i.puts "#{number}/#{attachment.filename}"
-              i.puts "\n#{attachment.description}" if attachment.description
-              i.close
-              o.read.chomp
-            end
-            File.open(attachment.tag_path,"w") do |f|
-              f.puts commit
-            end
-            yield attachment, attachment.tag_name if block_given?
-            seen[attachment.name] = [commit, parent]
-            commit
-          end
+        attachments.select do |attachment|
+          attachment.filename =~ /#{options[:filter] || "\\.(diff|patch)$"}/
+        end.map do |attachment|
+          commit, applied = attachment.fetch(options)
+          yield attachment, applied if block_given?
+          seen[attachment.name] = commit if commit
         end
         seen.each do |k,v|
           if !File.exists?(path = "#{repository.git_dir}/refs/heads/#{k}")
-            File.open(path, "w") {|f| f.puts v.first}
+            File.open(path, "w") {|f| f.puts v}
           end
         end
-      ensure
-        %w(GIT_AUTHOR_NAME GIT_COMMITTER_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_EMAIL GIT_AUTHOR_DATE GIT_COMMITTER_DATE).each {|e| ENV[e] = nil}
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: git-trac
 version: !ruby/object:Gem::Version 
-  version: 0.0.20080204
+  version: 0.0.20080205
 platform: ruby
 authors: 
 - Tim Pope
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-04 00:00:00 -06:00
+date: 2008-02-05 00:00:00 -06:00
 default_executable: git-trac
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,6 +39,8 @@ files:
 - lib/git/trac/repository.rb
 - lib/git/trac/runner.rb
 - lib/git/trac/ticket.rb
+- lib/git/trac/pager.rb
+- lib/git/trac/patch.rb
 - test/execution_test.rb
 has_rdoc: true
 homepage: http://git-trac.rubyforge.org