@@ -102,7 +102,7 @@ def to_s
102
102
end
103
103
104
104
def identifier
105
- uri_with_specifiers ( [ humanized_ref , cached_revision , glob_for_display ] )
105
+ uri_with_specifiers ( [ humanized_ref , locked_revision , glob_for_display ] )
106
106
end
107
107
108
108
def uri_with_specifiers ( specifiers )
@@ -176,10 +176,10 @@ def local_override!(path)
176
176
"#{ current_branch } but Gemfile specifies #{ branch } "
177
177
end
178
178
179
- changed = cached_revision && cached_revision != revision
179
+ changed = locked_revision && locked_revision != revision
180
180
181
- if !Bundler . settings [ :disable_local_revision_check ] && changed && !@unlocked && !git_proxy . contains? ( cached_revision )
182
- raise GitError , "The Gemfile lock is pointing to revision #{ shortref_for_display ( cached_revision ) } " \
181
+ if !Bundler . settings [ :disable_local_revision_check ] && changed && !@unlocked && !git_proxy . contains? ( locked_revision )
182
+ raise GitError , "The Gemfile lock is pointing to revision #{ shortref_for_display ( locked_revision ) } " \
183
183
"but the current branch in your local override for #{ name } does not contain such commit. " \
184
184
"Please make sure your branch is up to date."
185
185
end
@@ -249,7 +249,7 @@ def cache_path
249
249
end
250
250
251
251
def app_cache_dirname
252
- "#{ base_name } -#{ shortref_for_path ( cached_revision || revision ) } "
252
+ "#{ base_name } -#{ shortref_for_path ( locked_revision || revision ) } "
253
253
end
254
254
255
255
def revision
@@ -326,19 +326,19 @@ def set_up_app_cache!(path)
326
326
end
327
327
328
328
def has_app_cache?
329
- cached_revision && super
329
+ locked_revision && super
330
330
end
331
331
332
332
def use_app_cache?
333
333
has_app_cache? && !local?
334
334
end
335
335
336
336
def requires_checkout?
337
- allow_git_ops? && !local? && !cached_revision_checked_out ?
337
+ allow_git_ops? && !local? && !locked_revision_checked_out ?
338
338
end
339
339
340
- def cached_revision_checked_out ?
341
- cached_revision && cached_revision == revision && install_path . exist?
340
+ def locked_revision_checked_out ?
341
+ locked_revision && locked_revision == revision && install_path . exist?
342
342
end
343
343
344
344
def base_name
@@ -375,7 +375,7 @@ def uri_hash
375
375
Bundler ::Digest . sha1 ( input )
376
376
end
377
377
378
- def cached_revision
378
+ def locked_revision
379
379
options [ "revision" ]
380
380
end
381
381
@@ -384,7 +384,7 @@ def cached?
384
384
end
385
385
386
386
def git_proxy
387
- @git_proxy ||= GitProxy . new ( cache_path , uri , options , cached_revision , self )
387
+ @git_proxy ||= GitProxy . new ( cache_path , uri , options , locked_revision , self )
388
388
end
389
389
390
390
def fetch
0 commit comments