From c28b044d6802559a9a2a07af1b7661a1122e5f48 Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Sat, 15 Aug 2009 22:41:40 +0000
Subject: [PATCH] Added branch and tag support to the git repository viewer.
 (#1406)

Many thanks to Adam Soltys and everyone else who tested this patch.

* Updated git test repository so it has a branch with some differences from the master branch
* Moved redmine diff class into a module so as not to clash with diff-lcs gem which is required by grit
* Find changesets from all branches, not just master
* Got revision browsing working
* Got file actions working properly
* Allow browsing by short form of commit identifier
* Added a method to retrieve repository branches
* Allow browsing by branch names as well as commit numbers
* Handle the case where a git repository has no master branch
* Expand revision box and handle finding revisions by first 8 characters
* Added branches dropdown to repository show page
* Combined repository browse and show into a single action.  Moved branch/revision navigation into a partial.
* Renamed partial navigation -> breadcrumbs
* Made it so latest revisions list uses branch and path context
* Preserve current path when changing branch or revision
* Perform slightly more graceful error handling in the case of invalid repository URLs
* Allow branch names to contain periods
* Allow dashes in branch names
* Sort branches by name
* Adding tags dropdown
* Need to disable both branches and tags dropdowns before submitting revision form
* Support underscores in revision (branch/tag) names
* Making file history sensitive to current branch/tag/revision, adding common navigation to changes page
* Updated translation files to include labels for 'branch', 'tag', and 'view all revisions'
* Reenable fields after submit so they don't look disabled and don't stay disabled on browser back button
* Instead of dashes just use empty string for default dropdown value
* Individual entry views now sport the upgraded revision navigation
* Don't display dropdowns with no entries
* Consider all revisions when doing initial load
* Fixed bug grabbing changesets.  Thanks to Bernhard Furtmueller for catching.
* Always check the entire log to find new revisions, rather than trying to go forward from the latest known one
* Added some cleverness to avoid selecting the whole changesets table any time someone views the repository root
* File copies and renames being detected properly
* Return gracefully if no revisions are found in the git log
* Applied patch from Babar Le Lapin to improve Windows compatibility

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2840 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/repositories_controller.rb    |  28 +-
 app/models/repository.rb                      |  18 +-
 app/models/repository/git.rb                  |  83 +++--
 app/views/repositories/_breadcrumbs.rhtml     |  21 ++
 .../repositories/_dir_list_content.rhtml      |   4 +-
 app/views/repositories/_navigation.rhtml      |  36 +-
 app/views/repositories/annotate.rhtml         |   8 +-
 app/views/repositories/browse.rhtml           |   6 +-
 app/views/repositories/changes.rhtml          |  10 +-
 app/views/repositories/entry.rhtml            |   8 +-
 app/views/repositories/revision.rhtml         |   2 +-
 app/views/repositories/revisions.rhtml        |   2 +-
 app/views/repositories/show.rhtml             |  13 +-
 config/locales/bg.yml                         |   3 +
 config/locales/bs.yml                         |   3 +
 config/locales/ca.yml                         |   3 +
 config/locales/cs.yml                         |   3 +
 config/locales/da.yml                         |   3 +
 config/locales/de.yml                         |   3 +
 config/locales/en.yml                         |   3 +
 config/locales/es.yml                         |   3 +
 config/locales/fi.yml                         |   3 +
 config/locales/fr.yml                         |   5 +-
 config/locales/gl.yml                         |   3 +
 config/locales/he.yml                         |   3 +
 config/locales/hu.yml                         |   3 +
 config/locales/it.yml                         |   3 +
 config/locales/ja.yml                         |   3 +
 config/locales/ko.yml                         |   3 +
 config/locales/lt.yml                         |   3 +
 config/locales/nl.yml                         |   3 +
 config/locales/no.yml                         |   3 +
 config/locales/pl.yml                         |   3 +
 config/locales/pt-BR.yml                      |   3 +
 config/locales/pt.yml                         |   3 +
 config/locales/ro.yml                         |   3 +
 config/locales/ru.yml                         |   3 +
 config/locales/sk.yml                         |   5 +-
 config/locales/sl.yml                         |   3 +
 config/locales/sr.yml                         |   3 +
 config/locales/sv.yml                         |   3 +
 config/locales/th.yml                         |   3 +
 config/locales/tr.yml                         |   3 +
 config/locales/uk.yml                         |   3 +
 config/locales/vi.yml                         |   3 +
 config/locales/zh-TW.yml                      |   3 +
 config/locales/zh.yml                         |   3 +
 config/routes.rb                              |   2 +-
 lib/diff.rb                                   | 350 +++++++++---------
 lib/redmine/scm/adapters/abstract_adapter.rb  |  33 +-
 lib/redmine/scm/adapters/git_adapter.rb       | 207 +++++------
 public/javascripts/repository_navigation.js   |  35 ++
 public/stylesheets/application.css            |   2 +-
 .../repositories/git_repository.tar.gz        | Bin 12445 -> 17716 bytes
 .../repositories_bazaar_controller_test.rb    |  14 +-
 .../repositories_cvs_controller_test.rb       |  14 +-
 .../repositories_darcs_controller_test.rb     |  12 +-
 .../repositories_git_controller_test.rb       |  41 +-
 .../repositories_mercurial_controller_test.rb |  20 +-
 ...repositories_subversion_controller_test.rb |  14 +-
 test/unit/git_adapter_test.rb                 |  22 ++
 test/unit/repository_git_test.rb              |   8 +-
 62 files changed, 689 insertions(+), 430 deletions(-)
 create mode 100644 app/views/repositories/_breadcrumbs.rhtml
 create mode 100644 public/javascripts/repository_navigation.js
 create mode 100644 test/unit/git_adapter_test.rb

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 201845fa5..bddaa77d8 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -64,31 +64,26 @@ class RepositoriesController < ApplicationController
     redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'repository'
   end
   
-  def show
-    # check if new revisions have been committed in the repository
-    @repository.fetch_changesets if Setting.autofetch_changesets?
-    # root entries
-    @entries = @repository.entries('', @rev)    
-    # latest changesets
-    @changesets = @repository.changesets.find(:all, :limit => 10, :order => "committed_on DESC")
-    show_error_not_found unless @entries || @changesets.any?
-  end
-  
-  def browse
+  def show 
+    @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty?
+
     @entries = @repository.entries(@path, @rev)
     if request.xhr?
       @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
     else
       show_error_not_found and return unless @entries
+      @changesets = @repository.latest_changesets(@path, @rev)
       @properties = @repository.properties(@path, @rev)
-      render :action => 'browse'
+      render :action => 'show'
     end
   end
+
+  alias_method :browse, :show
   
   def changes
     @entry = @repository.entry(@path, @rev)
     show_error_not_found and return unless @entry
-    @changesets = @repository.changesets_for_path(@path, :limit => Setting.repository_log_display_limit.to_i)
+    @changesets = @repository.latest_changesets(@path, @rev, Setting.repository_log_display_limit.to_i)
     @properties = @repository.properties(@path, @rev)
   end
   
@@ -135,7 +130,7 @@ class RepositoriesController < ApplicationController
   end
   
   def revision
-    @changeset = @repository.changesets.find_by_revision(@rev)
+    @changeset = @repository.changesets.find(:first, :conditions => ["revision LIKE ?", @rev + '%'])
     raise ChangesetNotFound unless @changeset
 
     respond_to do |format|
@@ -199,17 +194,14 @@ private
     render_404
   end
   
-  REV_PARAM_RE = %r{^[a-f0-9]*$}
-  
   def find_repository
     @project = Project.find(params[:id])
     @repository = @project.repository
     render_404 and return false unless @repository
     @path = params[:path].join('/') unless params[:path].nil?
     @path ||= ''
-    @rev = params[:rev]
+    @rev = params[:rev].blank? ? @repository.default_branch : params[:rev].strip
     @rev_to = params[:rev_to]
-    raise InvalidRevisionParam unless @rev.to_s.match(REV_PARAM_RE) && @rev.to_s.match(REV_PARAM_RE)
   rescue ActiveRecord::RecordNotFound
     render_404
   rescue InvalidRevisionParam
diff --git a/app/models/repository.rb b/app/models/repository.rb
index bf181bfad..860395b5c 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -62,6 +62,18 @@ class Repository < ActiveRecord::Base
   def entries(path=nil, identifier=nil)
     scm.entries(path, identifier)
   end
+
+  def branches
+    scm.branches
+  end
+
+  def tags
+    scm.tags
+  end
+
+  def default_branch
+    scm.default_branch
+  end
   
   def properties(path, identifier=nil)
     scm.properties(path, identifier)
@@ -92,11 +104,15 @@ class Repository < ActiveRecord::Base
   def latest_changeset
     @latest_changeset ||= changesets.find(:first)
   end
+
+  def latest_changesets(path,rev,limit=10)
+    @latest_changesets ||= changesets.find(:all, limit, :order => "committed_on DESC")
+  end
     
   def scan_changesets_for_issue_ids
     self.changesets.each(&:scan_comment_for_issue_ids)
   end
-  
+
   # Returns an array of committers usernames and associated user_id
   def committers
     @committers ||= Changeset.connection.select_rows("SELECT DISTINCT committer, user_id FROM #{Changeset.table_name} WHERE repository_id = #{id}")
diff --git a/app/models/repository/git.rb b/app/models/repository/git.rb
index f721b938f..b3cdf3643 100644
--- a/app/models/repository/git.rb
+++ b/app/models/repository/git.rb
@@ -29,43 +29,60 @@ class Repository::Git < Repository
     'Git'
   end
 
+  def branches
+    scm.branches
+  end
+
+  def tags
+    scm.tags
+  end
+
   def changesets_for_path(path, options={})
-    Change.find(:all, :include => {:changeset => :user}, 
-                :conditions => ["repository_id = ? AND path = ?", id, path],
-                :order => "committed_on DESC, #{Changeset.table_name}.revision DESC",
-                :limit => options[:limit]).collect(&:changeset)
+    Change.find(
+      :all, 
+      :include => {:changeset => :user}, 
+      :conditions => ["repository_id = ? AND path = ?", id, path],
+      :order => "committed_on DESC, #{Changeset.table_name}.revision DESC",
+      :limit => options[:limit]
+    ).collect(&:changeset)
   end
 
+  # With SCM's that have a sequential commit numbering, redmine is able to be
+  # clever and only fetch changesets going forward from the most recent one
+  # it knows about.  However, with git, you never know if people have merged
+  # commits into the middle of the repository history, so we always have to
+  # parse the entire log.
   def fetch_changesets
-    scm_info = scm.info
-    if scm_info
-      # latest revision found in database
-      db_revision = latest_changeset ? latest_changeset.revision : nil
-      # latest revision in the repository
-      scm_revision = scm_info.lastrev.scmid
+    # Save ourselves an expensive operation if we're already up to date
+    return if scm.num_revisions == changesets.count
+
+    revisions = scm.revisions('', nil, nil, :all => true)
+    return if revisions.nil? || revisions.empty?
+
+    # Find revisions that redmine knows about already
+    existing_revisions = changesets.find(:all).map!{|c| c.scmid}
+
+    # Clean out revisions that are no longer in git
+    Changeset.delete_all(["scmid NOT IN (?) AND repository_id = (?)", revisions.map{|r| r.scmid}, self.id])
+
+    # Subtract revisions that redmine already knows about
+    revisions.reject!{|r| existing_revisions.include?(r.scmid)}
+
+    # Save the remaining ones to the database
+    revisions.each{|r| r.save(self)} unless revisions.nil?
+  end
+
+  def latest_changesets(path,rev,limit=10)
+    revisions = scm.revisions(path, nil, rev, :limit => limit, :all => false)
+    return [] if revisions.nil? || revisions.empty?
 
-      unless changesets.find_by_scmid(scm_revision)
-        scm.revisions('', db_revision, nil, :reverse => true) do |revision|
-          if changesets.find_by_scmid(revision.scmid.to_s).nil?
-            transaction do
-              changeset = Changeset.create!(:repository => self,
-                                           :revision => revision.identifier,
-                                           :scmid => revision.scmid,
-                                           :committer => revision.author, 
-                                           :committed_on => revision.time,
-                                           :comments => revision.message)
-              
-              revision.paths.each do |change|
-                Change.create!(:changeset => changeset,
-                              :action => change[:action],
-                              :path => change[:path],
-                              :from_path => change[:from_path],
-                              :from_revision => change[:from_revision])
-              end
-            end
-          end
-        end
-      end
-    end
+    changesets.find(
+      :all, 
+      :conditions => [
+        "scmid IN (?)", 
+        revisions.map!{|c| c.scmid}
+      ],
+      :order => 'committed_on DESC'
+    )
   end
 end
diff --git a/app/views/repositories/_breadcrumbs.rhtml b/app/views/repositories/_breadcrumbs.rhtml
new file mode 100644
index 000000000..42d11e1a4
--- /dev/null
+++ b/app/views/repositories/_breadcrumbs.rhtml
@@ -0,0 +1,21 @@
+<%= link_to 'root', :action => 'show', :id => @project, :path => '', :rev => @rev %>
+<% 
+dirs = path.split('/')
+if 'file' == kind
+    filename = dirs.pop
+end
+link_path = ''
+dirs.each do |dir|
+    next if dir.blank?
+    link_path << '/' unless link_path.empty?
+    link_path << "#{dir}" 
+    %>
+    / <%= link_to h(dir), :action => 'show', :id => @project, :path => to_path_param(link_path), :rev => @rev %>
+<% end %>
+<% if filename %>
+    / <%= link_to h(filename), :action => 'changes', :id => @project, :path => to_path_param("#{link_path}/#{filename}"), :rev => @rev %>
+<% end %>
+
+<%= "@ #{revision}" if revision %>
+
+<% html_title(with_leading_slash(path)) -%>
diff --git a/app/views/repositories/_dir_list_content.rhtml b/app/views/repositories/_dir_list_content.rhtml
index bcffed4a5..8b6a067b3 100644
--- a/app/views/repositories/_dir_list_content.rhtml
+++ b/app/views/repositories/_dir_list_content.rhtml
@@ -4,7 +4,7 @@
 <tr id="<%= tr_id %>" class="<%= params[:parent_id] %> entry <%= entry.kind %>">
 <td style="padding-left: <%=18 * depth%>px;" class="filename">
 <% if entry.is_dir? %>
-<span class="expander" onclick="<%=  remote_function :url => {:action => 'browse', :id => @project, :path => to_path_param(entry.path), :rev => @rev, :depth => (depth + 1), :parent_id => tr_id},
+<span class="expander" onclick="<%=  remote_function :url => {:action => 'show', :id => @project, :path => to_path_param(entry.path), :rev => @rev, :depth => (depth + 1), :parent_id => tr_id},
 									:method => :get,
                   :update => { :success => tr_id },
                   :position => :after,
@@ -12,7 +12,7 @@
                   :condition => "scmEntryClick('#{tr_id}')"%>">&nbsp</span>
 <% end %>
 <%=  link_to h(entry.name),
-          {:action => (entry.is_dir? ? 'browse' : 'changes'), :id => @project, :path => to_path_param(entry.path), :rev => @rev},
+          {:action => (entry.is_dir? ? 'show' : 'changes'), :id => @project, :path => to_path_param(entry.path), :rev => @rev},
           :class => (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(entry.name)}")%>
 </td>
 <td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
diff --git a/app/views/repositories/_navigation.rhtml b/app/views/repositories/_navigation.rhtml
index 25a15f496..d1417a61c 100644
--- a/app/views/repositories/_navigation.rhtml
+++ b/app/views/repositories/_navigation.rhtml
@@ -1,21 +1,21 @@
-<%= link_to 'root', :action => 'browse', :id => @project, :path => '', :rev => @rev %>
-<% 
-dirs = path.split('/')
-if 'file' == kind
-    filename = dirs.pop
-end
-link_path = ''
-dirs.each do |dir|
-    next if dir.blank?
-    link_path << '/' unless link_path.empty?
-    link_path << "#{dir}" 
-    %>
-    / <%= link_to h(dir), :action => 'browse', :id => @project, :path => to_path_param(link_path), :rev => @rev %>
-<% end %>
-<% if filename %>
-    / <%= link_to h(filename), :action => 'changes', :id => @project, :path => to_path_param("#{link_path}/#{filename}"), :rev => @rev %>
+<% content_for :header_tags do %>
+  <%= javascript_include_tag 'repository_navigation' %>
 <% end %>
 
-<%= "@ #{revision}" if revision %>
+<%= link_to l(:label_statistics), {:action => 'stats', :id => @project}, :class => 'icon icon-stats' %>
+
+<% form_tag({:action => controller.action_name, :id => @project, :path => @path, :rev => ''}, {:method => :get, :id => 'revision_selector'}) do -%>
+  <!-- Branches Dropdown -->
+  <% if !@repository.branches.nil? && @repository.branches.length > 0 -%>
+    | <%= l(:label_branch) %>: 
+    <%= select_tag :branch, options_for_select([''] + @repository.branches,@rev), :id => 'branch' %>
+  <% end -%>
+
+  <% if !@repository.tags.nil? && @repository.tags.length > 0 -%>
+    | <%= l(:label_tag) %>: 
+    <%= select_tag :tag, options_for_select([''] + @repository.tags,@rev), :id => 'tag' %>
+  <% end -%>
 
-<% html_title(with_leading_slash(path)) -%>
+  | <%= l(:label_revision) %>: 
+  <%= text_field_tag 'rev', @rev, :size => 8 %>
+<% end -%>
diff --git a/app/views/repositories/annotate.rhtml b/app/views/repositories/annotate.rhtml
index d0fb8cbf9..fd4d63f3a 100644
--- a/app/views/repositories/annotate.rhtml
+++ b/app/views/repositories/annotate.rhtml
@@ -1,4 +1,10 @@
-<h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
+<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
+
+<div class="contextual">
+  <%= render :partial => 'navigation' %>
+</div>
+
+<h2><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
 
 <p><%= render :partial => 'link_to_functions' %></p>
 
diff --git a/app/views/repositories/browse.rhtml b/app/views/repositories/browse.rhtml
index 3bf320cef..fc769aa22 100644
--- a/app/views/repositories/browse.rhtml
+++ b/app/views/repositories/browse.rhtml
@@ -1,10 +1,8 @@
 <div class="contextual">
-<% form_tag({}, :method => :get) do %>
-<%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
-<% end %>
+<%= render :partial => 'navigation' %>
 </div>
 
-<h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'dir', :revision => @rev } %></h2>
+<h2><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'dir', :revision => @rev } %></h2>
 
 <%= render :partial => 'dir_list' %>
 <%= render_properties(@properties) %>
diff --git a/app/views/repositories/changes.rhtml b/app/views/repositories/changes.rhtml
index aa359ef4d..3d4c7a96b 100644
--- a/app/views/repositories/changes.rhtml
+++ b/app/views/repositories/changes.rhtml
@@ -1,4 +1,12 @@
-<h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => (@entry ? @entry.kind : nil), :revision => @rev } %></h2>
+<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
+
+<div class="contextual">
+  <%= render :partial => 'navigation' %>
+</div>
+
+<h2>
+  <%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => (@entry ? @entry.kind : nil), :revision => @rev } %>
+</h2>
 
 <p><%= render :partial => 'link_to_functions' %></p>
 
diff --git a/app/views/repositories/entry.rhtml b/app/views/repositories/entry.rhtml
index 12ba9f428..1e198806d 100644
--- a/app/views/repositories/entry.rhtml
+++ b/app/views/repositories/entry.rhtml
@@ -1,4 +1,10 @@
-<h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
+<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
+
+<div class="contextual">
+  <%= render :partial => 'navigation' %>
+</div>
+
+<h2><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
 
 <p><%= render :partial => 'link_to_functions' %></p>
 
diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml
index b60b2a22a..f992f046d 100644
--- a/app/views/repositories/revision.rhtml
+++ b/app/views/repositories/revision.rhtml
@@ -14,7 +14,7 @@
   &#187;&nbsp;
 
   <% form_tag({:controller => 'repositories', :action => 'revision', :id => @project, :rev => nil}, :method => :get) do %>
-    <%= text_field_tag 'rev', @rev, :size => 5 %>
+    <%= text_field_tag 'rev', @rev[0,8], :size => 8 %>
     <%= submit_tag 'OK', :name => nil %>
   <% end %>
 </div>
diff --git a/app/views/repositories/revisions.rhtml b/app/views/repositories/revisions.rhtml
index c06c204cd..255cb6221 100644
--- a/app/views/repositories/revisions.rhtml
+++ b/app/views/repositories/revisions.rhtml
@@ -1,6 +1,6 @@
 <div class="contextual">
 <% form_tag({:action => 'revision', :id => @project}) do %>
-<%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
+<%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 8 %>
 <%= submit_tag 'OK' %>
 <% end %>
 </div>
diff --git a/app/views/repositories/show.rhtml b/app/views/repositories/show.rhtml
index a0f7dc33c..aae6571f0 100644
--- a/app/views/repositories/show.rhtml
+++ b/app/views/repositories/show.rhtml
@@ -1,15 +1,10 @@
-<div class="contextual">
 <%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
-<%= link_to l(:label_statistics), {:action => 'stats', :id => @project}, :class => 'icon icon-stats' %>
 
-<% if !@entries.nil? && authorize_for('repositories', 'browse') -%>
-<% form_tag({:action => 'browse', :id => @project}, :method => :get) do -%>
-| <%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
-<% end -%>
-<% end -%>
+<div class="contextual">
+  <%= render :partial => 'navigation' %>
 </div>
 
-<h2><%= l(:label_repository) %> (<%= @repository.scm_name %>)</h2>
+<h2><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'dir', :revision => @rev } %></h2>
 
 <% if !@entries.nil? && authorize_for('repositories', 'browse') %>
 <%= render :partial => 'dir_list' %>
@@ -18,7 +13,7 @@
 <% if !@changesets.empty? && authorize_for('repositories', 'revisions') %>
 <h3><%= l(:label_latest_revision_plural) %></h3>
 <%= render :partial => 'revisions', :locals => {:project => @project, :path => '', :revisions => @changesets, :entry => nil }%>
-<p><%= link_to l(:label_view_revisions), :action => 'revisions', :id => @project %></p>
+<p><%= link_to l(:label_view_all_revisions), :action => 'revisions', :id => @project %></p>
 <% content_for :header_tags do %>
   <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :action => 'revisions', :id => @project, :page => nil, :key => User.current.rss_key})) %>
 <% end %>
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 87ed7c037..a683f875b 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -798,3 +798,6 @@ bg:
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 2f8d94512..d78e61140 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -831,3 +831,6 @@ bs:
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 499001dee..049f734bc 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -801,3 +801,6 @@ ca:
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 7444da07a..4e1afa6f1 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -804,3 +804,6 @@ cs:
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 99b47599c..f438805a8 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -831,3 +831,6 @@ da:
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 6969d7a60..14dab4071 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -830,3 +830,6 @@ de:
   mail_body_wiki_content_updated: "Die Wiki-Seite '{{page}}' wurde von {{author}} aktualisiert."
   permission_add_project: Erstelle Projekt
   setting_new_project_user_role_id: Rolle einem Nicht-Administrator zugeordnet, welcher ein Projekt erstellt
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 459a34ef4..b907a56b4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -543,6 +543,8 @@ en:
   label_browse: Browse
   label_modification: "{{count}} change"
   label_modification_plural: "{{count}} changes"
+  label_branch: Branch
+  label_tag: Tag 
   label_revision: Revision
   label_revision_plural: Revisions
   label_associated_revisions: Associated revisions
@@ -554,6 +556,7 @@ en:
   label_latest_revision: Latest revision
   label_latest_revision_plural: Latest revisions
   label_view_revisions: View revisions
+  label_view_all_revisions: View all revisions
   label_max_size: Maximum size
   label_sort_highest: Move to top
   label_sort_higher: Move up
diff --git a/config/locales/es.yml b/config/locales/es.yml
index f0689b86b..89e4aaf6b 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -851,3 +851,6 @@ es:
   mail_body_wiki_content_updated: La página wiki '{{page}}' ha sido actualizada por {{author}}.
   permission_add_project: Crear proyecto
   setting_new_project_user_role_id: Permiso asignado a un usuario no-administrador para crear proyectos
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 759af0643..2fa1c4ce7 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -841,3 +841,6 @@ fi:
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 2e3ca60bb..9e691bb6e 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -832,4 +832,7 @@ fr:
   enumeration_doc_categories: Catégories des documents
   enumeration_activities: Activités (suivi du temps)
   label_greater_or_equal: ">="
-  label_less_or_equal: <=
+  label_less_or_equal: "<="
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 4cc93a5e7..7f44b8196 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -830,3 +830,6 @@ gl:
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/he.yml b/config/locales/he.yml
index a1846f4de..94cf716cd 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -813,3 +813,6 @@ he:
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 824694942..c204aaad3 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -836,3 +836,6 @@
   mail_body_wiki_content_updated: A '{{page}}' wiki oldalt {{author}} frissítette.
   permission_add_project: Projekt létrehozása
   setting_new_project_user_role_id: Projekt létrehozási jog nem adminisztrátor felhasználóknak
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 2a0016600..fa490e7c6 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -816,3 +816,6 @@ it:
   mail_body_wiki_content_updated: La pagina '{{page}}' wiki è stata aggiornata da{{author}}.
   permission_add_project: Crea progetto
   setting_new_project_user_role_id: Ruolo assegnato agli utenti non amministratori che creano un progetto
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index e3f09379f..1d1c330b2 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -838,3 +838,6 @@ ja:
   enumeration_issue_priorities: チケットの優先度
   enumeration_doc_categories: 文書カテゴリ
   enumeration_activities: 作業分類 (時間トラッキング)
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 5dee19a4b..a69e6af6c 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -869,3 +869,6 @@ ko:
 # by Kihyun Yoon(ddumbugie@gmail.com)
 # by John Hwang (jhwang@tavon.org),http://github.com/tavon
   field_issue_to: Related issue
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 8565425af..49e59720e 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -841,3 +841,6 @@ lt:
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index e97a39130..df95addcc 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -786,3 +786,6 @@ nl:
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/no.yml b/config/locales/no.yml
index a32d59a61..1e449573d 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -803,3 +803,6 @@
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 3f80f1590..016b55529 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -834,3 +834,6 @@ pl:
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index bc08ed16b..e308e4810 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -836,3 +836,6 @@ pt-BR:
   mail_body_wiki_content_updated: A página wiki '{{page}}' foi atualizada por {{author}}.
   permission_add_project: Criar projeto
   setting_new_project_user_role_id: Papel dado a um usuário não administrador que crie um projeto
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index f10f89803..5bf3dbb0d 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -822,3 +822,6 @@ pt:
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 0497b14e1..d9409b99d 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -801,3 +801,6 @@ ro:
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 525c3c04f..08373c64b 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -928,3 +928,6 @@ ru:
   mail_body_wiki_content_updated: "{{author}} обновил(а) wiki-страницу '{{page}}'."
   permission_add_project: Создание проекта
   setting_new_project_user_role_id: Роль, назначаемая пользователю, создавшему проект
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index a7b73b782..27a0a32ea 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -802,4 +802,7 @@ sk:
   label_wiki_content_updated: Wiki stránka aktualizovaná
   mail_body_wiki_content_updated: Wiki stránka '{{page}}' bola aktualizovaná užívateľom {{author}}.
   setting_repositories_encodings: Kódovanie repozitára
-  setting_new_project_user_role_id: Rola dána non-admin užívateľovi, ktorý vytvorí projekt   
\ No newline at end of file
+  setting_new_project_user_role_id: Rola dána non-admin užívateľovi, ktorý vytvorí projekt
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 7f01d35a1..6a1f4e273 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -800,3 +800,6 @@ sl:
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 8edd6d79f..5e565a9ca 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -824,3 +824,6 @@
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 648c0d986..0e75a25e9 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -858,3 +858,6 @@ sv:
   enumeration_issue_priorities: Ärendeprioriteter
   enumeration_doc_categories: Dokumentkategorier
   enumeration_activities: Aktiviteter (tidsuppföljning)
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 046ca8131..3eb1a2584 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -801,3 +801,6 @@ th:
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index b830f90c5..d6822490d 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -837,3 +837,6 @@ tr:
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 403b42cae..e95ce4048 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -800,3 +800,6 @@ uk:
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index dfe7a60f1..210532849 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -870,3 +870,6 @@ vi:
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 2b757e587..85100f913 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -908,3 +908,6 @@
   enumeration_issue_priorities: 項目優先權
   enumeration_doc_categories: 文件分類
   enumeration_activities: 活動 (時間追蹤)
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 31a19b3c6..a25ef9617 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -833,3 +833,6 @@ zh:
   enumeration_issue_priorities: 问题优先级
   enumeration_doc_categories: 文档类别
   enumeration_activities: 活动（时间跟踪）
+  label_view_all_revisions: View all revisions
+  label_tag: Tag
+  label_branch: Branch
diff --git a/config/routes.rb b/config/routes.rb
index bfacb1d3a..ded3435ba 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -218,7 +218,7 @@ ActionController::Routing::Routes.draw do |map|
       repository_views.connect 'projects/:id/repository/revisions/:rev', :action => 'revision'
       repository_views.connect 'projects/:id/repository/revisions/:rev/diff', :action => 'diff'
       repository_views.connect 'projects/:id/repository/revisions/:rev/diff.:format', :action => 'diff'
-      repository_views.connect 'projects/:id/repository/revisions/:rev/:action/*path'
+      repository_views.connect 'projects/:id/repository/revisions/:rev/:action/*path', :requirements => { :rev => /[a-z0-9\.\-_]+/ }
       repository_views.connect 'projects/:id/repository/:action/*path'
     end
     
diff --git a/lib/diff.rb b/lib/diff.rb
index 646f91bae..f88e7fbb1 100644
--- a/lib/diff.rb
+++ b/lib/diff.rb
@@ -1,153 +1,155 @@
-class Diff
+module RedmineDiff
+  class Diff
 
-  VERSION = 0.3
+    VERSION = 0.3
 
-  def Diff.lcs(a, b)
-    astart = 0
-    bstart = 0
-    afinish = a.length-1
-    bfinish = b.length-1
-    mvector = []
-    
-    # First we prune off any common elements at the beginning
-    while (astart <= afinish && bstart <= afinish && a[astart] == b[bstart])
-      mvector[astart] = bstart
-      astart += 1
-      bstart += 1
-    end
-    
-    # now the end
-    while (astart <= afinish && bstart <= bfinish && a[afinish] == b[bfinish])
-      mvector[afinish] = bfinish
-      afinish -= 1
-      bfinish -= 1
-    end
+    def Diff.lcs(a, b)
+      astart = 0
+      bstart = 0
+      afinish = a.length-1
+      bfinish = b.length-1
+      mvector = []
+      
+      # First we prune off any common elements at the beginning
+      while (astart <= afinish && bstart <= afinish && a[astart] == b[bstart])
+        mvector[astart] = bstart
+        astart += 1
+        bstart += 1
+      end
+      
+      # now the end
+      while (astart <= afinish && bstart <= bfinish && a[afinish] == b[bfinish])
+        mvector[afinish] = bfinish
+        afinish -= 1
+        bfinish -= 1
+      end
 
-    bmatches = b.reverse_hash(bstart..bfinish)
-    thresh = []
-    links = []
-    
-    (astart..afinish).each { |aindex|
-      aelem = a[aindex]
-      next unless bmatches.has_key? aelem
-      k = nil
-      bmatches[aelem].reverse.each { |bindex|
-	if k && (thresh[k] > bindex) && (thresh[k-1] < bindex)
-	  thresh[k] = bindex
-	else
-	  k = thresh.replacenextlarger(bindex, k)
-	end
-	links[k] = [ (k==0) ? nil : links[k-1], aindex, bindex ] if k
+      bmatches = b.reverse_hash(bstart..bfinish)
+      thresh = []
+      links = []
+      
+      (astart..afinish).each { |aindex|
+        aelem = a[aindex]
+        next unless bmatches.has_key? aelem
+        k = nil
+        bmatches[aelem].reverse.each { |bindex|
+    if k && (thresh[k] > bindex) && (thresh[k-1] < bindex)
+      thresh[k] = bindex
+    else
+      k = thresh.replacenextlarger(bindex, k)
+    end
+    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]
-	link = link[0]
+      if !thresh.empty?
+        link = links[thresh.length-1]
+        while link
+    mvector[link[1]] = link[2]
+    link = link[0]
+        end
       end
-    end
 
-    return mvector
-  end
-
-  def makediff(a, b)
-    mvector = Diff.lcs(a, b)
-    ai = bi = 0
-    while ai < mvector.length
-      bline = mvector[ai]
-      if bline
-	while bi < bline
-	  discardb(bi, b[bi])
-	  bi += 1
-	end
-	match(ai, bi)
-	bi += 1
-      else
-	discarda(ai, a[ai])
-      end
-      ai += 1
-    end
-    while ai < a.length
-      discarda(ai, a[ai])
-      ai += 1
+      return mvector
     end
-    while bi < b.length
+
+    def makediff(a, b)
+      mvector = Diff.lcs(a, b)
+      ai = bi = 0
+      while ai < mvector.length
+        bline = mvector[ai]
+        if bline
+    while bi < bline
       discardb(bi, b[bi])
       bi += 1
     end
     match(ai, bi)
-    1
-  end
-
-  def compactdiffs
-    diffs = []
-    @diffs.each { |df|
-      i = 0
-      curdiff = []
-      while i < df.length
-	whot = df[i][0]
-	s = @isstring ? df[i][2].chr : [df[i][2]]
-	p = df[i][1]
-	last = df[i][1]
-	i += 1
-	while df[i] && df[i][0] == whot && df[i][1] == last+1
-	  s << df[i][2]
-	  last  = df[i][1]
-	  i += 1
-	end
-	curdiff.push [whot, p, s]
+    bi += 1
+        else
+    discarda(ai, a[ai])
+        end
+        ai += 1
       end
-      diffs.push curdiff
-    }
-    return diffs
-  end
+      while ai < a.length
+        discarda(ai, a[ai])
+        ai += 1
+      end
+      while bi < b.length
+        discardb(bi, b[bi])
+        bi += 1
+      end
+      match(ai, bi)
+      1
+    end
 
-  attr_reader :diffs, :difftype
+    def compactdiffs
+      diffs = []
+      @diffs.each { |df|
+        i = 0
+        curdiff = []
+        while i < df.length
+    whot = df[i][0]
+    s = @isstring ? df[i][2].chr : [df[i][2]]
+    p = df[i][1]
+    last = df[i][1]
+    i += 1
+    while df[i] && df[i][0] == whot && df[i][1] == last+1
+      s << df[i][2]
+      last  = df[i][1]
+      i += 1
+    end
+    curdiff.push [whot, p, s]
+        end
+        diffs.push curdiff
+      }
+      return diffs
+    end
 
-  def initialize(diffs_or_a, b = nil, isstring = nil)
-    if b.nil?
-      @diffs = diffs_or_a
-      @isstring = isstring
-    else
-      @diffs = []
+    attr_reader :diffs, :difftype
+
+    def initialize(diffs_or_a, b = nil, isstring = nil)
+      if b.nil?
+        @diffs = diffs_or_a
+        @isstring = isstring
+      else
+        @diffs = []
+        @curdiffs = []
+        makediff(diffs_or_a, b)
+        @difftype = diffs_or_a.class
+      end
+    end
+    
+    def match(ai, bi)
+      @diffs.push @curdiffs unless @curdiffs.empty?
       @curdiffs = []
-      makediff(diffs_or_a, b)
-      @difftype = diffs_or_a.class
     end
-  end
-  
-  def match(ai, bi)
-    @diffs.push @curdiffs unless @curdiffs.empty?
-    @curdiffs = []
-  end
 
-  def discarda(i, elem)
-    @curdiffs.push ['-', i, elem]
-  end
+    def discarda(i, elem)
+      @curdiffs.push ['-', i, elem]
+    end
 
-  def discardb(i, elem)
-    @curdiffs.push ['+', i, elem]
-  end
+    def discardb(i, elem)
+      @curdiffs.push ['+', i, elem]
+    end
 
-  def compact
-    return Diff.new(compactdiffs)
-  end
+    def compact
+      return Diff.new(compactdiffs)
+    end
 
-  def compact!
-    @diffs = compactdiffs
-  end
+    def compact!
+      @diffs = compactdiffs
+    end
 
-  def inspect
-    @diffs.inspect
-  end
+    def inspect
+      @diffs.inspect
+    end
 
+  end
 end
 
 module Diffable
   def diff(b)
-    Diff.new(self, b)
+    RedmineDiff::Diff.new(self, b)
   end
 
   # Create a hash that maps elements of the array to arrays of indices
@@ -158,9 +160,9 @@ module Diffable
     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
@@ -179,9 +181,9 @@ module Diffable
       found = self[index]
       return nil if value == found
       if value > found
-	low = index + 1
+  low = index + 1
       else
-	high = index
+  high = index
       end
     end
 
@@ -204,25 +206,25 @@ module Diffable
     bi = 0
     diff.diffs.each { |d|
       d.each { |mod|
-	case mod[0]
-	when '-'
-	  while ai < mod[1]
-	    newary << self[ai]
-	    ai += 1
-	    bi += 1
-	  end
-	  ai += 1
-	when '+'
-	  while bi < mod[1]
-	    newary << self[ai]
-	    ai += 1
-	    bi += 1
-	  end
-	  newary << mod[2]
-	  bi += 1
-	else
-	  raise "Unknown diff action"
-	end
+  case mod[0]
+  when '-'
+    while ai < mod[1]
+      newary << self[ai]
+      ai += 1
+      bi += 1
+    end
+    ai += 1
+  when '+'
+    while bi < mod[1]
+      newary << self[ai]
+      ai += 1
+      bi += 1
+    end
+    newary << mod[2]
+    bi += 1
+  else
+    raise "Unknown diff action"
+  end
       }
     }
     while ai < self.length
@@ -243,38 +245,38 @@ class String
 end
 
 =begin
-= Diff
-(({diff.rb})) - computes the differences between two arrays or
-strings. Copyright (C) 2001 Lars Christensen
+  = Diff
+  (({diff.rb})) - computes the differences between two arrays or
+  strings. Copyright (C) 2001 Lars Christensen
 
-== Synopsis
+  == Synopsis
 
-    diff = Diff.new(a, b)
-    b = a.patch(diff)
+      diff = Diff.new(a, b)
+      b = a.patch(diff)
 
-== Class Diff
-=== Class Methods
---- Diff.new(a, b)
---- a.diff(b)
-      Creates a Diff object which represent the differences between
-      ((|a|)) and ((|b|)). ((|a|)) and ((|b|)) can be either be arrays
-      of any objects, strings, or object of any class that include
-      module ((|Diffable|))
+  == Class Diff
+  === Class Methods
+  --- Diff.new(a, b)
+  --- a.diff(b)
+        Creates a Diff object which represent the differences between
+        ((|a|)) and ((|b|)). ((|a|)) and ((|b|)) can be either be arrays
+        of any objects, strings, or object of any class that include
+        module ((|Diffable|))
 
-== Module Diffable
-The module ((|Diffable|)) is intended to be included in any class for
-which differences are to be computed. Diffable is included into String
-and Array when (({diff.rb})) is (({require}))'d.
+  == Module Diffable
+  The module ((|Diffable|)) is intended to be included in any class for
+  which differences are to be computed. Diffable is included into String
+  and Array when (({diff.rb})) is (({require}))'d.
 
-Classes including Diffable should implement (({[]})) to get element at
-integer indices, (({<<})) to append elements to the object and
-(({ClassName#new})) should accept 0 arguments to create a new empty
-object.
+  Classes including Diffable should implement (({[]})) to get element at
+  integer indices, (({<<})) to append elements to the object and
+  (({ClassName#new})) should accept 0 arguments to create a new empty
+  object.
 
-=== Instance Methods
---- Diffable#patch(diff)
-      Applies the differences from ((|diff|)) to the object ((|obj|))
-      and return the result. ((|obj|)) is not changed. ((|obj|)) and
-      can be either an array or a string, but must match the object
-      from which the ((|diff|)) was created.
+  === Instance Methods
+  --- Diffable#patch(diff)
+        Applies the differences from ((|diff|)) to the object ((|obj|))
+        and return the result. ((|obj|)) is not changed. ((|obj|)) and
+        can be either an array or a string, but must match the object
+        from which the ((|diff|)) was created.
 =end
diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index 7d21f8eba..a62076b52 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -100,6 +100,18 @@ module Redmine
         def entries(path=nil, identifier=nil)
           return nil
         end
+
+        def branches
+          return nil
+        end
+
+        def tags 
+          return nil
+        end
+
+        def default_branch
+          return nil
+        end
         
         def properties(path, identifier=nil)
           return nil
@@ -260,6 +272,7 @@ module Redmine
       
       class Revision
         attr_accessor :identifier, :scmid, :name, :author, :time, :message, :paths, :revision, :branch
+
         def initialize(attributes={})
           self.identifier = attributes[:identifier]
           self.scmid = attributes[:scmid]
@@ -271,7 +284,25 @@ module Redmine
           self.revision = attributes[:revision]
           self.branch = attributes[:branch]
         end
-    
+
+        def save(repo)
+          if repo.changesets.find_by_scmid(scmid.to_s).nil?
+            changeset = Changeset.create!(
+              :repository => repo,
+              :revision => identifier,
+              :scmid => scmid,
+              :committer => author, 
+              :committed_on => time,
+              :comments => message)
+
+            paths.each do |file|
+              Change.create!(
+                :changeset => changeset,
+                :action => file[:action],
+                :path => file[:path])
+            end   
+          end
+        end
       end
         
       class Annotate
diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb
index a9e1dda5c..14e1674b1 100644
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -21,90 +21,38 @@ module Redmine
   module Scm
     module Adapters    
       class GitAdapter < AbstractAdapter
-        
         # Git executable name
         GIT_BIN = "git"
 
-        # Get the revision of a particuliar file
-        def get_rev (rev,path)
-        
-          if rev != 'latest' && !rev.nil?
-            cmd="#{GIT_BIN} --git-dir #{target('')} show --date=iso --pretty=fuller #{shell_quote rev} -- #{shell_quote path}" 
-          else
-            @branch ||= shellout("#{GIT_BIN} --git-dir #{target('')} branch") { |io| io.grep(/\*/)[0].strip.match(/\* (.*)/)[1] }
-            cmd="#{GIT_BIN} --git-dir #{target('')} log --date=iso --pretty=fuller -1 #{@branch} -- #{shell_quote path}" 
+        def info
+          begin
+            Info.new(:root_url => url, :lastrev => lastrev('',nil))
+          rescue
+            nil
           end
-          rev=[]
-          i=0
-          shellout(cmd) do |io|
-            files=[]
-            changeset = {}
-            parsing_descr = 0  #0: not parsing desc or files, 1: parsing desc, 2: parsing files
+        end
 
+        def branches
+          branches = []
+          cmd = "#{GIT_BIN} --git-dir #{target('')} branch"
+          shellout(cmd) do |io|
             io.each_line do |line|
-              if line =~ /^commit ([0-9a-f]{40})$/
-                key = "commit"
-                value = $1
-                if (parsing_descr == 1 || parsing_descr == 2)
-                  parsing_descr = 0
-                  rev = Revision.new({:identifier => changeset[:commit],
-                                      :scmid => changeset[:commit],
-                                      :author => changeset[:author],
-                                      :time => Time.parse(changeset[:date]),
-                                      :message => changeset[:description],
-                                      :paths => files
-                                     })
-                  changeset = {}
-                  files = []
-                end
-                changeset[:commit] = $1
-              elsif (parsing_descr == 0) && line =~ /^(\w+):\s*(.*)$/
-                key = $1
-                value = $2
-                if key == "Author"
-                  changeset[:author] = value
-                elsif key == "CommitDate"
-                  changeset[:date] = value
-                end
-              elsif (parsing_descr == 0) && line.chomp.to_s == ""
-                parsing_descr = 1
-                changeset[:description] = ""
-              elsif (parsing_descr == 1 || parsing_descr == 2) && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\s+(.+)$/
-                parsing_descr = 2
-                fileaction = $1
-                filepath = $2
-                files << {:action => fileaction, :path => filepath}
-              elsif (parsing_descr == 1) && line.chomp.to_s == ""
-                parsing_descr = 2
-              elsif (parsing_descr == 1)
-                changeset[:description] << line
-              end
-            end	
-            rev = Revision.new({:identifier => changeset[:commit],
-                                :scmid => changeset[:commit],
-                                :author => changeset[:author],
-                                :time => (changeset[:date] ? Time.parse(changeset[:date]) : nil),
-                                :message => changeset[:description],
-                                :paths => files
-                               })
-
+              branches << line.match('\s*\*?\s*(.*)$')[1]
+            end
           end
-
-          get_rev('latest',path) if rev == []
-
-          return nil if $? && $?.exitstatus != 0
-          return rev
+          branches.sort!
         end
 
-        def info
-          revs = revisions(url,nil,nil,{:limit => 1})
-          if revs && revs.any?
-            Info.new(:root_url => url, :lastrev => revs.first)
-          else
-            nil
+        def tags
+          tags = []
+          cmd = "#{GIT_BIN} --git-dir #{target('')} tag"
+          shellout(cmd) do |io|
+            io.readlines.sort!.map{|t| t.strip}
           end
-        rescue Errno::ENOENT => e
-          return nil
+        end
+
+        def default_branch
+          branches.include?('master') ? 'master' : branches.first 
         end
         
         def entries(path=nil, identifier=nil)
@@ -121,27 +69,63 @@ module Redmine
                 sha = $2
                 size = $3
                 name = $4
+                full_path = path.empty? ? name : "#{path}/#{name}"
                 entries << Entry.new({:name => name,
-                                       :path => (path.empty? ? name : "#{path}/#{name}"),
-                                       :kind => ((type == "tree") ? 'dir' : 'file'),
-                                       :size => ((type == "tree") ? nil : size),
-                                       :lastrev => get_rev(identifier,(path.empty? ? name : "#{path}/#{name}")) 
-                                                                  
-                                     }) unless entries.detect{|entry| entry.name == name}
+                 :path => full_path,
+                 :kind => (type == "tree") ? 'dir' : 'file',
+                 :size => (type == "tree") ? nil : size,
+                 :lastrev => lastrev(full_path,identifier)
+                }) unless entries.detect{|entry| entry.name == name}
               end
             end
           end
           return nil if $? && $?.exitstatus != 0
           entries.sort_by_name
         end
-        
+
+        def lastrev(path,rev)
+          return nil if path.nil?
+          cmd = "#{GIT_BIN} --git-dir #{target('')} log --pretty=fuller --no-merges -n 1 "
+          cmd << " #{shell_quote rev} " if rev 
+          cmd <<  "-- #{path} " unless path.empty?
+          shellout(cmd) do |io|
+            begin
+              id = io.gets.split[1]
+              author = io.gets.match('Author:\s+(.*)$')[1]
+              2.times { io.gets }
+              time = io.gets.match('CommitDate:\s+(.*)$')[1]
+
+              Revision.new({
+                :identifier => id,
+                :scmid => id,
+                :author => author, 
+                :time => time,
+                :message => nil, 
+                :paths => nil 
+              })
+            rescue NoMethodError => e
+              logger.error("The revision '#{path}' has a wrong format")
+              return nil
+            end
+          end
+        end
+
+        def num_revisions
+          cmd = "#{GIT_BIN} --git-dir #{target('')} log --all --pretty=format:'' | wc -l"
+          shellout(cmd) {|io| io.gets.chomp.to_i + 1}
+        end
+
         def revisions(path, identifier_from, identifier_to, options={})
           revisions = Revisions.new
-          cmd = "#{GIT_BIN} --git-dir #{target('')} log --raw --date=iso --pretty=fuller"
+
+          cmd = "#{GIT_BIN} --git-dir #{target('')} log --find-copies-harder --raw --date=iso --pretty=fuller"
           cmd << " --reverse" if options[:reverse]
-          cmd << " -n #{options[:limit].to_i} " if (!options.nil?) && options[:limit]
+          cmd << " --all" if options[:all]
+          cmd << " -n #{options[:limit]} " if options[:limit]
           cmd << " #{shell_quote(identifier_from + '..')} " if identifier_from
           cmd << " #{shell_quote identifier_to} " if identifier_to
+          cmd << " -- #{path}" if path && !path.empty?
+
           shellout(cmd) do |io|
             files=[]
             changeset = {}
@@ -154,13 +138,14 @@ module Redmine
                 value = $1
                 if (parsing_descr == 1 || parsing_descr == 2)
                   parsing_descr = 0
-                  revision = Revision.new({:identifier => changeset[:commit],
-                                           :scmid => changeset[:commit],
-                                           :author => changeset[:author],
-                                           :time => Time.parse(changeset[:date]),
-                                           :message => changeset[:description],
-                                           :paths => files
-                                          })
+                  revision = Revision.new({
+                    :identifier => changeset[:commit],
+                    :scmid => changeset[:commit],
+                    :author => changeset[:author],
+                    :time => Time.parse(changeset[:date]),
+                    :message => changeset[:description],
+                    :paths => files
+                  })
                   if block_given?
                     yield revision
                   else
@@ -182,26 +167,35 @@ module Redmine
               elsif (parsing_descr == 0) && line.chomp.to_s == ""
                 parsing_descr = 1
                 changeset[:description] = ""
-              elsif (parsing_descr == 1 || parsing_descr == 2) && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\s+(.+)$/
+              elsif (parsing_descr == 1 || parsing_descr == 2) \
+              && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\s+(.+)$/
                 parsing_descr = 2
                 fileaction = $1
                 filepath = $2
                 files << {:action => fileaction, :path => filepath}
+              elsif (parsing_descr == 1 || parsing_descr == 2) \
+              && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\d+\s+(\S+)\s+(.+)$/
+                parsing_descr = 2
+                fileaction = $1
+                filepath = $3
+                files << {:action => fileaction, :path => filepath}
               elsif (parsing_descr == 1) && line.chomp.to_s == ""
                 parsing_descr = 2
               elsif (parsing_descr == 1)
                 changeset[:description] << line[4..-1]
               end
-            end	
+            end 
 
             if changeset[:commit]
-              revision = Revision.new({:identifier => changeset[:commit],
-                                       :scmid => changeset[:commit],
-                                       :author => changeset[:author],
-                                       :time => Time.parse(changeset[:date]),
-                                       :message => changeset[:description],
-                                       :paths => files
-                                      })
+              revision = Revision.new({
+                :identifier => changeset[:commit],
+                :scmid => changeset[:commit],
+                :author => changeset[:author],
+                :time => Time.parse(changeset[:date]),
+                :message => changeset[:description],
+                :paths => files
+              })
+
               if block_given?
                 yield revision
               else
@@ -213,15 +207,16 @@ module Redmine
           return nil if $? && $?.exitstatus != 0
           revisions
         end
-        
+
         def diff(path, identifier_from, identifier_to=nil)
           path ||= ''
-          if !identifier_to
-            identifier_to = nil
+
+          if identifier_to
+            cmd = "#{GIT_BIN} --git-dir #{target('')} diff #{shell_quote identifier_to} #{shell_quote identifier_from}" 
+          else
+            cmd = "#{GIT_BIN} --git-dir #{target('')} show #{shell_quote identifier_from}"
           end
-          
-          cmd = "#{GIT_BIN} --git-dir #{target('')} show #{shell_quote identifier_from}" if identifier_to.nil?
-          cmd = "#{GIT_BIN} --git-dir #{target('')} diff #{shell_quote identifier_to} #{shell_quote identifier_from}" if !identifier_to.nil?
+
           cmd << " -- #{shell_quote path}" unless path.empty?
           diff = []
           shellout(cmd) do |io|
@@ -265,6 +260,4 @@ module Redmine
       end
     end
   end
-
 end
-
diff --git a/public/javascripts/repository_navigation.js b/public/javascripts/repository_navigation.js
new file mode 100644
index 000000000..a40815f94
--- /dev/null
+++ b/public/javascripts/repository_navigation.js
@@ -0,0 +1,35 @@
+Event.observe(window,'load',function() {
+  /* 
+  If we're viewing a tag or branch, don't display it in the
+  revision box
+  */
+  var branch_selected = $('branch') && $('rev').getValue() == $('branch').getValue();
+  var tag_selected = $('tag') && $('rev').getValue() == $('tag').getValue();
+  if (branch_selected || tag_selected) {
+    $('rev').setValue('');
+  }
+
+  /* 
+  Copy the branch/tag value into the revision box, then disable
+  the dropdowns before submitting the form
+  */
+  $$('#branch,#tag').each(function(e) {
+    e.observe('change',function(e) {
+      $('rev').setValue(e.element().getValue());
+      $$('#branch,#tag').invoke('disable');
+      e.element().parentNode.submit();
+      $$('#branch,#tag').invoke('enable');
+    });
+  });
+
+  /*
+  Disable the branch/tag dropdowns before submitting the revision form
+  */
+  $('rev').observe('keydown', function(e) {
+    if (e.keyCode == 13) {
+      $$('#branch,#tag').invoke('disable');
+      e.element().parentNode.submit();
+      $$('#branch,#tag').invoke('enable');
+    }
+  });
+})
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 970b3c437..02e3870b3 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -181,7 +181,7 @@ div.square {
  width: .6em; height: .6em;
 }
 .contextual {float:right; white-space: nowrap; line-height:1.4em;margin-top:5px; padding-left: 10px; font-size:0.9em;}
-.contextual input {font-size:0.9em;}
+.contextual input,select {font-size:0.9em;}
 .message .contextual { margin-top: 0; }
 
 .splitcontentleft{float:left; width:49%;}
diff --git a/test/fixtures/repositories/git_repository.tar.gz b/test/fixtures/repositories/git_repository.tar.gz
index 84de88aa7d08d0f58ba6f07bcc4b876fcaab23a3..48966da30bf58b5d804ee9b51deb0dcce9da4edb 100644
GIT binary patch
literal 17716
zcmV)KK)SyliwFSwwns_;1MEC)Y#hgRk^-o{wc|Ri3$!TEj*ql?M{)0N_jYgZD3KEN
zVOw@=Ig%{H6-8=xcb2!+-R^mJPb4i7L0j0Z5i~{eqqPkuC=$b{`@=xnIE_=Ig=;&A
zlfVVipaJ?3xIvTth=ICr>%wgs^u3wgyS*=xwkRsKIRM4G-I@3O-n{o_s3kXA3|Pw#
z-N+ACi@UDID8Vpv9e*o^UP}K?#x6xs)smtZN?F@gQdC{3>>~PAp{8%N!-xii?4mYp
zt~YO^_y14FQm_8u>xF_vtvcI69H`)mrj69UZYX{F*I?`-r7fgk<oJ;5Um=R*n6#`L
zX0=+WRW-&8MXBo4R!bF~RdmNHX^LUj%$iCJwX9jD3c52ZWk)ki$1%z}vn{<u6{|$G
za@hjct&&TiM@Oq^T1Bf?)rzC*Rm;(}s;a6^RVmxlWQJv$C5==Rvr^R^lj%A&OS-93
zt5VfUs;wJp$x>*AS~a6=D@1i_R;g4|EJN35O`(oKYnEnIS-GO?6;m^9R<$k1AR0Al
zWzAqzGYzGx)yh>M-ek1o*qRCeOGeEx6w@T-imE6zO|h#bMh(Y?FRW}<OFFGm2gssI
zsjO*6nN({vs_3>!OJ!O%%fNlLW|bYiY%mQVmsEIR*;Z}S@>!D<=~^p39)12__x%gu
zR__9vivJ~}qLmELJo-QCbSM6A#~7;rR={N1YBg3{G_vYfjANttUn!OQ^k31-rJeY{
z9b@d4qUn0Yur7^BV`R=FY=t&k4MxxsNN5FaD<Y9kF0#ONR>^XmM#K#XHT^b!ZZcx|
z&88bg%mx7FD(M;yaRR?dD8Q7P)NPO^3q!iZ3LMqxdV-_ww;ML#btAIuMs?!(p8PNi
zd;*$@+JMW6SO7@Fw(BhcI9Log0>2fwG-3%<;yMH&P%jFRurTslB&sLm#Yla^JZb`a
zQ60EI{8OY!FT~#+7v8WHX0;=nRFI?s0SA%8x*W2o-I5{}MnqmA+3`D$pI$tA{A9{u
z1fDFp?KUZcFxH(keo5Jv9Y2&^lculjPB7g6{V<A2-3lBV`M+B3kN=gDR@w3Y?HHT$
z|Jds-+GsF4c1TLXwq=3yIqe2473PAon$%|R)7_@Yy*|A1mVR2&qYwNT>i<HQax+}o
z5*!=&zoIExpa1I>eW(80ma*CW->Ng~LTW!H4Sy-Mp_3ybG{F9k8)iI*Z|A<p2o09n
zP3A>Y9D+xijQ9@!j4=R~^9WO?VH!gMoopgk01zXxh4+#xbi!B~CuTd1hQAEl!Bl3u
z(GVgzAMZ2hjgk93ga-2AkWB{I5Er!}){;~1lE-Y>cN`g{+i*dg@D3-Y#DD6<;hFIq
zh@M;oYsS1|?*7wvo;bO9{OGZJPm{|e1oCB%OoYXS`CMUgc0OO295433o+k53u{Dtg
za7z#pi2P7UvJ2w?It#gsk|mcf6K2(Y_`;vf&hp0+Pv(HL#Bwam{a8rscB|o9DE2`X
zLg1SxQ`sz;0Wdj^abls5poti<lp&!XM8HSea~~qIm2kw!L~-FP$();1@ZX|6k>_+?
zf*cG<oxM#ZN7tt#!>vh?);^Sb&glHF-LgSuTY+Pv{I9GSJNe%=8k>#(P`tEg0Fj)u
zsC5BcuWK~K@dMHhA*4f*2te$1(<D(qy|4v78@`{Yi2F#^syBU`>{}rzbId~A;Kdd0
zGU5@GW&t3UUC;49lrDTlW2pakOZY9x0XOXbVE@0r|D*5t|8|V6$p1(Le(ZtIiq6bW
zWA~>gpF<E=HKW^P*Qi@&t<yD1Pr3?SqmljJfSEMhnp42_{a*o>uME_GJN@778NL30
z#BZ$z?ovG>IV(?8P#d`mGH#z7A$QUy^`Op@q*mK(xM6+9V=Iw_Mq<KVZ`EgbF#vuj
z^7`>H%<NSOJj;_Z;Et{}lMR>?7VC`KVR2l|N~{sG<lT8JUc%L;=|i#(*5{BrkIfxD
zFFCFxS%3r}c5zLO^F>+WdQy{y5Fw^gpbs7_PUfY|{{0gE;-RHP_K%TeMr<DfOa#kd
zNzjJS<^z2JRsk@Zh19}o=3Xejma%As`HVI&?(on=3CBtV4N#}y8{sF|`}RG2kA<xu
z34+e?5TnwGyD`p)iSYd(;y510z?^oYu?j&aSQ6n#tUV|JnTxKsD86#(fKV>VAbE%-
zGI(edt<FGg%?rW>F%4uS<Z`~F2l-)m*aIsYtE5vO#fz}e9Zt-CU^PPU0c%2z2P_n_
zN!b+3)#6c{M^$(|Ma(vjsUSgs>OuPGgUAb9nJL~G<ZUTzXix`1Xbu#6WYupcn*(ah
zWI})_a_r{&USo9;7c44$!s*CjAu*EiOR>qWVc7^d>G{-hb;R=S7_z);<taKuC7Xhr
zNIDjO*Ur1xx<m@J=cUXr&51eSDjeQW)zL-(#=lD1EjjXKOpJxmCQ8q|FNI}<i^fhQ
zWk7-ANlX|rx}kBV1lTpuOp65#UcdwR<|>IfnIYqIC+|3OwsdZP{2X>Z6zpU&1G_|G
zQ|vO`wIPlvanb2{FB^l&-I}5}4*;9Ag<XP7rnrzhTas&3cFyg~lOoQ~<i-^;GfR{_
zep@49tKmku;=EU!ipf*X@mE;+AdRfSnk3f&*#|RMn9Pq0z?riG^0><R8wy)Jm(L40
zU<$cgK=dK7I-a8c5=SV{f|S<cseCTVD*2v)1j&oYsnbV~ojl2<C<w^3JsW~+_raPp
zFgr^U1j@NsgnSzOOmtM(wN4}{I~Zn?#tJ%pY(LW26%I+_t)?)Yqf&=0wP|37J>i*!
zNmKD6w$#9HVj~1Q;hAX?zL$NFNC5$Z$N0eo2VH_fzS)GCu}4fx5}70?Jd5>j0$>3b
zLIE%vGd|V%#C-{aoCIMcwowqXkDCHrqOM1B%tfywwi_@jg4hcN<$B4td|@QsPO!E>
z26!gp**zFK#2{*ME@OjEBW4$PgvIdcG2t_2+l5%r-M(Cr@%sT%f$JF!8ZL%vutZ3E
z!zrM~W6J{+S>TP4=mMi$c*4#BV0s<7t)%Ij5XaMUSjR&S?EX>Uav^vO&y{Gf%HvYZ
z0VdphJ7us705L$~1;$#)Nk9M!Z$*SI8io+t0}w3v4wL4UhgJ}BYz$(xRj1w(<Anof
z2{9&CG$q7}bT?zs3VRn5V#5)I(o}3zv{Ob+f&B%x<=afOwiC3m%&-$KiBog|RRm(8
zFObGXmo~&cd;zyz(23``OYMLcBk)q{6bs@F(2BgcVH4<j0K-48P!hAA;-XmQp&v^n
zE<?{>2J_A-c~U48u#W1pG>o@gjOawENGk{i6+Q?Kw1gt-_dg5dz}+u|D#*1v=98i#
zplJSlvDIKOzuf{nU_2dBfjp<Ub@Ow<v{Q?;034h2c^A*=ddUC*quGFM#rYcF9DQM2
zP-8k^>8Lrew8eb1B0>&>GJNztp^;7mNePkzKvEKcLPP-%=1Gc_Q`eI!7ifRV)$t7u
z7;MYqxR43qz=W5x_n?Tt*dZMOyp7eVzJ!Ud9^%-t+`}VS)@o-LjX4n7;4YB}Jzx#)
z*zv)G-~>2m#jSoG%)qhGoA~l>EQD0fO@$k$9dPuq%T2|SjT6imIR=juq8y|Ob=nF=
zLW9pkJV8R|$%F0!7RJp6Ji_62C_+tFl+wppG!c>p?iVx?P7!-3*nTDhYkXOjH~fi>
zp06mz>0$DF;4{v`2NYJ~k4ff+PAc|28!{*L6n`v$*7+fa2WJ*jKix4uFfl#P<Rl*H
znHkS3lJ!9rxzsl!z^)*ZEJ2dyrho<X@FTqB>J1_yl+SU0!IMPCU4bAUyW}!Fj6Db9
zMmHw$HHY~c$Mv|!;;t8s@Va<yvS}kJaWqE0@T-e1fG#3pb+VIkJV!WGi~#+y5lsy;
zYz)P$FY1cK`$!Bgj!9GS!NErQoQQbLgDgFuOH4XEfcP|S(9KpG;sJziG~%IE%z}_6
zFV%<7hzFk`iVu)F#s%=~Dbh{3Qw&1hg44U~rHN4oiHXbMg4kPQBx2iV%~rIU1cA|^
z@LG3CKDc9K|8MKAe{IzNFRQvbc>iPP{BK*vR^I<y{~n0vcdmhigLgV$>E_P>Mw|cu
zjIF-`I@T#s!UlFmF+%ya>$piBIp^7s@?k<2`5q)0_pt!8Npc@XP!!3>@ty(CfFL^!
ze7g;sSE{qcbJ-}Mu4pvYT_{mn)Z*7V<{Dvg^n$Gh;2cs*5Fm|Q%<7U$GpFuLl4eRy
z&m9J;A;cyjxJ3hq=dv7Y5WA{Goh{nzV$p+u8~3PiHgM(0h+u`tEh66oi};@c*<z6_
z$Gx91a__NYM^8O);^f`a*h`9;X~n!zf`H<dsV71_Fvu9Mrg1q?2g{PZ(Du7I9VZem
zYaoBfGQNQ=Ji<aqq`L(vGc7qTxh!=%NVtPxAI8C2e$k{hnIWb9-N&F+%oe*(FysYb
zvWv+pY%yiK@3C>^`Qm%nHVJ@S<jt&067MFBFV|t);?uC1bZBwEB)T<S5_ls9*Y~zo
zCPhPK$O|l_;(Eykg2HwP+okKb<1|~`SD7BUy!)a@3<^A46T}VS8aV1mXB5HYxYwPO
z!ZJ*TDN!TVen==blH-DmMVuD^dnb0FOvkgtZ$1@KuknAuRlr$u2WC0p$YAsG0yjNb
z#=`_!#Ks#ji}T9(<qmV>X=;_27fffmaw;wyIz;68Q~SvLzTCXMFJJ7g7WDA7L?)xw
zlYtfc_6?ni*Rl2$N6)tEkXOZ@Iq3OtT+GfSCYj3)2_8^*jW6cog=?wx3-jS5nU4lw
zh`550#PQ>^QM}8K;bb(d+}Q)O=koK)rOFz)yfAagSQ{j+?LmF!H!iZcKgD|(4cChL
z!LFrLi(5f1<x2adiJctqs*Iue-_~9I;$wsSPuI%>=f5SRyp#WJ$JlKCXEuE6LP**k
z^&n{x%^<oIcfJ`Or$PW4OaKFBG4~>q@zPkF5hOX_G*-Jj5QlZD$UbBc{Da4qulUAT
z=dzeM)W+5*e31Eo58TQNyarD(1TW%#wCVf285uIjB$w-qcdQ0jUv?V}%zu-+B)s=1
zZV{8z^*C%Ju0rMR&~}5Lu|XCMi6Ztc3%#_6>K<TkKnb6R@qPpuTR?<pzigI{POEhb
zXpw}XKx@q=HbHO~kzz{`R}8>XAg_hbYE}Yc5ueN1WZ^05Fi1Fg){J@ZS#gpYH_Ef*
z+<uZe0M8!fsDrjA%qq6{q@BoXhlGqm77tyMg(MgEH8GDB?N@QA8n*Ec6p0aXWC*`^
zF&QtB1HjfSIUx9f4}zK5d@{3peAZ<nmPD4wzIY&3cfSiD18m-pHPZAtSO<|Ndf?vE
z?=10c^Z3|7meD{)_*GsSFszMMr|0%82aDg_T9}we7P`d~WNkJR>V@J$f@<a0p-jU^
z05Q2tt~@l6x`CCNpUtO~kXp+H-}eMciTgd&Qu>zc{^X)r61(ui14ci1h~xoJ%gihc
zC~k6clH4btr|B0kp!gGx!?<gX)S<Y%x7uQO_YL@ntpuxD+<^;)0{+5292BrLxe150
znK*Kw7^@3H0$mdWK1-V%DYnGwMWkj%fKRRzq+W0xL-iTSoKHDQNY1A(1SQTemC(c&
z^IJg~ejf+}WN~sz@RNtUbPU3{+!M#)A=Iw{W<esxj9-dBjg56-;OTeFeZP5U$t@s=
zC}^`3lbMwEu+!0x6>{GmtW(JuXiwziZRf;*V&$eG-w#rlKxY7mXq%K=CUQv5O^DJN
zcZVcEi96hWi!K2Pg)S^%DjB@kk-<AqJ#rK35ps(yK}akuijKc+D2SuUenC0G?}6iW
zspPJXB=+mIGf`X%>$QV;hZ{0$2-ls-gN%z;?}hj7dHI#GkGHX)-0R~Dib3l_cT*m|
zV3=YD)@=o^eNeB6=}AHFoVUtPB?(3i*o4FQ-V#keKbV(#9EInDe3zI8U&J$SkH<qi
zCKSn{IJ$L65>)tI1)R|vS_E|+;!?K;G0@%~pEf1;U9NR@zwsFT_djv!z6Cfoy8mw&
z{q<i(Rg9hbZ#%}O>c6BBo3;zQ6XHejW&UpBjLr<XwCLFPRDam0rk2H87@)<U5ykg9
zus}%tIZ@}3RybySbc@$7Xoz`Qr-BsWBk<cxbrMFli+>v+Dh{N$iDkz?n#<E)^zT`C
zeLL{gxds5UDb@6{s#I*nEHkaf45#AMs+y)aRIk*uifvnVg{mb|sX7KV9gV?zRjrnc
zYPII*s%e$9GPCTmVj4B4s%Rv&v53P=F0hdCHdqw6X6$iEdq0eC4dGu@_54vNKXB!Z
z)0~etK}?r=d90SCu>vW!!vIuB16H(st0+!h;7c!#wDx3%f0H2%_`h#rqPfNY0}%J|
zP5l3FO1WIt)H446Uy82m{Qp1OF-GX$W?N_i??eB(wxj=T8Kd>@IEJD+C7sqvcCEr}
z(>6*D1aQr;Yno;<y;?I^c{4ar!P<KN|4XG$|M+p||9{w)v9kMfpFVfj*Gf0-T6;bJ
z&Yruzde7S*$^Q2nnFB95fA&9Xzwz{ED!=)??|uJcmw$Qh-be5FxAvat%a8x|b=Q6I
z=so#ozk6$qo_qY|XKwz}2OfCwXP-Fpt1rI$^pSTm`#$^1&EcVM{?XiXvv2&`m*>Cn
z<yYUVS`Xg+i6e_|&)&GQ?>ql&ed*osugjnN<XaE_==4AQ{O|o_&-K&(*w<ct`HLU@
zyC=W7@LQ*T@|h?9%ddUq^X<Rd{rujy3xD{0=BB@ye&=t0yyvAoCq8<u<@G@uBmCbo
zu5J9+D(X)B-;Oa_|23m*RUOEB6<see-Kd$CV`*kZw^fs>W!<)Em2OH!8^!;UX7t5>
z#ZY$s{&QQ#%I>?r@!E-#C6!(G+SjMf?E1pdN1pz|D=*&s$cx_z9{JL@o;qFF^(UW}
z{@_}ZxihZP7~%g|op0F=u&MaZ`#(C=-v*xlE9n0_@&D?N_4JSb$a>XQ6|G`H380#m
zVliE@tA<)DIn1=HHCocB;Z#dn0cQ`#v3~rAs9#ch^{;B>vbq!hw`1HlcjRvPwFiEF
z<@wz!PlY#Le<pWaE_@<)m;CkO>r<~4|M*{iuxHoFU-%jOg_~BM`q2$<h5!14&wk%L
zfBudC{Et><&$oYk=vyzpbi?>x{P1@cKXP*V*5^KU>+8p!eeBjJ-d&Y$dE$j<Z+P{w
z7ao?LkzRQ03F-E|dw(cBy7$cOkDj^h8R_r$KDu}B+UqmB53Rj<>*xRSxi`Q2;DfbS
zZm2%l{`1|BRIfjf{nRi0;#VFy^!UGj`=7pg@X*}vM|UjVvG>v6{ojB5<j*}gcjI+$
z{U3YZ0Tor2tqqcc<fLR3B#2ZFlCwl5Cj}}JlpG~UmMBOTBq~8f0YS2W<S0l~f(nR%
zC@5KwSN2TL>+Wg(?ti8qtT&Hut#8#@b*t*!bN1ce-L=m?=TbTD^gdhK`L>>(j_l2l
z+1=f(uNmjflqPSD<*T<K53z*z`*G1+U~jt>Zdz6w<xNY@6=GDk3zzwP?j3%1K$JT?
zg6W#Z*_`jU*+-wfJ|XiyBzX8;P%&H-^X2WO4d_=lo3r;O#*eY56Fs+Ba#?jY{uuv)
zl&H|kfU4ZlBlWrdnBAB%gAaVd7a_}YiWqdV%9^I#)l|8diM5Wh`WYZV)+k27@!k8g
zHJ3UCrnbE-Rn^o6*xJ?oBtyqvCnKFdbe~y0k~qbgPi5KuXj3*uLGZ~d9p%w1K$sU(
zqSgg7i>qHcJ8frQaIZT^b8Ne`MrZiToc~m6ERxXe+*tO))NP%yOOK7m^@<X?nPB24
zqHF%0@u5L$wAjgq<MB~^+(A+1$LEMa%w5@EEOVkd8gochV4@bWo?kz>1;evDsDq8G
zv_Xw!k>}Z=n1+!ZRE$ofroM`XWQbB1F>}+iM%8=bvat(n5+!7x9Tyo#A!2ym*1Mvq
zmUbv7-j|qa)_8}u7td6_8}77$Fy}9y%)24rER1oAxu7F_l@ceXn!m*pkme|Jxvth!
zjPZ^1gmh|e)7bkaGKreO;sm!r*^V=Yu`yKu(I*ABpQ=<=r9{7VI=|uRDRo(TgGq4U
z{lXC1zvDF*KYr31$z4>~gv1wY&f7V%6488lV#B&?jyXk}cx)Ibcsg5zE<wiO3QcYv
zIvcGrJ{3A0)j_2wscb$Xjaw-%j7y7FGm{m3(Ym^f6}S)y-nDy3FSAx2ogWn-eVwZ$
z=|yySi#cM=GBQkq!}o6FW1pw6;IE5tegJ}(j>58um%K^ZAmWy~gj86(5cN0>`*Jo5
z=3W|9&GDnJ-0jjW?X*RY>z+q=Zgy7Wmok#MZa3U8f|;Dw*-SoWyj2?i)DSO<TosBr
zXI5btQ;{m{IsSQ5%>Bdz$;jQ7c-iL1=8YF_wg?z(Q{U}3sjI&^xt^Eez*Rg~Z9G=E
zz6f<wSF%G0(;VZJ1lMR(erzR&jPbc9H>#{X5}#`CGp9?czdH~<Y3*=>4s1t*zgH?S
zIlwN<8&0C(uJ>V_e|GYnb5BO9<%Xq&u;Gcju4yF$O!#THvJY!gZtF^`bJboMYu7kl
ziI2WCJEfjH()V(9(8Cv;e|+P!=EH$F&q}TZ=r?Z$&h<9WZE?qnWlK4%%jB@B)9Xu1
zwP)Vk)UY+G5y@MZI|b5Vys#rDVQ6wwQRur<ya^*_D6~O)=xwzv)v~9qtLN@KjiueT
zRH?Xg=f=((pIsTZYxAEhaSkQ-v!w)z=C_6>hU9K+EyEqlwM=r4c%*_MKlX#uKCk**
zRZMkAv|Zhjq0lU0dG^^U{-ia%<cJm;m;U-f7b2n!TDq3IB>(t=(1kOqJ?F(lqAv9G
ziVAo3cBqQ=i>jgTCrM{jjCQ(I#pEg5o9*QIo*RXqCMK#GVK&Gi|Hqdpom^d(U2*L$
z{S0AAJ@w04x#gohv852XyNeIQh#7>i9|Uvr*uX17=gzv@okO-^eC*2l?+O<!zGAZt
z782?a7gHmD;4pH|IOYAyNcK#t<lML1bHIdaEosC=56DlY#nF1CCUi;BH3Dd5C#CY1
zqV$k5&EY`|q7v-qO;wKC%!vR=Dk#F30k!YFMsE{K^@XCQ6<I!jx3HL~;P9`XFe!O{
zsa%$E=GEr|E#E#k>#(_Mpm+mVA!>9-sM?~VflBOdGWHwwdl@$8w*|vb<zLfTpS#`G
z_+sOhnf@rJ;0W|(ZD5Fw;bPz>k(H?A`KP)bsSA3VSD3X~d{iG;3mzp`GP&G-%EXF_
zD(=Z+hH8f|S*lhF=XD0rSqfA-3K*zdd}b(V{qe8}K5EA5V@p?pM9AQbuE5Ha_qy4%
zm7Wug+S-Mo4n8~d@^GnfXS(%g!KKv|U#c)XsCrq-Wo&=P5%<r6-?%TS1k{9&%dZZG
zc}{s7=ZmL53eRcD0p$y;^Dh^BDCe6|hB2z9Fr1t;LNG-rH~X<9X4e+Zn_i!JXql_q
zLl65X>#^N45aKN9B$jt!n3A#1wx7)xc0D7+C-1#=@~yJ+Z$%}63=|y~5_D`zU+79y
z7joLPe1g(8WuDTwLldu4s@iQgJg=`YfF%<zXh}A(c+$X8`lK=kC)O1(BIv@IdBwuz
z*{6UkVq4+`qJ<;+4gEw!Lu_l5v))h7`&dQYwLTGXvg^bhB|N_s<s9X?0DoCVk0YVv
zCzK$JVv2Qk7|vbJpjV4zEQQ%-?W`5m&)EW58j#()%{dx6XD@F*S*odZwi-#}srBjk
ze0{gF<V(|MHQy2UukYQ>-)3dh-v#qZWh|(enfp4vtcY>HoF0*w5LgsYv)i1Geap?d
zeI4~C(IJv7q^O+&yV*DNArK1Ua40wYroNca5%yRLZm_^PD|^L8hoghr_p9qte459T
z)gVj!{Z92;8X`&FJQ?+C^dfhJ!>Xh_Qg7;N+K<XI)Sg`CO^;V#>d3nFp!S8D>&5f;
zDdozwn;jpwd5o<Vmet(Yc<VkaH~B(&w&hJU-2Tm-<XXR+DOH=sqsOmY*Iv}75nI!X
zTXV==Q9)TFDxY;j(h|OPzO!+=IkvnZx)c{wXKbj`k;{K3_zf83SE^PmTUl|JTwGm!
zr3a>DX)-MzGTnbo)cw)v^YmE}7h1^!Mp;Vc8;uKSN|sm~;vR8pjM(!Sa7x}16lED+
z(CXk)PmXh|HEI}X$||`3tZ?q+2RQ}Le!nUddNQX^_tvym1c`B**EsnN-4td^QjDX3
z_eDEY3WNJ|Ckdg+-mH5Jo8r5ccgV6AlSP{ZzOp)(bllUUmXM#je^sAFh$AvdX>H?a
z2SZW0M_Ak`Gu)VPpbu^%k#0p<U`|;TkH;8Ty?wm#Y{?~~n+JKS&h!lX2+ZiVc*&4Y
z3i^90U+X!ol9sEbk<1U_9b3p+USeS~V;@$TLZF&p!O@qG`NXrGKKE3No3wq=^H<{v
zHBF6^EJpaJp8g~=mKXVEUHX`J;WSH05KOwUPc5Cp{=3~(N||+7qx{Evl;(nwOj{LG
zQ+esj-M}P)ue}LCSYw)_^s@}Kg||d<q`hE9TO8#b2>wcwTw##22Y<qy6uh$6mH4Sv
zUxjgp<*(9Xo8Abb3(D-(E>+A?XGth3jRY#{GhY@HU$;7U&buw#_a5MU59VEa)R$qC
z>%ON4XHewRTeh2ww_Si-D;Y9b9kLcRgy8V2rkL7Uu}+O{?cWIz<EW{*W{!l*d!*`q
zP07qfTUl7((RXj9#2Vi<yp`1ROwUudC!@(FEBa-IeXiwP)c802b#fwdbNb~EB;hIq
zEmljnz*_z7TNl$);!-p29M4G2Fw}|9h>J7HHjHmxf;vs**NU41Z>S{2yHc9VTxGLE
z(-3iVvpW5bn2%g>fQ|U|nN0*=Qo0dL`>|8FlqZFQ$X_0BhxW7qD%cKHKi@?o)5Lr}
z&ujQve1RbzbsW2!iKu@fbnO0#b)e-SJF<?`5L&eMoYh&_WTPmBm}q`M5FATK5c3E*
z>P7$q(dTO|Z-QfAYaXXLu@#SX4`dxX&$(;g!0vIJ1HXkQ*9Tmv5&|mshapaV2?$m%
z=JO9y(PS?5`uKd9Zbm5kVt8HTB?XZ(!Khp&ALV5vfJRBOW_u>OyusQ0!*{=~=!((N
zi(lNxnuTw&2=S##dVbCpQ|ViXZh5V*>7UsnKE_`}tv*oI6LPiS=pv0liu`)9Il;H}
z2$3m*!H52qF9#oeIkCzWOE2Qo=Zg=N$E(|0mdNCag-BD58($UD5fILkkMsR}D|W%G
zT$b16nA3-Dq@_@rU&D%tP>`<B&F`V(at$nF7XF?7L&;uP^5|$Si-%pKp_+@C5{nHZ
z7E817c16T*PU_~BUOKOxNNK2HEA-m%j5A7Vwzc@kCnz}7tKIp&D_N>=udI<}bF~v?
zBeCub@2H2LeBOzI9g`d#$b=JVNN#avDZ|rR;|5bbtJ^`wWr+bz2^06PT6Ev9F@J*0
zEiP1OX?8Yx!ew!n>NYZK2$`AbLt+X^L?gaZ+TLL+r5}||LiUdPo%OjK{b`slSt4G!
z?#u29FE*D?PqqhY{K2X5R7|wIn$bx;wo<h<DN=!^*DjljZe>9mA9xn0HYMwf-(={P
zbU_!U*f@o><8>H7RA7y&ly<M6xvtF(?u2IhT*HC)wMl^Fv-W4%X>O1A@ZT_&G}me?
zDDa>w9rAXosf;9I`(#bV?z;fQk{Vcj0V=fxJ@I<K4lz+*!BQi~PTahG?-di0JT<D%
zKI(!^8Pz%A&53DbC~dr(j|U_`D{?@FemIF2KNgZdrOj(bCmfMaq546b>pgR;A~r}S
z#^jFl)4t)&l{pRz2N)NfR){a%4Id*hbgY|qvp^}^;_Y`XI`c-NmQUg#oArEWJA8OX
zxrd{p{i2i?+6Ilm5#05~$|XnRG|v0tmC0rF1JL>K0F!7?R)6*mi*UBqHi~^f_v*1C
zsmOYr?)Fi6`#zNk`Y3-IqrQ_<3BVO9IOnc3d5`rV_Ozx|bzSDmY>p>6xx-k?2a{n4
zwr(k?7m+5%`@&mG!A?yd5l$N;4J~h9Sc_SAWNU}qu4uF#OQxROq_`jLMnA}{FQ7^7
zwe&te+q{=~L&8x^;N9(@+_Xdxe}z5O&E>2b-C_DEuihGI(s}d7cN;<*9~?f8RPexO
z=usu?4mE367+-c)V*?9KLFb&->SO3Q!wS^585|8Vry(zD-3vhv`izCcNLh*Q1?KO%
zn37qS6iU>7Zj--x$NR#3TjGhGV)eH>S>kjgJIZ9xcdUyX*D!JHf$U!FjSHg5m}S0s
z;!rA&RCTR%zSAXXGL|XNXLM<1*{-<290uR|i2B}fy&J<%^q7j)Xofh%p724<GzKB`
z8Gf(fZ!TZ!Sc^VyK!Z{=-sXDekPzJ@r+Jh1Ln$J)ZJGcKio34iJL2&PI3>3DSgy>F
zSC<!BsUPcKegB<tg>>im?Q8a1S=2~ou|%Ea6m`W8dGKir5d5_GaWonvwwOfsTH=ht
z(qjNB^BMmMapQoNTP}Em)K)&Fl6!{cW5m(U1wO$=^-oQ%WN5U(Ju(JxDNR93{ycrE
zW8{6Syy4%hb4-Sg*cujZ>3y{Gnwvvh8`g#fYWBu0&b}dCRQ166xf41AOR*p&BJm(5
zbk6Vc-#h2zsA~~YY&%%kR_iF95LEFp=jkOG8lt#hT6o;iA2MkAlML=Uhwrds2d<j&
zO&xpMkUR1s+*U0z{jJ~Wr7Ik_XEaHJ5T5F~6Q`u7ui{07RX8uF#E2bDveGr6fR9LU
zz^%DeKl(M+P4lC5WV`$$w4$KLPuR26f79WVG#eXbuiW+!ElX#v5RL4u3Da<JkiU8V
zL-ozOUAz(1T?R6-S&K(-KH*zOz7<G+oF)nN^+^5p>~(wTBx$LG_cgStld=t?c+wFD
zKV+OZV6If&DDq4m-^1sY#_`99r}7zR2%YsN+&Vxhe5a?}MUd4oGq1RVou{06&cffs
zAa}o?BMLZ0(=|iv&;0X{)P7A`o?bO+`#dK^Q$w1n4P;)eB_@h<p)QO2$=>QehD3H9
z*)mVo@g$BnlrkL~t8umExT<b#9odD6S=%>WwPCW3xgLR$Os!WtHmu6v@w!gN^e4$A
zZcY0SM%<B<V5kAaGUtAJq08Yz2c({hwU#X(4W0rhx0q(w1b(aT_6Zn>PSTkJI!TbA
z9lniP1qCWU(tprp=dyWH`(;=LyrcM$*V+e|vp3}mHSeNzY;Ij@zaplb#v@ffQjWR_
zKuh|Wco$`U%Xfw06Z<7E1=4)3Q#lRwMb5%2<p7D&7oFCz?xa!{k}2wtIcv3nFM(6-
z_oq-_&IPjarl{-2=b~&w-0ABqw}lh*)#^U?O;EJ8n>4s4oEYqPRK0p{-Z*T)n&IeZ
z3e87|)Kt_ZLB>J3rTNED?rEBVPjaY=pYKt>$exslR9REEyK=VvoIMGb|2cb76R+O9
zx!xTcAD=Dug2L>B+lTIC0rLhOCsF7mZ7`Hqc&$B{&9qb13lX<viJDoNW-ZjvHm-Uu
zS#2nlN*`k1v#|zVlA!W|b!EpY$yG9XcFkm=lU3O-Rv1iAyc}fW<`ch|%=Gw$zrV|y
zPR$vreuYod6c`d&JEmlV2E*B)Gv3NeSZ9j3;nr_8tZ(87p(y^nat8+-B)DMH8c;)#
z*Co`D`#@CCzv=FKzc7>qArxij>u`+VHg1FUkjRhaw#+vfxdhX9i)k><dTLYzFnu>V
zN13n-+jZ<F)p^;TjOy@iy)8Lisz=Q!KO-cjFC*&!;>qozUoQ~2TcaYW`1P7gh4<45
zY{s#u{;1<Z$?R$%5IsJ4jWv#*vf|~}0{Tl#wRhfVBt@fwI$W-~*BV(k$*2SwL(H{`
z4B&lSKW<R<l{`c=)ISm@rkHHnM9yI#KOr0q>EOLq7B!Pkn*55f2q9R7aXJFzy|-KS
zBXN=*7xyD^lKY}{efg?D1|c4;dUf&oxGk?PH~rRzb+fU&j4+$;Br*di2*PcLfm+v=
zdl0<+_9rboq>mr%RhFSs@p;I`813fCBs$5(6BNCfT`7967OJ-V!B<YNc+2ti;wKp?
zV&0n~5A#bIqs}!v=1;sioUb?89Vxb>uU4KgqGl(hm7_Jhkk>Bg9-grVlX<VztnWu<
zC@-vj=MMLy3{IT}nkVFEA3I?w9IeHCpKH$BGHZ~(Wpf*|Eb1tkrfyO+8gHHmKK8M(
z9s<k+QY81XN;}%^I7UhBEI4k8o_i!KR)&2si8MKen738k*ybKoaVMIM>Izs_mh$!#
z-cVTyaImZnW&%E%Bix|GPFC1oF`LzOml<z({q3oJ%d5$p>#6C3@}8p+8)cs~w{&Y~
z)yM4v>=`&0wmsGBOev)U7o#8NlUy-pUHK>nF*kWlYh<HDd$EZ&%I5p9ZT{&w&7m2e
z8Ya7!(-i04!ecw?o{#NBZ+)rkE~<1ct<09Xm-%UHb!io~wzWoP)3$PUhB#FC??MF<
zRs5bcIZgp%1?||J#@kU=*}#?=iF`_EL>EYYe2Q3#sBssEI|2Nu?v_tSNlsByiKt4;
zYW^rfHqjZ}d&H)nf%?p=vBH=W;w)zDN#Qe|3MALD-_B2!1u81c7BIORuwRP*N#W(_
z8u<u;?$dx8Rgz#b7_hbI%zP~RAxHRbMVR;!#QAozf}$xeD65S+57n7`5}83I$?kyC
zOgw5BI;*K*rdz}s0kl#ly<nBE+&G0{VkeScOBQg<*Y2~l^ZC^FxT0!iE_!|RTdei?
zlQND#3JL@BNT_l`T}Dg13|rakXu8v<TIT{y4{dXn7U|6bd(RE5LG*~P)|tG}aeMu^
z9PzLNPN4rU$6q)9V~zFLqm4h9{|AHNfZxvlfB=W}U;7PWqQA`p{W~NfkaQnO_8XG_
zf)xKEDfb}NZ%F-blI9nr{R1BT1?dQ+{~a>?e~|I-Wcrh2{sme71+o&zb^v7mJ30P`
zd2A0J{};&l7m(}k<o+G<{F-DdM_fmEE>J?VG}N}&pwF*2zgdHK6WnWy#JyO3#$EFw
zk}Y@r3jmhZOcy&#_>L&E*8{8BXR%C*Avmr+=gc#ftNF476Zf)Q$yZ%vv5u(qgjDN|
z>!ST%yfq|TW*XwDL@{l8`N!Aun?2s)44%|}8eb<|vPZ!j+|Sj!0_*P2jcfVoLz2o*
z4u%rmzXanyCijXiZ-+5m!p|gpxjc(R(V1{QwTfkNoTOdP(Me$1qNoJ<BW`MDg!5!T
zs$GLz&#vH5MU2$U(hu_IQe-&R5Z-^T)rm3nKhiqR*TbGVnFp@4&Ujl$IM4jw3wQ{Z
z3n!{P_}hDvVpEgWpd&+0w8w2aocjp<rL~q9Vln5mf3?Wv<0Xxxa<$;N{+!^#!dGhn
z&oKaE8HP_h9##l0s{HtrNy7U<w(qD+R(R-M4G9lLrLieGWqtP|{0te+3DR}?V!4b;
z{W^4^g_?_6K~jKl?NDp^covp^zf7fo)Euv}oPaFo;sX>2at!h1Y(HCY4w?s26}oBX
z+yDKH=twL<E<j-^tYewyB%m~5O{?(fnh6n-=N*LciHziz%ToyGNIhR<>viI8{Oq`t
zQyF1AVaX4o-TP*SXj8K*zV+^s*FV0rEktl@rxZQjNnqN9qz6~DV0&`0-ViKiitzhA
z74%mVCA&H^uiq02^P}{Ay}&z0&{oE|-wPlK<4oFDq8-XCWm5g_rrFF1=8EgsnWB^*
z^71ll3mjJ@()RYuNoK{1-KSuzny(0-XP(Y?l@G7;crAIMHX-pTwVtF_LM=ghzpNU^
zbk@$y5*wPjxP>ymY=Rj=qzJzwxNaVNoF{HrDZ(OHv)ktgB=OY3DZ;q5Z68mmJ;^E-
z3vr_5l+e<UZ?e4x{=EqCJ!8Z~;PCAD$6!7F#(4VPdcF22qC@<IJ>owUc)#m^f3^M(
z0)fE}>%aB`d)ps|Mgy@p6dVM=;sFo<3IRc)@q`y79s`D8!9XYuh(x0POdEf={)2FB
z{LTI_I0O#-ss0ysSpT&z__6-O)J7i2AiL8ef+rE{7}wz8Q_9j2TFIL@BG{oQ`sR*$
zs7zs9fW*@0XOqu5Y}0qiClv4WDe<-HDLjIZVKrDs47dX>1V3ay8wL)Zzo#wgZcL7d
zyOfy{6dISSn0mSRIL)=ek>Yn;J9?2*V~7g6w+m078OB{tA}dcCh;yrYKBs@<X~p#|
zqQFt|2#(Vp16o&BUqpBD7p=`!vhnCltQYTYBk%iS8`M<}da(Wjv4{U7kq4~*gqK78
z-v{h%e>5I}$3wvg5DJ9GgHRAW0D*v`u}}ychr*&!7$^b*M*{y$8-Jw#Kp5!1^&bZP
zY5gDIQ2+M@9>k);YMT0l8$1^9tNMx1)C}Prtw){jmZJ=h=e={|xG`Vp_^O$Rk_F_<
zJfItK%%))2_B(sm%+(n$OUo^ixQYgA%^n7_mdzZc4p~;mseu|Z10?um&i0zeld_SP
z%^@3pqKY_C{6Y8l5WmD8{tts5@cKUh_)!1%1AE&a0fD2SXao|9L*T(M5FU&L;4mN@
z0E~g6VMqubg9hW!f6e+og699z`aj^I{_h8V)_)l0@A7|Mv*S$PkGg9Mky_!8y{PIJ
zZF9Zwfl^nMMIW#X2@xQcVd9`q`VfB^_V9ne0q8#v1_MGNK+xax|8V{HzF=?rgWxzA
z8Vkb0VQ2^x2SS3uKm-^ML_-N$0Y_mVNIVn)2mP5g{!stH&|ljh1cU$%pZ~ot_<8*|
z<iFQ{#|}<0oh8yQpb$9dlRL!!IQH;==z-^d4%dJ03--1@5)VTH(Ks9k21h{<I4~N4
zLxB(&G!%zMfC)m4Mqm+`zh?g@5a2iYA0XjEIMo0BfCsVu&A*idd(lnPe+!TmUtm_F
z55C^;7<b})4xjMR?>=c5dz#WxiK27wJnJv>a8Z8o>&xxQ8g4~#nPIQNwM1XVTzu8!
z@g|VE4%;KrE`q9VyhGt5xGfw^{n2GuVUlz8R<@tb`|eX!lM_Z;C8zo4wa63s3WNtB
zbiD{)`gfGET1$41@4I{<X;hb!KIrlIzlJ^hAB;bM{11Te_a6=e9?t*nBlfmG9)utm
z1dj(|;9w9MiNk>*5EL4ZheLrV2o?i^!G0Y6Gj05#{{MLX%P;Lu_$zSu{FnWK2eDX`
zoL!SFEs58f=*AI}+Om&a0n_YX&R(W*eByuV<<jTUvz{m0i94)qnWgLNr3+KeD>rW1
zWQ}ZdXk8!)co0)Kkoa&TCj_Qoo%qI}nX%(zsBdM7O$>AQ4Ufk(kEwe~*>Vy{YCiN!
zC`7&rpexJn)j`lz)Hl3_#toBPYMrcGHT3!#GD?q4dbi@tpWdIu9T$;6Mw8aWNr_Ue
zJLu8*&&MAAkHa4B|N3kEhx-5C_D6uha1;Uo1>@lWI067bA%Q?V3J*ggfzTgm8W@Uj
z_^+A&{jvYkuk-)l!~OsE2S4Zkp%#Gu=SC{GPcDt>HVbPs<D+vfeZ1)e^`G596P<Bq
z9y;hA9OB=>9{!Km_xjJ@<o^%%|JxtzZGSit2gG6^Kokasg21paAOwp5qrq?(?8gBJ
z5DWrgFxWrS#vkW@K)=oZLl5`=+aLU+{s(6HoBE&2;$3>WmQTI5vX13}OnYs#s!oXD
z&_txv$yH%9`7N|%`g5?|i1#k#E48KI9siE8i6?@Vp#f9d{dcjM;fUp#%i;y8$#Xi_
zy(C9R=cl%9$`}S?f6Oh^#)dPI8?0J-xptK|TOU_{rA{%e$DPcpO-e+`2-7*}5&6G`
zJ^UYi5b^&n@;^|>Vg1j(U~l{55Lg5R1wp_;XcPvGg(C3~C=dq(VSrdD00qUNF<3kl
z{b$<vlluRQ{0|5OIn@7s!2#+24a$mQ@i@C<JBB(dFXuc<%$}q>H@FjV+amtdjM5?g
zD(vC^aNt4L|3DA*e?PFd{lRz$5(0ri5C{+q4}~HycqjxxP-Z*=2*#q&I5-B420;Ey
z8-Jw#U?Ak5>VJTT`Tu=^2XWd(bsG{O%iL(52ZdF{?mJoGqmV8;6Hh<OZ%AO|yN0hN
z?F(~jlw|y;{AGn!heZPEX8kD`UkPyQ(I#%|#D6ubxs;upYb2(9Csl(=S?Td)rf8sH
zABEuwWQcb4C%~pfPLEw5NO<KoT||f4#7%LZXFyC~QQa4x5ccui=CLZ&<qTc>qRc0*
zf*!U<B|DVVfCI=|GraoCwK#0&(zSDSzNvl^v?8Jc<aHC`L)?N4JzoRlOy7#GJNgD)
zv9yBp+v;6vp(k}QsXpkj{NISZ)_)#={{L$J7YaYr|NX$;_9xf?2!&$-P!Jdn2B5%T
zC>n_bp&>{-76Jc}`UfE(;J>8)|DWUkAJssI`oAC8GyX5$9kkds&o%OTgGn0NRnPIJ
z&jF6z`P2L7YI%FU>=Lp3P#yo4C%PO~gQzzVBQ485RaU83lzlgdzfo+yE8A3gH-Tkm
zwL1MF`=gJSmbi&T*b$NkJtF_Nu!sLcPzPQAb6EesFWB4u05~282BPtJ3?76)AmB(K
z9*l!w&=@2J0);>^IKp8Z;?K14hx!lur~D5Pa`^o3eZi0YALO*i_!-D9JBQc#k>9cd
z0F~({I+-CZVDK_{o9OJ*TJz|M#hlm&Py0<J*ftnG4_^#6Iw{H;rX^(DcS};g%j`bs
z!>nSp9Ioa|*FIJGUCIrDik`5HI97F$dYDGpJ_0lKg@w1}*mn~z-X+2DiF@Y5>p_<3
zzVBSGcwgdCvlpN6em0%fM!F6&xnj5C<}f3p_q8XZt*XIw#r9LGLu#>GaO>BKB#I0i
zT;@pj#lPZ#^oRHd_WJ*S(Dk42L;c?u>}`KIilFvbI1md%0I)d7k1P-X1;WAz>W_zD
zP&h0ehKBql^S{7<)_)M-F#g{c?79C#rT6;C>iBCKudC5YcDACx`s*<QVSWGR{tpY^
zMH>#f$A|bO_KN=w;Q7yo^*;xIz3q=d0?`Nv4hF{qp)eTezuG(ZxR~-jj!SOU%B6H+
z=~PHAnR8~&IWv`9bIG`uN~Ck<oYPE~8O==hSR%Ppid<4ch}@Fop=i}ZiX{<>R>-9`
zsXS6ho*BFQ?8?rg$IdhJT6^Aq&CKgezvlNn-|zYTzQ6D9^MeVB!IZtBSdi>7z$AD~
ziY=QSbfk?A#{ZA<{|KG`R|$&sfBp~aznx~@v20fNFQ)lD3jCi?L;dH+`5#*UO(iI{
zKS7WPfg%KsV<4L+3-}1k!C^LnvY04=5+H+xKn$hS|3fhAll@;19sgBAkcLyt3@=Ua
zn}|%LMYq0-E3ws_HM_bW>tw1yLgD!9L_=Ne;R%7ga-09*vo!Cqc+Aqw%|EU}x`du<
zDPNRwx6pEbFa7Sj*F_c`@9uo2Y+-hav}f&ru%L#jsPEz~IccA*D|s+0Is8QUZKrj|
zwyc<#a)q)WpIz-%;^CIoz}cUEu3`+=%*7(Fc+D;UjY-0{VWHBT^=;w0{Y8VK8+Qet
zKV~El@O_eQm_%sIyQA*D`WjKR{}WPk{HOJQRD)vsV<ely#!-mDgD8|Fc@Qca^}{$p
zz%UzU@o<P>5`<Fr|1v@5C;5Mn*8fonK^i+|xjA$Jd%v{VU#&ANSUOZ|WQy}OJ*o8$
ze~;sF-1!Z!y5;G#IG1jEc<+u~UTPht+Xq-#9o@@5v^M<4qoiWX@~E^eMxE_>=GN(U
zf<oWU8+DzMin7F6U_mU`|G3|i^VKDpBV8Zv99u}OSy^C~Z;wQl4`@ug=7og7hF6cq
zro3&f)^yi_gX%A~+C7-?bac>Z<jw|*=XJ(W_9jRC^78lSE;w}I=)`$#eVjzcyXEff
z)a*7UAlag{WPs!DV3W=>3Y<!N#ihFUQ+HSXB~jr26t3R<56q(LKUIQa`(sQP#o26x
z!)B2r3W97HBOnF>lL$=l7%UJaI5<Zs`fm`5e6s(G-v6r_KIs3;<G=m8tHZrC9W2sj
zLcqhrd0nRtNh|9a%&OUl1=LsfZOuvg=ZeJ1-Z{(tS_W@24sSBN#o3+usK=s!{*q%Q
zAy1ce_44LAxDI5U)(P^}aqm5FwZ}r&+p(9{<r&QjKbc_mR=+BIT`oC5?`T5*u&Ck9
zdhRu?1L_w?zk0KAa;T>7lB~Rh-uHtWFQ*K8={LK@BrW^N55_&LD|bEHJRa$LsxB+P
zx=C01Em!ZAZvOtTf@x!Xf9l?~!g05{d+)E0BK<G6n#cbjJ^oh-itW!rV1#0EAOd4T
z6a~p^awv#oV<ZcsKp3SM9E?Gs9ckmU`G3YI`5&0pe^U*=>VLxR^gnl&_HDu=!c$5&
zmY&h?I;&}6#QFI6AI?a3g}Hm3p0L0RpC*`d(9Ez?)D`_*>i!KhUyh>s4^rLrKeYaj
zN>FTn1jKkKgGG=ek022y3x`1x<`5Xh24w-82@^b=Nhs(1FQmQx8-4zZs`ya<>D9%w
zw|(X-eg73*F1sAb?+tktYB?NA5*pq0uvt}MH^YE4E}(vFOM`>RH}U?kF;{kLyRsZ!
zKI1J(m~P;3Q*U^7_=GLfBykSqVK1&Nop7bq!Sv#(z12>d_+SH1!|M@V8G}~tO-g!j
zapBwLhnB3|uxw{#_k}Gj5zTH@b!~G)LN%qyDH9iVw!Q0dgi~kCZZdI}^qZrx`tI!H
zW3`5*dV?ln0o!T=TI+0sMjv{uaq+ODjk<g7>p_wJ7f;>#Z*={SN>FTn*;t?Aa5xk~
zfgBdeqd*=Hg((chWwQbTK~NlHA}G?4Ha?sGXS6^61!ACd{l7~1wf+Z!cpcdPHPLDC
zQ$r#(^?cPF{_jeG(ndLz?C^U>y*U{cIjC%s=bN1;?`p%AqqA)7Mlmg%<Qu*ov`7=%
zEZ6Q1dyrXdQf_eQY~jo2>-Np|w@(XRdwSf6>2udlKj&p$k)O-WCSNX|R<by~wkV_|
z<Z9PS(=7&1w;Bx5^j&(_CpYD0?yhib-~Duvjs3(`#}D?`F#5rDn7TXhFN^~J7YHel
z(w+bvivJ(<-(eQalwAkHAVll`s02m%A2sMdeN_KT>wl{T#rDT2kYGS44<(sQ9Os}s
zh{NV#2!{>x2#CXB5iFUTDrf%3K-;hXAWS;{rxJoRMn!|#{~Xs_bKZc~?q|=%n%V!P
zZ(7W*EF$vCnK`va@9#a0of*|lkW{;-wr*Ll15m9|HFr_UoqK^x1988>`i%_Z+a7sa
zpUmxd+RJ6fgPiVTHQU5kT+&Q%co?QLO@}>WW5o7ApT6}cYo@KeDd^qvPCOKu8~Sb#
zx~YekcLTqn)09cp>h6WVFN)6pRrCChuK!gLitP_FNSwuyAH@VCAdAVvc}xySvN>|~
z4+xQs*Kn9Zm2v(LC>MKdr~eJH=>2~xAxOjD(OWbC?fuMCv#porqm_fl%^z}c+MLtE
zJw4{9oa;5dm(k=oJxYH}jsZ8E*=U<KA?f|S$73E1<#(!i-cnXxUT%tB@?iu?8f#~z
zALH)ReBXstw|j5ujZMzS^ebOjT#a@6SAy9FE<a;m)QL#u+DaWa;kSvc9*>bG{stR%
zeRE}UW0m23J*}n4^nDwHXP)X4a`}`-Hn;GA+lb?_?2JiM3a5X|T`{%#+&F8|<J5*O
zHKx+m%nS{HnZeb?j$Q*@TjK8*QMyAdyPG_p-!g9d;n~~z4H#lxQMl&B2xFZ{TW)qd
z?xRbdAH2k+l*Di&mmtB*Ayc6<7h(=qfmbzG0q+D5`&iG2E|19I>zHhF+h%*-f7^2n
z2gZ@1Ck)Nrr?+i|cvBZ$pVo8wlX(S?%$ny~`t*p{vv>B7o$|Kd$Ff_4zF&Y#o7Y5^
zgxO`g*}1=<cJ_DQH_&M|bb0fm38xp&=YQw%LgT@!5WBWQ(>={M5^G+7@r(qk`lE(A
z+~-e?Fl77a{Z%)w@MFro>~a<_Y+l~=(0Or}<tE-ytMVY878q>0*=BxQ;SqoCtP4{w
z#GJa&r)c0Ny)|W%qmPbVt-Ce?3URwt<XC2xwaLm<k6)Ej=2jHbnCkc<v0!z>)_Vcq
z%{l4oQBAJPc8imC2FcOqjPw#(^!3Q7x`$`|?p0d}r;K|a#;D%e)4jR-qQeH}R&_52
z&&}u9_AtqqS5d|nMbE8xUCFrQ`tHDq>z7+=w95KFGuUuzGTSR+ZO;s!6EpW}CmSz#
zlM`z@pBlkwV#Hay-<}c|nPeH_RnWS{rq966+?I>+$4(@amxL^i)6VqJiT}ngVzc?(
z_1fOAS<c?|2QQpz_Vvh#sd3C1dAfqp#{flwsDgxs;+y>^R0fw#Uz*wwVH_VRsje~E
zaHz5*<iHJQ<A?6+YY&k3Ns&(e?fPAIIp(uNT^@xEO<Os-n6r3NagSN4i6i=yWOMHv
zEQiGJvYw>cWhFk0xv?XC#_*xW;w|YnHqD({+;((QYkGCR%>Bo2I-jasWs_lOT-O>h
zJ$Hvr?v;w26X#hSerLM>`<Rs1`7f|<x*9C#6S{8|_B?v~cPG4mY7CL^Z~FE0e(sz#
z_S$Q^xTr){{r2^5v}X|M$=VehSI79x5%t%$H`%{`=n`sq?)yhJ?>aO@RvYc&KS4@(
zV!;xrKqORN8}cBJ{I~NzQK<d-e<+>*Qw>f+A?8aGz;E|}4L}kCDInzwBmgDwApxlf
zkY5AHKBPoqKz7FjlDL(&y8m+;Wzf$5aWN+3@kxmiNB>`R{wEWp_5V~tJNr+yA3sUy
zZG1NVLufnuGeMZ%|Dh7ZBxNlN{*+`ipTr2sXkSbsCB<}b|GUu6|9K)ICGb>o8=v$4
z59fb<?EfgO|EwC^cp@>mNL%Z-dq6hE^TnhAq*x-G1OQ_IhPIY`80ae^NZC87*q_wa
z!ZGoG-l+Q*(EJ(N`M*-veShVDAOA7s$AHu0KNavt_9ugQKK_LAgcd&+|Cva8`@;;n
z{$Dki%jff>d?cgfF<t_U8YPnQWuag8;+MN%6eSk<j<J$m_0i3tZ4Ph+LfJQ@d`t?+
z`%nr53Z#6%!rTIoKOJ}?Utdxvl~~EHoGcOp7_dYvk}oa*z9Na#Cm0Y2fr%q!Unc=d
z<l`d>6bL<mK#{)>0pO(UYEO}f03@Uo5K*$f@Jp+}5=<%^o(d(vFn{4MEy(|bFCd_R
zV39u%h{-<?0sa#5!{?UPvM&#}auZ>T<S&-dPpfvc^ZySs0cE%GCGnrG|5puvWdEOM
zg34>-3)X+>^WRj2V*CG`2~b8GpUwZkU_1N6D4qXN4FpM1C<svu7~?Pq4nh(*fiftJ
z$77)chsDB4n9V^+CjH?2I#KNZQc@ya{PTLipKPOp{{OrBPXwj)KUD*TcTDGl_W!Sw
zKk|Pm=Bd<4z!$9lu^@W=kA{YZhK7cQhK7cQhK7cQhK7cQ=1=i&Ji8bi06+l%grP#K

literal 12445
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
b(4aws1`QfCXwaZR^LPFaIec>z0LTCUkCs<U

diff --git a/test/functional/repositories_bazaar_controller_test.rb b/test/functional/repositories_bazaar_controller_test.rb
index b1787a538..98aa2369f 100644
--- a/test/functional/repositories_bazaar_controller_test.rb
+++ b/test/functional/repositories_bazaar_controller_test.rb
@@ -45,9 +45,9 @@ class RepositoriesBazaarControllerTest < Test::Unit::TestCase
     end
     
     def test_browse_root
-      get :browse, :id => 3
+      get :show, :id => 3
       assert_response :success
-      assert_template 'browse'
+      assert_template 'show'
       assert_not_nil assigns(:entries)
       assert_equal 2, assigns(:entries).size
       assert assigns(:entries).detect {|e| e.name == 'directory' && e.kind == 'dir'}
@@ -55,9 +55,9 @@ class RepositoriesBazaarControllerTest < Test::Unit::TestCase
     end
     
     def test_browse_directory
-      get :browse, :id => 3, :path => ['directory']
+      get :show, :id => 3, :path => ['directory']
       assert_response :success
-      assert_template 'browse'
+      assert_template 'show'
       assert_not_nil assigns(:entries)
       assert_equal ['doc-ls.txt', 'document.txt', 'edit.png'], assigns(:entries).collect(&:name)
       entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
@@ -67,9 +67,9 @@ class RepositoriesBazaarControllerTest < Test::Unit::TestCase
     end
     
     def test_browse_at_given_revision
-      get :browse, :id => 3, :path => [], :rev => 3
+      get :show, :id => 3, :path => [], :rev => 3
       assert_response :success
-      assert_template 'browse'
+      assert_template 'show'
       assert_not_nil assigns(:entries)
       assert_equal ['directory', 'doc-deleted.txt', 'doc-ls.txt', 'doc-mkdir.txt'], assigns(:entries).collect(&:name)
     end
@@ -102,7 +102,7 @@ class RepositoriesBazaarControllerTest < Test::Unit::TestCase
     def test_directory_entry
       get :entry, :id => 3, :path => ['directory']
       assert_response :success
-      assert_template 'browse'
+      assert_template 'show'
       assert_not_nil assigns(:entry)
       assert_equal 'directory', assigns(:entry).name
     end
diff --git a/test/functional/repositories_cvs_controller_test.rb b/test/functional/repositories_cvs_controller_test.rb
index 2207d6ab6..c728bf362 100644
--- a/test/functional/repositories_cvs_controller_test.rb
+++ b/test/functional/repositories_cvs_controller_test.rb
@@ -51,9 +51,9 @@ class RepositoriesCvsControllerTest < Test::Unit::TestCase
     end
     
     def test_browse_root
-      get :browse, :id => 1
+      get :show, :id => 1
       assert_response :success
-      assert_template 'browse'
+      assert_template 'show'
       assert_not_nil assigns(:entries)
       assert_equal 3, assigns(:entries).size
       
@@ -65,9 +65,9 @@ class RepositoriesCvsControllerTest < Test::Unit::TestCase
     end
     
     def test_browse_directory
-      get :browse, :id => 1, :path => ['images']
+      get :show, :id => 1, :path => ['images']
       assert_response :success
-      assert_template 'browse'
+      assert_template 'show'
       assert_not_nil assigns(:entries)
       assert_equal ['add.png', 'delete.png', 'edit.png'], assigns(:entries).collect(&:name)
       entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
@@ -78,9 +78,9 @@ class RepositoriesCvsControllerTest < Test::Unit::TestCase
     
     def test_browse_at_given_revision
       Project.find(1).repository.fetch_changesets
-      get :browse, :id => 1, :path => ['images'], :rev => 1
+      get :show, :id => 1, :path => ['images'], :rev => 1
       assert_response :success
-      assert_template 'browse'
+      assert_template 'show'
       assert_not_nil assigns(:entries)
       assert_equal ['delete.png', 'edit.png'], assigns(:entries).collect(&:name)
     end
@@ -118,7 +118,7 @@ class RepositoriesCvsControllerTest < Test::Unit::TestCase
     def test_directory_entry
       get :entry, :id => 1, :path => ['sources']
       assert_response :success
-      assert_template 'browse'
+      assert_template 'show'
       assert_not_nil assigns(:entry)
       assert_equal 'sources', assigns(:entry).name
     end
diff --git a/test/functional/repositories_darcs_controller_test.rb b/test/functional/repositories_darcs_controller_test.rb
index 8f1c7df98..3f841e9a1 100644
--- a/test/functional/repositories_darcs_controller_test.rb
+++ b/test/functional/repositories_darcs_controller_test.rb
@@ -45,9 +45,9 @@ class RepositoriesDarcsControllerTest < Test::Unit::TestCase
     end
     
     def test_browse_root
-      get :browse, :id => 3
+      get :show, :id => 3
       assert_response :success
-      assert_template 'browse'
+      assert_template 'show'
       assert_not_nil assigns(:entries)
       assert_equal 3, assigns(:entries).size
       assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
@@ -56,9 +56,9 @@ class RepositoriesDarcsControllerTest < Test::Unit::TestCase
     end
     
     def test_browse_directory
-      get :browse, :id => 3, :path => ['images']
+      get :show, :id => 3, :path => ['images']
       assert_response :success
-      assert_template 'browse'
+      assert_template 'show'
       assert_not_nil assigns(:entries)
       assert_equal ['delete.png', 'edit.png'], assigns(:entries).collect(&:name)
       entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
@@ -69,9 +69,9 @@ class RepositoriesDarcsControllerTest < Test::Unit::TestCase
     
     def test_browse_at_given_revision
       Project.find(3).repository.fetch_changesets
-      get :browse, :id => 3, :path => ['images'], :rev => 1
+      get :show, :id => 3, :path => ['images'], :rev => 1
       assert_response :success
-      assert_template 'browse'
+      assert_template 'show'
       assert_not_nil assigns(:entries)
       assert_equal ['delete.png'], assigns(:entries).collect(&:name)
     end
diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index 7f63ea3a9..6c2502f51 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -46,22 +46,37 @@ class RepositoriesGitControllerTest < Test::Unit::TestCase
     end
     
     def test_browse_root
-      get :browse, :id => 3
+      get :show, :id => 3
       assert_response :success
-      assert_template 'browse'
+      assert_template 'show'
       assert_not_nil assigns(:entries)
-      assert_equal 3, assigns(:entries).size
+      assert_equal 6, assigns(:entries).size
       assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
       assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
       assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
+      assert assigns(:entries).detect {|e| e.name == 'copied_README' && e.kind == 'file'}
+      assert assigns(:entries).detect {|e| e.name == 'new_file.txt' && e.kind == 'file'}
+      assert assigns(:entries).detect {|e| e.name == 'renamed_test.txt' && e.kind == 'file'}
     end
-    
+
+    def test_browse_branch
+      get :show, :id => 3, :rev => 'test_branch'
+      assert_response :success
+      assert_template 'show'
+      assert_not_nil assigns(:entries)
+      assert_equal 4, assigns(:entries).size
+      assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
+      assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
+      assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
+      assert assigns(:entries).detect {|e| e.name == 'test.txt' && e.kind == 'file'}
+    end
+
     def test_browse_directory
-      get :browse, :id => 3, :path => ['images']
+      get :show, :id => 3, :path => ['images']
       assert_response :success
-      assert_template 'browse'
+      assert_template 'show'
       assert_not_nil assigns(:entries)
-      assert_equal ['delete.png', 'edit.png'], assigns(:entries).collect(&:name)
+      assert_equal ['edit.png'], assigns(:entries).collect(&:name)
       entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
       assert_not_nil entry
       assert_equal 'file', entry.kind
@@ -69,9 +84,9 @@ class RepositoriesGitControllerTest < Test::Unit::TestCase
     end
     
     def test_browse_at_given_revision
-      get :browse, :id => 3, :path => ['images'], :rev => '7234cb2750b63f47bff735edc50a1c0a433c2518'
+      get :show, :id => 3, :path => ['images'], :rev => '7234cb2750b63f47bff735edc50a1c0a433c2518'
       assert_response :success
-      assert_template 'browse'
+      assert_template 'show'
       assert_not_nil assigns(:entries)
       assert_equal ['delete.png'], assigns(:entries).collect(&:name)
     end
@@ -89,7 +104,7 @@ class RepositoriesGitControllerTest < Test::Unit::TestCase
       assert_template 'entry'
       # Line 19
       assert_tag :tag => 'th',
-                 :content => /10/,
+                 :content => /11/,
                  :attributes => { :class => /line-num/ },
                  :sibling => { :tag => 'td', :content => /WITHOUT ANY WARRANTY/ }
     end
@@ -104,7 +119,7 @@ class RepositoriesGitControllerTest < Test::Unit::TestCase
     def test_directory_entry
       get :entry, :id => 3, :path => ['sources']
       assert_response :success
-      assert_template 'browse'
+      assert_template 'show'
       assert_not_nil assigns(:entry)
       assert_equal 'sources', assigns(:entry).name
     end
@@ -127,14 +142,14 @@ class RepositoriesGitControllerTest < Test::Unit::TestCase
       assert_response :success
       assert_template 'annotate'
       # Line 23, changeset 2f9c0091
-      assert_tag :tag => 'th', :content => /23/,
+      assert_tag :tag => 'th', :content => /24/,
                  :sibling => { :tag => 'td', :child => { :tag => 'a', :content => /2f9c0091/ } },
                  :sibling => { :tag => 'td', :content => /jsmith/ },
                  :sibling => { :tag => 'td', :content => /watcher =/ }
     end
     
     def test_annotate_binary_file
-      get :annotate, :id => 3, :path => ['images', 'delete.png']
+      get :annotate, :id => 3, :path => ['images', 'edit.png']
       assert_response 500
       assert_tag :tag => 'div', :attributes => { :class => /error/ },
                                 :content => /can not be annotated/
diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb
index 53cbedd00..ec2526550 100644
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -44,10 +44,10 @@ class RepositoriesMercurialControllerTest < Test::Unit::TestCase
       assert_not_nil assigns(:changesets)
     end
     
-    def test_browse_root
-      get :browse, :id => 3
+    def test_show_root
+      get :show, :id => 3
       assert_response :success
-      assert_template 'browse'
+      assert_template 'show'
       assert_not_nil assigns(:entries)
       assert_equal 3, assigns(:entries).size
       assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
@@ -55,10 +55,10 @@ class RepositoriesMercurialControllerTest < Test::Unit::TestCase
       assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
     end
     
-    def test_browse_directory
-      get :browse, :id => 3, :path => ['images']
+    def test_show_directory
+      get :show, :id => 3, :path => ['images']
       assert_response :success
-      assert_template 'browse'
+      assert_template 'show'
       assert_not_nil assigns(:entries)
       assert_equal ['delete.png', 'edit.png'], assigns(:entries).collect(&:name)
       entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
@@ -67,10 +67,10 @@ class RepositoriesMercurialControllerTest < Test::Unit::TestCase
       assert_equal 'images/edit.png', entry.path
     end
     
-    def test_browse_at_given_revision
-      get :browse, :id => 3, :path => ['images'], :rev => 0
+    def test_show_at_given_revision
+      get :show, :id => 3, :path => ['images'], :rev => 0
       assert_response :success
-      assert_template 'browse'
+      assert_template 'show'
       assert_not_nil assigns(:entries)
       assert_equal ['delete.png'], assigns(:entries).collect(&:name)
     end
@@ -103,7 +103,7 @@ class RepositoriesMercurialControllerTest < Test::Unit::TestCase
     def test_directory_entry
       get :entry, :id => 3, :path => ['sources']
       assert_response :success
-      assert_template 'browse'
+      assert_template 'show'
       assert_not_nil assigns(:entry)
       assert_equal 'sources', assigns(:entry).name
     end
diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb
index e31094e7b..ac1438572 100644
--- a/test/functional/repositories_subversion_controller_test.rb
+++ b/test/functional/repositories_subversion_controller_test.rb
@@ -47,18 +47,18 @@ class RepositoriesSubversionControllerTest < Test::Unit::TestCase
     end
     
     def test_browse_root
-      get :browse, :id => 1
+      get :show, :id => 1
       assert_response :success
-      assert_template 'browse'
+      assert_template 'show'
       assert_not_nil assigns(:entries)
       entry = assigns(:entries).detect {|e| e.name == 'subversion_test'}
       assert_equal 'dir', entry.kind
     end
     
     def test_browse_directory
-      get :browse, :id => 1, :path => ['subversion_test']
+      get :show, :id => 1, :path => ['subversion_test']
       assert_response :success
-      assert_template 'browse'
+      assert_template 'show'
       assert_not_nil assigns(:entries)
       assert_equal ['folder', '.project', 'helloworld.c', 'textfile.txt'], assigns(:entries).collect(&:name)
       entry = assigns(:entries).detect {|e| e.name == 'helloworld.c'}
@@ -68,9 +68,9 @@ class RepositoriesSubversionControllerTest < Test::Unit::TestCase
     end
 
     def test_browse_at_given_revision
-      get :browse, :id => 1, :path => ['subversion_test'], :rev => 4
+      get :show, :id => 1, :path => ['subversion_test'], :rev => 4
       assert_response :success
-      assert_template 'browse'
+      assert_template 'show'
       assert_not_nil assigns(:entries)
       assert_equal ['folder', '.project', 'helloworld.c', 'helloworld.rb', 'textfile.txt'], assigns(:entries).collect(&:name)
     end
@@ -131,7 +131,7 @@ class RepositoriesSubversionControllerTest < Test::Unit::TestCase
     def test_directory_entry
       get :entry, :id => 1, :path => ['subversion_test', 'folder']
       assert_response :success
-      assert_template 'browse'
+      assert_template 'show'
       assert_not_nil assigns(:entry)
       assert_equal 'folder', assigns(:entry).name
     end
diff --git a/test/unit/git_adapter_test.rb b/test/unit/git_adapter_test.rb
new file mode 100644
index 000000000..50bded062
--- /dev/null
+++ b/test/unit/git_adapter_test.rb
@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class GitAdapterTest < Test::Unit::TestCase
+  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
+
+  if File.directory?(REPOSITORY_PATH)  
+    def setup
+      @adapter = Redmine::Scm::Adapters::GitAdapter.new(REPOSITORY_PATH)
+    end
+
+    def test_branches
+      assert_equal @adapter.branches, ['master', 'test_branch']
+    end
+
+    def test_getting_all_revisions
+      assert_equal 12, @adapter.revisions('',nil,nil,:all => true).length
+    end
+  else
+    puts "Git test repository NOT FOUND. Skipping unit tests !!!"
+    def test_fake; assert true end
+  end
+end
diff --git a/test/unit/repository_git_test.rb b/test/unit/repository_git_test.rb
index bc997b96c..382774305 100644
--- a/test/unit/repository_git_test.rb
+++ b/test/unit/repository_git_test.rb
@@ -34,8 +34,8 @@ class RepositoryGitTest < Test::Unit::TestCase
       @repository.fetch_changesets
       @repository.reload
       
-      assert_equal 6, @repository.changesets.count
-      assert_equal 11, @repository.changes.count
+      assert_equal 12, @repository.changesets.count
+      assert_equal 20, @repository.changes.count
       
       commit = @repository.changesets.find(:first, :order => 'committed_on ASC')
       assert_equal "Initial import.\nThe repository contains 3 files.", commit.comments
@@ -57,10 +57,10 @@ class RepositoryGitTest < Test::Unit::TestCase
       # Remove the 3 latest changesets
       @repository.changesets.find(:all, :order => 'committed_on DESC', :limit => 3).each(&:destroy)
       @repository.reload
-      assert_equal 3, @repository.changesets.count
+      assert_equal 9, @repository.changesets.count
       
       @repository.fetch_changesets
-      assert_equal 6, @repository.changesets.count
+      assert_equal 12, @repository.changesets.count
     end
   else
     puts "Git test repository NOT FOUND. Skipping unit tests !!!"
-- 
GitLab