Merge: These apis can take null

Author: CouleeApps

merge.cpp

@@ -145,9 +145,9 @@ Ref<DiffObject> DiffState::GenerateDiff(
 {
 	BNDiffObject* diff = BNDiffStateGenerateDiff(
 		m_object,
-		base->GetObject(),
-		left->GetObject(),
-		right->GetObject()
+		base ? base->GetObject() : nullptr,
+		left ? left->GetObject() : nullptr,
+		right ? right->GetObject() : nullptr
 	);
 
 	if (!diff)
@@ -169,9 +169,9 @@ bool DiffState::ApplyDiff(
 	return BNDiffStateApplyDiff(
 		m_object,
 		diff->GetObject(),
-		base->GetObject(),
-		left->GetObject(),
-		right->GetObject(),
+		base ? base->GetObject() : nullptr,
+		left ? left->GetObject() : nullptr,
+		right ? right->GetObject() : nullptr,
 		result->GetObject()
 	);
 }

python/database.py

@@ -484,23 +484,34 @@ def clear_errors(self):
 		core.BNClearDiffStateErrors(self.handle)
 
 	def generate_diff(
-		self, base: DatabaseObject, left: DatabaseObject, right: DatabaseObject
+		self, base: Optional[DatabaseObject], left: Optional[DatabaseObject], right: Optional[DatabaseObject]
 	) -> Optional['DiffObject']:
 		"""Generate a three-way diff database objects"""
 		handle = core.BNDiffStateGenerateDiff(
-			self.handle, base.handle, left.handle, right.handle
+			self.handle,
+			base.handle if base is not None else None,
+			left.handle if left is not None else None,
+			right.handle if right is not None else None
 		)
 		if handle is None:
 			return None
 		return DiffObject(handle=handle)
 
 	def apply_diff(
-		self, diff: 'DiffObject', base: DatabaseObject, left: DatabaseObject,
-		right: DatabaseObject, result: DatabaseObject
+		self,
+		diff: 'DiffObject',
+		base: Optional[DatabaseObject],
+		left: Optional[DatabaseObject],
+		right: Optional[DatabaseObject],
+		result: DatabaseObject
 	) -> bool:
 		"""Apply a diff to database objects"""
 		return core.BNDiffStateApplyDiff(
-			self.handle, diff.handle, base.handle, left.handle, right.handle,
+			self.handle,
+			diff.handle,
+			base.handle if base is not None else None,
+			left.handle if left is not None else None,
+			right.handle if right is not None else None,
 			result.handle
 		)