jro_apps/redmine Commit - r9183:b96710fb57ac

fix source indents of lib/diff.rb...

Toshi MARUYAMA -

r9183:b96710fb57ac

parent child

Context file:

r9183:b96710fb57ac

Collapse all files

lib/diff.rb +49 -49

                     next unless bmatches.has_key? aelem
                     k = nil
                     bmatches[aelem].reverse.each { |bindex|
-                if k && (thresh[k] > bindex) && (thresh[k-1] < bindex)
+                      if k && (thresh[k] > bindex) && (thresh[k-1] < bindex)
-                  thresh[k] = bindex
+                        thresh[k] = bindex
-                else
+                      else
-                  k = thresh.replacenextlarger(bindex, k)
+                        k = thresh.replacenextlarger(bindex, k)
-                end
+                      end
-                links[k] = [ (k==0) ? nil : links[k-1], aindex, bindex ] if k
+                      links[k] = [ (k==0) ? nil : links[k-1], aindex, bindex ] if k
                     }
                   }
                   if !thresh.empty?
                     link = links[thresh.length-1]
                     while link
-                mvector[link[1]] = link[2]
+                      mvector[link[1]] = link[2]
-                link = link[0]
+                      link = link[0]
                     end
                   end
                   while ai < mvector.length
                     bline = mvector[ai]
                     if bline
-                while bi < bline
+                      while bi < bline
-                  discardb(bi, b[bi])
+                        discardb(bi, b[bi])
-                  bi += 1
+                        bi += 1
-                end
+                      end
-                match(ai, bi)
+                      match(ai, bi)
-                bi += 1
+                      bi += 1
                     else
-                discarda(ai, a[ai])
+                      discarda(ai, a[ai])
                     end
                     ai += 1
                   end
                     i = 0
                     curdiff = []
                     while i < df.length
-                whot = df[i][0]
+                      whot = df[i][0]
-                s = @isstring ? df[i][2].chr : [df[i][2]]
+                      s = @isstring ? df[i][2].chr : [df[i][2]]
-                p = df[i][1]
+                      p = df[i][1]
-                last = df[i][1]
+                      last = df[i][1]
-                i += 1
+                      i += 1
-                while df[i] && df[i][0] == whot && df[i][1] == last+1
+                      while df[i] && df[i][0] == whot && df[i][1] == last+1
-                  s << df[i][2]
+                        s << df[i][2]
-                  last  = df[i][1]
+                        last  = df[i][1]
-                  i += 1
+                        i += 1
-                end
+                      end
-                curdiff.push [whot, p, s]
+                      curdiff.push [whot, p, s]
                     end
                     diffs.push curdiff
                   }
                 range.each { |i|
                   elem = self[i]
                   if revmap.has_key? elem
-              revmap[elem].push i
+                    revmap[elem].push i
                   else
-              revmap[elem] = [i]
+                    revmap[elem] = [i]
                   end
                 }
                 return revmap
                   found = self[index]
                   return nil if value == found
                   if value > found
-              low = index + 1
+                    low = index + 1
                   else
-              high = index
+                    high = index
                   end
                 end
                 bi = 0
                 diff.diffs.each { |d|
                   d.each { |mod|
-              case mod[0]
+                    case mod[0]
-              when '-'
+                    when '-'
-                while ai < mod[1]
+                      while ai < mod[1]
-                  newary << self[ai]
+                        newary << self[ai]
-                  ai += 1
+                        ai += 1
-                  bi += 1
+                        bi += 1
-                end
+                      end
-                ai += 1
+                      ai += 1
-              when '+'
+                    when '+'
-                while bi < mod[1]
+                      while bi < mod[1]
-                  newary << self[ai]
+                        newary << self[ai]
-                  ai += 1
+                        ai += 1
-                  bi += 1
+                        bi += 1
-                end
+                      end
-                newary << mod[2]
+                      newary << mod[2]
-                bi += 1
+                      bi += 1
-              else
+                    else
-                raise "Unknown diff action"
+                      raise "Unknown diff action"
-              end
+                    end
                   }
                 }
                 while ai < self.length

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages