Skip to content
Snippets Groups Projects
  1. Jan 13, 2012
  2. Jan 12, 2012
  3. Jan 11, 2012
  4. Jan 10, 2012
  5. Jan 11, 2012
    • Olav Reinert's avatar
      help: fix column alignment in "hg help" output · d0f2a89c
      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.
      d0f2a89c
    • Olav Reinert's avatar
      minirst: simplify and standardize field list formatting · ee8f5e4c
      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.
      ee8f5e4c
    • Na'Tosha Bard's avatar
      largefiles: correctly download new largefiles when merging · 3ecce805
      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.
      3ecce805
    • Markus Zapke-Gründemann's avatar
      tests: add htmlcov option · 44a37182
      Markus Zapke-Gründemann authored
      44a37182
  6. Jan 12, 2012
  7. Jan 11, 2012
  8. Jan 13, 2012
  9. Jan 11, 2012
  10. Jan 10, 2012
  11. Jan 08, 2012
  12. Jan 11, 2012
  13. Jan 10, 2012
    • Pierre-Yves David's avatar
      phases: make outgoing object and discovery aware of exclusion · 7299e09a
      Pierre-Yves David authored
      The outgoing object gains an "excluded" members holding all changesets which
      were excluded because there where secret.
      
      The core discovery code now remove secret changeset from discovery by default.
      This means that any command relying on discovery will exclude secret changeset.
      Most notable one are outgoing and bundle. (But bundle with and explicit
      ``--base`` still allow to bundle outgoing changeset.
      7299e09a
  14. Jan 09, 2012
  15. Jan 11, 2012
  16. Jan 10, 2012
Loading