summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Arbash Meinel <john@arbash-meinel.com>2009-12-01 09:15:19 -0600
committerJohn Arbash Meinel <john@arbash-meinel.com>2009-12-01 09:15:19 -0600
commit88925abdf7e4c3d1f44acde03ffc55c2f6497fd5 (patch)
treedeeb250a66ee0ee9cbbc8fab4ed1e1ebed3c672a
parentb5640e3314a30d9957d6dc1f84c4a3421a5366a4 (diff)
downloadpython-fastimport-88925abdf7e4c3d1f44acde03ffc55c2f6497fd5.tar.gz
Some debugging code. It looks like the main bugs involve files that are deleted and restored.
-rw-r--r--revision_store.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/revision_store.py b/revision_store.py
index c40ac0f..d0ea181 100644
--- a/revision_store.py
+++ b/revision_store.py
@@ -364,13 +364,19 @@ class AbstractRevisionStore(object):
self._graph = self.repo.revisions.get_known_graph_ancestry(
[(r,) for r in rev.parent_ids])
if self._graph is not None:
+ orig_heads = builder._heads
def thunked_heads(file_id, revision_ids):
# self._graph thinks in terms of keys, not ids, so translate
# them
+ # old_res = orig_heads(file_id, revision_ids)
if len(revision_ids) < 2:
- return set(revision_ids)
- return set([h[0] for h in
- self._graph.heads([(r,) for r in revision_ids])])
+ res = set(revision_ids)
+ else:
+ res = set([h[0] for h in
+ self._graph.heads([(r,) for r in revision_ids])])
+ # if old_res != res:
+ # import pdb; pdb.set_trace()
+ return res
builder._heads = thunked_heads
if rev.parent_ids: