/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-16 15:19:49 UTC
  • mfrom: (7141.7.6 no-file-ids)
  • Revision ID: breezy.the.bot@gmail.com-20181116151949-hrmuv6s7ow1cqdhi
Drop file_id argument from read functions in Tree.

Merged from https://code.launchpad.net/~jelmer/brz/no-file-ids/+merge/357984

Show diffs side-by-side

added added

removed removed

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