From: Junio C Hamano <gitster@pobox•com>
To: Luke Diamand <luke@diamand•org>
Cc: Lex Spoon <lex@lexspoon•org>, Git Users <git@vger•kernel.org>,
Pete Wyckoff <pw@padd•com>
Subject: Re: [PATCH v4] git-p4: Use -m when running p4 changes
Date: Mon, 20 Apr 2015 11:04:30 -0700 [thread overview]
Message-ID: <xmqq383un0b5.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <xmqq7ft6n0rn.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Mon, 20 Apr 2015 10:54:36 -0700")
Junio C Hamano <gitster@pobox•com> writes:
> Luke Diamand <luke@diamand•org> writes:
>
>> Sorry - could you resubmit your patch (PATCHv4 it will be) with this
>> change squashed in please? It will make life much easier, especially
>> for Junio!
>
> Thanks for caring, but this seems to be a full patch to replace v3.
>
> It was sent with your Reviewed-by already in, but I'd tentatively
> remove that line while queuing it to 'pu' and ask you to double
> check if the patch makes sense (and after your "yes, it does", I'd
> add the Reviewed-by back).
>
> Thanks.
Just to make it easier to see, the interdiff between v3 and v4 looks
like this:
git-p4.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index 1fba3aa..e28033f 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -2608,7 +2608,7 @@ class P4Sync(Command, P4UserMap):
return ""
- def importNewBranch(self, branch, maxChange, changes_block_size):
+ def importNewBranch(self, branch, maxChange):
# make fast-import flush all changes to disk and update the refs using the checkpoint
# command so that we can try to find the branch parent in the git history
self.gitStream.write("checkpoint\n\n");
@@ -2616,7 +2616,7 @@ class P4Sync(Command, P4UserMap):
branchPrefix = self.depotPaths[0] + branch + "/"
range = "@1,%s" % maxChange
#print "prefix" + branchPrefix
- changes = p4ChangesForPaths([branchPrefix], range, changes_block_size)
+ changes = p4ChangesForPaths([branchPrefix], range, self.changes_block_size)
if len(changes) <= 0:
return False
firstChange = changes[0]
prev parent reply other threads:[~2015-04-20 18:04 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CALM2SnY62u3OXJOMSqSfghH_NYwZhzSedm3-wcde-dQCX6eB9Q@mail.gmail.com>
2015-04-14 11:25 ` [PATCH] git-p4: Use -m when running p4 changes Luke Diamand
[not found] ` <CALM2SnY=ZcSMSXk6Ks0uU65gPX5vC8QKG+iSrQxd3X7N=sw+Ww@mail.gmail.com>
2015-04-14 19:48 ` Lex Spoon
2015-04-15 3:47 ` Lex Spoon
2015-04-16 18:56 ` Junio C Hamano
2015-04-16 23:15 ` Luke Diamand
2015-04-17 13:20 ` Lex Spoon
2015-04-17 23:11 ` [PATCH v3] " Lex Spoon
2015-04-20 9:53 ` Luke Diamand
2015-04-20 14:30 ` Lex Spoon
2015-04-20 15:00 ` [PATCH v4] " Lex Spoon
2015-04-20 15:15 ` Luke Diamand
2015-04-20 15:25 ` Lex Spoon
2015-04-20 19:17 ` Luke Diamand
2015-04-20 17:54 ` Junio C Hamano
2015-04-20 18:04 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq383un0b5.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=lex@lexspoon$(echo .)org \
--cc=luke@diamand$(echo .)org \
--cc=pw@padd$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox