Mercurial > public > mercurial-scm > hg
comparison mercurial/tagmerge.py @ 48875:6000f5b25c9b
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
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Thu, 03 Mar 2022 17:34:00 +0100 |
| parents | d55b71393907 |
| children | f4733654f144 |
comparison
equal
deleted
inserted
replaced
| 48874:af0b21d5a930 | 48875:6000f5b25c9b |
|---|---|
| 69 # merged tags file | 69 # merged tags file |
| 70 # - sort the "tag blocks" according to their associated number line | 70 # - sort the "tag blocks" according to their associated number line |
| 71 # - put blocks whose nodes come all from p2 first | 71 # - put blocks whose nodes come all from p2 first |
| 72 # - write the tag blocks in the sorted order | 72 # - write the tag blocks in the sorted order |
| 73 | 73 |
| 74 from __future__ import absolute_import | |
| 75 | 74 |
| 76 from .i18n import _ | 75 from .i18n import _ |
| 77 from . import ( | 76 from . import ( |
| 78 tags as tagsmod, | 77 tags as tagsmod, |
| 79 util, | 78 util, |