Skip to content
Snippets Groups Projects
  1. Mar 05, 2018
  2. Mar 14, 2018
  3. Mar 13, 2018
  4. Mar 10, 2018
  5. Mar 09, 2018
  6. Mar 13, 2018
    • Jun Wu's avatar
      xdiff: move stdint.h to xdiff.h · a2baa61b
      Jun Wu authored
      It's more correct to put it in xdiff.h since that file actually uses int64_t
      etc and xdiff.h is included by xinclude.h.
      
      This should fix the oss-fuzz build. Thanks durin42 for discovering the
      issue.
      
      Test Plan:
      `make local` and xdiff related tests still work.
      
      Differential Revision: https://phab.mercurial-scm.org/D2848
      a2baa61b
  7. Mar 12, 2018
  8. Mar 13, 2018
  9. Mar 04, 2018
  10. Mar 02, 2018
  11. Mar 12, 2018
    • Martin von Zweigbergk's avatar
      rebase: extract function for rebasing a single node · 28f98809
      Martin von Zweigbergk authored
      We currently have _performrebase() and _performrebasesubset(), but we
      don't have a method for rebasing a single node (that's inside a loop
      in _performrebasesubset()). I think it makes sense to have such a
      method, so that's what this patch does. I think it may simplify future
      patches I'm working on that have to do with transactions, but I think
      this patch makes sense on its own whether or not that future work
      happens.
      
      Differential Revision: https://phab.mercurial-scm.org/D2809
      28f98809
  12. Mar 09, 2018
  13. Mar 08, 2018
  14. Mar 09, 2018
    • Martin von Zweigbergk's avatar
      rebase: also include commit of collapsed commits in single transaction · 17a744c5
      Martin von Zweigbergk authored
      When rebase.singletransaction is set, we still used to create a second
      transaction when committing with --collapse. It's simpler to create a
      single transaction.
      
      Note that in the affected .t file, the test that uses --collapse still
      appears to create two transactions (it prints "rebase status stored"
      twice). However, only a single transaction is actually created and the
      second printout comes from cmdutil.commitforceeditor() that explicitly
      calls tr.writepending().
      
      Also note the that we now roll back any commits if the user closes the
      commit message editor with an error code (or leaves the message
      empty). That might be unfortunate, but it's consistent with how we
      behave in the --no-collapse case (if the user passed --edit). If we
      want to change that, I think it should be done consistently in a
      separate patch.
      
      Differential Revision: https://phab.mercurial-scm.org/D2728
      17a744c5
  15. Mar 13, 2018
    • Matt Harbison's avatar
      lfs: debug print HTTP headers and JSON payload received from the server · 0dcf50dc
      Matt Harbison authored
      This has been extremely valuable to show divergences between `hg serve` and
      `lfs-test-server`.  Once the `hg serve` code lands, there will be a certain
      amount of conditionalizing that needs to be done, because `lfs-test-server`
      doesn't always follow its spec.
      
      The $ISO_8601_DATE_TIME$ pattern masks the fact that `lfs-test-serve` is sending
      out an expires_at value of "0001-01-01T00:00:00Z".  `hg serve` will (probably)
      use current time + 10 minutes or similar.  The $HTTP_DATE$ is the current time.
      0dcf50dc
    • Matt Harbison's avatar
      test-lfs: dial up the debugging on commands that interact with the server · 24e6342d
      Matt Harbison authored
      This will be useful to let the client print out the HTTP headers and JSON in a
      future patch, so we can compare native LFS serving against test-lfs-server
      behavior.  There tends to be a lot of debug stuff that we don't care about here
      in a push, so I was tempted to print this output with a [devel] config.  But
      this will be useful for field debugging too, so just put up with the extra
      output here.
      
      It would have been nice to be able to set ui.debug once, but issue5815 prevents
      that.
      24e6342d
  16. Feb 24, 2018
  17. Mar 13, 2018
    • Matt Harbison's avatar
      xdiff: fix a hard crash on Windows · d40b9e29
      Matt Harbison authored
      The xdiff case of test-diff-antipatience.t started crashing in the C extension
      with 882657a9f768 (with 6a71a5ba666b backported so it compiles).  There are a
      few more instances of 'long', but this resolves the crashing.
      d40b9e29
  18. Mar 08, 2018
  19. Feb 28, 2018
  20. Mar 10, 2018
    • Matt Harbison's avatar
      bdiff: convert more longs to int64_t · 1b9f6440
      Matt Harbison authored
      MSVC previously flagged these where the function is stored in a pointer:
      
          bdiff.c(284) : warning C4028: formal parameter 1 different from declaration
          bdiff.c(284) : warning C4028: formal parameter 2 different from declaration
          bdiff.c(284) : warning C4028: formal parameter 3 different from declaration
          bdiff.c(284) : warning C4028: formal parameter 4 different from declaration
      1b9f6440
    • Matt Harbison's avatar
      xdiff: silence a 32-bit shift warning on Windows · 651c8072
      Matt Harbison authored
      It's probably harmless, but:
      
          warning C4334: '<<' : result of 32-bit shift implicitly converted to 64 bits
          (was 64-bit shift intended?)
      
      Adding a 'ULL' suffix to 1 also works, but I doubt that's portable.
      651c8072
    • Matt Harbison's avatar
      xdiff: backport int64_t and uint64_t types to Windows · d255744d
      Matt Harbison authored
      Sadly, MSVC 2008 lacks stdint.h.  These are the only two definitions needed
      right now.
      d255744d
  21. Mar 08, 2018
  22. Mar 11, 2018
    • Gregory Szorc's avatar
      hgweb: remove wsgirequest (API) · f0a85154
      Gregory Szorc authored
      Good riddance.
      
      .. api::
      
         The old ``wsgirequest`` class for handling everything WSGI in hgweb
         has been replaced by separate request and response types. Various
         high-level functions in the hgweb WSGI applications now receive
         these new types as arguments instead of the old ``wsgirequest``
         type.
      
      Differential Revision: https://phab.mercurial-scm.org/D2832
      f0a85154
  23. Mar 10, 2018
    • Pulkit Goyal's avatar
      tweakdefaults: add commands.status.verbose to tweakefaults · 98487ad0
      Pulkit Goyal authored
      commands.status,verbose if set to True, shows conflict information in `hg
      status`. It shows which unresolved state you are in, which are the unresolved
      files and how to continue the unresolved state. That sounds like a very good
      candidate for tweakdefaults.
      
      bisect is added to commands.status.skipstates because people generally leave
      unresolved bisect state and we should skip that in morestatus output.
      
      Differential Revision: https://phab.mercurial-scm.org/D2806
      98487ad0
  24. Mar 11, 2018
Loading