3
# Copyright (C) 2014 Tim Marston <tim@edm.am>
5
# This file is part of stdhome (hereafter referred to as "this program").
6
# See http://ed.am/dev/stdhome for more information.
8
# This program is free software: you can redistribute it and/or modify
9
# it under the terms of the GNU General Public License as published by
10
# the Free Software Foundation, either version 3 of the License, or
11
# (at your option) any later version.
13
# This program is distributed in the hope that it will be useful,
14
# but WITHOUT ANY WARRANTY; without even the implied warranty of
15
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16
# GNU General Public License for more details.
18
# You should have received a copy of the GNU General Public License
19
# along with this program. If not, see <http://www.gnu.org/licenses/>.
22
import subprocess, os, re, shutil
23
from subprocess import Popen
26
from stdhome import the
32
def __init__( self, dir ):
35
@param dir the fully-qualified directory to work in.
42
"""Create a new, empty branch
45
# the directory shouldn't exist
50
self.run( [ 'bzr', 'init', '.' ] )
51
except self.VcsError as e:
53
# attempt to clean-up dir
55
shutil.rmtree( self.dir )
62
def checkout( self, url ):
63
"""Checkout a new copy of a remote branch.
65
@param url the remote repository URL
68
# the directory shouldn't exist
73
self.run( [ 'bzr', 'checkout', url, '.' ] )
74
except self.VcsError as e:
76
# attempt to clean-up dir
78
shutil.rmtree( self.dir )
85
def get_revno( self ):
86
"""Obtain some sort of revision identifier
90
output = self.run( [ 'bzr', 'revno', '--tree' ] )
93
buf = StringIO.StringIO( output )
94
return buf.readline().rstrip()
97
def revert( self, revno = None ):
98
"""Revert the branch so that there are no outstanding changes or unknown files.
99
If a revno is supplied, then the repository is reverted to that
104
output = self.run( [ 'bzr', 'status' ] )
105
files = self.parse_file_blocks( output )
107
# remove kind changed files (or they can cause `bzr revert` to break in
108
# strange situations, like when a directory has been replaced with a
109
# symlink to a non-existant file)
110
if 'kind changed' in files:
111
for file in files[ 'kind changed' ]:
112
matches = re.match( r'(.+?)[/@+]? \([^)]+\)', file )
115
'failed to parse bzr kind change: %s' % file )
116
file = matches.group( 1 )
117
if the.verbose >= 2: print "removing (kind changed): " + file
118
full_file = os.path.join( self.dir, file )
119
if os.path.isfile( full_file ) or os.path.islink( full_file ):
120
os.unlink( full_file )
121
elif os.path.isdir( full_file ):
122
shutil.rmtree( full_file )
124
raise RuntimeError( 'exotic file in repo: %s' % file )
127
self.run( [ 'bzr', 'revert', '--no-backup' ] )
130
output = self.run( [ 'bzr', 'status' ] )
131
files = self.parse_file_blocks( output )
133
# remove unknown files
134
if 'unknown' in files:
135
for file in files[ 'unknown' ]:
136
if the.verbose >= 2: print "removing (unknown): " + file
137
full_file = os.path.join( self.dir, file )
138
if os.path.isfile( full_file ):
139
os.unlink( full_file )
140
elif os.path.isdir( full_file ):
141
shutil.rmtree( full_file )
143
raise RuntimeError( 'exotic file in repo: %s' % file )
145
# if a revision identifier has been given, ensure we're updated to that
146
if revno is not None and self.get_revno() != revno:
149
self.run( [ 'bzr', 'update', '-r', revno ] )
153
"""Update the branch, pulling down any upstream changes and merging them. This
154
method returns a list of the files that were modified as part of this
158
# WARNING: the following might cause bzr to ask for your ssh password more than
159
# once during an update!!!
162
# revno = self.get_revno()
164
# # update to current revision (pull in history without updating tree)
165
# self.run( [ 'bzr', 'update', '-r', revno ] )
168
# next_revno = str( int( revno ) + 1 )
169
# output = self.run( [ 'bzr', 'log', '-r', next_revno + '..' ] )
172
# keep_files = list()
173
# buf = StringIO.StringIO( output )
176
# line = line.rstrip( '\n' )
177
# if line.lower() == 'message:':
180
# if line[ : 2 ] != ' ':
185
# # process directives
186
# if line[ : 6 ].lower() == 'keep: ':
188
# if file in rename_files: file = rename_files[ file ]
189
# keep_files.append( file )
190
# elif line[ : 8 ].lower() == 'rename: ':
191
# rename_from = line[ 8 : ]
192
# elif line[ : 4 ].lower() == 'to: ':
193
# if rename_from in rename_files:
194
# rename_from = rename_files[ rename_from ]
195
# rename_files[ line[ 4 : ] ] = rename_from
197
# bzr update properly
198
output = self.run( [ 'bzr', 'update' ] )
200
# parse output (see logic in report() in bzrlib/delta.py)
202
buf = StringIO.StringIO( output )
204
if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
206
if the.verbose >= 2: print ' %s' % line
208
# renames show before and after file names
209
matches = re.search( '^R.. (.*?)[/@+]? => (.*?)[/@+]?$', line )
211
files.append( matches.group( 1 ) )
212
files.append( matches.group( 2 ) )
215
# kind changes shows the same name twice
216
matches = re.search( '^.K. (.*?)[/@+]? => (.*?)[/@+]?$', line )
218
files.append( matches.group( 1 ) )
221
# other entries have only one filename
222
matches = re.search( '^... (.*?)[/@+]?$', line )
224
files.append( matches.group( 1 ) )
228
'failed to parse bzr update output line:\n%s' % line )
233
def has_changes( self ):
234
"""Check if the branch has any local modifications.
238
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
241
files = self.parse_file_blocks( output )
242
return True if len( files ) else False
245
def get_conflicts( self ):
246
"""Return a list of files that have conflicts.
250
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
253
files = self.parse_file_blocks( output )
254
return files['conflicts'] if 'conflicts' in files else None
257
def add( self, files ):
258
"""Make sure files are added to version control.
259
@param files a list of relative filenames
263
self.run( [ 'bzr', 'add', '-N' ] + files )
267
"""Commit changes to the repo.
271
self.run( [ 'bzr', 'commit', '-m', '' ] )
274
def run( self, cmd ):
275
if the.verbose >= 2: print 'exec: %s' % ' '.join( cmd )
276
p = Popen( cmd, cwd = self.dir,
277
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
278
output = p.communicate()[ 0 ]
280
raise self.VcsError( ' '.join( cmd[ : 2 ] ), output )
284
def parse_file_blocks( self, output ):
287
buf = StringIO.StringIO( output )
289
matches = re.search( '^([a-z ]+):$', line, re.I )
291
current = matches.group( 1 )
294
matches = re.search( '^ ([^ ].*)$', line )
296
if not current in res:
297
res[ current ] = list()
298
res[ current ].append( matches.group( 1 ) )
300
if re.search( '^[0-9]+ shel(?:f|ves) exists?', line ): continue
301
if re.search( '^working tree is out of date', line ): continue
302
raise self.ParseError( "unrecognised line: %s" % line )
306
class ParseError( Exception ):