summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bash_completion: Use _quilt_comfile for setupJean Delvare2016-10-211-3/+3
| | | | | Add support for directories to _quilt_comfile, and use that for the setup command. The drops the last direct dependency to _filedir.
* bash_completion: Use _quilt_comfile for diffJean Delvare2016-10-211-1/+1
| | | | | All other commands use _quilt_comfile so do the same for diff for consistency.
* bash_completion: Handle spaces in file namesJean Delvare2016-10-211-11/+12
| | | | | | | | Set IFS in _quilt_comfile so that file names containing spaces are properly handled. Also quote ${COMPREPLY[@]} everywhere so that such file names are preserved. This closes Debian bug #640551.
* bash_completion: Delete dead codeJean Delvare2016-10-211-6/+3
| | | | | | | | | | You can't change the caller's environment from the right hand side of a pipe. So that code was doing nothing, which means we can just delete it. What the code was supposedly doing, is actually implemented by complete's option "filenames". So move the comment to where this option is set, to clear the confusion.
* Update the French translationJean Delvare2016-10-211-1/+1
|
* Resync translation filesJean Delvare2016-10-215-135/+155
|
* Make one error message translatableJean Delvare2016-10-211-1/+1
|
* Fix a race condition in diff_fileJean Delvare2016-10-191-5/+7
| | | | | | Fix a race condition where we may check the return status of diff before the command has actually terminated. Make sure that we read all of diff's output to ensure this can't happen.
* diff: Report diff failuresJean Delvare2016-10-193-1/+2
| | | | | "quilt refresh" reports diff failures to the user. "quilt diff" should do the same.
* Reject binary files in patchesJean Delvare2016-09-151-1/+7
| | | | | | Since diffutils version 3.4, diff no longer returns an error code for binary files. Parse the first line of the output to detect this case and raise our own error.
* Project settings have priorityJean Delvare2015-12-042-2/+24
| | | | | | | | If QUILT_PATCHES or QUILT_SERIES are set both in ~/.quiltrc and .pc/.quilt_patches (respectively .pc/.quilt_series), the former currently takes precedence. This pretty much voids the value of per-project settings. Project settings should have the highest priority.
* setup: Drop variable $opt_fastJean Delvare2015-07-021-6/+5
| | | | | Variables $opt_fast and $QUILT_SETUP_FAST have the same meaning and value, so we can drop the former.
* setup: Reorder code in function inspect()Jean Delvare2015-07-021-12/+8
| | | | | Reorder the code in function inspect() to avoid testing for the same condition twice.
* setup: Delay the computation of md5sumsJean Delvare2015-07-022-3/+16
| | | | | | | | In fast mode, don't compute the md5sum of the files in the source directory before we need them. In most cases we will never actually need them, so this avoids computing them for nothing. Speed gain from this change can reach 12 %.
* inspect-wrapper: Identify files passed as stdinJean Delvare2015-07-021-0/+7
| | | | | | | | | | When the input file is passed through stdin, we can usually get its name from procfs. This avoids having to look up the file by md5sum. Not only this makes things faster, but this also helps if the patch file was modified by additional commands in the spec file before being applied (yes, I've seen this happen.) Speed gain from this change can reach 20 %.
* inspect-wrapper: Skip file copy in fast modeJean Delvare2015-06-161-3/+11
| | | | | | | | In fast mode, we only process calls to patch, and we don't let it actually apply the patches, so we never need to make a temporary copy of files read from the standard input. This change results in a 3 % performance gain in my test case.
* inspect-wrapper: Change original_file() parameterJean Delvare2015-06-161-4/+3
| | | | | Pass the md5sum instead of the file name to original_file(). This will allow for further optimization in fast mode.
* inspect-wrapper: Don't look up already known filesJean Delvare2015-06-162-9/+16
| | | | | | | If the input file is passed as a command line parameter, we already know its name, don't waste time looking it up. This change results in a 3 to 5 % performance gain in my test case.
* guards: Clarify user messageJean Delvare2015-04-291-1/+1
| | | | | | | | | | When --config=series is used and a listed file is not found on the disk, guards prints the following message: Not found in series: file This message is confusing, as the file was found in series, it is missing on the disk. Change the message to make this more obvious.
* Use standard sysconfdir as an etcdirNikolay Orlyuk2015-04-251-1/+1
|
* guards: Documentation updateJean Delvare2015-04-241-3/+5
| | | | | * Fix synopsis format. * Document the new --path=@<file> option.
* guards: Report which config file has problem in --check modeMichal Marek2015-04-241-2/+8
|
* guards: Include the file name also in the "Not found" errorMichal Marek2015-04-241-1/+5
|
* guards: Add support for an external filelist in --check modeMichal Marek2015-04-241-2/+14
| | | | This will allow us to run --check without a kernel-source.git work tree.
* guards: Simplify help textMichal Marek2015-04-241-2/+1
|
* inspect-wrapper: Compute our name only onceJean Delvare2015-04-151-10/+13
| | | | | | There are way too many occurrences of ${0##*/}. Store the result in a variable and use it as needed. Also hard-code the name when it is known, to save the cost of variable substitution altogether.
* inspect-wrapper: Report failed look-upsJean Delvare2015-03-242-19/+28
| | | | | The inspect-wrapper script looks up files by md5sum. If that fails, we should notify the user that something went wrong.
* Let cat_to_new_file handle the file backupJean Delvare2015-03-194-12/+52
| | | | | | | | | | | | | Let function cat_to_new_file optionally backup the destination file before overwriting it. This has two advantages: * This avoids duplicating code on the caller's side. Functions header and refresh both need to perform a backup. * This guarantees the consistency of the backup logic. At the moment, the refresh command would handle the backup of a symlinked file just fine while the header command would misbehave in that case. Now that the header command handles symlinked patches properly, also test it so that we don't break it accidentally later.
* hard-linked-patch.test: Test the header commandJean Delvare2015-03-191-0/+24
| | | | | Extend the hard-linked patch test case to also check the behavior when updating the header of such a patch.
* Test backup failureJean Delvare2015-03-191-0/+23
| | | | Add a test case for backup failure to the test suite.
* quilt-el: fix quilt-editable when patches are stored in subdirsCédric Le Goater2015-03-121-1/+1
| | | | | | | | | | | | I frequently use sub-directories to store different patchsets under the quilt patches/ directory. Unfortunately, the quilt emacs mode does not handle this case and the file is not considered editable. The issue seems to be in the quilt-top-patch which does an equivalent of basename on the patch name. The proposal below changes the quilt-editable routine to keep the full name of the patch. Signed-off-by: Cédric Le Goater <legoater@free.fr>
* symlink.test: Make the test more robustJean Delvare2015-02-251-0/+1
| | | | | | | "mv" may or may not overwrite a read-only file by default, depending on whether or not it is considered to be interactive. Removing the file explicitly before avoids that uncertainty and makes it easier to play the test case manually.
* Delete blank line at end of filesJean Delvare2015-02-2512-12/+0
|
* Add missing editor hintsJean Delvare2015-02-253-0/+12
| | | | | Add the editor syntax hint comments to 3 files which do not have them yet.
* Strip metadata comments from generated filesJean Delvare2015-02-251-0/+1
| | | | | | | Source files include metadata comments to help text editors apply the right syntax highlighting. Generated files should not be edited so these comments are not needed there. Text editors should get the language right for generated files in the first place anyway.
* refresh: Always preserve modification timeJean Delvare2015-02-252-1/+4
| | | | | | In the general case, when doing a backup copy of a patch on refresh, the modification time of the file is preserved. We should do the same when the patch is a symbolic link.
* refresh: Break links to read-only patch filesJean Delvare2015-02-252-1/+52
| | | | | | | | We just changed the behavior of the refresh command to no longer break symbolic links. While preserving the links is the right thing to do in the general case, this approach fails if the patch file is read-only. In that case we want to replace the link itself with the refreshed patch, as we used to.
* refresh: Do not remove symlinksJason Wessel2015-02-183-2/+63
| | | | | | | | | | | | | | | | | | | | | | Change the core behavior of quilt to not remove symlinks to the patch files. Historical notes: This is an 6 year old patch that is still actively used for the Yocto Project and others. http://lists.nongnu.org/archive/html/quilt-dev/2008-01/msg00004.html Revised again here: http://comments.gmane.org/gmane.comp.handhelds.openembedded/34224 [Edited by Jean Delvare: removed a compatibility option, we'll introduce it only if users ask for it. Also cleaned up the test case a bit.] Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
* edit: Fix a corner caseJean Delvare2015-02-182-2/+35
| | | | | | | | | | | | | | | | There is one corner case which is not properly handled by the "edit" command. If a patch deletes a file, and the user calls "quilt edit" on that file but does not actually add anything back to it, "quilt remove" is called on the file when the editor exits. This causes the file to be restored to its original state before the patch deleted it. The user never asked for that, so the file should be left to its deleted state in this case. The file must only be removed from the patch if it was not part of the patch originally. The same problem would occur if the editor deleted the file. In general text editors don't do that, they'd leave an empty file instead, but nothing prevents them from actually deleting the file so we should handle this case properly too.
* edit: Use command "remove" to remove filesJean Delvare2015-02-182-1/+12
| | | | | | | | | | | Commit f1c186ee renamed command "remove" to "revert". Commit bd1dfdab changed the semantics of command "revert". Commit 6d2501ac restored command "remove". However command "edit" is still calling command "revert" to remove files from the patch when it should be using command "remove". This case was not covered by the test suite, which is why the bug was not spotted earlier.
* edit: Improve the test caseJean Delvare2015-02-181-3/+24
| | | | | | | | | Cover one more use case of the "edit" command in the test case: file creation. Also reorder some of the commands to make the tests easier to follow. The intent is easier to understand when the result is tested after each command.
* Remove garbage from commentJean Delvare2015-02-171-1/+1
|
* Merge the two revert test casesJean Delvare2015-02-172-46/+26
| | | | | Merge the two revert test cases into a single, complete and commented test file.
* Fix translation of main usage messageJean Delvare2015-02-116-23/+23
| | | | | | @ETCDIR@ is substituted at build time so it should not appear in translated messages. Replace it with %s and pass the actual value as a parameter.
* Improve the German translationHolger Wansing2015-02-111-107/+106
|
* Missing escape in Japanese translationJean Delvare2015-02-111-1/+1
| | | | | The original message has the dollar sign protected, so the Japanese translation should do the same.
* Make gettext happyJean Delvare2015-02-102-23/+24
|
* Update the release checklistJean Delvare2015-02-101-5/+6
| | | | Translation updates take time so it should be the first item.
* Set version to 0.64.v0.64Jean Delvare2015-02-093-15/+37
|
* Update the German translationHolger Wansing2015-02-081-279/+343
|