Commit b303cb0

thetwojByron

authored and

committed

Initial stab at fixing diffs involving submodule changes

1 parent 6fd0902 commit b303cb0Copy full SHA for b303cb0

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@`
`67`	`67`
`68`	`68`	`def handle_process_output(process, stdout_handler, stderr_handler,`
`69`	`69`	`finalizer=None, decode_streams=True):`
`70`		`- """Registers for notifications to lean that process output is ready to read, and dispatches lines to`
	`70`	`+ """Registers for notifications to learn that process output is ready to read, and dispatches lines to`
`71`	`71`	`the respective line handlers.`
`72`	`72`	`This function returns once the finalizer returns`
`73`	`73`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -278,6 +278,14 @@ def __init__(self, repo, a_rawpath, b_rawpath, a_blob_id, b_blob_id, a_mode,`
`278`	`278`	`if self.b_mode:`
`279`	`279`	`self.b_mode = mode_str_to_int(self.b_mode)`
`280`	`280`
	`281`	`+ # Determine whether this diff references a submodule, if it does then`
	`282`	`+ # we need to overwrite "repo" to the corresponding submodule's repo instead`
	`283`	`+ if repo and a_rawpath:`
	`284`	`+ for submodule in repo.submodules:`
	`285`	`+ if submodule.path == a_rawpath.decode("utf-8"):`
	`286`	`+ repo = submodule.module()`
	`287`	`+ break`
	`288`	`+`
`281`	`289`	`if a_blob_id is None or a_blob_id == self.NULL_HEX_SHA:`
`282`	`290`	`self.a_blob = None`
`283`	`291`	`else:`

Comments

(0)