/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 bzrlib/commit.py

  • Committer: Parth Malwankar
  • Date: 2012-02-20 07:41:09 UTC
  • mto: (7122.6.1 win-symlink-warning)
  • mto: This revision was merged to the branch mainline in revision 7318.
  • Revision ID: parth.malwankar@gmail.com-20120220074109-kdogapw18keyt9gp
commit ignores symlinks on platforms that dont support symlinks

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
64
64
                           ConflictsInTree,
65
65
                           StrictCommitFailed
66
66
                           )
67
 
from bzrlib.osutils import (get_user_encoding,
68
 
                            is_inside_any,
69
 
                            minimum_path_selection,
70
 
                            splitpath,
71
 
                            )
72
 
from bzrlib.trace import mutter, note, is_quiet
 
67
from bzrlib.osutils import (
 
68
    get_user_encoding,
 
69
    has_symlinks,
 
70
    is_inside_any,
 
71
    minimum_path_selection,
 
72
    splitpath,
 
73
    )
 
74
from bzrlib.trace import mutter, note, is_quiet, warning
73
75
from bzrlib.inventory import Inventory, InventoryEntry, make_entry
74
76
from bzrlib import symbol_versioning
75
77
from bzrlib.urlutils import unescape_for_display
722
724
                # 'missing' path
723
725
                if report_changes:
724
726
                    reporter.missing(new_path)
 
727
                if change[6][0] == 'symlink' and not has_symlinks():
 
728
                    warning('Ignoring "%s" as symlinks are not supported on '
 
729
                        'this platform.' % (change[1][0],))
 
730
                    continue
725
731
                deleted_ids.append(change[0])
726
732
                # Reset the new path (None) and new versioned flag (False)
727
733
                change = (change[0], (change[1][0], None), change[2],