/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-12 20:07:32 UTC
  • mto: This revision was merged to the branch mainline in revision 6819.
  • Revision ID: jelmer@jelmer.uk-20171112200732-ehxgen03s9jphe8n
Swap arguments for get_symlink_target and kind/stored_kind.

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_path,
158
 
                                                 ignore_file_id)
 
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