[Updated] D12012: filemerge: make `labels` a required arg for `_premerge()`

[martinvonz (Martin von Zweigbergk)]

Closed by commit rHG62682662346c: filemerge: make `labels` a required arg for `_premerge()` (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D12012?vs=31712&id=31825

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D12012/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D12012

AFFECTED FILES
  mercurial/filemerge.py

CHANGE DETAILS

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -399,7 +399,7 @@
         return filectx
 
 
-def _premerge(repo, fcd, fco, fca, toolconf, backup, labels=None):
+def _premerge(repo, fcd, fco, fca, toolconf, backup, labels):
     tool, toolpath, binary, symlink, scriptfn = toolconf
     if symlink or fcd.isabsent() or fco.isabsent():
         return 1
@@ -421,8 +421,6 @@
             )
 
     if premerge:
-        if not labels:
-            labels = _defaultconflictlabels
         if len(labels) < 3:
             labels.append(b'base')
         mode = b'merge'



To: martinvonz, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20220124/10cc58a8/attachment-0002.html>