Show More
@@ -629,6 +629,11 b' class chgunixservicehandler(object):' | |||||
629 | self._hashstate, self._baseaddress) |
|
629 | self._hashstate, self._baseaddress) | |
630 |
|
630 | |||
631 | def chgunixservice(ui, repo, opts): |
|
631 | def chgunixservice(ui, repo, opts): | |
|
632 | # CHGINTERNALMARK is temporarily set by chg client to detect if chg will | |||
|
633 | # start another chg. drop it to avoid possible side effects. | |||
|
634 | if 'CHGINTERNALMARK' in os.environ: | |||
|
635 | del os.environ['CHGINTERNALMARK'] | |||
|
636 | ||||
632 | if repo: |
|
637 | if repo: | |
633 | # one chgserver can serve multiple repos. drop repo information |
|
638 | # one chgserver can serve multiple repos. drop repo information | |
634 | ui.setconfig('bundle', 'mainreporoot', '', 'repo') |
|
639 | ui.setconfig('bundle', 'mainreporoot', '', 'repo') | |
@@ -637,8 +642,3 b' def chgunixservice(ui, repo, opts):' | |||||
637 |
|
642 | |||
638 | def uisetup(ui): |
|
643 | def uisetup(ui): | |
639 | server._cmdservicemap['chgunix'] = chgunixservice |
|
644 | server._cmdservicemap['chgunix'] = chgunixservice | |
640 |
|
||||
641 | # CHGINTERNALMARK is temporarily set by chg client to detect if chg will |
|
|||
642 | # start another chg. drop it to avoid possible side effects. |
|
|||
643 | if 'CHGINTERNALMARK' in os.environ: |
|
|||
644 | del os.environ['CHGINTERNALMARK'] |
|
General Comments 0
You need to be logged in to leave comments.
Login now