Changeset 8335:f8548e5b6122

Timestamp:

12/01/07 21:36:01 (5 years ago)

Author:

Jonathan Hanke <jonhanke@…>

Branch:

default

Message:

Buxfix to correctly decide about the "main" branch separately for incoming and outgoing servers.

File:

• sage/misc/hg.py (modified) (2 diffs)

sage/misc/hg.py

@@ -1014 +1014 @@
 
 if (SAGE_INCOMING_SERVER == DEFAULT_SERVER):      ## Always uses the "main" branch on the default server.
-    temp_branch_name = "main"
+    temp_in_branch_name = "main"
 else:
-    temp_branch_name = branch_current_hg()
+    temp_in_branch_name = branch_current_hg()
+
+if (SAGE_OUTGOING_SERVER == DEFAULT_SERVER):      ## Always uses the "main" branch on the default server.
+    temp_out_branch_name = "main"
+else:
+    temp_out_branch_name = branch_current_hg()
+
 
 if (SAGE_INCOMING_SERVER != DEFAULT_SERVER) or (SAGE_OUTGOING_SERVER != DEFAULT_SERVER):
@@ -1029 +1035 @@
 hg_sage    = HG('%s/devel/sage'%SAGE_ROOT,
                 'SAGE Library Source Code',
-                    pull_url='%s/sage-%s'%(SAGE_INCOMING_SERVER, temp_branch_name),
-                    push_url='%s/sage-%s'%(SAGE_OUTGOING_SERVER, temp_branch_name),
+                    pull_url='%s/sage-%s'%(SAGE_INCOMING_SERVER, temp_in_branch_name),
+                    push_url='%s/sage-%s'%(SAGE_OUTGOING_SERVER, temp_out_branch_name),
                 cloneable=True,
                 obj_name='sage')