← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: John Arbash Meinel
  • Date: 2005-07-19 22:13:01 UTC
  • mto: (1185.11.1)
  • mto: This revision was merged to the branch mainline in revision 1396.
  • Revision ID: john@arbash-meinel.com-20050719221300-9a7b9bc9d866a9b9
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
Added readonly tests for Transports.
Added test for HttpTransport.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
526
526
 
527
527
    def run(self, location=None, revision=None):
528
528
        from bzrlib.merge import merge
529
 
        from bzrlib.transport import TransportError
 
529
        from bzrlib.transport import NoSuchFile
530
530
        import errno
531
531
        
532
532
        br_to = find_branch('.')
533
533
        stored_loc = None
534
534
        try:
535
535
            stored_loc = br_to.controlfile("x-pull", "rb").read().rstrip('\n')
536
 
        except TransportError, e:
 
536
        except NoSuchFile:
537
537
            pass
538
 
        except IOError, e:
539
 
            if e.errno != errno.ENOENT:
540
 
                raise
541
538
        if location is None:
542
539
            if stored_loc is None:
543
540
                raise BzrCommandError("No pull location known or specified.")