/stdhome

To get this branch, use:
bzr branch http://bzr.ed.am/stdhome

« back to all changes in this revision

Viewing changes to lib/stdhome/vcs/bzr.py

  • Committer: Tim Marston
  • Date: 2014-07-17 18:17:18 UTC
  • Revision ID: tim@ed.am-20140717181718-gxi5lpi8qszsigxf
switch to using bzr+ssh, rather than sftp (to work around broken pimiko)

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/stdhome/vcs/bzr.py
34
34
 
35
35
                @param dir the fully-qualified directory to work in.
36
36
                """
37
 
 
38
37
                self.dir = dir
39
38
 
40
39
 
142
141
                                else:
143
142
                                        raise RuntimeError( 'exotic file in repo: %s' % file )
144
143
 
145
 
                # if a revision identifier has been given, ensure we're updated to that
146
 
                if revno is not None and self.get_revno() != revno:
 
144
                # if a revision identifyer has been given, update to that
 
145
                if revno is not None:
147
146
 
148
147
                        # bzr update
149
148
                        self.run( [ 'bzr', 'update', '-r', revno ] )
260
259
                """
261
260
 
262
261
                # bzr add
263
 
                self.run( [ 'bzr', 'add', '-N' ] + files )
 
262
                self.run( [ 'bzr', 'add' ] + files )
264
263
 
265
264
 
266
265
        def commit( self ):