Skip to content
Snippets Groups Projects
  1. Jun 01, 2012
  2. 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
  3. Jun 03, 2012
  4. 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
  5. 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
  6. Jun 04, 2012
  7. Jun 01, 2012
  8. Jun 04, 2012
    • Nikolaj Sjujskij's avatar
      help: fix search with `-k` option in non-ASCII locales · 4594729c61ee
      Nikolaj Sjujskij authored
      Keyword search in help (introduced in 497deec204d1 and a17983680f12 by Augie
      Fackler) tries to translate already translated strings, which results in
      Unicode errors in gettext when non-ASCII locale is used. Also command
      descriptions should be translated before searching there (thanks to FUJIWARA
      Katsunori for pointing this out and actual fix), (issue3482).
      4594729c61ee
  9. Jun 03, 2012
    • Adrian Buehlmann's avatar
      test-paths.t: enable for Windows using #if · 61f3ca8e4d39
      Adrian Buehlmann authored
      If the no-msys exit at the beginning is removed, the test fails on Windows with
      MSYS with:
      
        --- C:\Users\adi\hgrepos\hg-main\tests\test-paths.t
        +++ C:\Users\adi\hgrepos\hg-main\tests\test-paths.t.err
        @@ -24,7 +24,7 @@
           expand = $TESTTMP/a/foo/bar (glob)
           $ SOMETHING=/foo hg paths
           dupe = $TESTTMP/b (glob)
        -  expand = /foo/bar
        +  expand = c:/MinGW/msys/1.0/foo/bar
           $ hg paths -q
           dupe
           expand
      
      caused by http://www.mingw.org/wiki/Posix_path_conversion .
      61f3ca8e4d39
  10. Jun 01, 2012
    • kiilerix's avatar
      tests: introduce c-style conditional sections in .t tests · a3ea092203a5
      kiilerix authored
      This makes it possible to have conditional sections like:
      
      #if windows
        $ echo foo
        foo
      #else
        $ echo bar
        bar
      #endif
      
      The directives and skipped sections are treated like comments, so don't
      interleave them with commands and their output.
      
      The parameters to #if are evaluated while preparing the test by passing them
      over to hghave. Requirements can thus be negated with 'no-' prefix, and
      multiple requirements must all be true to return true.
      a3ea092203a5
  11. May 30, 2012
    • Adrian Buehlmann's avatar
      run-tests: don't add python lines to expected dict · f2555e891982
      Adrian Buehlmann authored
      For test input lines of *.t files starting with '  >>> ', the code block for
      '  >>> '
      
      609:        if l.startswith('  >>> '): # python inlines
      610:            after.setdefault(pos, []).append(l)
      
      was (unsurprisingly) executed, but because there was an "if" instead of an
      "elif" on the condition "l.startswith('  ... ')", program execution proceeded
      to line 636
      
      635:        elif l.startswith('  '): # results
      636:            # queue up a list of expected results
      637:            expected.setdefault(pos, []).append(l[2:])
      
      due to the fact that if l starts with '  >>> ' it also starts with '  '.
      
      The net effect was that python command lines in *.t files were (surprisingly)
      also added to the "expected" dict.
      
      This caused no externally observable bad behavior, as the "expected" dict was
      not consulted for these lines.
      f2555e891982
  12. Jun 03, 2012
  13. May 25, 2012
  14. May 24, 2012
    • Patrick Mézard's avatar
      revset: cache alias expansions · d37d221334be
      Patrick Mézard authored
      Caching has no performance effect on the revset aliases which triggered
      the recent recursive evaluation bug. I wrote it not to feel bad about
      expanding several times the same complicated expression.
      d37d221334be
  15. May 23, 2012
  16. May 22, 2012
    • David Schleimer's avatar
      hg-ssh: read-only flag · 1ba3e17186c8
      David Schleimer authored
      Allows you to restrict a ssh key to have read-only access to a set of
      repos by passing the --read-only flag to hg-ssh.
      
      This is useful in an environment where the number of unix users you
      can or are willing to create is limited.  In such an environment,
      multiple users or applications will share a single unix account.  Some
      of those applications will likely need read-only access to the
      repository.  This change makes it possible to grant them such access
      without requiring that they use a separate unix account.
      1ba3e17186c8
  17. May 13, 2012
  18. Jun 02, 2012
  19. Jun 01, 2012
  20. May 30, 2012
Loading