Refactoring: remove duplicated code
v2 cover Refactoring: remove duplicated code
Hi,
Here is the 2nd iteration of my refactoring patches.
Michael Lukashov (4):
Refactoring: remove duplicated code from builtin-send-pack.c and
transport.c
Refactoring: connect.c: move duplicated code to get_host_and_port
Refactoring: move duplicated code from builtin-pack-objects.c and
fast-import.c to object.c
Refactoring: remove duplicated code from builtin-checkout.c and
merge-recursive.c
builtin-checkout.c | 18 ----- builtin-fetch.c | 20 +++--- builtin-pack-objects.c | 27 ------- builtin-send-pack.c | 190 +---------------------------------------------- connect.c | 83 +++++++-------------- fast-import.c | 23 ------ merge-recursive.c | 2 +- merge-recursive.h | 3 + object.c | 20 +++++ object.h | 9 ++ transport.c | 27 +++---- transport.h | 11 +++ 12 files changed, 101 insertions(+), 332 deletions(-)
PATCH v2 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
print_ref_status
status_abbrev
print_ok_ref_status
print_one_push_status
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
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 | 190 ++------------------------------------------------- transport.c | 27 ++++---- transport.h | 11 +++ 4 files changed, 39 insertions(+), 209 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 +5 -185
226 lines not on this page · raw message
transport.c +13 -14
@@ -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,9 +609,8 @@ 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) +static void print_ref_status (char flag,const char *summary,struct ref *to, +struct ref *from,const char *msg,int porcelain) {if (porcelain) {if (from)
@@ -623,7 +622,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
@@ -687,7 +686,7 @@ static int print_one_push_status(struct ref *ref, const char *dest, int count, ibreak ;case REF_STATUS_UPTODATE :print_ref_status ('=' ,"[up to date]" , ref, - ref->peer_ref,NULL , porcelain); + ref->peer_ref,NULL , porcelain);break ;case REF_STATUS_REJECT_NONFASTFORWARD : print_ref_status('!', "[rejected]", ref, ref->peer_ref,
@@ -711,8 +710,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 +737,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 +1017,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 +1056,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 +1066,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 v2 1/4] Refactoring: remove duplicated code from builtin-send-pack.c and transport.c
builtin-fetch.c static int update_local_ref(struct ref *ref, · line 229
Quoted 13 lines · Michael Lukashov
builtin-fetch.c +1
-1@@ -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);
If you are refactoring, can all of these fetch lines just call print_ref_status, which handles the summary width stuff itself? The push and fetch formats are meant to be quite similar.
-Peff
Re: [PATCH v2 1/4] Refactoring: remove duplicated code from builtin-send-pack.c and transport.c
In reply to Michael LukashovHi,
Quoted 11 lines · On Mon, 15 Feb 2010 23:26:47 +0000 Michael Lukashov…
The following functions are (almost) identical:
verify_remote_names
update_tracking_ref
print_ref_status
status_abbrev
print_ok_ref_status
print_one_push_status
refs_pushed
print_push_status
Quoted 2 lines
Move common versions of these functions to
transport.cand rename them, as suggested by Jeff King and Junio C Hamano
this is misleading. This list should the 4 functions added to transport.h. Some of the functions have been removed entirely from builtin-send-pack.c and aren't renamed at all (eg. print_ref_status, print_one_push_status).
For these, you could put them in another list, and say that "they have been removed entirely and will not be made public, since they are only used internally by print_push_status()."
Quoted 7 lines
transport.c +0
-0@@ -609,9 +609,8 @@ static void update_tracking_ref(struct remote *remote, struct ref *ref, int verb }
transport.c static void update_tracking_ref(struct remote *remote, struct ref *ref, int verb · line 616
Quoted 10 lines
transport.c +2
-3} -#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) +static void print_ref_status (char flag,const char *summary,struct ref *to, +struct ref *from,const char *msg,int porcelain) {if (porcelain) {if (from)
Unrelated whitespace change in the method signature.
transport.c static int print_one_push_status(struct ref *ref, const char *dest, int count, i · line 692
Quoted 9 lines
transport.c +1
-1@@ -687,7 +686,7 @@ static int print_one_push_status(struct ref *ref, const char *dest, int count, ibreak ;case REF_STATUS_UPTODATE :print_ref_status ('=' ,"[up to date]" , ref, - ref->peer_ref,NULL , porcelain); + ref->peer_ref,NULL , porcelain);break ;case REF_STATUS_REJECT_NONFASTFORWARD : print_ref_status('!', "[rejected]", ref, ref->peer_ref,
Unrelated whitespace change.
transport.c static int print_one_push_status(struct ref *ref, const char *dest, int count, i · line 717
Quoted 11 lines
transport.c +2
-2@@ -711,8 +710,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 ;
Unrelated whitespace change for the second line of the signature.
Signature · 2 lines
Cheers, Ray Chuan
PATCH v2 2/4 Refactoring: connect.c: move duplicated code to 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 v2 2/4] Refactoring: connect.c: move duplicated code to get_host_and_port
Quoted 67 lines · * Michael Lukashov ([email protected]) [100215 18:33]:
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 | 83 +++++++++++++++++++++--------------------------------------- 1 files changed, 29 insertions(+), 54 deletions(-)connect.c +22
-12@@ -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,':' );
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>" ;
shouldn't that be 'port = "none";'?
--larry
PATCH v2 3/4 Refactoring: move duplicated code from builtin-pack-objects.c and fast-import.c to object.c
In reply to Michael LukashovThe following functions are duplicated:
encode_header
--- builtin-pack-objects.c | 27 --------------------------- fast-import.c | 23 ----------------------- object.c | 20 ++++++++++++++++++++ object.h | 9 +++++++++ 4 files changed, 29 insertions(+), 50 deletions(-)
builtin-pack-objects.c +0 -27
@@ -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. */
fast-import.c +0 -23
@@ -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,
object.c +20 -0
@@ -268,3 +268,23 @@ void object_array_remove_duplicates(struct object_array *array) array->nr = dst; } } + +int 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; +}
object.h +9 -0
@@ -79,4 +79,13 @@ void add_object_array(struct object *obj, const char *name, struct object_arrayvoid add_object_array_with_mode (struct object *obj,const char *name,struct object_array *array,unsigned mode);void object_array_remove_duplicates (struct object_array *); +/* +* 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_header (enum object_type type,uintmax_t size,unsigned char *hdr); +#endif /* OBJECT_H */
Signature · 1 line
1.7.0.1571.g856c2
Re: [PATCH v2 3/4] Refactoring: move duplicated code from builtin-pack-objects.c and fast-import.c to object.c
Quoted 3 lines · Michael Lukashov
The following functions are duplicated:
encode_header
what are the other duplicated ones ;-)?
Quoted 2 lines
Signed-off-by Michael Lukashov <[email protected]>---
Two comments:
- encode_header() was a perfectly good name for a static function in these two contexts, but when lifted into public namespace, it is not clear enough anymore. It is not clear "header" in what context you are talking about. At least it should be encode_in_pack_object_header();
- Look at what are in object.[ch]; they are all about "object" layer, that sits one level higher in the abstraction on top of the raw object data layer (e.g. read_sha1_file() and friends). This function belongs to a layer that is even lower level than the raw object data (i.e. one particular implementation of the raw object data representations among others).
It looks very out of place. I would say that cache.h and sha1_file.c would probably be a better place, if nobody else finds a better alternative.
Other than that, I agree with the patch, including its choice of types involved.
PATCH v2 4/4 Refactoring: remove duplicated code from builtin-checkout.c and merge-recursive.c
In reply to Michael LukashovThe following functions are duplicated:
fill_mm
--- builtin-checkout.c | 18 ------------------ merge-recursive.c | 2 +- merge-recursive.h | 3 +++ 3 files changed, 4 insertions(+), 19 deletions(-)
builtin-checkout.c +0 -18
@@ -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];
merge-recursive.c +1 -1
@@ -599,7 +599,7 @@ struct merge_file_info merge:1 ; }; -static void fill_mm (const unsigned char *sha1,mmfile_t *mm) +void fill_mm (const unsigned char *sha1,mmfile_t *mm) {unsigned long size;enum object_type type;
merge-recursive.h +3 -0
@@ -2,6 +2,7 @@#define MERGE_RECURSIVE_H #include "string-list.h" +#include "xdiff/xdiff.h" struct merge_options {const char *branch1;
@@ -53,4 +54,6 @@ int merge_recursive_generic(struct merge_options *o,void init_merge_options (struct merge_options *o);struct tree *write_tree_from_memory (struct merge_options *o); +void fill_mm (const unsigned char *sha1,mmfile_t *mm); +#endif
Signature · 1 line
1.7.0.1571.g856c2
Re: [PATCH v2 4/4] Refactoring: remove duplicated code from builtin-checkout.c and merge-recursive.c
merge-recursive.c struct merge_file_info · line 605
Quoted 13 lines · Michael Lukashov
merge-recursive.c +1
-1@@ -599,7 +599,7 @@ struct merge_file_info merge:1 ; }; -static void fill_mm (const unsigned char *sha1,mmfile_t *mm) +void fill_mm (const unsigned char *sha1,mmfile_t *mm) {unsigned long size;enum object_type type;
Isn't a much better home for this function next to read_mmfile() in xdiff-interface.c?
Perhaps it would make sense to morph it into something like this
int read_mmblob(mmfile_t *ptr, const unsigned char *sha1);
for consistency.