equal
deleted
inserted
replaced
58 |
58 |
59 def _error(self, msg): |
59 def _error(self, msg): |
60 if self._abort_on_err: |
60 if self._abort_on_err: |
61 raise util.Abort(msg) |
61 raise util.Abort(msg) |
62 else: |
62 else: |
63 ui.warn('warning: ' + msg + '\n') |
63 self._ui.warn('warning: ' + msg + '\n') |
64 |
64 |
65 def _remove_file(self, name): |
65 def _remove_file(self, name): |
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. |
71 self._ui.note(name + '\n') |
71 self._ui.note(name + '\n') |
72 if self._act: |
72 if self._act: |
73 try: |
73 try: |
74 os.remove(name) |
74 os.remove(name) |
75 except OSError, e: |
75 except OSError, e: |
76 error('"%s" cannot be removed' % name) |
76 self._error('"%s" cannot be removed' % name) |
77 |
77 |
78 def _remove_dir(self, name): |
78 def _remove_dir(self, name): |
79 self._ui.note(name + '\n') |
79 self._ui.note(name + '\n') |
80 if self._act: |
80 if self._act: |
81 try: |
81 try: |
82 os.rmdir(name) |
82 os.rmdir(name) |
83 except OSError, e: |
83 except OSError, e: |
84 error('"%s" cannot be removed' % name) |
84 self._error('"%s" cannot be removed' % name) |
85 |
85 |
86 def _relative_name(self, name): |
86 def _relative_name(self, name): |
87 splitted_path = self._split_path(name)[len(self._hg_root):] |
87 splitted_path = self._split_path(name)[len(self._hg_root):] |
88 return self._join_path(splitted_path) |
88 return self._join_path(splitted_path) |
89 |
89 |