Mercurial > hgrepos > DevTools > mercurial-extensions

changeset 419:6606bff2d2eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
FIX: HG 5.6 compat: mergestate.mdstate() is gone
author Franz Glasner <fzglas.hg@dom66.de>
date Mon, 13 Sep 2021 09:33:15 +0200
parents 83ee547c7e5f
children 75273a180f87
files extensions/timestamps.py
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/extensions/timestamps.py	Sat Sep 11 17:58:26 2021 +0200
+++ b/extensions/timestamps.py	Mon Sep 13 09:33:15 2021 +0200
@@ -1303,8 +1303,14 @@
              + repr(ms._state) + '\n')
     ui.debug("UPDATE MergeState _stateextras: "
              + repr(ms._stateextras) + '\n')
-    ui.debug("UPDATE MergeState mdstate: "
-             + repr(ms.mdstate()) + '\n')
+    # On HG 5.6+: mdstate is gone
+    try:
+        mds = ms.mdstate
+    except AttributeError:
+        pass
+    else:
+        ui.debug("UPDATE MergeState mdstate: "
+                 + repr(mds()) + '\n')
 
 
 if hasattr(inspect, "getfullargspec"):