* git-p4: t9819 failing
@ 2015-09-23 9:27 Luke Diamand
2015-09-23 10:27 ` Lars Schneider
0 siblings, 1 reply; 7+ messages in thread
From: Luke Diamand @ 2015-09-23 9:27 UTC (permalink / raw)
To: Lars Schneider; +Cc: Git Users
Lars,
I just noticed that your change "git-p4: honor core.ignorecase when
using P4 client specs" seems to break t9819.
I suspect that the problem is just that t9819 needs to be updated to
reflect your change - do you have any thoughts on that?
Thanks!
Luke
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: git-p4: t9819 failing
2015-09-23 9:27 git-p4: t9819 failing Luke Diamand
@ 2015-09-23 10:27 ` Lars Schneider
2015-09-23 11:11 ` Luke Diamand
0 siblings, 1 reply; 7+ messages in thread
From: Lars Schneider @ 2015-09-23 10:27 UTC (permalink / raw)
To: Luke Diamand; +Cc: Git Users
On 23 Sep 2015, at 11:27, Luke Diamand <luke@diamand.org> wrote:
> Lars,
>
> I just noticed that your change "git-p4: honor core.ignorecase when
> using P4 client specs" seems to break t9819.
>
> I suspect that the problem is just that t9819 needs to be updated to
> reflect your change - do you have any thoughts on that?
>
> Thanks!
> Luke
What OS and what commit do you use for testing? Here is what I got on my machine:
Ubuntu, next (c07a1e8) -> OK
Ubuntu, maint (ee6ad5f) -> OK
OS X, next (c07a1e8) -> broken
OS X, maint (ee6ad5f) -> broken
Thanks,
Lars
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: git-p4: t9819 failing
2015-09-23 10:27 ` Lars Schneider
@ 2015-09-23 11:11 ` Luke Diamand
2015-09-23 12:28 ` Lars Schneider
0 siblings, 1 reply; 7+ messages in thread
From: Luke Diamand @ 2015-09-23 11:11 UTC (permalink / raw)
To: Lars Schneider; +Cc: Git Users
On 23 September 2015 at 11:27, Lars Schneider <larsxschneider@gmail.com> wrote:
>
> On 23 Sep 2015, at 11:27, Luke Diamand <luke@diamand.org> wrote:
>
>> Lars,
>>
>> I just noticed that your change "git-p4: honor core.ignorecase when
>> using P4 client specs" seems to break t9819.
>>
>> I suspect that the problem is just that t9819 needs to be updated to
>> reflect your change - do you have any thoughts on that?
>>
>> Thanks!
>> Luke
>
> What OS and what commit do you use for testing? Here is what I got on my machine:
>
> Ubuntu, next (c07a1e8) -> OK
> Ubuntu, maint (ee6ad5f) -> OK
>
> OS X, next (c07a1e8) -> broken
> OS X, maint (ee6ad5f) -> broken
The next branch is good:
c07a1e8 Merge branch 'bb/remote-get-url' into next
The pu branch isn't:
f44e3df Merge branch 'jk/notes-dwim-doc' into pu
This is on Debian.
Actually I think the problem may be in calcDiskFree().
Here's the last bit of the crash dump from git-p4 I get:
File "/home/ldiamand/git/git/git-p4", line 2580, in streamP4FilesCbSelf
self.streamP4FilesCb(entry)
File "/home/ldiamand/git/git/git-p4", line 2497, in streamP4FilesCb
required_bytes = int((4 * int(self.stream_file["fileSize"])) -
calcDiskFree(self.cloneDestination))
File "/home/ldiamand/git/git/git-p4", line 116, in calcDiskFree
st = os.statvfs(dirname)
OSError: [Errno 2] No such file or directory: 'lc'
Luke
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: git-p4: t9819 failing
2015-09-23 11:11 ` Luke Diamand
@ 2015-09-23 12:28 ` Lars Schneider
2015-09-24 7:45 ` Luke Diamand
0 siblings, 1 reply; 7+ messages in thread
From: Lars Schneider @ 2015-09-23 12:28 UTC (permalink / raw)
To: Luke Diamand; +Cc: Git Users
On 23 Sep 2015, at 13:11, Luke Diamand <luke@diamand.org> wrote:
> On 23 September 2015 at 11:27, Lars Schneider <larsxschneider@gmail.com> wrote:
>>
>> On 23 Sep 2015, at 11:27, Luke Diamand <luke@diamand.org> wrote:
>>
>>> Lars,
>>>
>>> I just noticed that your change "git-p4: honor core.ignorecase when
>>> using P4 client specs" seems to break t9819.
>>>
>>> I suspect that the problem is just that t9819 needs to be updated to
>>> reflect your change - do you have any thoughts on that?
>>>
>>> Thanks!
>>> Luke
>>
>> What OS and what commit do you use for testing? Here is what I got on my machine:
>>
>> Ubuntu, next (c07a1e8) -> OK
>> Ubuntu, maint (ee6ad5f) -> OK
>>
>> OS X, next (c07a1e8) -> broken
>> OS X, maint (ee6ad5f) -> broken
>
> The next branch is good:
> c07a1e8 Merge branch 'bb/remote-get-url' into next
>
> The pu branch isn't:
> f44e3df Merge branch 'jk/notes-dwim-doc' into pu
>
> This is on Debian.
>
> Actually I think the problem may be in calcDiskFree().
>
> Here's the last bit of the crash dump from git-p4 I get:
>
> File "/home/ldiamand/git/git/git-p4", line 2580, in streamP4FilesCbSelf
> self.streamP4FilesCb(entry)
> File "/home/ldiamand/git/git/git-p4", line 2497, in streamP4FilesCb
> required_bytes = int((4 * int(self.stream_file["fileSize"])) -
> calcDiskFree(self.cloneDestination))
> File "/home/ldiamand/git/git/git-p4", line 116, in calcDiskFree
> st = os.statvfs(dirname)
> OSError: [Errno 2] No such file or directory: 'lc'
>
> Luke
Confirmed. What do you think about this fix?
Thank you,
Lars
---
git-p4.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/git-p4.py b/git-p4.py
index 1d1bb87..66c0a4e 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -3478,6 +3478,7 @@ class P4Clone(P4Sync):
print "Importing from %s into %s" % (', '.join(depotPaths), self.cloneDestination)
+ self.cloneDestination = os.path.abspath(self.cloneDestination)
if not os.path.exists(self.cloneDestination):
os.makedirs(self.cloneDestination)
chdir(self.cloneDestination)
--
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: git-p4: t9819 failing
2015-09-23 12:28 ` Lars Schneider
@ 2015-09-24 7:45 ` Luke Diamand
2015-09-24 20:29 ` Luke Diamand
0 siblings, 1 reply; 7+ messages in thread
From: Luke Diamand @ 2015-09-24 7:45 UTC (permalink / raw)
To: Lars Schneider; +Cc: Git Users
On 23 September 2015 at 13:28, Lars Schneider <larsxschneider@gmail.com> wrote:
>
>> Here's the last bit of the crash dump from git-p4 I get:
>>
>> File "/home/ldiamand/git/git/git-p4", line 2580, in streamP4FilesCbSelf
>> self.streamP4FilesCb(entry)
>> File "/home/ldiamand/git/git/git-p4", line 2497, in streamP4FilesCb
>> required_bytes = int((4 * int(self.stream_file["fileSize"])) -
>> calcDiskFree(self.cloneDestination))
>> File "/home/ldiamand/git/git/git-p4", line 116, in calcDiskFree
>> st = os.statvfs(dirname)
>> OSError: [Errno 2] No such file or directory: 'lc'
>>
>> Luke
> Confirmed. What do you think about this fix?
Works for me!
>
> Thank you,
> Lars
>
> ---
> git-p4.py | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/git-p4.py b/git-p4.py
> index 1d1bb87..66c0a4e 100755
> --- a/git-p4.py
> +++ b/git-p4.py
> @@ -3478,6 +3478,7 @@ class P4Clone(P4Sync):
>
> print "Importing from %s into %s" % (', '.join(depotPaths), self.cloneDestination)
>
> + self.cloneDestination = os.path.abspath(self.cloneDestination)
> if not os.path.exists(self.cloneDestination):
> os.makedirs(self.cloneDestination)
> chdir(self.cloneDestination)
> --
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: git-p4: t9819 failing
2015-09-24 7:45 ` Luke Diamand
@ 2015-09-24 20:29 ` Luke Diamand
2015-09-25 9:29 ` Lars Schneider
0 siblings, 1 reply; 7+ messages in thread
From: Luke Diamand @ 2015-09-24 20:29 UTC (permalink / raw)
To: Lars Schneider; +Cc: Git Users
OK, slight correction there - it now doesn't crash getting the disk
usage, but I think it still needs to be updated following the other
changes to case-handling.
Luke
On 24 September 2015 at 08:45, Luke Diamand <luke@diamand.org> wrote:
> On 23 September 2015 at 13:28, Lars Schneider <larsxschneider@gmail.com> wrote:
>>
>>> Here's the last bit of the crash dump from git-p4 I get:
>>>
>>> File "/home/ldiamand/git/git/git-p4", line 2580, in streamP4FilesCbSelf
>>> self.streamP4FilesCb(entry)
>>> File "/home/ldiamand/git/git/git-p4", line 2497, in streamP4FilesCb
>>> required_bytes = int((4 * int(self.stream_file["fileSize"])) -
>>> calcDiskFree(self.cloneDestination))
>>> File "/home/ldiamand/git/git/git-p4", line 116, in calcDiskFree
>>> st = os.statvfs(dirname)
>>> OSError: [Errno 2] No such file or directory: 'lc'
>>>
>>> Luke
>> Confirmed. What do you think about this fix?
>
> Works for me!
>
>
>
>>
>> Thank you,
>> Lars
>>
>> ---
>> git-p4.py | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/git-p4.py b/git-p4.py
>> index 1d1bb87..66c0a4e 100755
>> --- a/git-p4.py
>> +++ b/git-p4.py
>> @@ -3478,6 +3478,7 @@ class P4Clone(P4Sync):
>>
>> print "Importing from %s into %s" % (', '.join(depotPaths), self.cloneDestination)
>>
>> + self.cloneDestination = os.path.abspath(self.cloneDestination)
>> if not os.path.exists(self.cloneDestination):
>> os.makedirs(self.cloneDestination)
>> chdir(self.cloneDestination)
>> --
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: git-p4: t9819 failing
2015-09-24 20:29 ` Luke Diamand
@ 2015-09-25 9:29 ` Lars Schneider
0 siblings, 0 replies; 7+ messages in thread
From: Lars Schneider @ 2015-09-25 9:29 UTC (permalink / raw)
To: Luke Diamand; +Cc: Git Users
Good catch. The case-handling test is actually fine. There was a bug in my implementation!
If you do this:
git p4 clone //depot/something/...
Then git p4 generates a directory “something” and clones into that (similar to Git). Since I set “cloneDirectory” to the current working directory that logic never kicked in. Therefore the depot was cloned into the current working directory instead of a new directory “something” and the test broke.
Thanks,
Lars
On 24 Sep 2015, at 22:29, Luke Diamand <luke@diamand.org> wrote:
> OK, slight correction there - it now doesn't crash getting the disk
> usage, but I think it still needs to be updated following the other
> changes to case-handling.
>
> Luke
>
> On 24 September 2015 at 08:45, Luke Diamand <luke@diamand.org> wrote:
>> On 23 September 2015 at 13:28, Lars Schneider <larsxschneider@gmail.com> wrote:
>>>
>>>> Here's the last bit of the crash dump from git-p4 I get:
>>>>
>>>> File "/home/ldiamand/git/git/git-p4", line 2580, in streamP4FilesCbSelf
>>>> self.streamP4FilesCb(entry)
>>>> File "/home/ldiamand/git/git/git-p4", line 2497, in streamP4FilesCb
>>>> required_bytes = int((4 * int(self.stream_file["fileSize"])) -
>>>> calcDiskFree(self.cloneDestination))
>>>> File "/home/ldiamand/git/git/git-p4", line 116, in calcDiskFree
>>>> st = os.statvfs(dirname)
>>>> OSError: [Errno 2] No such file or directory: 'lc'
>>>>
>>>> Luke
>>> Confirmed. What do you think about this fix?
>>
>> Works for me!
>>
>>
>>
>>>
>>> Thank you,
>>> Lars
>>>
>>> ---
>>> git-p4.py | 1 +
>>> 1 file changed, 1 insertion(+)
>>>
>>> diff --git a/git-p4.py b/git-p4.py
>>> index 1d1bb87..66c0a4e 100755
>>> --- a/git-p4.py
>>> +++ b/git-p4.py
>>> @@ -3478,6 +3478,7 @@ class P4Clone(P4Sync):
>>>
>>> print "Importing from %s into %s" % (', '.join(depotPaths), self.cloneDestination)
>>>
>>> + self.cloneDestination = os.path.abspath(self.cloneDestination)
>>> if not os.path.exists(self.cloneDestination):
>>> os.makedirs(self.cloneDestination)
>>> chdir(self.cloneDestination)
>>> --
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-09-25 9:29 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-23 9:27 git-p4: t9819 failing Luke Diamand
2015-09-23 10:27 ` Lars Schneider
2015-09-23 11:11 ` Luke Diamand
2015-09-23 12:28 ` Lars Schneider
2015-09-24 7:45 ` Luke Diamand
2015-09-24 20:29 ` Luke Diamand
2015-09-25 9:29 ` Lars Schneider
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).