Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
4addad22
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,发现更多精彩内容 >>
提交
4addad22
编写于
5月 23, 2007
作者:
H
Han-Wen Nienhuys
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add --verbose to all commands.
Signed-off-by:
N
Han-Wen Nienhuys
<
hanwen@google.com
>
上级
b25b2065
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
18 addition
and
14 deletion
+18
-14
contrib/fast-import/git-p4
contrib/fast-import/git-p4
+18
-14
未找到文件。
contrib/fast-import/git-p4
浏览文件 @
4addad22
...
...
@@ -15,47 +15,47 @@ import re
from
sets
import
Set
;
gitdir
=
os
.
environ
.
get
(
"GIT_DIR"
,
""
)
silent
=
Tru
e
verbose
=
Fals
e
def
write_pipe
(
c
,
str
):
if
not
silent
:
if
verbose
:
sys
.
stderr
.
write
(
'writing pipe: %s
\n
'
%
c
)
pipe
=
os
.
popen
(
c
,
'w'
)
val
=
pipe
.
write
(
str
)
if
pipe
.
close
():
sys
.
stderr
.
write
(
'Command
failed'
)
sys
.
stderr
.
write
(
'Command
%s failed
\n
'
%
c
)
sys
.
exit
(
1
)
return
val
def
read_pipe
(
c
):
if
not
silent
:
def
read_pipe
(
c
,
ignore_error
=
False
):
if
verbose
:
sys
.
stderr
.
write
(
'reading pipe: %s
\n
'
%
c
)
pipe
=
os
.
popen
(
c
,
'rb'
)
val
=
pipe
.
read
()
if
pipe
.
close
():
sys
.
stderr
.
write
(
'Command
failed'
)
if
pipe
.
close
()
and
not
ignore_error
:
sys
.
stderr
.
write
(
'Command
%s failed
\n
'
%
c
)
sys
.
exit
(
1
)
return
val
def
read_pipe_lines
(
c
):
if
not
silent
:
if
verbose
:
sys
.
stderr
.
write
(
'reading pipe: %s
\n
'
%
c
)
## todo: check return status
pipe
=
os
.
popen
(
c
,
'rb'
)
val
=
pipe
.
readlines
()
if
pipe
.
close
():
sys
.
stderr
.
write
(
'Command
failed'
)
sys
.
stderr
.
write
(
'Command
%s failed
\n
'
%
c
)
sys
.
exit
(
1
)
return
val
def
system
(
cmd
):
if
not
silent
:
if
verbose
:
sys
.
stderr
.
write
(
"executing %s"
%
cmd
)
if
os
.
system
(
cmd
)
!=
0
:
die
(
"command failed: %s"
%
cmd
)
...
...
@@ -157,7 +157,7 @@ def gitBranchExists(branch):
return
proc
.
wait
()
==
0
;
def
gitConfig
(
key
):
return
mypopen
(
"git config %s"
%
key
).
read
()[:
-
1
]
return
read_pipe
(
"git config %s"
%
key
,
ignore_error
=
True
).
strip
()
class
Command
:
def
__init__
(
self
):
...
...
@@ -168,7 +168,8 @@ class P4Debug(Command):
def
__init__
(
self
):
Command
.
__init__
(
self
)
self
.
options
=
[
]
optparse
.
make_option
(
"--verbose"
,
dest
=
"verbose"
,
action
=
"store_true"
),
]
self
.
description
=
"A tool to debug the output of p4 -G."
self
.
needsGit
=
False
...
...
@@ -234,6 +235,7 @@ class P4Submit(Command):
Command
.
__init__
(
self
)
self
.
options
=
[
optparse
.
make_option
(
"--continue"
,
action
=
"store_false"
,
dest
=
"firstTime"
),
optparse
.
make_option
(
"--verbose"
,
dest
=
"verbose"
,
action
=
"store_true"
),
optparse
.
make_option
(
"--origin"
,
dest
=
"origin"
),
optparse
.
make_option
(
"--reset"
,
action
=
"store_true"
,
dest
=
"reset"
),
optparse
.
make_option
(
"--log-substitutions"
,
dest
=
"substFile"
),
...
...
@@ -861,11 +863,12 @@ class P4Sync(Command):
if
not
self
.
silent
:
print
"Creating/updating branch(es) in %s based on origin branch(es)"
%
self
.
refPrefix
for
line
in
mypopen
(
"git rev-parse --symbolic --remotes"
):
for
line
in
read_pipe_lines
(
"git rev-parse --symbolic --remotes"
):
line
=
line
.
strip
()
if
(
not
line
.
startswith
(
"origin/"
))
or
line
.
endswith
(
"HEAD
\n
"
):
continue
headName
=
line
[
len
(
"origin/"
)
:
-
1
]
headName
=
line
[
len
(
"origin/"
)]
remoteHead
=
self
.
refPrefix
+
headName
originHead
=
"origin/"
+
headName
...
...
@@ -1292,6 +1295,7 @@ if len(options) > 0:
(
cmd
,
args
)
=
parser
.
parse_args
(
sys
.
argv
[
2
:],
cmd
);
verbose
=
cmd
.
verbose
if
cmd
.
needsGit
:
gitdir
=
cmd
.
gitdir
if
len
(
gitdir
)
==
0
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录