The MergeCitations batch tool had a cut-and-pasted code
replicating MergeCitationQuery logic. Naturally, it diverged :-)
Removed MergeCitations.Merge and use MergeCitationQuery instead.
svn: r22969
Refactor common base out of Citation, EventRef, and Repository
class IndirectCitationBase(object):
Citation management logic for objects that don't have citations
for the primary objects, but only for the child (secondary) ones.
The derived class must implement get_citation_child_list method
to return the list of child secondary objects that may refer
citations.
Note: for most objects, this functionality is inherited from
CitationBase, which checks both the object and the child objects.
Includes:
* has_citation_reference
* replace_citation_references
* remove_citation_references
svn: r22960
Cut-n-pastery of Repository functionality into Citation
to fix the bug pinpointed by merge_ref_test.SourceSourceCheck.
Refactoring to come next...
svn: r22953
0006848: citationtreeview corrupts when search bar open and edit occurs
0006829: Searching into source/citation selector disallows to select all related citations, only matching rows
by fixing treebasemodel so it properly deals with secondary objects, and also citationtreemodel so it adds secondary odes even when the parent is not present.
svn: r22941
Error merging citations containing objects with citations.
reapply from gramps40 the fix to MergeCitationQuery
merge_ref_test suite still fails :(
svn: r22938
Add to -h output new text about -y and -q
impex.sh switched to use --yes and --quiet
Refactor ArgHandler to reuse User object
ArgHandler now uses user.prompt
No longer custom code duplicating user.prompt functionality
This dropped support for English yes/no and prefixes in the
"OK to overwrite?", as User.prompt allows pressing "Enter"
to accept by default, and everything else except
verbatim accept choice will be treated as reject.
cli.user.User.prompt now supports treating EOF as a reject
prompt message reformatted: added newline after title
Previously, code
'-q' in ('--qml')
returned True, which was not what ArgParser meant.
Changed the rhs of in to [] from () to avoid this for every case
in ArgParser.parse in the future as well.
Tests run: the new UT added and impex.sh
svn: r22916
Implemented prompt method, changed signature
to match QuestionDialog2.__init__
Refactored existing code in User classes:
common __init__ code and User.callback pulled up to gen.user
Aligned gui and cli to use stderr for spinner and
progress printouts
For testability, self._fileout attr is used instead
of hardwired stderr/stdout, this is
add gui test (empty for now)
The new code (prompt) is not excercised anywhere but
in the unit tests yet, this is preparation work for other
items in bug #5598
svn: r22914
Reapply from gramps40.
commit b2977abeab0be3c9edd85f26f9c151d82198921c
Author: Vassilii Khachaturov <vassilii@tarunz.org>
Date: Wed Aug 21 18:54:21 2013 +0000
Replace a hardwired ProgressMeter with proper calls to User
Tested with impex.sh with and without DISPLAY env
git-svn-id: svn+ssh://svn.code.sf.net/p/gramps/code/branches/maintenance/gramps40@22901 4ae1f11a-8b86-4847-b8af-ab372f36d1fd
commit d67eda455f4f8c97e34ec7c85fb0bcf3a9c3b940
Author: Vassilii Khachaturov <vassilii@tarunz.org>
Date: Wed Aug 21 18:54:05 2013 +0000
6957: support gender in vcard import
forgotten merge cleanup
git-svn-id: svn+ssh://svn.code.sf.net/p/gramps/code/branches/maintenance/gramps40@22900 4ae1f11a-8b86-4847-b8af-ab372f36d1fd
svn: r22911
Merged from gramps40 the commits below and
verified there are no more instances of BatchTool
on trunk to change as well.
commit 657a57fb7de3c9804dfbff5b27f824ff79ead2ae
Author: Vassilii Khachaturov <vassilii@tarunz.org>
Date: Wed Aug 21 17:24:41 2013 +0000
6953: remove "undo history warning" under CLI
Port my fix from gramps34.
In addition, the Check tool now has a hardwired dependency
on ProgressMeter. Make a nullifying mock locally and
only set it to the real thing only under GUI.
Tested with impex.sh (further stages after check still fail,
see bug #6878).
git-svn-id: svn+ssh://svn.code.sf.net/p/gramps/code/branches/maintenance/gramps40@22899 4ae1f11a-8b86-4847-b8af-ab372f36d1fd
commit 064d9a7b36770857f7fd68b35ade6e8f3f52b81a
Author: Vassilii Khachaturov <vassilii@tarunz.org>
Date: Wed Aug 21 17:24:18 2013 +0000
action 'tool' CLI handler broken w/o DISPLAY
Preparing to port my fix for 6953: remove "undo history warning"
when the BatchTool run from cli (e.g., "check")
from gramps34, the ground state was worse in gramps40...
git-svn-id: svn+ssh://svn.code.sf.net/p/gramps/code/branches/maintenance/gramps40@22898 4ae1f11a-8b86-4847-b8af-ab372f36d1fd
svn: r22902
