/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/plugins/upload/cmds.py

  • Committer: Jelmer Vernooij
  • Date: 2017-11-19 18:35:20 UTC
  • mfrom: (6809.4.27 swap-arguments)
  • Revision ID: jelmer@jelmer.uk-20171119183520-fmw89uw30e0tbhwz
Merge lp:~jelmer/brz/swap-arguments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/upload/cmds.py
153
153
        if self._ignored is None:
154
154
            try:
155
155
                ignore_file_path = '.bzrignore-upload'
156
 
                ignore_file_id = self.tree.path2id(ignore_file_path)
157
 
                ignore_file = self.tree.get_file(ignore_file_id,
158
 
                                                 ignore_file_path)
 
156
                ignore_file = self.tree.get_file(ignore_file_path)
 
157
            except errors.NoSuchFile:
 
158
                ignored_patterns = []
 
159
            else:
159
160
                ignored_patterns = ignores.parse_ignore_file(ignore_file)
160
 
            except errors.NoSuchId:
161
 
                ignored_patterns = []
162
161
            self._ignored = globbing.Globster(ignored_patterns)
163
162
        return self._ignored
164
163
 
177
176
 
178
177
    def upload_file(self, relpath, id, mode=None):
179
178
        if mode is None:
180
 
            if self.tree.is_executable(id):
 
179
            if self.tree.is_executable(relpath, id):
181
180
                mode = 0o775
182
181
            else:
183
182
                mode = 0o664
184
183
        if not self.quiet:
185
184
            self.outf.write('Uploading %s\n' % relpath)
186
 
        self._up_put_bytes(relpath, self.tree.get_file_text(id), mode)
 
185
        self._up_put_bytes(relpath, self.tree.get_file_text(relpath, id), mode)
187
186
 
188
187
    def upload_file_robustly(self, relpath, id, mode=None):
189
188
        """Upload a file, clearing the way on the remote side.