DZone Snippets: svn code

rails-commit: Rails Commit Script for Subversion

edltech (Ed Laczynski) — Wed, 11 Jun 2008 21:23:20 GMT

#!/usr/bin/env ruby

# my take on a easy commit script for rails...
# it is far from prefect, so:
# please feed back the modifications you made to it!
#
# Fixed bugs on empty to_ arrays and spelling mistakes
# by Vesa-Pekka Palmu
# orginal by Cies Breijs -- cies.breijsATgmailDOTcom
# based on a bash script by Anonymous Gentleman
# found here: http://wiki.rubyonrails.org/rails/pages/HowtoUseRailsWithSubversion
# cleaned up an pasted by Ed Laczynski http://idisposable.net

to_add = []
to_remove = []
to_checkin = []

`svn status`.each_line do |l|
puts l
action_char, path = l.split(' ', 2)
path.strip!
case action_char
when '?'
to_add << path
when '!'
to_remove << path
when 'M'
to_checkin << path
end
end

puts "\nyou are about to"

def print_list(array, str)
puts "\n#{str}:"
array.each { |i| puts "\t"+i }
puts "\t" if array.length == 0
end

print_list(to_add, 'add')
print_list(to_remove, 'remove')
print_list(to_checkin, 'checkin')

puts "\nplease write something for the commit log and hit enter"
puts "(hitting enter on an empty line will cancel this commit)\n\n"

log = gets.strip

if log.empty?
puts "commit cancelled!\n"
exit
end

puts "\ncontacting repository\n"

`svn add #{to_add.join(' ')}` unless to_add.empty?
`svn remove #{to_remove.join(' ')}` unless to_remove.empty?
puts "\n" + `svn commit -m "#{log.gsub('"', '"')}"` + "\n"

puts "running \'svn update\' to be sure we are up-to-date"
puts `svn update`

puts "\nfinished.\n"

Copy all svn:* properties from one file to another

pvdb (Peter Vandenberk) — Fri, 16 May 2008 11:25:10 GMT

The following script can be used to copy all SVN properties from one file (presumably a file that's already under SVN control) to another file (which you presumably want to put under SVN control, and which you want to check in with the same SVN properties).



#!/bin/sh



ORIG=$1 ; shift ;

[ -e "$ORIG" ] || exit ;



for PROP in `svn pl "$ORIG" | sed -n '2,$p'` ; do

        VALUE=`svn pg $PROP "$ORIG"` ;

        for FILE ; do

                [ -e "$FILE" ] && svn ps $PROP "$VALUE" "$FILE" ;

        done

done



# That's it, Folks!

If you put the above code in a shell script called...



svnprops.sh

... then you can run it as follows if you want to copy all svn:* properties FROM original.file TO blegga:



pvdb@localhost ~ $ ./svnprops.sh original.file blegga 

property 'svn:mime-type' set on 'blegga'

property 'svn:eol-style' set on 'blegga'

pvdb@localhost ~ $ _

... or as follows for multiple target files:



pvdb@localhost ~ $ ./svnprops.sh another.original.file blegga foo bar 

property 'svn:mime-type' set on 'blegga'

property 'svn:mime-type' set on 'foo'

property 'svn:mime-type' set on 'bar'

pvdb@localhost ~ $ _

SVN Diff While Ignoring Whitespace

philsown (Phil) — Wed, 12 Mar 2008 05:42:46 GMT

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"

Resolve all SVN conflicts with the right version of the file

thesaint () — Thu, 28 Feb 2008 10:57:51 GMT

This small PHP shell script recourses through the subdirectories and looks for files that match the "conflict" files that SVN creates when merging from another branch. It chooses the "right" version of the files and resolves the conflict.





$dir = new RecursiveIteratorIterator(new RecursiveDirectoryIterator("."));

foreach($dir as $file)

{

  $path = $file->getPathname();

  if (preg_match('/\.merge-right\.r\d+$/', $path, $matches)) {

    $orig = str_replace($matches[0], '' , $path);

    copy($path, $orig);

    $cmd = "svn resolved $orig";

    `$cmd`;

  }

}

Rename old HTML views for Rails 2

sikelianos (Zeke Sikelianos) — Sun, 27 Jan 2008 22:57:54 GMT



# Snagged from http://softiesonrails.com/2007/7/11/upgrading-your-views-to-rails-2-0

for old in `find app/views -name *.rhtml`; do svn mv $old `dirname $old`/`basename $old .rhtml`.html.erb; done

Checkout a Git clone of an SVN repository in parent folder

nicwilliams (Dr Nic Williams) — Thu, 22 Nov 2007 22:35:30 GMT

Here is a quick executable cmd that you run inside a folder checked out with Subversion. It will clone the repository using Git into the parent folder as <projname>.git

Stick this code into ~/bin/gitify and add ~/bin to your path:



#!/usr/bin/env ruby -wKU



# get svn info location

svnurl = `svn info | grep "^URL:"`.gsub('URL: ','').chomp



# project = basename

project = File.basename(Dir.pwd)



puts cmd = "git-svn clone #{svnurl} ../#{project}.git"



`#{cmd}`

svn merging

sikelianos (Zeke Sikelianos) — Wed, 21 Nov 2007 22:24:54 GMT



svn log | more

svn merge -r339:HEAD https://wush.net/svn/givezooks/trunk

svn-add-all-new-files

sessy (sessy) — Wed, 31 Oct 2007 10:00:54 GMT

alias svn-add-all-new-files='svn st|grep ^?|sed s/?//|xargs svn add $1'

Subversion basic commands Part I

jrobertson (James Robertson) — Tue, 23 Oct 2007 11:37:57 GMT

New users to SVN should be familiar with the following commands. Examples based on the code from Gentoo-wiki - HOWTO subversion SVN http://urltea.com/1urj .



#server side



# create the project directory structure outside of svn

mkdir -p ~/Documents/code/my-project/{trunk,tags,branches} 



# create the new repository

svnadmin create /var/svn/my-repository 



# add the new project

svn import my-project file:////var/svn/my-repository/my-project



# remove the project

rm -rf /var/svn/my-repository/my-project 





#client side



# list the contents of my-project

svn list --verbose http://my-site.com/svn/my-repository/my-project 





# *update 29-Oct-07*

# it's possible to import, or remove the project from the client-side



# add the new project

svn import my-project http://my-site.com/svn/my-repository/my-project 



# remove the project

svn delete http://my-site.com/svn/my-repository/my-project

Note: To use http on the client side, it's necessary to have Apache configured using SVN and DAV. Refer to HOWTO Apache2 with subversion SVN and DAV. http://urltea.com/1uqg

Ignore a folder in subversion

sikelianos (Zeke Sikelianos) — Tue, 18 Sep 2007 18:50:59 GMT



# In this case, ignore contents of 'coverage' folder in current directory.

svn propset svn:ignore 'coverage' .