You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by he...@apache.org on 2015/04/01 23:10:57 UTC
[40/45] allura git commit: [#7837] ticket:749 Handle "R" action for
svn
[#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/6d9c49db
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/6d9c49db
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/6d9c49db
Branch: refs/heads/hss/7072
Commit: 6d9c49db472dadcc9f3a498adf2c143f2eaa5983
Parents: 02879be
Author: Igor Bondarenko <je...@gmail.com>
Authored: Mon Mar 16 10:50:48 2015 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Mon Mar 30 19:20:42 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/6d9c49db/ForgeSVN/forgesvn/model/svn.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/model/svn.py b/ForgeSVN/forgesvn/model/svn.py
index 28bf132..f37c1e2 100644
--- a/ForgeSVN/forgesvn/model/svn.py
+++ b/ForgeSVN/forgesvn/model/svn.py
@@ -790,6 +790,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
@@ -800,7 +802,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