bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 2359.1.1
by Kent Gibson Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster. | 1 | # Copyright (C) 2005, 2006, 2007 Canonical Ltd
 | 
| 1887.1.1
by Adeodato Simó Do not separate paragraphs in the copyright statement with blank lines, | 2 | #
 | 
| 369
by Martin Pool - Split out log printing into new show_log function | 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.
 | |
| 1887.1.1
by Adeodato Simó Do not separate paragraphs in the copyright statement with blank lines, | 7 | #
 | 
| 369
by Martin Pool - Split out log printing into new show_log function | 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.
 | |
| 1887.1.1
by Adeodato Simó Do not separate paragraphs in the copyright statement with blank lines, | 12 | #
 | 
| 369
by Martin Pool - Split out log printing into new show_log function | 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 | ||
| 375
by Martin Pool - New command touching-revisions and function to trace | 17 | |
| 18 | ||
| 527
by Martin Pool - refactor log command | 19 | """Code to show logs of changes.
 | 
| 20 | ||
| 21 | Various flavors of log can be produced:
 | |
| 22 | ||
| 23 | * for one file, or the whole tree, and (not done yet) for
 | |
| 24 |   files in a given directory
 | |
| 25 | ||
| 26 | * in "verbose" mode with a description of what changed from one
 | |
| 27 |   version to the next
 | |
| 28 | ||
| 29 | * with file-ids and revision-ids shown
 | |
| 30 | ||
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 31 | Logs are actually written out through an abstract LogFormatter
 | 
| 32 | interface, which allows for different preferred formats.  Plugins can
 | |
| 33 | register formats too.
 | |
| 34 | ||
| 35 | Logs can be produced in either forward (oldest->newest) or reverse
 | |
| 36 | (newest->oldest) order.
 | |
| 37 | ||
| 38 | Logs can be filtered to show only revisions matching a particular
 | |
| 39 | search string, or within a particular range of revisions.  The range
 | |
| 40 | can be given as date/times, which are reduced to revisions before
 | |
| 41 | calling in here.
 | |
| 42 | ||
| 43 | In verbose mode we show a summary of what changed in each particular
 | |
| 44 | revision.  Note that this is the delta for changes in that revision
 | |
| 45 | relative to its mainline parent, not the delta relative to the last
 | |
| 46 | logged revision.  So for example if you ask for a verbose log of
 | |
| 47 | changes touching hello.c you will get a list of those revisions also
 | |
| 48 | listing other things that were changed in the same revision, but not
 | |
| 49 | all the changes since the previous revision that touched hello.c.
 | |
| 527
by Martin Pool - refactor log command | 50 | """
 | 
| 51 | ||
| 1185.33.41
by Martin Pool Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676) | 52 | # TODO: option to show delta summaries for merged-in revisions
 | 
| 1773.4.1
by Martin Pool Add pyflakes makefile target; fix many warnings | 53 | |
| 1756.2.13
by Aaron Bentley Used scaled iterator to retrive revisions | 54 | from itertools import izip | 
| 1624.1.3
by Robert Collins Convert log to use the new tsort.merge_sort routine. | 55 | import re | 
| 1185.33.41
by Martin Pool Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676) | 56 | |
| 2490.1.2
by John Arbash Meinel Cleanup according to PEP8 and some other small whitespace fixes | 57 | from bzrlib import ( | 
| 2221.4.10
by Aaron Bentley Implement log options using RegistryOption | 58 | registry, | 
| 59 | symbol_versioning, | |
| 60 |     )
 | |
| 1433
by Robert Collins merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages. | 61 | import bzrlib.errors as errors | 
| 2466.12.1
by Kent Gibson Fix ``bzr log -r`` to support selecting merge revisions. | 62 | from bzrlib.revisionspec import( | 
| 63 |     RevisionInfo
 | |
| 64 |     )
 | |
| 2490.1.2
by John Arbash Meinel Cleanup according to PEP8 and some other small whitespace fixes | 65 | from bzrlib.symbol_versioning import ( | 
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 66 | deprecated_method, | 
| 67 | zero_eleven, | |
| 68 | zero_seventeen, | |
| 69 |     )
 | |
| 1624.1.3
by Robert Collins Convert log to use the new tsort.merge_sort routine. | 70 | from bzrlib.trace import mutter | 
| 2490.1.2
by John Arbash Meinel Cleanup according to PEP8 and some other small whitespace fixes | 71 | from bzrlib.tsort import ( | 
| 2359.1.2
by Kent Gibson add logging of merge revisions | 72 | merge_sort, | 
| 73 | topo_sort, | |
| 74 |     )
 | |
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 75 | |
| 375
by Martin Pool - New command touching-revisions and function to trace | 76 | |
| 77 | def find_touching_revisions(branch, file_id): | |
| 78 | """Yield a description of revisions which affect the file_id. | |
| 79 | ||
| 80 |     Each returned element is (revno, revision_id, description)
 | |
| 81 | ||
| 82 |     This is the list of revisions where the file is either added,
 | |
| 83 |     modified, renamed or deleted.
 | |
| 84 | ||
| 85 |     TODO: Perhaps some way to limit this to only particular revisions,
 | |
| 522
by Martin Pool todo | 86 |     or to traverse a non-mainline set of revisions?
 | 
| 375
by Martin Pool - New command touching-revisions and function to trace | 87 |     """
 | 
| 88 | last_ie = None | |
| 89 | last_path = None | |
| 90 | revno = 1 | |
| 91 | for revision_id in branch.revision_history(): | |
| 1185.67.2
by Aaron Bentley Renamed Branch.storage to Branch.repository | 92 | this_inv = branch.repository.get_revision_inventory(revision_id) | 
| 375
by Martin Pool - New command touching-revisions and function to trace | 93 | if file_id in this_inv: | 
| 94 | this_ie = this_inv[file_id] | |
| 95 | this_path = this_inv.id2path(file_id) | |
| 96 | else: | |
| 97 | this_ie = this_path = None | |
| 98 | ||
| 99 |         # now we know how it was last time, and how it is in this revision.
 | |
| 100 |         # are those two states effectively the same or not?
 | |
| 101 | ||
| 102 | if not this_ie and not last_ie: | |
| 103 |             # not present in either
 | |
| 104 |             pass
 | |
| 105 | elif this_ie and not last_ie: | |
| 106 | yield revno, revision_id, "added " + this_path | |
| 107 | elif not this_ie and last_ie: | |
| 108 |             # deleted here
 | |
| 109 | yield revno, revision_id, "deleted " + last_path | |
| 110 | elif this_path != last_path: | |
| 111 | yield revno, revision_id, ("renamed %s => %s" % (last_path, this_path)) | |
| 112 | elif (this_ie.text_size != last_ie.text_size | |
| 113 | or this_ie.text_sha1 != last_ie.text_sha1): | |
| 114 | yield revno, revision_id, "modified " + this_path | |
| 115 | ||
| 116 | last_ie = this_ie | |
| 117 | last_path = this_path | |
| 118 | revno += 1 | |
| 119 | ||
| 120 | ||
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 121 | def _enumerate_history(branch): | 
| 122 | rh = [] | |
| 123 | revno = 1 | |
| 124 | for rev_id in branch.revision_history(): | |
| 125 | rh.append((revno, rev_id)) | |
| 126 | revno += 1 | |
| 127 | return rh | |
| 128 | ||
| 129 | ||
| 378
by Martin Pool - New usage bzr log FILENAME | 130 | def show_log(branch, | 
| 794
by Martin Pool - Merge John's nice short-log format. | 131 | lf, | 
| 527
by Martin Pool - refactor log command | 132 | specific_fileid=None, | 
| 378
by Martin Pool - New usage bzr log FILENAME | 133 | verbose=False, | 
| 567
by Martin Pool - New form 'bzr log -r FROM:TO' | 134 | direction='reverse', | 
| 135 | start_revision=None, | |
| 900
by Martin Pool - patch from john to search for matching commits | 136 | end_revision=None, | 
| 2466.9.1
by Kent Gibson add bzr log --limit | 137 | search=None, | 
| 138 | limit=None): | |
| 369
by Martin Pool - Split out log printing into new show_log function | 139 | """Write out human-readable log of commits to this branch. | 
| 140 | ||
| 794
by Martin Pool - Merge John's nice short-log format. | 141 |     lf
 | 
| 142 |         LogFormatter object to show the output.
 | |
| 143 | ||
| 527
by Martin Pool - refactor log command | 144 |     specific_fileid
 | 
| 378
by Martin Pool - New usage bzr log FILENAME | 145 |         If true, list only the commits affecting the specified
 | 
| 146 |         file, rather than all commits.
 | |
| 147 | ||
| 369
by Martin Pool - Split out log printing into new show_log function | 148 |     verbose
 | 
| 149 |         If true show added/changed/deleted/renamed files.
 | |
| 150 | ||
| 527
by Martin Pool - refactor log command | 151 |     direction
 | 
| 152 |         'reverse' (default) is latest to earliest;
 | |
| 153 |         'forward' is earliest to latest.
 | |
| 567
by Martin Pool - New form 'bzr log -r FROM:TO' | 154 | |
| 155 |     start_revision
 | |
| 156 |         If not None, only show revisions >= start_revision
 | |
| 157 | ||
| 158 |     end_revision
 | |
| 159 |         If not None, only show revisions <= end_revision
 | |
| 2466.9.1
by Kent Gibson add bzr log --limit | 160 | |
| 161 |     search
 | |
| 162 |         If not None, only show revisions with matching commit messages
 | |
| 163 | ||
| 164 |     limit
 | |
| 165 |         If not None or 0, only show limit revisions
 | |
| 369
by Martin Pool - Split out log printing into new show_log function | 166 |     """
 | 
| 1417.1.7
by Robert Collins teach log it needs a read lock | 167 | branch.lock_read() | 
| 168 | try: | |
| 2466.8.2
by Kent Gibson Move begin/end calls from _show_log to show_log. Fix long line. | 169 | if getattr(lf, 'begin_log', None): | 
| 170 | lf.begin_log() | |
| 171 | ||
| 1756.1.6
by Aaron Bentley Revert locking fix | 172 | _show_log(branch, lf, specific_fileid, verbose, direction, | 
| 2466.9.1
by Kent Gibson add bzr log --limit | 173 | start_revision, end_revision, search, limit) | 
| 2466.8.2
by Kent Gibson Move begin/end calls from _show_log to show_log. Fix long line. | 174 | |
| 175 | if getattr(lf, 'end_log', None): | |
| 176 | lf.end_log() | |
| 1417.1.7
by Robert Collins teach log it needs a read lock | 177 | finally: | 
| 178 | branch.unlock() | |
| 2490.1.2
by John Arbash Meinel Cleanup according to PEP8 and some other small whitespace fixes | 179 | |
| 1417.1.7
by Robert Collins teach log it needs a read lock | 180 | def _show_log(branch, | 
| 181 | lf, | |
| 182 | specific_fileid=None, | |
| 183 | verbose=False, | |
| 184 | direction='reverse', | |
| 185 | start_revision=None, | |
| 186 | end_revision=None, | |
| 2466.9.1
by Kent Gibson add bzr log --limit | 187 | search=None, | 
| 188 | limit=None): | |
| 1417.1.7
by Robert Collins teach log it needs a read lock | 189 | """Worker function for show_log - see show_log.""" | 
| 794
by Martin Pool - Merge John's nice short-log format. | 190 | from bzrlib.osutils import format_date | 
| 191 | from bzrlib.errors import BzrCheckError | |
| 192 | ||
| 193 | from warnings import warn | |
| 369
by Martin Pool - Split out log printing into new show_log function | 194 | |
| 794
by Martin Pool - Merge John's nice short-log format. | 195 | if not isinstance(lf, LogFormatter): | 
| 196 | warn("not a LogFormatter instance: %r" % lf) | |
| 533
by Martin Pool - fix up asking for the log for the root of a remote branch | 197 | |
| 198 | if specific_fileid: | |
| 1185.31.4
by John Arbash Meinel Fixing mutter() calls to not have to do string processing. | 199 | mutter('get log for file_id %r', specific_fileid) | 
| 533
by Martin Pool - fix up asking for the log for the root of a remote branch | 200 | |
| 900
by Martin Pool - patch from john to search for matching commits | 201 | if search is not None: | 
| 202 | import re | |
| 203 | searchRE = re.compile(search, re.IGNORECASE) | |
| 204 | else: | |
| 205 | searchRE = None | |
| 206 | ||
| 2466.12.1
by Kent Gibson Fix ``bzr log -r`` to support selecting merge revisions. | 207 | mainline_revs, rev_nos, start_rev_id, end_rev_id = \ | 
| 208 | _get_mainline_revs(branch, start_revision, end_revision) | |
| 209 | if not mainline_revs: | |
| 1624.1.3
by Robert Collins Convert log to use the new tsort.merge_sort routine. | 210 |         return
 | 
| 1756.2.18
by Aaron Bentley Factor out the revision list generation | 211 | |
| 2466.12.1
by Kent Gibson Fix ``bzr log -r`` to support selecting merge revisions. | 212 | if direction == 'reverse': | 
| 213 | start_rev_id, end_rev_id = end_rev_id, start_rev_id | |
| 214 | ||
| 2490.1.2
by John Arbash Meinel Cleanup according to PEP8 and some other small whitespace fixes | 215 | legacy_lf = getattr(lf, 'log_revision', None) is None | 
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 216 | if legacy_lf: | 
| 217 |         # pre-0.17 formatters use show for mainline revisions.
 | |
| 218 |         # how should we show merged revisions ?
 | |
| 219 |         #   pre-0.11 api: show_merge
 | |
| 220 |         #   0.11-0.16 api: show_merge_revno
 | |
| 221 | show_merge_revno = getattr(lf, 'show_merge_revno', None) | |
| 222 | show_merge = getattr(lf, 'show_merge', None) | |
| 223 | if show_merge is None and show_merge_revno is None: | |
| 224 |             # no merged-revno support
 | |
| 225 | generate_merge_revisions = False | |
| 226 | else: | |
| 227 | generate_merge_revisions = True | |
| 1988.4.2
by Robert Collins ``bzr log`` Now shows dotted-decimal revision numbers for all revisions, | 228 |         # tell developers to update their code
 | 
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 229 | symbol_versioning.warn('LogFormatters should provide log_revision ' | 
| 230 | 'instead of show and show_merge_revno since bzr 0.17.', | |
| 1988.4.2
by Robert Collins ``bzr log`` Now shows dotted-decimal revision numbers for all revisions, | 231 | DeprecationWarning, stacklevel=3) | 
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 232 | else: | 
| 233 | generate_merge_revisions = getattr(lf, 'supports_merge_revisions', | |
| 234 | False) | |
| 2359.1.1
by Kent Gibson Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster. | 235 | view_revs_iter = get_view_revisions(mainline_revs, rev_nos, branch, | 
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 236 | direction, include_merges=generate_merge_revisions) | 
| 2466.12.1
by Kent Gibson Fix ``bzr log -r`` to support selecting merge revisions. | 237 | view_revisions = _filter_revision_range(list(view_revs_iter), | 
| 238 | start_rev_id, | |
| 239 | end_rev_id) | |
| 2359.1.1
by Kent Gibson Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster. | 240 | if specific_fileid: | 
| 2466.12.1
by Kent Gibson Fix ``bzr log -r`` to support selecting merge revisions. | 241 | view_revisions = _filter_revisions_touching_file_id(branch, | 
| 2359.1.4
by John Arbash Meinel Refactor the specific revisions for file id into a helper function. | 242 | specific_fileid, | 
| 243 | mainline_revs, | |
| 2466.12.1
by Kent Gibson Fix ``bzr log -r`` to support selecting merge revisions. | 244 | view_revisions) | 
| 2388.1.11
by Alexander Belchenko changes after John's review | 245 | |
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 246 | rev_tag_dict = {} | 
| 247 | generate_tags = getattr(lf, 'supports_tags', False) | |
| 248 | if generate_tags: | |
| 2388.1.8
by Erik Bagfors Redo based on input from Alexander | 249 | if branch.supports_tags(): | 
| 250 | rev_tag_dict = branch.tags.get_reverse_tag_dict() | |
| 2388.1.11
by Alexander Belchenko changes after John's review | 251 | |
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 252 | generate_delta = verbose and getattr(lf, 'supports_delta', False) | 
| 253 | ||
| 1756.2.13
by Aaron Bentley Used scaled iterator to retrive revisions | 254 | def iter_revisions(): | 
| 1756.3.22
by Aaron Bentley Tweaks from review | 255 |         # r = revision, n = revno, d = merge depth
 | 
| 1756.2.20
by Aaron Bentley Optimize log formats that don't show merges | 256 | revision_ids = [r for r, n, d in view_revisions] | 
| 1756.2.13
by Aaron Bentley Used scaled iterator to retrive revisions | 257 | num = 9 | 
| 1756.3.22
by Aaron Bentley Tweaks from review | 258 | repository = branch.repository | 
| 1756.2.13
by Aaron Bentley Used scaled iterator to retrive revisions | 259 | while revision_ids: | 
| 1756.3.22
by Aaron Bentley Tweaks from review | 260 | cur_deltas = {} | 
| 261 | revisions = repository.get_revisions(revision_ids[:num]) | |
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 262 | if generate_delta: | 
| 2466.11.1
by Kent Gibson Long log format reports deltas on merge revisions. | 263 | deltas = repository.get_deltas_for_revisions(revisions) | 
| 264 | cur_deltas = dict(izip((r.revision_id for r in revisions), | |
| 265 | deltas)) | |
| 1756.2.13
by Aaron Bentley Used scaled iterator to retrive revisions | 266 | for revision in revisions: | 
| 1756.3.3
by Aaron Bentley More refactoring, introduce revision_trees. | 267 | yield revision, cur_deltas.get(revision.revision_id) | 
| 1756.2.13
by Aaron Bentley Used scaled iterator to retrive revisions | 268 | revision_ids = revision_ids[num:] | 
| 2359.1.2
by Kent Gibson add logging of merge revisions | 269 | num = min(int(num * 1.5), 200) | 
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 270 | |
| 1624.1.3
by Robert Collins Convert log to use the new tsort.merge_sort routine. | 271 |     # now we just print all the revisions
 | 
| 2466.9.1
by Kent Gibson add bzr log --limit | 272 | log_count = 0 | 
| 1756.3.2
by Aaron Bentley Refactor revision_delta call | 273 | for ((rev_id, revno, merge_depth), (rev, delta)) in \ | 
| 1756.2.18
by Aaron Bentley Factor out the revision list generation | 274 | izip(view_revisions, iter_revisions()): | 
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 275 | |
| 276 | if searchRE: | |
| 277 | if not searchRE.search(rev.message): | |
| 278 |                 continue
 | |
| 279 | ||
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 280 | if not legacy_lf: | 
| 2490.1.2
by John Arbash Meinel Cleanup according to PEP8 and some other small whitespace fixes | 281 | lr = LogRevision(rev, revno, merge_depth, delta, | 
| 2466.8.2
by Kent Gibson Move begin/end calls from _show_log to show_log. Fix long line. | 282 | rev_tag_dict.get(rev_id)) | 
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 283 | lf.log_revision(lr) | 
| 1756.2.20
by Aaron Bentley Optimize log formats that don't show merges | 284 | else: | 
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 285 |             # support for legacy (pre-0.17) LogFormatters
 | 
| 286 | if merge_depth == 0: | |
| 287 | if generate_tags: | |
| 288 | lf.show(revno, rev, delta, rev_tag_dict.get(rev_id)) | |
| 289 | else: | |
| 290 | lf.show(revno, rev, delta) | |
| 1988.4.2
by Robert Collins ``bzr log`` Now shows dotted-decimal revision numbers for all revisions, | 291 | else: | 
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 292 | if show_merge_revno is None: | 
| 293 | lf.show_merge(rev, merge_depth) | |
| 2388.1.8
by Erik Bagfors Redo based on input from Alexander | 294 | else: | 
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 295 | if generate_tags: | 
| 296 | lf.show_merge_revno(rev, merge_depth, revno, | |
| 297 | rev_tag_dict.get(rev_id)) | |
| 298 | else: | |
| 299 | lf.show_merge_revno(rev, merge_depth, revno) | |
| 2466.9.1
by Kent Gibson add bzr log --limit | 300 | if limit: | 
| 301 | log_count += 1 | |
| 302 | if log_count >= limit: | |
| 303 |                 break
 | |
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 304 | |
| 530
by Martin Pool - put back verbose log support for reversed logs | 305 | |
| 2466.12.1
by Kent Gibson Fix ``bzr log -r`` to support selecting merge revisions. | 306 | def _get_mainline_revs(branch, start_revision, end_revision): | 
| 307 | """Get the mainline revisions from the branch. | |
| 308 |     
 | |
| 309 |     Generates the list of mainline revisions for the branch.
 | |
| 310 |     
 | |
| 311 |     :param  branch: The branch containing the revisions. 
 | |
| 312 | ||
| 313 |     :param  start_revision: The first revision to be logged.
 | |
| 314 |             For backwards compatibility this may be a mainline integer revno,
 | |
| 315 |             but for merge revision support a RevisionInfo is expected.
 | |
| 316 | ||
| 317 |     :param  end_revision: The last revision to be logged.
 | |
| 318 |             For backwards compatibility this may be a mainline integer revno,
 | |
| 319 |             but for merge revision support a RevisionInfo is expected.
 | |
| 320 | ||
| 321 |     :return: A (mainline_revs, rev_nos, start_rev_id, end_rev_id) tuple.
 | |
| 322 |     """
 | |
| 323 | which_revs = _enumerate_history(branch) | |
| 324 | if not which_revs: | |
| 325 | return None, None, None, None | |
| 326 | ||
| 327 |     # For mainline generation, map start_revision and end_revision to 
 | |
| 328 |     # mainline revnos. If the revision is not on the mainline choose the 
 | |
| 329 |     # appropriate extreme of the mainline instead - the extra will be 
 | |
| 330 |     # filtered later.
 | |
| 331 |     # Also map the revisions to rev_ids, to be used in the later filtering
 | |
| 332 |     # stage.
 | |
| 333 | start_rev_id = None | |
| 334 | if start_revision is None: | |
| 335 | start_revno = 1 | |
| 336 | else: | |
| 337 | if isinstance(start_revision,RevisionInfo): | |
| 338 | start_rev_id = start_revision.rev_id | |
| 339 | start_revno = start_revision.revno or 1 | |
| 340 | else: | |
| 341 | branch.check_real_revno(start_revision) | |
| 342 | start_revno = start_revision | |
| 343 | ||
| 344 | end_rev_id = None | |
| 345 | if end_revision is None: | |
| 346 | end_revno = len(which_revs) | |
| 347 | else: | |
| 348 | if isinstance(end_revision,RevisionInfo): | |
| 349 | end_rev_id = end_revision.rev_id | |
| 350 | end_revno = end_revision.revno or len(which_revs) | |
| 351 | else: | |
| 352 | branch.check_real_revno(end_revision) | |
| 353 | end_revno = end_revision | |
| 354 | ||
| 355 | if start_revno > end_revno: | |
| 356 | from bzrlib.errors import BzrCommandError | |
| 357 | raise BzrCommandError("Start revision must be older than " | |
| 358 | "the end revision.") | |
| 359 | ||
| 360 |     # list indexes are 0-based; revisions are 1-based
 | |
| 361 | cut_revs = which_revs[(start_revno-1):(end_revno)] | |
| 362 | if not cut_revs: | |
| 363 | return None, None, None, None | |
| 364 | ||
| 365 |     # convert the revision history to a dictionary:
 | |
| 366 | rev_nos = dict((k, v) for v, k in cut_revs) | |
| 367 | ||
| 368 |     # override the mainline to look like the revision history.
 | |
| 369 | mainline_revs = [revision_id for index, revision_id in cut_revs] | |
| 370 | if cut_revs[0][0] == 1: | |
| 371 | mainline_revs.insert(0, None) | |
| 372 | else: | |
| 373 | mainline_revs.insert(0, which_revs[start_revno-2][1]) | |
| 374 | return mainline_revs, rev_nos, start_rev_id, end_rev_id | |
| 375 | ||
| 376 | ||
| 377 | def _filter_revision_range(view_revisions, start_rev_id, end_rev_id): | |
| 378 | """Filter view_revisions based on revision ranges. | |
| 379 | ||
| 380 |     :param view_revisions: A list of (revision_id, dotted_revno, merge_depth) 
 | |
| 381 |             tuples to be filtered.
 | |
| 382 | ||
| 383 |     :param start_rev_id: If not NONE specifies the first revision to be logged.
 | |
| 384 |             If NONE then all revisions up to the end_rev_id are logged.
 | |
| 385 | ||
| 386 |     :param end_rev_id: If not NONE specifies the last revision to be logged.
 | |
| 387 |             If NONE then all revisions up to the end of the log are logged.
 | |
| 388 | ||
| 389 |     :return: The filtered view_revisions.
 | |
| 390 |     """
 | |
| 391 | if start_rev_id or end_rev_id: | |
| 392 | revision_ids = [r for r, n, d in view_revisions] | |
| 393 | if start_rev_id: | |
| 394 | start_index = revision_ids.index(start_rev_id) | |
| 395 | else: | |
| 396 | start_index = 0 | |
| 397 | if start_rev_id == end_rev_id: | |
| 398 | end_index = start_index | |
| 399 | else: | |
| 400 | if end_rev_id: | |
| 401 | end_index = revision_ids.index(end_rev_id) | |
| 402 | else: | |
| 403 | end_index = len(view_revisions) - 1 | |
| 404 |         # To include the revisions merged into the last revision, 
 | |
| 405 |         # extend end_rev_id down to, but not including, the next rev
 | |
| 406 |         # with the same or lesser merge_depth
 | |
| 407 | end_merge_depth = view_revisions[end_index][2] | |
| 408 | try: | |
| 409 | for index in xrange(end_index+1, len(view_revisions)+1): | |
| 410 | if view_revisions[index][2] <= end_merge_depth: | |
| 411 | end_index = index - 1 | |
| 412 |                     break
 | |
| 413 | except IndexError: | |
| 414 |             # if the search falls off the end then log to the end as well
 | |
| 415 | end_index = len(view_revisions) - 1 | |
| 416 | view_revisions = view_revisions[start_index:end_index+1] | |
| 417 | return view_revisions | |
| 418 | ||
| 419 | ||
| 420 | def _filter_revisions_touching_file_id(branch, file_id, mainline_revisions, | |
| 421 | view_revs_iter): | |
| 2359.1.4
by John Arbash Meinel Refactor the specific revisions for file id into a helper function. | 422 | """Return the list of revision ids which touch a given file id. | 
| 423 | ||
| 2466.12.1
by Kent Gibson Fix ``bzr log -r`` to support selecting merge revisions. | 424 |     The function filters view_revisions and returns a subset.
 | 
| 2359.1.4
by John Arbash Meinel Refactor the specific revisions for file id into a helper function. | 425 |     This includes the revisions which directly change the file id,
 | 
| 426 |     and the revisions which merge these changes. So if the
 | |
| 427 |     revision graph is::
 | |
| 428 |         A
 | |
| 429 |         |\
 | |
| 430 |         B C
 | |
| 431 |         |/
 | |
| 432 |         D
 | |
| 433 | ||
| 434 |     And 'C' changes a file, then both C and D will be returned.
 | |
| 435 | ||
| 436 |     This will also can be restricted based on a subset of the mainline.
 | |
| 2359.1.8
by John Arbash Meinel doc | 437 | |
| 438 |     :return: A list of (revision_id, dotted_revno, merge_depth) tuples.
 | |
| 2359.1.4
by John Arbash Meinel Refactor the specific revisions for file id into a helper function. | 439 |     """
 | 
| 440 |     # find all the revisions that change the specific file
 | |
| 2359.1.5
by John Arbash Meinel change some variable names to make the function a bit clearer. | 441 | file_weave = branch.repository.weave_store.get_weave(file_id, | 
| 2359.1.4
by John Arbash Meinel Refactor the specific revisions for file id into a helper function. | 442 | branch.repository.get_transaction()) | 
| 2359.1.5
by John Arbash Meinel change some variable names to make the function a bit clearer. | 443 | weave_modifed_revisions = set(file_weave.versions()) | 
| 2359.1.4
by John Arbash Meinel Refactor the specific revisions for file id into a helper function. | 444 |     # build the ancestry of each revision in the graph
 | 
| 445 |     # - only listing the ancestors that change the specific file.
 | |
| 446 | rev_graph = branch.repository.get_revision_graph(mainline_revisions[-1]) | |
| 447 | sorted_rev_list = topo_sort(rev_graph) | |
| 448 | ancestry = {} | |
| 449 | for rev in sorted_rev_list: | |
| 2359.1.9
by John Arbash Meinel Only generate a new set when we need to. Drops 'bzr log NEWS' time from 22s => 8s | 450 | parents = rev_graph[rev] | 
| 451 | if rev not in weave_modifed_revisions and len(parents) == 1: | |
| 452 |             # We will not be adding anything new, so just use a reference to
 | |
| 453 |             # the parent ancestry.
 | |
| 454 | rev_ancestry = ancestry[parents[0]] | |
| 455 | else: | |
| 456 | rev_ancestry = set() | |
| 457 | if rev in weave_modifed_revisions: | |
| 458 | rev_ancestry.add(rev) | |
| 459 | for parent in parents: | |
| 460 | rev_ancestry = rev_ancestry.union(ancestry[parent]) | |
| 2359.1.4
by John Arbash Meinel Refactor the specific revisions for file id into a helper function. | 461 | ancestry[rev] = rev_ancestry | 
| 462 | ||
| 2359.1.5
by John Arbash Meinel change some variable names to make the function a bit clearer. | 463 | def is_merging_rev(r): | 
| 2359.1.4
by John Arbash Meinel Refactor the specific revisions for file id into a helper function. | 464 | parents = rev_graph[r] | 
| 465 | if len(parents) > 1: | |
| 466 | leftparent = parents[0] | |
| 467 | for rightparent in parents[1:]: | |
| 468 | if not ancestry[leftparent].issuperset( | |
| 469 | ancestry[rightparent]): | |
| 470 | return True | |
| 471 | return False | |
| 472 | ||
| 473 |     # filter from the view the revisions that did not change or merge 
 | |
| 474 |     # the specific file
 | |
| 475 | return [(r, n, d) for r, n, d in view_revs_iter | |
| 2359.1.5
by John Arbash Meinel change some variable names to make the function a bit clearer. | 476 | if r in weave_modifed_revisions or is_merging_rev(r)] | 
| 2359.1.4
by John Arbash Meinel Refactor the specific revisions for file id into a helper function. | 477 | |
| 478 | ||
| 1756.2.20
by Aaron Bentley Optimize log formats that don't show merges | 479 | def get_view_revisions(mainline_revs, rev_nos, branch, direction, | 
| 1756.2.22
by Aaron Bentley Apply review comments | 480 | include_merges=True): | 
| 1756.2.18
by Aaron Bentley Factor out the revision list generation | 481 | """Produce an iterator of revisions to show | 
| 482 |     :return: an iterator of (revision_id, revno, merge_depth)
 | |
| 483 |     (if there is no revno for a revision, None is supplied)
 | |
| 484 |     """
 | |
| 1756.2.22
by Aaron Bentley Apply review comments | 485 | if include_merges is False: | 
| 1756.2.20
by Aaron Bentley Optimize log formats that don't show merges | 486 | revision_ids = mainline_revs[1:] | 
| 487 | if direction == 'reverse': | |
| 488 | revision_ids.reverse() | |
| 489 | for revision_id in revision_ids: | |
| 1988.4.2
by Robert Collins ``bzr log`` Now shows dotted-decimal revision numbers for all revisions, | 490 | yield revision_id, str(rev_nos[revision_id]), 0 | 
| 1756.2.20
by Aaron Bentley Optimize log formats that don't show merges | 491 |         return
 | 
| 1756.2.18
by Aaron Bentley Factor out the revision list generation | 492 | merge_sorted_revisions = merge_sort( | 
| 493 | branch.repository.get_revision_graph(mainline_revs[-1]), | |
| 494 | mainline_revs[-1], | |
| 1988.4.2
by Robert Collins ``bzr log`` Now shows dotted-decimal revision numbers for all revisions, | 495 | mainline_revs, | 
| 496 | generate_revno=True) | |
| 1756.2.18
by Aaron Bentley Factor out the revision list generation | 497 | |
| 498 | if direction == 'forward': | |
| 499 |         # forward means oldest first.
 | |
| 1756.2.25
by Aaron Bentley Sort revisions at each depth, instead of just mainline revisions. | 500 | merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions) | 
| 1756.2.18
by Aaron Bentley Factor out the revision list generation | 501 | elif direction != 'reverse': | 
| 502 | raise ValueError('invalid direction %r' % direction) | |
| 503 | ||
| 1988.4.2
by Robert Collins ``bzr log`` Now shows dotted-decimal revision numbers for all revisions, | 504 | for sequence, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions: | 
| 505 | yield rev_id, '.'.join(map(str, revno)), merge_depth | |
| 1756.2.18
by Aaron Bentley Factor out the revision list generation | 506 | |
| 507 | ||
| 1756.2.25
by Aaron Bentley Sort revisions at each depth, instead of just mainline revisions. | 508 | def reverse_by_depth(merge_sorted_revisions, _depth=0): | 
| 509 | """Reverse revisions by depth. | |
| 1756.2.24
by Aaron Bentley Forward sorting shows merges under mainline revision | 510 | |
| 1756.2.25
by Aaron Bentley Sort revisions at each depth, instead of just mainline revisions. | 511 |     Revisions with a different depth are sorted as a group with the previous
 | 
| 512 |     revision of that depth.  There may be no topological justification for this,
 | |
| 1756.2.24
by Aaron Bentley Forward sorting shows merges under mainline revision | 513 |     but it looks much nicer.
 | 
| 514 |     """
 | |
| 515 | zd_revisions = [] | |
| 516 | for val in merge_sorted_revisions: | |
| 1756.2.25
by Aaron Bentley Sort revisions at each depth, instead of just mainline revisions. | 517 | if val[2] == _depth: | 
| 1756.2.24
by Aaron Bentley Forward sorting shows merges under mainline revision | 518 | zd_revisions.append([val]) | 
| 519 | else: | |
| 1756.2.25
by Aaron Bentley Sort revisions at each depth, instead of just mainline revisions. | 520 | assert val[2] > _depth | 
| 1756.2.24
by Aaron Bentley Forward sorting shows merges under mainline revision | 521 | zd_revisions[-1].append(val) | 
| 1756.2.25
by Aaron Bentley Sort revisions at each depth, instead of just mainline revisions. | 522 | for revisions in zd_revisions: | 
| 523 | if len(revisions) > 1: | |
| 524 | revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1) | |
| 1756.2.24
by Aaron Bentley Forward sorting shows merges under mainline revision | 525 | zd_revisions.reverse() | 
| 526 | result = [] | |
| 527 | for chunk in zd_revisions: | |
| 528 | result.extend(chunk) | |
| 529 | return result | |
| 530 | ||
| 531 | ||
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 532 | class LogRevision(object): | 
| 533 | """A revision to be logged (by LogFormatter.log_revision). | |
| 534 | ||
| 535 |     A simple wrapper for the attributes of a revision to be logged.
 | |
| 536 |     The attributes may or may not be populated, as determined by the 
 | |
| 537 |     logging options and the log formatter capabilities.
 | |
| 538 |     """
 | |
| 539 | ||
| 2490.1.2
by John Arbash Meinel Cleanup according to PEP8 and some other small whitespace fixes | 540 | def __init__(self, rev=None, revno=None, merge_depth=0, delta=None, | 
| 541 | tags=None): | |
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 542 | self.rev = rev | 
| 543 | self.revno = revno | |
| 544 | self.merge_depth = merge_depth | |
| 545 | self.delta = delta | |
| 546 | self.tags = tags | |
| 547 | ||
| 548 | ||
| 794
by Martin Pool - Merge John's nice short-log format. | 549 | class LogFormatter(object): | 
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 550 | """Abstract class to display log messages. | 
| 551 | ||
| 552 |     At a minimum, a derived class must implement the log_revision method.
 | |
| 553 | ||
| 554 |     If the LogFormatter needs to be informed of the beginning or end of
 | |
| 555 |     a log it should implement the begin_log and/or end_log hook methods.
 | |
| 556 | ||
| 557 |     A LogFormatter should define the following supports_XXX flags 
 | |
| 558 |     to indicate which LogRevision attributes it supports:
 | |
| 559 | ||
| 560 |     - supports_delta must be True if this log formatter supports delta.
 | |
| 561 |         Otherwise the delta attribute may not be populated.
 | |
| 562 |     - supports_merge_revisions must be True if this log formatter supports 
 | |
| 563 |         merge revisions.  If not, only revisions mainline revisions (those 
 | |
| 564 |         with merge_depth == 0) will be passed to the formatter.
 | |
| 565 |     - supports_tags must be True if this log formatter supports tags.
 | |
| 566 |         Otherwise the tags attribute may not be populated.
 | |
| 567 |     """
 | |
| 1704.2.20
by Martin Pool log --line shows revision numbers (Alexander) | 568 | |
| 2388.1.8
by Erik Bagfors Redo based on input from Alexander | 569 | def __init__(self, to_file, show_ids=False, show_timezone='original'): | 
| 794
by Martin Pool - Merge John's nice short-log format. | 570 | self.to_file = to_file | 
| 571 | self.show_ids = show_ids | |
| 572 | self.show_timezone = show_timezone | |
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 573 | |
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 574 | # TODO: uncomment this block after show() has been removed.
 | 
| 575 | # Until then defining log_revision would prevent _show_log calling show() 
 | |
| 576 | # in legacy formatters.
 | |
| 577 | #    def log_revision(self, revision):
 | |
| 578 | #        """Log a revision.
 | |
| 579 | #
 | |
| 580 | #        :param  revision:   The LogRevision to be logged.
 | |
| 581 | #        """
 | |
| 582 | #        raise NotImplementedError('not implemented in abstract base')
 | |
| 583 | ||
| 584 | @deprecated_method(zero_seventeen) | |
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 585 | def show(self, revno, rev, delta): | 
| 586 | raise NotImplementedError('not implemented in abstract base') | |
| 1393.1.56
by Martin Pool - doc and small refactoring of log code | 587 | |
| 1185.35.19
by Aaron Bentley Tweaked short-log as Meinel suggested | 588 | def short_committer(self, rev): | 
| 589 | return re.sub('<.*@.*>', '', rev.committer).strip(' ') | |
| 2388.1.11
by Alexander Belchenko changes after John's review | 590 | |
| 591 | ||
| 794
by Martin Pool - Merge John's nice short-log format. | 592 | class LongLogFormatter(LogFormatter): | 
| 2388.1.11
by Alexander Belchenko changes after John's review | 593 | |
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 594 | supports_merge_revisions = True | 
| 595 | supports_delta = True | |
| 596 | supports_tags = True | |
| 2388.1.10
by Alexander Belchenko Slightly reworked: use None instead of [] as default tags list; PEP-8 | 597 | |
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 598 | @deprecated_method(zero_seventeen) | 
| 2388.1.10
by Alexander Belchenko Slightly reworked: use None instead of [] as default tags list; PEP-8 | 599 | def show(self, revno, rev, delta, tags=None): | 
| 2490.1.2
by John Arbash Meinel Cleanup according to PEP8 and some other small whitespace fixes | 600 | lr = LogRevision(rev, revno, 0, delta, tags) | 
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 601 | return self.log_revision(lr) | 
| 794
by Martin Pool - Merge John's nice short-log format. | 602 | |
| 1988.4.2
by Robert Collins ``bzr log`` Now shows dotted-decimal revision numbers for all revisions, | 603 | @deprecated_method(zero_eleven) | 
| 1624.1.3
by Robert Collins Convert log to use the new tsort.merge_sort routine. | 604 | def show_merge(self, rev, merge_depth): | 
| 2490.1.2
by John Arbash Meinel Cleanup according to PEP8 and some other small whitespace fixes | 605 | lr = LogRevision(rev, merge_depth=merge_depth) | 
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 606 | return self.log_revision(lr) | 
| 1185.33.41
by Martin Pool Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676) | 607 | |
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 608 | @deprecated_method(zero_seventeen) | 
| 2388.1.10
by Alexander Belchenko Slightly reworked: use None instead of [] as default tags list; PEP-8 | 609 | def show_merge_revno(self, rev, merge_depth, revno, tags=None): | 
| 1988.4.2
by Robert Collins ``bzr log`` Now shows dotted-decimal revision numbers for all revisions, | 610 | """Show a merged revision rev, with merge_depth and a revno.""" | 
| 2490.1.2
by John Arbash Meinel Cleanup according to PEP8 and some other small whitespace fixes | 611 | lr = LogRevision(rev, revno, merge_depth, tags=tags) | 
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 612 | return self.log_revision(lr) | 
| 1988.4.2
by Robert Collins ``bzr log`` Now shows dotted-decimal revision numbers for all revisions, | 613 | |
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 614 | def log_revision(self, revision): | 
| 615 | """Log a revision, either merged or not.""" | |
| 1185.33.41
by Martin Pool Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676) | 616 | from bzrlib.osutils import format_date | 
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 617 | indent = ' '*revision.merge_depth | 
| 1433
by Robert Collins merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages. | 618 | to_file = self.to_file | 
| 619 | print >>to_file, indent+'-' * 60 | |
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 620 | if revision.revno is not None: | 
| 621 | print >>to_file, indent+'revno:', revision.revno | |
| 622 | if revision.tags: | |
| 623 | print >>to_file, indent+'tags: %s' % (', '.join(revision.tags)) | |
| 1433
by Robert Collins merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages. | 624 | if self.show_ids: | 
| 2490.1.2
by John Arbash Meinel Cleanup according to PEP8 and some other small whitespace fixes | 625 | print >>to_file, indent+'revision-id:', revision.rev.revision_id | 
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 626 | for parent_id in revision.rev.parent_ids: | 
| 1433
by Robert Collins merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages. | 627 | print >>to_file, indent+'parent:', parent_id | 
| 2490.1.2
by John Arbash Meinel Cleanup according to PEP8 and some other small whitespace fixes | 628 | print >>to_file, indent+'committer:', revision.rev.committer | 
| 2388.1.11
by Alexander Belchenko changes after John's review | 629 | |
| 1185.35.17
by Aaron Bentley Added branch nicks to long-format logs | 630 | try: | 
| 631 | print >>to_file, indent+'branch nick: %s' % \ | |
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 632 | revision.rev.properties['branch-nick'] | 
| 1185.35.17
by Aaron Bentley Added branch nicks to long-format logs | 633 | except KeyError: | 
| 634 |             pass
 | |
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 635 | date_str = format_date(revision.rev.timestamp, | 
| 636 | revision.rev.timezone or 0, | |
| 1433
by Robert Collins merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages. | 637 | self.show_timezone) | 
| 638 | print >>to_file, indent+'timestamp: %s' % date_str | |
| 639 | ||
| 640 | print >>to_file, indent+'message:' | |
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 641 | if not revision.rev.message: | 
| 1433
by Robert Collins merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages. | 642 | print >>to_file, indent+' (no message)' | 
| 643 | else: | |
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 644 | message = revision.rev.message.rstrip('\r\n') | 
| 1185.31.20
by John Arbash Meinel Stripping trailing newlines when displaying log messages | 645 | for l in message.split('\n'): | 
| 1433
by Robert Collins merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages. | 646 | print >>to_file, indent+' ' + l | 
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 647 | if revision.delta is not None: | 
| 2466.11.1
by Kent Gibson Long log format reports deltas on merge revisions. | 648 | revision.delta.show(to_file, self.show_ids, indent=indent) | 
| 794
by Martin Pool - Merge John's nice short-log format. | 649 | |
| 650 | ||
| 651 | class ShortLogFormatter(LogFormatter): | |
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 652 | |
| 653 | supports_delta = True | |
| 654 | ||
| 655 | @deprecated_method(zero_seventeen) | |
| 794
by Martin Pool - Merge John's nice short-log format. | 656 | def show(self, revno, rev, delta): | 
| 2490.1.2
by John Arbash Meinel Cleanup according to PEP8 and some other small whitespace fixes | 657 | lr = LogRevision(rev, revno, 0, delta) | 
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 658 | return self.log_revision(lr) | 
| 659 | ||
| 660 | def log_revision(self, revision): | |
| 794
by Martin Pool - Merge John's nice short-log format. | 661 | from bzrlib.osutils import format_date | 
| 662 | ||
| 663 | to_file = self.to_file | |
| 2483.2.5
by John Arbash Meinel [merge] bzr.dev 2501 | 664 | date_str = format_date(revision.rev.timestamp, | 
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 665 | revision.rev.timezone or 0, | 
| 666 | self.show_timezone) | |
| 2483.2.2
by John Arbash Meinel Add [merge] after the timestamp for revisions with merges. | 667 | is_merge = '' | 
| 2483.2.5
by John Arbash Meinel [merge] bzr.dev 2501 | 668 | if len(revision.rev.parent_ids) > 1: | 
| 2483.2.2
by John Arbash Meinel Add [merge] after the timestamp for revisions with merges. | 669 | is_merge = ' [merge]' | 
| 2483.2.5
by John Arbash Meinel [merge] bzr.dev 2501 | 670 | print >>to_file, "%5s %s\t%s%s" % (revision.revno, | 
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 671 | self.short_committer(revision.rev), | 
| 2483.2.5
by John Arbash Meinel [merge] bzr.dev 2501 | 672 | format_date(revision.rev.timestamp, | 
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 673 | revision.rev.timezone or 0, | 
| 1185.35.19
by Aaron Bentley Tweaked short-log as Meinel suggested | 674 | self.show_timezone, date_fmt="%Y-%m-%d", | 
| 2483.2.5
by John Arbash Meinel [merge] bzr.dev 2501 | 675 | show_offset=False), | 
| 676 | is_merge) | |
| 794
by Martin Pool - Merge John's nice short-log format. | 677 | if self.show_ids: | 
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 678 | print >>to_file, ' revision-id:', revision.rev.revision_id | 
| 679 | if not revision.rev.message: | |
| 794
by Martin Pool - Merge John's nice short-log format. | 680 | print >>to_file, ' (no message)' | 
| 681 | else: | |
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 682 | message = revision.rev.message.rstrip('\r\n') | 
| 1185.31.20
by John Arbash Meinel Stripping trailing newlines when displaying log messages | 683 | for l in message.split('\n'): | 
| 794
by Martin Pool - Merge John's nice short-log format. | 684 | print >>to_file, ' ' + l | 
| 685 | ||
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 686 |         # TODO: Why not show the modified files in a shorter form as
 | 
| 687 |         # well? rewrap them single lines of appropriate length
 | |
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 688 | if revision.delta is not None: | 
| 689 | revision.delta.show(to_file, self.show_ids) | |
| 1185.31.21
by John Arbash Meinel Added test for log formatting, found bug when redirecting short logs to a file instead of stdout. | 690 | print >>to_file, '' | 
| 794
by Martin Pool - Merge John's nice short-log format. | 691 | |
| 1704.2.20
by Martin Pool log --line shows revision numbers (Alexander) | 692 | |
| 1185.12.25
by Aaron Bentley Added one-line log format | 693 | class LineLogFormatter(LogFormatter): | 
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 694 | |
| 695 | def __init__(self, *args, **kwargs): | |
| 696 | from bzrlib.osutils import terminal_width | |
| 697 | super(LineLogFormatter, self).__init__(*args, **kwargs) | |
| 698 | self._max_chars = terminal_width() - 1 | |
| 699 | ||
| 1185.12.25
by Aaron Bentley Added one-line log format | 700 | def truncate(self, str, max_len): | 
| 701 | if len(str) <= max_len: | |
| 702 | return str | |
| 703 | return str[:max_len-3]+'...' | |
| 704 | ||
| 705 | def date_string(self, rev): | |
| 706 | from bzrlib.osutils import format_date | |
| 707 | return format_date(rev.timestamp, rev.timezone or 0, | |
| 708 | self.show_timezone, date_fmt="%Y-%m-%d", | |
| 709 | show_offset=False) | |
| 710 | ||
| 711 | def message(self, rev): | |
| 712 | if not rev.message: | |
| 713 | return '(no message)' | |
| 714 | else: | |
| 715 | return rev.message | |
| 716 | ||
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 717 | @deprecated_method(zero_seventeen) | 
| 1185.12.25
by Aaron Bentley Added one-line log format | 718 | def show(self, revno, rev, delta): | 
| 1704.2.2
by Martin Pool Detect terminal width using ioctl | 719 | from bzrlib.osutils import terminal_width | 
| 1704.2.20
by Martin Pool log --line shows revision numbers (Alexander) | 720 | print >> self.to_file, self.log_string(revno, rev, terminal_width()-1) | 
| 1185.12.25
by Aaron Bentley Added one-line log format | 721 | |
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 722 | def log_revision(self, revision): | 
| 2490.1.2
by John Arbash Meinel Cleanup according to PEP8 and some other small whitespace fixes | 723 | print >>self.to_file, self.log_string(revision.revno, revision.rev, | 
| 724 | self._max_chars) | |
| 2466.8.1
by Kent Gibson Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. | 725 | |
| 1704.2.20
by Martin Pool log --line shows revision numbers (Alexander) | 726 | def log_string(self, revno, rev, max_chars): | 
| 727 | """Format log info into one string. Truncate tail of string | |
| 728 |         :param  revno:      revision number (int) or None.
 | |
| 729 |                             Revision numbers counts from 1.
 | |
| 730 |         :param  rev:        revision info object
 | |
| 731 |         :param  max_chars:  maximum length of resulting string
 | |
| 732 |         :return:            formatted truncated string
 | |
| 733 |         """
 | |
| 734 | out = [] | |
| 735 | if revno: | |
| 736 |             # show revno only when is not None
 | |
| 1988.4.2
by Robert Collins ``bzr log`` Now shows dotted-decimal revision numbers for all revisions, | 737 | out.append("%s:" % revno) | 
| 1704.2.20
by Martin Pool log --line shows revision numbers (Alexander) | 738 | out.append(self.truncate(self.short_committer(rev), 20)) | 
| 1185.12.25
by Aaron Bentley Added one-line log format | 739 | out.append(self.date_string(rev)) | 
| 1740.2.5
by Aaron Bentley Merge from bzr.dev | 740 | out.append(rev.get_summary()) | 
| 1185.12.25
by Aaron Bentley Added one-line log format | 741 | return self.truncate(" ".join(out).rstrip('\n'), max_chars) | 
| 794
by Martin Pool - Merge John's nice short-log format. | 742 | |
| 1704.2.20
by Martin Pool log --line shows revision numbers (Alexander) | 743 | |
| 1185.12.27
by Aaron Bentley Use line log for pending merges | 744 | def line_log(rev, max_chars): | 
| 745 | lf = LineLogFormatter(None) | |
| 1704.2.20
by Martin Pool log --line shows revision numbers (Alexander) | 746 | return lf.log_string(None, rev, max_chars) | 
| 1185.12.27
by Aaron Bentley Use line log for pending merges | 747 | |
| 2221.4.10
by Aaron Bentley Implement log options using RegistryOption | 748 | |
| 749 | class LogFormatterRegistry(registry.Registry): | |
| 750 | """Registry for log formatters""" | |
| 751 | ||
| 752 | def make_formatter(self, name, *args, **kwargs): | |
| 753 | """Construct a formatter from arguments. | |
| 754 | ||
| 755 |         :param name: Name of the formatter to construct.  'short', 'long' and
 | |
| 756 |             'line' are built-in.
 | |
| 757 |         """
 | |
| 758 | return self.get(name)(*args, **kwargs) | |
| 759 | ||
| 760 | def get_default(self, branch): | |
| 761 | return self.get(branch.get_config().log_format()) | |
| 762 | ||
| 763 | ||
| 764 | log_formatter_registry = LogFormatterRegistry() | |
| 765 | ||
| 766 | ||
| 767 | log_formatter_registry.register('short', ShortLogFormatter, | |
| 768 | 'Moderately short log format') | |
| 769 | log_formatter_registry.register('long', LongLogFormatter, | |
| 770 | 'Detailed log format') | |
| 771 | log_formatter_registry.register('line', LineLogFormatter, | |
| 772 | 'Log format with one line per revision') | |
| 773 | ||
| 794
by Martin Pool - Merge John's nice short-log format. | 774 | |
| 1553.2.1
by Erik Bågfors Support for plugins to register log formatters and set default formatter | 775 | def register_formatter(name, formatter): | 
| 2221.4.10
by Aaron Bentley Implement log options using RegistryOption | 776 | log_formatter_registry.register(name, formatter) | 
| 777 | ||
| 1553.2.1
by Erik Bågfors Support for plugins to register log formatters and set default formatter | 778 | |
| 794
by Martin Pool - Merge John's nice short-log format. | 779 | def log_formatter(name, *args, **kwargs): | 
| 1393.1.56
by Martin Pool - doc and small refactoring of log code | 780 | """Construct a formatter from arguments. | 
| 781 | ||
| 1185.12.27
by Aaron Bentley Use line log for pending merges | 782 |     name -- Name of the formatter to construct; currently 'long', 'short' and
 | 
| 783 |         'line' are supported.
 | |
| 1393.1.56
by Martin Pool - doc and small refactoring of log code | 784 |     """
 | 
| 794
by Martin Pool - Merge John's nice short-log format. | 785 | from bzrlib.errors import BzrCommandError | 
| 786 | try: | |
| 2221.4.10
by Aaron Bentley Implement log options using RegistryOption | 787 | return log_formatter_registry.make_formatter(name, *args, **kwargs) | 
| 1553.2.2
by Erik Bågfors Made "unknown log formatter" error message work | 788 | except KeyError: | 
| 794
by Martin Pool - Merge John's nice short-log format. | 789 | raise BzrCommandError("unknown log formatter: %r" % name) | 
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 790 | |
| 2221.4.10
by Aaron Bentley Implement log options using RegistryOption | 791 | |
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 792 | def show_one_log(revno, rev, delta, verbose, to_file, show_timezone): | 
| 1759.2.1
by Jelmer Vernooij Fix some types (found using aspell). | 793 |     # deprecated; for compatibility
 | 
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 794 | lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone) | 
| 795 | lf.show(revno, rev, delta) | |
| 1185.32.2
by John Arbash Meinel Refactor pull --verbose into a log.py function, add tests. | 796 | |
| 2490.1.4
by John Arbash Meinel Update bzrlib.log.show_changed_revisions to use the new api | 797 | |
| 1185.32.2
by John Arbash Meinel Refactor pull --verbose into a log.py function, add tests. | 798 | def show_changed_revisions(branch, old_rh, new_rh, to_file=None, log_format='long'): | 
| 799 | """Show the change in revision history comparing the old revision history to the new one. | |
| 800 | ||
| 801 |     :param branch: The branch where the revisions exist
 | |
| 802 |     :param old_rh: The old revision history
 | |
| 803 |     :param new_rh: The new revision history
 | |
| 804 |     :param to_file: A file to write the results to. If None, stdout will be used
 | |
| 805 |     """
 | |
| 806 | if to_file is None: | |
| 807 | import sys | |
| 808 | import codecs | |
| 809 | import bzrlib | |
| 810 | to_file = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace') | |
| 811 | lf = log_formatter(log_format, | |
| 812 | show_ids=False, | |
| 813 | to_file=to_file, | |
| 814 | show_timezone='original') | |
| 815 | ||
| 816 |     # This is the first index which is different between
 | |
| 817 |     # old and new
 | |
| 818 | base_idx = None | |
| 819 | for i in xrange(max(len(new_rh), | |
| 820 | len(old_rh))): | |
| 821 | if (len(new_rh) <= i | |
| 822 | or len(old_rh) <= i | |
| 823 | or new_rh[i] != old_rh[i]): | |
| 824 | base_idx = i | |
| 825 |             break
 | |
| 826 | ||
| 827 | if base_idx is None: | |
| 828 | to_file.write('Nothing seems to have changed\n') | |
| 829 |         return
 | |
| 830 |     ## TODO: It might be nice to do something like show_log
 | |
| 831 |     ##       and show the merged entries. But since this is the
 | |
| 832 |     ##       removed revisions, it shouldn't be as important
 | |
| 833 | if base_idx < len(old_rh): | |
| 834 | to_file.write('*'*60) | |
| 835 | to_file.write('\nRemoved Revisions:\n') | |
| 836 | for i in range(base_idx, len(old_rh)): | |
| 1185.67.2
by Aaron Bentley Renamed Branch.storage to Branch.repository | 837 | rev = branch.repository.get_revision(old_rh[i]) | 
| 2490.1.4
by John Arbash Meinel Update bzrlib.log.show_changed_revisions to use the new api | 838 | lr = LogRevision(rev, i+1, 0, None) | 
| 839 | lf.log_revision(lr) | |
| 1185.32.2
by John Arbash Meinel Refactor pull --verbose into a log.py function, add tests. | 840 | to_file.write('*'*60) | 
| 841 | to_file.write('\n\n') | |
| 842 | if base_idx < len(new_rh): | |
| 843 | to_file.write('Added Revisions:\n') | |
| 844 | show_log(branch, | |
| 845 | lf, | |
| 846 | None, | |
| 847 | verbose=True, | |
| 848 | direction='forward', | |
| 849 | start_revision=base_idx+1, | |
| 850 | end_revision=len(new_rh), | |
| 851 | search=None) | |
| 852 |