Show More
@@ -575,13 +575,13 b' def push(ui, repo, dest="default-push"):' | |||
|
575 | 575 | return 1 |
|
576 | 576 | |
|
577 | 577 | user, host, port, path = map(m.group, (2, 3, 5, 7)) |
|
578 | host = user and ("%s@%s" % (user, host)) or host | |
|
578 | uhost = user and ("%s@%s" % (user, host)) or host | |
|
579 | 579 | port = port and (" -p %s") % port or "" |
|
580 | 580 | path = path or "" |
|
581 | 581 | |
|
582 | 582 | sport = random.randrange(30000, 60000) |
|
583 | 583 | cmd = "ssh %s%s -R %d:localhost:%d 'cd %s; hg pull http://localhost:%d/'" |
|
584 | cmd = cmd % (host, port, sport+1, sport, path, sport+1) | |
|
584 | cmd = cmd % (uhost, port, sport+1, sport, path, sport+1) | |
|
585 | 585 | |
|
586 | 586 | child = os.fork() |
|
587 | 587 | if not child: |
@@ -589,6 +589,7 b' def push(ui, repo, dest="default-push"):' | |||
|
589 | 589 | sys.stderr = sys.stdout |
|
590 | 590 | hgweb.server(repo.root, "pull", "", "localhost", sport) |
|
591 | 591 | else: |
|
592 | ui.status("connecting to %s\n" % host) | |
|
592 | 593 | r = os.system(cmd) |
|
593 | 594 | os.kill(child, signal.SIGTERM) |
|
594 | 595 | return r |
General Comments 0
You need to be logged in to leave comments.
Login now