Skip to content
Snippets Groups Projects
  1. Aug 26, 2010
  2. Aug 17, 2010
  3. Aug 16, 2010
  4. Aug 13, 2010
  5. Aug 26, 2010
    • Thomas Arendsen Hein's avatar
      Fix merge-tools.checkconflicts · 8e7960fe
      Thomas Arendsen Hein authored
      re.match only looks at the beginning of the merged file, and without
      re.MULTILINE the file had to end with ">>>>>>> something".
      
      Now conflict markers inside the file are found, too.
      8e7960fe
  6. Aug 22, 2010
    • Brodie Rao's avatar
      alias: make shadowing behavior more consistent (issue2054) · 18e1e752
      Brodie Rao authored
      Currently, given an alias like the following:
      
          [alias]
          summary = summary --remote
      
      The alias might be executed - or it might not - depending on the order
      of the cmdtable dict.
      
      This happens because cmdalias gets assigned back to the cmdtable like so:
      
          cmdtable['summary'] = ...
      
      Yet '^summary|sum' is still in the table, so which one cmdutil.findcmd()
      chooses isn't deterministic.
      
      This patch makes cmdalias assign back to '^summary|sum'. It uses the same
      cmdtable key lookup that extensions.wrapcommand() does.
      18e1e752
  7. Aug 24, 2010
  8. Aug 25, 2010
  9. Jul 01, 2010
  10. Aug 23, 2010
  11. Aug 21, 2010
  12. Aug 20, 2010
  13. Aug 19, 2010
    • David Soria Parra's avatar
    • Patrick Mezard's avatar
      win32: remove useless lstat() fallback in nlinks() · ccd8e592
      Patrick Mezard authored
      The fallback was introduced by 3b4f05ff3130 at the same time than
      nlinks(). Apparently it only handles the case where target path
      does not exist. Just raise IOError directly.
      ccd8e592
    • Patrick Mezard's avatar
      win32: correctly break hardlinks on network drives (issue761) · 50523b44
      Patrick Mezard authored
      win32.nlinks() was often returning 1 instead of the correct
      hardlinks count when reading from network drives. This made
      commit or push to a repository on a network share to fail
      breaking the hardlinks in the datastore, possibly causing
      integrity errors in repositories linked locally on the remote
      side.
      
      Here is what the MSDN says about GetFileInformationByHandle():
      
        Depending on the underlying network features of the operating
        system and the type of server connected to, the
        GetFileInformationByHandle function may fail, return partial
        information, or full information for the given file.
      
      In practice, we never got the correct hardlinks count when
      reading from and to many combinations of Window XP, 2003, Vista
      and 7, via network drives or RDP shares. It always returned 1
      instead. The only setup returning an accurate links count was a
      samba on Debian.
      
      To avoid this, Mercurial now breaks the hardlinks unconditionally
      when writing to a network drive.
      50523b44
  14. Aug 18, 2010
  15. Aug 19, 2010
  16. Aug 17, 2010
  17. Aug 16, 2010
  18. Aug 13, 2010
  19. Aug 17, 2010
  20. 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
  21. Aug 15, 2010
  22. Aug 10, 2010
  23. 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
  24. Aug 15, 2010
  25. Aug 12, 2010
  26. Aug 15, 2010
  27. Aug 14, 2010
  28. Aug 13, 2010
Loading