← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

merge in lalos branch tidyup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
301
301
        import tempfile
302
302
        from shutil import rmtree
303
303
        import errno
304
 
        from bzrlib.branch import pull_loc
305
304
        
306
305
        br_to = find_branch('.')
307
306
        stored_loc = None
319
318
        cache_root = tempfile.mkdtemp()
320
319
        from bzrlib.branch import DivergedBranches
321
320
        br_from = find_branch(location)
322
 
        location = pull_loc(br_from)
 
321
        location = br_from.base
323
322
        old_revno = br_to.revno()
324
323
        try:
325
324
            from branch import find_cached_branch, DivergedBranches
326
325
            br_from = find_cached_branch(location, cache_root)
327
 
            location = pull_loc(br_from)
 
326
            location = br_from.base
328
327
            old_revno = br_to.revno()
329
328
            try:
330
329
                br_to.update_revisions(br_from)
636
635
    def run(self, filename=None):
637
636
        """Print the branch root."""
638
637
        b = find_branch(filename)
639
 
        print getattr(b, 'base', None) or getattr(b, 'baseurl')
 
638
        print b.base
640
639
 
641
640
 
642
641
class cmd_log(Command):