kde:digikam-software-compilati
Locked
kde:digikam-software-compilati
 
|
Hi,
the repository kde:digikam-software-compilation repository should now be working as we want it. The shipped .gits script has received to small but important fixes. No more kde:// hack, all repositories will inherit the prefix from the super- repo (non-developers will clone from anongit, developers clone from kde: ) It has downloaded and switched branches for me just fine from a clean checkout, any testing is welcome. Marcel _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: kde:digikam-software-compilati
|
|
On 02/22/2011 08:53 PM, Marcel Wiesweg wrote:
> Hi, > > the repository kde:digikam-software-compilation repository should now be > working as we want it. The shipped .gits script has received to small but > important fixes. > No more kde:// hack, all repositories will inherit the prefix from the super- > repo (non-developers will clone from anongit, developers clone from kde: ) > > It has downloaded and switched branches for me just fine from a clean > checkout, any testing is welcome. When I just copy the git URL from projects.kde.org and clone from that, download-repos fails: mike@operator:/c/temp/kde/trunk-src$ git clone git://anongit.kde.org/digikam-software-compilation digikam-sc.2 Cloning into digikam-sc.2... remote: Counting objects: 72, done. remote: Compressing objects: 100% (37/37), done. remote: Total 72 (delta 32), reused 64 (delta 28) Receiving objects: 100% (72/72), 26.53 KiB, done. Resolving deltas: 100% (32/32), done. mike@operator:/c/temp/kde/trunk-src$ cd digikam-sc.2/ mike@operator:/c/temp/kde/trunk-src/digikam-sc.2$ ./download-repos Cloning into core... fatal: Unable to look up (port 9418) (Name or service not known) Could not clone git://anongit.kde.orgdigikam onto core cd: 5: can't cd to core cd: 6: can't cd to extra/kipi-plugins cd: 7: can't cd to extra/libkexiv2 cd: 8: can't cd to extra/libkdcraw I suggest to check for error conditions after calling gits populate, to avoid further cd errors. But if I download from kde:digikam-software-compilation it works fine: mike@operator:/c/temp/kde/trunk-src$ git clone kde:digikam-software-compilation digikam-sc.2 Cloning into digikam-sc.2... remote: Counting objects: 72, done. remote: Compressing objects: 100% (37/37), done. remote: Total 72 (delta 32), reused 64 (delta 28) Receiving objects: 100% (72/72), 26.53 KiB, done. Resolving deltas: 100% (32/32), done. download-repos works fine, but ends with this: Branch 2.0 set up to track remote branch development/2.0 from origin. Switched to a new branch '2.0' Branch 2.0 set up to track remote branch development/2.0 from origin. Switched to a new branch '2.0' Branch 2.0 set up to track remote branch development/2.0 from origin. Switched to a new branch '2.0' Branch 2.0 set up to track remote branch development/2.0 from origin. Switched to a new branch '2.0' Looks like it once again set up a 2.0 branch as we discussed yesterday in private mails... Michael _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: kde:digikam-software-compilati
|
|
> When I just copy the git URL from projects.kde.org and clone from that, > download-repos fails: Should be fixed > I suggest to check for error conditions after calling gits populate, to > avoid further cd errors. Any bash scripting help is welcome ;-) > download-repos works fine, but ends with this: > > Branch 2.0 set up to track remote branch development/2.0 from origin. > Switched to a new branch '2.0' > Branch 2.0 set up to track remote branch development/2.0 from origin. > Switched to a new branch '2.0' > Branch 2.0 set up to track remote branch development/2.0 from origin. > Switched to a new branch '2.0' > Branch 2.0 set up to track remote branch development/2.0 from origin. > Switched to a new branch '2.0' > > Looks like it once again set up a 2.0 branch as we discussed yesterday > in private mails... The branch is named 2.0 locally: git checkout -b 2.0 -t origin/development/2.0 but it can have any name. The "-t" shouldnt be needed with newer git. The important part is that the local branch 2.0 tracks origin/development/2.0 (see git remote show origin) so that a git push (equivalent: git push origin) pushes to the tracking branch. Note: git push origin 2.0 (equivalent: git push origin 2.0:2.0) will create, as I assume, a new remote branch 2.0. _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: kde:digikam-software-compilati
|
|
In reply to this post by Marcel Wiesweg
Hi Marcel,
Could you please, when posting such announcements, include the full URLs? This would be really helpful especially for non-insiders. I had no clue where to find kde:digikam-software-compilation until Michaels mail. thanks! Simon On 22 February 2011 20:53, Marcel Wiesweg <[hidden email]> wrote: > Hi, > > the repository kde:digikam-software-compilation repository should now be > working as we want it. The shipped .gits script has received to small but > important fixes. > No more kde:// hack, all repositories will inherit the prefix from the super- > repo (non-developers will clone from anongit, developers clone from kde: ) > > It has downloaded and switched branches for me just fine from a clean > checkout, any testing is welcome. > > Marcel > _______________________________________________ > Digikam-devel mailing list > [hidden email] > https://mail.kde.org/mailman/listinfo/digikam-devel > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: kde:digikam-software-compilati
|
|
Marcel,
it doesn't work here : [gilles@localhost GIT]$ git clone [hidden email]:digikam-software-compilation ./2.x Initialized empty Git repository in /mnt/data/Devel/GIT/2.x/.git/ remote: Counting objects: 75, done. remote: Compressing objects: 100% (68/68), done. remote: Total 75 (delta 35), reused 0 (delta 0) Receiving objects: 100% (75/75), 26.61 KiB, done. Resolving deltas: 100% (35/35), done. [gilles@localhost 2.x]$ cd 2.x [gilles@localhost 2.x]$ ./download-repos Initialized empty Git repository in /mnt/data/Devel/GIT/2.x/core/.git/ fatal: '/digikam' does not appear to be a git repository fatal: The remote end hung up unexpectedly Could not clone /digikam onto core ./download-repos: line 5: cd: core: No such file or directory ./download-repos: line 6: cd: extra/kipi-plugins: No such file or directory ./download-repos: line 7: cd: extra/libkexiv2: No such file or directory ./download-repos: line 8: cd: extra/libkdcraw: No such file or directory [gilles@localhost 2.x]$ My git config : [gilles@localhost GIT]$ cat ~/.gitconfig [url "git://anongit.kde.org/"] insteadof = kde:// [url "[hidden email]:"] pushinsteadof = kde:// [url "ssh://[hidden email]/"] pushinsteadof = kde:// [alias] up = pull --rebase -v --stat ci = commit -a -v [core] editor = mcedit [user] name = Gilles Caulier email = [hidden email] [push] default = tracking Gilles _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: kde:digikam-software-compilati
|
|
> > [gilles@localhost 2.x]$ cd 2.x > [gilles@localhost 2.x]$ ./download-repos > Initialized empty Git repository in /mnt/data/Devel/GIT/2.x/core/.git/ > fatal: '/digikam' does not appear to be a git repository > fatal: The remote end hung up unexpectedly > Could not clone /digikam onto core > ./download-repos: line 5: cd: core: No such file or directory > ./download-repos: line 6: cd: extra/kipi-plugins: No such file or directory > ./download-repos: line 7: cd: extra/libkexiv2: No such file or directory > ./download-repos: line 8: cd: extra/libkdcraw: No such file or directory Fixed for git://anongit.kde.org/ urls (not recommended to use for cloning btw to reduce load on the push servers - the kde: or kde:// prefix is recommended) _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: kde:digikam-software-compilati
|
|
> Fixed for git://anongit.kde.org/ urls > (not recommended to use for cloning btw to reduce load on the push servers > - the kde: or kde:// prefix is recommended) What I meant to say: Fixed for [hidden email]: urls (not recommended to use for cloning btw to reduce load on the push servers - the kde: or kde:// prefix is recommended for developers) _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: kde:digikam-software-compilati
|
|
In reply to this post by Marcel Wiesweg
On 02/22/2011 11:10 PM, Marcel Wiesweg wrote:
>> When I just copy the git URL from projects.kde.org and clone from that, >> download-repos fails: > > Should be fixed Yes, it works fine now. >> I suggest to check for error conditions after calling gits populate, to >> avoid further cd errors. > > Any bash scripting help is welcome ;-) Done! The only strange thing is that commits are still reported under the old repository location on commits.kde.org. But when I click on the link, I am forwarded to the new commit location. mike@operator:/c/temp/kde/trunk-src/digikam-sc$ git push Counting objects: 9, done. Delta compression using up to 4 threads. Compressing objects: 100% (6/6), done. Writing objects: 100% (6/6), 797 bytes, done. Total 6 (delta 4), reused 0 (delta 0) remote: The last commit in this series is available for viewing at: remote: http://commits.kde.org/scratch/mwiesweg/digikam-sc/12d0b9119c5c04ef440a3747ccd9539f995e7609 To [hidden email]:digikam-software-compilation 46d11a8..12d0b91 master -> master Michael _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: kde:digikam-software-compilati
|
|
Michael,
I remember some words from you about to include Exiv2 and this digiKam SC. What do you think about to add Exiv2 library subversion repository extraction in this bash script. Of course, some tune must be done in Cmake to take a care about a local Exiv2 version... Gilles 2011/2/24 Michael G. Hansen <[hidden email]>: > On 02/22/2011 11:10 PM, Marcel Wiesweg wrote: >>> When I just copy the git URL from projects.kde.org and clone from that, >>> download-repos fails: >> >> Should be fixed > > Yes, it works fine now. > >>> I suggest to check for error conditions after calling gits populate, to >>> avoid further cd errors. >> >> Any bash scripting help is welcome ;-) > > Done! > > The only strange thing is that commits are still reported under the old > repository location on commits.kde.org. But when I click on the link, I > am forwarded to the new commit location. > > mike@operator:/c/temp/kde/trunk-src/digikam-sc$ git push > Counting objects: 9, done. > Delta compression using up to 4 threads. > Compressing objects: 100% (6/6), done. > Writing objects: 100% (6/6), 797 bytes, done. > Total 6 (delta 4), reused 0 (delta 0) > remote: The last commit in this series is available for viewing at: > remote: > http://commits.kde.org/scratch/mwiesweg/digikam-sc/12d0b9119c5c04ef440a3747ccd9539f995e7609 > To [hidden email]:digikam-software-compilation > 46d11a8..12d0b91 master -> master > > Michael > > _______________________________________________ > Digikam-devel mailing list > [hidden email] > https://mail.kde.org/mailman/listinfo/digikam-devel > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: kde:digikam-software-compilati
|
|
On 02/24/2011 10:13 PM, Gilles Caulier wrote:
> Michael, > > I remember some words from you about to include Exiv2 and this digiKam SC. > > What do you think about to add Exiv2 library subversion repository > extraction in this bash script. > > Of course, some tune must be done in Cmake to take a care about a > local Exiv2 version... Yes, I still think this would be a useful option. Maybe not by default, but to be enabled with one command. I will take a look later, right now I'm still working on the version detection stuff in the FindXXX.cmake files. Michael _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: kde:digikam-software-compilati
|
|
In reply to this post by Simon A. Eugster
Simon,
you should set your environment like this: http://community.kde.org/Sysadmin/GitKdeOrgManual#Let_Git_rewrite_URL_prefixes
Then you can use the "url" Marcel posted in the first post, the kde:digikam-software-compilation. It's actually very handy and making life a lot easier ;) You'll see this with other KDE projects as well, so I strongly suggest you read the manual up there and set yourself accordingly ;)
Marty
On Wed, Feb 23, 2011 at 08:00, Simon A. Eugster <[hidden email]> wrote: Hi Marcel, _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: kde:digikam-software-compilati
|
|
In reply to this post by Michael G. Hansen
Michael,
Also, why not to checkout marble widget too ? Gilles 2011/2/24 Michael G. Hansen <[hidden email]>: > On 02/24/2011 10:13 PM, Gilles Caulier wrote: >> Michael, >> >> I remember some words from you about to include Exiv2 and this digiKam SC. >> >> What do you think about to add Exiv2 library subversion repository >> extraction in this bash script. >> >> Of course, some tune must be done in Cmake to take a care about a >> local Exiv2 version... > > Yes, I still think this would be a useful option. Maybe not by default, > but to be enabled with one command. I will take a look later, right now > I'm still working on the version detection stuff in the FindXXX.cmake files. > > Michael > _______________________________________________ > Digikam-devel mailing list > [hidden email] > https://mail.kde.org/mailman/listinfo/digikam-devel > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
«
Return to digikam-devel
|
1 view|%1 views
| Free forum by Nabble | Edit this page |