Commit Graph

734 Commits

Author SHA1 Message Date
Thomas Keller
35e670a1ab The data structure is already a stdClass object, so add a property,
not a key (partially fixes issue 568)
2010-11-17 19:08:41 +01:00
Thomas Keller
70e8d12420 Output the branch a particular commit is on; this is easy for
mercurial and monotone, but slightly harder till impossible to
do properly for git and svn. Please review and eventually adapt
the code to make it work better (partially fixes issue 450)
2010-11-17 01:53:17 +01:00
Thomas Keller
b4bc6abace Make the monotone master branch editable on forge level at least to
make it possible to switch the default project branch (partially
fixes issue 560)
2010-11-17 00:47:55 +01:00
Thomas Keller
e6f255bc56 Code style; wider input for monotone branch name 2010-11-17 00:47:52 +01:00
Thomas Keller
470a961a80 Add syntax highlighter support for h, hh and hpp (fixes issue 567) 2010-11-17 00:06:18 +01:00
Thomas Keller
8993d2988b Pick initial issue type and priority from the particular first item of the predefined issue labels list (thanks Jakub Vitak, closes issue 556) 2010-10-31 23:18:35 +00:00
Thomas Keller
e776fc0713 Switch doctype from html 4.01 strict to xhtml 1.0 transitional, we
largely ignored the former with xml-like constructs either
(closes issue 511).
2010-10-31 18:26:31 +01:00
Thomas Keller
c0ccdc768a add a couple of file extensions which are supported by our in-tree version of prettyfy (closes issue 490) 2010-10-31 18:18:20 +01:00
Thomas Keller
039ae01cfa Use an even smarter way of including additional resources for monotone
by using a wildcard dir matcher and document this accordingly.
2010-10-30 22:09:55 +00:00
Thomas Keller
fe001abd26 Rework the way IDF's SCM interface provides downloadable snapshots.
Instead of returning a command which gets executed and which should
pass through / stream its output data to the client, we're just
returning an instance of Pluf_HTTP_Response. This is needed, because
some SCMs, most noticable monotone, have no locally executable command
to provide a snapshot archive (and probably never will for our kind
of setup).

We therefor added a little BSD-licensed class "ZipArchive" which allows
the creation of pkzip-compatible archives on the fly by letting it eat
the file contents directly feed from the (remote) stdio instance.
Download performance is ok and lies between 15K/s and 110K/s, but at
least we do no longer block the browser while we pre-generate the zip
file server-side.

Thanks to Patrick Georgi for all his work!
2010-10-30 21:52:40 +00:00
Thomas Keller
8a55952204 * use the built-in push_hook_functions to register the netsync hooks,
this way additional hooks which need these notifications as well
  do not override earlier hooks
* optionally include an additional hooks.lua file at the very end
  in which custom hooks can be defined
2010-10-28 19:45:45 +02:00
Thomas Keller
c807c4b734 Add *.pas ([object] pascal) to the list of supported source extensions 2010-10-22 16:11:04 +02:00
Thomas Keller
972df3b231 Merge branch 'develop' of git://projects.ceondo.com/indefero into develop 2010-10-16 01:19:17 +02:00
Thomas Keller
7e10524f92 Add a popup menu in the main menu which allows to quickly jump between projects.
* refactor out the common menu code from several base*.html classes into main-menu.html
  and put the raw links into a unordered list (which makes it easier to create dynamic
  menus as we cannot insert block items into inline items in strict mode)
* query the list of available projects on every request and set them for every template
  in Middleware.php
* make the popup menu pretty
2010-10-15 00:40:09 +00:00
Thomas Keller
c3ff90c4f8 The signal name was wrong, therefor mtn syncs never updated the IDF timeline. 2010-10-14 19:26:09 +00:00
Thomas Keller
07aec736f5 Add --timestamp and --ticker=dot as default options for newly created
servers, which make it easier to follow the logs of individual servers.
2010-10-14 18:46:08 +00:00
Thomas Keller
b30bdc9833 While for allowed upload extensions the user was hinted to the
need of having to start the list with a space, here it was actually
needed code-wise. I rewrote the code so the space was not needed
and the documentation follows the actual behaviour.
2010-10-14 12:13:38 +00:00
Thomas Keller
d171a249c5 Its untrue that the list of extra allowed extensions for uploaded files
has to start with a space - its even a little quirky since the code
expands that to a regex like "/\.(|ext1|ext2...)$/", so in theory files
which end up with a dot and without an extension would be allowed by this.
For now we just fix the comment and indentation of the default
configuration option.
2010-10-14 12:13:21 +00:00
Thomas Keller
0379b862ec Document 'idf_strong_key_check' (closes issue 516) 2010-10-09 12:21:20 +00:00
Thomas Keller
5af2ab4d97 Make the timeline view and RSS feeds filterable by model (closes issue 543). 2010-10-09 11:53:01 +00:00
Thomas Keller
b518385962 Introduce a per-project issue template to hint a reporter to provide
certain information in his issue report (closes issue 540).
2010-10-09 10:40:30 +00:00
Thomas Keller
d25bc74d71 If no branch certificates are attached to a revision, we do not get
an empty array back from _getCerts(), but no entry for 'branch' at all.
2010-10-09 10:09:51 +00:00
Thomas Keller
5641173a04 Comment in hg_repositories by default, so it matches the defaults of the other SCMs 2010-10-07 19:21:05 +02:00
Thomas Keller
806e69b858 Don't let sync git fail on ssh keys with no comment field (references:
issue 531 and issue 545)
2010-10-07 11:56:52 +00:00
Thomas Keller
a29a2a0fa4 The connection list view could never work with this messy backend. 2010-10-07 01:05:15 +00:00
Thomas Keller
4951498c0b Ignore pseudo diff stanzas which mention binary files. 2010-10-06 21:37:53 +00:00
Thomas Keller
97ea828532 Use a persistent cache through Pluf_Cache to speed up cert queries. 2010-10-04 15:42:21 +00:00
Thomas Keller
d539eaf64b - _getLastChangeFor(): drop that, no longer needed
- getTree(), getPathInfo(): use the new extended manifest format
  and save the calls to query file sizes from contents as well
  as the calls to determine the revision in which a file changed
  at last
2010-10-04 15:22:57 +00:00
Thomas Keller
90edbf0d8b Tweak the basicio parser so that it properly handles multi-value
lines with hashes (lines like symbol [hash] [hash] are still not
handled, but aren't outputted from any command either as of now).
2010-10-04 15:20:53 +00:00
Thomas Keller
0c575ccc74 If a symbol is printed without a value list at the very end of a
basic_io dump, we might access a non-existing character position.
This has been fixed and the string length calculation is now only
done once.
2010-10-03 22:23:08 +00:00
Thomas Keller
eebdc5ad12 IDF_Scm_Monotone::getCommit() separate the first line of a commit from the
rest and write the rest in full_message - just like we do it for log and
everything else. This is ugly, really ugly, because it assumes something
on the format of a commit message, which might not be true at all for
some project, but this is something Loic has to decide (see also issue 491
and issue 535)
2010-09-28 21:37:26 +00:00
Thomas Keller
617589f41b Reorganize and expand the help of the monotone plugin.
Make the commentary in idf.php-dist less verbose.
2010-09-17 03:11:36 +02:00
Thomas Keller
50638c768f Ensure that the SyncMonotone plugin does not throw around errors
in case of a local (non-usher) monotone setup.
2010-09-17 02:36:48 +02:00
Thomas Keller
29b8bf8a4e Some revisions might not carry a branch cert (yet), because they're
part of another branch whose certs haven't been pushed into the server
yet, so we need to skip these revisions while going back in time
for the changelog. The initial revision however must carry a branch
cert, otherwise we have nothing to "follow".
2010-09-15 08:46:10 +00:00
Thomas Keller
42936cc51d Mark the submenu item "Open Issues" active when its active
(partially resolves issue 536)
2010-09-14 23:14:29 +00:00
Thomas Keller
b138548a10 * check if the project actually uses mtn as scm for the
membershipsUpdated signal
* code cleanup and simplification
2010-09-14 22:58:34 +00:00
Thomas Keller
7d5ba6248e Merge branch 'develop' of projects.ceondo.com:indefero into develop 2010-09-14 22:34:57 +00:00
Thomas Keller
36a58dcae2 * update the permissions on IDF_Project::membershipsUpdated - listen
to the same signal also for the initial setup, since the memberships
haven't been added at the time the create signal is thrown
* my array references goo was slightly stupid (the usage of foreach
is of course hazardous in cases like this)
* always insert a trailing new line in write-permissions and skip
read-in newlines from being processed
2010-09-14 22:30:28 +00:00
Thomas Keller
2106a5fbdc Merge branch 'develop' of projects.ceondo.com:indefero 2010-09-14 14:23:18 +02:00
Thomas Keller
0897c8608f Allow the upload of SSH keys without the optional comment field
(fixes issue 531 - thanks William!)
2010-09-14 14:22:34 +02:00
Thomas Keller
a32d6d8265 * its late - put_public_key of course needs a specific database
* do not throw around exceptions if a key which should be removed is not found in the database
2010-09-13 01:13:49 +00:00
Thomas Keller
0f9f337e66 * configure whether or not to set remote client authentication for IDF -> remote_stdio
* hook into IDF_Project::preDelete, IDF_Key::postSave and IDF_Key::preDelete
* this is all not quite finished, but a big leap forward to completion
2010-09-13 00:53:24 +00:00
Thomas Keller
bb13722a2f bump copyright year 2010-09-13 00:51:45 +00:00
Thomas Keller
77cdbefe0c Added getter for the stdio instance 2010-09-13 00:50:16 +00:00
Thomas Keller
f68bba1292 Be more careful when parsing value lists - in case we process the last
line of a stanza which does _not_ close with a newline, we're accessing
a not existing string index.
2010-09-12 23:18:58 +00:00
Thomas Keller
37d0ccc728 partially resolve issue 492 (at least for the monotone tree view) 2010-09-11 00:28:31 +02:00
Thomas Keller
7557a73014 While the dateAgo code internally doesn't seem to care about the argument
(unless its not "withal"), its better to fix the spelling here anyways.
2010-09-11 00:21:30 +02:00
Loïc d'Anterroches
f3f00dd182 Fixed ticket 489, improve the Markdown and wiki syntax documentation. 2010-09-02 14:46:15 +02:00
Thomas Keller
07b2b2f305 Merge branch 'develop' of projects.ceondo.com:indefero into develop 2010-09-02 12:26:52 +00:00
Thomas Keller
85df9e5ab2 move IDF_View_Source_Precondition into a separate class file 2010-09-02 12:22:59 +00:00
Loïc d'Anterroches
439014b0b1 Fixed ticket 479, project editing inconsistency. 2010-09-02 14:16:41 +02:00
Thomas Keller
f6fc5ae466 Merge branch 'develop' of projects.ceondo.com:indefero 2010-09-01 13:18:10 +00:00
Thomas Keller
21cdf60c31 Introduce a more subtle concept of validity when it comes to revision
indentifiers in IDF - the SCM function isValidRevision has been replaced
by a validateRevision() method which returns one of three states,
valid, invalid or ambiguous.
The source view can then act accordingly and display disambiguate view
for the latter, so the user can select for which revision he actually
wants to execute the requested action. Also, invalid revisions now lead
to another separate view, telling the user that it is invalid / does
not exist and pointing him optionally to the help page where he can read
further how to access his repository to push the first changes into.
(partially resolves issue 525)
2010-09-01 13:13:52 +00:00
Brenda Wallace
b4f8cf8c50 Corrected grammar in instructions. 2010-09-01 15:06:02 +02:00
Loïc d'Anterroches
f4dbabe8de Merge branch 'master' of git://projects.ceondo.com/indefero 2010-09-01 14:51:33 +02:00
Matthew Dawson
c5c7ebff04 Improved the wiki links to have better descripting links. 2010-09-01 14:50:04 +02:00
Thomas Keller
5d263e78e0 its dateago:"without", not dateago:"wihtout" 2010-08-31 21:17:09 +00:00
Thomas Keller
5f4e1da0c8 while there _should_ be really a custom application exception,
currently there is no such one
2010-08-31 21:07:31 +00:00
Thomas Keller
187365db76 IDF_Scm::isValidRevision() only ever takes one argument 2010-08-30 21:50:25 +00:00
Thomas Keller
e26a5c8cdf waiting usher instances should be stoppable as well 2010-08-30 21:29:42 +00:00
Thomas Keller
a384c60937 fix a PHP notice 2010-08-30 20:14:03 +00:00
Thomas Keller
6b4abac08e - PHP doesn't like the $var = <init> kind of initialization and
won't return variable references properly, so revert that change
  again
- since we're requiring 0.99 now, we also have to use au generate_key
  instead of au genkey
2010-08-30 13:46:05 +00:00
Thomas Keller
e789263068 - raise required mtn version to 0.99
- add '--key=' to the default mtn arguments in idf.php-dist
2010-08-30 12:58:52 +00:00
Thomas Keller
82aaf43d5d - initial work on a mtn-post-push script which updates IDF's timeline
when new revisions arrive. this still needs some more tests, but
  its a start.
- refactor out the monotonerc template from SyncMonotone.php and
  place it in a separate template file (access control hooks are
  still missing from there)
2010-08-30 11:20:47 +00:00
Thomas Keller
adae73080c simplify and harden the configuration file writeouts, didn't knew
file_put_contents was around for so long already...
2010-08-30 09:00:20 +02:00
Thomas Keller
b648e6f7a7 - now that we have to configure usher's configuration file anyway,
we can skip the explicit configuration of its host and admin
  password, as we can directly read that from the configuration file
  itself
- expand the SyncMonotone plugin a bit to where this actually becomes
  useful, i.e.  create an accompanying key for each created database
  and also add some initial database-specific configuration
- update the config docs in idf.php-dist to reflect the changes and
  add more details about the inner workings of the SyncMonotone plugin
2010-08-29 23:01:25 +00:00
Thomas Keller
194dcad0e3 Don't check if the main branch is empty, but let the view code later
handle the case where a selector doesn't resolve to at least one
revision gracefully (see also issue 525).
2010-08-29 22:59:12 +00:00
Thomas Keller
af3df142d4 First attempt on a monotone plugin which creates a new database upon
project creation and adds the new server to the running usher instance.
If everything goes well, the usher instance is told to reload its
configuration, so the new server / database is picked up and started
automatically.
2010-08-28 23:10:08 +00:00
Thomas Keller
f2a9518b5c single quoted newlines of course will not work here... stupid me 2010-08-28 22:47:37 +00:00
Thomas Keller
593240b420 implement IDF_Scm_Monotone_BasicIO::compile() 2010-08-28 22:03:47 +00:00
Thomas Keller
8aae0f29d4 refactor the basicio parser into a separate utility class (we soon need a compiler part as well) 2010-08-28 14:06:17 +00:00
Loïc d'Anterroches
3eb0247b37 Fixed to correctly have a type text input. 2010-08-27 08:57:54 +02:00
Thomas Keller
7f32a5679d * removed type field in IDF_Key on request of Loic and automatically detect
and validate raw key data
* reworked the parseMonotoneKeyData() function to parse ssh and monotone keys
* tweak help texts and exception strings
2010-08-24 23:30:12 +02:00
Thomas Keller
a442fd588e Merge branch 'master' of github.com:tommyd3mdi/indefero-monotone 2010-08-24 22:57:52 +02:00
Thomas Keller
e7ce32fc26 Merge branch 'master' of git://projects.ceondo.com/indefero 2010-08-24 22:45:28 +02:00
Thomas Keller
f0a606e5cf * its IDF_Key, not IDF_Keys 2010-08-23 09:45:04 +02:00
Thomas Keller
31e81118dd Follow IDFs coding standards and tweak opening curly braces as well as
quoting where possible
2010-08-13 11:21:07 +02:00
Thomas Keller
e47d51d14c Add the possibility to save mtn public keys per user
* src/IDF/Key.php: new column "type" which is either "ssh" or "mtn";
  utility functions to query the mtn key name and id as well as
  all available key types for the current IDF installation
* src/IDF/Migrations/16KeyType.php: needed migration script
* src/IDF/Plugin/SyncGit/Cron.php: ensure only SSH keys are handled
* adapt forms and templates accordingly
2010-08-11 23:48:09 +02:00
Thomas Keller
ce436cc6ec ensure the usher section is active when we browse it 2010-08-11 23:43:15 +02:00
Loïc d'Anterroches
3d1ac97dc3 Correctly uses the private/description from the template project. 2010-08-11 14:50:32 +02:00
Loïc d'Anterroches
7a2065c687 Fixed to correctly use the default values if the template project was not fully updated. 2010-08-11 14:42:06 +02:00
Loïc d'Anterroches
9e6c7dad88 Fixed to use the private status and the description from the template when creating a project. 2010-08-11 14:12:03 +02:00
Loïc d'Anterroches
4f23ea4dd5 Added the ability to create a new project with another one as template. 2010-08-11 13:58:41 +02:00
Thomas Keller
f25dbd8872 Merge branch 'master' of git://projects.ceondo.com/indefero 2010-08-07 23:42:13 +02:00
Thomas Keller
de036920a4 * src/IDF/Middlewre.php: add a global template variable
"usherConfigured" to denote whether we render links to the usher
control functions in the forge administration
* src/IDF/Scm/Monotone.php: moved IDF_Scm_Monotone_Stdio into
separate file src/IDF/Scm/Monotone/Stdio.php
* src/IDF/Scm/Usher.php: new class to query and modify the state
of a running usher instance
* src/IDF/Views/Admin.php: add actions to query the list of
configured servers, edit their status, view their open connections
and control the state of the usher as a whole
* src/IDF/conf/idf.php-dist: optional usher configuration added;
mail address of monotone-users added; spelling changes
* src/IDF/conf/urls.php: added needed URLs for usher actions
* src/IDF/templates/idf/gadmin/base.html: usher links
2010-08-07 23:28:13 +02:00
Mehdi Kabab
061c806588 Fixed issue 509, indefero wiki do not support strikethrough. 2010-07-25 13:37:05 +02:00
Thomas Keller
780267978d basic test setup works; added tests for isAvailable(), getBranches(),
getTags(), inTags(), inBranches(), getTree() and isValidRevision()
2010-06-30 00:42:09 +02:00
Thomas Keller
0ad7f47885 first, incomplete version of a basic monotone test driver 2010-06-29 16:00:53 +02:00
Thomas Keller
d2f0bac907 * Monotone.php: get inTags() and inBranches() correct - they need to
return a list with selectors as keys, otherwise the main menu won't
  link the active revision, but instead use the main branch
* changelog.html, tree.html: shorten the branch / tag output a bit
  (still ugly to have a fixed output like this, though), link tags
  by their selector, no longer by their revision ID. We loose some
  flexibility here, since tags could actually mark different
  revisions, which are now ignored
2010-06-29 09:59:49 +02:00
Thomas Keller
e46a6fa171 link from the changelog view to the changelog view again when another
revision is selected
2010-06-28 11:46:48 +02:00
Thomas Keller
7cbc690890 use date instead of gmdate, monotone's dates are already UTC 2010-06-28 08:47:39 +02:00
Thomas Keller
a46fd28dae print the mtn master branch configuration in bold, because it is required
when monotone is selected as SCM
2010-06-26 00:18:52 +02:00
Thomas Keller
8decc383aa bugfix: do not validate the custom branch field in the project creation
formular if we should set the project up with another SCM
2010-06-26 00:07:56 +02:00
Thomas Keller
f3268b3d37 uh, we should really share one mtn instance per project and request... 2010-06-24 02:27:38 +02:00
Thomas Keller
4fdf248cb6 Merge branch 'master' of github.com:tommyd3mdi/indefero-monotone 2010-06-24 02:07:44 +02:00
Thomas Keller
1fd1e63043 * idf.php-dist: rework the documentation of the configuration options and
add two scenarios, one with a single, global database and one with
  multiple project databases and usher as proxy; add an option for additional
  command line options for the mtn process; remove the protocol type
  configuration option - we're handling this implicit with the new
  mtn_remote_url configuration
* Monotone.php: add the IDF user for ssh:// URIs; add support for remote_stdio
  and rework the command line stitching
2010-06-24 01:58:41 +02:00
Thomas Keller
5ce324f35f * clear the process environment and set LANG properly so we get english error codes and still keep utf8 compliant
* rename _read to _readStdout and introduce a generic _readStderr which reads from the other pipe on failure
2010-06-24 00:10:41 +02:00
Thomas Keller
7303e9dd58 return the correct file name for dropped files from monotone's diff output 2010-06-23 15:58:07 +02:00
Thomas Keller
9a8148079d prevent endless redirection if a requested branch does not exist, i.e. has no matching revisions 2010-06-23 00:22:10 +02:00
Thomas Keller
24762adecc improve error handling and reporting of the stdio process 2010-06-21 23:24:47 +02:00