diff options
Diffstat (limited to 'branch_updater.py')
| -rw-r--r-- | branch_updater.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/branch_updater.py b/branch_updater.py index 039171f..0f9b7be 100644 --- a/branch_updater.py +++ b/branch_updater.py @@ -121,7 +121,7 @@ class BranchUpdater(object): except errors.BzrError, ex: error("ERROR: failed to create branch %s: %s", location, ex) - lost_head = self.cache_mgr.revision_ids[tip] + lost_head = self.cache_mgr.lookup_committish(tip) lost_info = (name, lost_head) lost_heads.append(lost_info) return branch_tips, lost_heads @@ -147,11 +147,11 @@ class BranchUpdater(object): def _update_branch(self, br, last_mark): """Update a branch with last revision and tag information. - + :return: whether the branch was changed or not """ from fastimport.helpers import single_plural - last_rev_id = self.cache_mgr.revision_ids[last_mark] + last_rev_id = self.cache_mgr.lookup_committish(last_mark) revs = list(self.repo.iter_reverse_revision_history(last_rev_id)) revno = len(revs) existing_revno, existing_last_rev_id = br.last_revision_info() |