##// END OF EJS Templates
patch: refactor content diffing part in separate fn so extensions can wrap...
Pulkit Goyal -
r45658:20a65e39 default
parent child Browse files
Show More
@@ -2922,6 +2922,18 b' def _filepairs(modified, added, removed,'
2922 yield f1, f2, copyop
2922 yield f1, f2, copyop
2923
2923
2924
2924
2925 def _gitindex(text):
2926 if not text:
2927 text = b""
2928 l = len(text)
2929 s = hashutil.sha1(b'blob %d\0' % l)
2930 s.update(text)
2931 return hex(s.digest())
2932
2933
2934 _gitmode = {b'l': b'120000', b'x': b'100755', b'': b'100644'}
2935
2936
2925 def trydiff(
2937 def trydiff(
2926 repo,
2938 repo,
2927 revs,
2939 revs,
@@ -2944,14 +2956,6 b' def trydiff('
2944 pathfn is applied to every path in the diff output.
2956 pathfn is applied to every path in the diff output.
2945 '''
2957 '''
2946
2958
2947 def gitindex(text):
2948 if not text:
2949 text = b""
2950 l = len(text)
2951 s = hashutil.sha1(b'blob %d\0' % l)
2952 s.update(text)
2953 return hex(s.digest())
2954
2955 if opts.noprefix:
2959 if opts.noprefix:
2956 aprefix = bprefix = b''
2960 aprefix = bprefix = b''
2957 else:
2961 else:
@@ -2968,8 +2972,6 b' def trydiff('
2968 date1 = dateutil.datestr(ctx1.date())
2972 date1 = dateutil.datestr(ctx1.date())
2969 date2 = dateutil.datestr(ctx2.date())
2973 date2 = dateutil.datestr(ctx2.date())
2970
2974
2971 gitmode = {b'l': b'120000', b'x': b'100755', b'': b'100644'}
2972
2973 if not pathfn:
2975 if not pathfn:
2974 pathfn = lambda f: f
2976 pathfn = lambda f: f
2975
2977
@@ -3023,11 +3025,11 b' def trydiff('
3023 b'diff --git %s%s %s%s' % (aprefix, path1, bprefix, path2)
3025 b'diff --git %s%s %s%s' % (aprefix, path1, bprefix, path2)
3024 )
3026 )
3025 if not f1: # added
3027 if not f1: # added
3026 header.append(b'new file mode %s' % gitmode[flag2])
3028 header.append(b'new file mode %s' % _gitmode[flag2])
3027 elif not f2: # removed
3029 elif not f2: # removed
3028 header.append(b'deleted file mode %s' % gitmode[flag1])
3030 header.append(b'deleted file mode %s' % _gitmode[flag1])
3029 else: # modified/copied/renamed
3031 else: # modified/copied/renamed
3030 mode1, mode2 = gitmode[flag1], gitmode[flag2]
3032 mode1, mode2 = _gitmode[flag1], _gitmode[flag2]
3031 if mode1 != mode2:
3033 if mode1 != mode2:
3032 header.append(b'old mode %s' % mode1)
3034 header.append(b'old mode %s' % mode1)
3033 header.append(b'new mode %s' % mode2)
3035 header.append(b'new mode %s' % mode2)
@@ -3071,11 +3073,38 b' def trydiff('
3071 if fctx2 is not None:
3073 if fctx2 is not None:
3072 content2 = fctx2.data()
3074 content2 = fctx2.data()
3073
3075
3076 data1 = (ctx1, fctx1, path1, flag1, content1, date1)
3077 data2 = (ctx2, fctx2, path2, flag2, content2, date2)
3078 yield diffcontent(data1, data2, header, binary, opts)
3079
3080
3081 def diffcontent(data1, data2, header, binary, opts):
3082 """ diffs two versions of a file.
3083
3084 data1 and data2 are tuples containg:
3085
3086 * ctx: changeset for the file
3087 * fctx: file context for that file
3088 * path1: name of the file
3089 * flag: flags of the file
3090 * content: full content of the file (can be null in case of binary)
3091 * date: date of the changeset
3092
3093 header: the patch header
3094 binary: whether the any of the version of file is binary or not
3095 opts: user passed options
3096
3097 It exists as a separate function so that extensions like extdiff can wrap
3098 it and use the file content directly.
3099 """
3100
3101 ctx1, fctx1, path1, flag1, content1, date1 = data1
3102 ctx2, fctx2, path2, flag2, content2, date2 = data2
3074 if binary and opts.git and not opts.nobinary:
3103 if binary and opts.git and not opts.nobinary:
3075 text = mdiff.b85diff(content1, content2)
3104 text = mdiff.b85diff(content1, content2)
3076 if text:
3105 if text:
3077 header.append(
3106 header.append(
3078 b'index %s..%s' % (gitindex(content1), gitindex(content2))
3107 b'index %s..%s' % (_gitindex(content1), _gitindex(content2))
3079 )
3108 )
3080 hunks = ((None, [text]),)
3109 hunks = ((None, [text]),)
3081 else:
3110 else:
@@ -3086,9 +3115,9 b' def trydiff('
3086 header.append(
3115 header.append(
3087 b'index %s..%s %s'
3116 b'index %s..%s %s'
3088 % (
3117 % (
3089 gitindex(content1)[0 : opts.index],
3118 _gitindex(content1)[0 : opts.index],
3090 gitindex(content2)[0 : opts.index],
3119 _gitindex(content2)[0 : opts.index],
3091 gitmode[flag],
3120 _gitmode[flag],
3092 )
3121 )
3093 )
3122 )
3094
3123
@@ -3103,7 +3132,7 b' def trydiff('
3103 opts=opts,
3132 opts=opts,
3104 )
3133 )
3105 header.extend(uheaders)
3134 header.extend(uheaders)
3106 yield fctx1, fctx2, header, hunks
3135 return fctx1, fctx2, header, hunks
3107
3136
3108
3137
3109 def diffstatsum(stats):
3138 def diffstatsum(stats):
General Comments 0
You need to be logged in to leave comments. Login now