| 1 | diff -r ./changes/monotone.py /Library/Frameworks/Python.framework/Versions/Current/lib/python2.5/site-packages/buildbot/changes/monotone.py |
|---|
| 2 | 39c43 |
|---|
| 3 | < def __init__(self, bin, db): |
|---|
| 4 | --- |
|---|
| 5 | > def __init__(self, bin, db, user): |
|---|
| 6 | 41a46 |
|---|
| 7 | > self.user = user |
|---|
| 8 | 45a51,52 |
|---|
| 9 | > if self.user: |
|---|
| 10 | > cmdline += ('-k'+self.user,) #add user if provided, note comma at end to form tuple |
|---|
| 11 | 140c156 |
|---|
| 12 | < pollinterval=60 * 10, monotone_exec="monotone"): |
|---|
| 13 | --- |
|---|
| 14 | > pollinterval=60 * 10, monotone_exec="monotone",user=None): |
|---|
| 15 | 147c163 |
|---|
| 16 | < self.monotone = Monotone(self.monotone_exec, self.db_path) |
|---|
| 17 | --- |
|---|
| 18 | > self.monotone = Monotone(self.monotone_exec, self.db_path, user) |
|---|
| 19 | diff -r ./slave/commands.py /Library/Frameworks/Python.framework/Versions/Current/lib/python2.5/site-packages/buildbot/slave/commands.py |
|---|
| 20 | 1632a1633,1640 |
|---|
| 21 | > self.user = None |
|---|
| 22 | > self.password = None |
|---|
| 23 | > |
|---|
| 24 | > #add username / pass support |
|---|
| 25 | > if args.has_key('user'): |
|---|
| 26 | > self.user = args['user'] |
|---|
| 27 | > if args.has_key('password'): |
|---|
| 28 | > self.password = args['password'] |
|---|
| 29 | 1656a1665,1666 |
|---|
| 30 | > if self.user: |
|---|
| 31 | > command.append('-k'+self.user) |
|---|
| 32 | 1670a1681,1682 |
|---|
| 33 | > if self.user: |
|---|
| 34 | > command.append('-k'+self.user) |
|---|
| 35 | 1691a1704,1705 |
|---|
| 36 | > if self.user: |
|---|
| 37 | > command.append('-k'+self.user) |
|---|
| 38 | 1703a1718,1719 |
|---|
| 39 | > if self.user: |
|---|
| 40 | > command.append('-k'+self.user) |
|---|
| 41 | diff -r ./steps/source.py /Library/Frameworks/Python.framework/Versions/Current/lib/python2.5/site-packages/buildbot/steps/source.py |
|---|
| 42 | 1042c1042 |
|---|
| 43 | < monotone="monotone", |
|---|
| 44 | --- |
|---|
| 45 | > monotone="monotone", user=None, |
|---|
| 46 | 1053c1053,1054 |
|---|
| 47 | < "monotone": monotone}) |
|---|
| 48 | --- |
|---|
| 49 | > "monotone": monotone, |
|---|
| 50 | > "user":user}) |
|---|