[Psi-Devel] Code moving to github

8 views
Skip to first unread message

Justin Karneges

unread,
Nov 21, 2011, 3:05:35 PM11/21/11
to Psi Development
Hi folks,

I've taken the initial steps to make github the official home for our code.

https://github.com/psi-im

The psi, iris, and libpsi modules were already in there, being synced from our
origin repos (iris was even being specially synced from svn). I have disabled
the syncing mechanisms for these repos now, so new commits should be targetted
against github. I did not perform any kind of clean reimport into github. I
believe there wouldn't be a difference in the final result, unless someone can
correct me.

This means iris now uses git instead of svn. Additionally I've moved psimedia
into github, so it no longer uses svn either. Also, the placement of these
projects into an organization dubbed "psi-im" is significant. It marks the
start of their transition away from being under the Delta umbrella to the Psi
umbrella. I'll write more about this in a future email.

There are still plenty of URLs and references all over the place that point to
the old repo locations. I'll work to fix these soon.

Justin

P.S.: I know I'm behind on email. I'll get to it all eventually.
_______________________________________________
Psi-Devel mailing list
Psi-...@lists.affinix.com
http://lists.affinix.com/listinfo.cgi/psi-devel-affinix.com

Justin Karneges

unread,
Nov 21, 2011, 9:05:38 PM11/21/11
to psi-...@lists.affinix.com
On Monday, November 21, 2011 12:05:35 PM Justin Karneges wrote:
> I've taken the initial steps to make github the official home for our code.

In addition to the familiar modules, Psi has a bunch of old modules that in
the last few years managed to fall off the face of the earth. Probably it was
for good reason since these modules are no longer in use, but I'm bothered
that their removal was not a conscious decision. I speak of course of the Psi
CVS! Formerly a private repo that was graciously mirrored to the public by
Anywise in Psi's early days, both the private repo and the mirror have been
gone now for some time. I recovered the old CVS modules and put them in
github.

So you'll now find cutestuff, neatstuff, media, and ambrosia within the psi-im
organization on github. They are likely only of historic interest, but there
they are. If we choose to get rid of them someday it will be a conscious
decision instead of accidental abandonment.

Psi/Delta has now been reduced from four repos to three:

Delta SVN - contains qconf
KDE SVN - contains qca
Psi Git - contains everything else

I've corrected all the bad Psi CVS and Psi Darcs (!) links on the Psi and
Delta websites to point to github where applicable.

Justin

Dmitry Nezhevenko

unread,
Nov 22, 2011, 1:50:22 PM11/22/11
to psi-...@lists.affinix.com
On Mon, Nov 21, 2011 at 12:05:35PM -0800, Justin Karneges wrote:
> Hi folks,
>
> I've taken the initial steps to make github the official home for our code.
>
> https://github.com/psi-im
>
> The psi, iris, and libpsi modules were already in there, being synced from our
> origin repos (iris was even being specially synced from svn). I have disabled
> the syncing mechanisms for these repos now, so new commits should be targetted
> against github. I did not perform any kind of clean reimport into github. I
> believe there wouldn't be a difference in the final result, unless someone can
> correct me.

How it's supposed to be cloned to build current psi? I've tried to clone
psi repo and usual git submodule init/update and got followed:

% git submodule update
fatal: destination path 'iris' already exists and is not an empty
directory.
Clone of 'g...@github.com:psi-im/iris.git' into submodule path 'iris'
failed

Probably you need to drop everything from from psi's iris directory
--
WBR, Dmitry

signature.asc

Rion

unread,
Nov 22, 2011, 2:10:05 PM11/22/11
to psi-...@googlegroups.com
2011/11/23 Dmitry Nezhevenko <di...@inhex.net>:

rion@dizzynb ~/projects/psi $ git clone g...@github.com:psi-im/psi.git git2
Cloning into 'git2'...
remote: Counting objects: 14948, done.
remote: Compressing objects: 100% (4351/4351), done.
remote: Total 14948 (delta 10551), reused 14833 (delta 10452)
Receiving objects: 100% (14948/14948), 10.79 MiB | 1.07 MiB/s, done.
Resolving deltas: 100% (10551/10551), done.
rion@dizzynb ~/projects/psi $ cd git2/
rion@dizzynb ~/projects/psi/git2 $ git submodule update --init
Submodule 'iris' (g...@github.com:psi-im/iris.git) registered for path 'iris'
Submodule 'src/libpsi' (g...@github.com:psi-im/libpsi.git) registered
for path 'src/libpsi'
Cloning into 'iris'...
remote: Counting objects: 3065, done.
remote: Compressing objects: 100% (1104/1104), done.
remote: Total 3065 (delta 1943), reused 2983 (delta 1885)
Receiving objects: 100% (3065/3065), 948.76 KiB | 412 KiB/s, done.
Resolving deltas: 100% (1943/1943), done.
Submodule path 'iris': checked out 'c25194ae967fc5d1cfd9b795fa5cb65463df83ad'
Cloning into 'src/libpsi'...
remote: Counting objects: 275, done.
remote: Compressing objects: 100% (207/207), done.
remote: Total 275 (delta 121), reused 189 (delta 62)
Receiving objects: 100% (275/275), 154.18 KiB | 127 KiB/s, done.
Resolving deltas: 100% (121/121), done.
Submodule path 'src/libpsi': checked out
'649e617d0d37a7031f310fca52f175eb5acd07d0'
rion@dizzynb ~/projects/psi/git2 $

Justin Karneges

unread,
Nov 22, 2011, 7:18:55 PM11/22/11
to Psi Development
On Tuesday, November 22, 2011 10:50:22 AM Dmitry Nezhevenko wrote:
> How it's supposed to be cloned to build current psi? I've tried to clone
> psi repo and usual git submodule init/update and got followed:
>
> % git submodule update
> fatal: destination path 'iris' already exists and is not an empty
> directory.
> Clone of 'g...@github.com:psi-im/iris.git' into submodule path 'iris'
> failed
>
> Probably you need to drop everything from from psi's iris directory

Here are the instructions that are on the website:

git clone git://github.com/psi-im/psi.git
cd psi
git submodule init
git submodule update

I tried again just now with a fresh checkout to be sure, and it worked fine.

Justin

Sven Lankes

unread,
Nov 27, 2011, 9:16:50 AM11/27/11
to psi-...@lists.affinix.com
On Mon, Nov 21, 2011 at 12:05:35PM -0800, Justin Karneges wrote:

Hi,

> There are still plenty of URLs and references all over the place that point to
> the old repo locations. I'll work to fix these soon.

I do remember that there was/is a xmpp groupchat-root for psi. There
used to be a reference to it somewhere on one of the webpages but I
cannot find it anymore.

Could anyone please refresh my memory?

--
sven === jabber/xmpp: sv...@lankes.net

Kevin Smith

unread,
Nov 27, 2011, 9:17:26 AM11/27/11
to Psi Development
On Sun, Nov 27, 2011 at 2:16 PM, Sven Lankes <sv...@lank.es> wrote:
> On Mon, Nov 21, 2011 at 12:05:35PM -0800, Justin Karneges wrote:
>
> Hi,
>
>> There are still plenty of URLs and references all over the place that point to
>> the old repo locations.  I'll work to fix these soon.
>
> I do remember that there was/is a xmpp groupchat-root for psi. There
> used to be a reference to it somewhere on one of the webpages but I
> cannot find it anymore.
>
> Could anyone please refresh my memory?

p...@conference.psi-im.org

/K

Reply all
Reply to author
Forward
0 new messages