vc-fossil to non-gnu elpa?

vc-fossil to non-gnu elpa?

[Alfred M. Szmidt]

Would it be possible to add vc-fossil to non-gnu elpa?  Alas, I've not
managed to get hold of all copyright holders so it could have maybe
been added to Emacs or ELPA.

http://chiselapp.com/user/venks/repository/emacs-fossil

Re: vc-fossil to non-gnu elpa?

[Stefan Monnier]

> Would it be possible to add vc-fossil to non-gnu elpa?

I haven't looked at that code, so I can't really tell, but most likely
it is, yes.  All you need to do is check that it's acceptable according
to our criteria and if so add it to the `elpa-packages` file in the
`main` branch on `nongnu.git`.


        Stefan

Re: vc-fossil to non-gnu elpa?

[Richard Stallman]

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

  > I haven't looked at that code, so I can't really tell, but most likely
  > it is, yes.  All you need to do is check that it's acceptable according
  > to our criteria and if so add it to the `elpa-packages` file in the
  > `main` branch on `nongnu.git`.

If the package meets our criteria, putting it into NonGNU ELPA is
_not_ the next step.  The next thing we need to do is have a
conversation with its developers.

We are just beginning to figure out how to have that conversation, so
we can't describe how to do it.  Therefore, please tell us about the
package and we will take care of that aspect.

-- 
Dr Richard Stallman
Chief GNUisance of the GNU Project (https://gnu.org)
Founder, Free Software Foundation (https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)

Re: vc-fossil to non-gnu elpa?

[Stefan Monnier]

> If the package meets our criteria, putting it into NonGNU ELPA is
> _not_ the next step.  The next thing we need to do is have a
> conversation with its developers.

That doesn't need to happen beforehand.  It can happen in parallel or
even afterwards (it's sometimes much easier to get a constructive
discussion going with the other side when they can see the actual
package we build and the problems we faced and the solutions we chose,
and other times it's helpful to get their input on how to solve those
problems.  One size doesn't fit all).

> We are just beginning to figure out how to have that conversation, so
> we can't describe how to do it.  Therefore, please tell us about the
> package and we will take care of that aspect.

I'm not sure who you're thinking of with this "we", because I definitely
have no intention of doing that for packages other than the ones I add.


        Stefan

Re: vc-fossil to non-gnu elpa?

[Richard Stallman]

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

  > > If the package meets our criteria, putting it into NonGNU ELPA is
  > > _not_ the next step.  The next thing we need to do is have a
  > > conversation with its developers.

  > That doesn't need to happen beforehand.

To postpone it is running a risk.

I'll write back to you and the other people who work on NonGNU ELPA.

-- 
Dr Richard Stallman
Chief GNUisance of the GNU Project (https://gnu.org)
Founder, Free Software Foundation (https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)

Re: vc-fossil to non-gnu elpa?

[Stefan Monnier]

>   > That doesn't need to happen beforehand.
> To postpone it is running a risk.

Every choice entails a risk.  This is a question of tradeoffs.

When the probably of a conflict is low, optimistic concurrency is
a *much* better choice than pessimistic concurrency.


        Stefan

Re: vc-fossil to non-gnu elpa?

[Richard Stallman]

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

  > >   > That doesn't need to happen beforehand.
  > > To postpone it is running a risk.

  > Every choice entails a risk.  This is a question of tradeoffs.

I know by experience that the risk of assuming someone will do something
and not verifying this by asking per
is substantial.  If we have hundreds of such packages in NonGNU ELPA,
I expect that each year will will have several painful surprises
that we will have to clean up.

I insist on this.

-- 
Dr Richard Stallman
Chief GNUisance of the GNU Project (https://gnu.org)
Founder, Free Software Foundation (https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)

Re: vc-fossil to non-gnu elpa?

[Alfred M. Szmidt]

     > I haven't looked at that code, so I can't really tell, but most likely
     > it is, yes.  All you need to do is check that it's acceptable according
     > to our criteria and if so add it to the `elpa-packages` file in the
     > `main` branch on `nongnu.git`.

   If the package meets our criteria, putting it into NonGNU ELPA is
   _not_ the next step.  The next thing we need to do is have a
   conversation with its developers.

I'm the developer in this case :)

Re: vc-fossil to non-gnu elpa?

[Richard Stallman]

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

  >    If the package meets our criteria, putting it into NonGNU ELPA is
  >    _not_ the next step.  The next thing we need to do is have a
  >    conversation with its developers.

  > I'm the developer in this case :)

Ok, I'll have the discussion with you now.

-- 
Dr Richard Stallman
Chief GNUisance of the GNU Project (https://gnu.org)
Founder, Free Software Foundation (https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)

Re: vc-fossil to non-gnu elpa?

[Alfred M. Szmidt]

[Lets try this again and send it to emacs-devel@.  Sorry for the noise.]

So trying to get back to adding vc-fossil to non-GNU ELPA, I tried to
follow the instructions in the README.org, added this to elpa-packages

 ("vc-fossil"		:url "https://github.com/ams/vc-fossil")

And then did,

   ~/nongnu-elpa $ gmake -f GNUmakefile build/vc-fossil
   emacs --batch -l /home/ams/nongnu-elpa/admin/elpa-admin.el	\
            -f elpaa-batch-make-one-package vc-fossil
   Cloning branch vc-fossil:
   +refs/heads/*:refs/remotes/origin/Preparing worktree (new branch 'elpa/vc-fossil')
   HEAD is now at f365e4389 vc-fossil.el: Update from fossil.
   *
   
   ======== Building tarball archive-devel/vc-fossil-20210928.0...tar...
   Build error for archive-devel/vc-fossil-20210928.0...tar: (error "Invalid version syntax: `20210928.0..'")
   ######## Build of package archive-devel/vc-fossil-20210928.0...tar FAILED!!
   ======== Building tarball archive/vc-fossil-20210928.tar...
   ######## Built new package archive/vc-fossil-20210928.tar!

The error message is strange, and I don't understand it.  Any idea
what is going on?

Re: vc-fossil to non-gnu elpa?

[Philip Kaludercic]

"Alfred M. Szmidt" <ams@gnu.org> writes:

> [Lets try this again and send it to emacs-devel@.  Sorry for the noise.]
>
> So trying to get back to adding vc-fossil to non-GNU ELPA, I tried to
> follow the instructions in the README.org, added this to elpa-packages
>
>  ("vc-fossil"		:url "https://github.com/ams/vc-fossil")
>
> And then did,
>
>    ~/nongnu-elpa $ gmake -f GNUmakefile build/vc-fossil
>    emacs --batch -l /home/ams/nongnu-elpa/admin/elpa-admin.el	\
>             -f elpaa-batch-make-one-package vc-fossil
>    Cloning branch vc-fossil:
>    +refs/heads/*:refs/remotes/origin/Preparing worktree (new branch 'elpa/vc-fossil')
>    HEAD is now at f365e4389 vc-fossil.el: Update from fossil.
>    *
>    
>    ======== Building tarball archive-devel/vc-fossil-20210928.0...tar...
>    Build error for archive-devel/vc-fossil-20210928.0...tar: (error "Invalid version syntax: `20210928.0..'")
>    ######## Build of package archive-devel/vc-fossil-20210928.0...tar FAILED!!
>    ======== Building tarball archive/vc-fossil-20210928.tar...
>    ######## Built new package archive/vc-fossil-20210928.tar!
>
> The error message is strange, and I don't understand it.  Any idea
> what is going on?

It seems to build on my system:

        icterid$ make build/vc-fossil
        emacs --batch -l /home/philip/Code/src/nongnu/admin/elpa-admin.el	\
                 -f elpaa-batch-make-one-package vc-fossil
        Cloning branch vc-fossil:
        +refs/heads/*:refs/remotes/origin/Preparing worktree (new branch 'elpa/vc-fossil')
        HEAD is now at 7815c30d7 vc-fossil.el: Update from fossil.
        *

        ======== Building tarball archive-devel/vc-fossil-20210928.0.20210928.73744.tar...
        ######## Built new package archive-devel/vc-fossil-20210928.0.20210928.73744.tar!
        ======== Building tarball archive/vc-fossil-20210928.tar...
        ######## Built new package archive/vc-fossil-20210928.tar!

Did you change the history or do you have a local commit with
"20210928.0.." as a version number?

-- 
	Philip Kaludercic

Re: vc-fossil to non-gnu elpa?

[Alfred M. Szmidt]

   It seems to build on my system:

	   icterid$ make build/vc-fossil
	   emacs --batch -l /home/philip/Code/src/nongnu/admin/elpa-admin.el	\
		    -f elpaa-batch-make-one-package vc-fossil
	   Cloning branch vc-fossil:
	   +refs/heads/*:refs/remotes/origin/Preparing worktree (new branch 'elpa/vc-fossil')
	   HEAD is now at 7815c30d7 vc-fossil.el: Update from fossil.
	   *

	   ======== Building tarball archive-devel/vc-fossil-20210928.0.20210928.73744.tar...
	   ######## Built new package archive-devel/vc-fossil-20210928.0.20210928.73744.tar!
	   ======== Building tarball archive/vc-fossil-20210928.tar...
	   ######## Built new package archive/vc-fossil-20210928.tar!

   Did you change the history or do you have a local commit with
   "20210928.0.." as a version number?

No, but could it be how the string is constructed?

	   ======== Building tarball archive-devel/vc-fossil-20210928.0.20210928.73744.tar...
	   							        ^^^^^^^^ ^^^^^
If that those two parts are missing/empty then you will get vc-fossil-20210928.0...tar...

Re: vc-fossil to non-gnu elpa?

[Philip Kaludercic]

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

"Alfred M. Szmidt" <ams@gnu.org> writes:

>    It seems to build on my system:
>
> 	   icterid$ make build/vc-fossil
> 	   emacs --batch -l /home/philip/Code/src/nongnu/admin/elpa-admin.el	\
> 		    -f elpaa-batch-make-one-package vc-fossil
> 	   Cloning branch vc-fossil:
> 	   +refs/heads/*:refs/remotes/origin/Preparing worktree (new branch 'elpa/vc-fossil')
> 	   HEAD is now at 7815c30d7 vc-fossil.el: Update from fossil.
> 	   *
>
> 	   ======== Building tarball archive-devel/vc-fossil-20210928.0.20210928.73744.tar...
> 	   ######## Built new package archive-devel/vc-fossil-20210928.0.20210928.73744.tar!
> 	   ======== Building tarball archive/vc-fossil-20210928.tar...
> 	   ######## Built new package archive/vc-fossil-20210928.tar!
>
>    Did you change the history or do you have a local commit with
>    "20210928.0.." as a version number?
>
> No, but could it be how the string is constructed?

ELPA uses functions based on version-to-list to find the commit that the
tarball is based on. From the error message you got, it might be that
you were using an invalid versioning scheme. Consider how

    (version-to-list "1.0.0") ; => (1 0 0)

but

    (version-to-list "1.0..0")

throws an error.

> 	   ======== Building tarball archive-devel/vc-fossil-20210928.0.20210928.73744.tar...
> 	   							        ^^^^^^^^ ^^^^^
> If that those two parts are missing/empty then you will get vc-fossil-20210928.0...tar...

What do you mean, I seem to have everything necessary in the tarball: 


[-- Attachment #2: vc-fossil.tar --]
[-- Type: application/x-tar, Size: 30720 bytes --]

[-- Attachment #3: Type: text/plain, Size: 25 bytes --]



-- 
	Philip Kaludercic

Re: vc-fossil to non-gnu elpa?

[Stefan Monnier]

> The error message is strange, and I don't understand it.
> Any idea what is going on?

Looks like a bug in `elpa-admin.el` in how it extracts the commit date
to generate the <release>.0.<date>.<time> version number used for
GNU-devel.

If you edit `elpa-config` to set `debug` to t and try again we'll see
a more verbose trace which might give us more of a clue.

Notice also that the non-devel package (which is arguably the more
important one) was built successfully.


        Stefan

Re: vc-fossil to non-gnu elpa?

[Alfred M. Szmidt]

   > The error message is strange, and I don't understand it.
   > Any idea what is going on?

   Looks like a bug in `elpa-admin.el` in how it extracts the commit date
   to generate the <release>.0.<date>.<time> version number used for
   GNU-devel.

Seems like non-portable date usage, OpenBSD date doesn't have the -d
switch -- this should probobly have some error maybe?

  call-process git ("show" "--pretty=format:%cI" "--no-patch")
  call-process date ("-d" "2021-09-28T09:18:26+02:00" "+%Y%m%d.%H%M%S")
  Building tarball archive-devel/vc-fossil-20210928.0...tar...

Re: vc-fossil to non-gnu elpa?

[Stefan Monnier]

> Seems like non-portable date usage,

The code was written first and foremost to run on elpa.gnu.org, yes.
I do welcome patches which improve compatibility/portability, tho.


        Stefan

Re: vc-fossil to non-gnu elpa?

[Alfred M. Szmidt]

   > Seems like non-portable date usage,

   The code was written first and foremost to run on elpa.gnu.org, yes.
   I do welcome patches which improve compatibility/portability, tho.

Does this need to be fixed before vc-fossil can be added to non-GNU
ELPA?

How does one get push rights? Does one need them?

diff --git a/elpa-packages b/elpa-packages
index 1074f4c30..284894fcd 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -236,6 +236,8 @@
 
  ("tuareg"             :url "https://github.com/ocaml/tuareg.git")
 
+ ("vc-fossil"          :url "https://github.com/venks1/emacs-fossil")
+
  ("web-mode"           :url "https://github.com/fxbois/web-mode"
   :ignored-files ("issues" "tests" "run.sh"))

Re: vc-fossil to non-gnu elpa?

[Stefan Monnier]

Alfred M. Szmidt [2021-09-29 02:13:03] wrote:
>    > Seems like non-portable date usage,
>    The code was written first and foremost to run on elpa.gnu.org, yes.
>    I do welcome patches which improve compatibility/portability, tho.
> Does this need to be fixed before vc-fossil can be added to non-GNU
> ELPA?

AFAICT the problem has already been fixed, and no it was not necessary
to fix it for vc-fossil (it was not directly related to vc-fossil).

> How does one get push rights? Does one need them?

It's the same access rights as for Emacs itself.

> diff --git a/elpa-packages b/elpa-packages
> index 1074f4c30..284894fcd 100644
> --- a/elpa-packages
> +++ b/elpa-packages
> @@ -236,6 +236,8 @@
>  
>   ("tuareg"             :url "https://github.com/ocaml/tuareg.git")
>  
> + ("vc-fossil"          :url "https://github.com/venks1/emacs-fossil")
> +
>   ("web-mode"           :url "https://github.com/fxbois/web-mode"
>    :ignored-files ("issues" "tests" "run.sh"))

Pushed, thanks,


        Stefan

Re: vc-fossil to non-gnu elpa?

[Alfred M. Szmidt]

   Pushed, thanks,

Thank you.  

Small suggestion, it would be a good idea to add a time-stamp to the
https://elpa.nongnu.org/nongnu/ page, and in general to any
auto-generated page.  Hard to know when it was last updated or not.

Re: vc-fossil to non-gnu elpa?

[Stefan Kangas]

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

"Alfred M. Szmidt" <ams@gnu.org> writes:

> Small suggestion, it would be a good idea to add a time-stamp to the
> https://elpa.nongnu.org/nongnu/ page, and in general to any
> auto-generated page.  Hard to know when it was last updated or not.

This would be fixed by the second of the attached patches.

But I have two issues that maybe Stefan M can help with.

A) It seems like there are two versions of the elpa-admin branch, or at
   least that the one in elpa.git is out of synch/outdated?

B) I can't push to elpa-admin from nongnu.git.  Am I supposed to do
   that?

Probably I'm just confused by this whole worktree business.

[-- Attachment #2: 0001-Fix-footer-on-package-pages.patch --]
[-- Type: text/x-diff, Size: 1398 bytes --]

From f434c67c2a7ed088115145744e42e201b4b61e56 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Wed, 29 Sep 2021 19:11:32 +0200
Subject: [PATCH 1/2] Fix footer on package pages

* elpa-admin.el (elpaa--html-footer, elpaa--html-make-index): Fix footer.
---
 elpa-admin.el | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index ac72f2f6d..e99bd8909 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -1121,7 +1121,10 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
           title (or header title)))
 
 (defun elpaa--html-footer ()
-  (format "\n
+  (format "            </div>
+            <div class=\"push\"></div>
+        </div>
+
         <div class=\"footer\">
             <div class=\"container\">
                 <p>Copyright 2016-%s <a href=\"https://fsf.org\">Free Software Foundation</a>, Inc.</p>
@@ -1346,10 +1349,7 @@ return section under HEADER in package's main file."
                       (car pkg) (car pkg)
                       (package-version-join (aref (cdr pkg) 0))
                       (aref (cdr pkg) 2))))
-    (insert "                </table>
-            </div>
-            <div class=\"push\"></div>
-        </div>")
+    (insert "                </table>\n")
     (insert (elpaa--html-footer))
     (write-region (point-min) (point-max) "index.html")))
 
-- 
2.30.2


[-- Attachment #3: 0002-Add-timestamp-to-generated-pages.patch --]
[-- Type: text/x-diff, Size: 1050 bytes --]

From 32eb471ce26159613a2795b11b4024d8e0522eae Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Wed, 29 Sep 2021 19:14:42 +0200
Subject: [PATCH 2/2] Add timestamp to generated pages

* elpa-admin.el (elpaa--html-footer): Add timestamp to generated
pages.
---
 elpa-admin.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index e99bd8909..c09a51694 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -1121,7 +1121,9 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
           title (or header title)))
 
 (defun elpaa--html-footer ()
-  (format "            </div>
+  (format "\
+            <p>Last update: %s</p>
+            </div>
             <div class=\"push\"></div>
         </div>
 
@@ -1139,6 +1141,7 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
         </div>
 
 </body>\n"
+          (format-time-string "%Y-%m-%d %H:%M")
           (format-time-string "%Y")))
 
 (defun elpaa--html-bytes-format (bytes) ;Aka memory-usage-format.
-- 
2.30.2

Re: vc-fossil to non-gnu elpa?

[Philip Kaludercic]

Stefan Kangas <stefan@marxist.se> writes:

> "Alfred M. Szmidt" <ams@gnu.org> writes:
>
>> Small suggestion, it would be a good idea to add a time-stamp to the
>> https://elpa.nongnu.org/nongnu/ page, and in general to any
>> auto-generated page.  Hard to know when it was last updated or not.
>
> This would be fixed by the second of the attached patches.
>
> But I have two issues that maybe Stefan M can help with.
>
> A) It seems like there are two versions of the elpa-admin branch, or at
>    least that the one in elpa.git is out of synch/outdated?
>
> B) I can't push to elpa-admin from nongnu.git.  Am I supposed to do
>    that?

I am not sure, but elpa-admin is actually part of elpa.git, have you
tried to push the changes from that checkout?

> Probably I'm just confused by this whole worktree business.

-- 
	Philip Kaludercic

Re: vc-fossil to non-gnu elpa?

[Alfred M. Szmidt]

   > Would it be possible to add vc-fossil to non-gnu elpa?

   I haven't looked at that code, so I can't really tell, but most likely
   it is, yes.  All you need to do is check that it's acceptable according
   to our criteria and if so add it to the `elpa-packages` file in the
   `main` branch on `nongnu.git`.

Cool.  I'll double check the list of requirements, and fix them if
need be.  And post a patch for nongnu.git.

Re: vc-fossil to non-gnu elpa?

[Eli Zaretskii]

> From: "Alfred M. Szmidt" <ams@gnu.org>
> Date: Mon, 04 Jan 2021 06:14:43 -0500
> Cc: emacs-devel@gnu.org
> 
>    > Would it be possible to add vc-fossil to non-gnu elpa?
> 
>    I haven't looked at that code, so I can't really tell, but most likely
>    it is, yes.  All you need to do is check that it's acceptable according
>    to our criteria and if so add it to the `elpa-packages` file in the
>    `main` branch on `nongnu.git`.
> 
> Cool.  I'll double check the list of requirements, and fix them if
> need be.  And post a patch for nongnu.git.

Come to think of this, is there any reason why vc-fossil.el shouldn't
be in core?  Is Fossil less important then, say, SCCS or RCS or
WebDAV?

Re: vc-fossil to non-gnu elpa?

[Alfred M. Szmidt]

   >    > Would it be possible to add vc-fossil to non-gnu elpa?
   > 
   >    I haven't looked at that code, so I can't really tell, but most likely
   >    it is, yes.  All you need to do is check that it's acceptable according
   >    to our criteria and if so add it to the `elpa-packages` file in the
   >    `main` branch on `nongnu.git`.
   > 
   > Cool.  I'll double check the list of requirements, and fix them if
   > need be.  And post a patch for nongnu.git.

   Come to think of this, is there any reason why vc-fossil.el shouldn't
   be in core?  Is Fossil less important then, say, SCCS or RCS or
   WebDAV?

Gathering copyright assignments or disclaimers is the main issue; I
haven't been able to contact one author.  The track of changes record
is not optimal either.

Re: vc-fossil to non-gnu elpa?

[Richard Stallman]

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

  > Gathering copyright assignments or disclaimers is the main issue; I
  > haven't been able to contact one author.

Could you rewrite that person's contributions?

-- 
Dr Richard Stallman
Chief GNUisance of the GNU Project (https://gnu.org)
Founder, Free Software Foundation (https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)

Re: vc-fossil to non-gnu elpa?

[Alfred M. Szmidt]

     > Gathering copyright assignments or disclaimers is the main issue; I
     > haven't been able to contact one author.

   Could you rewrite that person's contributions?

It might be possible, but I don't have that type of time.