Skip to content
Snippets Groups Projects
  1. Jun 01, 2011
  2. May 31, 2011
  3. May 24, 2011
  4. Mar 07, 2011
  5. Apr 29, 2011
  6. Apr 26, 2011
  7. Apr 11, 2011
    • Idan Kamara's avatar
      localrepo: don't add deleted files to list of modified/added files (issue2761) · e880433a
      Idan Kamara authored
      If a file is deleted (rm, not 'hg rm') from the working dir
      an attempt to run 'hg diff -r X', with the file being present in X will
      cause an abort.
      
      We didn't check if the file has been deleted from the working dir
      and later on tried to open it to compare with the one from X, causing the abort.
      
      This fix adds that check. Consequently, no output will be returned.
      e880433a
  8. Apr 04, 2011
  9. Mar 14, 2011
  10. Mar 26, 2011
  11. Mar 16, 2011
  12. May 31, 2011
  13. May 30, 2011
  14. May 19, 2011
  15. May 28, 2011
  16. May 19, 2011
  17. May 18, 2011
  18. May 14, 2011
  19. May 09, 2011
  20. May 01, 2011
    • Alexander Solovyov's avatar
      fix bookmarks rollback behavior · 89e7d35e
      Alexander Solovyov authored
      Before this patch undo.bookmarks was created on bookmarks write and
      not with other transaction-related files. There were two issues: first
      is that if you have changed bookmarks few times after a transaction
      happened, rollback will give you a state which can point to
      non-existing revision. Second is that if you have not changed
      bookmarks after a transaction, rollback will touch your state anyway.
      
      This change also adds `localrepo._writejournal` method, which can be
      used by other extensions to save their transaction-related backup in
      right time.
      89e7d35e
  21. May 06, 2011
  22. May 05, 2011
  23. May 03, 2011
  24. May 01, 2011
  25. Apr 29, 2011
  26. Apr 25, 2011
  27. Apr 30, 2011
    • Nicolas Dumazet's avatar
      zeroconf: notify the Zeroconf threads when hg exits · 23fc62e0
      Nicolas Dumazet authored
      Zeroconf launches two threads in the background, and they wait on
      Condition objects to exit. We need to call Zeroconf.close() to
      release those conditions so that threads can gracefully exit.
      
      This means that an interrupt on the hg process will now gracefully
      propagate to the Zeroconf children, fixing that bug which did not
      allow us to kill an `hg serve` process.
      23fc62e0
  28. Apr 29, 2011
  29. Mar 04, 2011
    • Patrick Mezard's avatar
      subrepo: handle svn tracked/unknown directory collisions · 9e8a9d45
      Patrick Mezard authored
      This happens more often than expected. Say you have an svn subrepository with
      python code. Python would have generated unknown .pyc files. Now, you rebase
      this setup on a revision where a directory containing python code does not
      exist. Subversion is first asked to remove this directory when updating, but
      will not because it contains untracked items. Then it will have to bring back
      the directory after the merge but will fail because it now collides with an
      untracked directory.
      
      Using --force is not very elegant and only works with svn >= 1.5 but the only
      alternative I can think of is to write our own purge command for subversion.
      9e8a9d45
  30. Apr 29, 2011
Loading