[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: rev 1895 - trunk/subversion/clients/cmdline trunk/subversion/tests/clients/cmdline/svntest

From: Greg Stein <gstein_at_lyra.org>
Date: 2002-05-07 19:59:27 CEST

On Tue, May 07, 2002 at 11:18:40AM -0500, kfogel@tigris.org wrote:
>...
> +++ trunk/subversion/clients/cmdline/trace-update.c Tue May 7 11:18:26 2002
>...
> @@ -331,6 +336,10 @@
> struct file_baton *fb = file_baton;
> if (svn_wc_is_normal_prop (name))
> fb->prop_changed = TRUE;
> +
> + if (svn_wc_is_normal_prop (name))
> + fb->edit_baton->received_some_change = TRUE;

It would be clearer if those two if-blocks were combined. As it is, a reader
has to look harder to realize that they are the same. Combining reduces
their effort.

>...
> @@ -344,6 +353,10 @@
> struct dir_baton *db = parent_baton;
> if (svn_wc_is_normal_prop (name))
> db->prop_changed = TRUE;
> +
> + if (svn_wc_is_normal_prop (name))
> + db->edit_baton->received_some_change = TRUE;
> +
> return SVN_NO_ERROR;

Same.

But even better: in the close_file and close_directory functions, just
insert a line like:

  fb->edit_baton->received_some_change ||= fb->prop_changed;

And similar for close_directory.

>...
> @@ -390,6 +409,7 @@
> eb->target_revision = SVN_INVALID_REVNUM;
> eb->is_checkout = is_checkout;
> eb->suppress_final_line = suppress_final_line;
> + eb->received_some_change = FALSE;

FALSE is the default already, because of the apr_pcalloc()

>...
> +++ trunk/subversion/tests/clients/cmdline/svntest/tree.py Tue May 7 11:18:26 2002
> @@ -535,7 +535,7 @@
> "Return a tree derived by parsing the output LINES from 'co' or 'up'."
>
> root = SVNTreeNode(root_node_name)
> - rm = re.compile ('^(..)\s+(.+)')
> + rm = re.compile ('^([MAGCUD_ ][MAGCUD_ ])\s+(.+)')
>
> for line in lines:
> match = rm.search(line)
> @@ -591,7 +591,8 @@
> else:
> repos_rev = '?'
>
> - rm = re.compile ('^(..)(.)(.) . [^0-9]+(\d+|-)(.{23})(.+)')
> + # Try http://www.wordsmith.org/anagram/anagram.cgi?anagram=ACDRMGU
> + rm = re.compile ('^([MACDRUG_ ][MACDRUG_ ])(.)(.) . [^0-9]+(\d+|-)(.{23})(.+)')

Ha. I told you guys we wanted different column-0 characters.

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue May 7 19:58:12 2002

This is an archived mail posted to the Subversion Dev mailing list.