Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

client/ClientHelper.java: fix check for p4 error message when there are multiple files to reconcile #206

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

austin987
Copy link

Original patch by Akos Bannerth

Closes: https://issues.jenkins.io/browse/JENKINS-72335

When using p4publish with multiple paths listed in the paths argument, and the workspace doesn't contain any changes compared to the depot, publish will fail with

Unable to publish workspace: hudson.AbortException: P4JAVA: Error(s):
No file(s) to reconcile.

This seems to be a result of a check in ClientHelper.java

getValidate().check(status, "- no file(s) to reconcile", "instead of", "empty, assuming text", "also opened by");

which apparently should ignore the p4java status "- no file(s) to reconcile" but when reconciling with multiple paths, the message is "No file(s) to reconcile." - this can be easily tested from the command line:

> p4 rec foo/...
foo/... - no file(s) to reconcile.
> p4 rec foo/... bar/...
No file(s) to reconcile.

The attached patch changes the ignore string so that it's recognized in both cases, as the check uses StringUtils.containsIgnoreCase(msg, istring) to compare the message with it.

Testing done

Built plugin and tested change on a staging server.

Submitter checklist

Edit tasklist title
Beta Give feedback Tasklist Submitter checklist, more options

Delete tasklist

Delete tasklist block?
Are you sure? All relationships in this tasklist will be removed.
  1. Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
    Options
  2. Ensure that the pull request title represents the desired changelog entry
    Options
  3. Please describe what you did
    Options
  4. Link to relevant issues in GitHub or Jira
    Options
  5. Link to relevant pull requests, esp. upstream and downstream changes
    Options
  6. Ensure you have provided tests - that demonstrates feature works or fixes the issue
    Options

@austin987
Copy link
Author

If possible, please tag a release after this is merged, thanks!

@austin987
Copy link
Author

Hi, is there anything I can do to improve this patch?

@jg-outerdawn
Copy link

This issue is also blocking our build pipeline, would be really nice to get it fixed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants