comparison tests/test-bookmarks-corner-case.t @ 42512:84aff7e20c55

merge with stable

42504:a68350a7fc55

  $ cat > bookrace.py << EOF
  > import atexit
  > import os
  > import time
  > from mercurial import bookmarks, error, extensions
  > def wrapinit(orig, self, repo):
  >     if not os.path.exists('push-A-started'):
  >         repo.ui.status(b'setting raced push up\n')
  >         with open('push-A-started', 'w'):
  >             pass
  >     clock = 300
  >     while not os.path.exists('push-B-done'):
  >         clock -= 1
  >         if clock <= 0:
  >             raise error.Abort("race scenario timed out")
  >         time.sleep(0.1)
  >     return orig(self, repo)
  > 
  >     repo.__class__ = racedrepo
  > def uisetup(ui):
  >     extensions.wrapfunction(bookmarks.bmstore, '__init__', wrapinit)
  > def e():
  >     with open('push-A-done', 'w'):
  >         pass
  > atexit.register(e)
  > EOF

Check raced push output.

  $ cat push-output.txt
  pushing to ssh://user@dummy/bookrace-server
  searching for changes
  remote: setting raced push up
  remote: adding changesets
  remote: adding manifests
  remote: adding file changes
  remote: added 1 changesets with 1 changes to 1 files

42512:84aff7e20c55

  $ cat > bookrace.py << EOF
  > import atexit
  > import os
  > import time
  > import atexit
  > from mercurial import error, extensions, bookmarks
  > 
  > def wait(repo):
  >     if not os.path.exists('push-A-started'):
  >         assert repo._currentlock(repo._lockref) is None
  >         assert repo._currentlock(repo._wlockref) is None
  >         repo.ui.status(b'setting raced push up\n')
  >         with open('push-A-started', 'w'):
  >             pass
  >     clock = 300
  >     while not os.path.exists('push-B-done'):
  >         clock -= 1
  >         if clock <= 0:
  >             raise error.Abort("race scenario timed out")
  >         time.sleep(0.1)
  > 
  > def reposetup(ui, repo):
  >     class racedrepo(repo.__class__):
  >         @property
  >         def _bookmarks(self):
  >             wait(self)
  >             return super(racedrepo, self)._bookmarks
  >     repo.__class__ = racedrepo
  > 
  > def e():
  >     with open('push-A-done', 'w'):
  >         pass
  > atexit.register(e)
  > EOF

Check raced push output.

  $ cat push-output.txt
  pushing to ssh://user@dummy/bookrace-server
  searching for changes
  remote has heads on branch 'default' that are not known locally: f26c3b5167d1
  remote: setting raced push up
  remote: adding changesets
  remote: adding manifests
  remote: adding file changes
  remote: added 1 changesets with 1 changes to 1 files