Lines Matching refs:dir
139 def __init__(self, dir): argument
140 self.dir = dir
143 if 0 != subprocess.call(['git', 'init', '-b', 'main', self.dir]):
146 subprocess.call(['git', '-C', self.dir,
150 if 0 != subprocess.call(['git', '-C', self.dir, 'add', '*']):
152 if 0 != subprocess.call(['git', '-C', self.dir, 'commit',
157 cmd = ['git', '-C', self.dir, 'checkout']
171 if 0 == subprocess.call(['git', '-C', self.dir,
177 subprocess.call(['git', '-C', self.dir, 'rerere'])
193 conflict_markers = subprocess.run(['git', '-C', self.dir,
197 conflicts = subprocess.check_output(['git', '-C', self.dir, 'diff',
206 subprocess.call(['git', '-C', self.dir, 'add', filename])
211 result = subprocess.check_output(['git', '-C', self.dir, 'status',
216 conflicts = subprocess.check_output(['git', '-C', self.dir, 'diff',
221 return 0 == subprocess.call(['git', '-C', self.dir, 'rev-parse',
226 print("Completing merge in {}".format(self.dir))
227 subprocess.call(['git', '-C', self.dir, 'rerere'])
228 if 0 != subprocess.call(['git', '-C', self.dir,
231 .format(self.dir))
234 "Merging in {} is not complete".format(self.dir))
242 make_copy(resolve_dir, self.dir + "/.git/rr-cache")
248 make_copy(self.dir + "/.git/rr-cache", resolve_dir)
261 if os.path.lexists(self.repo.dir):
264 .format(self.repo.dir)):
267 'working dir'.format(self.repo.dir))
269 shutil.rmtree(self.repo.dir)
271 printerr("Unable to delete {}.".format(self.repo.dir))
325 base_version, self.repo.dir))