[Svnmerge] Fwd: svn commit: r18651 - trunk/contrib/client-side

[Blair Zajac]

http://svn.collab.net/viewvc/svn?rev=18648&view=rev

Blair

Begin forwarded message:

> From: blair at tigris.org
> Date: February 28, 2006 9:38:16 PM PST
> To: svn at subversion.tigris.org
> Subject: svn commit: r18651 - trunk/contrib/client-side
> Reply-To: dev at subversion.tigris.org, blair at tigris.org
>
> Author: blair
> Date: Tue Feb 28 23:38:13 2006
> New Revision: 18651
>
> Modified:
>    trunk/contrib/client-side/svnmerge.py
>
> Log:
> Improved merge command performance by eliminating svn log operations
> on phantom revisions.
>
> Patch by: Raman Gupta <rocketraman at fastmail.fm>
>
> * contrib/client-side/svnmerge.py
>   (action_merge):
>     Remove phantom_revs from the revs list used for getting the merge
>       intervals, and obtaining logs for writing the commit log
>       message.  For the first use, this change has no detrimental
>       effect, because the minimal_merge_intervals() function accounts
>       for the phantom revisions. For the second use, this improves
>       performance because now svnmerge does not execute an "svn log"
>       for every phantom revision.
>     Modified the range printing for the commit log message to re-add
>       the phantom revs, so the range prints with the phantom revs, as
>       is the current functionality.
>
>
> Modified: trunk/contrib/client-side/svnmerge.py
> Url: http://svn.collab.net/viewcvs/svn/trunk/contrib/client-side/ 
> svnmerge.py?rev=18651&p1=trunk/contrib/client-side/ 
> svnmerge.py&p2=trunk/contrib/client-side/svnmerge.py&r1=18650&r2=18651
> ====================================================================== 
> ========
> --- trunk/contrib/client-side/svnmerge.py	(original)
> +++ trunk/contrib/client-side/svnmerge.py	Tue Feb 28 23:38:13 2006
> @@ -863,7 +863,7 @@
>              report('skipping blocked revisions(s): %s' %  
> (blocked_revs & revs))
>
>      # Compute final merge set.
> -    revs = revs - merged_revs - blocked_revs - reflected_revs
> +    revs = revs - merged_revs - blocked_revs - reflected_revs -  
> phantom_revs
>      if not revs:
>          report('no revisions to merge, exiting')
>          return
> @@ -880,7 +880,8 @@
>      # Write out commit message if desired
>      if opts["commit_file"]:
>          f = open(opts["commit_file"], "w")
> -        print >>f, 'Merged revisions %s via %s from ' % (revs, NAME)
> +        print >>f, 'Merged revisions %s via %s from ' % \
> +                    (revs | phantom_revs, NAME)
>          print >>f, '%s' % opts["head_url"]
>          if opts["commit_verbose"]:
>              print >>f
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe at subversion.tigris.org
> For additional commands, e-mail: svn-help at subversion.tigris.org
>