move show_pack_info() where it belongs
This is called when verify_pack() has its verbose argument set, and verbose in this context makes sense only for the actual 'git verify-pack' command. Therefore let's move show_pack_info() to builtin-verify-pack.c instead and remove useless verbose argument from verify_pack(). Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nicolas Pitre committed
Jun 24, 2008 at 23:18 UTC
77d3ecee85dbf354d2059d7ef65d788d90db3efa
6 files changed
+67
-70
builtin-fsck.c
+1
-1
@@ -585,7 +585,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
585
prepare_packed_git();
586
for (p = packed_git; p; p = p->next)
587
/* verify gives error messages itself */
588
- verify_pack(p, 0);
588
+ verify_pack(p);
589
590
for (p = packed_git; p; p = p->next) {
591
uint32_t j, num;
builtin-verify-pack.c
+62
-1
@@ -2,6 +2,58 @@
2
#include "cache.h"
3
#include "pack.h"
4
5
+
6
+#define MAX_CHAIN 50
7
+
8
+static void show_pack_info(struct packed_git *p)
9
+{
10
+ uint32_t nr_objects, i, chain_histogram[MAX_CHAIN+1];
11
+
12
+ nr_objects = p->num_objects;
13
+ memset(chain_histogram, 0, sizeof(chain_histogram));
14
+
15
+ for (i = 0; i < nr_objects; i++) {
16
+ const unsigned char *sha1;
17
+ unsigned char base_sha1[20];
18
+ const char *type;
19
+ unsigned long size;
20
+ unsigned long store_size;
21
+ off_t offset;
22
+ unsigned int delta_chain_length;
23
+
24
+ sha1 = nth_packed_object_sha1(p, i);
25
+ if (!sha1)
26
+ die("internal error pack-check nth-packed-object");
27
+ offset = nth_packed_object_offset(p, i);
28
+ type = packed_object_info_detail(p, offset, &size, &store_size,
29
+ &delta_chain_length,
30
+ base_sha1);
31
+ printf("%s ", sha1_to_hex(sha1));
32
+ if (!delta_chain_length)
33
+ printf("%-6s %lu %lu %"PRIuMAX"\n",
34
+ type, size, store_size, (uintmax_t)offset);
35
+ else {
36
+ printf("%-6s %lu %lu %"PRIuMAX" %u %s\n",
37
+ type, size, store_size, (uintmax_t)offset,
38
+ delta_chain_length, sha1_to_hex(base_sha1));
39
+ if (delta_chain_length <= MAX_CHAIN)
40
+ chain_histogram[delta_chain_length]++;
41
+ else
42
+ chain_histogram[0]++;
43
+ }
44
+ }
45
+
46
+ for (i = 0; i <= MAX_CHAIN; i++) {
47
+ if (!chain_histogram[i])
48
+ continue;
49
+ printf("chain length = %d: %d object%s\n", i,
50
+ chain_histogram[i], chain_histogram[i] > 1 ? "s" : "");
51
+ }
52
+ if (chain_histogram[0])
53
+ printf("chain length > %d: %d object%s\n", MAX_CHAIN,
54
+ chain_histogram[0], chain_histogram[0] > 1 ? "s" : "");
55
+}
56
+
57
static int verify_one_pack(const char *path, int verbose)
58
{
59
char arg[PATH_MAX];
@@ -41,7 +93,16 @@ static int verify_one_pack(const char *path, int verbose)
93
return error("packfile %s not found.", arg);
94
95
install_packed_git(pack);
44
- err = verify_pack(pack, verbose);
96
+ err = verify_pack(pack);
97
+
98
+ if (verbose) {
99
+ if (err)
100
+ printf("%s: bad\n", pack->pack_name);
101
+ else {
102
+ show_pack_info(pack);
103
+ printf("%s: ok\n", pack->pack_name);
104
+ }
105
+ }
106
107
return err;
108
}
http-push.c
+1
-1
@@ -783,7 +783,7 @@ static void finish_request(struct transfer_request *request)
783
lst = &((*lst)->next);
784
*lst = (*lst)->next;
785
786
- if (!verify_pack(target, 0))
786
+ if (!verify_pack(target))
787
install_packed_git(target);
788
else
789
remote->can_update_info_refs = 0;
http-walker.c
+1
-1
@@ -795,7 +795,7 @@ static int fetch_pack(struct walker *walker, struct alt_base *repo, unsigned cha
795
lst = &((*lst)->next);
796
*lst = (*lst)->next;
797
798
- if (verify_pack(target, 0))
798
+ if (verify_pack(target))
799
return -1;
800
install_packed_git(target);
801
pack-check.c
+1
-65
@@ -96,62 +96,7 @@ static int verify_packfile(struct packed_git *p,
96
return err;
97
}
98
99
-
100
-#define MAX_CHAIN 50
101
-
102
-static void show_pack_info(struct packed_git *p)
103
-{
104
- uint32_t nr_objects, i, chain_histogram[MAX_CHAIN+1];
105
-
106
- nr_objects = p->num_objects;
107
- memset(chain_histogram, 0, sizeof(chain_histogram));
108
-
109
- for (i = 0; i < nr_objects; i++) {
110
- const unsigned char *sha1;
111
- unsigned char base_sha1[20];
112
- const char *type;
113
- unsigned long size;
114
- unsigned long store_size;
115
- off_t offset;
116
- unsigned int delta_chain_length;
117
-
118
- sha1 = nth_packed_object_sha1(p, i);
119
- if (!sha1)
120
- die("internal error pack-check nth-packed-object");
121
- offset = find_pack_entry_one(sha1, p);
122
- if (!offset)
123
- die("internal error pack-check find-pack-entry-one");
124
-
125
- type = packed_object_info_detail(p, offset, &size, &store_size,
126
- &delta_chain_length,
127
- base_sha1);
128
- printf("%s ", sha1_to_hex(sha1));
129
- if (!delta_chain_length)
130
- printf("%-6s %lu %lu %"PRIuMAX"\n",
131
- type, size, store_size, (uintmax_t)offset);
132
- else {
133
- printf("%-6s %lu %lu %"PRIuMAX" %u %s\n",
134
- type, size, store_size, (uintmax_t)offset,
135
- delta_chain_length, sha1_to_hex(base_sha1));
136
- if (delta_chain_length <= MAX_CHAIN)
137
- chain_histogram[delta_chain_length]++;
138
- else
139
- chain_histogram[0]++;
140
- }
141
- }
142
-
143
- for (i = 0; i <= MAX_CHAIN; i++) {
144
- if (!chain_histogram[i])
145
- continue;
146
- printf("chain length = %d: %d object%s\n", i,
147
- chain_histogram[i], chain_histogram[i] > 1 ? "s" : "");
148
- }
149
- if (chain_histogram[0])
150
- printf("chain length > %d: %d object%s\n", MAX_CHAIN,
151
- chain_histogram[0], chain_histogram[0] > 1 ? "s" : "");
152
-}
153
-
154
-int verify_pack(struct packed_git *p, int verbose)
99
+int verify_pack(struct packed_git *p)
100
{
101
off_t index_size;
102
const unsigned char *index_base;
@@ -177,14 +122,5 @@ int verify_pack(struct packed_git *p, int verbose)
122
err |= verify_packfile(p, &w_curs);
123
unuse_pack(&w_curs);
124
180
- if (verbose) {
181
- if (err)
182
- printf("%s: bad\n", p->pack_name);
183
- else {
184
- show_pack_info(p);
185
- printf("%s: ok\n", p->pack_name);
186
- }
187
- }
188
-
125
return err;
126
}
pack.h
+1
-1
@@ -57,7 +57,7 @@ struct pack_idx_entry {
57
58
extern char *write_idx_file(char *index_name, struct pack_idx_entry **objects, int nr_objects, unsigned char *sha1);
59
60
-extern int verify_pack(struct packed_git *, int);
60
+extern int verify_pack(struct packed_git *);
61
extern void fixup_pack_header_footer(int, unsigned char *, const char *, uint32_t);
62
extern char *index_pack_lockfile(int fd);
63