Skip to content
Snippets Groups Projects
  1. Jun 08, 2012
  2. Jun 07, 2012
  3. Jun 04, 2012
  4. Jun 07, 2012
  5. Jun 05, 2012
  6. Jun 06, 2012
  7. Jun 05, 2012
  8. May 27, 2012
  9. Jun 04, 2012
  10. Jun 01, 2012
  11. May 29, 2012
    • Angel Ezquerra's avatar
      config: make sortdict keys() and iterkeys() methods respect the item order · a6543fdcf869
      Angel Ezquerra authored
      The config.sortdict class is a simple "sorted dictionary" container
      class, based on python's regular dict container. The main difference
      compared to regular dicts is that sortdicts remember the order in
      which items have been added to it.
      
      Without this patch the items() method returns the sortdict elements in
      the right order. However, getting the list of keys by using the keys()
      or iterkeys() methods, and consequencly, looping through the container
      elements in a for loop does not respect that order. This patch fixes
      this problem.
      a6543fdcf869
  12. Jun 04, 2012
  13. Jun 01, 2012
  14. Jun 04, 2012
    • Adrian Buehlmann's avatar
      test-tags: enable for Windows · 1415edd88c56
      Adrian Buehlmann authored
      It turns out that MSYS does have a chmod.exe, but it has no effect. So, the
      inserted "#if unix-permissions" is somewhat redundant, as the test would pass
      without it as well: it would simply write the tag cache, despite what the
      comment says.
      
      But I'm actually in favor of inserting the #if, as it makes it clearer what's
      going on.
      1415edd88c56
    • Adrian Buehlmann's avatar
      tests: roll test-copy2.t into test-copy.t · 241a32942c7a
      Adrian Buehlmann authored
      241a32942c7a
  15. Jun 03, 2012
  16. Jun 02, 2012
    • Olav Reinert's avatar
      help: format all output using RST · d71ada5a6a33
      Olav Reinert authored
      This change is the last patch needed to implement help text generation based
      only on formatting a single text object marked up with RST.
      d71ada5a6a33
    • Olav Reinert's avatar
      help: format command and option list help using RST · 7863ff383894
      Olav Reinert authored
      This patch changes the function which generates help text about commands and
      options to use RST formatting. Tables describing options have been formatted
      using RST table markup for some time already, so their appearance does not
      change. Command lists, however, change appearance.
      
      To format non-verbose command lists, RST field list markup was chosen, because
      it resembles the old format:
      
      <http://docutils.sourceforge.net/docs/user/rst/quickref.html#field-lists>
      
      In the old (hand-coded) format of non-verbose command lists, the left column is
      12 characters wide. Our minirst implementation formats field lists with a left
      column 14 characters wide, so this patch changes the appearance of help output
      correspondingly:
      
      <http://markmail.org/message/krl4cxopsnii7s6z?q=mercurial+reinert+from:%22Olav+Reinert%22&page=2>
      
      The minirst markup most closely resembling the old verbose command lists is
      definition lists. But using it would cause a blank line to be inserted between
      each command definition, making the output excessively long, and no more
      useful than before. To avoid this, I chose to use field lists also for verbose
      command help, resulting in output like this example:
      
       add           add the specified files on the next commit
       annotate, blame
                     show changeset information by line for each file
       clone         make a copy of an existing repository
       commit, ci    commit the specified files or all outstanding changes
       diff          diff repository (or selected files)
       export        dump the header and diffs for one or more changesets
       forget        forget the specified files on the next commit
       init          create a new repository in the given directory
       log, history  show revision history of entire repository or files
       merge         merge working directory with another revision
       phase         set or show the current phase name
       pull          pull changes from the specified source
       push          push changes to the specified destination
       qdiff         diff of the current patch and subsequent modifications
       qinit         init a new queue repository (DEPRECATED)
       qnew          create a new patch
       qpop          pop the current patch off the stack
       qpush         push the next patch onto the stack
       qrefresh      update the current patch
       remove, rm    remove the specified files on the next commit
       serve         start stand-alone webserver
       status, st    show changed files in the working directory
       summary, sum  summarize working directory state
       update, up, checkout, co
                     update working directory (or switch revisions)
      
      This change is a move towards generating all help text as a list of strings
      marked up with RST.
      7863ff383894
    • Olav Reinert's avatar
      help: format extension lists using RST · af69b2b64d6e
      Olav Reinert authored
      This change is a move towards generating all help text as a list of strings
      marked up with RST.
      af69b2b64d6e
  17. Jun 03, 2012
    • Adrian Buehlmann's avatar
      test-revset: enable for Windows · c739227b5eea
      Adrian Buehlmann authored
      In MSYS, the test fails like this if the hghave exit at the beginning is
      removed:
      
        --- C:\Users\adi\hgrepos\hg-main\tests\test-revset.t
        +++ C:\Users\adi\hgrepos\hg-main\tests\test-revset.t.err
        @@ -58,7 +58,7 @@
           $ hg co 3
           2 files updated, 0 files merged, 0 files removed, 0 files unresolved
           $ hg branch /a/b/c/
        -  marked working directory as branch /a/b/c/
        +  marked working directory as branch a:/b/c/
           (branches are permanent and global, did you want a bookmark?)
           $ hg ci -Aqm"5 bug"
      
        @@ -252,7 +252,7 @@
           2 a-b-c-
           3 +a+b+c+
           4 -a-b-c-
        -  5 /a/b/c/
        +  5 a:/b/c/
           6 _a_b_c_
           7 .a.b.c.
           $ log 'children(ancestor(4,5))'
      
      due to the posix path conversion done by MSYS globally, as explained here
      
        http://www.mingw.org/wiki/Posix_path_conversion
      
      The solution is a bit lame, but it is simple and works: don't use strings that
      look like '/a/b', in order not to trigger the path magic done by MSYS.
      
      So, if we can agree not to insist on testing branch names starting with '/',
      then this relatively simple patch makes the test pass both on Windows with MSYS
      and Linux.
      c739227b5eea
  18. Jun 04, 2012
Loading