allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [36/50] git commit: [#4691] Temporarily skip computing diffs for removed trees pending [#5733] to reduce chance of hitting slow _diffs_copied
Date Wed, 06 Feb 2013 15:42:52 GMT
[#4691] Temporarily skip computing diffs for removed trees pending [#5733] to reduce chance
of hitting slow _diffs_copied

Signed-off-by: Cory Johns <johnsca@geek.net>


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

Branch: refs/heads/cj/4691
Commit: b05c8dc2b913a1d2a7c43dbc44c95e9c6bc75480
Parents: c340d11
Author: Cory Johns <johnsca@geek.net>
Authored: Mon Feb 4 15:23:34 2013 +0000
Committer: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Committed: Tue Feb 5 20:22:52 2013 +0000

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


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/b05c8dc2/Allura/allura/model/repo_refresh.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repo_refresh.py b/Allura/allura/model/repo_refresh.py
index bdd5a1f..313e58c 100644
--- a/Allura/allura/model/repo_refresh.py
+++ b/Allura/allura/model/repo_refresh.py
@@ -430,6 +430,7 @@ 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