Mercurial > traipse_dev

changeset 80:51bb772c3609 ornery-dev

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update Manager nearly 100% complete. Buttons on Controls panel need to be implmented. Users can now look over the revisions for each branch / revision.
author sirebral
date Mon, 24 Aug 2009 00:56:09 -0500
parents dd4be4817377
children 65c212e9a5b4
files orpg/orpg_version.py upmana/updatemana.py
diffstat 2 files changed, 43 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/orpg/orpg_version.py	Sun Aug 23 14:57:06 2009 -0500
+++ b/orpg/orpg_version.py	Mon Aug 24 00:56:09 2009 -0500
@@ -4,7 +4,7 @@
 #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
 DISTRO = "Traipse Dev"
 DIS_VER = "Ornery Orc"
-BUILD = "090823-00"
+BUILD = "090824-00"
 
 # This version is for network capability.
 PROTOCOL_VERSION = "1.2"
--- a/upmana/updatemana.py	Sun Aug 23 14:57:06 2009 -0500
+++ b/upmana/updatemana.py	Mon Aug 24 00:56:09 2009 -0500
@@ -3,9 +3,10 @@
 import os #just .sep maybe
 import manifest
 import shutil
+
 from orpg.orpgCore import component
 from orpg.dirpath import dir_struct
-from orpg.tools.orpg_log import logger
+from orpg.tools.orpg_log import logger, crash
 from orpg.tools.decorators import debugging
 from upmana.validate import validate
 from orpg.dirpath import dir_struct
@@ -173,10 +174,6 @@
 
     def BranchInfo(self, branch):
         cs = self.repo.changectx( self.current ).changeset()
-        rev = self.repo.changelog.rev(self.repo.branchtags()[self.current]) #Current revision number. Use in Controls
-        #print self.repo.changelog.reachable(self.repo.branchtags()[self.current])
-        #for heads in self.repo.changelog.reachable(self.repo.branchtags()[self.current]):
-        #    print self.repo.changelog.rev(heads)
         self.changelog.SetValue('')
         changelog = cs[4]
         self.changelog.AppendText(changelog + '\n')
@@ -445,15 +442,17 @@
         self.branchcp.Add(self.branches, (0,0))
         self.branchcp.Add(self.branch_txt, (0,1), flag=wx.ALIGN_CENTER_VERTICAL)
         branchcp.SetSizer(self.branchcp)
-        self.branchcp.AddGrowableCol(1)
         branchcp.SetAutoLayout(True)
 
         revlistcp = wx.Panel(self)
         self.revlistcp = wx.GridBagSizer(hgap=2, vgap=2)
         self.revlist = wx.ListCtrl(revlistcp, -1, wx.DefaultPosition, size=wx.DefaultSize, 
                                     style=wx.LC_REPORT|wx.SUNKEN_BORDER|wx.LC_HRULES)
-        self.revlist.InsertColumn(0, 'Revs', 145)
-        self.revlist.InsertColumn(1, 'Revs', 145)
+        self.revlist.InsertColumn(0, 'Revs')
+        self.revlist.InsertColumn(1, 'Changeset')
+        self.revlist.SetColumnWidth(0, -1)
+        self.revlist.SetColumnWidth(1, -1)
+        self.revlist.Refresh()
         self.revlistcp.Add(self.revlist, (0,0), flag=wx.EXPAND)
         revlistcp.SetSizer(self.revlistcp)
         self.revlistcp.AddGrowableCol(0)
@@ -484,22 +483,48 @@
         self.SetAutoLayout(True)
 
         self.current = self.repo.dirstate.branch()
+
+        self.RevInfo(self.current)
+        self.revlist.Select(self.revlist.FindItem(0, 
+                            str(self.repo.changelog.rev(self.repo.branchtags()[self.current]))), 
+                            True)
+
         self.BranchInfo(self.current)
+        self.Bind(wx.EVT_CHOICE, self.PackageSet)
+        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.PackageSet)
+
+    def PackageSet(self, event):
+
+        self.current = self.branches.GetStringSelection()
+        branches = self.repo.branchtags()
+        heads = dict.fromkeys(self.repo.heads(), 1)
+        l = [((n in heads), self.repo.changelog.rev(n), n, t) for t, n in branches.items()]
+
+        if self.current != type:
+            heads = dict.fromkeys(self.repo.heads(), self.repo.branchtags())
+            branches = dict.copy(self.repo.branchtags())
+            self.BranchInfo(self.current)
+            self.RevInfo(self.current)
+
+    def RevInfo(self, branch):
+        self.revlist.DeleteAllItems()
+        for heads in self.repo.changelog.reachable(self.repo.branchtags()[branch]): 
+            self.revlist.InsertStringItem(0, str(self.repo.changelog.rev(heads)), 0 )
+            self.revlist.SetStringItem(0, 1, str(self.repo.changectx(heads)))
+            self.revlist.SetColumnWidth(0, -1)
+            self.revlist.SetColumnWidth(1, -1)
+        self.revlist.Refresh()
 
     def BranchInfo(self, branch):
-        cs = self.repo.changectx( self.current ).changeset()
-        rev = self.repo.changelog.rev(self.repo.branchtags()[self.current]) #Current revision number. Use in Controls
-        #print self.repo.changelog.reachable(self.repo.branchtags()[self.current])
-        #for heads in self.repo.changelog.reachable(self.repo.branchtags()[self.current]): 
-        #grabs revision list depending on branch.
-        #    print self.repo.changelog.rev(heads)
+        rev = self.revlist.GetItemText( self.revlist.GetFirstSelected() )
+        rs = self.repo.changectx( rev ).changeset()
         self.changelog.SetValue('')
-        changelog = cs[4]
+        changelog = rs[4]
         self.changelog.AppendText(changelog + '\n')
         self.filelist.SetValue('')
-        self.filelist.AppendText("Currently selected branch: " + branch + "\n\nAuthor: "+cs[1]+"\n\n")
+        self.filelist.AppendText("Currently selected branch: " + branch + "\n\nAuthor: "+rs[1]+"\n\n")
         self.filelist.AppendText("Files Modified (in update): \n")
-        for f in cs[3]: self.filelist.AppendText(f+"\n")
+        for f in rs[3]: self.filelist.AppendText(f+"\n")
 
     def get_packages(self, type=None):
         #Fixed and ready for Test. Can be cleaner