diff options
author | Benjamin Kellermann <Benjamin.Kellermann@gmx.de> | 2016-10-14 23:09:18 +0200 |
---|---|---|
committer | Benjamin Kellermann <Benjamin.Kellermann@gmx.de> | 2016-10-14 23:09:18 +0200 |
commit | 6857ba9ce6c413d9cf524c10c09af13ae907232e (patch) | |
tree | 3f425419266e1d182dca78889d1f825169881f7a | |
parent | 4f2ececaad06e3c72a4088234dfd664b4db970ed (diff) |
drop bzr support
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | config_sample.rb | 5 | ||||
-rw-r--r-- | vcs_bzr.rb | 69 | ||||
-rw-r--r-- | vcs_test.rb | 2 |
4 files changed, 3 insertions, 75 deletions
@@ -7,7 +7,7 @@ GNU AGPL v3 or higher (see file License) # Requirements * ruby >=1.9 - * git >=1.6.5 (preferred and default setting) or bzr + * git >=1.6.5 * ruby-gettext (for localization) * gettext, potool, make (optional, if you want to generate localization files) diff --git a/config_sample.rb b/config_sample.rb index 4e01a94..579e9c3 100644 --- a/config_sample.rb +++ b/config_sample.rb @@ -23,10 +23,7 @@ # at the about page. # $conf.dudle_src = "https://github.com/kellerben/dudle/" -# Choose your favorite version control system -# bzr and git are implemented -# Warning: bzr is slow! -# Warning: git needs git >=1.6.5 +# Only git is supported currently # $conf.vcs = "git" # Change only if the url is not determined correctly (e.g. at the start page) diff --git a/vcs_bzr.rb b/vcs_bzr.rb deleted file mode 100644 index f3b367c..0000000 --- a/vcs_bzr.rb +++ /dev/null @@ -1,69 +0,0 @@ -############################################################################ -# Copyright 2009,2010 Benjamin Kellermann # -# # -# This file is part of dudle. # -# # -# Dudle is free software: you can redistribute it and/or modify it under # -# the terms of the GNU Affero General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# Dudle is distributed in the hope that it will be useful, but WITHOUT ANY # -# WARRANTY; without even the implied warranty of MERCHANTABILITY or # -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public # -# License for more details. # -# # -# You should have received a copy of the GNU Affero General Public License # -# along with dudle. If not, see <http://www.gnu.org/licenses/>. # -############################################################################ - -require "time" -require_relative "log" - -class VCS - BZRCMD="export LC_ALL=de_DE.UTF-8; bzr" - def VCS.init - %x{#{BZRCMD} init} - end - - def VCS.rm file - %x{#{BZRCMD} rm #{file}} - end - - def VCS.add file - %x{#{BZRCMD} add #{file}} - end - - def VCS.revno - %x{#{BZRCMD} revno}.to_i - end - - def VCS.cat revision, file - %x{#{BZRCMD} cat -r #{revision.to_i} #{file}} - end - - def VCS.history - log = %x{#{BZRCMD} log --forward}.split("-"*60) - ret = Log.new - log.shift - log.each{|s| - a = s.scan(/\nrevno:(.*)\ncommitter.*\n.*\ntimestamp: (.*)\nmessage:\n (.*)/).flatten - ret.add(a[0].to_i, Time.parse(a[1]), a[2]) - } - ret - end - - def VCS.commit comment - tmpfile = "/tmp/commitcomment.#{rand(10000)}" - File.open(tmpfile,"w"){|f| - f<<comment - } - ret = %x{#{BZRCMD} commit -q -F #{tmpfile}} - File.delete(tmpfile) - ret - end - - def VCS.branch source, target - %x{#{BZRCMD} branch #{source} #{target}} - end -end diff --git a/vcs_test.rb b/vcs_test.rb index 248a619..518e0ba 100644 --- a/vcs_test.rb +++ b/vcs_test.rb @@ -21,7 +21,7 @@ if __FILE__ == $0 require "test/unit" require "pp" unless ARGV[0] - puts "Usage: ruby #{$0} (git|bzr)" + puts "Usage: ruby #{$0} git" exit end require "vcs_#{ARGV[0]}" |