# HG changeset patch # User timeless # Date 1456909258 0 # Node ID 58b176240df6eed0a4c4917eeabc763ecb82065a # Parent 4e08b91a483fc96a4161d3d0795d674586a743ae convert: filemap use absolute_import diff -r 4e08b91a483f -r 58b176240df6 hgext/convert/filemap.py --- a/hgext/convert/filemap.py Wed Mar 02 08:58:01 2016 +0000 +++ b/hgext/convert/filemap.py Wed Mar 02 09:00:58 2016 +0000 @@ -3,12 +3,16 @@ # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. +from __future__ import absolute_import import posixpath import shlex +from mercurial import ( + error, +) from mercurial.i18n import _ -from mercurial import error -from common import SKIPREV, converter_source +from . import common +SKIPREV = common.SKIPREV def rpairs(path): '''Yield tuples with path split at '/', starting with the full path. @@ -164,7 +168,7 @@ # touch files we're interested in, but also merges that merge two # or more interesting revisions. -class filemap_source(converter_source): +class filemap_source(common.converter_source): def __init__(self, ui, baseconverter, filemap): super(filemap_source, self).__init__(ui) self.base = baseconverter diff -r 4e08b91a483f -r 58b176240df6 tests/test-check-py3-compat.t --- a/tests/test-check-py3-compat.t Wed Mar 02 08:58:01 2016 +0000 +++ b/tests/test-check-py3-compat.t Wed Mar 02 09:00:58 2016 +0000 @@ -31,7 +31,6 @@ hgext/convert/cvs.py not using absolute_import hgext/convert/cvsps.py not using absolute_import hgext/convert/darcs.py not using absolute_import - hgext/convert/filemap.py not using absolute_import hgext/convert/hg.py not using absolute_import hgext/convert/monotone.py not using absolute_import hgext/convert/p4.py not using absolute_import