Skip to content
Snippets Groups Projects
  1. Oct 31, 2018
  2. Dec 10, 2018
    • Matt Harbison's avatar
      py3: stop subscripting socket.error · 34835265
      Matt Harbison authored
      In 3.3 and later, this is now an alias for OSError.  I hacked up the server code
      enough that I was able to trigger the exception handler in server.py from
      test-http-bundle1.t.  Other instances of this either subscript through the
      `args` member, or reference the errno or strerror attributes.
      
      Note that on Windows, the errno value seems to reflect the Winsock error, so the
      various tests for EPIPE seem like they would always fail.  But that seems to be
      the case in py2 as well.
      34835265
  3. Dec 09, 2018
  4. Dec 10, 2018
    • Matt Harbison's avatar
      py3: quote several instances of $PYTHON for Windows · 07e181ed
      Matt Harbison authored
      Python3 lives in Program Files by default.  The last remaining unquoted instance
      is in test-hghave.t.  I can't figure out how to quote that, as it either
      complains:
      
          'c:\\Program' is not recognized as an internal or external command,
          operable program or batch file.
      
      or
      
          $TESTTMP.sh: line 22: "C:/Program Files/Python37/python.exe": $ENOENT$
      07e181ed
  5. Dec 09, 2018
    • Matt Harbison's avatar
      1aedbf3e
    • Matt Harbison's avatar
      py3: byteify test-push-race.t · d3d52cc9
      Matt Harbison authored
      d3d52cc9
    • Matt Harbison's avatar
      py3: convert filename to bytes in test-hardlinks.t · f79659e1
      Matt Harbison authored
      Windows was complaining about passing str to CreateFileA() in win32.py.
      f79659e1
    • Martin von Zweigbergk's avatar
      narrow: keep bookmarks temporarily stripped for as long as commits are · 109a267a
      Martin von Zweigbergk authored
      The narrow extension also has support for shallowness and for
      inserting older commits on pull. It works by temporarily stripping
      newer commits, adding the older commits, then re-applying the stripped
      bundle. The regular Mercurial server uses that when you widen,
      although it shouldn't be necessary there. Our Google-internal server
      does it when the user requests an older commit.
      
      Our Google-internal tests fail since 7caf632e30c3 (filecache:
      unimplement __set__() and __delete__() (API), 2018-10-20). I haven't
      quite understood the problem, but it's related to the way we
      temporarily hide bookmarks while the commits they point to are
      stripped. When a transaction is started, Mercurial tries to read
      various things from the repo for the transaction summary. That leads
      to computation of hidden commits, which leads to an attempt to find
      commits pinned by bookmarks. This is the reason we temporarily hide
      the bookmarks. I think the aforementioned commit makes the restored
      bookmarks visible earlier than before (which seems like an
      improvement), so we can no longer incorrectly rely on the
      repo._bookmarks field being cached too long (IIUC).
      
      This patch makes it so we restore the temporarily hidden bookmarks
      only after the temporary bundle has been re-applied. It also adapts
      the code to update the repo.__bookmarks field using the pattern
      described in the aforementioned commit instead of writing directly to
      the fiels.
      
      I have spent many hours trying to understand what was going on here,
      but I still don't know if this can also happen without our custom
      server. So this patch unfortunately does not add any tests; I have
      only been able to test the fix using our Google-internal tests.
      
      Differential Revision: https://phab.mercurial-scm.org/D5398
      109a267a
    • Martin von Zweigbergk's avatar
      narrow: drop obsolete support for old Mercurial · 0d50bfcd
      Martin von Zweigbergk authored
      Not needed since narrow is shipped with core.
      
      Differential Revision: https://phab.mercurial-scm.org/D5397
      0d50bfcd
  6. Dec 06, 2018
  7. Dec 07, 2018
  8. Oct 29, 2018
  9. Dec 02, 2018
  10. Mar 04, 2018
  11. Mar 21, 2018
    • Martin von Zweigbergk's avatar
      cleanupnodes: trust caller when "moves" is not None · b7823bd5
      Martin von Zweigbergk authored
      If "moves" (indicating how to move bookmarks) is None, we fill it out
      based on "replacements" (indicating which obsmarkers to add). If
      "moves" is not None, we would still add items based on
      "replacements". This makes it impossible to pass "moves={}" and not
      move bookmarks, which surprised me. The only caller that currently
      passes a value for "moves" was the rebase extension and there we were
      already adding bookmark moves corresponding to obsmarker additions, so
      it should not be impacted.
      
      Differential Revision: https://phab.mercurial-scm.org/D5391
      b7823bd5
  12. Dec 05, 2018
  13. Dec 04, 2018
  14. Jul 13, 2018
    • Boris Feld's avatar
      upgrade: clarify "aggressivemergedelta" handling · 64051af1
      Boris Feld authored
      We rename "aggressivemergedelta" argument to "forceaggressivemergedelta". The
      previous argument naming could infer an absolute control on the behavior.
      However, the code show we respect the config option if set.
      64051af1
Loading