Merge lp:~jelmer/brz/python3-grep-all into lp:brz

[Jelmer Vernooij]

Fix all but one of the grep plugin tests on python 3.

Fix all but one of the grep plugin tests on python 3.

[Martin Packman (gz)]

This is all a little messy and we probably need a better scheme for handling tree content, but seems okay for now.

review: Approve

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/land-brz/323/

=== modified file 'breezy/plugins/grep/cmds.py'
--- breezy/plugins/grep/cmds.py	2018-07-07 19:27:38 +0000
+++ breezy/plugins/grep/cmds.py	2018-07-15 09:29:16 +0000
@@ -203,7 +203,7 @@
             re_flags |= re.IGNORECASE
 
         if not fixed_string:
-            patternc = grep.compile_pattern(pattern, re_flags)
+            patternc = grep.compile_pattern(pattern.encode(grep._user_encoding), re_flags)
 
         if color == 'always':
             show_color = True

=== modified file 'breezy/plugins/grep/grep.py'
--- breezy/plugins/grep/grep.py	2018-07-12 00:27:24 +0000
+++ breezy/plugins/grep/grep.py	2018-07-15 09:29:16 +0000
@@ -145,14 +145,13 @@
         self.opts = opts
         self.outf = opts.outf
         if opts.show_color:
-            pat = opts.pattern.encode(_user_encoding, 'replace')
             if opts.fixed_string:
-                self._old = pat
-                self._new = color_string(pat, FG.BOLD_RED)
+                self._old = opts.pattern
+                self._new = color_string(opts.pattern, FG.BOLD_RED)
                 self.get_writer = self._get_writer_fixed_highlighted
             else:
                 flags = opts.patternc.flags
-                self._sub = re.compile(pat.join(("((?:", ")+)")), flags).sub
+                self._sub = re.compile(opts.pattern.join(("((?:", ")+)")), flags).sub
                 self._highlight = color_string("\\1", FG.BOLD_RED)
                 self.get_writer = self._get_writer_regexp_highlighted
         else:
@@ -260,8 +259,8 @@
             start_rev_tuple = (start_revid, start_revno, 0)
             given_revs = [start_rev_tuple]
         repo = branch.repository
-        diff_pattern = re.compile("^[+\\-].*(" + opts.pattern + ")")
-        file_pattern = re.compile("=== (modified|added|removed) file '.*'", re.UNICODE)
+        diff_pattern = re.compile(b"^[+\\-].*(" + opts.pattern.encode(_user_encoding) + b")")
+        file_pattern = re.compile(b"=== (modified|added|removed) file '.*'")
         outputter = _GrepDiffOutputter(opts)
         writeline = outputter.get_writer()
         writerevno = outputter.get_revision_header_writer()
@@ -282,7 +281,7 @@
             old_tree = repo.revision_tree(ancestor_id)
             s = BytesIO()
             diff.show_diff_trees(old_tree, new_tree, s,
-                old_label=b'', new_label=b'')
+                old_label='', new_label='')
             display_revno = True
             display_file = False
             file_header = None
@@ -296,7 +295,7 @@
                         writerevno("=== revno:%s ===" % (revno,))
                         display_revno = False
                     if display_file:
-                        writefileheader("  %s" % (file_header,))
+                        writefileheader("  %s" % (file_header.decode(file_encoding, 'replace'),))
                         display_file = False
                     line = line.decode(file_encoding, 'replace')
                     writeline("    %s" % (line,))
@@ -446,7 +445,7 @@
                 if opts.files_with_matches or opts.files_without_match:
                     # Optimize for wtree list-only as we don't need to read the
                     # entire file
-                    with open(path_for_file, 'r', buffering=4096) as file:
+                    with open(path_for_file, 'rb', buffering=4096) as file:
                         _file_grep_list_only_wtree(file, fp, opts, path_prefix)
                 else:
                     with open(path_for_file, 'rb') as f:
@@ -492,7 +491,7 @@
 
 def _file_grep_list_only_wtree(file, path, opts, path_prefix=None):
     # test and skip binary files
-    if '\x00' in file.read(1024):
+    if b'\x00' in file.read(1024):
         if opts.verbose:
             trace.warning("Binary file '%s' skipped.", path)
         return
@@ -540,16 +539,15 @@
         no_line = opts.files_with_matches or opts.files_without_match
 
         if opts.show_color:
-            pat = opts.pattern.encode(_user_encoding, 'replace')
             if no_line:
                 self.get_writer = self._get_writer_plain
             elif opts.fixed_string:
-                self._old = pat
-                self._new = color_string(pat, FG.BOLD_RED)
+                self._old = opts.pattern
+                self._new = color_string(opts.pattern, FG.BOLD_RED)
                 self.get_writer = self._get_writer_fixed_highlighted
             else:
                 flags = opts.patternc.flags
-                self._sub = re.compile(pat.join(("((?:", ")+)")), flags).sub
+                self._sub = re.compile(opts.pattern.join(("((?:", ")+)")), flags).sub
                 self._highlight = color_string("\\1", FG.BOLD_RED)
                 self.get_writer = self._get_writer_regexp_highlighted
             path_start = FG.MAGENTA
@@ -648,7 +646,7 @@
             found = pattern in file_text
         else:
             search = opts.patternc.search
-            if "$" not in pattern:
+            if b"$" not in pattern:
                 found = search(file_text) is not None
             else:
                 for line in file_text.splitlines():
@@ -685,7 +683,7 @@
         # standard cases, but perhaps could try and detect backtracking
         # patterns here and avoid whole text search in those cases
         search = opts.patternc.search
-        if "$" not in pattern:
+        if b"$" not in pattern:
             # GZ 2010-06-05: Grr, re.MULTILINE can't save us when searching
             #                through revisions as bazaar returns binary mode
             #                and trailing \r breaks $ as line ending match

=== modified file 'breezy/plugins/grep/test_grep.py'
--- breezy/plugins/grep/test_grep.py	2018-07-07 17:57:42 +0000
+++ breezy/plugins/grep/test_grep.py	2018-07-15 09:29:16 +0000
@@ -21,6 +21,7 @@
 import unicodedata as ud
 
 from ... import tests, osutils
+from ...sixish import PY3
 from ..._termcolor import color_string, FG
 
 from ...tests.features import (
@@ -364,17 +365,23 @@
         nref = ud.normalize(u'NFC', u"file0.txt~1:line1\0file0.txt~1:line2\0file0.txt~1:line3\0")
 
         out, err = self.run_bzr(['grep', '-r', 'last:1', '--null', 'line[1-3]'])
-        nout = ud.normalize(u'NFC', out.decode('utf-8', 'ignore'))
+        if not PY3:
+            out = out.decode('utf-8', 'ignore')
+        nout = ud.normalize(u'NFC', out)
         self.assertEqual(nout, nref)
         self.assertEqual(len(out.splitlines()), 1)
 
         out, err = self.run_bzr(['grep', '-r', 'last:1', '-Z', 'line[1-3]'])
-        nout = ud.normalize(u'NFC', out.decode('utf-8', 'ignore'))
+        if not PY3:
+            out = out.decode('utf-8', 'ignore')
+        nout = ud.normalize(u'NFC', out)
         self.assertEqual(nout, nref)
         self.assertEqual(len(out.splitlines()), 1)
 
         out, err = self.run_bzr(['grep', '-r', 'last:1', '--null', 'line'])
-        nout = ud.normalize(u'NFC', out.decode('utf-8', 'ignore'))
+        if not PY3:
+            out = out.decode('utf-8', 'ignore')
+        nout = ud.normalize(u'NFC', out)
         self.assertEqual(nout, nref)
         self.assertEqual(len(out.splitlines()), 1)
 
@@ -2248,6 +2255,5 @@
         """grep -p with zero revisions."""
         out, err = self.run_bzr(['init'])
         out, err = self.run_bzr(['grep', '--diff', 'foo'], 3)
-        self.assertEqual(out, b'')
+        self.assertEqual(out, '')
         self.assertContainsRe(err, "ERROR:.*revision.* does not exist in branch")
-

=== modified file 'python3.passing'
--- python3.passing	2018-07-14 19:36:48 +0000
+++ python3.passing	2018-07-15 09:29:16 +0000
@@ -638,11 +638,73 @@
 breezy.plugins.git.tests.test_workingtree.TreeDeltaFromGitChangesTests.test_empty
 breezy.plugins.git.tests.test_workingtree.TreeDeltaFromGitChangesTests.test_missing
 breezy.plugins.grep.test_grep.TestColorGrep.test_color_option
+breezy.plugins.grep.test_grep.TestColorGrep.test_ver_basic_file
+breezy.plugins.grep.test_grep.TestColorGrep.test_ver_matching_files
+breezy.plugins.grep.test_grep.TestColorGrep.test_wtree_basic_file
+breezy.plugins.grep.test_grep.TestColorGrep.test_wtree_matching_files
+breezy.plugins.grep.test_grep.TestGrepDiff.test_grep_diff_basic
+breezy.plugins.grep.test_grep.TestGrepDiff.test_grep_diff_color
+breezy.plugins.grep.test_grep.TestGrepDiff.test_grep_diff_revision
+breezy.plugins.grep.test_grep.TestGrepDiff.test_grep_diff_revision_range
+breezy.plugins.grep.test_grep.TestGrepDiff.test_grep_norevs
+breezy.plugins.grep.test_grep.TestGrep.test_basic_unknown_file
 breezy.plugins.grep.test_grep.TestGrep.test_dotted_rev_grep
+breezy.plugins.grep.test_grep.TestGrep.test_levels
+breezy.plugins.grep.test_grep.TestGrep.test_multiple_wtree_files
+breezy.plugins.grep.test_grep.TestGrep.test_no_tree
+breezy.plugins.grep.test_grep.TestGrep.test_revno_basic_history_grep_file
+breezy.plugins.grep.test_grep.TestGrep.test_revno_basic_history_grep_full
+breezy.plugins.grep.test_grep.TestGrep.test_revno_range_basic_history_grep
+breezy.plugins.grep.test_grep.TestGrep.test_revno_range_versioned_file_from_outside_dir
+breezy.plugins.grep.test_grep.TestGrep.test_revno_range_versioned_file_in_dir
+breezy.plugins.grep.test_grep.TestGrep.test_revno_versioned_file_in_dir
+breezy.plugins.grep.test_grep.TestGrep.test_revspec
+breezy.plugins.grep.test_grep.TestGrep.test_ver_basic_exclude
+breezy.plugins.grep.test_grep.TestGrep.test_ver_basic_file
+breezy.plugins.grep.test_grep.TestGrep.test_ver_basic_include
+breezy.plugins.grep.test_grep.TestGrep.test_ver_files_with_matches
+breezy.plugins.grep.test_grep.TestGrep.test_ver_files_without_matches
+breezy.plugins.grep.test_grep.TestGrep.test_ver_multiple_files
+breezy.plugins.grep.test_grep.TestGrep.test_ver_null_option
 breezy.plugins.grep.test_grep.TestGrep.test_versioned_binary_file_grep
+breezy.plugins.grep.test_grep.TestGrep.test_versioned_exclude_file_within_dir
+breezy.plugins.grep.test_grep.TestGrep.test_versioned_exclude_from_outside_dir
+breezy.plugins.grep.test_grep.TestGrep.test_versioned_file_in_dir_no_recursive
+breezy.plugins.grep.test_grep.TestGrep.test_versioned_file_in_dir_recurse
+breezy.plugins.grep.test_grep.TestGrep.test_versioned_files_from_outside_dir
+breezy.plugins.grep.test_grep.TestGrep.test_versioned_files_from_outside_two_dirs
+breezy.plugins.grep.test_grep.TestGrep.test_versioned_file_within_dir
+breezy.plugins.grep.test_grep.TestGrep.test_versioned_file_within_dir_two_levels
 breezy.plugins.grep.test_grep.TestGrep.test_versioned_from_root_fail
+breezy.plugins.grep.test_grep.TestGrep.test_versioned_from_root_pass
+breezy.plugins.grep.test_grep.TestGrep.test_versioned_ignore_case_match
+breezy.plugins.grep.test_grep.TestGrep.test_versioned_ignore_case_no_match
+breezy.plugins.grep.test_grep.TestGrep.test_versioned_include_file_within_dir
+breezy.plugins.grep.test_grep.TestGrep.test_versioned_include_from_outside_dir
+breezy.plugins.grep.test_grep.TestGrep.test_versioned_with_line_number
+breezy.plugins.grep.test_grep.TestGrep.test_workingtree_files_from_outside_dir
+breezy.plugins.grep.test_grep.TestGrep.test_wtree_basic_exclude
+breezy.plugins.grep.test_grep.TestGrep.test_wtree_basic_file
+breezy.plugins.grep.test_grep.TestGrep.test_wtree_basic_include
 breezy.plugins.grep.test_grep.TestGrep.test_wtree_binary_file_grep
+breezy.plugins.grep.test_grep.TestGrep.test_wtree_exclude_file_within_dir
+breezy.plugins.grep.test_grep.TestGrep.test_wtree_exclude_from_outside_dir
+breezy.plugins.grep.test_grep.TestGrep.test_wtree_file_in_dir_no_recursive
+breezy.plugins.grep.test_grep.TestGrep.test_wtree_file_in_dir_recurse
+breezy.plugins.grep.test_grep.TestGrep.test_wtree_files_from_outside_dir
+breezy.plugins.grep.test_grep.TestGrep.test_wtree_files_from_outside_two_dirs
+breezy.plugins.grep.test_grep.TestGrep.test_wtree_files_with_matches
+breezy.plugins.grep.test_grep.TestGrep.test_wtree_files_without_matches
+breezy.plugins.grep.test_grep.TestGrep.test_wtree_file_within_dir
+breezy.plugins.grep.test_grep.TestGrep.test_wtree_file_within_dir_two_levels
 breezy.plugins.grep.test_grep.TestGrep.test_wtree_from_root_fail
+breezy.plugins.grep.test_grep.TestGrep.test_wtree_from_root_pass
+breezy.plugins.grep.test_grep.TestGrep.test_wtree_ignore_case_match
+breezy.plugins.grep.test_grep.TestGrep.test_wtree_ignore_case_no_match
+breezy.plugins.grep.test_grep.TestGrep.test_wtree_include_file_within_dir
+breezy.plugins.grep.test_grep.TestGrep.test_wtree_include_from_outside_dir
+breezy.plugins.grep.test_grep.TestGrep.test_wtree_null_option
+breezy.plugins.grep.test_grep.TestGrep.test_wtree_with_line_number
 breezy.plugins.launchpad.test_account.CheckAccountTests.test_check_lp_login_no_ssh_keys
 breezy.plugins.launchpad.test_account.CheckAccountTests.test_check_lp_login_no_user
 breezy.plugins.launchpad.test_account.CheckAccountTests.test_check_lp_login_valid_user
@@ -1212,14 +1274,14 @@
 breezy.tests.blackbox.test_annotate.TestSimpleAnnotate.test_annotate_nonexistant_file
 breezy.tests.blackbox.test_annotate.TestSimpleAnnotate.test_annotate_removed_file
 breezy.tests.blackbox.test_annotate.TestSimpleAnnotate.test_annotate_without_workingtree
-breezy.tests.blackbox.test_bound_branches.TestBind.test_bind_before_bound
-breezy.tests.blackbox.test_bound_branches.TestBind.test_bind_when_bound
-breezy.tests.blackbox.test_bound_branches.TestBoundBranches.test_bind_branch6
 breezy.tests.blackbox.test_bisect.BisectTestCase.testLog
 breezy.tests.blackbox.test_bisect.BisectTestCase.testMove
 breezy.tests.blackbox.test_bisect.BisectTestCase.testRunScript
 breezy.tests.blackbox.test_bisect.BisectTestCase.testWorkflow
 breezy.tests.blackbox.test_bisect.BisectTestCase.testWorkflowSubtree
+breezy.tests.blackbox.test_bound_branches.TestBind.test_bind_before_bound
+breezy.tests.blackbox.test_bound_branches.TestBind.test_bind_when_bound
+breezy.tests.blackbox.test_bound_branches.TestBoundBranches.test_bind_branch6
 breezy.tests.blackbox.test_bound_branches.TestBoundBranches.test_bind_child_ahead
 breezy.tests.blackbox.test_bound_branches.TestBoundBranches.test_bind_diverged
 breezy.tests.blackbox.test_bound_branches.TestBoundBranches.test_bind_fail_if_missing
@@ -1414,19 +1476,19 @@
 breezy.tests.blackbox.test_debug.TestDebugOption.test_dash_derror
 breezy.tests.blackbox.test_debug.TestDebugOption.test_dash_dlock
 breezy.tests.blackbox.test_deleted.TestDeleted.test_deleted_directory
+breezy.tests.blackbox.test_diff.TestCheckoutDiff.test_diff_across_rename
 breezy.tests.blackbox.test_diff.TestCheckoutDiff.test_diff_illegal_revision_specifiers
 breezy.tests.blackbox.test_diff.TestCheckoutDiff.test_diff_nonexistent
 breezy.tests.blackbox.test_diff.TestCheckoutDiff.test_diff_nonexistent_revision
 breezy.tests.blackbox.test_diff.TestCheckoutDiff.test_diff_unversioned
 breezy.tests.blackbox.test_diff.TestCheckoutDiff.test_diff_using_and_format
 breezy.tests.blackbox.test_diff.TestDiffLabels.test_diff_label_renamed
+breezy.tests.blackbox.test_diff.TestDiff.test_diff_across_rename
 breezy.tests.blackbox.test_diff.TestDiff.test_diff_illegal_revision_specifiers
 breezy.tests.blackbox.test_diff.TestDiff.test_diff_nonexistent
 breezy.tests.blackbox.test_diff.TestDiff.test_diff_nonexistent_revision
 breezy.tests.blackbox.test_diff.TestDiff.test_diff_unversioned
 breezy.tests.blackbox.test_diff.TestDiff.test_diff_using_and_format
-breezy.tests.blackbox.test_diff.TestCheckoutDiff.test_diff_across_rename
-breezy.tests.blackbox.test_diff.TestDiff.test_diff_across_rename
 breezy.tests.blackbox.test_diff.TestExternalDiff.test_external_diff_options_and_using
 breezy.tests.blackbox.test_dump_btree.TestDumpBtree.test_dump_empty_btree_raw_smoke
 breezy.tests.blackbox.test_dump_btree.TestDumpBtree.test_dump_empty_btree_smoke
@@ -1543,10 +1605,11 @@
 breezy.tests.blackbox.test_log.MainlineGhostTests.test_log_range
 breezy.tests.blackbox.test_log.MainlineGhostTests.test_log_range_open_begin
 breezy.tests.blackbox.test_log.MainlineGhostTests.test_log_range_open_end
-breezy.tests.blackbox.test_log.TestLogEncodings.test_log_handles_bad_encoding
 breezy.tests.blackbox.test_log.Test_GenerateAllRevisions.test_no_start_rev_id_with_end_rev_id_being_a_merge
 breezy.tests.blackbox.test_log.Test_GenerateAllRevisions.test_not_an_ancestor
 breezy.tests.blackbox.test_log.Test_GenerateAllRevisions.test_wrong_order
+breezy.tests.blackbox.test_log.TestLogEncodings.test_log_handles_bad_encoding
+breezy.tests.blackbox.test_log.TestLogEncodings.test_log_handles_encoding
 breezy.tests.blackbox.test_log.TestLogErrors.test_log_bad_message_re
 breezy.tests.blackbox.test_log.TestLogErrors.test_log_change_incompatible_with_revision
 breezy.tests.blackbox.test_log.TestLogErrors.test_log_change_nonexistent_dotted_revno
@@ -1563,7 +1626,6 @@
 breezy.tests.blackbox.test_log.TestLogErrors.test_log_zero_begin_revspec
 breezy.tests.blackbox.test_log.TestLogErrors.test_log_zero_end_revspec
 breezy.tests.blackbox.test_log.TestLogErrors.test_log_zero_revspec
-breezy.tests.blackbox.test_log.TestLogEncodings.test_log_handles_encoding
 breezy.tests.blackbox.test_log.TestLogExcludeCommonAncestry.test_exclude_common_ancestry_simple_revnos
 breezy.tests.blackbox.test_log.TestLogFile.test_log_file1
 breezy.tests.blackbox.test_log.TestLogFile.test_log_file2
@@ -1639,8 +1701,8 @@
 breezy.tests.blackbox.test_merge.TestMergeRevisionRange.test_merge_reversed_revision_range(whole-tree)
 breezy.tests.blackbox.test_merge.TestMergeScript.test_merge_empty_branch
 breezy.tests.blackbox.test_merge.TestMerge.test_conflict_leaves_base_this_other_files
+breezy.tests.blackbox.test_merge.TestMerge.test_directive_cherrypick
 breezy.tests.blackbox.test_merge.TestMerge.test_merge
-breezy.tests.blackbox.test_merge.TestMerge.test_directive_cherrypick
 breezy.tests.blackbox.test_merge.TestMerge.test_merge_bundle
 breezy.tests.blackbox.test_merge.TestMerge.test_merge_criss_cross
 breezy.tests.blackbox.test_merge.TestMerge.test_merge_defaults_to_reprocess
@@ -1659,10 +1721,10 @@
 breezy.tests.blackbox.test_merge.TestMerge.test_merge_with_missing_file
 breezy.tests.blackbox.test_merge.TestMerge.test_no_remember_dont_set_submit
 breezy.tests.blackbox.test_merge.TestMerge.test_remember_sets_submit
+breezy.tests.blackbox.test_merge.TestMerge.test_weave_cherrypick
+breezy.tests.blackbox.test_merge.TestMerge.test_weave_conflict_leaves_base_this_other_files
 breezy.tests.blackbox.test_missing.TestMissing.test_missing
 breezy.tests.blackbox.test_missing.TestMissing.test_missing_check_last_location
-breezy.tests.blackbox.test_merge.TestMerge.test_weave_cherrypick
-breezy.tests.blackbox.test_merge.TestMerge.test_weave_conflict_leaves_base_this_other_files
 breezy.tests.blackbox.test_missing.TestMissing.test_missing_directory
 breezy.tests.blackbox.test_missing.TestMissing.test_missing_quiet
 breezy.tests.blackbox.test_missing.TestMissing.test_missing_tags
@@ -1910,8 +1972,8 @@
 breezy.tests.blackbox.test_resolve.TestResolve.test_resolve_via_directory_option
 breezy.tests.blackbox.test_revert.TestRevert.test_revert
 breezy.tests.blackbox.test_revert.TestRevert.test_revert_chatter
+breezy.tests.blackbox.test_revert.TestRevert.test_revert_forget_merges
 breezy.tests.blackbox.test_revert.TestRevert.test_revert_in_checkout
-breezy.tests.blackbox.test_revert.TestRevert.test_revert_forget_merges
 breezy.tests.blackbox.test_revert.TestRevert.test_revert_newly_added
 breezy.tests.blackbox.test_revert.TestRevert.test_revert_removing_file
 breezy.tests.blackbox.test_revision_history.TestRevisionHistory.test_revision_history
@@ -1951,8 +2013,8 @@
 breezy.tests.blackbox.test_selftest.TestOptions.test_transport_set_to_memory
 breezy.tests.blackbox.test_selftest.TestOptions.test_transport_set_to_sftp
 breezy.tests.blackbox.test_send.TestSend.test_mailto_child_option
+breezy.tests.blackbox.test_send.TestSend.test_no_common_ancestor
 breezy.tests.blackbox.test_send.TestSend.test_nonexistant_branch
-breezy.tests.blackbox.test_send.TestSend.test_no_common_ancestor
 breezy.tests.blackbox.test_serve.TestBzrServe.test_bzr_serve_dhpss
 breezy.tests.blackbox.test_serve.TestBzrServe.test_bzr_serve_inet_readonly
 breezy.tests.blackbox.test_serve.TestBzrServe.test_bzr_serve_inet_readwrite
@@ -23942,9 +24004,9 @@
 breezy.tests.test_repository.TestRepositoryPackCollection.test_all_packs_none
 breezy.tests.test_repository.TestRepositoryPackCollection.test_all_packs_one
 breezy.tests.test_repository.TestRepositoryPackCollection.test_all_packs_two
+breezy.tests.test_repository.TestRepositoryPackCollection.test_autopack_reloads_and_stops
 breezy.tests.test_repository.TestRepositoryPackCollection.test__clear_obsolete_packs
 breezy.tests.test_repository.TestRepositoryPackCollection.test__clear_obsolete_packs_preserve
-breezy.tests.test_repository.TestRepositoryPackCollection.test_autopack_reloads_and_stops
 breezy.tests.test_repository.TestRepositoryPackCollection.test_ensure_loaded_unlocked
 breezy.tests.test_repository.TestRepositoryPackCollection.test_get_pack_by_name
 breezy.tests.test_repository.TestRepositoryPackCollection.test__max_pack_count