1. 29 Sep, 2020 1 commit
  2. 23 Sep, 2020 2 commits
  3. 18 Sep, 2020 2 commits
    • Pierre-Yves David's avatar
      strip: with --keep, consider all revs "removed" from the wcp (issue6270) · 2bc978921e8a
      Pierre-Yves David authored
      The current code was blink to change from other branches when stripping merges
      that are ancestors of the working copy parents.
      
      --HG--
      branch : stable
      2bc978921e8a
    • Pierre-Yves David's avatar
      test-strip: display more information highlight buggy behavior · 27822b8436bf
      Pierre-Yves David authored
      When using `hg strip --keep` on a set of changeset that contains a merge, the
      set of file considered when rebuilding the dirstate is missing files updated by
      changeset that are not directly inside the `new-parent::old-parent` range.
      
      We start with updating the test with new output highlighting the issue.
      
      This issue was spotted because that dirstate inconsistency made the test flaky.
      The new command make the test less flaky (but still wrong).
      
      --HG--
      branch : stable
      27822b8436bf
  4. 13 Sep, 2020 1 commit
    • Yuya Nishihara's avatar
      py3: fix formatting of LookupError for workingctx · bd5b2b29b82d
      Yuya Nishihara authored
      Spotted while writing broken tests for "hg grep -fr'wdir()'".
      basectx._fileinfo() raises ManifestLookupError(self._node, ..), but _node
      of the workingctx is None for historical reasons.
      
      --HG--
      branch : stable
      bd5b2b29b82d
  5. 11 Sep, 2020 1 commit
  6. 09 Sep, 2020 1 commit
  7. 04 Sep, 2020 1 commit
    • Matt Harbison's avatar
      repoview: pin revisions for `local` and `other` when a merge is active · aaeccdb6e654
      Matt Harbison authored
      I've hit this a couple of times, where pulling with a dirty `wdir` obsoletes
      `p1` and updating to the successor results in merge conflicts.  The problem was
      resolving them failed immediately, complaining that the old checkout was
      filtered.
      
      The change in `test-rebase-obsolete.t` is because there's an outstanding merge
      conflict in a rebase operation.  The summary prompt to merge seems incorrect for
      this scenario, but that's an existing issue.
      
      Differential Revision: https://phab.mercurial-scm.org/D8980
      
      --HG--
      branch : stable
      aaeccdb6e654
  8. 02 Sep, 2020 1 commit
    • Harald Klimach's avatar
      hgweb: compatibility of hgweb.cgi template with Python 3 · d58a205d0672
      Harald Klimach authored
      When running Mercurial on Python 3 hgweb expects the config variable to be a
      bytestring.
      The solution proposed by Anton Shestakov is to use a byteprefix to the literal
      string defined cgi script as provided in this patch for hgweb.cgi,
      contrib/hgweb.fcgi and contrib/hgweb.wsgi.
      I am not sure whether this covers all relevant templates, but I couldn't find
      others.
      
      Differential Revision: https://phab.mercurial-scm.org/D8978
      
      --HG--
      branch : stable
      d58a205d0672
  9. 01 Sep, 2020 4 commits
  10. 27 Aug, 2020 1 commit
  11. 02 Aug, 2020 1 commit
  12. 03 Aug, 2020 2 commits
  13. 01 Aug, 2020 1 commit
  14. 25 Jul, 2020 1 commit
    • Yuya Nishihara's avatar
      dispatch: adjust ui.flush() timing to stabilize test-blackbox.t · 9b5723784aac
      Yuya Nishihara authored
      Without this change, dispatch.dispatch() could return before flushing all
      stdio data. This means chg stdio would print data after receiving the result
      code.
      
      --- tests/test-blackbox.t
      +++ tests/test-blackbox.t.err
      @@ -354,13 +354,13 @@
         > EOF
         $ hg log --debug
         removing $TESTTMP/gone/.hg
      -  warning: cannot write to blackbox.log: $ENOENT$ (no-windows !)
         warning: cannot write to blackbox.log: $TESTTMP/gone/.hg/blackbox.log: $ENOTDIR$ (windows !)
         $ cd ..
      
       blackbox should disable itself if track is empty
      
         $ hg --config blackbox.track= init nothing_tracked
      +  warning: cannot write to blackbox.log: $ENOENT$
         $ cd nothing_tracked
         $ cat >> .hg/hgrc << EOF
         > [blackbox]
      
      --HG--
      branch : stable
      9b5723784aac
  15. 26 Jul, 2020 1 commit
  16. 28 Jul, 2020 3 commits
  17. 23 Jul, 2020 7 commits
    • Pierre-Yves David's avatar
      push: test for checks preventing publishing obsolete changeset · 559ebfb5a58e
      Pierre-Yves David authored
      The main difference from the previous test is how the changeset was obsoleted.
      In this case it is an amend so publishing the orphan would also create phase
      divergence. This must not go unnoticed.
      
      --HG--
      branch : stable
      559ebfb5a58e
    • Pierre-Yves David's avatar
      push: test for checks preventing publishing obsolete changeset · 5ff77aaba1e4
      Pierre-Yves David authored
      This introduce a simple example, more are coming. See inline documentation
      for details.
      
      --HG--
      branch : stable
      5ff77aaba1e4
    • Pierre-Yves David's avatar
      push: another test for checks preventing pushing orphaness to a server · fc751824ae97
      Pierre-Yves David authored
      In this one, orphan was create with and amend instead of a prune.
      
      --HG--
      branch : stable
      fc751824ae97
    • Pierre-Yves David's avatar
      push: test the checks preventing pushing orphaness to a server · 187cc478e18f
      Pierre-Yves David authored
      This is introduce a simple example, more are coming. See inline documentation
      for details.
      
      --HG--
      branch : stable
      187cc478e18f
    • Pierre-Yves David's avatar
      exchange: backout changeset c26335fa4225 · 6063c1857d0a
      Pierre-Yves David authored
      Changeset c26335fa4225 has good intends but introduce significant behavior
      regressions for multiple important cases. In short there are many case where
      push would have caught instability creation/propagation that are no longer
      covered.  These behavior have been covered for many years and even if some
      related case are not currently caught, the covered one should not be regressed.
      
      The next four changesets introduce tests for some of these cases. However we
      could produce many more tests cases since the area is wide and they are many
      possible combination. (And we should cover them when getting back to this issue)
      
      Since 5.5 is one week away, the most reasonable approach seems to back this out
      while we devise a new way to move forward that preserve the current behavior,
      catch more issues and also improves the situation that c26335fa4225 target.
      
      
      In addition to the behavior change, c26335fa4225 also introduced output
      changes. These output changes does not requires a backout per-se, but are part of
      the same changeset. However they come with a couple of issues that also requires
      attention:
      
      1) the bulk of the error message have been shoehorned into a multiple line abort
      message. This seems quite different from what we usually do. The abort message
      should be a compact and efficient message, with extra details being issued as
      normal error output beforehand. (with --verbose/--quiet) support.
      
      2) the current output is unbounded, so if there is many (tens, hundreds,
      thousands, …) of unstable/obsolete changeset involved in the push, the output
      can quickly become a scary and un-usuable wall of text. So we need some
      limitation here (same as we have with the remote head list that says A, B , C
      and # others).
      
      --HG--
      branch : stable
      6063c1857d0a
    • Pulkit Goyal's avatar
      tests: glob 'mercurial.error' in test-phases.t · 41021660baa1
      Pulkit Goyal authored
      On python 2 with chg, `mercurial.error` is omitted while printing error. On
      other cases it's there in error message.
      
      I did tried to understand what might be the cause was unable to find one on
      quick skim through the code.
      
      --HG--
      branch : stable
      41021660baa1
    • Pierre-Yves David's avatar
      infinitepush: remove unused import to tempfile · bfc6e75c0114
      Pierre-Yves David authored
      Spotted by test-check-pyflakes.t
      
      --HG--
      branch : stable
      bfc6e75c0114
  18. 20 Jul, 2020 3 commits
  19. 22 Jul, 2020 1 commit
  20. 22 Apr, 2020 2 commits
  21. 20 Jul, 2020 1 commit
  22. 21 Jul, 2020 1 commit
  23. 20 Jul, 2020 1 commit