Also use --3way to ease conflict resolutions.
* etc/git/gitconfig [b4]: Add shazam-am-flags option.
Change-Id: I6a92909a5b23a8680c16251aafa084b9a48944ea
* etc/teams.scm (bootstrap): Add “gnu/packages/commencement.scm”.
(core-packages): New team.
(Ludovic Courtès): Add to ‘core-packages’ team.
Change-Id: I25f22d436a4dc9bf4c8f577f94cc178cbaa80768
* etc/completion/bash/guix (_guix_is_dash_f):
Recognise ‘--whole-file’ as a member of the ‘-f’ family.
(_guix_complete): Add a new clause for ‘guix style’.
Reported by cmiller in #guix.
Change-Id: I3f55f7fd7fb8610dc13770ebfe70d9f65c1497af
* etc/teams.scm (zig): New team for the zig programming language,
packages and build system.
Change-Id: I96f9ced1ad04b1cd9041c53aa8c86fe29014ccd1
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
* doc/contributing.texi (Contributing) [Reviewing the Work of Others]: New
section.
(Debbugs Usertags): Expound with Emacs Debbugs information and document the
'reviewed-looks-good' usertag.
* etc/git/gitconfig [b4]: New section.
Change-Id: I56630b15ec4fbc5c67e5420dbf2838556a005d6b
Reviewed-by: Ludovic Courtès <ludo@gnu.org>
This tells Emacs to use the scheme-mode to edit the file.
* etc/teams.scm (mode): New file-local variable.
Change-Id: I9a48f552e831317402673d95cf6c1de506d388b5
This ensures the correct Guix dependencies are always available for the
script.
* etc/teams.scm.in: Rename to...
* etc/teams.scm: ... this. Adjust shebang.
* .gitignore: No longer ignore it.
* configure.ac: Do not process it with AC_CONFIG_FILES.
Reported-by: Clément Lassieur <clement@lassieur.org>
Fixes: https://issues.guix.gnu.org/66605
Change-Id: I7a01750c6c5f0696b6c36b1e6caa9389d9e6822c
When a Change-Id is used, patman prepends a Message-Id field on the first line
of the patch, which broke the assumption that the 'From $commit' line must
appear on the first line.
* etc/teams.scm.in (git-patch->commit-id): Loop each line of the file until a
match is found. Update doc.
Series-to: 66027@debbugs.gnu.org
Series-version: 3
Series-changes: 3
- New commit
Series-cc: Giovanni Biscuolo <g@xelera.eu>, Simon Tournier <zimon.toutoune@gmail.com>
Change-Id: I20400f87469ffb761ffc82dd32e34cd06f619043
Partially implements <https://issues.guix.gnu.org/66027>.
This will make it possible to track a merged commit back to its original
posting on the mailing list, and open the door to new opportunities such as
closing fully merged series automatically.
* Makefile.am (COMMIT_MSG_MAGIC): New variable.
(.git/hooks/commit-msg): New target.
* etc/git/commit-msg: New file.
* doc/contributing.texi (Configuring Git): Document Change-Id.
Series-changes: 3
- Clarify documentation text, as suggested by Simon
Change-Id: Ia92fa958eae600fdd4e180bad494c85db8bb4dd6
Reviewed-by: Simon Tournier <zimon.toutoune@gmail.com>
* etc/snippets/tempel/scheme-mode (origin): Unquote ‘git-fetch’, ‘svn-fetch’,
‘hg-fetch’, ‘cvs-fetch’, and ‘bzr-fetch’. Use ‘otherwise’ instead of ‘t’.
This works around a situation where ‘cuirass remote-worker’ now builds
with max-jobs = 1 (Cuirass commit
980ef610989895be5ac2ba7f9d1901e5c7f22934). The effect is that all
.dis.drv would be performed sequentially, on a single machine (‘cuirass
remote-server’ is unable to distribute those derivations to several
machines because it only “sees” the ‘disarchive-collection’ derivation).
This would take a lot of time and force a rebuild of all of *.dis.drv
every time because their build results would not be retrieved by the
‘remote-server’ process.
* etc/disarchive-manifest.scm (disarchive-collection): Remove.
<top level>: Define ‘disarchives’. Append it to the entries of the
manifest.
The old surrounding-sexp procedure would read all S-expressions from the
beginning of the file up to the given line number and then return the last
encountered S-expression. This is quite wasteful. Instead we can record all
lines that begin with an S-expression and jump straight to the offset closest
to the desired line number to read the S-expression there.
* etc/committer.scm.in (lines+offsets-with-opening-parens): New procedure.
(surrounding-sexp): Use it.
* etc/committer.scm.in (%original-file-cache): New variable.
(read-original-file): New procedure.
(read-original-file*): New procedure.
(old-sexp): Use it.
Gdk-pixbuf is a dependency for `guix system reconfigure' and currently also
needs an unreleased glibc patch in order to build.
* etc/hurd-manifest.scm: Add gdk-pixbuf to manifest.
This is a follow up to commit 4d7b25a0 ("etc: teams: Sort and improve display
of regular expression in 'scope' field.").
* etc/teams.scm.in (regexp-exec*): Rename to...
(regexp*-exec): ... this.
(find-team-by-scope): Replace regexp? with regexp*?. Replace regexp-exec with
regexp*-exec.
Fixes <https://issues.guix.gnu.org/65208>.
* etc/teams.scm.in (<regexp*>): New record type.
(make-regexp*, regexp-exec*): New procedures.
(python, haskell, julia, java, emacs, rust, core, translations, installer,
home): Use it.
(find-team-by-scope): Use it.
(list-teams): Use it.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Reported-by: Greg Hogan <code@greghogan.com>
Maxim Cournoyer
Efraim Flashner
Wilko Meyer
Vivien Kraus
Florian Pelz
Sharlatan Hellseher
Oleg Pykhalov
Ludovic Courtès
Clément Lassieur
Tobias Geerinckx-Rice
Benjamin
Ekaitz Zarraga
Gabriel Wicki
Liliana Marie Prikler
Munyoki Kilyungi
Ricardo Wurmus
Marius Bakke
Janneke Nieuwenhuizen
Andrew Tropin
zimoun
Andreas Enge