hg/hg-fastimport: hgfastimport/hgimport.py comparison

comparison hgfastimport/hgimport.py @ 74:a4f13dc5e3f7

Support Mercurial 5.6 and Python-3.6 This change the minimum Mercurial supported version 4.1

author	Roy Marples <roy@marples.name>
date	Mon, 18 Jan 2021 18:04:38 +0000
parents	a99e5c6c8e1c
children

comparison

equal deleted inserted replaced

-:a99e5c6c8e1c
+:a4f13dc5e3f7
 def _parse(self):
 if self.parsed:
 return
 for source in self.sources:
-if source == "-":
+if source == b"-":
 infile = sys.stdin
 else:
 infile = open(source, 'rb')
 try:
 p = parser.ImportParser(infile)
 self.parsed = True
 class HgImportProcessor(processor.ImportProcessor):
-tagprefix = "refs/tags/"
+tagprefix = b"refs/tags/"
 def __init__(self, ui, repo):
 super(HgImportProcessor, self).__init__()
 self.ui = ui
 self.repo = repo
 pass
 def teardown(self):
 """Cleanup after processing all streams."""
 if self.blobdir and os.path.exists(self.blobdir):
-self.ui.status("Removing blob dir %r ...\n" % self.blobdir)
+self.ui.debug(b"Removing blob dir %s ...\n" % self.blobdir)
 shutil.rmtree(self.blobdir)
 def progress_handler(self, cmd):
-self.ui.write("Progress: %s\n" % cmd.message)
+self.ui.write(b"Progress: %s\n" % cmd.message)
 def blob_handler(self, cmd):
 self.writeblob(cmd.id, cmd.data)
 def _getblobfilename(self, blobid):
 if self.blobdir is None:
 raise RuntimeError("no blobs seen, so no blob directory created")
 # XXX should escape ":" for windows
-return os.path.join(self.blobdir, "blob-" + blobid)
+return os.path.join(self.blobdir, b"blob-" + blobid)
 def getblob(self, fileid):
 (commitid, blobid) = fileid
 f = open(self._getblobfilename(blobid), "rb")
 try:
 finally:
 f.close()
 def writeblob(self, blobid, data):
 if self.blobdir is None:        # no blobs seen yet
-self.blobdir = os.path.join(self.repo.root, ".hg", "blobs")
+self.blobdir = os.path.join(self.repo.root, b".hg", b"blobs")
 os.mkdir(self.blobdir)
 fn = self._getblobfilename(blobid)
 blobfile = open(fn, "wb")
 #self.ui.debug("writing blob %s to %s (%d bytes)\n"
 blobfile.write(data)
 blobfile.close()
 self.numblobs += 1
 if self.numblobs % 500 == 0:
-self.ui.status("%d blobs read\n" % self.numblobs)
+self.ui.status(b"%d blobs read\n" % self.numblobs)
 def getmode(self, name, fileid):
 (commitid, blobid) = fileid
 return self.filemodes[commitid][name]
 """Given a mark reference or a branch name, return the
 appropriate commit object.  Return None if commitref is a tag
 or a branch with no commits.  Raises KeyError if anything else
 is out of whack.
 """
-if commitref.startswith(":"):
+if commitref.startswith(b":"):
 # KeyError here indicates the input stream is broken.
 return self.commitmap[commitref]
 elif commitref.startswith(self.tagprefix):
 return None
 else:
 branch = self._getbranch(commitref)
 if branch is None:
-raise ValueError("invalid commit ref: %r" % commitref)
+raise ValueError(b"invalid commit ref: %s" % commitref)
 heads = self.branchmap.get(branch)
 if heads is None:
 return None
 else:
 """Translate a Git head ref to corresponding Mercurial branch
 name.  E.g. \"refs/heads/foo\" is translated to \"foo\".
 Special case: \"refs/heads/master\" becomes \"default\".  If
 'ref' is not a head ref, return None.
 """
-prefix = "refs/heads/"
+prefix = b"refs/heads/"
 if ref.startswith(prefix):
 branch = ref[len(prefix):]
-if branch == "master":
+if branch == b"master":
-return "default"
+return b"default"
 else:
 return branch
 else:
 return None
 # XXX this assumes the fixup branch name used by cvs2git.  In
 # contrast, git-fast-import(1) recommends "TAG_FIXUP" (not under
 # refs/heads), and implies that it can be called whatever the
 # creator of the fastimport dump wants to call it.  So the name
 # of the fixup branch should be configurable!
-fixup = (cmd.ref == "refs/heads/TAG.FIXUP")
+fixup = (cmd.ref == b"refs/heads/TAG.FIXUP")
 if cmd.ref.startswith(self.tagprefix) and cmd.mark:
 tag = cmd.ref[len(self.tagprefix):]
-self.tags.append((tag, ':' + cmd.mark))
+self.tags.append((tag, b':' + cmd.mark))
 if cmd.from_:
 first_parent = cmd.from_
 else:
 first_parent = self._getcommit(cmd.ref) # commit object
 # time.
 first_parent = second_parent
 second_parent = None
 no_files = True             # XXX this is ignored...
-self.ui.debug("commit %s: first_parent = %r, second_parent = %r\n"
+bfirst_parent = first_parent or b''
-% (cmd, first_parent, second_parent))
+bsecond_parent = second_parent or b''
+self.ui.debug(b"commit %s: first_parent = %s, second_parent = %s\n"
+% (cmd, bfirst_parent, bsecond_parent))
 assert ((first_parent != second_parent) or
 (first_parent is second_parent is None)), \
-("commit %s: first_parent == second parent = %r"
+(b"commit %s: first_parent == second parent = %s"
-% (cmd, first_parent))
+% (cmd, bfirst_parent))
 # Figure out the Mercurial branch name.
 if fixup and first_parent is not None:
 # If this is a fixup commit, pretend it happened on the same
 # branch as its first parent.  (We don't want a Mercurial
 # In order to conform to fastimport syntax, cvs2git with no
 # authormap produces author names like "jsmith <jsmith>"; if
 # we see that, revert to plain old "jsmith".
 user = userinfo[0]
 else:
-user = "%s <%s>" % (userinfo[0], userinfo[1])
+user = b"%s <%s>" % (userinfo[0], userinfo[1])
 text = cmd.message
 date = self.convert_date(userinfo)
+parents = []
-parents = filter(None, [first_parent, second_parent])
+if first_parent:
+parents.append(first_parent)
+if second_parent:
+parents.append(second_parent)
 commit = common.commit(user, date, text, parents, branch,
 rev=cmd.id, sortkey=int(cmd.id[1:]))
 self.commitmap[cmd.id] = commit
 heads = self.branchmap.get(branch)
 heads.remove(first_parent)
 except ValueError:          # first parent not a head: no problem
 pass
 heads.append(cmd.id)        # at end means this is tipmost
 self.branchmap[branch] = heads
-self.ui.debug("processed commit %s\n" % cmd)
+self.ui.debug(b"processed commit %s\n" % cmd)
 def convert_date(self, c):
 res = (int(c[2]), -int(c[3]))
 #print c, res
 #print type((0, 0)), type(res), len(res), type(res) is type((0, 0))
 #if type(res) is type((0, 0)) and len(res) == 2:
 #    print "go for it"
 #return res
-return "%d %d" % res
+return b"%d %d" % res
 def reset_handler(self, cmd):
 branch = self._getbranch(cmd.ref)
 if branch:
 # The usual case for 'reset': (re)create the named branch.
 def modify_handler(self, filecmd):
 if filecmd.dataref:
 blobid = filecmd.dataref    # blobid is the mark of the blob
 else:
-blobid = "%s-inline:%d" % (self.command.id, self.inlinecount)
+blobid = b"%s-inline:%d" % (self.command.id, self.inlinecount)
 assert filecmd.data is not None
 self.parent.writeblob(blobid, filecmd.data)
 self.inlinecount += 1
 fileid = (self.command.id, blobid)
 self.modified.append((filecmd.path, fileid))
 if stat.S_ISLNK(filecmd.mode): # link
-mode = 'l'
+mode = b'l'
-elif filecmd.mode & 0111: # executable
+elif filecmd.mode & 0o111: # executable
-mode = 'x'
+mode = b'x'
 elif stat.S_ISREG(filecmd.mode): # regular file
-mode = ''
+mode = b''
 else:
-raise RuntimeError("mode %r unsupported" % filecmd.mode)
+raise RuntimeError(b"mode %s unsupported" % filecmd.mode)
 self.mode[filecmd.path] = mode
 def delete_handler(self, filecmd):
 self.modified.append((filecmd.path, None))

Mercurial > hg > hg-fastimport

comparison hgfastimport/hgimport.py @ 74:a4f13dc5e3f7