You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by David Glasser <gl...@davidglasser.net> on 2007/09/28 23:34:16 UTC
[PATCH] svnmerge needs to use --non-interactive
In trunk svn, "svn merge" can produce a prompt for conflicts, breaking
svnmerge.py (which hides IO from the user). Ideally, the user should
just be able to use the conflict handler during svnmerge.py's call to
"svn merge", but at the very least it shouldn't hang. This appears to
work:
===================================================================
--- contrib/client-side/svnmerge/svnmerge.py (revision 26831)
+++ contrib/client-side/svnmerge/svnmerge.py (working copy)
@@ -298,7 +298,7 @@ def launchsvn(s, show=False, pretend=Fal
password = " --password=" + password
else:
password = ""
- cmd = opts["svn"] + username + password + " " + s
+ cmd = opts["svn"] + " --non-interactive " + username + password + " " + s
if show or opts["verbose"] >= 2:
print cmd
if pretend:
Should I commit this?
--dave
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] svnmerge needs to use --non-interactive
Posted by "Daniel L. Rall" <dl...@finemaltcoding.com>.
On Sat, 29 Sep 2007, David Glasser wrote:
> On 9/28/07, Daniel L. Rall <dl...@finemaltcoding.com> wrote:
> > On Fri, 28 Sep 2007, Daniel L. Rall wrote:
> >
> > > On Fri, 28 Sep 2007, David Glasser wrote:
> > >
> > > > In trunk svn, "svn merge" can produce a prompt for conflicts, breaking
> > > > svnmerge.py (which hides IO from the user). Ideally, the user should
> > > > just be able to use the conflict handler during svnmerge.py's call to
> > > > "svn merge", but at the very least it shouldn't hang. This appears to
> > > > work:
> > > >
> > > >
> > > > ===================================================================
> > > > --- contrib/client-side/svnmerge/svnmerge.py (revision 26831)
> > > > +++ contrib/client-side/svnmerge/svnmerge.py (working copy)
> > > > @@ -298,7 +298,7 @@ def launchsvn(s, show=False, pretend=Fal
> > > > password = " --password=" + password
> > > > else:
> > > > password = ""
> > > > - cmd = opts["svn"] + username + password + " " + s
> > > > + cmd = opts["svn"] + " --non-interactive " + username + password + " " + s
> > > > if show or opts["verbose"] >= 2:
> > > > print cmd
> > > > if pretend:
> > > >
> > > >
> > > >
> > > > Should I commit this?
> > >
> > > Looks good to me. There is a separate svnmerge.py mailing list;
> > > you might want to run it up the flagpole there as well.
> >
> > Ah, you did include the other list address, sorry for the noise.
>
> Well, I did CC it, but I think I am getting moderated since I'm not on it.
Yes, I didn't see it go through. When I try emailing it from unsub'd
addresses, my mails are immediately rejected (no moderation queue).
Anyhow, Giovanni's comment is good 'nuff for this change.
--
Daniel Rall
Re: [PATCH] svnmerge needs to use --non-interactive
Posted by David Glasser <gl...@davidglasser.net>.
On 9/28/07, Daniel L. Rall <dl...@finemaltcoding.com> wrote:
> On Fri, 28 Sep 2007, Daniel L. Rall wrote:
>
> > On Fri, 28 Sep 2007, David Glasser wrote:
> >
> > > In trunk svn, "svn merge" can produce a prompt for conflicts, breaking
> > > svnmerge.py (which hides IO from the user). Ideally, the user should
> > > just be able to use the conflict handler during svnmerge.py's call to
> > > "svn merge", but at the very least it shouldn't hang. This appears to
> > > work:
> > >
> > >
> > > ===================================================================
> > > --- contrib/client-side/svnmerge/svnmerge.py (revision 26831)
> > > +++ contrib/client-side/svnmerge/svnmerge.py (working copy)
> > > @@ -298,7 +298,7 @@ def launchsvn(s, show=False, pretend=Fal
> > > password = " --password=" + password
> > > else:
> > > password = ""
> > > - cmd = opts["svn"] + username + password + " " + s
> > > + cmd = opts["svn"] + " --non-interactive " + username + password + " " + s
> > > if show or opts["verbose"] >= 2:
> > > print cmd
> > > if pretend:
> > >
> > >
> > >
> > > Should I commit this?
> >
> > Looks good to me. There is a separate svnmerge.py mailing list;
> > you might want to run it up the flagpole there as well.
>
> Ah, you did include the other list address, sorry for the noise.
Well, I did CC it, but I think I am getting moderated since I'm not on it.
--dave
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] svnmerge needs to use --non-interactive
Posted by "Daniel L. Rall" <dl...@finemaltcoding.com>.
On Fri, 28 Sep 2007, Daniel L. Rall wrote:
> On Fri, 28 Sep 2007, David Glasser wrote:
>
> > In trunk svn, "svn merge" can produce a prompt for conflicts, breaking
> > svnmerge.py (which hides IO from the user). Ideally, the user should
> > just be able to use the conflict handler during svnmerge.py's call to
> > "svn merge", but at the very least it shouldn't hang. This appears to
> > work:
> >
> >
> > ===================================================================
> > --- contrib/client-side/svnmerge/svnmerge.py (revision 26831)
> > +++ contrib/client-side/svnmerge/svnmerge.py (working copy)
> > @@ -298,7 +298,7 @@ def launchsvn(s, show=False, pretend=Fal
> > password = " --password=" + password
> > else:
> > password = ""
> > - cmd = opts["svn"] + username + password + " " + s
> > + cmd = opts["svn"] + " --non-interactive " + username + password + " " + s
> > if show or opts["verbose"] >= 2:
> > print cmd
> > if pretend:
> >
> >
> >
> > Should I commit this?
>
> Looks good to me. There is a separate svnmerge.py mailing list;
> you might want to run it up the flagpole there as well.
Ah, you did include the other list address, sorry for the noise.
Re: [PATCH] svnmerge needs to use --non-interactive
Posted by "Daniel L. Rall" <dl...@finemaltcoding.com>.
On Fri, 28 Sep 2007, David Glasser wrote:
> In trunk svn, "svn merge" can produce a prompt for conflicts, breaking
> svnmerge.py (which hides IO from the user). Ideally, the user should
> just be able to use the conflict handler during svnmerge.py's call to
> "svn merge", but at the very least it shouldn't hang. This appears to
> work:
>
>
> ===================================================================
> --- contrib/client-side/svnmerge/svnmerge.py (revision 26831)
> +++ contrib/client-side/svnmerge/svnmerge.py (working copy)
> @@ -298,7 +298,7 @@ def launchsvn(s, show=False, pretend=Fal
> password = " --password=" + password
> else:
> password = ""
> - cmd = opts["svn"] + username + password + " " + s
> + cmd = opts["svn"] + " --non-interactive " + username + password + " " + s
> if show or opts["verbose"] >= 2:
> print cmd
> if pretend:
>
>
>
> Should I commit this?
Looks good to me. There is a separate svnmerge.py mailing list;
you might want to run it up the flagpole there as well.
Re: [PATCH] svnmerge needs to use --non-interactive
Posted by David Glasser <gl...@davidglasser.net>.
On Nov 15, 2007 11:35 AM, Raman Gupta <ro...@fastmail.fm> wrote:
>
>
> Giovanni Bajo wrote:
> >
> > On 10/2/2007 1:12 AM, David Glasser wrote:
> >> Committed the svnmerge patch in r26883.
> >
> > This patch broke svnmerge_test.py because of strict regexp checking in
> > some tests. Would you mind fixing this up?
> >
>
> I fixed svnmerge_test.py in rev 27829.
Thanks Raman. Sorry about that.
--dave
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] svnmerge needs to use --non-interactive
Posted by Raman Gupta <ro...@fastmail.fm>.
Giovanni Bajo wrote:
>
> On 10/2/2007 1:12 AM, David Glasser wrote:
>> Committed the svnmerge patch in r26883.
>
> This patch broke svnmerge_test.py because of strict regexp checking in
> some tests. Would you mind fixing this up?
>
I fixed svnmerge_test.py in rev 27829.
Cheers,
Raman Gupta
--
View this message in context: http://www.nabble.com/-PATCH--svnmerge-needs-to-use---non-interactive-tf4537357.html#a13774820
Sent from the Subversion Dev mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] svnmerge needs to use --non-interactive
Posted by Giovanni Bajo <ra...@develer.com>.
On 10/2/2007 1:12 AM, David Glasser wrote:
>>>>> +1. I hope you have verified that --non-interactive is accepted for "svn
>>>>> merge" by released versions :)
>>>> I'm pretty sure that every version of svn allows "svn merge
>>>> --non-interactive", although it used to be a no-op. Are you finding
>>>> otherwise?
>>> No, I was just worried about it. I haven't verified it myself since I'm
>>> webmailing from a non-dev computer.
>> I also just went through and verified that all of the subcommands that
>> svnmerge.py happens to use do take --non-interactive. (Good thing we
>> have propset and propdel on revprops...)
>
> Committed the svnmerge patch in r26883.
This patch broke svnmerge_test.py because of strict regexp checking in
some tests. Would you mind fixing this up?
--
Giovanni Bajo
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] svnmerge needs to use --non-interactive
Posted by David Glasser <gl...@davidglasser.net>.
On 10/1/07, David Glasser <gl...@davidglasser.net> wrote:
> On 9/29/07, Giovanni Bajo <ra...@develer.com> wrote:
> > On Sat, 29 Sep 2007 09:59:21 -0700, "David Glasser"
> > <gl...@davidglasser.net> wrote:
> >
> > >> +1. I hope you have verified that --non-interactive is accepted for "svn
> > >> merge" by released versions :)
> > >
> > > I'm pretty sure that every version of svn allows "svn merge
> > > --non-interactive", although it used to be a no-op. Are you finding
> > > otherwise?
> >
> > No, I was just worried about it. I haven't verified it myself since I'm
> > webmailing from a non-dev computer.
>
> I also just went through and verified that all of the subcommands that
> svnmerge.py happens to use do take --non-interactive. (Good thing we
> have propset and propdel on revprops...)
Committed the svnmerge patch in r26883.
--dave
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] svnmerge needs to use --non-interactive
Posted by David Glasser <gl...@davidglasser.net>.
On 9/29/07, Giovanni Bajo <ra...@develer.com> wrote:
> On Sat, 29 Sep 2007 09:59:21 -0700, "David Glasser"
> <gl...@davidglasser.net> wrote:
>
> >> +1. I hope you have verified that --non-interactive is accepted for "svn
> >> merge" by released versions :)
> >
> > I'm pretty sure that every version of svn allows "svn merge
> > --non-interactive", although it used to be a no-op. Are you finding
> > otherwise?
>
> No, I was just worried about it. I haven't verified it myself since I'm
> webmailing from a non-dev computer.
I also just went through and verified that all of the subcommands that
svnmerge.py happens to use do take --non-interactive. (Good thing we
have propset and propdel on revprops...)
--dave
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] svnmerge needs to use --non-interactive
Posted by Giovanni Bajo <ra...@develer.com>.
On Sat, 29 Sep 2007 09:59:21 -0700, "David Glasser"
<gl...@davidglasser.net> wrote:
>> +1. I hope you have verified that --non-interactive is accepted for "svn
>> merge" by released versions :)
>
> I'm pretty sure that every version of svn allows "svn merge
> --non-interactive", although it used to be a no-op. Are you finding
> otherwise?
No, I was just worried about it. I haven't verified it myself since I'm
webmailing from a non-dev computer.
--
Giovanni Bajo
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] svnmerge needs to use --non-interactive
Posted by Eric Gillespie <ep...@pretzelnet.org>.
[-svnmerge@orcaware.com so it won't spam me with more "You are
not allowed to post to this mailing list" crap]
"David Glasser" <gl...@davidglasser.net> writes:
> Arguably we should make all commands take --non-interactive so that
> people writing scripts can future-proof them against us suddenly
> deciding to make them contact the repository...
Oh, good idea. Yes, let's do that!
--
Eric Gillespie <*> epg@pretzelnet.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] svnmerge needs to use --non-interactive
Posted by David Glasser <gl...@davidglasser.net>.
On 9/29/07, Eric Gillespie <ep...@pretzelnet.org> wrote:
> "David Glasser" <gl...@davidglasser.net> writes:
>
> > On 9/29/07, Giovanni Bajo <ra...@develer.com> wrote:
> > > +1. I hope you have verified that --non-interactive is accepted for "svn
> > > merge" by released versions :)
> >
> > I'm pretty sure that every version of svn allows "svn merge
> > --non-interactive", although it used to be a no-op. Are you finding
> > otherwise?
>
> It's not a no-op, it suppresses authn and trust prompts. All
> commands which access the repository take --non-interactive.
Yup.
Arguably we should make all commands take --non-interactive so that
people writing scripts can future-proof them against us suddenly
deciding to make them contact the repository...
--dave
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] svnmerge needs to use --non-interactive
Posted by Eric Gillespie <ep...@pretzelnet.org>.
"David Glasser" <gl...@davidglasser.net> writes:
> On 9/29/07, Giovanni Bajo <ra...@develer.com> wrote:
> > +1. I hope you have verified that --non-interactive is accepted for "svn
> > merge" by released versions :)
>
> I'm pretty sure that every version of svn allows "svn merge
> --non-interactive", although it used to be a no-op. Are you finding
> otherwise?
It's not a no-op, it suppresses authn and trust prompts. All
commands which access the repository take --non-interactive.
--
Eric Gillespie <*> epg@pretzelnet.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] svnmerge needs to use --non-interactive
Posted by David Glasser <gl...@davidglasser.net>.
On 9/29/07, Giovanni Bajo <ra...@develer.com> wrote:
> +1. I hope you have verified that --non-interactive is accepted for "svn
> merge" by released versions :)
I'm pretty sure that every version of svn allows "svn merge
--non-interactive", although it used to be a no-op. Are you finding
otherwise?
--dave
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] svnmerge needs to use --non-interactive
Posted by Giovanni Bajo <ra...@develer.com>.
On Fri, 28 Sep 2007 16:34:16 -0700, "David Glasser"
<gl...@davidglasser.net> wrote:
> In trunk svn, "svn merge" can produce a prompt for conflicts, breaking
> svnmerge.py (which hides IO from the user). Ideally, the user should
> just be able to use the conflict handler during svnmerge.py's call to
> "svn merge", but at the very least it shouldn't hang. This appears to
> work:
>
>
> ===================================================================
> --- contrib/client-side/svnmerge/svnmerge.py (revision 26831)
> +++ contrib/client-side/svnmerge/svnmerge.py (working copy)
> @@ -298,7 +298,7 @@ def launchsvn(s, show=False, pretend=Fal
> password = " --password=" + password
> else:
> password = ""
> - cmd = opts["svn"] + username + password + " " + s
> + cmd = opts["svn"] + " --non-interactive " + username + password + "
"
> + s
> if show or opts["verbose"] >= 2:
> print cmd
> if pretend:
>
>
>
> Should I commit this?
+1. I hope you have verified that --non-interactive is accepted for "svn
merge" by released versions :)
--
Giovanni Bajo
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org