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 4
- compare with another revision
- download diff
- download tarball
- view history from revision 4
- Committer: Tim Marston
- Date: 2014-02-12 21:51:49 UTC
- Revision ID: tim@ed.am-20140212215149-msaxl7vo98il5i4a
added more commands
- files removed:
- dev
- lib/stdhome/command
- lib/stdhome/walker
- files renamed:
- lib/stdhome/command/init.py => lib/stdhome/command_init.py
- lib/stdhome/command/resolve.py => lib/stdhome/command_resolve.py
- lib/stdhome/command/stage_revert.py => lib/stdhome/command_stage_revert.py
- lib/stdhome/command/status.py => lib/stdhome/command_status.py
- lib/stdhome/command/update.py => lib/stdhome/command_update.py
- VERSION => version
- files modified:
- .bzrignore
added
removed
lib/stdhome/vcs/bzr.py
19
19
# along with this program. If not, see <http://www.gnu.org/licenses/>.
20
20
21
21
22
import io
23
import os
24
import re
25
import shutil
26
import subprocess
22
import subprocess, os, re, shutil
27
23
from subprocess import Popen
28
29
from stdhome import the
30
31
from .vcs import Vcs
32
33
34
class BzrVcs( Vcs ):
24
import stdhome.the as the
25
import StringIO
26
27
28
class VcsBzr:
35
29
36
30
37
31
def __init__( self, dir ):
39
33
40
34
@param dir the fully-qualified directory to work in.
41
35
"""
42
43
36
self.dir = dir
44
self.ignored_files = [ '.bzr', '.bzrignore' ]
45
46
47
def has_authority( self ):
48
"""Check that the directory is under this VCS's control.
49
"""
50
51
return os.path.exists( os.path.join( self.dir, '.bzr' ) )
52
53
54
def expand_repo_url( self, url ):
55
"""Convert a simple hostname in to an URL that the VCS can use.
56
"""
57
58
return 'bzr+ssh://%s/%s/%s' % ( url, the.dir, the.repo.name )
59
37
60
38
61
39
def init( self ):
66
44
os.mkdir( self.dir )
67
45
68
46
# bzr init
69
try:
70
self.run( [ 'bzr', 'init', '.' ] )
71
except self.VcsError as e:
47
p = Popen( [ 'bzr', 'init', '.' ], cwd = self.dir,
48
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
49
output = p.communicate()[ 0 ]
50
if p.returncode > 0:
72
51
73
52
# attempt to clean-up dir
74
53
try:
76
55
except OSError:
77
56
pass
78
57
79
raise
58
raise the.program.FatalError( 'bzr init failed', output )
80
59
81
60
82
61
def checkout( self, url ):
89
68
os.mkdir( self.dir )
90
69
91
70
# bzr co
92
try:
93
self.run( [ 'bzr', 'checkout', url, '.' ] )
94
except self.VcsError as e:
71
p = Popen( [ 'bzr', 'co', url, '.' ], cwd = self.dir,
72
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
73
output = p.communicate()[ 0 ]
74
if p.returncode > 0:
95
75
96
76
# attempt to clean-up dir
97
77
try:
99
79
except OSError:
100
80
pass
101
81
102
raise
103
104
105
def get_revno( self ):
106
"""Obtain some sort of revision identifier
107
"""
108
109
# bzr revno
110
output = self.run( [ 'bzr', 'revno', '--tree' ] )
111
112
# parse revno
113
buf = io.StringIO( output )
114
return buf.readline().rstrip()
115
116
117
def revert( self, revno = None ):
82
raise the.program.FatalError( 'bzr checkout failed', output )
83
84
85
def revert( self ):
118
86
"""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
120
revision.
121
87
"""
122
88
123
# bzr st
124
output = self.run( [ 'bzr', 'status' ] )
125
files = self.parse_file_blocks( output )
126
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 )
133
if not matches:
134
raise RunTimeError(
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 )
143
else:
144
raise RuntimeError( 'exotic file in repo: %s' % file )
145
146
89
# bzr revert
147
self.run( [ 'bzr', 'revert', '--no-backup' ] )
90
p = Popen( [ 'bzr', 'revert', '--no-backup' ], cwd = self.dir,
91
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
92
output = p.communicate()[ 0 ]
93
if p.returncode > 0:
94
raise the.program.FatalError( 'bzr revert failed', output )
148
95
149
96
# bzr st
150
output = self.run( [ 'bzr', 'status' ] )
97
p = Popen( [ 'bzr', 'st' ], cwd = self.dir,
98
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
99
output = p.communicate()[ 0 ]
100
if p.returncode > 0:
101
raise the.program.FatalError( 'bzr status failed', output )
151
102
files = self.parse_file_blocks( output )
152
103
153
104
# remove unknown files
154
105
if 'unknown' in files:
155
106
for file in files[ 'unknown' ]:
156
matches = re.search( r'^(.+?)[/@+]?$', file )
157
if not matches:
158
raise RunTimeError(
159
'failed to parse bzr unknowns: %s' % file )
160
file = matches.group( 1 )
161
if the.verbose >= 2: print("removing (unknown): " + file)
162
107
full_file = os.path.join( self.dir, file )
163
if os.path.isfile( full_file ) or os.path.islink( full_file ):
108
if os.path.isfile( full_file ):
164
109
os.unlink( full_file )
165
elif os.path.isdir( full_file ):
110
elif os.full_file.isdir( full_file ):
166
111
shutil.rmtree( full_file )
167
112
else:
168
113
raise RuntimeError( 'exotic file in repo: %s' % file )
169
114
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:
172
173
# bzr update
174
self.run( [ 'bzr', 'update', '-r', revno ] )
175
176
115
177
116
def update( self ):
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
180
operation.
181
"""
182
183
# WARNING: the following might cause bzr to ask for your ssh password more than
184
# once during an update!!!
185
#
186
# # get revno
187
# revno = self.get_revno()
188
#
189
# # update to current revision (pull in history without updating tree)
190
# self.run( [ 'bzr', 'update', '-r', revno ] )
191
#
192
# # get log output
193
# next_revno = str( int( revno ) + 1 )
194
# output = self.run( [ 'bzr', 'log', '-r', next_revno + '..' ] )
195
#
196
# # parse output
197
# keep_files = list()
198
# buf = StringIO.StringIO( output )
199
# in_message = False
200
# for line in buf:
201
# line = line.rstrip( '\n' )
202
# if line.lower() == 'message:':
203
# in_message = True
204
# elif in_message:
205
# if line[ : 2 ] != ' ':
206
# in_message = False
207
# else:
208
# line = line[ 2 : ]
209
#
210
# # process directives
211
# if line[ : 6 ].lower() == 'keep: ':
212
# file = line[ 6 : ]
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
221
222
# bzr update properly
223
output = self.run( [ 'bzr', 'update' ] )
224
225
# parse output (see logic in report() in bzrlib/delta.py)
226
files = list()
227
buf = io.StringIO( output )
228
for line in buf:
229
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
230
line = line.rstrip()
231
232
# renames show before and after file names
233
matches = re.search( '^R.. (.*?)[/@+]? => (.*?)[/@+]?$', line )
234
if matches:
235
files.append( matches.group( 1 ) )
236
files.append( matches.group( 2 ) )
237
continue
238
239
# kind changes shows the same name twice
240
matches = re.search( '^.K. (.*?)[/@+]? => (.*?)[/@+]?$', line )
241
if matches:
242
files.append( matches.group( 1 ) )
243
continue
244
245
# other entries have only one filename
246
matches = re.search( '^... (.*?)[/@+]?$', line )
247
if matches:
248
files.append( matches.group( 1 ) )
249
continue
250
251
raise RuntimeError(
252
'failed to parse bzr update output line:\n%s' % line )
253
254
return files
255
256
257
def status( self ):
258
"""Get a list of any local modifications. This method returns a list of files
259
which are modified.
260
261
"""
262
263
# bzr status
264
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
265
266
# parse output
267
return self.parse_file_blocks( output )
117
"""Update the branch, pulling down any upstream changes and merging them.
118
"""
119
120
# bzr update
121
p = Popen( [ 'bzr', 'update' ], cwd = self.dir,
122
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
123
output = p.communicate()[ 0 ]
124
if p.returncode > 0:
125
raise the.program.FatalError( 'bzr update failed', output )
268
126
269
127
270
128
def has_changes( self ):
272
130
"""
273
131
274
132
# bzr status
275
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
276
277
# parse output
133
p = Popen( [ 'bzr', 'status', '--no-pending' ], cwd = self.dir,
134
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
135
output = p.communicate()[ 0 ]
136
if p.returncode > 0:
137
raise the.program.FatalError( 'bzr status failed', output )
278
138
files = self.parse_file_blocks( output )
279
139
return True if len( files ) else False
280
140
284
144
"""
285
145
286
146
# bzr status
287
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
288
289
# parse output
147
p = Popen( [ 'bzr', 'status', '--no-pending' ], cwd = self.dir,
148
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
149
output = p.communicate()[ 0 ]
150
if p.returncode > 0:
151
raise the.program.FatalError( 'bzr status failed', output )
290
152
files = self.parse_file_blocks( output )
291
153
return files['conflicts'] if 'conflicts' in files else None
292
154
293
155
294
def add( self, files ):
295
"""Make sure files are added to version control.
296
@param files a list of relative filenames
297
"""
298
299
# bzr add
300
self.run( [ 'bzr', 'add', '-N' ] + files )
301
302
303
def commit( self ):
304
"""Commit changes to the repo.
305
"""
306
307
# bzr commit
308
try:
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 );
315
else:
316
raise e
317
318
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()
324
if p.returncode > 0:
325
raise self.VcsError( ' '.join( cmd[ : 2 ] ), output )
326
if the.verbose >= 2:
327
verbose_output = output.rstrip()
328
if len( verbose_output ):
329
print(re.sub( '(^|\n)', '\\1 : ', verbose_output ))
330
return output
331
332
333
156
def parse_file_blocks( self, output ):
334
157
res = dict()
335
158
current = None
336
buf = io.StringIO( output )
159
buf = StringIO.StringIO( output )
337
160
for line in buf:
338
161
matches = re.search( '^([a-z ]+):$', line, re.I )
339
162
if matches:
346
169
res[ current ] = list()
347
170
res[ current ].append( matches.group( 1 ) )
348
171
continue
349
if re.search( '^[0-9]+ shel(?:f|ves) exists?', line ): continue
172
if re.search( '^[0-9]+ shelf exists', line ): continue
350
173
if re.search( '^working tree is out of date', line ): continue
351
174
raise self.ParseError( "unrecognised line: %s" % line )
352
175
return res
Loggerhead is a web-based interface for Bazaar branches
Version: 1.18.2, Revision: 480