Mercurial > hgsubversion

changeset 1021:f67f9d28b0ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable.
author Augie Fackler <raf@durin42.com>
date Sun, 23 Jun 2013 18:18:32 -0500
parents c6e9889dba27 (current diff) b5b1fce26f1f (diff)
children 1c9b1d0e0ba3
files hgsubversion/svncommands.py
diffstat 3 files changed, 14 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags
+++ b/.hgtags
@@ -8,3 +8,4 @@ 4bbc6bf947f56a92e95a04a27b94a9f72d5482d7
 0cbf9fd89672e73165e1bb4db1ec8f7f65b95c94 1.3
 07234759a3f750029ccaa001837d42fa12dd33ee 1.4
 77b22e5b4ea6c248e079afd0f1e544cb5690ce20 1.5
+d0f3a5c2cb56ce65d9ef1c611c8bfbebdc3bef34 1.5.1
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,2 @@
-include Makefile hgsubversion/help/*.rst
+include Makefile hgsubversion/help/*.rst tests/fixtures/invalid_utf8.tar.gz
 recursive-include tests *.py *.sh *.svndump *.txt
--- a/hgsubversion/svncommands.py
+++ b/hgsubversion/svncommands.py
@@ -135,7 +135,12 @@ def _buildmeta(ui, repo, args, partial=F
     # changesets that close a branch, and store their first parent
     for rev in xrange(startrev, len(repo)):
         util.progress(ui, 'prepare', rev - startrev, total=numrevs)
-        ctx = repo[rev]
+        try:
+            ctx = repo[rev]
+        except error.RepoError:
+            # this revision is hidden
+            continue
+
         convinfo = util.getsvnrev(ctx, None)
         if not convinfo:
             continue
@@ -163,7 +168,12 @@ def _buildmeta(ui, repo, args, partial=F
 
     for rev in xrange(startrev, len(repo)):
         util.progress(ui, 'rebuild', rev-startrev, total=numrevs)
-        ctx = repo[rev]
+        try:
+            ctx = repo[rev]
+        except error.RepoError:
+            # this revision is hidden
+            continue
+
         convinfo = util.getsvnrev(ctx, None)
         if not convinfo:
             continue