Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
51a2640a
G
git
项目概览
李少辉-开发者
/
git
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
git
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
51a2640a
编写于
4月 15, 2007
作者:
S
Simon Hausmann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Handle patch errors in git-p4 submit better.
Signed-off-by:
N
Simon Hausmann
<
simon@lst.de
>
上级
90865adc
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
32 addition
and
6 deletion
+32
-6
contrib/fast-import/git-p4
contrib/fast-import/git-p4
+32
-6
未找到文件。
contrib/fast-import/git-p4
浏览文件 @
51a2640a
...
...
@@ -244,7 +244,33 @@ class P4Submit(Command):
else
:
die
(
"unknown modifier %s for %s"
%
(
modifier
,
path
))
system
(
"git diff-tree -p --diff-filter=ACMRTUXB
\"
%s^
\"
\"
%s
\"
| patch -p1"
%
(
id
,
id
))
diffcmd
=
"git diff-tree -p --diff-filter=ACMRTUXB
\"
%s^
\"
\"
%s
\"
"
%
(
id
,
id
)
patchcmd
=
diffcmd
+
" | patch -p1"
if
os
.
system
(
patchcmd
+
" --dry-run --silent"
)
!=
0
:
print
"Unfortunately applying the change failed!"
print
"What do you want to do?"
response
=
"x"
while
response
!=
"s"
and
response
!=
"a"
and
response
!=
"w"
:
response
=
raw_input
(
"[s]kip this patch / [a]pply the patch forcibly and with .rej files / [w]rite the patch to a file (patch.txt) "
)
if
response
==
"s"
:
print
"Skipping! Good luck with the next patches..."
return
elif
response
==
"a"
:
os
.
system
(
patchcmd
)
if
len
(
filesToAdd
)
>
0
:
print
"You may also want to call p4 add on the following files:"
print
" "
.
join
(
filesToAdd
)
if
len
(
filesToDelete
):
print
"The following files should be scheduled for deletion with p4 delete:"
print
" "
.
join
(
filesToDelete
)
die
(
"Please resolve and submit the conflict manually and continue afterwards with git-p4 submit --continue"
)
elif
response
==
"w"
:
system
(
diffcmd
+
" > patch.txt"
)
print
"Patch saved to patch.txt in %s !"
%
self
.
clientPath
die
(
"Please resolve and submit the conflict manually and continue afterwards with git-p4 submit --continue"
)
system
(
patchcmd
)
for
f
in
filesToAdd
:
system
(
"p4 add %s"
%
f
)
...
...
@@ -335,16 +361,16 @@ class P4Submit(Command):
print
"Internal error: cannot locate perforce depot path from existing branches"
sys
.
exit
(
128
)
clientPath
=
p4Where
(
depotPath
)
self
.
clientPath
=
p4Where
(
depotPath
)
if
len
(
clientPath
)
==
0
:
if
len
(
self
.
clientPath
)
==
0
:
print
"Error: Cannot locate perforce checkout of %s in client view"
%
depotPath
sys
.
exit
(
128
)
print
"Perforce checkout for depot path %s located at %s"
%
(
depotPath
,
clientPath
)
print
"Perforce checkout for depot path %s located at %s"
%
(
depotPath
,
self
.
clientPath
)
oldWorkingDirectory
=
os
.
getcwd
()
os
.
chdir
(
clientPath
)
response
=
raw_input
(
"Do you want to sync %s with p4 sync? [y]es/[n]o "
%
clientPath
)
os
.
chdir
(
self
.
clientPath
)
response
=
raw_input
(
"Do you want to sync %s with p4 sync? [y]es/[n]o "
%
self
.
clientPath
)
if
response
==
"y"
or
response
==
"yes"
:
system
(
"p4 sync ..."
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录