Skip to content
Snippets Groups Projects
  1. Mar 25, 2021
  2. Mar 22, 2021
  3. Mar 13, 2021
  4. Mar 15, 2021
    • Pierre-Yves David's avatar
      copies: detect files as `touched/salvaged` if they only existed on one side · c52c3c4c
      Pierre-Yves David authored
      The file cannot be merged if there was content to merge on the other side. So
      the previous record was wrong.
      
      In the general case, the file existed only on one side and got touched during the
      merge. So it should detected as touched.
      
      They are a special case where the merge manually prevent the file to be deleted.
      In this case the file is marked as `salvaged`.
      
      The result of this `salvaged` recording, copy-tracing-wise, is the same as
      recording it as `merged`. This is probably why they were recorded as `merged` in
      the first place.
      
      Differential Revision: https://phab.mercurial-scm.org/D10219
      c52c3c4c
  5. Mar 02, 2021
  6. Mar 13, 2021
  7. Mar 10, 2021
    • Pulkit Goyal's avatar
      commit: get info from mergestate whether a file was merged or not · 5a0b930c
      Pulkit Goyal authored
      While commiting a merge, the commit code does not know whether a file was merged
      during `hg merge` or not. This leads the commit code to look for filelog
      ancestor to choose parents of new filelog created on merge commit.
      This leads to wrong results in some cases as demonstrated by previous patch.
      
      From this patch, we start storing information about merged files in mergestate
      in stateextras and then use that on commit to detect whether we need to set two
      parents or not.
      
      Differential Revision: https://phab.mercurial-scm.org/D10149
      5a0b930c
  8. Mar 17, 2021
  9. Mar 19, 2021
    • Matt Harbison's avatar
      commands: necessary annotations and assertions to pass pytype · b26f9560
      Matt Harbison authored
      This is a slightly less forceful incarnation of D7384, where pytype can be
      appeased with some assertions rather than disabling warnings.
      
      Differential Revision: https://phab.mercurial-scm.org/D10236
      b26f9560
    • Matt Harbison's avatar
      typing: mark the argument to mercurial.i18n.gettext() non-Optional · 2c0e35f6
      Matt Harbison authored
      Few if any of the callers are handling a `None` return, which is making pytype
      complain.  I tried adding @overload definitions to indicate the bytes -> bytes
      and None -> None relationship, but pytype doesn't seem to apply that to `_()`
      through the function assignment.  What did work was to change `_()` into its own
      function that called `gettext()`, but that has an extra function call overhead.
      Even putting that function into an `if pycompat.TYPE_CHECKING` block and leaving
      the existing assignments in the `else` block caused pytype to lose track of the
      @overloads.
      
      At that point, I simply gave up.  PyCharm doesn't like that it can return None,
      given the new type hints, but pytype doesn't complain about this nor does it
      see any callers passing None.  The most important thing here is to catch str
      being passed anyway.
      
      Differential Revision: https://phab.mercurial-scm.org/D10235
      2c0e35f6
  10. Mar 18, 2021
  11. Mar 17, 2021
  12. Mar 19, 2021
  13. Mar 20, 2021
  14. Mar 19, 2021
  15. Mar 18, 2021
  16. Mar 13, 2021
  17. Mar 12, 2021
  18. Mar 01, 2021
  19. Mar 10, 2021
  20. Jan 13, 2021
    • Jörg Sonnenberger's avatar
      node: introduce nodeconstants class · 6266d195
      Jörg Sonnenberger authored
      In preparing for moving from SHA1 hashes to a modern hash function,
      place nullid and other constant magic vules in a class. Provide the
      active set of constants in the repository and push it down. Provide
      nullid directly in strategic places like the repository as it is
      accessed very often. This changeset introduces the API change, but not
      the mechanical replacement of the node.py attributes itself.
      
      Differential Revision: https://phab.mercurial-scm.org/D9750
      6266d195
  21. Mar 10, 2021
Loading