Commit Graph

710 Commits

Author SHA1 Message Date
Thomas Keller
f6fc5ae466 Merge branch 'develop' of projects.ceondo.com:indefero 2010-09-01 13:18:10 +00:00
Loïc d'Anterroches
132c4f6c89 Fixed ticket 481, problem with registration link. 2010-09-01 15:17:24 +02: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
14d07a22e2 Merge branch 'mnt-support' 2010-08-27 08:59:09 +02: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
0c4846c986 Adapted monotone's README file and moved it under doc/ 2010-08-13 11:42:14 +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