Skip to content
Snippets Groups Projects
  1. Nov 07, 2013
  2. Nov 17, 2013
  3. Nov 16, 2013
    • Brodie Rao's avatar
      share: fix unshare calling wrong repo.__init__() method · cbcd85fa
      Brodie Rao authored
      When running the unshare command, if there's other code that tries to use
      the repo after the command is finished, it'll end up with a ui object for
      repo.unfiltered(). This change fixes an erroneous call to repo.__init__()
      that could be on the repoview proxy class--now it's always done on the
      unfiltered repo.
      cbcd85fa
  4. Nov 17, 2013
  5. Nov 16, 2013
  6. Nov 15, 2013
  7. Nov 09, 2013
  8. Nov 13, 2013
    • Wagner Bruna's avatar
      hgweb, i18n: do not translate search mode description · 06e118c0
      Wagner Bruna authored
      The search mode description can't be translated by itself, since
      it's displayed as part of a template phrase (the "Assuming ..."
      / "Use ... instead" bits). Just drop the translation markers for
      now, since the templates themselves currently do not support
      translations.
      06e118c0
  9. Nov 10, 2013
  10. Nov 08, 2013
  11. Nov 05, 2013
  12. Nov 04, 2013
  13. Nov 06, 2013
  14. 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
  15. 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
  16. Nov 01, 2013
  17. Oct 31, 2013
  18. Oct 30, 2013
  19. Oct 13, 2013
  20. Oct 26, 2013
  21. 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
  22. Oct 30, 2013
  23. Oct 29, 2013
  24. 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
Loading