Merge lp:~angeloc/ubuntu-community-accomplishments/first-branch-merged into lp:~ubuntu-community-accomplishments-reviewers/ubuntu-community-accomplishments/0.1

[Angelo Compagnucci]

Check if you have merged any branch

[lp:~angeloc/ubuntu-community-accomplishments/first-branch-merged]

85. By Angelo Compagnucci on 2012-04-26

modified:
  accomplishments/ubuntu-community/en/first-branch-merged.accomplishment
   Fix typo

[Jono Bacon (jonobacon)]

review: Needs Fixing

=== added file 'accomplishments/ubuntu-community/en/canonical-contributor.accomplishment'
--- accomplishments/ubuntu-community/en/canonical-contributor.accomplishment	1970-01-01 00:00:00 +0000
+++ accomplishments/ubuntu-community/en/canonical-contributor.accomplishment	2012-04-26 10:53:21 +0000
@@ -0,0 +1,13 @@
+[accomplishment]
+title=Signed the Canonical Contributors agreement
+description=Signed the Canonical Contributors agreement and can have branches merged.
+application=ubuntu-community
+category=Development
+icon=devel.png
+depends=ubuntu-community/report-first-bug
+needs-signing=true
+needs-information=launchpad-email
+summary = Canonical Contributor Agreement team tracks the set of people who have signed the Canonical Contributors agreement, and can have branches merged.
+steps: Signing the single-page agreement is very easy and is typically done with a single email. For more information see attached links.
+links: http://www.canonical.com/contributors
+help = #ubuntu-devel on Freenode
 
=== added file 'accomplishments/ubuntu-community/en/first-branch-merged.accomplishment'
--- accomplishments/ubuntu-community/en/first-branch-merged.accomplishment	1970-01-01 00:00:00 +0000
+++ accomplishments/ubuntu-community/en/first-branch-merged.accomplishment	2012-04-26 10:53:21 +0000
@@ -0,0 +1,24 @@
+[accomplishment]
+title=First branch merged 
+description=Code you wrote is in Ubuntu, congratulations!
+application=ubuntu-community
+category=Development
+icon=devel.png
+depends=ubuntu-community/report-first-bug
+needs-signing=true
+needs-information=launchpad-email
+summary = When you've come to a stage in your development where you're ready to merge your code into another branch you can make a public merge proposal.
+steps: You submit your request to merge your branch into the main one (or whichever target branch interests you)
+       Wait for one of the target branch's reviewers to review your code, they'll either:
+       Accept your code, and it will be merged.
+       Modify your code slightly, then merge it.
+       Tell you what to do with a comment, marking your review as "Needs Fixing".
+       If you're happy to, you do make the changes requested and push them into your branch. Then comment back on your proposal that you have done that. You should now await further action. 
+       Reject the changes. At this point, you can either try again discuss with the branch owner how to make your changes acceptable or continue work in your own branch.
+tips: Join the IRC channel best suited for the branch you are working on and talk to developers, they will be glad to help you.
+      Read bazaar documentation to get acquainted with it.
+      Try to understand how code review works.
+pitfalls: If your branch is not accepted, don't resign, try harder.
+links: https://help.launchpad.net/Code/Review
+       http://wiki.bazaar.canonical.com/Tutorials
+help = #ubuntu-devel on Freenode
 
=== added file 'scripts/ubuntu-community/canonical-contributor.py'
--- scripts/ubuntu-community/canonical-contributor.py	1970-01-01 00:00:00 +0000
+++ scripts/ubuntu-community/canonical-contributor.py	2012-04-26 10:53:21 +0000
@@ -0,0 +1,37 @@
+#!/usr/bin/python
+import traceback, sys
+
+from accomplishments.daemon import dbusapi
+
+
+try:
+    import sys, os, pwd, subprocess
+    from launchpadlib.launchpad import Launchpad
+
+    api = dbusapi.Accomplishments()
+    f = api.get_extra_information("ubuntu-community", "launchpad-email")
+    if bool(f[0]["launchpad-email"]) == False:
+        sys.exit(4)
+    else:
+        email = f[0]["launchpad-email"]
+
+    # Check if user is member of contributor-agreement-canonical team, 
+    # using email to identify
+    l = Launchpad.login_anonymously(
+        'ubuntu-community accomplishments', 'production')
+    me = l.people.getByEmail(email=email)
+    if me == None:
+        sys.exit(1)
+    else:
+        team = l.people['contributor-agreement-canonical']
+        members = team.getMembersByStatus(status='Approved')
+        for member in members:
+          if member.name == me.name:
+            sys.exit(0)
+        sys.exit(1)
+
+except SystemExit, e:
+    sys.exit(e.code)
+except:
+    traceback.print_exc()
+    sys.exit(2)
 
=== added file 'scripts/ubuntu-community/first-branch-merged.py'
--- scripts/ubuntu-community/first-branch-merged.py	1970-01-01 00:00:00 +0000
+++ scripts/ubuntu-community/first-branch-merged.py	2012-04-26 10:53:21 +0000
@@ -0,0 +1,35 @@
+#!/usr/bin/python
+import traceback, sys
+
+from accomplishments.daemon import dbusapi
+
+
+try:
+    import sys, os, pwd, subprocess
+    from launchpadlib.launchpad import Launchpad
+
+    api = dbusapi.Accomplishments()
+    f = api.get_extra_information("ubuntu-community", "launchpad-email")
+    if bool(f[0]["launchpad-email"]) == False:
+        sys.exit(4)
+    else:
+        email = f[0]["launchpad-email"]
+
+    # Check if user has at least one merge proposal with
+    # 'Merged' status
+    l = Launchpad.login_anonymously(
+        'ubuntu-community accomplishments', 'production')
+    me = l.people.getByEmail(email=email)
+    if me == None:
+        sys.exit(1)
+    else:
+        branches = me.getMergeProposals(status='Merged')
+        if len (branches) > 0:
+          sys.exit(0)
+        sys.exit(1)
+
+except SystemExit, e:
+    sys.exit(e.code)
+except:
+    traceback.print_exc()
+    sys.exit(2)