Skip to content
Snippets Groups Projects
  1. Feb 13, 2024
    • Georges Racinet's avatar
      RHGitaly: bumped hg-core to Mercurial 6.6.3 · 9d85d59c
      Georges Racinet authored
      It contains an important fix for `ChangelogRevisionData.files`. We
      don't seem to use that method yet, but are prone to, as it would be
      the main backing data access for the likes of `LastCommitForPath`
      9d85d59c
  2. Feb 09, 2024
  3. Jan 29, 2024
  4. Jan 28, 2024
    • Georges Racinet's avatar
      MercurialOperations: define and implement MergeBranch · dca77bae
      Georges Racinet authored
      This is the counterpart of Gitaly's `OperationService.UserMergeBranch`.
      
      We had to make a dedicated method because
      
      - the two-phase system of Gitaly does not make sense for Mercurial:
        merging does move branches right away, as branch information is
        enclosed in the changeset. We started development by mimicking it,
        but it soon became overly complicated
      - we have the `semi_linear` field, nothing alike on the Gitaly side,
        since the method always performs a merge, and ours would fast-forward
        by default.
      - we have error cases that do not exist in Git (obsolescence and
        instability checks). Actually, we reuse some of Gitaly errors
        to ease the burden of treatment on the client side. The case
        of `reference_check` being a borderline, but it shouldn't matter
        much.
      
      (bumping minimal py-heptapod version for `GitRepo.git()` helper method)
      dca77bae
  5. Jan 29, 2024
  6. Jan 28, 2024
  7. Jan 23, 2024
    • Georges Racinet's avatar
      Comparison tests: separated method to compare exceptions · 794bbdd4
      Georges Racinet authored
      As explained in the docstring, this will allow comparing exceptions
      obtained with different gRPC methods. First use-case will be Mercurial
      version of `UserMergeBranch` that will have to differ yet will return
      same exceptions and structured errors.
      
      Also introducing a way normalize structured errors: some of them, such
      as `MergeConflictError` can indeed contain commit ids.
      794bbdd4
    • Georges Racinet's avatar
      Servicer: adopted changeset publication method · d4c14b0b
      Georges Racinet authored
      Because of the duality bewteen `OperationService` and
      `MercurialOperationService`, it will be useful to have it upstairs in the
      class hierarchy (attributes are really used, to that moving to an
      utility module will not be appropriate)
      d4c14b0b
  8. Jan 18, 2024
  9. Jan 20, 2024
  10. Jan 17, 2024
  11. Jan 15, 2024
  12. Jan 13, 2024
  13. Jan 09, 2024
Loading