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

Re: [INTERM PATCH] Issue 571: A+D should be R in update

From: Max Bowsher <maxb_at_ukf.net>
Date: 2005-09-13 16:39:33 CEST

Christopher Ness wrote:
> [[[
> Closure of the second half of issue 571, "svn update: D+A should say R"
> http://subversion.tigris.org/issues/show_bug.cgi?id=571
> Patch By: Chris Ness <chris@nesser.org>
> Design By: eh
> Review By:
> * subversion/include/svn_wc.h
> (svn_wc_notify_action_t): New enumerated type
> svn_wc_notify_update_replace
> * subversion/libsvn_wc/update_editor.c
> (): New defines
> (struct dir_baton): New hash table deleted_targets
> (make_dir_baton): Initialize hash table when a new dir_baton is
> created.
> (do_entry_deletion): No longer notifies about file deletions, this is
> delayed by use of the hash table.
> (delete_entry): Adds to hash table, and if key exists notifies of
> a replacement of a file and removes that key from the hash.
> (close_directory): Walks hash for leftover keys marked as deleted
> and notifies them as deleted. Ignores added hashes.
> Removes entries from the hash.
> (close_file): Adds targets to the hash as added since reverse merges
> of replaced files can also occur. If target exists it notifies of
> a replacement and removes the target from the hash.
> (hash_get_set): New local function which tries to return the hash
> key. If not found it adds the target to the hash table.
> * subversion/clients/cmdline/notify.c
> (notify): New case to handle svn_wc_notify_update_replace
> ]]]

I'm a bit hesitant about the way many delete notifications can be saved up
until close_directory().

Do we really need a hash at all? Are not all D+A combinations immediately
consecutive, meaning that all we have to do is to queue exactly one delete
notification at any one time, in case the next notification is an add for
the same path?
That ought to reduce the complexity of the code quite a lot.

do_notify (notification)
  if (pending_delete_notification)
    if (notification->action == ADD &&
        strcmp(notification->path, pending_delete_notification->path) == 0)
      output (REPLACE, notification->path);
      pending_delete_notification = NULL;
      return; /* All done */
      output (pending_delete_notification->action,
      pending_delete_notification = NULL;

  if (notification->action == DELETE)
    pending_delete_notification = notification;
    output (notification->action, notification->path);

Plus code to flush pending_delete_notification on close_directory()


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Sep 13 16:41:45 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.