brz-git

Merge lp:~jelmer/brz-git/repr into lp:brz-git

  1. repr
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 1892
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz-git/repr
Merge into: lp:brz-git
Diff against target: 62 lines (+15/-8)
2 files modified
tree.py (+15/-4)
xfail (+0/-4)
To merge this branch: bzr merge lp:~jelmer/brz-git/repr
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+342041@code.launchpad.net

Commit message

Add repr implementation to GitTreeFile & GitTreeLink.

Description of the change

Add repr implementation to GitTreeFile & GitTreeLink.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Rubberstamp! Proposer approves of own proposal.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tree.py'
2--- tree.py 2018-03-24 14:11:13 +0000
3+++ tree.py 2018-03-24 15:11:48 +0000
4@@ -101,14 +101,15 @@
5 __slots__ = ['file_id', 'name', 'parent_id', 'text_size', 'text_sha1', 'revision',
6 'executable']
7
8- def __init__(self, file_id, name, parent_id, revision=None):
9+ def __init__(self, file_id, name, parent_id, revision=None, text_size=None,
10+ text_sha1=None, executable=None):
11 self.file_id = file_id
12 self.name = name
13 self.parent_id = parent_id
14 self.revision = revision
15- self.text_size = None
16- self.text_sha1 = None
17- self.executable = None
18+ self.text_size = text_size
19+ self.text_sha1 = text_sha1
20+ self.executable = executable
21
22 @property
23 def kind(self):
24@@ -124,6 +125,11 @@
25 self.text_size == other.text_size and
26 self.executable == other.executable)
27
28+ def __repr__(self):
29+ return "%s(file_id=%r, name=%r, parent_id=%r, revision=%r, text_size=%r, text_sha1=%r, executable=%r)" % (
30+ type(self).__name__, self.file_id, self.name, self.parent_id,
31+ self.revision, self.text_size, self.text_sha1, self.executable)
32+
33 def copy(self):
34 ret = self.__class__(
35 self.file_id, self.name, self.parent_id,
36@@ -158,6 +164,11 @@
37 def text_size(self):
38 return None
39
40+ def __repr__(self):
41+ return "%s(file_id=%r, name=%r, parent_id=%r, revision=%r, symlink_target=%r)" % (
42+ type(self).__name__, self.file_id, self.name, self.parent_id,
43+ self.revision, self.symlink_target)
44+
45 def __eq__(self, other):
46 return (self.kind == other.kind and
47 self.file_id == other.file_id and
48
49=== modified file 'xfail'
50--- xfail 2018-03-24 10:10:30 +0000
51+++ xfail 2018-03-24 15:11:48 +0000
52@@ -44,10 +44,6 @@
53 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_last_modified_revision_after_reparent_dir_changes(GitRepositoryFormat)
54 breezy.tests.per_repository.test_commit_builder.TestCommitBuilder.test_record_delete_record_iter_changes(GitRepositoryFormat)
55 breezy.tests.per_repository.test_repository.TestRepository.test_add_signature_text(GitRepositoryFormat)
56-breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_abc_tree_content_6_no_parents(GitWorkingTreeFormat)
57-breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_tree_with_merged_utf8(GitWorkingTreeFormat)
58-breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_tree_with_subdirs_and_all_content_types(GitWorkingTreeFormat)
59-breezy.tests.per_tree.test_test_trees.TestTreeShapes.test_tree_with_subdirs_and_all_content_types_wo_symlinks(GitWorkingTreeFormat)
60 breezy.tests.per_workingtree.test_annotate_iter.TestAnnotateIter.test_annotate_merge_parent_no_file(GitWorkingTreeFormat)
61 breezy.tests.per_workingtree.test_annotate_iter.TestAnnotateIter.test_annotate_merge_parents(GitWorkingTreeFormat)
62 breezy.tests.per_workingtree.test_annotate_iter.TestAnnotateIter.test_annotate_merge_parent_was_directory(GitWorkingTreeFormat)

Subscribers

People subscribed via source and target branches

to all changes: