Commit 0b760212 authored by Toshi MARUYAMA's avatar Toshi MARUYAMA Committed by Eric Davis

scm: git: code clean up adapter.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5034 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 38bfb7da
...@@ -172,7 +172,6 @@ module Redmine ...@@ -172,7 +172,6 @@ module Redmine
files=[] files=[]
changeset = {} changeset = {}
parsing_descr = 0 #0: not parsing desc or files, 1: parsing desc, 2: parsing files parsing_descr = 0 #0: not parsing desc or files, 1: parsing desc, 2: parsing files
revno = 1
io.each_line do |line| io.each_line do |line|
if line =~ /^commit ([0-9a-f]{40})$/ if line =~ /^commit ([0-9a-f]{40})$/
...@@ -195,7 +194,6 @@ module Redmine ...@@ -195,7 +194,6 @@ module Redmine
end end
changeset = {} changeset = {}
files = [] files = []
revno = revno + 1
end end
changeset[:commit] = $1 changeset[:commit] = $1
elsif (parsing_descr == 0) && line =~ /^(\w+):\s*(.*)$/ elsif (parsing_descr == 0) && line =~ /^(\w+):\s*(.*)$/
...@@ -210,16 +208,16 @@ module Redmine ...@@ -210,16 +208,16 @@ module Redmine
parsing_descr = 1 parsing_descr = 1
changeset[:description] = "" changeset[:description] = ""
elsif (parsing_descr == 1 || parsing_descr == 2) \ elsif (parsing_descr == 1 || parsing_descr == 2) \
&& line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\t(.+)$/ && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\t(.+)$/
parsing_descr = 2 parsing_descr = 2
fileaction = $1 fileaction = $1
filepath = $2 filepath = $2
files << {:action => fileaction, :path => filepath} files << {:action => fileaction, :path => filepath}
elsif (parsing_descr == 1 || parsing_descr == 2) \ elsif (parsing_descr == 1 || parsing_descr == 2) \
&& line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\d+\s+(\S+)\t(.+)$/ && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\d+\s+(\S+)\t(.+)$/
parsing_descr = 2 parsing_descr = 2
fileaction = $1 fileaction = $1
filepath = $3 filepath = $3
files << {:action => fileaction, :path => filepath} files << {:action => fileaction, :path => filepath}
elsif (parsing_descr == 1) && line.chomp.to_s == "" elsif (parsing_descr == 1) && line.chomp.to_s == ""
parsing_descr = 2 parsing_descr = 2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment