changeset 6028:97aa9afe71a0

obshistory: remove 4.6 compat in handling obsmarker_printer diffopts
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 04 Sep 2021 19:22:57 +0300
parents 9e27494ac618
children f69a13a4fe85
files hgext3rd/evolve/obshistory.py
diffstat 1 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/obshistory.py	Sat Sep 04 19:21:40 2021 +0300
+++ b/hgext3rd/evolve/obshistory.py	Sat Sep 04 19:22:57 2021 +0300
@@ -265,11 +265,7 @@
 
         super(obsmarker_printer, self).__init__(ui, repo, *args, **kwargs)
         diffopts = kwargs.get('diffopts', {})
-
-        # hg <= 4.6 (3fe1c9263024)
-        if not util.safehasattr(self, "_includediff"):
-            self._includediff = diffopts and diffopts.get(b'patch')
-
+        self._includediff = diffopts and diffopts.get(b'patch')
         self.template = diffopts and diffopts.get(b'template')
         self.filter = diffopts and diffopts.get(b'filternonlocal')
         self.origin = diffopts and diffopts.get(b'origin')