On 05/10/10 12:41, Camille Huot wrote:
> You can grab the trads release I downloaded before I patched it
> according to my needs:
>
> http://files.cameuh.net/trads-200604071846.tgz
thanks!
i have attached the diff on trads.rb from my to your snapshot, if you're
curious.
sebastian
diff --git a/rb/trads.rb b/rb/trads.rb
index 606a24a..db4510e 100755
--- a/rb/trads.rb
+++ b/rb/trads.rb
@@ -206,7 +206,7 @@ class TTrads
return diff if diff and r1==diff[0][0] and r2==diff[0][1] # We have
already done the diff
# Get history log
- cmd = "cd #[email protected]}; cvs -z0 log [email protected]}:#...@rev}
#...@path}/#[email protected]}/#...@subdir}#{@filename}"
+ cmd = "cd #[email protected]}; cvs -z3 log [email protected]}:#...@rev}
#...@path}/#[email protected]}/#...@subdir}#{@filename}"
# Run cvs command
# DEBUG begin
# read from local file cvs.log instead (no need to load actual cvs)
@@ -228,7 +228,7 @@ class TTrads
end
# Diff the revisions
- cmd = "cd #[email protected]}; cvs -z0 diff -kk -t -U6 -...@sync}
-...@rev} #...@path}/#[email protected]}/#...@subdir}#{@filename}"
+ cmd = "cd #[email protected]}; cvs -z3 diff -kk -t -U6 -...@sync}
-...@rev} #...@path}/#[email protected]}/#...@subdir}#{@filename}"
# Run cvs command
# DEBUG begin
# read from local file cvs.log instead (no need to load actual cvs)
@@ -308,7 +308,7 @@ class TTrads
return yxml[1] if yxml and rev == yxml[0]
# Check the CVS status to see if our local copy of the CVS matches the
requested revision
- cmd = "cd #[email protected]}; cvs -z0 status
#...@path}/#[email protected]}/#...@subdir}#{@filename}"
+ cmd = "cd #[email protected]}; cvs -z3 status
#...@path}/#[email protected]}/#...@subdir}#{@filename}"
# Run cvs command
po, pe = runrun(cmd, @ttrad.log)
raise "CVS was not happy!\n\n#{pe.join("\n")}" if pe.length>0
@@ -327,7 +327,7 @@ class TTrads
# Therefore we use cvs -p -r{revision} and read the file from stdout
@ttrad.log.info("Getting #...@localfilename} (#{rev}) from repository")
# Run cvs command
- cmd = "cd #[email protected]}; cvs -q -z0 update -p -r#{rev}
#...@path}/#[email protected]}/#...@subdir}#{@filename}"
+ cmd = "cd #[email protected]}; cvs -q -z3 update -p -r#{rev}
#...@path}/#[email protected]}/#...@subdir}#{@filename}"
po, pe = runrun(cmd, @ttrad.log)
raise "CVS was not happy!\n\n#{pe.join("\n")}" if pe.length > 0
raise "Cannot download #...@localfilename} from CVS.\nMaybe you should
try to update your CVS copy." if po.length < 1
@@ -956,7 +956,7 @@ class TTrads
# If @genhtml contains anything, upload list of targets and our newly
generated page
if @genhtml != "" then
flst = "#...@xmlfilename} #[email protected](' ')} #[email protected](' ')}
#[email protected](' ')}".squeeze(" ")
- stdo, stdr = runrun("scp -Cq #{flst} #...@wwwdev}", @log)
+ stdo, stdr = runrun("scp -Cpq #{flst} #...@wwwdev}", @log)
raise "Could not upload files: #{stdr.join("\n")}" if stdr.length > 0
flst.split
else
