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  | 
||
31  | 
* from last to first or (not anymore) from first to last;
 | 
|
32  | 
  the default is "reversed" because it shows the likely most
 | 
|
33  | 
  relevant and interesting information first
 | 
|
34  | 
||
35  | 
* (not yet) in XML format
 | 
|
36  | 
"""
 | 
|
37  | 
||
38  | 
||
| 
538
by Martin Pool
 - fix import  | 
39  | 
from trace import mutter  | 
| 
375
by Martin Pool
 - New command touching-revisions and function to trace  | 
40  | 
|
41  | 
def find_touching_revisions(branch, file_id):  | 
|
42  | 
"""Yield a description of revisions which affect the file_id.  | 
|
43  | 
||
44  | 
    Each returned element is (revno, revision_id, description)
 | 
|
45  | 
||
46  | 
    This is the list of revisions where the file is either added,
 | 
|
47  | 
    modified, renamed or deleted.
 | 
|
48  | 
||
49  | 
    TODO: Perhaps some way to limit this to only particular revisions,
 | 
|
| 
522
by Martin Pool
 todo  | 
50  | 
    or to traverse a non-mainline set of revisions?
 | 
| 
375
by Martin Pool
 - New command touching-revisions and function to trace  | 
51  | 
    """
 | 
52  | 
last_ie = None  | 
|
53  | 
last_path = None  | 
|
54  | 
revno = 1  | 
|
55  | 
for revision_id in branch.revision_history():  | 
|
56  | 
this_inv = branch.get_revision_inventory(revision_id)  | 
|
57  | 
if file_id in this_inv:  | 
|
58  | 
this_ie = this_inv[file_id]  | 
|
59  | 
this_path = this_inv.id2path(file_id)  | 
|
60  | 
else:  | 
|
61  | 
this_ie = this_path = None  | 
|
62  | 
||
63  | 
        # now we know how it was last time, and how it is in this revision.
 | 
|
64  | 
        # are those two states effectively the same or not?
 | 
|
65  | 
||
66  | 
if not this_ie and not last_ie:  | 
|
67  | 
            # not present in either
 | 
|
68  | 
            pass
 | 
|
69  | 
elif this_ie and not last_ie:  | 
|
70  | 
yield revno, revision_id, "added " + this_path  | 
|
71  | 
elif not this_ie and last_ie:  | 
|
72  | 
            # deleted here
 | 
|
73  | 
yield revno, revision_id, "deleted " + last_path  | 
|
74  | 
elif this_path != last_path:  | 
|
75  | 
yield revno, revision_id, ("renamed %s => %s" % (last_path, this_path))  | 
|
76  | 
elif (this_ie.text_size != last_ie.text_size  | 
|
77  | 
or this_ie.text_sha1 != last_ie.text_sha1):  | 
|
78  | 
yield revno, revision_id, "modified " + this_path  | 
|
79  | 
||
80  | 
last_ie = this_ie  | 
|
81  | 
last_path = this_path  | 
|
82  | 
revno += 1  | 
|
83  | 
||
84  | 
||
| 
527
by Martin Pool
 - refactor log command  | 
85  | 
|
| 
378
by Martin Pool
 - New usage bzr log FILENAME  | 
86  | 
def show_log(branch,  | 
| 
794
by Martin Pool
 - Merge John's nice short-log format.  | 
87  | 
lf,  | 
| 
527
by Martin Pool
 - refactor log command  | 
88  | 
specific_fileid=None,  | 
| 
378
by Martin Pool
 - New usage bzr log FILENAME  | 
89  | 
verbose=False,  | 
| 
567
by Martin Pool
 - New form 'bzr log -r FROM:TO'  | 
90  | 
direction='reverse',  | 
91  | 
start_revision=None,  | 
|
| 
900
by Martin Pool
 - patch from john to search for matching commits  | 
92  | 
end_revision=None,  | 
93  | 
search=None):  | 
|
| 
369
by Martin Pool
 - Split out log printing into new show_log function  | 
94  | 
"""Write out human-readable log of commits to this branch.  | 
95  | 
||
| 
794
by Martin Pool
 - Merge John's nice short-log format.  | 
96  | 
    lf
 | 
97  | 
        LogFormatter object to show the output.
 | 
|
98  | 
||
| 
527
by Martin Pool
 - refactor log command  | 
99  | 
    specific_fileid
 | 
| 
378
by Martin Pool
 - New usage bzr log FILENAME  | 
100  | 
        If true, list only the commits affecting the specified
 | 
101  | 
        file, rather than all commits.
 | 
|
102  | 
||
| 
369
by Martin Pool
 - Split out log printing into new show_log function  | 
103  | 
    verbose
 | 
104  | 
        If true show added/changed/deleted/renamed files.
 | 
|
105  | 
||
| 
527
by Martin Pool
 - refactor log command  | 
106  | 
    direction
 | 
107  | 
        'reverse' (default) is latest to earliest;
 | 
|
108  | 
        'forward' is earliest to latest.
 | 
|
| 
567
by Martin Pool
 - New form 'bzr log -r FROM:TO'  | 
109  | 
|
110  | 
    start_revision
 | 
|
111  | 
        If not None, only show revisions >= start_revision
 | 
|
112  | 
||
113  | 
    end_revision
 | 
|
114  | 
        If not None, only show revisions <= end_revision
 | 
|
| 
369
by Martin Pool
 - Split out log printing into new show_log function  | 
115  | 
    """
 | 
| 
794
by Martin Pool
 - Merge John's nice short-log format.  | 
116  | 
from bzrlib.osutils import format_date  | 
117  | 
from bzrlib.errors import BzrCheckError  | 
|
118  | 
from bzrlib.textui import show_status  | 
|
119  | 
||
120  | 
from warnings import warn  | 
|
| 
369
by Martin Pool
 - Split out log printing into new show_log function  | 
121  | 
|
| 
794
by Martin Pool
 - Merge John's nice short-log format.  | 
122  | 
if not isinstance(lf, LogFormatter):  | 
123  | 
warn("not a LogFormatter instance: %r" % lf)  | 
|
| 
533
by Martin Pool
 - fix up asking for the log for the root of a remote branch  | 
124  | 
|
125  | 
if specific_fileid:  | 
|
126  | 
mutter('get log for file_id %r' % specific_fileid)  | 
|
127  | 
||
| 
900
by Martin Pool
 - patch from john to search for matching commits  | 
128  | 
if search is not None:  | 
129  | 
import re  | 
|
130  | 
searchRE = re.compile(search, re.IGNORECASE)  | 
|
131  | 
else:  | 
|
132  | 
searchRE = None  | 
|
133  | 
||
| 
527
by Martin Pool
 - refactor log command  | 
134  | 
which_revs = branch.enum_history(direction)  | 
| 
805
by Martin Pool
 Merge John's log patch:  | 
135  | 
which_revs = [x for x in which_revs if (  | 
136  | 
(start_revision is None or x[0] >= start_revision)  | 
|
137  | 
and (end_revision is None or x[0] <= end_revision))]  | 
|
| 
527
by Martin Pool
 - refactor log command  | 
138  | 
|
| 
532
by Martin Pool
 - put back support for log on specific files  | 
139  | 
if not (verbose or specific_fileid):  | 
140  | 
        # no need to know what changed between revisions
 | 
|
| 
530
by Martin Pool
 - put back verbose log support for reversed logs  | 
141  | 
with_deltas = deltas_for_log_dummy(branch, which_revs)  | 
142  | 
elif direction == 'reverse':  | 
|
143  | 
with_deltas = deltas_for_log_reverse(branch, which_revs)  | 
|
144  | 
else:  | 
|
| 
805
by Martin Pool
 Merge John's log patch:  | 
145  | 
with_deltas = deltas_for_log_forward(branch, which_revs)  | 
| 
530
by Martin Pool
 - put back verbose log support for reversed logs  | 
146  | 
|
147  | 
for revno, rev, delta in with_deltas:  | 
|
| 
532
by Martin Pool
 - put back support for log on specific files  | 
148  | 
if specific_fileid:  | 
149  | 
if not delta.touches_file_id(specific_fileid):  | 
|
150  | 
                continue
 | 
|
| 
567
by Martin Pool
 - New form 'bzr log -r FROM:TO'  | 
151  | 
|
| 
532
by Martin Pool
 - put back support for log on specific files  | 
152  | 
if not verbose:  | 
153  | 
            # although we calculated it, throw it away without display
 | 
|
154  | 
delta = None  | 
|
| 
794
by Martin Pool
 - Merge John's nice short-log format.  | 
155  | 
|
| 
900
by Martin Pool
 - patch from john to search for matching commits  | 
156  | 
if searchRE is None or searchRE.search(rev.message):  | 
157  | 
lf.show(revno, rev, delta)  | 
|
| 
527
by Martin Pool
 - refactor log command  | 
158  | 
|
159  | 
||
| 
530
by Martin Pool
 - put back verbose log support for reversed logs  | 
160  | 
|
161  | 
def deltas_for_log_dummy(branch, which_revs):  | 
|
162  | 
for revno, revision_id in which_revs:  | 
|
163  | 
yield revno, branch.get_revision(revision_id), None  | 
|
164  | 
||
165  | 
||
166  | 
def deltas_for_log_reverse(branch, which_revs):  | 
|
167  | 
"""Compute deltas for display in reverse log.  | 
|
168  | 
||
169  | 
    Given a sequence of (revno, revision_id) pairs, return
 | 
|
170  | 
    (revno, rev, delta).
 | 
|
171  | 
||
172  | 
    The delta is from the given revision to the next one in the
 | 
|
173  | 
    sequence, which makes sense if the log is being displayed from
 | 
|
174  | 
    newest to oldest.
 | 
|
175  | 
    """
 | 
|
176  | 
from tree import EmptyTree  | 
|
177  | 
from diff import compare_trees  | 
|
178  | 
||
179  | 
last_revno = last_revision_id = last_tree = None  | 
|
180  | 
for revno, revision_id in which_revs:  | 
|
181  | 
this_tree = branch.revision_tree(revision_id)  | 
|
182  | 
this_revision = branch.get_revision(revision_id)  | 
|
183  | 
||
184  | 
if last_revno:  | 
|
185  | 
yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)  | 
|
186  | 
||
| 
909
by Martin Pool
 - merge John's code to give the tree root an explicit file id  | 
187  | 
this_tree = EmptyTree(branch.get_root_id())  | 
188  | 
||
| 
530
by Martin Pool
 - put back verbose log support for reversed logs  | 
189  | 
last_revno = revno  | 
190  | 
last_revision = this_revision  | 
|
191  | 
last_tree = this_tree  | 
|
192  | 
||
193  | 
if last_revno:  | 
|
| 
805
by Martin Pool
 Merge John's log patch:  | 
194  | 
if last_revno == 1:  | 
| 
914
by Martin Pool
 - fix up breakage of 'bzr log -v' by root_id patch  | 
195  | 
this_tree = EmptyTree(branch.get_root_id())  | 
| 
805
by Martin Pool
 Merge John's log patch:  | 
196  | 
else:  | 
197  | 
this_revno = last_revno - 1  | 
|
198  | 
this_revision_id = branch.revision_history()[this_revno]  | 
|
199  | 
this_tree = branch.revision_tree(this_revision_id)  | 
|
| 
530
by Martin Pool
 - put back verbose log support for reversed logs  | 
200  | 
yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)  | 
201  | 
||
202  | 
||
| 
805
by Martin Pool
 Merge John's log patch:  | 
203  | 
def deltas_for_log_forward(branch, which_revs):  | 
204  | 
"""Compute deltas for display in forward log.  | 
|
205  | 
||
206  | 
    Given a sequence of (revno, revision_id) pairs, return
 | 
|
207  | 
    (revno, rev, delta).
 | 
|
208  | 
||
209  | 
    The delta is from the given revision to the next one in the
 | 
|
210  | 
    sequence, which makes sense if the log is being displayed from
 | 
|
211  | 
    newest to oldest.
 | 
|
212  | 
    """
 | 
|
213  | 
from tree import EmptyTree  | 
|
214  | 
from diff import compare_trees  | 
|
215  | 
||
216  | 
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  | 
217  | 
prev_tree = EmptyTree(branch.get_root_id())  | 
218  | 
||
| 
805
by Martin Pool
 Merge John's log patch:  | 
219  | 
for revno, revision_id in which_revs:  | 
220  | 
this_tree = branch.revision_tree(revision_id)  | 
|
221  | 
this_revision = branch.get_revision(revision_id)  | 
|
222  | 
||
223  | 
if not last_revno:  | 
|
224  | 
if revno == 1:  | 
|
225  | 
last_tree = EmptyTree()  | 
|
226  | 
else:  | 
|
227  | 
last_revno = revno - 1  | 
|
228  | 
last_revision_id = branch.revision_history()[last_revno]  | 
|
229  | 
last_tree = branch.revision_tree(last_revision_id)  | 
|
230  | 
||
231  | 
yield revno, this_revision, compare_trees(last_tree, this_tree, False)  | 
|
232  | 
||
233  | 
last_revno = revno  | 
|
234  | 
last_revision = this_revision  | 
|
235  | 
last_tree = this_tree  | 
|
| 
530
by Martin Pool
 - put back verbose log support for reversed logs  | 
236  | 
|
| 
527
by Martin Pool
 - refactor log command  | 
237  | 
|
| 
794
by Martin Pool
 - Merge John's nice short-log format.  | 
238  | 
class LogFormatter(object):  | 
239  | 
"""Abstract class to display log messages."""  | 
|
240  | 
def __init__(self, to_file, show_ids=False, show_timezone=False):  | 
|
241  | 
self.to_file = to_file  | 
|
242  | 
self.show_ids = show_ids  | 
|
243  | 
self.show_timezone = show_timezone  | 
|
244  | 
||
245  | 
||
246  | 
||
247  | 
||
248  | 
||
249  | 
||
250  | 
class LongLogFormatter(LogFormatter):  | 
|
251  | 
def show(self, revno, rev, delta):  | 
|
252  | 
from osutils import format_date  | 
|
253  | 
||
254  | 
to_file = self.to_file  | 
|
255  | 
||
256  | 
print >>to_file, '-' * 60  | 
|
257  | 
print >>to_file, 'revno:', revno  | 
|
258  | 
if self.show_ids:  | 
|
259  | 
print >>to_file, 'revision-id:', rev.revision_id  | 
|
260  | 
print >>to_file, 'committer:', rev.committer  | 
|
261  | 
print >>to_file, 'timestamp: %s' % (format_date(rev.timestamp, rev.timezone or 0,  | 
|
262  | 
self.show_timezone))  | 
|
263  | 
||
264  | 
print >>to_file, 'message:'  | 
|
265  | 
if not rev.message:  | 
|
266  | 
print >>to_file, ' (no message)'  | 
|
267  | 
else:  | 
|
268  | 
for l in rev.message.split('\n'):  | 
|
269  | 
print >>to_file, ' ' + l  | 
|
270  | 
||
271  | 
if delta != None:  | 
|
272  | 
delta.show(to_file, self.show_ids)  | 
|
273  | 
||
274  | 
||
275  | 
||
276  | 
class ShortLogFormatter(LogFormatter):  | 
|
277  | 
def show(self, revno, rev, delta):  | 
|
278  | 
from bzrlib.osutils import format_date  | 
|
279  | 
||
280  | 
to_file = self.to_file  | 
|
281  | 
||
282  | 
print >>to_file, "%5d %s\t%s" % (revno, rev.committer,  | 
|
283  | 
format_date(rev.timestamp, rev.timezone or 0,  | 
|
284  | 
self.show_timezone))  | 
|
285  | 
if self.show_ids:  | 
|
286  | 
print >>to_file, ' revision-id:', rev.revision_id  | 
|
287  | 
if not rev.message:  | 
|
288  | 
print >>to_file, ' (no message)'  | 
|
289  | 
else:  | 
|
290  | 
for l in rev.message.split('\n'):  | 
|
291  | 
print >>to_file, ' ' + l  | 
|
292  | 
||
293  | 
if delta != None:  | 
|
294  | 
delta.show(to_file, self.show_ids)  | 
|
295  | 
        print
 | 
|
296  | 
||
297  | 
||
298  | 
||
299  | 
FORMATTERS = {'long': LongLogFormatter,  | 
|
300  | 
'short': ShortLogFormatter,  | 
|
301  | 
              }
 | 
|
302  | 
||
303  | 
||
304  | 
def log_formatter(name, *args, **kwargs):  | 
|
305  | 
from bzrlib.errors import BzrCommandError  | 
|
| 
527
by Martin Pool
 - refactor log command  | 
306  | 
|
| 
794
by Martin Pool
 - Merge John's nice short-log format.  | 
307  | 
try:  | 
308  | 
return FORMATTERS[name](*args, **kwargs)  | 
|
309  | 
except IndexError:  | 
|
310  | 
raise BzrCommandError("unknown log formatter: %r" % name)  |