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 .

Last successful import was .

Import started on juju-1e3bde-prod-lp-code-import-14 and finished taking 10 seconds — see the log
Import started on juju-1e3bde-prod-lp-code-import-14 and finished taking 15 seconds — see the log
Import started on juju-1e3bde-prod-lp-code-import-14 and finished taking 15 seconds — see the log
Import started on juju-1e3bde-prod-lp-code-import-14 and finished taking 15 seconds — see the log
Import started on juju-1e3bde-prod-lp-code-import-13 and finished taking 10 seconds — see the log
Import started on juju-1e3bde-prod-lp-code-import-14 and finished taking 10 seconds — see the log
Import started on juju-1e3bde-prod-lp-code-import-14 and finished taking 20 seconds — see the log
Import started on juju-1e3bde-prod-lp-code-import-14 and finished taking 15 seconds — see the log
Import started on juju-1e3bde-prod-lp-code-import-14 and finished taking 10 seconds — see the log
Import started on juju-1e3bde-prod-lp-code-import-13 and finished taking 10 seconds — see the log

Recent revisions

1446. By Jean Delvare <email address hidden>

patchfns: Compatibility fix for BSD awk

"+" needs to be quoted to be considered as a literal "+" by BSD awk.

Without this fix, patch_header() fails to find the beginning of the
changes and treats the whole patch as a header, subsequently causing
"quilt refresh" to append the refreshed patch after the original one
instead of replacing it.

Bug reported and fix suggested by Dominic Evans.

Signed-off-by: Jean Delvare <email address hidden>
Fixes: 1d94980dbdd4 ("Tighten the patch format parsing")

1445. By Jean Delvare <email address hidden>

Fix the 0.67 release date

1444. By Jean Delvare <email address hidden>

Set version to 0.67.

1443. By Yasushi SHOJI <email address hidden>

gitignore: Add Emacs backup file pattern

Emacs uses *~ as a backup files. Ignore them.

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

1442. By Yasushi SHOJI <email address hidden>

po/ja.po: Update my email address

Update my email address to the new one.

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

1441. By Jean Delvare <email address hidden>

Reuse the shell

One side effect of commit ca85fbd82022 ("Move the code which adds the
default parameters from quiltrc") is that we now source the quiltrc
configuration file twice. While parsing this file shouldn't take
overly long, this still feels conceptually wrong.

This can be avoided by reusing the same shell for the quilt command
as we used for the quilt "launcher" itself, instead of starting a
new instance of bash for it.

As a nice side bonus, this makes quilt about 2% faster (measured on
the test suite).

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

1440. By Jean Delvare <email address hidden>

import: Fix option -P

I broke "import -P" with my previous commit. Using this option now
fails with the following error message:
/usr/share/quilt/import: line 168: [: missing `]'

This is caused by a missing space before the closing square bracket,
which prevents bash from parsing the line.

Fix that, and add a test case to cover this code path, so that no
such bug can creep in in the future.

Signed-off-by: Jean Delvare <email address hidden>
Fixes: c539338458e4 ("Delay sourcing patchfns until options have been processed")

1439. By Jean Delvare <email address hidden>

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>

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>

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>

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.