Skip to content
GitLab
Projects Groups Topics Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Register
  • Sign in
  • H hg-git
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
  • Issues 3
    • Issues 3
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 0
    • Merge requests 0
  • Deployments
    • Deployments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • Repository
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
Collapse sidebar
  • heptapodheptapod
  • hg-git
  • Merge requests
  • !10

Fix auto detection of MR merges (heptapod#47)

  • Review changes

  • Download
  • Patches
  • Plain diff
Merged Georges Racinet requested to merge topic/heptapod/fix-heptapod-issue-47 into branch/heptapod Jul 31, 2019
  • Overview 0
  • Commits 8
  • Pipelines 0
  • Changes 3

At this stage, we just can't avoid to cut the Mercurial push into several Git pushes, and we have to go explicit for that with a range of new options. A corresponding change in the Mercurial sync hook takes care of calling these pushees with the correct options.

This comes at a price: three pushes with exports etc are more costly than just one, although optimization could be done (see commits descriptions for more level).

The next level would be to call GitLab hooks directly from Mercurial, somewhat akin to what we'll do once we drop hg-git completely. In the meanwhile, this is functionally much more correct (see heptapod-tests!1 (merged) to learn about the new scenarios)

Edited Aug 05, 2019 by Georges Racinet
Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: topic/heptapod/fix-heptapod-issue-47