Re: [BUG] git p4 clone fails when p4 sizes does not return 'fileSize' key
Just to be clear - git-p4 does not use the p4 "sizes" command anywhere AFAIK.
We are just talking about the output from "p4 print" and the
"fileSize" key, right?
--> Correct.
Does that happen with the 17.2 version of p4?
-->Correct.
print() probably makes more sense; can we try to use the function form
so that we don't deliberately make the path to python3 harder (albeit
in a very tiny way)
-->Sure.
If your server isn't reporting "fileSize" then there are a few other
places where I would expect git-p4 to also fail.
-->Most of other places are already doing key check in the hash. Looks
like this line was missed out.
On Wed, Apr 18, 2018 at 4:08 AM, Luke Diamand wrote:
> On 17 April 2018 at 20:12, Thandesha VK wrote:
>> I have few cases where even p4 -G sizes (or p4 sizes) is not returning
>> the size value even with latest version of p4 (17.2). In that case, we
>> have to regenerate the digest for file save it - It mean something is
>> wrong with the file in perforce.
>
> Just to be clear - git-p4 does not use the p4 "sizes" command anywhere AFAIK.
>
> We are just talking about the output from "p4 print" and the
> "fileSize" key, right?
>
> Does that happen with the 17.2 version of p4?
>
>> Regarding, sys.stdout.write v/s print, I see script using both of them
>> without a common pattern. I can change it to whatever is more
>> appropriate.
>
> print() probably makes more sense; can we try to use the function form
> so that we don't deliberately make the path to python3 harder (albeit
> in a very tiny way).
>
>>
>> On Tue, Apr 17, 2018 at 11:47 AM, Mazo, Andrey wrote:
>>> Does a missing "fileSize" actually mean that there is something wrong with
>>> the file?
>>> Because, for me, `p4 -G print` doesn't print "fileSize" for _any_ file.
>>> (which I attribute to our rather ancient (2007.2) Perforce server)
>>> I'm not an expert in Perforce, so don't know for sure.
>
> My 2015 version of p4d reports a fileSize.
>
>>>
>>> However, `p4 -G sizes` works fine even with our p4 server.
>>> Should we then go one step further and use `p4 -G sizes` to obtain the
>>> "fileSize" when it's not returned by `p4 -G print`?
>>> Or is it an overkill for a simple verbose print out?
>
> If your server isn't reporting "fileSize" then there are a few other
> places where I would expect git-p4 to also fail.
>
> If we're going to support this very ancient version of p4d, then
> gracefully handling a missing fileSize will be useful.
>
>>>
>>> Also, please, find one comment inline below.
>>>
>>> Thank you,
>>> Andrey
>>>
>>> From: Thandesha VK
>>>> Sounds good. How about an enhanced version of fix from both of us.
>>>> This will let us know that something is not right with the file but
>>>> will not bark
>>>>
>>>> $ git diff
>>>> diff --git a/git-p4.py b/git-p4.py
>>>> index 7bb9cadc6..df901976f 100755
>>>> --- a/git-p4.py
>>>> +++ b/git-p4.py
>>>> @@ -2566,7 +2566,12 @@ class P4Sync(Command, P4UserMap):
>>>> relPath = self.stripRepoPath(file['depotFile'],
>>>> self.branchPrefixes)
>>>> relPath = self.encodeWithUTF8(relPath)
>>>> if verbose:
>>>> -size = int(self.stream_file['fileSize'])
>>>> +if 'fileSize' not in self.stream_file:
>>>> + print "WARN: File size from perforce unknown. Please
>>>> verify by p4 sizes %s" %(file['depotFile'])
>>> For whatever reason, the code below uses sys.stdout.write() instead of
>>> print().
>>> Should it be used here for consistency as well?
>>>
>>>> + size = "-1"
>>>> +else:
>>>> + size = self.stream_file['fileSize']
>>>> +size = int(size)
>>>> sys.stdout.write('\r%s --> %s (%i MB)\n' %
>>>> (file['depotFile'], relPath, size/1024/1024))
>>>> sys.stdout.flush()
>>>>
>>>>
>>>> On Tue, Apr 17, 2018 at 10:33 AM, Mazo, Andrey
>>>> wrote:
>>>>> Sure, I totally agree.
>>>>> Sorry, I just wasn't clear enough in my previous email.
>>>>> I meant that your patch suppresses "%s --> %s (%i MB)&q
Re: [PATCH 1/1] git-p4: fix `sync --verbose` traceback due to 'fileSize'
Ah. I didn't realize the script is not using p4 sizes to get the size. I assumed that it is using p4 sizes. Now I am looking at it using p4 -G print. However, when the stack trace happened, I verified what is wrong and found out that the fileSize key is not returned for "p4 -G sizes" command. So what I am saying is that we cannot use p4 sizes in this case to solve the problem as even p4 sizes will fail with the same fileSize not found stack trace. We can continue as this is not as Critical. However it is a good idea to let user know that they need to take action to correct this file at the perforce side. So irrespective of we are using p4 print or p4 sizes, the fileSize is not returned in some cases and warning or aborting is something we need to do. Just ignoring may not be a good choice. On Tue, Apr 17, 2018 at 2:38 PM, Mazo, Andrey wrote: > Thandesha, > > If I read your patch correctly, it adds a warning in case `p4 -G print` > doesn't return "fileSize" (not `p4 sizes`). > I don't see `p4 sizes` being used by git-p4 at all. > As I said earlier, for our ancient Perforce server, `p4 -G print` _never_ > returns "fileSize". > So, it's definitely not a reason to abort. > > Thank you, > Andrey > > From: Thandesha VK >> My fix is for the case where p4 -G sizes not returning the key and >> value for fileSize. This can happen in some cases. Only option at that >> point of time is to warn the user about the problematic file and keep >> moving (or should we abort??) >> >> Thanks >> Thandesha >> >> On Tue, Apr 17, 2018 at 2:18 PM, Mazo, Andrey wrote: >>> Luke, >>> >>> Thank you for reviewing and acking my patch! >>> By the way, did you see Thandesha's proposed patch [1] to print a warning >>> in case of the missing "fileSize" attribute? >>> Should we go that route instead? >>> Or should we try harder to get the size by running `p4 -G sizes`? >>> >>> [1] >>> https://public-inbox.org/git/cajjpmi-plb4qcka5alkxa8b1vozfff+oaq0fguq9yviobrp...@mail.gmail.com/t/#m6053d2031020e08edd24ada6c9eb49721ebc4e27 >>> >>> Thank you, >>> Andrey >>> >>> From: Luke Diamand >>>> On Tue, 17 Apr 2018, 09:22 Andrey Mazo, wrote: >>>>> Perforce server 2007.2 (and maybe others) doesn't return "fileSize" >>>>> attribute in its reply to `p4 -G print` command. >>>>> This causes the following traceback when running `git p4 sync --verbose`: >>>>> """ >>>>> Traceback (most recent call last): >>>>> File "/usr/libexec/git-core/git-p4", line 3839, in >>>>> main() >>>>> File "/usr/libexec/git-core/git-p4", line 3833, in main >>>>> if not cmd.run(args): >>>>> File "/usr/libexec/git-core/git-p4", line 3567, in run >>>>> self.importChanges(changes) >>>>> File "/usr/libexec/git-core/git-p4", line 3233, in importChanges >>>>> self.commit(description, filesForCommit, branch, parent) >>>>> File "/usr/libexec/git-core/git-p4", line 2855, in commit >>>>> self.streamP4Files(files) >>>>> File "/usr/libexec/git-core/git-p4", line 2747, in streamP4Files >>>>> cb=streamP4FilesCbSelf) >>>>> File "/usr/libexec/git-core/git-p4", line 552, in p4CmdList >>>>> cb(entry) >>>>> File "/usr/libexec/git-core/git-p4", line 2741, in >>>>> streamP4FilesCbSelf >>>>> self.streamP4FilesCb(entry) >>>>> File "/usr/libexec/git-core/git-p4", line 2689, in streamP4FilesCb >>>>> self.streamOneP4File(self.stream_file, self.stream_contents) >>>>> File "/usr/libexec/git-core/git-p4", line 2566, in streamOneP4File >>>>> size = int(self.stream_file['fileSize']) >>>>> KeyError: 'fileSize' >>>>> """ >>>>> >>>>> Fix this by omitting the file size information from the verbose print out. >>>>> Also, don't use "self.stream_file" directly, >>>>> but rather use passed in "file" argument. >>>>> (which point to the same "self.stream_file" for all existing callers) >>>>> >>>>> Signed-off-by: Andrey Mazo >>>>> ---
Re: [PATCH 1/1] git-p4: fix `sync --verbose` traceback due to 'fileSize'
My fix is for the case where p4 -G sizes not returning the key and
value for fileSize. This can happen in some cases. Only option at that
point of time is to warn the user about the problematic file and keep
moving (or should we abort??)
Thanks
Thandesha
On Tue, Apr 17, 2018 at 2:18 PM, Mazo, Andrey wrote:
> Luke,
>
> Thank you for reviewing and acking my patch!
> By the way, did you see Thandesha's proposed patch [1] to print a warning in
> case of the missing "fileSize" attribute?
> Should we go that route instead?
> Or should we try harder to get the size by running `p4 -G sizes`?
>
> [1]
> https://public-inbox.org/git/cajjpmi-plb4qcka5alkxa8b1vozfff+oaq0fguq9yviobrp...@mail.gmail.com/t/#m6053d2031020e08edd24ada6c9eb49721ebc4e27
>
> Thank you,
> Andrey
>
> From: Luke Diamand
>> On Tue, 17 Apr 2018, 09:22 Andrey Mazo, wrote:
>>> Perforce server 2007.2 (and maybe others) doesn't return "fileSize"
>>> attribute in its reply to `p4 -G print` command.
>>> This causes the following traceback when running `git p4 sync --verbose`:
>>> """
>>> Traceback (most recent call last):
>>> File "/usr/libexec/git-core/git-p4", line 3839, in
>>> main()
>>> File "/usr/libexec/git-core/git-p4", line 3833, in main
>>> if not cmd.run(args):
>>> File "/usr/libexec/git-core/git-p4", line 3567, in run
>>> self.importChanges(changes)
>>> File "/usr/libexec/git-core/git-p4", line 3233, in importChanges
>>> self.commit(description, filesForCommit, branch, parent)
>>> File "/usr/libexec/git-core/git-p4", line 2855, in commit
>>> self.streamP4Files(files)
>>> File "/usr/libexec/git-core/git-p4", line 2747, in streamP4Files
>>> cb=streamP4FilesCbSelf)
>>> File "/usr/libexec/git-core/git-p4", line 552, in p4CmdList
>>> cb(entry)
>>> File "/usr/libexec/git-core/git-p4", line 2741, in streamP4FilesCbSelf
>>> self.streamP4FilesCb(entry)
>>> File "/usr/libexec/git-core/git-p4", line 2689, in streamP4FilesCb
>>> self.streamOneP4File(self.stream_file, self.stream_contents)
>>> File "/usr/libexec/git-core/git-p4", line 2566, in streamOneP4File
>>> size = int(self.stream_file['fileSize'])
>>> KeyError: 'fileSize'
>>> """
>>>
>>> Fix this by omitting the file size information from the verbose print out.
>>> Also, don't use "self.stream_file" directly,
>>> but rather use passed in "file" argument.
>>> (which point to the same "self.stream_file" for all existing callers)
>>>
>>> Signed-off-by: Andrey Mazo
>>> ---
>>> git -p4.py | 8 ++--
>>> 1 file changed, 6 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/git-p4.py b/git-p4.py
>>> index 7bb9cadc6..6f05f915a 100755
>>> --- a/git-p4.py
>>> +++ b/git-p4.py
>>> @@ -2566,8 +2566,12 @@ class P4Sync(Command, P4UserMap):
>>> relPath = self.stripRepoPath(file['depotFile'],
>>> self.branchPrefixes)
>>> relPath = self.encodeWithUTF8(relPath)
>>> if verbose:
>>> -size = int(self.stream_file['fileSize'])
>>> -sys.stdout.write('\r%s --> %s (%i MB)\n' % (file['depotFile'],
>>> relPath, size/1024/1024))
>>> +size = file.get('fileSize', None)
>>> +if size is None:
>>> +sizeStr = ''
>>> +else:
>>> +sizeStr = ' (%i MB)' % (int(size)/1024/1024)
>>> +sys.stdout.write('\r%s --> %s%s\n' % (file['depotFile'],
>>> relPath, sizeStr))
>>> sys.stdout.flush()
>>>
>>> (type_base, type_mods) = split_p4_type(file["type"])
>>> --
>>> 2.16.1
>>>
>> Thanks, that looks like a good fix to me. Ack.
--
Thanks & Regards
Thandesha VK | Cellphone +1 (703) 459-5386
Re: [BUG] git p4 clone fails when p4 sizes does not return 'fileSize' key
I have few cases where even p4 -G sizes (or p4 sizes) is not returning
the size value even with latest version of p4 (17.2). In that case, we
have to regenerate the digest for file save it - It mean something is
wrong with the file in perforce.
Regarding, sys.stdout.write v/s print, I see script using both of them
without a common pattern. I can change it to whatever is more
appropriate.
On Tue, Apr 17, 2018 at 11:47 AM, Mazo, Andrey wrote:
> Does a missing "fileSize" actually mean that there is something wrong with
> the file?
> Because, for me, `p4 -G print` doesn't print "fileSize" for _any_ file.
> (which I attribute to our rather ancient (2007.2) Perforce server)
> I'm not an expert in Perforce, so don't know for sure.
>
> However, `p4 -G sizes` works fine even with our p4 server.
> Should we then go one step further and use `p4 -G sizes` to obtain the
> "fileSize" when it's not returned by `p4 -G print`?
> Or is it an overkill for a simple verbose print out?
>
> Also, please, find one comment inline below.
>
> Thank you,
> Andrey
>
> From: Thandesha VK
>> Sounds good. How about an enhanced version of fix from both of us.
>> This will let us know that something is not right with the file but
>> will not bark
>>
>> $ git diff
>> diff --git a/git-p4.py b/git-p4.py
>> index 7bb9cadc6..df901976f 100755
>> --- a/git-p4.py
>> +++ b/git-p4.py
>> @@ -2566,7 +2566,12 @@ class P4Sync(Command, P4UserMap):
>> relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)
>> relPath = self.encodeWithUTF8(relPath)
>> if verbose:
>> -size = int(self.stream_file['fileSize'])
>> +if 'fileSize' not in self.stream_file:
>> + print "WARN: File size from perforce unknown. Please verify
>> by p4 sizes %s" %(file['depotFile'])
> For whatever reason, the code below uses sys.stdout.write() instead of
> print().
> Should it be used here for consistency as well?
>
>> + size = "-1"
>> +else:
>> + size = self.stream_file['fileSize']
>> +size = int(size)
>> sys.stdout.write('\r%s --> %s (%i MB)\n' %
>> (file['depotFile'], relPath, size/1024/1024))
>> sys.stdout.flush()
>>
>>
>> On Tue, Apr 17, 2018 at 10:33 AM, Mazo, Andrey wrote:
>>> Sure, I totally agree.
>>> Sorry, I just wasn't clear enough in my previous email.
>>> I meant that your patch suppresses "%s --> %s (%i MB)" line in case
>>> "fileSize" is not available,
>>> while my patch suppresses just "(%i MB)" portion if the "fileSize" is not
>>> known.
>>> In other words,
>>> * if "fileSize" is known:
>>> ** both yours and mine patches don't change existing behavior;
>>> * if "fileSize" is not known:
>>> ** your patch makes streamOneP4File() not print anything;
>>> ** my patch makes streamOneP4File() print "%s --> %s".
>>>
>>> Hope, I'm clearer this time.
>>>
>>> Thank you,
>>> Andrey
>>>
>>> From: Thandesha VK
>>>> *I* think keeping the filesize info is better with --verbose option as
>>>> that gives some clue about the file we are working on. What do you
>>>> think?
>>>> Script has similar checks of key existence at other places where it is
>>>> looking for fileSize.
>>>>
>>>> On Tue, Apr 17, 2018 at 9:22 AM, Andrey Mazo wrote:
>>>>> Huh, I actually have a slightly different fix for the same issue.
>>>>> It doesn't suppress the corresponding verbose output completely, but just
>>>>> removes the size information from it.
>>>>>
>>>>> Also, I'd mention that the workaround is trivial -- simply omit the
>>>>> "--verbose" option.
>>>>>
>>>>> Andrey Mazo (1):
>>>>> git-p4: fix `sync --verbose` traceback due to 'fileSize'
>>>>>
>>>>> git-p4.py | 8 ++--
>>>>> 1 file changed, 6 insertions(+), 2 deletions(-)
>>>>>
>>>>>
>>>>> base-commit: 468165c1d8a442994a825f3684528361727cd8c0
>>>>> --
>>>>> 2.16.1
>>>>>
>>>>
>>>> --
>>>> Thanks & Regards
>>>> Thandesha VK | Cellphone +1 (703) 459-5386
>>
>>
>>
>> --
>> Thanks & Regards
>> Thandesha VK | Cellphone +1 (703) 459-5386
--
Thanks & Regards
Thandesha VK | Cellphone +1 (703) 459-5386
Re: [BUG] git p4 clone fails when p4 sizes does not return 'fileSize' key
Sounds good. How about an enhanced version of fix from both of us.
This will let us know that something is not right with the file but
will not bark
$ git diff
diff --git a/git-p4.py b/git-p4.py
index 7bb9cadc6..df901976f 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -2566,7 +2566,12 @@ class P4Sync(Command, P4UserMap):
relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)
relPath = self.encodeWithUTF8(relPath)
if verbose:
-size = int(self.stream_file['fileSize'])
+if 'fileSize' not in self.stream_file:
+ print "WARN: File size from perforce unknown. Please
verify by p4 sizes %s" %(file['depotFile'])
+ size = "-1"
+else:
+ size = self.stream_file['fileSize']
+size = int(size)
sys.stdout.write('\r%s --> %s (%i MB)\n' %
(file['depotFile'], relPath, size/1024/1024))
sys.stdout.flush()
On Tue, Apr 17, 2018 at 10:33 AM, Mazo, Andrey wrote:
> Sure, I totally agree.
> Sorry, I just wasn't clear enough in my previous email.
> I meant that your patch suppresses "%s --> %s (%i MB)" line in case
> "fileSize" is not available,
> while my patch suppresses just "(%i MB)" portion if the "fileSize" is not
> known.
> In other words,
> * if "fileSize" is known:
> ** both yours and mine patches don't change existing behavior;
> * if "fileSize" is not known:
> ** your patch makes streamOneP4File() not print anything;
> ** my patch makes streamOneP4File() print "%s --> %s".
>
> Hope, I'm clearer this time.
>
> Thank you,
> Andrey
>
> From: Thandesha VK
>> *I* think keeping the filesize info is better with --verbose option as
>> that gives some clue about the file we are working on. What do you
>> think?
>> Script has similar checks of key existence at other places where it is
>> looking for fileSize.
>>
>> On Tue, Apr 17, 2018 at 9:22 AM, Andrey Mazo wrote:
>>> Huh, I actually have a slightly different fix for the same issue.
>>> It doesn't suppress the corresponding verbose output completely, but just
>>> removes the size information from it.
>>>
>>> Also, I'd mention that the workaround is trivial -- simply omit the
>>> "--verbose" option.
>>>
>>> Andrey Mazo (1):
>>> git-p4: fix `sync --verbose` traceback due to 'fileSize'
>>>
>>> git-p4.py | 8 ++--
>>> 1 file changed, 6 insertions(+), 2 deletions(-)
>>>
>>>
>>> base-commit: 468165c1d8a442994a825f3684528361727cd8c0
>>> --
>>> 2.16.1
>>>
>>
>> --
>> Thanks & Regards
>> Thandesha VK | Cellphone +1 (703) 459-5386
--
Thanks & Regards
Thandesha VK | Cellphone +1 (703) 459-5386
Re: [BUG] git p4 clone fails when p4 sizes does not return 'fileSize' key
*I* think keeping the filesize info is better with --verbose option as that gives some clue about the file we are working on. What do you think? Script has similar checks of key existence at other places where it is looking for fileSize. On Tue, Apr 17, 2018 at 9:22 AM, Andrey Mazo wrote: > Huh, I actually have a slightly different fix for the same issue. > It doesn't suppress the corresponding verbose output completely, but just > removes the size information from it. > > Also, I'd mention that the workaround is trivial -- simply omit the > "--verbose" option. > > Andrey Mazo (1): > git-p4: fix `sync --verbose` traceback due to 'fileSize' > > git-p4.py | 8 ++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > > base-commit: 468165c1d8a442994a825f3684528361727cd8c0 > -- > 2.16.1 > -- Thanks & Regards Thandesha VK | Cellphone +1 (703) 459-5386
[BUG] git p4 clone fails when p4 sizes does not return 'fileSize' key
git p4 clone fails when p4 sizes does not return 'fileSize' key. There
are few cases when p4 sizes returens 0 size and with marshaled output,
it doesn’t return the fileSize attribute.
Here is the demonstration and potential fix
$ cd /tmp/git/
$ git remote -v
origin https://github.com/git/git.git (fetch)
origin https://github.com/git/git.git (push)
$ git branch -v
* master fe0a9eaf3 Merge branch 'svn/authors-prog-2' of
git://bogomips.org/git-svn
Problem:
$ /tmp/git/git-p4.py clone //depot//@all . –verbose
.
.
.
Traceback (most recent call last):
File "/tmp/git/git-p4.py", line 3840, in
main()
File "/tmp/git/git-p4.py", line 3834, in main
if not cmd.run(args):
File "/tmp/git/git-p4.py", line 3706, in run
if not P4Sync.run(self, depotPaths):
File "/tmp/git/git-p4.py", line 3568, in run
self.importChanges(changes)
File "/tmp/git/git-p4.py", line 3240, in importChanges
self.initialParent)
File "/tmp/git/git-p4.py", line 2858, in commit
self.streamP4Files(files)
File "/tmp/git/git-p4.py", line 2750, in streamP4Files
cb=streamP4FilesCbSelf)
File "/tmp/git/git-p4.py", line 552, in p4CmdList
cb(entry)
File "/tmp/git/git-p4.py", line 2744, in streamP4FilesCbSelf
self.streamP4FilesCb(entry)
File "/tmp/git/git-p4.py", line 2692, in streamP4FilesCb
self.streamOneP4File(self.stream_file, self.stream_contents)
File "/tmp/git/git-p4.py", line 2569, in streamOneP4File
size = int(self.stream_file['fileSize'])
KeyError: 'fileSize'
Signature of the sizes output resulting in this problem:
$ p4 -p sizes //foo.c
//foo.c#5 bytes
$ p4 -p -G sizes //foo.c
{scodesstatsdepotFiles4//fooc.c50
Signature for a file without problem:
$ p4 -p sizes //bar.c
//bar.c#5 1105 bytes
$ p4 -p -G sizes //bar.c
{scodesstatsdepotFiles;//bar.csrevs5fileSizes11050
Patch:
$ git diff
diff --git a/git-p4.py b/git-p4.py
index 7bb9cadc6..f908e805e 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -2565,7 +2565,7 @@ class P4Sync(Command, P4UserMap):
def streamOneP4File(self, file, contents):
relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)
relPath = self.encodeWithUTF8(relPath)
-if verbose:
+if verbose and 'fileSize' in self.stream_file:
size = int(self.stream_file['fileSize'])
sys.stdout.write('\r%s --> %s (%i MB)\n' %
(file['depotFile'], relPath, size/1024/1024))
sys.stdout.flush()
Thanks & Regards
Thandesha
