mercurial: comparison hgext/convert/hg.py

equal deleted inserted replaced

-:d6afa9c149c3
+:59fa3890d40a
 import re
 import time
 from mercurial.i18n import _
 from mercurial.pycompat import open
+from mercurial.node import (
+bin,
+hex,
+nullhex,
+nullid,
+)
 from mercurial import (
 bookmarks,
 context,
 error,
 exchange,
 hg,
 lock as lockmod,
 merge as mergemod,
-node as nodemod,
 phases,
 pycompat,
 scmutil,
 util,
 )
 self.ui.warn(_(b'invalid tag entry: "%s"\n') % line)
 fp.write(b'%s\n' % line)  # Bogus, but keep for hash stability
 continue
 revid = revmap.get(source.lookuprev(s[0]))
 if not revid:
-if s[0] == nodemod.nullhex:
+if s[0] == nullhex:
 revid = s[0]
 else:
 # missing, but keep for hash stability
 self.ui.warn(_(b'missing tag entry: "%s"\n') % line)
 fp.write(b'%s\n' % line)
 if len(s) != 2:
 continue
 revid = s[0]
 subpath = s[1]
-if revid != nodemod.nullhex:
+if revid != nullhex:
 revmap = self.subrevmaps.get(subpath)
 if revmap is None:
 revmap = mapfile(
 self.ui, self.repo.wjoin(subpath, b'.hg/shamap')
 )
 if p not in pl:
 pl.append(p)
 parents = pl
 nparents = len(parents)
 if self.filemapmode and nparents == 1:
-m1node = self.repo.changelog.read(nodemod.bin(parents[0]))[0]
+m1node = self.repo.changelog.read(bin(parents[0]))[0]
 parent = parents[0]
 if len(parents) < 2:
-parents.append(nodemod.nullid)
+parents.append(nullid)
 if len(parents) < 2:
-parents.append(nodemod.nullid)
+parents.append(nullid)
 p2 = parents.pop(0)
 text = commit.desc
 sha1s = re.findall(sha1re, text)
 if node is None:
 continue
 # Only transplant stores its reference in binary
 if label == b'transplant_source':
-node = nodemod.hex(node)
+node = hex(node)
 newrev = revmap.get(node)
 if newrev is not None:
 if label == b'transplant_source':
-newrev = nodemod.bin(newrev)
+newrev = bin(newrev)
 extra[label] = newrev
 if self.branchnames and commit.branch:
 extra[b'branch'] = commit.branch
 while parents:
 p1 = p2
 p2 = parents.pop(0)
 p1ctx = self.repo[p1]
 p2ctx = None
-if p2 != nodemod.nullid:
+if p2 != nullid:
 p2ctx = self.repo[p2]
 fileset = set(files)
 if full:
 fileset.update(self.repo[p1])
 fileset.update(self.repo[p2])
 with self.repo.transaction(b"convert") as tr:
 if self.repo.ui.config(b'convert', b'hg.preserve-hash'):
 origctx = commit.ctx
 else:
 origctx = None
-node = nodemod.hex(self.repo.commitctx(ctx, origctx=origctx))
+node = hex(self.repo.commitctx(ctx, origctx=origctx))
 # If the node value has changed, but the phase is lower than
 # draft, set it back to draft since it hasn't been exposed
 # anywhere.
 if commit.rev != node:
 text = b"(octopus merge fixup)\n"
 p2 = node
 if self.filemapmode and nparents == 1:
 man = self.repo.manifestlog.getstorage(b'')
-mnode = self.repo.changelog.read(nodemod.bin(p2))[0]
+mnode = self.repo.changelog.read(bin(p2))[0]
 closed = b'close' in commit.extra
 if not closed and not man.cmp(m1node, man.revision(mnode)):
 self.ui.status(_(b"filtering out empty revision\n"))
 self.repo.rollback(force=True)
 return parent
 return p2
 def puttags(self, tags):
 tagparent = self.repo.branchtip(self.tagsbranch, ignoremissing=True)
-tagparent = tagparent or nodemod.nullid
+tagparent = tagparent or nullid
 oldlines = set()
 for branch, heads in pycompat.iteritems(self.repo.branchmap()):
 for h in heads:
 if b'.hgtags' in self.repo[h]:
 b"convert-repo",
 date,
 extra,
 )
 node = self.repo.commitctx(ctx)
-return nodemod.hex(node), nodemod.hex(tagparent)
+return hex(node), hex(tagparent)
 def setfilemapmode(self, active):
 self.filemapmode = active
 def putbookmarks(self, updatedbookmark):
 lock = self.repo.lock()
 tr = self.repo.transaction(b'bookmark')
 self.ui.status(_(b"updating bookmarks\n"))
 destmarks = self.repo._bookmarks
 changes = [
-(bookmark, nodemod.bin(updatedbookmark[bookmark]))
+(bookmark, bin(updatedbookmark[bookmark]))
 for bookmark in updatedbookmark
 ]
 destmarks.applychanges(self.repo, tr, changes)
 tr.close()
 finally:
 def _parents(self, ctx):
 return [p for p in ctx.parents() if p and self.keep(p.node())]
 def getheads(self):
-return [nodemod.hex(h) for h in self._heads if self.keep(h)]
+return [hex(h) for h in self._heads if self.keep(h)]
 def getfile(self, name, rev):
 try:
 fctx = self._changectx(rev)[name]
 return fctx.data(), fctx.flags()
 tags = [
 t
 for t in self.repo.tagslist()
 if self.repo.tagtype(t[0]) == b'global'
 ]
-return {
+return {name: hex(node) for name, node in tags if self.keep(node)}
-name: nodemod.hex(node) for name, node in tags if self.keep(node)
-}
 def getchangedfiles(self, rev, i):
 ctx = self._changectx(rev)
 parents = self._parents(ctx)
 if not parents and i is None:
 def hasnativeclose(self):
 return True
 def lookuprev(self, rev):
 try:
-return nodemod.hex(self.repo.lookup(rev))
+return hex(self.repo.lookup(rev))
 except (error.RepoError, error.LookupError):
 return None
 def getbookmarks(self):
 return bookmarks.listbookmarks(self.repo)

changeset 46113	59fa3890d40a
parent 45790	5d65e04b6a80
child 46819	d4ba4d51f85f