/brz/remove-bazaar

To get this branch, use:
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
118
    from textui import show_status
119
120
    if to_file == None:
121
        import sys
122
        to_file = sys.stdout
378 by Martin Pool
- New usage bzr log FILENAME
123
527 by Martin Pool
- refactor log command
124
    which_revs = branch.enum_history(direction)
125
532 by Martin Pool
- put back support for log on specific files
126
    if not (verbose or specific_fileid):
127
        # no need to know what changed between revisions
530 by Martin Pool
- put back verbose log support for reversed logs
128
        with_deltas = deltas_for_log_dummy(branch, which_revs)
129
    elif direction == 'reverse':
130
        with_deltas = deltas_for_log_reverse(branch, which_revs)
131
    else:        
132
        raise NotImplementedError("sorry, verbose forward logs not done yet")
133
134
    for revno, rev, delta in with_deltas:
532 by Martin Pool
- put back support for log on specific files
135
        if specific_fileid:
136
            if not delta.touches_file_id(specific_fileid):
137
                continue
138
        
139
        if not verbose:
140
            # although we calculated it, throw it away without display
141
            delta = None
142
            
527 by Martin Pool
- refactor log command
143
        show_one_log(revno, rev, delta, show_ids, to_file, show_timezone)
144
145
530 by Martin Pool
- put back verbose log support for reversed logs
146
147
def deltas_for_log_dummy(branch, which_revs):
148
    for revno, revision_id in which_revs:
149
        yield revno, branch.get_revision(revision_id), None
150
151
152
def deltas_for_log_reverse(branch, which_revs):
153
    """Compute deltas for display in reverse log.
154
155
    Given a sequence of (revno, revision_id) pairs, return
156
    (revno, rev, delta).
157
158
    The delta is from the given revision to the next one in the
159
    sequence, which makes sense if the log is being displayed from
160
    newest to oldest.
161
    """
162
    from tree import EmptyTree
163
    from diff import compare_trees
164
    
165
    last_revno = last_revision_id = last_tree = None
166
    for revno, revision_id in which_revs:
167
        this_tree = branch.revision_tree(revision_id)
168
        this_revision = branch.get_revision(revision_id)
169
        
170
        if last_revno:
171
            yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
172
173
        last_revno = revno
174
        last_revision = this_revision
175
        last_tree = this_tree
176
177
    if last_revno:
178
        this_tree = EmptyTree()
179
        yield last_revno, last_revision, compare_trees(this_tree, last_tree, False)
180
181
182
527 by Martin Pool
- refactor log command
183
def junk():
369 by Martin Pool
- Split out log printing into new show_log function
184
    precursor = None
379 by Martin Pool
- Simpler compare_inventories() to possibly replace diff_trees
185
    if verbose:
461 by Martin Pool
- remove compare_inventories() in favor of compare_trees()
186
        from tree import EmptyTree
187
        prev_tree = EmptyTree()
527 by Martin Pool
- refactor log command
188
    for revno, revision_id in which_revs:
369 by Martin Pool
- Split out log printing into new show_log function
189
        precursor = revision_id
378 by Martin Pool
- New usage bzr log FILENAME
190
527 by Martin Pool
- refactor log command
191
    if revision_id != rev.revision_id:
192
        raise BzrCheckError("retrieved wrong revision: %r"
193
                            % (revision_id, rev.revision_id))
194
195
    if verbose:
196
        this_tree = branch.revision_tree(revision_id)
197
        delta = compare_trees(prev_tree, this_tree, want_unchanged=False)
198
        prev_tree = this_tree
199
    else:
200
        delta = None    
201
202
203
204
def show_one_log(revno, rev, delta, show_ids, to_file, show_timezone):
205
    from osutils import format_date
206
    
207
    print >>to_file,  '-' * 60
208
    print >>to_file,  'revno:', revno
209
    if show_ids:
210
        print >>to_file,  'revision-id:', rev.revision_id
211
    print >>to_file,  'committer:', rev.committer
212
    print >>to_file,  'timestamp: %s' % (format_date(rev.timestamp, rev.timezone or 0,
213
                                         show_timezone))
214
215
    print >>to_file,  'message:'
216
    if not rev.message:
217
        print >>to_file,  '  (no message)'
218
    else:
219
        for l in rev.message.split('\n'):
220
            print >>to_file,  '  ' + l
221
222
    if delta != None:
223
        delta.show(to_file, show_ids)