Add ability to Squash Changes when merging

netbox_branching/api/views.py

@@ -10,7 +10,7 @@
 from core.api.serializers import JobSerializer
 from netbox.api.viewsets import BaseViewSet, NetBoxReadOnlyModelViewSet
 from netbox_branching import filtersets
-from netbox_branching.jobs import MergeBranchJob, RevertBranchJob, SyncBranchJob
+from netbox_branching.jobs import JOB_TIMEOUT, MergeBranchJob, RevertBranchJob, SyncBranchJob
 from netbox_branching.models import Branch, BranchEvent, ChangeDiff
 from . import serializers
 
@@ -78,7 +78,8 @@ def merge(self, request, pk):
         job = MergeBranchJob.enqueue(
             instance=branch,
             user=request.user,
-            commit=commit
+            commit=commit,
+            job_timeout=JOB_TIMEOUT
         )
 
         return Response(JobSerializer(job, context={'request': request}).data)

netbox_branching/choices.py

@@ -1,4 +1,4 @@
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext_lazy as _, pgettext_lazy
 
 from utilities.choices import ChoiceSet
 
@@ -46,6 +46,16 @@ class BranchStatusChoices(ChoiceSet):
     )
 
 
+class BranchMergeStrategyChoices(ChoiceSet):
+    ITERATIVE = 'iterative'
+    SQUASH = 'squash'
+
+    CHOICES = (
+        (ITERATIVE, _('Iterative')),
+        (SQUASH, pgettext_lazy('The act of compressing multiple records into one', 'Squash')),
+    )
+
+
 class BranchEventTypeChoices(ChoiceSet):
     PROVISIONED = 'provisioned'
     SYNCED = 'synced'

netbox_branching/forms/misc.py

@@ -1,19 +1,24 @@
 from django import forms
 from django.utils.translation import gettext_lazy as _
 
+from netbox_branching.choices import BranchMergeStrategyChoices
 from netbox_branching.models import ChangeDiff
 
 __all__ = (
-    'BranchActionForm',
+    'BranchSyncForm',
+    'BranchMergeForm',
+    'BranchRevertForm',
     'ConfirmationForm',
     'MigrateBranchForm',
 )
 
 
-class BranchActionForm(forms.Form):
+class BaseBranchActionForm(forms.Form):
+    """Base form for branch actions (sync, merge, revert)."""
     pk = forms.ModelMultipleChoiceField(
         queryset=ChangeDiff.objects.all(),
-        required=False
+        required=False,
+        widget=forms.MultipleHiddenInput()
     )
     commit = forms.BooleanField(
         required=False,
@@ -43,6 +48,27 @@ def clean(self):
         return self.cleaned_data
 
 
+class BranchSyncForm(BaseBranchActionForm):
+    """Form for syncing a branch."""
+    pass
+
+
+class BranchMergeForm(BaseBranchActionForm):
+    """Form for merging a branch."""
+    merge_strategy = forms.ChoiceField(
+        choices=BranchMergeStrategyChoices,
+        initial=BranchMergeStrategyChoices.ITERATIVE,
+        required=True,
+        label=_('Merge Strategy'),
+        help_text=_('Strategy to use when merging changes.')
+    )
+
+
+class BranchRevertForm(BaseBranchActionForm):
+    """Form for reverting a branch."""
+    pass
+
+
 class ConfirmationForm(forms.Form):
     confirm = forms.BooleanField(
         required=True,

netbox_branching/jobs.py

@@ -8,6 +8,8 @@
 from .signal_receivers import validate_object_deletion_in_branch
 from .utilities import ListHandler
 
+JOB_TIMEOUT = 3600  # 1 hour - increased for large operations
+
 __all__ = (
     'MergeBranchJob',
     'MigrateBranchJob',
@@ -51,6 +53,12 @@ class SyncBranchJob(JobRunner):
     """
     class Meta:
         name = 'Sync branch'
+        job_timeout = 3600  # 1 hour - increased for large syncs
+
+    @property
+    def job_timeout(self):
+        """Return the job timeout from Meta."""
+        return getattr(self.Meta, 'job_timeout', None)
 
     def _disconnect_signal_receivers(self):
         """
@@ -102,6 +110,10 @@ class MergeBranchJob(JobRunner):
     class Meta:
         name = 'Merge branch'
 
+    @property
+    def job_timeout(self):
+        return JOB_TIMEOUT
+
     def run(self, commit=True, *args, **kwargs):
         # Initialize logging
         logger = logging.getLogger('netbox_branching.branch.merge')
@@ -123,6 +135,10 @@ class RevertBranchJob(JobRunner):
     class Meta:
         name = 'Revert branch'
 
+    @property
+    def job_timeout(self):
+        return JOB_TIMEOUT
+
     def run(self, commit=True, *args, **kwargs):
         # Initialize logging
         logger = logging.getLogger('netbox_branching.branch.revert')

netbox_branching/merge_strategies/__init__.py

@@ -0,0 +1,14 @@
+"""
+Merge strategy implementations for branch operations.
+"""
+from .strategy import MergeStrategy, get_merge_strategy
+from .iterative import IterativeMergeStrategy
+from .squash import SquashMergeStrategy
+
+
+__all__ = (
+    'MergeStrategy',
+    'IterativeMergeStrategy',
+    'SquashMergeStrategy',
+    'get_merge_strategy',
+)

netbox_branching/merge_strategies/iterative.py

@@ -0,0 +1,51 @@
+"""
+Iterative merge strategy implementation.
+"""
+from django.db import DEFAULT_DB_ALIAS
+
+from netbox.context_managers import event_tracking
+
+from .strategy import MergeStrategy
+
+
+__all__ = (
+    'IterativeMergeStrategy',
+)
+
+
+class IterativeMergeStrategy(MergeStrategy):
+    """
+    Iterative merge strategy that applies/reverts changes one at a time in chronological order.
+    """
+
+    def merge(self, branch, changes, request, logger, user):
+        """
+        Apply changes iteratively in chronological order.
+        """
+        models = set()
+
+        for change in changes:
+            models.add(change.changed_object_type.model_class())
+            with event_tracking(request):
+                request.id = change.request_id
+                request.user = change.user
+                change.apply(branch, using=DEFAULT_DB_ALIAS, logger=logger)
+
+        self._clean(models)
+
+    def revert(self, branch, changes, request, logger, user):
+        """
+        Undo changes iteratively (one at a time) in reverse chronological order.
+        """
+        models = set()
+
+        # Undo each change from the Branch
+        for change in changes:
+            models.add(change.changed_object_type.model_class())
+            with event_tracking(request):
+                request.id = change.request_id
+                request.user = change.user
+                change.undo(branch, logger=logger)
+
+        # Perform cleanup tasks
+        self._clean(models)