From 1d83ac54683edbeab3f911c38f8795f9138799a4 Mon Sep 17 00:00:00 2001
From: Julien Muchembled <jm@nexedi.com>
Date: Wed, 11 May 2011 10:33:45 +0200
Subject: [PATCH] ERP5VCS: do not suggest to push if there are already local
commits
---
.../erp5_vcs/BusinessTemplate_viewVcsChangelog/your_push.xml | 2 +-
bt5/erp5_forge/bt/revision | 2 +-
.../VcsPreference/preferred_vcs_push_mode_property.xml | 2 +-
product/ERP5/bootstrap/erp5_property_sheets/bt/revision | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewVcsChangelog/your_push.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewVcsChangelog/your_push.xml
index 0e77194126..ad97e24785 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewVcsChangelog/your_push.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewVcsChangelog/your_push.xml
@@ -127,7 +127,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>preferences/getPreferredVcsPushMode</string> </value>
+ <value> <string>python: preferences.getPreferredVcsPushMode() and not here.getVcsTool().getAheadCount()</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_forge/bt/revision b/bt5/erp5_forge/bt/revision
index 06834d4380..e59f0632ab 100644
--- a/bt5/erp5_forge/bt/revision
+++ b/bt5/erp5_forge/bt/revision
@@ -1 +1 @@
-657
\ No newline at end of file
+658
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/VcsPreference/preferred_vcs_push_mode_property.xml b/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/VcsPreference/preferred_vcs_push_mode_property.xml
index 847595194a..5a47824148 100644
--- a/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/VcsPreference/preferred_vcs_push_mode_property.xml
+++ b/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/VcsPreference/preferred_vcs_push_mode_property.xml
@@ -33,7 +33,7 @@
</item>
<item>
<key> <string>description</string> </key>
- <value> <string>Set default value of "Push" checkbox in dialog to commit changes to a DVCS working copy</string> </value>
+ <value> <string>Set default value of "Push" checkbox in dialog to commit changes to a DVCS working copy, when there is no local commit</string> </value>
</item>
<item>
<key> <string>id</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_property_sheets/bt/revision b/product/ERP5/bootstrap/erp5_property_sheets/bt/revision
index d99e90eb96..8580e7b684 100644
--- a/product/ERP5/bootstrap/erp5_property_sheets/bt/revision
+++ b/product/ERP5/bootstrap/erp5_property_sheets/bt/revision
@@ -1 +1 @@
-29
\ No newline at end of file
+30
\ No newline at end of file
--
2.30.9