From 061e8691b57285aee73c839423568e515043f8b2 Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gregory.szorc@gmail.com>
Date: Mon, 21 Dec 2015 21:38:53 -0800
Subject: [PATCH] dirstate: use absolute_import

---
 mercurial/dirstate.py         | 23 ++++++++++++++++++-----
 tests/test-check-py3-compat.t |  1 -
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
index 67f7b6bb0b..97da245344 100644
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -5,11 +5,24 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-from node import nullid
-from i18n import _
-import scmutil, util, osutil, parsers, encoding, pathutil, error
-import os, stat, errno
-import match as matchmod
+from __future__ import absolute_import
+
+import errno
+import os
+import stat
+
+from .i18n import _
+from .node import nullid
+from . import (
+    encoding,
+    error,
+    match as matchmod,
+    osutil,
+    parsers,
+    pathutil,
+    scmutil,
+    util,
+)
 
 propertycache = util.propertycache
 filecache = scmutil.filecache
diff --git a/tests/test-check-py3-compat.t b/tests/test-check-py3-compat.t
index c0f5990bef..da7c518c2d 100644
--- a/tests/test-check-py3-compat.t
+++ b/tests/test-check-py3-compat.t
@@ -102,7 +102,6 @@
   mercurial/cmdutil.py not using absolute_import
   mercurial/commands.py not using absolute_import
   mercurial/context.py not using absolute_import
-  mercurial/dirstate.py not using absolute_import
   mercurial/dispatch.py requires print_function
   mercurial/exchange.py not using absolute_import
   mercurial/httpclient/__init__.py not using absolute_import