Re: git-p4 cannot use perforce client created by p4java — "Expected view key View1 missing"

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, 31 Jan 2020 at 13:43, Ivan Selin <ivan.selin@xxxxxxxxxx> wrote:
>
> Yes, that's exactly the way that I've tried it and it worked for me.
> Can we have that integrated into git-p4? What can I do to make it
> happen?

A patch would be very welcome!

See Documentation/SubmittingPatches for details, but it's likely
enough to just make the change, and then use git format-patch and git
send-email.

Please ensure you add a "Signed-off-by" (git commit -s).

Thanks!
Luke


>
> On Wed, Jan 29, 2020 at 1:35 PM Luke Diamand <luke@xxxxxxxxxxx> wrote:
> >
> > On Tue, 7 Jan 2020 at 15:53, Ivan Selin <ivan.selin@xxxxxxxxxx> wrote:
> > >
> > > Hello!
> > >
> > > If I create a perforce client from java using p4java, it gets created
> > > with an extra key "ViewDepotType" in client definition. When I try to
> > > do `git p4 sync --use-client-spec`, git-p4 dies with message like
> > > "Expected view key View1 missing" — because it assumes that all keys
> > > starting with "View" are "View0", "View1" and so on.
> > >
> > > How to reproduce:
> > > 1) Create perforce repository;
> > > 2) Create a perforce client (let's name it "my-client") in said
> > > perforce repository using p4java; add one view mapping to the client
> > > on creation;
> > > 3) Run `P4CLIENT=my-client git p4 sync --use-client-spec`;
> > > 4) git p4 finishes with error "Expected view key View1 missing".
> > >
> > > Attaching hexdumped/unmarshalled examples of "regular" client
> > > definition and client created with p4java. Note that p4java's version
> > > has "ViewDepotType" key and regular client does not. Also,
> > > "ViewDepotType" key is not showing up in text output of `p4 client
> > > -o`, only in binary format (`p4 -G client -o`). And I'm attaching a
> > > patch that solved the issue for me.
> > >
> > > Is that information enough or should I add anything else? I'm new to
> > > git community, but willing to help.
> >
> > I suspect the problem lies at around line 4220 of git-p4, where it does this:
> >
> >      view_keys = [ k for k in entry.keys() if k.startswith("View") ]
> >
> > I think changing that startswith to a regex match would fix this,
> > although I have not tried it.
> > Something like:
> >
> > is_view = re.compile(r'^View\d+$')
> > view_keys = [ k for k in entry.keys() if is_view.match(k) ]
> >
> >
> > >
> > > Regards,
> > > Ivan.




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux