Awn Extras

Merge lp:~dhavlicek/awn-extras/dhavlicek into lp:awn-extras

dhavlicek
Merge into trunk

Proposed by Dave Havlicek on 2009-01-30

Status:

Rejected

Rejected by:

Mark Lee on 2009-04-01

Proposed branch:

lp:~dhavlicek/awn-extras/dhavlicek

Merge into:

lp:awn-extras

To merge this branch:

bzr merge lp:~dhavlicek/awn-extras/dhavlicek

Related bugs:

Bug #323249: calendar: evolution integration does not support webcal	Low	New
Bug #323251: calendar: evolution integration does not support recurring events	Low	Fix Released

Link a bug report

Reviewer	Date Requested	Status
Mark Lee	2009-01-30	Needs Resubmitting on 2009-01-30
Michael Rooney (community)		Needs Fixing on 2009-01-30
Awn Extras Developers	2009-01-30	Pending
Review via email: mp+3267@code.launchpad.net

Revision history for this message

Mark Lee (malept) wrote on 2009-01-30:

From a high level POV, you shouldn't leave commented out code in files which are version controlled.

review: Needs Fixing

Revision history for this message

Dave Havlicek (dhavlicek) wrote on 2009-01-30:

"From a high level POV, you shouldn't leave commented out code in files which are version controlled."

i agree - however i wasnt sure what to do with that code.. it seems like it is trying to pre-load a few year's worth of events on startup. is this the desired behavior? it severely slows things down, and i cant think of any reason to do it when clicking on a date loads the event anyway.

if that behavior is desired, you can ignore my changes to calthread.py. if not, ill remove the commented code.

Revision history for this message

Michael Rooney (mrooney) wrote on 2009-01-30:

I agree with Mark, if fetch() isn't needed, then just remove the function completely and remove calls to it. Why isn't that needed?

review: Needs Fixing

Revision history for this message

Michael Rooney (mrooney) wrote on 2009-01-30:

""From a high level POV, you shouldn't leave commented out code in files which are version controlled."

if that behavior is desired, you can ignore my changes to calthread.py. if not, ill remove the commented code."

I think it will be easier to review if you just stick to directly fixing the two bugs you filed in this branch, then we can merge, and then file new bugs for other others.

lp:~dhavlicek/awn-extras/dhavlicek updated on 2009-01-30

4. By Dave Havlicek on 2009-01-30: return calthread.py to original state

Revision history for this message

Dave Havlicek (dhavlicek) wrote on 2009-01-30:

"""From a high level POV, you shouldn't leave commented out code in files which are version controlled."

if that behavior is desired, you can ignore my changes to calthread.py. if not, ill remove the commented code."

I think it will be easier to review if you just stick to directly fixing the two bugs you filed in this branch, then we can merge, and then file new bugs for other others."

ok i have removed all changes in calthread.py - it should be at its original state now.

Revision history for this message

Mark Lee (malept) wrote on 2009-01-30:

I tried to view your changes via `bzr diff --new=<LP URL>` and found that it seems that you didn't branch trunk properly. The proper way to do this is the following:

bzr branch lp:awn-extras
[add modifications]
bzr commit
bzr push lp:~dhavlicek/awn-extras/calendar-evolution

review: Needs Resubmitting

Revision history for this message

Dave Havlicek (dhavlicek) wrote on 2009-01-30:

"I tried to view your changes via `bzr diff --new=<LP URL>` and found that it seems that you didn't branch trunk properly. The proper way to do this is the following:

bzr branch lp:awn-extras
[add modifications]
bzr commit
bzr push lp:~dhavlicek/awn-extras/calendar-evolution"

sorry, im new to the whole "contributing" thing :)

i just did what you suggested and that just created an empty branch.. if i navigate through the lp:~dhavlicek/awn-extras/dhavlicek though i do see my changes in there.

Revision history for this message

Mark Lee (malept) wrote on 2009-01-30:

"sorry, im new to the whole "contributing" thing :)

i just did what you suggested and that just created an empty branch.. if i navigate through the lp:~dhavlicek/awn-extras/dhavlicek though i do see my changes in there."

Much better. The reason why we ask to do it that way is that this way, we can run `bzr merge` to merge your changes into trunk. Please request a merge of your new branch.

Unmerged revisions

4. By Dave Havlicek on 2009-01-30: return calthread.py to original state
3. By Dave Havlicek on 2009-01-30: remove unnecessary imports in evocal.py
2. By Dave Havlicek on 2009-01-30: enable webcals in evolution calendar and enable recurring event support
1. By Dave Havlicek on 2009-01-30: dhavlicek bugfix branch