Merge lp://staging/~jameinel/loggerhead/small-cleanups into lp://staging/loggerhead
| Status: | Merged |
|---|---|
| Approved by: | Martin Albisetti |
| Approved revision: | 413 |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~jameinel/loggerhead/small-cleanups |
| Merge into: | lp://staging/loggerhead |
| Diff against target: |
113 lines (+39/-4) (has conflicts) 4 files modified
.bzrignore (+6/-0) __init__.py (+14/-2) loggerhead/apps/branch.py (+1/-1) loggerhead/util.py (+18/-1) Text conflict in .bzrignore |
| To merge this branch: | bzr merge lp://staging/~jameinel/loggerhead/small-cleanups |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Albisetti | Approve | ||
|
Review via email:
|
|||
Description of the change
A collection of small cleanups, mostly win32 related.
1) strftime('%T') seems to be part of a standard, but isn't supported by Windows. So we just get an exception. Just expand it to '%H:%M:%S'.
2) Change one of the runtime-import checks to get 'bzr serve --http' working again.
3) Ignore ctags files ('tags')
4) Change 'bzr serve --http' so that it sets up logging for loggerhead and simpleTAL, otherwise when things go bad I just get "No handles found for ..."
5) Adds a '_set_property()' function for the generic util.Container. This lets you define a cached property attribute that will be evaluated on request, rather than an creation.
The big one here was "merge_points" which has to do a fair amount of work to determine what revisions actually merged this rev. However 90% of the time it goes unused. (And at the moment, I think it is broken anyway...)
Hopefully these changes aren't controversial.
Looks good to land, minus the conflicts in .bzrignore with trunk