Mercurial > hg-stable
changeset 3680:69cf255a55a1
Indentation cleanups for 2956948b81f3.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Sun, 19 Nov 2006 16:09:04 +0100 |
| parents | 2956948b81f3 |
| children | 05d877dfd33d |
| files | mercurial/commands.py mercurial/hg.py mercurial/revlog.py |
| diffstat | 3 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Sat Nov 18 17:20:38 2006 -0200 +++ b/mercurial/commands.py Sun Nov 19 16:09:04 2006 +0100 @@ -214,7 +214,7 @@ 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))) + (short(p), short(node))) parent = p else: if opts['parent']:
--- a/mercurial/hg.py Sat Nov 18 17:20:38 2006 -0200 +++ b/mercurial/hg.py Sun Nov 19 16:09:04 2006 +0100 @@ -243,7 +243,7 @@ " you can redo the full merge using:\n" " hg update -C %s\n" " hg merge %s\n") - % (pl[0].rev(), pl[1].rev())) + % (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 17:20:38 2006 -0200 +++ b/mercurial/revlog.py Sun Nov 19 16:09:04 2006 +0100 @@ -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 @@ -915,7 +915,7 @@ p1, p2 = self.parents(node) if node != hash(text, p1, p2): raise RevlogError(_("integrity check failed on %s:%d") - % (self.datafile, rev)) + % (self.datafile, rev)) self.cache = (node, rev, text) return text @@ -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)