Mercurial > hg > hg-git
changeset 796:c19835c3c60d
git_handler: move extract_hg_metadata into git2hg
This function doesn't depend on self at all, so moving it to git2hg is
straightforward.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Wed, 15 Oct 2014 16:54:50 -0700 |
| parents | 1350e43e662f |
| children | b21d6d8ea9ba |
| files | hggit/git2hg.py hggit/git_handler.py |
| diffstat | 2 files changed, 47 insertions(+), 46 deletions(-) [+] |
line wrap: on
line diff
--- a/hggit/git2hg.py +++ b/hggit/git2hg.py @@ -1,5 +1,6 @@ # git2hg.py - convert Git repositories and commits to Mercurial ones +import urllib from dulwich.objects import Commit, Tag def find_incoming(git_object_store, git_map, refs): @@ -77,3 +78,48 @@ def __init__(self, commits, commit_cache): self.commits = commits self.commit_cache = commit_cache + +def extract_hg_metadata(message, git_extra): + split = message.split("\n--HG--\n", 1) + renames = {} + extra = {} + branch = False + if len(split) == 2: + message, meta = split + lines = meta.split("\n") + for line in lines: + if line == '': + continue + + if ' : ' not in line: + break + command, data = line.split(" : ", 1) + + if command == 'rename': + before, after = data.split(" => ", 1) + renames[after] = before + if command == 'branch': + branch = data + if command == 'extra': + k, v = data.split(" : ", 1) + extra[k] = urllib.unquote(v) + + git_fn = 0 + for field, data in git_extra: + if field.startswith('HG:'): + command = field[3:] + if command == 'rename': + before, after = data.split(':', 1) + renames[urllib.unquote(after)] = urllib.unquote(before) + elif command == 'extra': + k, v = data.split(':', 1) + extra[urllib.unquote(k)] = urllib.unquote(v) + else: + # preserve ordering in Git by using an incrementing integer for + # each field. Note that extra metadata in Git is an ordered list + # of pairs. + hg_field = 'GIT%d-%s' % (git_fn, field) + git_fn += 1 + extra[urllib.quote(hg_field)] = urllib.quote(data) + + return (message, renames, branch, extra)
--- a/hggit/git_handler.py +++ b/hggit/git_handler.py @@ -690,7 +690,7 @@ self.ui.debug(_("importing: %s\n") % commit.id) (strip_message, hg_renames, - hg_branch, extra) = self.extract_hg_metadata( + hg_branch, extra) = git2hg.extract_hg_metadata( commit.message, commit.extra) gparents = map(self.map_hg_get, commit.parents) @@ -1249,51 +1249,6 @@ return convert[mode] return '' - def extract_hg_metadata(self, message, git_extra): - split = message.split("\n--HG--\n", 1) - renames = {} - extra = {} - branch = False - if len(split) == 2: - message, meta = split - lines = meta.split("\n") - for line in lines: - if line == '': - continue - - if ' : ' not in line: - break - command, data = line.split(" : ", 1) - - if command == 'rename': - before, after = data.split(" => ", 1) - renames[after] = before - if command == 'branch': - branch = data - if command == 'extra': - k, v = data.split(" : ", 1) - extra[k] = urllib.unquote(v) - - git_fn = 0 - for field, data in git_extra: - if field.startswith('HG:'): - command = field[3:] - if command == 'rename': - before, after = data.split(':', 1) - renames[urllib.unquote(after)] = urllib.unquote(before) - elif command == 'extra': - k, v = data.split(':', 1) - extra[urllib.unquote(k)] = urllib.unquote(v) - else: - # preserve ordering in Git by using an incrementing integer for - # each field. Note that extra metadata in Git is an ordered list - # of pairs. - hg_field = 'GIT%d-%s' % (git_fn, field) - git_fn += 1 - extra[urllib.quote(hg_field)] = urllib.quote(data) - - return (message, renames, branch, extra) - def get_file(self, commit, f): otree = self.git.tree(commit.tree) parts = f.split('/')