Skip to content
Snippets Groups Projects
  1. Nov 10, 2013
  2. Nov 08, 2013
  3. Nov 05, 2013
  4. Nov 04, 2013
  5. Nov 06, 2013
  6. Nov 02, 2013
    • Durham Goode's avatar
      rebase: fix working copy location after a --collapse (issue4080) · ea81f8b2
      Durham Goode authored
      Rebasing with --collapse would leave the working copy on the parent of the
      collapsed commit, instead of on the collapsed commit.  This fixes that.  Also
      fixes a few tests that already covered this area but had bad data.
      
      This also fixes issue3716 where bookmarks are not kept across rebases with
      --collapse. I updated the test to cover that case as well.
      ea81f8b2
  7. Nov 05, 2013
    • Durham Goode's avatar
      rebase: fix rebase aborts when 'tip-1' is public (issue4082) · 7d5e7799
      Durham Goode authored
      When aborting a rebase where tip-1 is public, rebase would fail to undo the merge
      state. This caused unexpected dirstate parents and also caused unshelve to
      become unabortable (since it uses rebase under the hood).
      
      The problem was that rebase uses -2 as a marker rev, and when it checked for
      immutableness during the abort, -2 got resolved to the second to last entry in
      the phase cache.
      
      Adds a test for the fix. Add exception to phase code to prevent this in the
      future.
      7d5e7799
    • Pierre-Yves David's avatar
      test: do not add .pyc and .orig in test-commit-amend.t (issue4085) · 0151b61f
      Pierre-Yves David authored
      This makes the test fails with disabled byte-compilation
      (PYTHONDONTWRITEBYTECODE="1" environmental variable).
      0151b61f
  8. Nov 01, 2013
  9. Oct 31, 2013
  10. Oct 30, 2013
  11. Oct 13, 2013
  12. Oct 26, 2013
  13. Nov 01, 2013
    • Katsunori FUJIWARA's avatar
      shelve: remove unused variable assignment · 065e6f1c
      Katsunori FUJIWARA authored
      Fix test-check-pyflakes.t error after 1d7a36ff2615.
      
      This patch replaces "readshelvedfiles()" invocation by
      "shelvedfile().exists()" check and aborting, because it is required
      only to ensure that shelved changes corresponded to specified name
      exist after invocation.
      
      This patch also remove definition of "readshelvedfiles()" itself,
      because it is invoked only from the line removed by this patch.
      065e6f1c
  14. Oct 30, 2013
  15. Oct 29, 2013
  16. Oct 28, 2013
    • Mads Kiilerich's avatar
      largefiles: use 'remote'/'local' in merge prompts like in other merge prompts · e92c6524
      Mads Kiilerich authored
      Prompts like
        foo has been turned into a largefile
        use (l)argefile or keep as (n)ormal file?
      was not as clear as the usual prompts that use 'remote' or 'local' to explain
      what happened on which side ... especially not when used to the normal prompts.
      
      "as" could also indicate that it would be possible to take the content of the
      largefile and somehow put it into the normal file. It could make it more clear
      that it was a choice between one side or the other.
      
      For consistency we will now phrase it like:
        remote turned local normal file f into a largefile
        use (l)argefile or keep (n)ormal file?
      e92c6524
    • Mads Kiilerich's avatar
      largefiles: systematic testing of merges to/from largefiles · 7985e346
      Mads Kiilerich authored
      427ce5633c1c fixed one problem with update and added a test case for it. The
      test coverage was thus insufficient before that.
      
      To make sure we have good test coverage in this area we add systematic testing
      of all cases of merges that may or may not change normal files to largefiles or
      vice versa.
      
      The tests shows some annoying extra merge prompts in some cases, but these
      prompts are hard to avoid and they are now "safe" - they do not leave the
      system in a confused inconsistent state.
      7985e346
  17. Oct 23, 2013
  18. Oct 28, 2013
    • Katsunori FUJIWARA's avatar
      shelve: remove useless and incorrect code paths for file access · ff38dfbc
      Katsunori FUJIWARA authored
      This patch removes code paths in "shelvedfile.opener()", because:
      
          - explicit "vfs.mkdir()" invocation is useless
      
            "vfs.__call__()" for modes other than "read" creates parent
            directory of target file automatically by "util.ensuredirs()".
      
          - mode checking in "except IOError" code path is useless
      
            ENOENT occurs only for "read" mode, because target file is
            created forcibly for other modes.
      
          - there is no explicit "return" statement in the code path for
            "except IOError" if "mode[0] in 'wa'"
      
            this is incorrect, because None may be returnd unexpectedly,
            even though it seems the EEXIST case in the directory creation
            race for ".hg/shelved" and is very rare.
      
            this directory creation race is also treated in
            "util.ensuredirs()".
      ff38dfbc
    • Katsunori FUJIWARA's avatar
      shelve: disallow commit while unshelve is in progress · 6f29cc56
      Katsunori FUJIWARA authored
      Before this patch, commit is allowed even while unshelve is in
      progress.
      
      In the other hand, "hg unshelve --abort" and "hg unshelve --continue"
      check whether parent revisions of the working directory have changed
      or not since last "hg unshelve", and abort without clearing state for
      unshelve in progress if they have.
      
      This causes that accidental commit makes clearing state for unshelve
      difficult in ordinary ways.
      
      This patch disallows commit while unshelve is in progress for
      consistency.
      6f29cc56
  19. Oct 30, 2013
  20. Oct 23, 2013
    • Durham Goode's avatar
      shelve: use rebase instead of merge (issue4068) · 1d7a36ff
      Durham Goode authored
      Previously, shelve used merge to unshelve things. This meant that if you shelved
      changes on one branch, then unshelved on another, all the changes from the first
      branch would be present in the second branch, and not just the shelved changes.
      
      The fix is to use rebase to pick the shelve commit off the original branch and
      place it on top of the new branch. This means only the shelved changes are
      brought across.
      
      This has the side effect of fixing several other issues in shelve:
      
      - you can now unshelve into a file that already has pending changes
      - unshelve a mv/cp now has the correct dirstate value (A instead of M)
      - you can now unshelve to an ancestor of the shelve
      - unshelve now no longer deletes untracked .orig files
      
      Updates tests and adds a new one to cover the issue. The test changes fall into
      a few categories:
      
      - I removed some excess output
      - The --continue/--abort state is a little different, so the parents and
        dirstate needed updating
      - Removed some untracked files at certain points that cluttered the output
      1d7a36ff
  21. Oct 24, 2013
  22. Oct 23, 2013
  23. Oct 24, 2013
Loading