@@ -93,7 +93,8 @@ def branches
93
93
end
94
94
end
95
95
@branches . sort!
96
- rescue ScmCommandAborted
96
+ rescue ScmCommandAborted => e
97
+ logger . error ( e . message )
97
98
[ ]
98
99
end
99
100
@@ -106,17 +107,18 @@ def tags
106
107
@tags = io . readlines . sort! . map { |t | t . strip }
107
108
end
108
109
@tags
109
- rescue ScmCommandAborted
110
+ rescue ScmCommandAborted => e
111
+ logger . error ( e . message )
110
112
[ ]
111
113
end
112
114
113
115
114
116
def default_branch
115
117
bras = self . branches
116
118
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' }
120
122
master_bras . empty? ? bras . first . to_s : 'master'
121
123
end
122
124
@@ -169,7 +171,8 @@ def entries(path=nil, identifier=nil, options={})
169
171
end
170
172
end
171
173
entries . sort_by_name
172
- rescue ScmCommandAborted
174
+ rescue ScmCommandAborted => e
175
+ logger . error ( e . message )
173
176
nil
174
177
end
175
178
@@ -198,7 +201,8 @@ def lastrev(path, rev)
198
201
logger . error ( "The revision '#{ path } ' has a wrong format" )
199
202
return nil
200
203
end
201
- rescue ScmCommandAborted
204
+ rescue ScmCommandAborted => e
205
+ logger . error ( e . message )
202
206
nil
203
207
end
204
208
@@ -339,7 +343,8 @@ def diff(path, identifier_from, identifier_to = nil, opts = {})
339
343
end
340
344
end
341
345
diff
342
- rescue ScmCommandAborted
346
+ rescue ScmCommandAborted => e
347
+ logger . error ( e . message )
343
348
nil
344
349
end
345
350
@@ -373,7 +378,8 @@ def annotate(path, identifier=nil)
373
378
end
374
379
end
375
380
blame
376
- rescue ScmCommandAborted
381
+ rescue ScmCommandAborted => e
382
+ logger . error ( e . message )
377
383
nil
378
384
end
379
385
@@ -390,7 +396,8 @@ def cat(path, identifier=nil)
390
396
cat = io . read
391
397
end
392
398
cat
393
- rescue ScmCommandAborted
399
+ rescue ScmCommandAborted => e
400
+ logger . error ( e . message )
394
401
nil
395
402
end
396
403
@@ -420,7 +427,8 @@ def rev_list(revision, args)
420
427
@revisions_list = io . readlines . map { |t | t . strip }
421
428
end
422
429
@revisions_list
423
- rescue ScmCommandAborted
430
+ rescue ScmCommandAborted => e
431
+ logger . error ( e . message )
424
432
[ ]
425
433
end
426
434
@@ -433,7 +441,8 @@ def rev_parse(revision)
433
441
@parsed_revision = io . readlines . map { |t | t . strip } . first
434
442
end
435
443
@parsed_revision
436
- rescue ScmCommandAborted
444
+ rescue ScmCommandAborted => e
445
+ logger . error ( e . message )
437
446
nil
438
447
end
439
448
@@ -460,7 +469,8 @@ def archive(revision, format)
460
469
@content = io . read
461
470
end
462
471
@content
463
- rescue ScmCommandAborted
472
+ rescue ScmCommandAborted => e
473
+ logger . error ( e . message )
464
474
nil
465
475
end
466
476
0 commit comments