Skip to content
Snippets Groups Projects
  1. Nov 01, 2011
    • Matt Mackall's avatar
      Added tag 2.0 for changeset 41453d55b481 · c23737b76030
      Matt Mackall authored
      c23737b76030
    • Matt Mackall's avatar
      dirstate: don't fail when dropping a not-tracked file (issue3080) · 41453d55b481
      Matt Mackall authored
      Complex merges with divergent renames can cause a file to be 'moved'
      twice, causing dirstate.drop() to be called twice. Rather than try to
      ensure there are no unexpected corner cases where this can happen, we
      simply ignore drops of files that aren't tracked.
      2.0
      41453d55b481
    • Brodie Rao's avatar
      tests: fix readline escape characters in heredoctest.py/test-url.py · 474279be5add
      Brodie Rao authored
      This fix mirrors the changes made to test-doctest.py in b856071435f7
      and 967adcf5910d.
      
      Without this change, tests running heredoctest.py can fail on certain
      versions of OS X when TERM is set to xterm-256color:
      
         $ /opt/local/Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python -m heredoctest <<EOF
         > >>> open('b', 'w').write('this' * 1000)
         > EOF
      +  \x1b[?1034h (no-eol) (esc)
      
      A similar problem occurs with test-url.py:
      
        $ ./run-tests.py test-url.py
      
        --- .../tests/test-url.py.out
        +++ .../tests/test-url.py.err
        @@ -0,0 +1 @@
        +
        ERROR: .../test-url.py output changed
        !
        Failed test-url.py: output changed
        # Ran 1 tests, 0 skipped, 1 failed.
      474279be5add
    • Matt Mackall's avatar
      merge with i18n · f32f71f6c20c
      Matt Mackall authored
      f32f71f6c20c
  2. Oct 31, 2011
  3. Oct 20, 2011
    • Hao Lian's avatar
      largefiles: replace tempfile.NamedTemporaryFile with tempfile.mkstemp · a5a6a9b7f3b9
      Hao Lian authored
      This is consistent with the rest of Mercurial's code, mirroring the
      try-finally-unlink structure elsewhere. Furthermore, it fixes the case where
      largefiles throws an IOError on Windows when the temporary file is opened a
      second time by copytocacheabsolute.
      
      This patch creates the temporary file in the repo's largefiles store rather than
      /tmp, which might be a different filesystem.
      a5a6a9b7f3b9
  4. Oct 31, 2011
  5. Oct 30, 2011
  6. Oct 29, 2011
  7. Oct 28, 2011
  8. Oct 29, 2011
  9. Oct 28, 2011
  10. Oct 27, 2011
  11. Oct 26, 2011
    • Peer Stritzinger's avatar
      revert: fix missing removes when parent was changed in dirstate · 9a2582e325a5
      Peer Stritzinger authored
      When dirstate parent is changed with dirstate.setparent before a
      revert so it no longer points to where the dirstate refered to, revert
      does not remove all files it should:
      
      Revert to a different revision needs also to remove files that are not
      found through disptables and not in the context or parent manifest.
      9a2582e325a5
  12. Oct 27, 2011
    • Matt Mackall's avatar
      check-code: fix issues with finding patterns in unified tests, fix tests · 695ac6aca77f
      Matt Mackall authored
      - old-style patterns without ^ were getting improperly anchored
      - finditer was matching against beginning of line poorly
      - \s was matching newlines
      - [^x] was matching newlines
      
      so we:
      
      - remove earlier hacks for multiline matching
      - fix unified test anchoring by adding .*
      - replace \s with [ \t]
      - replace [^x] with [^\nx]
      - force all matches into multiline mode so ^ anchors work
      
      This uncovers a number of test issues that are then repaired.
      695ac6aca77f
  13. Oct 25, 2011
  14. Oct 26, 2011
  15. Oct 25, 2011
  16. Oct 26, 2011
  17. Oct 24, 2011
    • Patrick Mezard's avatar
      diffstat: be more picky when marking file as 'binary' (issue2816) · 628a4a9e411d
      Patrick Mezard authored
      The 'Bin' marker was added to every changed file for which we could not find
      any diff changes. This included binary files but also copy/renames and mode
      changes. Since Mercurial regular diff format emits a 'Binary file XXX has
      changed' line when fed with binary files, we use that and the usual git marker
      to tell them from other cases. In particular, new empty files are no longer
      reported as binary.
      
      Still, this fix is not complete since copy/renames/mode changes are now
      reported as '0' lines changes, instead of 'Bin'.
      628a4a9e411d
    • Wagner Bruna's avatar
      i18n-pt_BR: synchronized with b74f74b482d8 · 60f93ddd61fd
      Wagner Bruna authored
      60f93ddd61fd
    • Matt Mackall's avatar
      graft: add a test · c1930992e111
      Matt Mackall authored
      c1930992e111
Loading