11 return os.popen (x).read ()
17 class PatchFailed(Exception):
30 def __init__ (self, dict):
35 self.__dict__[v] = dict[v]
37 self.date = ' '.join (self.date.split (' ')[:-1])
38 self.date = time.strptime (self.date, '%a %b %d %H:%M:%S %Y')
40 m = re.search ('(.*)<(.*)>', self.author)
41 self.email = m.group (2).strip ()
42 self.name = m.group (1).strip ()
43 self.diff = read_pipe ('git show %s' % self.committish)
44 def compare (self, other):
45 return sign (time.mktime (self.date) - time.mktime (other.date))
47 def touched_files (self):
50 files.append (x.group (1))
53 re.sub ('\n--- a/([^\n]+)\n',
55 re.sub('\n--- /dev/null\n\\+\\+\\+ b/([^\n]+)',
61 return self.touched_files () <> []
63 def apply (self, add_del_files):
64 def note_add_file (x):
65 add_del_files.append (('add', x.group (1)))
68 def note_del_file (x):
69 add_del_files.append (('del', x.group (1)))
72 re.sub('\n--- /dev/null\n\\+\\+\\+ b/([^\n]+)',
73 note_add_file, self.diff)
75 re.sub('\n--- a/([^\n]+)\n\\+\\+\\+ /dev/null',
76 note_del_file, self.diff)
78 p = os.popen ('patch -f -p1 ', 'w')
82 raise PatchFailed, self.committish
85 def parse_commit_log (log):
86 committish = re.search ('^([^\n]+)', log).group (1)
87 author = re.search ('\nAuthor:\s+([^\n]+)', log).group (1)
88 date_match = re.search ('\nDate:\s+([^\n]+)', log)
89 date = date_match.group (1)
90 log = log[date_match.end (1):]
92 message = re.sub ("\n *", '', log)
93 message = message.strip ()
95 c = Commit (locals ())
98 def parse_add_changes (from_commit, max_count=0):
104 assert max_count == 1
105 opt = '--max-count=%d' % max_count
108 log = read_pipe ('git log %(opt)s %(from_commit)s%(rest)s' % locals ())
110 log = log[len ('commit '):]
116 commits = map (parse_commit_log, re.split ('\ncommit ', log))
123 return '%d-%02d-%02d %s <%s>\n' % (commit.date[:3] + (commit.name, commit.email))
125 def changelog_body (commit):
127 s += ''.join ('\n* %s: ' % f for f in commit.touched_files())
128 s += '\n' + commit.message
130 s = s.replace ('\n', '\n\t')
135 p = optparse.OptionParser (usage="usage git-update-changelog.py [options] [commits]",
137 Apply GIT patches and update change log.
139 Run this file from the CVS directory, with commits from the repository in --git-dir.
145 p.add_option ("--start",
150 help="all commits starting with FIRST.")
152 p.add_option ("--git-dir",
156 help="the GIT directory to merge.")
158 (options, args) = p.parse_args ()
160 log = open ('ChangeLog').read ()
163 os.environ['GIT_DIR'] = options.gitdir
167 if not options.start:
168 print 'Must set start committish.'
171 commits = parse_add_changes (options.start)
175 commits += parse_add_changes (a, max_count=1)
183 first = header (commits[0]) + '\n'
184 if first == log[:len (first)]:
185 log = log[len (first):]
188 previously_done = dict((c, 1) for c in open ('.git-commits-done').read ().split ('\n'))
192 commits = [c for c in commits if not previously_done.has_key (c.committish)]
193 commits = sorted (commits, cmp=Commit.compare)
198 collated_message = ''
203 commits = commits[1:]
205 commits_done.append (c)
207 if not c.has_patch ():
208 print 'patchless commit (merge?)'
211 print 'patch ', c.committish
213 c.apply (file_adddel)
217 if c.touched_files () == ['ChangeLog']:
221 and c.author != last_commit.author
222 and c.date[:3] != last_commit.date[:3]):
224 new_log += header (last_commit)
226 collated_log = changelog_body (c) + collated_log
229 collated_message += c.message + '\n'
233 for (op, f) in file_adddel:
235 system ('cvs remove %(f)s' % locals ())
237 system ('cvs add %(f)s' % locals ())
240 collated_log = header (last_commit) + collated_log + '\n'
242 log = collated_log + log
245 os.unlink ('ChangeLog~')
249 os.rename ('ChangeLog', 'ChangeLog~')
250 open ('ChangeLog', 'w').write (log)
252 open ('.msg','w').write (collated_message)
253 print '\nCommit message\n**\n%s\n**\n' % collated_message
254 print '\nRun:\n\n\tcvs commit -F .msg\n\n'
255 print '\n\techo %s >> .git-commits-done\n\n' % ' '.join ([c.committish
256 for c in commits_done])
260 print 'Commits left to do:'
261 print ' '.join ([c.committish for c in commits])