summaryrefslogtreecommitdiffstats
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* - Get rid of the apatch and rpatch helper scripts: Integrate themAndreas Gruenbacher2004-11-152-393/+0
| | | | | in the push and pop commands. This should bring a small performance improvement.
* - Fix extra trailing space in series file after quilt refreshAndreas Gruenbacher2004-11-081-1/+1
| | | | (David Vrabel <dvrabel@arcom.com>).
* - When applying a patch with -q and without -f no (individual)Andreas Gruenbacher2004-10-172-3/+6
| | | | | | | | | | | reject files are created, and the "patching file" comments are missing as well. In that case, we don't know wich files the "-- saving rejects to file /tmp/foo" comments belong to, and we can't fic them up. Remove them, instead. - Pop command: Touch files after they are restored so that tools like make don't get confused. - Update test cases. - Bump to version 0.37.
* - scripts/patchfns.in: set the dotglob option so that dot filesAndreas Gruenbacher2004-09-222-8/+18
| | | | | | | | | | | | | will show up in file globs as well. Bug reported by James Rowe. - Add a missing tab to the patch header of files that are removed. Bug reported by James Rowe. - Push command: Without -f or --leave-rejects, when applying a patch failed, the *.rej files were not removed properly. Change the code so that they won't be created in the working tree in the first place this case. - test/run script: Oops, the previouos commit was not the latest version. - Bump version to 0.36.
* - scripts/inspect.in: Run the RPM %prep section in /var/tmp andAndreas Gruenbacher2004-09-121-1/+1
| | | | not in /tmp: the sources can become large.
* - Refresh command: recognize and ignore header lines generated byAndreas Gruenbacher2004-08-251-1/+1
| | | | | ``cvs diff''. - Add a missing print_patch call (cosmetic).
* - setup command: detect errors when running ``rpm -bp'' andAndreas Gruenbacher2004-08-131-1/+3
| | | | improve the messages of ``quilt setup''.
* Tell the user to refresh patch which does not remove properly, not only to ↵Martin Quinson2004-07-221-1/+1
| | | | force with -f
* - Replace a few instances of awk and sed with @AWK@ and @SED@ inAndreas Gruenbacher2004-07-142-3/+3
| | | | *.in files.
* Track down two string expensions in printf $"" leftMartin Quinson2004-07-131-1/+1
|
* Fix a typo (s/prinf/printf/) reported by Dean RoehrichMartin Quinson2004-07-131-1/+1
|
* - Fix stripping of the path to $QUILT_PATCHES when working inAndreas Gruenbacher2004-07-131-1/+1
| | | | sub-dirextories. (This could be fixed more flexibly later...)
* - Disable CDPATH within quilt (Joe Green writes: I've seen someAndreas Gruenbacher2004-07-121-0/+2
| | | | | | cases where having CDPATH set results in the path being printed by cd, and I suppose it's possible that the wrong destination might be selected in some cases.)
* - Some more QUILT_PATCHES_PREFIX fixes.Andreas Gruenbacher2004-07-121-3/+5
|
* - Switch from echo to printf for all translations: This is moreAndreas Gruenbacher2004-07-093-19/+27
| | | | | | | | | | | | | | | stable than having expansions in messages that might change independent of the message. - Add print_patch function and always use it when printing patch names. Remove -n options from various scripts and use a global switch QUILT_PATCHES_PREFIX in .quiltrc to decide between patch names with and without directory prefix. Depending on user experience this switch may eventually go away. - Add --diffstat option to refresh command: If given, this option inserts diffstat statistics at the end of the patch header, or refreshes the existing diffstat output. No special tags in the path file (%diffstat or the like) are needed. - Minor fix inserting changelog into RPM specfile.
* - Add common GNU Diff format options to diff and refresH commands:Andreas Gruenbacher2004-07-041-9/+13
| | | | | | | | | | | -u, -U num, -c, -C num. REname old -c option (combine patches) of diff command to --combine. - Extend the function that splits comments froM patches and syntax coloring to handLe combined diff format. - Honor the LAnG environment variable again; this goT broken at some point. - Set TEXTDOMAINDIR to where the translations are put so that Messages are found even when not installing into /usr.
* - Several Fixes from Joe Green <jgreen@mvista.com>:Andreas Gruenbacher2004-07-021-15/+16
| | | | | | | | | | | | | | | | + Another sed \t\r problem, in Makefile.in + Bad error message on "quilt delete" of non-existent patch + "import" doesn't remove all leading components on patch file + Misspelling in "import" help text - With using the GNU diff --label option, file timestamps disappeared. Specify the timestamps in --label by hand: This gives us added flexibility when generating patches; we may some day want to support diff styles other than unified. Also reported by Joe Green. - Add --backup option to quilt refresh. - Update documentation to QUILT_${COMMAND}_ARGS in .quiltrc. (The old settings still work but they are no longer documented.) - Update German translation.
* - Allow passing of default options to commands by definingAndreas Gruenbacher2004-07-011-0/+6
| | | | | QUILT_${COMMAND}_ARGS in .quiltrc. This should eventually get us rid of some of the mess in .quiltrc.
* - Add meta-data version check/upgrade code from Martin Quinson andAndreas Gruenbacher2004-06-101-60/+107
| | | | | | | | | | | | | | me; new `quilt upgrade' command. - Handle new/removed files correctly in generated patches: If the old or new file is missing, the file name in the patch should be /dev/null. Fix test suite accordingly, and add test/create-delete.diff. GNU patch recognizes this, and does additional file existance tests when a patch creates/deletes a file. Also use the --label option of GNU diff instead of hand-editing file name headers. - Add test/Makefile for running the test suite. Note: The tests run against the installed version of quilt! - Bump version to 0.34.
* - dependency-graph: Fix backup filenames for patcher.v0.33Andreas Gruenbacher2004-06-061-1/+1
|
* - Preserve the order of files in patches in the diff and refreshAndreas Gruenbacher2004-06-061-0/+42
| | | | | | | commands. Files added to a patch appear at the end of a patch. The files command also lists the files in the order in which they appear in patches. - Update to version 0.33.
* - dependency-graph: Fix for --lines option in patcher mode;Andreas Gruenbacher2004-06-061-5/+13
| | | | restrict to applied patches.
* - backup-file.c: Add code to recursively search .pc directories.Andreas Gruenbacher2004-06-062-24/+10
| | | | | | | | | | Add a "no-op" mode as default, and allow to just unlink files. - apatch/rpatch: let backup-files search .pc directories instead of generating temporary file lists. - rpatch/pop: unlink files of topmost patch after popping instead of unlinking at each step. - If QUILTRC is set in the environment, use this as the configuration file.
* - Return exit status 2 when commands go beyond the series (topAndreas Gruenbacher2004-06-051-6/+27
| | | | | | | | | | with no series, push/next when all patches are applied, pop/ previous when no patches are applied). - From John Lenz <jelenz@students.wisc.edu>: Add compatibility code to the dependency-graph script for reading the meta-data of Holger Schurig's patcher tool, http://www.holgerschurig.de/patcher.html. - Update German translation.
* - Another `quilt setup' fix.Andreas Gruenbacher2004-05-311-1/+1
|
* - Rewrite spec2series to return what the new `quilt setup' needs,Andreas Gruenbacher2004-05-312-227/+182
| | | | | | | | and rename it to inspect. - `quilt setup': Rewrite so that it supports multiple archives per spec file. Always make the patches directory a symlink to the original patch files instead of copying the patches. - Update German translation.
* - Fix `quilt fork': It destroys .pc/applied patches; that bug gotAndreas Gruenbacher2004-04-271-1/+1
| | | | introduced when reverting it to its previous semantics.
* - Fix a glitch in the previous \t fix.Andreas Gruenbacher2004-04-211-1/+1
|
* - Replace two occurrences of \t in sed regular expressionsAndreas Gruenbacher2004-04-211-2/+2
| | | | | | with bash $'\t': Some older versions of sed don't understand \t. Thanks to Randy Dunlap <rddunlap@osdl.org> for reporting this.
* - Fix an algorithmic bug in `quilt graph --lines': Edges wereAndreas Gruenbacher2004-03-201-67/+52
| | | | | sometimes lost. - A few minor cleanups.
* - Extend `quilt graph' to also support checking for overlappingAndreas Gruenbacher2004-03-142-14/+142
| | | | | | changes in patches. - Export QUILT_PATCHES QUILT_PC SUBDIR SERIES DB for use in non-shell components of quilt.
* - Revert `quilt fork' to how it originally worked: fork theAndreas Gruenbacher2004-03-132-1/+23
| | | | | | | | | | | | | | *topmost* patch, not the next unapplied patch. Adapt the test suite accordingly. - Add flag to backup-files.c to make sure that files in the working tree have a link count of at most one. Use this where appropriate. - Fix a bug in `quilt snapshot': Taking snapshots caused files to get link counts bigger than one, so modifying them could cause multiple files to get modified. Speed up the command, too. - Update the documentation. Add example1.test from the documentation.
* - Add some more generated files to .cvsignoreAndreas Gruenbacher2004-03-131-0/+3
|
* - Fix an open issue in the patchname filter inAndreas Gruenbacher2004-03-131-17/+31
| | | | scripts/dependency-graph.
* - Add `quilt graph' command for generating a dependency graphAndreas Gruenbacher2004-03-131-0/+314
| | | | | | | | between patches. This requires the graphviz package for removing transitive edges (optional) and for rendering the graph. Please note that the graph command itself is minimal, while the underlying scripts/dependency-graph is more flexible. - The spec file was missing the quilt.1 man page.
* - Quilt push/pop: exit with a non-zero status when beyond series.Andreas Gruenbacher2004-03-101-2/+2
| | | | - Ignore empty lines in series file.
* - Sub-directory support:Andreas Gruenbacher2004-02-201-2/+2
| | | | | | | | | | + Fix another bug that triggers when /patches exists. + Working in sub-directories: Force `quilt new' to always create the new patch in the current working directory even if there is a patches/ sub-directory further up the directory tree. This should restore the behavior from before Jan 28 very well. - quilt files, diff, refresh: Sort the files in the patch alphabetically.
* - Never fail when patching temporary files in `quilt diff -z',Andreas Gruenbacher2004-02-152-8/+3
| | | | only warn.
* - Add some fixes from Manuel Estrada Sainz <ranty@debian.org>.Andreas Gruenbacher2004-02-051-1/+4
| | | | | - Add QUILT_SERIES setting: Override the location of the series file to use.
* - Add --quiltrc={rcfile|-} option. Remove some superfluous quotingAndreas Gruenbacher2004-02-031-6/+6
| | | | | | from quilt wrapper. - Extra tests in `quilt refresh' did not check if the old patch was missing.
* - No longer remove common extensions (.dif, .diff, .patch, .gz,Andreas Gruenbacher2004-01-313-28/+40
| | | | | | | .bz2) from patch names. This allows patches in the same series that only differ by extension, and cleans up the scripts a little. Also don't remove extensions when printing patch names. - Remove unused diffstat code.
* - Add support for working in subdirectories of the base directoryAndreas Gruenbacher2004-01-283-29/+70
| | | | | | | that contains patches/ and .pc/. In the unlikely case that quilt shall operate in the sub-directory itself, it is sufficient to create a patches/ directory there. - Add a small testcase for subdirectory support.
* - Add QUILT_NO_DIFF_TIMESTAMPS option in .quiltrc.Andreas Gruenbacher2004-01-262-6/+7
| | | | | | GNU patch. - Fix help for `quilt diff'. - Update TODO.
* Small fix from wangdi: when patch file empty, it should first check wether ↵Andreas Gruenbacher2003-11-201-1/+6
| | | | the dir in .pc exist, then create timestamp
* - Add new command `quilt fold' to fold one patch into another.Andreas Gruenbacher2003-11-171-31/+27
| | | | | | | | - Fix bug in `quilt files': Files that are neither present in the working directory and have an empty backup copy sometimes were still listed. - Some minor cleanups in apatch. - Add test/fold.test, and fix a now-useless check in one.test.
* - Fix the timestamp check in scripts/rpatch.in for missing files.Andreas Gruenbacher2003-11-041-8/+4
|
* - Add failpop.test that checks if modified patches are recognized.Andreas Gruenbacher2003-11-043-10/+10
| | | | | - Fix the check for modified patches: That broke with the .pc file removal.
* - No longer verify if patches remove cleanly by reverse applyingAndreas Gruenbacher2003-10-313-91/+66
| | | | | | | | | them: This doesn't always succeed, and the the equivalent of `quilt diff -z' should suffice, anyway. - Add `touch .pc/$patch' after successful refresh: Speeds up `quilt pop' after a refresh. - Update test suite. - apatch was printing a spurious newline.
* - If a patch does not apply cleanly and `quilt push' removesAndreas Gruenbacher2003-10-291-4/+18
| | | | | rejects files it GNU patch left behind, change the output from ``saving rejects to file x.rej'' to ``rejects in file x''.
* - Remove .pc/*/.pc files, and adjust various scripts accordingly.Andreas Gruenbacher2003-10-283-146/+63
| | | | - Run test/one.test inside sub-directory.