[PATCH 7 of 8] py3: make contrib/simplemerge use absolute_import

Pulkit Goyal 7895pulkit at gmail.com
Thu May 12 16:55:00 EDT 2016


# HG changeset patch
# User Pulkit Goyal <7895pulkit at gmail.com>
# Date 1463086340 -19800
#      Fri May 13 02:22:20 2016 +0530
# Node ID 5a58e714148c54864ffe2685cee67f4052d59656
# Parent  210a9d05670a65a8ee8efa9eaa29a6efa36942c8
py3: make contrib/simplemerge use absolute_import

diff --git a/contrib/simplemerge b/contrib/simplemerge
--- a/contrib/simplemerge
+++ b/contrib/simplemerge
@@ -1,11 +1,19 @@
 #!/usr/bin/env python
 
+from __future__ import absolute_import
+
 from mercurial import demandimport
 demandimport.enable()
 
 import sys
 from mercurial.i18n import _
-from mercurial import error, simplemerge, fancyopts, util, ui
+from mercurial import (
+    error,
+    fancyopts,
+    simplemerge,
+    ui as uimod,
+    util,
+)
 
 options = [('L', 'label', [], _('labels to use on conflict markers')),
            ('a', 'text', None, _('treat all files as text')),
@@ -54,7 +62,7 @@
         sys.exit(0)
     if len(args) != 3:
             raise ParseError(_('wrong number of arguments'))
-    sys.exit(simplemerge.simplemerge(ui.ui(), *args, **opts))
+    sys.exit(simplemerge.simplemerge(uimod.ui(), *args, **opts))
 except ParseError as e:
     sys.stdout.write("%s: %s\n" % (sys.argv[0], e))
     showhelp()


More information about the Mercurial-devel mailing list