urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Make gitorigin_branch and gitmaster_branch configurable via the setup 

file. Closes: #408599
master
joey 2007-01-27 23:56:17 +00:00
parent e177dc187b
commit 72dbbe3a2c
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki.pm
View File

@ -56,6 +56,8 @@ sub defaultconfig () { #{{{
wrappermode => undef,
svnrepo => undef,
svnpath => "trunk",
gitorigin_branch => "origin",
gitmaster_branch => "master",
srcdir => undef,
destdir => undef,
pingurl => [],

12
IkiWiki/Rcs/git.pm
View File

@ -8,8 +8,6 @@ use open qw{:utf8 :std};
package IkiWiki;
my $origin_branch = 'origin'; # Git ref for main repository
my $master_branch = 'master'; # working branch
my $sha1_pattern = qr/[0-9a-fA-F]{40}/; # pattern to validate Git sha1sums
my $dummy_commit_msg = 'dummy commit'; # message to skip in recent changes
@ -112,8 +110,8 @@ sub _merge_past ($$$) { #{{{
# Switch to throw-away branch for the merge operation.
push @undo, sub {
if (!run_or_cry('git-checkout', $master_branch)) {
run_or_cry('git-checkout','-f',$master_branch);
if (!run_or_cry('git-checkout', $config{gitmaster_branch})) {
run_or_cry('git-checkout','-f',$config{gitmaster_branch});
}
};
run_or_die('git-checkout', $branch);
@ -125,7 +123,7 @@ sub _merge_past ($$$) { #{{{
# _Silently_ commit all modifications in the current branch.
run_or_non('git-commit', '-m', $message, '-a');
# ... and re-switch to master.
run_or_die('git-checkout', $master_branch);
run_or_die('git-checkout', $config{gitmaster_branch});
# Attempt to merge without complaining.
if (!run_or_non('git-pull', '--no-commit', '.', $branch)) {
@ -287,7 +285,7 @@ sub git_sha1 (;$) { #{{{
sub rcs_update () { #{{{
# Update working directory.
run_or_cry('git-pull', $origin_branch);
run_or_cry('git-pull', $config{gitorigin_branch});
} #}}}
sub rcs_prepedit ($) { #{{{
@ -337,7 +335,7 @@ sub rcs_commit ($$$;$$) { #{{{
$message = possibly_foolish_untaint($message);
if (run_or_non('git-commit', '-m', $message, '-i', $file)) {
unlockwiki();
run_or_cry('git-push', $origin_branch);
run_or_cry('git-push', $config{gitorigin_branch});
}
return undef; # success

4
debian/changelog vendored
View File

@ -5,8 +5,10 @@ ikiwiki (1.41) UNRELEASED; urgency=low
crashing.
* Added smileys for Moin Moin compatability.
* Fix handling of discussion links on discussion pages when l10n is used.
* Make gitorigin_branch and gitmaster_branch configurable via the setup
file. Closes: #408599
-- Joey Hess <joeyh@debian.org> Thu, 18 Jan 2007 10:03:59 -0500
-- Joey Hess <joeyh@debian.org> Sat, 27 Jan 2007 18:55:45 -0500
ikiwiki (1.40) unstable; urgency=low

2
doc/ikiwiki.setup
View File

@ -29,6 +29,8 @@ use IkiWiki::Setup::Standard {
#rcs => "git",
#historyurl => "http://git.example.org/gitweb.cgi?p=wiki.git;a=history;f=[[file]]",
#diffurl => "http://git.example.org/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
#gitorigin_branch => "origin",
#gitmaster_branch => "master",
# Tla stuff.
#rcs => "tla"