lp:quilt

Created by VCS imports and last modified
Get this branch:
bzr branch lp:quilt

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
VCS imports
Project:
quilt
Status:
Development

Import details

Import Status: Reviewed

This branch is an import of the HEAD branch of the Git repository at git://git.savannah.nongnu.org/quilt.git.

The next import is scheduled to run as soon as possible.

Last successful import was .

Import started on izar and finished taking 10 seconds — see the log
Import started on izar and finished taking 10 seconds — see the log
Import started on alnitak and finished taking 10 seconds — see the log
Import started on alnitak and finished taking 10 seconds — see the log
Import started on alnitak and finished taking 10 seconds — see the log
Import started on alnitak and finished taking 10 seconds — see the log
Import started on alnitak and finished taking 10 seconds — see the log
Import started on alnitak and finished taking 10 seconds — see the log
Import started on izar and finished taking 10 seconds — see the log
Import started on alnitak and finished taking 10 seconds — see the log

Recent revisions

1439. By Jean Delvare <email address hidden> on 2021-06-10

Delay sourcing patchfns until options have been processed

Commit 8b39a960afcf ("Consistently complain early if no series file
is found") unexpectedly broke commands like "quilt add -h", because
the check for a series file happens before the command line options
are processed. This, in turn, breaks the generation of the quilt
manual page, which relies on the output of each command when called
with option -h.

Reorder the code so that options are always processed first, and then
patchfns is sourced. That way, option "-h" will work again even if
not in a quilt working tree.

Fixes: 8b39a960afcf ("Consistently complain early if no series file is found")
Signed-off-by: Jean Delvare <email address hidden>

1438. By Jean Delvare <email address hidden> on 2021-06-10

Move the code which adds the default parameters from quiltrc

Move the code which reads the default parameters for each command
from quiltrc, from patchfns to the main quilt script. This is needed
because the parsing of command line options needs to happen before we
source patchfns, which is obviously not possible if some of the
options are being set by patchfns itself.

Signed-off-by: Jean Delvare <email address hidden>

1437. By Andreas Gruenbacher <email address hidden> on 2021-05-14

Tighten the patch format parsing

Require a "---" line to be followed by a "+++" line to recognize it as
the start of a unified diff. Likewise, require a "***" line to be
followed by a "---" line to recognize it as the start of a context diff.

Without that, a line like "*** NOTE ***" in the patch header will cause
the refresh and header commands to truncate the header.

Signed-off-by: Andreas Gruenbacher <email address hidden>

1436. By Jean Delvare <email address hidden> on 2020-12-09

backup-files: Restore symbolic links

As "patch" originally did not handle symbolic links, backup-files
didn't have to care about them either. But now that git has
introduced an extended syntax which allows manipulating symbolic
links in patch files, "quilt push" may create or delete symbolic
links, which means that backup-files must support such operations
too.

Also extend the backup-files test case to cover these operations.

This fixes bug #59479:
https://savannah.nongnu.org/bugs/index.php?59479

Signed-off-by: Jean Delvare <email address hidden>

1435. By Jean Delvare <email address hidden> on 2020-12-09

inspect-wrapper: procfs resolves links

When patch files are passed through stdin, we get the actual patch
file name from procfs. It turns out that procfs resolves symbolic
links, and that breaks our later attempt to strip the prefix from
the path to extract a relative path to the patch file.

This is solved by also resolving symbolic links in the prefix
before stripping it.

Signed-off-by: Jean Delvare <email address hidden>

1434. By Jean Delvare <email address hidden> on 2020-10-05

Quote parameter to gen_tempfile as needed

When the parameter passed to gen_tempfile is based on the working
directory, we need to quote it because it could contain spaces or
other special characters. Also quote the string returned by this
function for the same reason.

Affected commands:
* quilt diff -z
* quilt fold
* quilt refresh -z
* quilt revert

Also test these code paths in the test suite to avoid regressions.

Signed-off-by: Jean Delvare <email address hidden>

1433. By Jean Delvare <email address hidden> on 2020-10-05

Don't check for double sourcing of patchfns

In practice there is no situation where patchfns would be sourced
more than once, so remove the check for this situation, that was
present in every quilt command file.

Signed-off-by: Jean Delvare <email address hidden>

1432. By Ondřej Lysoněk <email address hidden> on 2020-06-09

quilt.el: Fix quilt-editable when QUILT_PATCHES_PREFIX is set

This patch fixes a bug in quilt-editable: if QUILT_PATCHES_PREFIX is
set, quilt-editable will always return nil, even if the file being
edited is part of the topmost patch.

If QUILT_PATCHES_PREFIX is set, then 'quilt top' prints the patch name
as a relative path to the patch. Since in quilt-editable we're running
'quilt top' from the top level directory, the printed patch path is in
the form $QUILT_PATCHES/patch-name.

Later on, we're looking for a cached version of the file that we're
editing in .pc/. The patch directories are stored directly under .pc/,
rather than .pc/$QUILT_PATCHES/, so we must remove the $QUILT_PATCHES/
prefix from the patch path.

Signed-off-by: Ondřej Lysoněk <email address hidden>
Signed-off-by: Jean Delvare <email address hidden>

1431. By Ondřej Lysoněk <email address hidden> on 2020-06-09

quilt.el: Fix a typo in documentation

Signed-off-by: Ondřej Lysoněk <email address hidden>
Signed-off-by: Jean Delvare <email address hidden>

1430. By Ondřej Lysoněk <email address hidden> on 2020-06-09

quilt.el: Make quilt-patches-directory return per-project setting

When creating the .pc/ directory, quilt writes the value of
QUILT_PATCHES to .pc/.quilt_patches. On all subsequent invocations,
quilt uses the contents of .pc/.quilt_patches as the value of
QUILT_PATCHES, rather than the value set in quiltrc.

All the callers in quilt.el really expect the per-project setting from
.pc/.quilt_patches, so return the value set therein if present.

Signed-off-by: Ondřej Lysoněk <email address hidden>
Signed-off-by: Jean Delvare <email address hidden>

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.

Subscribers

No subscribers.