Details

    • Type: Bug
    • Status: Closed (View Workflow)
    • Priority: Major
    • Resolution: Duplicate
    • Component/s: mercurial-plugin
    • Labels:
      None
    • Environment:
      Platform: All, OS: Linux
    • Similar Issues:

      Description

      Two bugs when working with branches:

      1. Hudson thinks there are changes, even when there aren't any.

      2. Workspaces are not the proper checkout.

      Here are two patches for src/main/java/hudson/plugins/mercurial/MercurialSCM.java:

      For issue #1:

      // Get the list of changed files.
      + ArgumentListBuilder args = new ArgumentListBuilder();
      + args.add(getDescriptor().getHgExe(), "incoming", "--style",
      tmpFile.getCanonicalPath());
      + if (branch != null)

      { + args.add("-r", branch); + }

      +
      launcher.launch(

      • new String[] {getDescriptor().getHgExe(), "incoming", "--style", tmpFile.getCanonicalPath()}

        ,
        + args.toCommandArray(),
        EnvVars.masterEnvVars, new ForkOutputStream(baos, output),
        workspace).join();

      For issue #2:

      • if(branch!=null) args.add("-r",branch);
      • args.add(source,workspace.getRemote());
        + if(branch!=null) { + args.add(source + "#" + branch,workspace.getRemote()); + }

        else

        { + args.add(source,workspace.getRemote()); + }

        Attachments

          Issue Links

            Activity

            sfermigier sfermigier created issue -
            jglick Jesse Glick made changes -
            Field Original Value New Value
            Status Open [ 1 ] Resolved [ 5 ]
            Resolution Duplicate [ 3 ]
            jglick Jesse Glick made changes -
            Link This issue duplicates JENKINS-4281 [ JENKINS-4281 ]
            abayer Andrew Bayer made changes -
            Status Resolved [ 5 ] Closed [ 6 ]
            rtyler R. Tyler Croy made changes -
            Workflow JNJira [ 132130 ] JNJira + In-Review [ 201182 ]

              People

              • Assignee:
                kohsuke Kohsuke Kawaguchi
                Reporter:
                sfermigier sfermigier
              • Votes:
                0 Vote for this issue
                Watchers:
                0 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved: