3
# Copyright (C) 2014 Tim Marston <tim@edm.am>
5
# This file is part of stdhome (hereafter referred to as "this program").
6
# See http://ed.am/dev/stdhome for more information.
8
# This program is free software: you can redistribute it and/or modify
9
# it under the terms of the GNU General Public License as published by
10
# the Free Software Foundation, either version 3 of the License, or
11
# (at your option) any later version.
13
# This program is distributed in the hope that it will be useful,
14
# but WITHOUT ANY WARRANTY; without even the implied warranty of
15
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16
# GNU General Public License for more details.
18
# You should have received a copy of the GNU General Public License
19
# along with this program. If not, see <http://www.gnu.org/licenses/>.
27
from subprocess import Popen
29
from stdhome import the
37
def __init__( self, dir ):
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 )
62
"""Create a new, empty branch
65
# the directory shouldn't exist
70
self.run( [ 'bzr', 'init', '.' ] )
71
except self.VcsError as e:
73
# attempt to clean-up dir
75
shutil.rmtree( self.dir )
82
def checkout( self, url ):
83
"""Checkout a new copy of a remote branch.
85
@param url the remote repository URL
88
# the directory shouldn't exist
93
self.run( [ 'bzr', 'checkout', url, '.' ] )
94
except self.VcsError as e:
96
# attempt to clean-up dir
98
shutil.rmtree( self.dir )
105
def get_revno( self ):
106
"""Obtain some sort of revision identifier
110
output = self.run( [ 'bzr', 'revno', '--tree' ] )
113
buf = io.StringIO( output )
114
return buf.readline().rstrip()
117
def revert( self, revno = None ):
118
"""Revert the branch so that there are no outstanding changes or unknown files.
119
If a revno is supplied, then the repository is reverted to that
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 )
147
self.run( [ 'bzr', 'revert', '--no-backup' ] )
150
output = self.run( [ 'bzr', 'status' ] )
151
files = self.parse_file_blocks( output )
153
# remove unknown files
154
if 'unknown' in files:
155
for file in files[ 'unknown' ]:
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)
162
full_file = os.path.join( self.dir, file )
163
if os.path.isfile( full_file ) or os.path.islink( full_file ):
164
os.unlink( full_file )
165
elif os.path.isdir( full_file ):
166
shutil.rmtree( full_file )
168
raise RuntimeError( 'exotic file in repo: %s' % file )
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:
174
self.run( [ 'bzr', 'update', '-r', revno ] )
178
"""Update the branch, pulling down any upstream changes and merging them. This
179
method returns a list of the files that were modified as part of this
183
# WARNING: the following might cause bzr to ask for your ssh password more than
184
# once during an update!!!
187
# revno = self.get_revno()
189
# # update to current revision (pull in history without updating tree)
190
# self.run( [ 'bzr', 'update', '-r', revno ] )
193
# next_revno = str( int( revno ) + 1 )
194
# output = self.run( [ 'bzr', 'log', '-r', next_revno + '..' ] )
197
# keep_files = list()
198
# buf = StringIO.StringIO( output )
201
# line = line.rstrip( '\n' )
202
# if line.lower() == 'message:':
205
# if line[ : 2 ] != ' ':
210
# # process directives
211
# if line[ : 6 ].lower() == 'keep: ':
213
# if file in rename_files: file = rename_files[ file ]
214
# keep_files.append( file )
215
# elif line[ : 8 ].lower() == 'rename: ':
216
# rename_from = line[ 8 : ]
217
# elif line[ : 4 ].lower() == 'to: ':
218
# if rename_from in rename_files:
219
# rename_from = rename_files[ rename_from ]
220
# rename_files[ line[ 4 : ] ] = rename_from
222
# bzr update properly
223
output = self.run( [ 'bzr', 'update' ] )
225
# parse output (see logic in report() in bzrlib/delta.py)
227
buf = io.StringIO( output )
229
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
232
# renames show before and after file names
233
matches = re.search( '^R.. (.*?)[/@+]? => (.*?)[/@+]?$', line )
235
files.append( matches.group( 1 ) )
236
files.append( matches.group( 2 ) )
239
# kind changes shows the same name twice
240
matches = re.search( '^.K. (.*?)[/@+]? => (.*?)[/@+]?$', line )
242
files.append( matches.group( 1 ) )
245
# other entries have only one filename
246
matches = re.search( '^... (.*?)[/@+]?$', line )
248
files.append( matches.group( 1 ) )
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 )
270
def has_changes( self ):
271
"""Check if the branch has any local modifications.
275
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
278
files = self.parse_file_blocks( output )
279
return True if len( files ) else False
282
def get_conflicts( self ):
283
"""Return a list of files that have conflicts.
287
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
290
files = self.parse_file_blocks( output )
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 );
319
def run( self, cmd ):
320
if the.verbose >= 2: print('exec: %s' % ' '.join( cmd ))
321
p = Popen( cmd, cwd = self.dir,
322
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
323
output = p.communicate()[ 0 ].decode()
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 ))
333
def parse_file_blocks( self, output ):
336
buf = io.StringIO( output )
338
matches = re.search( '^([a-z ]+):$', line, re.I )
340
current = matches.group( 1 )
343
matches = re.search( '^ ([^ ].*)$', line )
345
if not current in res:
346
res[ current ] = list()
347
res[ current ].append( matches.group( 1 ) )
349
if re.search( '^[0-9]+ shel(?:f|ves) exists?', line ): continue
350
if re.search( '^working tree is out of date', line ): continue
351
raise self.ParseError( "unrecognised line: %s" % line )
355
class ParseError( Exception ):