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 28
- compare with another revision
- download diff
- download tarball
- view history from revision 28
- Committer: Tim Marston
- Date: 2014-04-05 22:30:23 UTC
- Revision ID: tim@ed.am-20140405223023-3co87mbvnxwk1l65
added revert command
- files removed:
- dev
- files renamed:
- lib/stdhome/vcs/brz.py => lib/stdhome/vcs/bzr.py
- VERSION => version
- files modified:
- .bzrignore
added
removed
lib/stdhome/vcs/bzr.py
1
# brz.py
1
# bzr.py
2
2
#
3
3
# Copyright (C) 2014 Tim Marston <tim@edm.am>
4
4
#
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
24
import StringIO
25
from vcs import Vcs
29
26
from stdhome import the
30
27
31
from .vcs import Vcs
32
33
34
class BrzVcs( Vcs ):
28
29
class BzrVcs( Vcs ):
35
30
36
31
37
32
def __init__( self, dir ):
39
34
40
35
@param dir the fully-qualified directory to work in.
41
36
"""
42
43
37
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
38
60
39
61
40
def init( self ):
65
44
# the directory shouldn't exist
66
45
os.mkdir( self.dir )
67
46
68
# brz init
47
# bzr init
69
48
try:
70
self.run( [ 'brz', 'init', '.' ] )
49
self.run( [ 'bzr', 'init', '.' ] )
71
50
except self.VcsError as e:
72
51
73
52
# attempt to clean-up dir
88
67
# the directory shouldn't exist
89
68
os.mkdir( self.dir )
90
69
91
# brz co
70
# bzr co
92
71
try:
93
self.run( [ 'brz', 'checkout', url, '.' ] )
72
self.run( [ 'bzr', 'checkout', url, '.' ] )
94
73
except self.VcsError as e:
95
74
96
75
# attempt to clean-up dir
106
85
"""Obtain some sort of revision identifier
107
86
"""
108
87
109
# brz revno
110
output = self.run( [ 'brz', 'revno', '--tree' ] )
88
# bzr revert
89
output = self.run( [ 'bzr', 'revno', '--tree' ] )
111
90
112
91
# parse revno
113
buf = io.StringIO( output )
92
buf = StringIO.StringIO( output )
114
93
return buf.readline().rstrip()
115
94
116
95
120
99
revision.
121
100
"""
122
101
123
# brz st
124
output = self.run( [ 'brz', 'status' ] )
102
# bzr st
103
output = self.run( [ 'bzr', 'status' ] )
125
104
files = self.parse_file_blocks( output )
126
105
127
# 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
128
107
# strange situations, like when a directory has been replaced with a
129
108
# symlink to a non-existant file)
130
109
if 'kind changed' in files:
131
110
for file in files[ 'kind changed' ]:
132
matches = re.search( '^(.+?)[/@+]? \([^)]+\)$', file )
111
matches = re.match( r'(.+?)[/@+]? \([^)]+\)', file )
133
112
if not matches:
134
113
raise RunTimeError(
135
'failed to parse brz kind change: %s' % file )
114
'failed to parse bzr kind change: %s' % file )
136
115
file = matches.group( 1 )
137
if the.verbose >= 2: print("removing (kind changed): " + file)
116
if the.verbose > 1: print "removing (kind changed): " + file
138
117
full_file = os.path.join( self.dir, file )
139
118
if os.path.isfile( full_file ) or os.path.islink( full_file ):
140
119
os.unlink( full_file )
143
122
else:
144
123
raise RuntimeError( 'exotic file in repo: %s' % file )
145
124
146
# brz revert
147
self.run( [ 'brz', 'revert', '--no-backup' ] )
125
# bzr revert
126
self.run( [ 'bzr', 'revert', '--no-backup' ] )
148
127
149
# brz st
150
output = self.run( [ 'brz', 'status' ] )
128
# bzr st
129
output = self.run( [ 'bzr', 'status' ] )
151
130
files = self.parse_file_blocks( output )
152
131
153
132
# remove unknown files
154
133
if 'unknown' in files:
155
134
for file in files[ 'unknown' ]:
156
matches = re.search( r'^(.+?)[/@+]?$', file )
157
if not matches:
158
raise RunTimeError(
159
'failed to parse brz unknowns: %s' % file )
160
file = matches.group( 1 )
161
if the.verbose >= 2: print("removing (unknown): " + file)
135
if the.verbose > 1: print "removing (unknown): " + file
162
136
full_file = os.path.join( self.dir, file )
163
if os.path.isfile( full_file ) or os.path.islink( full_file ):
137
if os.path.isfile( full_file ):
164
138
os.unlink( full_file )
165
139
elif os.path.isdir( full_file ):
166
140
shutil.rmtree( full_file )
167
141
else:
168
142
raise RuntimeError( 'exotic file in repo: %s' % file )
169
143
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:
144
# if a revision identifyer has been given, update to that
145
if revno is not None:
172
146
173
# brz update
174
self.run( [ 'brz', 'update', '-r', revno ] )
147
# bzr update
148
self.run( [ 'bzr', 'update', '-r', revno ] )
175
149
176
150
177
151
def update( self ):
180
154
operation.
181
155
"""
182
156
183
# 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
184
158
# once during an update!!!
185
159
#
186
160
# # get revno
187
161
# revno = self.get_revno()
188
162
#
189
163
# # update to current revision (pull in history without updating tree)
190
# self.run( [ 'brz', 'update', '-r', revno ] )
164
# self.run( [ 'bzr', 'update', '-r', revno ] )
191
165
#
192
166
# # get log output
193
167
# next_revno = str( int( revno ) + 1 )
194
# output = self.run( [ 'brz', 'log', '-r', next_revno + '..' ] )
168
# output = self.run( [ 'bzr', 'log', '-r', next_revno + '..' ] )
195
169
#
196
170
# # parse output
197
171
# keep_files = list()
219
193
# rename_from = rename_files[ rename_from ]
220
194
# rename_files[ line[ 4 : ] ] = rename_from
221
195
222
# brz update properly
223
output = self.run( [ 'brz', 'update' ] )
196
# bzr update properly
197
output = self.run( [ 'bzr', 'update' ] )
224
198
225
199
# parse output (see logic in report() in bzrlib/delta.py)
226
200
files = list()
227
buf = io.StringIO( output )
201
buf = StringIO.StringIO( output )
228
202
for line in buf:
229
203
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
230
204
line = line.rstrip()
205
if the.verbose > 1: print ' %s' % line
231
206
232
207
# renames show before and after file names
233
208
matches = re.search( '^R.. (.*?)[/@+]? => (.*?)[/@+]?$', line )
249
224
continue
250
225
251
226
raise RuntimeError(
252
'failed to parse brz update output line:\n%s' % line )
227
'failed to parse bzr update output line:\n%s' % line )
253
228
254
229
return files
255
230
256
231
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 )
268
269
270
232
def has_changes( self ):
271
233
"""Check if the branch has any local modifications.
272
234
"""
273
235
274
# brz status
275
output = self.run( [ 'brz', 'status', '--no-pending' ] )
236
# bzr status
237
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
276
238
277
239
# parse output
278
240
files = self.parse_file_blocks( output )
283
245
"""Return a list of files that have conflicts.
284
246
"""
285
247
286
# brz status
287
output = self.run( [ 'brz', 'status', '--no-pending' ] )
248
# bzr status
249
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
288
250
289
251
# parse output
290
252
files = self.parse_file_blocks( output )
291
253
return files['conflicts'] if 'conflicts' in files else None
292
254
293
255
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
# brz add
300
self.run( [ 'brz', 'add', '-N' ] + files )
301
302
303
def commit( self ):
304
"""Commit changes to the repo.
305
"""
306
307
# brz commit
308
try:
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 );
315
else:
316
raise e
317
318
319
256
def run( self, cmd ):
320
if the.verbose >= 2: print('exec: %s' % ' '.join( cmd ))
257
if the.verbose > 1: print 'exec: %s' % ' '.join( cmd )
321
258
p = Popen( cmd, cwd = self.dir,
322
259
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
323
output = p.communicate()[ 0 ].decode()
260
output = p.communicate()[ 0 ]
324
261
if p.returncode > 0:
325
262
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
263
return output
331
264
332
265
333
266
def parse_file_blocks( self, output ):
334
267
res = dict()
335
268
current = None
336
buf = io.StringIO( output )
269
buf = StringIO.StringIO( output )
337
270
for line in buf:
338
271
matches = re.search( '^([a-z ]+):$', line, re.I )
339
272
if matches:
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0