Skip to content
Snippets Groups Projects
  1. Nov 18, 2013
    • Siddharth Agarwal's avatar
      strip: hold wlock for entire duration · 88e172871ad7
      Siddharth Agarwal authored
      Previously, we'd acquire and release the wlock several times. This meant that
      other hg processes could come in and change state. Instead of that, retain the
      wlock for the entire duration of the strip.
      88e172871ad7
  2. Nov 10, 2013
  3. Nov 08, 2013
    • Martin Geisler's avatar
      phase: better error message when --force is needed · 1dee888b22f7
      Martin Geisler authored
      When trying to turn a draft changeset into a secret changeset, I was
      told:
      
        % hg phase -s .
        cannot move 1 changesets to a more permissive phase, use --force
        no phases changed
      
      That message struck me as being backwards -- the secret phase feels
      less permissive to me since it restricts the changesets from being
      pushed.
      
      We don't use the word "permissive" elsewhere, 'hg help phase' talks
      about "lower phases" and "higher phases". I therefore reformulated the
      error message to be
      
        cannot move 1 changesets to a higher phase, use --force
      
      That is not perfect either, but more in line with the help text. An
      alternative could be
      
        cannot move phase backwards for 1 changesets, use --force
      
      which fits better with the help text for --force.
      1dee888b22f7
    • Isaac Jurado's avatar
      77acd8ce01ce
  4. Nov 21, 2013
  5. Nov 17, 2013
    • Siddharth Agarwal's avatar
      histedit: hold wlock and lock while in progress · 4778f398ec83
      Siddharth Agarwal authored
      Currently, histedit acquires and releases lock and wlock several times during
      its run. This isn't great because it allows other hg processes to come in and
      change state. With this fix, lock and wlock are acquired and released exactly
      once.
      
      The change to test-histedit-drop.t is a minor implementation one -- the cache
      is still correctly invalidated, but it just happens a little later and only
      gets printed out because of the unrelated --debug flag.
      4778f398ec83
  6. Nov 18, 2013
  7. Nov 17, 2013
  8. Nov 18, 2013
  9. Nov 08, 2013
    • David Soria Parra's avatar
      shelve: unshelve using an unfiltered repository · 99c4b8f79324
      David Soria Parra authored
      when evolve is enabled and a hidden obsolete changeset exists
      in the repository, the strip during unshelve will fail due to
      filtered revs. we use an unfiltered repository like to
      repair.strip to strip the proper nodes.
      99c4b8f79324
  10. Nov 07, 2013
  11. Nov 17, 2013
  12. Nov 16, 2013
    • Brodie Rao's avatar
      share: fix unshare calling wrong repo.__init__() method · cbcd85fa75c0
      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.
      cbcd85fa75c0
  13. Nov 17, 2013
  14. Nov 16, 2013
  15. Nov 15, 2013
  16. Nov 09, 2013
  17. Nov 13, 2013
    • Wagner Bruna's avatar
      hgweb, i18n: do not translate search mode description · 06e118c097ff
      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.
      06e118c097ff
  18. Nov 10, 2013
  19. Nov 08, 2013
  20. Nov 05, 2013
  21. Nov 04, 2013
  22. Nov 06, 2013
  23. Nov 02, 2013
    • Durham Goode's avatar
      rebase: fix working copy location after a --collapse (issue4080) · ea81f8b2364e
      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.
      ea81f8b2364e
  24. Nov 05, 2013
    • Durham Goode's avatar
      rebase: fix rebase aborts when 'tip-1' is public (issue4082) · 7d5e7799a29f
      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.
      7d5e7799a29f
    • Pierre-Yves David's avatar
      test: do not add .pyc and .orig in test-commit-amend.t (issue4085) · 0151b61fed97
      Pierre-Yves David authored
      This makes the test fails with disabled byte-compilation
      (PYTHONDONTWRITEBYTECODE="1" environmental variable).
      0151b61fed97
Loading