Skip to content
Snippets Groups Projects
  1. Jul 09, 2021
  2. Jul 07, 2021
  3. Aug 27, 2021
  4. Jul 31, 2021
  5. Jul 02, 2021
    • Dan Villiom Podlaski Christiansen's avatar
      tests: don't rely on cloning into an empty directory · c3a6d1e748b5
      Dan Villiom Podlaski Christiansen authored
      Mercurial 5.8 and earlier would delete such a directory on errors,
      and the test accidentally relied on that behaviour. To work around
      that, we clone into the _current_ directory, which Mercurial never
      deletes.
      
      The test now reveals the incorrect behaviour, but the current design
      makes that difficult to address without tracking unnecessary state.
      c3a6d1e748b5
  6. Jun 21, 2021
  7. Jun 18, 2021
  8. Jun 21, 2021
  9. Jun 24, 2021
  10. Jun 22, 2021
  11. Jun 18, 2021
  12. May 12, 2021
    • Dan Villiom Podlaski Christiansen's avatar
      phases: avoid accidentally marking a divergent bookmark as public · 4fb7c538b817
      Dan Villiom Podlaski Christiansen authored
      This essentially makes our behaviour match the documentation, which
      states that ``git.public`` refers to “a list of Git branches”. It
      didn't: it actually referred to a list of Mercurial changesets that we
      would publish on push.
      
      Previously, this would lead to a rather nonsensical situation:
      
      * The remote ``stable`` points to commit A
      * The local, corresponding ``stable`` bookmark points to commit B
      * ``git.public`` is configured to list ``stable``
      * The user performs a pull.
      
      Whatever you'd expect to happen in that case, it mostly likely
      _wouldn't_ be for B to be published, which was what happened.
      
      Please note that this change breaks backwards compatibility;
      previously, having ``git.public`` point to e.g. ``default/master``
      would cause that to be published. But that was always undocumented.
      4fb7c538b817
  13. Jun 18, 2021
  14. Jun 11, 2020
  15. Jun 17, 2021
  16. May 08, 2021
  17. Jun 18, 2021
  18. Sep 15, 2020
  19. Jun 13, 2021
  20. May 19, 2021
  21. Apr 16, 2021
  22. May 21, 2021
  23. May 10, 2021
  24. May 12, 2021
  25. May 05, 2021
  26. Dec 26, 2020
    • Dan Villiom Podlaski Christiansen's avatar
      push & pull: consolidate invalid path handling, default to skipping · b46639f34ff6
      Dan Villiom Podlaski Christiansen authored
      The current behaviour is quite unhelpful, given that it either allows
      you to abort the conversion or generate a bogus repository. As an
      example, GitHub rejects anything with a `.git` in it.
      
      Instead, the new default is to issue a warning and simply discard the
      dangerous files. Although this might cause problems down the line, I'd
      much rather have those problems than just have hg-git give up.
      
      As an example of such a bogus repository, look no further than this
      one. c43c02cc803a committed some tests from Dulwich with nested Git
      repositories, and a061dce264b7 renamed them. Prior to this change,
      hg-git could not push its own repository to GitHub.
      
      Further more, Mercurial disallows paths containing carriage return
      (CR) and newline (NL) characters; as noted in the original Mercurial
      bug report that enabled this behaviour,[1] such paths appear for
      folder icons on macOS. This was reported on the list by Uwe Brauer.[2]
      
      Since Mercurial simply cannot store these files, we always either skip
      them or abort the conversion.
      
      [1] https://bz.mercurial-scm.org/show_bug.cgi?id=352
      [2] https://groups.google.com/g/hg-git/c/Rz3oRzrMS3Q/m/RRq4AIMsBAAJ
      b46639f34ff6
  27. Dec 22, 2020
Loading