From 30f9d25d77ccb5cd978d4cf8fa389ec819e90e95 Mon Sep 17 00:00:00 2001
From: Philip L. McMahon <philip.l.mcmahon@gmail.com>
Date: Fri, 27 Jan 2012 02:02:19 -0500
Subject: [PATCH] Correct update of HEAD symbolic reference when target is a tag.
---
src/com/gitblit/client/EditRepositoryDialog.java | 57 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 43 insertions(+), 14 deletions(-)
diff --git a/src/com/gitblit/client/EditRepositoryDialog.java b/src/com/gitblit/client/EditRepositoryDialog.java
index 44b6fc6..ebc540f 100644
--- a/src/com/gitblit/client/EditRepositoryDialog.java
+++ b/src/com/gitblit/client/EditRepositoryDialog.java
@@ -52,6 +52,7 @@
import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.Constants.FederationStrategy;
import com.gitblit.models.RepositoryModel;
+import com.gitblit.utils.ArrayUtils;
import com.gitblit.utils.StringUtils;
/**
@@ -89,7 +90,7 @@
private JCheckBox isFrozen;
- private JTextField mailRecipientsField;
+ private JTextField mailingListsField;
private JComboBox accessRestriction;
@@ -105,7 +106,11 @@
private JPalette<String> preReceivePalette;
+ private JLabel preReceiveInherited;
+
private JPalette<String> postReceivePalette;
+
+ private JLabel postReceiveInherited;
private Set<String> repositoryNames;
@@ -164,8 +169,8 @@
anRepository.skipSummaryMetrics);
isFrozen = new JCheckBox(Translation.get("gb.isFrozenDescription"), anRepository.isFrozen);
- mailRecipientsField = new JTextField(anRepository.mailRecipients == null ? ""
- : StringUtils.flattenStrings(anRepository.mailRecipients, " "), 50);
+ mailingListsField = new JTextField(ArrayUtils.isEmpty(anRepository.mailingLists) ? ""
+ : StringUtils.flattenStrings(anRepository.mailingLists, " "), 50);
accessRestriction = new JComboBox(AccessRestrictionType.values());
accessRestriction.setRenderer(new AccessRestrictionRenderer());
@@ -198,7 +203,7 @@
fieldsPanel
.add(newFieldPanel(Translation.get("gb.skipSummaryMetrics"), skipSummaryMetrics));
fieldsPanel.add(newFieldPanel(Translation.get("gb.isFrozen"), isFrozen));
- fieldsPanel.add(newFieldPanel(Translation.get("gb.mailRecipients"), mailRecipientsField));
+ fieldsPanel.add(newFieldPanel(Translation.get("gb.mailingLists"), mailingListsField));
usersPalette = new JPalette<String>();
JPanel accessPanel = new JPanel(new BorderLayout(5, 5));
@@ -221,16 +226,16 @@
BorderLayout.CENTER);
preReceivePalette = new JPalette<String>(true);
+ preReceiveInherited = new JLabel();
JPanel preReceivePanel = new JPanel(new BorderLayout(5, 5));
- preReceivePanel.add(
- newFieldPanel(Translation.get("gb.preReceiveScripts"), preReceivePalette),
- BorderLayout.CENTER);
+ preReceivePanel.add(preReceivePalette, BorderLayout.CENTER);
+ preReceivePanel.add(preReceiveInherited, BorderLayout.WEST);
postReceivePalette = new JPalette<String>(true);
+ postReceiveInherited = new JLabel();
JPanel postReceivePanel = new JPanel(new BorderLayout(5, 5));
- postReceivePanel.add(
- newFieldPanel(Translation.get("gb.postReceiveScripts"), postReceivePalette),
- BorderLayout.CENTER);
+ postReceivePanel.add(postReceivePalette, BorderLayout.CENTER);
+ postReceivePanel.add(postReceiveInherited, BorderLayout.WEST);
JTabbedPane panel = new JTabbedPane(JTabbedPane.TOP);
panel.addTab(Translation.get("gb.general"), fieldsPanel);
@@ -371,8 +376,17 @@
repository.skipSummaryMetrics = skipSummaryMetrics.isSelected();
repository.isFrozen = isFrozen.isSelected();
- repository.mailRecipients = StringUtils.getStringsFromValue(mailRecipientsField.getText()
- .trim(), " ");
+ String ml = mailingListsField.getText();
+ if (!StringUtils.isEmpty(ml)) {
+ Set<String> list = new HashSet<String>();
+ for (String address : ml.split("(,|\\s)")) {
+ if (StringUtils.isEmpty(address)) {
+ continue;
+ }
+ list.add(address.toLowerCase());
+ }
+ repository.mailingLists = new ArrayList<String>(list);
+ }
repository.accessRestriction = (AccessRestrictionType) accessRestriction.getSelectedItem();
repository.federationStrategy = (FederationStrategy) federationStrategy.getSelectedItem();
@@ -418,12 +432,27 @@
setsPalette.setObjects(all, selected);
}
- public void setPreReceiveScripts(List<String> all, List<String> selected) {
+ public void setPreReceiveScripts(List<String> all, List<String> inherited, List<String> selected) {
preReceivePalette.setObjects(all, selected);
+ showInherited(inherited, preReceiveInherited);
}
- public void setPostReceiveScripts(List<String> all, List<String> selected) {
+ public void setPostReceiveScripts(List<String> all, List<String> inherited,
+ List<String> selected) {
postReceivePalette.setObjects(all, selected);
+ showInherited(inherited, postReceiveInherited);
+ }
+
+ private void showInherited(List<String> list, JLabel label) {
+ StringBuilder sb = new StringBuilder();
+ if (list != null && list.size() > 0) {
+ sb.append("<html><body><b>INHERITED</b><ul style=\"margin-left:5px;list-style-type: none;\">");
+ for (String script : list) {
+ sb.append("<li>").append(script).append("</li>");
+ }
+ sb.append("</ul></body></html>");
+ }
+ label.setText(sb.toString());
}
public RepositoryModel getRepository() {
--
Gitblit v1.9.1