Mercurial > hg
comparison hgext/bookmarks.py @ 11434:86eea1f97eac stable
bookmarks: Use error message consistently
The 'updating bookmark %s failed!' message is better than
'failed to update bookmark %s'. To have more consistent error
messages we use just 'updating bookmarks %s failed'.
| author | David Soria Parra <dsp@php.net> |
|---|---|
| date | Wed, 23 Jun 2010 11:53:59 +0200 |
| parents | cac256790aa4 |
| children | 5fe4302cfd72 |
comparison
equal
deleted
inserted
replaced
| 11433:2186124f08e4 | 11434:86eea1f97eac |
|---|---|
| 325 if cl in cr.descendants(): | 325 if cl in cr.descendants(): |
| 326 r = remote.pushkey('bookmarks', k, nr, nl) | 326 r = remote.pushkey('bookmarks', k, nr, nl) |
| 327 if r: | 327 if r: |
| 328 self.ui.status(_("updating bookmark %s\n") % k) | 328 self.ui.status(_("updating bookmark %s\n") % k) |
| 329 else: | 329 else: |
| 330 self.ui.warn(_("failed to update bookmark" | 330 self.ui.warn(_('updating bookmark %s' |
| 331 " %s!\n") % k) | 331 ' failed!\n') % k) |
| 332 | 332 |
| 333 return result | 333 return result |
| 334 | 334 |
| 335 def addchangegroup(self, source, srctype, url, emptyok=False): | 335 def addchangegroup(self, source, srctype, url, emptyok=False): |
| 336 parents = self.dirstate.parents() | 336 parents = self.dirstate.parents() |