/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/git/commit.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-16 18:35:30 UTC
  • mfrom: (7143.15.15 more-cleanups)
  • mto: This revision was merged to the branch mainline in revision 7178.
  • Revision ID: jelmer@jelmer.uk-20181116183530-ue8yx60h5tinl2wy
Merge more-cleanups.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/commit.py
112
112
            if kind[1] == "file":
113
113
                entry.executable = executable[1]
114
114
                blob = Blob()
115
 
                f, st = workingtree.get_file_with_stat(path[1], file_id)
 
115
                f, st = workingtree.get_file_with_stat(path[1])
116
116
                try:
117
117
                    blob.data = f.read()
118
118
                finally:
122
122
                self.store.add_object(blob)
123
123
                sha = blob.id
124
124
            elif kind[1] == "symlink":
125
 
                symlink_target = workingtree.get_symlink_target(
126
 
                    path[1], file_id)
 
125
                symlink_target = workingtree.get_symlink_target(path[1])
127
126
                blob = Blob()
128
127
                blob.data = symlink_target.encode("utf-8")
129
128
                self.store.add_object(blob)
132
131
                st = None
133
132
            elif kind[1] == "tree-reference":
134
133
                sha = read_submodule_head(workingtree.abspath(path[1]))
135
 
                reference_revision = workingtree.get_reference_revision(
136
 
                    path[1], file_id)
 
134
                reference_revision = workingtree.get_reference_revision(path[1])
137
135
                entry.reference_revision = reference_revision
138
136
                st = None
139
137
            else: