Guido van Rossum | 6f0cf7e | 1997-08-14 22:04:00 +0000 | [diff] [blame] | 1 | #! /usr/bin/env python |
| 2 | |
| 3 | """Consolidate a bunch of CVS or RCS logs read from stdin. |
| 4 | |
| 5 | Input should be the output of a CVS or RCS logging command, e.g. |
| 6 | |
Guido van Rossum | 9971f68 | 1997-10-06 21:09:32 +0000 | [diff] [blame] | 7 | cvs log -rrelease14: |
Guido van Rossum | 6f0cf7e | 1997-08-14 22:04:00 +0000 | [diff] [blame] | 8 | |
| 9 | which dumps all log messages from release1.4 upwards (assuming that |
Guido van Rossum | 9971f68 | 1997-10-06 21:09:32 +0000 | [diff] [blame] | 10 | release 1.4 was tagged with tag 'release14'). Note the trailing |
| 11 | colon! |
Guido van Rossum | 6f0cf7e | 1997-08-14 22:04:00 +0000 | [diff] [blame] | 12 | |
| 13 | This collects all the revision records and outputs them sorted by date |
| 14 | rather than by file, collapsing duplicate revision record, i.e., |
| 15 | records with the same message for different files. |
| 16 | |
| 17 | The -t option causes it to truncate (discard) the last revision log |
| 18 | entry; this is useful when using something like the above cvs log |
| 19 | command, which shows the revisions including the given tag, while you |
| 20 | probably want everything *since* that tag. |
| 21 | |
Guido van Rossum | bc01c32 | 2002-09-29 04:37:36 +0000 | [diff] [blame] | 22 | The -r option reverses the output (oldest first; the default is oldest |
| 23 | last). |
| 24 | |
| 25 | The -b tag option restricts the output to *only* checkin messages |
| 26 | belonging to the given branch tag. The form -b HEAD restricts the |
| 27 | output to checkin messages belonging to the CVS head (trunk). (It |
| 28 | produces some output if tag is a non-branch tag, but this output is |
| 29 | not very useful.) |
| 30 | |
Guido van Rossum | 9971f68 | 1997-10-06 21:09:32 +0000 | [diff] [blame] | 31 | XXX This code was created by reverse engineering CVS 1.9 and RCS 5.7 |
| 32 | from their output. |
Guido van Rossum | 6f0cf7e | 1997-08-14 22:04:00 +0000 | [diff] [blame] | 33 | |
| 34 | """ |
| 35 | |
Guido van Rossum | bc01c32 | 2002-09-29 04:37:36 +0000 | [diff] [blame] | 36 | import os, sys, getopt |
Guido van Rossum | 6f0cf7e | 1997-08-14 22:04:00 +0000 | [diff] [blame] | 37 | |
Guido van Rossum | ed5b3d8 | 1998-03-24 05:30:29 +0000 | [diff] [blame] | 38 | sep1 = '='*77 + '\n' # file separator |
| 39 | sep2 = '-'*28 + '\n' # revision separator |
Guido van Rossum | 6f0cf7e | 1997-08-14 22:04:00 +0000 | [diff] [blame] | 40 | |
| 41 | def main(): |
| 42 | """Main program""" |
| 43 | truncate_last = 0 |
Guido van Rossum | d962878 | 2000-02-14 21:41:50 +0000 | [diff] [blame] | 44 | reverse = 0 |
Guido van Rossum | bc01c32 | 2002-09-29 04:37:36 +0000 | [diff] [blame] | 45 | branch = None |
| 46 | opts, args = getopt.getopt(sys.argv[1:], "trb:") |
Guido van Rossum | 6f0cf7e | 1997-08-14 22:04:00 +0000 | [diff] [blame] | 47 | for o, a in opts: |
Guido van Rossum | ed5b3d8 | 1998-03-24 05:30:29 +0000 | [diff] [blame] | 48 | if o == '-t': |
| 49 | truncate_last = 1 |
Guido van Rossum | d962878 | 2000-02-14 21:41:50 +0000 | [diff] [blame] | 50 | elif o == '-r': |
| 51 | reverse = 1 |
Guido van Rossum | bc01c32 | 2002-09-29 04:37:36 +0000 | [diff] [blame] | 52 | elif o == '-b': |
| 53 | branch = a |
Guido van Rossum | 6f0cf7e | 1997-08-14 22:04:00 +0000 | [diff] [blame] | 54 | database = [] |
| 55 | while 1: |
Guido van Rossum | ed5b3d8 | 1998-03-24 05:30:29 +0000 | [diff] [blame] | 56 | chunk = read_chunk(sys.stdin) |
| 57 | if not chunk: |
| 58 | break |
Guido van Rossum | bc01c32 | 2002-09-29 04:37:36 +0000 | [diff] [blame] | 59 | records = digest_chunk(chunk, branch) |
Guido van Rossum | ed5b3d8 | 1998-03-24 05:30:29 +0000 | [diff] [blame] | 60 | if truncate_last: |
| 61 | del records[-1] |
| 62 | database[len(database):] = records |
Guido van Rossum | 6f0cf7e | 1997-08-14 22:04:00 +0000 | [diff] [blame] | 63 | database.sort() |
Guido van Rossum | d962878 | 2000-02-14 21:41:50 +0000 | [diff] [blame] | 64 | if not reverse: |
| 65 | database.reverse() |
Guido van Rossum | 6f0cf7e | 1997-08-14 22:04:00 +0000 | [diff] [blame] | 66 | format_output(database) |
| 67 | |
| 68 | def read_chunk(fp): |
| 69 | """Read a chunk -- data for one file, ending with sep1. |
| 70 | |
| 71 | Split the chunk in parts separated by sep2. |
| 72 | |
| 73 | """ |
| 74 | chunk = [] |
| 75 | lines = [] |
| 76 | while 1: |
Guido van Rossum | ed5b3d8 | 1998-03-24 05:30:29 +0000 | [diff] [blame] | 77 | line = fp.readline() |
| 78 | if not line: |
| 79 | break |
| 80 | if line == sep1: |
| 81 | if lines: |
| 82 | chunk.append(lines) |
| 83 | break |
| 84 | if line == sep2: |
| 85 | if lines: |
| 86 | chunk.append(lines) |
| 87 | lines = [] |
| 88 | else: |
| 89 | lines.append(line) |
Guido van Rossum | 6f0cf7e | 1997-08-14 22:04:00 +0000 | [diff] [blame] | 90 | return chunk |
| 91 | |
Guido van Rossum | bc01c32 | 2002-09-29 04:37:36 +0000 | [diff] [blame] | 92 | def digest_chunk(chunk, branch=None): |
| 93 | """Digest a chunk -- extract working file name and revisions""" |
Guido van Rossum | 6f0cf7e | 1997-08-14 22:04:00 +0000 | [diff] [blame] | 94 | lines = chunk[0] |
| 95 | key = 'Working file:' |
| 96 | keylen = len(key) |
| 97 | for line in lines: |
Guido van Rossum | ed5b3d8 | 1998-03-24 05:30:29 +0000 | [diff] [blame] | 98 | if line[:keylen] == key: |
Walter Dörwald | aaab30e | 2002-09-11 20:36:02 +0000 | [diff] [blame] | 99 | working_file = line[keylen:].strip() |
Guido van Rossum | ed5b3d8 | 1998-03-24 05:30:29 +0000 | [diff] [blame] | 100 | break |
Guido van Rossum | 6f0cf7e | 1997-08-14 22:04:00 +0000 | [diff] [blame] | 101 | else: |
Guido van Rossum | ed5b3d8 | 1998-03-24 05:30:29 +0000 | [diff] [blame] | 102 | working_file = None |
Guido van Rossum | bc01c32 | 2002-09-29 04:37:36 +0000 | [diff] [blame] | 103 | if branch and branch != "HEAD": |
| 104 | revisions = {} |
| 105 | key = 'symbolic names:\n' |
| 106 | found = 0 |
| 107 | for line in lines: |
| 108 | if line == key: |
| 109 | found = 1 |
| 110 | elif found: |
| 111 | if line[0] in '\t ': |
| 112 | tag, rev = line.split() |
| 113 | if tag[-1] == ':': |
| 114 | tag = tag[:-1] |
| 115 | revisions[tag] = rev |
| 116 | else: |
| 117 | found = 0 |
| 118 | rev = revisions.get(branch) |
| 119 | if rev: |
| 120 | if rev.find('.0.') >= 0: |
| 121 | rev = rev.replace('.0.', '.') + '.' |
| 122 | branch = rev or "<>" # <> to force a mismatch |
Guido van Rossum | 6f0cf7e | 1997-08-14 22:04:00 +0000 | [diff] [blame] | 123 | records = [] |
| 124 | for lines in chunk[1:]: |
Guido van Rossum | ed5b3d8 | 1998-03-24 05:30:29 +0000 | [diff] [blame] | 125 | revline = lines[0] |
| 126 | dateline = lines[1] |
| 127 | text = lines[2:] |
Walter Dörwald | aaab30e | 2002-09-11 20:36:02 +0000 | [diff] [blame] | 128 | words = dateline.split() |
Guido van Rossum | ed5b3d8 | 1998-03-24 05:30:29 +0000 | [diff] [blame] | 129 | author = None |
| 130 | if len(words) >= 3 and words[0] == 'date:': |
| 131 | dateword = words[1] |
| 132 | timeword = words[2] |
| 133 | if timeword[-1:] == ';': |
| 134 | timeword = timeword[:-1] |
| 135 | date = dateword + ' ' + timeword |
| 136 | if len(words) >= 5 and words[3] == 'author:': |
| 137 | author = words[4] |
| 138 | if author[-1:] == ';': |
| 139 | author = author[:-1] |
| 140 | else: |
| 141 | date = None |
| 142 | text.insert(0, revline) |
Walter Dörwald | aaab30e | 2002-09-11 20:36:02 +0000 | [diff] [blame] | 143 | words = revline.split() |
Guido van Rossum | ed5b3d8 | 1998-03-24 05:30:29 +0000 | [diff] [blame] | 144 | if len(words) >= 2 and words[0] == 'revision': |
| 145 | rev = words[1] |
| 146 | else: |
| 147 | rev = None |
| 148 | text.insert(0, revline) |
Guido van Rossum | bc01c32 | 2002-09-29 04:37:36 +0000 | [diff] [blame] | 149 | if branch: |
| 150 | if branch == "HEAD": |
| 151 | if rev is not None and rev.count('.') > 1: |
| 152 | continue |
| 153 | elif rev is None or not rev.startswith(branch): |
| 154 | continue |
Guido van Rossum | ed5b3d8 | 1998-03-24 05:30:29 +0000 | [diff] [blame] | 155 | records.append((date, working_file, rev, author, text)) |
Guido van Rossum | 6f0cf7e | 1997-08-14 22:04:00 +0000 | [diff] [blame] | 156 | return records |
Tim Peters | 70c4378 | 2001-01-17 08:48:39 +0000 | [diff] [blame] | 157 | |
Guido van Rossum | 6f0cf7e | 1997-08-14 22:04:00 +0000 | [diff] [blame] | 158 | def format_output(database): |
| 159 | prevtext = None |
| 160 | prev = [] |
Guido van Rossum | 9971f68 | 1997-10-06 21:09:32 +0000 | [diff] [blame] | 161 | database.append((None, None, None, None, None)) # Sentinel |
| 162 | for (date, working_file, rev, author, text) in database: |
Guido van Rossum | ed5b3d8 | 1998-03-24 05:30:29 +0000 | [diff] [blame] | 163 | if text != prevtext: |
| 164 | if prev: |
| 165 | print sep2, |
| 166 | for (p_date, p_working_file, p_rev, p_author) in prev: |
Guido van Rossum | f9e56e1 | 2001-04-10 03:31:27 +0000 | [diff] [blame] | 167 | print p_date, p_author, p_working_file, p_rev |
Guido van Rossum | ed5b3d8 | 1998-03-24 05:30:29 +0000 | [diff] [blame] | 168 | sys.stdout.writelines(prevtext) |
| 169 | prev = [] |
| 170 | prev.append((date, working_file, rev, author)) |
| 171 | prevtext = text |
Guido van Rossum | 6f0cf7e | 1997-08-14 22:04:00 +0000 | [diff] [blame] | 172 | |
| 173 | main() |