19
19
# along with this program. If not, see <http://www.gnu.org/licenses/>.
22
import subprocess, os, re, shutil
23
27
from subprocess import Popen
26
29
from stdhome import the
29
34
class BzrVcs( Vcs ):
35
40
@param dir the fully-qualified directory to work in.
44
self.ignored_files = [ '.bzr', '.bzrignore' ]
47
def has_authority( self ):
48
"""Check that the directory is under this VCS's control.
51
return os.path.exists( os.path.join( self.dir, '.bzr' ) )
54
def expand_repo_url( self, url ):
55
"""Convert a simple hostname in to an URL that the VCS can use.
58
return 'bzr+ssh://%s/%s/%s' % ( url, the.dir, the.repo.name )
85
106
"""Obtain some sort of revision identifier
89
110
output = self.run( [ 'bzr', 'revno', '--tree' ] )
92
buf = StringIO.StringIO( output )
113
buf = io.StringIO( output )
93
114
return buf.readline().rstrip()
102
# bzr revert (run twice to handle a bug in bzr where reverting a
103
# directory from a symlink can cause conflicts during initial revert)
104
self.run( [ 'bzr', 'revert', '--no-backup' ] )
124
output = self.run( [ 'bzr', 'status' ] )
125
files = self.parse_file_blocks( output )
127
# remove kind changed files (or they can cause `bzr revert` to break in
128
# strange situations, like when a directory has been replaced with a
129
# symlink to a non-existant file)
130
if 'kind changed' in files:
131
for file in files[ 'kind changed' ]:
132
matches = re.search( '^(.+?)[/@+]? \([^)]+\)$', file )
135
'failed to parse bzr kind change: %s' % file )
136
file = matches.group( 1 )
137
if the.verbose >= 2: print("removing (kind changed): " + file)
138
full_file = os.path.join( self.dir, file )
139
if os.path.isfile( full_file ) or os.path.islink( full_file ):
140
os.unlink( full_file )
141
elif os.path.isdir( full_file ):
142
shutil.rmtree( full_file )
144
raise RuntimeError( 'exotic file in repo: %s' % file )
105
147
self.run( [ 'bzr', 'revert', '--no-backup' ] )
111
153
# remove unknown files
112
154
if 'unknown' in files:
113
155
for file in files[ 'unknown' ]:
114
if the.verbose > 1: print "removing unknown: " + file
156
matches = re.search( r'^(.+?)[/@+]?$', file )
159
'failed to parse bzr unknowns: %s' % file )
160
file = matches.group( 1 )
161
if the.verbose >= 2: print("removing (unknown): " + file)
115
162
full_file = os.path.join( self.dir, file )
116
if os.path.isfile( full_file ):
163
if os.path.isfile( full_file ) or os.path.islink( full_file ):
117
164
os.unlink( full_file )
118
165
elif os.path.isdir( full_file ):
119
166
shutil.rmtree( full_file )
121
168
raise RuntimeError( 'exotic file in repo: %s' % file )
123
# if a revision identifyer has been given, update to that
124
if revno is not None:
170
# if a revision identifier has been given, ensure we're updated to that
171
if revno is not None and self.get_revno() != revno:
127
174
self.run( [ 'bzr', 'update', '-r', revno ] )
178
225
# parse output (see logic in report() in bzrlib/delta.py)
180
buf = StringIO.StringIO( output )
227
buf = io.StringIO( output )
182
229
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
183
230
line = line.rstrip()
184
if the.verbose > 1: print ' %s' % line
186
232
# renames show before and after file names
187
233
matches = re.search( '^R.. (.*?)[/@+]? => (.*?)[/@+]?$', line )
205
251
raise RuntimeError(
206
'failed to parse bzr update output line:\n%' % line )
252
'failed to parse bzr update output line:\n%s' % line )
258
"""Get a list of any local modifications. This method returns a list of files
264
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
267
return self.parse_file_blocks( output )
211
270
def has_changes( self ):
212
271
"""Check if the branch has any local modifications.
232
291
return files['conflicts'] if 'conflicts' in files else None
294
def add( self, files ):
295
"""Make sure files are added to version control.
296
@param files a list of relative filenames
300
self.run( [ 'bzr', 'add', '-N' ] + files )
304
"""Commit changes to the repo.
309
self.run( [ 'bzr', 'commit', '-m', '' ] )
310
except self.VcsError as e:
311
if re.search( 'Working tree is out of date', e.output ):
312
raise the.program.FatalError(
313
'you must update your files first.\n' +
314
'Hint: see "%s update --help"' % the.program.name );
235
319
def run( self, cmd ):
236
if the.verbose > 1: print 'exec: %s' % ' '.join( cmd )
320
if the.verbose >= 2: print('exec: %s' % ' '.join( cmd ))
237
321
p = Popen( cmd, cwd = self.dir,
238
322
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
239
output = p.communicate()[ 0 ]
323
output = p.communicate()[ 0 ].decode()
240
324
if p.returncode > 0:
241
325
raise self.VcsError( ' '.join( cmd[ : 2 ] ), output )
327
verbose_output = output.rstrip()
328
if len( verbose_output ):
329
print(re.sub( '(^|\n)', '\\1 : ', verbose_output ))
245
333
def parse_file_blocks( self, output ):
248
buf = StringIO.StringIO( output )
336
buf = io.StringIO( output )
250
338
matches = re.search( '^([a-z ]+):$', line, re.I )
258
346
res[ current ] = list()
259
347
res[ current ].append( matches.group( 1 ) )
261
if re.search( '^[0-9]+ shelf exists', line ): continue
349
if re.search( '^[0-9]+ shel(?:f|ves) exists?', line ): continue
262
350
if re.search( '^working tree is out of date', line ): continue
263
351
raise self.ParseError( "unrecognised line: %s" % line )