Mercurial > hg
changeset 3679:2956948b81f3
fix warnings generated by pygettext.py.
| author | Marcos Chaves <marcos.nospam@gmail.com> |
|---|---|
| date | Sat, 18 Nov 2006 17:20:38 -0200 |
| parents | 7e622c9a9707 |
| children | 69cf255a55a1 |
| files | hgext/notify.py mercurial/commands.py mercurial/hg.py mercurial/revlog.py |
| diffstat | 4 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/notify.py Sat Nov 18 23:51:15 2006 -0200 +++ b/hgext/notify.py Sat Nov 18 17:20:38 2006 -0200 @@ -259,7 +259,7 @@ changegroup. else send one email per changeset.''' n = notifier(ui, repo, hooktype) if not n.subs: - ui.debug(_('notify: no subscribers to repo %s\n' % n.root)) + ui.debug(_('notify: no subscribers to repo %s\n') % n.root) return if n.skipsource(source): ui.debug(_('notify: changes have source "%s" - skipping\n') %
--- a/mercurial/commands.py Sat Nov 18 23:51:15 2006 -0200 +++ b/mercurial/commands.py Sat Nov 18 17:20:38 2006 -0200 @@ -213,8 +213,8 @@ '--parent')) p = repo.lookup(opts['parent']) if p not in (p1, p2): - raise util.Abort(_('%s is not a parent of %s' % - (short(p), short(node)))) + raise util.Abort(_('%s is not a parent of %s') % + (short(p), short(node))) parent = p else: if opts['parent']: @@ -1969,12 +1969,12 @@ elif misslist is not None: handle(misslist, backupmiss) else: - if exact: ui.warn(_('file not managed: %s\n' % rel)) + if exact: ui.warn(_('file not managed: %s\n') % rel) break else: # file has not changed in dirstate if node == parent: - if exact: ui.warn(_('no changes needed to %s\n' % rel)) + if exact: ui.warn(_('no changes needed to %s\n') % rel) continue if pmf is None: # only need parent manifest in this unlikely case,
--- a/mercurial/hg.py Sat Nov 18 23:51:15 2006 -0200 +++ b/mercurial/hg.py Sat Nov 18 17:20:38 2006 -0200 @@ -242,8 +242,8 @@ repo.ui.status(_("There are unresolved merges," " you can redo the full merge using:\n" " hg update -C %s\n" - " hg merge %s\n" - % (pl[0].rev(), pl[1].rev()))) + " hg merge %s\n") + % (pl[0].rev(), pl[1].rev())) elif remind: repo.ui.status(_("(branch merge, don't forget to commit)\n")) return stats[3]
--- a/mercurial/revlog.py Sat Nov 18 23:51:15 2006 -0200 +++ b/mercurial/revlog.py Sat Nov 18 17:20:38 2006 -0200 @@ -30,7 +30,7 @@ def flagstr(flag): if flag == "inline": return REVLOGNGINLINEDATA - raise RevlogError(_("unknown revlog flag %s" % flag)) + raise RevlogError(_("unknown revlog flag %s") % flag) def hash(text, p1, p2): """generate a hash from the given text and its parent hashes @@ -355,15 +355,15 @@ fmt = v & 0xFFFF if fmt == REVLOGV0: if flags: - raise RevlogError(_("index %s invalid flags %x for format v0" % - (self.indexfile, flags))) + raise RevlogError(_("index %s invalid flags %x for format v0") % + (self.indexfile, flags)) elif fmt == REVLOGNG: if flags & ~REVLOGNGINLINEDATA: - raise RevlogError(_("index %s invalid flags %x for revlogng" % - (self.indexfile, flags))) + raise RevlogError(_("index %s invalid flags %x for revlogng") % + (self.indexfile, flags)) else: - raise RevlogError(_("index %s invalid format %d" % - (self.indexfile, fmt))) + raise RevlogError(_("index %s invalid format %d") % + (self.indexfile, fmt)) self.version = v if v == REVLOGV0: self.indexformat = indexformatv0 @@ -931,8 +931,8 @@ return trinfo = tr.find(self.indexfile) if trinfo == None: - raise RevlogError(_("%s not found in the transaction" % - self.indexfile)) + raise RevlogError(_("%s not found in the transaction") % + self.indexfile) trindex = trinfo[2] dataoff = self.start(trindex)