/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/bundle/bundle_data.py

  • Committer: Jelmer Vernooij
  • Date: 2017-11-12 17:14:00 UTC
  • mfrom: (6809.1.1 ws_comma)
  • Revision ID: jelmer@jelmer.uk-20171112171400-x19h7e3vw8t0u3w4
Merge lp:~gz/brz/ws_comma

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bundle/bundle_data.py
535
535
        old_path = self._renamed.get(new_path)
536
536
        if old_path is not None:
537
537
            return old_path
538
 
        dirname,basename = os.path.split(new_path)
 
538
        dirname, basename = os.path.split(new_path)
539
539
        # dirname is not '' doesn't work, because
540
540
        # dirname may be a unicode entry, and is
541
541
        # requires the objects to be identical
564
564
            return new_path
565
565
        if new_path in self._renamed:
566
566
            return None
567
 
        dirname,basename = os.path.split(old_path)
 
567
        dirname, basename = os.path.split(old_path)
568
568
        if dirname != '':
569
569
            new_dir = self.new_path(dirname)
570
570
            if new_dir is None: