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
 | 
|
| 
2466.12.2
by Kent Gibson
 shift log output with only merge revisions to the left margin  | 
45  | 
relative to its left-most parent, not the delta relative to the last
 | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
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  | 
||
| 
2997.1.2
by Kent Gibson
 Move all imports to top of log.py  | 
52  | 
import codecs  | 
53  | 
from itertools import (  | 
|
54  | 
izip,  | 
|
55  | 
    )
 | 
|
| 
1624.1.3
by Robert Collins
 Convert log to use the new tsort.merge_sort routine.  | 
56  | 
import re  | 
| 
2997.1.2
by Kent Gibson
 Move all imports to top of log.py  | 
57  | 
import sys  | 
58  | 
from warnings import (  | 
|
59  | 
warn,  | 
|
60  | 
    )
 | 
|
| 
1185.33.41
by Martin Pool
 Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676)  | 
61  | 
|
| 
3535.5.1
by John Arbash Meinel
 cleanup a few imports to be lazily loaded.  | 
62  | 
from bzrlib.lazy_import import lazy_import  | 
63  | 
lazy_import(globals(), """  | 
|
64  | 
||
| 
2490.1.2
by John Arbash Meinel
 Cleanup according to PEP8 and some other small whitespace fixes  | 
65  | 
from bzrlib import (
 | 
| 
3063.3.2
by Lukáš Lalinský
 Move the name and e-mail address extraction logic to config.parse_username.  | 
66  | 
    config,
 | 
| 
3535.5.1
by John Arbash Meinel
 cleanup a few imports to be lazily loaded.  | 
67  | 
    errors,
 | 
68  | 
    repository as _mod_repository,
 | 
|
69  | 
    revision as _mod_revision,
 | 
|
70  | 
    revisionspec,
 | 
|
71  | 
    trace,
 | 
|
72  | 
    tsort,
 | 
|
73  | 
    )
 | 
|
74  | 
""")  | 
|
75  | 
||
76  | 
from bzrlib import (  | 
|
| 
2221.4.10
by Aaron Bentley
 Implement log options using RegistryOption  | 
77  | 
registry,  | 
| 
2997.1.2
by Kent Gibson
 Move all imports to top of log.py  | 
78  | 
    )
 | 
79  | 
from bzrlib.osutils import (  | 
|
80  | 
format_date,  | 
|
| 
2997.1.3
by Alexander Belchenko
 file wrapper around stdout should use terminal encoding, not user_encoding.  | 
81  | 
get_terminal_encoding,  | 
| 
2997.1.2
by Kent Gibson
 Move all imports to top of log.py  | 
82  | 
terminal_width,  | 
83  | 
    )
 | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
84  | 
|
| 
375
by Martin Pool
 - New command touching-revisions and function to trace  | 
85  | 
|
86  | 
def find_touching_revisions(branch, file_id):  | 
|
87  | 
"""Yield a description of revisions which affect the file_id.  | 
|
88  | 
||
89  | 
    Each returned element is (revno, revision_id, description)
 | 
|
90  | 
||
91  | 
    This is the list of revisions where the file is either added,
 | 
|
92  | 
    modified, renamed or deleted.
 | 
|
93  | 
||
94  | 
    TODO: Perhaps some way to limit this to only particular revisions,
 | 
|
| 
522
by Martin Pool
 todo  | 
95  | 
    or to traverse a non-mainline set of revisions?
 | 
| 
375
by Martin Pool
 - New command touching-revisions and function to trace  | 
96  | 
    """
 | 
97  | 
last_ie = None  | 
|
98  | 
last_path = None  | 
|
99  | 
revno = 1  | 
|
100  | 
for revision_id in branch.revision_history():  | 
|
| 
1185.67.2
by Aaron Bentley
 Renamed Branch.storage to Branch.repository  | 
101  | 
this_inv = branch.repository.get_revision_inventory(revision_id)  | 
| 
375
by Martin Pool
 - New command touching-revisions and function to trace  | 
102  | 
if file_id in this_inv:  | 
103  | 
this_ie = this_inv[file_id]  | 
|
104  | 
this_path = this_inv.id2path(file_id)  | 
|
105  | 
else:  | 
|
106  | 
this_ie = this_path = None  | 
|
107  | 
||
108  | 
        # now we know how it was last time, and how it is in this revision.
 | 
|
109  | 
        # are those two states effectively the same or not?
 | 
|
110  | 
||
111  | 
if not this_ie and not last_ie:  | 
|
112  | 
            # not present in either
 | 
|
113  | 
            pass
 | 
|
114  | 
elif this_ie and not last_ie:  | 
|
115  | 
yield revno, revision_id, "added " + this_path  | 
|
116  | 
elif not this_ie and last_ie:  | 
|
117  | 
            # deleted here
 | 
|
118  | 
yield revno, revision_id, "deleted " + last_path  | 
|
119  | 
elif this_path != last_path:  | 
|
120  | 
yield revno, revision_id, ("renamed %s => %s" % (last_path, this_path))  | 
|
121  | 
elif (this_ie.text_size != last_ie.text_size  | 
|
122  | 
or this_ie.text_sha1 != last_ie.text_sha1):  | 
|
123  | 
yield revno, revision_id, "modified " + this_path  | 
|
124  | 
||
125  | 
last_ie = this_ie  | 
|
126  | 
last_path = this_path  | 
|
127  | 
revno += 1  | 
|
128  | 
||
129  | 
||
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
130  | 
def _enumerate_history(branch):  | 
131  | 
rh = []  | 
|
132  | 
revno = 1  | 
|
133  | 
for rev_id in branch.revision_history():  | 
|
134  | 
rh.append((revno, rev_id))  | 
|
135  | 
revno += 1  | 
|
136  | 
return rh  | 
|
137  | 
||
138  | 
||
| 
378
by Martin Pool
 - New usage bzr log FILENAME  | 
139  | 
def show_log(branch,  | 
| 
794
by Martin Pool
 - Merge John's nice short-log format.  | 
140  | 
lf,  | 
| 
527
by Martin Pool
 - refactor log command  | 
141  | 
specific_fileid=None,  | 
| 
378
by Martin Pool
 - New usage bzr log FILENAME  | 
142  | 
verbose=False,  | 
| 
567
by Martin Pool
 - New form 'bzr log -r FROM:TO'  | 
143  | 
direction='reverse',  | 
144  | 
start_revision=None,  | 
|
| 
900
by Martin Pool
 - patch from john to search for matching commits  | 
145  | 
end_revision=None,  | 
| 
2466.9.1
by Kent Gibson
 add bzr log --limit  | 
146  | 
search=None,  | 
147  | 
limit=None):  | 
|
| 
369
by Martin Pool
 - Split out log printing into new show_log function  | 
148  | 
"""Write out human-readable log of commits to this branch.  | 
149  | 
||
| 
794
by Martin Pool
 - Merge John's nice short-log format.  | 
150  | 
    lf
 | 
151  | 
        LogFormatter object to show the output.
 | 
|
152  | 
||
| 
527
by Martin Pool
 - refactor log command  | 
153  | 
    specific_fileid
 | 
| 
378
by Martin Pool
 - New usage bzr log FILENAME  | 
154  | 
        If true, list only the commits affecting the specified
 | 
155  | 
        file, rather than all commits.
 | 
|
156  | 
||
| 
369
by Martin Pool
 - Split out log printing into new show_log function  | 
157  | 
    verbose
 | 
158  | 
        If true show added/changed/deleted/renamed files.
 | 
|
159  | 
||
| 
527
by Martin Pool
 - refactor log command  | 
160  | 
    direction
 | 
161  | 
        'reverse' (default) is latest to earliest;
 | 
|
162  | 
        'forward' is earliest to latest.
 | 
|
| 
567
by Martin Pool
 - New form 'bzr log -r FROM:TO'  | 
163  | 
|
164  | 
    start_revision
 | 
|
165  | 
        If not None, only show revisions >= start_revision
 | 
|
166  | 
||
167  | 
    end_revision
 | 
|
168  | 
        If not None, only show revisions <= end_revision
 | 
|
| 
2466.9.1
by Kent Gibson
 add bzr log --limit  | 
169  | 
|
170  | 
    search
 | 
|
171  | 
        If not None, only show revisions with matching commit messages
 | 
|
172  | 
||
173  | 
    limit
 | 
|
174  | 
        If not None or 0, only show limit revisions
 | 
|
| 
369
by Martin Pool
 - Split out log printing into new show_log function  | 
175  | 
    """
 | 
| 
1417.1.7
by Robert Collins
 teach log it needs a read lock  | 
176  | 
branch.lock_read()  | 
177  | 
try:  | 
|
| 
2466.8.2
by Kent Gibson
 Move begin/end calls from _show_log to show_log. Fix long line.  | 
178  | 
if getattr(lf, 'begin_log', None):  | 
179  | 
lf.begin_log()  | 
|
180  | 
||
| 
1756.1.6
by Aaron Bentley
 Revert locking fix  | 
181  | 
_show_log(branch, lf, specific_fileid, verbose, direction,  | 
| 
2466.9.1
by Kent Gibson
 add bzr log --limit  | 
182  | 
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.  | 
183  | 
|
184  | 
if getattr(lf, 'end_log', None):  | 
|
185  | 
lf.end_log()  | 
|
| 
1417.1.7
by Robert Collins
 teach log it needs a read lock  | 
186  | 
finally:  | 
187  | 
branch.unlock()  | 
|
| 
2490.1.2
by John Arbash Meinel
 Cleanup according to PEP8 and some other small whitespace fixes  | 
188  | 
|
| 
3302.1.1
by Aaron Bentley
 Split out _iter_revision, allow view_revisions to be an iterator  | 
189  | 
|
| 
1417.1.7
by Robert Collins
 teach log it needs a read lock  | 
190  | 
def _show_log(branch,  | 
191  | 
lf,  | 
|
192  | 
specific_fileid=None,  | 
|
193  | 
verbose=False,  | 
|
194  | 
direction='reverse',  | 
|
195  | 
start_revision=None,  | 
|
196  | 
end_revision=None,  | 
|
| 
2466.9.1
by Kent Gibson
 add bzr log --limit  | 
197  | 
search=None,  | 
198  | 
limit=None):  | 
|
| 
1417.1.7
by Robert Collins
 teach log it needs a read lock  | 
199  | 
"""Worker function for show_log - see show_log."""  | 
| 
794
by Martin Pool
 - Merge John's nice short-log format.  | 
200  | 
if not isinstance(lf, LogFormatter):  | 
201  | 
warn("not a LogFormatter instance: %r" % lf)  | 
|
| 
533
by Martin Pool
 - fix up asking for the log for the root of a remote branch  | 
202  | 
|
203  | 
if specific_fileid:  | 
|
| 
3535.5.1
by John Arbash Meinel
 cleanup a few imports to be lazily loaded.  | 
204  | 
trace.mutter('get log for file_id %r', specific_fileid)  | 
| 
3302.1.2
by Aaron Bentley
 Split out the major view_revision calculation logic  | 
205  | 
generate_merge_revisions = getattr(lf, 'supports_merge_revisions', False)  | 
206  | 
allow_single_merge_revision = getattr(lf,  | 
|
207  | 
'supports_single_merge_revision', False)  | 
|
208  | 
view_revisions = calculate_view_revisions(branch, start_revision,  | 
|
209  | 
end_revision, direction,  | 
|
210  | 
specific_fileid,  | 
|
211  | 
generate_merge_revisions,  | 
|
212  | 
allow_single_merge_revision)  | 
|
213  | 
rev_tag_dict = {}  | 
|
214  | 
generate_tags = getattr(lf, 'supports_tags', False)  | 
|
215  | 
if generate_tags:  | 
|
216  | 
if branch.supports_tags():  | 
|
217  | 
rev_tag_dict = branch.tags.get_reverse_tag_dict()  | 
|
218  | 
||
219  | 
generate_delta = verbose and getattr(lf, 'supports_delta', False)  | 
|
220  | 
||
221  | 
    # now we just print all the revisions
 | 
|
222  | 
log_count = 0  | 
|
| 
3642.1.5
by Robert Collins
 Separate out batching of revisions.  | 
223  | 
revision_iterator = make_log_rev_iterator(branch, view_revisions,  | 
224  | 
generate_delta, search)  | 
|
| 
3642.1.2
by Robert Collins
 Setup a log iterator that more closely matches what the code tries to do with repository operations.  | 
225  | 
for revs in revision_iterator:  | 
226  | 
for (rev_id, revno, merge_depth), rev, delta in revs:  | 
|
227  | 
lr = LogRevision(rev, revno, merge_depth, delta,  | 
|
228  | 
rev_tag_dict.get(rev_id))  | 
|
229  | 
lf.log_revision(lr)  | 
|
230  | 
if limit:  | 
|
231  | 
log_count += 1  | 
|
232  | 
if log_count >= limit:  | 
|
233  | 
                    break
 | 
|
| 
3302.1.2
by Aaron Bentley
 Split out the major view_revision calculation logic  | 
234  | 
|
235  | 
||
236  | 
def calculate_view_revisions(branch, start_revision, end_revision, direction,  | 
|
237  | 
specific_fileid, generate_merge_revisions,  | 
|
238  | 
allow_single_merge_revision):  | 
|
| 
3302.1.3
by Aaron Bentley
 Add optimization of the simple case of generating view revisions  | 
239  | 
if (not generate_merge_revisions and start_revision is end_revision is  | 
240  | 
None and direction == 'reverse' and specific_fileid is None):  | 
|
241  | 
return _linear_view_revisions(branch)  | 
|
242  | 
||
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
243  | 
mainline_revs, rev_nos, start_rev_id, end_rev_id = \  | 
244  | 
_get_mainline_revs(branch, start_revision, end_revision)  | 
|
245  | 
if not mainline_revs:  | 
|
| 
3302.1.2
by Aaron Bentley
 Split out the major view_revision calculation logic  | 
246  | 
return []  | 
| 
1756.2.18
by Aaron Bentley
 Factor out the revision list generation  | 
247  | 
|
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
248  | 
if direction == 'reverse':  | 
249  | 
start_rev_id, end_rev_id = end_rev_id, start_rev_id  | 
|
| 
3302.1.2
by Aaron Bentley
 Split out the major view_revision calculation logic  | 
250  | 
|
| 
2997.1.1
by Kent Gibson
 Support logging single merge revisions with short and line log formatters.  | 
251  | 
generate_single_revision = False  | 
| 
2985.1.1
by Aaron Bentley
 Better behavior when user requests a log that cannot be viewed (Kent Gibson)  | 
252  | 
if ((not generate_merge_revisions)  | 
| 
2978.3.2
by Kent Gibson
 Use in rather than has_key  | 
253  | 
and ((start_rev_id and (start_rev_id not in rev_nos))  | 
254  | 
or (end_rev_id and (end_rev_id not in rev_nos)))):  | 
|
| 
2997.1.1
by Kent Gibson
 Support logging single merge revisions with short and line log formatters.  | 
255  | 
generate_single_revision = ((start_rev_id == end_rev_id)  | 
| 
3302.1.2
by Aaron Bentley
 Split out the major view_revision calculation logic  | 
256  | 
and allow_single_merge_revision)  | 
| 
2997.1.1
by Kent Gibson
 Support logging single merge revisions with short and line log formatters.  | 
257  | 
if not generate_single_revision:  | 
| 
3535.5.1
by John Arbash Meinel
 cleanup a few imports to be lazily loaded.  | 
258  | 
raise errors.BzrCommandError('Selected log formatter only supports'  | 
259  | 
' mainline revisions.')  | 
|
| 
2997.1.1
by Kent Gibson
 Support logging single merge revisions with short and line log formatters.  | 
260  | 
generate_merge_revisions = generate_single_revision  | 
| 
2359.1.1
by Kent Gibson
 Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster.  | 
261  | 
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.  | 
262  | 
direction, include_merges=generate_merge_revisions)  | 
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
263  | 
view_revisions = _filter_revision_range(list(view_revs_iter),  | 
264  | 
start_rev_id,  | 
|
265  | 
end_rev_id)  | 
|
| 
2997.1.1
by Kent Gibson
 Support logging single merge revisions with short and line log formatters.  | 
266  | 
if view_revisions and generate_single_revision:  | 
267  | 
view_revisions = view_revisions[0:1]  | 
|
| 
2359.1.1
by Kent Gibson
 Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster.  | 
268  | 
if specific_fileid:  | 
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
269  | 
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.  | 
270  | 
specific_fileid,  | 
271  | 
mainline_revs,  | 
|
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
272  | 
view_revisions)  | 
| 
2388.1.11
by Alexander Belchenko
 changes after John's review  | 
273  | 
|
| 
2466.12.2
by Kent Gibson
 shift log output with only merge revisions to the left margin  | 
274  | 
    # rebase merge_depth - unless there are no revisions or 
 | 
275  | 
    # either the first or last revision have merge_depth = 0.
 | 
|
276  | 
if view_revisions and view_revisions[0][2] and view_revisions[-1][2]:  | 
|
| 
2466.12.3
by Kent Gibson
 Fix JAM's review comments for left align patch  | 
277  | 
min_depth = min([d for r,n,d in view_revisions])  | 
278  | 
if min_depth != 0:  | 
|
| 
2466.12.2
by Kent Gibson
 shift log output with only merge revisions to the left margin  | 
279  | 
view_revisions = [(r,n,d-min_depth) for r,n,d in view_revisions]  | 
| 
3302.1.2
by Aaron Bentley
 Split out the major view_revision calculation logic  | 
280  | 
return view_revisions  | 
| 
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.  | 
281  | 
|
| 
530
by Martin Pool
 - put back verbose log support for reversed logs  | 
282  | 
|
| 
3302.1.3
by Aaron Bentley
 Add optimization of the simple case of generating view revisions  | 
283  | 
def _linear_view_revisions(branch):  | 
284  | 
start_revno, start_revision_id = branch.last_revision_info()  | 
|
285  | 
repo = branch.repository  | 
|
286  | 
revision_ids = repo.iter_reverse_revision_history(start_revision_id)  | 
|
287  | 
for num, revision_id in enumerate(revision_ids):  | 
|
| 
3302.1.4
by Aaron Bentley
 Return revno as a string  | 
288  | 
yield revision_id, str(start_revno - num), 0  | 
| 
3302.1.3
by Aaron Bentley
 Add optimization of the simple case of generating view revisions  | 
289  | 
|
290  | 
||
| 
3642.1.1
by Robert Collins
 Refactoring in log towards more pluggable revision selection.  | 
291  | 
def make_log_rev_iterator(branch, view_revisions, generate_delta, search):  | 
292  | 
"""Create a revision iterator for log.  | 
|
293  | 
||
294  | 
    :param branch: The branch being logged.
 | 
|
295  | 
    :param view_revisions: The revisions being viewed.
 | 
|
296  | 
    :param generate_delta: Whether to generate a delta for each revision.
 | 
|
297  | 
    :param search: A user text search string.
 | 
|
| 
3642.1.7
by Robert Collins
 Review feedback.  | 
298  | 
    :return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
 | 
| 
3642.1.2
by Robert Collins
 Setup a log iterator that more closely matches what the code tries to do with repository operations.  | 
299  | 
        delta).
 | 
| 
3642.1.1
by Robert Collins
 Refactoring in log towards more pluggable revision selection.  | 
300  | 
    """
 | 
| 
3642.1.5
by Robert Collins
 Separate out batching of revisions.  | 
301  | 
    # Convert view_revisions into (view, None, None) groups to fit with
 | 
302  | 
    # the standard interface here.
 | 
|
303  | 
if type(view_revisions) == list:  | 
|
| 
3642.1.7
by Robert Collins
 Review feedback.  | 
304  | 
        # A single batch conversion is faster than many incremental ones.
 | 
305  | 
        # As we have all the data, do a batch conversion.
 | 
|
| 
3642.1.5
by Robert Collins
 Separate out batching of revisions.  | 
306  | 
nones = [None] * len(view_revisions)  | 
307  | 
log_rev_iterator = iter([zip(view_revisions, nones, nones)])  | 
|
308  | 
else:  | 
|
309  | 
def _convert():  | 
|
310  | 
for view in view_revisions:  | 
|
311  | 
yield (view, None, None)  | 
|
312  | 
log_rev_iterator = iter([_convert()])  | 
|
| 
3642.1.6
by Robert Collins
 Make log revision filtering pluggable.  | 
313  | 
for adapter in log_adapters:  | 
314  | 
log_rev_iterator = adapter(branch, generate_delta, search,  | 
|
315  | 
log_rev_iterator)  | 
|
| 
3642.1.1
by Robert Collins
 Refactoring in log towards more pluggable revision selection.  | 
316  | 
return log_rev_iterator  | 
317  | 
||
318  | 
||
| 
3642.1.7
by Robert Collins
 Review feedback.  | 
319  | 
def _make_search_filter(branch, generate_delta, search, log_rev_iterator):  | 
| 
3642.1.1
by Robert Collins
 Refactoring in log towards more pluggable revision selection.  | 
320  | 
"""Create a filtered iterator of log_rev_iterator matching on a regex.  | 
321  | 
||
322  | 
    :param branch: The branch being logged.
 | 
|
323  | 
    :param generate_delta: Whether to generate a delta for each revision.
 | 
|
324  | 
    :param search: A user text search string.
 | 
|
325  | 
    :param log_rev_iterator: An input iterator containing all revisions that
 | 
|
| 
3642.1.2
by Robert Collins
 Setup a log iterator that more closely matches what the code tries to do with repository operations.  | 
326  | 
        could be displayed, in lists.
 | 
| 
3642.1.7
by Robert Collins
 Review feedback.  | 
327  | 
    :return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
 | 
| 
3642.1.2
by Robert Collins
 Setup a log iterator that more closely matches what the code tries to do with repository operations.  | 
328  | 
        delta).
 | 
| 
3642.1.1
by Robert Collins
 Refactoring in log towards more pluggable revision selection.  | 
329  | 
    """
 | 
330  | 
if search is None:  | 
|
331  | 
return log_rev_iterator  | 
|
332  | 
    # Compile the search now to get early errors.
 | 
|
333  | 
searchRE = re.compile(search, re.IGNORECASE)  | 
|
334  | 
return _filter_message_re(searchRE, log_rev_iterator)  | 
|
335  | 
||
336  | 
||
337  | 
def _filter_message_re(searchRE, log_rev_iterator):  | 
|
| 
3642.1.2
by Robert Collins
 Setup a log iterator that more closely matches what the code tries to do with repository operations.  | 
338  | 
for revs in log_rev_iterator:  | 
| 
3642.1.3
by Robert Collins
 Split out delta generation from revision content reading, and structure it after message evaluation, increasing performance of log -v -m.  | 
339  | 
new_revs = []  | 
| 
3642.1.2
by Robert Collins
 Setup a log iterator that more closely matches what the code tries to do with repository operations.  | 
340  | 
for (rev_id, revno, merge_depth), rev, delta in revs:  | 
341  | 
if searchRE.search(rev.message):  | 
|
| 
3642.1.3
by Robert Collins
 Split out delta generation from revision content reading, and structure it after message evaluation, increasing performance of log -v -m.  | 
342  | 
new_revs.append(((rev_id, revno, merge_depth), rev, delta))  | 
343  | 
yield new_revs  | 
|
344  | 
||
345  | 
||
| 
3642.1.7
by Robert Collins
 Review feedback.  | 
346  | 
def _make_delta_filter(branch, generate_delta, search, log_rev_iterator):  | 
| 
3642.1.3
by Robert Collins
 Split out delta generation from revision content reading, and structure it after message evaluation, increasing performance of log -v -m.  | 
347  | 
"""Add revision deltas to a log iterator if needed.  | 
348  | 
||
349  | 
    :param branch: The branch being logged.
 | 
|
350  | 
    :param generate_delta: Whether to generate a delta for each revision.
 | 
|
351  | 
    :param search: A user text search string.
 | 
|
352  | 
    :param log_rev_iterator: An input iterator containing all revisions that
 | 
|
353  | 
        could be displayed, in lists.
 | 
|
| 
3642.1.7
by Robert Collins
 Review feedback.  | 
354  | 
    :return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
 | 
| 
3642.1.3
by Robert Collins
 Split out delta generation from revision content reading, and structure it after message evaluation, increasing performance of log -v -m.  | 
355  | 
        delta).
 | 
356  | 
    """
 | 
|
357  | 
if not generate_delta:  | 
|
358  | 
return log_rev_iterator  | 
|
359  | 
return _generate_deltas(branch.repository, log_rev_iterator)  | 
|
360  | 
||
361  | 
||
362  | 
def _generate_deltas(repository, log_rev_iterator):  | 
|
| 
3642.1.7
by Robert Collins
 Review feedback.  | 
363  | 
"""Create deltas for each batch of revisions in log_rev_iterator."""  | 
| 
3642.1.3
by Robert Collins
 Split out delta generation from revision content reading, and structure it after message evaluation, increasing performance of log -v -m.  | 
364  | 
for revs in log_rev_iterator:  | 
365  | 
revisions = [rev[1] for rev in revs]  | 
|
366  | 
deltas = repository.get_deltas_for_revisions(revisions)  | 
|
367  | 
revs = [(rev[0], rev[1], delta) for rev, delta in izip(revs, deltas)]  | 
|
368  | 
yield revs  | 
|
| 
3642.1.2
by Robert Collins
 Setup a log iterator that more closely matches what the code tries to do with repository operations.  | 
369  | 
|
370  | 
||
| 
3642.1.7
by Robert Collins
 Review feedback.  | 
371  | 
def _make_revision_objects(branch, generate_delta, search, log_rev_iterator):  | 
| 
3642.1.4
by Robert Collins
 Factor out revision object extraction from revision batching.  | 
372  | 
"""Extract revision objects from the repository  | 
373  | 
||
374  | 
    :param branch: The branch being logged.
 | 
|
375  | 
    :param generate_delta: Whether to generate a delta for each revision.
 | 
|
376  | 
    :param search: A user text search string.
 | 
|
377  | 
    :param log_rev_iterator: An input iterator containing all revisions that
 | 
|
378  | 
        could be displayed, in lists.
 | 
|
| 
3642.1.7
by Robert Collins
 Review feedback.  | 
379  | 
    :return: An iterator over lists of ((rev_id, revno, merge_depth), rev,
 | 
| 
3642.1.4
by Robert Collins
 Factor out revision object extraction from revision batching.  | 
380  | 
        delta).
 | 
381  | 
    """
 | 
|
| 
3642.1.5
by Robert Collins
 Separate out batching of revisions.  | 
382  | 
repository = branch.repository  | 
| 
3642.1.4
by Robert Collins
 Factor out revision object extraction from revision batching.  | 
383  | 
for revs in log_rev_iterator:  | 
384  | 
        # r = revision_id, n = revno, d = merge depth
 | 
|
385  | 
revision_ids = [view[0] for view, _, _ in revs]  | 
|
386  | 
revisions = repository.get_revisions(revision_ids)  | 
|
387  | 
revs = [(rev[0], revision, rev[2]) for rev, revision in  | 
|
388  | 
izip(revs, revisions)]  | 
|
389  | 
yield revs  | 
|
390  | 
||
391  | 
||
| 
3642.1.7
by Robert Collins
 Review feedback.  | 
392  | 
def _make_batch_filter(branch, generate_delta, search, log_rev_iterator):  | 
| 
3642.1.5
by Robert Collins
 Separate out batching of revisions.  | 
393  | 
"""Group up a single large batch into smaller ones.  | 
| 
3642.1.2
by Robert Collins
 Setup a log iterator that more closely matches what the code tries to do with repository operations.  | 
394  | 
|
395  | 
    :param branch: The branch being logged.
 | 
|
396  | 
    :param generate_delta: Whether to generate a delta for each revision.
 | 
|
397  | 
    :param search: A user text search string.
 | 
|
| 
3642.1.5
by Robert Collins
 Separate out batching of revisions.  | 
398  | 
    :param log_rev_iterator: An input iterator containing all revisions that
 | 
399  | 
        could be displayed, in lists.
 | 
|
| 
3642.1.7
by Robert Collins
 Review feedback.  | 
400  | 
    :return: An iterator over lists of ((rev_id, revno, merge_depth), rev, delta).
 | 
| 
3642.1.2
by Robert Collins
 Setup a log iterator that more closely matches what the code tries to do with repository operations.  | 
401  | 
    """
 | 
402  | 
repository = branch.repository  | 
|
| 
3302.1.1
by Aaron Bentley
 Split out _iter_revision, allow view_revisions to be an iterator  | 
403  | 
num = 9  | 
| 
3642.1.5
by Robert Collins
 Separate out batching of revisions.  | 
404  | 
for batch in log_rev_iterator:  | 
405  | 
batch = iter(batch)  | 
|
406  | 
while True:  | 
|
407  | 
step = [detail for _, detail in zip(range(num), batch)]  | 
|
408  | 
if len(step) == 0:  | 
|
409  | 
                break
 | 
|
410  | 
yield step  | 
|
411  | 
num = min(int(num * 1.5), 200)  | 
|
| 
3302.1.1
by Aaron Bentley
 Split out _iter_revision, allow view_revisions to be an iterator  | 
412  | 
|
413  | 
||
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
414  | 
def _get_mainline_revs(branch, start_revision, end_revision):  | 
415  | 
"""Get the mainline revisions from the branch.  | 
|
416  | 
    
 | 
|
417  | 
    Generates the list of mainline revisions for the branch.
 | 
|
418  | 
    
 | 
|
419  | 
    :param  branch: The branch containing the revisions. 
 | 
|
420  | 
||
421  | 
    :param  start_revision: The first revision to be logged.
 | 
|
422  | 
            For backwards compatibility this may be a mainline integer revno,
 | 
|
423  | 
            but for merge revision support a RevisionInfo is expected.
 | 
|
424  | 
||
425  | 
    :param  end_revision: The last revision to be logged.
 | 
|
426  | 
            For backwards compatibility this may be a mainline integer revno,
 | 
|
427  | 
            but for merge revision support a RevisionInfo is expected.
 | 
|
428  | 
||
429  | 
    :return: A (mainline_revs, rev_nos, start_rev_id, end_rev_id) tuple.
 | 
|
430  | 
    """
 | 
|
| 
3449.2.1
by John Arbash Meinel
 bzr uncommit doesn't need to work in terms of 'revision_history()'  | 
431  | 
branch_revno, branch_last_revision = branch.last_revision_info()  | 
432  | 
if branch_revno == 0:  | 
|
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
433  | 
return None, None, None, None  | 
434  | 
||
435  | 
    # For mainline generation, map start_revision and end_revision to 
 | 
|
436  | 
    # mainline revnos. If the revision is not on the mainline choose the 
 | 
|
437  | 
    # appropriate extreme of the mainline instead - the extra will be 
 | 
|
438  | 
    # filtered later.
 | 
|
439  | 
    # Also map the revisions to rev_ids, to be used in the later filtering
 | 
|
440  | 
    # stage.
 | 
|
441  | 
start_rev_id = None  | 
|
442  | 
if start_revision is None:  | 
|
443  | 
start_revno = 1  | 
|
444  | 
else:  | 
|
| 
3535.5.1
by John Arbash Meinel
 cleanup a few imports to be lazily loaded.  | 
445  | 
if isinstance(start_revision, revisionspec.RevisionInfo):  | 
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
446  | 
start_rev_id = start_revision.rev_id  | 
447  | 
start_revno = start_revision.revno or 1  | 
|
448  | 
else:  | 
|
449  | 
branch.check_real_revno(start_revision)  | 
|
450  | 
start_revno = start_revision  | 
|
451  | 
||
452  | 
end_rev_id = None  | 
|
453  | 
if end_revision is None:  | 
|
| 
3449.2.5
by John Arbash Meinel
 Stop referencing the variable I removed.  | 
454  | 
end_revno = branch_revno  | 
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
455  | 
else:  | 
| 
3535.5.1
by John Arbash Meinel
 cleanup a few imports to be lazily loaded.  | 
456  | 
if isinstance(end_revision, revisionspec.RevisionInfo):  | 
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
457  | 
end_rev_id = end_revision.rev_id  | 
| 
3449.2.5
by John Arbash Meinel
 Stop referencing the variable I removed.  | 
458  | 
end_revno = end_revision.revno or branch_revno  | 
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
459  | 
else:  | 
460  | 
branch.check_real_revno(end_revision)  | 
|
461  | 
end_revno = end_revision  | 
|
462  | 
||
| 
3535.5.1
by John Arbash Meinel
 cleanup a few imports to be lazily loaded.  | 
463  | 
if ((start_rev_id == _mod_revision.NULL_REVISION)  | 
464  | 
or (end_rev_id == _mod_revision.NULL_REVISION)):  | 
|
465  | 
raise errors.BzrCommandError('Logging revision 0 is invalid.')  | 
|
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
466  | 
if start_revno > end_revno:  | 
| 
3535.5.1
by John Arbash Meinel
 cleanup a few imports to be lazily loaded.  | 
467  | 
raise errors.BzrCommandError("Start revision must be older than "  | 
468  | 
"the end revision.")  | 
|
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
469  | 
|
| 
3449.2.7
by John Arbash Meinel
 Minor tweak from Ian  | 
470  | 
if end_revno < start_revno:  | 
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
471  | 
return None, None, None, None  | 
| 
3449.2.1
by John Arbash Meinel
 bzr uncommit doesn't need to work in terms of 'revision_history()'  | 
472  | 
cur_revno = branch_revno  | 
473  | 
rev_nos = {}  | 
|
474  | 
mainline_revs = []  | 
|
475  | 
for revision_id in branch.repository.iter_reverse_revision_history(  | 
|
476  | 
branch_last_revision):  | 
|
477  | 
if cur_revno < start_revno:  | 
|
| 
3449.2.2
by John Arbash Meinel
 Fix bug #172649. Cleanup, and handle the case where we are logging to the first revision.  | 
478  | 
            # We have gone far enough, but we always add 1 more revision
 | 
| 
3449.2.1
by John Arbash Meinel
 bzr uncommit doesn't need to work in terms of 'revision_history()'  | 
479  | 
rev_nos[revision_id] = cur_revno  | 
480  | 
mainline_revs.append(revision_id)  | 
|
481  | 
            break
 | 
|
482  | 
if cur_revno <= end_revno:  | 
|
483  | 
rev_nos[revision_id] = cur_revno  | 
|
484  | 
mainline_revs.append(revision_id)  | 
|
485  | 
cur_revno -= 1  | 
|
| 
3449.2.2
by John Arbash Meinel
 Fix bug #172649. Cleanup, and handle the case where we are logging to the first revision.  | 
486  | 
else:  | 
487  | 
        # We walked off the edge of all revisions, so we add a 'None' marker
 | 
|
488  | 
mainline_revs.append(None)  | 
|
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
489  | 
|
| 
3449.2.1
by John Arbash Meinel
 bzr uncommit doesn't need to work in terms of 'revision_history()'  | 
490  | 
mainline_revs.reverse()  | 
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
491  | 
|
492  | 
    # override the mainline to look like the revision history.
 | 
|
493  | 
return mainline_revs, rev_nos, start_rev_id, end_rev_id  | 
|
494  | 
||
495  | 
||
496  | 
def _filter_revision_range(view_revisions, start_rev_id, end_rev_id):  | 
|
497  | 
"""Filter view_revisions based on revision ranges.  | 
|
498  | 
||
499  | 
    :param view_revisions: A list of (revision_id, dotted_revno, merge_depth) 
 | 
|
500  | 
            tuples to be filtered.
 | 
|
501  | 
||
502  | 
    :param start_rev_id: If not NONE specifies the first revision to be logged.
 | 
|
503  | 
            If NONE then all revisions up to the end_rev_id are logged.
 | 
|
504  | 
||
505  | 
    :param end_rev_id: If not NONE specifies the last revision to be logged.
 | 
|
506  | 
            If NONE then all revisions up to the end of the log are logged.
 | 
|
507  | 
||
508  | 
    :return: The filtered view_revisions.
 | 
|
509  | 
    """
 | 
|
510  | 
if start_rev_id or end_rev_id:  | 
|
511  | 
revision_ids = [r for r, n, d in view_revisions]  | 
|
512  | 
if start_rev_id:  | 
|
513  | 
start_index = revision_ids.index(start_rev_id)  | 
|
514  | 
else:  | 
|
515  | 
start_index = 0  | 
|
516  | 
if start_rev_id == end_rev_id:  | 
|
517  | 
end_index = start_index  | 
|
518  | 
else:  | 
|
519  | 
if end_rev_id:  | 
|
520  | 
end_index = revision_ids.index(end_rev_id)  | 
|
521  | 
else:  | 
|
522  | 
end_index = len(view_revisions) - 1  | 
|
523  | 
        # To include the revisions merged into the last revision, 
 | 
|
524  | 
        # extend end_rev_id down to, but not including, the next rev
 | 
|
525  | 
        # with the same or lesser merge_depth
 | 
|
526  | 
end_merge_depth = view_revisions[end_index][2]  | 
|
527  | 
try:  | 
|
528  | 
for index in xrange(end_index+1, len(view_revisions)+1):  | 
|
529  | 
if view_revisions[index][2] <= end_merge_depth:  | 
|
530  | 
end_index = index - 1  | 
|
531  | 
                    break
 | 
|
532  | 
except IndexError:  | 
|
533  | 
            # if the search falls off the end then log to the end as well
 | 
|
534  | 
end_index = len(view_revisions) - 1  | 
|
535  | 
view_revisions = view_revisions[start_index:end_index+1]  | 
|
536  | 
return view_revisions  | 
|
537  | 
||
538  | 
||
539  | 
def _filter_revisions_touching_file_id(branch, file_id, mainline_revisions,  | 
|
540  | 
view_revs_iter):  | 
|
| 
2359.1.4
by John Arbash Meinel
 Refactor the specific revisions for file id into a helper function.  | 
541  | 
"""Return the list of revision ids which touch a given file id.  | 
542  | 
||
| 
2466.12.1
by Kent Gibson
 Fix ``bzr log -r`` to support selecting merge revisions.  | 
543  | 
    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.  | 
544  | 
    This includes the revisions which directly change the file id,
 | 
545  | 
    and the revisions which merge these changes. So if the
 | 
|
546  | 
    revision graph is::
 | 
|
547  | 
        A
 | 
|
548  | 
        |\
 | 
|
549  | 
        B C
 | 
|
550  | 
        |/
 | 
|
551  | 
        D
 | 
|
552  | 
||
553  | 
    And 'C' changes a file, then both C and D will be returned.
 | 
|
554  | 
||
555  | 
    This will also can be restricted based on a subset of the mainline.
 | 
|
| 
2359.1.8
by John Arbash Meinel
 doc  | 
556  | 
|
557  | 
    :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.  | 
558  | 
    """
 | 
559  | 
    # find all the revisions that change the specific file
 | 
|
560  | 
    # build the ancestry of each revision in the graph
 | 
|
561  | 
    # - only listing the ancestors that change the specific file.
 | 
|
| 
3287.6.1
by Robert Collins
 * ``VersionedFile.get_graph`` is deprecated, with no replacement method.  | 
562  | 
graph = branch.repository.get_graph()  | 
563  | 
    # This asks for all mainline revisions, which means we only have to spider
 | 
|
564  | 
    # sideways, rather than depth history. That said, its still size-of-history
 | 
|
565  | 
    # and should be addressed.
 | 
|
| 
3373.5.1
by John Arbash Meinel
 bzr log bzr:// was failing at the first revision because it was trying to  | 
566  | 
    # mainline_revisions always includes an extra revision at the beginning, so
 | 
567  | 
    # don't request it.
 | 
|
| 
3287.6.8
by Robert Collins
 Reduce code duplication as per review.  | 
568  | 
parent_map = dict(((key, value) for key, value in  | 
| 
3373.5.1
by John Arbash Meinel
 bzr log bzr:// was failing at the first revision because it was trying to  | 
569  | 
graph.iter_ancestry(mainline_revisions[1:]) if value is not None))  | 
| 
3535.5.1
by John Arbash Meinel
 cleanup a few imports to be lazily loaded.  | 
570  | 
sorted_rev_list = tsort.topo_sort(parent_map.items())  | 
| 
3350.6.4
by Robert Collins
 First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.  | 
571  | 
text_keys = [(file_id, rev_id) for rev_id in sorted_rev_list]  | 
572  | 
modified_text_versions = branch.repository.texts.get_parent_map(text_keys)  | 
|
| 
2359.1.4
by John Arbash Meinel
 Refactor the specific revisions for file id into a helper function.  | 
573  | 
ancestry = {}  | 
574  | 
for rev in sorted_rev_list:  | 
|
| 
3350.6.4
by Robert Collins
 First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.  | 
575  | 
text_key = (file_id, rev)  | 
| 
3287.6.1
by Robert Collins
 * ``VersionedFile.get_graph`` is deprecated, with no replacement method.  | 
576  | 
parents = parent_map[rev]  | 
| 
3350.6.4
by Robert Collins
 First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.  | 
577  | 
if text_key not in modified_text_versions and len(parents) == 1:  | 
| 
2359.1.9
by John Arbash Meinel
 Only generate a new set when we need to. Drops 'bzr log NEWS' time from 22s => 8s  | 
578  | 
            # We will not be adding anything new, so just use a reference to
 | 
579  | 
            # the parent ancestry.
 | 
|
580  | 
rev_ancestry = ancestry[parents[0]]  | 
|
581  | 
else:  | 
|
582  | 
rev_ancestry = set()  | 
|
| 
3350.6.4
by Robert Collins
 First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.  | 
583  | 
if text_key in modified_text_versions:  | 
| 
2359.1.9
by John Arbash Meinel
 Only generate a new set when we need to. Drops 'bzr log NEWS' time from 22s => 8s  | 
584  | 
rev_ancestry.add(rev)  | 
585  | 
for parent in parents:  | 
|
| 
3373.2.1
by John Arbash Meinel
 Fix bug #209948, properly skip over ghosts when displaying the changes for a single file.  | 
586  | 
if parent not in ancestry:  | 
587  | 
                    # parent is a Ghost, which won't be present in
 | 
|
588  | 
                    # sorted_rev_list, but we may access it later, so create an
 | 
|
589  | 
                    # empty node for it
 | 
|
590  | 
ancestry[parent] = set()  | 
|
| 
2359.1.9
by John Arbash Meinel
 Only generate a new set when we need to. Drops 'bzr log NEWS' time from 22s => 8s  | 
591  | 
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.  | 
592  | 
ancestry[rev] = rev_ancestry  | 
593  | 
||
| 
2359.1.5
by John Arbash Meinel
 change some variable names to make the function a bit clearer.  | 
594  | 
def is_merging_rev(r):  | 
| 
3287.6.1
by Robert Collins
 * ``VersionedFile.get_graph`` is deprecated, with no replacement method.  | 
595  | 
parents = parent_map[r]  | 
| 
2359.1.4
by John Arbash Meinel
 Refactor the specific revisions for file id into a helper function.  | 
596  | 
if len(parents) > 1:  | 
597  | 
leftparent = parents[0]  | 
|
598  | 
for rightparent in parents[1:]:  | 
|
599  | 
if not ancestry[leftparent].issuperset(  | 
|
600  | 
ancestry[rightparent]):  | 
|
601  | 
return True  | 
|
602  | 
return False  | 
|
603  | 
||
604  | 
    # filter from the view the revisions that did not change or merge 
 | 
|
605  | 
    # the specific file
 | 
|
606  | 
return [(r, n, d) for r, n, d in view_revs_iter  | 
|
| 
3350.6.4
by Robert Collins
 First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.  | 
607  | 
if (file_id, r) in modified_text_versions or is_merging_rev(r)]  | 
| 
2359.1.4
by John Arbash Meinel
 Refactor the specific revisions for file id into a helper function.  | 
608  | 
|
609  | 
||
| 
1756.2.20
by Aaron Bentley
 Optimize log formats that don't show merges  | 
610  | 
def get_view_revisions(mainline_revs, rev_nos, branch, direction,  | 
| 
1756.2.22
by Aaron Bentley
 Apply review comments  | 
611  | 
include_merges=True):  | 
| 
1756.2.18
by Aaron Bentley
 Factor out the revision list generation  | 
612  | 
"""Produce an iterator of revisions to show  | 
613  | 
    :return: an iterator of (revision_id, revno, merge_depth)
 | 
|
614  | 
    (if there is no revno for a revision, None is supplied)
 | 
|
615  | 
    """
 | 
|
| 
1756.2.22
by Aaron Bentley
 Apply review comments  | 
616  | 
if include_merges is False:  | 
| 
1756.2.20
by Aaron Bentley
 Optimize log formats that don't show merges  | 
617  | 
revision_ids = mainline_revs[1:]  | 
618  | 
if direction == 'reverse':  | 
|
619  | 
revision_ids.reverse()  | 
|
620  | 
for revision_id in revision_ids:  | 
|
| 
1988.4.2
by Robert Collins
 ``bzr log`` Now shows dotted-decimal revision numbers for all revisions,  | 
621  | 
yield revision_id, str(rev_nos[revision_id]), 0  | 
| 
1756.2.20
by Aaron Bentley
 Optimize log formats that don't show merges  | 
622  | 
        return
 | 
| 
3287.6.1
by Robert Collins
 * ``VersionedFile.get_graph`` is deprecated, with no replacement method.  | 
623  | 
graph = branch.repository.get_graph()  | 
624  | 
    # This asks for all mainline revisions, which means we only have to spider
 | 
|
625  | 
    # sideways, rather than depth history. That said, its still size-of-history
 | 
|
626  | 
    # and should be addressed.
 | 
|
| 
3373.5.4
by John Arbash Meinel
 Track down another bogus location. Only triggered with --long  | 
627  | 
    # mainline_revisions always includes an extra revision at the beginning, so
 | 
628  | 
    # don't request it.
 | 
|
| 
3287.6.8
by Robert Collins
 Reduce code duplication as per review.  | 
629  | 
parent_map = dict(((key, value) for key, value in  | 
| 
3373.5.4
by John Arbash Meinel
 Track down another bogus location. Only triggered with --long  | 
630  | 
graph.iter_ancestry(mainline_revs[1:]) if value is not None))  | 
| 
3287.6.1
by Robert Collins
 * ``VersionedFile.get_graph`` is deprecated, with no replacement method.  | 
631  | 
    # filter out ghosts; merge_sort errors on ghosts.
 | 
| 
3535.5.1
by John Arbash Meinel
 cleanup a few imports to be lazily loaded.  | 
632  | 
rev_graph = _mod_repository._strip_NULL_ghosts(parent_map)  | 
633  | 
merge_sorted_revisions = tsort.merge_sort(  | 
|
| 
3287.6.1
by Robert Collins
 * ``VersionedFile.get_graph`` is deprecated, with no replacement method.  | 
634  | 
rev_graph,  | 
| 
1756.2.18
by Aaron Bentley
 Factor out the revision list generation  | 
635  | 
mainline_revs[-1],  | 
| 
1988.4.2
by Robert Collins
 ``bzr log`` Now shows dotted-decimal revision numbers for all revisions,  | 
636  | 
mainline_revs,  | 
637  | 
generate_revno=True)  | 
|
| 
1756.2.18
by Aaron Bentley
 Factor out the revision list generation  | 
638  | 
|
639  | 
if direction == 'forward':  | 
|
640  | 
        # forward means oldest first.
 | 
|
| 
1756.2.25
by Aaron Bentley
 Sort revisions at each depth, instead of just mainline revisions.  | 
641  | 
merge_sorted_revisions = reverse_by_depth(merge_sorted_revisions)  | 
| 
1756.2.18
by Aaron Bentley
 Factor out the revision list generation  | 
642  | 
elif direction != 'reverse':  | 
643  | 
raise ValueError('invalid direction %r' % direction)  | 
|
644  | 
||
| 
1988.4.2
by Robert Collins
 ``bzr log`` Now shows dotted-decimal revision numbers for all revisions,  | 
645  | 
for sequence, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:  | 
646  | 
yield rev_id, '.'.join(map(str, revno)), merge_depth  | 
|
| 
1756.2.18
by Aaron Bentley
 Factor out the revision list generation  | 
647  | 
|
648  | 
||
| 
1756.2.25
by Aaron Bentley
 Sort revisions at each depth, instead of just mainline revisions.  | 
649  | 
def reverse_by_depth(merge_sorted_revisions, _depth=0):  | 
650  | 
"""Reverse revisions by depth.  | 
|
| 
1756.2.24
by Aaron Bentley
 Forward sorting shows merges under mainline revision  | 
651  | 
|
| 
1756.2.25
by Aaron Bentley
 Sort revisions at each depth, instead of just mainline revisions.  | 
652  | 
    Revisions with a different depth are sorted as a group with the previous
 | 
653  | 
    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  | 
654  | 
    but it looks much nicer.
 | 
655  | 
    """
 | 
|
656  | 
zd_revisions = []  | 
|
657  | 
for val in merge_sorted_revisions:  | 
|
| 
1756.2.25
by Aaron Bentley
 Sort revisions at each depth, instead of just mainline revisions.  | 
658  | 
if val[2] == _depth:  | 
| 
1756.2.24
by Aaron Bentley
 Forward sorting shows merges under mainline revision  | 
659  | 
zd_revisions.append([val])  | 
660  | 
else:  | 
|
661  | 
zd_revisions[-1].append(val)  | 
|
| 
1756.2.25
by Aaron Bentley
 Sort revisions at each depth, instead of just mainline revisions.  | 
662  | 
for revisions in zd_revisions:  | 
663  | 
if len(revisions) > 1:  | 
|
664  | 
revisions[1:] = reverse_by_depth(revisions[1:], _depth + 1)  | 
|
| 
1756.2.24
by Aaron Bentley
 Forward sorting shows merges under mainline revision  | 
665  | 
zd_revisions.reverse()  | 
666  | 
result = []  | 
|
667  | 
for chunk in zd_revisions:  | 
|
668  | 
result.extend(chunk)  | 
|
669  | 
return result  | 
|
670  | 
||
671  | 
||
| 
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.  | 
672  | 
class LogRevision(object):  | 
673  | 
"""A revision to be logged (by LogFormatter.log_revision).  | 
|
674  | 
||
675  | 
    A simple wrapper for the attributes of a revision to be logged.
 | 
|
676  | 
    The attributes may or may not be populated, as determined by the 
 | 
|
677  | 
    logging options and the log formatter capabilities.
 | 
|
678  | 
    """
 | 
|
679  | 
||
| 
2490.1.2
by John Arbash Meinel
 Cleanup according to PEP8 and some other small whitespace fixes  | 
680  | 
def __init__(self, rev=None, revno=None, merge_depth=0, delta=None,  | 
681  | 
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.  | 
682  | 
self.rev = rev  | 
683  | 
self.revno = revno  | 
|
684  | 
self.merge_depth = merge_depth  | 
|
685  | 
self.delta = delta  | 
|
686  | 
self.tags = tags  | 
|
687  | 
||
688  | 
||
| 
794
by Martin Pool
 - Merge John's nice short-log format.  | 
689  | 
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.  | 
690  | 
"""Abstract class to display log messages.  | 
691  | 
||
692  | 
    At a minimum, a derived class must implement the log_revision method.
 | 
|
693  | 
||
694  | 
    If the LogFormatter needs to be informed of the beginning or end of
 | 
|
695  | 
    a log it should implement the begin_log and/or end_log hook methods.
 | 
|
696  | 
||
697  | 
    A LogFormatter should define the following supports_XXX flags 
 | 
|
698  | 
    to indicate which LogRevision attributes it supports:
 | 
|
699  | 
||
700  | 
    - supports_delta must be True if this log formatter supports delta.
 | 
|
701  | 
        Otherwise the delta attribute may not be populated.
 | 
|
702  | 
    - supports_merge_revisions must be True if this log formatter supports 
 | 
|
| 
2997.1.1
by Kent Gibson
 Support logging single merge revisions with short and line log formatters.  | 
703  | 
        merge revisions.  If not, and if supports_single_merge_revisions is
 | 
704  | 
        also not True, then only mainline revisions will be passed to the 
 | 
|
705  | 
        formatter.
 | 
|
706  | 
    - supports_single_merge_revision must be True if this log formatter
 | 
|
707  | 
        supports logging only a single merge revision.  This flag is
 | 
|
708  | 
        only relevant if supports_merge_revisions is not True.
 | 
|
| 
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.  | 
709  | 
    - supports_tags must be True if this log formatter supports tags.
 | 
710  | 
        Otherwise the tags attribute may not be populated.
 | 
|
| 
3144.7.1
by Guillermo Gonzalez
 * added show_properties to LonLogFormat and the hooks to register custom functions  | 
711  | 
|
712  | 
    Plugins can register functions to show custom revision properties using
 | 
|
| 
3144.7.13
by Guillermo Gonzalez
 * fixed typo LogFormatter.show_properties in docstring  | 
713  | 
    the properties_handler_registry. The registered function
 | 
| 
3144.7.1
by Guillermo Gonzalez
 * added show_properties to LonLogFormat and the hooks to register custom functions  | 
714  | 
    must respect the following interface description:
 | 
| 
3144.7.2
by Guillermo Gonzalez
 * cleanup a bit the interface  | 
715  | 
        def my_show_properties(properties_dict):
 | 
716  | 
            # code that returns a dict {'name':'value'} of the properties 
 | 
|
717  | 
            # to be shown
 | 
|
| 
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.  | 
718  | 
    """
 | 
| 
1704.2.20
by Martin Pool
 log --line shows revision numbers (Alexander)  | 
719  | 
|
| 
2388.1.8
by Erik Bagfors
 Redo based on input from Alexander  | 
720  | 
def __init__(self, to_file, show_ids=False, show_timezone='original'):  | 
| 
794
by Martin Pool
 - Merge John's nice short-log format.  | 
721  | 
self.to_file = to_file  | 
722  | 
self.show_ids = show_ids  | 
|
723  | 
self.show_timezone = show_timezone  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
724  | 
|
| 
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  | 
# TODO: uncomment this block after show() has been removed.
 | 
726  | 
# Until then defining log_revision would prevent _show_log calling show() 
 | 
|
727  | 
# in legacy formatters.
 | 
|
728  | 
#    def log_revision(self, revision):
 | 
|
729  | 
#        """Log a revision.
 | 
|
730  | 
#
 | 
|
731  | 
#        :param  revision:   The LogRevision to be logged.
 | 
|
732  | 
#        """
 | 
|
733  | 
#        raise NotImplementedError('not implemented in abstract base')
 | 
|
734  | 
||
| 
1185.35.19
by Aaron Bentley
 Tweaked short-log as Meinel suggested  | 
735  | 
def short_committer(self, rev):  | 
| 
3063.3.2
by Lukáš Lalinský
 Move the name and e-mail address extraction logic to config.parse_username.  | 
736  | 
name, address = config.parse_username(rev.committer)  | 
737  | 
if name:  | 
|
| 
3063.3.1
by Lukáš Lalinský
 Fall back to showing e-mail in ``log --short/--line`` if the committer/author has only e-mail.  | 
738  | 
return name  | 
| 
3063.3.2
by Lukáš Lalinský
 Move the name and e-mail address extraction logic to config.parse_username.  | 
739  | 
return address  | 
| 
2388.1.11
by Alexander Belchenko
 changes after John's review  | 
740  | 
|
| 
2671.5.4
by Lukáš Lalinsky
 Replace the committer with the author in log, the committer is displayed only in the long format and only if it's different from the author.  | 
741  | 
def short_author(self, rev):  | 
| 
3063.3.2
by Lukáš Lalinský
 Move the name and e-mail address extraction logic to config.parse_username.  | 
742  | 
name, address = config.parse_username(rev.get_apparent_author())  | 
743  | 
if name:  | 
|
| 
3063.3.1
by Lukáš Lalinský
 Fall back to showing e-mail in ``log --short/--line`` if the committer/author has only e-mail.  | 
744  | 
return name  | 
| 
3063.3.2
by Lukáš Lalinský
 Move the name and e-mail address extraction logic to config.parse_username.  | 
745  | 
return address  | 
| 
2671.5.4
by Lukáš Lalinsky
 Replace the committer with the author in log, the committer is displayed only in the long format and only if it's different from the author.  | 
746  | 
|
| 
3144.7.9
by Guillermo Gonzalez
 * bzrlib.log.show_roperties don't hide handler errors  | 
747  | 
def show_properties(self, revision, indent):  | 
| 
3144.7.8
by Guillermo Gonzalez
 * added error handling (and logging) to LogFormatter.show_properties when a handler raise an error  | 
748  | 
"""Displays the custom properties returned by each registered handler.  | 
749  | 
        
 | 
|
| 
3144.7.13
by Guillermo Gonzalez
 * fixed typo LogFormatter.show_properties in docstring  | 
750  | 
        If a registered handler raises an error it is propagated.
 | 
| 
3144.7.5
by Guillermo Gonzalez
 * some improvements to the doctstring in show_properties method and in LogFormatter  | 
751  | 
        """
 | 
| 
3144.7.9
by Guillermo Gonzalez
 * bzrlib.log.show_roperties don't hide handler errors  | 
752  | 
for key, handler in properties_handler_registry.iteritems():  | 
753  | 
for key, value in handler(revision).items():  | 
|
754  | 
self.to_file.write(indent + key + ': ' + value + '\n')  | 
|
| 
3144.7.8
by Guillermo Gonzalez
 * added error handling (and logging) to LogFormatter.show_properties when a handler raise an error  | 
755  | 
|
| 
2388.1.11
by Alexander Belchenko
 changes after John's review  | 
756  | 
|
| 
794
by Martin Pool
 - Merge John's nice short-log format.  | 
757  | 
class LongLogFormatter(LogFormatter):  | 
| 
2388.1.11
by Alexander Belchenko
 changes after John's review  | 
758  | 
|
| 
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.  | 
759  | 
supports_merge_revisions = True  | 
760  | 
supports_delta = True  | 
|
761  | 
supports_tags = True  | 
|
| 
2388.1.10
by Alexander Belchenko
 Slightly reworked: use None instead of [] as default tags list; PEP-8  | 
762  | 
|
| 
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.  | 
763  | 
def log_revision(self, revision):  | 
764  | 
"""Log a revision, either merged or not."""  | 
|
| 
2671.2.5
by Lukáš Lalinský
 Fixes for comments from the mailing list.  | 
765  | 
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.  | 
766  | 
to_file = self.to_file  | 
| 
2911.6.1
by Blake Winton
 Change 'print >> f,'s to 'f.write('s.  | 
767  | 
to_file.write(indent + '-' * 60 + '\n')  | 
| 
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.  | 
768  | 
if revision.revno is not None:  | 
| 
2911.6.3
by Blake Winton
 Implemented suggestions from John Arbash Meinel.  | 
769  | 
to_file.write(indent + 'revno: %s\n' % (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.  | 
770  | 
if revision.tags:  | 
| 
2911.6.1
by Blake Winton
 Change 'print >> f,'s to 'f.write('s.  | 
771  | 
to_file.write(indent + 'tags: %s\n' % (', '.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.  | 
772  | 
if self.show_ids:  | 
| 
3257.2.1
by Adeodato Simó
 Add a space after "revision-id:" in log output.  | 
773  | 
to_file.write(indent + 'revision-id: ' + revision.rev.revision_id)  | 
| 
2911.6.1
by Blake Winton
 Change 'print >> f,'s to 'f.write('s.  | 
774  | 
to_file.write('\n')  | 
| 
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.  | 
775  | 
for parent_id in revision.rev.parent_ids:  | 
| 
2911.6.3
by Blake Winton
 Implemented suggestions from John Arbash Meinel.  | 
776  | 
to_file.write(indent + 'parent: %s\n' % (parent_id,))  | 
| 
3144.7.11
by Guillermo Gonzalez
 * updates LongLogFormatter to pass revision instead of the properties dict to show_properties method  | 
777  | 
self.show_properties(revision.rev, indent)  | 
| 
2671.2.2
by Lukáš Lalinský
 Move setting of the author revision property to MutableTree.commit. Don't use try/except KeyError in LongLogFormatter to display authors and branch-nicks. Removed warning about missing e-mail in the authors name.  | 
778  | 
|
| 
2671.5.7
by Lukáš Lalinsky
 Rename get_author to get_apparent_author, revert the long log back to displaying the committer.  | 
779  | 
author = revision.rev.properties.get('author', None)  | 
780  | 
if author is not None:  | 
|
| 
2911.6.3
by Blake Winton
 Implemented suggestions from John Arbash Meinel.  | 
781  | 
to_file.write(indent + 'author: %s\n' % (author,))  | 
782  | 
to_file.write(indent + 'committer: %s\n' % (revision.rev.committer,))  | 
|
| 
2671.2.2
by Lukáš Lalinský
 Move setting of the author revision property to MutableTree.commit. Don't use try/except KeyError in LongLogFormatter to display authors and branch-nicks. Removed warning about missing e-mail in the authors name.  | 
783  | 
|
784  | 
branch_nick = revision.rev.properties.get('branch-nick', None)  | 
|
785  | 
if branch_nick is not None:  | 
|
| 
2911.6.3
by Blake Winton
 Implemented suggestions from John Arbash Meinel.  | 
786  | 
to_file.write(indent + 'branch nick: %s\n' % (branch_nick,))  | 
| 
2671.2.2
by Lukáš Lalinský
 Move setting of the author revision property to MutableTree.commit. Don't use try/except KeyError in LongLogFormatter to display authors and branch-nicks. Removed warning about missing e-mail in the authors name.  | 
787  | 
|
| 
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.  | 
788  | 
date_str = format_date(revision.rev.timestamp,  | 
789  | 
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.  | 
790  | 
self.show_timezone)  | 
| 
2911.6.3
by Blake Winton
 Implemented suggestions from John Arbash Meinel.  | 
791  | 
to_file.write(indent + 'timestamp: %s\n' % (date_str,))  | 
| 
1433
by Robert Collins
 merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.  | 
792  | 
|
| 
2911.6.1
by Blake Winton
 Change 'print >> f,'s to 'f.write('s.  | 
793  | 
to_file.write(indent + 'message:\n')  | 
| 
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.  | 
794  | 
if not revision.rev.message:  | 
| 
2911.6.1
by Blake Winton
 Change 'print >> f,'s to 'f.write('s.  | 
795  | 
to_file.write(indent + ' (no message)\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.  | 
796  | 
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.  | 
797  | 
message = revision.rev.message.rstrip('\r\n')  | 
| 
1185.31.20
by John Arbash Meinel
 Stripping trailing newlines when displaying log messages  | 
798  | 
for l in message.split('\n'):  | 
| 
2911.6.3
by Blake Winton
 Implemented suggestions from John Arbash Meinel.  | 
799  | 
to_file.write(indent + ' %s\n' % (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.  | 
800  | 
if revision.delta is not None:  | 
| 
2466.11.1
by Kent Gibson
 Long log format reports deltas on merge revisions.  | 
801  | 
revision.delta.show(to_file, self.show_ids, indent=indent)  | 
| 
794
by Martin Pool
 - Merge John's nice short-log format.  | 
802  | 
|
803  | 
||
804  | 
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.  | 
805  | 
|
806  | 
supports_delta = True  | 
|
| 
2997.1.1
by Kent Gibson
 Support logging single merge revisions with short and line log formatters.  | 
807  | 
supports_single_merge_revision = True  | 
| 
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.  | 
808  | 
|
809  | 
def log_revision(self, revision):  | 
|
| 
794
by Martin Pool
 - Merge John's nice short-log format.  | 
810  | 
to_file = self.to_file  | 
| 
2483.2.2
by John Arbash Meinel
 Add [merge] after the timestamp for revisions with merges.  | 
811  | 
is_merge = ''  | 
| 
2483.2.5
by John Arbash Meinel
 [merge] bzr.dev 2501  | 
812  | 
if len(revision.rev.parent_ids) > 1:  | 
| 
2483.2.2
by John Arbash Meinel
 Add [merge] after the timestamp for revisions with merges.  | 
813  | 
is_merge = ' [merge]'  | 
| 
2911.6.1
by Blake Winton
 Change 'print >> f,'s to 'f.write('s.  | 
814  | 
to_file.write("%5s %s\t%s%s\n" % (revision.revno,  | 
| 
2671.5.4
by Lukáš Lalinsky
 Replace the committer with the author in log, the committer is displayed only in the long format and only if it's different from the author.  | 
815  | 
self.short_author(revision.rev),  | 
| 
2483.2.5
by John Arbash Meinel
 [merge] bzr.dev 2501  | 
816  | 
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.  | 
817  | 
revision.rev.timezone or 0,  | 
| 
1185.35.19
by Aaron Bentley
 Tweaked short-log as Meinel suggested  | 
818  | 
self.show_timezone, date_fmt="%Y-%m-%d",  | 
| 
2483.2.5
by John Arbash Meinel
 [merge] bzr.dev 2501  | 
819  | 
show_offset=False),  | 
| 
2911.6.1
by Blake Winton
 Change 'print >> f,'s to 'f.write('s.  | 
820  | 
is_merge))  | 
| 
794
by Martin Pool
 - Merge John's nice short-log format.  | 
821  | 
if self.show_ids:  | 
| 
2911.6.3
by Blake Winton
 Implemented suggestions from John Arbash Meinel.  | 
822  | 
to_file.write(' revision-id:%s\n' % (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.  | 
823  | 
if not revision.rev.message:  | 
| 
2911.6.1
by Blake Winton
 Change 'print >> f,'s to 'f.write('s.  | 
824  | 
to_file.write(' (no message)\n')  | 
| 
794
by Martin Pool
 - Merge John's nice short-log format.  | 
825  | 
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.  | 
826  | 
message = revision.rev.message.rstrip('\r\n')  | 
| 
1185.31.20
by John Arbash Meinel
 Stripping trailing newlines when displaying log messages  | 
827  | 
for l in message.split('\n'):  | 
| 
2911.6.3
by Blake Winton
 Implemented suggestions from John Arbash Meinel.  | 
828  | 
to_file.write(' %s\n' % (l,))  | 
| 
794
by Martin Pool
 - Merge John's nice short-log format.  | 
829  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
830  | 
        # TODO: Why not show the modified files in a shorter form as
 | 
831  | 
        # 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.  | 
832  | 
if revision.delta is not None:  | 
833  | 
revision.delta.show(to_file, self.show_ids)  | 
|
| 
2911.6.1
by Blake Winton
 Change 'print >> f,'s to 'f.write('s.  | 
834  | 
to_file.write('\n')  | 
| 
794
by Martin Pool
 - Merge John's nice short-log format.  | 
835  | 
|
| 
1704.2.20
by Martin Pool
 log --line shows revision numbers (Alexander)  | 
836  | 
|
| 
1185.12.25
by Aaron Bentley
 Added one-line log format  | 
837  | 
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.  | 
838  | 
|
| 
2997.1.1
by Kent Gibson
 Support logging single merge revisions with short and line log formatters.  | 
839  | 
supports_single_merge_revision = True  | 
840  | 
||
| 
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.  | 
841  | 
def __init__(self, *args, **kwargs):  | 
842  | 
super(LineLogFormatter, self).__init__(*args, **kwargs)  | 
|
843  | 
self._max_chars = terminal_width() - 1  | 
|
844  | 
||
| 
1185.12.25
by Aaron Bentley
 Added one-line log format  | 
845  | 
def truncate(self, str, max_len):  | 
846  | 
if len(str) <= max_len:  | 
|
847  | 
return str  | 
|
848  | 
return str[:max_len-3]+'...'  | 
|
849  | 
||
850  | 
def date_string(self, rev):  | 
|
851  | 
return format_date(rev.timestamp, rev.timezone or 0,  | 
|
852  | 
self.show_timezone, date_fmt="%Y-%m-%d",  | 
|
853  | 
show_offset=False)  | 
|
854  | 
||
855  | 
def message(self, rev):  | 
|
856  | 
if not rev.message:  | 
|
857  | 
return '(no message)'  | 
|
858  | 
else:  | 
|
859  | 
return rev.message  | 
|
860  | 
||
| 
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.  | 
861  | 
def log_revision(self, revision):  | 
| 
2911.6.1
by Blake Winton
 Change 'print >> f,'s to 'f.write('s.  | 
862  | 
self.to_file.write(self.log_string(revision.revno, revision.rev,  | 
863  | 
self._max_chars))  | 
|
864  | 
self.to_file.write('\n')  | 
|
| 
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.  | 
865  | 
|
| 
1704.2.20
by Martin Pool
 log --line shows revision numbers (Alexander)  | 
866  | 
def log_string(self, revno, rev, max_chars):  | 
867  | 
"""Format log info into one string. Truncate tail of string  | 
|
868  | 
        :param  revno:      revision number (int) or None.
 | 
|
869  | 
                            Revision numbers counts from 1.
 | 
|
870  | 
        :param  rev:        revision info object
 | 
|
871  | 
        :param  max_chars:  maximum length of resulting string
 | 
|
872  | 
        :return:            formatted truncated string
 | 
|
873  | 
        """
 | 
|
874  | 
out = []  | 
|
875  | 
if revno:  | 
|
876  | 
            # show revno only when is not None
 | 
|
| 
1988.4.2
by Robert Collins
 ``bzr log`` Now shows dotted-decimal revision numbers for all revisions,  | 
877  | 
out.append("%s:" % revno)  | 
| 
2671.5.4
by Lukáš Lalinsky
 Replace the committer with the author in log, the committer is displayed only in the long format and only if it's different from the author.  | 
878  | 
out.append(self.truncate(self.short_author(rev), 20))  | 
| 
1185.12.25
by Aaron Bentley
 Added one-line log format  | 
879  | 
out.append(self.date_string(rev))  | 
| 
1740.2.5
by Aaron Bentley
 Merge from bzr.dev  | 
880  | 
out.append(rev.get_summary())  | 
| 
1185.12.25
by Aaron Bentley
 Added one-line log format  | 
881  | 
return self.truncate(" ".join(out).rstrip('\n'), max_chars)  | 
| 
794
by Martin Pool
 - Merge John's nice short-log format.  | 
882  | 
|
| 
1704.2.20
by Martin Pool
 log --line shows revision numbers (Alexander)  | 
883  | 
|
| 
1185.12.27
by Aaron Bentley
 Use line log for pending merges  | 
884  | 
def line_log(rev, max_chars):  | 
885  | 
lf = LineLogFormatter(None)  | 
|
| 
1704.2.20
by Martin Pool
 log --line shows revision numbers (Alexander)  | 
886  | 
return lf.log_string(None, rev, max_chars)  | 
| 
1185.12.27
by Aaron Bentley
 Use line log for pending merges  | 
887  | 
|
| 
2221.4.10
by Aaron Bentley
 Implement log options using RegistryOption  | 
888  | 
|
889  | 
class LogFormatterRegistry(registry.Registry):  | 
|
890  | 
"""Registry for log formatters"""  | 
|
891  | 
||
892  | 
def make_formatter(self, name, *args, **kwargs):  | 
|
893  | 
"""Construct a formatter from arguments.  | 
|
894  | 
||
895  | 
        :param name: Name of the formatter to construct.  'short', 'long' and
 | 
|
896  | 
            'line' are built-in.
 | 
|
897  | 
        """
 | 
|
898  | 
return self.get(name)(*args, **kwargs)  | 
|
899  | 
||
900  | 
def get_default(self, branch):  | 
|
901  | 
return self.get(branch.get_config().log_format())  | 
|
902  | 
||
903  | 
||
904  | 
log_formatter_registry = LogFormatterRegistry()  | 
|
905  | 
||
906  | 
||
907  | 
log_formatter_registry.register('short', ShortLogFormatter,  | 
|
908  | 
'Moderately short log format')  | 
|
909  | 
log_formatter_registry.register('long', LongLogFormatter,  | 
|
910  | 
'Detailed log format')  | 
|
911  | 
log_formatter_registry.register('line', LineLogFormatter,  | 
|
912  | 
'Log format with one line per revision')  | 
|
913  | 
||
| 
794
by Martin Pool
 - Merge John's nice short-log format.  | 
914  | 
|
| 
1553.2.1
by Erik Bågfors
 Support for plugins to register log formatters and set default formatter  | 
915  | 
def register_formatter(name, formatter):  | 
| 
2221.4.10
by Aaron Bentley
 Implement log options using RegistryOption  | 
916  | 
log_formatter_registry.register(name, formatter)  | 
917  | 
||
| 
1553.2.1
by Erik Bågfors
 Support for plugins to register log formatters and set default formatter  | 
918  | 
|
| 
794
by Martin Pool
 - Merge John's nice short-log format.  | 
919  | 
def log_formatter(name, *args, **kwargs):  | 
| 
1393.1.56
by Martin Pool
 - doc and small refactoring of log code  | 
920  | 
"""Construct a formatter from arguments.  | 
921  | 
||
| 
1185.12.27
by Aaron Bentley
 Use line log for pending merges  | 
922  | 
    name -- Name of the formatter to construct; currently 'long', 'short' and
 | 
923  | 
        'line' are supported.
 | 
|
| 
1393.1.56
by Martin Pool
 - doc and small refactoring of log code  | 
924  | 
    """
 | 
| 
794
by Martin Pool
 - Merge John's nice short-log format.  | 
925  | 
try:  | 
| 
2221.4.10
by Aaron Bentley
 Implement log options using RegistryOption  | 
926  | 
return log_formatter_registry.make_formatter(name, *args, **kwargs)  | 
| 
1553.2.2
by Erik Bågfors
 Made "unknown log formatter" error message work  | 
927  | 
except KeyError:  | 
| 
3535.5.1
by John Arbash Meinel
 cleanup a few imports to be lazily loaded.  | 
928  | 
raise errors.BzrCommandError("unknown log formatter: %r" % name)  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
929  | 
|
| 
2221.4.10
by Aaron Bentley
 Implement log options using RegistryOption  | 
930  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
931  | 
def show_one_log(revno, rev, delta, verbose, to_file, show_timezone):  | 
| 
1759.2.1
by Jelmer Vernooij
 Fix some types (found using aspell).  | 
932  | 
    # deprecated; for compatibility
 | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
933  | 
lf = LongLogFormatter(to_file=to_file, show_timezone=show_timezone)  | 
934  | 
lf.show(revno, rev, delta)  | 
|
| 
1185.32.2
by John Arbash Meinel
 Refactor pull --verbose into a log.py function, add tests.  | 
935  | 
|
| 
2490.1.4
by John Arbash Meinel
 Update bzrlib.log.show_changed_revisions to use the new api  | 
936  | 
|
| 
1551.17.2
by Aaron Bentley
 Stop showing deltas in pull -v output  | 
937  | 
def show_changed_revisions(branch, old_rh, new_rh, to_file=None,  | 
938  | 
log_format='long'):  | 
|
| 
1185.32.2
by John Arbash Meinel
 Refactor pull --verbose into a log.py function, add tests.  | 
939  | 
"""Show the change in revision history comparing the old revision history to the new one.  | 
940  | 
||
941  | 
    :param branch: The branch where the revisions exist
 | 
|
942  | 
    :param old_rh: The old revision history
 | 
|
943  | 
    :param new_rh: The new revision history
 | 
|
944  | 
    :param to_file: A file to write the results to. If None, stdout will be used
 | 
|
945  | 
    """
 | 
|
946  | 
if to_file is None:  | 
|
| 
2997.1.3
by Alexander Belchenko
 file wrapper around stdout should use terminal encoding, not user_encoding.  | 
947  | 
to_file = codecs.getwriter(get_terminal_encoding())(sys.stdout,  | 
948  | 
errors='replace')  | 
|
| 
1185.32.2
by John Arbash Meinel
 Refactor pull --verbose into a log.py function, add tests.  | 
949  | 
lf = log_formatter(log_format,  | 
950  | 
show_ids=False,  | 
|
951  | 
to_file=to_file,  | 
|
952  | 
show_timezone='original')  | 
|
953  | 
||
954  | 
    # This is the first index which is different between
 | 
|
955  | 
    # old and new
 | 
|
956  | 
base_idx = None  | 
|
957  | 
for i in xrange(max(len(new_rh),  | 
|
958  | 
len(old_rh))):  | 
|
959  | 
if (len(new_rh) <= i  | 
|
960  | 
or len(old_rh) <= i  | 
|
961  | 
or new_rh[i] != old_rh[i]):  | 
|
962  | 
base_idx = i  | 
|
963  | 
            break
 | 
|
964  | 
||
965  | 
if base_idx is None:  | 
|
966  | 
to_file.write('Nothing seems to have changed\n')  | 
|
967  | 
        return
 | 
|
968  | 
    ## TODO: It might be nice to do something like show_log
 | 
|
969  | 
    ##       and show the merged entries. But since this is the
 | 
|
970  | 
    ##       removed revisions, it shouldn't be as important
 | 
|
971  | 
if base_idx < len(old_rh):  | 
|
972  | 
to_file.write('*'*60)  | 
|
973  | 
to_file.write('\nRemoved Revisions:\n')  | 
|
974  | 
for i in range(base_idx, len(old_rh)):  | 
|
| 
1185.67.2
by Aaron Bentley
 Renamed Branch.storage to Branch.repository  | 
975  | 
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  | 
976  | 
lr = LogRevision(rev, i+1, 0, None)  | 
977  | 
lf.log_revision(lr)  | 
|
| 
1185.32.2
by John Arbash Meinel
 Refactor pull --verbose into a log.py function, add tests.  | 
978  | 
to_file.write('*'*60)  | 
979  | 
to_file.write('\n\n')  | 
|
980  | 
if base_idx < len(new_rh):  | 
|
981  | 
to_file.write('Added Revisions:\n')  | 
|
982  | 
show_log(branch,  | 
|
983  | 
lf,  | 
|
984  | 
None,  | 
|
| 
1551.17.2
by Aaron Bentley
 Stop showing deltas in pull -v output  | 
985  | 
verbose=False,  | 
| 
1185.32.2
by John Arbash Meinel
 Refactor pull --verbose into a log.py function, add tests.  | 
986  | 
direction='forward',  | 
987  | 
start_revision=base_idx+1,  | 
|
988  | 
end_revision=len(new_rh),  | 
|
989  | 
search=None)  | 
|
990  | 
||
| 
3144.7.4
by Guillermo Gonzalez
 * move the function regisstry into a real Registry instead of a list  | 
991  | 
|
| 
3144.7.9
by Guillermo Gonzalez
 * bzrlib.log.show_roperties don't hide handler errors  | 
992  | 
properties_handler_registry = registry.Registry()  | 
| 
3642.1.6
by Robert Collins
 Make log revision filtering pluggable.  | 
993  | 
|
994  | 
# adapters which revision ids to log are filtered. When log is called, the
 | 
|
995  | 
# log_rev_iterator is adapted through each of these factory methods.
 | 
|
996  | 
# Plugins are welcome to mutate this list in any way they like - as long
 | 
|
997  | 
# as the overall behaviour is preserved. At this point there is no extensible
 | 
|
998  | 
# mechanism for getting parameters to each factory method, and until there is
 | 
|
999  | 
# this won't be considered a stable api.
 | 
|
1000  | 
log_adapters = [  | 
|
1001  | 
    # core log logic
 | 
|
| 
3642.1.7
by Robert Collins
 Review feedback.  | 
1002  | 
_make_batch_filter,  | 
| 
3642.1.6
by Robert Collins
 Make log revision filtering pluggable.  | 
1003  | 
    # read revision objects
 | 
| 
3642.1.7
by Robert Collins
 Review feedback.  | 
1004  | 
_make_revision_objects,  | 
| 
3642.1.6
by Robert Collins
 Make log revision filtering pluggable.  | 
1005  | 
    # filter on log messages
 | 
| 
3642.1.7
by Robert Collins
 Review feedback.  | 
1006  | 
_make_search_filter,  | 
| 
3642.1.6
by Robert Collins
 Make log revision filtering pluggable.  | 
1007  | 
    # generate deltas for things we will show
 | 
| 
3642.1.7
by Robert Collins
 Review feedback.  | 
1008  | 
    _make_delta_filter
 | 
| 
3642.1.6
by Robert Collins
 Make log revision filtering pluggable.  | 
1009  | 
    ]
 |