Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
0ebcc60a
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0ebcc60a
编写于
10月 26, 2012
作者:
R
Riyad Preukschas
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move locking from Satellite::Action to Satellite and add checks
上级
0e9d4f30
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
27 addition
and
22 deletion
+27
-22
lib/gitlab/satellite/action.rb
lib/gitlab/satellite/action.rb
+2
-16
lib/gitlab/satellite/satellite.rb
lib/gitlab/satellite/satellite.rb
+25
-6
未找到文件。
lib/gitlab/satellite/action.rb
浏览文件 @
0ebcc60a
...
...
@@ -18,18 +18,8 @@ module Gitlab
# * Yields the prepared satellite repo
def
in_locked_and_timed_satellite
Grit
::
Git
.
with_timeout
(
options
[
:git_timeout
])
do
File
.
open
(
lock_file
,
"w+"
)
do
|
f
|
f
.
flock
(
File
::
LOCK_EX
)
unless
project
.
satellite
.
exists?
raise
"Satellite doesn't exist"
end
Dir
.
chdir
(
project
.
satellite
.
path
)
do
repo
=
Grit
::
Repo
.
new
(
'.'
)
return
yield
repo
end
project
.
satellite
.
lock
do
return
yield
project
.
satellite
.
repo
end
end
rescue
Errno
::
ENOMEM
=>
ex
...
...
@@ -40,10 +30,6 @@ module Gitlab
return
false
end
def
lock_file
Rails
.
root
.
join
(
"tmp"
,
"
#{
project
.
path
}
.lock"
)
end
# * Clears the satellite
# * Updates the satellite from Gitolite
# * Sets up Git variables for the user
...
...
lib/gitlab/satellite/satellite.rb
浏览文件 @
0ebcc60a
...
...
@@ -10,6 +10,8 @@ module Gitlab
end
def
clear_and_update!
raise
"Satellite doesn't exist"
unless
exists?
delete_heads!
clear_working_dir!
update_from_source!
...
...
@@ -23,10 +25,31 @@ module Gitlab
File
.
exists?
path
end
# Locks the satellite and yields
def
lock
raise
"Satellite doesn't exist"
unless
exists?
File
.
open
(
lock_file
,
"w+"
)
do
|
f
|
f
.
flock
(
File
::
LOCK_EX
)
return
yield
end
end
def
lock_file
Rails
.
root
.
join
(
"tmp"
,
"
#{
project
.
path
}
.lock"
)
end
def
path
Rails
.
root
.
join
(
"tmp"
,
"repo_satellites"
,
project
.
path
)
end
def
repo
raise
"Satellite doesn't exist"
unless
exists?
@repo
||=
Grit
::
Repo
.
new
(
path
)
end
private
# Clear the working directory
...
...
@@ -39,7 +62,7 @@ module Gitlab
# This ensures we have no name clashes or issues updating branches when
# working with the satellite.
def
delete_heads!
heads
=
repo
.
heads
.
map
{
|
head
|
head
.
name
}
heads
=
repo
.
heads
.
map
(
&
:name
)
# update or create the parking branch
if
heads
.
include?
PARKING_BRANCH
...
...
@@ -54,15 +77,11 @@ module Gitlab
heads
.
each
{
|
head
|
repo
.
git
.
branch
({
D
:
true
},
head
)
}
end
def
repo
@repo
||=
Grit
::
Repo
.
new
(
path
)
end
# Updates the satellite from Gitolite
#
# Note: this will only update remote branches (i.e. origin/*)
def
update_from_source!
repo
.
git
.
fetch
({},
:origin
)
repo
.
git
.
fetch
({
timeout:
true
},
:origin
)
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录