From: Uwe B. <ou...@ma...> - 2024-07-30 12:29:10
Attachments:
smime.p7s
|
Hi all (especially Eric) As you maybe aware of, we plan to move the development to github. That is a good moment, to think about cleaning up a bit the repository, like rebasing and deleting old merged branches. The idea is once we agree, I would push a test, but public repository to my own github account so that everybody can have a look and if everything is alright it will then be pushed to its new «home», and we will leave a note in sourceforge. 1. I would like to rename the principal branch, «default» (instead of master). That simplify things quite a bit on my side, besides the name master is hm, controversial, a lot of repositories call the principal branch now, «main», but on technical reasons I prefer, «default» 2. The actual git branches - Git branch -a tells me ,---- | | * master | remotes/origin/HEAD -> origin/master | remotes/origin/copyright | remotes/origin/documentation | remotes/origin/fill-fix | remotes/origin/font-lock | remotes/origin/fontlockhang | remotes/origin/hairyblocks | remotes/origin/mac_init | remotes/origin/master | remotes/origin/matlab-cells | remotes/origin/modernize | remotes/origin/org-mode | remotes/origin/shell-patch | remotes/origin/shellcomplete | remotes/origin/strings | remotes/origin/usage1 | remotes/origin/wisent-parser `---- - while git branch -r --no-merged origin/master results in ,---- | | origin/copyright | origin/fill-fix | origin/fontlockhang | origin/matlab-cells | origin/org-mode | origin/shellcomplete | origin/wisent-parser `---- So 7 branches are actually not merged and can't be deleted without loosing the commits. 1. I created - copyright, (to sort out the issue with the FSF papers and having the repository in ELPA, not MELPA) - fill-fix a branch for testing and trying to improve the filling of comments, and inline comments. - org-mode a branch for testing who the matlab-shell could interact with org mode. 2. Nidish created matlab-cells, which hopefully soon will be merged into master/default. 3. Eric created the rest. So Eric, is it ok if I delete all the branches that are *not* merged into master? Once that is settled, I rename master-->default, do some rebasing and push the result to a test repository in github. Regards Uwe -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. |
From: Eric L. <eri...@gm...> - 2024-07-31 13:40:00
|
Thanks for doing all this work Uwe. I appreciate it. For unmerged branches, I recognize some as branches that were merged via other avenues, and others are not relevant anymore or I don't recall what I might have been up to. Should be fine to ignore them all Thanks for checking in Eric On Tue, Jul 30, 2024 at 8:29 AM Uwe Brauer via Matlab-emacs-discuss < mat...@li...> wrote: > Hi all (especially Eric) > > > As you maybe aware of, we plan to move the development to github. That > is a good moment, to think about cleaning up a bit the repository, like > rebasing and deleting old merged branches. > > The idea is once we agree, I would push a test, but public repository to > my own > github account so that everybody can have a look and if everything is > alright it will then be pushed to its new «home», and we will leave a > note in sourceforge. > > 1. I would like to rename the principal branch, «default» (instead of > master). That simplify things quite a bit on my side, besides the > name master is hm, controversial, a lot of repositories call the > principal branch now, «main», but on technical reasons I prefer, > «default» > > 2. The actual git branches > > - Git branch -a tells me > ,---- > | > | * master > | remotes/origin/HEAD -> origin/master > | remotes/origin/copyright > | remotes/origin/documentation > | remotes/origin/fill-fix > | remotes/origin/font-lock > | remotes/origin/fontlockhang > | remotes/origin/hairyblocks > | remotes/origin/mac_init > | remotes/origin/master > | remotes/origin/matlab-cells > | remotes/origin/modernize > | remotes/origin/org-mode > | remotes/origin/shell-patch > | remotes/origin/shellcomplete > | remotes/origin/strings > | remotes/origin/usage1 > | remotes/origin/wisent-parser > `---- > > > - while git branch -r --no-merged origin/master results in > ,---- > | > | origin/copyright > | origin/fill-fix > | origin/fontlockhang > | origin/matlab-cells > | origin/org-mode > | origin/shellcomplete > | origin/wisent-parser > `---- > > So 7 branches are actually not merged and can't be deleted without > loosing the commits. > > > > 1. I created > > - copyright, (to sort out the issue with the FSF papers and having > the repository in ELPA, not MELPA) > > - fill-fix a branch for testing and trying to improve the filling of > comments, and inline comments. > > - org-mode a branch for testing who the matlab-shell could > interact with org mode. > > 2. Nidish created matlab-cells, which hopefully soon will be merged > into master/default. > > 3. Eric created the rest. So Eric, is it ok if I delete all the > branches that are *not* merged into master? > > > Once that is settled, I rename master-->default, do some rebasing and > push the result to a test repository in github. > > Regards > > Uwe > > > > > > > > > > > -- > I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel > I strongly condemn Putin's war of aggression against Ukraine. > I support to deliver weapons to Ukraine's military. > I support the EU and NATO membership of Ukraine. > > _______________________________________________ > Matlab-emacs-discuss mailing list > Mat...@li... > https://lists.sourceforge.net/lists/listinfo/matlab-emacs-discuss > |
From: Uwe B. <ou...@ma...> - 2024-07-31 16:07:30
Attachments:
smime.p7s
|
>>> "EL" == Eric Ludlam <eri...@gm...> writes: Hi > Thanks for doing all this work Uwe. I appreciate it. > For unmerged branches, I recognize some as branches that were merged via > other avenues, and others are not relevant anymore or I don't recall what I > might have been up to. Should be fine to ignore them all Just to be sure, because this is git not mercurial, deleting an unmerged branch will delete all its commits (impossible in mercurial). So I would like to keep the following branches, for the moment - matlab-cells - org-mode - fill-fix - copyright - documentation. If I understand you correctly I can delete the unmerged branches. - fonlockhang - shell-complete - wisent-parser Right? I can do that as soon as I have you definite ok and push the resulting repository for further inspection as a public repository to my github account. Uwe -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. |
From: Eric L. <eri...@gm...> - 2024-08-01 02:56:26
|
Removing those 3 items are fine with me. Here are some details. * I'm pretty sure fontlockhang was used by John to solve problems at MathWorks. I thought John then recommended the fixes be merged into mainline after that. * wisent-parser is a dead end and is fine to delete * shell-complete I just don't recall what that is. Maybe there is something useful in there but I don't remember enough about it to advise. I was looking to use the sourceforge interface to show what was different about each branch from where it was branched from, but I didn't see an easy way to do that. That would make it much easier to verify my assumptions about fontlockhang, or guess at what shell-complete was about. Is there an easy way to do that? Thanks Eric On Wed, Jul 31, 2024 at 11:07 AM Uwe Brauer <ou...@ma...> wrote: > >>> "EL" == Eric Ludlam <eri...@gm...> writes: > > Hi > > Thanks for doing all this work Uwe. I appreciate it. > > For unmerged branches, I recognize some as branches that were merged via > > other avenues, and others are not relevant anymore or I don't recall > what I > > might have been up to. Should be fine to ignore them all > > Just to be sure, because this is git not mercurial, deleting an unmerged > branch will delete all its commits (impossible in mercurial). > > So I would like to keep the following branches, for the moment > > - matlab-cells > > - org-mode > > - fill-fix > > - copyright > > - documentation. > > If I understand you correctly I can delete the unmerged branches. > > - fonlockhang > > - shell-complete > > - wisent-parser > > Right? I can do that as soon as I have you definite ok and push the > resulting repository for further inspection as a public repository to my > github account. > > Uwe > > > > > -- > I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel > I strongly condemn Putin's war of aggression against Ukraine. > I support to deliver weapons to Ukraine's military. > I support the EU and NATO membership of Ukraine. > > |
From: Uwe B. <ou...@ma...> - 2024-08-01 08:03:36
Attachments:
smime.p7s
|
>>> "EL" == Eric Ludlam <eri...@gm...> writes: > Removing those 3 items are fine with me. Here are some details. > * I'm pretty sure fontlockhang was used by John to solve problems at > MathWorks. I thought John then recommended the fixes be merged into > mainline after that. I would like to clarify these issues before we move to github Hm, ok @John, what do you say? Shall (and can) this branch be merged into master (in sourceforge)? Can you do that? > * wisent-parser is a dead end and is fine to delete Ok. > * shell-complete I just don't recall what that is. Maybe there is > something useful in there but I don't remember enough about it to advise. > I was looking to use the sourceforge interface to show what was different > about each branch from where it was branched from, but I didn't see an easy > way to do that. That would make it much easier to verify my assumptions > about fontlockhang, or guess at what shell-complete was about. Is there an > easy way to do that? Yes and no. First a small rant. Git is praised for its speed and flexibility, (renaming, tracking, deleting branches), but this comes at a price. In git you can never be sure where a branch starts and which commits belong to which branch (there are relative simple counter examples, but I don't want to bore you). There is the command name-rev which tries on the fly to find out which commit belongs to which branch but as said this is not failsafe (contrary to mercurial). So what you should do on the command line is this. git switch --guess shellcomplete git log --graph --color=always --decorate --pretty | git name-rev --annotate-stdin | less -R That gives me * commit 27972c21a5b7b154af83b0d0a941674f668dd06b (shellcomplete) (HEAD -> shellcomplete, origin/shellcomplete) | Author: Eric Ludlam <er...@si...> | Date: Tue Apr 6 20:45:07 2021 -0400 | | matlab-shell.el: | | (matlab-shell-collect-command-output): Prevent read-only text from throwing | errors for systems where this is on by default. | * commit 9c0da9f52812001ff3584f623fe4fa6f62b7a7b1 (shellcomplete~1) | Author: Eric Ludlam <er...@si...> | Date: Mon Jan 18 11:58:12 2021 -0500 | | matlab-xref.el: | | (matlab-shell-xref-activate, matlab-local-xref-activate): | Don't bother checking major mode. Only installed for ML buffers, | and user might want to install in org mode buffers too. | * commit 34aab6039575f7132a99116ec4760a0a51d2d587 (shellcomplete~2) | Author: Eric Ludlam <er...@si...> | Date: Sun Jan 17 12:34:29 2021 -0500 | | matlab.el: | | (matlab-local-xref-activate): Declare fcn / quiet compiler. | * commit 8fe27556fe2acdfca2e65eee919fd05e283e00bc (shellcomplete~3) | Author: Eric Ludlam <er...@si...> | Date: Sun Jan 17 12:33:16 2021 -0500 | | | *commit 71daa45c0b0f0513c24461a0a24a277bc7430f91 (shellcomplete~8) Begin the last commit on that branch. Hope this helps Uwe -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. |
From: Uwe B. <ou...@ma...> - 2024-08-01 15:17:01
Attachments:
smime.p7s
|
>>> "UB" == Uwe Brauer <ou...@ma...> writes: >>> "EL" == Eric Ludlam <eri...@gm...> writes: >> Removing those 3 items are fine with me. Here are some details. >> * I'm pretty sure fontlockhang was used by John to solve problems at >> MathWorks. I thought John then recommended the fixes be merged into >> mainline after that. > I would like to clarify these issues before we move to github > Hm, ok @John, what do you say? Shall (and can) this branch be merged > into master (in sourceforge)? Can you do that? >> * wisent-parser is a dead end and is fine to delete > Ok. >> * shell-complete I just don't recall what that is. Maybe there is >> something useful in there but I don't remember enough about it to advise. >> I was looking to use the sourceforge interface to show what was different >> about each branch from where it was branched from, but I didn't see an easy >> way to do that. That would make it much easier to verify my assumptions >> about fontlockhang, or guess at what shell-complete was about. Is there an >> easy way to do that? I just realize that maybe I misunderstood you, do you want to see which files have been changed in each commit in that branch, or do you want to have a diff of the latest commit in master with each commit in that branch? -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. |
From: Eric L. <eri...@gm...> - 2024-08-01 17:59:23
|
Regarding finding differences between a branch and main/master. I was trying to remind myself what the changes were. Thus, just a diff between branch tip and main/master from whence the branch was created. (ie - what did I change). Then I could check main/master to see if that change was already merged (in the case of the fontlock branch). I know how to do it from the command line (or more accurately, I know how to look up how to do it), but I didn't have a clone handy at the time and was hoping to use the web interface for a quick check and not delay replying. I can dig in more soon to find the answers when I get some other tasks off my plate. Eric On Thu, Aug 1, 2024 at 11:16 AM Uwe Brauer <ou...@ma...> wrote: > >>> "UB" == Uwe Brauer <ou...@ma...> writes: > > >>> "EL" == Eric Ludlam <eri...@gm...> writes: > >> Removing those 3 items are fine with me. Here are some details. > >> * I'm pretty sure fontlockhang was used by John to solve problems at > >> MathWorks. I thought John then recommended the fixes be merged into > >> mainline after that. > > > I would like to clarify these issues before we move to github > > > Hm, ok @John, what do you say? Shall (and can) this branch be merged > > into master (in sourceforge)? Can you do that? > > > >> * wisent-parser is a dead end and is fine to delete > > > Ok. > > >> * shell-complete I just don't recall what that is. Maybe there is > >> something useful in there but I don't remember enough about it to > advise. > > >> I was looking to use the sourceforge interface to show what was > different > >> about each branch from where it was branched from, but I didn't see an > easy > >> way to do that. That would make it much easier to verify my assumptions > >> about fontlockhang, or guess at what shell-complete was about. Is > there an > >> easy way to do that? > > > I just realize that maybe I misunderstood you, do you want to see which > files have been changed in each commit in that branch, or do you want to > have a diff of the latest commit in master with each commit in that branch? > > > > -- > I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel > I strongly condemn Putin's war of aggression against Ukraine. > I support to deliver weapons to Ukraine's military. > I support the EU and NATO membership of Ukraine. > > |
From: John C. <ci...@ma...> - 2024-08-01 20:26:04
|
Regarding the fontlockhang, these have been merged in to the main/master branch already. I just manually compared matlab.el between and the fontlock improvements are in the tip. The fontlockhang branch can be deleted. Note, in MathWorks we are using the current matlab-emacs tip minus a few items that no longer work such as the cedet items. Once we get matlab-emacs into github, I'll update it with improvements such as good org mode support and LSP support. Thanks, John ________________________________ From: Eric Ludlam <eri...@gm...> Sent: Thursday, August 1, 2024 1:59 PM To: Uwe Brauer <ou...@ma...> Cc: matlab-emacs-discuss <mat...@li...> Subject: Re: [Matlab-emacs-discuss] move -->github: rebase, and which branches could be deleted Regarding finding differences between a branch and main/master. I was trying to remind myself what the changes were. Thus, just a diff between branch tip and main/master from whence the branch was created. (ie - what did I change). Then I could check main/master to see if that change was already merged (in the case of the fontlock branch). I know how to do it from the command line (or more accurately, I know how to look up how to do it), but I didn't have a clone handy at the time and was hoping to use the web interface for a quick check and not delay replying. I can dig in more soon to find the answers when I get some other tasks off my plate. Eric On Thu, Aug 1, 2024 at 11:16 AM Uwe Brauer <ou...@ma...<mailto:ou...@ma...>> wrote: >>> "UB" == Uwe Brauer <ou...@ma...<mailto:ou...@ma...>> writes: >>> "EL" == Eric Ludlam <eri...@gm...<mailto:eri...@gm...>> writes: >> Removing those 3 items are fine with me. Here are some details. >> * I'm pretty sure fontlockhang was used by John to solve problems at >> MathWorks. I thought John then recommended the fixes be merged into >> mainline after that. > I would like to clarify these issues before we move to github > Hm, ok @John, what do you say? Shall (and can) this branch be merged > into master (in sourceforge)? Can you do that? >> * wisent-parser is a dead end and is fine to delete > Ok. >> * shell-complete I just don't recall what that is. Maybe there is >> something useful in there but I don't remember enough about it to advise. >> I was looking to use the sourceforge interface to show what was different >> about each branch from where it was branched from, but I didn't see an easy >> way to do that. That would make it much easier to verify my assumptions >> about fontlockhang, or guess at what shell-complete was about. Is there an >> easy way to do that? I just realize that maybe I misunderstood you, do you want to see which files have been changed in each commit in that branch, or do you want to have a diff of the latest commit in master with each commit in that branch? -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. |
From: Uwe B. <ou...@ma...> - 2024-08-01 20:46:33
Attachments:
smime.p7s
|
>>> "JC" == John Ciolfi <ci...@ma...> writes: > Regarding the fontlockhang, these have been merged in to the > main/master branch already. I just manually compared matlab.el between > and the fontlock improvements are in the tip. > The fontlockhang branch can be deleted. This is odd, (and this is why I don't trust git (and prefer mercurial 😉) If I run clone the sourceforge repository again and run git log --graph --color=always --all --decorate --pretty | git name-rev --annotate-stdin | less -R I see | * commit ce22c697d06ece776cfd7a9a41b3704f1815823f (remotes/origin/fontlockhang) (origin/fontlockhang) | | Author: Eric Ludlam <el...@ma...> | | Date: Mon Sep 26 17:44:26 2022 -0400 | | | | mclass.m: Added AH to test a type with a long package name. | | | | This used to be very very slow or hang Emacs. | | | * commit c0af4943b5d45fa73e6d4ed5681121d6e1983727 (remotes/origin/fontlockhang~1) |/ Author: Eric Ludlam <el...@ma...> | Date: Mon Sep 26 17:31:41 2022 -0400 | | (matlab-font-lock-anchor-variable-match): Fix regex to be faster. | | Fixes what was percieved as a hang for properties with lots of package.class types. | So this branch clearly is not merged. That is confirmed by running git branch -a --no-merged master remotes/origin/copyright remotes/origin/fill-fix remotes/origin/fontlockhang remotes/origin/matlab-cells remotes/origin/org-mode remotes/origin/shellcomplete remotes/origin/wisent-parser Could you please check again and confirm before I delete, because if I delete an unmerged branch in git, its commits are gone (well I will do this on my experimental github repository not in sourceforge). > Note, in MathWorks we are using the current matlab-emacs tip minus a > few items that no longer work such as the cedet items. Once we get > matlab-emacs into github, I'll update it with improvements such as > good org mode support and LSP support. Ok, should be ready in a couple of days. I need to clarify the status of this branch and the one Eric is looking into. Uwe -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. |
From: John C. <ci...@ma...> - 2024-08-04 10:59:55
|
Hi I just double checked the fontlonkhang branch, downloaded zip * matlab-emacs-src-a78b368387c85437f8de187acf0a2b1cbeeacc3f/ (master) * matlab-emacs-src-ce22c697d06ece776cfd7a9a41b3704f1815823f/ (fontlockhang) And diff'd them - all changes are in master. I also validated that the hangs we were seeing no longer exist. I believe what happened is that Eric and I used the fontlockhang as a "staging" area and then once solved, we manually added to master. Thanks John ________________________________ From: Uwe Brauer Sent: Thursday, August 01, 2024 4:46 PM To: John Ciolfi Cc: Eric Ludlam; Uwe Brauer; matlab-emacs-discuss Subject: Re: [Matlab-emacs-discuss] move -->github: rebase, and which branches could be deleted >>> "JC" == John Ciolfi <ci...@ma...> writes: > Regarding the fontlockhang, these have been merged in to the > main/master branch already. I just manually compared matlab.el between > and the fontlock improvements are in the tip. > The fontlockhang branch can be deleted. This is odd, (and this is why I don't trust git (and prefer mercurial 😉) If I run clone the sourceforge repository again and run git log --graph --color=always --all --decorate --pretty | git name-rev --annotate-stdin | less -R I see | * commit ce22c697d06ece776cfd7a9a41b3704f1815823f (remotes/origin/fontlockhang) (origin/fontlockhang) | | Author: Eric Ludlam <el...@ma...> | | Date: Mon Sep 26 17:44:26 2022 -0400 | | | | mclass.m: Added AH to test a type with a long package name. | | | | This used to be very very slow or hang Emacs. | | | * commit c0af4943b5d45fa73e6d4ed5681121d6e1983727 (remotes/origin/fontlockhang~1) |/ Author: Eric Ludlam <el...@ma...> | Date: Mon Sep 26 17:31:41 2022 -0400 | | (matlab-font-lock-anchor-variable-match): Fix regex to be faster. | | Fixes what was percieved as a hang for properties with lots of package.class types. | So this branch clearly is not merged. That is confirmed by running git branch -a --no-merged master remotes/origin/copyright remotes/origin/fill-fix remotes/origin/fontlockhang remotes/origin/matlab-cells remotes/origin/org-mode remotes/origin/shellcomplete remotes/origin/wisent-parser Could you please check again and confirm before I delete, because if I delete an unmerged branch in git, its commits are gone (well I will do this on my experimental github repository not in sourceforge). > Note, in MathWorks we are using the current matlab-emacs tip minus a > few items that no longer work such as the cedet items. Once we get > matlab-emacs into github, I'll update it with improvements such as > good org mode support and LSP support. Ok, should be ready in a couple of days. I need to clarify the status of this branch and the one Eric is looking into. Uwe -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. |
From: Uwe B. <ou...@ma...> - 2024-08-04 15:52:59
Attachments:
smime.p7s
|
>>> "JC" == John Ciolfi <ci...@ma...> writes: > Hi > I just double checked the fontlonkhang branch, downloaded zip > * > matlab-emacs-src-a78b368387c85437f8de187acf0a2b1cbeeacc3f/ (master) > * > matlab-emacs-src-ce22c697d06ece776cfd7a9a41b3704f1815823f/ (fontlockhang) > And diff'd them - all changes are in master. I also validated that the > hangs we were seeing no longer exist. Ok, thanks for checking to this settled and this branch can be safely deleted. The only open question then concerns the shellcomplete branch, Eric wanted to check. > Thanks > John > ________________________________ > From: Uwe Brauer > Sent: Thursday, August 01, 2024 4:46 PM > To: John Ciolfi > Cc: Eric Ludlam; Uwe Brauer; matlab-emacs-discuss > Subject: Re: [Matlab-emacs-discuss] move -->github: rebase, and which branches could be deleted >>> "JC" == John Ciolfi <ci...@ma...> writes: >> Regarding the fontlockhang, these have been merged in to the >> main/master branch already. I just manually compared matlab.el between >> and the fontlock improvements are in the tip. >> The fontlockhang branch can be deleted. > This is odd, (and this is why I don't trust git (and prefer mercurial 😉) > If I run clone the sourceforge repository again and run > git log --graph --color=always --all --decorate --pretty | git name-rev --annotate-stdin | less -R > I see > | * commit ce22c697d06ece776cfd7a9a41b3704f1815823f (remotes/origin/fontlockhang) (origin/fontlockhang) > | | Author: Eric Ludlam <el...@ma...> > | | Date: Mon Sep 26 17:44:26 2022 -0400 > | | > | | mclass.m: Added AH to test a type with a long package name. > | | > | | This used to be very very slow or hang Emacs. > | | > | * commit c0af4943b5d45fa73e6d4ed5681121d6e1983727 (remotes/origin/fontlockhang~1) > |/ Author: Eric Ludlam <el...@ma...> > | Date: Mon Sep 26 17:31:41 2022 -0400 > | > | (matlab-font-lock-anchor-variable-match): Fix regex to be faster. > | > | Fixes what was percieved as a hang for properties with lots of package.class types. > | > So this branch clearly is not merged. That is confirmed by running > git branch -a --no-merged master > remotes/origin/copyright > remotes/origin/fill-fix > remotes/origin/fontlockhang > remotes/origin/matlab-cells > remotes/origin/org-mode > remotes/origin/shellcomplete > remotes/origin/wisent-parser > Could you please check again and confirm before I delete, because if I > delete an unmerged branch in git, its commits are gone (well I will do > this on my experimental github repository not in sourceforge). >> Note, in MathWorks we are using the current matlab-emacs tip minus a >> few items that no longer work such as the cedet items. Once we get >> matlab-emacs into github, I'll update it with improvements such as >> good org mode support and LSP support. > Ok, should be ready in a couple of days. I need to clarify the status of > this branch and the one Eric is looking into. > Uwe -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. |
From: John C. <ci...@ma...> - 2024-08-05 11:42:46
|
I took a quick look at shellcomplete and think master is more current. There's a fair bit of diff in matlab-complete.el and master looks more current. Around the time of the branch activity, Eric and I were improving matlab completion and I think we used this branch a little, then directly sent to master. Also, all the older completion problems that we were working on are resolved (master contains the fixes). We'll wait for Eric to verify before deleting the shellcomplete branch. Thanks John ________________________________ From: Uwe Brauer Sent: Sunday, August 04, 2024 11:52 AM To: John Ciolfi Cc: Uwe Brauer; Eric Ludlam; matlab-emacs-discuss Subject: Re: [Matlab-emacs-discuss] move -->github: rebase, and which branches could be deleted >>> "JC" == John Ciolfi <ci...@ma...> writes: > Hi > I just double checked the fontlonkhang branch, downloaded zip > * > matlab-emacs-src-a78b368387c85437f8de187acf0a2b1cbeeacc3f/ (master) > * > matlab-emacs-src-ce22c697d06ece776cfd7a9a41b3704f1815823f/ (fontlockhang) > And diff'd them - all changes are in master. I also validated that the > hangs we were seeing no longer exist. Ok, thanks for checking to this settled and this branch can be safely deleted. The only open question then concerns the shellcomplete branch, Eric wanted to check. > Thanks > John > ________________________________ > From: Uwe Brauer > Sent: Thursday, August 01, 2024 4:46 PM > To: John Ciolfi > Cc: Eric Ludlam; Uwe Brauer; matlab-emacs-discuss > Subject: Re: [Matlab-emacs-discuss] move -->github: rebase, and which branches could be deleted >>> "JC" == John Ciolfi <ci...@ma...> writes: >> Regarding the fontlockhang, these have been merged in to the >> main/master branch already. I just manually compared matlab.el between >> and the fontlock improvements are in the tip. >> The fontlockhang branch can be deleted. > This is odd, (and this is why I don't trust git (and prefer mercurial 😉) > If I run clone the sourceforge repository again and run > git log --graph --color=always --all --decorate --pretty | git name-rev --annotate-stdin | less -R > I see > | * commit ce22c697d06ece776cfd7a9a41b3704f1815823f (remotes/origin/fontlockhang) (origin/fontlockhang) > | | Author: Eric Ludlam <el...@ma...> > | | Date: Mon Sep 26 17:44:26 2022 -0400 > | | > | | mclass.m: Added AH to test a type with a long package name. > | | > | | This used to be very very slow or hang Emacs. > | | > | * commit c0af4943b5d45fa73e6d4ed5681121d6e1983727 (remotes/origin/fontlockhang~1) > |/ Author: Eric Ludlam <el...@ma...> > | Date: Mon Sep 26 17:31:41 2022 -0400 > | > | (matlab-font-lock-anchor-variable-match): Fix regex to be faster. > | > | Fixes what was percieved as a hang for properties with lots of package.class types. > | > So this branch clearly is not merged. That is confirmed by running > git branch -a --no-merged master > remotes/origin/copyright > remotes/origin/fill-fix > remotes/origin/fontlockhang > remotes/origin/matlab-cells > remotes/origin/org-mode > remotes/origin/shellcomplete > remotes/origin/wisent-parser > Could you please check again and confirm before I delete, because if I > delete an unmerged branch in git, its commits are gone (well I will do > this on my experimental github repository not in sourceforge). >> Note, in MathWorks we are using the current matlab-emacs tip minus a >> few items that no longer work such as the cedet items. Once we get >> matlab-emacs into github, I'll update it with improvements such as >> good org mode support and LSP support. > Ok, should be ready in a couple of days. I need to clarify the status of > this branch and the one Eric is looking into. > Uwe -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. |
From: Uwe B. <ou...@ma...> - 2024-08-09 07:55:24
Attachments:
smime.p7s
|
>>> "EL" == Eric Ludlam <eri...@gm...> writes: > Regarding finding differences between a branch and main/master. > I was trying to remind myself what the changes were. Thus, just a diff > between branch tip and main/master from whence the branch was created. (ie > - what did I change). Then I could check main/master to see if that change > was already merged (in the case of the fontlock branch). Any news? Uwe -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. |
From: Uwe B. <ou...@ma...> - 2024-08-13 09:11:52
Attachments:
smime.p7s
|
>>> "EL" == Eric Ludlam <eri...@gm...> writes: Hi all > Regarding finding differences between a branch and main/master. > I was trying to remind myself what the changes were. Thus, just a diff > between branch tip and main/master from whence the branch was created. (ie > - what did I change). Then I could check main/master to see if that change > was already merged (in the case of the fontlock branch). Sorry to nag, but basically I have around 2 weeks left in which I can find the time to deal with the move of the repository to github and do the cleanup we discussed 1. I also would like to settle the issue concerning ELPA, but I think it is best do do this after the move to github 2. Maybe we should then remove the MELPA package just in order to simplify things. Sorry Eric, any idea what to do with the only branch whose status is unclear: shellcomplete Uwe -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. |
From: John C. <ci...@ma...> - 2024-08-13 10:54:44
|
I think Eric may be on vacation. I'm fairly confident that we've already taken the work from shellcomplete and put it in master. Just in case we haven't, I just made a git clone of matlab-emacs that contains all the current branches. I'll double check with Eric when he's back. I too am about to run out of time to work on this, so it would be good to get this the code into github. Therefore, please go ahead and delete the shellcomplete branch and set things up so we can move it into github. As for ELPA, yes, lets work on this after moving to github. Thanks John ________________________________ From: Uwe Brauer via Matlab-emacs-discuss <mat...@li...> Sent: Tuesday, August 13, 2024 5:11 AM To: Eric Ludlam <eri...@gm...> Cc: matlab-emacs-discuss <mat...@li...> Subject: Re: [Matlab-emacs-discuss] move -->github: rebase, and which branches could be deleted >>> "EL" == Eric Ludlam <eri...@gm...> writes: Hi all > Regarding finding differences between a branch and main/master. > I was trying to remind myself what the changes were. Thus, just a diff > between branch tip and main/master from whence the branch was created. (ie > - what did I change). Then I could check main/master to see if that change > was already merged (in the case of the fontlock branch). Sorry to nag, but basically I have around 2 weeks left in which I can find the time to deal with the move of the repository to github and do the cleanup we discussed 1. I also would like to settle the issue concerning ELPA, but I think it is best do do this after the move to github 2. Maybe we should then remove the MELPA package just in order to simplify things. Sorry Eric, any idea what to do with the only branch whose status is unclear: shellcomplete Uwe -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. |
From: Uwe B. <ou...@ma...> - 2024-08-13 12:41:09
Attachments:
smime.p7s
|
>>> "JC" == John Ciolfi <ci...@ma...> writes: > I think Eric may be on vacation. I'm fairly confident that we've > already taken the work from shellcomplete and put it in master. Just > in case we haven't, I just made a git clone of matlab-emacs that > contains all the current branches. I'll double check with Eric when > he's back. I have also quite a bit of clones, so no worries. > I too am about to run out of time to work on this, so it would be good > to get this the code into github. Therefore, please go ahead and > delete the shellcomplete branch and set things up so we can move it > into github. Here is what I did on my local machine (I did not mess up with sourceforge) - git clone --bare git+ssh://ou...@gi.../p/matlab-emacs/src matlab-sf-mirror-bare - cd matlab-sf-mirror-bare - delete the branches via git branch -D wisent-parser git branch -D fontlockhang git branch -D strings git branch -D usage1 git branch -D hairyblocks git branch -D mac_init git branch -D modernize git branch -D font-lock git branch -D shell-patch git branch -D shellcomplete - I created a new public github repository (for you and others to check) and git push --mirror gi...@gi...:ouboub/matlab-sf-git-mirror.git Now, if you are satisfies 1. You create the repository in the MATLAB structure/world in github but don't add anything and give me write access. 2. Or: you need to run on your machine - git clone --bare gi...@gi...:ouboub/matlab-sf-git-mirror.git - cd matlab-sf-git-mirror - git push --mirror git@WHEREEVER However: and I digged into that quite a bit. There is a certain bug or missing feature. If you do it this way, github selects the default branch randomly! You have to open the UI and switch the default branch to default Once I have write access I can also check this, but it is important otherwise things get messy. > As for ELPA, yes, lets work on this after moving to github. ok Please tell me how to proceed. Uwe -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. |
From: Uwe B. <ou...@ma...> - 2024-08-13 12:43:14
Attachments:
smime.p7s
|
> I have also quite a bit of clones, so no worries. > Here is what I did on my local machine (I did not mess up with sourceforge) > - git clone --bare git+ssh://ou...@gi.../p/matlab-emacs/src matlab-sf-mirror-bare > - cd matlab-sf-mirror-bare > - delete the branches via > git branch -D wisent-parser > git branch -D fontlockhang > git branch -D strings > git branch -D usage1 > git branch -D hairyblocks > git branch -D mac_init > git branch -D modernize > git branch -D font-lock > git branch -D shell-patch > git branch -D shellcomplete I forget before I pushed I also did: - git branch -m default renaming the master branch default. -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. |
From: John C. <ci...@ma...> - 2024-08-13 13:33:00
|
Thanks - soon (perhaps tomorrow), I'll try to set up the empty github area so you can push the history to it. I need to talk with some people in MathWorks on how to do this. Thanks, John ________________________________ From: Uwe Brauer Sent: Tuesday, August 13, 2024 8:43 AM To: Uwe Brauer Cc: John Ciolfi; Eric Ludlam; matlab-emacs-discuss Subject: Re: [Matlab-emacs-discuss] move -->github: rebase, and which branches could be deleted > I have also quite a bit of clones, so no worries. > Here is what I did on my local machine (I did not mess up with sourceforge) > - git clone --bare git+ssh://ou...@gi.../p/matlab-emacs/src matlab-sf-mirror-bare > - cd matlab-sf-mirror-bare > - delete the branches via > git branch -D wisent-parser > git branch -D fontlockhang > git branch -D strings > git branch -D usage1 > git branch -D hairyblocks > git branch -D mac_init > git branch -D modernize > git branch -D font-lock > git branch -D shell-patch > git branch -D shellcomplete I forget before I pushed I also did: - git branch -m default renaming the master branch default. -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. |
From: Uwe B. <ou...@ma...> - 2024-08-20 14:48:43
Attachments:
smime.p7s
|
>>> "JC" == John Ciolfi <ci...@ma...> writes: Hi John > Thanks - soon (perhaps tomorrow), I'll try to set up the empty github > area so you can push the history to it. I need to talk with some > people in MathWorks on how to do this. Any news? Uwe -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. |
From: John C. <ci...@ma...> - 2024-08-21 00:57:16
|
Hi Sorry for the delay. I’m out on vacation but will try to finish this in the next day or so. It took a little longer than I expected to get things setup, but now I have the right permissions to do this. Thanks John ________________________________ From: Uwe Brauer <ou...@ma...> Sent: Tuesday, August 20, 2024 10:48 AM To: John Ciolfi <ci...@ma...> Cc: Uwe Brauer <ou...@ma...>; Eric Ludlam <eri...@gm...>; matlab-emacs-discuss <mat...@li...> Subject: Re: [Matlab-emacs-discuss] move -->github: rebase, and which branches could be deleted >>> "JC" == John Ciolfi <ci...@ma...> writes: Hi John > Thanks - soon (perhaps tomorrow), I'll try to set up the empty github > area so you can push the history to it. I need to talk with some > people in MathWorks on how to do this. Any news? Uwe -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. |
From: Uwe B. <ou...@ma...> - 2024-08-21 12:29:31
Attachments:
smime.p7s
|
>>> "JC" == John Ciolfi <ci...@ma...> writes: > Hi > Sorry for the delay. I’m out on vacation but will try to finish this > in the next day or so. It took a little longer than I expected to get > things setup, but now I have the right permissions to do this. Ok, great! Sorry for the nagging but at the end of next week I have to travel for several weeks and hardly the time to look into this. I also wanted to set up ELPA (and maybe remove MELPA) BTW an off topic question, if you don't mind. It is my understanding that for numerical task (say solving a system of linear equations), the precision of the result, in Matlab, is fixed, So commands like format long, format short vpa etc Only display less decimals, but all (internal) operations are carried out with a fixed precision. Is this correct? Uwe -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. |
From: John C. <ci...@ma...> - 2024-08-24 13:19:59
|
Hi I setup https://github.com/mathworks/Emacs-MATLAB-Mode per your guidelines where I deleted the old branches, then mirrored. I then added a commit (reviewed a while back by Eric): Cleanup stale files and setup to align with github MathWorks standards 1. For MathWorks standards, - Renamed COPYING to LICENSE.txt - Added SECURITY.md - Added CONTRIBUTING.org 2. Deleted stale files that no longer work or are no longer needed - INSTALL - Project.ede - README - cedet-matlab.el - matlab-publish.el - semantic-matlab.el - semanticdb-matlab.el - srecode-matlab.el - templates/Makefile - templates/Project.ede - templates/srecode-matlab.srt - tests/Project.ede - toolbox/Makefile - toolbox/Project.ede 3. Cleaned up the Makefile's and fixed build issues 4. Tests were fixed and now pass (verified with MATLAB 2024a) I also made you an admin so you can be the maintainer. I do have LSP and improved org mode changes I'd like to send in, but we can do that after the MELPA setup. We should also track do existing issues from the mail list and create github issues so we can better manage them. Sorry for the delay on this. We ran into security issues, which delayed me. Thanks for your help, John ________________________________ From: Uwe Brauer Sent: Wednesday, August 21, 2024 8:29 AM To: John Ciolfi Cc: Uwe Brauer; Eric Ludlam; matlab-emacs-discuss Subject: Re: [Matlab-emacs-discuss] move -->github: rebase, and which branches could be deleted >>> "JC" == John Ciolfi <ci...@ma...> writes: > Hi > Sorry for the delay. I’m out on vacation but will try to finish this > in the next day or so. It took a little longer than I expected to get > things setup, but now I have the right permissions to do this. Ok, great! Sorry for the nagging but at the end of next week I have to travel for several weeks and hardly the time to look into this. I also wanted to set up ELPA (and maybe remove MELPA) BTW an off topic question, if you don't mind. It is my understanding that for numerical task (say solving a system of linear equations), the precision of the result, in Matlab, is fixed, So commands like format long, format short vpa etc Only display less decimals, but all (internal) operations are carried out with a fixed precision. Is this correct? Uwe -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. |
From: Uwe B. <ou...@ma...> - 2024-08-24 13:56:31
Attachments:
smime.p7s
|
-- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. |
From: Uwe B. <ou...@ma...> - 2024-08-24 15:14:13
Attachments:
smime.p7s
|
>>> "JC" == John Ciolfi <ci...@ma...> writes: > Hi > I setup https://github.com/mathworks/Emacs-MATLAB-Mode per your > guidelines where I deleted the old branches, then mirrored. I then > added a commit (reviewed a while back by Eric): Maybe I should open an issue on github? Here is the is the situation: 1. Ubuntu 24 2. Matlab 2024A 3. Emacs-29.2 Running make -j I obtain --8<---------------cut here---------------start------------->8--- mstest-savestate) (message "Expected: [%S]" exp) (message "Found: [%S]" txt) (user-error "'WHICH TEST: ls' failed"))))) mstest-start() mstest-run-all-tests() command-line-1(("--eval" "(setq debug-on-error t)" "-l" "mstest.el" "-e" "mstest-run-all-tests")) command-line() normal-top-level() MATLAB Shell took to long (20s) to produce a prompt. make[1]: *** [Makefile:37: shelltests] Error 255 make[1]: *** Waiting for unfinished jobs.... >> Starting indenting loop on ("indents.m" "continuations.m" "mclass.m" "blocks.m" "mfuncends.m" "mfuncnoendblock.m" "mclass_cont.m" "mfuncnofuncindent.m") << indenting indents.m passed: (161 tests) 1.19 s << indenting continuations.m passed: (110 tests) 0.47 s << indenting mclass.m passed: (36 tests) 0.42 s << indenting blocks.m passed: (97 tests) 0.65 s << indenting mfuncends.m passed: (18 tests) 0.03 s << indenting mfuncnoendblock.m passed: (20 tests) 0.07 s << indenting mclass_cont.m passed: (6 tests) 0.02 s << indenting mfuncnofuncindent.m passed: (18 tests) 0.04 s >> Starting completion loop on ("complete.m") << completion complete.m passed: (4 tests) 0.84 s Baseln Run Improvement Test 7.6011 10.2655 -2.6645 end-detect 0.0350 0.0589 -0.0240 comment-string-syntax 1.8879 3.1919 -1.3040 fontlock 0.8374 1.6881 -0.8507 sexp-counting 2.5888 3.7362 -1.1474 sexp-traversal 2.8868 2.8899 -0.0030 indents 0.8526 0.8434 0.0092 complete Cache Key Hits code: 290 codemiss: 414 flush: 7976 flushskip: 846 lvl1: 1910 lvl1-miss: 2766 nonempty: 14 prev2miss: 834 --- make[1]: Leaving directory '/home/oub/ALLES/emacs/site-lisp/packages/src/Matlab/Github/emacs-matlab-hg/tests' make: *** [Makefile:61: .tests.tstamp] Error 2 oub@Utnapischtim:~/emacs/site-lisp/packages/src/Matlab/Github/emacs-matlab-hg --8<---------------cut here---------------end--------------->8--- Error 2 sounds bad to me. Before moving to ELPA we should run more tests. Uwe -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. |
From: John C. <ci...@ma...> - 2024-08-24 16:44:59
|
I’ll look at this in a couple of days. I can confirm the tests pass on Debian 12 with Emacs 28 using R2024a. The code should match source forge minus some stale code that no longer works. So, this is likely an existing issue Thanks John ________________________________ From: Uwe Brauer <ou...@ma...> Sent: Saturday, August 24, 2024 11:14 AM To: John Ciolfi <ci...@ma...> Cc: Uwe Brauer <ou...@ma...>; Eric Ludlam <eri...@gm...>; matlab-emacs-discuss <mat...@li...> Subject: [installation problems] (was: [Matlab-emacs-discuss] move -->github: rebase, and which branches could be deleted) >>> "JC" == John Ciolfi <ci...@ma...> writes: > Hi > I setup https://github.com/mathworks/Emacs-MATLAB-Mode per your > guidelines where I deleted the old branches, then mirrored. I then > added a commit (reviewed a while back by Eric): Maybe I should open an issue on github? Here is the is the situation: 1. Ubuntu 24 2. Matlab 2024A 3. Emacs-29.2 Running make -j I obtain --8<---------------cut here---------------start------------->8--- mstest-savestate) (message "Expected: [%S]" exp) (message "Found: [%S]" txt) (user-error "'WHICH TEST: ls' failed"))))) mstest-start() mstest-run-all-tests() command-line-1(("--eval" "(setq debug-on-error t)" "-l" "mstest.el" "-e" "mstest-run-all-tests")) command-line() normal-top-level() MATLAB Shell took to long (20s) to produce a prompt. make[1]: *** [Makefile:37: shelltests] Error 255 make[1]: *** Waiting for unfinished jobs.... >> Starting indenting loop on ("indents.m" "continuations.m" "mclass.m" "blocks.m" "mfuncends.m" "mfuncnoendblock.m" "mclass_cont.m" "mfuncnofuncindent.m") << indenting indents.m passed: (161 tests) 1.19 s << indenting continuations.m passed: (110 tests) 0.47 s << indenting mclass.m passed: (36 tests) 0.42 s << indenting blocks.m passed: (97 tests) 0.65 s << indenting mfuncends.m passed: (18 tests) 0.03 s << indenting mfuncnoendblock.m passed: (20 tests) 0.07 s << indenting mclass_cont.m passed: (6 tests) 0.02 s << indenting mfuncnofuncindent.m passed: (18 tests) 0.04 s >> Starting completion loop on ("complete.m") << completion complete.m passed: (4 tests) 0.84 s Baseln Run Improvement Test 7.6011 10.2655 -2.6645 end-detect 0.0350 0.0589 -0.0240 comment-string-syntax 1.8879 3.1919 -1.3040 fontlock 0.8374 1.6881 -0.8507 sexp-counting 2.5888 3.7362 -1.1474 sexp-traversal 2.8868 2.8899 -0.0030 indents 0.8526 0.8434 0.0092 complete Cache Key Hits code: 290 codemiss: 414 flush: 7976 flushskip: 846 lvl1: 1910 lvl1-miss: 2766 nonempty: 14 prev2miss: 834 --- make[1]: Leaving directory '/home/oub/ALLES/emacs/site-lisp/packages/src/Matlab/Github/emacs-matlab-hg/tests' make: *** [Makefile:61: .tests.tstamp] Error 2 oub@Utnapischtim:~/emacs/site-lisp/packages/src/Matlab/Github/emacs-matlab-hg --8<---------------cut here---------------end--------------->8--- Error 2 sounds bad to me. Before moving to ELPA we should run more tests. Uwe -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. |