# HG changeset patch # User Patrick Mezard # Date 1334937535 -7200 # Node ID ce5837c64b128038355730d8e2c42aee3438b777 # Parent d4312a6f7a87d4b8230a4d77b4e2f10f15fa5fcf svn verify: display extra and missing files separately diff --git a/hgsubversion/svncommands.py b/hgsubversion/svncommands.py --- a/hgsubversion/svncommands.py +++ b/hgsubversion/svncommands.py @@ -73,8 +73,16 @@ def verify(ui, repo, args=None, **opts): hgfiles = set(ctx) - util.ignoredfiles if hgfiles != svnfiles: - missing = set(hgfiles).symmetric_difference(svnfiles) - ui.write('missing files: %s\n' % (', '.join(sorted(missing)))) + unexpected = hgfiles - svnfiles + if unexpected: + ui.write('unexpected files:\n') + for f in sorted(unexpected): + ui.write(' %s\n' % f) + missing = svnfiles - hgfiles + if missing: + ui.write('missing files:\n') + for f in sorted(missing): + ui.write(' %s\n' % f) result = 1 return result diff --git a/tests/test_utility_commands.py b/tests/test_utility_commands.py --- a/tests/test_utility_commands.py +++ b/tests/test_utility_commands.py @@ -261,7 +261,10 @@ class UtilityTests(test_util.TestBase): self.assertEqual("""\ verifying d51f46a715a1 against file:// difference in file binary2 -missing files: binary1, binary3 +unexpected files: + binary1 +missing files: + binary3 """, output) def suite():