chk debug fix

John Arbash Meinel john at arbash-meinel.com
Wed Dec 3 16:50:53 GMT 2008


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

ATM if you use "-Dpack" during an autopack or otherwise you'll get a bug
with regular repositories (in the brisbane branch).

I went ahead and just committed this fix directly to the branch, since
it is fairly obviously correct. All it does is move the mutter
underneath the "if new_pack.chk_index is not None" check.

John
=:->

=== modified file 'bzrlib/repofmt/pack_repo.py'
- --- bzrlib/repofmt/pack_repo.py 2008-11-20 19:41:26 +0000
+++ bzrlib/repofmt/pack_repo.py 2008-12-03 16:48:57 +0000
@@ -783,12 +783,12 @@
         # the items? How should that interact with stacked repos?
         if new_pack.chk_index is not None:
             self._copy_chks()
- -        if 'pack' in debug.debug_flags:
- -            mutter('%s: create_pack: chk content copied: %s%s %d items
t+%6.3fs',
- -                time.ctime(),
self._pack_collection._upload_transport.base,
- -                new_pack.random_name,
- -                new_pack.chk_index.key_count(),
- -                time.time() - new_pack.start_time)
+            if 'pack' in debug.debug_flags:
+                mutter('%s: create_pack: chk content copied: %s%s %d
items t+%6.3fs',
+                    time.ctime(),
self._pack_collection._upload_transport.base,
+                    new_pack.random_name,
+                    new_pack.chk_index.key_count(),
+                    time.time() - new_pack.start_time)
         self._check_references()
         if not self._use_pack(new_pack):
             new_pack.abort()
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkk2uO0ACgkQJdeBCYSNAAPBwwCfXcUJn7Nn1NzOySXR7BvzBOE3
eOcAoL5TBX6h9z8dzZ4sLnyXjd5S2j+d
=vu/T
-----END PGP SIGNATURE-----



More information about the bazaar mailing list