Skip to content
Snippets Groups Projects
  1. Dec 18, 2024
  2. Feb 19, 2025
  3. Feb 03, 2023
    • Pierre-Yves David's avatar
      diff: add a --ignore-changes-from-ancestors option · 68866542
      Pierre-Yves David authored
      This is a generalisation of the new feature from evolve but for any diff, it
      allow to compares changes to patches regardless of the changes introduced by
      ancestors, this is typically useful after rebase and graft.
      
      I am not very happy about the name, but it is still experimental, so that can
      be improved later.
      
      Having the ability to compare ranges of commit would probably be handy too, but
      this changeset focus in getting the basic case in. We have to think about the
      UI a bit ahead however.
      68866542
  4. Feb 18, 2025
  5. Feb 17, 2025
  6. Feb 18, 2025
  7. Feb 19, 2025
  8. Feb 18, 2025
  9. Feb 07, 2025
    • Mitchell Kember's avatar
      rhg-annotate: support whitespace options · 874c64e0
      Mitchell Kember authored
      This adds support to rhg annotate for all the whitespace options:
      
          -w, --ignore-all-space
          -b, --ignore-space-change
          -B, --ignore-blank-lines
          -Z, --ignore-space-at-eol
      
      Note that --ignore-blank-lines has no effect on annotate so it is ignored. You
      can see this in dagop.py _annotepair which only checks if blocks are '=' or not,
      whereas the effect of --ignore-blank-lines is to change some '!' into '~'.
      
      When the other 3 are combined, we use the strongest option since -w implies -b
      and -b implies -Z. This is not explicit in the Python implementation, but I have
      verified that's how it behaves.
      874c64e0
  10. Feb 12, 2025
  11. Feb 06, 2025
  12. Feb 05, 2025
    • Arseniy Alekseyev's avatar
      sshpeer: fix deadlock on short writes · 7aec18bd
      Arseniy Alekseyev authored
      This commit makes the `sshpeer.doublepipe` object retry on short write,
      which fixes a deadlock in hg client-server communication, in
      particular when client needs to send a large message.
      
      Apparently Mercurial relies on `write` method on file objects
      to never return short writes, without checking, which leads to deadlocks.
      
      This work fine when the underlying file object is buffered,
      since buffered writers never return short writes.
      (why buffering has anything to do with this I don't know, but ok)
      
      It breaks horribly with raw IO, which happens to be used in sshpeer.
      7aec18bd
  13. Feb 18, 2025
  14. Feb 17, 2025
  15. Feb 11, 2025
  16. Feb 06, 2025
  17. Feb 04, 2025
Loading