Landing requested on , by omehani@mozilla.com.
Pull request:
lando#769
While applying pull request #769 to
lando, the following files had conflicts:
(Hint: try rebasing your changes on the latest commits from lando and re-submitting.)
-
src/lando/ui/jinja2/partials/job.html @ 82cb5d6b45b2a870211f38a3c8f65f555a91b0f9
diff a/src/lando/ui/jinja2/partials/job.html b/src/lando/ui/jinja2/partials/job.html (rejected hunks)
@@ -13,7 +13,7 @@
...
diff a/src/lando/ui/jinja2/partials/job.html b/src/lando/ui/jinja2/partials/job.html (rejected hunks)
@@ -13,7 +13,7 @@
<strong>Landing Job:</strong>
<a href="{{ url('jobs-page', args=[job.id]) }}">{{ job.id }}</a>
</p>
- {% elif job.is_pull_request_job %}
+ {% elif has_revisions and job.is_pull_request_job %}
{% set top_revision = job.revisions[0] %}
<p>
<strong>Pull request:</strong>
in addition, Git reported this error: while searching for:
<strong>Landing Job:</strong>
<a href="{{ url('jobs-page', args=[job.id]) }}">{{ job.id }}</a>
</p>
{% elif job.is_pull_request_job %}
{% set top_revision = job.revisions[0] %}
<p>
<strong>Pull request:</strong>
-
src/lando/ui/jinja2/partials/job.html @ 82cb5d6b45b2a870211f38a3c8f65f555a91b0f9
diff a/src/lando/ui/jinja2/partials/job.html b/src/lando/ui/jinja2/partials/job.html (rejected hunks)
@@ -13,7 +13,7 @@
...
diff a/src/lando/ui/jinja2/partials/job.html b/src/lando/ui/jinja2/partials/job.html (rejected hunks)
@@ -13,7 +13,7 @@
<strong>Landing Job:</strong>
<a href="{{ url('jobs-page', args=[job.id]) }}">{{ job.id }}</a>
</p>
- {% elif job.is_pull_request_job %}
+ {% elif has_revisions and job.is_pull_request_job %}
{% set top_revision = job.revisions[0] %}
<p>
<strong>Pull request:</strong>
in addition, Git reported this error: while searching for:
<strong>Landing Job:</strong>
<a href="{{ url('jobs-page', args=[job.id]) }}">{{ job.id }}</a>
</p>
{% elif job.is_pull_request_job %}
{% set top_revision = job.revisions[0] %}
<p>
<strong>Pull request:</strong>
-
src/lando/ui/jinja2/partials/job.html @ 82cb5d6b45b2a870211f38a3c8f65f555a91b0f9
diff a/src/lando/ui/jinja2/partials/job.html b/src/lando/ui/jinja2/partials/job.html (rejected hunks)
@@ -13,7 +13,7 @@
...
diff a/src/lando/ui/jinja2/partials/job.html b/src/lando/ui/jinja2/partials/job.html (rejected hunks)
@@ -13,7 +13,7 @@
<strong>Landing Job:</strong>
<a href="{{ url('jobs-page', args=[job.id]) }}">{{ job.id }}</a>
</p>
- {% elif job.is_pull_request_job %}
+ {% elif has_revisions and job.is_pull_request_job %}
{% set top_revision = job.revisions[0] %}
<p>
<strong>Pull request:</strong>
in addition, Git reported this error: while searching for:
<strong>Landing Job:</strong>
<a href="{{ url('jobs-page', args=[job.id]) }}">{{ job.id }}</a>
</p>
{% elif job.is_pull_request_job %}
{% set top_revision = job.revisions[0] %}
<p>
<strong>Pull request:</strong>
Last update:
Raw error output:
Problem while applying patch in revision None:
Checking patch src/lando/ui/jinja2/partials/job.html...
error: while searching for:
<strong>Landing Job:</strong>
<a href="{{ url('jobs-page', args=[job.id]) }}">{{ job.id }}</a>
</p>
{% elif job.revisions.exists() %}
{% set top_revision = job.revisions[0] %}
{% if top_revision.revision_id %}
error: patch failed: src/lando/ui/jinja2/partials/job.html:12
error: while searching for:
<a href="{{ url('revisions-page', args=[top_revision.revision_id]) }}">D{{ top_revision.revision_id }}</a>
</p>
{% endif %}
{% endif %}
{% if job.revisions.exists() and not job.is_pull_request_job %}
<p>
<strong>Revisions:</strong>
{% for i in job.serialized_landing_path -%}
error: patch failed: src/lando/ui/jinja2/partials/job.html:20
Checking patch src/lando/ui/pull_requests.py...
Hunk #1 succeeded at 53 (offset 17 lines).
Checking patch src/lando/jinja.py...
Hunk #3 succeeded at 317 (offset 3 lines).
Hunk #4 succeeded at 442 (offset 3 lines).
Checking patch src/lando/ui/jinja2/partials/error-breakdown.html...
Checking patch src/lando/jinja.py...
Hunk #1 succeeded at 318 (offset 3 lines).
Checking patch src/lando/jinja.py...
Hunk #1 succeeded at 255 (offset 3 lines).
Hunk #2 succeeded at 321 (offset 3 lines).
Hunk #3 succeeded at 461 (offset 3 lines).
Hunk #4 succeeded at 472 (offset 3 lines).
Checking patch src/lando/ui/jinja2/partials/error-breakdown.html...
Checking patch src/lando/ui/jinja2/partials/job.html...
Hunk #1 succeeded at 27 (offset -3 lines).
Checking patch src/lando/ui/jinja2/stack/partials/landing-preview.html...
Checking patch src/lando/ui/tests/test_template_helpers.py...
Checking patch src/lando/jinja.py...
Hunk #1 succeeded at 317 (offset 3 lines).
Checking patch src/lando/jinja.py...
Hunk #1 succeeded at 442 (offset 3 lines).
Checking patch src/lando/ui/jinja2/partials/error-breakdown.html...
Checking patch src/lando/ui/jinja2/partials/job.html...
error: while searching for:
<strong>Landing Job:</strong>
<a href="{{ url('jobs-page', args=[job.id]) }}">{{ job.id }}</a>
</p>
{% elif job.is_pull_request_job %}
{% set top_revision = job.revisions[0] %}
<p>
<strong>Pull request:</strong>
error: patch failed: src/lando/ui/jinja2/partials/job.html:13
Applying patch src/lando/ui/jinja2/partials/job.html with 2 rejects...
Rejected hunk #1.
Rejected hunk #2.
Applied patch src/lando/ui/pull_requests.py cleanly.
Applied patch src/lando/jinja.py cleanly.
Applied patch src/lando/ui/jinja2/partials/error-breakdown.html cleanly.
Applied patch src/lando/jinja.py cleanly.
Applied patch src/lando/jinja.py cleanly.
Applied patch src/lando/ui/jinja2/partials/error-breakdown.html cleanly.
Applied patch src/lando/ui/jinja2/partials/job.html cleanly.
Applied patch src/lando/ui/jinja2/stack/partials/landing-preview.html cleanly.
Applied patch src/lando/ui/tests/test_template_helpers.py cleanly.
Applied patch src/lando/jinja.py cleanly.
Applied patch src/lando/jinja.py cleanly.
Applied patch src/lando/ui/jinja2/partials/error-breakdown.html cleanly.
Applying patch src/lando/ui/jinja2/partials/job.html with 1 reject...
Rejected hunk #1.