Bazaar

'bzr uncommit' could use a update_basis_by_delta

Bug #780544 reported by John A Meinel
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Bazaar
Fix Released
Medium
John A Meinel
Bazaar 2.4b3

Bug Description

Uncommit currently always calls "tree.set_parent_ids(new_parents)". If it was a reasonably simple uncommit (single revision no extra parents to single revision no extra parents) we could certainly use tree.update_basis_by_delta. This should be considerably faster since we don't need to compute the complete parent inventory, just the delta.

In the case of extra parents, things get trickier, so it is probably ok.

Though I wonder if we could still update the basis revision using a delta, and then bring in the merge parents afterwards.

We are currently ~15s to uncommit a tree with 70k files. But we can apply a delta in <5s.

Another way to look at it. uncommit should be at least as fast as commit.

Related branches

lp:~jameinel/bzr/2.4-set-parent-trees-delta-282941
Jelmer Vernooij (community): Approve (code)
Andrew Bennetts: Pending requested
Diff: 1476 lines (+906/-199)
7 files modified
bzrlib/dirstate.py (+214/-132)
bzrlib/tests/test_dirstate.py (+446/-0)
bzrlib/tests/test_inv.py (+137/-57)
bzrlib/tests/test_workingtree_4.py (+62/-0)
bzrlib/workingtree_4.py (+23/-1)
doc/en/release-notes/bzr-2.4.txt (+4/-0)
doc/en/whats-new/whats-new-in-2.4.txt (+20/-9)
John A Meinel (jameinel)
Changed in bzr:
assignee: nobody → John A Meinel (jameinel)
milestone: none → 2.4b3
status: Confirmed → In Progress
John A Meinel (jameinel)
Changed in bzr:
status: In Progress → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.