summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* - Make a note about pagers and colors.Andreas Gruenbacher2009-01-281-0/+4
|
* - quilt setup: Define %__tar and %__patch to refer to the tar andAndreas Gruenbacher2008-11-292-0/+8
| | | | patch wrapper. (Patch from Jan Kratochvil, Savannah bug 24964).
* - To allow using 'procmail' (which contains 'formail') as weakAndreas Gruenbacher2008-11-022-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 Gruenbacher2008-11-022-4/+7
| | | | (From Wolfram Sang <w.sang@pengutronix.de>.)
* - mail command: don't word boundaries in awk; it's a GNU awkAndreas Gruenbacher2008-11-022-2/+8
| | | | extension. (From Wolfram Sang <w.sang@pengutronix.de>.)
* - From Wolfram Sang <w.sang@pengutronix.de>:Andreas Gruenbacher2008-11-022-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 Gruenbacher2008-11-022-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 Gruenbacher2008-11-024-3/+36
| | | | | - Only run test/patch-wrapper.test if the --with-patch-wrapper config option is used.
* - Bash completion fix for fold command fromAndreas Gruenbacher2008-09-032-0/+7
| | | | Bernhard Walle <bwalle@suse.de>.
* +- Bump version to 0.47.v0.47Andreas Gruenbacher2008-08-213-2/+14
| | | | | +- Add a new "publish" makefile target for pushing releases to + savannah.nongnu.org.
generated by cgit (git 2.34.1) at 2024-09-23 00:25:16 +0000