Changeset 2921 for branch

Timestamp:

Jul 8, 2017 2:57:13 PM (8 years ago)

Author:

toby

Message:

add switch command to 2frame

Location:

branch/2frame

Files:

• GSASIIctrlGUI.py (modified) (5 diffs)
• GSASIIpath.py (modified) (7 diffs)

branch/2frame/GSASIIctrlGUI.py ¶

@@ -3503 +3503 @@
                 text='&Regress to an old GSAS-II version')
             frame.Bind(wx.EVT_MENU, self.OnSelectVersion, helpobj)
+            if GSASIIpath.svnTestBranch():
+                msg = "&Switch to back standard GSAS-II version"
+            else:
+                msg = "&Switch to test (2frame) GSAS-II version"
+            helpobj = self.Append(
+                help='', id=wx.ID_ANY, kind=wx.ITEM_NORMAL,text=msg)
+            frame.Bind(wx.EVT_MENU, self.OnSelectBranch, helpobj)
         # provide special help topic names for extra items in help menu
         for lbl,indx in morehelpitems:
@@ -3605 +3612 @@
         repos = GSASIIpath.svnGetRev(local=False)
         wx.EndBusyCursor()
-        if repos is None: 
+        # has the current branch disappeared? If so, switch to the trunk -- not fully tested
+        if (repos is None and "not found" in GSASIIpath.svnLastError.lower()
+            and "path" in GSASIIpath.svnLastError.lower()):
+            print('Repository is gone, will switch to trunk')
+            GSASIIpath.svnSwitch2branch()
+            return
+        elif repos is None: 
             dlg = wx.MessageDialog(self.frame,
                                    'Unable to access the GSAS-II server. Is this computer on the internet?',
@@ -3664 +3677 @@
             return
         dlg.Destroy()
-        try:
-            self.frame.OnFileSave(event)
-            GPX = self.frame.GSASprojectfile
-        except AttributeError:
-            self.frame.G2frame.OnFileSave(event)
-            GPX = self.frame.G2frame.GSASprojectfile
+        self.frame.OnFileSave(event)
+        GPX = self.frame.GSASprojectfile
         GSASIIpath.svnUpdateProcess(projectfile=GPX)
         return
@@ -3727 +3736 @@
         dlg.Destroy()
         print('start regress to '+str(ver))
-        try:
-            self.frame.OnFileSave(event)
-            GPX = self.frame.GSASprojectfile
-        except AttributeError:
-            self.frame.G2frame.OnFileSave(event)
-            GPX = self.frame.G2frame.GSASprojectfile
+        self.frame.OnFileSave(event)
+        GPX = self.frame.GSASprojectfile
         GSASIIpath.svnUpdateProcess(projectfile=GPX,version=str(ver))
         return
+
+    def OnSelectBranch(self,event):
+        '''Allow the user to select branch of GSAS-II or return to trunk
+        N.B. Name of branch to use is hard-coded here. Must contain a slash
+        '''
+        testbranch = '/branch/2frame'
+        if GSASIIpath.svnTestBranch():
+            dlg = wx.MessageDialog(self.frame,
+                                   'Switching from test to standard GSAS-II version',
+                                   'Confirm Switch',
+                                   wx.OK|wx.CANCEL)
+            if dlg.ShowModal() != wx.ID_OK: return
+            branch = testbranch
+        else:
+            dlg = wx.MessageDialog(self.frame,
+                                   'Switching back to standard GSAS-II version',
+                                   'Confirm Switch',
+                                   wx.OK|wx.CANCEL)
+            if dlg.ShowModal() != wx.ID_OK: return
+            branch = 'trunk'
+        print('start switch')
+        self.frame.OnFileSave(event)
+        GPX = self.frame.GSASprojectfile
+        GSASIIpath.svnUpdateProcess(projectfile=GPX,branch=branch)
 
 ################################################################################
@@ -4398 +4427 @@
         style=wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER
         wx.Dialog.__init__(self, parent, wx.ID_ANY, 'Open Tutorial', style=style)
-        self.frame = parent
-        # self.frame can be the tree window frame or the data editing window frame, set G2frame to the
-        # tree either way
-        if hasattr(self.frame,'G2frame'):
-            self.G2frame = self.frame.G2frame
-        else:
-            self.G2frame = self.frame
+        self.G2frame = self.frame = parent
         pnl = wx.Panel(self)
         sizer = wx.BoxSizer(wx.VERTICAL)

branch/2frame/GSASIIpath.py ¶

@@ -231 +231 @@
     return d
 
+svnLastError = ''
 def svnGetRev(fpath=os.path.split(__file__)[0],local=True):
     '''Obtain the version number for the either the last update of the local version
@@ -243 +244 @@
     :Returns: the version number as an str or 
        None if there is a subversion error (likely because the path is
-       not a repository or svn is not found)
+       not a repository or svn is not found). The error message is placed in
+       global variable svnLastError
     '''
 
@@ -261 +263 @@
         print 'svn failed\n',out
         print 'err=',err
+        global svnLastError
+        svnLastError = err
         return None
     x = ET.fromstring(out)
@@ -342 +346 @@
         print err
             
-def svnUpdateProcess(version=None,projectfile=None):
+def svnUpdateProcess(version=None,projectfile=None,branch=None):
     '''perform an update of GSAS-II in a separate python process'''
     if not projectfile:
@@ -349 +353 @@
         projectfile = os.path.realpath(projectfile)
         print 'restart using',projectfile
-    if not version:
+    if branch:
+        version = branch
+    elif not version:
         version = ''
     else:
@@ -493 +499 @@
     svnSwitchDir('bindist','',distdir,verbose=verbose)
     return os.path.join(path2GSAS2,'bindist')
+
+def svnTestBranch(loc=None):
+    '''Returns the name of the branch directory if the installation has been switched.
+    Returns none, if not a branch
+    the test 2frame branch. False otherwise
+    '''
+    if loc is None: loc = path2GSAS2
+    svn = whichsvn()
+    if not svn:
+        print('**** unable to load files: svn not found ****')
+        return ''
+    cmd = [svn, 'info', loc]
+    if proxycmds: cmd += proxycmds
+    p = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+    res,err = p.communicate()
+    for l in res.split('\n'):
+        if "Relative URL:" in l: break
+    if "/branch/" in l:
+        return l[l.find("/branch/")+8:].strip()
+    else:
+        return None
+    
+def svnSwitch2branch(branch=None,loc=None,svnHome=None):
+    '''Switch to a subversion branch if specified. Switches to trunk otherwise.
+    '''
+    if svnHome is None: svnHome = g2home
+    svnURL = svnHome + '/trunk'
+    if branch:
+        if svnHome.endswith('/'):
+            svnURL = svnHome[:-1]
+        else:
+            svnURL = svnHome
+        if branch.startswith('/'):
+            svnURL += branch
+        else:
+            svnURL += '/' + branch
+    svnSwitchDir('','',svnURL,loadpath=loc)
+    
 
 def IPyBreak_base():
@@ -708 +752 @@
     project,version = sys.argv[1:3]
     loc = os.path.dirname(__file__)
-    if version:
+    if version == 'trunk':
+        svnSwitch2branch('')
+    elif '/' in version:
+        svnSwitch2branch(version)
+    elif version:
         print("Regress to version "+str(version))
         svnUpdateDir(loc,version=version)