Skip to content
Snippets Groups Projects
  1. Jul 12, 2020
  2. Nov 20, 2020
  3. Oct 23, 2020
  4. Aug 13, 2020
  5. Sep 15, 2020
  6. Oct 11, 2020
  7. Aug 13, 2020
  8. Sep 15, 2020
  9. Aug 18, 2020
    • Dan Villiom Podlaski Christiansen's avatar
      import: _always_ save the map after an import · c3f19d62
      Dan Villiom Podlaski Christiansen authored
      Pulls aren't done in a transaction, so you can safely interrupt them,
      and get a partial result. Unfortunately, the commit map isn't updated,
      so once you resume the pull, it'll begin at the start at same commit as
      last, rather than where interrupted.
      
      With this tiny change, I can interrupt and resume long-running pulls
      at leisure.
      
      There's no test, since writing the required infrastructure seems a bit
      overkill.
      c3f19d62
  10. Aug 03, 2020
    • muxator's avatar
      gitnodekw: do not crash on hg incoming when log template includes gitnode() · d6ac1ae9
      muxator authored
      Before this change, if the user's log template included a call to gitnode() to
      show the git commit hash, invoking "hg incoming" on a git repository that had at
      least one incoming change failed with:
      
         AttributeError: 'overlayrepo' object has no attribute 'githandler'
      
      Since an incoming changeset should already have well defined git commit hashes,
      there is no apparent reason for which "hg incoming" should not have this
      information already.
      
      This change is a workaround that removes any reference to the hg-git structures
      from the incoming changeset, thus merely avoiding the crash.
      
      Fixes #239 (#239)
      d6ac1ae9
  11. Aug 06, 2020
  12. Jun 14, 2020
  13. Jul 23, 2020
    • Manuel Jacob's avatar
      compat: fix compatibility with upstream Mercurial · bf279164
      Manuel Jacob authored
      Mercurial changeset 3b7aabd02e11 changed some code from `repo[ctx.p1().node()]`
      to `ctx.p1()`. `ctx.p1()` is using `ctx._parents`. The base class’s `_parents`
      returns instances of type `changectx` instead of `overlaychangectx`, leading to
      a crash later. Therefore we override `_parents` instead of `parents()`.
      
      The base class’s `parents()` method returns `self._parents`, so the return value
      of `parents()` is unchanged.
      bf279164
  14. Jun 11, 2020
  15. Jun 13, 2020
  16. Jun 12, 2020
  17. May 13, 2020
  18. May 10, 2020
    • Manuel Jacob's avatar
      hggit: fix safebranchrevs() for the case when the remote repo is not a gitrepo · 3483dccd
      Manuel Jacob authored
      (folded with intermediate revision with new message by Georges Racinet)
      
      The previous conditional was wrong: in current Mercurial, 'co' is in principle
      not an integer. The condition on integer has been introduced for the port to
      py3, but does not change the fact that changelog.__contains__ is for integers.
      
      The original intent in a90fe3e8a8c3 was probably to exclude local repositories,
      but this had the side effect of setting `co=None` in all cases, hence affecting
      pulls having nothing to do with hg-git, as the new test demontstrates.
      
      What we really want is to force `co=None` only for remote Git repositories,
      for the reasons explained in the comment.
      
      Previous intermediate commit was
      
        cleanup: eliminate if statement with condition that is always true
      
        'co' is never an integer. It’s always None or of type bytes. Apparently 'co'
        was of type int some years ago.
      
        A proper fix would require to fix the lookup() remote command or change hg to
        not require it e.g. when pulling with -r. For now, let’s remove the broken
        code and be honest about that we give up.
      3483dccd
    • Manuel Jacob's avatar
      cleanup: use more precise variable name · 2e68868b
      Manuel Jacob authored
      2e68868b
    • Manuel Jacob's avatar
      hggit: add comment explaining why we return None in safebranchrevs() · b6d9fe6e
      Manuel Jacob authored
      A test for a case mentioned in the comment will be added in a subsequent
      changeset.
      b6d9fe6e
    • Manuel Jacob's avatar
Loading