pull request: trips

[Linus Torvalds]

Done.

I now also require the new libdivecomputer..

            Linus

On Mon, Aug 27, 2012 at 3:34 PM, Dirk Hohndel <dirk at hohndel.org> wrote:
>
> In case you haven't pushed yet (I can see you working on something on
> your laptop ;-) ) - here's a fix to two of the issues I encountered
> playing with the test dives.
>
> /D
>
> The following changes since commit 5726a50d89d1f76b6bc2cfb96568d41d27f2b63e:
>
>   Improve group selection semantics (2012-08-20 06:45:56 -0700)
>
> are available in the git repository at:
>
>   git://git.hohndel.org/subsurface.git trips
>
> for you to fetch changes up to 9cf961249e197d6d8a3656968ce15dfd19e3ef3b:
>
>   Fix an issue with trips that have dives from multiple input files (2012-08-27 15:29:40 -0700)
>
> ----------------------------------------------------------------
> Dirk Hohndel (3):
>       First cut of explicit trip tracking
>       Some simple test dives for the trips code
>       Fix an issue with trips that have dives from multiple input files
>
>  dive.h           |  56 ++++++++++++++++++++++++++++++
>  divelist.c       | 179 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------
>  dives/test21.xml |   9 +++++
>  dives/test22.xml |   9 +++++
>  dives/test23.xml |   9 +++++
>  gtk-gui.c        |  20 ++++++++++-
>  parse-xml.c      |  62 ++++++++++++++++++++++++++++++++-
>  save-xml.c       |  28 +++++++++++++++
>  8 files changed, 296 insertions(+), 76 deletions(-)
>  create mode 100644 dives/test21.xml
>  create mode 100644 dives/test22.xml
>  create mode 100644 dives/test23.xml
>
>
> Dirk Hohndel <dirk at hohndel.org> writes:
>
>> Linus,
>>
>> I think the code for trip handling is now far enough evolved to have it
>> pushed into master. The data format should be stable and by default it
>> is turned off so it shouldn't cause any harm.
>>
>> That said, playing with the test files I discovered that there are
>> clearly a few bugs left in handling multiple files. If you want to hold
>> off with pulling this until I've fixed those, let me know
>>
>> /D
>>
>>
>> The following changes since commit 5726a50d89d1f76b6bc2cfb96568d41d27f2b63e:
>>
>>   Improve group selection semantics (2012-08-20 06:45:56 -0700)
>>
>> are available in the git repository at:
>>
>>   git://git.hohndel.org/subsurface.git trips
>>
>> for you to fetch changes up to 6500e943c18a416b4f628a963d067ee977da48ba:
>>
>>   Some simple test dives for the trips code (2012-08-27 14:34:21 -0700)
>>
>> ----------------------------------------------------------------
>> Dirk Hohndel (2):
>>       First cut of explicit trip tracking
>>       Some simple test dives for the trips code
>>
>>  dive.h           |  25 ++++++++++++++
>>  divelist.c       | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------
>>  dives/test21.xml |   9 +++++
>>  dives/test22.xml |   9 +++++
>>  dives/test23.xml |   9 +++++
>>  gtk-gui.c        |  20 ++++++++++-
>>  parse-xml.c      |  62 ++++++++++++++++++++++++++++++++-
>>  save-xml.c       |  28 +++++++++++++++
>>  8 files changed, 264 insertions(+), 76 deletions(-)
>>  create mode 100644 dives/test21.xml
>>  create mode 100644 dives/test22.xml
>>  create mode 100644 dives/test23.xml
>> _______________________________________________
>> subsurface mailing list
>> subsurface at hohndel.org
>> http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface
>
> --
> Dirk Hohndel
> Intel Open Source Technology Center