parser doesn't work with diffs from git merge commits

未关闭

#284 创建于 2019年7月9日 0 条评论 0 个 reaction 已指派 0 人在 GitHub 查看

还没有人认领这个 Issue。

评估

难度: 3/5
预计耗时: 1-2 天
新手友好度: 42/100

Issue 类型: 缺陷
描述清晰度: 基本清楚
活跃度: 停滞
技术栈: python
领域: backend

调研方向

首先定位处理 unified diff 头部的 parser 代码，以及处理 @@@ hunk 头部的 regex 或 parsing 路径。比较它在所示 diff --cc 示例和普通 diff 上的行为；如果 repository 中有 parser 测试，则补充覆盖。完成标准是能够识别 merge commit diff，同时不破坏普通 patch 的解析。

由索引模型根据 Issue 内容生成。

描述

bug

@mpe reported that https://patchwork.ozlabs.org/patch/1129056/ is missing a patch diff.

It appears this is because it's a diff of a git merge commit:

diff --cc arch/powerpc/include/asm/pgtable.h
index bf7d771f342e,64145751b2fd..000000000000
--- a/arch/powerpc/include/asm/pgtable.h
+++ b/arch/powerpc/include/asm/pgtable.h
@@@ -140,30 -140,20 +140,44 @@@ static inline void pte_frag_set(mm_cont
  }
  #endif

as opposed to a normal diff

diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c
index 80ceb458e79c..ef75f590ad3e 100644
--- a/arch/powerpc/kernel/module_64.c
+++ b/arch/powerpc/kernel/module_64.c
@@ -133,20 +133,27 @@ struct ppc64_stub_entry
  * the stub, but it's significantly shorter to put these values at the
  * end of the stub code, and patch the stub address (32-bits relative

The part that the parser trips on is the unusual format of the @@@ header line because of diff --cc mode.

This isn't too high priority since sending a merge diff to a mailing list is not the normal case, but we might still want to consider fixing the regex to cope with this.

主要语言: Python
星标: 317
派生: 91
PR 合并指标: 30 天内没有已合并 PR