Skip to content
Snippets Groups Projects
  1. Nov 20, 2011
  2. Nov 18, 2011
  3. Nov 20, 2011
  4. Nov 18, 2011
  5. Nov 20, 2011
  6. Nov 11, 2011
  7. Nov 18, 2011
    • Patrick Mezard's avatar
      mdiff: replace wscleanup() regexps with C loops · eeac5e179243
      Patrick Mezard authored
      On my system it reduces:
      
        hg annotate -w mercurial/commands.py
      
      from 36s to less than 8s, to be compared with 6.3s when run without whitespace
      options.
      eeac5e179243
    • Patrick Mezard's avatar
      mdiff: split lines in allblocks() only when necessary · b35cf47286a6
      Patrick Mezard authored
      These are only required to handle the --ignore-blank-lines case
      b35cf47286a6
    • Patrick Mezard's avatar
      annotate: support diff whitespace filtering flags (issue3030) · a84698badf0b
      Patrick Mezard authored
      splitblock() was added to handle blocks returned by bdiff.blocks() which differ
      only by blank lines but are not made only of blank lines. I do not know exactly
      how it could happen but mdiff.blocks() threshold behaviour makes me think it
      can if those blocks are made of very popular lines mixed with popular blank
      lines. If it is proven to be wrong, the function can be dropped.
      
      The first implementation made annotate share diff configuration entries. But it
      looks like users will user -w/b for annotate but not for diff, on both the
      command line and hgweb. Since the latter cannot use command line entries, we
      introduce a new [annotate] section duplicating the diff whitespace options.
      a84698badf0b
  8. Nov 20, 2011
  9. Nov 18, 2011
  10. Nov 16, 2011
  11. Nov 17, 2011
  12. Nov 16, 2011
    • Thomas De Schampheleire's avatar
      hook: flush stdout before redirecting to stderr · 8b011ededfb2
      Thomas De Schampheleire authored
      When hook output redirection is enabled (e.g. when cloning over ssh), hook
      output on stdout is redirected to stderr, to prevent the repository data on
      stdout from being corrupted.
      In certain cases, the redirection could cause part of the repository data to
      end up on stderr as well. In case of a clone, this causes:
      "abort: consistency error in delta!"
      
      This was seen with a clone over ssh, an outgoing hook present (any
      non-python type, e.g. 'pwd'), on certain repositories only,
      probably depending on the distribution of the sent data)
      
      This patch updates the hook redirection code to flush stdout before
      redirecting, removing the problem.
      8b011ededfb2
    • Patrick Mezard's avatar
      import: fix parent selection when importing merges · 6cae68a361ed
      Patrick Mezard authored
      With "wp1" and "wp2" the current working directory parents, "p1" and "p2" the
      patch parents and "parents" the resulting commit parents, the current behaviour
      is:
      
      --bypass --exact p2 parents
      0        0       0  [wp1, wp2]
      0        0       1  [wp1, wp2]/buggy
      0        1       0  [p1]
      0        1       1  [p1, p2]
      1        0       0  [wp1, wp2]
      1        0       1  [p1, p2]
      1        1       0  [p1]
      1        1       1  [p1, p2]
      
      The original behaviour before f53dc0787424 was:
      
      --bypass --exact p2 parents
      0        0       0  [wp1, wp2]
      0        0       1  if p1 == wp1 then [p1, p2] otherwise [wp1, wp2]
      0        1       0  [p1]
      0        1       1  [p1, p2]
      
      This patch restores the previous behaviour when --bypass is not set, and align
      --bypass behaviour when --exact is not set with merge diffs.
      6cae68a361ed
  13. Nov 14, 2011
  14. Nov 13, 2011
  15. Nov 12, 2011
  16. Nov 13, 2011
  17. Nov 17, 2011
  18. Nov 15, 2011
  19. Nov 11, 2011
  20. Nov 17, 2011
  21. Nov 12, 2011
Loading