← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-02-24 14:43:00 UTC
  • mfrom: (1558.1.12 Aaron's integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060224144300-16a30ef3bb38fb7f
Actually apply alias and uncommit fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2128
2128
 
2129
2129
        if location is None:
2130
2130
            location = u'.'
2131
 
        b, relpath = Branch.open_containing(location)
 
2131
        control, relpath = bzrdir.BzrDir.open_containing(location)
 
2132
        b = control.open_branch()
 
2133
        try:
 
2134
            tree = control.open_workingtree()
 
2135
        except (errors.NoWorkingTree, errors.NotLocalUrl):
 
2136
            tree = None
2132
2137
 
2133
2138
        if revision is None:
2134
2139
            revno = b.revno()
2155
2160
                    print 'Canceled'
2156
2161
                    return 0
2157
2162
 
2158
 
        uncommit(b, dry_run=dry_run, verbose=verbose,
 
2163
        uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
2159
2164
                revno=revno)
2160
2165
 
2161
2166