35
35
@param dir the fully-qualified directory to work in.
39
self.ignored_files = [ '.bzr', '.bzrignore' ]
42
def has_authority( self ):
43
"""Check that the directory is under this VCS's control.
46
return os.path.exists( os.path.join( self.dir, '.bzr' ) )
49
def expand_repo_url( self, url ):
50
"""Convert a simple hostname in to an URL that the VCS can use.
53
return 'bzr+ssh://%s/%s/%s' % ( url, the.dir, the.repo.name )
84
69
os.mkdir( self.dir )
88
self.run( [ 'bzr', 'checkout', url, '.' ] )
89
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 ]
91
77
# attempt to clean-up dir
100
def get_revno( self ):
101
"""Obtain some sort of revision identifier
105
output = self.run( [ 'bzr', 'revno', '--tree' ] )
108
buf = StringIO.StringIO( output )
109
return buf.readline().rstrip()
112
def revert( self, revno = None ):
83
raise self.VcsError( 'bzr checkout failed', output )
113
87
"""Revert the branch so that there are no outstanding changes or unknown files.
114
If a revno is supplied, then the repository is reverted to that
119
output = self.run( [ 'bzr', 'status' ] )
120
files = self.parse_file_blocks( output )
122
# remove kind changed files (or they can cause `bzr revert` to break in
123
# strange situations, like when a directory has been replaced with a
124
# symlink to a non-existant file)
125
if 'kind changed' in files:
126
for file in files[ 'kind changed' ]:
127
matches = re.search( '^(.+?)[/@+]? \([^)]+\)$', file )
130
'failed to parse bzr kind change: %s' % file )
131
file = matches.group( 1 )
132
if the.verbose >= 2: print "removing (kind changed): " + file
133
full_file = os.path.join( self.dir, file )
134
if os.path.isfile( full_file ) or os.path.islink( full_file ):
135
os.unlink( full_file )
136
elif os.path.isdir( full_file ):
137
shutil.rmtree( full_file )
139
raise RuntimeError( 'exotic file in repo: %s' % file )
142
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 )
145
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 )
146
103
files = self.parse_file_blocks( output )
148
105
# remove unknown files
149
106
if 'unknown' in files:
150
107
for file in files[ 'unknown' ]:
151
matches = re.search( r'^(.+?)[/@+]?$', file )
154
'failed to parse bzr unknowns: %s' % file )
155
file = matches.group( 1 )
156
if the.verbose >= 2: print "removing (unknown): " + file
157
108
full_file = os.path.join( self.dir, file )
158
if os.path.isfile( full_file ) or os.path.islink( full_file ):
109
if os.path.isfile( full_file ):
159
110
os.unlink( full_file )
160
elif os.path.isdir( full_file ):
111
elif os.full_file.isdir( full_file ):
161
112
shutil.rmtree( full_file )
163
114
raise RuntimeError( 'exotic file in repo: %s' % file )
165
# if a revision identifier has been given, ensure we're updated to that
166
if revno is not None and self.get_revno() != revno:
169
self.run( [ 'bzr', 'update', '-r', revno ] )
172
117
def update( self ):
173
118
"""Update the branch, pulling down any upstream changes and merging them. This
178
# WARNING: the following might cause bzr to ask for your ssh password more than
179
# once during an update!!!
182
# revno = self.get_revno()
184
# # update to current revision (pull in history without updating tree)
185
# self.run( [ 'bzr', 'update', '-r', revno ] )
188
# next_revno = str( int( revno ) + 1 )
189
# output = self.run( [ 'bzr', 'log', '-r', next_revno + '..' ] )
192
# keep_files = list()
193
# buf = StringIO.StringIO( output )
196
# line = line.rstrip( '\n' )
197
# if line.lower() == 'message:':
200
# if line[ : 2 ] != ' ':
205
# # process directives
206
# if line[ : 6 ].lower() == 'keep: ':
208
# if file in rename_files: file = rename_files[ file ]
209
# keep_files.append( file )
210
# elif line[ : 8 ].lower() == 'rename: ':
211
# rename_from = line[ 8 : ]
212
# elif line[ : 4 ].lower() == 'to: ':
213
# if rename_from in rename_files:
214
# rename_from = rename_files[ rename_from ]
215
# rename_files[ line[ 4 : ] ] = rename_from
217
# bzr update properly
218
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 )
220
130
# parse output (see logic in report() in bzrlib/delta.py)
257
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 )
260
173
files = self.parse_file_blocks( output )
261
174
return True if len( files ) else False
269
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 )
272
187
files = self.parse_file_blocks( output )
273
188
return files['conflicts'] if 'conflicts' in files else None
276
def add( self, files ):
277
"""Make sure files are added to version control.
278
@param files a list of relative filenames
282
self.run( [ 'bzr', 'add', '-N' ] + files )
286
"""Commit changes to the repo.
291
self.run( [ 'bzr', 'commit', '-m', '' ] )
292
except self.VcsError as e:
293
if re.search( 'Working tree is out of date', e.output ):
294
raise the.program.FatalError(
295
'you must update your files first.\n' +
296
'Hint: see "%s update --help"' % the.program.name );
301
def run( self, cmd ):
302
if the.verbose >= 2: print 'exec: %s' % ' '.join( cmd )
303
p = Popen( cmd, cwd = self.dir,
304
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
305
output = p.communicate()[ 0 ]
307
raise self.VcsError( ' '.join( cmd[ : 2 ] ), output )
309
verbose_output = output.rstrip()
310
if len( verbose_output ):
311
print re.sub( '(^|\n)', '\\1 : ', verbose_output )
315
191
def parse_file_blocks( self, output ):