equal
deleted
inserted
replaced
66 relative_name = self._relative_name(name) |
66 relative_name = self._relative_name(name) |
67 # dirstate.state() requires a path relative to the root |
67 # dirstate.state() requires a path relative to the root |
68 # directory. |
68 # directory. |
69 if self._repo.dirstate.state(relative_name) != '?': |
69 if self._repo.dirstate.state(relative_name) != '?': |
70 return |
70 return |
71 if self._ui.verbose: |
71 self._ui.note(name + '\n') |
72 self._ui.status(name + '\n') |
|
73 if self._act: |
72 if self._act: |
74 try: |
73 try: |
75 os.remove(name) |
74 os.remove(name) |
76 except OSError, e: |
75 except OSError, e: |
77 error('"%s" cannot be removed' % name) |
76 error('"%s" cannot be removed' % name) |
78 |
77 |
79 def _remove_dir(self, name): |
78 def _remove_dir(self, name): |
80 if self._ui.verbose: |
79 self._ui.note(name + '\n') |
81 self._ui.status(name + '\n') |
|
82 if self._act: |
80 if self._act: |
83 try: |
81 try: |
84 os.rmdir(name) |
82 os.rmdir(name) |
85 except OSError, e: |
83 except OSError, e: |
86 error('"%s" cannot be removed' % name) |
84 error('"%s" cannot be removed' % name) |