git-p4: remove tabs from usermap file
PATCH 1/1 git-p4: remove tabs from usermap file
Some users have tabs in their names, oddly enough. This causes problems when loading the usercache from disk, as split separates the fields on the wrong tabs. When fast-import's parse_ident() tries to parse the committer field, it is unhappy about the unbalanced <..> angle brackets.
It is easy enough to convert the tabs to single spaces.
---
Here's another random little fix. We have a user Firstname\tLastname who checked something in recently and broke my git-p4 conversion.
I need to send the other acked patch to Junio; will wait and give him two if you ack this one.
contrib/fast-import/git-p4 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
contrib/fast-import/git-p4 +1 -1
@@ -1142,7 +1142,7 @@ class P4Sync(Command): s = '' for (key, val) in self.users.items(): - s += "%s\t%s\n" % (key, val) + s += "%s\t%s\n" % (key.expandtabs(1), val.expandtabs(1)) open(self.getUserCacheFilename(), "wb").write(s) self.userMapFromPerforceServer = True
Signature · 1 line
1.6.0.6
Quoted 8 lines · On Friday 27 February 2009 19:53:59 Pete Wyckoff wrote:
Some users have tabs in their names, oddly enough. This causes problems when loading the usercache from disk, as split separates the fields on the wrong tabs. When fast-import's
parse_ident()tries to parse the committer field, it is unhappy about the unbalanced <..> angle brackets.It is easy enough to convert the tabs to single spaces.
Quoted 8 lines
Signed-off-by Pete Wyckoff <[email protected]>---
Here's another random little fix. We have a user Firstname\tLastname who checked something in recently and broke my git-p4 conversion.I need to send the other acked patch to Junio; will wait and give him two if you ack this one.
Looks good to me :-)
Thanks,
Simon
Quoted 16 lines
contrib/fast-import/git-p4 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)contrib/fast-import/git-p4 +1
-1@@ -1142,7 +1142,7 @@ class P4Sync(Command): s = '' for (key, val) in self.users.items(): - s += "%s\t%s\n" % (key, val) + s += "%s\t%s\n" % (key.expandtabs(1), val.expandtabs(1)) open(self.getUserCacheFilename(), "wb").write(s) self.userMapFromPerforceServer = True