[Svnmerge] [PATCH] make avail and integrated accepts URLs asarguments

[Mattias Brändström]

Madan U Sreenivasan wrote:
> On Mon, 15 May 2006 13:10:55 +0530, Mattias Brändström  
> <thebrasse at brasse.org> wrote:
> 
>> Giovanni Bajo wrote:
>>
>>> Mattias Brändström wrote:
> 
> [snip]
> 
>> Ok. Here is my patch and a test case for it. I did not change the flag
>> to a string, I think it will be easy enough to change that if it is
>> needed in the future.
> 
> 
> okay, I have a suggestion and a question...
> +        self.svnmerge("avail", error=False, match=r"^9-10$")
> +        self.svnmerge("avail " + url, error=False, match=r"^9-10$")
> +        self.svnmerge("integrated", error=False, match=r"^3-6$")
> +        self.svnmerge("integrated " + url, error=False, match=r"^3-6$")
> 
> suggestion:
> The current code gives out an error saying "... is not a subversion  
> working directory" when an URL is provided for the avail command. With  
> your patch, it wont, so you could make sure of this by using a third  
> argument to self.svnmerge()
> 
> nonmatch = "is not a subversion working directory"

I thought my test made sure that the text printed by svnmerge matches 
exactly '9-10' and '3-6'. This would also mean that svnmerge has not 
said anything about the URL not being a working directory.

> 
> +        self.svnmerge("merge " + url, error=True, match=r"working dir")
> +        self.svnmerge("block " + url, error=True, match=r"working dir")
> +        self.svnmerge("unblock " + url, error=True, match=r"working dir")
> 
> similarly, It would be good if the match parameter for the above three  
> lines could match as specifically as possible against the expected 
> error.  consider
> 
> match = "is not a subversion working directory"
> 
> instead of just matching against just 'working dir'.
> 

Agreed.

> question:
> Why cant merge/block/unblock accept a url? I think url here denotes  
> url at HEAD unless specified otherwise... The destination would anyway be 
> the  cwd, which is expected to be a working copy... sorry if there was 
> a  conversation earlier on this and I missed it.
> 

I am a bit new to svnmerge and don't really follow how this would work. 
Can you provide me with a small example of how svnmerge would be invoked 
in this case and what the effect would be?

:.:: mattias