Projects

projects@lrde.epita.fr

1049 discussions

LT 92: Rationalize the invocation of traditional Unix commands

by Akim Demaille

Index: ChangeLog from Akim Demaille <akim(a)epita.fr> Rationalize the invocation of traditional Unix commands. It should be possible to redo what prcs2svn did by grepping "prcs2svn $". The test suite fails, I have no idea why... * prcs2svn/prcs2svn.py (error): Fix >> use. (trace): New. (xsystem, xtee): Use it. (xcopy, xrm, xpopen, xcat, xchdir, xmkdir, xmove): New. Use them where ever their low level implementation was used. * prcs2svn/prcs2svn.py (Svn.changes_apply_files_rename): Don't rm files you just mv'ed. Index: prcs2svn/prcs2svn.py --- prcs2svn/prcs2svn.py (revision 89) +++ prcs2svn/prcs2svn.py (working copy) @@ -80,7 +80,7 @@ sys.stdout.flush() def error(status, msg): - print "prcs2svn: ***" + msg >>sys.stderr + print >> sys.stderr, "prcs2svn:", msg sys.stderr.flush () if status: sys.exit (status) @@ -95,14 +95,59 @@ ## ------------------------------------- ## Misc. -## Print cmd on debug stream and execute it through os.system. +def trace (cmd): + "Announce we are about to run the cmd." + debug ("prcs2svn $ " + cmd) + + def xsystem(cmd, ignErr=False): - debug ("os.system(\"" + cmd + "\")") + "Print cmd on debug stream and execute it through os.system." + + trace (cmd) if infos.trace_level < 2: cmd += "> /dev/null 2> /dev/null" status = os.system(cmd) if status: + error (int (ignErr), + cmd + ": returned an error (" + status.__str__ () + ")") + +def xpopen(cmd, ignErr=False): + "Verbose and error proof wrapper around os.popen." + + trace (cmd) + if infos.trace_level < 2: + cmd += "> /dev/null 2> /dev/null" + return os.popen(cmd) + +def xcat (cmd, ignErr=False): + "Return the content of running cmd." + pipe = xpopen(cmd, ignErr) + res = "" + for line in pipe: + sys.__stdout__.write(line) + res += line + # What is this supposed to return? There is nothing in the doc! --akim + status = pipe.close () + if status: error (int (ignErr), cmd + ": returned an error (" + status + ")") + return res + +def xtee (cmd, ignErr=False): + "Print cmd on debug stream, tee it, return the number of printed chars." + return len (xcat (cmd, ignErr)) + + +def xchdir (dir): + trace ("cd " + dir) + os.chdir (dir) + +def xmkdir (dir): + trace ("mkdir " + dir) + os.mkdir (dir) + +def xrm (dir): + trace ("rm -rf " + dir) + shutil.rmtree (dir, True) ## Add quote for filename, directory's name, ... def quote(path): @@ -114,28 +159,14 @@ r = string.replace(r, "\\\\", "\\") return r -## Print cmd on debug stream, tee it, return the number of printed chars. -def xtee (cmd, ignErr=False): - debug ("os.popen(\"" + cmd + "\")") - pipe = os.popen(cmd) - res = 0 - for line in pipe: - res += len(line) - sys.__stdout__.write(line) - # What is this supposed to return? There is nothing in the doc! --akim - status = pipe.close () - if status: - error (int (ignErr), cmd + ": returned an error (" + status + ")") - return res - ## Print copy on debug stream and copy a file. -def copy(src, dst): - debug("cp --force " + src + " " + dst) +def xcopy(src, dst): + trace ("cp --force " + src + " " + dst) shutil.copy(src, dst) ## Print move on debug stream and move a file. -def move(src, dst): - debug("mv --force " + src + " " + dst) +def xmove(src, dst): + trace ("mv --force " + src + " " + dst) dst_dirname = os.path.dirname(dst) if (len(dst_dirname) > 0 and (not os.path.exists(dst_dirname))): os.makedirs(dst_dirname) @@ -331,7 +362,7 @@ return self.prcs_project + ".prj" def __del__(self): - shutil.rmtree(self.tmp, True) + xrm(self.tmp) # Remove keyword to compare repositories. def keywords_clean(self, line): @@ -345,7 +376,7 @@ # Compare two directories. def compare(self, path_svn, path_prcs): - os.chdir(self.tmp) + xchdir(self.tmp) dircmp = dirCmp() result = dircmp.cmp(os.path.join(os.getcwd(), path_prcs), os.path.join(os.getcwd(), path_svn), @@ -354,20 +385,20 @@ if not result: dircmp.report() raise RepositoriesDifferent() - os.chdir(self.tmp) + xchdir(self.tmp) # Compare trunk of the project. def cmp_trunk(self, prcs_revision=""): info("> Comparing trunk.") if prcs_revision != "": prcs_revision = " -r " + prcs_revision + " " - os.mkdir(self.prcs_project + "_prcs") - os.chdir(self.prcs_project + "_prcs") + 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 - svn_repo = os.path.join(self.svn_project, os.path.join(infos.subdir, "trunk")) + 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) self.compare(svn_repo, self.prcs_project + "_prcs") @@ -383,11 +414,11 @@ # Compare a branch of a project. def cmp_branch(self, prcs_revision): - os.mkdir(self.prcs_project + prcs_revision + "_prcs") - os.chdir(self.prcs_project + prcs_revision + "_prcs") + xmkdir(self.prcs_project + prcs_revision + "_prcs") + xchdir(self.prcs_project + prcs_revision + "_prcs") xsystem("prcs checkout -f -r" + prcs_revision + " " + self.prjname ()) svn_repo = self.svn_project + "/" + os.path.join(infos.subdir, "branches") - svn_repo = os.path.join(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: svn_repo = os.path.join(svn_repo, self.prcs_project) svn_repo = os.path.join(svn_repo, prcs_revision.split(".")[0]) @@ -399,7 +430,7 @@ self.prcs_project = prcs_project self.svn_project = svn_project self.tmp = tempfile.mkdtemp(".diff", "prcs2svn") - os.chdir(self.tmp) + xchdir(self.tmp) if svn_revision != "": svn_revision = " -r " + svn_revision + " " xsystem("svn checkout " + svn_revision + svn_repo) @@ -489,7 +520,7 @@ # Rewrite each file exchanging prcs and svn keywords. def change_keywords_(self, path): - os.chdir(path) + xchdir(path) files = glob.glob(path + os.sep + "*") for f in files: st = os.stat(f) @@ -499,10 +530,10 @@ tmp = tempfile.mkdtemp(".keywords", "prcs2svn") atime = st[stat.ST_ATIME] mtime = st[stat.ST_MTIME] - shutil.copy(f, tmp) + xcopy(f, tmp) fd_tmp = open(tmp + os.sep + os.path.basename(f), "r") # FIXME: in python, we should have that. - os.system("chmod +w " + f) + xsystem("chmod +w " + f) fd_f = open(f, "w+") for l in fd_tmp: l = self.change_keywords_line(f, l) @@ -510,13 +541,13 @@ fd_tmp.close() fd_f.close() os.utime(f, (atime, mtime)) - shutil.rmtree(tmp) + xrm(tmp) # Just a garbage function because change_keywords_ is recursive. def change_keywords(self, path): pwd = os.getcwd() self.change_keywords_(path) - os.chdir(pwd) + xchdir(pwd) # Commit Subversion changes. @@ -550,7 +581,7 @@ # Refresh local copy (should be useless, may be a bug of svn). if update: xsystem("svn update") - os.remove(log_path) + xrm(log_path) # Replace symbolic links with the files they point to. def changes_apply_links_replace(self, diffs): @@ -564,7 +595,7 @@ if os.path.dirname(l): ref = os.path.normpath(os.path.dirname(l) + "/" + ref) if os.path.isfile(ref): - copy(ref, l) + xcopy(ref, l) else: f = file(l, "w") f.write("Symbolic link to: " + ref + "\n") @@ -614,10 +645,10 @@ # Destination exists: PRCS renamed then added an homonym file. bak_fd, bak_path = tempfile.mkstemp(".bak", "prcs2svn") os.close(bak_fd) - move(diffs.renamed[i][0], bak_path) + xmove(diffs.renamed[i][0], bak_path) backup[diffs.renamed[i][0]] = bak_path # FIXED: was copy(). - move(diffs.renamed[i][1], diffs.renamed[i][0]) + xmove(diffs.renamed[i][1], diffs.renamed[i][0]) # Do Subversion rename. for r in diffs.renamed: # Delete files that may be overwritten (--force is a joke). @@ -636,12 +667,11 @@ break if must_delete: if backup.has_key(r[0]): - copy(backup[r[0]], r[0]) - xtee("svn delete --force " + quote(r[0])) + xcopy(backup[r[0]], r[0]) + xsystem("svn delete --force " + quote(r[0])) # Restore backuped files. for b in backup.keys(): - move(backup[b], b) - shutil.rmtree(backup[b], True) + xmove(backup[b], b) # Add files. # Hard to explain, see movement of "Makefile.am" in oln 0_7_reconf.1.prj. @@ -670,10 +700,10 @@ ".svn"): args = args + " " + quote(e) if infos.action and len(args) > 0: - xtee("svn delete --force " + args) + xsystem ("svn delete --force " + args) # Apply changes to Subversion repository. - # Be careful: order is very important ! + # Be careful: the order is very important! def changes_apply(self, diffs, checkin_login, version_log, checkin_time): self.changes_apply_links_replace(diffs) self.changes_apply_directories_add(diffs) @@ -720,7 +750,7 @@ info("> Get versions of the project named `" + self.name + "'") re_DELETED = re.compile(".*DELETED\*$") prcs_versions = [] - pipe = os.popen("prcs info --plain-format -f --sort=date " +\ + pipe = xpopen("prcs info --plain-format -f --sort=date " +\ self.prjname ()) for line in pipe: prcs_desc = line.split(" ") @@ -781,7 +811,7 @@ re_DELETED = re.compile(".*DELETED\*$") prcs_versions = [] # FIXME: should use python features instead of sed. - prcs_info = os.popen("prcs info --plain-format -f --sort=date " +\ + prcs_info = xpopen("prcs info --plain-format -f --sort=date " +\ project + ".prj | sed -ne \"1p;\$p\"" +\ " | sed -e \"s/.*, $.*$ +[0-9]* by .*/\\1/\"" ) f_date = "" @@ -812,13 +842,13 @@ self.topdir = tempfile.mkdtemp(".migrate", "prcs2svn") self.workdir = os.path.join(self.topdir, infos.subdir) debug("> Create working directory: " + self.topdir) - os.chdir(self.topdir) + xchdir(self.topdir) self.svn.repository_init(self.topdir) # Clean workspace. def convert_desinit(self): self.svn.repository_desinit() - shutil.rmtree(self.topdir, True) + xrm(self.topdir) # Convert prcs -> svn. def convert(self): @@ -833,7 +863,7 @@ # Convert a project. def convert_project(self, project): - os.chdir(self.topdir) + xchdir(self.topdir) # if several prcs projects -> # trunk/proj1, trunk/proj2, branches/proj1, ... # else trunk/ and branches/ @@ -910,7 +940,7 @@ self.svn.branch = svn_new_branch if self.svn.branches.has_key(self.svn.branch): info(" > Return to branch: " + self.svn.branch) - os.chdir(self.workdir + os.sep + self.svn.branch) + xchdir(self.workdir + os.sep + self.svn.branch) # FIXME: may be a comparison with svn branches. if prcsProject.prj.parent_version.major != \ prcsProject.prj.version.major: @@ -920,7 +950,7 @@ else: if prcsProject.prj.parent_version.major == "-*-": info(" > Initial revision") - os.chdir(self.workdir + os.sep + self.svn.branch) + xchdir(self.workdir + os.sep + self.svn.branch) xsystem("svn checkout " + self.svn.repository + " " +\ quote(self.workdir)) else: @@ -929,7 +959,7 @@ self.prcs_to_svn[prcsProject.prj.parent_version.name()] xsystem("svn copy -r " + str(svn_parent[1]) + \ " " + svn_parent[0] + " " + self.svn.branch) - os.chdir(self.workdir + os.sep + self.svn.branch) + xchdir(self.workdir + os.sep + self.svn.branch) self.svn.changes_commit("prcs2svn", "Make a new branch.", prcsProject.create_date) self.svn.branches[self.svn.branch] = [self.svn.revision, @@ -937,7 +967,7 @@ # Merge with parents. def merge(self, prcsProject): - os.chdir(self.workdir + os.sep + self.svn.branch) + xchdir(self.workdir + os.sep + self.svn.branch) prcs_merged_parents = [] for prcs_merge_parent in prcsProject.prj.merge_parents: # Skip already merged parents (complete/incomplete repetition). @@ -979,7 +1009,7 @@ # Synchronize PRCS and Subversion repositories def synchronize(self, prcsProject): info(" > Checkout whole revision from PRCS repository") - os.chdir(self.workdir + os.sep + self.svn.branch) + xchdir(self.workdir + os.sep + self.svn.branch) xsystem("prcs checkout -f -r " + prcsProject.prj.version.name() + \ " " + prcsProject.name + ".prj") # Make a diff between previous and current prj's file. @@ -994,7 +1024,7 @@ # Convert a revision of a project. def convert_project_of_revision(self, prcsProject, prcs_version): info("> Consider PRCS revision " + prcs_version.name()) - os.chdir(self.workdir) + xchdir(self.workdir) xsystem("prcs checkout -f -r " + prcs_version.name() + " " + \ prcsProject.name + ".prj " + prcsProject.name + ".prj") prcsProject.parse() @@ -1043,7 +1073,7 @@ else: globs_local_bypath[path] = [g] for path in globs_local_bypath.keys(): - shutil.copy(".svnignore", ".svnignore_local") + xcopy(".svnignore", ".svnignore_local") fd = open(".svnignore_local", "a") for g in globs_local_bypath[path]: fd.write(g + "\n") @@ -1083,7 +1113,7 @@ def desinit_repositories(self): if infos.copy_prcs: - shutil.rmtree(os.environ["PRCS_REPOSITORY"], True) + xrm(os.environ["PRCS_REPOSITORY"]) # Make the 'svnadmin create'. def create_svn_repository(self): @@ -1102,14 +1132,14 @@ info("> Copy prcs repository") tmp = tempfile.mkdtemp(".prcs", "prcs2svn") pwd = os.getcwd() - os.chdir(tmp) + xchdir(tmp) for proj in infos.prcs_projects: xsystem("prcs package -f " + proj + " " + proj + ".pkg") os.environ["PRCS_REPOSITORY"] = tmp for proj in infos.prcs_projects: xsystem("prcs unpackage -f ./" + proj + ".pkg") - os.remove(proj + ".pkg") - os.chdir(pwd) + xrm(proj + ".pkg") + xchdir(pwd) # Copy the svn repository to work on a copy. def copy_svn_repository(self): @@ -1118,9 +1148,9 @@ tmp = tempfile.mkdtemp(".svn", "prcs2svn") info("> Copy svn repository to " + tmp) new_repo = os.path.join(tmp, infos.svn_project) - os.mkdir(new_repo) + xmkdir(new_repo) if infos.svn_root[0] != "f": - shutil.rmtree(tmp, True) + xrm (tmp) raise SvnCopyForbidden() xsystem("svnadmin hotcopy " + os.path.join(infos.svn_root[7:], infos.svn_project) + \ @@ -1128,11 +1158,9 @@ infos.svn_root = urlparse.urljoin("file://", urllib.pathname2url(tmp)) def initialize_svn_revision(self): - pipe = os.popen("svnlook youngest " + os.path.join(infos.svn_root[7:], - infos.svn_project)) - for line in pipe: - infos.initial_svn_revision = int(line) - pipe.close() + 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':

20 years, 4 months

LT 91: The "disregard exit status by default" strategy is rotten!

by Akim Demaille

Index: ChangeLog from Akim Demaille <akim(a)epita.fr> The "disregard exit status by default" strategy is rotten! * prcs2svn/prcs2svn.py (error): Expect an exit status. (warn, fatal): New. (xsystem, xtee): By default, do not disregard the exit status. And these new functions to output better messages and exit when appropriate. Adjust all callers. Flag those where ignoring error is truly OK. (repositoryCmp.cmp_trunk): Complete PRCS' message with the missing eol. Index: prcs2svn/prcs2svn.py --- prcs2svn/prcs2svn.py (revision 88) +++ prcs2svn/prcs2svn.py (working copy) @@ -79,25 +79,30 @@ print msg sys.stdout.flush() -def error(msg): - sys.stderr.write(msg + "\n") +def error(status, msg): + print "prcs2svn: ***" + msg >>sys.stderr sys.stderr.flush() + if status: + sys.exit (status) + +def warn(msg): + error (0, "Warning: " + msg) + +def fatal(msg): + error (1, "Error: " + msg) ## ------------------------------------- ## Misc. ## Print cmd on debug stream and execute it through os.system. -def xsystem(cmd, ignErr=True): +def xsystem(cmd, ignErr=False): debug("os.system(\"" + cmd + "\")") - if 2 > infos.trace_level: + if infos.trace_level < 2: cmd += "> /dev/null 2> /dev/null" - if ignErr: - if os.system(cmd) != 0: - # Errors may be ignored if the repositories are the same. - error("** Warning: '" + cmd + "' returned an error.") - else: - assert(os.system(cmd) == 0) + status = os.system(cmd) + if status: + error (int (ignErr), cmd + ": returned an error (" + status + ")") ## Add quote for filename, directory's name, ... def quote(path): @@ -117,12 +122,10 @@ for line in pipe: res += len(line) sys.__stdout__.write(line) - if not ignErr: - if pipe.close() != None: - # Errors may be ignored if the repositories are the same. - error("** Warning: '" + cmd + "' returned an error.") - else: - pipe.close() + # What is this supposed to return? There is nothing in the doc! --akim + status = pipe.close () + if status: + error (int (ignErr), cmd + ": returned an error (" + status + ")") return res ## Print copy on debug stream and copy a file. @@ -361,6 +364,9 @@ os.mkdir(self.prcs_project + "_prcs") os.chdir(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 svn_repo = os.path.join(self.svn_project, os.path.join(infos.subdir, "trunk")) if len(infos.prcs_projects) > 1: svn_repo = os.path.join(svn_repo, self.prcs_project) @@ -456,7 +462,7 @@ self.topdir = topdir self.workdir = os.path.join(self.topdir, infos.subdir) info("> Checkout subversion repository") - xsystem("svn checkout " + self.repository + " " + quote(self.topdir), False) + xsystem("svn checkout " + self.repository + " " + quote(self.topdir)) info("> Create subversion repository tree") if len(infos.subdir) > 0: xsystem("svn mkdir " + infos.subdir, False) @@ -541,7 +547,7 @@ "--username " + checkin_login + " --file " + log_path) if r > 0: self.revision += 1 - # Refresh local copy (should be useness, may be a bug of svn). + # Refresh local copy (should be useless, may be a bug of svn). if update: xsystem("svn update") os.remove(log_path) @@ -946,12 +952,14 @@ if svn_branch_start < self.svn.branches[self.svn.branch][0] and \ self.svn.branches[self.svn.branch][0] < svn_merge_parent[1]: svn_branch_start = self.svn.branches[self.svn.branch][0] - # Do merge. + + # 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]) + \ " " + urlparse.urljoin(self.svn.repository + "/", - svn_merge_parent[0])) + svn_merge_parent[0]), True) # The conflicts will be resolved later, tell it now to Subversion. xsystem("svn resolved --recursive .") self.svn.changes_commit("prcs2svn", "Only merge branches, "+\

20 years, 4 months

LT 86: prjname

by Akim Demaille

Index: ChangeLog from Akim Demaille <akim(a)epita.fr> * prcs2svn/prcs2svn.py (repositoryCmp.prjname): New, to pass prj names instead of project names to prcs. (Prcs.prjname): Likewise. Index: prcs2svn/prcs2svn.py --- prcs2svn/prcs2svn.py (revision 85) +++ prcs2svn/prcs2svn.py (working copy) @@ -323,6 +323,9 @@ # Prcs project's name. __prcs_project = "" + def prjname (self): + """Name of the PRJ file.""" + return self.prcs_project + ".prj" def __del__(self): shutil.rmtree(self.tmp, True) @@ -344,7 +347,7 @@ result = dircmp.cmp(os.path.join(os.getcwd(), path_prcs), os.path.join(os.getcwd(), path_svn), self.keywords_clean, - [".svn", self.prcs_project + ".prj"]) + [".svn", self.prjname ()]) if not result: dircmp.report() raise RepositoriesDifferent() @@ -357,7 +360,7 @@ prcs_revision = " -r " + prcs_revision + " " os.mkdir(self.prcs_project + "_prcs") os.chdir(self.prcs_project + "_prcs") - xsystem("prcs checkout -f " + prcs_revision + self.prcs_project) + xsystem("prcs checkout -f " + prcs_revision + self.prjname ()) svn_repo = os.path.join(self.svn_project, os.path.join(infos.subdir, "trunk")) if len(infos.prcs_projects) > 1: svn_repo = os.path.join(svn_repo, self.prcs_project) @@ -376,7 +379,7 @@ def cmp_branch(self, prcs_revision): os.mkdir(self.prcs_project + prcs_revision + "_prcs") os.chdir(self.prcs_project + prcs_revision + "_prcs") - xsystem("prcs checkout -f -r" + prcs_revision + " " + self.prcs_project) + xsystem("prcs checkout -f -r" + prcs_revision + " " + self.prjname ()) svn_repo = self.svn_project + "/" + os.path.join(infos.subdir, "branches") svn_repo = os.path.join(self.svn_project, os.path.join(infos.subdir, "branches")) if len(infos.prcs_projects) > 1: @@ -684,6 +687,10 @@ # Prcs project's name. name = "" + def prjname (self): + """Name of the PRJ file.""" + return self.name + ".prj" + # Date of project. create_date = "" @@ -708,7 +715,7 @@ re_DELETED = re.compile(".*DELETED\*$") prcs_versions = [] pipe = os.popen("prcs info --plain-format -f --sort=date " +\ - self.name + ".prj") + self.prjname ()) for line in pipe: prcs_desc = line.split(" ") if re_DELETED.match(line): @@ -727,7 +734,7 @@ # Parse the prj file. def parse(self): self.prev_prj = self.prj - self.prj = self.prj_parser.parse(self.name + ".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) @@ -736,7 +743,7 @@ 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() + " " +\ - self.name + ".prj " + self.name + ".prj") + self.prjname () + " " + self.prjname ()) self.prev_prj = self.prj_parser.parse(self.name + ".prj") @@ -769,7 +776,7 @@ prcs_versions = [] # FIXME: should use python features instead of sed. prcs_info = os.popen("prcs info --plain-format -f --sort=date " +\ - project + " | sed -ne \"1p;\$p\"" +\ + project + ".prj | sed -ne \"1p;\$p\"" +\ " | sed -e \"s/.*, $.*$ +[0-9]* by .*/\\1/\"" ) f_date = "" l_date = "" @@ -1061,6 +1068,7 @@ self.desinit_repositories() def init_repositories(self): + if infos.copy_prcs: self.copy_prcs_repository() self.copy_svn_repository() self.create_svn_repository() @@ -1082,8 +1090,6 @@ # Copy the prcs repository to work locally. def copy_prcs_repository(self): - if not infos.copy_prcs: - return info("> Copy prcs repository") tmp = tempfile.mkdtemp(".prcs", "prcs2svn") pwd = os.getcwd()

20 years, 4 months

Guidelines 51: Typical Year

by Akim Demaille

Index: ChangeLog from Akim Demaille <akim(a)epita.fr> * guidelines.texi (Typical Year): New, from Wiki. Index: guidelines.texi --- guidelines.texi (revision 50) +++ guidelines.texi (working copy) @@ -109,8 +109,9 @@ * Meetings:: Wednesday's "Grand Messe" * System Administration:: Rules to obey -* Buying Books:: +* Buying Books:: Extending the LRDE Library * Entering the Lab:: Night access +* Typical Year:: Buying Books @@ -197,8 +198,9 @@ @menu * Meetings:: Wednesday's "Grand Messe" * System Administration:: Rules to obey -* Buying Books:: +* Buying Books:: Extending the LRDE Library * Entering the Lab:: Night access +* Typical Year:: @end menu @node Meetings @@ -380,6 +382,118 @@ Lire le Passe-muraille (Marcel Aymé) et s'en inspirer. @end itemize +------------------------------------- Entering the Lab + +@node Typical Year +@section Typical Year + +@table @strong +@item January +@itemize +@item +Beginning of P4: 2nd chance recruiting of Ing2 students. +@item +LRDE: Present the LRDE to Ing1 students. +@item +Last week: Ask for CSI candidates; hold HalfDays (Ing2 students). +@item +End (or beginning of February): Recruiting of Ing1 students. +@end itemize + +@item February +@itemize +@item +Beginning: Recruiting of Ing1 students. +@item +End: Preseminar: Ing1 & 2 students present during 3 minutes their working plan with 2 slides. +@end itemize + +@item March +@itemize +@item +Csi.DEA: Prompt the students to look for the Csi.DEA they want to follow. +@end itemize + + +@item April +@item May +@itemize +@item +End: grades for Ing1 & Ing2 grade sheets: +@item +Ing 1 (P2): mentoring, social life, preseminar (@samp{> average grade } compensatory grade) +@item +Ing 2 (P4): mentoring, social life, preseminar (+ HalfDays ?) +@item +End: Ing 2: start series of LRDE seminars on wednesdays: reports and slides must be ready before the seminar and are assessed immediately (=> grades for september P5: oral & report) +@end itemize + +@item June +@itemize +@item +Beginning: LRDE seminars on wednesdays: +@item +Ing 2: reports and slides must be ready before the seminar and are assessed immediately (=> grades for september P5: oral & report) +@item +Ing 1: reports and slides must be ready before the seminar and are assessed immediately (=> grades for september P3: oral & report count for compensatory grades) +@end itemize + +@item July +@itemize +@item +CSI English exam: +@item +CSI English: for P3 (grades count for compensatory grades) +@item +CSI English: passed in P5, grades count for P6 +@end itemize + + +@item August +@item September +@itemize +@item +End: grade sheets for Ing2 (former Ing1) & Ing3 (former Ing2) students +@item +P3: oral, report (@samp{ grades from June), CSI English (} grades from +July), development, research (@samp{ grades from after the summer) }> +average grade = compensatory grade +@item +P5: oral and report (= grades from May and June), mentoring and social +life (new grades or same as in P4) +@item +C-Minar: Presentation of the LRDE to new Ing students. +@item +InfoSup: Likewise. Requested by the direction. +@end itemize + +@item October +@itemize +@item +Ing 2: internship core curriculum +@end itemize + +@item November + +@itemize +@item +Ing 2: internship core curriculum +@item +Ing 3: LRDE seminars on wednesdays: reports and slides from May or June are improved (final results), must be ready before the seminar and are assessed immediately (grades for P6). +@end itemize + + +@item December +@itemize +@item +Ing 2: internship core curriculum +@item +End: grade sheets for Ing3 students (P6): development and research +(final grades from November for the work at the LRDE), CSI English +(grades from July P5) +@end itemize +@end table + @c ====================================================================== @node External Communication

20 years, 4 months

LT 85: [prcs2svn bugfix] remove deleted symlinks properly

by Didier Verna

NOTE: This patch has been committed. The version below is informational only (whitespace differences have been removed). ChangeLog addition: 2004-08-24 Didier Verna <didier(a)lrde.epita.fr> * prcs2svn/prcs.py (diff): Properly detect depopulated symlinks, and schedule them for deletion: don't assume that identical PRCS keys means same file in case of symlinks. lrde-tools source patch: Diff command: svn diff --diff-cmd /usr/bin/diff -x "-u -t -b -B -w" Files affected: prcs2svn/prcs.py Index: prcs2svn/prcs.py =================================================================== --- prcs2svn/prcs.py (revision 84) +++ prcs2svn/prcs.py (working copy) @@ -423,8 +423,13 @@ deleted_p = True for j in prj.files: if i[0] == j[0] or \ - (len(i[1]) > 0 and len(j[1]) > 0 and i[1][0] == j[1][0]): - # same name or same key + (len(i[1]) > 0 and len(j[1]) > 0 and i[1][0] == j[1][0] \ + and (len(i) < 3 or i[2] != ":symlink" \ + or len(j) < 3 or j[2] != ":symlink")): + # #### WARNING: identical symbolic links have the same key (since it + # is the name of the pointed file). Hence we can't deduce that it's a + # renaming. -- dvl + # same name or same key (except for symlinks) deleted_p = False break if deleted_p: -- Didier Verna, didier(a)lrde.epita.fr, http://www.lrde.epita.fr/~didier EPITA / LRDE, 14-16 rue Voltaire Tel.+33 (1) 44 08 01 85 94276 Le Kremlin-Bicêtre, France Fax.+33 (1) 53 14 59 22 didier(a)xemacs.org

20 years, 4 months

LT 84: [prcs2svn bugfix] always use youngest svn revision number

by Didier Verna

NOTE: This patch has been committed. The version below is informational only (whitespace differences have been removed). ChangeLog addition: 2004-08-24 Didier Verna <didier(a)lrde.epita.fr> * prcs2svn/prcs2svn.py (Main.initialize_svn_revision): New method. Code extracted from Main.copy_svn_repository. Initialize the svn revision number to the youngest, in case the project already exists. (Main.init_repositories): Call it at the end. lrde-tools source patch: Diff command: svn diff --diff-cmd /usr/bin/diff -x "-u -t -b -B -w" Files affected: prcs2svn/prcs2svn.py Index: prcs2svn/prcs2svn.py =================================================================== --- prcs2svn/prcs2svn.py (revision 83) +++ prcs2svn/prcs2svn.py (working copy) @@ -1064,6 +1064,7 @@ self.copy_prcs_repository() self.copy_svn_repository() self.create_svn_repository() + self.initialize_svn_revision() def desinit_repositories(self): if infos.copy_prcs: @@ -1110,7 +1111,10 @@ infos.svn_project) + \ " " + new_repo, False) infos.svn_root = urlparse.urljoin("file://", urllib.pathname2url(tmp)) - pipe = os.popen("svnlook youngest " + new_repo) + + def initialize_svn_revision(self): + pipe = os.popen("svnlook youngest " + os.path.join(infos.svn_root[7:], + infos.svn_project)) for line in pipe: infos.initial_svn_revision = int(line) pipe.close() -- Didier Verna <didier(a)lrde.epita.fr> / LRDE 01 44 08 01 85

20 years, 4 months

Mauvais style de programmation

by Didier Verna

Tiré de prcs2svn: ,---- | def init_repositories(self): | [ ... ] | self.create_svn_repository() | [ ... ] | | [ ... ] | | def create_svn_repository(self): | if infos.svn_root[0] != 'f': | return | [ ... ] `----- Personnellement, je n'aime pas du tout ce style de programmation (par style, j'entend ici appeller inconditionnellement des méthodes qui peuvent ne rien faire): 1/ C'est peu lisible. Au minimum, ces méthodes devraient s'appeler maybe_... 2/ Ça fait des appels de fonction qui retournent tout de suite ce qui n'est pas beau (bien sûr je pinaille, mais c'est au niveau des principes). 3/ D'autant que le test est fait sur quelque chose de global (infos). 4/ Donc il est bien plus propre de sortir le test de la fonction elle-même. -- Didier Verna, didier(a)lrde.epita.fr, http://www.lrde.epita.fr/~didier EPITA / LRDE, 14-16 rue Voltaire Tel.+33 (1) 44 08 01 85 94276 Le Kremlin-Bicêtre, France Fax.+33 (1) 53 14 59 22 didier(a)xemacs.org

20 years, 4 months

Re: Nolimips: --calle[er]-save

by Akim Demaille

>>> "Akim" == Akim Demaille <akim(a)epita.fr> writes: > tc supports these two options to decide how many $s? and $t? there are > on the mips we target. This is a cool feature to exercise the > regallocation. But it would be even cooler if Nolimips supported > these two options too, since that would make it possible to check that > tc is not cheating, using $s7 when --callee-save=0. > src/tc/trunk % src/tc --callee-save=0 --caller-save=3 --target-display - > CPU (12) > Arguments (4): $a0, $a1, $a2, $a3 > Caller Save (3): $t0 $t1 $t2 > Callee Save (0): > Special (5): $fp $ra $sp $v0 $zero > src/tc/trunk % src/tc --target-display - nostromo 15:47 > CPU (27) > Arguments (4): $a0, $a1, $a2, $a3 > Caller Save (10): $t0 $t1 $t2 $t3 $t4 $t5 $t6 $t7 $t8 $t9 > Callee Save (8): $s0 $s1 $s2 $s3 $s4 $s5 $s6 $s7 > Special (5): $fp $ra $sp $v0 $zero Je voudrais insister sur les bénéfices de telles options !

20 years, 4 months

Yahoo! Auto Response

by bobf＠oppgrp.net

I am at training this week an may not have access to email. Will get back to you Monday. If this is urgent, call my office number 585-671-4400. Leave a message. Enjoy the summer! -------------------- Original Message: X-Rocket-Spam: 129.250.36.41 X-YahooFilteredBulk: 129.250.36.41 X-Rocket-Track: -70 ; SFLAG=BADURLLIST=bolguarou.biz:0 ; IPCR=n-w0,n100,g0 ; IP=129.250.36.41 ; SERVER=66.163.174.33 X-Originating-IP: [129.250.36.41] Return-Path: <projects(a)lrde.epita.fr> Received: from 129.250.36.41 (EHLO dfw-smtpout1.email.verio.net) (129.250.36.41) by mtavm100.mail.yahoo.com with SMTP; Thu, 19 Aug 2004 10:44:06 -0700 Received: from [129.250.36.53] (helo=dfw-smtpin3.email.verio.net) by dfw-smtpout1.email.verio.net with esmtp id 1BxqxJ-0005pK-BB for bobf(a)oppgrp.net; Thu, 19 Aug 2004 17:44:05 +0000 Received: from [65.95.128.42] (helo=keithley.com) by dfw-smtpin3.email.verio.net with smtp id 1BxqxI-0005CP-LE for rfreeser(a)servtech.com; Thu, 19 Aug 2004 17:44:04 +0000 Date: Thu, 19 Aug 2004 17:39:58 +0000 From: projects(a)lrde.epita.fr Subject: updates To: Rfreeser <rfreeser(a)servtech.com> References: <ILKK69CAFCB449F4(a)servtech.com> In-Reply-To: <ILKK69CAFCB449F4(a)servtech.com> Message-ID: <J31FEGIJFDGF

20 years, 4 months

Re: updates

by rfreeser＠servtech.com

Please note: I have a new mail address - it is bobf(a)oppgrp.net Please change your address for me. Thank you. If you have any questions, call at 585-671-4400.

20 years, 4 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