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 )
60
44
# the directory shouldn't exist
61
45
os.mkdir( self.dir )
65
self.run( [ 'brz', 'init', '.' ] )
49
self.run( [ 'bzr', 'init', '.' ] )
66
50
except self.VcsError as e:
68
52
# attempt to clean-up dir
83
67
# the directory shouldn't exist
84
68
os.mkdir( self.dir )
88
self.run( [ 'brz', 'checkout', url, '.' ] )
72
self.run( [ 'bzr', 'checkout', url, '.' ] )
89
73
except self.VcsError as e:
91
75
# attempt to clean-up dir
101
85
"""Obtain some sort of revision identifier
105
output = self.run( [ 'brz', 'revno', '--tree' ] )
89
output = self.run( [ 'bzr', 'revno', '--tree' ] )
108
buf = io.StringIO( output )
92
buf = StringIO.StringIO( output )
109
93
return buf.readline().rstrip()
119
output = self.run( [ 'brz', 'status' ] )
103
output = self.run( [ 'bzr', 'status' ] )
120
104
files = self.parse_file_blocks( output )
122
# remove kind changed files (or they can cause `brz revert` to break in
106
# remove kind changed files (or they can cause `bzr revert` to break in
123
107
# strange situations, like when a directory has been replaced with a
124
108
# symlink to a non-existant file)
125
109
if 'kind changed' in files:
126
110
for file in files[ 'kind changed' ]:
127
matches = re.search( '^(.+?)[/@+]? \([^)]+\)$', file )
111
matches = re.match( r'(.+?)[/@+]? \([^)]+\)', file )
129
113
raise RunTimeError(
130
'failed to parse brz kind change: %s' % file )
114
'failed to parse bzr kind change: %s' % file )
131
115
file = matches.group( 1 )
132
if the.verbose >= 2: print("removing (kind changed): " + file)
116
if the.verbose >= 2: print "removing (kind changed): " + file
133
117
full_file = os.path.join( self.dir, file )
134
118
if os.path.isfile( full_file ) or os.path.islink( full_file ):
135
119
os.unlink( full_file )
139
123
raise RuntimeError( 'exotic file in repo: %s' % file )
142
self.run( [ 'brz', 'revert', '--no-backup' ] )
126
self.run( [ 'bzr', 'revert', '--no-backup' ] )
145
output = self.run( [ 'brz', 'status' ] )
129
output = self.run( [ 'bzr', 'status' ] )
146
130
files = self.parse_file_blocks( output )
148
132
# remove unknown files
149
133
if 'unknown' in files:
150
134
for file in files[ 'unknown' ]:
151
matches = re.search( r'^(.+?)[/@+]?$', file )
154
'failed to parse brz unknowns: %s' % file )
155
file = matches.group( 1 )
156
if the.verbose >= 2: print("removing (unknown): " + file)
135
if the.verbose >= 2: print "removing (unknown): " + file
157
136
full_file = os.path.join( self.dir, file )
158
if os.path.isfile( full_file ) or os.path.islink( full_file ):
137
if os.path.isfile( full_file ):
159
138
os.unlink( full_file )
160
139
elif os.path.isdir( full_file ):
161
140
shutil.rmtree( full_file )
163
142
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:
144
# if a revision identifyer has been given, update to that
145
if revno is not None:
169
self.run( [ 'brz', 'update', '-r', revno ] )
148
self.run( [ 'bzr', 'update', '-r', revno ] )
172
151
def update( self ):
178
# WARNING: the following might cause brz to ask for your ssh password more than
157
# WARNING: the following might cause bzr to ask for your ssh password more than
179
158
# once during an update!!!
182
161
# revno = self.get_revno()
184
163
# # update to current revision (pull in history without updating tree)
185
# self.run( [ 'brz', 'update', '-r', revno ] )
164
# self.run( [ 'bzr', 'update', '-r', revno ] )
187
166
# # get log output
188
167
# next_revno = str( int( revno ) + 1 )
189
# output = self.run( [ 'brz', 'log', '-r', next_revno + '..' ] )
168
# output = self.run( [ 'bzr', 'log', '-r', next_revno + '..' ] )
192
171
# keep_files = list()
214
193
# rename_from = rename_files[ rename_from ]
215
194
# rename_files[ line[ 4 : ] ] = rename_from
217
# brz update properly
218
output = self.run( [ 'brz', 'update' ] )
196
# bzr update properly
197
output = self.run( [ 'bzr', 'update' ] )
220
199
# parse output (see logic in report() in bzrlib/delta.py)
222
buf = io.StringIO( output )
201
buf = StringIO.StringIO( output )
224
203
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
225
204
line = line.rstrip()
205
if the.verbose >= 2: print ' %s' % line
227
207
# renames show before and after file names
228
208
matches = re.search( '^R.. (.*?)[/@+]? => (.*?)[/@+]?$', line )
246
226
raise RuntimeError(
247
'failed to parse brz update output line:\n%s' % line )
227
'failed to parse bzr update output line:\n%s' % line )
253
"""Get a list of any local modifications. This method returns a list of files
259
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
262
return self.parse_file_blocks( output )
265
232
def has_changes( self ):
266
233
"""Check if the branch has any local modifications.
270
output = self.run( [ 'brz', 'status', '--no-pending' ] )
237
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
273
240
files = self.parse_file_blocks( output )
278
245
"""Return a list of files that have conflicts.
282
output = self.run( [ 'brz', 'status', '--no-pending' ] )
249
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
285
252
files = self.parse_file_blocks( output )
291
258
@param files a list of relative filenames
295
self.run( [ 'brz', 'add', '-N' ] + files )
262
self.run( [ 'bzr', 'add' ] + files )
298
265
def commit( self ):
299
266
"""Commit changes to the repo.
304
self.run( [ 'brz', 'commit', '-m', '' ] )
305
except self.VcsError as e:
306
if re.search( 'Working tree is out of date', e.output ):
307
raise the.program.FatalError(
308
'you must update your files first.\n' +
309
'Hint: see "%s update --help"' % the.program.name );
270
self.run( [ 'bzr', 'commit', '-m', '' ] )
314
273
def run( self, cmd ):
315
if the.verbose >= 2: print('exec: %s' % ' '.join( cmd ))
274
if the.verbose >= 2: print 'exec: %s' % ' '.join( cmd )
316
275
p = Popen( cmd, cwd = self.dir,
317
276
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
318
output = p.communicate()[ 0 ].decode()
277
output = p.communicate()[ 0 ]
319
278
if p.returncode > 0:
320
279
raise self.VcsError( ' '.join( cmd[ : 2 ] ), output )
322
verbose_output = output.rstrip()
323
if len( verbose_output ):
324
print(re.sub( '(^|\n)', '\\1 : ', verbose_output ))
328
283
def parse_file_blocks( self, output ):
331
buf = io.StringIO( output )
286
buf = StringIO.StringIO( output )
333
288
matches = re.search( '^([a-z ]+):$', line, re.I )