Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/tagmerge.py @ 25981:fa91c49a9b9f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tagmerge: use absolute_import
author Gregory Szorc <gregory.szorc@gmail.com>
date Sat, 08 Aug 2015 20:10:46 -0700
parents e53f6b72a0e4
children 5d92107dfb9b
comparison
equal deleted inserted replaced
25980:38c585c2f8cc 25981:fa91c49a9b9f
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 import tags as tagsmod 74 from __future__ import absolute_import
75 import util 75
76 from node import nullid, hex
77 from i18n import _
78 import operator 76 import operator
77
78 from .i18n import _
79 from .node import (
80 hex,
81 nullid,
82 )
83 from .import (
84 tags as tagsmod,
85 util,
86 )
87
79 hexnullid = hex(nullid) 88 hexnullid = hex(nullid)
80 89
81 def readtagsformerge(ui, repo, lines, fn='', keeplinenums=False): 90 def readtagsformerge(ui, repo, lines, fn='', keeplinenums=False):
82 '''read the .hgtags file into a structure that is suitable for merging 91 '''read the .hgtags file into a structure that is suitable for merging
83 92