Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
80bd6f30
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,发现更多精彩内容 >>
提交
80bd6f30
编写于
7月 31, 2005
作者:
J
Junio C Hamano
浏览文件
操作
浏览文件
下载
差异文件
Merge with gitk.
上级
b2c0bd65
1115fb38
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
9 addition
and
5 deletion
+9
-5
gitk
gitk
+9
-5
未找到文件。
gitk
浏览文件 @
80bd6f30
...
@@ -1729,7 +1729,9 @@ proc mergediff {id} {
...
@@ -1729,7 +1729,9 @@ proc mergediff {id} {
set diffpindex -1
set diffpindex -1
set diffmergegca
[
findgca $parents
(
$id
)]
set diffmergegca
[
findgca $parents
(
$id
)]
if
{[
info exists mergefilelist
(
$id
)]}
{
if
{[
info exists mergefilelist
(
$id
)]}
{
showmergediff
if
{
$mergefilelist
(
$id
)
ne
{}}
{
showmergediff
}
}
else
{
}
else
{
contmergediff
{}
contmergediff
{}
}
}
...
@@ -1753,7 +1755,7 @@ proc findgca {ids} {
...
@@ -1753,7 +1755,7 @@ proc findgca {ids} {
proc contmergediff
{
ids
}
{
proc contmergediff
{
ids
}
{
global diffmergeid diffpindex parents nparents diffmergegca
global diffmergeid diffpindex parents nparents diffmergegca
global treediffs mergefilelist diffids
global treediffs mergefilelist diffids
treepending
# diff the child against each of the parents, and diff
# diff the child against each of the parents, and diff
# each of the parents against the GCA.
# each of the parents against the GCA.
...
@@ -1814,8 +1816,8 @@ proc contmergediff {ids} {
...
@@ -1814,8 +1816,8 @@ proc contmergediff {ids} {
proc showmergediff
{}
{
proc showmergediff
{}
{
global cflist diffmergeid mergefilelist parents
global cflist diffmergeid mergefilelist parents
global diffopts diffinhunk currentfile
diffblocked
global diffopts diffinhunk currentfile
currenthunk filelines
global
groupfilelast mergefd
s
global
diffblocked groupfilelast mergefds groupfilenum grouphunk
s
set files $mergefilelist
(
$diffmergeid
)
set files $mergefilelist
(
$diffmergeid
)
foreach f $files
{
foreach f $files
{
...
@@ -1826,6 +1828,8 @@ proc showmergediff {} {
...
@@ -1826,6 +1828,8 @@ proc showmergediff {} {
catch
{
unset currentfile
}
catch
{
unset currentfile
}
catch
{
unset currenthunk
}
catch
{
unset currenthunk
}
catch
{
unset filelines
}
catch
{
unset filelines
}
catch
{
unset groupfilenum
}
catch
{
unset grouphunks
}
set groupfilelast -1
set groupfilelast -1
foreach p $parents
(
$diffmergeid
)
{
foreach p $parents
(
$diffmergeid
)
{
set cmd
[
list | git-diff-tree -p $p $diffmergeid
]
set cmd
[
list | git-diff-tree -p $p $diffmergeid
]
...
@@ -2700,7 +2704,7 @@ proc diffvssel {dirn} {
...
@@ -2700,7 +2704,7 @@ proc diffvssel {dirn} {
$ctext conf -state disabled
$ctext conf -state disabled
$ctext tag delete Comments
$ctext tag delete Comments
$ctext tag remove found 1.0 end
$ctext tag remove found 1.0 end
startdiff
$newid
[
list
$oldid
]
startdiff
[
list $newid
$oldid
]
}
}
proc mkpatch
{}
{
proc mkpatch
{}
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录