Mercurial > hg > hg-git
diff git_handler.py @ 35:562fc51b991e
we did the same thing, not sure why it conflicted
author | Scott Chacon <schacon@gmail.com> |
---|---|
date | Tue, 28 Apr 2009 11:08:54 -0700 (2009-04-28) |
parents | 2a5c0bf0fef5 |
children | 7046d792dfcd |
line wrap: on
line diff
--- a/git_handler.py +++ b/git_handler.py @@ -329,8 +329,10 @@ def import_git_commit(self, commit): print "importing: " + commit.id # TODO : look for HG metadata in the message and use it + # TODO : add extra Git data (committer info) as extras to changeset # TODO : (?) have to handle merge contexts at some point (two parent files, etc) + # TODO : throw IOError for removed files def getfilectx(repo, memctx, f): (e, sha, data) = self.git.get_file(commit, f) e = '' # TODO : make this a real mode @@ -377,13 +379,13 @@ def get_transport_and_path(self, uri): from dulwich.client import TCPGitClient, SSHGitClient, SubprocessGitClient - for handler, transport in (("git://", TCPGitClient), ("git@", SSHGitClient)): + for handler, transport in (("git://", TCPGitClient), ("git@", SSHGitClient), ("git+ssh://", SSHGitClient)): if uri.startswith(handler): if handler == 'git@': host, path = uri[len(handler):].split(":", 1) host = 'git@' + host else: - host, path = uri[len(handler):].split('/', 1) + host, path = uri[len(handler):].split("/", 1) return transport(host), '/' + path # if its not git or git+ssh, try a local url.. return SubprocessGitClient(), uri