py2: remove simple from __future__ statements
These were needed for Python 2 support. Now that our linter no longer
mandates these, we can start deleting them.
Differential Revision: https://phab.mercurial-scm.org/D12254
--- a/contrib/bdiff-torture.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/bdiff-torture.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,6 +1,5 @@
# Randomized torture test generation for bdiff
-from __future__ import absolute_import, print_function
import random
import sys
--- a/contrib/benchmarks/__init__.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/benchmarks/__init__.py Thu Mar 03 17:34:00 2022 +0100
@@ -31,7 +31,6 @@
$ asv --config contrib/asv.conf.json preview
'''
-from __future__ import absolute_import
import functools
import os
--- a/contrib/benchmarks/perf.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/benchmarks/perf.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from . import perfbench
--- a/contrib/benchmarks/revset.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/benchmarks/revset.py Thu Mar 03 17:34:00 2022 +0100
@@ -10,7 +10,6 @@
Each revset benchmark is parameterized with variants (first, last, sort, ...)
'''
-from __future__ import absolute_import
import os
import string
--- a/contrib/byteify-strings.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/byteify-strings.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
# 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, print_function
import argparse
import contextlib
--- a/contrib/casesmash.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/casesmash.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,4 +1,3 @@
-from __future__ import absolute_import
import __builtin__
import os
from mercurial import util
--- a/contrib/catapipe.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/catapipe.py Thu Mar 03 17:34:00 2022 +0100
@@ -34,7 +34,6 @@
HGCATAPULTSERVERPIPE environment variable, which both run-tests and hg
understand. To trace *only* run-tests, use HGTESTCATAPULTSERVERPIPE instead.
"""
-from __future__ import absolute_import, print_function
import argparse
import json
--- a/contrib/check-code.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/check-code.py Thu Mar 03 17:34:00 2022 +0100
@@ -19,7 +19,6 @@
* ONLY use no--check-code for skipping entire files from external sources
"""
-from __future__ import absolute_import, print_function
import glob
import keyword
import optparse
--- a/contrib/check-commit Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/check-commit Thu Mar 03 17:34:00 2022 +0100
@@ -15,7 +15,6 @@
#
# See also: https://mercurial-scm.org/wiki/ContributingChanges
-from __future__ import absolute_import, print_function
import os
import re
--- a/contrib/check-config.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/check-config.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
# 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, print_function
import re
import sys
--- a/contrib/check-py3-compat.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/check-py3-compat.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
# 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, print_function
import ast
import importlib
--- a/contrib/debugcmdserver.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/debugcmdserver.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
# $ ./hg serve --cmds pipe | ./contrib/debugcmdserver.py -
# o, 52 -> 'capabilities: getencoding runcommand\nencoding: UTF-8'
-from __future__ import absolute_import, print_function
import struct
import sys
--- a/contrib/debugshell.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/debugshell.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,7 +1,6 @@
# debugshell extension
"""a python shell with repo, changelog & manifest objects"""
-from __future__ import absolute_import
import code
import mercurial
import sys
--- a/contrib/dumprevlog Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/dumprevlog Thu Mar 03 17:34:00 2022 +0100
@@ -2,7 +2,6 @@
# Dump revlogs as raw data stream
# $ find .hg/store/ -name "*.i" | xargs dumprevlog > repo.dump
-from __future__ import absolute_import, print_function
import sys
from mercurial.node import hex
--- a/contrib/fuzz/dirs_corpus.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/fuzz/dirs_corpus.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import argparse
import zipfile
--- a/contrib/fuzz/dirstate_corpus.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/fuzz/dirstate_corpus.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import argparse
import os
import zipfile
--- a/contrib/fuzz/fm1readmarkers_corpus.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/fuzz/fm1readmarkers_corpus.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import argparse
import zipfile
--- a/contrib/fuzz/manifest_corpus.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/fuzz/manifest_corpus.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import argparse
import zipfile
--- a/contrib/fuzz/mpatch_corpus.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/fuzz/mpatch_corpus.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import argparse
import os
import struct
--- a/contrib/fuzz/revlog_corpus.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/fuzz/revlog_corpus.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import argparse
import os
import zipfile
--- a/contrib/genosxversion.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/genosxversion.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,4 @@
#!/usr/bin/env python2
-from __future__ import absolute_import, print_function
import argparse
import os
--- a/contrib/hg-ssh Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/hg-ssh Thu Mar 03 17:34:00 2022 +0100
@@ -28,7 +28,6 @@
You can also add a --read-only flag to allow read-only access to a key, e.g.:
command="hg-ssh --read-only repos/*"
"""
-from __future__ import absolute_import
import os
import re
--- a/contrib/hgclient.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/hgclient.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,6 +1,5 @@
# A minimal client for Mercurial's command server
-from __future__ import absolute_import, print_function
import io
import os
--- a/contrib/import-checker.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/import-checker.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,6 +1,5 @@
#!/usr/bin/env python3
-from __future__ import absolute_import, print_function
import ast
import collections
--- a/contrib/memory.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/memory.py Thu Mar 03 17:34:00 2022 +0100
@@ -11,8 +11,6 @@
prints it to ``stderr`` on exit.
'''
-from __future__ import absolute_import
-
def memusage(ui):
"""Report memory usage of the current process."""
--- a/contrib/perf-utils/perf-revlog-write-plot.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/perf-utils/perf-revlog-write-plot.py Thu Mar 03 17:34:00 2022 +0100
@@ -9,7 +9,6 @@
# various plot related to write performance in a revlog
#
# usage: perf-revlog-write-plot.py details.json
-from __future__ import absolute_import, print_function
import json
import re
--- a/contrib/perf-utils/search-discovery-case Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/perf-utils/search-discovery-case Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
# This use a subsetmaker extension (next to this script) to generate a steam of
# random discovery instance. When interesting case are discovered, information
# about them are print on the stdout.
-from __future__ import print_function
import json
import os
--- a/contrib/perf.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/perf.py Thu Mar 03 17:34:00 2022 +0100
@@ -54,7 +54,6 @@
# - make perf command for recent feature work correctly with early
# Mercurial
-from __future__ import absolute_import
import contextlib
import functools
import gc
--- a/contrib/phab-clean.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/phab-clean.py Thu Mar 03 17:34:00 2022 +0100
@@ -3,7 +3,6 @@
# A small script to automatically reject idle Diffs
#
# you need to set the PHABBOT_USER and PHABBOT_TOKEN environment variable for authentication
-from __future__ import absolute_import, print_function
import datetime
import os
--- a/contrib/python-hook-examples.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/python-hook-examples.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,7 +1,6 @@
'''
Examples of useful python hooks for Mercurial.
'''
-from __future__ import absolute_import
from mercurial import (
patch,
util,
--- a/contrib/python-zstandard/make_cffi.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/python-zstandard/make_cffi.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
# This software may be modified and distributed under the terms
# of the BSD license. See the LICENSE file for details.
-from __future__ import absolute_import
import cffi
import distutils.ccompiler
--- a/contrib/python-zstandard/setup.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/python-zstandard/setup.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# This software may be modified and distributed under the terms
# of the BSD license. See the LICENSE file for details.
-from __future__ import print_function
from distutils.version import LooseVersion
import os
--- a/contrib/python-zstandard/tests/test_module_attributes.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/python-zstandard/tests/test_module_attributes.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
import unittest
import zstandard as zstd
--- a/contrib/python-zstandard/zstandard/__init__.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/python-zstandard/zstandard/__init__.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
"""Python interface to the Zstandard (zstd) compression library."""
-from __future__ import absolute_import, unicode_literals
# This module serves 2 roles:
#
--- a/contrib/python-zstandard/zstandard/cffi.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/python-zstandard/zstandard/cffi.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
"""Python interface to the Zstandard (zstd) compression library."""
-from __future__ import absolute_import, unicode_literals
# This should match what the C extension exports.
__all__ = [
--- a/contrib/python3-ratchet.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/python3-ratchet.py Thu Mar 03 17:34:00 2022 +0100
@@ -15,8 +15,6 @@
$ python3 ../contrib/python3-ratchet.py \
> --working-tests=../contrib/python3-whitelist
"""
-from __future__ import print_function
-from __future__ import absolute_import
import argparse
import json
--- a/contrib/revsetbenchmarks.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/revsetbenchmarks.py Thu Mar 03 17:34:00 2022 +0100
@@ -8,7 +8,6 @@
#
# call with --help for details
-from __future__ import absolute_import, print_function
import math
import optparse # cannot use argparse, python 2.7 only
import os
--- a/contrib/showstack.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/showstack.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
r"""dump stack trace when receiving SIGQUIT (Ctrl-\) or SIGINFO (Ctrl-T on BSDs)
"""
-from __future__ import absolute_import, print_function
import signal
import sys
import traceback
--- a/contrib/simplemerge Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/simplemerge Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,4 @@
#!/usr/bin/env python3
-from __future__ import absolute_import
import getopt
import sys
--- a/contrib/synthrepo.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/synthrepo.py Thu Mar 03 17:34:00 2022 +0100
@@ -36,7 +36,6 @@
- Symlinks and binary files are ignored
'''
-from __future__ import absolute_import
import bisect
import collections
import itertools
--- a/contrib/testparseutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/testparseutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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, print_function
import abc
import re
--- a/contrib/undumprevlog Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/undumprevlog Thu Mar 03 17:34:00 2022 +0100
@@ -3,7 +3,6 @@
# $ hg init
# $ undumprevlog < repo.dump
-from __future__ import absolute_import, print_function
import sys
from mercurial.node import bin
--- a/contrib/win32/hgwebdir_wsgi.py Sun Feb 20 15:18:15 2022 -0700
+++ b/contrib/win32/hgwebdir_wsgi.py Thu Mar 03 17:34:00 2022 +0100
@@ -78,7 +78,6 @@
# - Restart the web server and see if things are running.
#
-from __future__ import absolute_import
# Configuration file location
hgweb_config = r'c:\your\directory\wsgi.config'
--- a/doc/check-seclevel.py Sun Feb 20 15:18:15 2022 -0700
+++ b/doc/check-seclevel.py Thu Mar 03 17:34:00 2022 +0100
@@ -2,7 +2,6 @@
#
# checkseclevel - checking section title levels in each online help document
-from __future__ import absolute_import
import optparse
import os
--- a/doc/docchecker Sun Feb 20 15:18:15 2022 -0700
+++ b/doc/docchecker Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
# 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, print_function
import os
import re
--- a/doc/gendoc.py Sun Feb 20 15:18:15 2022 -0700
+++ b/doc/gendoc.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
where DOC is the name of a document
"""
-from __future__ import absolute_import
import os
import sys
--- a/doc/hgmanpage.py Sun Feb 20 15:18:15 2022 -0700
+++ b/doc/hgmanpage.py Thu Mar 03 17:34:00 2022 +0100
@@ -41,7 +41,6 @@
by the command whatis or apropos.
"""
-from __future__ import absolute_import
__docformat__ = 'reStructuredText'
--- a/doc/runrst Sun Feb 20 15:18:15 2022 -0700
+++ b/doc/runrst Thu Mar 03 17:34:00 2022 +0100
@@ -12,7 +12,6 @@
where WRITER is the name of a Docutils writer such as 'html' or 'manpage'
"""
-from __future__ import absolute_import
import sys
--- a/hg Sun Feb 20 15:18:15 2022 -0700
+++ b/hg Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
#
# 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 os
import sys
--- a/hgdemandimport/__init__.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgdemandimport/__init__.py Thu Mar 03 17:34:00 2022 +0100
@@ -11,7 +11,6 @@
# demand loading is per-package. Keeping demandimport in the mercurial package
# would disable demand loading for any modules in mercurial.
-from __future__ import absolute_import
import os
import sys
--- a/hgdemandimport/demandimportpy2.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgdemandimport/demandimportpy2.py Thu Mar 03 17:34:00 2022 +0100
@@ -24,7 +24,6 @@
b = __import__(a)
'''
-from __future__ import absolute_import
import __builtin__ as builtins
import contextlib
--- a/hgdemandimport/demandimportpy3.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgdemandimport/demandimportpy3.py Thu Mar 03 17:34:00 2022 +0100
@@ -24,7 +24,6 @@
"""
# This line is unnecessary, but it satisfies test-check-py3-compat.t.
-from __future__ import absolute_import
import contextlib
import importlib.util
--- a/hgdemandimport/tracing.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgdemandimport/tracing.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
#
# 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 contextlib
import os
--- a/hgext/__init__.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/__init__.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,4 +1,3 @@
-from __future__ import absolute_import
import pkgutil
__path__ = pkgutil.extend_path(__path__, __name__)
--- a/hgext/absorb.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/absorb.py Thu Mar 03 17:34:00 2022 +0100
@@ -31,7 +31,6 @@
# * Converge getdraftstack() with other code in core
# * move many attributes on fixupstate to be private
-from __future__ import absolute_import
import collections
--- a/hgext/acl.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/acl.py Thu Mar 03 17:34:00 2022 +0100
@@ -213,7 +213,6 @@
'''
-from __future__ import absolute_import
from mercurial.i18n import _
from mercurial import (
--- a/hgext/amend.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/amend.py Thu Mar 03 17:34:00 2022 +0100
@@ -10,7 +10,6 @@
``commit --amend`` but does not prompt an editor.
"""
-from __future__ import absolute_import
from mercurial.i18n import _
from mercurial import (
--- a/hgext/automv.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/automv.py Thu Mar 03 17:34:00 2022 +0100
@@ -24,7 +24,6 @@
#
# See http://markmail.org/thread/5pxnljesvufvom57 for context.
-from __future__ import absolute_import
from mercurial.i18n import _
from mercurial import (
--- a/hgext/beautifygraph.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/beautifygraph.py Thu Mar 03 17:34:00 2022 +0100
@@ -11,7 +11,6 @@
A terminal with UTF-8 support and monospace narrow text are required.
'''
-from __future__ import absolute_import
from mercurial.i18n import _
from mercurial import (
--- a/hgext/blackbox.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/blackbox.py Thu Mar 03 17:34:00 2022 +0100
@@ -42,7 +42,6 @@
"""
-from __future__ import absolute_import
import re
--- a/hgext/bookflow.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/bookflow.py Thu Mar 03 17:34:00 2022 +0100
@@ -13,7 +13,6 @@
:hg up|co NAME: switch to bookmark
:hg push -B .: push active bookmark
"""
-from __future__ import absolute_import
from mercurial.i18n import _
from mercurial import (
--- a/hgext/bugzilla.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/bugzilla.py Thu Mar 03 17:34:00 2022 +0100
@@ -291,7 +291,6 @@
Changeset commit comment. Bug 1234.
'''
-from __future__ import absolute_import
import json
import re
--- a/hgext/censor.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/censor.py Thu Mar 03 17:34:00 2022 +0100
@@ -28,7 +28,6 @@
ignore censored data and merely report that it was encountered.
"""
-from __future__ import absolute_import
from mercurial.i18n import _
from mercurial.node import short
--- a/hgext/children.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/children.py Thu Mar 03 17:34:00 2022 +0100
@@ -14,7 +14,6 @@
"children(REV)"` instead.
'''
-from __future__ import absolute_import
from mercurial.i18n import _
from mercurial import (
--- a/hgext/churn.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/churn.py Thu Mar 03 17:34:00 2022 +0100
@@ -8,7 +8,6 @@
'''command to display statistics about repository history'''
-from __future__ import absolute_import, division
import datetime
import os
--- a/hgext/clonebundles.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/clonebundles.py Thu Mar 03 17:34:00 2022 +0100
@@ -202,7 +202,6 @@
Mercurial server when the bundle hosting service fails.
"""
-from __future__ import absolute_import
from mercurial import (
bundlecaches,
--- a/hgext/closehead.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/closehead.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
'''close arbitrary heads without checking them out first'''
-from __future__ import absolute_import
from mercurial.i18n import _
from mercurial import (
--- a/hgext/commitextras.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/commitextras.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
'''adds a new flag extras to commit (ADVANCED)'''
-from __future__ import absolute_import
import re
--- a/hgext/convert/__init__.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/convert/__init__.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
'''import revisions from foreign VCS repositories into Mercurial'''
-from __future__ import absolute_import
from mercurial.i18n import _
from mercurial import registrar
--- a/hgext/convert/bzr.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/convert/bzr.py Thu Mar 03 17:34:00 2022 +0100
@@ -8,7 +8,6 @@
# This module is for handling Breezy imports or `brz`, but it's also compatible
# with Bazaar or `bzr`, that was formerly known as Bazaar-NG;
# it cannot access `bar` repositories, but they were never used very much.
-from __future__ import absolute_import
import os
--- a/hgext/convert/common.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/convert/common.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
#
# 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 base64
import datetime
--- a/hgext/convert/convcmd.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/convert/convcmd.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
#
# 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 collections
import os
--- a/hgext/convert/cvs.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/convert/cvs.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
#
# 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 errno
import os
--- a/hgext/convert/cvsps.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/convert/cvsps.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
#
# 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 functools
import os
--- a/hgext/convert/darcs.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/convert/darcs.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
#
# 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 errno
import os
--- a/hgext/convert/filemap.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/convert/filemap.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
# 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, print_function
import posixpath
--- a/hgext/convert/git.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/convert/git.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
#
# 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 os
--- a/hgext/convert/gnuarch.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/convert/gnuarch.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
#
# 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 os
import shutil
--- a/hgext/convert/hg.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/convert/hg.py Thu Mar 03 17:34:00 2022 +0100
@@ -16,7 +16,6 @@
# identifier to be stored in the converted revision. This will cause
# the converted revision to have a different identity than the
# source.
-from __future__ import absolute_import
import os
import re
--- a/hgext/convert/monotone.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/convert/monotone.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
#
# 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 os
import re
--- a/hgext/convert/p4.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/convert/p4.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
#
# 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 marshal
import re
--- a/hgext/convert/subversion.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/convert/subversion.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,7 +1,6 @@
# Subversion 1.4/1.5 Python API backend
#
# Copyright(C) 2007 Daniel Holth et al
-from __future__ import absolute_import
import codecs
import locale
--- a/hgext/convert/transport.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/convert/transport.py Thu Mar 03 17:34:00 2022 +0100
@@ -16,7 +16,6 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
-from __future__ import absolute_import
import svn.client
import svn.core
--- a/hgext/eol.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/eol.py Thu Mar 03 17:34:00 2022 +0100
@@ -91,7 +91,6 @@
used.
"""
-from __future__ import absolute_import
import os
import re
--- a/hgext/extdiff.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/extdiff.py Thu Mar 03 17:34:00 2022 +0100
@@ -81,7 +81,6 @@
pretty fast (at least faster than having to compare the entire tree).
'''
-from __future__ import absolute_import
import os
import re
--- a/hgext/factotum.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/factotum.py Thu Mar 03 17:34:00 2022 +0100
@@ -45,7 +45,6 @@
'''
-from __future__ import absolute_import
import os
from mercurial.i18n import _
--- a/hgext/fastannotate/__init__.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/fastannotate/__init__.py Thu Mar 03 17:34:00 2022 +0100
@@ -101,7 +101,6 @@
#
# * format changes to the revmap file (maybe use length-encoding
# instead of null-terminated file paths at least?)
-from __future__ import absolute_import
from mercurial.i18n import _
from mercurial import (
--- a/hgext/fastannotate/commands.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/fastannotate/commands.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 os
--- a/hgext/fastannotate/context.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/fastannotate/context.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 collections
import contextlib
--- a/hgext/fastannotate/error.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/fastannotate/error.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
#
# 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
class CorruptedFileError(Exception):
--- a/hgext/fastannotate/formatter.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/fastannotate/formatter.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
#
# 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
from mercurial.node import (
hex,
--- a/hgext/fastannotate/protocol.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/fastannotate/protocol.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
#
# 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 contextlib
import os
--- a/hgext/fastannotate/revmap.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/fastannotate/revmap.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 bisect
import io
--- a/hgext/fastannotate/support.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/fastannotate/support.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from mercurial.pycompat import getattr
from mercurial import (
--- a/hgext/fastexport.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/fastexport.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
# The format specification for fast-import streams can be found at
# https://git-scm.com/docs/git-fast-import#_input_format
-from __future__ import absolute_import
import re
from mercurial.i18n import _
--- a/hgext/fetch.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/fetch.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
'''pull, update and merge in one command (DEPRECATED)'''
-from __future__ import absolute_import
from mercurial.i18n import _
from mercurial.node import short
--- a/hgext/fix.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/fix.py Thu Mar 03 17:34:00 2022 +0100
@@ -122,7 +122,6 @@
file content back to stdout as documented above.
"""
-from __future__ import absolute_import
import collections
import itertools
--- a/hgext/fsmonitor/__init__.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/fsmonitor/__init__.py Thu Mar 03 17:34:00 2022 +0100
@@ -107,7 +107,6 @@
# The issues related to nested repos and subrepos are probably not fundamental
# ones. Patches to fix them are welcome.
-from __future__ import absolute_import
import codecs
import os
--- a/hgext/fsmonitor/pywatchman/__init__.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/fsmonitor/pywatchman/__init__.py Thu Mar 03 17:34:00 2022 +0100
@@ -27,7 +27,6 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# no unicode literals
-from __future__ import absolute_import, division, print_function
import inspect
import math
--- a/hgext/fsmonitor/pywatchman/capabilities.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/fsmonitor/pywatchman/capabilities.py Thu Mar 03 17:34:00 2022 +0100
@@ -27,7 +27,6 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# no unicode literals
-from __future__ import absolute_import, division, print_function
def parse_version(vstr):
--- a/hgext/fsmonitor/pywatchman/compat.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/fsmonitor/pywatchman/compat.py Thu Mar 03 17:34:00 2022 +0100
@@ -27,7 +27,6 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# no unicode literals
-from __future__ import absolute_import, division, print_function
import sys
--- a/hgext/fsmonitor/pywatchman/encoding.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/fsmonitor/pywatchman/encoding.py Thu Mar 03 17:34:00 2022 +0100
@@ -27,7 +27,6 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# no unicode literals
-from __future__ import absolute_import, division, print_function
import sys
--- a/hgext/fsmonitor/pywatchman/load.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/fsmonitor/pywatchman/load.py Thu Mar 03 17:34:00 2022 +0100
@@ -27,7 +27,6 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# no unicode literals
-from __future__ import absolute_import, division, print_function
import ctypes
--- a/hgext/fsmonitor/pywatchman/pybser.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/fsmonitor/pywatchman/pybser.py Thu Mar 03 17:34:00 2022 +0100
@@ -27,7 +27,6 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# no unicode literals
-from __future__ import absolute_import, division, print_function
import binascii
import collections
--- a/hgext/fsmonitor/state.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/fsmonitor/state.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 errno
import os
--- a/hgext/fsmonitor/watchmanclient.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/fsmonitor/watchmanclient.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 getpass
--- a/hgext/git/__init__.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/git/__init__.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
firstborn a la Rumpelstiltskin, etc.
"""
-from __future__ import absolute_import
import os
--- a/hgext/git/dirstate.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/git/dirstate.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import contextlib
import errno
import os
--- a/hgext/git/gitlog.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/git/gitlog.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from mercurial.i18n import _
from mercurial.node import (
--- a/hgext/git/gitutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/git/gitutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,4 @@
"""utilities to assist in working with pygit2"""
-from __future__ import absolute_import
from mercurial.node import bin, hex, sha1nodeconstants
--- a/hgext/git/index.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/git/index.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import collections
import os
import sqlite3
--- a/hgext/git/manifest.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/git/manifest.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from mercurial import (
match as matchmod,
pathutil,
--- a/hgext/githelp.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/githelp.py Thu Mar 03 17:34:00 2022 +0100
@@ -15,7 +15,6 @@
produced.
"""
-from __future__ import absolute_import
import getopt
import re
--- a/hgext/gpg.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/gpg.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
'''commands to sign and verify changesets'''
-from __future__ import absolute_import
import binascii
import os
--- a/hgext/graphlog.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/graphlog.py Thu Mar 03 17:34:00 2022 +0100
@@ -15,7 +15,6 @@
revision graph is also shown.
'''
-from __future__ import absolute_import
from mercurial.i18n import _
from mercurial import (
--- a/hgext/hgk.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/hgk.py Thu Mar 03 17:34:00 2022 +0100
@@ -34,7 +34,6 @@
vdiff on hovered and selected revisions.
'''
-from __future__ import absolute_import
import os
--- a/hgext/highlight/__init__.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/highlight/__init__.py Thu Mar 03 17:34:00 2022 +0100
@@ -26,7 +26,6 @@
match (even matches with a low confidence score) will be used.
"""
-from __future__ import absolute_import
from . import highlight
from mercurial.hgweb import (
--- a/hgext/highlight/highlight.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/highlight/highlight.py Thu Mar 03 17:34:00 2022 +0100
@@ -8,7 +8,6 @@
# The original module was split in an interface and an implementation
# file to defer pygments loading and speedup extension setup.
-from __future__ import absolute_import
from mercurial import demandimport
--- a/hgext/histedit.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/histedit.py Thu Mar 03 17:34:00 2022 +0100
@@ -190,7 +190,6 @@
"""
-from __future__ import absolute_import
# chistedit dependencies that are not available everywhere
try:
--- a/hgext/hooklib/__init__.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/hooklib/__init__.py Thu Mar 03 17:34:00 2022 +0100
@@ -13,7 +13,6 @@
extension as option. The functionality itself is planned to be supported
long-term.
"""
-from __future__ import absolute_import
from . import (
changeset_obsoleted,
changeset_published,
--- a/hgext/hooklib/changeset_obsoleted.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/hooklib/changeset_obsoleted.py Thu Mar 03 17:34:00 2022 +0100
@@ -17,7 +17,6 @@
python:hgext.hooklib.changeset_obsoleted.hook
"""
-from __future__ import absolute_import
import email.errors as emailerrors
import email.utils as emailutils
--- a/hgext/hooklib/changeset_published.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/hooklib/changeset_published.py Thu Mar 03 17:34:00 2022 +0100
@@ -17,7 +17,6 @@
python:hgext.hooklib.changeset_published.hook
"""
-from __future__ import absolute_import
import email.errors as emailerrors
import email.utils as emailutils
--- a/hgext/hooklib/enforce_draft_commits.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/hooklib/enforce_draft_commits.py Thu Mar 03 17:34:00 2022 +0100
@@ -14,7 +14,6 @@
python:hgext.hooklib.enforce_draft_commits.hook
"""
-from __future__ import absolute_import
from mercurial.i18n import _
from mercurial import (
--- a/hgext/hooklib/reject_merge_commits.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/hooklib/reject_merge_commits.py Thu Mar 03 17:34:00 2022 +0100
@@ -14,7 +14,6 @@
python:hgext.hooklib.reject_merge_commits.hook
"""
-from __future__ import absolute_import
from mercurial.i18n import _
from mercurial import (
--- a/hgext/hooklib/reject_new_heads.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/hooklib/reject_new_heads.py Thu Mar 03 17:34:00 2022 +0100
@@ -14,7 +14,6 @@
python:hgext.hooklib.reject_new_heads.hook
"""
-from __future__ import absolute_import
from mercurial.i18n import _
from mercurial import (
--- a/hgext/infinitepush/__init__.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/infinitepush/__init__.py Thu Mar 03 17:34:00 2022 +0100
@@ -87,7 +87,6 @@
bookmarks = True
"""
-from __future__ import absolute_import
import collections
import contextlib
--- a/hgext/infinitepush/bundleparts.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/infinitepush/bundleparts.py Thu Mar 03 17:34:00 2022 +0100
@@ -3,7 +3,6 @@
# 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
from mercurial.i18n import _
from mercurial.node import hex
--- a/hgext/infinitepush/common.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/infinitepush/common.py Thu Mar 03 17:34:00 2022 +0100
@@ -3,7 +3,6 @@
# 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 os
--- a/hgext/infinitepush/fileindexapi.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/infinitepush/fileindexapi.py Thu Mar 03 17:34:00 2022 +0100
@@ -11,7 +11,6 @@
indexpath = PATH
"""
-from __future__ import absolute_import
import os
--- a/hgext/infinitepush/indexapi.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/infinitepush/indexapi.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,8 +5,6 @@
# 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
-
class indexapi(object):
"""Class that manages access to infinitepush index.
--- a/hgext/infinitepush/sqlindexapi.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/infinitepush/sqlindexapi.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 logging
import os
--- a/hgext/infinitepush/store.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/infinitepush/store.py Thu Mar 03 17:34:00 2022 +0100
@@ -3,7 +3,6 @@
# based on bundleheads extension by Gregory Szorc <gps@mozilla.com>
-from __future__ import absolute_import
import abc
import os
--- a/hgext/journal.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/journal.py Thu Mar 03 17:34:00 2022 +0100
@@ -11,7 +11,6 @@
"""
-from __future__ import absolute_import
import collections
import errno
--- a/hgext/keyword.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/keyword.py Thu Mar 03 17:34:00 2022 +0100
@@ -83,8 +83,6 @@
'''
-from __future__ import absolute_import
-
import os
import re
import weakref
--- a/hgext/largefiles/__init__.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/largefiles/__init__.py Thu Mar 03 17:34:00 2022 +0100
@@ -104,7 +104,6 @@
explicitly do so with the --large flag passed to the :hg:`add`
command.
'''
-from __future__ import absolute_import
from mercurial import (
cmdutil,
--- a/hgext/largefiles/basestore.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/largefiles/basestore.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
# GNU General Public License version 2 or any later version.
'''base class for store implementations and store-related utility code'''
-from __future__ import absolute_import
from mercurial.i18n import _
--- a/hgext/largefiles/lfcommands.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/largefiles/lfcommands.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
# GNU General Public License version 2 or any later version.
'''High-level command function for lfconvert, plus the cmdtable.'''
-from __future__ import absolute_import
import errno
import os
--- a/hgext/largefiles/lfutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/largefiles/lfutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
# GNU General Public License version 2 or any later version.
'''largefiles utility code: must not import other modules in this package.'''
-from __future__ import absolute_import
import contextlib
import copy
--- a/hgext/largefiles/localstore.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/largefiles/localstore.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
# GNU General Public License version 2 or any later version.
'''store class for local filesystem'''
-from __future__ import absolute_import
from mercurial.i18n import _
from mercurial.pycompat import open
--- a/hgext/largefiles/overrides.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/largefiles/overrides.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
# GNU General Public License version 2 or any later version.
'''Overridden Mercurial commands and functions for the largefiles extension'''
-from __future__ import absolute_import
import copy
import os
--- a/hgext/largefiles/proto.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/largefiles/proto.py Thu Mar 03 17:34:00 2022 +0100
@@ -2,7 +2,6 @@
#
# 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 os
--- a/hgext/largefiles/remotestore.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/largefiles/remotestore.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# GNU General Public License version 2 or any later version.
'''remote largefile store; the base class for wirestore'''
-from __future__ import absolute_import
from mercurial.i18n import _
--- a/hgext/largefiles/reposetup.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/largefiles/reposetup.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
# GNU General Public License version 2 or any later version.
'''setup for largefiles repositories: reposetup'''
-from __future__ import absolute_import
import copy
--- a/hgext/largefiles/storefactory.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/largefiles/storefactory.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,7 +1,6 @@
# 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 re
--- a/hgext/largefiles/wirestore.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/largefiles/wirestore.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
# GNU General Public License version 2 or any later version.
'''largefile store working over Mercurial's wire protocol'''
-from __future__ import absolute_import
from . import (
lfutil,
--- a/hgext/lfs/__init__.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/lfs/__init__.py Thu Mar 03 17:34:00 2022 +0100
@@ -120,7 +120,6 @@
usercache = /path/to/global/cache
"""
-from __future__ import absolute_import
import sys
--- a/hgext/lfs/blobstore.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/lfs/blobstore.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 contextlib
import errno
--- a/hgext/lfs/pointer.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/lfs/pointer.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 re
--- a/hgext/lfs/wireprotolfsserver.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/lfs/wireprotolfsserver.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 datetime
import errno
--- a/hgext/lfs/wrapper.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/lfs/wrapper.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 hashlib
--- a/hgext/logtoprocess.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/logtoprocess.py Thu Mar 03 17:34:00 2022 +0100
@@ -32,7 +32,6 @@
"""
-from __future__ import absolute_import
import os
--- a/hgext/mq.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/mq.py Thu Mar 03 17:34:00 2022 +0100
@@ -62,7 +62,6 @@
in the strip extension.
'''
-from __future__ import absolute_import, print_function
import errno
import os
--- a/hgext/narrow/__init__.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/narrow/__init__.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
# GNU General Public License version 2 or any later version.
'''create clones which fetch history data for subset of files (EXPERIMENTAL)'''
-from __future__ import absolute_import
from mercurial import (
localrepo,
--- a/hgext/narrow/narrowbundle2.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/narrow/narrowbundle2.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 errno
import struct
--- a/hgext/narrow/narrowcommands.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/narrow/narrowcommands.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
#
# 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 itertools
import os
--- a/hgext/narrow/narrowdirstate.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/narrow/narrowdirstate.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from mercurial.i18n import _
from mercurial import error
--- a/hgext/narrow/narrowrepo.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/narrow/narrowrepo.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from mercurial import wireprototypes
--- a/hgext/narrow/narrowtemplates.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/narrow/narrowtemplates.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from mercurial import (
registrar,
--- a/hgext/narrow/narrowwirepeer.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/narrow/narrowwirepeer.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from mercurial import (
bundle2,
--- a/hgext/notify.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/notify.py Thu Mar 03 17:34:00 2022 +0100
@@ -154,7 +154,6 @@
references. See also ``notify.strip``.
'''
-from __future__ import absolute_import
import email.errors as emailerrors
import email.utils as emailutils
--- a/hgext/pager.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/pager.py Thu Mar 03 17:34:00 2022 +0100
@@ -21,7 +21,6 @@
[pager]
attend-cat = false
'''
-from __future__ import absolute_import
from mercurial import (
cmdutil,
--- a/hgext/patchbomb.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/patchbomb.py Thu Mar 03 17:34:00 2022 +0100
@@ -71,7 +71,6 @@
You can set patchbomb to always ask for confirmation by setting
``patchbomb.confirm`` to true.
'''
-from __future__ import absolute_import
import email.encoders as emailencoders
import email.mime.base as emimebase
--- a/hgext/phabricator.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/phabricator.py Thu Mar 03 17:34:00 2022 +0100
@@ -57,7 +57,6 @@
example.phabtoken = cli-xxxxxxxxxxxxxxxxxxxxxxxxxxxx
"""
-from __future__ import absolute_import
import base64
import contextlib
--- a/hgext/rebase.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/rebase.py Thu Mar 03 17:34:00 2022 +0100
@@ -14,7 +14,6 @@
https://mercurial-scm.org/wiki/RebaseExtension
'''
-from __future__ import absolute_import
import errno
import os
--- a/hgext/record.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/record.py Thu Mar 03 17:34:00 2022 +0100
@@ -10,7 +10,6 @@
The feature provided by this extension has been moved into core Mercurial as
:hg:`commit --interactive`.'''
-from __future__ import absolute_import
from mercurial.i18n import _
from mercurial import (
--- a/hgext/releasenotes.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/releasenotes.py Thu Mar 03 17:34:00 2022 +0100
@@ -11,7 +11,6 @@
process simpler by automating it.
"""
-from __future__ import absolute_import
import difflib
import errno
--- a/hgext/relink.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/relink.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
# GNU General Public License version 2 or any later version.
"""recreates hardlinks between repository clones"""
-from __future__ import absolute_import
import os
import stat
--- a/hgext/remotefilelog/__init__.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/remotefilelog/__init__.py Thu Mar 03 17:34:00 2022 +0100
@@ -124,7 +124,6 @@
corruption before returning metadata
"""
-from __future__ import absolute_import
import os
import time
--- a/hgext/remotefilelog/basepack.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/remotefilelog/basepack.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import collections
import errno
import mmap
--- a/hgext/remotefilelog/basestore.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/remotefilelog/basestore.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import errno
import os
import shutil
--- a/hgext/remotefilelog/connectionpool.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/remotefilelog/connectionpool.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from mercurial import (
hg,
--- a/hgext/remotefilelog/constants.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/remotefilelog/constants.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import struct
from mercurial.i18n import _
--- a/hgext/remotefilelog/contentstore.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/remotefilelog/contentstore.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import threading
from mercurial.node import (
--- a/hgext/remotefilelog/datapack.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/remotefilelog/datapack.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import struct
import zlib
--- a/hgext/remotefilelog/debugcommands.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/remotefilelog/debugcommands.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
#
# 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 os
import zlib
--- a/hgext/remotefilelog/fileserverclient.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/remotefilelog/fileserverclient.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 io
import os
--- a/hgext/remotefilelog/historypack.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/remotefilelog/historypack.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import struct
from mercurial.node import (
--- a/hgext/remotefilelog/metadatastore.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/remotefilelog/metadatastore.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from mercurial.node import (
hex,
sha1nodeconstants,
--- a/hgext/remotefilelog/remotefilectx.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/remotefilelog/remotefilectx.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
#
# 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 collections
import time
--- a/hgext/remotefilelog/remotefilelog.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/remotefilelog/remotefilelog.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
#
# 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 collections
import os
--- a/hgext/remotefilelog/remotefilelogserver.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/remotefilelog/remotefilelogserver.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
#
# 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 errno
import os
--- a/hgext/remotefilelog/repack.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/remotefilelog/repack.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import os
import time
--- a/hgext/remotefilelog/shallowbundle.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/remotefilelog/shallowbundle.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
#
# 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
from mercurial.i18n import _
from mercurial.node import bin, hex
--- a/hgext/remotefilelog/shallowrepo.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/remotefilelog/shallowrepo.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
#
# 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 os
--- a/hgext/remotefilelog/shallowstore.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/remotefilelog/shallowstore.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
#
# 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
def wrapstore(store):
--- a/hgext/remotefilelog/shallowutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/remotefilelog/shallowutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
#
# 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 collections
import errno
--- a/hgext/remotefilelog/shallowverifier.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/remotefilelog/shallowverifier.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
#
# 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
from mercurial.i18n import _
from mercurial import verify
--- a/hgext/remotenames.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/remotenames.py Thu Mar 03 17:34:00 2022 +0100
@@ -24,7 +24,6 @@
namespace (default: 'default')
"""
-from __future__ import absolute_import
from mercurial.i18n import _
--- a/hgext/schemes.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/schemes.py Thu Mar 03 17:34:00 2022 +0100
@@ -39,7 +39,6 @@
You can override a predefined scheme by defining a new scheme with the
same name.
"""
-from __future__ import absolute_import
import os
import re
--- a/hgext/share.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/share.py Thu Mar 03 17:34:00 2022 +0100
@@ -65,7 +65,6 @@
and there are no untracked files, delete that share and create a new share.
'''
-from __future__ import absolute_import
import errno
from mercurial.i18n import _
--- a/hgext/show.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/show.py Thu Mar 03 17:34:00 2022 +0100
@@ -25,7 +25,6 @@
performed.
"""
-from __future__ import absolute_import
from mercurial.i18n import _
from mercurial.node import nullrev
--- a/hgext/sparse.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/sparse.py Thu Mar 03 17:34:00 2022 +0100
@@ -71,7 +71,6 @@
tools/tests/**
"""
-from __future__ import absolute_import
from mercurial.i18n import _
from mercurial.pycompat import setattr
--- a/hgext/split.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/split.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
# GNU General Public License version 2 or any later version.
"""command to split a changeset into smaller ones (EXPERIMENTAL)"""
-from __future__ import absolute_import
from mercurial.i18n import _
--- a/hgext/sqlitestore.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/sqlitestore.py Thu Mar 03 17:34:00 2022 +0100
@@ -43,7 +43,6 @@
# --extra-config-opt extensions.sqlitestore= \
# --extra-config-opt storage.new-repo-backend=sqlite
-from __future__ import absolute_import
import sqlite3
import struct
--- a/hgext/strip.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/strip.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
This extension allows you to strip changesets and all their descendants from the
repository. See the command help for details.
"""
-from __future__ import absolute_import
from mercurial import commands
--- a/hgext/transplant.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/transplant.py Thu Mar 03 17:34:00 2022 +0100
@@ -13,7 +13,6 @@
Transplanted patches are recorded in .hg/transplant/transplants, as a
map from a changeset hash to its hash in the source repository.
'''
-from __future__ import absolute_import
import os
--- a/hgext/uncommit.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/uncommit.py Thu Mar 03 17:34:00 2022 +0100
@@ -17,7 +17,6 @@
added and removed in the working directory.
"""
-from __future__ import absolute_import
from mercurial.i18n import _
--- a/hgext/win32mbcs.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/win32mbcs.py Thu Mar 03 17:34:00 2022 +0100
@@ -44,7 +44,6 @@
It is useful for the users who want to commit with UTF-8 log message.
'''
-from __future__ import absolute_import
import os
import sys
--- a/hgext/win32text.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/win32text.py Thu Mar 03 17:34:00 2022 +0100
@@ -41,7 +41,6 @@
# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr
'''
-from __future__ import absolute_import
import re
from mercurial.i18n import _
--- a/hgext/zeroconf/Zeroconf.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/zeroconf/Zeroconf.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
""" Multicast DNS Service Discovery for Python, v0.12
Copyright (C) 2003, Paul Scott-Murphy
--- a/hgext/zeroconf/__init__.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext/zeroconf/__init__.py Thu Mar 03 17:34:00 2022 +0100
@@ -22,7 +22,6 @@
$ hg paths
zc-test = http://example.com:8000/test
'''
-from __future__ import absolute_import
import os
import socket
--- a/hgext3rd/__init__.py Sun Feb 20 15:18:15 2022 -0700
+++ b/hgext3rd/__init__.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,4 @@
# name space package to host third party extensions
-from __future__ import absolute_import
import pkgutil
__path__ = pkgutil.extend_path(__path__, __name__)
--- a/i18n/check-translation.py Sun Feb 20 15:18:15 2022 -0700
+++ b/i18n/check-translation.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,7 +1,6 @@
#!/usr/bin/env python3
#
# check-translation.py - check Mercurial specific translation problems
-from __future__ import absolute_import
import re
--- a/i18n/hggettext Sun Feb 20 15:18:15 2022 -0700
+++ b/i18n/hggettext Thu Mar 03 17:34:00 2022 +0100
@@ -20,7 +20,6 @@
join the message cataloges to get the final catalog.
"""
-from __future__ import absolute_import, print_function
import inspect
import os
--- a/i18n/polib.py Sun Feb 20 15:18:15 2022 -0700
+++ b/i18n/polib.py Thu Mar 03 17:34:00 2022 +0100
@@ -13,7 +13,6 @@
:func:`~polib.mofile` convenience functions.
"""
-from __future__ import absolute_import
__author__ = 'David Jean Louis <izimobil@gmail.com>'
__version__ = '1.0.7'
--- a/i18n/posplit Sun Feb 20 15:18:15 2022 -0700
+++ b/i18n/posplit Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# license: MIT/X11/Expat
#
-from __future__ import absolute_import, print_function
import polib
import re
--- a/mercurial/__init__.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/__init__.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
# Allow 'from mercurial import demandimport' to keep working.
import hgdemandimport
--- a/mercurial/ancestor.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/ancestor.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 heapq
--- a/mercurial/archival.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/archival.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 gzip
import os
--- a/mercurial/bookmarks.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/bookmarks.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 errno
import struct
--- a/mercurial/branchmap.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/branchmap.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 struct
--- a/mercurial/bundle2.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/bundle2.py Thu Mar 03 17:34:00 2022 +0100
@@ -145,7 +145,6 @@
preserve.
"""
-from __future__ import absolute_import, division
import collections
import errno
--- a/mercurial/bundlerepo.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/bundlerepo.py Thu Mar 03 17:34:00 2022 +0100
@@ -11,7 +11,6 @@
were part of the actual repository.
"""
-from __future__ import absolute_import
import os
import shutil
--- a/mercurial/cacheutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/cacheutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
#
# 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
from . import repoview
--- a/mercurial/cffi/bdiff.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/cffi/bdiff.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 struct
--- a/mercurial/cffi/bdiffbuild.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/cffi/bdiffbuild.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import cffi
import os
--- a/mercurial/cffi/mpatch.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/cffi/mpatch.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from ..pure.mpatch import *
from ..pure.mpatch import mpatchError # silence pyflakes
--- a/mercurial/cffi/mpatchbuild.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/cffi/mpatchbuild.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import cffi
import os
--- a/mercurial/cffi/osutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/cffi/osutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 os
import stat as statmod
--- a/mercurial/cffi/osutilbuild.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/cffi/osutilbuild.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import cffi
ffi = cffi.FFI()
--- a/mercurial/changegroup.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/changegroup.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 os
import struct
--- a/mercurial/changelog.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/changelog.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from .i18n import _
from .node import (
--- a/mercurial/chgserver.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/chgserver.py Thu Mar 03 17:34:00 2022 +0100
@@ -39,7 +39,6 @@
skiphash = False
"""
-from __future__ import absolute_import
import inspect
import os
--- a/mercurial/cmdutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/cmdutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 copy as copymod
import errno
--- a/mercurial/color.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/color.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 re
--- a/mercurial/commands.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/commands.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 errno
import os
--- a/mercurial/commandserver.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/commandserver.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 errno
import gc
--- a/mercurial/commit.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/commit.py Thu Mar 03 17:34:00 2022 +0100
@@ -3,7 +3,6 @@
# 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 errno
--- a/mercurial/config.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/config.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 errno
import os
--- a/mercurial/configitems.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/configitems.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 functools
import re
--- a/mercurial/context.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/context.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 errno
import filecmp
--- a/mercurial/copies.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/copies.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
# 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 collections
import os
--- a/mercurial/crecord.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/crecord.py Thu Mar 03 17:34:00 2022 +0100
@@ -8,7 +8,6 @@
# This code is based on the Mark Edgington's crecord extension.
# (Itself based on Bryan O'Sullivan's record extension.)
-from __future__ import absolute_import
import os
import re
--- a/mercurial/dagop.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/dagop.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 heapq
--- a/mercurial/dagparser.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/dagparser.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 re
import string
--- a/mercurial/debugcommands.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/debugcommands.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 binascii
import codecs
--- a/mercurial/destutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/destutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from .i18n import _
from . import bookmarks, error, obsutil, scmutil, stack
--- a/mercurial/diffhelper.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/diffhelper.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from .i18n import _
--- a/mercurial/diffutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/diffutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
# 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
from .i18n import _
--- a/mercurial/dirstate.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/dirstate.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 collections
import contextlib
--- a/mercurial/dirstateguard.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/dirstateguard.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 os
from .i18n import _
--- a/mercurial/dirstatemap.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/dirstatemap.py Thu Mar 03 17:34:00 2022 +0100
@@ -3,7 +3,6 @@
# 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 errno
--- a/mercurial/dirstateutils/docket.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/dirstateutils/docket.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 struct
--- a/mercurial/dirstateutils/timestamp.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/dirstateutils/timestamp.py Thu Mar 03 17:34:00 2022 +0100
@@ -3,7 +3,6 @@
# 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 functools
import os
--- a/mercurial/dirstateutils/v2.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/dirstateutils/v2.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 struct
--- a/mercurial/discovery.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/discovery.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 functools
--- a/mercurial/dispatch.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/dispatch.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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, print_function
import errno
import getopt
--- a/mercurial/encoding.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/encoding.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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, print_function
import locale
import os
--- a/mercurial/error.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/error.py Thu Mar 03 17:34:00 2022 +0100
@@ -11,7 +11,6 @@
imports.
"""
-from __future__ import absolute_import
import difflib
--- a/mercurial/exchange.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/exchange.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 collections
import weakref
--- a/mercurial/extensions.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/extensions.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 ast
import collections
--- a/mercurial/exthelper.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/exthelper.py Thu Mar 03 17:34:00 2022 +0100
@@ -9,7 +9,6 @@
### Extension helper ###
#####################################################################
-from __future__ import absolute_import
from . import (
commands,
--- a/mercurial/fancyopts.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/fancyopts.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 abc
import functools
--- a/mercurial/filelog.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/filelog.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from .i18n import _
from .node import nullrev
--- a/mercurial/filemerge.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/filemerge.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 contextlib
import os
--- a/mercurial/fileset.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/fileset.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 errno
import re
--- a/mercurial/filesetlang.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/filesetlang.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from .i18n import _
from .pycompat import getattr
--- a/mercurial/formatter.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/formatter.py Thu Mar 03 17:34:00 2022 +0100
@@ -105,7 +105,6 @@
baz: foo, bar
"""
-from __future__ import absolute_import, print_function
import contextlib
import itertools
--- a/mercurial/graphmod.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/graphmod.py Thu Mar 03 17:34:00 2022 +0100
@@ -17,7 +17,6 @@
Data depends on type.
"""
-from __future__ import absolute_import
from .node import nullrev
from .thirdparty import attr
--- a/mercurial/grep.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/grep.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 difflib
import errno
--- a/mercurial/hbisect.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/hbisect.py Thu Mar 03 17:34:00 2022 +0100
@@ -8,7 +8,6 @@
# 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 collections
import contextlib
--- a/mercurial/help.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/help.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 itertools
import re
--- a/mercurial/hg.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/hg.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
# 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 errno
import os
--- a/mercurial/hgweb/__init__.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/hgweb/__init__.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
# 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 os
--- a/mercurial/hgweb/common.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/hgweb/common.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
# 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 base64
import errno
--- a/mercurial/hgweb/hgweb_mod.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/hgweb/hgweb_mod.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
# 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 contextlib
import os
--- a/mercurial/hgweb/hgwebdir_mod.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/hgweb/hgwebdir_mod.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
# 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 gc
import os
--- a/mercurial/hgweb/request.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/hgweb/request.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
# 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 wsgiref.validate
--- a/mercurial/hgweb/server.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/hgweb/server.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
# 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 errno
import importlib
--- a/mercurial/hgweb/webcommands.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/hgweb/webcommands.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 copy
import mimetypes
--- a/mercurial/hgweb/webutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/hgweb/webutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
# 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 copy
import difflib
--- a/mercurial/hgweb/wsgicgi.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/hgweb/wsgicgi.py Thu Mar 03 17:34:00 2022 +0100
@@ -8,7 +8,6 @@
# This was originally copied from the public domain code at
# http://www.python.org/dev/peps/pep-0333/#the-server-gateway-side
-from __future__ import absolute_import
import os
--- a/mercurial/hgweb/wsgiheaders.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/hgweb/wsgiheaders.py Thu Mar 03 17:34:00 2022 +0100
@@ -9,7 +9,6 @@
# Regular expression that matches `special' characters in parameters, the
# existence of which force quoting of the parameter value.
-from __future__ import absolute_import, print_function
import re
--- a/mercurial/hook.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/hook.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 contextlib
import errno
--- a/mercurial/httpconnection.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/httpconnection.py Thu Mar 03 17:34:00 2022 +0100
@@ -8,7 +8,6 @@
# 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 os
--- a/mercurial/httppeer.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/httppeer.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
# 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 errno
import io
--- a/mercurial/i18n.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/i18n.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 gettext as gettextmod
import locale
--- a/mercurial/interfaces/dirstate.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/interfaces/dirstate.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import contextlib
from . import util as interfaceutil
--- a/mercurial/interfaces/repository.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/interfaces/repository.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
# 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
from ..i18n import _
from .. import error
--- a/mercurial/interfaces/util.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/interfaces/util.py Thu Mar 03 17:34:00 2022 +0100
@@ -9,7 +9,6 @@
# bookkeeping for declaring interfaces. So, we use stubs for various
# zope.interface primitives unless instructed otherwise.
-from __future__ import absolute_import
from .. import encoding
--- a/mercurial/keepalive.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/keepalive.py Thu Mar 03 17:34:00 2022 +0100
@@ -82,7 +82,6 @@
# $Id: keepalive.py,v 1.14 2006/04/04 21:00:32 mstenner Exp $
-from __future__ import absolute_import, print_function
import collections
import errno
--- a/mercurial/linelog.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/linelog.py Thu Mar 03 17:34:00 2022 +0100
@@ -18,7 +18,6 @@
deletion is performed on the file, a jump instruction is used to patch
in a new body of annotate information.
"""
-from __future__ import absolute_import, print_function
import abc
import struct
--- a/mercurial/localrepo.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/localrepo.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
# 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 errno
import functools
--- a/mercurial/lock.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/lock.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 contextlib
import errno
--- a/mercurial/logcmdutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/logcmdutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 itertools
import os
--- a/mercurial/logexchange.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/logexchange.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
# 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
from .node import hex
--- a/mercurial/loggingutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/loggingutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
# 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 errno
--- a/mercurial/lsprof.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/lsprof.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import _lsprof
import sys
--- a/mercurial/lsprofcalltree.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/lsprofcalltree.py Thu Mar 03 17:34:00 2022 +0100
@@ -10,7 +10,6 @@
of the GNU General Public License, incorporated herein by reference.
"""
-from __future__ import absolute_import
from . import pycompat
--- a/mercurial/mail.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/mail.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 email
import email.charset
--- a/mercurial/manifest.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/manifest.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 heapq
import itertools
--- a/mercurial/match.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/match.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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, print_function
import bisect
import copy
--- a/mercurial/mdiff.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/mdiff.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 re
import struct
--- a/mercurial/merge.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/merge.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 collections
import errno
--- a/mercurial/mergestate.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/mergestate.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import collections
import errno
import shutil
--- a/mercurial/mergeutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/mergeutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from .i18n import _
--- a/mercurial/metadata.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/metadata.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
#
# 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, print_function
import multiprocessing
import struct
--- a/mercurial/minifileset.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/minifileset.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from .i18n import _
from . import (
--- a/mercurial/minirst.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/minirst.py Thu Mar 03 17:34:00 2022 +0100
@@ -18,7 +18,6 @@
when adding support for new constructs.
"""
-from __future__ import absolute_import
import re
--- a/mercurial/namespaces.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/namespaces.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from .i18n import _
from . import (
pycompat,
--- a/mercurial/narrowspec.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/narrowspec.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from .i18n import _
from .pycompat import getattr
--- a/mercurial/node.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/node.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 binascii
--- a/mercurial/obsolete.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/obsolete.py Thu Mar 03 17:34:00 2022 +0100
@@ -67,7 +67,6 @@
comment associated with each format for details.
"""
-from __future__ import absolute_import
import errno
import struct
--- a/mercurial/obsutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/obsutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 re
--- a/mercurial/parser.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/parser.py Thu Mar 03 17:34:00 2022 +0100
@@ -16,7 +16,6 @@
# an action is a tree node name, a tree label, and an optional match
# __call__(program) parses program into a labeled tree
-from __future__ import absolute_import, print_function
from .i18n import _
from . import (
--- a/mercurial/patch.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/patch.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
# 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, print_function
import collections
import contextlib
--- a/mercurial/pathutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/pathutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import contextlib
import errno
import os
--- a/mercurial/phases.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/phases.py Thu Mar 03 17:34:00 2022 +0100
@@ -100,7 +100,6 @@
"""
-from __future__ import absolute_import
import errno
import struct
--- a/mercurial/policy.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/policy.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 os
import sys
--- a/mercurial/posix.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/posix.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 errno
import fcntl
--- a/mercurial/profiling.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/profiling.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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, print_function
import contextlib
--- a/mercurial/progress.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/progress.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 errno
import threading
--- a/mercurial/pure/base85.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/pure/base85.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 struct
--- a/mercurial/pure/bdiff.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/pure/bdiff.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 difflib
import re
--- a/mercurial/pure/charencode.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/pure/charencode.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 array
--- a/mercurial/pure/mpatch.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/pure/mpatch.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 io
import struct
--- a/mercurial/pure/osutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/pure/osutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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, division
import ctypes
import ctypes.util
--- a/mercurial/pure/parsers.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/pure/parsers.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 io
import stat
--- a/mercurial/pushkey.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/pushkey.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from . import (
bookmarks,
--- a/mercurial/pvec.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/pvec.py Thu Mar 03 17:34:00 2022 +0100
@@ -48,7 +48,6 @@
different branches
'''
-from __future__ import absolute_import
from .node import nullrev
from . import (
--- a/mercurial/pycompat.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/pycompat.py Thu Mar 03 17:34:00 2022 +0100
@@ -8,7 +8,6 @@
This contains aliases to hide python version-specific details from the core.
"""
-from __future__ import absolute_import
import builtins
import codecs
--- a/mercurial/rcutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/rcutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 os
--- a/mercurial/registrar.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/registrar.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from . import (
configitems,
--- a/mercurial/repair.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/repair.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
# 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 errno
--- a/mercurial/repocache.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/repocache.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 collections
import gc
--- a/mercurial/repoview.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/repoview.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
# 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 copy
import weakref
--- a/mercurial/requirements.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/requirements.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
# obsolete experimental requirements:
# - manifestv2: An experimental new manifest format that allowed
--- a/mercurial/revlog.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/revlog.py Thu Mar 03 17:34:00 2022 +0100
@@ -12,7 +12,6 @@
and O(changes) merge between branches.
"""
-from __future__ import absolute_import
import binascii
import collections
--- a/mercurial/revlogutils/__init__.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/revlogutils/__init__.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from ..thirdparty import attr
from ..interfaces import repository
--- a/mercurial/revlogutils/constants.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/revlogutils/constants.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
# GNU General Public License version 2 or any later version.
"""Helper class to compute deltas stored inside revlogs"""
-from __future__ import absolute_import
import struct
--- a/mercurial/revlogutils/deltas.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/revlogutils/deltas.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
# GNU General Public License version 2 or any later version.
"""Helper class to compute deltas stored inside revlogs"""
-from __future__ import absolute_import
import collections
import struct
--- a/mercurial/revlogutils/docket.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/revlogutils/docket.py Thu Mar 03 17:34:00 2022 +0100
@@ -15,7 +15,6 @@
#
# * a data file, containing variable width data for these revisions,
-from __future__ import absolute_import
import errno
import os
--- a/mercurial/revlogutils/flagutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/revlogutils/flagutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
# 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
from ..i18n import _
--- a/mercurial/revlogutils/nodemap.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/revlogutils/nodemap.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
# 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 errno
import re
--- a/mercurial/revlogutils/revlogv0.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/revlogutils/revlogv0.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
#
# 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
from ..node import sha1nodeconstants
--- a/mercurial/revlogutils/sidedata.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/revlogutils/sidedata.py Thu Mar 03 17:34:00 2022 +0100
@@ -30,7 +30,6 @@
the concept.
"""
-from __future__ import absolute_import
import collections
import struct
--- a/mercurial/revset.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/revset.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 re
--- a/mercurial/revsetlang.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/revsetlang.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 string
--- a/mercurial/rewriteutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/rewriteutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 re
--- a/mercurial/scmposix.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/scmposix.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import array
import errno
import fcntl
--- a/mercurial/scmutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/scmutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 errno
import glob
--- a/mercurial/scmwindows.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/scmwindows.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import os
from . import (
--- a/mercurial/server.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/server.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 os
--- a/mercurial/setdiscovery.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/setdiscovery.py Thu Mar 03 17:34:00 2022 +0100
@@ -40,7 +40,6 @@
classified with it (since all ancestors or descendants will be marked as well).
"""
-from __future__ import absolute_import
import collections
import random
--- a/mercurial/shelve.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/shelve.py Thu Mar 03 17:34:00 2022 +0100
@@ -20,7 +20,6 @@
shelved change has a distinct name. For details, see the help for "hg
shelve".
"""
-from __future__ import absolute_import
import collections
import errno
--- a/mercurial/similar.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/similar.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from .i18n import _
from . import (
--- a/mercurial/simplemerge.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/simplemerge.py Thu Mar 03 17:34:00 2022 +0100
@@ -16,7 +16,6 @@
# mbp: "you know that thing where cvs gives you conflict markers?"
# s: "i hate that."
-from __future__ import absolute_import
from .i18n import _
from . import (
--- a/mercurial/smartset.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/smartset.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from .pycompat import getattr
from . import (
--- a/mercurial/sparse.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/sparse.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 os
--- a/mercurial/sshpeer.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/sshpeer.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 re
import uuid
--- a/mercurial/sslutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/sslutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
# 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 hashlib
import os
--- a/mercurial/stack.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/stack.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,8 +5,6 @@
# 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
-
def getstack(repo, rev=None):
"""return a sorted smartrev of the stack containing either rev if it is
--- a/mercurial/state.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/state.py Thu Mar 03 17:34:00 2022 +0100
@@ -17,7 +17,6 @@
the data.
"""
-from __future__ import absolute_import
import contextlib
--- a/mercurial/statichttprepo.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/statichttprepo.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
# 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 errno
--- a/mercurial/statprof.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/statprof.py Thu Mar 03 17:34:00 2022 +0100
@@ -101,7 +101,6 @@
main thread's work patterns.
"""
# no-check-code
-from __future__ import absolute_import, division, print_function
import collections
import contextlib
--- a/mercurial/store.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/store.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 errno
import functools
--- a/mercurial/streamclone.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/streamclone.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 contextlib
import errno
--- a/mercurial/strip.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/strip.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from .i18n import _
from .pycompat import getattr
from . import (
--- a/mercurial/subrepo.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/subrepo.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 copy
import errno
--- a/mercurial/subrepoutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/subrepoutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 errno
import os
--- a/mercurial/tagmerge.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/tagmerge.py Thu Mar 03 17:34:00 2022 +0100
@@ -71,7 +71,6 @@
# - put blocks whose nodes come all from p2 first
# - write the tag blocks in the sorted order
-from __future__ import absolute_import
from .i18n import _
from . import (
--- a/mercurial/tags.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/tags.py Thu Mar 03 17:34:00 2022 +0100
@@ -10,7 +10,6 @@
# Eventually, it could take care of updating (adding/removing/moving)
# tags too.
-from __future__ import absolute_import
import errno
import io
--- a/mercurial/templatefilters.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/templatefilters.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 os
import re
--- a/mercurial/templatefuncs.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/templatefuncs.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 re
--- a/mercurial/templatekw.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/templatekw.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from .i18n import _
from .node import (
--- a/mercurial/templater.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/templater.py Thu Mar 03 17:34:00 2022 +0100
@@ -65,7 +65,6 @@
operation.
"""
-from __future__ import absolute_import, print_function
import abc
import os
--- a/mercurial/templateutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/templateutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 abc
import types
--- a/mercurial/testing/__init__.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/testing/__init__.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,8 +1,3 @@
-from __future__ import (
- absolute_import,
- division,
-)
-
import os
import time
--- a/mercurial/testing/revlog.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/testing/revlog.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,4 +1,3 @@
-from __future__ import absolute_import
import unittest
# picked from test-parse-index2, copied rather than imported
--- a/mercurial/testing/storage.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/testing/storage.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 unittest
--- a/mercurial/transaction.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/transaction.py Thu Mar 03 17:34:00 2022 +0100
@@ -11,7 +11,6 @@
# 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 errno
--- a/mercurial/treediscovery.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/treediscovery.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 collections
--- a/mercurial/txnutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/txnutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 errno
--- a/mercurial/ui.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/ui.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 collections
import contextlib
--- a/mercurial/unionrepo.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/unionrepo.py Thu Mar 03 17:34:00 2022 +0100
@@ -11,7 +11,6 @@
allowing operations like diff and log with revsets.
"""
-from __future__ import absolute_import
from .i18n import _
from .pycompat import getattr
--- a/mercurial/upgrade.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/upgrade.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from .i18n import _
from . import (
--- a/mercurial/upgrade_utils/actions.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/upgrade_utils/actions.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from ..i18n import _
from .. import (
--- a/mercurial/upgrade_utils/engine.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/upgrade_utils/engine.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 errno
import stat
--- a/mercurial/url.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/url.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
# 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 base64
import socket
--- a/mercurial/urllibcompat.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/urllibcompat.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
#
# 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
from .pycompat import getattr
from . import pycompat
--- a/mercurial/util.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/util.py Thu Mar 03 17:34:00 2022 +0100
@@ -13,7 +13,6 @@
hide platform-specific details from the core.
"""
-from __future__ import absolute_import, print_function
import abc
import collections
--- a/mercurial/utils/cborutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/utils/cborutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 struct
import sys
--- a/mercurial/utils/compression.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/utils/compression.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,8 +4,6 @@
# GNU General Public License version 2 or any later version.
-from __future__ import absolute_import, print_function
-
import bz2
import collections
import zlib
--- a/mercurial/utils/dateutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/utils/dateutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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, print_function
import calendar
import datetime
--- a/mercurial/utils/hashutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/utils/hashutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import hashlib
try:
--- a/mercurial/utils/procutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/utils/procutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
# 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 contextlib
import errno
--- a/mercurial/utils/repoviewutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/utils/repoviewutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
# 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
### Nearest subset relation
# Nearest subset of filter X is a filter Y so that:
--- a/mercurial/utils/resourceutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/utils/resourceutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
# 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 imp
import os
--- a/mercurial/utils/storageutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/utils/storageutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 re
import struct
--- a/mercurial/utils/stringutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/utils/stringutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
# 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 ast
import codecs
--- a/mercurial/verify.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/verify.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 os
--- a/mercurial/vfs.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/vfs.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
#
# 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 contextlib
import errno
--- a/mercurial/win32.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/win32.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 ctypes
import ctypes.wintypes as wintypes
--- a/mercurial/windows.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/windows.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 errno
import getpass
--- a/mercurial/wireprotoframing.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/wireprotoframing.py Thu Mar 03 17:34:00 2022 +0100
@@ -9,7 +9,6 @@
# protocol. For details about the protocol, see
# `hg help internals.wireprotocol`.
-from __future__ import absolute_import
import collections
import struct
--- a/mercurial/wireprotoserver.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/wireprotoserver.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
# 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 contextlib
import struct
--- a/mercurial/wireprototypes.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/wireprototypes.py Thu Mar 03 17:34:00 2022 +0100
@@ -3,7 +3,6 @@
# 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
from .node import (
bin,
--- a/mercurial/wireprotov1peer.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/wireprotov1peer.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 sys
import weakref
--- a/mercurial/wireprotov1server.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/wireprotov1server.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 binascii
import os
--- a/mercurial/worker.py Sun Feb 20 15:18:15 2022 -0700
+++ b/mercurial/worker.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 errno
import os
--- a/tests/artifacts/scripts/generate-churning-bundle.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/artifacts/scripts/generate-churning-bundle.py Thu Mar 03 17:34:00 2022 +0100
@@ -17,7 +17,6 @@
#
# Running with `chg` in your path and `CHGHG` set is recommended for speed.
-from __future__ import absolute_import, print_function
import hashlib
import os
--- a/tests/autodiff.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/autodiff.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,6 +1,5 @@
# Extension dedicated to test patch.diff() upgrade modes
-from __future__ import absolute_import
from mercurial import (
error,
--- a/tests/basic_test_result.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/basic_test_result.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import sys
import unittest
--- a/tests/blackbox-readonly-dispatch.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/blackbox-readonly-dispatch.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,4 +1,3 @@
-from __future__ import absolute_import
import os
from mercurial import (
dispatch,
--- a/tests/bruterebase.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/bruterebase.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from mercurial import (
error,
--- a/tests/check-perf-code.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/check-perf-code.py Thu Mar 03 17:34:00 2022 +0100
@@ -2,7 +2,6 @@
#
# check-perf-code - (historical) portability checker for contrib/perf.py
-from __future__ import absolute_import
import os
import sys
--- a/tests/common-pattern.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/common-pattern.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,4 @@
# common patterns in test at can safely be replaced
-from __future__ import absolute_import
import os
--- a/tests/crashgetbundler.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/crashgetbundler.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from mercurial.i18n import _
from mercurial import changegroup, error, extensions
--- a/tests/drawdag.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/drawdag.py Thu Mar 03 17:34:00 2022 +0100
@@ -80,7 +80,6 @@
# split: A -> B, C # 1 to many
# prune: A, B, C # many to nothing
"""
-from __future__ import absolute_import, print_function
import collections
import itertools
--- a/tests/dumbhttp.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/dumbhttp.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,6 +1,5 @@
#!/usr/bin/env python
-from __future__ import absolute_import
"""
Small and dumb HTTP server for use in tests.
--- a/tests/dummysmtpd.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/dummysmtpd.py Thu Mar 03 17:34:00 2022 +0100
@@ -2,7 +2,6 @@
"""dummy SMTP server for use in tests"""
-from __future__ import absolute_import
import asyncore
import optparse
--- a/tests/dummyssh Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/dummyssh Thu Mar 03 17:34:00 2022 +0100
@@ -1,6 +1,5 @@
#!/usr/bin/env python3
-from __future__ import absolute_import
import os
import shlex
--- a/tests/f Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/f Thu Mar 03 17:34:00 2022 +0100
@@ -23,7 +23,6 @@
md5sum.py
"""
-from __future__ import absolute_import
import binascii
import glob
--- a/tests/failfilemerge.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/failfilemerge.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,6 +1,5 @@
# extension to emulate interrupting filemerge._filemerge
-from __future__ import absolute_import
from mercurial import (
error,
--- a/tests/fakedirstatewritetime.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/fakedirstatewritetime.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# - 'workingctx._poststatusfixup()' (= 'repo.status()')
# - 'committablectx.markcommitted()'
-from __future__ import absolute_import
from mercurial import (
context,
--- a/tests/fakemergerecord.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/fakemergerecord.py Thu Mar 03 17:34:00 2022 +0100
@@ -2,7 +2,6 @@
#
#
-from __future__ import absolute_import
from mercurial import (
mergestate as mergestatemod,
--- a/tests/fakepatchtime.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/fakepatchtime.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,7 +1,6 @@
# extension to emulate invoking 'patch.internalpatch()' at the time
# specified by '[fakepatchtime] fakenow'
-from __future__ import absolute_import
from mercurial import (
extensions,
--- a/tests/filterpyflakes.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/filterpyflakes.py Thu Mar 03 17:34:00 2022 +0100
@@ -2,7 +2,6 @@
# Filter output by pyflakes to control which warnings we check
-from __future__ import absolute_import, print_function
import re
import sys
--- a/tests/filtertraceback.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/filtertraceback.py Thu Mar 03 17:34:00 2022 +0100
@@ -2,7 +2,6 @@
# Filters traceback lines from stdin.
-from __future__ import absolute_import, print_function
import io
import sys
--- a/tests/flagprocessorext.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/flagprocessorext.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,6 +1,5 @@
# coding=UTF-8
-from __future__ import absolute_import
import base64
import zlib
--- a/tests/fsmonitor-run-tests.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/fsmonitor-run-tests.py Thu Mar 03 17:34:00 2022 +0100
@@ -11,8 +11,6 @@
# Watchman and runs the Mercurial tests against it. This ensures that the global
# version of Watchman isn't affected by anything this test does.
-from __future__ import absolute_import
-from __future__ import print_function
import argparse
import contextlib
--- a/tests/generate-working-copy-states.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/generate-working-copy-states.py Thu Mar 03 17:34:00 2022 +0100
@@ -29,7 +29,6 @@
# $ hg forget *_*_*-untracked
# $ rm *_*_missing-*
-from __future__ import absolute_import, print_function
import os
import sys
--- a/tests/get-with-headers.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/get-with-headers.py Thu Mar 03 17:34:00 2022 +0100
@@ -3,7 +3,6 @@
"""This does HTTP GET requests given a host:port and path and returns
a subset of the headers plus the body of the result."""
-from __future__ import absolute_import
import argparse
import json
--- a/tests/heredoctest.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/heredoctest.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import sys
--- a/tests/hghave Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/hghave Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
prefixed with "no-", the absence of feature is tested.
"""
-from __future__ import absolute_import, print_function
import hghave
import optparse
--- a/tests/hghave.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/hghave.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import distutils.version
import os
import re
--- a/tests/hgweberror.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/hgweberror.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,6 +1,5 @@
# A dummy extension that installs an hgweb command that throws an Exception.
-from __future__ import absolute_import
from mercurial.hgweb import webcommands
--- a/tests/httpserverauth.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/httpserverauth.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import base64
import hashlib
--- a/tests/hypothesishelpers.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/hypothesishelpers.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
#
# For details see http://hypothesis.readthedocs.org
-from __future__ import absolute_import, print_function
import os
import sys
import traceback
--- a/tests/killdaemons.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/killdaemons.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,6 +1,5 @@
#!/usr/bin/env python3
-from __future__ import absolute_import
import errno
import os
import signal
--- a/tests/list-tree.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/list-tree.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,8 +1,3 @@
-from __future__ import (
- absolute_import,
- print_function,
-)
-
import argparse
import os
--- a/tests/lockdelay.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/lockdelay.py Thu Mar 03 17:34:00 2022 +0100
@@ -2,7 +2,6 @@
#
# This extension can be used to test race conditions between lock acquisition.
-from __future__ import absolute_import
import os
import time
--- a/tests/logexceptions.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/logexceptions.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 inspect
import os
--- a/tests/ls-l.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/ls-l.py Thu Mar 03 17:34:00 2022 +0100
@@ -2,7 +2,6 @@
# like ls -l, but do not print date, user, or non-common mode bit, to avoid
# using globs in tests.
-from __future__ import absolute_import, print_function
import os
import stat
--- a/tests/md5sum.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/md5sum.py Thu Mar 03 17:34:00 2022 +0100
@@ -6,7 +6,6 @@
# of the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2, which is
# GPL-compatible.
-from __future__ import absolute_import
import hashlib
import os
--- a/tests/mockblackbox.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/mockblackbox.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,4 +1,3 @@
-from __future__ import absolute_import
from mercurial.utils import procutil
# XXX: we should probably offer a devel option to do this in blackbox directly
--- a/tests/mockmakedate.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/mockmakedate.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,6 +1,5 @@
# mock out util.makedate() to supply testable values
-from __future__ import absolute_import
import os
--- a/tests/mocktime.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/mocktime.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import os
import time
--- a/tests/printenv.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/printenv.py Thu Mar 03 17:34:00 2022 +0100
@@ -12,7 +12,6 @@
# - [output] is the name of the output file (default: use sys.stdout)
# the file will be opened in append mode.
#
-from __future__ import absolute_import
import argparse
import os
import sys
--- a/tests/printrevset.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/printrevset.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,4 +1,3 @@
-from __future__ import absolute_import
from mercurial.thirdparty import attr
from mercurial import (
cmdutil,
--- a/tests/pullext.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/pullext.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from mercurial.i18n import _
from mercurial import (
--- a/tests/readlink.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/readlink.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,6 +1,5 @@
#!/usr/bin/env python3
-from __future__ import absolute_import, print_function
import errno
import os
--- a/tests/remotefilelog-getflogheads.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/remotefilelog-getflogheads.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from mercurial.i18n import _
from mercurial import (
hg,
--- a/tests/revlog-formatv0.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/revlog-formatv0.py Thu Mar 03 17:34:00 2022 +0100
@@ -17,7 +17,6 @@
empty file
"""
-from __future__ import absolute_import
import binascii
import os
import sys
--- a/tests/revnamesext.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/revnamesext.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,6 +1,5 @@
# Dummy extension to define a namespace containing revision names
-from __future__ import absolute_import
from mercurial import namespaces
--- a/tests/run-tests.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/run-tests.py Thu Mar 03 17:34:00 2022 +0100
@@ -43,8 +43,6 @@
# completes fairly quickly, includes both shell and Python scripts, and
# includes some scripts that run daemon processes.)
-from __future__ import absolute_import, print_function
-
import argparse
import collections
--- a/tests/seq.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/seq.py Thu Mar 03 17:34:00 2022 +0100
@@ -7,7 +7,6 @@
# seq START STOP [START, STOP] stepping by 1
# seq START STEP STOP [START, STOP] stepping by STEP
-from __future__ import absolute_import, print_function
import os
import sys
--- a/tests/silenttestrunner.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/silenttestrunner.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function
import os
import sys
import unittest
--- a/tests/simplestorerepo.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/simplestorerepo.py Thu Mar 03 17:34:00 2022 +0100
@@ -10,7 +10,6 @@
# $ HGREPOFEATURES="simplestore" ./run-tests.py \
# --extra-config-opt extensions.simplestore=`pwd`/simplestorerepo.py
-from __future__ import absolute_import
import stat
--- a/tests/sitecustomize.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/sitecustomize.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,4 +1,3 @@
-from __future__ import absolute_import
import os
if os.environ.get('COVERAGE_PROCESS_START'):
--- a/tests/sshprotoext.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/sshprotoext.py Thu Mar 03 17:34:00 2022 +0100
@@ -8,7 +8,6 @@
# This extension replaces the SSH server started via `hg serve --stdio`.
# The server behaves differently depending on environment variables.
-from __future__ import absolute_import
from mercurial import (
error,
--- a/tests/svn-safe-append.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/svn-safe-append.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,6 +1,5 @@
#!/usr/bin/env python3
-from __future__ import absolute_import
__doc__ = """Same as `echo a >> b`, but ensures a changed mtime of b.
Without this svn will not detect workspace changes."""
--- a/tests/svnurlof.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/svnurlof.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function
import sys
from mercurial import (
--- a/tests/svnxml.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/svnxml.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,7 +1,6 @@
# Read the output of a "svn log --xml" command on stdin, parse it and
# print a subset of attributes common to all svn versions tested by
# hg.
-from __future__ import absolute_import
import sys
import xml.dom.minidom
--- a/tests/test-absorb-filefixupstate.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-absorb-filefixupstate.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import itertools
from mercurial import pycompat
from hgext import absorb
--- a/tests/test-ancestor.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-ancestor.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import binascii
import getopt
import math
--- a/tests/test-annotate.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-annotate.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import print_function
-
import unittest
from mercurial import (
--- a/tests/test-atomictempfile.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-atomictempfile.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import glob
import os
import shutil
--- a/tests/test-batching.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-batching.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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, print_function
import contextlib
--- a/tests/test-bdiff.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-bdiff.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function
import collections
import struct
import unittest
--- a/tests/test-cappedreader.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-cappedreader.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import io
import unittest
--- a/tests/test-cbor.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-cbor.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import os
import sys
import unittest
--- a/tests/test-check-interfaces.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-check-interfaces.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,6 +1,5 @@
# Test that certain objects conform to well-defined interfaces.
-from __future__ import absolute_import, print_function
from mercurial import encoding
--- a/tests/test-config-env.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-config-env.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,6 +1,5 @@
# Test the config layer generated by environment variables
-from __future__ import absolute_import, print_function
import os
--- a/tests/test-context.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-context.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function
import os
import stat
import sys
--- a/tests/test-demandimport.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-demandimport.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
from mercurial import demandimport
demandimport.enable()
--- a/tests/test-dirs.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-dirs.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import unittest
import silenttestrunner
--- a/tests/test-dispatch.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-dispatch.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function
import os
import sys
from mercurial import dispatch
--- a/tests/test-doctest.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-doctest.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,7 +1,5 @@
# this is hack to make sure no escape characters are inserted into the output
-from __future__ import absolute_import
-from __future__ import print_function
import doctest
import os
--- a/tests/test-duplicateoptions.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-duplicateoptions.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function
import os
from mercurial import (
commands,
--- a/tests/test-encoding-func.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-encoding-func.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import unittest
from mercurial import encoding
--- a/tests/test-extensions-wrapfunction.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-extensions-wrapfunction.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
from mercurial import extensions
--- a/tests/test-fastannotate-revmap.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-fastannotate-revmap.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import os
import tempfile
--- a/tests/test-filecache.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-filecache.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function
import os
import stat
import subprocess
--- a/tests/test-filelog.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-filelog.py Thu Mar 03 17:34:00 2022 +0100
@@ -2,7 +2,6 @@
"""
Tests the behavior of filelog w.r.t. data starting with '\1\n'
"""
-from __future__ import absolute_import, print_function
from mercurial.node import hex
from mercurial import (
--- a/tests/test-hashutil.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-hashutil.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,6 +1,5 @@
# Tests to ensure that sha1dc.sha1 is exactly a drop-in for
# hashlib.sha1 for our needs.
-from __future__ import absolute_import
import hashlib
import unittest
--- a/tests/test-hg-parseurl.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-hg-parseurl.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import unittest
from mercurial.utils import urlutil
--- a/tests/test-hgweb-auth.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-hgweb-auth.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
from mercurial import demandimport
demandimport.enable()
--- a/tests/test-hgwebdir-gc.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-hgwebdir-gc.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import os
from mercurial.hgweb import hgwebdir_mod
--- a/tests/test-hgwebdir-paths.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-hgwebdir-paths.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import os
from mercurial import (
hg,
--- a/tests/test-hybridencode.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-hybridencode.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import unittest
from mercurial import store
--- a/tests/test-lfs-pointer.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-lfs-pointer.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
# Import something from Mercurial, so the module loader gets initialized.
from mercurial import pycompat
--- a/tests/test-linelog.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-linelog.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import difflib
import random
import unittest
--- a/tests/test-linerange.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-linerange.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import unittest
from mercurial import error, mdiff
from mercurial.utils import stringutil
--- a/tests/test-lock.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-lock.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import copy
import errno
import tempfile
--- a/tests/test-lrucachedict.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-lrucachedict.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import unittest
import silenttestrunner
--- a/tests/test-manifest.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-manifest.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import binascii
import itertools
import silenttestrunner
--- a/tests/test-match.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-match.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import unittest
import silenttestrunner
--- a/tests/test-mdiff.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-mdiff.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import print_function
-
import unittest
from mercurial import mdiff
--- a/tests/test-minifileset.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-minifileset.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import print_function
-
from mercurial import minifileset
--- a/tests/test-minirst.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-minirst.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function
from mercurial import minirst
from mercurial.utils import stringutil
--- a/tests/test-parseindex2.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-parseindex2.py Thu Mar 03 17:34:00 2022 +0100
@@ -3,7 +3,6 @@
It also checks certain aspects of the parsers module as a whole.
"""
-from __future__ import absolute_import, print_function
import os
import struct
--- a/tests/test-pathencode.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-pathencode.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# that have proven likely to expose bugs and divergent behavior in
# different encoding implementations.
-from __future__ import absolute_import, print_function
import binascii
import collections
--- a/tests/test-propertycache.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-propertycache.py Thu Mar 03 17:34:00 2022 +0100
@@ -4,7 +4,6 @@
property cache of both localrepo and repoview to prevent
regression."""
-from __future__ import absolute_import, print_function
import os
import subprocess
--- a/tests/test-remotefilelog-datapack.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-remotefilelog-datapack.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-from __future__ import absolute_import, print_function
import hashlib
import os
--- a/tests/test-remotefilelog-histpack.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-remotefilelog-histpack.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-from __future__ import absolute_import
import hashlib
import os
--- a/tests/test-revlog-ancestry.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-revlog-ancestry.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function
import os
from mercurial import (
hg,
--- a/tests/test-revlog-raw.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-revlog-raw.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,6 +1,5 @@
# test revlog interaction about raw data (flagprocessor)
-from __future__ import absolute_import, print_function
import collections
import hashlib
--- a/tests/test-run-tests.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-run-tests.py Thu Mar 03 17:34:00 2022 +0100
@@ -3,7 +3,6 @@
run-test.t only checks positive matches and can not see warnings
(both by design)
"""
-from __future__ import absolute_import, print_function
import doctest
import os
--- a/tests/test-rust-ancestor.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-rust-ancestor.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,4 +1,3 @@
-from __future__ import absolute_import
import sys
import unittest
--- a/tests/test-rust-discovery.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-rust-discovery.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,4 +1,3 @@
-from __future__ import absolute_import
import unittest
from mercurial import policy
--- a/tests/test-rust-revlog.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-rust-revlog.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,4 +1,3 @@
-from __future__ import absolute_import
import unittest
try:
--- a/tests/test-simplekeyvaluefile.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-simplekeyvaluefile.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import unittest
import silenttestrunner
--- a/tests/test-simplemerge.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-simplemerge.py Thu Mar 03 17:34:00 2022 +0100
@@ -13,7 +13,6 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
-from __future__ import absolute_import
import unittest
from mercurial import (
--- a/tests/test-sshserver.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-sshserver.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import io
import unittest
--- a/tests/test-status-inprocess.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-status-inprocess.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-from __future__ import absolute_import, print_function
import sys
--- a/tests/test-stdio.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-stdio.py Thu Mar 03 17:34:00 2022 +0100
@@ -2,7 +2,6 @@
"""
Tests the buffering behavior of stdio streams in `mercurial.utils.procutil`.
"""
-from __future__ import absolute_import
import contextlib
import errno
--- a/tests/test-storage.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-storage.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,6 +1,5 @@
# This test verifies the conformance of various classes to various
# storage interfaces.
-from __future__ import absolute_import
import silenttestrunner
--- a/tests/test-symlink-os-yes-fs-no.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-symlink-os-yes-fs-no.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import os
import sys
import time
--- a/tests/test-trusted.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-trusted.py Thu Mar 03 17:34:00 2022 +0100
@@ -2,7 +2,6 @@
# with files from different users/groups, we cheat a bit by
# monkey-patching some functions in the util module
-from __future__ import absolute_import, print_function
import os
import sys
--- a/tests/test-ui-color.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-ui-color.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import os
from mercurial import (
dispatch,
--- a/tests/test-ui-config.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-ui-config.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function
from mercurial import (
dispatch,
error,
--- a/tests/test-ui-verbosity.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-ui-verbosity.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import os
from mercurial import (
pycompat,
--- a/tests/test-url.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-url.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,4 @@
# coding=utf-8
-from __future__ import absolute_import, print_function
import doctest
import os
--- a/tests/test-util.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-util.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,4 @@
# unit tests for mercuril.util utilities
-from __future__ import absolute_import
import contextlib
import io
--- a/tests/test-verify-repo-operations.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-verify-repo-operations.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import print_function, absolute_import
-
"""Fuzz testing for operations against a Mercurial repository
This uses Hypothesis's stateful testing to generate random repository
--- a/tests/test-walkrepo.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-walkrepo.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import os
from mercurial import (
--- a/tests/test-wireproto-clientreactor.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-wireproto-clientreactor.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import sys
import unittest
import zlib
--- a/tests/test-wireproto-framing.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-wireproto-framing.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import unittest
from mercurial import (
--- a/tests/test-wireproto-serverreactor.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-wireproto-serverreactor.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import unittest
from mercurial import (
--- a/tests/test-wireproto.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-wireproto.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import sys
from mercurial import (
--- a/tests/test-wsgirequest.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/test-wsgirequest.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import unittest
from mercurial.hgweb import request as requestmod
--- a/tests/testlib/badserverext.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/testlib/badserverext.py Thu Mar 03 17:34:00 2022 +0100
@@ -44,7 +44,6 @@
request)
"""
-from __future__ import absolute_import
import re
import socket
--- a/tests/testlib/crash_transaction_late.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/testlib/crash_transaction_late.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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
from mercurial import (
error,
--- a/tests/testlib/ext-phase-report.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/testlib/ext-phase-report.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,7 +1,5 @@
# tiny extension to report phase changes during transaction
-from __future__ import absolute_import
-
def reposetup(ui, repo):
def reportphasemove(tr):
--- a/tests/testlib/ext-sidedata-2.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/testlib/ext-sidedata-2.py Thu Mar 03 17:34:00 2022 +0100
@@ -8,7 +8,6 @@
# 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 hashlib
import struct
--- a/tests/testlib/ext-sidedata-3.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/testlib/ext-sidedata-3.py Thu Mar 03 17:34:00 2022 +0100
@@ -9,7 +9,6 @@
# 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 hashlib
import struct
--- a/tests/testlib/ext-sidedata-4.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/testlib/ext-sidedata-4.py Thu Mar 03 17:34:00 2022 +0100
@@ -9,7 +9,6 @@
# 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
from mercurial.revlogutils import sidedata
--- a/tests/testlib/ext-sidedata-5.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/testlib/ext-sidedata-5.py Thu Mar 03 17:34:00 2022 +0100
@@ -9,7 +9,6 @@
# 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 hashlib
import struct
--- a/tests/testlib/ext-sidedata.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/testlib/ext-sidedata.py Thu Mar 03 17:34:00 2022 +0100
@@ -5,7 +5,6 @@
# 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 hashlib
import struct
--- a/tests/testlib/ext-stream-clone-steps.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/testlib/ext-stream-clone-steps.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from mercurial import (
encoding,
extensions,
--- a/tests/testlib/persistent-nodemap-race-ext.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/testlib/persistent-nodemap-race-ext.py Thu Mar 03 17:34:00 2022 +0100
@@ -35,7 +35,6 @@
/!\ valid.
"""
-from __future__ import print_function
import os
--- a/tests/testlib/sigpipe-remote.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/testlib/sigpipe-remote.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,4 @@
#!/usr/bin/env python3
-from __future__ import print_function
import io
import os
--- a/tests/testlib/sigpipe-worker.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/testlib/sigpipe-worker.py Thu Mar 03 17:34:00 2022 +0100
@@ -3,7 +3,6 @@
# This is literally `cat` but in python, one char at a time.
#
# see sigpipe-remote.py for details.
-from __future__ import print_function
import io
import os
--- a/tests/tinyproxy.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/tinyproxy.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,6 +1,5 @@
#!/usr/bin/env python
-from __future__ import absolute_import, print_function
__doc__ = """Tiny HTTP Proxy.
--- a/tests/unwrap-message-id.py Sun Feb 20 15:18:15 2022 -0700
+++ b/tests/unwrap-message-id.py Thu Mar 03 17:34:00 2022 +0100
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, print_function
-
import sys
for line in sys.stdin: