Skip to content
Snippets Groups Projects
  1. Dec 02, 2013
  2. Dec 01, 2013
  3. Nov 27, 2013
    • Katsunori FUJIWARA's avatar
      i18n: add the tool to check Mercurial specific translation problems in *.po · 84939b728749
      Katsunori FUJIWARA authored
      Existing tool like "msgfmt --check" can check typical translation
      problems (missing "%s" in msgstr, for example), but can't check
      Mercurial specific ones.
      
      For example, "msgfmt --check" can't check whether the translated
      string given to "ui.promptchoice()" is correct or not, even though
      problems like below cause run-time error or unexpected behavior:
      
        - less or more choices than msgid,
        - choices without '&', or
        - choices with '&' followed by none
      
      This patch adds the tool to check Mercurial specific translation
      problems in *.po files.
      84939b728749
    • Santiago Pay=C3=A0 i Miralta's avatar
      734ff413eb7e
    • Durham Goode's avatar
      unshelve: add tests for unknown files · 11dbc38cebc6
      Durham Goode authored
      Adds a basic test for shelving/unshelving with an unknown file present.
      
      Adds a test for unshelving on top of an existing unknown file.
      11dbc38cebc6
    • Durham Goode's avatar
      unshelve: don't commit unknown files during unshelve (issue4113) · 578b888c820e
      Durham Goode authored
      Previously, unshelve would temporarily commit unknown files (via addremove) in
      an attempt to allow unshelving into unknown files.  This produced unexpected
      results, like the file time stamp changing and a .i file being created.
      
      This change makes it no longer use addremove.  It ignores unknown files
      completely.  If an unshelve would overwrite an unknown file, the unknown file is
      moved to *.orig
      
      The shelve continue/abort format is changed, but it just removes stuff from the
      end of the file, so it can still read the old format.
      578b888c820e
  4. Nov 26, 2013
  5. Nov 22, 2013
  6. Nov 30, 2013
  7. Nov 28, 2013
  8. Nov 26, 2013
  9. Nov 27, 2013
    • Chris Jerdonek's avatar
      parse_index2: fix crash on bad argument type (issue4110) · e57c532c3835
      Chris Jerdonek authored
      Passing a non-string to parsers.parse_index2() causes Mercurial to crash
      instead of raising a TypeError (found on Mac OS X 10.8.5, Python 2.7.6):
      
          import mercurial.parsers as parsers
          parsers.parse_index2(0, 0)
      
          Thread 0 Crashed:: Dispatch queue: com.apple.main-thread
          0 parsers.so  0x000000010e071c59 _index_clearcaches + 73 (parsers.c:644)
          1 parsers.so  0x000000010e06f2d5 index_dealloc + 21 (parsers.c:1767)
          2 parsers.so  0x000000010e074e3b parse_index2 + 347 (parsers.c:1891)
          3 org.python.python 0x000000010dda8b17 PyEval_EvalFrameEx + 9911
      
      This happens because when arguments of the wrong type are passed to
      parsers.parse_index2(), indexType's initialization function index_init() in
      parsers.c leaves the indexObject instance in a state that indexType's
      destructor function index_dealloc() cannot handle.
      
      This patch moves enough of the indexObject initialization code inside
      index_init() from after the argument validation code to before it.
      This way, when bad arguments are passed to index_init(), the destructor
      doesn't crash and the existing code to raise a TypeError works.  This
      patch also adds a test to check that a TypeError is raised.
      e57c532c3835
  10. Nov 07, 2013
  11. Nov 20, 2013
    • Simon Heimberg's avatar
      util: url keeps backslash in paths · c33d9217e99d
      Simon Heimberg authored
      Backslashes (\) in paths were encoded to %C5 when converting from url to
      string. This does not look nice for windows paths. And it introduces many
      problems when running tests on windows.
      c33d9217e99d
  12. Nov 17, 2013
  13. Nov 25, 2013
  14. 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
  15. Nov 10, 2013
  16. 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
  17. Nov 21, 2013
  18. 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
  19. Nov 18, 2013
  20. Nov 17, 2013
  21. Nov 18, 2013
  22. 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
  23. Nov 07, 2013
Loading