/stdhome : revision 23

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

Committer: Tim Marston
Date: 2014-04-05 19:22:21 UTC
Revision ID: tim@ed.am-20140405192221-yl8xgy3qorbahlfw

implemented CopyInWalker in terms of CopyBaseWalker, changed implementation of
the verbose operation print function for readability

Show diffs side-by-side

added added

removed removed

lib/stdhome/vcs/bzr.py

revision.

100

"""

101

102

# bzr st

103

output = self.run( [ 'bzr', 'status' ] )

104

files = self.parse_file_blocks( output )

105

106

# remove kind changed files (or they can cause `bzr revert` to break in

107

# strange situations, like when a directory has been replaced with a

108

# symlink to a non-existant file)

109

if 'kind changed' in files:

110

for file in files[ 'kind changed' ]:

111

matches = re.match( r'(.+?)[/@+]? $[^)]+$', file )

112

if not matches:

113

raise RunTimeError(

114

'failed to parse bzr kind change: %s' % file )

115

file = matches.group( 1 )

116

if the.verbose >= 2: print "removing (kind changed): " + file

117

full_file = os.path.join( self.dir, file )

118

if os.path.isfile( full_file ) or os.path.islink( full_file ):

119

os.unlink( full_file )

120

elif os.path.isdir( full_file ):

121

shutil.rmtree( full_file )

122

else:

123

raise RuntimeError( 'exotic file in repo: %s' % file )

124

125

# bzr revert

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' ] )

126

105

self.run( [ 'bzr', 'revert', '--no-backup' ] )

127

106

128

107

# bzr st

132

111

# remove unknown files

133

112

if 'unknown' in files:

134

113

for file in files[ 'unknown' ]:

135

if the.verbose >= 2: print "removing (unknown): " + file

114

if the.verbose > 1: print "removing unknown: " + file

136

115

full_file = os.path.join( self.dir, file )

137

116

if os.path.isfile( full_file ):

138

117

os.unlink( full_file )

202

181

for line in buf:

203

182

if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue

204

183

line = line.rstrip()

205

if the.verbose >= 2: print ' %s' % line

184

if the.verbose > 1: print ' %s' % line

206

185

207

186

# renames show before and after file names

208

187

matches = re.search( '^R.. (.*?)[/@+]? => (.*?)[/@+]?$', line )

224

203

continue

225

204

226

205

raise RuntimeError(

227

'failed to parse bzr update output line:\n%s' % line )

206

'failed to parse bzr update output line:\n%' % line )

228

207

229

208

return files

230

209

253

232

return files['conflicts'] if 'conflicts' in files else None

254

233

255

234

256

def add( self, files ):

257

"""Make sure files are added to version control.

258

@param files a list of relative filenames

259

"""

260

261

# bzr add

262

self.run( [ 'bzr', 'add' ] + files )

263

264

265

def commit( self ):

266

"""Commit changes to the repo.

267

"""

268

269

# bzr commit

270

self.run( [ 'bzr', 'commit', '-m', '' ] )

271

272

273

235

def run( self, cmd ):

274

if the.verbose >= 2: print 'exec: %s' % ' '.join( cmd )

236

if the.verbose > 1: print 'exec: %s' % ' '.join( cmd )

275

237

p = Popen( cmd, cwd = self.dir,

276

238

stdout = subprocess.PIPE, stderr = subprocess.STDOUT )

277

239

output = p.communicate()[ 0 ]

296

258

res[ current ] = list()

297

259

res[ current ].append( matches.group( 1 ) )

298

260

continue

299

if re.search( '^[0-9]+ shel(?:f|ves) exists?', line ): continue

261

if re.search( '^[0-9]+ shelf exists', line ): continue

300

262

if re.search( '^working tree is out of date', line ): continue

301

263

raise self.ParseError( "unrecognised line: %s" % line )

302

264

return res

Older »