Skip to content
Snippets Groups Projects
  1. Jan 24, 2022
  2. Jan 17, 2022
    • Pierre-Yves David's avatar
      requirements: move "bookmark in store" requirements in the right module · dfbfa802876b
      Pierre-Yves David authored
      There seems to be no reasons to not have it with the others.
      
      Differential Revision: https://phab.mercurial-scm.org/D12030
      dfbfa802876b
    • Pierre-Yves David's avatar
      stream-clone: add a explicit test for format change during stream clone · a6f16ec07ed7
      Pierre-Yves David authored
      They are different kind of requirements, the one which impact the data storage
      and are relevant to the files being streamed and the one which does not. For
      example some requirements are only relevant to the working copy, like sparse, or
      dirstate-v2.
      
      Since they are irrelevant to the content being streamed, they do not prevent the
      receiving side to use streaming clone and mercurial skip adverting them over
      the wire and, ideally, within the bundle.
      
      In addition, this let the client decide to use whichever format it desire for
      the part that does not affect the store itself. So the configuration related to
      these format are used as normal when doing a streaming clone.
      
      In practice, the feature was not really tested and is badly broken with bundle-2,
      since the requirements are not filtered out from the stream bundle.
      
      So we start with adding simple tests as a good base before the fix and adjust
      the feature.
      
      Differential Revision: https://phab.mercurial-scm.org/D12029
      a6f16ec07ed7
  3. Jan 14, 2022
  4. Jan 17, 2022
  5. Jan 24, 2022
  6. Jan 21, 2022
  7. Jan 18, 2022
  8. Jan 20, 2022
    • Martin von Zweigbergk's avatar
      simplemerge: take over formatting of label from `filemerge` · 3c8cc987672e
      Martin von Zweigbergk authored
      The padding we do of conflict labels depends on which conflict marker
      style is used. For two-way conflict markers (the default), the length
      of the base label shouldn't matter. It does before this patch,
      however. This patch moves the formatting from `filemerge` to
      `simplemerge`. The latter knows which conflict marker style to use, so
      it can easily decide about the padding.
      
      This change will allow us to use more descriptive "base" labels
      without causing illogical padding in 2-way markers. I'll do that next.
      
      One wrinkle is that we pass the same labels to external merge tools. I
      decided to change that in this patch to be simpler: no padding, and no
      ellipsis to fit within 80 columns. My reasoning is that the typical
      external, 3-or-4-panel merge tool doesn't show the labels on top of
      each others, so the padding doesn't make sense there. The ellipsis is
      probably not necessary because the external tools probably have their
      own way of dealing with long labels. Also, we limit them to "80 - 8"
      to fit the "<<<<<<< " before, which is almost definitely not what an
      external tool would put there.
      
      Differential Revision: https://phab.mercurial-scm.org/D12019
      3c8cc987672e
  9. Jan 21, 2022
  10. Jan 20, 2022
  11. Jan 21, 2022
  12. Jan 18, 2022
  13. Dec 30, 2021
  14. Jan 17, 2022
  15. Jan 14, 2022
  16. Jan 12, 2022
  17. Jan 08, 2022
  18. Jan 12, 2022
  19. Jan 08, 2022
Loading