summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* - quilt/scripts/patchfns.in (diff_file): Swap options andJean Delvare2009-12-122-1/+8
| | | | parameters for better portability.
* add, files, remove: accept file name with spacesYasushi SHOJI2009-11-275-19/+65
| | | | | | | | | | | | | 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.
* inspect: Fix detection of lzma-compressed files.Jean Delvare2009-11-272-1/+18
| | | | | Some (possibly all) versions of "file" do not recognize lzma- compressed files. Rely on the file name for these.
* Fix support of lzma- or xz-compressed files:Jean Delvare2009-11-276-10/+44
| | | | | | | | | | * 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.quiltrc: make sur eto only override QUILT_PAGER ifAndreas Gruenbacher2009-11-252-1/+7
| | | | QUILT_PAGER isn't set already.
* fix pager if you press ^CBert Wesarg2009-11-251-2/+21
| | | | | | | 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>
* - inspect: Try to better recognize "patch -d" and "tar -C" (whichAndreas Gruenbacher2009-11-252-21/+64
| | | | | both change the working directory). (This may fail in some other cases now -- there are still a lot of heuristics involved here.)
* - inspect: When guessing the tarball filename, make sure that onlyAndreas Gruenbacher2009-11-252-1/+11
| | | | | regular files are considered. (Otherwise, we will trip over command lines like "tar xjCf dir file").
* - new command: Add -p ... option (equivalent to diff -p ...).Andreas Gruenbacher2009-11-253-4/+30
| | | | (Based on a patch from Egbert Eich <eich@freedesktop.org>.)
* - Make sure the series file is a regular file (or a symlink to aAndreas Gruenbacher2009-11-252-5/+24
| | | | regular file). Reported by Raphael Hertzog <hertzog@debian.org>.
* push: update color matcher for failed mergeBert Wesarg2009-11-252-1/+6
| | | | | | | | 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>
* - No longer create backup files of new files with file mode 0.Andreas Gruenbacher2009-11-222-2/+9
| | | | (This has been changed in GNU patch 2.6 as well.)
* Fix typoAndreas Gruenbacher2009-11-201-1/+1
|
* Do not quite QUILT_PAGER when executing the pagerAndreas Gruenbacher2009-11-201-1/+1
| | | | (This allows to add parameters.)
* pager support: some improvementsAndreas Gruenbacher2009-11-204-22/+39
| | | | | | | 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.
* pager support like gitBert Wesarg2009-11-209-0/+48
| | | | | | Include the pager support from the TopGit script into Quilt. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
* re-activate exit handler multiplexerBert Wesarg2009-11-207-30/+34
| | | | Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
* Enable quilt to handle compressed tarballs and patches that were compressed ↵Philipp Thomas2009-11-206-4/+32
| | | | with lzma or xz
* patches command: Also match deleted files in unapplied patches at the cost ↵Andreas Gruenbacher2009-11-052-2/+8
| | | | of more possible false matches
* patches command: Prevent false matches in unapplied patches for patches ↵Andreas Gruenbacher2009-11-052-1/+4
| | | | which delete files
* patches command: Commit 2e581933a introduced a bug in scanning unapplied ↵Andreas Gruenbacher2009-11-052-2/+8
| | | | patches which lead to missed matches
* Fix typo in doc/quilt.1.inAndreas Gruenbacher2009-11-042-1/+6
|
* Implement -r / --reference option in compat/date (patch from Olivier Mehani ↵Andreas Gruenbacher2009-11-022-0/+7
| | | | <shtrom-savanah@ssji.net>)
* Restore the "remove" commandAndreas Gruenbacher2009-09-172-0/+119
|
* French translation updateJean Delvare2009-09-093-47/+74
| | | | Update the French translation.
* Fix French translation of import commandJean Delvare2009-09-091-1/+1
| | | | | Fix French translation which was saying the exact opposite of the original message. Rather confusing...
* Fix commit 93b4531Andreas Gruenbacher2009-06-171-2/+2
|
* No longer use $0 in gen_tempfileAndreas Gruenbacher2009-06-172-3/+7
| | | | This saves us from having to work around slashes and other special characters.
* Don't use the =~ constructJean Delvare2009-06-171-3/+7
| | | | | Older versions of bash do not support the =~ construct, so stop using it.
* Make git-desc work even outside git repositories and include it in tarballsAndreas Gruenbacher2009-06-172-8/+10
|
* Try to clarify the help text of "quilt revert"Andreas Gruenbacher2009-06-172-3/+11
|
* "quilt revert" accidentally creates a hard link, it shouldn't do that.Jean Delvare2009-06-172-1/+20
| | | | | | | | | | | | | | | | | | | | | | 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.
* Concurrent readdir() + unlink() compatibility fixAndreas Gruenbacher2009-06-152-15/+44
|
* Minor test suite updateAndreas Gruenbacher2009-06-152-3/+5
| | | | | Recognize the output of more recent versions of patch, and set the coreutils quoting style instead of matching different quoting styles.
* - Push command: don't imply --force when --merge is given so thatAndreas Gruenbacher2009-04-057-56/+71
| | | | | a patch that doesn't merge cleanly will still require to spcify --force separately. Update merge syntax highlighting.
* - Rename push's -M option to -m.Andreas Gruenbacher2009-03-311-3/+3
|
* Push command: update the -M / --merge optionAndreas Gruenbacher2009-03-151-9/+5
|
* patches command: add --color option as wellAndreas Gruenbacher2009-03-084-8/+34
|
* series command: add --color optionAndreas Gruenbacher2009-03-083-10/+29
|
* Fix the -M option (which aliases to --merge=rejects).Andreas Gruenbacher2009-02-031-3/+6
|
* make snapshot: strip the v from v$version tags.Andreas Gruenbacher2009-02-031-1/+1
|
* Add the generated files configure and quilt.spec to the repository so thatAndreas Gruenbacher2009-02-034-3/+9542
| | | | reposititory snapshots can simply be used as release tarballs.
* The translations still need updating...Andreas Gruenbacher2009-02-033-54/+77
|
* Convert the French translation to UTF-8 like all other translations.Andreas Gruenbacher2009-02-031-315/+323
| | | | This avoids seeing a mix of encodings in diffs.
* Ignore quilt-*.tar.gz tarballs as well.Andreas Gruenbacher2009-02-031-0/+1
|
* Allow to optionally specify different merge modes.Andreas Gruenbacher2009-02-031-4/+4
|
* I'm not sure it's really a good idea to bump --fuzz for merges; removeAndreas Gruenbacher2009-02-011-2/+2
| | | | that for now.
* - push command: Add --fuzz=N option. Add experimental --mergeAndreas Gruenbacher2009-02-012-21/+45
| | | | | option. Fail pushes when GNU patch exits with a status > 1. Some cleanups.
* Remove the trailing slash from autom4te.cache/ so that git status willAndreas Gruenbacher2009-02-011-1/+1
| | | | behave better.
* Convert to git repository formatv0.48Andreas Gruenbacher2009-01-2914-58/+59
|