Changeset 875 in tailor

Timestamp:

10/02/05 08:23:10 (8 years ago)

Author:

R.Ghetta <birrachiara@…>

Hash name:

20051002062310-2c016-23ac114e1206afda4b0cb5f4db6cd669c5e0f770

Message:

bugfix on handling of monotone branches

File:

• vcpx/monotone.py (modified) (19 diffs)

vcpx/monotone.py

@@ -85 +85 @@
         return '\n'.join(s)
 
-    def update(self, real_dates, authors, log, real_ancestors):
+    def update(self, real_dates, authors, log, real_ancestors, branches):
         """
         Updates the monotone changeset secondary data
@@ -94 +94 @@
         self.real_dates = real_dates
         self.real_ancestors = real_ancestors
+        self.branches = branches
 
 class MonotoneLogParser:
@@ -137 +138 @@
         self.dates=[]
         self.changelog=""
+        self.branches=[]
 
         cmd = self.repository.command("log", "--db", self.repository.repository,
@@ -174 +176 @@
                     self.dates.append(date)
                     state = self.SINGLE
-            elif pr("Branch:") or pr("Tag"):
+            elif pr("Branch:"):
+                # branch data
+                self.branches.append(pr.value)
+                state = self.SINGLE
+            elif pr("Tag"):
                 # unused data, just resetting state
                 state = self.SINGLE
@@ -216 +222 @@
                      authors=self.authors,
                      log=self.changelog,
-                     real_ancestors=self.ancestors)
+                     real_ancestors=self.ancestors,
+                     branches=self.branches)
 
         return chset
@@ -431 +438 @@
 
     branch
-      ignored (tailor follows only a single branch)
+      used to restrict source revs (tailor follows only a single branch)
 
     testresult
@@ -452 +459 @@
     """
 
-    def __init__(self, repository, working_dir):
+    def __init__(self, repository, working_dir, branch):
         self.working_dir = working_dir
         self.repository = repository
+        self.branch = branch
         self.logparser = MonotoneLogParser(repository=repository,
                                            working_dir=working_dir)
@@ -460 +468 @@
                                              working_dir=working_dir)
 
-    def _cset_from_rev(self, lin_ancestor, revision):
-        # prepare a new changeset and fill it with rev data
-        chset = MonotoneChangeset(lin_ancestor, revision)
-        self.updateCset(chset)
-        return chset
-
     def updateCset(self, chset):
         # Parsing the log fills the changeset from revision data
@@ -474 +476 @@
             self.diffparser.convertDiff(chset)
 
-    def getCset(self, revlist):
-        # receives a revlist, already toposorted (i.e. ordered by
-        # ancestry) and outputs a list of changesets
+    def getCset(self, revlist, onlyFirst):
+        """
+        receives a revlist, already toposorted (i.e. ordered by
+        ancestry) and outputs a list of changesets, filtering out revs
+        outside the chosen branch. If onlyFirst is true, only the
+        first valid element is considered
+        """
         cslist=[]
         anc=revlist[0]
         for r in revlist[1:]:
-            cslist.append(self._cset_from_rev(anc, r))
-            anc=r
+            chtmp = MonotoneChangeset(anc, r)
+            self.logparser.convertLog(chtmp)
+            if self.branch in chtmp.branches:
+                cslist.append(MonotoneChangeset(anc, r)) # using a new, unfilled changeset
+                anc=r
+                if onlyFirst:
+                    break
         return cslist
 
@@ -487 +498 @@
 class MonotoneWorkingDir(UpdatableSourceWorkingDir, SyncronizableTargetWorkingDir):
 
-    def convert_head_initial(self, repository, module, revision, working_dir):
+    def _convert_head_initial(self, dbrepo, module, revision, working_dir):
         """
         This method handles HEAD and INITIAL pseudo-revisions, converting
@@ -496 +507 @@
             # in both cases we need the head(s) of the requested branch
             cmd = self.repository.command("automate","heads",
-                                          "--db", repository, module)
+                                          "--db", dbrepo, module)
             mtl = ExternalCommand(cwd=working_dir, command=cmd)
             outstr = mtl.execute(stdout=PIPE)
@@ -519 +530 @@
                                   "full history." % module)
                 cmd = [ self.repository.command("automate","ancestors",
-                                                "--db",repository),
+                                                "--db",dbrepo),
                         self.repository.command("automate","toposort",
-                                                "--db",repository, "-@-")
+                                                "--db",dbrepo, "-@-")
                         ]
                 cmd[0].extend(revision)
@@ -529 +540 @@
                     raise InvocationError("Ancestor reading returned "
                                           "status %d" % cld.exit_status)
-                revision = outstr[0].getvalue().split()
-                effective_rev=revision[0]
+                revlist = outstr[0].getvalue().split()
+                mtr = MonotoneRevToCset(repository=self.repository,
+                                        working_dir=working_dir,
+                                        branch=module)
+                first_cset = mtr.getCset(revlist, True)
+                if len(first_cset)==0:
+                    raise InvocationError("Can't find an INITIAL revision on branch '%s'."
+                                          % module)
+                effective_rev=first_cset[0].revision
         return effective_rev
 
@@ -553 +571 @@
 
         # now childs is a list of revids, we must transform it in a
-        # list of monotone changesets at this time we fill only the
+        # list of monotone changesets. We fill only the
         # linearized ancestor and revision ids, because at this time
         # we need only to know WICH changesets must be applied to the
-        # target repo, not WHAT are the changesets
-        childs = outstr[0].getvalue().split()
-        chlist = []
-        lin_anc=sincerev
-        for r in childs:
-            chlist.append(MonotoneChangeset(lin_anc, r))
-            lin_anc = r
+        # target repo, not WHAT are the changesets (apart for filtering
+        # the outside-branch revs)
+        childs = [sincerev] +outstr[0].getvalue().split()
+        mtr = MonotoneRevToCset(repository=self.repository,
+                                working_dir=self.repository.rootdir,
+                                branch=self.repository.module)
+        chlist = mtr.getCset(childs, False)
         return chlist
 
@@ -573 +591 @@
                                               "status %s" % mtl.exit_status)
         mtr = MonotoneRevToCset(repository=self.repository,
-                                working_dir=self.basedir)
+                                working_dir=self.basedir,
+                                branch=self.repository.module)
         mtr.updateCset( changeset )
 
@@ -582 +601 @@
         Concretely do the checkout of the FIRST upstream revision.
         """
-        effrev = self.convert_head_initial(self.repository.repository,
+        effrev = self._convert_head_initial(self.repository.repository,
                                            self.repository.module, revision,
-                                           self.basedir)
+                                           self.repository.rootdir)
         if not exists(join(self.basedir, 'MT')):
+
+            # actually check out the revision
             self.log_info("checking out a working copy")
             cmd = self.repository.command("co",
@@ -591 +612 @@
                                           "--revision", effrev,
                                           "--branch", self.repository.module,
-                                          self.repository.subdir)
+                                          self.basedir)
             mtl = ExternalCommand(cwd=self.repository.rootdir, command=cmd)
             mtl.execute()
@@ -599 +620 @@
         else:
             self.log_info("%s already exists, assuming it's a monotone "
-                          "working dir" % self.basedir)
+                          "working dir already populated" % self.basedir)
+
 
         # Ok, now the workdir contains the checked out revision. We
@@ -610 +632 @@
         # linearized ancestor, changeset entries will NOT be filled
         mtr = MonotoneRevToCset(repository=self.repository,
-                                working_dir=self.basedir)
+                                working_dir=self.basedir,
+                                branch=self.repository.module)
         mtr.updateCset(chset)
         return chset