19
19
# along with this program. If not, see <http://www.gnu.org/licenses/>.
22
import subprocess, os, re, shutil
27
23
from subprocess import Popen
29
26
from stdhome import the
37
32
def __init__( self, dir ):
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 )
65
45
# the directory shouldn't exist
66
46
os.mkdir( self.dir )
70
self.run( [ 'brz', 'init', '.' ] )
50
self.run( [ 'bzr', 'init', '.' ] )
71
51
except self.VcsError as e:
73
53
# attempt to clean-up dir
88
68
# the directory shouldn't exist
89
69
os.mkdir( self.dir )
93
self.run( [ 'brz', 'checkout', url, '.' ] )
73
self.run( [ 'bzr', 'checkout', url, '.' ] )
94
74
except self.VcsError as e:
96
76
# attempt to clean-up dir
106
86
"""Obtain some sort of revision identifier
110
output = self.run( [ 'brz', 'revno', '--tree' ] )
90
output = self.run( [ 'bzr', 'revno', '--tree' ] )
113
buf = io.StringIO( output )
93
buf = StringIO.StringIO( output )
114
94
return buf.readline().rstrip()
124
output = self.run( [ 'brz', 'status' ] )
104
output = self.run( [ 'bzr', 'status' ] )
125
105
files = self.parse_file_blocks( output )
127
# remove kind changed files (or they can cause `brz revert` to break in
107
# remove kind changed files (or they can cause `bzr revert` to break in
128
108
# strange situations, like when a directory has been replaced with a
129
109
# symlink to a non-existant file)
130
110
if 'kind changed' in files:
131
111
for file in files[ 'kind changed' ]:
132
matches = re.search( '^(.+?)[/@+]? \([^)]+\)$', file )
112
matches = re.match( r'(.+?)[/@+]? \([^)]+\)', file )
134
114
raise RunTimeError(
135
'failed to parse brz kind change: %s' % file )
115
'failed to parse bzr kind change: %s' % file )
136
116
file = matches.group( 1 )
137
if the.verbose >= 2: print("removing (kind changed): " + file)
117
if the.verbose >= 2: print "removing (kind changed): " + file
138
118
full_file = os.path.join( self.dir, file )
139
119
if os.path.isfile( full_file ) or os.path.islink( full_file ):
140
120
os.unlink( full_file )
144
124
raise RuntimeError( 'exotic file in repo: %s' % file )
147
self.run( [ 'brz', 'revert', '--no-backup' ] )
127
self.run( [ 'bzr', 'revert', '--no-backup' ] )
150
output = self.run( [ 'brz', 'status' ] )
130
output = self.run( [ 'bzr', 'status' ] )
151
131
files = self.parse_file_blocks( output )
153
133
# remove unknown files
154
134
if 'unknown' in files:
155
135
for file in files[ 'unknown' ]:
156
matches = re.search( r'^(.+?)[/@+]?$', file )
159
'failed to parse brz unknowns: %s' % file )
160
file = matches.group( 1 )
161
if the.verbose >= 2: print("removing (unknown): " + file)
136
if the.verbose >= 2: print "removing (unknown): " + file
162
137
full_file = os.path.join( self.dir, file )
163
if os.path.isfile( full_file ) or os.path.islink( full_file ):
138
if os.path.isfile( full_file ):
164
139
os.unlink( full_file )
165
140
elif os.path.isdir( full_file ):
166
141
shutil.rmtree( full_file )
170
145
# if a revision identifier has been given, ensure we're updated to that
171
146
if revno is not None and self.get_revno() != revno:
174
self.run( [ 'brz', 'update', '-r', revno ] )
149
self.run( [ 'bzr', 'update', '-r', revno ] )
177
152
def update( self ):
183
# WARNING: the following might cause brz to ask for your ssh password more than
158
# WARNING: the following might cause bzr to ask for your ssh password more than
184
159
# once during an update!!!
187
162
# revno = self.get_revno()
189
164
# # update to current revision (pull in history without updating tree)
190
# self.run( [ 'brz', 'update', '-r', revno ] )
165
# self.run( [ 'bzr', 'update', '-r', revno ] )
192
167
# # get log output
193
168
# next_revno = str( int( revno ) + 1 )
194
# output = self.run( [ 'brz', 'log', '-r', next_revno + '..' ] )
169
# output = self.run( [ 'bzr', 'log', '-r', next_revno + '..' ] )
197
172
# keep_files = list()
219
194
# rename_from = rename_files[ rename_from ]
220
195
# rename_files[ line[ 4 : ] ] = rename_from
222
# brz update properly
223
output = self.run( [ 'brz', 'update' ] )
197
# bzr update properly
198
output = self.run( [ 'bzr', 'update' ] )
225
200
# parse output (see logic in report() in bzrlib/delta.py)
227
buf = io.StringIO( output )
202
buf = StringIO.StringIO( output )
229
204
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
230
205
line = line.rstrip()
206
if the.verbose >= 2: print ' %s' % line
232
208
# renames show before and after file names
233
209
matches = re.search( '^R.. (.*?)[/@+]? => (.*?)[/@+]?$', line )
251
227
raise RuntimeError(
252
'failed to parse brz update output line:\n%s' % line )
228
'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
233
def has_changes( self ):
271
234
"""Check if the branch has any local modifications.
275
output = self.run( [ 'brz', 'status', '--no-pending' ] )
238
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
278
241
files = self.parse_file_blocks( output )
283
246
"""Return a list of files that have conflicts.
287
output = self.run( [ 'brz', 'status', '--no-pending' ] )
250
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
290
253
files = self.parse_file_blocks( output )
296
259
@param files a list of relative filenames
300
self.run( [ 'brz', 'add', '-N' ] + files )
263
self.run( [ 'bzr', 'add', '-N' ] + files )
303
266
def commit( self ):
304
267
"""Commit changes to the repo.
309
self.run( [ 'brz', '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 );
271
self.run( [ 'bzr', 'commit', '-m', '' ] )
319
274
def run( self, cmd ):
320
if the.verbose >= 2: print('exec: %s' % ' '.join( cmd ))
275
if the.verbose >= 2: print 'exec: %s' % ' '.join( cmd )
321
276
p = Popen( cmd, cwd = self.dir,
322
277
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
323
output = p.communicate()[ 0 ].decode()
278
output = p.communicate()[ 0 ]
324
279
if p.returncode > 0:
325
280
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
284
def parse_file_blocks( self, output ):
336
buf = io.StringIO( output )
287
buf = StringIO.StringIO( output )
338
289
matches = re.search( '^([a-z ]+):$', line, re.I )