1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
|
#!/usr/bin/env python
#
# cvsdiff-fix
#
# Takes the output of "cvs diff", which produces a flattened
# recursive diff, and unflattens it so that it can be
# applied correctly with "patch".
#
# $Id$
#
# Copyright (C) 2001 by Gilbert Ramirez <gram@alumni.rice.edu>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import sys
import re
import string
# Open input stream
if len(sys.argv) == 1:
input = sys.stdin
elif len(sys.argv) == 2:
try:
input = open(sys.argv[1])
except IOError:
(exc_type, exc_value, exc_traceback) = sys.exc_info()
print "Cannot open %s for input: %s" % (sys.argv[1], exc_value)
sys.exit(1)
else:
print "Usage: %s [diff_file]" % (sys.argv[0])
sys.exit(1)
# State Meaning
# ----- -------
# 0 Looking for "^Index: "
# 1 Looking for "^diff "
# 2 Looking for "^---"
# 3 Looking for "^+++"
state = 0
pathname = None
basename = None
re_index = re.compile(r"^Index: (?P<pathname>\S+)")
re_diff = re.compile(r"^diff ")
re_diff_filename = re.compile(r"\S+$")
re_from = re.compile(r"^--- \S+(?P<after>.*)")
re_to = re.compile(r"^\+\+\+ \S+(?P<after>.*)")
for line in input.readlines():
if line[-1] == "\n":
line = line[:-1]
if state == 0:
match = re_index.search(line)
if match:
pathname = match.group("pathname")
# Find basename
i = string.rfind(pathname, "/")
if i == -1:
i = string.rfind(pathname, "\\")
if i == -1:
# if there's no dir info,
# then there's no reason to
# process this section
pass
else:
basename = line[i+1:]
state = 1
elif state == 1:
match = re_diff.search(line)
if match:
line = re_diff_filename.sub(pathname, line)
state = 2
elif state == 2:
if line.find("Binary files") == 0:
state = 0
continue
match = re_from.search(line)
if match:
new_line = "--- %s\\g<after>" % (pathname)
line = re_from.sub(new_line, line)
state = 3
else:
sys.stderr.write("Expected ^---, but found: %s\n" \
% (line))
elif state == 3:
match = re_to.search(line)
if match:
new_line = "+++ %s\\g<after>" % (pathname)
line = re_to.sub(new_line, line)
state = 0
else:
sys.stderr.write("Expected ^+++, but found: %s\n" \
% (line))
print line
|
