else:
self.config = None
+ def save_config(self):
+ with open(self.config_loc, 'wb') as config_file:
+ self.config.write(config_file)
+
def create(self, api_url):
# create the directory
if os.path.isdir(self.location):
self.config = ConfigParser.RawConfigParser()
self.config.add_section('remote')
self.config.set('remote', 'api_url', api_url)
- with open(self.config_loc, 'wb') as config_file:
- self.config.write(config_file)
+ self.save_config()
# create cache/
os.mkdir(os.path.join(self.location, 'cache'))
# create cache/pagedict
pagedata = json.loads(pagedata_raw)
rvid = int(rv['revid'])
pagedata[rvid] = {
- 'user': rv['user'], 'timestamp': rv['timestamp']
+ 'user': rv['user'],
+ 'timestamp': rv['timestamp'],
}
if '*' in rv.keys():
pagedata[rvid]['content'] = rv['*']
pagedata = json.loads(fd.read())
return pagedata[str(rvid)]
- def working_dir_status(self):
+ def working_dir_status(self, files=None):
status = {}
check = []
- for root, dirs, files in os.walk(self.root):
- if root == self.root:
- dirs.remove('.mw')
- for name in files:
- check.append(os.path.join(root, name))
+ if files == None or files == []:
+ for root, dirs, files in os.walk(self.root):
+ if root == self.root:
+ dirs.remove('.mw')
+ for name in files:
+ check.append(os.path.join(root, name))
+ else:
+ for file in files:
+ check.append(os.path.join(os.getcwd(), file))
check.sort()
for full in check:
name = os.path.split(full)[1]
rvid = self.pages_get_rv_list(pageid)[-1]
rv = self.pages_get_rv(pageid, rvid)
cur_content = codecs.open(full, 'r', 'utf-8').read()
+ if (len(cur_content) != 0) and (cur_content[-1] == '\n'):
+ cur_content = cur_content[:-1]
if cur_content != rv['content']:
status[os.path.relpath(full, self.root)] = 'U'
return status
oldrvid = self.pages_get_rv_list(pageid)[-1]
oldrv = self.pages_get_rv(pageid, oldrvid)
oldname = 'a/%s (revision %i)' % (filename, oldrvid)
- old = [i+'\n' for i in oldrv['content'].split('\n')]
+ old = [i + '\n' for i in oldrv['content'].split('\n')]
if newrvid == 0:
cur_content = codecs.open(filename, 'r', 'utf-8').read()
+ if (len(cur_content) != 0) and (cur_content[-1] == '\n'):
+ cur_content = cur_content[:-1]
newname = 'b/%s (working copy)' % filename
- new = [i+'\n' for i in cur_content.split('\n')]
+ new = [i + '\n' for i in cur_content.split('\n')]
else:
newrv = self.pages_get_rv(pageid, newrvid)
newname = 'b/%s (revision %i)' % (filename, newrvid)
- new = [i+'\n' for i in newrv['content'].split('\n')]
+ new = [i + '\n' for i in newrv['content'].split('\n')]
diff_fd = StringIO()
bzrlib.diff.internal_diff(oldname, old, newname, new, diff_fd)
diff_fd.seek(0)
- return diff_fd.read()
+ diff = diff_fd.read()
+ if diff[-1] == '\n':
+ diff = diff[:-1]
+ return diff