Files
@ abaf8e1033a6
Branch filter:
Location: kallithea/init.d/supervisord.conf - annotation
abaf8e1033a6
2.6 KiB
text/plain
pullrequests: don't show empty "additional changesets" (issue #280)
When opening a pullrequest on a revision range including the tipmost
revision, and then pushing a new revision on top of that, the PR page shows:
This pullrequest can be updated with changes on ...:
and then nothing.
This is because the available revisions looped over are in 'avail_cs' but
the guard around the loop is checking on 'avail_revs'. The former, while
derived from avail_revs, can become empty under circumstances like this one.
Fix the problem by changing the guard checking avail_cs rather than
avail_revs, and making sure the printed message is aligned to 'No additional
changes found'.
When opening a pullrequest on a revision range including the tipmost
revision, and then pushing a new revision on top of that, the PR page shows:
This pullrequest can be updated with changes on ...:
and then nothing.
This is because the available revisions looped over are in 'avail_cs' but
the guard around the loop is checking on 'avail_revs'. The former, while
derived from avail_revs, can become empty under circumstances like this one.
Fix the problem by changing the guard checking avail_cs rather than
avail_revs, and making sure the printed message is aligned to 'No additional
changes found'.
24c0d584ba86 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 99ad9d0af1a3 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 99ad9d0af1a3 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 99ad9d0af1a3 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 03bbd33bc084 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 e4eabd2558b6 99ad9d0af1a3 99ad9d0af1a3 e4eabd2558b6 e4eabd2558b6 03bbd33bc084 2c3d30095d5e e4eabd2558b6 e285bb7abb28 e285bb7abb28 | ; Kallithea Supervisord
; ##########################
; for help see http://supervisord.org/configuration.html
; ##########################
[inet_http_server] ; inet (TCP) server disabled by default
port=127.0.0.1:9001 ; (ip_address:port specifier, *:port for all iface)
;username=user ; (default is no username (open server))
;password=123 ; (default is no password (open server))
[supervisord]
logfile=/%(here)s/supervisord_kallithea.log ; (main log file;default $CWD/supervisord.log)
logfile_maxbytes=50MB ; (max main logfile bytes b4 rotation;default 50MB)
logfile_backups=10 ; (num of main logfile rotation backups;default 10)
loglevel=info ; (log level;default info; others: debug,warn,trace)
pidfile=/%(here)s/supervisord_kallithea.pid ; (supervisord pidfile;default supervisord.pid)
nodaemon=true ; (start in foreground if true;default false)
minfds=1024 ; (min. avail startup file descriptors;default 1024)
minprocs=200 ; (min. avail process descriptors;default 200)
umask=022 ; (process file creation umask;default 022)
user=username ; (default is current user, required if root)
;identifier=supervisor ; (supervisord identifier, default is 'supervisor')
;directory=/tmp ; (default is not to cd during start)
;nocleanup=true ; (don't clean up tempfiles at start;default false)
;childlogdir=/tmp ; ('AUTO' child log dir, default $TEMP)
environment=HOME=/srv/kallithea ; (key value pairs to add to environment)
;strip_ansi=false ; (strip ansi escape codes in logs; def. false)
; the below section must remain in the config file for RPC
; (supervisorctl/web interface) to work, additional interfaces may be
; added by defining them in separate rpcinterface: sections
[rpcinterface:supervisor]
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
[supervisorctl]
serverurl=http://127.0.0.1:9001 ; use an http:// url to specify an inet socket
;username=user ; should be same as http_username if set
;password=123 ; should be same as http_password if set
;prompt=mysupervisor ; cmd line prompt (default "supervisor")
;history_file=~/.sc_history ; use readline history if available
; restart with supervisorctl restart kallithea:*
[program:kallithea]
numprocs = 1
numprocs_start = 5000 # possible should match ports
directory=/srv/kallithea
command = /srv/kallithea/venv/bin/gearbox serve -c my.ini
process_name = %(program_name)s_%(process_num)04d
redirect_stderr=true
stdout_logfile=/%(here)s/kallithea.log
|