Skip to content
Snippets Groups Projects
  1. Feb 16, 2022
  2. Feb 15, 2022
  3. Feb 14, 2022
  4. Feb 07, 2022
  5. Jan 14, 2022
  6. Feb 10, 2022
  7. Feb 03, 2022
  8. Jan 20, 2022
    • Martin von Zweigbergk's avatar
      simplemerge: take arguments as annotated context objects · 77e24ee8
      Martin von Zweigbergk authored
      The labels we put in conflict markers are formatted so the part before
      the ':' (typically says things like "local") is padded so the ':' is
      aligned among the labels. That means that if you specify a long label
      for "base" but the conflict marker style is "merge" (i.e. 2-way), the
      other two will have unwanted padding. We often don't specify a label
      for the base, so we don't notice the problem (and it may very well be
      that it didn't exist before my D11972).
      
      I think the best fix is to pass the labels along with the context
      objects, so the low-level code that switches on the marker style to
      use (i.e. `simplemerge`) can do the formatting. This patch starts
      doing that by passing a fully-formatted label to `simplemerge`. A
      coming patch will move the formatting to `simplemerge`.
      
      Differential Revision: https://phab.mercurial-scm.org/D12013
      77e24ee8
  9. Jan 08, 2022
  10. Dec 14, 2021
    • Martin von Zweigbergk's avatar
      simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels · c9141848
      Martin von Zweigbergk authored
      Before this patch, we use a combination of `mode` and `labels` to
      decide which marker style to use. That's mostly my own fault because I
      was the one who added the `mergediff` as a "mode" instead of adding a
      separate argument for marker style. Still, let's make these arguments
      more orthogonal by ignoring the number of labels when deciding which
      marker style to use.
      
      This refactoring makes it a little clearer in the simplemerge
      *extension* that passing more than 2 `--label` arguments changes the
      marker style.
      
      Differential Revision: https://phab.mercurial-scm.org/D11972
      c9141848
  11. Jan 04, 2022
  12. Jan 03, 2022
  13. Nov 22, 2021
    • Raphaël Gomès's avatar
      backout: backed out changeset 5d83a40cd3f8 · 0ad593b6
      Raphaël Gomès authored
      This is the re-send of the backout in D11757 that I accidentally queued. I'll
      rewrite the original commit message:
      
      ...sigh
      
      We do not have Python 3 packaging for thg on Windows where the vast majority of
      of users use the thg installer for Mercurial. Until this is done (hopefully
      this cycle), we're keeping Python.
      
      (end of the old commit message)
      
      On top of this, we have a solid lead to have competent people take care of this
      packaging issue for us in time for the 6.1 release, which is really the main
      reason for us to wait. We're trying our best to make this work, so please bear
      with us.
      
      Differential Revision: https://phab.mercurial-scm.org/D11770
      0ad593b6
  14. Nov 24, 2021
  15. Nov 16, 2021
  16. Nov 25, 2021
  17. Nov 17, 2021
  18. Nov 19, 2021
  19. Nov 16, 2021
  20. Nov 10, 2021
  21. Oct 21, 2021
  22. Oct 04, 2021
  23. Sep 28, 2021
    • Martin von Zweigbergk's avatar
      errors: raise InputError on bad revset to revrange() iff provided by the user · 5ced12cf
      Martin von Zweigbergk authored
      Most callers of `scmutil.revrange()` pass in a revset provided by the
      user. If there are problems resolving that, it should result in an
      `InputError` and exit code 10 (when using detailed exit
      codes). However, there are also some callers that pass in revsets not
      provided by the user. `InputError` is not appropriate in those
      cases. This patch therefore introduces a wrapper around
      `scmutil.revrange()` that simply converts the exception type. I put it
      in `logcmdutil.py` since that seems to be the lowest-level module in
      the (poorly defined) UI layer.
      
      Differential Revision: https://phab.mercurial-scm.org/D11560
      5ced12cf
    • Raphaël Gomès's avatar
      windows-ci: temporarily allow Windows jobs to fail · 750920b1
      Raphaël Gomès authored
      We have unfortunately ran out of free credit on the runners we were using from
      OVH for the Windows CI. We will be disabling the two remaining ones on the 30th
      of September, hence we need the CI to pass even if Windows jobs cannot start as
      a temporary measure. Hopefully we can find another way of getting Windows
      runners soon.
      
      Differential Revision: https://phab.mercurial-scm.org/D11499
    • Pierre-Yves David's avatar
      dirstate: drop all logic around the "non-normal" sets · 060cd909
      Pierre-Yves David authored
      The dirstate has a lot of code to compute a set of all "non-normal" and
      "from_other_parent" entries.
      
      This is all used in one, unique, location, when `setparent` is called and moved
      from a merge to a non merge. At that time, any "merge related" information has
      to be dropped. This is mostly useful for command like `graft` or `shelve` that
      move to a single-parent state -before- the commit. Otherwise the commit will
      already have removed all traces of the merge information in the dirstate (e.g.
      for a regular merges).
      
      The bookkeeping for these sets is quite invasive. And it seems simpler to just
      drop it and do the full computation in the single location where we actually
      use it (since we have to do the computation at least once anyway).
      
      This simplify the code a lot, and clarify why this kind of computation is
      needed.
      
      The possible drawback compared to the previous code are:
      - if the operation happens in a loop, we will end up doing it multiple time,
      - the C code to detect entry of interest have been dropped, for now. It will be
        re-introduced later, with a processing code directly in C for even faster
        operation.
      
      Differential Revision: https://phab.mercurial-scm.org/D11507
      060cd909
  24. Sep 17, 2021
  25. Sep 01, 2021
  26. Aug 24, 2021
Loading