Projects

projects@lrde.epita.fr

1049 discussions

by Noe

Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> Name sections. * src/inst/section: Add name attribute. * src/inst/text_section.hh, src/inst/data_section.hh: Default it to `.text' for text sections and `.data' for data sections. * src/inst/text_section.cc, src/inst/data_section.cc (print): Display name. Index: src/inst/data_section.cc --- src/inst/data_section.cc (revision 127) +++ src/inst/data_section.cc (revision 128) @@ -26,8 +26,7 @@ // -------------------------------------------------------------------------- DataSection::~DataSection() - { - } + {} // -------------------------------------------------------------------------- // Print operator @@ -39,7 +38,7 @@ if (size_ == 0) return; - ostr << "\t.data" << std::endl; + ostr << "\t" << name_ << std::endl; int i = 0; while (i < size_) Index: src/inst/data_section.hh --- src/inst/data_section.hh (revision 127) +++ src/inst/data_section.hh (revision 128) @@ -33,11 +33,13 @@ namespace inst { + /// Abstract an assembly data section class DataSection: public Section { public: - DataSection(): + DataSection(const std::string &name = ".data"): + Section(name), size_(0) { std::memset(bytes_, 0, INST_DATA_DATASIZE); Index: src/inst/text_section.cc --- src/inst/text_section.cc (revision 127) +++ src/inst/text_section.cc (revision 128) @@ -39,7 +39,8 @@ void TextSection::print(std::ostream& ostr) const { - ostr << "\t.text" << std::endl; + ostr << "\t" << name_ << std::endl; + for (unsigned i = 0; i < insts_.size(); ++i) { std::map<int, label_list_type>::const_iterator it = Index: src/inst/section.hh --- src/inst/section.hh (revision 127) +++ src/inst/section.hh (revision 128) @@ -29,6 +29,7 @@ namespace inst { + /// Abstract an assembly section class Section { protected: @@ -39,12 +40,12 @@ typedef std::map<const Label, int> label_offset_type; public: - Section() - { - } + /// Construct an abstract section `\a name' + Section(const std::string &name): + name_(name) + {} virtual ~Section() - { - } + {} protected: void add_label(Label *label, int offset) @@ -76,6 +77,8 @@ virtual void print(std::ostream& ostr) const = 0; protected: + std::string name_; + // FIXME: Might be static, to avoid multi-definition of labels. offset_label_type labels_; label_offset_type offsets_; Index: src/inst/text_section.hh --- src/inst/text_section.hh (revision 127) +++ src/inst/text_section.hh (revision 128) @@ -30,13 +30,14 @@ namespace inst { + /// Implement an assembly text (code) section class TextSection: public Section { public: - TextSection() - { - } + TextSection(const std::string &name = ".text"): + Section(name) + {} virtual ~TextSection(); public:

20 years, 3 months

LT 113: p2s: More merge verbosity

by Akim Demaille

Index: ChangeLog from Akim Demaille <akim(a)epita.fr> * prcs2svn/prcs2svn.py (Prcs2svn.merge): Rename some variables and add info message to help understanding what this routine actually does. (Main.main): Report the command line and revision of this tool. Index: prcs2svn/prcs2svn.py --- prcs2svn/prcs2svn.py (revision 112) +++ prcs2svn/prcs2svn.py (working copy) @@ -985,33 +985,43 @@ xchdir (os.path.join (self.workdir, self.svn.branch)) prcs_merged_parents = [] for prcs_merge_parent in prcsProject.prj.merge_parents: + # PRCS Revision to Merge. + prcs_m_rev = prcs_merge_parent[0] # Skip already merged parents (complete/incomplete repetition). - if prcs_merge_parent[0] in prcs_merged_parents: + if prcs_m_rev in prcs_merged_parents: continue - prcs_merged_parents.append(prcs_merge_parent[0]) - info("> Merge with PRCS revision " + prcs_merge_parent[0]) - svn_merge_parent = self.prcs_to_svn[prcs_merge_parent[0]] + prcs_merged_parents.append (prcs_m_rev) + + # SVN Revision to merge. + svn_m_branch = self.prcs_to_svn[prcs_m_rev][0] + svn_m_rev = self.prcs_to_svn[prcs_m_rev][1] + info("> Merge with PRCS revision %s (%s)" % (prcs_m_rev, svn_m_rev)) + + # Previous SVN Revision (of the current branch). svn_parent = self.prcs_to_svn[prcsProject.prj.parent_version.name()] + print >>sys.stderr, "BRANCH: " + prcsProject.prj.parent_version.name() + # Compute most recent common point (see oln 0_5.103). - svn_branch_start = self.svn.branches[svn_merge_parent[0]][0] + print >>sys.stderr, "REV: " + self.svn.branches[svn_m_branch].__str__ () + svn_branch_start = self.svn.branches[svn_m_branch][0] if svn_branch_start < self.svn.branches[self.svn.branch][0] and \ - self.svn.branches[self.svn.branch][0] < svn_merge_parent[1]: + self.svn.branches[self.svn.branch][0] < svn_m_rev: svn_branch_start = self.svn.branches[self.svn.branch][0] # Do merge. Ignore errors, since anyway we will solve all the # conflicts and make a fresh and clean tree. xsystem("svn --force merge " + \ "-r " + str(svn_branch_start) + \ - ":" + str(svn_merge_parent[1]) + \ + ":" + str(svn_m_rev) + \ " " + urlparse.urljoin(self.svn.repository + "/", - svn_merge_parent[0]), True) + svn_m_branch), True) # The conflicts will be resolved later, tell it now to Subversion. xsystem("svn resolved --recursive .") self.svn.changes_commit ("prcs2svn", "Only merge branches, "+\ "conflicts will be resolved later.", prcsProject.create_date) # Compute the intermediate project descriptor - prcs_checkout ("-r " + prcs_merge_parent[0] + " " + + prcs_checkout ("-r " + prcs_m_rev + " " + prcsProject.name + ".prj " + prcsProject.name + ".prj") prcsProject.prev_prj = prcs.merge(prcsProject.prev_prj, prcsProject.prj_parser.parse(prcsProject.name + ".prj"), @@ -1124,6 +1134,8 @@ class Main: def main(self): + info ("This is prcs2svn $Id$.") + info ("Command line arguments: " + sys.argv.__str__ ()) self.parse_opt(sys.argv[1:]) self.test_environment() self.init_repositories() @@ -1199,6 +1211,7 @@ "svn-root=", "copy-svn", "svn-project=", "subdir=", "keep-deleted-files", + "no-check", "no-rekey", "no-ignores"]) except getopt.GetoptError, error_msg: raise ScanOpt(str(error_msg)) Property changes on: prcs2svn/prcs2svn.py ___________________________________________________________________ Name: svn:keywords + Id

20 years, 3 months

[nolimips: 121] Split task.hh and task.cc

by Noe

Index: trunk/ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> * src/task/task.hh, src/task/task.cc: Split in... * src/task/function_task.hh, src/task/function_task.cc, * src/task/libtask.hh: These new files. * src/task/Makefile.am: Distribute new files. * src/task/task-tasks.hh, src/shell/shell-tasks.hh, * src/parse/parse-tasks.hh, src/nolimips-tasks.hh, * src/inst/inst-tasks.hh, src/vm/vm-tasks.hh: Include libtask.hh instead of task/task.hh Test invalid access to memory. Index: trunk/src/task/task.hh --- trunk/src/task/task.hh (revision 120) +++ trunk/src/task/task.hh (revision 121) @@ -72,44 +72,6 @@ deps_type dependencies_; }; - - class FunctionTask : public Task - { - public: - FunctionTask (void (*execute) (void), - const std::string& option, const std::string& module_name, - const std::string& desc, const std::string& deps = ""): - Task (option, module_name, desc, deps), - execute_ (execute) - { - } - - public: - virtual void execute() const; - - private: - void (*execute_) (void); - }; - - -#ifdef NOLIMIPS_CC_ - -# define TASK_MODULE(Name) \ - const char module_name [] = Name; -# define TASK_DECLARE(Option, Desc, Routine, Deps) \ - extern void (Routine) (void); \ - task::FunctionTask task_##Routine (Routine, \ - Option, module_name, \ - Desc, Deps) -#else // !NOLIMIPS_CC_ - -# define TASK_MODULE(Name) -# define TASK_DECLARE(Name, Help, Routine, Dependencies) \ - extern void (Routine) (void) - -#endif // NOLIMIPS_CC_ - } // namespace task #endif // !TASK_TASK_HH - Index: trunk/src/task/task-tasks.hh --- trunk/src/task/task-tasks.hh (revision 120) +++ trunk/src/task/task-tasks.hh (revision 121) @@ -19,7 +19,7 @@ #ifndef TASK_TASK_TASKS_HH # define TASK_TASK_TASKS_HH -# include "task/task.hh" +# include "task/libtask.hh" namespace task { Index: trunk/src/task/function_task.hh --- trunk/src/task/function_task.hh (revision 0) +++ trunk/src/task/function_task.hh (revision 121) @@ -0,0 +1,44 @@ +// +// This file is part of Nolimips, a MIPS simulator with unlimited registers +// Copyright (C) 2004 Akim Demaille <akim(a)epita.fr> and +// Benoit Perrot <benoit(a)lrde.epita.fr> +// +// Nolimips is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// Nolimips 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +#ifndef TASK_FUNCTION_TASK_HH +# define TASK_FUNCTION_TASK_HH + +#include "task/task.hh" + +namespace task +{ + + class FunctionTask: public Task + { + public: + FunctionTask(void (*execute) (void), + const std::string& option, const std::string& module_name, + const std::string& desc, const std::string& deps = ""); + + public: + virtual void execute() const; + + private: + void (*execute_) (void); + }; + +} // namespace task + +#endif // !TASK_FUNCTION_TASK_HH Index: trunk/src/task/task.cc --- trunk/src/task/task.cc (revision 120) +++ trunk/src/task/task.cc (revision 121) @@ -71,11 +71,4 @@ // std::cout << "\t" << *i << std::endl; // } - - void - FunctionTask::execute() const - { - execute_(); - } - } // namespace task Index: trunk/src/task/libtask.hh --- trunk/src/task/libtask.hh (revision 0) +++ trunk/src/task/libtask.hh (revision 121) @@ -0,0 +1,43 @@ +// +// This file is part of Nolimips, a MIPS simulator with unlimited registers +// Copyright (C) 2004 Akim Demaille <akim(a)epita.fr> and +// Benoit Perrot <benoit(a)lrde.epita.fr> +// +// Nolimips is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// Nolimips 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// + +#ifndef TASK_LIBTASK_HH +# define TASK_LIBTASK_HH + +# include "task/function_task.hh" + +# ifdef NOLIMIPS_CC_ + +# define TASK_MODULE(Name) \ + const char module_name [] = Name; +# define TASK_DECLARE(Option, Desc, Routine, Deps) \ + extern void (Routine) (void); \ + task::FunctionTask task_##Routine (Routine, \ + Option, module_name, \ + Desc, Deps) +# else // !NOLIMIPS_CC_ + +# define TASK_MODULE(Name) +# define TASK_DECLARE(Name, Help, Routine, Dependencies) \ + extern void (Routine) (void) + +# endif // NOLIMIPS_CC_ + +#endif // !TASK_LIBTASK_HH Index: trunk/src/task/Makefile.am --- trunk/src/task/Makefile.am (revision 120) +++ trunk/src/task/Makefile.am (revision 121) @@ -3,5 +3,7 @@ noinst_LIBRARIES = libtask.a libtask_a_SOURCES = \ task.hh task.cc \ + function_task.hh function_task.cc \ task_register.hh task_register.cc \ + libtask.hh \ task-tasks.hh task-tasks.cc Index: trunk/src/task/function_task.cc --- trunk/src/task/function_task.cc (revision 0) +++ trunk/src/task/function_task.cc (revision 121) @@ -0,0 +1,41 @@ +// +// This file is part of Nolimips, a MIPS simulator with unlimited registers +// Copyright (C) 2004 Akim Demaille <akim(a)epita.fr> and +// Benoit Perrot <benoit(a)lrde.epita.fr> +// +// Nolimips is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// Nolimips 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// + +#include "task/function_task.hh" + +namespace task +{ + + FunctionTask::FunctionTask(void (*execute) (void), + const std::string& option, + const std::string& module_name, + const std::string& desc, + const std::string& deps): + Task(option, module_name, desc, deps), + execute_(execute) + {} + + void + FunctionTask::execute() const + { + execute_(); + } + +} // namespace task Index: trunk/src/vm/vm-tasks.hh --- trunk/src/vm/vm-tasks.hh (revision 120) +++ trunk/src/vm/vm-tasks.hh (revision 121) @@ -19,7 +19,7 @@ #ifndef VM_VM_TASKS_HH # define VM_VM_TASKS_HH -# include "task/task.hh" +# include "task/libtask.hh" namespace vm { Index: trunk/src/shell/shell-tasks.hh --- trunk/src/shell/shell-tasks.hh (revision 120) +++ trunk/src/shell/shell-tasks.hh (revision 121) @@ -19,7 +19,7 @@ #ifndef SHELL_SHELL_TASKS_HH # define SHELL_SHELL_TASKS_HH -# include "task/task.hh" +# include "task/libtask.hh" namespace shell { Index: trunk/src/parse/parse-tasks.hh --- trunk/src/parse/parse-tasks.hh (revision 120) +++ trunk/src/parse/parse-tasks.hh (revision 121) @@ -19,7 +19,7 @@ #ifndef PARSE_PARSE_TASKS_HH # define PARSE_PARSE_TASKS_HH -# include "task/task.hh" +# include "task/libtask.hh" namespace inst { class Program; } Index: trunk/src/nolimips-tasks.hh --- trunk/src/nolimips-tasks.hh (revision 120) +++ trunk/src/nolimips-tasks.hh (revision 121) @@ -19,7 +19,7 @@ #ifndef NOLIMIPS_TASKS_HH # define NOLIMIPS_TASKS_HH -# include "task/task.hh" +# include "task/libtask.hh" namespace nolimips { Index: trunk/src/inst/inst-tasks.hh --- trunk/src/inst/inst-tasks.hh (revision 120) +++ trunk/src/inst/inst-tasks.hh (revision 121) @@ -19,7 +19,7 @@ #ifndef INST_INST_TASKS_HH # define INST_INST_TASKS_HH -# include "task/task.hh" +# include "task/libtask.hh" namespace inst {

20 years, 3 months

[nolimips: 125] Li is not a native instruction

by Noe

This patch reveals the lack of nolimips in immediate checking: li $t0, 0x10001 is invalid since 0x10001 does not fit in 16bits. In these cases, the assembler should output: lui $t0, 0x1 ori $t0, $t0, 0x10000 ... The worst is that this remark is valid for every immediate instructions (addi, ori, andi, etc.) Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> Li is not a native instruction * dev/nolimips.xml, src/int/program_builder.cc: Make `li' a pseudo instruction for `addiu'. * src/vm/cpu.hh, src/vm/cpu.cc: Remove emulation of `li'. Index: src/vm/cpu.hh --- src/vm/cpu.hh (revision 124) +++ src/vm/cpu.hh (revision 125) @@ -195,7 +195,6 @@ virtual void visit(const inst::Lb& lb); virtual void visit(const inst::Lbu& Lbu); virtual void visit(const inst::Lw& lw); - virtual void visit(const inst::Li& li); virtual void visit(const inst::Sb& sb); virtual void visit(const inst::Sw& sw); Index: src/vm/cpu.cc --- src/vm/cpu.cc (revision 124) +++ src/vm/cpu.cc (revision 125) @@ -365,12 +365,6 @@ // Move instructions // -------------------------------------------------------------------------- - void - Cpu::visit(const inst::Li& li) - { - set_register(li.get_dest (), li.get_imm ()); - } - // Store void Cpu::visit(const inst::Sb& sb) Index: src/inst/program_builder.cc --- src/inst/program_builder.cc (revision 124) +++ src/inst/program_builder.cc (revision 125) @@ -50,7 +50,8 @@ { // Warning: is not implemented in as for mips, check why. program_->text_section (). - add_inst(new Li(Register(Register::general, Cpu::at), src2)); + add_inst(new Addiu(Register(Register::general, Cpu::at), + Register(Register::general, Cpu::zero), src2)); program_->text_section (). add_inst(new Mul(*dest, *src1, Register(Register::general, Cpu::at))); } @@ -67,7 +68,8 @@ { // FIXME: program_solver must warn and/or break when exp is zero program_->text_section (). - add_inst(new Li(Register(Register::general, Cpu::at), src2)); + add_inst(new Addiu(Register(Register::general, Cpu::at), + Register(Register::general, Cpu::zero), src2)); program_->text_section (). add_inst(new Div(*src1, Register(Register::general, Cpu::at))); program_->text_section ().add_inst(new Mflo(*dest)); @@ -84,7 +86,8 @@ { // FIXME: program_solver must warn and/or break when exp is zero program_->text_section (). - add_inst(new Li(Register(Register::general, Cpu::at), src2)); + add_inst(new Addiu(Register(Register::general, Cpu::at), + Register(Register::general, Cpu::zero), src2)); program_->text_section (). add_inst(new Divu(*src1, Register(Register::general, Cpu::at))); program_->text_section ().add_inst(new Mflo(*dest)); @@ -234,7 +237,8 @@ ProgramBuilder::add_sgt(Register *dest, Register *src1, Exp *src2) { program_->text_section (). - add_inst(new Li(Register(Register::general, Cpu::at), src2)); + add_inst(new Addiu(Register(Register::general, Cpu::at), + Register(Register::general, Cpu::zero), src2)); program_->text_section (). add_inst(new Slt(*dest, Register(Register::general, Cpu::at), *src1)); } @@ -242,7 +246,8 @@ ProgramBuilder::add_sgtu(Register *dest, Register *src1, Exp *src2) { program_->text_section (). - add_inst(new Li(Register(Register::general, Cpu::at), src2)); + add_inst(new Addiu(Register(Register::general, Cpu::at), + Register(Register::general, Cpu::zero), src2)); program_->text_section (). add_inst(new Sltu(*dest, Register(Register::general, Cpu::at), *src1)); } @@ -258,7 +263,8 @@ ProgramBuilder::add_sle(Register *dest, Register *src1, Exp *src2) { program_->text_section (). - add_inst(new Li(Register(Register::general, Cpu::at), src2)); + add_inst(new Addiu(Register(Register::general, Cpu::at), + Register(Register::general, Cpu::zero), src2)); program_->text_section (). add_inst(new Slt(*dest, Register(Register::general, Cpu::at), *src1)); program_->text_section ().add_inst(new Xori(*dest, *dest, new IntExp(1))); @@ -273,7 +279,8 @@ ProgramBuilder::add_sleu(Register *dest, Register *src1, Exp *src2) { program_->text_section (). - add_inst(new Li(Register(Register::general, Cpu::at), src2)); + add_inst(new Addiu(Register(Register::general, Cpu::at), + Register(Register::general, Cpu::zero), src2)); program_->text_section (). add_inst(new Sltu(*dest, Register(Register::general, Cpu::at), *src1)); program_->text_section (). @@ -288,7 +295,8 @@ ProgramBuilder::add_bne(Register *src1, Exp *src2, Exp *dest) { program_->text_section (). - add_inst(new Li(Register(Register::general, Cpu::at), src2)); + add_inst(new Addiu(Register(Register::general, Cpu::at), + Register(Register::general, Cpu::zero), src2)); program_->text_section (). add_inst(new Bne(*src1, Register(Register::general, Cpu::at), dest)); // This nop is in the delay slot @@ -301,7 +309,8 @@ ProgramBuilder::add_beq(Register *src1, Exp *src2, Exp *dest) { program_->text_section (). - add_inst(new Li(Register(Register::general, Cpu::at), src2)); + add_inst(new Addiu(Register(Register::general, Cpu::at), + Register(Register::general, Cpu::zero), src2)); program_->text_section (). add_inst(new Beq(*src1, Register(Register::general, Cpu::at), dest)); // This nop is in the delay slot @@ -545,7 +554,10 @@ new IntExp(0))); } - // Load address ------------------------------------------ + // Load -------------------------------------------------- + + // Load address + // FIXME: alias? void ProgramBuilder::add_la (Register *dest, Exp *exp, Register *base) { @@ -554,8 +566,8 @@ void ProgramBuilder::add_la (Register *reg, Exp *exp) { - // FIXME: alias - program_->text_section ().add_inst(new Li(*reg, exp)); + program_->text_section (). + add_inst(new Addiu(*reg, Register(Register::general, Cpu::zero), exp)); } } // namespace inst Index: dev/nolimips.xml --- dev/nolimips.xml (revision 124) +++ dev/nolimips.xml (revision 125) @@ -1026,15 +1026,11 @@ </syntax> </instruction> -  - <instruction opcode="li" level="native" kind="load"> + <instruction opcode="li" level="pseudo" kind="load"> <description>Move the constant imm into dest.</description> - <format> - <attribute type="Register" name="dest"/> - <attribute type="Exp" name="imm"/> - </format> - <syntax> + <syntax alias="ori"> <token kind="register" /> + <token kind="hidden" value="new Register(Register::general, Cpu::zero)"/> <token kind="immediate" /> </syntax> </instruction>

20 years, 3 months

LT 112: p2s: --no-check

by Akim Demaille

Index: ChangeLog from Akim Demaille <akim(a)epita.fr> * prcs2svn/prcs2svn.py (Main.parse_opt): Handle --no-check. (Informations.check_conversion): New. (repository_cmp): Use it. Use the svn project descriptor as argument instead of passing parts of it. (Prcs2svn.convert_project): Adjust. Index: prcs2svn/prcs2svn.py --- prcs2svn/prcs2svn.py (revision 111) +++ prcs2svn/prcs2svn.py (working copy) @@ -240,6 +240,9 @@ # Delete files after a merge keep_deleted_files = False + # Check the consistence bw PRCS and Subversion + check_conversion = True + # Translate Populate-Ignores translate_ignores = True @@ -471,10 +474,11 @@ # Main to compare two repositories. -def repository_cmp (prcs_project, svn_project, svn_repo, prcs_revision="", - svn_revision=""): - repo_cmp = repositoryCmp (prcs_project, svn_project) - repo_cmp.doit (svn_repo, prcs_revision, svn_revision) +def repository_cmp (prcs_project, svn, prcs_revision="", svn_revision=""): + if infos.check_conversion: + debug (" > Check working copy coherency") + repo_cmp = repositoryCmp (prcs_project, svn.name) + repo_cmp.doit (svn.repository, prcs_revision, svn_revision) # Don't rely on the dtor, since it is non deterministically called! xrm (repo_cmp.tmp) @@ -901,15 +905,12 @@ prcsProject.create_date) for prcs_version in prcs_versions: self.convert_project_of_revision(prcsProject, prcs_version) - debug(" > Check working copy coherency") - repository_cmp(prcsProject.name, self.svn.name, - self.svn.repository, + repository_cmp (prcsProject.name, self.svn, prcsProject.prj.version.name(), str(self.svn.revision)) - repository_cmp(prcsProject.name, self.svn.name, self.svn.repository) + repository_cmp (prcsProject.name, self.svn) self.prcs_to_svn_list.append(self.prcs_to_svn) - # Ask user to convert a revision. def ask_revision_proceed(self): if not infos.force: @@ -1230,6 +1231,8 @@ infos.keep_deleted_files = True elif o == "--svn-root": infos.svn_root = a + elif o == "--no-check": + infos.check_conversion = False elif o == "--no-ignores": infos.translate_ignores = False elif o == "--no-rekey": @@ -1259,6 +1262,7 @@ print " [--copy-prcs]" print " [--copy-svn]" print " [--keep-deleted-files]" + print " [--no-check]" print " [--no-ignores]" print " [--no-rekey]" print " [--preserve-dates]" @@ -1292,11 +1296,16 @@ --copy-svn copy svn repository of a project and extend this copy (need a svn root beginning with 'file' and not 'http'). --keep-deleted-files preserve deleted files after a merge operation + +Development Options: + --no-check do not check that PRCS and Subversion trees are equal --no-ignores do not translate PRCS Populate-IGnore into Subversion - svn:ignore property. - This is useful to speed up tests. - --no-rekey do not translate PRCS keywords into Subversion keywords. - This is useful to speed up tests. + svn:ignore property + --no-rekey do not translate PRCS keywords into Subversion keywords + +These options are useful to speed up tests. Do not use them to perform +real conversion. + Subversion destination repository and project: --svn-root=URL set subversion repository root to URL

20 years, 3 months

LT 110: p2s: --no-ignore

by Akim Demaille

Index: ChangeLog from Akim Demaille <akim(a)epita.fr> Introduce --no-ignore. * prcs2svn/prcs2svn.py (Informations.translate_ignores): New. (Main.parse_opt): Handle --no-ignore. (Prcs2svn.ignore_set): Take Informations.translate_ignores into account. Index: prcs2svn/prcs2svn.py --- prcs2svn/prcs2svn.py (revision 109) +++ prcs2svn/prcs2svn.py (working copy) @@ -240,6 +240,9 @@ # Delete files after a merge keep_deleted_files = False + # Translate Populate-Ignores + translate_ignores = True + # Translate the $Id$ etc. keywords. translate_keywords = True @@ -1058,6 +1061,9 @@ def ignore_set(self, prcs_project): "Set which file must be ignored by subversion." + if not infos.translate_ignores: + return + info ("> Handling Populate-Ignore.") p = prcs.ProjectParser() p = p.parse(prcs_project + ".prj") globs_local = [] @@ -1192,7 +1198,7 @@ "svn-root=", "copy-svn", "svn-project=", "subdir=", "keep-deleted-files", - "no-rekey"]) + "no-rekey", "no-ignore"]) except getopt.GetoptError, error_msg: raise ScanOpt(str(error_msg)) @@ -1224,6 +1230,8 @@ infos.keep_deleted_files = True elif o == "--svn-root": infos.svn_root = a + elif o == "--no-ignores": + infos.translate_ignores = False elif o == "--no-rekey": infos.translate_keywords = False elif o == "--svn-project": @@ -1251,11 +1259,12 @@ print " [--copy-prcs]" print " [--copy-svn]" print " [--keep-deleted-files]" + print " [--no-ignore]" + print " [--no-rekey]" print " [--preserve-dates]" print " [--svn-root=URL]" print " [--svn-project=NAME]" print " [--subdir=PATH]" - print " [--no-rekey]" print " <project prcs> ..." def version(self): @@ -1283,6 +1292,9 @@ --copy-svn copy svn repository of a project and extend this copy (need a svn root beginning with 'file' and not 'http'). --keep-deleted-files preserve deleted files after a merge operation + --no-ignores do not translate PRCS Populate-IGnore into Subversion + svn:ignore property. + This is useful to speed up tests. --no-rekey do not translate PRCS keywords into Subversion keywords. This is useful to speed up tests.

20 years, 3 months

LT 109: p2s: prcs_checkout

by Akim Demaille

Index: ChangeLog from Akim Demaille <akim(a)epita.fr> * prcs2svn/prcs2svn.py (prcs_checkout): New. Use it. 2004-09-22 Akim Demaille <akim(a)epita.fr> Index: prcs2svn/prcs2svn.py --- prcs2svn/prcs2svn.py (revision 108) +++ prcs2svn/prcs2svn.py (working copy) @@ -193,6 +193,13 @@ shutil.move(src, dst) +def prcs_checkout (arg): + xsystem ("prcs checkout -f " + arg) + # PRCS sometimes lacks a \n after the messages emitted by checkout -f. + if 2 <= infos.trace_level: + print + + ## ------------------------------------- ## Informations @@ -419,10 +426,7 @@ prcs_revision = " -r " + prcs_revision + " " xmkdir (self.prcs_project + "_prcs") xchdir (self.prcs_project + "_prcs") - xsystem("prcs checkout -f " + prcs_revision + self.prjname ()) - # PRCS sometimes lacks a \n after the messages emitted by checkout -f. - if 2 <= infos.trace_level: - print + prcs_checkout (prcs_revision + self.prjname ()) svn_repo = os.path.join(self.svn_project, infos.subdir, "trunk") if len (infos.prcs_projects) > 1: svn_repo = os.path.join(svn_repo, self.prcs_project) @@ -440,7 +444,7 @@ def cmp_branch (self, prcs_revision): xmkdir (self.prcs_project + prcs_revision + "_prcs") xchdir (self.prcs_project + prcs_revision + "_prcs") - xsystem("prcs checkout -f -r" + prcs_revision + " " + self.prjname ()) + prcs_checkout ("-r" + prcs_revision + " " + self.prjname ()) svn_repo = self.svn_project + "/" + os.path.join(infos.subdir, "branches") svn_repo = os.path.join(self.svn_project, infos.subdir, "branches") if len(infos.prcs_projects) > 1: @@ -778,7 +782,7 @@ # Set prev_prj to the PRCS parent project descriptor. def project_parent_set(self): if self.prj.parent_version.name() != self.prev_prj.version.name(): - xsystem("prcs checkout -f -r " + self.prj.parent_version.name() + " " +\ + prcs_checkout ("-r " + self.prj.parent_version.name() + " " + self.prjname () + " " + self.prjname ()) self.prev_prj = self.prj_parser.parse(self.name + ".prj") @@ -973,6 +977,7 @@ # Merge with parents. def merge(self, prcsProject): + info ("> Preparing to merge.") xchdir(os.path.join (self.workdir, self.svn.branch)) prcs_merged_parents = [] for prcs_merge_parent in prcsProject.prj.merge_parents: @@ -1002,7 +1007,7 @@ "conflicts will be resolved later.", prcsProject.create_date) # Compute the intermediate project descriptor - xsystem("prcs checkout -f -r " + prcs_merge_parent[0] + " " + \ + prcs_checkout ("-r " + prcs_merge_parent[0] + " " + prcsProject.name + ".prj " + prcsProject.name + ".prj") prcsProject.prev_prj = prcs.merge(prcsProject.prev_prj, prcsProject.prj_parser.parse(prcsProject.name + ".prj"), @@ -1017,7 +1022,7 @@ def synchronize(self, prcsProject): info("> Checkout whole revision from PRCS repository") xchdir(os.path.join (self.workdir, self.svn.branch)) - xsystem("prcs checkout -f -r " + prcsProject.prj.version.name() + \ + prcs_checkout ("-r " + prcsProject.prj.version.name() + " " + prcsProject.name + ".prj") # Make a diff between previous and current prj's file. diffs = prcs.diff(prcsProject.prev_prj, prcsProject.prj) @@ -1036,7 +1041,7 @@ def convert_project_of_revision(self, prcsProject, prcs_version): info("> Consider PRCS revision " + prcs_version.name()) xchdir(self.workdir) - xsystem("prcs checkout -f -r " + prcs_version.name() + " " + \ + prcs_checkout ("-r " + prcs_version.name() + " " + prcsProject.name + ".prj " + prcsProject.name + ".prj") prcsProject.parse() if not self.ask_revision_proceed():

20 years, 3 months

LT 108: p2s: --no-rekey

by Akim Demaille

Index: ChangeLog from Akim Demaille <akim(a)epita.fr> * prcs2svn/prcs2svn.py Introduce --no-rekey, and spare useless keyword translations. * prcs2svn/prcs2svn.py (Informations.translate_keywords): New. (Main.parse_opt): Handle --no-rekey. (Svn.change_keywords): Rename as... (Svn.change_keywords_): this. (Svn.change_keywords): New wrapper, taking Informations.translate_keywords into account. (Svn.changes_commit): Do not call change_keywords here, since some commit do not need keyword translation. (Prcs2svn.synchronize): Do it here, when the files are actually coming from PRCS. Index: prcs2svn/prcs2svn.py --- prcs2svn/prcs2svn.py (revision 107) +++ prcs2svn/prcs2svn.py (working copy) @@ -233,6 +233,9 @@ # Delete files after a merge keep_deleted_files = False + # Translate the $Id$ etc. keywords. + translate_keywords = True + infos = Informations() # Keywords. @@ -540,14 +543,14 @@ prcs_to_svn_keywords[keyword] + " " + f) return line - def change_keywords (self, path): + def change_keywords_ (self, path): "Rewrite each file replacing PRCS keywords with Subversion's." pwd = os.getcwd () xchdir (path) for f in glob.glob ("*"): st = os.stat (f) if stat.S_ISDIR (st.st_mode): - self.change_keywords (f) + self.change_keywords_ (f) else: fout, rekeyed = TempDir().mkfile ("%s.re-keyed" % f) fin = open (f, "r") @@ -560,6 +563,12 @@ xmove (rekeyed, f) xchdir (pwd) + def change_keywords (self): + "Rewrite each file replacing PRCS keywords with Subversion's." + if infos.translate_keywords: + info("> Translating keywords") + self.change_keywords_ (self.workdir) + def env_to_preserve_dates (self): "Return the environment assignment needed to preserve checkin dates." res = "" @@ -585,7 +594,6 @@ # Write version log in a temporary file. # Do commit. # FIXME: `encoding' must be a command line option. - self.change_keywords(self.workdir) env = self.env_to_preserve_dates () msg = xcat (env + "svn commit --encoding latin1 " + \ "--username " + quote (checkin_login) + \ @@ -1017,8 +1025,12 @@ prcsProject.prj.version_log, prcsProject.prj.checkin_time) self.ignore_set(prcsProject.name) + # FIXME: Brute force keyword translation: using a list of files + # would be more intelligent. + self.svn.change_keywords () self.svn.changes_commit(prcsProject.prj.checkin_login, - prcsProject.prj.version_log, prcsProject.prj.checkin_time) + prcsProject.prj.version_log, + prcsProject.prj.checkin_time) # Convert a revision of a project. def convert_project_of_revision(self, prcsProject, prcs_version): @@ -1174,7 +1186,8 @@ "preserve-date", "copy-prcs", "svn-root=", "copy-svn", "svn-project=", "subdir=", - "keep-deleted-files"]) + "keep-deleted-files", + "no-rekey"]) except getopt.GetoptError, error_msg: raise ScanOpt(str(error_msg)) @@ -1184,31 +1197,33 @@ sys.exit(0) if o == "--usage": self.usage(); sys.exit(0) - if o in ("-V", "--version"): + elif o in ("-V", "--version"): self.version() sys.exit(0) - if o in ("-t", "--trace"): + elif o in ("-t", "--trace"): if not a in trace_levels: self.usage() raise ParseOpt() infos.trace_level = trace_levels[a] if o in ("-f", "--force"): infos.force = True - if o in ("-p", "--preserve-date"): + elif o in ("-p", "--preserve-date"): infos.preserve_dates = True - if o in ("-n", "--no-action"): + elif o in ("-n", "--no-action"): infos.action = False - if o in ("-c", "--copy-prcs"): + elif o in ("-c", "--copy-prcs"): infos.copy_prcs = True - if o == "--copy-svn": + elif o == "--copy-svn": infos.copy_svn = True - if o == "--keep-deleted-files": + elif o == "--keep-deleted-files": infos.keep_deleted_files = True - if o == "--svn-root": + elif o == "--svn-root": infos.svn_root = a - if o == "--svn-project": + elif o == "--no-rekey": + infos.translate_keywords = False + elif o == "--svn-project": infos.svn_project = a - if o == "--subdir": + elif o == "--subdir": infos.subdir = a if len(args) < 1: @@ -1235,6 +1250,7 @@ print " [--svn-root=URL]" print " [--svn-project=NAME]" print " [--subdir=PATH]" + print " [--no-rekey]" print " <project prcs> ..." def version(self): @@ -1262,6 +1278,8 @@ --copy-svn copy svn repository of a project and extend this copy (need a svn root beginning with 'file' and not 'http'). --keep-deleted-files preserve deleted files after a merge operation + --no-rekey do not translate PRCS keywords into Subversion keywords. + This is useful to speed up tests. Subversion destination repository and project: --svn-root=URL set subversion repository root to URL

20 years, 3 months

LT 107: p2s: Various

by Akim Demaille

Pas pu réduire. Index: ChangeLog from Akim Demaille <akim(a)epita.fr> Be more verbose. * prcs2svn/prcs2svn.py (TempDir): Use xmkdir and xrm so that we can see the actions. (Informations.initial_svn_revision): Remove. Use just the right number of directories to compare Svn and Prcs repositories. * prcs2svn/prcs2svn.py (repositoryCmp.__init__): New. (repository_cmp, repositoryCmp.doit): Adjust. Clean up the diff directory once done. (repositoryCmp.compare): Say what you do. Remove useless chdirs. Various fixes. * prcs2svn/prcs2svn.py (repositoryCmp.cmp_trunk): Simplify Python syntax. (Svn.__init__): Adjust: no longer initialize Svn.revision. (Svn.repository_init): svn mkdir is allowed to fail here. (Svn.change_keywords): Fix change_keywords_line invocation: pass the file name, not its fd. Rather than blindly incrementing by one the current revision each time we check in, just read the answer from "svn commit" and fetch the revision number there. * prcs2svn/prcs2svn.py (Svn.changes_commit): Do it. Comment out some weird code (svn update). (Prcs2svn.convert_project, Main.init_repositories): Adjust. (Main.initialize_svn_revision): Remove. Index: prcs2svn/prcs2svn.py --- prcs2svn/prcs2svn.py (revision 106) +++ prcs2svn/prcs2svn.py (working copy) @@ -22,14 +22,14 @@ def mkdir (self, name): dirname = os.path.join (self.base, name) # Ignore rm errors: the file might be fresh. - shutil.rmtree (dirname, True) - os.mkdir (dirname) + xrm (dirname) + xmkdir (dirname) return dirname def mkfile (self, name): fname = os.path.join (self.base, name) # Ignore rm errors: the file might be fresh. - shutil.rmtree (fname, True) + xrm (fname) return (open (fname, "wb"), fname) def mksfile (self, name): @@ -227,9 +227,6 @@ # Copy svn repository (use it to extend a svn repository) copy_svn = False - # Initial revision number of svn repository - initial_svn_revision = 0 - # Where to write in svn project subdir = "" @@ -381,11 +378,14 @@ __prcs_project = "" def prjname (self): - """Name of the PRJ file.""" + "Name of the PRJ file." return self.prcs_project + ".prj" - def __del__(self): - xrm(self.tmp) + def __init__ (self, prcs_project, svn_project): + self.prcs_project = prcs_project + self.svn_project = svn_project + self.tmp = TempDir().mkdir ("%s.prcs-%s.svn.diff" + % (prcs_project, svn_project)) # Remove keyword to compare repositories. def keywords_clean(self, line): @@ -399,7 +399,7 @@ # Compare two directories. def compare(self, path_svn, path_prcs): - xchdir(self.tmp) + info ("Compare %s and %s." % (path_svn, path_prcs)) dircmp = dirCmp() result = dircmp.cmp(os.path.join(os.getcwd(), path_prcs), os.path.join(os.getcwd(), path_svn), @@ -408,12 +408,11 @@ if not result: dircmp.report() raise RepositoriesDifferent() - xchdir(self.tmp) # Compare trunk of the project. def cmp_trunk(self, prcs_revision=""): info("> Comparing trunk.") - if prcs_revision != "": + if prcs_revision: prcs_revision = " -r " + prcs_revision + " " xmkdir(self.prcs_project + "_prcs") xchdir(self.prcs_project + "_prcs") @@ -447,13 +446,9 @@ self.compare(svn_repo, self.prcs_project + prcs_revision + "_prcs") # Compare two repositories of specified (or not) revisions. - def doit(self, prcs_project, svn_project, svn_repo, prcs_revision="", - svn_revision=""): - self.prcs_project = prcs_project - self.svn_project = svn_project - self.tmp = TempDir().mkdir ("%s.prcs-%s.svn.diff" % (prcs_project, svn_project)) + def doit (self, svn_repo, prcs_revision="", svn_revision=""): xchdir(self.tmp) - if svn_revision != "": + if svn_revision: svn_revision = " -r " + svn_revision + " " xsystem("svn checkout " + svn_revision + svn_repo) if prcs_revision == "": @@ -468,10 +463,10 @@ # Main to compare two repositories. def repository_cmp(prcs_project, svn_project, svn_repo, prcs_revision="", svn_revision=""): - repo_cmp = repositoryCmp() - repo_cmp.doit(prcs_project, svn_project, svn_repo, prcs_revision, - svn_revision) - + repo_cmp = repositoryCmp (prcs_project, svn_project) + repo_cmp.doit (svn_repo, prcs_revision, svn_revision) + # Don't rely on the dtor, since it is non deterministically called! + xrm (repo_cmp.tmp) @@ -505,7 +500,6 @@ self.branch = "" self.branches = {} self.name = infos.svn_project - self.revision = infos.initial_svn_revision # Create initial repository. # Simulate branches with the 'trunk' and 'branches' repositories. @@ -518,10 +512,16 @@ xsystem("svn checkout " + self.repository + " " + quote(self.topdir)) info("> Create subversion repository tree") if len(infos.subdir) > 0: - xsystem("svn mkdir " + infos.subdir, False) - xsystem("svn mkdir " + os.path.join(infos.subdir, "branches") + " " +\ - os.path.join(infos.subdir, "trunk") + " " +\ - os.path.join(infos.subdir, "tags"), False) + xsystem("svn mkdir " + infos.subdir) + # FIXME: Rather than accepting failures on mkdir, we should test for + # there existence first. + xsystem ("svn mkdir " + + os.path.join (infos.subdir, "branches") + " " + + os.path.join (infos.subdir, "trunk") + " " + + os.path.join (infos.subdir, "tags"), + # If we are launched on an existing hierarchy, these directories + # already exist. + True) def repository_desinit(self): pass @@ -536,7 +536,7 @@ line = re.sub("\$" + keyword + ": [^\$]*\$", "$" + prcs_to_svn_keywords[keyword] + "$", line) if len(line_bak) != len(line): - xsystem("svn propset svn:keywords " +\ + xsystem ("svn propset svn:keywords " + prcs_to_svn_keywords[keyword] + " " + f) return line @@ -552,7 +552,7 @@ fout, rekeyed = TempDir().mkfile ("%s.re-keyed" % f) fin = open (f, "r") for l in fin: - l = self.change_keywords_line (fin, l) + l = self.change_keywords_line (f, l) fout.writelines ([l]) fout.close () fin.close () @@ -587,14 +587,16 @@ # FIXME: `encoding' must be a command line option. self.change_keywords(self.workdir) env = self.env_to_preserve_dates () - r = xtee (env + "svn commit --encoding latin1 " + \ + msg = xcat (env + "svn commit --encoding latin1 " + \ "--username " + quote (checkin_login) + \ " --message " + quote (version_log)) - if r > 0: - self.revision += 1 + # The last line of the msg contains the checkin revision. + print "(" + msg + ")" + if msg: + self.revision = re.search (r'Committed revision (\d+)\.', msg).group (1) # Refresh local copy (should be useless, may be a bug of svn). - if update: - xsystem("svn update") + # if update: + # xsystem("svn update") # Replace symbolic links with the files they point to. def changes_apply_links_replace(self, diffs): @@ -890,7 +892,6 @@ prcsProject.prj.version.name(), str(self.svn.revision)) repository_cmp(prcsProject.name, self.svn.name, self.svn.repository) - infos.initial_svn_revision = self.svn.revision self.prcs_to_svn_list.append(self.prcs_to_svn) @@ -1111,7 +1112,6 @@ self.copy_prcs_repository() self.copy_svn_repository() self.create_svn_repository() - self.initialize_svn_revision() def desinit_repositories(self): if infos.copy_prcs: @@ -1159,11 +1159,6 @@ " " + new_repo, False) infos.svn_root = urlparse.urljoin("file://", urllib.pathname2url(tmp)) - def initialize_svn_revision(self): - infos.initial_svn_revision = \ - int (xcat("svnlook youngest " + os.path.join(infos.svn_root[7:], - infos.svn_project))) - def test_environment(self): if not os.environ.has_key('LANG') or os.environ['LANG'] == 'C': print "Warning: LANG is not set. " +\

20 years, 3 months

LT 106: p2s: handling of keywords

by Akim Demaille

Index: ChangeLog from Akim Demaille <akim(a)epita.fr> * prcs2svn/prcs2svn.py (Svn.change_keywords_): Rewrite, the logic is rotten, and makes too many file system moves. Much remains to be optimized. And rename to... (Svn.change_keywords): this. (Prcs.parse): Display time before log, since the latter can span over several lines. Index: prcs2svn/prcs2svn.py --- prcs2svn/prcs2svn.py (revision 105) +++ prcs2svn/prcs2svn.py (working copy) @@ -540,35 +540,24 @@ prcs_to_svn_keywords[keyword] + " " + f) return line - # Rewrite each file exchanging prcs and svn keywords. - def change_keywords_(self, path): + def change_keywords (self, path): + "Rewrite each file replacing PRCS keywords with Subversion's." + pwd = os.getcwd () xchdir(path) - files = glob.glob (os.path.join (path, "*")) - for f in files: + for f in glob.glob ("*"): st = os.stat(f) if stat.S_ISDIR (st.st_mode): - self.change_keywords_ (os.path.join (path, f)) + self.change_keywords (f) else: - tmp = TempDir().mkdir ("prcs2svn.keywords") - atime = st[stat.ST_ATIME] - mtime = st[stat.ST_MTIME] - xcopy(f, tmp) - fd_tmp = open (os.path.join (tmp, os.path.basename (f)), "r") - # FIXME: in python, we should have that. - xsystem("chmod +w " + quote (f)) - fd_f = open(f, "w+") - for l in fd_tmp: - l = self.change_keywords_line(f, l) - fd_f.writelines([l]) - fd_tmp.close() - fd_f.close() - os.utime(f, (atime, mtime)) - xrm(tmp) - - # Just a garbage function because change_keywords_ is recursive. - def change_keywords(self, path): - pwd = os.getcwd() - self.change_keywords_(path) + fout, rekeyed = TempDir().mkfile ("%s.re-keyed" % f) + fin = open (f, "r") + for l in fin: + l = self.change_keywords_line (fin, l) + fout.writelines ([l]) + fout.close () + fin.close () + os.utime (rekeyed, (st[stat.ST_ATIME], st[stat.ST_MTIME])) + xmove (rekeyed, f) xchdir(pwd) def env_to_preserve_dates (self): @@ -773,8 +762,8 @@ self.prev_prj = self.prj self.prj = self.prj_parser.parse(self.prjname ()) info(" * User: " + self.prj.checkin_login) - info(" * Version-Log: " + self.prj.version_log) info(" * Time: " + self.prj.checkin_time) + info(" * Version-Log: " + self.prj.version_log) # Set prev_prj to the PRCS parent project descriptor. def project_parent_set(self):

20 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Projects