bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
2052.3.1
by John Arbash Meinel
 Add tests to cleanup the copyright of all source files  | 
1  | 
# Copyright (C) 2005, 2006 Canonical Ltd
 | 
| 
1887.1.1
by Adeodato Simó
 Do not separate paragraphs in the copyright statement with blank lines,  | 
2  | 
#
 | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
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  | 
#
 | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
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  | 
#
 | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
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  | 
||
| 
1185.16.40
by Martin Pool
 todo  | 
17  | 
# TODO: Some kind of command-line display of revision properties: 
 | 
18  | 
# perhaps show them in log -v and allow them as options to the commit command.
 | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
19  | 
|
| 
1590.1.1
by Robert Collins
 Improve common_ancestor performance.  | 
20  | 
|
| 
2598.5.5
by Aaron Bentley
 Convert assertion to deprecation warning  | 
21  | 
from bzrlib import (  | 
22  | 
errors,  | 
|
| 
3228.4.1
by John Arbash Meinel
 deprecate get_revision_graph_with_ghosts and its only caller, common_ancestor.  | 
23  | 
symbol_versioning,  | 
| 
2598.5.5
by Aaron Bentley
 Convert assertion to deprecation warning  | 
24  | 
    )
 | 
| 
1185.16.39
by Martin Pool
 - constraints on revprops  | 
25  | 
from bzrlib.osutils import contains_whitespace  | 
| 
1534.9.1
by Aaron Bentley
 Added progress bars to merge  | 
26  | 
from bzrlib.progress import DummyProgress  | 
| 
8
by mbp at sourcefrog
 store committer's timezone in revision and show  | 
27  | 
|
| 
974.1.90
by Aaron Bentley
 Switched NULL revision ID to 'null:' per robertc's suggestion  | 
28  | 
NULL_REVISION="null:"  | 
| 
1551.9.16
by Aaron Bentley
 Implement Tree.annotate_iter for RevisionTree and WorkingTree  | 
29  | 
CURRENT_REVISION="current:"  | 
| 
974.1.89
by Aaron Bentley
 Fixed merging with multiple roots, by using null as graph root.  | 
30  | 
|
| 
1911.2.1
by John Arbash Meinel
 Cache encode/decode operations, saves memory and time. Especially when committing a new kernel tree with 7.7M new lines to annotate  | 
31  | 
|
| 
802
by Martin Pool
 - Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions  | 
32  | 
class Revision(object):  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
33  | 
"""Single revision on a branch.  | 
34  | 
||
35  | 
    Revisions may know their revision_hash, but only once they've been
 | 
|
36  | 
    written out.  This is not stored because you cannot write the hash
 | 
|
37  | 
    into the file it describes.
 | 
|
38  | 
||
| 
697
by Martin Pool
 - write out parent list for new revisions  | 
39  | 
    After bzr 0.0.5 revisions are allowed to have multiple parents.
 | 
| 
696
by Martin Pool
 - Refactor revision deserialization code  | 
40  | 
|
| 
1313
by Martin Pool
 - rename to Revision.parent_ids to avoid confusion with old usage  | 
41  | 
    parent_ids
 | 
42  | 
        List of parent revision_ids
 | 
|
| 
1185.16.39
by Martin Pool
 - constraints on revprops  | 
43  | 
|
44  | 
    properties
 | 
|
45  | 
        Dictionary of revision properties.  These are attached to the
 | 
|
46  | 
        revision as extra metadata.  The name must be a single 
 | 
|
47  | 
        word; the value can be an arbitrary string.
 | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
48  | 
    """
 | 
| 
696
by Martin Pool
 - Refactor revision deserialization code  | 
49  | 
|
| 
1185.16.35
by Martin Pool
 - stub for revision properties  | 
50  | 
def __init__(self, revision_id, properties=None, **args):  | 
| 
1092.2.25
by Robert Collins
 support ghosts in commits  | 
51  | 
self.revision_id = revision_id  | 
| 
1185.16.35
by Martin Pool
 - stub for revision properties  | 
52  | 
self.properties = properties or {}  | 
| 
1185.16.39
by Martin Pool
 - constraints on revprops  | 
53  | 
self._check_properties()  | 
| 
1313
by Martin Pool
 - rename to Revision.parent_ids to avoid confusion with old usage  | 
54  | 
self.parent_ids = []  | 
| 
1311
by Martin Pool
 - remove RevisionReference; just hold parent ids directly  | 
55  | 
self.parent_sha1s = []  | 
| 
1733.1.4
by Robert Collins
 Cosmetic niceties for debugging, extra comments etc.  | 
56  | 
"""Not used anymore - legacy from for 4."""  | 
| 
1185.42.6
by Jelmer Vernooij
 Don't clear Revision.parent_ids after it has been set from the arguments  | 
57  | 
self.__dict__.update(args)  | 
| 
696
by Martin Pool
 - Refactor revision deserialization code  | 
58  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
59  | 
def __repr__(self):  | 
| 
184
by mbp at sourcefrog
 pychecker fixups  | 
60  | 
return "<Revision id %s>" % self.revision_id  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
61  | 
|
| 
1185
by Martin Pool
 - add xml round-trip test for revisions  | 
62  | 
def __eq__(self, other):  | 
63  | 
if not isinstance(other, Revision):  | 
|
64  | 
return False  | 
|
| 
1092.2.20
by Robert Collins
 symlink and weaves, whaddya know  | 
65  | 
        # FIXME: rbc 20050930 parent_ids are not being compared
 | 
66  | 
return (  | 
|
67  | 
self.inventory_sha1 == other.inventory_sha1  | 
|
| 
1185
by Martin Pool
 - add xml round-trip test for revisions  | 
68  | 
and self.revision_id == other.revision_id  | 
69  | 
and self.timestamp == other.timestamp  | 
|
70  | 
and self.message == other.message  | 
|
71  | 
and self.timezone == other.timezone  | 
|
| 
1185.16.35
by Martin Pool
 - stub for revision properties  | 
72  | 
and self.committer == other.committer  | 
73  | 
and self.properties == other.properties)  | 
|
| 
1185
by Martin Pool
 - add xml round-trip test for revisions  | 
74  | 
|
75  | 
def __ne__(self, other):  | 
|
76  | 
return not self.__eq__(other)  | 
|
77  | 
||
| 
1185.16.39
by Martin Pool
 - constraints on revprops  | 
78  | 
def _check_properties(self):  | 
| 
1732.3.2
by Matthieu Moy
 merge  | 
79  | 
"""Verify that all revision properties are OK."""  | 
| 
1185.16.39
by Martin Pool
 - constraints on revprops  | 
80  | 
for name, value in self.properties.iteritems():  | 
81  | 
if not isinstance(name, basestring) or contains_whitespace(name):  | 
|
82  | 
raise ValueError("invalid property name %r" % name)  | 
|
83  | 
if not isinstance(value, basestring):  | 
|
84  | 
raise ValueError("invalid property value %r for %r" %  | 
|
85  | 
(name, value))  | 
|
86  | 
||
| 
1534.4.49
by Robert Collins
 Provide a revision.get_history(repository) method for generating a synthetic revision history.  | 
87  | 
def get_history(self, repository):  | 
88  | 
"""Return the canonical line-of-history for this revision.  | 
|
89  | 
||
90  | 
        If ghosts are present this may differ in result from a ghost-free
 | 
|
91  | 
        repository.
 | 
|
92  | 
        """
 | 
|
93  | 
current_revision = self  | 
|
94  | 
reversed_result = []  | 
|
95  | 
while current_revision is not None:  | 
|
96  | 
reversed_result.append(current_revision.revision_id)  | 
|
97  | 
if not len (current_revision.parent_ids):  | 
|
98  | 
reversed_result.append(None)  | 
|
99  | 
current_revision = None  | 
|
100  | 
else:  | 
|
101  | 
next_revision_id = current_revision.parent_ids[0]  | 
|
102  | 
current_revision = repository.get_revision(next_revision_id)  | 
|
103  | 
reversed_result.reverse()  | 
|
104  | 
return reversed_result  | 
|
105  | 
||
| 
1740.2.5
by Aaron Bentley
 Merge from bzr.dev  | 
106  | 
def get_summary(self):  | 
107  | 
"""Get the first line of the log message for this revision.  | 
|
108  | 
        """
 | 
|
| 
2671.5.1
by Lukáš Lalinsky
 Strip leading whitespace from the commit message before using the first line as a commit summary.  | 
109  | 
return self.message.lstrip().split('\n', 1)[0]  | 
| 
1740.2.5
by Aaron Bentley
 Merge from bzr.dev  | 
110  | 
|
| 
2671.5.7
by Lukáš Lalinsky
 Rename get_author to get_apparent_author, revert the long log back to displaying the committer.  | 
111  | 
def get_apparent_author(self):  | 
112  | 
"""Return the apparent author of this revision.  | 
|
113  | 
||
114  | 
        If the revision properties contain the author name,
 | 
|
115  | 
        return it. Otherwise return the committer name.
 | 
|
| 
2671.5.2
by Lukáš Lalinsky
 Add Revision.get_author to return the author's name, either from the property 'author' or the name of the committer.  | 
116  | 
        """
 | 
117  | 
return self.properties.get('author', self.committer)  | 
|
118  | 
||
| 
1268
by Martin Pool
 - is_ancestor now works by looking at the Branch's stored ancestry  | 
119  | 
|
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
120  | 
def iter_ancestors(revision_id, revision_source, only_present=False):  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
121  | 
ancestors = (revision_id,)  | 
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
122  | 
distance = 0  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
123  | 
while len(ancestors) > 0:  | 
124  | 
new_ancestors = []  | 
|
125  | 
for ancestor in ancestors:  | 
|
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
126  | 
if not only_present:  | 
127  | 
yield ancestor, distance  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
128  | 
try:  | 
129  | 
revision = revision_source.get_revision(ancestor)  | 
|
| 
1773.4.1
by Martin Pool
 Add pyflakes makefile target; fix many warnings  | 
130  | 
except errors.NoSuchRevision, e:  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
131  | 
if e.revision == revision_id:  | 
132  | 
                    raise 
 | 
|
133  | 
else:  | 
|
134  | 
                    continue
 | 
|
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
135  | 
if only_present:  | 
136  | 
yield ancestor, distance  | 
|
| 
1313
by Martin Pool
 - rename to Revision.parent_ids to avoid confusion with old usage  | 
137  | 
new_ancestors.extend(revision.parent_ids)  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
138  | 
ancestors = new_ancestors  | 
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
139  | 
distance += 1  | 
140  | 
||
141  | 
||
142  | 
def find_present_ancestors(revision_id, revision_source):  | 
|
| 
1133
by Martin Pool
 doc  | 
143  | 
"""Return the ancestors of a revision present in a branch.  | 
144  | 
||
145  | 
    It's possible that a branch won't have the complete ancestry of
 | 
|
146  | 
    one of its revisions.  
 | 
|
147  | 
||
148  | 
    """
 | 
|
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
149  | 
found_ancestors = {}  | 
150  | 
anc_iter = enumerate(iter_ancestors(revision_id, revision_source,  | 
|
151  | 
only_present=True))  | 
|
152  | 
for anc_order, (anc_id, anc_distance) in anc_iter:  | 
|
| 
1963.2.1
by Robey Pointer
 remove usage of has_key()  | 
153  | 
if anc_id not in found_ancestors:  | 
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
154  | 
found_ancestors[anc_id] = (anc_order, anc_distance)  | 
155  | 
return found_ancestors  | 
|
156  | 
||
| 
1153
by Martin Pool
 - clean up some code in revision.py  | 
157  | 
|
158  | 
def __get_closest(intersection):  | 
|
159  | 
intersection.sort()  | 
|
160  | 
matches = []  | 
|
161  | 
for entry in intersection:  | 
|
162  | 
if entry[0] == intersection[0][0]:  | 
|
163  | 
matches.append(entry[2])  | 
|
164  | 
return matches  | 
|
165  | 
||
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
166  | 
|
| 
2229.2.3
by Aaron Bentley
 change reserved_id to is_reserved_id, add check_not_reserved for DRY  | 
167  | 
def is_reserved_id(revision_id):  | 
| 
2229.2.2
by Aaron Bentley
 Update docs  | 
168  | 
"""Determine whether a revision id is reserved  | 
169  | 
||
170  | 
    :return: True if the revision is is reserved, False otherwise
 | 
|
171  | 
    """
 | 
|
172  | 
return isinstance(revision_id, basestring) and revision_id.endswith(':')  | 
|
| 
2229.2.3
by Aaron Bentley
 change reserved_id to is_reserved_id, add check_not_reserved for DRY  | 
173  | 
|
174  | 
||
175  | 
def check_not_reserved_id(revision_id):  | 
|
176  | 
"""Raise ReservedId if the supplied revision_id is reserved"""  | 
|
177  | 
if is_reserved_id(revision_id):  | 
|
178  | 
raise errors.ReservedId(revision_id)  | 
|
| 
2490.2.5
by Aaron Bentley
 Use GraphWalker.unique_ancestor to determine merge base  | 
179  | 
|
| 
2598.5.2
by Aaron Bentley
 Got all tests passing with Branch returning 'null:' for null revision  | 
180  | 
|
| 
2490.2.5
by Aaron Bentley
 Use GraphWalker.unique_ancestor to determine merge base  | 
181  | 
def ensure_null(revision_id):  | 
| 
2999.1.2
by Ian Clatworthy
 incorporate review feedback including basic blackbox tests  | 
182  | 
"""Ensure only NULL_REVISION is used to represent the null revision"""  | 
| 
2490.2.5
by Aaron Bentley
 Use GraphWalker.unique_ancestor to determine merge base  | 
183  | 
if revision_id is None:  | 
| 
2598.5.16
by Aaron Bentley
 Replace exception with deprecation warning  | 
184  | 
symbol_versioning.warn('NULL_REVISION should be used for the null'  | 
185  | 
' revision instead of None, as of bzr 0.91.',  | 
|
186  | 
DeprecationWarning, stacklevel=2)  | 
|
| 
2490.2.5
by Aaron Bentley
 Use GraphWalker.unique_ancestor to determine merge base  | 
187  | 
return NULL_REVISION  | 
188  | 
else:  | 
|
189  | 
return revision_id  | 
|
| 
2598.5.1
by Aaron Bentley
 Start eliminating the use of None to indicate null revision  | 
190  | 
|
| 
2598.5.2
by Aaron Bentley
 Got all tests passing with Branch returning 'null:' for null revision  | 
191  | 
|
| 
2598.5.1
by Aaron Bentley
 Start eliminating the use of None to indicate null revision  | 
192  | 
def is_null(revision_id):  | 
| 
2598.5.5
by Aaron Bentley
 Convert assertion to deprecation warning  | 
193  | 
if revision_id is None:  | 
194  | 
symbol_versioning.warn('NULL_REVISION should be used for the null'  | 
|
| 
2687.2.2
by Martin Pool
 Fix up other references to 0.19  | 
195  | 
' revision instead of None, as of bzr 0.90.',  | 
| 
2598.5.5
by Aaron Bentley
 Convert assertion to deprecation warning  | 
196  | 
DeprecationWarning, stacklevel=2)  | 
| 
2598.5.1
by Aaron Bentley
 Start eliminating the use of None to indicate null revision  | 
197  | 
return revision_id in (None, NULL_REVISION)  |