Merge lp:~ian-clatworthy/bzr/log-show-custom into lp:~bzr/bzr/trunk-old
Proposed by
Ian Clatworthy
Status: | Rejected |
---|---|
Rejected by: | Ian Clatworthy |
Proposed branch: | lp:~ian-clatworthy/bzr/log-show-custom |
Merge into: | lp:~bzr/bzr/trunk-old |
Diff against target: |
261 lines (has conflicts)
Text conflict in bzrlib/log.py |
To merge this branch: | bzr merge lp:~ian-clatworthy/bzr/log-show-custom |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij (community) | Needs Fixing | ||
Review via email: mp+6770@code.launchpad.net |
To post a comment you must log in.
Unmerged revisions
- 4380. By Ian Clatworthy
-
log --show-custom
- 4379. By Canonical.com Patch Queue Manager <email address hidden>
-
(tanner) merge 1.15final back to trunk
- 4378. By Canonical.com Patch Queue Manager <email address hidden>
-
(igc) faster branch in a shared repo for dev6rr format (Ian
Clatworthy) - 4377. By Canonical.com Patch Queue Manager <email address hidden>
-
(igc) make branch --no-tree faster (Ian Clatworthy)
- 4376. By Canonical.com Patch Queue Manager <email address hidden>
-
(Jelmer) Return BranchPushResult from InterBranch.
lossy_push( ). - 4375. By Canonical.com Patch Queue Manager <email address hidden>
-
(Jelmer) Add child_submit_format option used by 'bzr send'.
- 4374. By Canonical.com Patch Queue Manager <email address hidden>
-
(abentley) Enable committing from a PreviewTree.
- 4373. By Canonical.com Patch Queue Manager <email address hidden>
-
(Jelmer) Mention --default-rich-root rather than a particular format
in the user guide. - 4372. By Canonical.com Patch Queue Manager <email address hidden>
-
(igc) added osutils.
parent_ directories( ) (Ian Clatworthy) - 4371. By Canonical.com Patch Queue Manager <email address hidden>
-
(Jelmer) Make dpush help/error a bit more generic.
It turns out that checking for custom properties when logging, particularly checking for foreign VCS properties, is pretty expensive. This patch switches their display off by default and introduces a new option to enable them: --show-custom. If that's considered heavy-handed, we could find a smarter way to skip foreign VCS property calculation (I couldn't see a way given the current algorithm) or make the option --show-foreign, leaving non-foreign custom properties on by default.
On OpenOffice.org with 260K revisions, this patch reduces the time by 10% from 50 seconds to 45 seconds. This improvement complements my faster-log branch: together they reduce the overall time from 50+ seconds to 41 seconds.