Skip to content
Snippets Groups Projects
  1. Jun 04, 2017
    • Gregory Szorc's avatar
      tests: use unittest.SkipTest · 240183a04429
      Gregory Szorc authored
      unittest.SkipTest was introduced in Python 2.7. We previously defined
      it with our own class so we could run on Python 2.6.
      240183a04429
  2. Jun 16, 2017
  3. Jun 15, 2017
    • Martin von Zweigbergk's avatar
      exchange: create transaction for bundle1 unbundling earlier · febd6bfa770d
      Martin von Zweigbergk authored
      changegroup.apply() currently creates a transation if there isn't
      already one. Having the callers of that method pass in an existing
      transaction seems a little cleaner. To do that, we need to make sure
      all callers have a transaction. Since the transaction name is used as
      a hook argument (HG_TXNNAME), we need to match the name from
      changegroup.apply().
      febd6bfa770d
  4. Jun 19, 2017
  5. Jun 20, 2017
  6. Jun 18, 2017
  7. Jun 17, 2017
  8. Jun 19, 2017
    • durin42's avatar
      highlight: put pygments import inside demandimport.deactivated · 661025fd3e1c
      durin42 authored
      I tripped on some weirdness relating to _thread vs threading way down
      in a dep of highlight recently. I'm not really sure why I'm only just
      seeing this defect now, but experimentally this fixes the problem, and
      shouldn't cause any load-time slowness for people until pygments is
      actually about to be used since highlight.highlight is still lazily
      loaded in the highlight/__init__.py file.
      661025fd3e1c
    • Matt Harbison's avatar
      run-tests: explicitly flush test runner output for Windows stability · bd77ac2bd23a
      Matt Harbison authored
      When hghave testing goes awry, the output order was changing on Windows.
      
        diff --git a/tests/test-run-tests.t b/tests/test-run-tests.t
        --- a/tests/test-run-tests.t
        +++ b/tests/test-run-tests.t
        @@ -920,10 +920,10 @@
            > EOF
            > done
            $ rt -j 2
        -  ....
        +  ....skipped: unknown feature: notarealhghavefeature\r (esc)
        +
        +
            # Ran 5 tests, 0 skipped, 0 warned, 0 failed.
        -  skipped: unknown feature: notarealhghavefeature
        -
            $ cd ..
            $ rm -rf broken
      
      Since 'skipped: unknown feature: notarealhghavefeature\n\n' is printed to stdout
      and the rest to stderr, it seems like maybe stdio isn't line buffered on
      Windows.  When a program exits, stdout is flushed before stderr[1].
      
      [1] https://blogs.msdn.microsoft.com/oldnewthing/20060519-09/?p=31133
      bd77ac2bd23a
    • Matt Harbison's avatar
      tinyproxy: explicitly flush logged messages · 23b07333a8b2
      Matt Harbison authored
      On Windows, output streams are buffered when redirected to a file, and
      TerminateProcess() apparently doesn't trigger a flush.  This left
      test-http-proxy.t missing part of the last line when it cat'd proxy.log[1].
      
      Flushing stderr is all that is needed (on py27 anyway).  I originally flushed
      stdout too, but that added additional output to the log:
      
           $ cat proxy.log
        +  Accept: $LOCALIP (localhost)\r (esc)
        +  Serving HTTP on 0.0.0.0 port 20810 ...\r (esc)
        +       connect to localhost:$HGPORT\r (esc)
           * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob)
        +       bye\r (esc)
        +       connect to localhost:$HGPORT\r (esc)
           * - - [*] "GET http://localhost:$HGPORT/?cmd=branchmap HTTP/1.1" - - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
        +       bye\r (esc)
        +       connect to localhost:$HGPORT\r (esc)
           * - - [*] "GET http://localhost:$HGPORT/?cmd=stream_out HTTP/1.1" - - x-hgproto-1:0.1 0.2 comp=*zlib,none,bzip2 (glob)
        +       bye\r (esc)
        +       connect to localhost:$HGPORT\r (esc)
       ...
      
      [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2017-April/096987.html
      23b07333a8b2
  9. Jun 18, 2017
  10. Feb 19, 2017
  11. Oct 16, 2016
    • Yuya Nishihara's avatar
      dagop: split module hosting DAG-related algorithms from revset · 27932a76a88d
      Yuya Nishihara authored
      This module hosts the following functions. They are somewhat similar (e.g.
      scanning revisions using heap queue or stack) and seem non-trivial in
      algorithmic point of view.
      
       - _revancestors()
       - _revdescendants()
       - reachableroots()
       - _toposort()
      
      I was thinking of adding revset._fileancestors() generator for better follow()
      implementation, but it would be called from context.py as well. So I decided
      to create new module.
      
      Naming is hard. I couldn't come up with any better module name, so it's called
      "dag operation" now. I rejected the following candidates:
      
       - ancestor.py - existing, revlog-level DAG algorithm
       - ancestorset.py - doesn't always return a set
       - dagalgorithm.py - hard to type
       - dagutil.py - existing
       - revancestor.py - I want to add fileancestors()
      
        % wc -l mercurial/dagop.py mercurial/revset.py
          339 mercurial/dagop.py
         2020 mercurial/revset.py
         2359 total
      27932a76a88d
  12. Jun 16, 2017
  13. Jun 18, 2017
  14. Jun 17, 2017
Loading