Skip to content
Snippets Groups Projects
  1. Aug 20, 2016
  2. Jun 03, 2017
  3. Jun 01, 2017
    • Martin von Zweigbergk's avatar
      match: simplify nevermatcher · 783394c0c978
      Martin von Zweigbergk authored
      Most of it does the same as its superclass, so it can simply be
      removed. It also seems to make more sense for it to use relative
      paths, as we do for everything except alwaysmatcher, although
      nevermatcher.uipath() will probably never get called anyway, so it
      won't matter.
      783394c0c978
  4. Jun 02, 2017
  5. May 08, 2017
    • Matt Harbison's avatar
      setup: prevent setuptools from laying an egg · 331dcf199039
      Matt Harbison authored
      Previously, test-hghave.t was failing on Windows (and on Linux if
      $FORCE_SETUPTOOLS was set) with the following:
      
        --- c:/Users/Matt/Projects/hg/tests/test-hghave.t
        +++ c:/Users/Matt/Projects/hg/tests/test-hghave.t.err
        @@ -19,7 +19,11 @@
           >   foo
           > EOF
           $ run-tests.py $HGTEST_RUN_TESTS_PURE test-hghaveaddon.t
        +  warning: Testing with unexpected mercurial lib: c:\Users\Matt\Projects\hg\mercurial
        +           (expected ...\hgtests.mu9rou\install\lib\python\mercurial)
           .
        +  warning: Tested with unexpected mercurial lib: c:\Users\Matt\Projects\hg\mercurial
        +           (expected ...\hgtests.mu9rou\install\lib\python\mercurial)
      
      Augie relayed concerns[1] about the first attempt at this, which also excluded
      'install_egg_info'.  All that needs to be excluded to avoid the egg and make the
      test work is to filter out 'bdist_egg'.  (Actually, the body of this class could
      simply be 'pass', and 'bdist_egg' still isn't run.  But that seems to magical.)
      
      Also note that prior to this (and still now), `make clean` doesn't delete the
      'mercurial.egg-info' that is generated by `make install`.
      
      [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2017-May/097668.html
      
      # no-check-commit
      331dcf199039
  6. Jun 02, 2017
  7. May 31, 2017
  8. Jun 02, 2017
  9. May 31, 2017
    • Pulkit Goyal's avatar
      py3: implement __bytes__ for committablectx · 1df98fc923d4
      Pulkit Goyal authored
      Before this method, calling bytes on workingctx or memctx calls
      basectx.__bytes__ since the magic method was not defined for this class. When it
      calls the method from basectx class, it returns TypeError because None is passed
      into it.
      
      After this commit `hg update -C` works on Python 3 if eol is not enabled.
      1df98fc923d4
  10. Jun 02, 2017
  11. May 31, 2017
  12. Feb 03, 2017
  13. May 27, 2017
  14. May 20, 2017
    • Pierre-Yves David's avatar
      strip: strip obsmarkers exclusive to the stripped changeset · 71eb6a098315
      Pierre-Yves David authored
      This is it, `hg strip --rev X` will now also remove obsolescence markers
      exclusive to X. Since a previous changeset, the obsmarkers has been backed up
      in the strip backup bundle, so it is possible to restore them.
      
      Note: stripping obsmarkers means the precursors of the stripped changeset might no
      longer be obsolete after the strip.
      
      Stripping changeset without obsmarkers can be useful when building test case. So
      It is possible to disable the stripping of obsmarkers using the
      'devel.strip-obsmarkers' config option.
      
      Test change have been carefully validated.
      71eb6a098315
  15. Jun 01, 2017
    • Pierre-Yves David's avatar
      strip: do not include obsolescence markers for the temporary bundle · 5732e6d2b369
      Pierre-Yves David authored
      When stripping, we need to put all non-stripped revisions "above" the stripped
      ones in a "temporary-bundle" while we strip the targets revision. Then we
      reapply that bundle to restore these non-stripped revisions (with a new revision
      numbers). We skip the inclusion of obsolescence markers in that bundle. This is
      safe since all obsmarkers we plan to strip will be backed-up in the strip backup
      bundle. Including the markers would create issue in some case were we try to
      strip a prune markers that is "relevant" to a revision in the
      "temporary-bundle".
      
      (note: we do not strip obsmarkers yet)
      5732e6d2b369
    • Pierre-Yves David's avatar
      exclusive-markers: update the dedicated test with list of exclusive markers · b36b02d57021
      Pierre-Yves David authored
      We now display data about the "exclusive markers" in the test dedicated to
      relevant and exclusive markers computation and usage. Each output have been
      carefully validated
      b36b02d57021
  16. May 20, 2017
  17. Jun 01, 2017
  18. May 26, 2017
  19. May 20, 2017
    • Pierre-Yves David's avatar
      strip: also backup obsmarkers · ed566a59f660
      Pierre-Yves David authored
      We are about to give 'strip' the ability to remove obsmarkers. Before we start
      removing data we must make sure it is preserved somewhere. So the backup bundle
      created by 'strip' now contains obsmarkers.
      ed566a59f660
  20. May 31, 2017
    • Augie Fackler's avatar
      tests: fix run-tests when there's a bad #if in a test · 931bb962e0eb
      Augie Fackler authored
      That has (and still does) caused the test to be skipped, but without
      this fix it was possible to exit this block of code without clearing
      the output channel, which poisoned the channel list for later test
      method runs. Fix this by always clearing the channel in a finally.
      
      The test for this is somewhat unfortunate. Sadly, I couldn't get a way
      to reproduce this with less than 2n+1 test cases, nor could I get it
      to reproduce reliably without the sleep statements. It's also crucial
      that the test with the broken #if be smaller (in terms of byte count)
      than the sleeping tests, so that it runs first and would poison the
      channel list prior to another test needing that entry from the list.
      931bb962e0eb
    • Augie Fackler's avatar
      tests: make run-tests fail early if no channel is found · c59451e11cbf
      Augie Fackler authored
      I hit a weird corner case in run-tests where a test that caused an
      exception to be raised was breaking everything with an unbound
      variable error a few lines down because channel was never getting set
      in this for loop. By adding an `else` clause to this for loop, we can
      explode right away if we can't find a channel and give the developer a
      better chance at figuring out what's going on.
      c59451e11cbf
  21. May 28, 2017
  22. Jun 01, 2017
Loading