Skip to content
Snippets Groups Projects
  1. Dec 08, 2011
    • kiilerix's avatar
      hg-ssh: use shlex for shell-like parsing of SSH_ORIGINAL_COMMAND · cc021114fc98
      kiilerix authored
      The Mercurial ssh protocol is defined as if it was ssh-ing to a shell account on
      an ordinary ssh server, and where hg was available in $PATH and it executed
      the command "hg -R REPOPATH serve --stdio".
      
      The Mercurial ssh client can in most cases just pass REPOPATH to the shell, but
      if it contains unsafe characters the client will have to quote it so the shell
      will pass the right -R value to hg. Correct quoting of repopaths was introduced
      in d8fa35c28335 and tweaked in 86fc364ca5f8.
      
      hg-ssh doesn't create the command via a shell and used a simple parser instead.
      It worked fine for simple paths without any quoting, but if any kind of quoting
      was used it failed to parse the command like the shell would do it.
      
      This makes hg-ssh behave more like a normal shell with hg in the path would do.
      cc021114fc98
  2. Jan 15, 2012
    • Matt Zuba's avatar
      hooks: prioritize run order of hooks · 30c34fde40cc
      Matt Zuba authored
      As of Mercurial 1.3, hooks are sorted in the order they are read into
      Mercurial.  There are many instances when someone may want the hooks
      sorted in a specific order; this patch allows prioritizing hooks, while
      maintaining the existing enumeration for hooks without a priority.
      30c34fde40cc
  3. Jan 16, 2012
  4. Jan 11, 2012
    • Jordi Gutiérrez Hermoso's avatar
      merge: report all files in _checkunknown · 44fa047cef57
      Jordi Gutiérrez Hermoso authored
      When doing hg up, if there is a file conflict with untracked files,
      currently only the first such conflict is reported. With this patch,
      all of them are listed.
      
      With this patch error message is now reported as
      
          a: untracked file differs
          b: untracked file differs
          abort: untracked files in working directory conflict with files in
          requested revision
      
      instead of
      
          abort: untracked file in working directory differs from file in
          requested revision: 'a'
      
      This is a follow up to an old attempt to do this here:
      
          http://selenic.com/pipermail/mercurial-devel/2011-August/033625.html
      44fa047cef57
  5. Jan 13, 2012
    • Pierre-Yves David's avatar
      discovery: fix prepush documentation · eb6867b98223
      Pierre-Yves David authored
      The prepush documentation claim that when we refuse to push, the second element
      of the returng tuple is an "outgoing" integer. value should be 0 when no
      outgoing changeset and 1 otherwise.  In pratice if there are no outgoing
      changeset, "outgoing" value is alway 1 and util.Abort is raised on other error.
      
      the stable branch also include this error so it wasn't introduced by a recent
      refactoring.
      eb6867b98223
    • Pierre-Yves David's avatar
      phases: simplify phase exchange and movement over pushkey · 592b3d1742a1
      Pierre-Yves David authored
      The code now only exchange draft root and only care about movement related to
      public//draft boundary.
      
      There is multiple reason to simplify this code:
          * Secret are never discovered anymore
          * We decided to not support more the three existing phase
      
      Removing phase index from pushkey (if ever decided) will be made in another commit.
      592b3d1742a1
    • Pierre-Yves David's avatar
      phases: move phase according what was pushed not only what was added added · 249d3420ec9c
      Pierre-Yves David authored
      This fix the lack phase movement when a locally secret changeset without added
      children was pushed to the repository. In such case, this changeset would be
      present in the bundle source, but not in the ``added`` variable.
      249d3420ec9c
    • Pierre-Yves David's avatar
      revlog: make addgroup returns a list of node contained in the added source · e234eda20984
      Pierre-Yves David authored
      This list will contains any node see in the source, not only the added one.
      This is intended to allow phase to be move according what was pushed by client
      not only what was added.
      e234eda20984
  6. Jan 12, 2012
  7. Jan 11, 2012
  8. Jan 13, 2012
  9. Jan 11, 2012
  10. Jan 13, 2012
  11. Jan 11, 2012
  12. Jan 15, 2012
  13. Jan 11, 2012
    • Jim Hague's avatar
      bugzilla: make XMLRPC interface support http and https access · f4c859293ed4
      Jim Hague authored
      Inadvertently support is currently only for https. For some reason I
      thought xmlrpclib.SafeTransport did http and https, but it is https only.
      
      So create http and https XMLRPC transports that retain cookies. Decide which
      to use by inspecting the Bugzilla URL.
      f4c859293ed4
  14. Jan 13, 2012
  15. Jan 12, 2012
  16. Jan 11, 2012
  17. Jan 10, 2012
  18. Jan 11, 2012
    • Olav Reinert's avatar
      help: fix column alignment in "hg help" output · d0f2a89c8cfa
      Olav Reinert authored
      The output of "hg help" is changed to ensure that the column containing
      descriptions of commands, extensions, and other topics is correctly alignmened.
      d0f2a89c8cfa
    • Olav Reinert's avatar
      minirst: simplify and standardize field list formatting · ee8f5e4ce7b8
      Olav Reinert authored
      The default width of field lists is changed from 12 to 14 to align minirst with
      the rst2html tool. Shrinking the width of the left column to fit the content is
      removed, to keep formatting simple and uniform.
      ee8f5e4ce7b8
    • Na'Tosha Bard's avatar
      largefiles: correctly download new largefiles when merging · 3ecce805ac13
      Na'Tosha Bard authored
      There is a bug in the merge process where, if a new largefile is introduced
      in a merge and the user does not have that largefile in his repo's local store
      nor in his system cache, the working copy will retain the old largefile.  Upon
      the commit of the merge, the standin is re-written to contain the hash of the
      old largefile, and the lfdirstate retains a "Modified" status for the file.
      The end result is that the largefile can show up in the merge commit as
      "Modified", but the standin has no diff.  This is wrong in two ways:
      
        1) Such a "wedged" history with a nonsense change in a commit should not be
            possible
        2) It effectively reverts a largefile to an old version when doing a merge
      
      This is caused by the fact that the updatelfiles() command always checks the
      current largefile's hash against the hash stored in the current node's standin.
      This is correct behavior in every case except for a merge.  When merging, we
      must assume that the standin in the working copy contains the correct hash,
      because the original hg.merge() has already updated it for us.
      
      This patch fixes the issue by patching the repo object to carry a "_ismerging"
      attribute, that the updatelfiles() command checks for.  When this attribute is
      found, it checks against the working copy's standin, rather than the standin
      in the current node.
      3ecce805ac13
    • Markus Zapke-Gründemann's avatar
      tests: add htmlcov option · 44a371823f83
      Markus Zapke-Gründemann authored
      44a371823f83
  19. Jan 12, 2012
Loading