##// END OF EJS Templates
git: use diff with long flag names for better readability.
marcink -
r754:f6977cf3 default
parent child Browse files
Show More
@@ -930,11 +930,11 b' class GitRemote(RemoteBase):'
930 def diff(self, wire, commit_id_1, commit_id_2, file_filter, opt_ignorews, context):
930 def diff(self, wire, commit_id_1, commit_id_2, file_filter, opt_ignorews, context):
931
931
932 flags = [
932 flags = [
933 '-U%s' % context, '--full-index', '--binary', '-p',
933 '-U%s' % context, '--full-index', '--binary', '--patch',
934 '-M', '--abbrev=40']
934 '--find-renames', '--abbrev=40']
935
935
936 if opt_ignorews:
936 if opt_ignorews:
937 flags.append('-w')
937 flags.append('--ignore-all-space')
938
938
939 if commit_id_1 == self.EMPTY_COMMIT:
939 if commit_id_1 == self.EMPTY_COMMIT:
940 cmd = ['show'] + flags + [commit_id_2]
940 cmd = ['show'] + flags + [commit_id_2]
@@ -956,6 +956,7 b' class GitRemote(RemoteBase):'
956 x += 1
956 x += 1
957 # Append new line just like 'diff' command do
957 # Append new line just like 'diff' command do
958 diff = '\n'.join(lines[x:]) + '\n'
958 diff = '\n'.join(lines[x:]) + '\n'
959
959 return diff
960 return diff
960
961
961 @reraise_safe_exceptions
962 @reraise_safe_exceptions
General Comments 0
You need to be logged in to leave comments. Login now