Show More
@@ -159,16 +159,18 b' def log_pull_action(ui, repo, **kwargs):' | |||||
159 | repository = extras['repository'] |
|
159 | repository = extras['repository'] | |
160 | scm = extras['scm'] |
|
160 | scm = extras['scm'] | |
161 | make_lock = extras['make_lock'] |
|
161 | make_lock = extras['make_lock'] | |
|
162 | ip = extras['ip'] | |||
162 | elif 'username' in rc_extras: |
|
163 | elif 'username' in rc_extras: | |
163 | username = rc_extras['username'] |
|
164 | username = rc_extras['username'] | |
164 | repository = rc_extras['repository'] |
|
165 | repository = rc_extras['repository'] | |
165 | scm = rc_extras['scm'] |
|
166 | scm = rc_extras['scm'] | |
166 | make_lock = rc_extras['make_lock'] |
|
167 | make_lock = rc_extras['make_lock'] | |
|
168 | ip = rc_extras['ip'] | |||
167 | else: |
|
169 | else: | |
168 | raise Exception('Missing data in repo.ui and os.environ') |
|
170 | raise Exception('Missing data in repo.ui and os.environ') | |
169 | user = User.get_by_username(username) |
|
171 | user = User.get_by_username(username) | |
170 | action = 'pull' |
|
172 | action = 'pull' | |
171 |
action_logger(user, action, repository, |
|
173 | action_logger(user, action, repository, ip, commit=True) | |
172 | # extension hook call |
|
174 | # extension hook call | |
173 | from rhodecode import EXTENSIONS |
|
175 | from rhodecode import EXTENSIONS | |
174 | callback = getattr(EXTENSIONS, 'PULL_HOOK', None) |
|
176 | callback = getattr(EXTENSIONS, 'PULL_HOOK', None) |
General Comments 0
You need to be logged in to leave comments.
Login now