Repository: allura
Updated Branches:
refs/heads/ib/7873 [created] 88fa04245
[#7837] ticket:749 Handle "R" action for svn
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/88fa0424
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/88fa0424
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/88fa0424
Branch: refs/heads/ib/7873
Commit: 88fa042457bac17c8e770ab637eabd95da201643
Parents: c4e2ddc
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Mon Mar 16 10:50:48 2015 +0000
Committer: Igor Bondarenko <jetmind2@gmail.com>
Committed: Mon Mar 16 10:50:48 2015 +0000
----------------------------------------------------------------------
ForgeSVN/forgesvn/model/svn.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/88fa0424/ForgeSVN/forgesvn/model/svn.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/model/svn.py b/ForgeSVN/forgesvn/model/svn.py
index a98b256..4381a09 100644
--- a/ForgeSVN/forgesvn/model/svn.py
+++ b/ForgeSVN/forgesvn/model/svn.py
@@ -778,6 +778,8 @@ class SVNImplementation(M.RepositoryImplementation):
revision_end=rev,
discover_changed_paths=True)
except pysvn.ClientError:
+ log.info('Error getting paged_diffs log of %s on %s',
+ commit_id, self._url, exc_info=True)
return result
if len(log_info) == 0:
return result
@@ -788,7 +790,12 @@ class SVNImplementation(M.RepositoryImplementation):
result['added'].append(h.really_unicode(p.path))
elif p['action'] == 'D':
result['removed'].append(h.really_unicode(p.path))
- elif p['action'] == 'M':
+ elif p['action'] in ['M', 'R']:
+ # 'R' means 'Replaced', i.e.
+ # svn rm aaa.txt
+ # echo "Completely new aaa!" > aaa.txt
+ # svn add aaa.txt
+ # svn commit -m "Replace aaa.txt"
result['changed'].append(h.really_unicode(p.path))
return result
|