Mercurial > hgrepos > DevTools > mercurial-extensions

changeset 415:4b22cfae980d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
The `mergestate' class was moved to a new module `mercurial.mergestate' in HG 5.5: use this if available
author Franz Glasner <fzglas.hg@dom66.de>
date Wed, 01 Sep 2021 01:54:54 +0200
parents 38f4e4474df0
children 81f1bfebaede
files extensions/timestamps.py
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/extensions/timestamps.py	Sun Feb 02 16:40:47 2020 +0100
+++ b/extensions/timestamps.py	Wed Sep 01 01:54:54 2021 +0200
@@ -85,13 +85,17 @@
 from mercurial import (cmdutil, scmutil, config, util, error, pycompat,
                        demandimport)
 from mercurial import match as _matchmod
-from mercurial import merge as _mergemod
 with demandimport.deactivated():
     try:
         from mercurial import registrar
     except ImportError:
         registrar = None
 
+    try:
+        from mercurial.mergestate import mergestate
+    except ImportError:
+        from mercurial.merge import mergestate
+
 
 testedwith = b"4.5.2 4.6.1 4.8.1 4.9 5.0.1 5.1.2 5.2.1"
 
@@ -404,7 +408,7 @@
             if _DEV:
                 self.ui.debug("timestamps: UPDATE TO_UPDATE: "
                               + repr(to_update) + '\n')
-            ms = _mergemod.mergestate.read(self)
+            ms = mergestate.read(self)
             _debug_mergestate(self.ui, ms)
             if ms.active():
                 to_update.difference_update(set(ms.files()))