Switching to new Git repositories

Switching to new Git repositories

[Bastien]

Hi all,

from now on, here are the official Org repositories:

- org-mode: https://git.savannah.gnu.org/cgit/emacs/org-mode.git
- worg: https://git.sr.ht/~bzg/worg
- orgweb: https://git.sr.ht/~bzg/orgweb

org-contrib will continue to be on https://git.sr.ht/~bzg/org-contrib
until it disappears, thanks to volunteers taking over maintainance of
the various packages.

You can forget code.orgmode.org.

If you commit to code.orgmode.org by mistake instead of using the new
repos, just merge the commit from the old repo that you can set up as
a remote branch: I won't delete code.orgmode.org until Org 9.6.

If you don't have write access to the new repos and think you should,
please send me an email.

I will work on merging orgweb+worg and setting up the HTML publication
process from sr.ht, which can take a while.

Have a nice week!

-- 
 Bastien

Re: Switching to new Git repositories

[Marco Wahl]

Hi Bastien,

Thanks for all!

> from now on, here are the official Org repositories:
>
> - org-mode: https://git.savannah.gnu.org/cgit/emacs/org-mode.git
> - worg: https://git.sr.ht/~bzg/worg
> - orgweb: https://git.sr.ht/~bzg/orgweb
>
> org-contrib will continue to be on https://git.sr.ht/~bzg/org-contrib
> until it disappears, thanks to volunteers taking over maintainance of
> the various packages.
>
> You can forget code.orgmode.org.
>
> If you commit to code.orgmode.org by mistake instead of using the new
> repos, just merge the commit from the old repo that you can set up as
> a remote branch: I won't delete code.orgmode.org until Org 9.6.
>
> If you don't have write access to the new repos and think you should,
> please send me an email.

My first attempt to commit to the new repo
https://git.savannah.gnu.org/cgit/emacs/org-mode.git failed.

Would you mind to describe what preconditions are needed to be able to
commit?  Is it just a question of using the right URL at clone time?

Would you even update file CONTRIBUTE respectively? (Which still refers
to code.orgmode.org.)

Re: Switching to new Git repositories

[Timothy]

[-- Attachment #1: Type: text/plain, Size: 635 bytes --]

Hi  Marco,

> My first attempt to commit to the new repo
> <https://git.savannah.gnu.org/cgit/emacs/org-mode.git> failed.
>
> Would you mind to describe what preconditions are needed to be able to
> commit?  Is it just a question of using the right URL at clone time?
>
> Would you even update file CONTRIBUTE respectively? (Which still refers
> to code.orgmode.org.)

I think for contributors we might want to use this git remote:
┌────
│ git@git.savannah.gnu.org:emacs/org-mode.git
└────

Pulling from this seemed to work, and so I will update CONTRIBUTE accordingly.

All the best,
Timothy

Re: Switching to new Git repositories

[Bastien]

Hi Marco,

Marco Wahl <marcowahlsoft@gmail.com> writes:

> My first attempt to commit to the new repo
> https://git.savannah.gnu.org/cgit/emacs/org-mode.git failed.

You need to create an account on https://savannah.gnu.org and have
your username there being accepted in the Emacs group:

https://savannah.gnu.org/git/?group=emacs

Please let me know when you are done requesting to join the Emacs
group, so that I can explain Eli and Lars that you are a regular Org
contributor.  (I've sent such instructions to the main committers a
while ago -- I think I've sent them to you, sorry if this was not the
case.)

> Would you mind to describe what preconditions are needed to be able to
> commit?  Is it just a question of using the right URL at clone time?

See the instructions here: https://savannah.gnu.org/git/?group=emacs

> Would you even update file CONTRIBUTE respectively? (Which still refers
> to code.orgmode.org.)

Yes, I'll do that today, thanks for the heads up.

-- 
 Bastien

Re: Switching to new Git repositories

[Eric S Fraga]

On Monday, 20 Sep 2021 at 11:27, Bastien wrote:
> You need to create an account on https://savannah.gnu.org and have
> your username there being accepted in the Emacs group:

What about those of us that do not wish to have write access but do want
to simply track the development?  Neither of the links provided works
for me.

-- 
: Eric S Fraga via Emacs 28.0.50, Org release_9.4.6-637-gd70f28
: Latest paper written in org: https://arxiv.org/abs/2106.05096

Re: Switching to new Git repositories

[Bastien]

Hi Éric,

Eric S Fraga <e.fraga@ucl.ac.uk> writes:

> On Monday, 20 Sep 2021 at 11:27, Bastien wrote:
>> You need to create an account on https://savannah.gnu.org and have
>> your username there being accepted in the Emacs group:
>
> What about those of us that do not wish to have write access but do want
> to simply track the development?

You can clone the repo from here:

~$ git clone https://git.savannah.gnu.org/git/emacs/org-mode.git

And subscribe to this RSS feed:

https://git.savannah.gnu.org/cgit/emacs/org-mode.git/atom/?h=main

HTH,

-- 
 Bastien

Re: Switching to new Git repositories

[Marco Wahl]

Thanks you both!

Thanks to you I use a suitable reference to the repo now!  My first
tiny commit landed in the new repo AFAICS.

Note that I had wrongly filled out the form for the ssh-key on the
savannah platform.  Clearly this is my fault.  BTW the documentation is
all there on the savannah page (or linked.)

Eli and friends added me to the system a while ago--professional as
always.

Further I'll also try to have a look at the CONTRIBUTE file after it
will have been updated.  Of course!


Thanks again and have a nice day!

Re: Switching to new Git repositories

[Eric S Fraga]

Bastien,

thank you.  My bad: I tried to simply change the url in the .git/config
but hadn't realised that the branch information etc. was
different.  I've cloned anew and everything is fine.

-- 
: Eric S Fraga via Emacs 28.0.50, Org release_9.4.6-637-gd70f28
: Latest paper written in org: https://arxiv.org/abs/2106.05096

Re: Switching to new Git repositories

[Éibhear]

[-- Attachment #1.1: Type: text/plain, Size: 2297 bytes --]

On 20/09/2021 05:37, Bastien wrote:
> Hi all,
> 
> from now on, here are the official Org repositories:
> 
> - org-mode: https://git.savannah.gnu.org/cgit/emacs/org-mode.git
> - worg: https://git.sr.ht/~bzg/worg
> - orgweb: https://git.sr.ht/~bzg/orgweb

Hi,

We're the tags missed in the migration across to savannah?

Thanks,

Éibhear

=================8<-------------------------

$ git -C org-mode.orig remote -v
origin	https://code.orgmode.org/bzg/org-mode.git (fetch)
origin	https://code.orgmode.org/bzg/org-mode.git (push)

$ git -C org-mode.orig tag | wc -l
385

$ git -C org-mode.orig tag | tail -5
release_9.4.2
release_9.4.3
release_9.4.4
release_9.4.5
release_9.4.6

$ git -C org-mode.new remote -v
origin	https://git.savannah.gnu.org/git/emacs/org-mode.git (fetch)
origin	https://git.savannah.gnu.org/git/emacs/org-mode.git (push)

$ git -C org-mode.new tag | wc -l
0

=================8<-------------------------

> 
> org-contrib will continue to be on https://git.sr.ht/~bzg/org-contrib
> until it disappears, thanks to volunteers taking over maintainance of
> the various packages.
> 
> You can forget code.orgmode.org.
> 
> If you commit to code.orgmode.org by mistake instead of using the new
> repos, just merge the commit from the old repo that you can set up as
> a remote branch: I won't delete code.orgmode.org until Org 9.6.
> 
> If you don't have write access to the new repos and think you should,
> please send me an email.
> 
> I will work on merging orgweb+worg and setting up the HTML publication
> process from sr.ht, which can take a while.
> 
> Have a nice week!
> 


-- 
Éibhear Ó hAnluain
Dublin, Ireland.
+-------------------------------+-------------------------------------+
| e-mail: eibhear.geo@gmail.com | Web: [http://www.gibiris.org/]      |
| Mobile: +353 86 856 5666      | Matrix: @eibhear:matrix.gibiris.org |
| Twitter: @eibhear             |                                     |
+-------------------------------=-------------------------------------+
| If you would like help getting started using the Element and Matrix |
|      messaging system, at home or in work, please let me know.      |
+---------------------------------------------------------------------+


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 203 bytes --]

Re: Switching to new Git repositories

[Nick Dokos]

FWIW, I get

$ git remote -v
upstream	https://git.savannah.gnu.org/git/emacs/org-mode.git (fetch)
upstream	https://git.savannah.gnu.org/git/emacs/org-mode.git (push)

$ git tag | wc -l
386

Maybe do

$ git remote update
$ git rebase

and try again?

-- 
Nick

"There are only two hard problems in computer science: cache
invalidation, naming things, and off-by-one errors." -Martin Fowler

Re: Switching to new Git repositories

[Colin Baxter]

>>>>> Nick Dokos <ndokos@gmail.com> writes:

    > FWIW, I get $ git remote -v upstream
    > https://git.savannah.gnu.org/git/emacs/org-mode.git (fetch)
    > upstream https://git.savannah.gnu.org/git/emacs/org-mode.git
    > (push)

    > $ git tag | wc -l 386

    > Maybe do

    > $ git remote update $ git rebase

    > and try again?

Doesn't work for me. I did all above but still get zero for git tag | wc

Best wishes,

Re: Switching to new Git repositories

[William Denton]

[-- Attachment #1: Type: text/plain, Size: 2673 bytes --]

I'm seeing exactly the same, and the suggested rebase commands didn't change it.

I wonder if it's related to a problem I have on one of the two machines (both 
Ubuntu, with identical setups) where I run Org from source.

On one, when I switched to the new repo, I got this on startup:

Error (use-package): org/:catch: Invalid version syntax: ‘9.5-dev’

I can't see what causes that.  I use use-package to set up Org in my init file¹ 
but it seems to be some internal problem, because I don't mention anything about 
versions.

What's more, on my other machine, where everything about Emacs is identical, it 
works without any problem (even though there are no tags).

Bill


¹ https://github.com/wdenton/.emacs.d/blob/master/init.org


On 23 September 2021, Éibhear wrote:

> On 20/09/2021 05:37, Bastien wrote:
>> Hi all,
>>
>> from now on, here are the official Org repositories:
>>
>> - org-mode: https://git.savannah.gnu.org/cgit/emacs/org-mode.git
>> - worg: https://git.sr.ht/~bzg/worg
>> - orgweb: https://git.sr.ht/~bzg/orgweb
>
> Hi,
>
> We're the tags missed in the migration across to savannah?
>
> Thanks,
>
> Éibhear
>
> =================8<-------------------------
>
> $ git -C org-mode.orig remote -v
> origin	https://code.orgmode.org/bzg/org-mode.git (fetch)
> origin	https://code.orgmode.org/bzg/org-mode.git (push)
>
> $ git -C org-mode.orig tag | wc -l
> 385
>
> $ git -C org-mode.orig tag | tail -5
> release_9.4.2
> release_9.4.3
> release_9.4.4
> release_9.4.5
> release_9.4.6
>
> $ git -C org-mode.new remote -v
> origin	https://git.savannah.gnu.org/git/emacs/org-mode.git (fetch)
> origin	https://git.savannah.gnu.org/git/emacs/org-mode.git (push)
>
> $ git -C org-mode.new tag | wc -l
> 0
>
> =================8<-------------------------
>
>>
>> org-contrib will continue to be on https://git.sr.ht/~bzg/org-contrib
>> until it disappears, thanks to volunteers taking over maintainance of
>> the various packages.
>>
>> You can forget code.orgmode.org.
>>
>> If you commit to code.orgmode.org by mistake instead of using the new
>> repos, just merge the commit from the old repo that you can set up as
>> a remote branch: I won't delete code.orgmode.org until Org 9.6.
>>
>> If you don't have write access to the new repos and think you should,
>> please send me an email.
>>
>> I will work on merging orgweb+worg and setting up the HTML publication
>> process from sr.ht, which can take a while.
>>
>> Have a nice week!
>>
>
>
>

--
William Denton
https://www.miskatonic.org/
Librarian, artist and licensed private investigator.
Toronto, Canada

Re: Switching to new Git repositories

[Éibhear]

[-- Attachment #1.1: Type: text/plain, Size: 4064 bytes --]

On 23/09/2021 19:06, William Denton wrote:
> I'm seeing exactly the same, and the suggested rebase commands didn't
> change it.

I'm guessing it's just that in the migration from code.orgmode.org to
git.savannah.gnu.org, the step to push the tags was not performed:

=================8<-------------------------

$ git push --tags https://git.savannah.gnu.org/git/emacs/org-mode.git

=================8<-------------------------

Even though the branch names are different, the commit SHAs are the same
for both remotes, to this command would do it.

I just wonder if it's because there's something else planned for the
tags, or if this was just an oversight.

Éibhear

> 
> I wonder if it's related to a problem I have on one of the two machines
> (both Ubuntu, with identical setups) where I run Org from source.
> 
> On one, when I switched to the new repo, I got this on startup:
> 
> Error (use-package): org/:catch: Invalid version syntax: ‘9.5-dev’
> 
> I can't see what causes that.  I use use-package to set up Org in my
> init file¹ but it seems to be some internal problem, because I don't
> mention anything about versions.
> 
> What's more, on my other machine, where everything about Emacs is
> identical, it works without any problem (even though there are no tags).
> 
> Bill
> 
> 
> ¹ https://github.com/wdenton/.emacs.d/blob/master/init.org
> 
> 
> On 23 September 2021, Éibhear wrote:
> 
>> On 20/09/2021 05:37, Bastien wrote:
>>> Hi all,
>>>
>>> from now on, here are the official Org repositories:
>>>
>>> - org-mode: https://git.savannah.gnu.org/cgit/emacs/org-mode.git
>>> - worg: https://git.sr.ht/~bzg/worg
>>> - orgweb: https://git.sr.ht/~bzg/orgweb
>>
>> Hi,
>>
>> We're the tags missed in the migration across to savannah?
>>
>> Thanks,
>>
>> Éibhear
>>
>> =================8<-------------------------
>>
>> $ git -C org-mode.orig remote -v
>> origin    https://code.orgmode.org/bzg/org-mode.git (fetch)
>> origin    https://code.orgmode.org/bzg/org-mode.git (push)
>>
>> $ git -C org-mode.orig tag | wc -l
>> 385
>>
>> $ git -C org-mode.orig tag | tail -5
>> release_9.4.2
>> release_9.4.3
>> release_9.4.4
>> release_9.4.5
>> release_9.4.6
>>
>> $ git -C org-mode.new remote -v
>> origin    https://git.savannah.gnu.org/git/emacs/org-mode.git (fetch)
>> origin    https://git.savannah.gnu.org/git/emacs/org-mode.git (push)
>>
>> $ git -C org-mode.new tag | wc -l
>> 0
>>
>> =================8<-------------------------
>>
>>>
>>> org-contrib will continue to be on https://git.sr.ht/~bzg/org-contrib
>>> until it disappears, thanks to volunteers taking over maintainance of
>>> the various packages.
>>>
>>> You can forget code.orgmode.org.
>>>
>>> If you commit to code.orgmode.org by mistake instead of using the new
>>> repos, just merge the commit from the old repo that you can set up as
>>> a remote branch: I won't delete code.orgmode.org until Org 9.6.
>>>
>>> If you don't have write access to the new repos and think you should,
>>> please send me an email.
>>>
>>> I will work on merging orgweb+worg and setting up the HTML publication
>>> process from sr.ht, which can take a while.
>>>
>>> Have a nice week!
>>>
>>
>>
>>
> 
> -- 
> William Denton
> https://www.miskatonic.org/
> Librarian, artist and licensed private investigator.
> Toronto, Canada


-- 
Éibhear Ó hAnluain
Dublin, Ireland.
+-------------------------------+-------------------------------------+
| e-mail: eibhear.geo@gmail.com | Web: [http://www.gibiris.org/]      |
| Mobile: +353 86 856 5666      | Matrix: @eibhear:matrix.gibiris.org |
| Twitter: @eibhear             |                                     |
+-------------------------------=-------------------------------------+
| If you would like help getting started using the Element and Matrix |
|      messaging system, at home or in work, please let me know.      |
+---------------------------------------------------------------------+


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 203 bytes --]

Re: Switching to new Git repositories

[Marco Wahl]

Hi!

Colin Baxter <m43cap@yandex.com> writes:

>>>>>> Nick Dokos <ndokos@gmail.com> writes:
>
>     > FWIW, I get $ git remote -v upstream
>     > https://git.savannah.gnu.org/git/emacs/org-mode.git (fetch)
>     > upstream https://git.savannah.gnu.org/git/emacs/org-mode.git
>     > (push)
>
>     > $ git tag | wc -l 386
>
>     > Maybe do
>
>     > $ git remote update $ git rebase
>
>     > and try again?
>
> Doesn't work for me. I did all above but still get zero for git tag | wc

What about adding the still existing Org repo temporarily and fetching
the tags from there?

Example:

cd PATHTOORGMODE
git remote -v
git remote add olderrepo https://code.orgmode.org/bzg/org-mode.git
git remote -v
git fetch olderrepo 'refs/tags/*:refs/tags/*'
git remote remove olderrepo
git remote -v

Enjoy the tags in your local repo!

I guess the maintainers will push the right tags to the new repo soon.

Re: Switching to new Git repositories

[Colin Baxter]

[-- Attachment #1: Type: text/plain, Size: 1007 bytes --]

>>>>> Éibhear  <eibhear.geo@gmail.com> writes:

    > On 23/09/2021 19:06, William Denton wrote:
    >> I'm seeing exactly the same, and the suggested rebase commands
    >> didn't change it.

    > I'm guessing it's just that in the migration from code.orgmode.org
    > to git.savannah.gnu.org, the step to push the tags was not
    > performed:

    > =================8<-------------------------

    > $ git push --tags
    > https://git.savannah.gnu.org/git/emacs/org-mode.git

    > =================8<-------------------------

    > Even though the branch names are different, the commit SHAs are
    > the same for both remotes, to this command would do it.

    > I just wonder if it's because there's something else planned for
    > the tags, or if this was just an oversight.

    > Éibhear

Good point. I'll wait a few days to see what happens before following
Marco's suggestion of bringing over the tags manually.

-- Cut ---

Best wishes,

Colin Baxter.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 511 bytes --]

Re: Switching to new Git repositories

[Marco Wahl]

William Denton <wtd@pobox.com> writes:

> I'm seeing exactly the same, and the suggested rebase commands didn't change it.
>
> I wonder if it's related to a problem I have on one of the two
> machines (both Ubuntu, with identical setups) where I run Org from
> source.
>
> On one, when I switched to the new repo, I got this on startup:
>
> Error (use-package): org/:catch: Invalid version syntax: ‘9.5-dev’
>
> I can't see what causes that.  I use use-package to set up Org in my
> init file¹ but it seems to be some internal problem, because I don't
> mention anything about versions.
>
> What's more, on my other machine, where everything about Emacs is
> identical, it works without any problem (even though there are no
> tags).

Sounds like a weird issue.  I don't think this 9.5-dev tag is something
from the Org repo.

Have you already tried to turn it off and on again?  I.e. delete your
local repo and start with a fresh clone?

Of course take care not to loose any data important to you!


HTH

Re: Switching to new Git repositories

[No Wayman]

[-- Attachment #1: Type: text/plain, Size: 513 bytes --]

> Sounds like a weird issue.  I don't think this 9.5-dev tag is 
> something from the Org repo.

There is a bug in mk/targets.mk introduced by 61336f80dc.
As others have pointed out, the new repository does not have tags.
As a fallback, org.el's version is read in it's header.
However, it looks like Kyle forgot to trim that string so we get 
ORGVERSION set to "9.5-dev" instead of "9.5".
This causes `org-version' to return an incorrect version string.

The attached patch addresses the issue in the makefile.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: fix ORGVERSION in targets.mk --]
[-- Type: text/x-patch, Size: 1335 bytes --]

From 9b81f396e69af146faceb13f5602fb6aa06a84e0 Mon Sep 17 00:00:00 2001
From: Nicholas Vollmer <iarchivedmywholelife@gmail.com>
Date: Thu, 23 Sep 2021 17:13:34 -0400
Subject: [PATCH] mk/targets.mk: Fix ORGVERSION in tag-less repos

* mk/targets.mk (ORGVERSION, GITVERSION): properly generate ORGVERSION.

Fix bug introduced 61336f80 which caused ORGVERSION to be generated as
"Major.Minor-dev" instead of "Major.Minor" in tag-less repos.
---
 mk/targets.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mk/targets.mk b/mk/targets.mk
index 693e3781f..35383f173 100644
--- a/mk/targets.mk
+++ b/mk/targets.mk
@@ -15,9 +15,9 @@ ifneq ($(wildcard .git),)
   ifeq ($(ORGVERSION),)
     # In elpa.git, there are no tags available.  Fall back to using
     # the org.el header.
-    ORGVERSION := $(shell $(BATCH) --eval "(require 'lisp-mnt)" \
-      --visit lisp/org.el --eval '(princ (lm-header "version"))')
-    GITVERSION ?= $(ORGVERSION)-g$(shell git rev-parse --short=6 HEAD)
+    ORGVERSION := $(patsubst %-dev,%,$(shell $(BATCH) --eval "(require 'lisp-mnt)" \
+      --visit lisp/org.el --eval '(princ (lm-header "version"))'))
+    GITVERSION ?= $(ORGVERSION)-g$(shell git rev-parse --short=6 HEAD))
   else
     GITVERSION ?= $(shell git describe --match release\* --abbrev=6 HEAD)
   endif
-- 
2.33.0

Re: Switching to new Git repositories

[Kyle Meyer]

On 09/23/21 17:17:48 -0400, No Wayman wrote:
>> Sounds like a weird issue.  I don't think this 9.5-dev tag is 
>> something from the Org repo.
>
> There is a bug in mk/targets.mk introduced by 61336f80dc.

Quoting that commit message for context:

  mk/targets.mk: Add version fallback for tag-less repos
  
  * mk/targets.mk (ORGVERSION, GITVERSION): Get version from lisp/org.el
  header if it can't be retrieved from git-describe.
  
  As of elpa.git's ee03829f90 (Finalize the new master branch,
  2020-12-14), org-release and org-git-version are empty strings in
  https://elpa.gnu.org/packages/org-*.tar files.  This is because the
  new setup executes `make autoloads info' in an elpa.git worktree with
  an Org branch checked out, but elpa.git of course doesn't have Org's
  release tags.
  
  Maintaining the org.el version header has been a point of contention
  in the past [1], but the header has been there for a while now.  Use
  it to avoid the above elpa.git issue.  In the case of the master
  branch, the org-release value generated in a tag-less repo will have a
  different version than the one from a regular repo because org.el's
  version header has a "-dev" suffix, but that's still better than an
  empty version.
  [...]

> As others have pointed out, the new repository does not have tags.
> As a fallback, org.el's version is read in it's header.
> However, it looks like Kyle forgot to trim that string so we get 
> ORGVERSION set to "9.5-dev" instead of "9.5".

I of course can't say for sure, but based on my commit message (in
particular the last paragraph), it sounds like I was aware of the
discrepancy but didn't realize it'd cause the downstream "Invalid
version syntax" issue mentioned by Bill in
<alpine.DEB.2.22.394.2109231400490.7770@shell3.miskatonic.org>.

> This causes `org-version' to return an incorrect version string.
>
> The attached patch addresses the issue in the makefile.

Thanks.

> Subject: [PATCH] mk/targets.mk: Fix ORGVERSION in tag-less repos
>
> * mk/targets.mk (ORGVERSION, GITVERSION): properly generate ORGVERSION.

I think it'd be better to say something more specific about the change
rather than say "properly" and assume the reader knows what the writer
has in mind.

> Fix bug introduced 61336f80 which caused ORGVERSION to be generated as
> "Major.Minor-dev" instead of "Major.Minor" in tag-less repos.

Please say what the bug is.  Can you give a sparse outline of the call
chain for the error mentioned in Bill's message?

> -    ORGVERSION := $(shell $(BATCH) --eval "(require 'lisp-mnt)" \
> -      --visit lisp/org.el --eval '(princ (lm-header "version"))')
> -    GITVERSION ?= $(ORGVERSION)-g$(shell git rev-parse --short=6 HEAD)
> +    ORGVERSION := $(patsubst %-dev,%,$(shell $(BATCH) --eval "(require 'lisp-mnt)" \
> +      --visit lisp/org.el --eval '(princ (lm-header "version"))'))
> +    GITVERSION ?= $(ORGVERSION)-g$(shell git rev-parse --short=6 HEAD))

It looks like you've unintentionally added a ')' to the end of the
GITVERSION line.

Another approach would be to update org.el's version to contain
something that still signals "-dev" but won't trigger the "Invalid
version syntax" (which, based on grepping the Emacs repo, is signaled by
version-to-list).  But given that in the current setup a clone with tags
wouldn't use the header version, stripping -dev for consistency sounds
like the way to go.

Re: Switching to new Git repositories

[No Wayman]

[-- Attachment #1: Type: text/plain, Size: 1126 bytes --]


Kyle Meyer <kyle@kyleam.com> writes:

> On 09/23/21 17:17:48 -0400, No Wayman wrote:

> It looks like you've unintentionally added a ')' to the end of 
> the
> GITVERSION line.

Apologies. Must've been a stray.

> Another approach would be to update org.el's version to contain
> something that still signals "-dev" but won't trigger the 
> "Invalid
> version syntax" (which, based on grepping the Emacs repo, is 
> signaled by
> version-to-list).  But given that in the current setup a clone 
> with tags
> wouldn't use the header version, stripping -dev for consistency 
> sounds
> like the way to go.

I agree we should keep it simple and consistent.

Out of curiosity I ran this against the repo to see if the 
"Version" metadata had always followed its current convention:

git grep "Version:" $(git rev-list --all) -- lisp/org.el

Looks like the "-dev" suffix goes back to "9.4-dev" and before 
that we have "8.4-git" and "6.08-pre01".
I'm not sure what Org's convention is here, but the patsubst could 
be adjusted to be more flexible if necessary.

I tried to be more concrete with the commit message.
See attached.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-mk-targets.mk-Fix-ORGVERSION-in-tag-less-repos.patch --]
[-- Type: text/x-patch, Size: 1416 bytes --]

From 164029cb66eed8d47d7eb69d449660964749195d Mon Sep 17 00:00:00 2001
From: Nicholas Vollmer <iarchivedmywholelife@gmail.com>
Date: Thu, 23 Sep 2021 17:13:34 -0400
Subject: [PATCH] mk/targets.mk: Fix ORGVERSION in tag-less repos

* mk/targets.mk (ORGVERSION, GITVERSION): trim "-dev" suffix from ORGVERSION.

61336f80 uses org.el's Version metadata to generate ORGVERSION when
the source repository has no tags.
This can result in an org-version of "Major.Minor-dev".
The "-dev" suffix is not recognized by `version-to-list' as a valid
version syntax because it is not part of `version-regexp-alist'.
---
 mk/targets.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mk/targets.mk b/mk/targets.mk
index 693e3781f..ee6f3f344 100644
--- a/mk/targets.mk
+++ b/mk/targets.mk
@@ -15,8 +15,8 @@ ifneq ($(wildcard .git),)
   ifeq ($(ORGVERSION),)
     # In elpa.git, there are no tags available.  Fall back to using
     # the org.el header.
-    ORGVERSION := $(shell $(BATCH) --eval "(require 'lisp-mnt)" \
-      --visit lisp/org.el --eval '(princ (lm-header "version"))')
+    ORGVERSION := $(patsubst %-dev,%,$(shell $(BATCH) --eval "(require 'lisp-mnt)" \
+      --visit lisp/org.el --eval '(princ (lm-header "version"))'))
     GITVERSION ?= $(ORGVERSION)-g$(shell git rev-parse --short=6 HEAD)
   else
     GITVERSION ?= $(shell git describe --match release\* --abbrev=6 HEAD)
-- 
2.33.0

Re: Switching to new Git repositories

[Kyle Meyer]

No Wayman writes:

> Out of curiosity I ran this against the repo to see if the 
> "Version" metadata had always followed its current convention:
>
> git grep "Version:" $(git rev-list --all) -- lisp/org.el
>
> Looks like the "-dev" suffix goes back to "9.4-dev" and before 
> that we have "8.4-git" and "6.08-pre01".
> I'm not sure what Org's convention is here, but the patsubst could 
> be adjusted to be more flexible if necessary.

Thanks for checking.  I think just handling -dev is probably good
enough.

> Subject: [PATCH] mk/targets.mk: Fix ORGVERSION in tag-less repos

Pushed:

  To git.savannah.gnu.org:/srv/git/emacs/org-mode.git
     c9dc6603a..9a4a24a94  main -> main

(It's not needed on the bugfix branch given -dev isn't used in the
header there.  Plus I think the 9.5 release is expected before another
release from maint/bugfix.)

Thank you for fixing my mistake.

Re: Switching to new Git repositories

[William Denton]

On 23 September 2021, No Wayman wrote:

> There is a bug in mk/targets.mk introduced by 61336f80dc.
> As others have pointed out, the new repository does not have tags.
> As a fallback, org.el's version is read in it's header.
> However, it looks like Kyle forgot to trim that string so we get ORGVERSION 
> set to "9.5-dev" instead of "9.5".
> This causes `org-version' to return an incorrect version string.

This is an interesting bug---a tiny thing that never mattered until it turned 
into problem when triggered by a minor part of the process of moving Git repos 
from one place to another.  My sincere thanks to everyone who looked into it, 
and found causes and fixes.

Such is Org development: on the one hand, years of intricate work to build a 
powerful citation system, on the other, removing "-dev" from a string.

Bill

--
William Denton
https://www.miskatonic.org/
Librarian, artist and licensed private investigator.
Toronto, Canada

Re: Switching to new Git repositories

[Eric S Fraga]

On Thursday, 23 Sep 2021 at 14:06, William Denton wrote:
> Error (use-package): org/:catch: Invalid version syntax: ‘9.5-dev’

Minor aside: this version number causes problems with org-caldav-sync as
well.  It doesn't enable "(version< ...)" and related to work properly.

-- 
: Eric S Fraga via Emacs 28.0.50, Org 9.5-dev-g4271f2
: Latest paper written in org: https://arxiv.org/abs/2106.05096

Re: Switching to new Git repositories

[Bastien]

Hi Marco,

Marco Wahl <marcowahlsoft@gmail.com> writes:

> Further I'll also try to have a look at the CONTRIBUTE file after it
> will have been updated.  Of course!

I just updated it, applying a patch from Timothy, you can refer to it
from now on.

https://git.savannah.gnu.org/cgit/emacs/org-mode.git/tree/CONTRIBUTE

-- 
 Bastien

Re: Switching to new Git repositories

[Bastien]

Hi Éibhear,

Éibhear <eibhear.geo@gmail.com> writes:

> We're the tags missed in the migration across to savannah?

Indeed they were, fixed now.  Thanks a lot!