September 2004 - Projects

LT 110: p2s: --no-ignore
by Akim Demaille 22 Sep '04

22 Sep '04

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.

1 0

LT 109: p2s: prcs_checkout
by Akim Demaille 22 Sep '04

22 Sep '04

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():

1 0

LT 108: p2s: --no-rekey
by Akim Demaille 22 Sep '04

22 Sep '04

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

1 0

LT 107: p2s: Various
by Akim Demaille 22 Sep '04

22 Sep '04

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. " +\

1 0

LT 106: p2s: handling of keywords
by Akim Demaille 21 Sep '04

21 Sep '04

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):

1 0

LT 105: p2s: Clean up
by Akim Demaille 21 Sep '04

21 Sep '04

Ce script est une *£&$ Index: ChangeLog from Akim Demaille <akim(a)epita.fr> * prcs2svn/prcs2svn.py (Svn.env_to_preserve_dates): New. (Svn.changes_commit): Adjust. Index: prcs2svn/prcs2svn.py --- prcs2svn/prcs2svn.py (revision 104) +++ prcs2svn/prcs2svn.py (working copy) @@ -571,6 +571,23 @@ self.change_keywords_(path) xchdir(pwd) + def env_to_preserve_dates (self): + "Return the environment assignment needed to preserve checkin dates." + res = "" + if infos.preserve_dates: + # FIXME: Well done! This way we are sure nothing will work + # properly if there are two concurrent runs. Use an env var! + fd = open ("/tmp/prcs2svn_time", "w+") + checkin_time = checkin_time[:checkin_time.rfind(" ")] + checkin_time = checkin_time[1:] + checkin_time = checkin_time[checkin_time.find(" ") + 1:] + fd.write (str (time.mktime ( + time.strptime (checkin_time, "%d %b %Y %H:%M:%S"))).split(".")[0]) + fd.close () + if infos.timelib_path: + res = "LD_LIBRARY_PATH=" + infos.timelib_path + " " + res += "LD_PRELOAD=libprcs2svntime.so " + return res # Commit Subversion changes. # Return 1 if a new version is really committed, else 0. @@ -580,19 +597,7 @@ # Do commit. # FIXME: `encoding' must be a command line option. self.change_keywords(self.workdir) - env = "" - if infos.preserve_dates: - fd = open ("/tmp/prcs2svn_time", "w+") - checkin_time = checkin_time[:checkin_time.rfind(" ")] - checkin_time = checkin_time[1:] - checkin_time = checkin_time[checkin_time.find(" ") + 1:] - fd.write(str(time.mktime( - time.strptime(checkin_time, "%d %b %Y %H:%M:%S"))).split(".")[0]) - fd.close() - env = "" - if len(infos.timelib_path) > 0: - env = "LD_LIBRARY_PATH=" + infos.timelib_path + " " - env += "LD_PRELOAD=libprcs2svntime.so " + env = self.env_to_preserve_dates () r = xtee (env + "svn commit --encoding latin1 " + \ "--username " + quote (checkin_login) + \ " --message " + quote (version_log))

1 0

LT 104: prcs2svn: 1 tmp dir
by Akim Demaille 21 Sep '04

21 Sep '04

2004-09-21 Akim Demaille <akim(a)epita.fr> Have a single tmp dir for each run. * prcs2svn/prcs2svn.py (TempDir): New. Use it instead of tempfile functions. The calling convention is not nice, if someone can improve it (using class methods), be my guest. Index: prcs2svn/prcs2svn.py --- prcs2svn/prcs2svn.py (revision 102) +++ prcs2svn/prcs2svn.py (working copy) @@ -14,6 +14,28 @@ ## ------------------------------------- +## Temporary directory +class TempDir: + + base = tempfile.mkdtemp ("", "prcs2svn") + + 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) + 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) + return (open (fname, "wb"), fname) + + def mksfile (self, name): + return tempfile.mkstemp ("", name, self.base) + +## ------------------------------------- ## Errors class AbstractError: @@ -429,7 +451,7 @@ svn_revision=""): self.prcs_project = prcs_project self.svn_project = svn_project - self.tmp = tempfile.mkdtemp(".diff", "prcs2svn") + self.tmp = TempDir().mkdir ("%s.prcs-%s.svn.diff" % (prcs_project, svn_project)) xchdir(self.tmp) if svn_revision != "": svn_revision = " -r " + svn_revision + " " @@ -527,7 +549,7 @@ if stat.S_ISDIR(st.st_mode): self.change_keywords_(os.path.join(path, f)) else: - tmp = tempfile.mkdtemp(".keywords", "prcs2svn") + tmp = TempDir().mkdir ("prcs2svn.keywords") atime = st[stat.ST_ATIME] mtime = st[stat.ST_MTIME] xcopy(f, tmp) @@ -555,9 +577,6 @@ def changes_commit(self, checkin_login, version_log, checkin_time, update=True): info("> Commit changes") # Write version log in a temporary file. - log_fd, log_path = tempfile.mkstemp(".log", "prcs2svn") - os.write(log_fd, version_log) - os.close(log_fd) # Do commit. # FIXME: `encoding' must be a command line option. self.change_keywords(self.workdir) @@ -575,13 +594,13 @@ env = "LD_LIBRARY_PATH=" + infos.timelib_path + " " env += "LD_PRELOAD=libprcs2svntime.so " r = xtee(env + "svn commit --encoding latin1 " + \ - "--username " + checkin_login + " --file " + log_path) + "--username " + quote (checkin_login) + \ + " --message " + quote (version_log)) if r > 0: self.revision += 1 # Refresh local copy (should be useless, may be a bug of svn). if update: xsystem("svn update") - xrm(log_path) # Replace symbolic links with the files they point to. def changes_apply_links_replace(self, diffs): @@ -628,15 +647,17 @@ backup = {} # Process the sorted list backward for copy consistency. for i in reversed(range(len(diffs.renamed))): + to = diffs.renamed[i][0] + frm = diffs.renamed[i][1] # Backup files that may be overwritten. - if os.path.exists(diffs.renamed[i][0]): + if os.path.exists (to): # Destination exists: PRCS renamed then added an homonym file. - bak_fd, bak_path = tempfile.mkstemp(".bak", "prcs2svn") + bak_fd, bak_path = TempDir().mksfile ("%s.bak" % to) os.close(bak_fd) - xmove(diffs.renamed[i][0], bak_path) - backup[diffs.renamed[i][0]] = bak_path + xmove (to, bak_path) + backup[to] = bak_path # FIXED: was copy(). - xmove(diffs.renamed[i][1], diffs.renamed[i][0]) + xmove (frm, to) # Do Subversion rename. for r in diffs.renamed: # Delete files that may be overwritten (--force is a joke). @@ -821,7 +842,7 @@ # Create workspace. def convert_init(self): self.svn = Svn() - self.topdir = tempfile.mkdtemp(".migrate", "prcs2svn") + self.topdir = TempDir().mkdir ("current-svn-checkout") self.workdir = os.path.join(self.topdir, infos.subdir) debug("> Create working directory: " + self.topdir) xchdir(self.topdir) @@ -1117,7 +1138,7 @@ if not infos.copy_prcs: return info("> Copy prcs repository") - tmp = tempfile.mkdtemp(".prcs", "prcs2svn") + tmp = TempDir().mkdir ("prcs-repository") pwd = os.getcwd() xchdir(tmp) for proj in infos.prcs_projects: @@ -1132,7 +1153,7 @@ def copy_svn_repository(self): if not infos.copy_svn: return - tmp = tempfile.mkdtemp(".svn", "prcs2svn") + tmp = TempDir().mkdir ("%s.svn-repo" % infos.svn_project) info("> Copy svn repository to " + tmp) new_repo = os.path.join(tmp, infos.svn_project) xmkdir(new_repo)

1 0

[nolimips: 126] Emulate `lui'
by Noe 20 Sep '04

20 Sep '04

Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> Emulate `lui' * dev/nolimips.xml: Add `lui' instruction. * src/vm/cpu.hh, src/vm/cpu.cc: Emulate `lui'. 2004-09-20 Benoît Perrot <benoit(a)lrde.epita.fr> Index: src/vm/cpu.hh --- src/vm/cpu.hh (revision 125) +++ src/vm/cpu.hh (revision 126) @@ -195,6 +195,7 @@ 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::Lui& lui); virtual void visit(const inst::Sb& sb); virtual void visit(const inst::Sw& sw); Index: src/vm/cpu.cc --- src/vm/cpu.cc (revision 125) +++ src/vm/cpu.cc (revision 126) @@ -365,6 +365,12 @@ // Move instructions // -------------------------------------------------------------------------- + void + Cpu::visit(const inst::Lui& lui) + { + set_register(lui.get_dest (), lui.get_imm () << 16); + } + // Store void Cpu::visit(const inst::Sb& sb) Index: dev/nolimips.xml --- dev/nolimips.xml (revision 125) +++ dev/nolimips.xml (revision 126) @@ -1026,6 +1026,19 @@ </syntax> </instruction> + <instruction opcode="lui" level="native" kind="load"> + <description>Move the constant imm into the upper half word of +dest.</description> + <format> + <attribute type="Register" name="dest"/> + <attribute type="Exp" name="imm"/> + </format> + <syntax> + <token kind="register" /> + <token kind="immediate" /> + </syntax> + </instruction> + <instruction opcode="li" level="pseudo" kind="load"> <description>Move the constant imm into dest.</description> <syntax alias="ori">

1 1

[nolimips: 124] Limit access to callee-save and caller-save registers.
by Noe 20 Sep '04

20 Sep '04

Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> Limit access to callee-save and caller-save registers. * dev/inst-solver-gen.py: Check use of callee-save and caller-save registers. * src/inst/inst-tasks.hh, src/inst/inst-tasks.cc: Add coresponding tasks. 2004-09-19 Benoît Perrot <benoit(a)lrde.epita.fr> Index: src/inst/inst-tasks.cc --- src/inst/inst-tasks.cc (revision 123) +++ src/inst/inst-tasks.cc (revision 124) @@ -39,6 +39,8 @@ prg_solve () { inst::ProgramSolver program_solver; + program_solver.set_max_callee_save(max_callee_save); + program_solver.set_max_caller_save(max_caller_save); program_solver.solve(* parse::tasks::program); if (exit_status != exit_success) exit (exit_status); Index: src/inst/inst-tasks.hh --- src/inst/inst-tasks.hh (revision 123) +++ src/inst/inst-tasks.hh (revision 124) @@ -37,6 +37,14 @@ "Resolve jump offsets and check bounds of immediates", prg_solve, "parse"); + INT_TASK_DECLARE ("callee-save", + "Set max number of callee-save registers", + max_callee_save, 8, 0, 8, + ""); + INT_TASK_DECLARE ("caller-save", + "Set max number of caller-save registers", + max_caller_save, 10, 0, 10, + ""); } // namespace tasks } // namespace inst Index: dev/inst-solver-gen.py --- dev/inst-solver-gen.py (revision 123) +++ dev/inst-solver-gen.py (revision 124) @@ -59,10 +59,24 @@ protected ExpVisitor { public: + ProgramSolver(): + program_(0), + max_callee_save_(8), max_caller_save_(10) + {} virtual ~ProgramSolver() {} public: + void set_max_callee_save(int max_callee_save) + { + max_callee_save_ = max_callee_save; + } + void set_max_caller_save(int max_caller_save) + { + max_caller_save_ = max_caller_save; + } + + public: void solve(Program &program) { program_ = &program; @@ -98,6 +112,9 @@ print """ protected: Program *program_; + + int max_callee_save_; + int max_caller_save_; }; } // namespace inst @@ -116,6 +133,7 @@ print license print """#include \"inst/program_solver.hh\" +#include \"vm/cpu.hh\" namespace inst { @@ -168,7 +186,6 @@ } } - void ProgramSolver::solve_cpu_register(Register &reg) const { @@ -176,8 +193,21 @@ { case Register::generic: reg.set_kind(Register::general); - break; case Register::general: + if ((reg.get_index() == vm::Cpu::t9 && max_caller_save_ < 10) + || (reg.get_index() == vm::Cpu::t8 && max_caller_save_ < 9) + || (vm::Cpu::t0 + max_caller_save_ - 1 < reg.get_index() + && reg.get_index() <= vm::Cpu::t7)) + { + std::cerr << \"Caller-save register limited.\" << std::endl; + exit_set(exit_solve); + } + else if (vm::Cpu::s0 + max_callee_save_ - 1 < reg.get_index() && + reg.get_index() <= vm::Cpu::s7) + { + std::cerr << \"Callee-save register limited.\" << std::endl; + exit_set(exit_solve); + } break; case Register::unlimited: if (!parse::unlimited_regs_p)

2 2

[Nolimips] Back To Life
by Noe 20 Sep '04

20 Sep '04

Yeaaaahhhh, I EVENTUALLY have the Net. And thus will I continue Nolimips' development. Quick road map: 1. limit access to native registers (see tc's caller-save); 2. add an ELF branch (encoder, loader, memory management redesign); 3. add everything that spim has and Nolimips does not; 4. implement libc-like system calls. -- Noe

2 2