/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Aaron Bentley
  • Date: 2012-07-13 19:49:54 UTC
  • mto: This revision was merged to the branch mainline in revision 6540.
  • Revision ID: aaron@aaronbentley.com-20120713194954-2orlp0ftgjx3etvl
Move unshelver construction to Branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1369
1369
        note('Uncommitted changes stored in branch "%s".', self.branch.nick)
1370
1370
 
1371
1371
    def restore_uncommitted(self, delete=True):
1372
 
        transform = self.branch._get_uncommitted()
1373
 
        if transform is None:
 
1372
        unshelver = self.branch.get_unshelver(self)
 
1373
        if unshelver is None:
1374
1374
            return
1375
 
        unshelver = shelf.Unshelver.from_tree_and_shelf(self, transform)
1376
1375
        try:
1377
1376
            merger = unshelver.make_merger()
1378
1377
            merger.ignore_zero = True