Commit85a5a8c

committed

Fixed mode-handling in Diff creation, and added assertions to catch this in future

There is still some work todo in terms of how we handle the encoding

1 parent18caa61 commit85a5a8cCopy full SHA for 85a5a8c

File tree

+10

-3

lines changed

+10

-3

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -217,10 +217,12 @@ def __init__(self, repo, a_path, b_path, a_blob_id, b_blob_id, a_mode,`
`217`	`217`	`ifa_blob_idisNone:`
`218`	`218`	`self.a_blob=None`
`219`	`219`	`else:`
	`220`	`+assertself.a_mode`
`220`	`221`	`self.a_blob=Blob(repo,hex_to_bin(a_blob_id),mode=self.a_mode,path=a_path)`
`221`	`222`	`ifb_blob_idisNone:`
`222`	`223`	`self.b_blob=None`
`223`	`224`	`else:`
	`225`	`+assertself.b_mode`
`224`	`226`	`self.b_blob=Blob(repo,hex_to_bin(b_blob_id),mode=self.b_mode,path=b_path)`
`225`	`227`
`226`	`228`	`self.new_file=new_file`
`@@ -313,8 +315,9 @@ def _index_from_patch_format(cls, repo, stream):`
`313`	`315`
`314`	`316`	`# Make sure the mode is set if the path is set. Otherwise the resulting blob is invalid`
`315`	`317`	`# We just use the one mode we should have parsed`
`316`		`-index.append(Diff(repo,a_path,b_path,a_blob_id,b_blob_id,`
`317`		`-old_modeordeleted_file_modeorb_mode,new_modeornew_file_modeorb_mode,`
	`318`	`+a_mode=old_modeordeleted_file_modeor (a_pathand (b_modeornew_modeornew_file_mode))`
	`319`	`+b_mode=b_modeornew_modeornew_file_modeor (b_pathanda_mode)`
	`320`	`+index.append(Diff(repo,a_path,b_path,a_blob_id,b_blob_id,a_mode,b_mode,`
`318`	`321`	`new_file,deleted_file,rename_from,rename_to,None))`
`319`	`322`
`320`	`323`	`previous_header=header`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ def test_binary_diff(self):`
`73`	`73`	`assertlen(list(res.iter_change_type('M')))==1`
`74`	`74`	`ifres[0].diff:`
`75`	`75`	`assertres[0].diff=="Binary files a/rps and b/rps differ\n","in patch mode, we get a diff text"`
`76`		`-assertisinstance(str(res[0]),str),"This call should just work"`
	`76`	`+assertstr(res[0]),"This call should just work"`
`77`	`77`	`# end for each method to test`
`78`	`78`
`79`	`79`	`deftest_diff_index(self):`
`@@ -82,6 +82,7 @@ def test_diff_index(self):`
`82`	`82`	`assertlen(res)==6`
`83`	`83`	`fordrinres:`
`84`	`84`	`assertdr.diff`
	`85`	`+assertstr(dr),"Diff to string conversion should be possible"`
`85`	`86`	`# end for each diff`
`86`	`87`
`87`	`88`	`dr=res[3]`
`@@ -129,6 +130,9 @@ def test_diff_interface(self):`
`129`	`130`	`assertlen(diff_set)==1`
`130`	`131`	`assertdiff_index[0]==diff_index[0]`
`131`	`132`	`assertnot (diff_index[0]!=diff_index[0])`
	`133`	`+`
	`134`	`+fordrindiff_index:`
	`135`	`+assertstr(dr),"Diff to string conversion should be possible"`
`132`	`136`	`# END diff index checking`
`133`	`137`	`# END for each patch option`
`134`	`138`	`# END for each path option`

Comments

(0)