Skip to content
Snippets Groups Projects
  1. 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
  2. Aug 06, 2020
  3. Jun 12, 2020
  4. May 13, 2020
  5. 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
      py3: fix map() without effect on py3 · b227b36b
      Manuel Jacob authored
      b227b36b
  6. May 04, 2020
  7. May 08, 2020
  8. Mar 06, 2020
  9. May 03, 2020
  10. Mar 06, 2020
  11. May 03, 2020
    • Manuel Jacob's avatar
      py3: byteify sources · 86feb288
      Manuel Jacob authored
      These files were byteified using hg’s contrib/byteify-strings.py:
      
      - contrib/hggitperf.py
      - hggit/compat.py
      - hggit/git2hg.py
      - hggit/gitdirstate.py
      - hggit/gitrepo.py
      - hggit/git_handler.py
      - hggit/hg2git.py
      - hggit/hgrepo.py
      - hggit/overlay.py
      - hggit/util.py
      - hggit/verify.py
      - hggit/_ssh.py
      - hggit/__init__.py
      - tests/commitextra.py
      
      Additionally, "--treat-as-kwargs opts kwargs" were passed as arguments.
      
      Some of the changes will be undone later. Because of the large amount of
      literals that should be changed in comparison to the few literals that should
      stay, it seemed better to do it this way around.
      
      Raw literals are not changed by the script. Some of them will be changed
      manually in a separate changeset.
      86feb288
  12. Nov 25, 2019
  13. Mar 05, 2020
    • Manuel Jacob's avatar
      py3: use print as function · 7a13f6fa
      Manuel Jacob authored
      * run `find . -name "*.py" -print0 -o -path ./tests/hghave | xargs -I {} -0 2to3 --fix=print --write {}`
      * run `find . -name "*.py" -print0 -o -path ./tests/hghave | xargs -I {} -0 2to3 --doctests_only --fix=print --write {}`
      * remove extra newline at end of files introduced by last command
      * add `from __future__ import print_function` to Python files
      7a13f6fa
  14. Nov 22, 2019
  15. Nov 12, 2019
  16. Nov 20, 2019
  17. Nov 18, 2019
  18. Aug 07, 2019
  19. May 19, 2019
  20. May 16, 2019
  21. Mar 18, 2019
  22. Dec 02, 2018
  23. Oct 15, 2018
  24. Feb 08, 2018
Loading