Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | - Make sure the series file is a regular file (or a symlink to a | Andreas Gruenbacher | 2009-11-25 | 2 | -5/+24 |
| | | | | regular file). Reported by Raphael Hertzog <hertzog@debian.org>. | ||||
* | push: update color matcher for failed merge | Bert Wesarg | 2009-11-25 | 2 | -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 Gruenbacher | 2009-11-22 | 2 | -2/+9 |
| | | | | (This has been changed in GNU patch 2.6 as well.) | ||||
* | Fix typo | Andreas Gruenbacher | 2009-11-20 | 1 | -1/+1 |
| | |||||
* | Do not quite QUILT_PAGER when executing the pager | Andreas Gruenbacher | 2009-11-20 | 1 | -1/+1 |
| | | | | (This allows to add parameters.) | ||||
* | pager support: some improvements | Andreas Gruenbacher | 2009-11-20 | 4 | -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 git | Bert Wesarg | 2009-11-20 | 9 | -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 multiplexer | Bert Wesarg | 2009-11-20 | 7 | -30/+34 |
| | | | | Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> | ||||
* | Enable quilt to handle compressed tarballs and patches that were compressed ↵ | Philipp Thomas | 2009-11-20 | 6 | -4/+32 |
| | | | | with lzma or xz | ||||
* | patches command: Also match deleted files in unapplied patches at the cost ↵ | Andreas Gruenbacher | 2009-11-05 | 2 | -2/+8 |
| | | | | of more possible false matches | ||||
* | patches command: Prevent false matches in unapplied patches for patches ↵ | Andreas Gruenbacher | 2009-11-05 | 2 | -1/+4 |
| | | | | which delete files | ||||
* | patches command: Commit 2e581933a introduced a bug in scanning unapplied ↵ | Andreas Gruenbacher | 2009-11-05 | 2 | -2/+8 |
| | | | | patches which lead to missed matches | ||||
* | Fix typo in doc/quilt.1.in | Andreas Gruenbacher | 2009-11-04 | 2 | -1/+6 |
| | |||||
* | Implement -r / --reference option in compat/date (patch from Olivier Mehani ↵ | Andreas Gruenbacher | 2009-11-02 | 2 | -0/+7 |
| | | | | <shtrom-savanah@ssji.net>) | ||||
* | Restore the "remove" command | Andreas Gruenbacher | 2009-09-17 | 2 | -0/+119 |
| | |||||
* | French translation update | Jean Delvare | 2009-09-09 | 3 | -47/+74 |
| | | | | Update the French translation. | ||||
* | Fix French translation of import command | Jean Delvare | 2009-09-09 | 1 | -1/+1 |
| | | | | | Fix French translation which was saying the exact opposite of the original message. Rather confusing... | ||||
* | Fix commit 93b4531 | Andreas Gruenbacher | 2009-06-17 | 1 | -2/+2 |
| | |||||
* | No longer use $0 in gen_tempfile | Andreas Gruenbacher | 2009-06-17 | 2 | -3/+7 |
| | | | | This saves us from having to work around slashes and other special characters. | ||||
* | Don't use the =~ construct | Jean Delvare | 2009-06-17 | 1 | -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 tarballs | Andreas Gruenbacher | 2009-06-17 | 2 | -8/+10 |
| | |||||
* | Try to clarify the help text of "quilt revert" | Andreas Gruenbacher | 2009-06-17 | 2 | -3/+11 |
| | |||||
* | "quilt revert" accidentally creates a hard link, it shouldn't do that. | Jean Delvare | 2009-06-17 | 2 | -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 fix | Andreas Gruenbacher | 2009-06-15 | 2 | -15/+44 |
| | |||||
* | Minor test suite update | Andreas Gruenbacher | 2009-06-15 | 2 | -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 that | Andreas Gruenbacher | 2009-04-05 | 7 | -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 Gruenbacher | 2009-03-31 | 1 | -3/+3 |
| | |||||
* | Push command: update the -M / --merge option | Andreas Gruenbacher | 2009-03-15 | 1 | -9/+5 |
| | |||||
* | patches command: add --color option as well | Andreas Gruenbacher | 2009-03-08 | 4 | -8/+34 |
| | |||||
* | series command: add --color option | Andreas Gruenbacher | 2009-03-08 | 3 | -10/+29 |
| | |||||
* | Fix the -M option (which aliases to --merge=rejects). | Andreas Gruenbacher | 2009-02-03 | 1 | -3/+6 |
| | |||||
* | make snapshot: strip the v from v$version tags. | Andreas Gruenbacher | 2009-02-03 | 1 | -1/+1 |
| | |||||
* | Add the generated files configure and quilt.spec to the repository so that | Andreas Gruenbacher | 2009-02-03 | 4 | -3/+9542 |
| | | | | reposititory snapshots can simply be used as release tarballs. | ||||
* | The translations still need updating... | Andreas Gruenbacher | 2009-02-03 | 3 | -54/+77 |
| | |||||
* | Convert the French translation to UTF-8 like all other translations. | Andreas Gruenbacher | 2009-02-03 | 1 | -315/+323 |
| | | | | This avoids seeing a mix of encodings in diffs. | ||||
* | Ignore quilt-*.tar.gz tarballs as well. | Andreas Gruenbacher | 2009-02-03 | 1 | -0/+1 |
| | |||||
* | Allow to optionally specify different merge modes. | Andreas Gruenbacher | 2009-02-03 | 1 | -4/+4 |
| | |||||
* | I'm not sure it's really a good idea to bump --fuzz for merges; remove | Andreas Gruenbacher | 2009-02-01 | 1 | -2/+2 |
| | | | | that for now. | ||||
* | - push command: Add --fuzz=N option. Add experimental --merge | Andreas Gruenbacher | 2009-02-01 | 2 | -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 will | Andreas Gruenbacher | 2009-02-01 | 1 | -1/+1 |
| | | | | behave better. | ||||
* | Convert to git repository formatv0.48 | Andreas Gruenbacher | 2009-01-29 | 14 | -58/+59 |
| | |||||
* | - Make a note about pagers and colors. | Andreas Gruenbacher | 2009-01-28 | 1 | -0/+4 |
| | |||||
* | - quilt setup: Define %__tar and %__patch to refer to the tar and | Andreas Gruenbacher | 2008-11-29 | 2 | -0/+8 |
| | | | | patch wrapper. (Patch from Jan Kratochvil, Savannah bug 24964). | ||||
* | - To allow using 'procmail' (which contains 'formail') as weak | Andreas Gruenbacher | 2008-11-02 | 2 | -0/+16 |
| | | | | | | | dependency in package managers, explicitely check for the 'formail' binary when invoking 'quilt mail' so that the user gets a clear error message when 'formail' is missing and knows what to do. (From Bernhard Walle <bwalle@suse.de>.) | ||||
* | - push command: Remove leftovers of the former interactive-option. | Andreas Gruenbacher | 2008-11-02 | 2 | -4/+7 |
| | | | | (From Wolfram Sang <w.sang@pengutronix.de>.) | ||||
* | - mail command: don't word boundaries in awk; it's a GNU awk | Andreas Gruenbacher | 2008-11-02 | 2 | -2/+8 |
| | | | | extension. (From Wolfram Sang <w.sang@pengutronix.de>.) | ||||
* | - From Wolfram Sang <w.sang@pengutronix.de>: | Andreas Gruenbacher | 2008-11-02 | 2 | -2/+12 |
| | | | | | | "The test for import did not always recreate a patches-dir inside the temporary location, so it would fail if you modified quilt using quilt." | ||||
* | - Fix from Dean Roehrich <Dean.Roehrich@sun.com> for Solaris: | Andreas Gruenbacher | 2008-11-02 | 2 | -2/+10 |
| | | | | | | "I ran into a case solaris ON build 99 where configure found ginstall, but the Makefile.in used something else, and that led to things going a bit haywire." | ||||
* | - Add a dual BSD/GPL license header to test/run. | Andreas Gruenbacher | 2008-11-02 | 4 | -3/+36 |
| | | | | | - Only run test/patch-wrapper.test if the --with-patch-wrapper config option is used. | ||||
* | - Bash completion fix for fold command from | Andreas Gruenbacher | 2008-09-03 | 2 | -0/+7 |
| | | | | Bernhard Walle <bwalle@suse.de>. |