/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-10-29 11:27:33 UTC
  • mto: This revision was merged to the branch mainline in revision 7170.
  • Revision ID: jelmer@jelmer.uk-20181029112733-bjvm24z12svwl53m
Get rid of file_ids in most of Tree.

Show diffs side-by-side

added added

removed removed

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