In issue #118 Thomas Klausner asks if someone could update notmuch to mutt-1.5.24. Done. That, and much much more...
mutt-kz consists of quite a few elements:
Major features: sidebar notmuch
Minor features: conditional dates index-color nested-if progress bar quasi-delete status-color tls-sni
Misc: bug-fixes for Mutt
However, the current version of mutt-kz is missing: Some important mutt code commits Most of the translation commits Many bugfixes in the minor features My wonderful new version of the sidebar patch
I've brought mutt-kz up-to-date. The branch names in [] refer to my work repository on github. The diagram, below, may help you understand the relationships between the branches (red: mutt; green: sidebar; cyan: notmuch).
https://github.com/neomutt/flatcap https://flatcap.org/mutt/flatcap.png
I started with the latest version of mutt-kz [kz/master] which contains 394 commits since the Last Common Ancestor with mutt [mutt/lca].
Rebase onto: [mutt/1.5.24] -> [kz/rebase1] (160 commits) [combine/minor/20160307] -> [kz/rebase2] (148 commits) [combine/sidebar/20160307] -> [kz/rebase3] (129 commits)
Any mutt-kz bug-fixes that weren't notuch-related have been moved to either [feature/bugfix] or the relevant feature branch.
The minor features have been merged into [combine/minor/20160307] The icons represent the order in which the features were merged.
This brings mutt-kz now up-to-date, but still needs a little tidying.
Refactor:
[kz/refactor1] (116 commits) Tidy remaining rebase artifacts I've tweaked the history a little here (in very minor ways). e.g. folded pairs like: Introduce typo Fix typo Move notmuch build changes to beginning
[kz/refactor2] [kz/release2] (110 + 2 commits) Factor out kz-build-related commit The kz-version number isn't a part of the notmuch code. gitignore changes folded kz-versioning changes folded
[kz/release2] (yellow on diagram) represents the kz-versioning. These are changes you want for mutt-kz, but don't want to be merged into Mutt upstream.
[kz/refactor3] [kz/release3] (110 + 2 commits) Trailing whitespace Rework all the commits to prevent the introduction of trailing whitespace. Tidy commit messages Most commits in the repo were prefixed with "notmuch:". Now the notmuch code is isolated in its own branch, the prefix isn't needed. Fold commit messages Fit to git standards
The code REMAINS THE SAME, but the 'churn' is reduced This should making rebasing simpler.
I've been very careful not to make any functional changes and the authorship of commits is maintained.
What next?
Adoption -- I would like you to adopt one of these branches. Ideally [kz/refactor3]
Once you've picked a repo, I will start submitting changes to: Tidy the Sidebar code that Notmuch introduces Fix mutt-kz's remaining Sidebar issues Rename <sidebar-toggle> to <sidebar-toggle-virtual> Sidebar currently has <sidebar-toggle-visible> Integrate [combine/extra/20160307] Number of useful small features Integrate other downstream/distro bugfixes
Hope this all makes sense.
On Mon, Mar 07, 2016 at 05:24:43PM +0000, Richard Russon rich@flatcap.org wrote:
In issue #118 Thomas Klausner asks if someone could update notmuch to mutt-1.5.24. Done. That, and much much more...
amazing!
https://github.com/neomutt/flatcap
I'm having issues cloning this:
11:34 MacBook-Pro~/src[local@2.7.11] % rm -rf flatcap (master↑10|●35✚33…) 11:37 MacBook-Pro~/src[local@2.7.11] % git clone git@github.com:neomutt/flatcap.git (master↑10|●35✚33…) Cloning into 'flatcap'... remote: Counting objects: 36243, done. remote: Compressing objects: 100% (1982/1982), done. remote: Total 36243 (delta 2678), reused 1414 (delta 1414), pack-reused 32847 Receiving objects: 100% (36243/36243), 15.28 MiB | 2.02 MiB/s, done. Resolving deltas: 100% (27901/27901), done. Checking connectivity... done. warning: remote HEAD refers to nonexistent ref, unable to checkout.
On Mon, Mar 14, 2016 at 11:38:43AM +0000, Charlie Allom wrote:
On Mon, Mar 07, 2016 at 05:24:43PM +0000, Richard Russon rich@flatcap.org wrote:
In issue #118 Thomas Klausner asks if someone could update notmuch to mutt-1.5.24. Done. That, and much much more...
amazing!
https://github.com/neomutt/flatcapI'm having issues cloning this:
11:34 MacBook-Pro~/src[local@2.7.11] % rm -rf flatcap (master↑10|●35✚33…) 11:37 MacBook-Pro~/src[local@2.7.11] % git clone git@github.com:neomutt/flatcap.git (master↑10|●35✚33…) Cloning into 'flatcap'... remote: Counting objects: 36243, done. remote: Compressing objects: 100% (1982/1982), done. remote: Total 36243 (delta 2678), reused 1414 (delta 1414), pack-reused 32847 Receiving objects: 100% (36243/36243), 15.28 MiB | 2.02 MiB/s, done. Resolving deltas: 100% (27901/27901), done. Checking connectivity... done. warning: remote HEAD refers to nonexistent ref, unable to checkout.
You have to clone neomutt/neomutt and add flatcap as a remote.
mutt-kz@lists.fedoraproject.org