Ticket #128: monotone_user_support.patch

File monotone_user_support.patch, 1.8 KB (added by chris, 3 years ago)

Diffs of lines changed to add user support.

Line 
1diff -r ./changes/monotone.py /Library/Frameworks/Python.framework/Versions/Current/lib/python2.5/site-packages/buildbot/changes/monotone.py
239c43
3<     def __init__(self, bin, db):
4---
5>     def __init__(self, bin, db, user):
641a46
7>         self.user = user
845a51,52
9>         if self.user:
10>               cmdline += ('-k'+self.user,)  #add user if provided, note comma at end to form tuple
11140c156
12<                  pollinterval=60 * 10, monotone_exec="monotone"):
13---
14>                  pollinterval=60 * 10, monotone_exec="monotone",user=None):
15147c163
16<         self.monotone = Monotone(self.monotone_exec, self.db_path)
17---
18>         self.monotone = Monotone(self.monotone_exec, self.db_path, user)
19diff -r ./slave/commands.py /Library/Frameworks/Python.framework/Versions/Current/lib/python2.5/site-packages/buildbot/slave/commands.py
201632a1633,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']
291656a1665,1666
30>         if self.user:
31>               command.append('-k'+self.user)
321670a1681,1682
33>         if self.user:
34>               command.append('-k'+self.user)
351691a1704,1705
36>         if self.user:
37>               command.append('-k'+self.user)               
381703a1718,1719
39>         if self.user:
40>               command.append('-k'+self.user)
41diff -r ./steps/source.py /Library/Frameworks/Python.framework/Versions/Current/lib/python2.5/site-packages/buildbot/steps/source.py
421042c1042
43<                  monotone="monotone",
44---
45>                  monotone="monotone", user=None,
461053c1053,1054
47<                           "monotone": monotone})
48---
49>                           "monotone": monotone,
50>                           "user":user})