Re: [PATCH v1] git-p4: map a P4 user to Git author name and email address

On 28 Feb 2016, at 17:19, Eric Sunshine [off-list ref] wrote:

On Sun, Feb 28, 2016 at 5:25 AM,  [off-list ref] wrote:

quoted

Map a P4 user to a specific name and email address in Git with the
"git-p4.mapUser" config. The config value must be a string adhering
to the format "p4user -> First Lastname [off-list ref]".

With the caveat that I'm not a Perforce user, is this arrow "->"
thingy common in the Perforce world, or was it invented with this
patch? If it was invented here, then would it make sense to instead
use a more established format, such as the "authors" mapping file from
git-svn?

   p4user = Joe User [off-list ref]

I invented "the arrow" here :-)
I didn't know about the SVN format and I agree it makes sense to reuse
an established format. I will fix this in a reroll.

More below...

quoted

Signed-off-by: Lars Schneider <redacted>
---

diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt

@@ -553,6 +553,17 @@ git-p4.keepEmptyCommits::
+git-p4.mapUser::
+       Map a P4 user to a name and email address in Git. Use a string
+       with the following format to create a mapping:
++
+-------------
+git config --add git-p4.mapUser "p4user -> First Last <mail@address.com>"
+-------------
++
+       A mapping will override any user information from P4. Mappings for
+       multiple P4 user can be defined.

Does this format correctly with Asciidoc, or does the pargraph need to
be left-justified? (I haven't tested it myself.)

I am not exactly sure what you mean. The last paragraph is already left
justified, no? Do you know a good tutorial for Asciidoc? How can I/should
I check these things?

quoted

diff --git a/t/t9828-git-p4-map-user.sh b/t/t9828-git-p4-map-user.sh

@@ -0,0 +1,61 @@
+#!/bin/sh
+
+test_description='Clone repositories and map users'
+
+. ./lib-git-p4.sh
+
+test_expect_success 'start p4d' '
+       start_p4d
+'
+
+test_expect_success 'Create a repo with different users' '
+       client_view "//depot/... //client/..." &&
+       (
+               cd "$cli" &&
+
+               >author.txt &&
+               p4 add author.txt &&
+               p4 submit -d "Add file author\\n"

Broken &&-chain.

Oh. You're right. Will fix!

Thanks for the review,
Lars