Opened 19 years ago
Closed 19 years ago
#2041 closed task (fixed)
Integrate intertrac branch in the trunk
Reported by: | Christian Boos | Owned by: | Christian Boos |
---|---|---|---|
Priority: | high | Milestone: | 0.10 |
Component: | wiki system | Version: | devel |
Severity: | major | Keywords: | branch intertrac review |
Cc: | dserodio@… kazarmy@… pixelpapst@… | Branch: | |
Release Notes: | |||
API Changes: | |||
Internal Changes: |
Description
The intertrac branch is now quite complete and functional.
It implements the following features:
- InterWiki links
- InterTrac links, which are kind of InterWiki links, but targeting other Tracs.
- support for shorthand links (e.g.
#T2041
,[T2222]
) - support for getting the complete "title" information of the remote object
being linked (only supported for sibling environments within
tracd
, for now)
- support for shorthand links (e.g.
I'll also use this ticket for attaching patches against the different 0.9 releases.
Attachments (5)
Change History (20)
comment:1 by , 19 years ago
by , 19 years ago
Attachment: | trac-0.9b1-intertrac.patch added |
---|
comment:2 by , 19 years ago
Status: | new → assigned |
---|
The patch attachment:trac-0.9b1-intertrac.patch was created against the trac-0.9b1.tar.gz. archive and applies cleanly on the source extracted from that archive:
$ ls -l trac-0.9b1-intertrac.patch -rw-r--r-- 1 nobody nobody 120577 2005-09-16 21:08 trac-0.9b1-intertrac.patch $ cd trac-0.9b1 $ patch -p1 < ../trac-0.9b1-intertrac.patch
However, you will have to fix manually one file
(trac/versioncontrol/web_ui/__init__.py
)
if you try to apply the patch on the source extracted from the
trac-0.9b1.zip
archive (different end-of-line encoding problem).
I'm sorry for the inconvenience.
comment:3 by , 19 years ago
Works for fully qualified intertrac links but not for the aliases
Also, we're using mod-rewrite and have to specify the full /cgi-bin/<projectname>/trac.cgi for the links to work.
Would be nice if there was some easy way to simply link to the trac site you are referring to instead of putting <site>::wiki
comment:4 by , 19 years ago
I can't figure out exactly what's wrong
with the description you gave above, however
I guess that when you say aliases, you are referring
to links to the sibling Tracs (other environments
from the same TRAC_ENV_PARENT_DIR
): this is not yet
supported for anything but tracd
.
If the above assumption is not correct, can you please show me:
- examples of working intertrac links
- examples of not working intertrac links
- your
[intertrac]
section from yourtrac.ini
by , 19 years ago
Attachment: | trac-0.9b2-intertrac-r2308.patch added |
---|
comment:5 by , 19 years ago
Cc: | added |
---|
comment:6 by , 19 years ago
Cc: | added |
---|
comment:7 by , 19 years ago
Cc: | added; removed |
---|
comment:8 by , 19 years ago
Keywords: | intertrac review added |
---|
I recently (r2522) improved the support for sibling environments.
comment:9 by , 19 years ago
I downloaded trac-0.9.tar.gz from TracDownload and tried to patch it using the following command:
patch -p0 < ../trac-0.9-intertrac.patch
The patch failed because the file 'wiki-default/checkwiki.py' did not exist. I double-checked trac-0.9.tar.gz and indeed, the file wasn't included in the gzipped file.
Any suggestions?
comment:10 by , 19 years ago
Oops, I created the patch against a checkout of 0.9:
svn co http://svn.edgewall.com/repos/trac/tags/trac-0.9
I'll upload another patch made against the tar.gz
later today.
For trying out the very latest status of that branch, it's:
svn co http://svn.edgewall.com/repos/trac/sandbox/intertrac
by , 19 years ago
Attachment: | trac-0.9-intertrac.patch added |
---|
by , 19 years ago
Attachment: | trac-0.9.tar.gz-intertrac.patch added |
---|
comment:11 by , 19 years ago
I think this feature is ready to be merged to the trunk, what's holding it?
comment:12 by , 19 years ago
Cc: | added; removed |
---|
comment:13 by , 19 years ago
cboos: Do the newest paches here still contain the TracDiff stuff ? (After a quick glance, i think not.) According to #2028, that has been merged to trunk in [2808] (confusing, i know :)). Does this have any implications on merging InterTrac ?
Also, i'd like to see InterTrac seperated out from InterWiki, as I think editing some of the prefixes in the config file and some of them in a wiki page is too confusing for my users. (And i can't seem to get the InterWiki part of this patch working anyhow.)
comment:14 by , 19 years ago
Milestone: | 1.0 → 0.10 |
---|---|
Priority: | normal → high |
The newest patches don't contain the TracDiff stuff anymore, though I wouldn't call those patches new anymore :)
InterTrac is going to be merge "really soon now".
As for the InterWiki stuff, if you don't want to enable it, simply leave the InterMapTxt page empty and make it read-only.
You have some valid points though, and I think that a little clean-up for the configuration is needed.
The InterTrac should really be about interoperability between your different local projects (i.e. all the environments that can be directly read).
So here's my proposal:
- the syntax of the InterMapTxt should be expanded so that it's
possible to mark sites as being Trac sites (so that the shorthand
syntax work), as well as the possibility to create aliases.
This would make it possible to not having to use the
[intertrac]
section at all. - the
[intertrac]
configuration section in TracIni should be kept, so that sites without a Wiki can have InterTrac links too. - finally, the
[intertrac]
configuration should be expanded in order to recognize local projects and integrate them as sibling projects (as withTRAC_ENV_PARENT_DIR
or with TracStandalone's ability to handle multiple projects).
by , 19 years ago
Attachment: | intertrac-for-trac-0.9.4pre-r2830.patch added |
---|
comment:15 by , 19 years ago
Resolution: | → fixed |
---|---|
Status: | assigned → closed |
The branch has been merged in trunk for milestone:0.10 (r2839).
There's also a new patch for the 0.9-stable branch. But if you want InterTrac, you should really upgrade to 0.10, as:
- you'll get some other interesting stuff (e.g. TracDiff)
- it's more likely to get fixes and enhancements for InterTrac itself.
Speaking of those, if there's any issue with InterTrac on trunk, please fill a new ticket for it.
The patch was generated using the -b flag which ignored identation changes caused errors like:
cboos is aware and working on an updated patch.