equal
deleted
inserted
replaced
449 runargs = util.hgcmd() + ['inserve', '-R', root] |
449 runargs = util.hgcmd() + ['inserve', '-R', root] |
450 else: |
450 else: |
451 runargs = util.hgcmd() + sys.argv[1:] |
451 runargs = util.hgcmd() + sys.argv[1:] |
452 |
452 |
453 pidfile = ui.config('inotify', 'pidfile') |
453 pidfile = ui.config('inotify', 'pidfile') |
454 if opts['daemon'] and pidfile is not None and 'pid-file' not in runargs: |
454 opts.setdefault('pid_file', '') |
|
455 if opts['daemon'] and pidfile is not None and not opts['pid_file']: |
|
456 opts['pid_file'] = pidfile |
455 runargs.append("--pid-file=%s" % pidfile) |
457 runargs.append("--pid-file=%s" % pidfile) |
456 |
458 |
457 service = service() |
459 service = service() |
458 logfile = ui.config('inotify', 'log') |
460 logfile = ui.config('inotify', 'log') |
459 |
461 |