2564 respond("") |
2564 respond("") |
2565 |
2565 |
2566 r = repo.addchangegroup(fin) |
2566 r = repo.addchangegroup(fin) |
2567 respond(str(r)) |
2567 respond(str(r)) |
2568 |
2568 |
2569 optlist = """name templates style address port |
2569 optlist = ("name templates style address port ipv6" |
2570 ipv6 accesslog errorlog webdir_conf""" |
2570 " accesslog errorlog webdir_conf") |
2571 for o in optlist.split(): |
2571 for o in optlist.split(): |
2572 if opts[o]: |
2572 if opts[o]: |
2573 ui.setconfig("web", o, opts[o]) |
2573 ui.setconfig("web", o, opts[o]) |
2574 |
2574 |
2575 if opts['daemon'] and not opts['daemon_pipefds']: |
2575 if opts['daemon'] and not opts['daemon_pipefds']: |
2996 "help": (help_, [], _('hg help [COMMAND]')), |
2996 "help": (help_, [], _('hg help [COMMAND]')), |
2997 "identify|id": (identify, [], _('hg identify')), |
2997 "identify|id": (identify, [], _('hg identify')), |
2998 "import|patch": |
2998 "import|patch": |
2999 (import_, |
2999 (import_, |
3000 [('p', 'strip', 1, |
3000 [('p', 'strip', 1, |
3001 _('directory strip option for patch. This has the same\n') + |
3001 _('directory strip option for patch. This has the same\n' |
3002 _('meaning as the corresponding patch option')), |
3002 'meaning as the corresponding patch option')), |
3003 ('b', 'base', '', _('base path')), |
3003 ('b', 'base', '', _('base path')), |
3004 ('f', 'force', None, |
3004 ('f', 'force', None, |
3005 _('skip check for outstanding uncommitted changes'))], |
3005 _('skip check for outstanding uncommitted changes'))], |
3006 _('hg import [-p NUM] [-b BASE] [-f] PATCH...')), |
3006 _('hg import [-p NUM] [-b BASE] [-f] PATCH...')), |
3007 "incoming|in": (incoming, |
3007 "incoming|in": (incoming, |