diff code

SVN Diff While Ignoring Whitespace

A command line alias for doing an svn diff while ignoring whitespace differences. Placed in ~/.bashrc or your profile.

Can be used in a directory:
$ dw

Or on a single file:
$ dw functions.php

alias dw="svn diff --diff-cmd diff -x -uw"

to subversion svn diff by philsown on Mar 12, 2008

Speeding up your acts_as_tokenized inserts

You might want to apply this diff to your token_generator plugin. Otherwise for saving identical models the minimum time taken is one per second. Not fun!

Index: vendor/plugins/token_generator/lib/token_generator.rb
===================================================================
--- vendor/plugins/token_generator/lib/token_generator.rb       (revision 1233)
+++ vendor/plugins/token_generator/lib/token_generator.rb       (working copy)
@@ -1,7 +1,7 @@
 module TokenGenerator
   def generate_token(size = 12, &validity)
     begin
-      token = Digest::MD5.hexdigest("#{inspect}#{Time.now}").first(size)
+      token = Digest::MD5.hexdigest("#{inspect}#{Time.now}#{rand}").first(size)
     end while !validity.call(token) if block_given?

to ruby rails token diff plugin by jchris on Sep 21, 2007

Capistrano : apply local patches when deploying from an external source code repository

I've submitted patches to a couple rails apps, and want to run off of their SCM's trunk code, but with my local patches applied. These Capistrano tasks will take any files matching

patches/*.diff

in your local directory, and apply them before restarting your app.

task :after_setup do
  patches_setup
end

task :after_update_code do
  send_and_apply_patches
end

task :patches_setup do
  run "mkdir -p #{deploy_to}/#{shared_dir}/patches" 
end

task :send_and_apply_patches do
  Dir[File.join(File.dirname(__FILE__), '../patches/*.diff')].sort.each do |patch|
    puts "sending #{File.basename(patch)}"
    put(File.read(patch),
       "#{deploy_to}/#{shared_dir}/patches/#{File.basename(patch)}",
       :mode => 0777)
    puts "applying #{File.basename(patch)}"
    run "cd #{release_path}; patch -p0 < #{deploy_to}/#{shared_dir}/patches/#{File.basename(patch)}"
  end
end

to ruby rails rubyonrails patch capistrano diff by jnewland on Dec 13, 2006

diff

diff two directories

diff <dir1> <dir2>

to bash tools diff by nevadalife on Sep 23, 2006

Popular @ dzone.com

Related Tags

Never been to DZone Snippets before?

SVN Diff While Ignoring Whitespace

Speeding up your acts_as_tokenized inserts

Capistrano : apply local patches when deploying from an external source code repository

diff