Mercurial > hg > soundsoftware-site
comparison lib/redmine/scm/adapters/.svn/text-base/mercurial_adapter.rb.svn-base @ 507:0c939c159af4 redmine-1.2
Update to Redmine 1.2.1 on 1.2-stable branch (Redmine SVN rev 6270)
| author | Chris Cannam |
|---|---|
| date | Thu, 14 Jul 2011 10:32:19 +0100 |
| parents | cbce1fd3b1b7 |
| children | 851510f1b535 |
comparison
equal
deleted
inserted
replaced
| 441:cbce1fd3b1b7 | 507:0c939c159af4 |
|---|---|
| 93 def info | 93 def info |
| 94 tip = summary['repository']['tip'] | 94 tip = summary['repository']['tip'] |
| 95 Info.new(:root_url => CGI.unescape(summary['repository']['root']), | 95 Info.new(:root_url => CGI.unescape(summary['repository']['root']), |
| 96 :lastrev => Revision.new(:revision => tip['revision'], | 96 :lastrev => Revision.new(:revision => tip['revision'], |
| 97 :scmid => tip['node'])) | 97 :scmid => tip['node'])) |
| 98 # rescue HgCommandAborted | |
| 99 rescue Exception => e | |
| 100 logger.error "hg: error during getting info: #{e.message}" | |
| 101 nil | |
| 98 end | 102 end |
| 99 | 103 |
| 100 def tags | 104 def tags |
| 101 as_ary(summary['repository']['tag']).map { |e| e['name'] } | 105 as_ary(summary['repository']['tag']).map { |e| e['name'] } |
| 102 end | 106 end |
| 274 blame.add_line($4.rstrip, r) | 278 blame.add_line($4.rstrip, r) |
| 275 end | 279 end |
| 276 end | 280 end |
| 277 blame | 281 blame |
| 278 rescue HgCommandAborted | 282 rescue HgCommandAborted |
| 279 nil # means not found or cannot be annotated | 283 # means not found or cannot be annotated |
| 284 Annotate.new | |
| 280 end | 285 end |
| 281 | 286 |
| 282 class Revision < Redmine::Scm::Adapters::Revision | 287 class Revision < Redmine::Scm::Adapters::Revision |
| 283 # Returns the readable identifier | 288 # Returns the readable identifier |
| 284 def format_identifier | 289 def format_identifier |
