incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [1/2] git commit: Revert "[#4691] Temporarily skip computing diffs for removed trees pending [#5733] to reduce chance of hitting slow _diffs_copied"
Date Tue, 05 Feb 2013 21:12:15 GMT
Revert "[#4691] Temporarily skip computing diffs for removed trees pending [#5733] to reduce
chance of hitting slow _diffs_copied"

This reverts commit b05c8dc2b913a1d2a7c43dbc44c95e9c6bc75480.


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/508aca26
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/508aca26
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/508aca26

Branch: refs/heads/master
Commit: 508aca261653f1ea59bf576f9340ea49390e7aa6
Parents: bb34f6a
Author: Cory Johns <johnsca@geek.net>
Authored: Tue Feb 5 21:06:33 2013 +0000
Committer: Cory Johns <johnsca@geek.net>
Committed: Tue Feb 5 21:11:53 2013 +0000

----------------------------------------------------------------------
 Allura/allura/model/repo_refresh.py |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/508aca26/Allura/allura/model/repo_refresh.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repo_refresh.py b/Allura/allura/model/repo_refresh.py
index 313e58c..bdd5a1f 100644
--- a/Allura/allura/model/repo_refresh.py
+++ b/Allura/allura/model/repo_refresh.py
@@ -430,7 +430,6 @@ def _diff_trees(lhs, rhs, index, *path):
             continue
         elif rhs_id is None:  # removed
             yield (_fq(o.name), o.id, None)
-            continue  # FIXME This is a temporary work-around for #5733 and breaks moved/renamed
directories
             rhs_tree = Object(_id=None, tree_ids=[], blob_ids=[], other_ids=[])
         else:  # changed
             rhs_tree = index[rhs_id]


Mime
View raw message