# HG changeset patch # User Anton Shestakov # Date 1573627426 -25200 # Node ID 0fe5d74134d6b2889187439039cb6f6d65da3057 # Parent 0d1893c1044cabb7b4789bc17976ca039b7020d6 compat: compatibility for pathuril.dirs vs util.dirs diff -r 0d1893c1044c -r 0fe5d74134d6 hgext3rd/evolve/cmdrewrite.py --- a/hgext3rd/evolve/cmdrewrite.py Mon Nov 11 03:40:20 2019 +0700 +++ b/hgext3rd/evolve/cmdrewrite.py Wed Nov 13 13:43:46 2019 +0700 @@ -522,7 +522,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) diff -r 0d1893c1044c -r 0fe5d74134d6 hgext3rd/evolve/compat.py --- a/hgext3rd/evolve/compat.py Mon Nov 11 03:40:20 2019 +0700 +++ b/hgext3rd/evolve/compat.py Wed Nov 13 13:43:46 2019 +0700 @@ -45,6 +45,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, )