46
45
os.mkdir( self.dir )
50
self.run( [ 'bzr', 'init', '.' ] )
51
except self.VcsError as e:
48
p = Popen( [ 'bzr', 'init', '.' ], cwd = self.dir,
49
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
50
output = p.communicate()[ 0 ]
53
53
# attempt to clean-up dir
69
69
os.mkdir( self.dir )
73
self.run( [ 'bzr', 'checkout', url, '.' ] )
74
except self.VcsError as e:
72
p = Popen( [ 'bzr', 'co', url, '.' ], cwd = self.dir,
73
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
74
output = p.communicate()[ 0 ]
76
77
# attempt to clean-up dir
85
def get_revno( self ):
86
"""Obtain some sort of revision identifier
90
output = self.run( [ 'bzr', 'revno', '--tree' ] )
93
buf = StringIO.StringIO( output )
94
return buf.readline().rstrip()
97
def revert( self, revno = None ):
83
raise self.VcsError( 'bzr checkout failed', output )
98
87
"""Revert the branch so that there are no outstanding changes or unknown files.
99
If a revno is supplied, then the repository is reverted to that
104
output = self.run( [ 'bzr', 'status' ] )
105
files = self.parse_file_blocks( output )
107
# remove kind changed files (or they can cause `bzr revert` to break in
108
# strange situations, like when a directory has been replaced with a
109
# symlink to a non-existant file)
110
if 'kind changed' in files:
111
for file in files[ 'kind changed' ]:
112
matches = re.match( r'(.+?)[/@+]? \([^)]+\)', file )
115
'failed to parse bzr kind change: %s' % file )
116
file = matches.group( 1 )
117
if the.verbose >= 2: print "removing (kind changed): " + file
118
full_file = os.path.join( self.dir, file )
119
if os.path.isfile( full_file ) or os.path.islink( full_file ):
120
os.unlink( full_file )
121
elif os.path.isdir( full_file ):
122
shutil.rmtree( full_file )
124
raise RuntimeError( 'exotic file in repo: %s' % file )
127
self.run( [ 'bzr', 'revert', '--no-backup' ] )
91
p = Popen( [ 'bzr', 'revert', '--no-backup' ], cwd = self.dir,
92
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
93
output = p.communicate()[ 0 ]
95
raise self.VcsError( 'bzr revert failed', output )
130
output = self.run( [ 'bzr', 'status' ] )
98
p = Popen( [ 'bzr', 'st' ], cwd = self.dir,
99
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
100
output = p.communicate()[ 0 ]
102
raise self.VcsError( 'bzr status failed', output )
131
103
files = self.parse_file_blocks( output )
133
105
# remove unknown files
134
106
if 'unknown' in files:
135
107
for file in files[ 'unknown' ]:
136
if the.verbose >= 2: print "removing (unknown): " + file
137
108
full_file = os.path.join( self.dir, file )
138
109
if os.path.isfile( full_file ):
139
110
os.unlink( full_file )
140
elif os.path.isdir( full_file ):
111
elif os.full_file.isdir( full_file ):
141
112
shutil.rmtree( full_file )
143
114
raise RuntimeError( 'exotic file in repo: %s' % file )
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:
149
self.run( [ 'bzr', 'update', '-r', revno ] )
152
117
def update( self ):
153
118
"""Update the branch, pulling down any upstream changes and merging them. This
158
# WARNING: the following might cause bzr to ask for your ssh password more than
159
# once during an update!!!
162
# revno = self.get_revno()
164
# # update to current revision (pull in history without updating tree)
165
# self.run( [ 'bzr', 'update', '-r', revno ] )
168
# next_revno = str( int( revno ) + 1 )
169
# output = self.run( [ 'bzr', 'log', '-r', next_revno + '..' ] )
172
# keep_files = list()
173
# buf = StringIO.StringIO( output )
176
# line = line.rstrip( '\n' )
177
# if line.lower() == 'message:':
180
# if line[ : 2 ] != ' ':
185
# # process directives
186
# if line[ : 6 ].lower() == 'keep: ':
188
# if file in rename_files: file = rename_files[ file ]
189
# keep_files.append( file )
190
# elif line[ : 8 ].lower() == 'rename: ':
191
# rename_from = line[ 8 : ]
192
# elif line[ : 4 ].lower() == 'to: ':
193
# if rename_from in rename_files:
194
# rename_from = rename_files[ rename_from ]
195
# rename_files[ line[ 4 : ] ] = rename_from
197
# bzr update properly
198
output = self.run( [ 'bzr', 'update' ] )
124
p = Popen( [ 'bzr', 'update' ], cwd = self.dir,
125
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
126
output = p.communicate()[ 0 ]
128
raise self.VcsError( 'bzr update failed', output )
200
130
# parse output (see logic in report() in bzrlib/delta.py)
238
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
168
p = Popen( [ 'bzr', 'status', '--no-pending' ], cwd = self.dir,
169
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
170
output = p.communicate()[ 0 ]
172
raise self.VcsError( 'bzr status failed', output )
241
173
files = self.parse_file_blocks( output )
242
174
return True if len( files ) else False
250
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
182
p = Popen( [ 'bzr', 'status', '--no-pending' ], cwd = self.dir,
183
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
184
output = p.communicate()[ 0 ]
186
raise self.VcsError( 'bzr status failed', output )
253
187
files = self.parse_file_blocks( output )
254
188
return files['conflicts'] if 'conflicts' in files else None
257
def add( self, files ):
258
"""Make sure files are added to version control.
259
@param files a list of relative filenames
263
self.run( [ 'bzr', 'add', '-N' ] + files )
267
"""Commit changes to the repo.
271
self.run( [ 'bzr', 'commit', '-m', '' ] )
274
def run( self, cmd ):
275
if the.verbose >= 2: print 'exec: %s' % ' '.join( cmd )
276
p = Popen( cmd, cwd = self.dir,
277
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
278
output = p.communicate()[ 0 ]
280
raise self.VcsError( ' '.join( cmd[ : 2 ] ), output )
284
191
def parse_file_blocks( self, output ):