Merge ~racb/git-ubuntu:lp1699541-queue-local-import into git-ubuntu:master

[Robie Basak]

This needs Robie's review to be landable, as he's the only user of `git ubuntu queue`

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:81464a0f73de66d8f96558cfec2173a18ca84b2e
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/101/
Executed test runs:
    SUCCESS: Checkout
    FAILED: Style Check

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/101/rebuild

review: Needs Fixing (continuous-integration)

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:72ca788b4726257f90838b2e879a7b93570b3698
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/105/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Style Check
    SUCCESS: Unit Tests
    FAILED: Integration Tests

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/105/rebuild

review: Needs Fixing (continuous-integration)

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:39767d41bac6130a6f226f1f89e6f3440ef63c7e
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/107/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Style Check
    SUCCESS: Unit Tests
    FAILED: Integration Tests

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/107/rebuild

review: Needs Fixing (continuous-integration)

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:2d80e7a56e46dbc666f4a69921e3da059f1a73d1
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/129/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Style Check
    SUCCESS: Unit Tests
    FAILED: Integration Tests

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/129/rebuild

review: Needs Fixing (continuous-integration)

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:2d80e7a56e46dbc666f4a69921e3da059f1a73d1
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/134/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Style Check
    SUCCESS: Unit Tests
    SUCCESS: Integration Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/134/rebuild

review: Approve (continuous-integration)

[Robie Basak (racb)]

Looks good, thanks! I had to add this extra commit to make it work. I'm not sure if resubmitting the MP is a good thing to do, but I thought I'd try it as the CI bot should be able to catch up without you having to make one additional context switch.

review: Approve

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:3fb6f7fcff6baf30c9e829108124f02264558bc5
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/180/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Style Check
    SUCCESS: Unit Tests
    SUCCESS: Integration Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/180/rebuild

review: Approve (continuous-integration)

[Nish Aravamudan (nacc)]

Oh and as a follow-up to your comment, I was 100% pro you resubmitting with the fixlet, it made it easier for me to see just your change.

diff --git a/gitubuntu/queue.py b/gitubuntu/queue.py
index 1ff4d12..8c01b1f 100644
--- a/gitubuntu/queue.py
+++ b/gitubuntu/queue.py
@@ -210,6 +210,20 @@ def _commit_upload(repo, upload, parent_commit):
 
     return commit_hash
 
+def get_devel_head_ref(repo, series):
+    for ref in [
+        'refs/heads/importer/ubuntu/%s-devel' % series,
+        'refs/remotes/pkg/ubuntu/%s-devel' % series,
+    ]:
+        try:
+            return repo.raw_repo.lookup_reference(ref)
+        except KeyError:
+            pass
+    raise KeyError(
+        "Unable to find %s-devel branch in either local or remote "
+        "importer branches."
+    )
+
 def sync(repo, lp, retries, retry_backoffs, source, trim, series_list, parent, statuses):
     if not series_list:
         series_list = [
@@ -224,20 +238,22 @@ def sync(repo, lp, retries, retry_backoffs, source, trim, series_list, parent, s
         logging.debug('Considering %s', series)
         series_parent = parent
         try:
-            devel_head_ref = repo.raw_repo.lookup_reference(
-                'refs/remotes/pkg/ubuntu/%s-devel' % series
-            )
-        except KeyError:
+            devel_head_ref = get_devel_head_ref(repo, series)
+        except KeyError as e:
             if source:
                 devel_srcpkg_name = source
             else:
                 logging.warn(
-                    'Series %s has no devel head pointer and no source name specified; skipping', series
+                    "Series %s has no devel head pointer and no source "
+                    "name specified; skipping",
+                    series,
                 )
                 continue
             if series_parent is True:
                 logging.warn(
-                    "Series %s has no devel head pointer and no parent specified; skipping", series
+                    "Series %s has no devel head pointer and no parent "
+                    "specified; skipping",
+                    series,
                 )
                 continue
         else:
@@ -247,7 +263,7 @@ def sync(repo, lp, retries, retry_backoffs, source, trim, series_list, parent, s
                 devel_srcpkg_name = source
             else:
                 devel_srcpkg_name = repo.get_changelog_srcpkg_from_treeish(
-                    'pkg/ubuntu/%s-devel' % series
+                    str(devel_head_ref.peel(pygit2.Tree).id)
                 )
         assert series_parent is not True
         lp_queue_items = _fetch_lp_queue_items(