Skip to content
Snippets Groups Projects
  1. Jan 06, 2012
  2. Dec 29, 2011
  3. Jan 04, 2012
  4. Jan 06, 2012
  5. Jan 09, 2012
  6. Jan 08, 2012
  7. Jan 10, 2012
  8. Jan 08, 2012
  9. Jan 07, 2012
  10. Jan 05, 2012
  11. Jan 04, 2012
  12. Jan 10, 2012
  13. Jan 08, 2012
    • Steven Brown's avatar
      rebase: reinstate old-style rev spec support for the source and base (issue3181) · e4fc0f0b
      Steven Brown authored
      As of b12362ab13e7 (first released as part of Mercurial 2.0), the rebase command
      accepted ONLY revsets for the source and base arguments and no longer accepted
      old-style revision specifications. As a result, some revision names were no
      longer recognised, e.g.
      
      hg rebase --base br-anch
      abort: unknown revision 'br'!
      
      These arguments are now interpreted first as old-style revision specifications,
      then as revsets when no matching revision is found. This restores backwards
      compatibility with releases prior to 2.0.
      e4fc0f0b
  14. Jan 06, 2012
  15. Jan 08, 2012
  16. Jan 07, 2012
    • Levi Bard's avatar
      largefiles: add precommit hook to check for inappropriate locking · 8bed8551
      Levi Bard authored
      This tests for inappropriate locking (issue3182) by running hg status
      as a precommit hook.
      8bed8551
    • Levi Bard's avatar
      largefiles: fix inappropriate locking (issue3182) · 0d91211d
      Levi Bard authored
      Don't lock/write on operations that should be readonly (status).
      Always lock when writing the lfdirstate (rollback).
      Don't write lfdirstate until after committing; state isn't actually changed
      until the commit is complete.
      0d91211d
    • Na'Tosha Bard's avatar
      largefiles: correctly handle dirstate status when rebasing · 3ef07ecd
      Na'Tosha Bard authored
      When rebasing, we need to trust that the standins are always correct. The
      rebase operation updates the standins according to the changeset it is
      rebasing. We need to make the largefiles in the working copy match.  If we
      don't make them match, then they get accidentally reverted, either during
      the rebase or during the next commit after the rebase.
      
      This worked previously only becuase we were relying on the behavior that
      largefiles with a changed standin, but unchanged contents, never showed up in
      the list of modified largefiles.  Unfortunately, pre-commit hooks can get
      an incorrect status this way, and it also results in extra execution of code.
      
      The solution is to simply trust the standins when we are about to commit a
      rebased changeset, and politely ask updatelfiles() to pull the new contents
      down.  In this case, updatelfiles() will also mark any files it has pulled
      down as dirty in the lfdirstate so that pre-commit hooks will get correct
      status output.
      3ef07ecd
    • Na'Tosha Bard's avatar
      largefiles: implement addremove (issue3064) · 7cbba3ad
      Na'Tosha Bard authored
      Implementing addremove correctly in largefiles is tricky, becuase the original
      addremove function does not call into any of the add or remove function we've
      already overridden in the extension.  So the trick is to implement addremove
      without duplicating any code.
      
      This patch implements addremove by pulling out the interesting parts of
      override_add() and override_remove() into generic utility functions, and
      using those to handle the largefiles in addremove.  Then a matcher is
      installed that will ignore all largefiles, and the original addremove
      function is called to take care of the regular files in addremove.
      
      A small bit of monkey patching is used to make sure that remove_largefiles()
      notifies the user when a file is removed by addremove and also makes sure
      the removal of largefiles doesn't interfer with the original addremove's
      operation of removing the standin.
      7cbba3ad
  17. Jan 08, 2012
  18. Jan 07, 2012
Loading