带标记的文件有多少行

👁️ 3 人浏览 💬 0 人评论 ❤️ 添加收藏

把三方比对的结果连同冲突标记一起写出来。运行下面这段程序:

def classify(b, o, t):
    if o == t:
        return "same"
    if o == b:
        return "theirs"
    if t == b:
        return "ours"
    return "conflict"

def merge3(base, ours, theirs):
    out = []
    for b, o, t in zip(base, ours, theirs):
        k = classify(b, o, t)
        if k == "conflict":
            out.append("<<<<<<< ours")
            out.append(o)
            out.append("=======")
            out.append(t)
            out.append(">>>>>>> theirs")
        elif k == "theirs":
            out.append(t)
        else:
            out.append(o)
    return out

base = ['HOST = "localhost"', 'PORT = 8000', 'DEBUG = False',
        'TIMEOUT = 30', 'RETRY = 1', 'LOG = "app.log"']
ours = ['HOST = "localhost"', 'PORT = 8080', 'DEBUG = True',
        'TIMEOUT = 60', 'RETRY = 1', 'LOG = "main.log"']
theirs = ['HOST = "0.0.0.0"', 'PORT = 9000', 'DEBUG = True',
          'TIMEOUT = 30', 'RETRY = 3', 'LOG = "sys.log"']
print(len(merge3(base, ours, theirs)))
提交你的答案
请登录后提交答案。
去登录
代码编辑器
Ctrl + Enter 运行
本次输入:
输出:

                        
👩‍🏫
AI
💬 题目评论

全部评论