git-trac 0.0.20071107 → 0.0.20071211

data/lib/git/trac/attachment.rb

@@ -89,11 +89,20 @@ module Git
         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_value.zero?
+        if root && !root.empty? && p_level.zero?
           patch = ""
           body.each_line do |line|
-            line.sub!(/^([+-]{3} |Index: )([^\/].*)$/) { $1 + File.join(root, $2) }
+            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

data/lib/git/trac/runner.rb

@@ -145,6 +145,9 @@ directory.
           opts.on("--filter PATTERN","only download filenames matching PATTERN") do |pattern|
             options[:filter] = pattern
           end
+          opts.on("--root DIR","prefix patch paths with DIR") do |dir|
+            options[:root] = dir
+          end
         end
 
         def run
@@ -173,9 +176,6 @@ Show a crude ticket summary.
 
         def add_options(opts)
           require_ticket_number
-          opts.on("--root DIR","apply patches relative to DIR") do |dir|
-            options[:root] = dir
-          end
         end
 
         def run
@@ -222,10 +222,18 @@ potentially remove conflicted branches first.
           opts.on("--root DIR","apply patches relative to DIR") do |dir|
             options[:root] = dir
           end
+          opts.on("--[no-]update","automatically run git-svn fetch") do |bool|
+            options[:update] = bool
+          end
         end
 
         def run
           number = get_ticket_number
+          if options[:update]
+            @repository.in_work_tree do
+              system("git-svn","fetch")
+            end
+          end
           @repository.ticket(number).fetch(options) do |attachment, branch|
             if branch
               puts "#{attachment.filename}: #{branch}"
@@ -294,17 +302,44 @@ it against a production trac server.
 
         def add_options(opts)
           require_ticket_number
-          opts.on("--branch BRANCH", "git diff BRANCH (default trunk)") do |b|
+          opts.on("--branch BRANCH", "git diff BRANCH (default trunk...HEAD)") do |b|
             options[:branch] = b
           end
           opts.on("--description TEXT", "use TEXT as description") do |text|
             options[:description] = text
           end
+          opts.on("--[no-]force", "do not prompt before uploading") do |force|
+            options[:force] = force
+          end
+          opts.on("--[no-]update","automatically run git-svn fetch") do |bool|
+            options[:update] = bool
+          end
         end
 
         def run
           number = get_ticket_number
-          if uri = @repository.ticket(number).upload_patch(options)
+          if options[:update]
+            @repository.in_work_tree do
+              system("git-svn","fetch")
+            end
+          end
+          ticket = @repository.ticket(number)
+          if $stdin.tty? && !options[:force]
+            block = lambda do
+              @repository.in_work_tree do
+                system("git-diff", options[:branch] || "trunk...HEAD")
+              end
+              description = "##{number} (#{ticket.csv["summary"]}"
+              cols = ENV["COLUMNS"].to_i
+              cols = 80 if cols.zero?
+              description.sub!(/^(.{#{cols-22}}).{4,}/,"\\1...")
+              print "#{description}) Proceed? [yN] "
+              $stdin.gets[0,1] == "y"
+            end
+          else
+            block = lambda { true }
+          end
+          if uri = ticket.upload_patch(options,&block)
             puts uri
           else
             exit 1

data/lib/git/trac/ticket.rb

@@ -104,10 +104,13 @@ module Git
       def upload_patch(options = {})
         filename = options[:filename] || "#{File.basename(repository.current_checkout)}.patch"
         # diff = repository.exec("git-diff","#{options[:branch] || "trunk"}...HEAD")
-        diff = repository.exec("git-diff", options[:branch] || "trunk")
+        diff = repository.exec("git-diff", options[:branch] || "trunk...HEAD")
         return false if diff.empty?
         # Don't upload the exact same patch that was pulled down
         return false if repository.generated_commits[repository.rev_parse("HEAD")] == number
+        if block_given? # confirmation block
+          return false if yield(diff) == false
+        end
         upload_attachment(options[:description], filename, diff)
       end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: git-trac
 version: !ruby/object:Gem::Version 
-  version: 0.0.20071107
-date: 2007-11-07 00:00:00 -06:00
+  version: 0.0.20071211
+date: 2007-12-11 00:00:00 -06:00
 summary: Interact with trac from a git repository pulled from svn
 require_paths: 
 - lib