126 || b==UNDERSCORE || b==TAB
- sprintf("=%02x", b)
+ if b>126 || b==UNDERSCORE || b==TAB || b==HOOK || b==EQUALS
+ sprintf("=%02X", b)
elsif b == SPACE
"_"
else
@@ -163,8 +164,9 @@
# gives a string starting "=?", and including a charset specification, that
# marks the start of a quoted-printable character sequence
- def marker_start_quoted
- "=?#{@charset}?#{@encoding}?"
+ def marker_start_quoted(charset=nil)
+ charset = @charset if charset.nil?
+ "=?#{charset}?#{@encoding}?"
end
# test to see of the given string contains non-ASCII characters
@@ -388,6 +390,7 @@
class FileEntry
def initialize(path)
@path = path
+ @fromVer = @toVer = nil
@lineAdditions = @lineRemovals = 0
@repository = Repository.get(path)
@repository.merge_common_prefix(basedir())
@@ -397,7 +400,7 @@
# the full path and filename within the repository
attr_accessor :path
- # the type of change committed 'M'=modified, 'A'=added, 'R'=removed
+ # the type of change committed 'M'=modified, 'A'=added, 'R'=removed, 'P'=properties, 'C'=copied
attr_accessor :type
# records number of 'addition' lines in diff output, once counted
attr_accessor :lineAdditions
@@ -452,17 +455,28 @@
def removal?
@type == "R"
end
-
+
# was this file added during the commit?
def addition?
@type == "A"
end
+ # was this file copied during the commit?
+ def copied?
+ @type == "C"
+ end
+
# was this file simply modified during the commit?
def modification?
@type == "M"
end
+
+ # was this file simply modified during the commit?
+ def modifiedprops?
+ @type == "P"
+ end
+
# passing true, this object remembers that a diff will appear in the email,
# passing false, this object remembers that no diff will appear in the email.
# Once the value is set, it will not be changed
@@ -533,6 +547,14 @@
# TODO: consolidate these into a nicer framework,
mailSub = proc { |match| "#{match}" }
urlSub = proc { |match| "#{match}" }
+gforgeTaskSub = proc { |match|
+ match =~ /([0-9]+)/
+ "#{match}"
+}
+gforgeBugSub = proc { |match|
+ match =~ /([0-9]+)/
+ "#{match}"
+}
bugzillaSub = proc { |match|
match =~ /([0-9]+)/
"#{match}"
@@ -544,15 +566,31 @@
match =~ /([0-9]+)/
"#{match}"
}
+issueSub = proc { |match|
+ match =~ /([0-9]+)/
+ "#{match}"
+}
wikiSub = proc { |match|
- match =~ /\[\[(.*)\]\]/
+ match =~ /\[\[(.*?)\]\]/
raw = $1
"[[#{raw}]]"
}
+xplannerIterationSub = proc { |match|
+ match =~ /([0-9]+)/
+ "#{match}"
+}
+xplannerProjectSub = proc { |match|
+ match =~ /([0-9]+)/
+ "#{match}"
+}
+xplannerStorySub = proc { |match|
+ match =~ /([0-9]+)/
+ "#{match}"
+}
commentSubstitutions = {
- '(?:mailto:)?[\w\.\-\+\=]+\@[\w\-]+(?:\.[\w\-]+)+\b' => mailSub,
- '\b(?:http|https|ftp):[^ \t\n<>"]+[\w/]' => urlSub
- }
+ '(?:mailto:)?[\w\.\-\+\=]+\@[\w\-]+(?:\.[\w\-]+)+\b' => mailSub,
+ '\b(?:http|https|ftp):[^ \t\n<>"]+[\w/]' => urlSub
+}
# outputs commit log comment text supplied by LogReader as preformatted HTML
class CommentHandler < LineConsumer
@@ -670,6 +708,12 @@
def diff(file)
'->'
end
+
+ # may be overridden by subclasses that are able to make a hyperlink to a
+ # history log for a file
+ def log(file)
+ ''
+ end
end
# Superclass for objects that can link to CVS frontends on the web (ViewCVS,
@@ -710,6 +754,14 @@
"#{super(file)}"
end
+ def log(file)
+ link = log_url(file)
+ if link
+ return "(log)"
+ end
+ return nil
+ end
+
protected
def add_repo(url)
if @repository_name
@@ -722,6 +774,10 @@
url
end
end
+
+ def log_url(file)
+ nil
+ end
end
# Link to ViewCVS
@@ -745,6 +801,15 @@
def diff_url(file)
add_repo("#{@base_url}#{urlEncode(file.path)}.diff?r1=#{file.fromVer}&r2=#{file.toVer}")
end
+
+ def log_url(file)
+ if file.toVer
+ log_anchor = "#rev#{file.toVer}"
+ else
+ log_anchor = ""
+ end
+ add_repo("#{@base_url}#{urlEncode(file.path)}#{log_anchor}")
+ end
end
# Link to Chora, from the Horde framework
@@ -767,9 +832,9 @@
class CVSwebFrontend < WebFrontend
def path_url(path, tag)
if tag == nil
- add_repo(@base_url + urlEncode(path))
+ add_repo(@base_url + urlEncode(path) + "/")
else
- add_repo("#{@base_url}#{urlEncode(path)}?only_with_tag=#{urlEncode(tag)}")
+ add_repo("#{@base_url}#{urlEncode(path)}/?only_with_tag=#{urlEncode(tag)}")
end
end
@@ -780,9 +845,45 @@
def diff_url(file)
add_repo("#{@base_url}#{urlEncode(file.path)}.diff?r1=text&tr1=#{file.fromVer}&r2=text&tr2=#{file.toVer}&f=h")
end
+
+ protected
+
+ def log_url(file)
+ if file.toVer
+ log_anchor = "#rev#{file.toVer}"
+ else
+ log_anchor = ""
+ end
+ add_repo("#{@base_url}#{urlEncode(file.path)}#{log_anchor}")
+ end
end
+# Link to Trac
+class TracFrontend < WebFrontend
+ def path_url(path, tag)
+ add_repo("#{@base_url}browser/#{urlEncode(path)}")
+ end
+ def version_url(path, version)
+ add_repo("#{@base_url}browser/#{urlEncode(path)}?rev=#{version}")
+ end
+
+ def diff_url(file)
+ add_repo("#{@base_url}changeset/#{file.toVer}")
+ end
+
+ protected
+
+ def log_url(file)
+ if file.toVer
+ log_anchor = "?rev=#{file.toVer}"
+ else
+ log_anchor = ""
+ end
+ add_repo("#{@base_url}log/#{urlEncode(file.path)}#{log_anchor}")
+ end
+end
+
# in need of refactoring...
# Note when LogReader finds record of a file that was added in this commit
@@ -801,6 +902,15 @@
end
end
+# Note when LogReader finds record of a file that was copied in this commit
+class CopiedFileHandler < FileHandler
+ def handleFile(file)
+ file.type="C"
+ file.fromVer=$fromVer
+ file.toVer=$toVer
+ end
+end
+
# Note when LogReader finds record of a file that was modified in this commit
class ModifiedFileHandler < FileHandler
def handleFile(file)
@@ -810,7 +920,16 @@
end
end
+# Note when LogReader finds record of a file whose properties were modified in this commit
+class ModifiedPropsFileHandler < FileHandler
+ def handleFile(file)
+ file.type="P"
+ file.fromVer=$fromVer
+ file.toVer=$toVer
+ end
+end
+
# Used by UnifiedDiffHandler to record the number of added and removed lines
# appearing in a unidiff.
class UnifiedDiffStats
@@ -873,7 +992,10 @@
addInfixSize = line.length - (prefixLen+suffixLen)
oversize_change = deleteInfixSize*100/@lineJustDeleted.length>33 || addInfixSize*100/line.length>33
- if prefixLen==1 && suffixLen==0 || deleteInfixSize<=0 || oversize_change
+ # avoid doing 'within-a-line highlighting' if a multibyte encoding
+ # is suspected, as all the suffix/prefix stuff above is byte, not
+ # character based
+ if multibyte_encoding? || prefixLen==1 && suffixLen==0 || deleteInfixSize<=0 || oversize_change
print(htmlEncode(@lineJustDeleted))
else
print(htmlEncode(@lineJustDeleted[0,prefixLen]))
@@ -905,7 +1027,7 @@
@lineJustDeleted = nil
end
shift(initial)
- if prefixLen==1 && suffixLen==0 || addInfixSize<=0 || oversize_change
+ if multibyte_encoding? || prefixLen==1 && suffixLen==0 || addInfixSize<=0 || oversize_change
encoded = htmlEncode(line)
else
encoded = htmlEncode(line[0,prefixLen]) +
@@ -958,7 +1080,7 @@
end
shift(nil)
if @truncatedLineCount>0
- println("[Note: Some over-long lines of diff output only partialy shown]")
+ println("[Note: Some over-long lines of diff output only partially shown]")
end
end
@@ -976,11 +1098,21 @@
print($frontend.path($file.basedir, $file.tag))
println("
")
println("")
+ when "C"
+ print("")
+ print($frontend.path($file.basedir, $file.tag))
+ println("
")
+ println("")
when "M"
print("")
print($frontend.path($file.basedir, $file.tag))
println("
")
println("")
+ when "P"
+ print("")
+ print($frontend.path($file.basedir, $file.tag))
+ println("
")
+ println("")
end
print("")
lines.each do |line|
@@ -1078,7 +1210,7 @@
@colour.teardown
end
println("") # end of "file" div
- $file.has_diff = true
+ $file.has_diff = true
end
end
end
@@ -1181,7 +1313,7 @@
# an RFC 822 email address
class EmailAddress
- def initialize(text)
+ def initialize(text, charset=nil)
if text =~ /^\s*([^<]+?)\s*<\s*([^>]+?)\s*>\s*$/
@personal_name = $1
@address = $2
@@ -1189,9 +1321,10 @@
@personal_name = nil
@address = text
end
+ @charset=charset
end
- attr_accessor :personal_name, :address
+ attr_accessor :personal_name, :address, :charset
def has_personal_name?
return !@personal_name.nil?
@@ -1222,9 +1355,9 @@
# rfc2047 encode the word, if it contains non-ASCII characters
def encode_word(word)
if $encoder.requires_rfc2047?(word)
- encoded = $encoder.marker_start_quoted
+ encoded = $encoder.marker_start_quoted(@charset)
$encoder.each_char_encoded(word) do |code|
- encoded << code
+ encoded << code
end
encoded << $encoder.marker_end_quoted
return encoded
@@ -1233,26 +1366,40 @@
end
end
+# guess if the users selected encoding is multibyte, since some CVSspam code
+# isn't multibyte-safe, and needs to be disabled.
+def multibyte_encoding?
+ $charset && ["utf-8", "utf-16"].include?($charset.downcase)
+end
cvsroot_dir = "#{ENV['CVSROOT']}/CVSROOT"
$config = "#{cvsroot_dir}/cvsspam.conf"
$users_file = "#{cvsroot_dir}/users"
+$users_file_charset = nil
$debug = false
+$svn = false
$recipients = Array.new
$sendmail_prog = "/usr/sbin/sendmail"
$hostname = ENV['HOSTNAME'] || 'localhost'
$no_removed_file_diff = false
$no_added_file_diff = false
$no_diff = false
-$task_keywords = ['TODO', 'FIXME']
+$task_keywords = ['TODO', 'FIXME', 'FIXIT', 'todo']
$bugzillaURL = nil
+$gforgeBugURL = nil
+$gforgeTaskURL = nil
$wikiURL = nil
$jiraURL = nil
$ticketURL = nil
+$issueURL = nil
$viewcvsURL = nil
+$xplannerIterationURL = nil
+$xplannerProjectURL = nil
+$xplannerStoryURL = nil
$choraURL = nil
$cvswebURL = nil
+$tracURL = nil
$from_address = nil
$subjectPrefix = nil
$files_in_subject = false;
@@ -1261,6 +1408,7 @@
# 2MiB limit on attached diffs,
$mail_size_limit = 1024 * 1024 * 2
$arg_charset = nil
+$cvsroot_email_header = false
require 'getoptlong'
@@ -1268,6 +1416,7 @@
[ "--to", "-t", GetoptLong::REQUIRED_ARGUMENT ],
[ "--config", "-c", GetoptLong::REQUIRED_ARGUMENT ],
[ "--debug", "-d", GetoptLong::NO_ARGUMENT ],
+ [ "--svn", "-s", GetoptLong::NO_ARGUMENT ],
[ "--from", "-u", GetoptLong::REQUIRED_ARGUMENT ],
[ "--charset", GetoptLong::REQUIRED_ARGUMENT ]
)
@@ -1276,6 +1425,7 @@
$recipients << EmailAddress.new(arg) if opt=="--to"
$config = arg if opt=="--config"
$debug = true if opt=="--debug"
+ $svn = true if opt=="--svn"
$from_address = EmailAddress.new(arg) if opt=="--from"
# must use different variable as the config is readed later.
$arg_charset = arg if opt == "--charset"
@@ -1288,7 +1438,7 @@
else
$stderr.puts "missing required file argument"
end
- puts "Usage: cvsspam.rb [ --to ] [ --config ] "
+ puts "Usage: cvsspam.rb [ --svn ] [ --to ] [ --config ] "
exit(-1)
end
@@ -1321,6 +1471,8 @@
blah("Config file '#{$config}' not found, ignoring")
end
+blah("Users file: '#{$users_file}'")
+
unless $arg_charset.nil?
$charset = $arg_charset
end
@@ -1337,6 +1489,9 @@
elsif $cvswebURL !=nil
$cvswebURL << "/" unless $cvswebURL =~ /\/$/
$frontend = CVSwebFrontend.new($cvswebURL)
+elsif $tracURL !=nil
+ $tracURL << "/" unless $tracURL =~ /\/$/
+ $frontend = TracFrontend.new($tracURL)
else
$frontend = NoFrontend.new
end
@@ -1353,33 +1508,57 @@
if $bugzillaURL != nil
- commentSubstitutions['\b[Bb][Uu][Gg]\s*#?[0-9]+'] = bugzillaSub
+ commentSubstitutions['\b[Bb](?:[Uu][Gg])?\s*[#:]?\s*\[?[0-9]+\]?'] = bugzillaSub
end
+if $gforgeBugURL != nil
+ commentSubstitutions['\B\[#[0-9]+\]'] = gforgeBugSub
+end
+if $gforgeTaskURL != nil
+ commentSubstitutions['\B\[[Tt][0-9]+\]'] = gforgeTaskSub
+end
if $jiraURL != nil
commentSubstitutions['\b[a-zA-Z]+-[0-9]+\b'] = jiraSub
end
if $ticketURL != nil
commentSubstitutions['\b[Tt][Ii][Cc][Kk][Ee][Tt]\s*#?[0-9]+\b'] = ticketSub
end
+if $issueURL != nil
+ commentSubstitutions['\b[Ii][Ss][Ss][Uu][Ee]\s*#?[0-9]+\b'] = issueSub
+end
if $wikiURL != nil
commentSubstitutions['\[\[.+\]\]'] = wikiSub
end
+if $xplannerIterationURL != nil
+ commentSubstitutions['\bXI\[?[0-9]+\]?'] = xplannerIterationSub
+end
+if $xplannerProjectURL != nil
+ commentSubstitutions['\bXP\[?[0-9]+\]?'] = xplannerProjectSub
+end
+if $xplannerStoryURL != nil
+ commentSubstitutions['\bXS\[?[0-9]+\]?'] = xplannerStorySub
+end
$commentEncoder = MultiSub.new(commentSubstitutions)
tagHandler = TagHandler.new
-$handlers = Hash[">" => CommentHandler.new,
- "U" => UnifiedDiffHandler.new,
- "T" => tagHandler,
- "A" => AddedFileHandler.new,
- "R" => RemovedFileHandler.new,
- "M" => ModifiedFileHandler.new,
- "V" => VersionHandler.new]
+$handlers = Hash[
+ ">" => CommentHandler.new,
+ "U" => UnifiedDiffHandler.new,
+ "T" => tagHandler,
+ "A" => AddedFileHandler.new,
+ "R" => RemovedFileHandler.new,
+ "C" => CopiedFileHandler.new,
+ "M" => ModifiedFileHandler.new,
+ "P" => ModifiedPropsFileHandler.new,
+ "V" => VersionHandler.new
+]
$handlers["A"].setTagHandler(tagHandler)
$handlers["R"].setTagHandler(tagHandler)
+$handlers["C"].setTagHandler(tagHandler)
$handlers["M"].setTagHandler(tagHandler)
+$handlers["P"].setTagHandler(tagHandler)
$fileEntries = Array.new
$task_list = Array.new
@@ -1404,7 +1583,11 @@
end
if $subjectPrefix == nil
- $subjectPrefix = "[CVS #{Repository.array.join(',')}]"
+ if $svn
+ $subjectPrefix = "[SVN #{Repository.array.join(',')}]"
+ else
+ $subjectPrefix = "[CVS #{Repository.array.join(',')}]"
+ end
end
if $files_in_subject
@@ -1451,6 +1634,8 @@
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
+ #copied {background-color:#ccccff;}
+ tr.alt #copied {background-color:#bbbbf7;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
@@ -1483,7 +1668,9 @@
filesAdded = 0
filesRemoved = 0
+ filesCopied = 0
filesModified = 0
+ filesModifiedProps = 0
totalLinesAdded = 0
totalLinesRemoved = 0
file_count = 0
@@ -1492,24 +1679,26 @@
$fileEntries.each do |file|
unless file.repository == last_repository
last_repository = file.repository
- mail.print("| ")
+ mail.print(" |
| ")
if last_repository.has_multiple_tags
mail.print("Mixed-tag commit")
else
mail.print("Commit")
end
mail.print(" in #{htmlEncode(last_repository.common_prefix)}")
- if last_repository.trunk_only?
- mail.print(" on MAIN")
- else
- mail.print(" on ")
- tagCount = 0
- last_repository.each_tag do |tag|
- tagCount += 1
- if tagCount > 1
- mail.print tagCount on MAIN")
+ else
+ mail.print(" on ")
+ tagCount = 0
+ last_repository.each_tag do |tag|
+ tagCount += 1
+ if tagCount > 1
+ mail.print tagCountMAIN"
end
- mail.print tag ? htmlEncode(tag) : "MAIN"
end
end
mail.puts(" |
")
@@ -1524,8 +1713,12 @@
filesAdded += 1
elsif file.removal?
filesRemoved += 1
+ elsif file.copied?
+ filesCopied += 1
elsif file.modification?
filesModified += 1
+ elsif file.modifiedprops?
+ filesModifiedProps += 1
end
name = htmlEncode(file.name_after_common_prefix)
slashPos = name.rindex("/")
@@ -1545,17 +1738,29 @@
name = "#{name}"
elsif file.removal?
name = "#{name}"
+ elsif file.copied?
+ name = "#{name}"
end
+ mail.print("")
if file.has_diff?
- mail.print(" | #{prefix}#{name} | ")
+ mail.print("#{prefix}#{name}")
else
- mail.print("#{prefix}#{name} | ")
+ mail.print("#{prefix}#{name}")
end
- if file.isEmpty
- mail.print("[empty] | ")
+ mail.print(" #{$frontend.log(file)}")
+ mail.print("")
+ if file.copied?
+ mail.print("[copied] | ")
+ elsif file.isEmpty
+ mail.print("[empty] | ")
elsif file.isBinary
- mail.print("[binary] | ")
+ mail.print("[binary] | ")
else
+ if file.modifiedprops?
+ mail.print("[props] | ")
+ else
+ mail.print(" | ")
+ end
if file.lineAdditions>0
totalLinesAdded += file.lineAdditions
mail.print("+#{file.lineAdditions} | ")
@@ -1582,15 +1787,19 @@
mail.print("added #{$frontend.version(file.path,file.toVer)} | ")
elsif file.removal?
mail.print("#{$frontend.version(file.path,file.fromVer)} removed | ")
+ elsif file.copied?
+ mail.print("#{$frontend.version(file.path,file.fromVer)} #{$frontend.diff(file)} #{$frontend.version(file.path,file.toVer)} | ")
elsif file.modification?
mail.print("#{$frontend.version(file.path,file.fromVer)} #{$frontend.diff(file)} #{$frontend.version(file.path,file.toVer)} | ")
+ elsif file.modifiedprops?
+ mail.print("#{$frontend.version(file.path,file.fromVer)} #{$frontend.diff(file)} #{$frontend.version(file.path,file.toVer)} | ")
end
mail.puts("")
end
if $fileEntries.size>1 && (totalLinesAdded+totalLinesRemoved)>0
# give total number of lines added/removed accross all files
- mail.print(" | ")
+ mail.print("
| | ")
if totalLinesAdded>0
mail.print("+#{totalLinesAdded} | ")
else
@@ -1607,7 +1816,7 @@
mail.puts("")
- totalFilesChanged = filesAdded+filesRemoved+filesModified
+ totalFilesChanged = filesAdded+filesRemoved+filesCopied+filesModified+filesModifiedProps
if totalFilesChanged > 1
mail.print("")
changeKind = 0
@@ -1620,11 +1829,21 @@
mail.print("#{filesRemoved} removed")
changeKind += 1
end
+ if filesCopied>0
+ mail.print(" + ") if changeKind>0
+ mail.print("#{filesCopied} copied")
+ changeKind += 1
+ end
if filesModified>0
mail.print(" + ") if changeKind>0
mail.print("#{filesModified} modified")
changeKind += 1
end
+ if filesModifiedProps>0
+ mail.print(" + ") if changeKind>0
+ mail.print("#{filesModifiedProps} modified properties")
+ changeKind += 1
+ end
mail.print(", total #{totalFilesChanged}") if changeKind > 1
mail.puts(" files
")
end
@@ -1667,12 +1886,13 @@
# CVSROOT/users file, if the file exists. The argument is returned unchanged
# if no alias is found.
def sender_alias(email)
+ blah("Lookup '#{email}' from users file")
if File.exists?($users_file)
File.open($users_file) do |io|
io.each_line do |line|
if line =~ /^([^:]+)\s*:\s*(['"]?)([^\n\r]+)(\2)/
if email.address == $1
- return EmailAddress.new($3)
+ return EmailAddress.new($3, $users_file_charset)
end
end
end
@@ -1686,6 +1906,8 @@
# sensible header formatting, and for ensuring that the body is seperated
# from the message headers by a blank line (as it is required to be).
class MailContext
+ ENCODE_HEADERS = ["Subject", "X-CVSspam-Module-Path"]
+
def initialize(io)
@done_headers = false
@io = io
@@ -1695,8 +1917,8 @@
# called
def header(name, value)
raise "headers already commited" if @done_headers
- if name == "Subject"
- $encoder.encode_header(@io, "Subject", value)
+ if ENCODE_HEADERS.include?(name)
+ $encoder.encode_header(@io, name, value)
else
@io.puts("#{name}: #{value}")
end
@@ -1769,7 +1991,7 @@
ctx.header("To", recipients.map{|addr| addr.encoded}.join(','))
blah("Mail From: <#{from}>")
ctx.header("From", from.encoded) if from
- ctx.header("Date", Time.now.utc.strftime(DATE_HEADER_FORMAT))
+ ctx.header("Date", Time.now.rfc2822)
yield ctx
end
end
@@ -1800,10 +2022,10 @@
return unless $fileEntries.length == 1
file = $fileEntries[0]
name = zap_header_special_chars(file.path)
- unless file.fromVer == "NONE"
+ if file.fromVer
mail.header("References", make_msg_id("#{name}.#{file.fromVer}", $hostname))
end
- unless file.toVer == "NONE"
+ if file.toVer
mail.header("Message-ID", make_msg_id("#{name}.#{file.toVer}", $hostname))
end
end
@@ -1834,8 +2056,18 @@
end
end
mail.header("X-Mailer", "CVSspam #{$version} ")
+ if $cvsroot_email_header
+ mod = '/'
+ if Repository.count == 1
+ rep = Repository.array.first
+ mod << rep.common_prefix
+ end
+ mail.header("X-CVSspam-Module-Path", mod)
+ end
mail.body do |body|
make_html_email(body)
end
end
+
+# vim:et:ts=2:sw=2
Property changes on: testcases/data/remove.png
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: testcases/data/fiddlyedits.after
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: testcases/data/fiddlyedits.before
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: testcases/data/add.png
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: testcases/README
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: .
___________________________________________________________________
Added: svn:ignore
+ .project