Edgewall Software
Modify

Opened 9 years ago

Closed 8 years ago

#2041 closed task (fixed)

Integrate intertrac branch in the trunk

Reported by: cboos Owned by: cboos
Priority: high Milestone: 0.10
Component: wiki system Version: devel
Severity: major Keywords: branch intertrac review
Cc: dserodio@… kazarmy@… pixelpapst@…
Release Notes:
API 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)

I'll also use this ticket for attaching patches against the different 0.9 releases.

Attachments (5)

trac-0.9b1-intertrac.patch (117.8 KB) - added by cboos 9 years ago.
Adds InterTrac and InterWiki (r2241) functionality to Trac 0.9b1. Patch applies against the .tar.gz (see note below for the .zip). Note that this patch also contains the TracDiff features (see #2028).
trac-0.9b2-intertrac-r2308.patch (132.6 KB) - added by cboos 9 years ago.
Patch adding TracDiff, InterTrac and InterWiki features to trac-0.9b2
trac-0.9-intertrac.patch (32.5 KB) - added by cboos 8 years ago.
The InterTrac and InterWiki features added to Trac 0.9 (from the repository)
trac-0.9.tar.gz-intertrac.patch (32.1 KB) - added by cboos 8 years ago.
The InterTrac and InterWiki features added to Trac 0.9 (from the trac-0.9.tar.gz package)
intertrac-for-trac-0.9.4pre-r2830.patch (34.8 KB) - added by cboos 8 years ago.
Adds InterTrac and InterWiki on 0.9-stable (applies also on 0.9.3)

Download all attachments as: .zip

Change History (20)

comment:1 Changed 9 years ago by mat.ellis@…

The patch was generated using the -b flag which ignored identation changes caused errors like:

trac-admin /var/trac
..........................................
    ^
IndentationError: expected an indented block

cboos is aware and working on an updated patch.

Changed 9 years ago by cboos

Adds InterTrac and InterWiki (r2241) functionality to Trac 0.9b1. Patch applies against the .tar.gz (see note below for the .zip). Note that this patch also contains the TracDiff features (see #2028).

comment:2 Changed 9 years ago by cboos

  • Status changed from new to 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 Changed 9 years ago by anonymous

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 Changed 9 years ago by cboos

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 your trac.ini

Changed 9 years ago by cboos

Patch adding TracDiff, InterTrac and InterWiki features to trac-0.9b2

comment:5 Changed 9 years ago by anonymous

  • Cc dserodio@… added

comment:6 Changed 9 years ago by anonymous

  • Cc kazarmy@… added

comment:7 Changed 8 years ago by anonymous

  • Cc dserodio@… added; dserodio@… kazarmy@… removed

comment:8 Changed 8 years ago by cboos

  • Keywords intertrac review added

I recently (r2522) improved the support for sibling environments.

comment:9 Changed 8 years ago by Khairul Azhar

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 Changed 8 years ago by cboos

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

Changed 8 years ago by cboos

The InterTrac and InterWiki features added to Trac 0.9 (from the repository)

Changed 8 years ago by cboos

The InterTrac and InterWiki features added to Trac 0.9 (from the trac-0.9.tar.gz package)

comment:11 Changed 8 years ago by dserodio@…

I think this feature is ready to be merged to the trunk, what's holding it?

comment:12 Changed 8 years ago by pixelpapst@…

  • Cc dserodio@… added; dserodio@… removed

comment:13 Changed 8 years ago by pixelpapst@…

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 Changed 8 years ago by cboos

  • Milestone changed from 1.0 to 0.10
  • Priority changed from normal to 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 with TRAC_ENV_PARENT_DIR or with TracStandalone's ability to handle multiple projects).

Changed 8 years ago by cboos

Adds InterTrac and InterWiki on 0.9-stable (applies also on 0.9.3)

comment:15 Changed 8 years ago by cboos

  • Resolution set to fixed
  • Status changed from assigned to 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.

Add Comment

Modify Ticket

Change Properties
<Author field>
Action
as closed The owner will remain cboos.
The resolution will be deleted. Next status will be 'reopened'.
to The owner will be changed from cboos to the specified user.
Author


E-mail address and user name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.