summaryrefslogtreecommitdiffstats
path: root/app/models/repository
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-04-12 05:44:48 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-04-12 05:44:48 +0000
commitfbf23a14b8377b89bf2eab35754c43ac1c329473 (patch)
treea64ff7f5562fd38b95ad9bb8a34c2a956824ba02 /app/models/repository
parentc4616e0ae0d4db4d5d6e5cc1bca4b6485f1ec9de (diff)
downloadredmine-fbf23a14b8377b89bf2eab35754c43ac1c329473.tar.gz
redmine-fbf23a14b8377b89bf2eab35754c43ac1c329473.zip
scm: darcs: code clean up model.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5432 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/repository')
-rw-r--r--app/models/repository/darcs.rb18
1 files changed, 10 insertions, 8 deletions
diff --git a/app/models/repository/darcs.rb b/app/models/repository/darcs.rb
index c8870e299..5a9e7a7dd 100644
--- a/app/models/repository/darcs.rb
+++ b/app/models/repository/darcs.rb
@@ -40,30 +40,32 @@ class Repository::Darcs < Repository
patch = identifier.nil? ? nil : changesets.find_by_revision(identifier)
scm.entry(path, patch.nil? ? nil : patch.scmid)
end
-
+
def entries(path=nil, identifier=nil)
patch = identifier.nil? ? nil : changesets.find_by_revision(identifier)
entries = scm.entries(path, patch.nil? ? nil : patch.scmid)
if entries
entries.each do |entry|
# Search the DB for the entry's last change
- changeset = changesets.find_by_scmid(entry.lastrev.scmid) if entry.lastrev && !entry.lastrev.scmid.blank?
+ if entry.lastrev && !entry.lastrev.scmid.blank?
+ changeset = changesets.find_by_scmid(entry.lastrev.scmid)
+ end
if changeset
entry.lastrev.identifier = changeset.revision
- entry.lastrev.name = changeset.revision
- entry.lastrev.time = changeset.committed_on
- entry.lastrev.author = changeset.committer
+ entry.lastrev.name = changeset.revision
+ entry.lastrev.time = changeset.committed_on
+ entry.lastrev.author = changeset.committer
end
end
end
entries
end
-
+
def cat(path, identifier=nil)
patch = identifier.nil? ? nil : changesets.find_by_revision(identifier.to_s)
scm.cat(path, patch.nil? ? nil : patch.scmid)
end
-
+
def diff(path, rev, rev_to)
patch_from = changesets.find_by_revision(rev)
return nil if patch_from.nil?
@@ -73,7 +75,7 @@ class Repository::Darcs < Repository
end
patch_from ? scm.diff(path, patch_from.scmid, patch_to ? patch_to.scmid : nil) : nil
end
-
+
def fetch_changesets
scm_info = scm.info
if scm_info