A patch maintenance tool
Edit <file> as part of the patch <patchname>.
Refresh current patch.
Move back one patch to the previous one.
Move back in series until we're at <patch>.
Move back <num> patches in series.
Apply the next patch in the series.
Apply all patches from the series until we've reached at <patch>.
Apply next <num> patches from series.
Import an external diff file into patch <patchname>. Strip <n> levels from the directory names. Please note that patch allows '-p1', but we only '-p 1'.
Import an external diff file into patch <patchname>. Strip <n> levels from the directory names. Please note that patch allows '-p1', but we only '-p 1'.
Patcher is a perl script which I use for managing patches. It's quite powerful, easy to use, and fast.
Patcher keeps track of which files you change. It then can generate patches from your changes, no need for you to handle the diff tool manually.
You can have more than one record of file changes, we call this a patch. A patch is something that the patch\|(1) command can apply.
The patches can be stacked in series, they define the order they have to applied. Patcher keeps series information as well as information which patches have been applied and which not.
Later we will have a walkthrought, but let me first explain the basic operation modes of patcher:
\$1
When you call patcher with a filename, patch will make a backup of this file (if the file exists). Now you can create or change the file. Later you can ask patcher to create a unified diff with all your changes. Just call \*(L"patcher -r\*(R" and you will get a unified diff of all your additions, modification and deletions. The diff will be stored in .patches/<patchname>.patch. It is in a form that allows direct application via patch\|(1) or, of course, via \*(L"patcher -i\*(R".
Whenever you do \*(L"patcher -r\*(R" your .patches/<patchname>.patch file get's refreshed. To revoke your changes and go to the previous version, just enter \*(L"patcher -b\*(R". Patcher will make sure that you don't loose your changes by asking you to create a diff if something has changed since the last refresh. You may use -f (or --force) patcher to go back anyway.
You can back out more than one patch by either specifying a number a patch name after -b. With \*(L"patcher -n <patchname> -a\*(R" one can apply an already existing managed patch. A managed patch is a patch that already is stored in the .patches directory and is mentioned in the .patches/series file. Patcher tests if the patch would apply without problem and applies it. If the patch would be rejected, you can use -f (or --force) to apply the patch anyway.
You can apply more than one patch by either specifying a number a patch name after -a. Sometimes you have an external patch. That's the opposite of a managed patch, the patch is not stored in the .patches directory. By importing it, it will become a managed patch.
Import the patch simply with -i <filename>. You can use -p <num> to specify the directory level, similar to the -p<num> option of patch\|(1). But please keep in mind that we need a space between -p and the number.
Normally only clean patches will be imported. To import a patch that creates rejects use -f (or --force). You'll see a list of files where the patch did not apply cleanly, fix the problems manually.
Later you can use \*(L"patcher -r\*(R" to create a clean patch.
Just place patcher somewhere in your path. That's all.
For each project Patcher requires one special directory called \*(L".patches\*(R". It will search for this directory. If it does not exist, patcher creates it automatically.
All work occurs with a single directory tree. All commands are invoked within the root of that tree (\s-1TODO:\s0 this can and should change). Patcher manages a \*(L"stack\*(R" of patches.
Each patch is a changeset against the base tree plus the preceding patches.
All patches are listed, in order, in the file \*(L".patches/series\*(R". Patcher adds patches into this file, but never deletes entries. You can edit this file with a text editor, but please do only so if the patch you delete is currently not applied.
Any currently applied patches is listed in the file \*(L".patches/applied\*(R". The patcher manage this file, there is no need for you to ever edit this file manually.
Each patch affects a number of files in the tree. These files are listed in a file list named \*(L".patches/*.files\*(R". Patcher manages them. When you back out a patch, this file will deleted. Or, in other words, this file exists only for applied patches. It's only used by \*(L"patcher -r\*(R".
Patches are placed into \*(L".patches/*.patch\*(R" files. They are always unified diffs with -p1 as patchlevel. You can copy then anywhere, the patch\|(1) utility will read them without problems.
Optionally you can put descriptions for the patches in files named \*(L".patches/*.txt\*(R".
So for a particular patch \*(L"my-first-patch\*(R" the following will exist:
An entry \*(L"my-first-patch.patch\*(R" in \*(L".patches/series\*(R".
An entry \*(L"my-first-patch\*(R" in \*(L".patches/applied\*(R" (if it's currently applied)
A file \*(L".patches/my-first-patch.files\*(R" which contains the names of the files which my-first-patch modifies, adds or removes
A file \*(L".patches/my-first-patch.patch\*(R", which is the context diff, basically the main output of patcher.
Optionally a file \*(L".patches/my-first-patch.txt\*(R" which contains the patch's changelog, description or whatever you put in there.
Let's start.
Go into /usr/src/linux (or wherever).
Now let's start with changing some source files:
patcher -n my-patch kernel/sched.c
\s-1OK\s0, patcher copied kernel/sched.c to kernel/sched.c~my-patch for you, the program has also done some magic in the .patches directory, which won't be of interest to us now.
Now edit kernel/sched.c a bit.
Now we're ready to document the patch:
Create .patches/my-patch.txt
Now generate a patch:
patcher -r
This will generate \*(L".patches/my-patch.patch\*(R". Take a look at this file.
Now we remove our change to sched.c by going backwards:
patcher -b
Look at where we're now:
patcher -s
Now let's add another file to my-patch. First we re-apply the patch:
patcher -a
Now edit a second file:
patcher kernel/printk.c
Note that here we gave patcher a single argument, without command line options. This always tells patcher to add another file to the current patch.
Edit kernel/printk.c
Refresh my-patch:
patcher -r
Now start a second patch:
patcher -n my-second-patch kernel/sched.c
Here we have a filename in the command line for patcher, so we edit a file. But now we specified a patch name with -n. This told patcher to create a new patch. Now patcher manages two patches, \*(L"my-patch\*(R" and \*(L"my-second-patch\*(R".
Edit kernel/sched.c, to make some changes for my-second-patch
Generate my-second-patch:
patcher -r
Take a look in \*(L".patches/my-second-patch.patch\*(R".
Also note that \*(L"my-second-patch.patch\*(R" has been added to the series file. Whenever you manually begin a patch, it will automatically be put into the series file.
In this way, the whole thing is stackable. If you have four patches applied, say \*(L"patch-1\*(R", \*(L"patch-2\*(R", \*(L"patch-3\*(R" and \*(L"patch-4\*(R", and if patch-2 and patch-4 both touch kernel/sched.c then you will have:
Original copy, before patch-2
Copy before patch-4. Contains changes from patch-2
Current working copy. Contains changes from patch-4.
This means that your diff headers contain \*(L"~patch-name\*(R" in them, which is convenient documentation.
To end our tour, we remove both patches:
patcher -b patcher -b
That's pretty much it, really.
Andrew Morton's patch scripts at http://www.zip.com.au/~akpm/linux/patches/
I stole the idea from him and even most of this documentation.
At http://savannah.nongnu.org/projects/quilt/ you'll find Quilt. That's the successor of Andrew's original scripts. They do the same as patcher (and slightly more), but with tenthousand shell scripts.
Holger Schurig <holgerschurig usingthedomain gmx.de>