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 |
||
375
by Martin Pool
- New command touching-revisions and function to trace |
39 |
|
40 |
def find_touching_revisions(branch, file_id): |
|
41 |
"""Yield a description of revisions which affect the file_id. |
|
42 |
||
43 |
Each returned element is (revno, revision_id, description)
|
|
44 |
||
45 |
This is the list of revisions where the file is either added,
|
|
46 |
modified, renamed or deleted.
|
|
47 |
||
48 |
TODO: Perhaps some way to limit this to only particular revisions,
|
|
522
by Martin Pool
todo |
49 |
or to traverse a non-mainline set of revisions?
|
375
by Martin Pool
- New command touching-revisions and function to trace |
50 |
"""
|
51 |
last_ie = None |
|
52 |
last_path = None |
|
53 |
revno = 1 |
|
54 |
for revision_id in branch.revision_history(): |
|
55 |
this_inv = branch.get_revision_inventory(revision_id) |
|
56 |
if file_id in this_inv: |
|
57 |
this_ie = this_inv[file_id] |
|
58 |
this_path = this_inv.id2path(file_id) |
|
59 |
else: |
|
60 |
this_ie = this_path = None |
|
61 |
||
62 |
# now we know how it was last time, and how it is in this revision.
|
|
63 |
# are those two states effectively the same or not?
|
|
64 |
||
65 |
if not this_ie and not last_ie: |
|
66 |
# not present in either
|
|
67 |
pass
|
|
68 |
elif this_ie and not last_ie: |
|
69 |
yield revno, revision_id, "added " + this_path |
|
70 |
elif not this_ie and last_ie: |
|
71 |
# deleted here
|
|
72 |
yield revno, revision_id, "deleted " + last_path |
|
73 |
elif this_path != last_path: |
|
74 |
yield revno, revision_id, ("renamed %s => %s" % (last_path, this_path)) |
|
75 |
elif (this_ie.text_size != last_ie.text_size |
|
76 |
or this_ie.text_sha1 != last_ie.text_sha1): |
|
77 |
yield revno, revision_id, "modified " + this_path |
|
78 |
||
79 |
last_ie = this_ie |
|
80 |
last_path = this_path |
|
81 |
revno += 1 |
|
82 |
||
83 |
||
527
by Martin Pool
- refactor log command |
84 |
|
378
by Martin Pool
- New usage bzr log FILENAME |
85 |
def show_log(branch, |
527
by Martin Pool
- refactor log command |
86 |
specific_fileid=None, |
378
by Martin Pool
- New usage bzr log FILENAME |
87 |
show_timezone='original', |
88 |
verbose=False, |
|
369
by Martin Pool
- Split out log printing into new show_log function |
89 |
show_ids=False, |
527
by Martin Pool
- refactor log command |
90 |
to_file=None, |
91 |
direction='reverse'): |
|
369
by Martin Pool
- Split out log printing into new show_log function |
92 |
"""Write out human-readable log of commits to this branch. |
93 |
||
527
by Martin Pool
- refactor log command |
94 |
specific_fileid
|
378
by Martin Pool
- New usage bzr log FILENAME |
95 |
If true, list only the commits affecting the specified
|
96 |
file, rather than all commits.
|
|
97 |
||
369
by Martin Pool
- Split out log printing into new show_log function |
98 |
show_timezone
|
99 |
'original' (committer's timezone),
|
|
100 |
'utc' (universal time), or
|
|
101 |
'local' (local user's timezone)
|
|
102 |
||
103 |
verbose
|
|
104 |
If true show added/changed/deleted/renamed files.
|
|
105 |
||
106 |
show_ids
|
|
107 |
If true, show revision and file ids.
|
|
108 |
||
109 |
to_file
|
|
110 |
File to send log to; by default stdout.
|
|
527
by Martin Pool
- refactor log command |
111 |
|
112 |
direction
|
|
113 |
'reverse' (default) is latest to earliest;
|
|
114 |
'forward' is earliest to latest.
|
|
369
by Martin Pool
- Split out log printing into new show_log function |
115 |
"""
|
116 |
from osutils import format_date |
|
117 |
from errors import BzrCheckError |
|
461
by Martin Pool
- remove compare_inventories() in favor of compare_trees() |
118 |
from diff import compare_trees |
369
by Martin Pool
- Split out log printing into new show_log function |
119 |
from textui import show_status |
120 |
||
121 |
if to_file == None: |
|
122 |
import sys |
|
123 |
to_file = sys.stdout |
|
378
by Martin Pool
- New usage bzr log FILENAME |
124 |
|
527
by Martin Pool
- refactor log command |
125 |
if specific_fileid or verbose: |
126 |
raise NotImplementedError('sorry, option not implemented at the moment') |
|
127 |
||
128 |
which_revs = branch.enum_history(direction) |
|
129 |
||
130 |
for revno, revision_id in which_revs: |
|
131 |
# TODO: if filename given, check if it's changed; if not
|
|
132 |
# changed, skip this one
|
|
133 |
||
134 |
# TODO: if verbose, get a list of changes; if we're running
|
|
135 |
# forward then the delta is as compared to the previous
|
|
136 |
# version, otherwise as compared to the *next* version to be
|
|
137 |
# enumerated; in both cases must treat 0 specially as the
|
|
138 |
# empty tree.
|
|
139 |
||
140 |
rev = branch.get_revision(revision_id) |
|
141 |
delta = None |
|
142 |
show_one_log(revno, rev, delta, show_ids, to_file, show_timezone) |
|
143 |
||
144 |
||
145 |
def junk(): |
|
369
by Martin Pool
- Split out log printing into new show_log function |
146 |
precursor = None |
379
by Martin Pool
- Simpler compare_inventories() to possibly replace diff_trees |
147 |
if verbose: |
461
by Martin Pool
- remove compare_inventories() in favor of compare_trees() |
148 |
from tree import EmptyTree |
149 |
prev_tree = EmptyTree() |
|
527
by Martin Pool
- refactor log command |
150 |
for revno, revision_id in which_revs: |
369
by Martin Pool
- Split out log printing into new show_log function |
151 |
precursor = revision_id |
378
by Martin Pool
- New usage bzr log FILENAME |
152 |
|
527
by Martin Pool
- refactor log command |
153 |
if revision_id != rev.revision_id: |
154 |
raise BzrCheckError("retrieved wrong revision: %r" |
|
155 |
% (revision_id, rev.revision_id)) |
|
156 |
||
157 |
if verbose: |
|
158 |
this_tree = branch.revision_tree(revision_id) |
|
159 |
delta = compare_trees(prev_tree, this_tree, want_unchanged=False) |
|
160 |
prev_tree = this_tree |
|
161 |
else: |
|
162 |
delta = None |
|
163 |
||
164 |
||
165 |
||
166 |
def show_one_log(revno, rev, delta, show_ids, to_file, show_timezone): |
|
167 |
from osutils import format_date |
|
168 |
||
169 |
print >>to_file, '-' * 60 |
|
170 |
print >>to_file, 'revno:', revno |
|
171 |
if show_ids: |
|
172 |
print >>to_file, 'revision-id:', rev.revision_id |
|
173 |
print >>to_file, 'committer:', rev.committer |
|
174 |
print >>to_file, 'timestamp: %s' % (format_date(rev.timestamp, rev.timezone or 0, |
|
175 |
show_timezone)) |
|
176 |
||
177 |
print >>to_file, 'message:' |
|
178 |
if not rev.message: |
|
179 |
print >>to_file, ' (no message)' |
|
180 |
else: |
|
181 |
for l in rev.message.split('\n'): |
|
182 |
print >>to_file, ' ' + l |
|
183 |
||
184 |
if delta != None: |
|
185 |
delta.show(to_file, show_ids) |