1c06aed378
* monotone: Add code to default mergerc file to run
...
_MTN/ikiwiki-netsync-hook when a commit is merged in from the net.
2008-02-14 16:10:33 -05:00
27d5f91a18
remove spurious EOF
2008-02-03 18:16:19 -05:00
749c1e36d9
* monotone changes by Brian May:
...
- On commits, replace "mtn sync" bidirectional with "mtn push" single
direction. No need to pull changes when doing a commit. mtn sync
is still called in rcs_update.
- Support for viewing differences via patches using viewmtn.
2008-02-03 18:14:39 -05:00
246e93a300
Expand file-id in diffurl in the bzr backend.
2008-01-30 02:29:28 +01:00
4284719464
rename bazaar -> bzr after discussion with jelmer
2008-01-29 19:48:30 -05:00
381ac0f667
commit only the changed file
2008-01-29 19:44:26 -05:00
274fb90026
stylistic changes
...
Remarkably few. Also, I removed the stub for the obsolete rcs_notify function.
2008-01-29 19:36:35 -05:00
cddc335b2b
Merge git://git.samba.org/jelmer/ikiwiki
2008-01-29 19:28:51 -05:00
d7fdd04b5a
* Removed support for sending commit notification mails. Along with it went
...
the svnrepo and notify settings, though both will be ignored if left in
setup files.
2008-01-29 00:36:58 -05:00
9f25e3436b
change rcs_recentchanges when to absolute, not relative, time
...
No point in using a relative time value in rcs_recentchanges. Different
consumers of the info want different things.
2008-01-28 22:57:22 -05:00
ad4f7bc075
remove debug message
...
This can legitimately happen when there's a simple merge.
2008-01-28 22:47:43 -05:00
e30b96baba
figured out how rev is used..
2008-01-28 21:23:56 -05:00
b11ddb88e6
add an id field to the rcs_recentchanges return structure
...
There was an undocumented field named "rev", I think "id" is a better name,
and nothing uses it yet.
2008-01-28 20:34:11 -05:00
161947160b
remove extraneous quoting
2008-01-28 18:01:51 -05:00
84d3856512
test1
2008-01-28 17:41:02 -05:00
df32ad1139
really fix comment
...
It doesn't really make sense to do notification from a post-commit hook.
2008-01-28 17:36:36 -05:00
52b16186c4
update comment
...
This is not only called from post-update in all configurations. Also, the
comment was innaccurate about what the post-update hook is passed.
2008-01-28 17:33:22 -05:00
d3f91f37ff
Finish bazaar backend and make the remaining test pass.
2008-01-28 07:30:37 +01:00
0be7aad67d
Initial work adding support for Bazaar.
2008-01-28 06:16:56 +01:00
6d85ccdb6f
Add full parser for git diff-tree output
...
The -c option to git log/diff-tree produces "merged" diffs with a
different format from normal ones. However, the existing diff-tree
parser only accepted non-merged diff lines. Merged diff lines caused
the parser to get out of sync. This patch adds a full parser for diffs
with any number of parents. See the "DIFF FORMAT FOR MERGES" section in
the git-diff-tree man page for more information.
Signed-off-by: Brian Downing <bdowning@lavos.net>
2008-01-17 11:15:23 -05:00
58f1ef0784
* git: Correct display of multiline commit messages in recentchanges.
2007-12-16 16:52:39 -05:00
8ffa59e610
* The first git commit legitimately has no parents. Avoid recentchanges
...
spewing uninitialised value warnings and debug messages about it.
Dummying up a parent of 0000000 allows gitweb to work too.
2007-11-12 12:53:46 -05:00
9e7160a664
fix dumb mistake
2007-10-31 18:42:14 -04:00
ada249e0dd
* Don't truncate git commit messages to the first line in RecentChanges,
...
show the full message.
2007-10-31 18:35:37 -04:00
3506f4ba07
* Improve the RecentChanges display for git merges, by passing -c instead
...
of -m to git-log, and by skipping display of commits that change no
pages.
2007-10-31 18:32:22 -04:00
b8887c1cd7
* Avoid using commands like git-diff and instead use "git diff".
...
In some configurations, only the main git command is in the path.
2007-10-31 17:37:33 -04:00
c5d9c0d6b6
* Avoid a race in the git rcs_commit function, by not assuming HEAD will
...
stay the same for the duration of the function.
2007-10-31 17:17:03 -04:00
730a3fb4b7
Run git-commit -q (though it doesn't do much good due to its stderr abuse).
2007-10-26 03:22:44 -04:00
3613f72a3b
* If gitorigin_branch is set to the empty string, don't push or pull.
...
Useful for laptop clones of remote wikis.
2007-10-22 01:47:30 +00:00
cadfac387c
minor stylistic changes
2007-10-21 22:59:18 +00:00
19cfec2654
* Correct a pair of logic errors that triggered if svnpath was empty.
2007-10-21 22:57:11 +00:00
a22d9f9721
* Support git authors of the form "joey <joey>", which is common when
...
importing from a svn repo.
2007-10-21 00:27:11 +00:00
eec289e281
* Fix strange stderr-hiding code in the git module, allow error messages
...
to be passed on to stderr. Also fixes a potential bug, since git error
meesages were treated as if they came from git stdout.
2007-10-10 23:27:11 +00:00
3fd86def96
* French translation update. Closes : #445923
...
* Fix --get-ctime with git, needed to remove srcdir from filename.
2007-10-10 18:15:15 +00:00
f948133a61
* Tidy ctime debug output for git.
2007-10-04 09:00:08 +00:00
8de136222e
git.pm: Handle operating in sub-trees of a git repository.
...
When looking for git commits that affect the wiki, only include changes
that affect the ikiwiki source directory. If that is not the top-level
directory in this git repository, strip off the prefix as given by
`git-rev-parse --show-prefix` from all names reported by git-log.
Patch by Jamey Sharp <jamey@minilop.net>.
2007-08-30 02:32:35 +00:00
c5ee59ec5e
git.pm: Renames from git-diff-tree aren't handled, so don't ask for them.
...
Patch by Jamey Sharp <jamey@minilop.net>.
2007-08-30 02:32:32 +00:00
7144514b93
Use git-log rather than the shell, git-rev-list, and git-diff-tree.
...
Patch by Jamey Sharp <jamey@minilop.net>.
2007-08-30 02:32:29 +00:00
c73e0b78f9
use --style default for get_ctime too
2007-08-29 03:02:41 +00:00
67c6ff9b08
* mercurial: Fix rcs_getctime (thanks, bma)
2007-08-29 02:16:45 +00:00
5b8e1cc369
thank goodness for test suites
2007-08-29 02:09:43 +00:00
7813bcf08a
* mercurial: Pass --style defaults to hg log to ensure right format is used.
2007-08-29 02:01:23 +00:00
c2ec0a97a1
remove unncessesary and unused loop labels
2007-08-24 18:07:15 +00:00
a18d99c3fa
apply monotone patch
2007-08-24 01:20:25 +00:00
c2c943bc25
monotone updates
2007-08-21 16:55:13 +00:00
38353384cf
minor changes (but lots of them)
2007-08-21 03:58:00 +00:00
62a4ea821d
move enormous data block to __DATA__
2007-08-21 03:31:27 +00:00
4fcf25a820
remove the mtnbinpath config option; users should use PATH if they need
...
this kind of thing.
change formatting of some quotes
2007-08-21 03:22:45 +00:00
50e1b43408
* Add monotone support, contributed by William Uther.
2007-08-21 03:10:35 +00:00
c8f7b9480e
proper fix for adding file, based on jkoenig's patch
2007-08-15 00:06:20 +00:00
Joey Hess
Jelmer Vernooij
Brian Downing
Joey Hess
joey
joshtriplett