# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1590697048 14400
# Node ID 17d928f8abaff86c35bcbe6029f8e2d2aefde5b7
# Parent  9f96beb9bafe3321401fb6a5f3275b7000ef3312
mergestate: move staticmethod _filectxorabsent to module level

I suspect this was a static method just because it made merge.py feel
less messy, but now we have a mergestate package so we can do better.

Differential Revision: https://phab.mercurial-scm.org/D8591

diff -r 9f96beb9bafe -r 17d928f8abaf mercurial/mergestate.py
--- a/mercurial/mergestate.py	Fri May 29 12:17:59 2020 +0200
+++ b/mercurial/mergestate.py	Thu May 28 16:17:28 2020 -0400
@@ -31,6 +31,13 @@
     return b'\0'.join(bits)
 
 
+def _filectxorabsent(hexnode, ctx, f):
+    if hexnode == nullhex:
+        return filemerge.absentfilectx(ctx, f)
+    else:
+        return ctx[f]
+
+
 # Merge state record types. See ``mergestate`` docs for more.
 RECORD_LOCAL = b'L'
 RECORD_OTHER = b'O'
@@ -600,8 +607,8 @@
             actx = self._repo[anccommitnode]
         else:
             actx = None
-        fcd = self._filectxorabsent(localkey, wctx, dfile)
-        fco = self._filectxorabsent(onode, octx, ofile)
+        fcd = _filectxorabsent(localkey, wctx, dfile)
+        fco = _filectxorabsent(onode, octx, ofile)
         # TODO: move this to filectxorabsent
         fca = self._repo.filectx(afile, fileid=anode, changectx=actx)
         # "premerge" x flags
@@ -679,12 +686,6 @@
 
         return complete, r
 
-    def _filectxorabsent(self, hexnode, ctx, f):
-        if hexnode == nullhex:
-            return filemerge.absentfilectx(ctx, f)
-        else:
-            return ctx[f]
-
     def preresolve(self, dfile, wctx):
         """run premerge process for dfile