[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kde-common/release/svn
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2005-04-25 16:11:56
Message-ID: 20050425161156.D90F0488 () office ! kde ! org
[Download RAW message or body]

CVS commit by ossi: 

oops, the trunk remapping leaves partial branches, so filter the
physical tree accordingly.


  M +31 -0     cvs2svn   1.66


--- kde-common/release/svn/cvs2svn  #1.65:1.66
@@ -993,7 +993,9 @@
   def init_file(self, fname):
     revs = { }
+#    print "initializing", fname
     for line in self.tree_db[fname].split('\n'):
       prv = None
       for r in line.split():
+#        print "r%s" % r,
         try:
           rev = revs[r]
@@ -1008,7 +1010,9 @@
           rev.ref += 1
         prv = r
+#      print
     return revs
 
   def checkout_i(self, fname, revs, r, op, co, ref):
+#    print "checking out", r, "from", fname, ", op %s" % op, ", ref %d" % ref
     rev = revs[r]
     if rev.prev:
@@ -1736,18 +1740,28 @@
         try:
           del self.branch_heads['1.1.1.1']
+#          print "deletet branch head 1.1.1.1"
           del self.branch_inits['1.1.1.1']
+#          print "deletet branch start 1.1.1.1"
           del self.default_branches_db[self.rel_name]
+#          print "deleted from default branch list"
           if inf11[4] == 'Initial revision\n':
             inf11[4] = inf1111[4]
+#            print "assigned 1.1.1.1 log to 1.1"
           elif inf11[4] != inf1111[4]:
             inf11[4] += '\n' + inf1111[4]
+#            print "appended 1.1.1.1 log to 1.1"
           self.absorb_rev('1.1', '1.1.1.1')
+#          print "absorbed tags and branches"
           del self.rev_data['1.1.1.1']
+#          print "deleted revision data"
           del self.prev_rev['1.1.1.1']
+#          print "deleted from prev_rev"
           del self.next_rev['1.1.1.1']
+#          print "deleted from next_rev"
           Log().write(LOG_VERBOSE, "Killed superfluous r1.1.1.1 from %s." %
                                    self.rel_name)
         except KeyError:
           inf11[3] = 'dead'
+#          print "marked 1.1 dead"
           # i don't expect this to happen in reality
           try:
@@ -1757,4 +1771,5 @@
             except KeyError:
               self.taglist['1.1.1.1'] = blist
+#            print "moved 1.1 tag list to 1.1.1.1"
           except KeyError:
             pass
@@ -1798,19 +1813,28 @@
       try:
         ld_rev = self.default_branches_db[self.rel_name]
+#        print "remapping default branch"
+        self.next_rev['1.1'] = '1.1.1.1'
         try:
           self.branchlist['1.1'].remove(self.branch_names['1.1.1'])
+#          print "removed 1.1.1 from 1.1 branch list"
         except KeyError:
           dbn = None
         if self.rev_data.has_key('1.2'):
+#          print "we have a 1.2"
           nxr = self.next_rev[ld_rev]
           if nxr:
+#            print "and the branch lives afterwards"
             self.prev_rev[nxr] = '1.2'
             self.branch_inits[nxr] = None
           self.prev_rev['1.2'] = ld_rev
           self.next_rev[ld_rev] = '1.2'
+#          print "relinked last default rev", ld_rev
         del self.branch_inits['1.1.1.1']
+#        print "deleted branch start 1.1.1.1"
         del self.default_branches_db[self.rel_name]
+#        print "deleted from default branches list"
         while ld_rev:
           self.non_branch[ld_rev] = None
+#          print "marked", ld_rev, "as trunk revision"
           ld_rev = self.prev_rev[ld_rev]
       except KeyError:
@@ -5325,4 +5349,11 @@
       if revok.has_key(rv[:rv.index(' ')]):
         nrvs.append(rv)
+      else:
+        if rv.startswith("1.1.1."):
+          rve = rv.split(" ")
+          for i in range(len(rve)):
+            if revok.has_key(rve[i]):
+              nrvs.append(" ".join(rve[i:]))
+              break
     #nrvs.extend(filter(lambda rv: revok.has_key(rv[:rv.index(' ')]), rvs))
     self.cvstree_db[fname] = "\n".join(nrvs)


[prev in list] [next in list] [prev in thread] [next in thread]