Mercurial > evolve

changeset 4928:379ce8ba150d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compat: compatibility for pathuril.dirs vs util.dirs
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 13 Nov 2019 13:43:46 +0700
parents 31cd40b1bb67
children bb2b4f6c99dc
files hgext3rd/evolve/cmdrewrite.py hgext3rd/evolve/compat.py
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/cmdrewrite.py	Fri Nov 15 10:59:47 2019 +0100
+++ b/hgext3rd/evolve/cmdrewrite.py	Wed Nov 13 13:43:46 2019 +0700
@@ -524,7 +524,7 @@
             # if not everything tracked in that directory can be
             # uncommitted.
             if badfiles:
-                badfiles -= set([f for f in util.dirs(eligible)])
+                badfiles -= set([f for f in compat.dirs(eligible)])
 
             try:
                 uipathfn = scmutil.getuipathfn(repo)
--- a/hgext3rd/evolve/compat.py	Fri Nov 15 10:59:47 2019 +0100
+++ b/hgext3rd/evolve/compat.py	Wed Nov 13 13:43:46 2019 +0700
@@ -46,6 +46,13 @@
     displaygraph = cmdutil.displaygraph
     changesetdiffer = None
 
+# hg <= 5.3 (c21aca51b392)
+try:
+    from mercurial import pathutil
+    dirs = pathutil.dirs
+except (AttributeError, ImportError):
+    dirs = util.dirs
+
 from . import (
     exthelper,
 )