motomike-bnr_tools 0.0.5 → 0.0.6

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 5
+:patch: 6
 :major: 0

data/bin/taggit

@@ -15,6 +15,7 @@ CURRENT_RELEASE_BRANCH="9.4"
 
 opts = Trollop::options do
   opt :ticket, "A ticket number optionally followed by one or more changesets to merge", :type => :ints, :multi => true
+  opt :deticket, "A ticket number optionally followed by one or more changesets to UN-merge", :type => :ints, :multi => true
   opt :wc_root_path, "Root path to a working copy of the repository we can do merge gymnastics in", :default => "#{ENV["HOME"]}/diggRepository"
   opt :release_branch, "Name of the release branch which will be the merge target", :default => CURRENT_RELEASE_BRANCH, :required => true, :multi => true  
 end
@@ -25,5 +26,9 @@ Array(opts[:release_branch]).each { |release_branch|
     ticket, *changesets = *ticketRefAndChangesets
     tickets << Ticket.new(ticket, changesets, opts[:wc_root_path], release_branch)
   }
+  opts[:deticket].each { |ticketRefAndChangesets|
+    ticket, *changesets = *ticketRefAndChangesets
+    tickets << Ticket.new(ticket, changesets.map { |cs| -cs } , opts[:wc_root_path], release_branch)
+  }
   Mergeinator.new(opts[:wc_root_path], release_branch, tickets).mergeStuff
 }

data/lib/bnr_tools/changeset.rb

@@ -15,7 +15,7 @@ class Changeset
   
   def modifiedPaths(relativeStartPath = self.wcBasePath)
     @modified[relativeStartPath] ||= begin
-      SvnCommands::Log.new(relativeStartPath,"-r #{self.revision}", true).entries.first.paths.map {|p| p.to_s}
+      SvnCommands::Log.new(relativeStartPath,"-r #{self.revision.abs}", true).entries.first.paths.map {|p| p.to_s}
     rescue
       []
     end

data/lib/bnr_tools/mergeinator.rb

@@ -48,19 +48,22 @@ class Mergeinator
   def tagLOLCat
     ref_msg = self.ticketsToMerge ? "Refs #{(self.ticketsToMerge.map {|t| "#{t}"}).join(", ")}" : "No tickets referenced"
     if agree("Tagging version #{self.version}. #{ref_msg}\nOkay to proceed? (NB: This will commit to SVN) ")
-      SvnCommands.copy("LOLcat/branches/#{self.releaseBranch}","LOLcat/tags/#{version}", nil, nil, "Tagged LOLcat-#{version}. #{ref_msg}")
+      SvnCommands.copy("LOLcat/branches/#{self.releaseBranch}","LOLcat/tags/#{version}", nil, nil, "Tagged LOLcat-#{version}. #{ref_msg}. External links not yet updated.")
       SvnCommands.copy("LOLz/branches/#{self.releaseBranch}","LOLz/tags/#{version}", nil, nil, "Tagged LOLz-#{version}. #{ref_msg}")
+      SvnCommands::Update.new("LOLcat/tags/#{version}",nil,true,true,self.wcPath) # shallowly checkout the new tag to ~/diggRepository/, no extra args for svn, force update
+      t = Tempfile.new("svn_externals").open { |tempfile|
+        tempfile.puts "modules svn+ssh://svn.digg.internal/repository/LOLz/tags/#{version}"
+        tempfile.puts "build svn+ssh://svn.digg.internal/repository/build/trunk"
+      }
+      cmd = "svn ps svn:externals --file #{t.path} #{SvnCommands::DIGG_DEFAULT_WC_PATH}/LOLcat/tags/#{version}"
+      puts "Running command : #{cmd}"
+      puts IO.popen(cmd).readlines
+      cmd = %Q{svn commit -m"Tagged LOLcat-#{version}. #{ref_msg}. Updated external links."}
+      puts "Running command : #{cmd}"
+      puts IO.popen(cmd).readlines
     else
       exit(1) unless agree("Oh. Well, would you like to keep going anyway? ")
     end
-    SvnCommands::Update.new("LOLcat/tags/#{version}",nil,true,true,self.wcPath) # shallowly checkout the new tag to ~/diggRepository/, no extra args for svn, force update
-    t = Tempfile.new("svn_externals").open { |tempfile|
-      tempfile.puts "modules svn+ssh://svn.digg.internal/repository/LOLz/tags/#{version}"
-      tempfile.puts "build svn+ssh://svn.digg.internal/repository/build/trunk"
-    }
-    cmd = "svn ps svn:externals --file #{t.path} #{SvnCommands::DIGG_DEFAULT_WC_PATH}/LOLcat/tags/#{version}"
-    puts "Running command : #{cmd}"
-    puts IO.popen(cmd).readlines
   end
 
   def mergeStuff
@@ -106,6 +109,7 @@ class Mergeinator
     tagLOLCat
     if agree("Upload modified modules now? ")
       @module_upload_cmds.each { |cmd|
+        puts "Running #{cmd} ..."
         puts IO.popen(cmd).readlines
       }
     else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: motomike-bnr_tools
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Mike Ashmore
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-27 00:00:00 -08:00
+date: 2009-03-04 00:00:00 -08:00
 default_executable: 
 dependencies: []