Skip to content
Snippets Groups Projects
  1. Oct 02, 2019
  2. Sep 20, 2019
  3. Sep 18, 2019
  4. Sep 07, 2019
  5. Sep 09, 2019
    • Pierre-Yves David's avatar
      merge: respect parents order when using `graft` on a merge · a4ca0610c754
      Pierre-Yves David authored
      The previous code did not record the index of the replaced parent. It was always
      using the "graft" destination as `p1`. This could switch parents order in some
      situation (eg: some of the evolve evolving merge case). Recording and using the
      information fixes the issue in evolve.
      
      We are not aware of core commands calling graft in that fashion, so we could not
      build a simple test case for it using core commands.
      a4ca0610c754
  6. Sep 07, 2019
    • Pierre-Yves David's avatar
      tests: register test-merge-combination.t as small but slow · 344a086bb764
      Pierre-Yves David authored
      run-tests.py use file size as an heuristic for test run time. The new
      `test-merge-combination.t` is a small file that do a lot of processing. As a
      result it tend to be scheduled really late but delay the full test run by a lot.
      
      On an example test run, the one-before-last test completed 279s after the start
      of the run, while `test-merge-combination.t` finished 355s after it. A 76s
      delay. This delay can be avoided since `test-merge-combination.t` only got started
      175s after the start of the run.
      344a086bb764
  7. Sep 06, 2019
  8. Sep 05, 2019
  9. Aug 25, 2019
  10. Aug 16, 2019
  11. Aug 17, 2019
  12. Aug 25, 2019
  13. Aug 21, 2019
  14. Aug 16, 2019
  15. Aug 12, 2019
  16. Aug 09, 2019
  17. Aug 08, 2019
  18. Aug 01, 2019
    • Martin von Zweigbergk's avatar
      relnotes: copy "next" to "5.1" and clear "next" · cba59b338976
      Martin von Zweigbergk authored
      To avoid merge conflicts, we want to avoid modifying the file on
      multiple branches in parallel. This patch is therefore meant to be
      applied to the stable branch and then quickly be merged to default (at
      least before edits are made to relnotes/next there).
      
      Another option would have been to copy the file on the stable branch
      and to clear it on the default branch. However, that still results in
      conflicts if the copy is edited on the stable branch (Mercurial would
      try to apply the changes from the default branch to it).
      
      We could also delete the file in one commit and recreate it in another
      commit. However, Mercurial is quite inconsistent in what it considers
      a break in history (see test-copies-unrelated.t), so I'd like to avoid
      that.
      
      Differential Revision: https://phab.mercurial-scm.org/D6705
      cba59b338976
  19. Aug 03, 2019
    • Gregory Szorc's avatar
      automation: push changes affecting .hgtags · 9e0f1c80cddb
      Gregory Szorc authored
      When I went to build the 5.1 tag using the in-repo automation, the
      automatic version calculation failed to deduce the clean 5.1 version
      string because we had only pushed the changeset corresponding to the 5.1
      tag and not the changeset containing the 5.1 tag. So from the
      perspective of the remote repo, the 5.1 tag didn't exist yet and
      automatic version deduction failed.
      
      This commit changes the `hg push` to also push all changesets affecting
      the .hgtags file, ensuring the remote has up-to-date tags information.
      
      I tested this by creating a local draft changeset with a dummy tag
      value on a different DAG head and instructed the automation to build
      a revision that didn't have this change to .hgtags. The tag was
      successfully pushed and the built package had a version number
      incorporating that tag.
      
      Sending this to stable so the 5.1.1 automation hopefully "just works."
      9e0f1c80cddb
  20. Jun 21, 2019
    • Pierre-Yves David's avatar
      bookmarks: actual fix for race condition deleting bookmark · e0cf09bc35ef
      Pierre-Yves David authored
      This is a simple but efficient fix to prevent the issue tested in
      `test-bookmarks-corner-case.t`. It might be worth pursuing a more generic
      approach where filecache learn to depend on each other, but that would not be
      suitable for stable.
      
      The issue is complicated enough that I documented the race and its current
      solution as inline comment. See this comment for details on the fix.
      e0cf09bc35ef
  21. Aug 01, 2019
  22. Jul 29, 2019
    • Gregory Szorc's avatar
      automation: execute powershell when connecting · e91930d712e8
      Gregory Szorc authored
      For some reason, the ability to execute PS scripts appears to
      come online after the ability to execute regular command scripts.
      This is creating race conditions when connecting to instances
      resulting in our wait_for_winrm() returning before PS is available
      leading to an exception being thrown in other code.
      
      Let's change the client connection code to execute a minimal
      PS script so we can try to trap the exception in wait_for_winrm().
      5.1
      e91930d712e8
    • Gregory Szorc's avatar
      automation: allow exit code of 1 for `hg push` · 24cd5b0ba5b3
      Gregory Szorc authored
      `hg push` exits 1 for no-ops. No-op pushes should be fine in the
      context of automation.
      24cd5b0ba5b3
  23. Jul 25, 2019
  24. Jul 23, 2019
  25. Jul 22, 2019
Loading