Refactoring: remove duplicated code
v3 cover Refactoring: remove duplicated code
Hi,
Here is 3rd iteration of my refactoring patches. These patches take into account suggestions made by Tay Ray Chuan, Johannes Sixt, Jeff King and Junio C Hamano
Michael Lukashov (4):
Refactoring: remove duplicated code from builtin-send-pack.c and
transport.c
Refactoring: connect.c: move duplicated code to a new function
'get_host_and_port'
Refactoring: move duplicated code from builtin-pack-objects.c and
fast-import.c to sha1_file.c
Refactoring: move duplicated code from builtin-checkout.c and
merge-recursive.c to xdiff-interface.c
builtin-checkout.c | 24 +----- builtin-fetch.c | 20 +++--- builtin-pack-objects.c | 31 +------- builtin-send-pack.c | 191 ++---------------------------------------------- cache.h | 8 ++ connect.c | 83 +++++++-------------- fast-import.c | 29 +------- merge-recursive.c | 23 +----- sha1_file.c | 20 +++++ transport.c | 22 +++--- transport.h | 11 +++ xdiff-interface.c | 17 ++++ xdiff-interface.h | 1 + 13 files changed, 123 insertions(+), 357 deletions(-)
PATCH v3 1/4 Refactoring: remove duplicated code from builtin-send-pack.c and transport.c
The following functions are (almost) identical:
verify_remote_names
update_tracking_ref
refs_pushed
print_push_status
Move common versions of these functions to transport.c and rename them, as suggested by Jeff King and Junio C Hamano.
The following functions have been removed entirely from builtin-send-pack.c, since they are only used internally by print_push_status():
print_ref_status
status_abbrev
print_ok_ref_status
print_one_push_status
Also, move #define SUMMARY_WIDTH to transport.h and rename it TRANSPORT_SUMMARY_WIDTH as it is used in builtin-fetch.c and transport.c
--- builtin-fetch.c | 20 +++--- builtin-send-pack.c | 191 ++------------------------------------------------- transport.c | 22 +++--- transport.h | 11 +++ 4 files changed, 37 insertions(+), 207 deletions(-)
builtin-fetch.c +10 -10
@@ -11,6 +11,7 @@#include "run-command.h" #include "parse-options.h" #include "sigchain.h" +#include "transport.h" static const char *const builtin_fetch_usage[] = {"git fetch [options] [<repository> <refspec>...]" ,
@@ -205,7 +206,6 @@ static int s_update_ref(const char *action,return 0 ; } -#define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)#define REFCOL_WIDTH 10 static int update_local_ref(struct ref *ref,
@@ -224,7 +224,7 @@ static int update_local_ref(struct ref *ref,if (!hashcmp (ref->old_sha1, ref->new_sha1)) {if (verbosity >0 ) -sprintf (display,"= %-*s %-*s -> %s" ,SUMMARY_WIDTH , +sprintf (display,"= %-*s %-*s -> %s" ,TRANSPORT_SUMMARY_WIDTH ,"[up to date]" ,REFCOL_WIDTH , remote, pretty_ref);return 0 ;
@@ -239,7 +239,7 @@ static int update_local_ref(struct ref *ref,* the head, and the old value of the head isn't empty... */ sprintf (display,"! %-*s %-*s -> %s (can't fetch in current branch)" , -SUMMARY_WIDTH ,"[rejected]" ,REFCOL_WIDTH , remote, +TRANSPORT_SUMMARY_WIDTH ,"[rejected]" ,REFCOL_WIDTH , remote, pretty_ref);return 1 ; }
@@ -249,7 +249,7 @@ static int update_local_ref(struct ref *ref,int r; r =s_update_ref ("updating tag" , ref,0 );sprintf (display,"%c %-*s %-*s -> %s%s" , r ?'!' :'-' , -SUMMARY_WIDTH ,"[tag update]" ,REFCOL_WIDTH , remote, +TRANSPORT_SUMMARY_WIDTH ,"[tag update]" ,REFCOL_WIDTH , remote, pretty_ref, r ?" (unable to update local ref)" :"" );return r; }
@@ -271,7 +271,7 @@ static int update_local_ref(struct ref *ref, r =s_update_ref (msg, ref,0 );sprintf (display,"%c %-*s %-*s -> %s%s" , r ?'!' :'*' , -SUMMARY_WIDTH , what,REFCOL_WIDTH , remote, pretty_ref, +TRANSPORT_SUMMARY_WIDTH , what,REFCOL_WIDTH , remote, pretty_ref, r ?" (unable to update local ref)" :"" );return r; }
@@ -284,7 +284,7 @@ static int update_local_ref(struct ref *ref,strcat (quickref,find_unique_abbrev (ref->new_sha1,DEFAULT_ABBREV )); r =s_update_ref ("fast-forward" , ref,1 );sprintf (display,"%c %-*s %-*s -> %s%s" , r ?'!' :' ' , -SUMMARY_WIDTH , quickref,REFCOL_WIDTH , remote, +TRANSPORT_SUMMARY_WIDTH , quickref,REFCOL_WIDTH , remote, pretty_ref, r ?" (unable to update local ref)" :"" );return r; }else if (force || ref->force) {
@@ -295,13 +295,13 @@ static int update_local_ref(struct ref *ref,strcat (quickref,find_unique_abbrev (ref->new_sha1,DEFAULT_ABBREV )); r =s_update_ref ("forced-update" , ref,1 );sprintf (display,"%c %-*s %-*s -> %s (%s)" , r ?'!' :'+' , -SUMMARY_WIDTH , quickref,REFCOL_WIDTH , remote, +TRANSPORT_SUMMARY_WIDTH , quickref,REFCOL_WIDTH , remote, pretty_ref, r ?"unable to update local ref" :"forced update" );return r; }else {sprintf (display,"! %-*s %-*s -> %s (non-fast-forward)" , -SUMMARY_WIDTH ,"[rejected]" ,REFCOL_WIDTH , remote, +TRANSPORT_SUMMARY_WIDTH ,"[rejected]" ,REFCOL_WIDTH , remote, pretty_ref);return 1 ; }
@@ -393,7 +393,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name, rc |=update_local_ref (ref, what, note); else sprintf(note, "* %-*s %-*s -> FETCH_HEAD", -SUMMARY_WIDTH , *kind ? kind :"branch" , +TRANSPORT_SUMMARY_WIDTH , *kind ? kind :"branch" , REFCOL_WIDTH, *what ? what : "HEAD");if (*note) {if (verbosity >=0 && !shown_url) {
@@ -514,7 +514,7 @@ static int prune_refs(struct transport *transport, struct ref *ref_map) result |=delete_ref (ref->name,NULL ,0 );if (verbosity >=0 ) {fprintf (stderr," x %-*s %-*s -> %s\n" , -SUMMARY_WIDTH ,"[deleted]" , +TRANSPORT_SUMMARY_WIDTH ,"[deleted]" ,REFCOL_WIDTH ,"(none)" ,prettify_refname (ref->name));warn_dangling_symref (stderr, dangling_msg, ref->name); }
builtin-send-pack.c +6 -185
233 lines not on this page · raw message
transport.c +10 -12
@@ -573,7 +573,7 @@ static int push_had_errors(struct ref *ref)return 0 ; } -static int refs_pushed (struct ref *ref) +int transport_refs_pushed (struct ref *ref) {for (; ref; ref = ref->next) {switch (ref->status) {
@@ -587,7 +587,7 @@ static int refs_pushed(struct ref *ref)return 0 ; } -static void update_tracking_ref (struct remote *remote,struct ref *ref,int verbose) +void transport_update_tracking_ref (struct remote *remote,struct ref *ref,int verbose) {struct refspec rs;
@@ -609,8 +609,6 @@ static void update_tracking_ref(struct remote *remote, struct ref *ref, int verb } } -#define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3) -static void print_ref_status (char flag,const char *summary,struct ref *to,struct ref *from,const char *msg,int porcelain) {if (porcelain) {
@@ -623,7 +621,7 @@ static void print_ref_status(char flag, const char *summary, struct ref *to, strelse fprintf (stdout,"%s\n" , summary); }else { -fprintf (stderr," %c %-*s " , flag,SUMMARY_WIDTH , summary); +fprintf (stderr," %c %-*s " , flag,TRANSPORT_SUMMARY_WIDTH , summary);if (from)fprintf (stderr,"%s -> %s" ,prettify_refname (from->name),prettify_refname (to->name));else
@@ -711,8 +709,8 @@ static int print_one_push_status(struct ref *ref, const char *dest, int count, ireturn 1 ; } -static void print_push_status (const char *dest,struct ref *refs, -int verbose,int porcelain,int * nonfastforward) +void transport_print_push_status (const char *dest,struct ref *refs, +int verbose,int porcelain,int *nonfastforward) {struct ref *ref;int n =0 ;
@@ -738,7 +736,7 @@ static void print_push_status(const char *dest, struct ref *refs, } } -static void verify_remote_names (int nr_heads,const char **heads) +void transport_verify_remote_names (int nr_heads,const char **heads) {int i;
@@ -1018,7 +1016,7 @@ int transport_push(struct transport *transport, int *nonfastforward) { *nonfastforward =0 ; -verify_remote_names (refspec_nr, refspec); +transport_verify_remote_names (refspec_nr, refspec);if (transport->push) {/* Maybe FIXME. But no important transport uses this case. */
@@ -1057,7 +1055,7 @@ int transport_push(struct transport *transport, ret |= err;if (!quiet || err) -print_push_status (transport->url, remote_refs, +transport_print_push_status (transport->url, remote_refs, verbose | porcelain, porcelain, nonfastforward);
@@ -1067,10 +1065,10 @@ int transport_push(struct transport *transport,if (!(flags &TRANSPORT_PUSH_DRY_RUN )) {struct ref *ref;for (ref = remote_refs; ref; ref = ref->next) -update_tracking_ref (transport->remote, ref, verbose); +transport_update_tracking_ref (transport->remote, ref, verbose); } -if (!quiet && !ret && !refs_pushed (remote_refs)) +if (!quiet && !ret && !transport_refs_pushed (remote_refs))fprintf (stderr,"Everything up-to-date\n" );return ret; }
transport.h +11 -0
@@ -92,6 +92,7 @@ struct transport {#define TRANSPORT_PUSH_PORCELAIN 32#define TRANSPORT_PUSH_QUIET 64#define TRANSPORT_PUSH_SET_UPSTREAM 128 +#define TRANSPORT_SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)/* Returns a transport suitable for the url */ struct transport *transport_get (struct remote *,const char *);
@@ -142,4 +143,14 @@ int transport_connect(struct transport *transport, const char *name,/* Transport methods defined outside transport.c */ int transport_helper_init (struct transport *transport,const char *name); +/* common methods used by transport.c and builtin-send-pack.c */ +void transport_verify_remote_names (int nr_heads,const char **heads); + +void transport_update_tracking_ref (struct remote *remote,struct ref *ref,int verbose); + +int transport_refs_pushed (struct ref *ref); + +void transport_print_push_status (const char *dest,struct ref *refs, +int verbose,int porcelain,int *nonfastforward); +#endif
Signature · 1 line
1.7.0.1571.g856c2
Re: [PATCH v3 1/4] Refactoring: remove duplicated code from builtin-send-pack.c and transport.c
Hi,
Quoted 5 lines · Michael Lukashov
[snip]
Also, move #defineSUMMARY_WIDTHtotransport.hand rename itTRANSPORT_SUMMARY_WIDTHas it is used inbuiltin-fetch.candtransport.cSigned-off-by Michael Lukashov <[email protected]>
Apart from the long line in the patch message, looks ok to me.
Signature · 2 lines
Cheers, Ray Chuan
PATCH v3 2/4 Refactoring: connect.c: move duplicated code to a new function 'get_host_and_port'
In reply to Michael LukashovThe following functions:
git_tcp_connect_sock (IPV6 version)
git_tcp_connect_sock (no IPV6 version),
git_proxy_connect
have common block of code. Move it to a new function 'get_host_and_port'
--- connect.c | 83 +++++++++++++++++++++--------------------------------------- 1 files changed, 29 insertions(+), 54 deletions(-)
connect.c +29 -54
@@ -152,6 +152,28 @@ static enum protocol get_protocol(const char *name)#define STR_ (s) # s#define STR (s) STR_(s) +static void get_host_and_port (char **host,const char **port) +{ +char *colon, *end; + +if (*host[0 ] =='[' ) { + end =strchr (*host +1 ,']' ); +if (end) { + *end =0 ; + end++; + (*host)++; + }else + end = *host; + }else + end = *host; + colon =strchr (end,':' ); + +if (colon) { + *colon =0 ; + *port = colon +1 ; + } +} +#ifndef NO_IPV6 static const char *ai_name (const struct addrinfo *ai)
@@ -170,30 +192,14 @@ static const char *ai_name(const struct addrinfo *ai)static int git_tcp_connect_sock (char *host,int flags) {int sockfd =-1 , saved_errno =0 ; -char *colon, *end;const char *port =STR (DEFAULT_GIT_PORT );struct addrinfo hints, *ai0, *ai;int gai;int cnt =0 ; -if (host[0 ] =='[' ) { - end =strchr (host +1 ,']' ); -if (end) { - *end =0 ; - end++; - host++; - }else - end = host; - }else - end = host; - colon =strchr (end,':' ); - -if (colon) { - *colon =0 ; - port = colon +1 ; -if (!*port) - port ="<none>" ; - } +get_host_and_port (&host, &port); +if (!*port) + *port ="<none>" ;memset (&hints,0 ,sizeof (hints)); hints.ai_socktype =SOCK_STREAM ;
@@ -251,30 +257,15 @@ static int git_tcp_connect_sock(char *host, int flags)static int git_tcp_connect_sock (char *host,int flags) {int sockfd =-1 , saved_errno =0 ; -char *colon, *end; -char *port =STR (DEFAULT_GIT_PORT ), *ep; +const char *port =STR (DEFAULT_GIT_PORT ); +char *ep;struct hostent *he;struct sockaddr_in sa;char **ap;unsigned int nport;int cnt; -if (host[0 ] =='[' ) { - end =strchr (host +1 ,']' ); -if (end) { - *end =0 ; - end++; - host++; - }else - end = host; - }else - end = host; - colon =strchr (end,':' ); - -if (colon) { - *colon =0 ; - port = colon +1 ; - } +get_host_and_port (&host, &port);if (flags &CONNECT_VERBOSE )fprintf (stderr,"Looking up %s ... " , host);
@@ -406,26 +397,10 @@ static int git_use_proxy(const char *host)static void git_proxy_connect (int fd[2 ],char *host) {const char *port =STR (DEFAULT_GIT_PORT ); -char *colon, *end;const char *argv[4 ];struct child_process proxy; -if (host[0 ] =='[' ) { - end =strchr (host +1 ,']' ); -if (end) { - *end =0 ; - end++; - host++; - }else - end = host; - }else - end = host; - colon =strchr (end,':' ); - -if (colon) { - *colon =0 ; - port = colon +1 ; - } +get_host_and_port (&host, &port); argv[0 ] = git_proxy_command; argv[1 ] = host;
Signature · 1 line
1.7.0.1571.g856c2
Re: [PATCH v3 2/4] Refactoring: connect.c: move duplicated code to a new function 'get_host_and_port'
Quoted 21 lines · * Michael Lukashov ([email protected]) [100216 18:43]:
connect.c +0
-12@@ -170,30 +192,14 @@ static const char *ai_name(const struct addrinfo *ai)static int git_tcp_connect_sock (char *host,int flags) {int sockfd =-1 , saved_errno =0 ; -char *colon, *end;const char *port =STR (DEFAULT_GIT_PORT );struct addrinfo hints, *ai0, *ai;int gai;int cnt =0 ; -if (host[0 ] =='[' ) { - end =strchr (host +1 ,']' ); -if (end) { - *end =0 ; - end++; - host++; - }else - end = host; - }else - end = host; - colon =strchr (end,':' );
connect.c static const char *ai_name(const struct addrinfo *ai) · line 202
Quoted 10 lines
connect.c +3
-7- -if (colon) { - *colon =0 ; - port = colon +1 ; -if (!*port) - port ="<none>" ; - } +get_host_and_port (&host, &port); +if (!*port) + *port ="<none>" ;
Again, isn't this wrong? This doesn't even compile for me. Shouldn't it be
port = "<none>";
??
What am I missing?
--larry
Re: [PATCH v3 2/4] Refactoring: connect.c: move duplicated code to a new function 'get_host_and_port'
Quoted 36 lines · Larry D'Anna
Quoted 21 lines · * Michael Lukashov ([email protected]) [100216 18:43]:
connect.c +0
-12@@ -170,30 +192,14 @@ static const char *ai_name(const struct addrinfo *ai) static int git_tcp_connect_sock(char *host, int flags) { int sockfd = -1, saved_errno = 0; - char *colon, *end; const char *port = STR(DEFAULT_GIT_PORT); struct addrinfo hints, *ai0, *ai; int gai; int cnt = 0; - if (host[0] == '[') { - end = strchr(host + 1, ']'); - if (end) { - *end = 0; - end++; - host++; - } else - end = host; - } else - end = host; - colon = strchr(end, ':');connect.c static const char *ai_name(const struct addrinfo *ai) · line 202
Quoted 10 lines
connect.c +3
-7- - if (colon) { - *colon = 0; - port = colon + 1; - if (!*port) - port = "<none>"; - } + get_host_and_port(&host, &port); + if (!*port) + *port = "<none>";Again, isn't this wrong? This doesn't even compile for me. Shouldn't it be
Quoted 8 lines
port = "<none>";
??
What am I missing?
--larry
Oops, my bad, sorry.
Strange, my mingw-gcc 4.4.0 compiler didn't issue no errors or warnings. Weird indeed.
I'll send repaired patch later.
PATCH v4 2/4 Refactoring: connect.c: move duplicated code to a new function 'get_host_and_port'
In reply to Larry D'AnnaThe following functions:
git_tcp_connect_sock (IPV6 version)
git_tcp_connect_sock (no IPV6 version),
git_proxy_connect
have common block of code. Move it to a new function 'get_host_and_port'
--- connect.c | 83 +++++++++++++++++++++--------------------------------------- 1 files changed, 29 insertions(+), 54 deletions(-)
connect.c +29 -54
@@ -152,6 +152,28 @@ static enum protocol get_protocol(const char *name)#define STR_ (s) # s#define STR (s) STR_(s) +static void get_host_and_port (char **host,const char **port) +{ +char *colon, *end; + +if (*host[0 ] =='[' ) { + end =strchr (*host +1 ,']' ); +if (end) { + *end =0 ; + end++; + (*host)++; + }else + end = *host; + }else + end = *host; + colon =strchr (end,':' ); + +if (colon) { + *colon =0 ; + *port = colon +1 ; + } +} +#ifndef NO_IPV6 static const char *ai_name (const struct addrinfo *ai)
@@ -170,30 +192,14 @@ static const char *ai_name(const struct addrinfo *ai)static int git_tcp_connect_sock (char *host,int flags) {int sockfd =-1 , saved_errno =0 ; -char *colon, *end;const char *port =STR (DEFAULT_GIT_PORT );struct addrinfo hints, *ai0, *ai;int gai;int cnt =0 ; -if (host[0 ] =='[' ) { - end =strchr (host +1 ,']' ); -if (end) { - *end =0 ; - end++; - host++; - }else - end = host; - }else - end = host; - colon =strchr (end,':' ); - -if (colon) { - *colon =0 ; - port = colon +1 ; -if (!*port) - port ="<none>" ; - } +get_host_and_port (&host, &port); +if (!*port) + port ="<none>" ;memset (&hints,0 ,sizeof (hints)); hints.ai_socktype =SOCK_STREAM ;
@@ -251,30 +257,15 @@ static int git_tcp_connect_sock(char *host, int flags)static int git_tcp_connect_sock (char *host,int flags) {int sockfd =-1 , saved_errno =0 ; -char *colon, *end; -char *port =STR (DEFAULT_GIT_PORT ), *ep; +const char *port =STR (DEFAULT_GIT_PORT ); +char *ep;struct hostent *he;struct sockaddr_in sa;char **ap;unsigned int nport;int cnt; -if (host[0 ] =='[' ) { - end =strchr (host +1 ,']' ); -if (end) { - *end =0 ; - end++; - host++; - }else - end = host; - }else - end = host; - colon =strchr (end,':' ); - -if (colon) { - *colon =0 ; - port = colon +1 ; - } +get_host_and_port (&host, &port);if (flags &CONNECT_VERBOSE )fprintf (stderr,"Looking up %s ... " , host);
@@ -406,26 +397,10 @@ static int git_use_proxy(const char *host)static void git_proxy_connect (int fd[2 ],char *host) {const char *port =STR (DEFAULT_GIT_PORT ); -char *colon, *end;const char *argv[4 ];struct child_process proxy; -if (host[0 ] =='[' ) { - end =strchr (host +1 ,']' ); -if (end) { - *end =0 ; - end++; - host++; - }else - end = host; - }else - end = host; - colon =strchr (end,':' ); - -if (colon) { - *colon =0 ; - port = colon +1 ; - } +get_host_and_port (&host, &port); argv[0 ] = git_proxy_command; argv[1 ] = host;
Signature · 1 line
1.7.0.1571.g856c2
Re: [PATCH v3 2/4] Refactoring: connect.c: move duplicated code to a new function 'get_host_and_port'
In reply to Michael LukashovQuoted 12 lines · Michael Lukashov
The following functions:
git_tcp_connect_sock(IPV6 version)
git_tcp_connect_sock(no IPV6 version),
git_proxy_connecthave common block of code. Move it to a new function '
get_host_and_port'Signed-off-by Michael Lukashov <[email protected]>connect.c +0
-0@@ -170,30 +192,14 @@ static const char *ai_name(const struct addrinfo *ai)static int git_tcp_connect_sock (char *host,int flags)
connect.c static const char *ai_name(const struct addrinfo *ai) · line 202
Quoted 10 lines
connect.c +3
-6-if (colon) { - *colon =0 ; - port = colon +1 ; -if (!*port) - port ="<none>" ; - } +get_host_and_port (&host, &port); +if (!*port) + *port ="<none>" ;
Is this version any different from v2?
I expected that at least this one would have been fixed from the older version.
PATCH v3 3/4 Refactoring: move duplicated code from builtin-pack-objects.c and fast-import.c to sha1_file.c
In reply to Michael LukashovThe following function is duplicated:
encode_header
Move this function to sha1_file.c and rename it 'encode_in_pack_object_header', as suggested by Junio C Hamano
--- builtin-pack-objects.c | 31 ++----------------------------- cache.h | 8 ++++++++ fast-import.c | 29 +++-------------------------- sha1_file.c | 20 ++++++++++++++++++++ 4 files changed, 33 insertions(+), 55 deletions(-)
builtin-pack-objects.c +2 -29
@@ -155,33 +155,6 @@ static unsigned long do_compress(void **pptr, unsigned long size) }/* -* The per-object header is a pretty dense thing, which is -* - first byte: low four bits are "size", then three bits of "type", -* and the high bit is "size continues". -* - each byte afterwards: low seven bits are size continuation, -* with the high bit being "size continues" -*/ -static int encode_header (enum object_type type,unsigned long size,unsigned char *hdr) -{ -int n =1 ; -unsigned char c; - -if (type <OBJ_COMMIT || type >OBJ_REF_DELTA ) -die ("bad type %d" , type); - - c = (type <<4 ) | (size &15 ); - size >>=4 ; -while (size) { - *hdr++ = c |0x80 ; - c = size &0x7f ; - size >>=7 ; - n++; - } - *hdr = c; -return n; -} - -/* * we are going to reuse the existing object data as is. make * sure it is not corrupt. */
@@ -321,7 +294,7 @@ static unsigned long write_object(struct sha1file *f,* The object header is a byte of 'type' followed by zero or * more bytes of length. */ - hdrlen =encode_header (type, size, header); + hdrlen =encode_in_pack_object_header (type, size, header);if (type ==OBJ_OFS_DELTA ) {/*
@@ -372,7 +345,7 @@ static unsigned long write_object(struct sha1file *f,if (entry->delta) type = (allow_ofs_delta && entry->delta->idx.offset) ?OBJ_OFS_DELTA :OBJ_REF_DELTA ; - hdrlen =encode_header (type, entry->size, header); + hdrlen =encode_in_pack_object_header (type, entry->size, header); offset = entry->in_pack_offset; revidx =find_pack_revindex (p, offset);
cache.h +8 -0
@@ -911,6 +911,14 @@ extern void *unpack_entry(struct packed_git *, off_t, enum object_type *, unsignextern unsigned long unpack_object_header_buffer (const unsigned char *buf,unsigned long len,enum object_type *type,unsigned long *sizep);extern unsigned long get_size_from_delta (struct packed_git *,struct pack_window **,off_t );extern const char *packed_object_info_detail (struct packed_git *,off_t ,unsigned long *,unsigned long *,unsigned int *,unsigned char *); +/* +* The per-object header is a pretty dense thing, which is +* - first byte: low four bits are "size", then three bits of "type", +* and the high bit is "size continues". +* - each byte afterwards: low seven bits are size continuation, +* with the high bit being "size continues" +*/ +int encode_in_pack_object_header (enum object_type type,uintmax_t size,unsigned char *hdr);/* Dumb servers support */ extern int update_server_info (int );
fast-import.c +3 -26
@@ -1013,29 +1013,6 @@ static void cycle_packfile(void)start_packfile (); } -static size_t encode_header ( -enum object_type type, -uintmax_t size, -unsigned char *hdr) -{ -int n =1 ; -unsigned char c; - -if (type <OBJ_COMMIT || type >OBJ_REF_DELTA ) -die ("bad type %d" , type); - - c = (type <<4 ) | (size &15 ); - size >>=4 ; -while (size) { - *hdr++ = c |0x80 ; - c = size &0x7f ; - size >>=7 ; - n++; - } - *hdr = c; -return n; -} - static int store_object( enum object_type type, struct strbuf *dat,
@@ -1138,7 +1115,7 @@ static int store_object( delta_count_by_type[type]++; e->depth = last->depth +1 ; - hdrlen =encode_header (OBJ_OFS_DELTA , deltalen, hdr); + hdrlen =encode_in_pack_object_header (OBJ_OFS_DELTA , deltalen, hdr);write_or_die (pack_data->pack_fd, hdr, hdrlen); pack_size += hdrlen;
@@ -1149,7 +1126,7 @@ static int store_object( pack_size +=sizeof (hdr) - pos; }else { e->depth =0 ; - hdrlen =encode_header (type, dat->len, hdr); + hdrlen =encode_in_pack_object_header (type, dat->len, hdr);write_or_die (pack_data->pack_fd, hdr, hdrlen); pack_size += hdrlen; }
@@ -1209,7 +1186,7 @@ static void stream_blob(uintmax_t len, unsigned char *sha1out, uintmax_t mark)memset (&s,0 ,sizeof (s));deflateInit (&s, pack_compression_level); - hdrlen =encode_header (OBJ_BLOB , len, out_buf); + hdrlen =encode_in_pack_object_header (OBJ_BLOB , len, out_buf);if (out_sz <= hdrlen)die ("impossibly large object header" );
sha1_file.c +20 -0
@@ -1475,6 +1475,26 @@ const char *packed_object_info_detail(struct packed_git *p, } } +int encode_in_pack_object_header (enum object_type type,uintmax_t size,unsigned char *hdr) +{ +int n =1 ; +unsigned char c; + +if (type <OBJ_COMMIT || type >OBJ_REF_DELTA ) +die ("bad type %d" , type); + + c = (type <<4 ) | (size &15 ); + size >>=4 ; +while (size) { + *hdr++ = c |0x80 ; + c = size &0x7f ; + size >>=7 ; + n++; + } + *hdr = c; +return n; +} +static int packed_object_info (struct packed_git *p,off_t obj_offset,unsigned long *sizep) {
Signature · 1 line
1.7.0.1571.g856c2
PATCH v3 4/4 Refactoring: move duplicated code from builtin-checkout.c and merge-recursive.c to xdiff-interface.c
In reply to Michael LukashovThe following function is duplicated:
fill_mm
Move it to xdiff-interface.c and rename it 'read_mmblob', as suggested by Junio C Hamano.
Also, change parameters order for consistency.
--- builtin-checkout.c | 24 +++--------------------- merge-recursive.c | 23 +++-------------------- xdiff-interface.c | 17 +++++++++++++++++ xdiff-interface.h | 1 + 4 files changed, 24 insertions(+), 41 deletions(-)
builtin-checkout.c +3 -21
@@ -128,24 +128,6 @@ static int checkout_stage(int stage, struct cache_entry *ce, int pos, (stage == 2) ? "our" : "their"); } -/* NEEDSWORK: share with merge-recursive */ -static void fill_mm (const unsigned char *sha1,mmfile_t *mm) -{ -unsigned long size; -enum object_type type; - -if (!hashcmp (sha1, null_sha1)) { - mm->ptr =xstrdup ("" ); - mm->size =0 ; -return ; - } - - mm->ptr =read_sha1_file (sha1, &type, &size); -if (!mm->ptr || type !=OBJ_BLOB ) -die ("unable to read blob object %s" ,sha1_to_hex (sha1)); - mm->size = size; -} -static int checkout_merged (int pos,struct checkout *state) {struct cache_entry *ce = active_cache[pos];
@@ -163,9 +145,9 @@ static int checkout_merged(int pos, struct checkout *state) ce_stage(active_cache[pos+2]) != 3)return error ("path '%s' does not have all 3 versions" , path); -fill_mm (active_cache[pos]->sha1, &ancestor); -fill_mm (active_cache[pos+1 ]->sha1, &ours); -fill_mm (active_cache[pos+2 ]->sha1, &theirs); +read_mmblob (&ancestor, active_cache[pos]->sha1); +read_mmblob (&ours, active_cache[pos+1 ]->sha1); +read_mmblob (&theirs, active_cache[pos+2 ]->sha1); status =ll_merge (&result_buf, path, &ancestor, &ours,"ours" , &theirs,"theirs" ,0 );
merge-recursive.c +3 -20
@@ -599,23 +599,6 @@ struct merge_file_info merge:1 ; }; -static void fill_mm (const unsigned char *sha1,mmfile_t *mm) -{ -unsigned long size; -enum object_type type; - -if (!hashcmp (sha1, null_sha1)) { - mm->ptr =xstrdup ("" ); - mm->size =0 ; -return ; - } - - mm->ptr =read_sha1_file (sha1, &type, &size); -if (!mm->ptr || type !=OBJ_BLOB ) -die ("unable to read blob object %s" ,sha1_to_hex (sha1)); - mm->size = size; -} - static int merge_3way(struct merge_options *o, mmbuffer_t *result_buf, struct diff_filespec *one,
@@ -653,9 +636,9 @@ static int merge_3way(struct merge_options *o, name2 =xstrdup (mkpath ("%s" , branch2)); } -fill_mm (one->sha1, &orig); -fill_mm (a->sha1, &src1); -fill_mm (b->sha1, &src2); +read_mmblob (&orig, one->sha1); +read_mmblob (&src1, a->sha1); +read_mmblob (&src2, b->sha1); merge_status = ll_merge(result_buf, a->path, &orig, &src1, name1, &src2, name2,
xdiff-interface.c +17 -0
@@ -218,6 +218,23 @@ int read_mmfile(mmfile_t *ptr, const char *filename)return 0 ; } +void read_mmblob (mmfile_t *ptr,const unsigned char *sha1) +{ +unsigned long size; +enum object_type type; + +if (!hashcmp (sha1, null_sha1)) { + ptr->ptr =xstrdup ("" ); + ptr->size =0 ; +return ; + } + + ptr->ptr =read_sha1_file (sha1, &type, &size); +if (!ptr->ptr || type !=OBJ_BLOB ) +die ("unable to read blob object %s" ,sha1_to_hex (sha1)); + ptr->size = size; +} +#define FIRST_FEW_BYTES 8000int buffer_is_binary (const char *ptr,unsigned long size) {
xdiff-interface.h +1 -0
@@ -18,6 +18,7 @@ int parse_hunk_header(char *line, int len, int *ob, int *on, int *nb, int *nn);int read_mmfile (mmfile_t *ptr,const char *filename); +void read_mmblob (mmfile_t *ptr,const unsigned char *sha1);int buffer_is_binary (const char *ptr,unsigned long size);extern void xdiff_set_find_func (xdemitconf_t *xecfg,const char *line,int cflags);
Signature · 1 line
1.7.0.1571.g856c2