tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds the committer in the config + python3 support

Browse Source
This commit is contained in:
Jean-Marc Martins 2013-09-13 17:21:50 +02:00
parent 87ec798f37
commit 369477b9e5
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config
View File

@ -94,6 +94,11 @@ http_user_parameter =
http_password_parameter =
[git]
# Git default options
committer = Firstname Lastname <email@mail.com>
[rights]
# Rights management method
# Value: None | owner_only | owner_write | from_file

3
radicale/config.py
View File

@ -72,6 +72,9 @@ INITIAL_CONFIG = {
"http_url": "",
"http_user_parameter": "",
"http_password_parameter": ""},
"git": {
"committer": "Firstname Lastname <Radicale@Radicale.org>",
},
"rights": {
"type": "None",
"file": "~/.config/radicale/rights"},

10
radicale/storage/filesystem.py
View File

@ -26,16 +26,17 @@ import os
import posixpath
import json
import time
import sys
from contextlib import contextmanager
from .. import config, ical
FOLDER = os.path.expanduser(config.get("storage", "filesystem_folder"))
FILESYSTEM_ENCODING = sys.getfilesystemencoding()
try:
from dulwich.repo import Repo
GIT_REPOSITORY = Repo(FOLDER)
GIT_REPOSITORY = Repo(FOLDER).encode(FILESYSTEM_ENCODING)
except:
GIT_REPOSITORY = None
@ -52,8 +53,9 @@ def open(path, mode="r"):
# On exit
if GIT_REPOSITORY and mode == "w":
path = os.path.relpath(abs_path, FOLDER)
GIT_REPOSITORY.stage([path.encode("utf-8")])
GIT_REPOSITORY.do_commit("Commit by Radicale")
GIT_REPOSITORY.stage([path.encode(FILESYSTEM_ENCODING)])
committer = config.get("git", "committer")
GIT_REPOSITORY.do_commit("Commit by Radicale", committer=committer)
# pylint: enable=W0622