Breezy

Merge lp:~jelmer/brz/merged-at into lp:brz

  1. merged-at
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/merged-at
Merge into: lp:brz
Prerequisite: lp:~jelmer/brz/merged-by
Diff against target: 65 lines (+22/-0)
4 files modified
breezy/plugins/propose/github.py (+7/-0)
breezy/plugins/propose/gitlabs.py (+7/-0)
breezy/plugins/propose/launchpad.py (+3/-0)
breezy/plugins/propose/propose.py (+5/-0)
To merge this branch: bzr merge lp:~jelmer/brz/merged-at
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+377275@code.launchpad.net

Commit message

Add MergeProposal.get_merged_at().

Description of the change

Add MergeProposal.get_merged_at().

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/plugins/propose/github.py'
2--- breezy/plugins/propose/github.py 2020-01-02 12:21:20 +0000
3+++ breezy/plugins/propose/github.py 2020-01-08 01:37:17 +0000
4@@ -193,6 +193,13 @@
5 return None
6 return merged_by['login']
7
8+ def get_merged_at(self):
9+ merged_at = self._pr.get('merged_at')
10+ if merged_at is None:
11+ return None
12+ import iso8601
13+ return iso8601.parse_date(merged_at)
14+
15
16 def parse_github_url(url):
17 (scheme, user, password, host, port, path) = urlutils.parse_url(
18
19=== modified file 'breezy/plugins/propose/gitlabs.py'
20--- breezy/plugins/propose/gitlabs.py 2020-01-02 12:21:20 +0000
21+++ breezy/plugins/propose/gitlabs.py 2020-01-08 01:37:17 +0000
22@@ -241,6 +241,13 @@
23 return None
24 return user['username']
25
26+ def get_merged_at(self):
27+ merged_at = self._mr.get('merged_at')
28+ if merged_at is None:
29+ return None
30+ import iso8601
31+ return iso8601.parse_date(merged_at)
32+
33
34 def gitlab_url_to_bzr_url(url, name):
35 if not PY3:
36
37=== modified file 'breezy/plugins/propose/launchpad.py'
38--- breezy/plugins/propose/launchpad.py 2019-11-23 21:25:17 +0000
39+++ breezy/plugins/propose/launchpad.py 2020-01-08 01:37:17 +0000
40@@ -168,6 +168,9 @@
41 return None
42 return merge_reporter.name
43
44+ def get_merged_at(self):
45+ return self._mp.date_merged
46+
47 def merge(self, commit_message=None):
48 target_branch = _mod_branch.Branch.open(
49 self.get_target_branch_url())
50
51=== modified file 'breezy/plugins/propose/propose.py'
52--- breezy/plugins/propose/propose.py 2019-11-23 21:25:17 +0000
53+++ breezy/plugins/propose/propose.py 2020-01-08 01:37:17 +0000
54@@ -163,6 +163,11 @@
55 """
56 raise NotImplementedError(self.get_merged_by)
57
58+ def get_merged_at(self):
59+ """If this proposal was merged, when it was merged.
60+ """
61+ raise NotImplementedError(self.get_merged_at)
62+
63
64 class MergeProposalBuilder(object):
65 """Merge proposal creator.

Subscribers

People subscribed via source and target branches