Mercurial > hg
comparison hgext/bookmarks.py @ 13307:7f2b8aac7bdc stable
bookmarks: respect rollbacks dryrun parameter
| author | David Soria Parra <dsp@php.net> |
|---|---|
| date | Thu, 27 Jan 2011 02:58:48 +0100 |
| parents | 146bad852ede |
| children | 0c493e5ce8e9 |
comparison
equal
deleted
inserted
replaced
| 13306:146bad852ede | 13307:7f2b8aac7bdc |
|---|---|
| 259 if mark == '': | 259 if mark == '': |
| 260 mark = None | 260 mark = None |
| 261 file.close() | 261 file.close() |
| 262 return mark | 262 return mark |
| 263 | 263 |
| 264 def rollback(self, *args): | 264 def rollback(self, dryrun=False): |
| 265 if os.path.exists(self.join('undo.bookmarks')): | 265 if os.path.exists(self.join('undo.bookmarks')): |
| 266 util.rename(self.join('undo.bookmarks'), self.join('bookmarks')) | 266 if not dryrun: |
| 267 return super(bookmark_repo, self).rollback(*args) | 267 util.rename(self.join('undo.bookmarks'), self.join('bookmarks')) |
| 268 elif not os.path.exists(self.sjoin("undo")): | |
| 269 # avoid "no rollback information available" message | |
| 270 return 0 | |
| 271 return super(bookmark_repo, self).rollback(dryrun) | |
| 268 | 272 |
| 269 def lookup(self, key): | 273 def lookup(self, key): |
| 270 if key in self._bookmarks: | 274 if key in self._bookmarks: |
| 271 key = self._bookmarks[key] | 275 key = self._bookmarks[key] |
| 272 return super(bookmark_repo, self).lookup(key) | 276 return super(bookmark_repo, self).lookup(key) |