IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Bastien]

Dear all,

Jason will migrate org-mode.git to the new server next sunday, 5pm-7pm
CET (UTC+1).  Pulling will not be possible during that time.

I will send instructions on how to clone the new repo when the migration
is done.

It will be important to clone again after the migration as this repo
comes with a major change: there is no ORGWEBPAGES/ directory anymore.
We have moved ORGWEBPAGES/ in a separate repo, which might get public
later.

http://repo.or.cz/w/org-mode.git will still exist as a mirror, we will
install this next week.

Thanks!

-- 
 Bastien

Re: IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Bernt Hansen]

Bastien <bastien.guerry@wikimedia.fr> writes:

> Dear all,
>
> Jason will migrate org-mode.git to the new server next sunday, 5pm-7pm
> CET (UTC+1).  Pulling will not be possible during that time.
>
> I will send instructions on how to clone the new repo when the migration
> is done.
>
> It will be important to clone again after the migration as this repo
> comes with a major change: there is no ORGWEBPAGES/ directory anymore.
> We have moved ORGWEBPAGES/ in a separate repo, which might get public
> later.
>
> http://repo.or.cz/w/org-mode.git will still exist as a mirror, we will
> install this next week.
>
> Thanks!

Hi Bastien,

Is it really necessary to rebuild the org-mode git repository (with
filter-branch) to remove the ORGWEBPAGES/ content.  Anyone with a clone
and local branches of the existing repository will need to move all of
these to the new repository.

Would creating a commit to remove the ORGWEBPAGES directory in the
existing repository not work just as well?  This will keep all of the
existing SHA1s for historical commits intact.

If you remove the ORGWEBPAGES directory with just a commit in the
org-mode repository then the SHA1's of previous commits will not change
and we can just change the URL to point at the new server and we're
done.

Regards,
Bernt

Re: IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Bastien]

Hi Bernt,

Bernt Hansen <bernt@norang.ca> writes:

> Is it really necessary to rebuild the org-mode git repository (with
> filter-branch) to remove the ORGWEBPAGES/ content.  Anyone with a clone
> and local branches of the existing repository will need to move all of
> these to the new repository.
>
> Would creating a commit to remove the ORGWEBPAGES directory in the
> existing repository not work just as well?  This will keep all of the
> existing SHA1s for historical commits intact.

I think you're right.  Our goal was to remove ORGWEBPAGES/ into a new
repo with a proper history of its own.  As Jason did that with success,
I asked him to do the filtering for org-mode.git too -- which might be
too much (my bad).

Jason, Carsten, what is your take on this?

> If you remove the ORGWEBPAGES directory with just a commit in the
> org-mode repository then the SHA1's of previous commits will not change

Which is more in the spirit of what git allows: keep the revision
history as *truthful* as possible.

> and we can just change the URL to point at the new server and we're
> done.

I'm for the direction you suggest -- I let Jason and Carsten tell me
what they think before deciding.

Thanks for voicing this in time!

-- 
 Bastien

Re: Re: IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Carsten Dominik]

On Jan 8, 2011, at 10:02 AM, Bastien wrote:

> Hi Bernt,
>
> Bernt Hansen <bernt@norang.ca> writes:
>
>> Is it really necessary to rebuild the org-mode git repository (with
>> filter-branch) to remove the ORGWEBPAGES/ content.  Anyone with a  
>> clone
>> and local branches of the existing repository will need to move all  
>> of
>> these to the new repository.
>>
>> Would creating a commit to remove the ORGWEBPAGES directory in the
>> existing repository not work just as well?  This will keep all of the
>> existing SHA1s for historical commits intact.
>
> I think you're right.  Our goal was to remove ORGWEBPAGES/ into a new
> repo with a proper history of its own.  As Jason did that with  
> success,
> I asked him to do the filtering for org-mode.git too -- which might be
> too much (my bad).
>
> Jason, Carsten, what is your take on this?

I agree with Bernt.

Cheers

- Carsten

>
>> If you remove the ORGWEBPAGES directory with just a commit in the
>> org-mode repository then the SHA1's of previous commits will not  
>> change
>
> Which is more in the spirit of what git allows: keep the revision
> history as *truthful* as possible.
>
>> and we can just change the URL to point at the new server and we're
>> done.
>
> I'm for the direction you suggest -- I let Jason and Carsten tell me
> what they think before deciding.
>
> Thanks for voicing this in time!
>
> -- 
> Bastien
>
> _______________________________________________
> Emacs-orgmode mailing list
> Please use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode

Re: Re: IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Carsten Dominik]

On Jan 8, 2011, at 10:56 AM, Carsten Dominik wrote:

>
> On Jan 8, 2011, at 10:02 AM, Bastien wrote:
>
>> Hi Bernt,
>>
>> Bernt Hansen <bernt@norang.ca> writes:
>>
>>> Is it really necessary to rebuild the org-mode git repository (with
>>> filter-branch) to remove the ORGWEBPAGES/ content.  Anyone with a  
>>> clone
>>> and local branches of the existing repository will need to move  
>>> all of
>>> these to the new repository.
>>>
>>> Would creating a commit to remove the ORGWEBPAGES directory in the
>>> existing repository not work just as well?  This will keep all of  
>>> the
>>> existing SHA1s for historical commits intact.
>>
>> I think you're right.  Our goal was to remove ORGWEBPAGES/ into a new
>> repo with a proper history of its own.  As Jason did that with  
>> success,
>> I asked him to do the filtering for org-mode.git too -- which might  
>> be
>> too much (my bad).
>>
>> Jason, Carsten, what is your take on this?
>
> I agree with Bernt.

Sorry, let me be more specific.

I am for moving the website to a separate repository.  THis makes a  
lot of sense.  It does require to the release process though, because  
my setup also used to update the webpage automatically.

But I think that Bernt is right that it would be much better for users  
if the git repo remains in tact, so that moving simple means changing  
the pointer to the repo, and that local branches will survive.  So  
simple removing the webpage from the repo with a commit sounds like a  
good idea to me.

I don't think moving the webpage into a special branch is the right  
solution.

- Carsten

>
> Cheers
>
> - Carsten
>
>>
>>> If you remove the ORGWEBPAGES directory with just a commit in the
>>> org-mode repository then the SHA1's of previous commits will not  
>>> change
>>
>> Which is more in the spirit of what git allows: keep the revision
>> history as *truthful* as possible.
>>
>>> and we can just change the URL to point at the new server and we're
>>> done.
>>
>> I'm for the direction you suggest -- I let Jason and Carsten tell me
>> what they think before deciding.
>>
>> Thanks for voicing this in time!
>>
>> -- 
>> Bastien
>>
>> _______________________________________________
>> Emacs-orgmode mailing list
>> Please use `Reply All' to send replies to the list.
>> Emacs-orgmode@gnu.org
>> http://lists.gnu.org/mailman/listinfo/emacs-orgmode
>

Re: IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Jason Dunsmore]

Carsten Dominik <carsten.dominik@gmail.com> writes:

> On Jan 8, 2011, at 10:56 AM, Carsten Dominik wrote:
>
>>
>> On Jan 8, 2011, at 10:02 AM, Bastien wrote:
>>
>>> Hi Bernt,
>>>
>>> Bernt Hansen <bernt@norang.ca> writes:
>>>
>>>> Is it really necessary to rebuild the org-mode git repository (with
>>>> filter-branch) to remove the ORGWEBPAGES/ content.  Anyone with a
>>>> clone
>>>> and local branches of the existing repository will need to move
>>>> all of
>>>> these to the new repository.
>>>>
>>>> Would creating a commit to remove the ORGWEBPAGES directory in the
>>>> existing repository not work just as well?  This will keep all of
>>>> the
>>>> existing SHA1s for historical commits intact.
>>>
>>> I think you're right.  Our goal was to remove ORGWEBPAGES/ into a new
>>> repo with a proper history of its own.  As Jason did that with
>>> success,
>>> I asked him to do the filtering for org-mode.git too -- which might
>>> be
>>> too much (my bad).
>>>
>>> Jason, Carsten, what is your take on this?
>>
>> I agree with Bernt.
>
> Sorry, let me be more specific.
>
> I am for moving the website to a separate repository.  THis makes a
> lot of sense.  It does require to the release process though, because
> my setup also used to update the webpage automatically.
>
> But I think that Bernt is right that it would be much better for users
> if the git repo remains in tact, so that moving simple means changing
> the pointer to the repo, and that local branches will survive.  So
> simple removing the webpage from the repo with a commit sounds like a
> good idea to me.
>
> I don't think moving the webpage into a special branch is the right
> solution.

I agree with Carsten and Bernt - keep the org-mode repo's history
intact, remove ORGWEBPAGE in a commit, and split off ORGWEBPAGE into its
own repo.

Re: IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Bastien]

Jason Dunsmore <emacs-orgmode@dunsmor.com> writes:

> I agree with Carsten and Bernt - keep the org-mode repo's history
> intact, remove ORGWEBPAGE in a commit, and split off ORGWEBPAGE into its
> own repo.

I agree with this plan as well.  

Thanks Bernt for pointing at the right direction!

FYI: the migration is supposed to happen in the next few hours.  Also,
repo.or.cz seems down right now.

-- 
 Bastien

Re: IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Achim Gratz]

Hi Bastien,

Bastien <bastien.guerry@wikimedia.fr> writes:
> It will be important to clone again after the migration as this repo
> comes with a major change: there is no ORGWEBPAGES/ directory anymore.
> We have moved ORGWEBPAGES/ in a separate repo, which might get public
> later.

As Bernt Hansen has already remarked, this is somewhat against the
spirit of Git...  There may be reasons to do what you seem to want to
do, but I don't get what they might be at the moment - could you
perhaps elaborate?

May I ask you to consider to just put ORGWEBPAGES into a separate
branch?  More specifically, create a new branch for ORGWEBPAGES and rm
all other stuff, then rm ORGWEBPAGES from the master / maint branches.
This way it's easy enough to build clones that track all or just
selected branches from a single repository which preserves commit
history.


Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

Wavetables for the Terratec KOMPLEXER:
http://Synth.Stromeko.net/Downloads.html#KomplexerWaves

Re: IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Bernt Hansen]

Achim Gratz <Stromeko@nexgo.de> writes:

> Hi Bastien,
>
> Bastien <bastien.guerry@wikimedia.fr> writes:
>> It will be important to clone again after the migration as this repo
>> comes with a major change: there is no ORGWEBPAGES/ directory anymore.
>> We have moved ORGWEBPAGES/ in a separate repo, which might get public
>> later.
>
> As Bernt Hansen has already remarked, this is somewhat against the
> spirit of Git...  There may be reasons to do what you seem to want to
> do, but I don't get what they might be at the moment - could you
> perhaps elaborate?
>
> May I ask you to consider to just put ORGWEBPAGES into a separate
> branch?  More specifically, create a new branch for ORGWEBPAGES and rm
> all other stuff, then rm ORGWEBPAGES from the master / maint branches.
> This way it's easy enough to build clones that track all or just
> selected branches from a single repository which preserves commit
> history.

It's perfectly okay to extract the ORGWEBPAGE content and history into
a new repository for future work on the website.  We can then remove the
ORGWEBPAGES directory with a single commit in the org-mode.git
repository since that is no longer being used and move forward from
there.

There's no reason to keep the ORGWEBPAGE directory around in a branch in
org-mode.git repository if it isn't ever going to be used again.  I
think deleting the content with a commit is the correct way to deal with
this in org-mode.git.

The only reason to use filter-branch to remove the ORGWEBPAGE history
and content (and create a totally new repository with new SHA1 for every
historical commit) is if it contained some proprietary stuff that really
should not be shared with the public.  You would do this before making
the repository public and for org-mode.git it is already way to late for
that.

Using filter-branch on an existing git repository is highly intrusive
since it breaks everyone's clone of the repository and any work in
process needs to be extracted and applied to the new repository.  It's
doable but painful and something that we should strive to avoid unless
it is absolutely necessary.

HTH,
Bernt

Re: IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Achim Gratz]

Bernt Hansen <bernt@norang.ca> writes:
> There's no reason to keep the ORGWEBPAGE directory around in a branch in
> org-mode.git repository if it isn't ever going to be used again.

I agree, but I also see that Bastien hinted at it possibly being made
public again at a later stage.

Just to clarify my position: for me it boils down to the question: is
the orgmode.org web page part of the org-mode project or not?  If
removed from the repository this sends a strong message (intentionally?)
that it is not.  Even then, from a Git point of view filtering makes no
sense unless you deliberately need to remove history: just do a fork
(split into two repositories that will diverge from then on) -- or, as I
had suggested earlier, branch (fork in the same repository).  If the
size of the repository was the driving force behind that idea, do a
shallow rather than a full clone (I just did a fresh full clone that
comes out at 60M, I really don't know how much smaller the filtered
repository would be).


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

SD adaptation for Waldorf microQ V2.22R2:
http://Synth.Stromeko.net/Downloads.html#WaldorfSDada

Re: Re: IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Bastien]

Hi Achim,

Achim Gratz <Stromeko@nexgo.de> writes:

> Just to clarify my position: for me it boils down to the question: is
> the orgmode.org web page part of the org-mode project or not?  

It was, but I think it should not be anymore.

One advantage of having a separate org-web.git repo is to let people
contribute to the website without having to grant them push access to
the repository.

> If removed from the repository this sends a strong message
> (intentionally?)  that it is not.

Yes, this is intentional - and we discussed this with Carsten before 
I suggested this move.

> Even then, from a Git point of view filtering makes no
> sense unless you deliberately need to remove history: just do a fork
> (split into two repositories that will diverge from then on) -- or, as I
> had suggested earlier, branch (fork in the same repository).  

Simply removing ORGWEBPAGE/ is simpler.

Thanks for insisting on Bernt's point about git history -- this is
something I overlooked while planning this change.

Best,

-- 
 Bastien

Re: Re: IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Bastien]

Bastien <bastien.guerry@wikimedia.fr> writes:

> One advantage of having a separate org-web.git repo is to let people
> contribute to the website without having to grant them push access to
> the repository.

Sorry I mean: "to the org-mode.git repository".

-- 
 Bastien

Re: IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Bastien]

Hi all,

so we migrated org-mode.git repository to the new server.

If you already have a clone, please update your refs like this:

  ~$ cd your-existing-org-mode-repo/
  ~$ git config remote.origin.url git://orgmode.org/org-mode.git

You can make a fresh clone like this:

  ~$ git clone git://orgmode.org/org-mode.git
  
To browse the repo on the web, just go here:

  http://orgmode.org/w/org-mode.git

http://repo.or.cz/w/org-mode.git won't disappear.  We will convert it
into a mirror of the orgmode.org repo.  Mirrors on repo.or.cz lag one
hour behind the origin, so it's better to pull from the orgmode.org
repository.

I have updated references to repo.or.cz on Worg, but if you find some 
that are not fixed, please let us know (and/or provide a patch).

Please report any problem while pulling or cloning!

And thanks to Jason for the switch,

-- 
 Bastien

Re: IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Achim Gratz]

Bastien <bastien.guerry@wikimedia.fr> writes:
> Please report any problem while pulling or cloning!

All branches except master have disappeared.  Most notably, the maint
branch is missing (I've only had master and maint cloned locally).


Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

Factory and User Sound Singles for Waldorf Q+, Q and microQ:
http://Synth.Stromeko.net/Downloads.html#WaldorfSounds

Re: Re: IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Bastien]

Achim Gratz <Stromeko@nexgo.de> writes:

> Bastien <bastien.guerry@wikimedia.fr> writes:
>> Please report any problem while pulling or cloning!
>
> All branches except master have disappeared.  Most notably, the maint
> branch is missing (I've only had master and maint cloned locally).

Thanks for reporting - we're now looking into this.

-- 
 Bastien

Re: IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Jason Dunsmore]

Achim Gratz <Stromeko@nexgo.de> writes:

> Bastien <bastien.guerry@wikimedia.fr> writes:
>> Please report any problem while pulling or cloning!
>
> All branches except master have disappeared.  Most notably, the maint
> branch is missing (I've only had master and maint cloned locally).

My bad.  I used git-clone with the --bare option instead of --mirror
when cloning from repo.or.cz.  It's fixed now.  Thanks for catching
this!

Re: IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Achim Gratz]

Jason Dunsmore <emacs-orgmode@dunsmor.com> writes:
> My bad.  I used git-clone with the --bare option instead of --mirror
> when cloning from repo.or.cz.  It's fixed now.  Thanks for catching
> this!

I've just did a fetch on both the full clone (for testing) and my local
repo (just master and maint) and everything seems to be working now as
it should.  Thank you!


Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

SD adaptation for Waldorf Blofeld V1.15B11:
http://Synth.Stromeko.net/Downloads.html#WaldorfSDada

Re: IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Konrad Hinsen]

On 9 Jan 2011, at 17:05, Bastien wrote:

> If you already have a clone, please update your refs like this:
>
>  ~$ cd your-existing-org-mode-repo/
>  ~$ git config remote.origin.url git://orgmode.org/org-mode.git

Is there an http version as well, for those of us behind nasty  
firewalls? I tried replacing git: by http:, but that doesn't seem to  
yield a valid repo URL.

Konrad.

Re: IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Bastien]

Hi Konrad,

Konrad Hinsen <konrad.hinsen@fastmail.net> writes:

> On 9 Jan 2011, at 17:05, Bastien wrote:
>
>> If you already have a clone, please update your refs like this:
>>
>>  ~$ cd your-existing-org-mode-repo/
>>  ~$ git config remote.origin.url git://orgmode.org/org-mode.git
>
> Is there an http version as well, for those of us behind nasty firewalls? I
> tried replacing git: by http:, but that doesn't seem to  yield a valid repo
> URL.

Nope, there is no http access to the repo on orgmode.org for now.

We will use repo.or.cz as a mirror and you will be able to access
org-mode.git from this mirror using the http protocol (as usual).

I updated Worg to mention this:

  http://orgmode.org/worg/org-faq.html

See "Keeping current".

HTH,

-- 
 Bastien

Re: IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Jambunathan K]

Konrad Hinsen <konrad.hinsen@fastmail.net> writes:

> On 9 Jan 2011, at 17:05, Bastien wrote:
>
>> If you already have a clone, please update your refs like this:
>>
>>  ~$ cd your-existing-org-mode-repo/
>>  ~$ git config remote.origin.url git://orgmode.org/org-mode.git
>
> Is there an http version as well, for those of us behind nasty
> firewalls? I tried replacing git: by http:, but that doesn't seem to
> yield a valid repo URL.
>

Try this http://orgmode.org/w/org-mode.git. May not be the
'authoritative url', but shows a commit that is 10 mins old.

Browser displays loopback address as title of the above URL.

> Konrad.
>
> _______________________________________________
> Emacs-orgmode mailing list
> Please use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode

Re: IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Jason Dunsmore]

Jambunathan K <kjambunathan@gmail.com> writes:

> Browser displays loopback address as title of the above URL.

This is because Gitweb requests are being proxied through Nginx to a
CGI-capable web server listening on localhost.  Fixed the title:

--8<---------------cut here---------------start------------->8---
# diff gitweb.cgi{~,}
50,51c50
< our $site_name = ""
<                  || ($ENV{'SERVER_NAME'} || "Untitled") . " Git";
---
> our $site_name = "Git";
--8<---------------cut here---------------end--------------->8---

Re: IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Jason Dunsmore]

Konrad Hinsen <konrad.hinsen@fastmail.net> writes:

> On 9 Jan 2011, at 17:05, Bastien wrote:
>
>> If you already have a clone, please update your refs like this:
>>
>>  ~$ cd your-existing-org-mode-repo/
>>  ~$ git config remote.origin.url git://orgmode.org/org-mode.git
>
> Is there an http version as well, for those of us behind nasty
> firewalls? I tried replacing git: by http:, but that doesn't seem to
> yield a valid repo URL.

Hi Konrad,

I just made the org-mode repo available via HTTP.  Try running:

git clone http://orgmode.org/org-mode.git

Regards,
Jason

Re: Re: IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Bastien]

Jason Dunsmore <emacs-orgmode@dunsmor.com> writes:

> I just made the org-mode repo available via HTTP.  Try running:
>
> git clone http://orgmode.org/org-mode.git

Great - I just mentioned this in Worg's FAQ.

Best,

-- 
 Bastien

Re: Re: IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Konrad Hinsen]

On 9 Jan 2011, at 20:19, Jason Dunsmore wrote:

> I just made the org-mode repo available via HTTP.  Try running:
>
> git clone http://orgmode.org/org-mode.git

Works, thanks!

Konrad.

Re: IMPORTANT: Migration of org-mode.git to the new server on sunday 5pm-7pm CET (UTC+1)

[Bastien]

Hi all,

Bastien <bastien.guerry@wikimedia.fr> writes:

> http://repo.or.cz/w/org-mode.git will still exist as a mirror, we will
> install this next week.

This happened sooner than expected, the mirror is now setup here:

  http://repo.or.cz/w/org-mode.git

Meaning that all references to commits in Worg and elsewhere are now
okay.  Please remember that this mirror is one hour older than the
orgmode.org repository.

Cheers,

-- 
 Bastien