git show v2.6.30-rc5:Makefile |head -n5
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 30
EXTRAVERSION = -rc5
NAME = Vindictive ArmadilloA simple way with curl to post code snippet to ubuntu paste:
$ curl -v -d 'poster=chengrq&syntax=python' --data-urlencode 'content@/home/gektop/bin/diff-filter' http://paste.ubuntu.com
* About to connect() to paste.ubuntu.com port 80 (#0)
* Trying 91.189.90.174... connected
* Connected to paste.ubuntu.com (91.189.90.174) port 80 (#0)
> POST / HTTP/1.1
> User-Agent: curl/7.18.2 (x86_64-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.8j zlib/1.2.3
> Host: paste.ubuntu.com
> Accept: */*
> Content-Length: 3002
> Content-Type: application/x-www-form-urlencoded
> Expect: 100-continue
>
< HTTP/1.1 100 Continue
< HTTP/1.1 302 Found
< Date: Fri, 08 May 2009 01:29:08 GMT
< Server: Apache/2.2.8 (Ubuntu) mod_python/3.3.1 Python/2.5.2 mod_ssl/2.2.8 OpenSSL/0.9.8g mod_perl/2.0.3 Perl/v5.8.8
< Location: /166435/
< Content-Length: 0
< Content-Type: text/html; charset=utf-8
<
* Connection #0 to host paste.ubuntu.com left intact
* Closing connection #0
I need a diff (or patch) manipulation utility, but unfortunately I have not found one, then I wrote one, of course, it's in Python.
#!/usr/bin/python
import sys, os
# Usage: diff-filter [-v] path1 path2 ...
# <INPUT >OUTPUT
if len(sys.argv) <= 1:
print "Usage: %s [-v] path1 path2 ... <INPUT" % \
os.path.basename(sys.argv[0])
sys.exit(1)
# some global variables
inChunk = True
strip = 1
matched = False
buffer = ''
invert = False
# to invert the filter
if sys.argv[1] == '-v':
invert = True
del sys.argv[1]
# the main filter
while True:
line = sys.stdin.readline()
if not line:
break
if line.startswith("--- ") or \
line.startswith("diff") or \
line.startswith("Binary") or \
line.startswith("Index"):
matched = False
inChunk = False
if line.startswith("diff") or \
line.startswith("Binary") or \
line.startswith("Index"):
buffer += line
continue
else:
path = line.split()[1]
slash = path.find('/')
path = path[slash+1:]
for arg in sys.argv[1:]:
if path.startswith(arg):
matched = True
break
else:
matched = False
if invert:
matched = not matched
if not matched:
buffer = ''
if inChunk:
print line,
if matched:
if buffer:
print buffer,
buffer = ''
print line,
It also can be reached by the ubuntu paste service:
Application field: if you have a big diff generated by "diff -R", and want to split it according to some seperate path or components, you can use this. Happy hacking!