Merged #30 "Watch list push parameters are not always honored"

James Moger

2014-03-12 ed882589e15422e03267ffb9ca6cb1a7376d1822

Merged #30 "Watch list push parameters are not always honored"

 src/main/java/com/gitblit/git/PatchsetReceivePack.java

@@ -163,11 +163,11 @@


    /** Extracts the ticket id from the ref name */

    private long getTicketId(String refName) {

        if (refName.indexOf('%') > -1) {

            refName = refName.substring(0, refName.indexOf('%'));

        }

        if (refName.startsWith(Constants.R_FOR)) {

            String ref = refName.substring(Constants.R_FOR.length());

            if (ref.indexOf('%') > -1) {

                ref = ref.substring(0, ref.indexOf('%'));

            }

            try {

                return Long.parseLong(ref);

            } catch (Exception e) {


 src/main/java/com/gitblit/models/TicketModel.java

@@ -785,7 +785,21 @@
            for (String item : items) {
                list.add(prefix + item);
            }
            setField(field, join(list, ","));
            if (hasField(field)) {
                String flat = getString(field);
                if (isEmpty(flat)) {
                    // field is empty, use this list
                    setField(field, join(list, ","));
                } else {
                    // merge this list into the existing field list
                    Set<String> set = new TreeSet<String>(Arrays.asList(flat.split(",")));
                    set.addAll(list);
                    setField(field, join(set, ","));
                }
            } else {
                // does not have a list for this field
                setField(field, join(list, ","));
            }
        }

        public String getId() {