Nemcio/git-remote-hg
1
0
Fork 0
mirror of https://github.com/mnauw/git-remote-hg.git synced 2025-11-03 01:55:49 +01:00
Code Issues Packages Projects Releases Activity

Optionally don't mangle git usernames with quotes

Browse Source 
By default, for backwards compatibility with earlier versions,
git-remote-hg removes quotation marks from git usernames
(e.g. 'Raffaello "Raphael" Sanzio da Urbino <raphael@example.com>'
would become 'Raffaello Raphael Sanzio da Urbino
<raphael@example.com>').  This breaks round-trip compatibility; a git
commit by an author with quotes would become an hg commit without,
and if re-imported into git, would get a different SHA1.

To restore round-trip compatibility (at the cost of backwards
compatibility with commits converted by older versions of
git-remote-hg), add an option 'remote-hg.remove-username-quotes'. This
option defaults to true (for backwards compatibility).
This commit is contained in:
David Turner
2016-12-05 16:08:01 -05:00
parent 1d94ba2d42
commit a1ca279d92
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
README.asciidoc
View File

@@ -226,6 +226,20 @@ also be enabled on an existing one by the following setting.
-------------------------------------- --------------------------------------
Note, however, that one should then perform a fetch from each relevant remote Note, however, that one should then perform a fetch from each relevant remote
to fully complete the conversion (prior to subsequent pushing). to fully complete the conversion (prior to subsequent pushing).
--------------------------------------
% git config --global remote-hg.remove-username-quotes false
By default, for backwards compatibility with earlier versions,
git-remote-hg removes quotation marks from git usernames
(e.g. 'Raffaello "Raphael" Sanzio da Urbino <raphael@example.com>'
would become 'Raffaello Raphael Sanzio da Urbino
<raphael@example.com>'). This breaks round-trip compatibility; a git
commit by an author with quotes would become an hg commit without,
and if re-imported into git, would get a different SHA1.
To restore round-trip compatibility (at the cost of backwards
compatibility with commits converted by older versions of
git-remote-hg), turn 'remote-hg.remove-username-quotes' off.
=== Helper Commands === === Helper Commands ===

4
git-remote-hg
View File

@@ -334,6 +334,8 @@ def get_filechanges(repo, ctx, parent):
def fixup_user_git(user): def fixup_user_git(user):
name = mail = None name = mail = None
global remove_username_quotes
if remove_username_quotes:
user = user.replace('"', '') user = user.replace('"', '')
m = AUTHOR_RE.match(user) m = AUTHOR_RE.match(user)
if m: if m:
@@ -1646,6 +1648,7 @@ def main(args):
global dry_run global dry_run
global notes, alias global notes, alias
global capability_push global capability_push
global remove_username_quotes
global marksdir global marksdir
marks = None marks = None
@@ -1665,6 +1668,7 @@ def main(args):
hg_git_compat = get_config_bool('remote-hg.hg-git-compat') hg_git_compat = get_config_bool('remote-hg.hg-git-compat')
track_branches = get_config_bool('remote-hg.track-branches', True) track_branches = get_config_bool('remote-hg.track-branches', True)
capability_push = get_config_bool('remote-hg.capability-push', True) capability_push = get_config_bool('remote-hg.capability-push', True)
remove_username_quotes = get_config_bool('remote-hg.remove-username-quotes', True)
force_push = False force_push = False
if hg_git_compat: if hg_git_compat: