Mercurial > hg > hg-git
changeset 80:0e0a2d20deed
added a missing newline back to git conversion
| author | Scott Chacon <schacon@gmail.com> |
|---|---|
| date | Fri, 08 May 2009 11:35:14 -0700 |
| parents | 7b4cf18c896b |
| children | 8f5fddaf002a |
| files | TODO.txt git_handler.py |
| diffstat | 2 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/TODO.txt +++ b/TODO.txt @@ -5,7 +5,6 @@ - hg fetch [remote] (remote is url, hg alias or hg-git remote) - hg clone url * fail nicely when the remote_name is not there -* more tests * submodules? * .gitignore, etc - try to convert? - (probably not automatically, but perhaps a generator?) @@ -24,8 +23,8 @@ MAPPING ISSUES ============== Created in Hg: -* named branches # -* merges with renames - dont convert back properly for some reason +* merges with renames in 2nd branch + - dont convert back properly for some reason Created in Git: * different committer in Git objects
--- a/git_handler.py +++ b/git_handler.py @@ -201,7 +201,7 @@ author = author + ' <none@none>' commit['author'] = author + ' ' + str(int(time)) + ' ' + seconds_to_offset(timezone) message = ctx.description() - commit['message'] = ctx.description() + commit['message'] = ctx.description() + "\n" # HG EXTRA INFORMATION add_extras = False @@ -216,7 +216,7 @@ extra_message += "rename : " + oldfile + " => " + newfile + "\n" if add_extras: - commit['message'] += "\n\n--HG--\n" + extra_message + commit['message'] += "\n--HG--\n" + extra_message commit['parents'] = [] for parent in parents: