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

[PATCH] mailer.py: Always use 'delete' instead of 'remove'

From: Mathias Weinert <mathias.weinert_at_gfa-net.de>
Date: 2006-08-14 10:12:01 CEST

Hi,

With this patch I want to replace several occurences of 'remove' with
'delete'. The first reason is that 'delete' is used many more times
than 'remove' and the second one is that I want to introduce the
detection of replaced paths (instead of showing them all as added) and
therefor I would like to use the 'R' in generate_list.

Are there any objections?

Mathias

[[[
* tools/hook-scripts/mailer/mailer.py
  Replaced several occurences of 'remove' with 'delete'
  which is standard in mailer.py

* tools/hook-scripts/mailer/tests/mailer-t1.output
  Reflected above mentioned change in mailer.py
]]]

--- mailer.py.orig 2006-08-14 09:47:59.751175700 +0200
+++ mailer.py 2006-08-14 09:57:46.966167500 +0200
@@ -615,10 +615,10 @@
       or 'yes'
 
   # figure out the lists of changes outside the selected path-space
- other_added_data = other_removed_data = other_modified_data = [ ]
+ other_added_data = other_deleted_data = other_modified_data = [ ]
   if len(paths) != len(changelist) and show_nonmatching_paths != 'no':
     other_added_data = generate_list('A', changelist, paths, False)
- other_removed_data = generate_list('R', changelist, paths, False)
+ other_deleted_data = generate_list('D', changelist, paths, False)
     other_modified_data = generate_list('M', changelist, paths, False)
 
   if len(paths) != len(changelist) and show_nonmatching_paths == 'yes':
@@ -633,11 +633,11 @@
     rev=repos.rev,
     log=repos.get_rev_prop(svn.core.SVN_PROP_REVISION_LOG) or '',
     added_data=generate_list('A', changelist, paths, True),
- removed_data=generate_list('R', changelist, paths, True),
+ deleted_data=generate_list('D', changelist, paths, True),
     modified_data=generate_list('M', changelist, paths, True),
     show_nonmatching_paths=show_nonmatching_paths,
     other_added_data=other_added_data,
- other_removed_data=other_removed_data,
+ other_deleted_data=other_deleted_data,
     other_modified_data=other_modified_data,
     diffs=DiffGenerator(changelist, paths, True, cfg, repos, date, group,
                         params, diffsels, diffurls, pool),
@@ -649,7 +649,7 @@
 def generate_list(changekind, changelist, paths, in_paths):
   if changekind == 'A':
     selection = lambda change: change.added
- elif changekind == 'R':
+ elif changekind == 'D':
     selection = lambda change: change.path is None
   elif changekind == 'M':
     selection = lambda change: not change.added and change.path is not None
@@ -893,15 +893,15 @@
 
     # print summary sections
     self._render_list('Added', data.added_data)
- self._render_list('Removed', data.removed_data)
+ self._render_list('Deleted', data.deleted_data)
     self._render_list('Modified', data.modified_data)
 
- if data.other_added_data or data.other_removed_data \
+ if data.other_added_data or data.other_deleted_data \
            or data.other_modified_data:
       if data.show_nonmatching_paths:
         w('\nChanges in other areas also in this revision:\n')
         self._render_list('Added', data.other_added_data)
- self._render_list('Removed', data.other_removed_data)
+ self._render_list('Deleted', data.other_deleted_data)
         self._render_list('Modified', data.other_modified_data)
       else:
         w('and changes in other areas\n')
--- tests/mailer-t1.output.orig 2006-08-14 09:48:33.079087400 +0200
+++ tests/mailer-t1.output 2006-08-14 09:59:20.356194800 +0200
@@ -167,7 +167,7 @@
 Added:
    dir1/file10
    dir3/dir5/
-Removed:
+Deleted:
    dir2/
    file2
 Modified:

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Aug 14 10:12:39 2006

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.