* src/DbManager.py (__rcs): Typo; (find_revisions): Use local
time; (__selection_changed, __rcs): Change label. svn: r8618
This commit is contained in:
parent
dfa46b7af4
commit
c70a3c2852
@ -4,7 +4,8 @@
|
|||||||
|
|
||||||
2007-06-20 Alex Roitman <shura@gramps-project.org>
|
2007-06-20 Alex Roitman <shura@gramps-project.org>
|
||||||
* src/Config/_GrampsConfigKeys.py: Correctly regenerate.
|
* src/Config/_GrampsConfigKeys.py: Correctly regenerate.
|
||||||
* src/DbManager.py (__rcs): Typo.
|
* src/DbManager.py (__rcs): Typo; (find_revisions): Use local
|
||||||
|
time; (__selection_changed, __rcs): Change label.
|
||||||
|
|
||||||
2007-06-20 Don Allingham <don@gramps-project.org>
|
2007-06-20 Don Allingham <don@gramps-project.org>
|
||||||
* src/DbManager.py: Handle more advanced RCS commands, such as
|
* src/DbManager.py: Handle more advanced RCS commands, such as
|
||||||
|
@ -187,7 +187,7 @@ class DbManager:
|
|||||||
is_rev = len(self.model.get_path(node)) > 1
|
is_rev = len(self.model.get_path(node)) > 1
|
||||||
|
|
||||||
if is_rev:
|
if is_rev:
|
||||||
self.rcs.set_label(_("Restore"))
|
self.rcs.set_label(_("Extract"))
|
||||||
else:
|
else:
|
||||||
self.rcs.set_label(_("Archive"))
|
self.rcs.set_label(_("Archive"))
|
||||||
self.rename.set_sensitive(True)
|
self.rename.set_sensitive(True)
|
||||||
@ -451,7 +451,7 @@ class DbManager:
|
|||||||
QuestionDialog.QuestionDialog(
|
QuestionDialog.QuestionDialog(
|
||||||
_("Remove the '%s' version of %s") % (rev, parent),
|
_("Remove the '%s' version of %s") % (rev, parent),
|
||||||
_("Removing this version will prevent you from "
|
_("Removing this version will prevent you from "
|
||||||
"restoring it in the future."),
|
"extracting it in the future."),
|
||||||
_("Remove version"),
|
_("Remove version"),
|
||||||
self.__really_delete_version)
|
self.__really_delete_version)
|
||||||
|
|
||||||
@ -667,12 +667,12 @@ def find_revisions(name):
|
|||||||
import re
|
import re
|
||||||
|
|
||||||
rev = re.compile("\s*revision\s+([\d\.]+)")
|
rev = re.compile("\s*revision\s+([\d\.]+)")
|
||||||
date = re.compile("date:\s+(\d\d\d\d/\d\d/\d\d \d\d:\d\d:\d\d);")
|
date = re.compile("date:\s+(\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d)-\d\d;")
|
||||||
|
|
||||||
if not os.path.isfile(name):
|
if not os.path.isfile(name):
|
||||||
return []
|
return []
|
||||||
|
|
||||||
rlog = [ "rlog" , name ]
|
rlog = [ "rlog", "-zLT" , name ]
|
||||||
|
|
||||||
proc = subprocess.Popen(rlog, stdout = subprocess.PIPE)
|
proc = subprocess.Popen(rlog, stdout = subprocess.PIPE)
|
||||||
proc.wait()
|
proc.wait()
|
||||||
@ -692,7 +692,7 @@ def find_revisions(name):
|
|||||||
match = date.match(line)
|
match = date.match(line)
|
||||||
if match:
|
if match:
|
||||||
date_str = time.asctime(time.strptime(match.groups()[0],
|
date_str = time.asctime(time.strptime(match.groups()[0],
|
||||||
'%Y/%m/%d %H:%M:%S'))
|
'%Y-%m-%d %H:%M:%S'))
|
||||||
|
|
||||||
get_next = True
|
get_next = True
|
||||||
continue
|
continue
|
||||||
@ -774,4 +774,3 @@ def check_in(db, filename, callback, cursor_func = None):
|
|||||||
_("An attempt to archive the data failed "
|
_("An attempt to archive the data failed "
|
||||||
"with the following message:\n\n%s") % message
|
"with the following message:\n\n%s") % message
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user