You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/08/16 19:06:54 UTC
svn commit: r1158377 - in /subversion/branches/1.7.x: ./ STATUS
subversion/bindings/swig/python/svn/repos.py
Author: hwright
Date: Tue Aug 16 17:06:54 2011
New Revision: 1158377
URL: http://svn.apache.org/viewvc?rev=1158377&view=rev
Log:
Merge r1158288 from trunk:
* r1158288
swig-py: Document ChangeCollector.
Votes:
+1: danielsh, arfrever
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/bindings/swig/python/svn/repos.py
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 16 17:06:54 2011
@@ -55,4 +55,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154273,1154461,1155015,1156085,1156098,1156527,1158193-1158194,1158285,1158303
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154273,1154461,1155015,1156085,1156098,1156527,1158193-1158194,1158285,1158288,1158303
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158377&r1=1158376&r2=1158377&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Tue Aug 16 17:06:54 2011
@@ -252,11 +252,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1158288
- swig-py: Document ChangeCollector.
- Votes:
- +1: danielsh, arfrever
-
* r1156216, r1156312, r1156717, r1156721, r1156750, r1156827, r1156838
Fix issue #3986 'svn_client_mergeinfo_log API is broken'.
Justification:
Modified: subversion/branches/1.7.x/subversion/bindings/swig/python/svn/repos.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/bindings/swig/python/svn/repos.py?rev=1158377&r1=1158376&r2=1158377&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/bindings/swig/python/svn/repos.py (original)
+++ subversion/branches/1.7.x/subversion/bindings/swig/python/svn/repos.py Tue Aug 16 17:06:54 2011
@@ -72,12 +72,28 @@ class ChangedPath:
class ChangeCollector(_svndelta.Editor):
- """Available Since: 1.2.0
+ """An editor that, when driven, walks a revision or a transaction and
+ incrementally invokes a callback with ChangedPath instances corresponding to
+ paths changed in that revision.
+
+ Available Since: 1.2.0
"""
# BATON FORMAT: [path, base_path, base_rev]
def __init__(self, fs_ptr, root, pool=None, notify_cb=None):
+ """Construct a walker over the svn_fs_root_t ROOT, which must
+ be in the svn_fs_t FS_PTR. Invoke NOTIFY_CB with a single argument
+ of type ChangedPath for each change under ROOT.
+
+ At this time, two ChangedPath objects will be passed for a path that had
+ been replaced in the revision/transaction. This may change in the future.
+
+ ### Can't we deduce FS_PTR from ROOT?
+
+ ### POOL is unused
+ """
+
self.fs_ptr = fs_ptr
self.changes = { } # path -> ChangedPathEntry()
self.roots = { } # revision -> svn_svnfs_root_t