# HG changeset patch # User Thomas Arendsen Hein # Date 1224853240 -7200 # Node ID db6fbb785800d77babe5421417f2ec1540bf35c9 # Parent 7488a1f14e3ce882bfb8324dd1b89c01b7303951 Remove trailing spaces. diff -r 7488a1f14e3c -r db6fbb785800 hgext/convert/__init__.py --- a/hgext/convert/__init__.py Fri Oct 24 14:58:24 2008 +0200 +++ b/hgext/convert/__init__.py Fri Oct 24 15:00:40 2008 +0200 @@ -85,7 +85,7 @@ Mercurial Source ----------------- - --config convert.hg.ignoreerrors=False (boolean) + --config convert.hg.ignoreerrors=False (boolean) ignore integrity errors when reading. Use it to fix Mercurial repositories with missing revlogs, by converting from and to Mercurial. diff -r 7488a1f14e3c -r db6fbb785800 hgext/convert/hg.py --- a/hgext/convert/hg.py Fri Oct 24 14:58:24 2008 +0200 +++ b/hgext/convert/hg.py Fri Oct 24 15:00:40 2008 +0200 @@ -267,7 +267,7 @@ # getcopies() detects missing revlogs early, run it before # filtering the changes. copies = self.getcopies(ctx, m + a) - changes = [(name, rev) for name in m + a + r + changes = [(name, rev) for name in m + a + r if name not in self.ignored] return util.sort(changes), copies diff -r 7488a1f14e3c -r db6fbb785800 mercurial/commands.py --- a/mercurial/commands.py Fri Oct 24 14:58:24 2008 +0200 +++ b/mercurial/commands.py Fri Oct 24 15:00:40 2008 +0200 @@ -1894,7 +1894,7 @@ break if miss: continue - + copies = [] if opts.get('copies') and rev: for fn in get(rev)[3]: diff -r 7488a1f14e3c -r db6fbb785800 mercurial/store.py --- a/mercurial/store.py Fri Oct 24 14:58:24 2008 +0200 +++ b/mercurial/store.py Fri Oct 24 15:00:40 2008 +0200 @@ -279,7 +279,7 @@ fp.close() def copylist(self): - d = _data + ' dh fncache' + d = _data + ' dh fncache' return (['requires', '00changelog.i'] + [self.pathjoiner('store', f) for f in d.split()]) diff -r 7488a1f14e3c -r db6fbb785800 tests/test-convert.out --- a/tests/test-convert.out Fri Oct 24 14:58:24 2008 +0200 +++ b/tests/test-convert.out Fri Oct 24 15:00:40 2008 +0200 @@ -72,7 +72,7 @@ Mercurial Source ----------------- - --config convert.hg.ignoreerrors=False (boolean) + --config convert.hg.ignoreerrors=False (boolean) ignore integrity errors when reading. Use it to fix Mercurial repositories with missing revlogs, by converting from and to Mercurial.