# HG changeset patch # User Thomas Arendsen Hein # Date 2008-10-24 13:00:40 # Node ID db6fbb785800d77babe5421417f2ec1540bf35c9 # Parent 7488a1f14e3ce882bfb8324dd1b89c01b7303951 Remove trailing spaces. diff --git a/hgext/convert/__init__.py b/hgext/convert/__init__.py --- a/hgext/convert/__init__.py +++ b/hgext/convert/__init__.py @@ -85,7 +85,7 @@ def convert(ui, src, dest=None, revmapfi 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 --git a/hgext/convert/hg.py b/hgext/convert/hg.py --- a/hgext/convert/hg.py +++ b/hgext/convert/hg.py @@ -267,7 +267,7 @@ class mercurial_source(converter_source) # 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 --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -1894,7 +1894,7 @@ def log(ui, repo, *pats, **opts): break if miss: continue - + copies = [] if opts.get('copies') and rev: for fn in get(rev)[3]: diff --git a/mercurial/store.py b/mercurial/store.py --- a/mercurial/store.py +++ b/mercurial/store.py @@ -279,7 +279,7 @@ class fncachestore(basicstore): 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 --git a/tests/test-convert.out b/tests/test-convert.out --- a/tests/test-convert.out +++ b/tests/test-convert.out @@ -72,7 +72,7 @@ Convert a foreign SCM repository to a Me 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.