Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/api/converters.py b/api/converters.py
index 4f01a8b..9222f8c 100644
--- a/api/converters.py
+++ b/api/converters.py
@@ -1,7 +1,6 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://developers.google.com/open-source/licenses/bsd
+# Copyright 2018 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
"""Functions that convert protorpc business objects into protoc objects.
@@ -37,8 +36,8 @@
from tracker import field_helpers
from tracker import tracker_bizobj
from tracker import tracker_helpers
-from proto import tracker_pb2
-from proto import user_pb2
+from mrproto import tracker_pb2
+from mrproto import user_pb2
# Convert and ingest objects in issue_objects.proto.
@@ -332,7 +331,7 @@
return fvs
-def ConvertIssue(issue, users_by_id, related_refs, config):
+def ConvertIssue(issue, users_by_id, related_refs, config, migrated_id=None):
"""Convert our protorpc Issue to a protoc Issue.
Args:
@@ -405,7 +404,8 @@
# resolved and database has been repaired.
if issue.attachment_count >= 0:
result.attachment_count = issue.attachment_count
-
+ if migrated_id is not None:
+ result.migrated_id = migrated_id
return result