| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When the quilt db is created/initialized, QUILT_PATCHES and QUILT_SERIES
are written down in .pc/.quilt_{patches,series} and in subsequent
invocations of quilt those values are reused if the environmement
variables are no longer set.
When identifying the root directory, quilt now also looks for the
existence of .pc and not only of QUILT_PATCHES since that value might not
be set and we must be able to look it up from .pc/.quilt_patches instead.
Based on a preliminary patch made by Goswin von Brederlow
<goswin-v-b@web.de> (see http://bugs.debian.org/557623).
|
|
|
|
| |
scripts. Reported by Randy Dunlap. (for real this time)
|
|
|
|
| |
scripts. Reported by Randy Dunlap.
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
Quitting the pager while quilt is producing output caused write
error messages on the console. Fix this by using the default
SIGPIPE, which will quit quilt.
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
|
|
|
|
| |
don't show the pager for output shorter than a page.
|
| |
|
|
|
|
|
|
|
|
|
| |
When using bash TAB completion, such as in "quilt pop <TAB>",
if no patch is applied, it shows the standard error of the command
"quilt applied" ("No patches applied"), used in the source file
bash_completion to get the list of applied patches.
Signed-off-by: David Paleino <dapal@debian.org>
|
|
|
|
| |
parameters for better portability.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
http://savannah.nongnu.org/bugs/?19477 and
http://lists.nongnu.org/archive/html/quilt-dev/2009-09/msg00010.html
reported that the current quilt does not work with file name with
spaces. we all know that it is tough to handle it with bash script and
fix all quilt commands.
this patch only fixes add, files, and remove command with normal code
path. no excessive test has been done but a few test code is also
added. hope this starts fixing quilt to handle all possible path
pattern.
|
|
|
|
|
| |
Some (possibly all) versions of "file" do not recognize lzma-
compressed files. Rely on the file name for these.
|
|
|
|
|
|
|
|
|
|
| |
* Let xz handle lzma compatibility externally, with links.
Otherwise lzma support will not work for users with only lzma
installed and not xz.
* "upgrade" doesn't need to care about lzma nor xz, these
compression formats were not supported back in v1.
* Fix cat_to_new_file() for lzma/xz files..
* Use a different letter for lzma and xz files in inspect.
|
|
|
|
| |
QUILT_PAGER isn't set already.
|
|
|
|
|
|
|
| |
This adopts more pager clean-up handling from git. Which traps also for some
common signals.
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
|
|
|
|
|
| |
both change the working directory). (This may fail in some other
cases now -- there are still a lot of heuristics involved here.)
|
|
|
|
|
| |
regular files are considered. (Otherwise, we will trip over
command lines like "tar xjCf dir file").
|
|
|
|
| |
(Based on a patch from Egbert Eich <eich@freedesktop.org>.)
|
|
|
|
| |
regular file). Reported by Raphael Hertzog <hertzog@debian.org>.
|
|
|
|
|
|
|
|
| |
Patch(1) has recently changed the message for a failed merge from 'UNMERGED'
to 'NOT MERGED' (See commit 87f54e80 in the patch repository). Adopt this
change to quilt push's color matcher.
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
|
|
|
|
| |
(This has been changed in GNU patch 2.6 as well.)
|
| |
|
|
|
|
| |
(This allows to add parameters.)
|
|
|
|
|
|
|
| |
When QUILT_PAGER is set to an empty value, do not paginate.
Document QUILT_PAGER in the man page.
Clean things up a little.
Add a workaround in quilt.quiltrc for color output when $LESS is defined.
|
|
|
|
|
|
| |
Include the pager support from the TopGit script into Quilt.
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
|
|
|
|
| |
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
|
|
|
|
| |
with lzma or xz
|
|
|
|
| |
of more possible false matches
|
|
|
|
| |
which delete files
|
|
|
|
| |
patches which lead to missed matches
|
| |
|
|
|
|
| |
<shtrom-savanah@ssji.net>)
|
| |
|
|
|
|
| |
Update the French translation.
|
|
|
|
|
| |
Fix French translation which was saying the exact opposite of the
original message. Rather confusing...
|
| |
|
|
|
|
| |
This saves us from having to work around slashes and other special characters.
|
|
|
|
|
| |
Older versions of bash do not support the =~ construct, so stop
using it.
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I think the reason is that apply_patch_temporarily() uses backup-files
to create the temporary files, and by default backup-files uses hard
links. For files which are modified by the patch, this isn't a problem
because patch will unlink the file before modifying it. But for files
which are not modified by the patch, the hard link is preserved.
Then quilt revert also makes a hard link to restore the file, on the
assumption that the temporary copy will be deleted right away. At
this point, files not modified by the patch will have a link count
of 3 (.pc/<patch>/<file>, d.*/<file> and <file>). When the temporary
file is deleted, the link count is still 2 (.pc/<patch>/<file> and
<file>).
A simple way to fix this is to always use cp instead of ln when
restoring the files. Performance is not as good, but at least it is
always correct. We could optimize the code to use ln when possible
and cp for the other cases, but honestly I don't think it is worth
the extra complexity. The speed of "quilt revert" is hardly
critical, given how infrequently this command is used.
|
| |
|
|
|
|
|
| |
Recognize the output of more recent versions of patch, and set the
coreutils quoting style instead of matching different quoting styles.
|
|
|
|
|
| |
a patch that doesn't merge cleanly will still require to
spcify --force separately. Update merge syntax highlighting.
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|