Skip to content
Snippets Groups Projects
  1. Aug 20, 2010
  2. Aug 18, 2010
    • kiilerix's avatar
      mq: don't inherit default and default-push paths with --mq (issue2333) · 77f1f206
      kiilerix authored
      Configuration from the outer repo is inherited to the patches repo when --mq is
      used.
      
      In case the patches repo only has paths.default configured but the outer repo
      has paths.default-push then the inherited default-push will win. Very
      confusing.
      
      Inheriting the default paths is however wrong in all sane cases, so now we
      explicitly remove them.
      77f1f206
  3. Aug 19, 2010
  4. Aug 17, 2010
  5. Aug 16, 2010
  6. Aug 13, 2010
  7. Aug 17, 2010
  8. Aug 13, 2010
    • Dan Villiom Podlaski Christiansen's avatar
      encoding: improve handling of buggy getpreferredencoding() on Mac OS X · 2be70ca1
      Dan Villiom Podlaski Christiansen authored
      Prior to version 2.7, calling locale.getpreferredencoding() would
      always return 'mac-roman' on Mac OS X. Previously, this was handled by
      a call to locale.setlocale(). Unfortunately, Python 2.6.5 and older
      have a bug where isspace() would incorrectly report True for 0x85 and
      0xa0 after such a call.
      
      In order to fix this, we replace the previous _encodingfixup mapping
      to an _encodingfixers mapping. Rather than mapping encodings to their
      replacement, it maps them to a function returning the
      replacement. This allows us to provide an simplified implementation of
      getpreferredencoding() which extracts the expected encoding and
      restores the locale.
      
      This fix is based on a patch originally submitted by Martijn Pieters
      as well as feedback from Brodie Rao.
      2be70ca1
  9. Aug 15, 2010
  10. Aug 10, 2010
  11. Aug 13, 2010
    • Dan Villiom Podlaski Christiansen's avatar
      test-notify: make it pass on Mac OS X (again) · 3b65c3c3
      Dan Villiom Podlaski Christiansen authored
      Changeset 25e74cd3f023 (from 2008) introduced a hack to handle the
      very long values of $TMPDIR typically seen on Mac OS X. This hack
      expected continuation lines to begin with a tab. However, as a result
      of a change in Python 2.7, changeset 594b98846ce1 made it so
      continuation lines began with a tab. Since then, `test-notify' has
      been broken on Mac OS X.
      
      Merely replacing the tab in the regular expression with a space will
      not work: not only do tab continuations still occur in the message, but
      other lines -- in the body of the message -- also start with a
      space. Luckily, all broken up lines appear to end with either a colon
      or an n, so we can match those, and reinsert them in the replacement.
      3b65c3c3
  12. Aug 15, 2010
  13. Aug 12, 2010
  14. Aug 15, 2010
  15. Aug 14, 2010
  16. Aug 13, 2010
  17. Jul 25, 2010
  18. Aug 13, 2010
  19. Aug 12, 2010
  20. Aug 13, 2010
  21. Aug 12, 2010
  22. Jul 02, 2010
  23. Aug 11, 2010
  24. Aug 09, 2010
    • kiilerix's avatar
      test-dispatch: Make test of removed working directory work on AIX (issue2315) · 423ece53
      kiilerix authored
      AIX sh won't delete its own working directory. Removing it from another process
      works.
      
      Also hide the actual OS error message - operating systems returns different
      errors when getcwd fails.
      423ece53
    • Martin Geisler's avatar
      dirstate: ignore symlinks when fs cannot handle them (issue1888) · ca6cebd8
      Martin Geisler authored
      When the filesystem cannot handle the executable bit, we currently
      ignore it completely when looking for modified files. Similarly, it is
      impossible to set or clear the bit when the filesystem ignores it.
      
      This patch makes Mercurial treat symbolic links the same way.
      
      Symlinks are a little different since they manifest themselves as
      small files containing a filename (the symlink target). On Windows,
      these files show up as regular files, and on Linux and Mac they show
      up as real symlinks.
      
      Issue1888 presents a case where the symlink files are better ignored
      from the Windows side. A Linux client creates symlinks in a working
      copy which is shared over a network between Linux and Windows clients.
      
      The Samba server is helpful and defererences the symlink when the
      Windows client looks at it. This means that Mercurial on the Windows
      side sees file content instead of a file name in the symlink, and
      hence flags the link as modified. Ignoring the change would be much
      more helpful, similarly to how Mercurial does not report any changes
      when executable bits are ignored in a checkout on Windows.
      
      An initial checkout of a symbolic link on a file system that cannot
      handle symbolic links will still result in a regular file containing
      the target file name as its content. Sharing such a checkout with a
      Linux client will not turn the file into a symlink automatically, but
      'hg revert' can fix that. After the revert, the Windows client will
      see the correct file content (provided by the Samba server when it
      follows the link on the Linux side) and otherwise ignore the change.
      
      Running 'hg perfstatus' 10 times gives these results:
      
        Before:          After:
        min: 0.544703    min: 0.546549
        med: 0.547592    med: 0.548881
        avg: 0.549146    avg: 0.548549
        max: 0.564112    max: 0.551504
      
      The median time is increased about 0.24%.
      ca6cebd8
Loading