bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 1385
by Martin Pool - simple weave-based annotate code (not complete) | 1 | # Copyright (C) 2004, 2005 by Canonical Ltd
 | 
| 2 | ||
| 3 | # This program is free software; you can redistribute it and/or modify
 | |
| 4 | # it under the terms of the GNU General Public License as published by
 | |
| 5 | # the Free Software Foundation; either version 2 of the License, or
 | |
| 6 | # (at your option) any later version.
 | |
| 7 | ||
| 8 | # This program is distributed in the hope that it will be useful,
 | |
| 9 | # but WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
| 10 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | |
| 11 | # GNU General Public License for more details.
 | |
| 12 | ||
| 13 | # You should have received a copy of the GNU General Public License
 | |
| 14 | # along with this program; if not, write to the Free Software
 | |
| 15 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 | |
| 16 | ||
| 17 | """File annotate based on weave storage"""
 | |
| 18 | ||
| 1185.16.8
by Martin Pool doc | 19 | # TODO: Choice of more or less verbose formats:
 | 
| 20 | # 
 | |
| 21 | # interposed: show more details between blocks of modified lines
 | |
| 22 | ||
| 23 | # TODO: Show which revision caused a line to merge into the parent
 | |
| 24 | ||
| 1185.16.57
by Martin Pool [merge] from aaron | 25 | # TODO: perhaps abbreviate timescales depending on how recent they are
 | 
| 26 | # e.g. "3:12 Tue", "13 Oct", "Oct 2005", etc.  
 | |
| 27 | ||
| 1385
by Martin Pool - simple weave-based annotate code (not complete) | 28 | import sys | 
| 29 | import os | |
| 1185.16.1
by Martin Pool - update annotate for new branch api | 30 | import time | 
| 1385
by Martin Pool - simple weave-based annotate code (not complete) | 31 | |
| 32 | import bzrlib.weave | |
| 1185.16.53
by Martin Pool - annotate improvements from Goffreddo, with extra bug fixes and tests | 33 | from bzrlib.config import extract_email_address | 
| 1185.33.31
by Martin Pool Make annotate cope better with revisions committed without a valid | 34 | from bzrlib.errors import BzrError | 
| 1185.16.53
by Martin Pool - annotate improvements from Goffreddo, with extra bug fixes and tests | 35 | |
| 36 | ||
| 37 | def annotate_file(branch, rev_id, file_id, verbose=False, full=False, | |
| 38 | to_file=None): | |
| 1385
by Martin Pool - simple weave-based annotate code (not complete) | 39 | if to_file is None: | 
| 40 | to_file = sys.stdout | |
| 1185.16.53
by Martin Pool - annotate improvements from Goffreddo, with extra bug fixes and tests | 41 | |
| 42 | prevanno='' | |
| 1185.33.39
by Martin Pool [patch] annotate --long (robey pointer) | 43 | annotation = list(_annotate_file(branch, rev_id, file_id)) | 
| 44 | max_origin_len = max(len(origin) for origin in set(x[1] for x in annotation)) | |
| 45 | for (revno_str, author, date_str, line_rev_id, text ) in annotation: | |
| 1185.16.53
by Martin Pool - annotate improvements from Goffreddo, with extra bug fixes and tests | 46 | if verbose: | 
| 1185.33.39
by Martin Pool [patch] annotate --long (robey pointer) | 47 | anno = '%5s %-*s %8s ' % (revno_str, max_origin_len, author, date_str) | 
| 1185.16.53
by Martin Pool - annotate improvements from Goffreddo, with extra bug fixes and tests | 48 | else: | 
| 49 | anno = "%5s %-7s " % ( revno_str, author[:7] ) | |
| 50 | ||
| 51 | if anno.lstrip() == "" and full: anno = prevanno | |
| 52 | print >>to_file, '%s| %s' % (anno, text) | |
| 53 | prevanno=anno | |
| 54 | ||
| 55 | def _annotate_file(branch, rev_id, file_id ): | |
| 56 | ||
| 1385
by Martin Pool - simple weave-based annotate code (not complete) | 57 | rh = branch.revision_history() | 
| 1185.67.2
by Aaron Bentley Renamed Branch.storage to Branch.repository | 58 | w = branch.repository.weave_store.get_weave(file_id, | 
| 59 | branch.repository.get_transaction()) | |
| 1385
by Martin Pool - simple weave-based annotate code (not complete) | 60 | last_origin = None | 
| 61 | for origin, text in w.annotate_iter(rev_id): | |
| 62 | text = text.rstrip('\r\n') | |
| 63 | if origin == last_origin: | |
| 1185.16.53
by Martin Pool - annotate improvements from Goffreddo, with extra bug fixes and tests | 64 | (revno_str, author, date_str) = ('','','') | 
| 1385
by Martin Pool - simple weave-based annotate code (not complete) | 65 | else: | 
| 66 | last_origin = origin | |
| 1563.2.1
by Robert Collins Merge in a variation of the versionedfile api from versioned-file. | 67 | if not branch.repository.has_revision(origin): | 
| 1185.16.53
by Martin Pool - annotate improvements from Goffreddo, with extra bug fixes and tests | 68 | (revno_str, author, date_str) = ('?','?','?') | 
| 1185.16.1
by Martin Pool - update annotate for new branch api | 69 | else: | 
| 1563.2.1
by Robert Collins Merge in a variation of the versionedfile api from versioned-file. | 70 | if origin in rh: | 
| 71 | revno_str = str(rh.index(origin) + 1) | |
| 1185.16.32
by Martin Pool - add a basic annotate built-in command | 72 | else: | 
| 73 | revno_str = 'merge' | |
| 1563.2.1
by Robert Collins Merge in a variation of the versionedfile api from versioned-file. | 74 | rev = branch.repository.get_revision(origin) | 
| 1185.16.32
by Martin Pool - add a basic annotate built-in command | 75 | tz = rev.timezone or 0 | 
| 76 | date_str = time.strftime('%Y%m%d', | |
| 77 | time.gmtime(rev.timestamp + tz)) | |
| 78 |             # a lazy way to get something like the email address
 | |
| 79 |             # TODO: Get real email address
 | |
| 1185.16.53
by Martin Pool - annotate improvements from Goffreddo, with extra bug fixes and tests | 80 | author = rev.committer | 
| 81 | try: | |
| 82 | author = extract_email_address(author) | |
| 83 | except BzrError: | |
| 84 | pass # use the whole name | |
| 1563.2.1
by Robert Collins Merge in a variation of the versionedfile api from versioned-file. | 85 | yield (revno_str, author, date_str, origin, text) |