To get this branch, use:
bzr branch
http://bzr.ed.am/stdhome
« back to all changes in this revision
Viewing changes to lib/stdhome/vcs/bzr.py
- browse files at revision 87
- compare with another revision
- download diff
- download tarball
- view history from revision 87
- Committer: Tim Marston
- Date: 2021-07-05 19:11:53 UTC
- Revision ID: tim@ed.am-20210705191153-5jcbb6lxv5i15ypx
fix debian dist-package installation
- files added:
- dev
- files renamed:
- version => VERSION
- files modified:
- .bzrignore
added
removed
lib/stdhome/vcs/bzr.py
34
34
35
35
@param dir the fully-qualified directory to work in.
36
36
"""
37
37
38
self.dir = dir
39
self.ignored_files = [ '.bzr', '.bzrignore' ]
40
41
42
def has_authority( self ):
43
"""Check that the directory is under this VCS's control.
44
"""
45
46
return os.path.exists( os.path.join( self.dir, '.bzr' ) )
47
48
49
def expand_repo_url( self, url ):
50
"""Convert a simple hostname in to an URL that the VCS can use.
51
"""
52
53
return 'bzr+ssh://%s/%s/%s' % ( url, the.dir, the.repo.name )
38
54
39
55
40
56
def init( self ):
85
101
"""Obtain some sort of revision identifier
86
102
"""
87
103
88
# bzr revert
104
# bzr revno
89
105
output = self.run( [ 'bzr', 'revno', '--tree' ] )
90
106
91
107
# parse revno
99
115
revision.
100
116
"""
101
117
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' ] )
118
# bzr st
119
output = self.run( [ 'bzr', 'status' ] )
120
files = self.parse_file_blocks( output )
121
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 )
128
if not matches:
129
raise RunTimeError(
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 )
138
else:
139
raise RuntimeError( 'exotic file in repo: %s' % file )
140
141
# bzr revert
105
142
self.run( [ 'bzr', 'revert', '--no-backup' ] )
106
143
107
144
# bzr st
111
148
# remove unknown files
112
149
if 'unknown' in files:
113
150
for file in files[ 'unknown' ]:
114
if the.verbose > 1: print "removing unknown: " + file
151
matches = re.search( r'^(.+?)[/@+]?$', file )
152
if not matches:
153
raise RunTimeError(
154
'failed to parse bzr unknowns: %s' % file )
155
file = matches.group( 1 )
156
if the.verbose >= 2: print "removing (unknown): " + file
115
157
full_file = os.path.join( self.dir, file )
116
if os.path.isfile( full_file ):
158
if os.path.isfile( full_file ) or os.path.islink( full_file ):
117
159
os.unlink( full_file )
118
160
elif os.path.isdir( full_file ):
119
161
shutil.rmtree( full_file )
120
162
else:
121
163
raise RuntimeError( 'exotic file in repo: %s' % file )
122
164
123
# if a revision identifyer has been given, update to that
124
if revno is not None:
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:
125
167
126
168
# bzr update
127
169
self.run( [ 'bzr', 'update', '-r', revno ] )
181
223
for line in buf:
182
224
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
183
225
line = line.rstrip()
184
if the.verbose > 1: print ' %s' % line
185
226
186
227
# renames show before and after file names
187
228
matches = re.search( '^R.. (.*?)[/@+]? => (.*?)[/@+]?$', line )
203
244
continue
204
245
205
246
raise RuntimeError(
206
'failed to parse bzr update output line:\n%' % line )
247
'failed to parse bzr update output line:\n%s' % line )
207
248
208
249
return files
209
250
232
273
return files['conflicts'] if 'conflicts' in files else None
233
274
234
275
276
def add( self, files ):
277
"""Make sure files are added to version control.
278
@param files a list of relative filenames
279
"""
280
281
# bzr add
282
self.run( [ 'bzr', 'add', '-N' ] + files )
283
284
285
def commit( self ):
286
"""Commit changes to the repo.
287
"""
288
289
# bzr commit
290
try:
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 );
297
else:
298
raise e
299
300
235
301
def run( self, cmd ):
236
if the.verbose > 1: print 'exec: %s' % ' '.join( cmd )
302
if the.verbose >= 2: print 'exec: %s' % ' '.join( cmd )
237
303
p = Popen( cmd, cwd = self.dir,
238
304
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
239
305
output = p.communicate()[ 0 ]
240
306
if p.returncode > 0:
241
307
raise self.VcsError( ' '.join( cmd[ : 2 ] ), output )
308
if the.verbose >= 2:
309
verbose_output = output.rstrip()
310
if len( verbose_output ):
311
print re.sub( '(^|\n)', '\\1 : ', verbose_output )
242
312
return output
243
313
244
314
258
328
res[ current ] = list()
259
329
res[ current ].append( matches.group( 1 ) )
260
330
continue
261
if re.search( '^[0-9]+ shelf exists', line ): continue
331
if re.search( '^[0-9]+ shel(?:f|ves) exists?', line ): continue
262
332
if re.search( '^working tree is out of date', line ): continue
263
333
raise self.ParseError( "unrecognised line: %s" % line )
264
334
return res
Loggerhead is a web-based interface for Bazaar branches
Version: 1.18.2, Revision: 480