bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 369
by Martin Pool - Split out log printing into new show_log function | 1 | # Copyright (C) 2005 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 | ||
| 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 | ||
| 52 | ||
| 1185.33.41
by Martin Pool Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676) | 53 | # TODO: option to show delta summaries for merged-in revisions
 | 
| 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 | |
| 1624.1.3
by Robert Collins Convert log to use the new tsort.merge_sort routine. | 57 | from bzrlib.delta import compare_trees | 
| 1433
by Robert Collins merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages. | 58 | import bzrlib.errors as errors | 
| 1624.1.3
by Robert Collins Convert log to use the new tsort.merge_sort routine. | 59 | from bzrlib.trace import mutter | 
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 60 | from bzrlib.tree import EmptyTree | 
| 1624.1.3
by Robert Collins Convert log to use the new tsort.merge_sort routine. | 61 | from bzrlib.tsort import merge_sort | 
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 62 | |
| 375
by Martin Pool - New command touching-revisions and function to trace | 63 | |
| 64 | def find_touching_revisions(branch, file_id): | |
| 65 | """Yield a description of revisions which affect the file_id. | |
| 66 | ||
| 67 |     Each returned element is (revno, revision_id, description)
 | |
| 68 | ||
| 69 |     This is the list of revisions where the file is either added,
 | |
| 70 |     modified, renamed or deleted.
 | |
| 71 | ||
| 72 |     TODO: Perhaps some way to limit this to only particular revisions,
 | |
| 522
by Martin Pool todo | 73 |     or to traverse a non-mainline set of revisions?
 | 
| 375
by Martin Pool - New command touching-revisions and function to trace | 74 |     """
 | 
| 75 | last_ie = None | |
| 76 | last_path = None | |
| 77 | revno = 1 | |
| 78 | for revision_id in branch.revision_history(): | |
| 1185.67.2
by Aaron Bentley Renamed Branch.storage to Branch.repository | 79 | this_inv = branch.repository.get_revision_inventory(revision_id) | 
| 375
by Martin Pool - New command touching-revisions and function to trace | 80 | if file_id in this_inv: | 
| 81 | this_ie = this_inv[file_id] | |
| 82 | this_path = this_inv.id2path(file_id) | |
| 83 | else: | |
| 84 | this_ie = this_path = None | |
| 85 | ||
| 86 |         # now we know how it was last time, and how it is in this revision.
 | |
| 87 |         # are those two states effectively the same or not?
 | |
| 88 | ||
| 89 | if not this_ie and not last_ie: | |
| 90 |             # not present in either
 | |
| 91 |             pass
 | |
| 92 | elif this_ie and not last_ie: | |
| 93 | yield revno, revision_id, "added " + this_path | |
| 94 | elif not this_ie and last_ie: | |
| 95 |             # deleted here
 | |
| 96 | yield revno, revision_id, "deleted " + last_path | |
| 97 | elif this_path != last_path: | |
| 98 | yield revno, revision_id, ("renamed %s => %s" % (last_path, this_path)) | |
| 99 | elif (this_ie.text_size != last_ie.text_size | |
| 100 | or this_ie.text_sha1 != last_ie.text_sha1): | |
| 101 | yield revno, revision_id, "modified " + this_path | |
| 102 | ||
| 103 | last_ie = this_ie | |
| 104 | last_path = this_path | |
| 105 | revno += 1 | |
| 106 | ||
| 107 | ||
| 527
by Martin Pool - refactor log command | 108 | |
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 109 | def _enumerate_history(branch): | 
| 110 | rh = [] | |
| 111 | revno = 1 | |
| 112 | for rev_id in branch.revision_history(): | |
| 113 | rh.append((revno, rev_id)) | |
| 114 | revno += 1 | |
| 115 | return rh | |
| 116 | ||
| 117 | ||
| 1393.1.56
by Martin Pool - doc and small refactoring of log code | 118 | def _get_revision_delta(branch, revno): | 
| 119 | """Return the delta for a mainline revision. | |
| 120 |     
 | |
| 121 |     This is used to show summaries in verbose logs, and also for finding 
 | |
| 122 |     revisions which touch a given file."""
 | |
| 123 |     # XXX: What are we supposed to do when showing a summary for something 
 | |
| 124 |     # other than a mainline revision.  The delta to it's first parent, or
 | |
| 125 |     # (more useful) the delta to a nominated other revision.
 | |
| 1744.2.2
by Johan Rydberg Add get_revision_delta to Repository; and make Branch.get_revision_delta use it. | 126 | return branch.get_revision_delta(revno) | 
| 1393.1.56
by Martin Pool - doc and small refactoring of log code | 127 | |
| 128 | ||
| 378
by Martin Pool - New usage bzr log FILENAME | 129 | def show_log(branch, | 
| 794
by Martin Pool - Merge John's nice short-log format. | 130 | lf, | 
| 527
by Martin Pool - refactor log command | 131 | specific_fileid=None, | 
| 378
by Martin Pool - New usage bzr log FILENAME | 132 | verbose=False, | 
| 567
by Martin Pool - New form 'bzr log -r FROM:TO' | 133 | direction='reverse', | 
| 134 | start_revision=None, | |
| 900
by Martin Pool - patch from john to search for matching commits | 135 | end_revision=None, | 
| 136 | search=None): | |
| 369
by Martin Pool - Split out log printing into new show_log function | 137 | """Write out human-readable log of commits to this branch. | 
| 138 | ||
| 794
by Martin Pool - Merge John's nice short-log format. | 139 |     lf
 | 
| 140 |         LogFormatter object to show the output.
 | |
| 141 | ||
| 527
by Martin Pool - refactor log command | 142 |     specific_fileid
 | 
| 378
by Martin Pool - New usage bzr log FILENAME | 143 |         If true, list only the commits affecting the specified
 | 
| 144 |         file, rather than all commits.
 | |
| 145 | ||
| 369
by Martin Pool - Split out log printing into new show_log function | 146 |     verbose
 | 
| 147 |         If true show added/changed/deleted/renamed files.
 | |
| 148 | ||
| 527
by Martin Pool - refactor log command | 149 |     direction
 | 
| 150 |         'reverse' (default) is latest to earliest;
 | |
| 151 |         'forward' is earliest to latest.
 | |
| 567
by Martin Pool - New form 'bzr log -r FROM:TO' | 152 | |
| 153 |     start_revision
 | |
| 154 |         If not None, only show revisions >= start_revision
 | |
| 155 | ||
| 156 |     end_revision
 | |
| 157 |         If not None, only show revisions <= end_revision
 | |
| 369
by Martin Pool - Split out log printing into new show_log function | 158 |     """
 | 
| 1417.1.7
by Robert Collins teach log it needs a read lock | 159 | branch.lock_read() | 
| 160 | try: | |
| 1756.1.6
by Aaron Bentley Revert locking fix | 161 | _show_log(branch, lf, specific_fileid, verbose, direction, | 
| 162 | start_revision, end_revision, search) | |
| 1417.1.7
by Robert Collins teach log it needs a read lock | 163 | finally: | 
| 164 | branch.unlock() | |
| 165 | ||
| 166 | def _show_log(branch, | |
| 167 | lf, | |
| 168 | specific_fileid=None, | |
| 169 | verbose=False, | |
| 170 | direction='reverse', | |
| 171 | start_revision=None, | |
| 172 | end_revision=None, | |
| 173 | search=None): | |
| 174 | """Worker function for show_log - see show_log.""" | |
| 794
by Martin Pool - Merge John's nice short-log format. | 175 | from bzrlib.osutils import format_date | 
| 176 | from bzrlib.errors import BzrCheckError | |
| 177 | from bzrlib.textui import show_status | |
| 178 | ||
| 179 | from warnings import warn | |
| 369
by Martin Pool - Split out log printing into new show_log function | 180 | |
| 794
by Martin Pool - Merge John's nice short-log format. | 181 | if not isinstance(lf, LogFormatter): | 
| 182 | warn("not a LogFormatter instance: %r" % lf) | |
| 533
by Martin Pool - fix up asking for the log for the root of a remote branch | 183 | |
| 184 | if specific_fileid: | |
| 1185.31.4
by John Arbash Meinel Fixing mutter() calls to not have to do string processing. | 185 | 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 | 186 | |
| 900
by Martin Pool - patch from john to search for matching commits | 187 | if search is not None: | 
| 188 | import re | |
| 189 | searchRE = re.compile(search, re.IGNORECASE) | |
| 190 | else: | |
| 191 | searchRE = None | |
| 192 | ||
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 193 | which_revs = _enumerate_history(branch) | 
| 194 | ||
| 195 | if start_revision is None: | |
| 196 | start_revision = 1 | |
| 974.1.54
by aaron.bentley at utoronto Fixed the revno bug in log | 197 | else: | 
| 198 | branch.check_real_revno(start_revision) | |
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 199 | |
| 200 | if end_revision is None: | |
| 201 | end_revision = len(which_revs) | |
| 974.1.54
by aaron.bentley at utoronto Fixed the revno bug in log | 202 | else: | 
| 203 | branch.check_real_revno(end_revision) | |
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 204 | |
| 205 |     # list indexes are 0-based; revisions are 1-based
 | |
| 206 | cut_revs = which_revs[(start_revision-1):(end_revision)] | |
| 1624.1.3
by Robert Collins Convert log to use the new tsort.merge_sort routine. | 207 | if not cut_revs: | 
| 208 |         return
 | |
| 209 |     # override the mainline to look like the revision history.
 | |
| 210 | mainline_revs = [revision_id for index, revision_id in cut_revs] | |
| 211 | if cut_revs[0][0] == 1: | |
| 212 | mainline_revs.insert(0, None) | |
| 213 | else: | |
| 214 | mainline_revs.insert(0, which_revs[start_revision-2][1]) | |
| 215 | ||
| 216 | merge_sorted_revisions = merge_sort( | |
| 217 | branch.repository.get_revision_graph(mainline_revs[-1]), | |
| 218 | mainline_revs[-1], | |
| 219 | mainline_revs) | |
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 220 | |
| 221 | if direction == 'reverse': | |
| 222 | cut_revs.reverse() | |
| 223 | elif direction == 'forward': | |
| 1624.1.3
by Robert Collins Convert log to use the new tsort.merge_sort routine. | 224 |         # forward means oldest first.
 | 
| 225 | merge_sorted_revisions.reverse() | |
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 226 | else: | 
| 227 | raise ValueError('invalid direction %r' % direction) | |
| 228 | ||
| 1433
by Robert Collins merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages. | 229 | revision_history = branch.revision_history() | 
| 1624.1.3
by Robert Collins Convert log to use the new tsort.merge_sort routine. | 230 | |
| 231 |     # convert the revision history to a dictionary:
 | |
| 232 | rev_nos = {} | |
| 233 | for index, rev_id in cut_revs: | |
| 234 | rev_nos[rev_id] = index | |
| 235 | ||
| 1756.2.13
by Aaron Bentley Used scaled iterator to retrive revisions | 236 | def iter_revisions(): | 
| 237 | revision_ids = [r for s, r, m, e in merge_sorted_revisions] | |
| 238 | num = 9 | |
| 239 | while revision_ids: | |
| 240 | revisions = branch.repository.get_revisions(revision_ids[:num]) | |
| 241 | for revision in revisions: | |
| 242 | yield revision | |
| 243 | revision_ids = revision_ids[num:] | |
| 244 | num = int(num * 1.5) | |
| 245 | ||
| 246 | revisions = branch.repository.get_revisions() | |
| 247 | for revision in revisions: | |
| 248 | yield revision | |
| 1624.1.3
by Robert Collins Convert log to use the new tsort.merge_sort routine. | 249 |     # now we just print all the revisions
 | 
| 1756.1.2
by Aaron Bentley Show logs using get_revisions | 250 | for ((sequence, rev_id, merge_depth, end_of_merge), rev) in \ | 
| 1756.2.13
by Aaron Bentley Used scaled iterator to retrive revisions | 251 | izip(merge_sorted_revisions, iter_revisions()): | 
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 252 | |
| 253 | if searchRE: | |
| 254 | if not searchRE.search(rev.message): | |
| 255 |                 continue
 | |
| 256 | ||
| 1624.1.3
by Robert Collins Convert log to use the new tsort.merge_sort routine. | 257 | if merge_depth == 0: | 
| 258 |             # a mainline revision.
 | |
| 259 | if verbose or specific_fileid: | |
| 260 | delta = _get_revision_delta(branch, rev_nos[rev_id]) | |
| 261 | ||
| 262 | if specific_fileid: | |
| 263 | if not delta.touches_file_id(specific_fileid): | |
| 264 |                     continue
 | |
| 265 | ||
| 266 | if not verbose: | |
| 267 |                 # although we calculated it, throw it away without display
 | |
| 268 | delta = None | |
| 269 | ||
| 270 | lf.show(rev_nos[rev_id], rev, delta) | |
| 271 | elif hasattr(lf, 'show_merge'): | |
| 272 | lf.show_merge(rev, merge_depth) | |
| 527
by Martin Pool - refactor log command | 273 | |
| 530
by Martin Pool - put back verbose log support for reversed logs | 274 | |
| 275 | def deltas_for_log_dummy(branch, which_revs): | |
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 276 | """Return all the revisions without intermediate deltas. | 
| 277 | ||
| 278 |     Useful for log commands that won't need the delta information.
 | |
| 279 |     """
 | |
| 280 | ||
| 530
by Martin Pool - put back verbose log support for reversed logs | 281 | for revno, revision_id in which_revs: | 
| 282 | yield revno, branch.get_revision(revision_id), None | |
| 283 | ||
| 284 | ||
| 285 | def deltas_for_log_reverse(branch, which_revs): | |
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 286 | """Compute deltas for display in latest-to-earliest order. | 
| 287 | ||
| 288 |     branch
 | |
| 289 |         Branch to traverse
 | |
| 290 | ||
| 291 |     which_revs
 | |
| 292 |         Sequence of (revno, revision_id) for the subset of history to examine
 | |
| 293 | ||
| 294 |     returns 
 | |
| 295 |         Sequence of (revno, rev, delta)
 | |
| 530
by Martin Pool - put back verbose log support for reversed logs | 296 | |
| 297 |     The delta is from the given revision to the next one in the
 | |
| 298 |     sequence, which makes sense if the log is being displayed from
 | |
| 299 |     newest to oldest.
 | |
| 300 |     """
 | |
| 301 | last_revno = last_revision_id = last_tree = None | |
| 302 | for revno, revision_id in which_revs: | |
| 303 | this_tree = branch.revision_tree(revision_id) | |
| 304 | this_revision = branch.get_revision(revision_id) | |
| 305 | ||
| 306 | if last_revno: | |
| 307 | yield last_revno, last_revision, compare_trees(this_tree, last_tree, False) | |
| 308 | ||
| 909
by Martin Pool - merge John's code to give the tree root an explicit file id | 309 | this_tree = EmptyTree(branch.get_root_id()) | 
| 310 | ||
| 530
by Martin Pool - put back verbose log support for reversed logs | 311 | last_revno = revno | 
| 312 | last_revision = this_revision | |
| 313 | last_tree = this_tree | |
| 314 | ||
| 315 | if last_revno: | |
| 805
by Martin Pool Merge John's log patch: | 316 | if last_revno == 1: | 
| 909.1.5
by Aaron Bentley Fixed log -v (mostly) | 317 | this_tree = EmptyTree(branch.get_root_id()) | 
| 805
by Martin Pool Merge John's log patch: | 318 | else: | 
| 319 | this_revno = last_revno - 1 | |
| 320 | this_revision_id = branch.revision_history()[this_revno] | |
| 321 | this_tree = branch.revision_tree(this_revision_id) | |
| 530
by Martin Pool - put back verbose log support for reversed logs | 322 | yield last_revno, last_revision, compare_trees(this_tree, last_tree, False) | 
| 323 | ||
| 324 | ||
| 805
by Martin Pool Merge John's log patch: | 325 | def deltas_for_log_forward(branch, which_revs): | 
| 326 | """Compute deltas for display in forward log. | |
| 327 | ||
| 328 |     Given a sequence of (revno, revision_id) pairs, return
 | |
| 329 |     (revno, rev, delta).
 | |
| 330 | ||
| 331 |     The delta is from the given revision to the next one in the
 | |
| 332 |     sequence, which makes sense if the log is being displayed from
 | |
| 333 |     newest to oldest.
 | |
| 334 |     """
 | |
| 335 | last_revno = last_revision_id = last_tree = None | |
| 909
by Martin Pool - merge John's code to give the tree root an explicit file id | 336 | prev_tree = EmptyTree(branch.get_root_id()) | 
| 337 | ||
| 805
by Martin Pool Merge John's log patch: | 338 | for revno, revision_id in which_revs: | 
| 339 | this_tree = branch.revision_tree(revision_id) | |
| 340 | this_revision = branch.get_revision(revision_id) | |
| 341 | ||
| 342 | if not last_revno: | |
| 343 | if revno == 1: | |
| 909.1.5
by Aaron Bentley Fixed log -v (mostly) | 344 | last_tree = EmptyTree(branch.get_root_id()) | 
| 805
by Martin Pool Merge John's log patch: | 345 | else: | 
| 346 | last_revno = revno - 1 | |
| 347 | last_revision_id = branch.revision_history()[last_revno] | |
| 348 | last_tree = branch.revision_tree(last_revision_id) | |
| 349 | ||
| 350 | yield revno, this_revision, compare_trees(last_tree, this_tree, False) | |
| 351 | ||
| 352 | last_revno = revno | |
| 353 | last_revision = this_revision | |
| 354 | last_tree = this_tree | |
| 530
by Martin Pool - put back verbose log support for reversed logs | 355 | |
| 527
by Martin Pool - refactor log command | 356 | |
| 794
by Martin Pool - Merge John's nice short-log format. | 357 | class LogFormatter(object): | 
| 358 | """Abstract class to display log messages.""" | |
| 1704.2.20
by Martin Pool log --line shows revision numbers (Alexander) | 359 | |
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 360 | def __init__(self, to_file, show_ids=False, show_timezone='original'): | 
| 794
by Martin Pool - Merge John's nice short-log format. | 361 | self.to_file = to_file | 
| 362 | self.show_ids = show_ids | |
| 363 | self.show_timezone = show_timezone | |
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 364 | |
| 365 | def show(self, revno, rev, delta): | |
| 366 | raise NotImplementedError('not implemented in abstract base') | |
| 1393.1.56
by Martin Pool - doc and small refactoring of log code | 367 | |
| 1185.35.19
by Aaron Bentley Tweaked short-log as Meinel suggested | 368 | def short_committer(self, rev): | 
| 369 | return re.sub('<.*@.*>', '', rev.committer).strip(' ') | |
| 370 | ||
| 1393.1.56
by Martin Pool - doc and small refactoring of log code | 371 | |
| 794
by Martin Pool - Merge John's nice short-log format. | 372 | class LongLogFormatter(LogFormatter): | 
| 373 | def show(self, revno, rev, delta): | |
| 1185.33.41
by Martin Pool Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676) | 374 | return self._show_helper(revno=revno, rev=rev, delta=delta) | 
| 794
by Martin Pool - Merge John's nice short-log format. | 375 | |
| 1624.1.3
by Robert Collins Convert log to use the new tsort.merge_sort routine. | 376 | def show_merge(self, rev, merge_depth): | 
| 377 | return self._show_helper(rev=rev, indent=' '*merge_depth, merged=True, delta=None) | |
| 1185.33.41
by Martin Pool Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676) | 378 | |
| 379 | def _show_helper(self, rev=None, revno=None, indent='', merged=False, delta=None): | |
| 1624.1.3
by Robert Collins Convert log to use the new tsort.merge_sort routine. | 380 | """Show 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) | 381 | from bzrlib.osutils import format_date | 
| 1433
by Robert Collins merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages. | 382 | to_file = self.to_file | 
| 383 | print >>to_file, indent+'-' * 60 | |
| 1185.35.18
by Aaron Bentley Refactored long-format log printing | 384 | if revno is not None: | 
| 385 | print >>to_file, 'revno:', revno | |
| 386 | if merged: | |
| 387 | print >>to_file, indent+'merged:', rev.revision_id | |
| 388 | elif self.show_ids: | |
| 389 | print >>to_file, indent+'revision-id:', rev.revision_id | |
| 1433
by Robert Collins merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages. | 390 | if self.show_ids: | 
| 391 | for parent_id in rev.parent_ids: | |
| 392 | print >>to_file, indent+'parent:', parent_id | |
| 393 | print >>to_file, indent+'committer:', rev.committer | |
| 1185.35.17
by Aaron Bentley Added branch nicks to long-format logs | 394 | try: | 
| 395 | print >>to_file, indent+'branch nick: %s' % \ | |
| 396 | rev.properties['branch-nick'] | |
| 397 | except KeyError: | |
| 398 |             pass
 | |
| 1433
by Robert Collins merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages. | 399 | date_str = format_date(rev.timestamp, | 
| 400 | rev.timezone or 0, | |
| 401 | self.show_timezone) | |
| 402 | print >>to_file, indent+'timestamp: %s' % date_str | |
| 403 | ||
| 404 | print >>to_file, indent+'message:' | |
| 405 | if not rev.message: | |
| 406 | print >>to_file, indent+' (no message)' | |
| 407 | else: | |
| 1185.31.20
by John Arbash Meinel Stripping trailing newlines when displaying log messages | 408 | message = rev.message.rstrip('\r\n') | 
| 409 | 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. | 410 | print >>to_file, indent+' ' + l | 
| 1185.33.41
by Martin Pool Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676) | 411 | if delta != None: | 
| 412 | delta.show(to_file, self.show_ids) | |
| 794
by Martin Pool - Merge John's nice short-log format. | 413 | |
| 414 | ||
| 415 | class ShortLogFormatter(LogFormatter): | |
| 416 | def show(self, revno, rev, delta): | |
| 417 | from bzrlib.osutils import format_date | |
| 418 | ||
| 419 | to_file = self.to_file | |
| 1185.12.25
by Aaron Bentley Added one-line log format | 420 | date_str = format_date(rev.timestamp, rev.timezone or 0, | 
| 421 | self.show_timezone) | |
| 1185.35.19
by Aaron Bentley Tweaked short-log as Meinel suggested | 422 | print >>to_file, "%5d %s\t%s" % (revno, self.short_committer(rev), | 
| 794
by Martin Pool - Merge John's nice short-log format. | 423 | format_date(rev.timestamp, rev.timezone or 0, | 
| 1185.35.19
by Aaron Bentley Tweaked short-log as Meinel suggested | 424 | self.show_timezone, date_fmt="%Y-%m-%d", | 
| 425 | show_offset=False)) | |
| 794
by Martin Pool - Merge John's nice short-log format. | 426 | if self.show_ids: | 
| 427 | print >>to_file, ' revision-id:', rev.revision_id | |
| 428 | if not rev.message: | |
| 429 | print >>to_file, ' (no message)' | |
| 430 | else: | |
| 1185.31.20
by John Arbash Meinel Stripping trailing newlines when displaying log messages | 431 | message = rev.message.rstrip('\r\n') | 
| 432 | for l in message.split('\n'): | |
| 794
by Martin Pool - Merge John's nice short-log format. | 433 | print >>to_file, ' ' + l | 
| 434 | ||
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 435 |         # TODO: Why not show the modified files in a shorter form as
 | 
| 436 |         # well? rewrap them single lines of appropriate length
 | |
| 794
by Martin Pool - Merge John's nice short-log format. | 437 | if delta != None: | 
| 438 | 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. | 439 | print >>to_file, '' | 
| 794
by Martin Pool - Merge John's nice short-log format. | 440 | |
| 1704.2.20
by Martin Pool log --line shows revision numbers (Alexander) | 441 | |
| 1185.12.25
by Aaron Bentley Added one-line log format | 442 | class LineLogFormatter(LogFormatter): | 
| 443 | def truncate(self, str, max_len): | |
| 444 | if len(str) <= max_len: | |
| 445 | return str | |
| 446 | return str[:max_len-3]+'...' | |
| 447 | ||
| 448 | def date_string(self, rev): | |
| 449 | from bzrlib.osutils import format_date | |
| 450 | return format_date(rev.timestamp, rev.timezone or 0, | |
| 451 | self.show_timezone, date_fmt="%Y-%m-%d", | |
| 452 | show_offset=False) | |
| 453 | ||
| 454 | def message(self, rev): | |
| 455 | if not rev.message: | |
| 456 | return '(no message)' | |
| 457 | else: | |
| 458 | return rev.message | |
| 459 | ||
| 460 | def show(self, revno, rev, delta): | |
| 1704.2.2
by Martin Pool Detect terminal width using ioctl | 461 | from bzrlib.osutils import terminal_width | 
| 1704.2.20
by Martin Pool log --line shows revision numbers (Alexander) | 462 | print >> self.to_file, self.log_string(revno, rev, terminal_width()-1) | 
| 1185.12.25
by Aaron Bentley Added one-line log format | 463 | |
| 1704.2.20
by Martin Pool log --line shows revision numbers (Alexander) | 464 | def log_string(self, revno, rev, max_chars): | 
| 465 | """Format log info into one string. Truncate tail of string | |
| 466 |         :param  revno:      revision number (int) or None.
 | |
| 467 |                             Revision numbers counts from 1.
 | |
| 468 |         :param  rev:        revision info object
 | |
| 469 |         :param  max_chars:  maximum length of resulting string
 | |
| 470 |         :return:            formatted truncated string
 | |
| 471 |         """
 | |
| 472 | out = [] | |
| 473 | if revno: | |
| 474 |             # show revno only when is not None
 | |
| 475 | out.append("%d:" % revno) | |
| 476 | out.append(self.truncate(self.short_committer(rev), 20)) | |
| 1185.12.25
by Aaron Bentley Added one-line log format | 477 | out.append(self.date_string(rev)) | 
| 1740.2.5
by Aaron Bentley Merge from bzr.dev | 478 | out.append(rev.get_summary()) | 
| 1185.12.25
by Aaron Bentley Added one-line log format | 479 | return self.truncate(" ".join(out).rstrip('\n'), max_chars) | 
| 794
by Martin Pool - Merge John's nice short-log format. | 480 | |
| 1704.2.20
by Martin Pool log --line shows revision numbers (Alexander) | 481 | |
| 1185.12.27
by Aaron Bentley Use line log for pending merges | 482 | def line_log(rev, max_chars): | 
| 483 | lf = LineLogFormatter(None) | |
| 1704.2.20
by Martin Pool log --line shows revision numbers (Alexander) | 484 | return lf.log_string(None, rev, max_chars) | 
| 1185.12.27
by Aaron Bentley Use line log for pending merges | 485 | |
| 1553.2.4
by Erik Bågfors Support for setting the default log format at a configuration option | 486 | FORMATTERS = { | 
| 1553.2.1
by Erik Bågfors Support for plugins to register log formatters and set default formatter | 487 | 'long': LongLogFormatter, | 
| 794
by Martin Pool - Merge John's nice short-log format. | 488 | 'short': ShortLogFormatter, | 
| 1185.12.25
by Aaron Bentley Added one-line log format | 489 | 'line': LineLogFormatter, | 
| 794
by Martin Pool - Merge John's nice short-log format. | 490 |               }
 | 
| 491 | ||
| 1553.2.1
by Erik Bågfors Support for plugins to register log formatters and set default formatter | 492 | def register_formatter(name, formatter): | 
| 493 | FORMATTERS[name] = formatter | |
| 494 | ||
| 794
by Martin Pool - Merge John's nice short-log format. | 495 | def log_formatter(name, *args, **kwargs): | 
| 1393.1.56
by Martin Pool - doc and small refactoring of log code | 496 | """Construct a formatter from arguments. | 
| 497 | ||
| 1185.12.27
by Aaron Bentley Use line log for pending merges | 498 |     name -- Name of the formatter to construct; currently 'long', 'short' and
 | 
| 499 |         'line' are supported.
 | |
| 1393.1.56
by Martin Pool - doc and small refactoring of log code | 500 |     """
 | 
| 794
by Martin Pool - Merge John's nice short-log format. | 501 | from bzrlib.errors import BzrCommandError | 
| 502 | try: | |
| 503 | return FORMATTERS[name](*args, **kwargs) | |
| 1553.2.2
by Erik Bågfors Made "unknown log formatter" error message work | 504 | except KeyError: | 
| 794
by Martin Pool - Merge John's nice short-log format. | 505 | raise BzrCommandError("unknown log formatter: %r" % name) | 
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 506 | |
| 507 | def show_one_log(revno, rev, delta, verbose, to_file, show_timezone): | |
| 1759.2.1
by Jelmer Vernooij Fix some types (found using aspell). | 508 |     # deprecated; for compatibility
 | 
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 509 | lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone) | 
| 510 | lf.show(revno, rev, delta) | |
| 1185.32.2
by John Arbash Meinel Refactor pull --verbose into a log.py function, add tests. | 511 | |
| 512 | def show_changed_revisions(branch, old_rh, new_rh, to_file=None, log_format='long'): | |
| 513 | """Show the change in revision history comparing the old revision history to the new one. | |
| 514 | ||
| 515 |     :param branch: The branch where the revisions exist
 | |
| 516 |     :param old_rh: The old revision history
 | |
| 517 |     :param new_rh: The new revision history
 | |
| 518 |     :param to_file: A file to write the results to. If None, stdout will be used
 | |
| 519 |     """
 | |
| 520 | if to_file is None: | |
| 521 | import sys | |
| 522 | import codecs | |
| 523 | import bzrlib | |
| 524 | to_file = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace') | |
| 525 | lf = log_formatter(log_format, | |
| 526 | show_ids=False, | |
| 527 | to_file=to_file, | |
| 528 | show_timezone='original') | |
| 529 | ||
| 530 |     # This is the first index which is different between
 | |
| 531 |     # old and new
 | |
| 532 | base_idx = None | |
| 533 | for i in xrange(max(len(new_rh), | |
| 534 | len(old_rh))): | |
| 535 | if (len(new_rh) <= i | |
| 536 | or len(old_rh) <= i | |
| 537 | or new_rh[i] != old_rh[i]): | |
| 538 | base_idx = i | |
| 539 |             break
 | |
| 540 | ||
| 541 | if base_idx is None: | |
| 542 | to_file.write('Nothing seems to have changed\n') | |
| 543 |         return
 | |
| 544 |     ## TODO: It might be nice to do something like show_log
 | |
| 545 |     ##       and show the merged entries. But since this is the
 | |
| 546 |     ##       removed revisions, it shouldn't be as important
 | |
| 547 | if base_idx < len(old_rh): | |
| 548 | to_file.write('*'*60) | |
| 549 | to_file.write('\nRemoved Revisions:\n') | |
| 550 | for i in range(base_idx, len(old_rh)): | |
| 1185.67.2
by Aaron Bentley Renamed Branch.storage to Branch.repository | 551 | rev = branch.repository.get_revision(old_rh[i]) | 
| 1185.32.2
by John Arbash Meinel Refactor pull --verbose into a log.py function, add tests. | 552 | lf.show(i+1, rev, None) | 
| 553 | to_file.write('*'*60) | |
| 554 | to_file.write('\n\n') | |
| 555 | if base_idx < len(new_rh): | |
| 556 | to_file.write('Added Revisions:\n') | |
| 557 | show_log(branch, | |
| 558 | lf, | |
| 559 | None, | |
| 560 | verbose=True, | |
| 561 | direction='forward', | |
| 562 | start_revision=base_idx+1, | |
| 563 | end_revision=len(new_rh), | |
| 564 | search=None) | |
| 565 |