Commit Graph

73 Commits

Author SHA1 Message Date
Michiel Nauta 0204ee48e4 Add merge unittests
svn: r16949
2011-03-27 21:11:50 +00:00
Michiel Nauta 01a0822680 Commit phoenix asap to fix a bug and simplify code in merge code
svn: r16938
2011-03-26 18:52:17 +00:00
Michiel Nauta 6e1ed4c481 Use new transactions with eventmerger
svn: r16772
2011-03-07 08:09:18 +00:00
Benny Malengier 752d594571 4198: Person view does not remove a row correctly when two people are merged.
This patch improves on the context changes:
 * avoid use of transaction_xx methods
 * force an abort in case of unclean transaction

Backward compatibility is broken to achieve this.


svn: r16680
2011-02-20 10:52:06 +00:00
Michiel Nauta 1231b1cac8 4590: Error on access of LDS editor when sealed to family has been removed.
svn: r16592
2011-02-09 16:03:52 +00:00
Michiel Nauta ed85671df5 Fix typos in mergecode, notebly one missing space.
svn: r16556
2011-02-03 18:35:27 +00:00
Jérôme Rapinat c67d02847b 4326: typos (by PaulFranklin); part I
svn: r16543
2011-02-02 18:33:16 +00:00
Michiel Nauta 3fff5e38b8 make context info work for person merge
svn: r16525
2011-02-01 12:06:25 +00:00
Benny Malengier 6d596ad987 4198: Person view does not remove a row correctly when two people are merged.
This is a major patch by Michael Nauta. It means all writes happen immediately to bsddb, and the bsddb 
rollback is used on a crash. Transaction is no longer used to store changes and do them on commit.
Undo database is set on end. 
At the same time with statement is used throughout for transactions
At the same time, the original bug in merge code should be fixed
Still some issues, that will be ironed out


svn: r16523
2011-01-31 21:54:58 +00:00
Jérôme Rapinat 325bb5086e 4436: FindDuplicated tool uses merging (fix by MD Nauta)
svn: r16254
2010-12-06 09:02:01 +00:00
Nick Hall fd00d8c6e1 Remove rebuilds from merges that do not use batch transactions
svn: r16097
2010-11-01 12:00:26 +00:00
Doug Blank 6a473c8a54 4198: Person view does not remove a row correctly when two people are merged (fixed issue from previous commit)
svn: r16070
2010-10-28 13:38:43 +00:00
Doug Blank afefbad431 4198: Person view does not remove a row correctly when two people are merged.
svn: r16069
2010-10-28 13:33:29 +00:00
Doug Blank e3fdeb363d Add property keywords; removed unneeded files after merge fixes (#2059)
svn: r16059
2010-10-26 10:49:11 +00:00
Nick Hall c3e527b4fb GEPS 011: Tagging - Extended to Family, Note and Media objects
svn: r16025
2010-10-22 23:22:33 +00:00
Nick Hall 2bece278c0 Fix error handling when merging people
svn: r15675
2010-08-01 18:18:29 +00:00
Doug Blank 3e28ee67ec 2059: need a way to compare and merge all objects, by MD Nauta
svn: r15645
2010-07-22 02:16:32 +00:00
Gerald Britton c6df5a7a0f Tweak
svn: r15429
2010-05-20 18:39:58 +00:00
Brian Matherly df32be43de 0003796: Make export available when no GUI available. Patch from jmodule (Jakim Friant).
svn: r15294
2010-05-01 04:12:42 +00:00
Doug Blank 9e505f3419 3831: Childref notes are lost on merging of children
svn: r15096
2010-04-13 02:23:56 +00:00
Doug Blank 76fbbcaab9 3831: Childref notes are lost on merging of children, by MD Nauta
svn: r15083
2010-04-11 13:44:01 +00:00
Doug Blank ac4e25bffc 3830: 'Merged GRAMPS ID' attribute overwritten on PeopleMerge by MD Nauta
svn: r15080
2010-04-11 13:09:23 +00:00
Gerald Britton 8f0582df8a Use built-in functions to replace for loops:
Old code:

for x in y:
  f(x)

New Code:

map(f, y)

Also use defaultdict instead of simple dict when advantageous and use list comprehensions
instead of for loops where map() could be used but requires lambdas.


svn: r14135
2010-01-25 17:45:21 +00:00
Brian Matherly f04880ec09 Move gettext, ngettext and sgettext calls into the new ggettext module. All of them return unicode all of the time.
svn: r14091
2010-01-18 04:42:17 +00:00
Brian Matherly c5f54d0cfc Continued work on GEP008: Move src/BasicUtils/_NameDisplay.py to src/gen/display.
svn: r14072
2010-01-14 04:08:04 +00:00
Doug Blank 872e971fd3 gen.lib and gen.utils are independent; removed gen.utils.dbutils --- moved db methods to gen.db.base
svn: r13872
2009-12-21 04:18:31 +00:00
Gerald Britton 966d2bcd42 Use new iter_objects methods
svn: r13203
2009-09-14 20:50:25 +00:00
Gerald Britton 181c0c9b41 Replace get_place_handles with iter_place_handles
svn: r12778
2009-07-08 18:11:02 +00:00
Gerald Britton b601f4bdf2 Replace get_family_handles with iter_family_handles
svn: r12776
2009-07-08 16:11:20 +00:00
Gerald Britton 2769b58a44 Implement iter_people_handles methods and begin to use them - second batch of updates
svn: r12774
2009-07-07 18:58:47 +00:00
Gerald Britton 5eb7e18dc6 Bug 3018: ImportGrdb: remove calls to keys() dictionary method where possible
svn: r12572
2009-05-26 20:48:09 +00:00
Gerald Britton 021b754939 Bug 3011: change old-style classes to new-style classes
svn: r12559
2009-05-21 17:19:50 +00:00
Gerald Britton 110557c3c7 Add glade.py with Glade class and use instead of gtk.Builder throughout project
svn: r12528
2009-05-14 20:15:59 +00:00
Gerald Britton 31187ac521 Merge modules: convert from libglade to gtkbuilder
svn: r12472
2009-04-18 03:10:50 +00:00
Jérôme Rapinat 279882c853 2748: Some URLs still point user to wiki manual version 3.0
svn: r12132
2009-02-26 10:02:00 +00:00
Jérôme Rapinat 6e89f69278 #2359: Phone and ZIP/Postal code are not added on alternate Address after merging two persons
svn: r11048
2008-09-09 07:59:04 +00:00
Gerald Britton 882199f1c2 Replace dict.has_key(x) with x in dict for performance gain
svn: r10874
2008-07-17 18:10:32 +00:00
Gerald Britton 4982292774 Code optimizations wrt handling of None - bug 2212
svn: r10811
2008-06-16 15:01:46 +00:00
Brian Matherly a46e733398 Remove the "target" parameter from GrampsDisplay.help(). It was used for the old help system. We now link directly to the wiki.
svn: r10474
2008-04-05 14:17:15 +00:00
Zsolt Foldvari 2642641b84 Changing the way of how formatted Notes are stored:
remove 'Markup' optional parameter from gen.lib.note.Note.get() method.


svn: r10288
2008-03-13 10:44:22 +00:00
Doug Blank b41c02b3af 0001927: renamed glade to avoid name conflict
svn: r10264
2008-03-11 01:21:38 +00:00
Raphael Ackermann c962d5e6e1 2008-02-22 Raphael Ackermann <raphael.ackermann@gmail.com>
* various (294 files)
	pep8 doc fixes & pylint fixes

svn: r10103
2008-02-24 13:55:55 +00:00
Erik De Richter 12056e6b67 links to wiki manual
svn: r10088
2008-02-21 08:56:39 +00:00
Erik De Richter 54cad55630 links to wiki manual
svn: r10081
2008-02-20 19:04:53 +00:00
Raphael Ackermann 90f883e46d 2008-02-18 Raphael Ackermann <raphael.ackermann@gmail.com>
* src/* 143 files
    * test/try_tree_model.py
    * windows/nsis/gcheck.py
    imports cleanup

svn: r10055
2008-02-18 20:07:09 +00:00
Raphael Ackermann de5edf9f29 2008-02-18 Raphael Ackermann <raphael.ackermann@gmail.com>
* src/DataViews/PersonView.py
	* src/ViewManager.py
	* src/GrampsCfg.py
	* src/plugins/WriteCD.py
	* src/plugins/FindDupes.py
	* src/Merge/_MergePerson.py
	* src/DbManager.py
	* src/ArgHandler.py
	* src/docgen/HtmlDoc.py
	* src/DbLoader.py
	use from QuestionDialog import ErrorDialog etc to bring in line with
	rest of gramps
	* src/Editors/_EditPrimary.py: EditPrimary._uses_duplicate_id() check
	for duplicates and give error dialog if id is already used. #0001347
	* src/Editors/_EditFamily.py: EditFamily.__do_save(), add call to 
	_uses_duplicate_id(). #0001347 

svn: r10046
2008-02-18 10:09:50 +00:00
Raphael Ackermann bbe2cc6d4e 2008-01-22 Raphael Ackermann <raphael.ackermann@gmail.com>
* src/* Everything but src/images/* and src/data/* add correct svn 
	properties with the commands:
	svn propset -R svn:mime-type text/plain src/
	svn propset -R svn:eol-style native src/
	svn propset -R svn:keywords Id src/
	See below why the Id keyword is enough. From svn help propset
	svn:keywords   - Keywords to be expanded.  Valid keywords are:
      URL, HeadURL             - The URL for the head version of the object.
      Author, LastChangedBy    - The last person to modify the file.
      Date, LastChangedDate    - The date/time the object was last modified.
      Rev, Revision,           - The last revision the object changed.
      LastChangedRevision
      Id                       - A compressed summary of the previous
                                   4 keywords.

svn: r9912
2008-01-22 09:17:46 +00:00
Don Allingham d58641415d 2007-10-08 Don Allingham <don@gramps-project.org>
* various: gen.lib integration. probably touches almost every file

	* various: gen.utils integration


svn: r9101
2007-10-08 16:41:39 +00:00
Don Allingham 8038bc0dca 2007-10-07 Don Allingham <don@gramps-project.org>
* various: gen.utils integrationk



svn: r9100
2007-10-08 04:02:34 +00:00
Don Allingham 32d7968365 2007-10-06 Don Allingham <don@gramps-project.org>
* various: creation of gen.db package



svn: r9091
2007-10-07 03:19:35 +00:00