Skip to content
Snippets Groups Projects
  1. Jul 09, 2019
  2. Jul 08, 2019
  3. Jul 04, 2019
  4. Jul 08, 2019
  5. Jul 06, 2019
  6. Jun 20, 2019
    • Augie Fackler's avatar
      4eaf7197a740
    • Kyle Lippincott's avatar
      patch: use a short, fixed-size message for last line of prompt (issue6158) · f802a75da585
      Kyle Lippincott authored
      See issue6158 and the previous commit for examples of what might go wrong if we
      have some combinations of readline version and terminal and need to wrap the
      line.
      
      Briefly: readline may not display the beginning of the last line of the prompt,
      or it may print over it with the end of the prompt, making it difficult for
      users to know what's going on.
      
      Differential Revision: https://phab.mercurial-scm.org/D6563
      f802a75da585
    • Kyle Lippincott's avatar
      filemerge: make last line of prompts <40 english chars (issue6158) · 4764e8436b2a
      Kyle Lippincott authored
      I've chosen <40 as the target so that other languages that may have a 2x blowup
      in character count can still have a chance to fit into an 80 column screen.
      
      Previously, we would show a prompt like:
      
      ```
      keep (l)ocal [dest], take (o)ther [source], or leave (u)nresolved for some/potentially/really/long/path?
      ```
      
      On at least some systems, if readline was in use then the last line of the
      prompt would be wrapped strangely if it couldn't fit entirely on one line. This
      strange wrapping may be just a carriage return without a line feed, overwriting
      the beginning of the line; example (100 columns wide, 65 character filename, and
      yes there's 10 spaces on the end, I assume this is to handle the user inputting
      longest word we provide as an option, "unresolved"):
      
      ```
      ng/dir/name/that/does/not/work/well/with/readline/file.txt? ave (u)nresolved for some/lon
      ```
      
      In some cases it may partially wrap onto the next line, but still be missing
      earlier parts in the line, such as below (60 columns wide, 65 character
      filename):
      
      ```
       rev], or leave (u)nresolved for some/long/dir/name/that/do
      s/not/work/well/with/readline/file.txt?
      ```
      
      With this fix, this looks like this on a 60 column screen:
      
      ```
      tool vim_with_markers (for pattern some/long/dir/name/that/d
      oes/not/work/well/with/readline/file.txt) can't handle binar
      y
      tool meld can't handle binary
      tool vim_with_markers can't handle binary
      tool internal:merge3 can't handle binary
      tool merge can't handle binary
      no tool found to merge some/long/dir/name/that/does/not/work
      /well/with/readline/file.txt
      file 'some/long/dir/name/that/does/not/work/well/with/readli
      ne/file.txt' needs to be resolved.
      You can keep (l)ocal [working copy], take (o)ther [merge rev
      ], or leave (u)nresolved.
      What do you want to do?
      ```
      
      Differential Revision: https://phab.mercurial-scm.org/D6562
      4764e8436b2a
  7. Jul 06, 2019
  8. Jul 04, 2019
  9. Jul 01, 2019
  10. Jun 30, 2019
  11. Jun 11, 2019
  12. Feb 02, 2019
    • Gregory Szorc's avatar
      zeroconf: port to Python 3 · fa2071753dc2
      Gregory Szorc authored
      Since we're using the source transformer on Python 3, calls into
      Zeroconf and return values from it are generally bytes.
      
      But various socket functions require str on Python 3.
      
      This commit contains enough changes to coerce test-paths.t into
      passing on Python 3. I suspect there are still a handful of bugs
      on Python 3. But the tests do pass.
      
      Differential Revision: https://phab.mercurial-scm.org/D5805
      fa2071753dc2
  13. Jun 28, 2019
  14. Jun 30, 2019
  15. Jun 28, 2019
  16. May 18, 2019
    • Sushil Khanchi's avatar
      commit: add --force-close-branch flag to close a non-head changeset · 2e1d9414ff71
      Sushil Khanchi authored
      While closing branch from a changeset which is not a branch head
      current implementation abort this action in every case but, there
      can be the situations where the changeset is not a local head but
      could be a remote head. This patch adds the functionality to bypass
      the "abort: can only close branch heads" by introducing
      --force-close-branch flag.
      
      Test case changes demonstrate the new functionality added.
      
      Differential Revision: https://phab.mercurial-scm.org/D6490
      2e1d9414ff71
  17. Jun 28, 2019
  18. Jun 19, 2019
  19. Jun 05, 2019
  20. May 16, 2019
    • Raphaël Gomès's avatar
      rust-dirstate: add "dirs" rust-cpython binding · ce94f9622acd
      Raphaël Gomès authored
      There is an obvious performance and memory issue with those bindings on larger
      repos as it copies and allocates everything at once, round-trip. Like in the
      previous patch series, this is only temporary and will only get better once
      we don't have large data structures going to and from Python.
      
      Differential Revision: https://phab.mercurial-scm.org/D6394
      ce94f9622acd
    • Raphaël Gomès's avatar
      rust-dirstate: add "dirs" Rust implementation · 2dcee6497b0b
      Raphaël Gomès authored
      Following the work done in d1786c1d34fa and working towards the goal of a
      complete Rust implementation of the dirstate, this rewrites the `dirs` class.
      
      There is already a C implementation, which relies heavily on CPython hacks and
      protocol violations for performance, so I don't expect this to perform as well
      for now, as this is very straight-forward code.
      The immediate benefits are new high-level documentation and some unit tests.
      
      Differential Revision: https://phab.mercurial-scm.org/D6393
      2dcee6497b0b
  21. Jun 20, 2019
  22. Jun 27, 2019
Loading