Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 389A8E367 for ; Mon, 4 Feb 2013 15:24:37 +0000 (UTC) Received: (qmail 63758 invoked by uid 500); 4 Feb 2013 15:24:37 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 63722 invoked by uid 500); 4 Feb 2013 15:24:36 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 63677 invoked by uid 99); 4 Feb 2013 15:24:35 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Feb 2013 15:24:35 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D2627829BC6; Mon, 4 Feb 2013 15:24:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: johnsca@apache.org To: allura-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: [#4691] Temporarily skip computing diffs for removed trees pending [#5733] to reduce chance of hitting slow _diffs_copied Message-Id: <20130204152434.D2627829BC6@tyr.zones.apache.org> Date: Mon, 4 Feb 2013 15:24:34 +0000 (UTC) [#4691] Temporarily skip computing diffs for removed trees pending [#5733] to reduce chance of hitting slow _diffs_copied Signed-off-by: Cory Johns Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/859d2e6b Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/859d2e6b Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/859d2e6b Branch: refs/heads/cj/4691 Commit: 859d2e6bdeec7efaf1e460ca0f85691b7f6057ec Parents: a74ce63 Author: Cory Johns Authored: Mon Feb 4 15:23:34 2013 +0000 Committer: Cory Johns Committed: Mon Feb 4 15:23:34 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/859d2e6b/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]