45
45
os.mkdir( self.dir )
48
p = Popen( [ 'bzr', 'init', '.' ], cwd = self.dir,
49
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
50
output = p.communicate()[ 0 ]
49
self.run( [ 'bzr', 'init', '.' ] )
50
except self.VcsError as e:
53
52
# attempt to clean-up dir
69
68
os.mkdir( self.dir )
72
p = Popen( [ 'bzr', 'co', url, '.' ], cwd = self.dir,
73
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
74
output = p.communicate()[ 0 ]
72
self.run( [ 'bzr', 'checkout', url, '.' ] )
73
except self.VcsError as e:
77
75
# attempt to clean-up dir
83
raise self.VcsError( 'bzr checkout failed', output )
84
def get_revno( self ):
85
"""Obtain some sort of revision identifier
89
output = self.run( [ 'bzr', 'revno', '--tree' ] )
92
buf = StringIO.StringIO( output )
93
return buf.readline().rstrip()
96
def revert( self, revno = None ):
87
97
"""Revert the branch so that there are no outstanding changes or unknown files.
98
If a revno is supplied, then the repository is reverted to that
103
output = self.run( [ 'bzr', 'status' ] )
104
files = self.parse_file_blocks( output )
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 )
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 )
123
raise RuntimeError( 'exotic file in repo: %s' % file )
91
p = Popen( [ 'bzr', 'revert', '--no-backup' ], cwd = self.dir,
92
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
93
output = p.communicate()[ 0 ]
95
raise self.VcsError( 'bzr revert failed', output )
126
self.run( [ 'bzr', 'revert', '--no-backup' ] )
98
p = Popen( [ 'bzr', 'st' ], cwd = self.dir,
99
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
100
output = p.communicate()[ 0 ]
102
raise self.VcsError( 'bzr status failed', output )
129
output = self.run( [ 'bzr', 'status' ] )
103
130
files = self.parse_file_blocks( output )
105
132
# remove unknown files
106
133
if 'unknown' in files:
107
134
for file in files[ 'unknown' ]:
135
if the.verbose >= 2: print "removing (unknown): " + file
108
136
full_file = os.path.join( self.dir, file )
109
137
if os.path.isfile( full_file ):
110
138
os.unlink( full_file )
111
elif os.full_file.isdir( full_file ):
139
elif os.path.isdir( full_file ):
112
140
shutil.rmtree( full_file )
114
142
raise RuntimeError( 'exotic file in repo: %s' % file )
144
# if a revision identifyer has been given, update to that
145
if revno is not None:
148
self.run( [ 'bzr', 'update', '-r', revno ] )
117
151
def update( self ):
118
152
"""Update the branch, pulling down any upstream changes and merging them. This
124
p = Popen( [ 'bzr', 'update' ], cwd = self.dir,
125
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
126
output = p.communicate()[ 0 ]
128
raise self.VcsError( 'bzr update failed', output )
157
# WARNING: the following might cause bzr to ask for your ssh password more than
158
# once during an update!!!
161
# revno = self.get_revno()
163
# # update to current revision (pull in history without updating tree)
164
# self.run( [ 'bzr', 'update', '-r', revno ] )
167
# next_revno = str( int( revno ) + 1 )
168
# output = self.run( [ 'bzr', 'log', '-r', next_revno + '..' ] )
171
# keep_files = list()
172
# buf = StringIO.StringIO( output )
175
# line = line.rstrip( '\n' )
176
# if line.lower() == 'message:':
179
# if line[ : 2 ] != ' ':
184
# # process directives
185
# if line[ : 6 ].lower() == 'keep: ':
187
# if file in rename_files: file = rename_files[ file ]
188
# keep_files.append( file )
189
# elif line[ : 8 ].lower() == 'rename: ':
190
# rename_from = line[ 8 : ]
191
# elif line[ : 4 ].lower() == 'to: ':
192
# if rename_from in rename_files:
193
# rename_from = rename_files[ rename_from ]
194
# rename_files[ line[ 4 : ] ] = rename_from
196
# bzr update properly
197
output = self.run( [ 'bzr', 'update' ] )
130
199
# parse output (see logic in report() in bzrlib/delta.py)
168
p = Popen( [ 'bzr', 'status', '--no-pending' ], cwd = self.dir,
169
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
170
output = p.communicate()[ 0 ]
172
raise self.VcsError( 'bzr status failed', output )
237
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
173
240
files = self.parse_file_blocks( output )
174
241
return True if len( files ) else False
182
p = Popen( [ 'bzr', 'status', '--no-pending' ], cwd = self.dir,
183
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
184
output = p.communicate()[ 0 ]
186
raise self.VcsError( 'bzr status failed', output )
249
output = self.run( [ 'bzr', 'status', '--no-pending' ] )
187
252
files = self.parse_file_blocks( output )
188
253
return files['conflicts'] if 'conflicts' in files else None
256
def add( self, files ):
257
"""Make sure files are added to version control.
258
@param files a list of relative filenames
262
self.run( [ 'bzr', 'add' ] + files )
266
"""Commit changes to the repo.
270
self.run( [ 'bzr', 'commit', '-m', '' ] )
273
def run( self, cmd ):
274
if the.verbose >= 2: print 'exec: %s' % ' '.join( cmd )
275
p = Popen( cmd, cwd = self.dir,
276
stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
277
output = p.communicate()[ 0 ]
279
raise self.VcsError( ' '.join( cmd[ : 2 ] ), output )
191
283
def parse_file_blocks( self, output ):