Trac Development Sandbox

As we like to keep our development version (a.k.a. trunk​) clean and always fully functional _{(minus the bugs)}, we try to implement functionally disruptive changes in branches first.

Branch Categories

There are basically two kinds of branches in our sandbox:

1. short-lived branches: branches that concern a small set of functionality, that is better reviewed and refined as a branch than as a patch
   • it should be a no-brainer to start this kind of branch, at the developer's discretion
   • merge back in trunk should be a no-brainer too, when one thinks that branch is robust enough for trunk inclusion
   • … so this basically follows the same policy as commit directly on trunk, except when some initial review is wanted and/or a few bugfixes are to be expected
   • typical and first example was WikiContext (see ​trac-dev:1514)
2. experimental branches:
   • this kind of branch are typically about large changes to some architectural part of Trac, or about a big rework of some subsystem.
   • the process to get such a branch up is a bit more formal: a proposal should be made to the development list, and should get approval from other developers. That initial approval doesn't necessarily mean agreement for a future branch integration, though.
   • before the branch gets merged back into trunk, another round of approval is needed

In order to distinguish between the two kind of branches, a -tmp suffix should be used for the informal, short-lived branches.

Branches Overview

Current branches

sandbox/controller

Controller refactoring

• proposal: ​trac-dev:2342
• …

sandbox/setuptools

SetupTools integration

• proposal: ​trac-dev:590
• namespace: ​trac-dev:195
• …

sandbox/sqlalchemy-ng

SqlAlchemy integration, restarted

• proposal: ​trac-dev:228

sandbox/trac-xref

TracCrossReferences

sandbox/announcer

Trac Notification system refactoring

• proposal: wiki:TracDev/Proposals/Announcer
• dev reference: wiki:TracDev/Announcer

Planned branches

sandbox/mimeview-refactoring

Mimeview refactoring, #3332

• idea: ​trac-dev:555, ​trac-dev:703
• proposal: ​trac-dev:1536

sandbox/generic-trac

GenericTrac, milestone refactoring

• proposal: ​trac-dev:1424

sandbox/setuptools

TracDev/SecurityBranch (restart on WikiContext) sandbox/vc-refactoring VcRefactoring branch for 0.12 probably

Unfinished Branches

sandbox/workflow@3378

WorkFlow branch for 0.10dev

• proposals: ​trac-dev:1, ​trac-dev:289
• discussion: ​trac-dev:256, ​trac-dev:355

sandbox/setuptools@3354

TracDev/SecurityBranch for 0.10dev

• idea: ​trac-dev:393
• proposal: ​trac-dev:476

sandbox/sqlalchemy

SqlAlchemy integration

• proposal: ​trac-dev:228

Completed Branches

sandbox/browser-quickjump@4436

VcRefactoring/BrowserQuickjump

• proposal: ​trac-dev:161
• merge: ​trac-dev:1422, r4438, 0.11

sandbox/webadmin-genshi@

WebAdmin plugin, Genshi version

• ​merge

sandbox/jquery@

Integration of jQuery

• proposal: ​trac-dev:691
• merge: r3947, 0.11

sandbox/datetimegenshi@

datetime

• proposal: ​trac-dev:732
• merge: r3935, 0.11

sandbox/genshi@

Migration from ClearSilver to Genshi

• proposal: ​trac-dev:727
• merge: r3832, 0.11

sandbox/i18n

Localization of Trac

• proposal: ​trac-dev:3436
• merge: r6989, 0.12

sandbox/unicode@

unicode refactoring

• proposal: ​trac-dev:255
• discussion: ​trac-dev:362
• merge: r3024, 0.10

sandbox/wsgi@

WSGI refactoring

• merge: ​trac-dev:223, r2957, 0.10

Plugins

As of r8950, the plugins have been moved out of the sandbox:

• The SpamFilter plugin
  • plugins/0.10/spam-filter​
  • plugins/0.11/spam-filter​
  • plugins/0.11/spam-filter-captcha
• The TracMercurial plugin
  • plugins/0.10/mercurial-plugin​
  • plugins/0.11/mercurial-plugin​
  • plugins/0.12/mercurial-plugin​
  • plugins/multirepos/mercurial-plugin​
• The WebAdmin for Trac 0.10:
  • plugins/0.10/webadmin​

---

See also: TracDev/Proposals