[ATTENTION] Gerrit is now the primary git repo. Freedesktop is now read-only

Dear committers,

We have now completer the switch from fdo to gerrit as the primary
site for our git repos

core, binfitler, dictionaries, help and translations are now hosted
primarely on gerrit.libreoffice.org

please update your .git/config to reflect that.
the easiest way is to edit the [remote "origin"] entry

something like

[remote "origin"]
        fetch = +refs/heads/*:refs/remotes/origin/*
        url = ssh://logerrit/core.git


provided that you have in your ~/.ssh/config
something like

Host logerrit
User <the username you defined in gerrit>
Port 29418
Hostname gerrit.libreoffice.org
IdentityFile ~/.ssh/<the private key associated with the public key
you uploaded to gerrit>


modulo the changes above
the usual workflow is unchanged.

Now for people using gerrit's feature. the good news is that once a
patched is review+verified, one can now use the 'Publish and Submit'
button to push a patch on the appropriate branch... no need to push it
separately(*) to fdo


Norbert


(*)
Pushing to fdo has been disabled... if you try you should receive a message like

 $git push
Counting objects: 5, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 378 bytes, done.
Total 3 (delta 2), reused 0 (delta 0)
*** The reference for this repo is gerrit. do not push directly to fdo
error: hooks/update exited with error code 1
error: hook declined to update refs/heads/master
To ssh://git.freedesktop.org/git/libreoffice/core
 ! [remote rejected] master -> master (hook declined)
error: failed to push some refs to
'ssh://git.freedesktop.org/git/libreoffice/core'
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Hi,

On Fri, Aug 17, 2012 at 01:53:28PM -0500, Norbert Thiebaud wrote:
> Dear committers,
>
> We have now completer the switch from fdo to gerrit as the primary
> site for our git repos
>
> core, binfitler, dictionaries, help and translations are now hosted
> primarely on gerrit.libreoffice.org

It seems that some branches that had been deleted on fd.o have crept
back. And they cannot be deleted again:

$ git push origin :feature/gbuild_sdext
remote: Processing changes: refs: 1, done    
To ssh://dtardon@logerrit/core
 ! [remote rejected] feature/gbuild_sdext (can not delete references)
 error: failed to push some refs to 'ssh://dtardon@logerrit/core'

What is more important is that branches libreoffice-3-5-6 and
libreoffice-3-6-1 are missing.

D.
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

On Sat, Aug 18, 2012 at 12:15 PM, David Tardon <[hidden email]> wrote:
This seems to be an ACL issue as I was able to execute successfully
that very command.

Note: to be conservative, the replication from gerrit to fdo does
_not_ delete branches. so branches deletion on logerrit are not
propagated to fdo.
Once we are confident that nothing is missing on logerrit (like the 2
branches below) then we will make the replication propagate delete...

>
> What is more important is that branches libreoffice-3-5-6 and
> libreoffice-3-6-1 are missing.

fixed: they are there now...

Thanks,

Norbert
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

On Fri, Aug 17, 2012 at 01:53:28PM -0500, Norbert Thiebaud wrote:

> [remote "origin"]
> fetch = +refs/heads/*:refs/remotes/origin/*
> url = ssh://logerrit/core.git

I had:

[remote "origin"]
        url = git://anongit.freedesktop.org/libreoffice/core
        pushurl = ssh://[hidden email]/git/libreoffice/core

So that I have to authenticate only when I push, not when I fetch/pull.

Is there a no-authentication access to gerrit repo, or should I use
fdo for that (assuming the mirroring is "immediate").

--
Lionel
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Norbert Thiebaud píše v Pá 17. 08. 2012 v 13:53 -0500: I have many clones, so I created the attached script to do the job:

Usage:  sh -x lo-git-to-gerrit path-to-core-dir

Warranty: I did my best. It worked here. You might want to use --dry-run
option before you run it for real :-)


Best Regards,
Petr

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Hi Petr, all,

On 2012-08-20 at 12:56 +0200, Petr Mladek wrote:

> I have many clones, so I created the attached script to do the job:

I've just pushed:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=aa6808ba1163b22ce31d205eedb8f8718eeb7263

With this, it is enough to do:

./g --set-push-user <your_gerrit_username>

and you are done :-)

[no need to add anything to the .ssh/config either]

Apologies for accidentally pushing that to libreoffice-3-6-1 branch, I
forgot to check the branch I was on before pushing.

All the best,
Kendy

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

On 08/18/2012 01:59 PM, Norbert Thiebaud wrote:
I also had feature/calc-multiline-input re-appeared on gerrit (it had
been deleted on fdo), and unable to remove it on gerrit for the exact
same error message.

Could you delete that branch too?

Thanks,

Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

On 20 August 2012 16:07, Kohei Yoshida <[hidden email]> wrote:
> I also had feature/calc-multiline-input re-appeared on gerrit (it had been
> deleted on fdo), and unable to remove it on gerrit for the exact same error
> message.
>
> Could you delete that branch too?

Done by me, so it should now work for all.
I couldn't do it either but Norbert fixed that somehow.

Best,
Matus
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Norbert Thiebaud píše v So 18. 08. 2012 v 12:59 -0500:
Maybe we should give rights to create/delete branches and tags to more
developers. Feature branches will be quite common task. Also I would
imagine that distro maintainers might want to create some
distro-specific tags for their releases.

Best Regards,
Petr

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

On Tue, Aug 21, 2012 at 3:53 AM, Petr Mladek <[hidden email]> wrote:
I already fixed that issue:
Committers are allowed to create feature/* branches

as for tag and other branches that is reserved to 'Steward' (you are
in that group).
We can certainly create a group for distro-maintainer to allow them to
tag... but I don't think it is necessary to make that a generic
ability.

Norbert
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice