Skip to content

Commit b7a2704

Browse files
committed
Updated with source install
1 parent afde317 commit b7a2704

File tree

2 files changed

+20
-97
lines changed

2 files changed

+20
-97
lines changed

README.md

+19-96
Original file line numberDiff line numberDiff line change
@@ -7,88 +7,23 @@ Commit patches to Darcs, Git, Mercurial, Bazaar, Monotone, Subversion, or CVS
77
Installation
88
------------
99

10-
On a recent Debian/Ubuntu:
10+
Depends on:
1111

12-
apt install commit-patch
12+
- [patchutils] (https://github.com/twaugh/patchutils)
13+
Install from your OS pkg manager
14+
- [IPC-Run] (https://github.com/toddr/IPC-Run)
15+
- [commit-patch] (https://github.com/oneness/commit-patch)
16+
Run following script:
1317

14-
Anywhere else: Install the prerequisites below and download the release
15-
tarball from the [homepage](https://porkrind.org/commit-patch/). This
16-
tarball contains a "fatpacked" version of the `commit-patch` perl script
17-
with the external perl dependencies embedded. Then put the commit-patch
18-
and commit-partial binaries into your `PATH`.
18+
```
19+
git clone https://github.com/toddr/IPC-Run ~/repos/IPC-Run
20+
git clone https://github.com/oneness/commit-patch ~/repos/commit-patch
21+
cd ~/repos/commit-patch && sudo make install
22+
```
1923

20-
21-
Prerequisites
22-
-------------
23-
24-
`commit-patch` is known to run on Linux and Mac OS X. It is perl,
25-
so ideally it will run anywhere, but we have never tested in
26-
other environments, most notably Windows. Use at your own risk.
27-
28-
`commit-patch` relies on several programs to get the job done:
29-
30-
- [perl](https://www.perl.org)
31-
- [patch](https://www.gnu.org/software/patch/)
32-
- [interdiff](http://cyberelk.net/tim/software/patchutils/)
33-
- cp - Ideally installed on your system already. :-)
34-
35-
and, of course, one of:
36-
37-
- [git](https://git-scm.com/)
38-
- [mercurial](https://subversion.apache.org/)
39-
- [darcs](http://darcs.net/)
40-
- [subversion](http://subversion.tigris.org/)
41-
- [cvs](https://www.nongnu.org/cvs/)
42-
- [bazaar](https://bazaar.canonical.com/)
43-
- [monotone](https://www.monotone.ca/)
44-
45-
## Installing Prerequisites
46-
47-
On Debian/Ubuntu:
48-
49-
apt-get install patch patchutils
50-
51-
On Fedora:
52-
53-
yum install patch patchutils
54-
55-
On Mac OS X w/ [Homebrew](https://brew.sh)
56-
57-
brew install patchutils
58-
59-
---
60-
**NOTE**
61-
62-
If you see error like this: `you may need to install the IPC::Run
63-
module`, which means you are installing from source using `sudo make
64-
install` after cloning this repo. Here is how to install the needed
65-
perl module:
66-
67-
sudo perl -MCPAN -e shell
68-
o conf init # on the prompt like perl> o conf init
69-
## exit from the prompt by typing `quit`
70-
sudo perl -MCPAN -e 'install Bundle::CPAN' # to update CPAN
71-
sudo perl -MCPAN -e 'install IPC::Run' # to install the module
72-
73-
FYI: You do not need to install above module if you are using the
74-
`tar` version that comes with it.
75-
76-
---
77-
78-
79-
Instructions
24+
Usage
8025
------------
8126

82-
### commit-patch
83-
84-
See the man page or perldoc:
85-
86-
man ./commit-patch.1
87-
perldoc commit-patch
88-
89-
90-
### commit-patch-buffer.el
91-
9227
commit-patch-buffer.el is an emacs interface to `commit-patch`. It
9328
allows you to just hit `C-c C-c` in any patch buffer to apply and commit
9429
only the changes indicated by the patch, regardless of the changes in
@@ -102,30 +37,18 @@ your emacs init file:
10237

10338
The easy way of working with commit-patch-buffer is to `M-x vc-diff` a
10439
file (or `M-x vc-root-diff` your whole project) then kill, split or edit
105-
the resulting hunks using diff mode's built-in commands and to then hit
106-
`C-c C-c` to commit the patch.
40+
the resulting hunks using diff mode's built-in commands and then hit
41+
`C-c C-c` to commit the patch. You can amend previous commit by `C-c C-C` instead.
10742

10843

109-
Development
44+
Notes
11045
-----------
11146

112-
`commit-patch` uses [Carton](https://github.com/perl-carton/carton) for
113-
local development. Once Carton is installed:
114-
115-
carton install
116-
117-
After than `commit-patch` and `commit-partial` should work. There is no
118-
need to `carton exec` them—the code autodetects the local libs.
119-
120-
121-
Homepage
122-
--------
123-
https://porkrind.org/commit-patch/
47+
This is my fork of:
48+
- [commit-patch] (https://github.com/caldwell/commit-patch)
12449

125-
Authors
126-
-------
127-
- David Caldwell <david@porkrind.org>
128-
- Jim Radford <radford@blackbean.org>
50+
I will keep updating this fork to meet my use case. Please fork this
51+
or the original above to change/extend it if your needs are not met.
12952

13053
Copyright and License
13154
---------------------

commit-patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ my $FALLBACK_EDITOR = 'vi';
99
use strict;
1010
use Cwd qw(abs_path);
1111
use File::Basename;
12-
use lib dirname(abs_path($0))."/local/lib/perl5";
12+
use lib $ENV{HOME}."/repos/IPC-Run/lib";
1313
use IPC::Run;
1414
use File::Temp qw(tempfile);
1515
use Getopt::Long;

0 commit comments

Comments
 (0)