← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

merge from aaron - fixes bare excepts, adds ancestor namespace

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
306
306
        import errno
307
307
        
308
308
        br_to = find_branch('.')
309
 
        stored_loc = None
310
 
        try:
311
 
            stored_loc = br_to.controlfile("x-pull", "rb").read().rstrip('\n')
312
 
        except IOError, e:
313
 
            if e.errno != errno.ENOENT:
314
 
                raise
 
309
        stored_loc = br_to.get_parent()
315
310
        if location is None:
316
311
            if stored_loc is None:
317
312
                raise BzrCommandError("No pull location known or specified.")
336
331
                
337
332
            merge(('.', -1), ('.', old_revno), check_clean=False)
338
333
            if location != stored_loc:
339
 
                br_to.controlfile("x-pull", "wb").write(location + "\n")
 
334
                br_to.set_parent(location)
340
335
        finally:
341
336
            rmtree(cache_root)
342
337
 
1298
1293
                    print "Using last location: %s" % parent
1299
1294
                remote = parent
1300
1295
        elif parent is None:
1301
 
            # We only update x-pull if it did not exist, missing should not change the parent
1302
 
            b.controlfile('x-pull', 'wb').write(remote + '\n')
 
1296
            # We only update parent if it did not exist, missing should not change the parent
 
1297
            b.set_parent(remote)
1303
1298
        br_remote = find_branch(remote)
1304
1299
 
1305
1300
        return show_missing(b, br_remote, verbose=verbose, quiet=quiet)