Skip to content

Commit 143745a

Browse files
rootNicolas Rodriguez
root
authored and
Nicolas Rodriguez
committed
Log errors from XitoliteAdapter
1 parent f877544 commit 143745a

File tree

1 file changed

+23
-13
lines changed

1 file changed

+23
-13
lines changed

Diff for: lib/redmine/scm/adapters/xitolite_adapter.rb

+23-13
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ def branches
9393
end
9494
end
9595
@branches.sort!
96-
rescue ScmCommandAborted
96+
rescue ScmCommandAborted => e
97+
logger.error(e.message)
9798
[]
9899
end
99100

@@ -106,17 +107,18 @@ def tags
106107
@tags = io.readlines.sort!.map{ |t| t.strip }
107108
end
108109
@tags
109-
rescue ScmCommandAborted
110+
rescue ScmCommandAborted => e
111+
logger.error(e.message)
110112
[]
111113
end
112114

113115

114116
def default_branch
115117
bras = self.branches
116118
return nil if bras.nil?
117-
default_bras = bras.select{|x| x.is_default == true}
118-
return default_bras.first.to_s if ! default_bras.empty?
119-
master_bras = bras.select{|x| x.to_s == 'master'}
119+
default_bras = bras.select { |x| x.is_default == true }
120+
return default_bras.first.to_s if !default_bras.empty?
121+
master_bras = bras.select { |x| x.to_s == 'master' }
120122
master_bras.empty? ? bras.first.to_s : 'master'
121123
end
122124

@@ -169,7 +171,8 @@ def entries(path=nil, identifier=nil, options={})
169171
end
170172
end
171173
entries.sort_by_name
172-
rescue ScmCommandAborted
174+
rescue ScmCommandAborted => e
175+
logger.error(e.message)
173176
nil
174177
end
175178

@@ -198,7 +201,8 @@ def lastrev(path, rev)
198201
logger.error("The revision '#{path}' has a wrong format")
199202
return nil
200203
end
201-
rescue ScmCommandAborted
204+
rescue ScmCommandAborted => e
205+
logger.error(e.message)
202206
nil
203207
end
204208

@@ -339,7 +343,8 @@ def diff(path, identifier_from, identifier_to = nil, opts = {})
339343
end
340344
end
341345
diff
342-
rescue ScmCommandAborted
346+
rescue ScmCommandAborted => e
347+
logger.error(e.message)
343348
nil
344349
end
345350

@@ -373,7 +378,8 @@ def annotate(path, identifier=nil)
373378
end
374379
end
375380
blame
376-
rescue ScmCommandAborted
381+
rescue ScmCommandAborted => e
382+
logger.error(e.message)
377383
nil
378384
end
379385

@@ -390,7 +396,8 @@ def cat(path, identifier=nil)
390396
cat = io.read
391397
end
392398
cat
393-
rescue ScmCommandAborted
399+
rescue ScmCommandAborted => e
400+
logger.error(e.message)
394401
nil
395402
end
396403

@@ -420,7 +427,8 @@ def rev_list(revision, args)
420427
@revisions_list = io.readlines.map{ |t| t.strip }
421428
end
422429
@revisions_list
423-
rescue ScmCommandAborted
430+
rescue ScmCommandAborted => e
431+
logger.error(e.message)
424432
[]
425433
end
426434

@@ -433,7 +441,8 @@ def rev_parse(revision)
433441
@parsed_revision = io.readlines.map{ |t| t.strip }.first
434442
end
435443
@parsed_revision
436-
rescue ScmCommandAborted
444+
rescue ScmCommandAborted => e
445+
logger.error(e.message)
437446
nil
438447
end
439448

@@ -460,7 +469,8 @@ def archive(revision, format)
460469
@content = io.read
461470
end
462471
@content
463-
rescue ScmCommandAborted
472+
rescue ScmCommandAborted => e
473+
logger.error(e.message)
464474
nil
465475
end
466476

0 commit comments

Comments
 (0)