← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Aaron Bentley
  • Date: 2012-07-12 20:32:15 UTC
  • mto: This revision was merged to the branch mainline in revision 6540.
  • Revision ID: aaron@aaronbentley.com-20120712203215-2kfuuu9ji9y8y5sb
Move to shelve_all and improve it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1358
1358
            target_tree = self.basis_tree()
1359
1359
            shelf_creator = shelf.ShelfCreator(self, target_tree)
1360
1360
            try:
1361
 
                change = None
1362
 
                for change in shelf_creator.iter_shelvable():
1363
 
                    shelf_creator.shelve_change(change)
1364
 
                if change is None:
 
1361
                if not shelf_creator.shelve_all():
1365
1362
                    return
1366
1363
                self.branch.store_uncommitted(shelf_creator)
1367
1364
                shelf_creator.transform()
1369
1366
                shelf_creator.finalize()
1370
1367
        finally:
1371
1368
            self.unlock()
1372
 
        note('Uncommitted changes stored in pipe "%s".', self.branch.nick)
 
1369
        note('Uncommitted changes stored in branch "%s".', self.branch.nick)
1373
1370
 
1374
1371
    def revision_tree(self, revision_id):
1375
1372
        """See Tree.revision_tree.