threads / patch / 46652

patchvcs-svn/repo_tree.h: remove repo_init declaration

Subject: [PATCH] vcs-svn/repo_tree.h: remove repo_init declaration

## tl;dr

6 messages between Aug 22, 2017 and Aug 23, 2017. Diffs are folded; open one to read it.

replies: 5people: 3as markdown or json

Stefan Beller· Aug 22, 2017, 21:35 UTC · lore

The svn specific declaration of repo_init was not used since 723b7a2789 (vcs-svn: eliminate repo_tree structure, 2010-12-10).

This was noticed when including repository.h via cache.h as that has the same function with a different signature.

Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
---
 vcs-svn/repo_tree.h | 1 -
 1 file changed, 1 deletion(-)
Show changes to vcs-svn/repo_tree.h +0 −1
diff --git a/vcs-svn/repo_tree.h b/vcs-svn/repo_tree.h
index 889c6a3c95..8592beb59b 100644
--- a/vcs-svn/repo_tree.h
+++ b/vcs-svn/repo_tree.h
@@ -17,7 +17,6 @@ void repo_commit(uint32_t revision, const char *author,
 		const struct strbuf *log, const char *uuid, const char *url,
 		long unsigned timestamp);
 void repo_diff(uint32_t r1, uint32_t r2);
-void repo_init(void);
 void repo_reset(void);
 
 #endif
-- 
2.14.0.rc0.3.g6c2e499285
Junio C Hamano· Aug 22, 2017, 22:18 UTC · re: Stefan Beller · lore

Re: [PATCH] vcs-svn/repo_tree.h: remove repo_init declaration

Stefan Beller <sbeller@google.com> writes:
Show 9 quoted lines
> The svn specific declaration of repo_init was not used since 723b7a2789
> (vcs-svn: eliminate repo_tree structure, 2010-12-10).
>
> This was noticed when including repository.h via cache.h as that has the
> same function with a different signature.
>
> Helped-by: Jonathan Nieder <jrnieder@gmail.com>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---

It looks to me that this is a reduced duplicate of what brian posted yesterday. The first two patches in the 6-patch series that you commented on, I think, covers what this change wants to achieve and probably a lot more. I've merged those two already to 'next' and was about to push the result out.

Thanks.
Show 15 quoted lines
>  vcs-svn/repo_tree.h | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/vcs-svn/repo_tree.h b/vcs-svn/repo_tree.h
> index 889c6a3c95..8592beb59b 100644
> --- a/vcs-svn/repo_tree.h
> +++ b/vcs-svn/repo_tree.h
> @@ -17,7 +17,6 @@ void repo_commit(uint32_t revision, const char *author,
>  		const struct strbuf *log, const char *uuid, const char *url,
>  		long unsigned timestamp);
>  void repo_diff(uint32_t r1, uint32_t r2);
> -void repo_init(void);
>  void repo_reset(void);
>  
>  #endif
Stefan Beller· Aug 22, 2017, 22:24 UTC · re: Junio C Hamano · lore

Re: [PATCH] vcs-svn/repo_tree.h: remove repo_init declaration

On Tue, Aug 22, 2017 at 3:18 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 21 quoted lines
> Stefan Beller <sbeller@google.com> writes:
>
>
>> The svn specific declaration of repo_init was not used since 723b7a2789
>> (vcs-svn: eliminate repo_tree structure, 2010-12-10).
>>
>> This was noticed when including repository.h via cache.h as that has the
>> same function with a different signature.
>>
>> Helped-by: Jonathan Nieder <jrnieder@gmail.com>
>> Signed-off-by: Stefan Beller <sbeller@google.com>
>> ---
>
> It looks to me that this is a reduced duplicate of what brian posted
> yesterday.  The first two patches in the 6-patch series that you
> commented on, I think, covers what this change wants to achieve and
> probably a lot more.  I've merged those two already to 'next' and
> was about to push the result out.
>
> Thanks.
>

Ok, thanks. I did not remember reviewing those. (I just wanted to fix my odd compile error here, and currently I build a series on top of jt/packmigrate so I shot off a quick one liner)

Sorry for the noise.
Jonathan Nieder· Aug 22, 2017, 22:54 UTC · re: Junio C Hamano · lore

Re: [PATCH] vcs-svn/repo_tree.h: remove repo_init declaration

Junio C Hamano wrote:
> Stefan Beller <sbeller@google.com> writes:
Show 14 quoted lines
>> The svn specific declaration of repo_init was not used since 723b7a2789
>> (vcs-svn: eliminate repo_tree structure, 2010-12-10).
>>
>> This was noticed when including repository.h via cache.h as that has the
>> same function with a different signature.
>>
>> Helped-by: Jonathan Nieder <jrnieder@gmail.com>
>> Signed-off-by: Stefan Beller <sbeller@google.com>
>
> It looks to me that this is a reduced duplicate of what brian posted
> yesterday.  The first two patches in the 6-patch series that you
> commented on, I think, covers what this change wants to achieve and
> probably a lot more.  I've merged those two already to 'next' and
> was about to push the result out.

Thanks for the pointer. I believe you're referring to https://public-inbox.org/git/20170821000022.26729-2-sandals@crustytoothpaste.net/.

From Stefan's verbal report I was about to send a patch just like Brian's plus some more patches on top to get rid of the rest of repo_tree.h. I can build on top of Brian's patch if that's more convenient.

Regards, Jonathan

Jonathan Nieder· Aug 22, 2017, 23:45 UTC · re: Junio C Hamano · lore

Re: [PATCH] vcs-svn/repo_tree.h: remove repo_init declaration

Junio C Hamano wrote:
> Stefan Beller <sbeller@google.com> writes:
Show 15 quoted lines
>> The svn specific declaration of repo_init was not used since 723b7a2789
>> (vcs-svn: eliminate repo_tree structure, 2010-12-10).
>>
>> This was noticed when including repository.h via cache.h as that has the
>> same function with a different signature.
>>
>> Helped-by: Jonathan Nieder <jrnieder@gmail.com>
>> Signed-off-by: Stefan Beller <sbeller@google.com>
>> ---
>
> It looks to me that this is a reduced duplicate of what brian posted
> yesterday.  The first two patches in the 6-patch series that you
> commented on, I think, covers what this change wants to achieve and
> probably a lot more.  I've merged those two already to 'next' and
> was about to push the result out.

I just sent https://public-inbox.org/git/20170822233732.GX13924@aiede.mtv.corp.google.com/ to fix this more thoroughly. I can rebase on top of bc/vcs-svn-cleanup if that is helpful --- just say the word.

Thanks, Jonathan

Junio C Hamano· Aug 23, 2017, 01:10 UTC · re: Jonathan Nieder · lore

Re: [PATCH] vcs-svn/repo_tree.h: remove repo_init declaration

Jonathan Nieder <jrnieder@gmail.com> writes:
Show 12 quoted lines
> Junio C Hamano wrote:
> ...
>> It looks to me that this is a reduced duplicate of what brian posted
>> yesterday.  The first two patches in the 6-patch series that you
>> commented on, I think, covers what this change wants to achieve and
>> probably a lot more.  I've merged those two already to 'next' and
>> was about to push the result out.
>
> I just sent
> https://public-inbox.org/git/20170822233732.GX13924@aiede.mtv.corp.google.com/
> to fix this more thoroughly.  I can rebase on top of bc/vcs-svn-cleanup
> if that is helpful --- just say the word.

Yup, as I merged those two preliminary clean-up separately to 'next' already, it would be more efficient to build on top. I do not know what you are planning with the other patches (I only saw Stefan's one, not your series) so do not yet have suggestion on how to work well with Brian's series that builds on his two clean-up patches. Hopefully they are orthogonal?

Thanks.

← back to recent threads