James Moger
2014-03-07 4affd0a3a4fe086b31a87d56616f74093d2ac715
src/main/java/com/gitblit/wicket/pages/TicketPage.java
@@ -731,15 +731,36 @@
       *  PATCHSET TAB
       */
      if (currentPatchset == null) {
         // no patchset yet, show propose fragment
         String repoUrl = getRepositoryUrl(user, repository);
         Fragment changeIdFrag = new Fragment("patchset", "proposeFragment", this);
         changeIdFrag.add(new Label("proposeInstructions", MarkdownUtils.transformMarkdown(getString("gb.proposeInstructions"))).setEscapeModelStrings(false));
         changeIdFrag.add(new Label("ptWorkflow", MessageFormat.format(getString("gb.proposeWith"), "Barnum")));
         changeIdFrag.add(new Label("ptWorkflowSteps", getProposeWorkflow("propose_pt.md", repoUrl, ticket.number)).setEscapeModelStrings(false));
         changeIdFrag.add(new Label("gitWorkflow", MessageFormat.format(getString("gb.proposeWith"), "Git")));
         changeIdFrag.add(new Label("gitWorkflowSteps", getProposeWorkflow("propose_git.md", repoUrl, ticket.number)).setEscapeModelStrings(false));
         add(changeIdFrag);
         // no patchset available
         if (ticket.isOpen() && app().tickets().isAcceptingNewPatchsets(repository)) {
            // ticket & repo will accept a proposal patchset
            // show the instructions for proposing a patchset
            String repoUrl = getRepositoryUrl(user, repository);
            Fragment changeIdFrag = new Fragment("patchset", "proposeFragment", this);
            changeIdFrag.add(new Label("proposeInstructions", MarkdownUtils.transformMarkdown(getString("gb.proposeInstructions"))).setEscapeModelStrings(false));
            changeIdFrag.add(new Label("ptWorkflow", MessageFormat.format(getString("gb.proposeWith"), "Barnum")));
            changeIdFrag.add(new Label("ptWorkflowSteps", getProposeWorkflow("propose_pt.md", repoUrl, ticket.number)).setEscapeModelStrings(false));
            changeIdFrag.add(new Label("gitWorkflow", MessageFormat.format(getString("gb.proposeWith"), "Git")));
            changeIdFrag.add(new Label("gitWorkflowSteps", getProposeWorkflow("propose_git.md", repoUrl, ticket.number)).setEscapeModelStrings(false));
            add(changeIdFrag);
         } else {
            // explain why you can't propose a patchset
            Fragment fragment = new Fragment("patchset", "canNotProposeFragment", this);
            String reason = "";
            if (ticket.isClosed()) {
               reason = getString("gb.ticketIsClosed");
            } else if (repository.isMirror) {
               reason = getString("gb.repositoryIsMirror");
            } else if (repository.isFrozen) {
               reason = getString("gb.repositoryIsFrozen");
            } else if (!repository.acceptNewPatchsets) {
               reason = getString("gb.repositoryDoesNotAcceptPatchsets");
            } else {
               reason = getString("gb.serverDoesNotAcceptPatchsets");
            }
            fragment.add(new Label("reason", reason));
            add(fragment);
         }
      } else {
         // show current patchset
         Fragment patchsetFrag = new Fragment("patchset", "patchsetFragment", this);
@@ -1260,7 +1281,7 @@
      String ticketBranch  = Repository.shortenRefName(PatchsetCommand.getTicketBranch(ticket.number));
      String step1 = "git fetch";
      String step2 = MessageFormat.format("git checkout {0} && git pull -ff-only\nOR\ngit checkout {0} && git reset --hard origin/{0}", ticketBranch);
      String step2 = MessageFormat.format("git checkout {0} && git pull --ff-only\nOR\ngit checkout {0} && git reset --hard origin/{0}", ticketBranch);
      panel.add(new Label("gitPreStep1", step1));
      panel.add(new Label("gitPreStep2", step2));