Skip to content
Snippets Groups Projects
  1. Jul 21, 2012
  2. Jul 20, 2012
    • Matt Harbison's avatar
      largefiles: ensure addlargefiles() doesn't add a standin as a largefile · 25248e2e
      Matt Harbison authored
      An easy way to force this (and cause a traceback) prior to the fix for 3507 was
      
        $ touch large
        $ hg add --large large
        $ hg ci -m "add"
        $ hg remove large
        $ touch large
        $ hg addremove --config largefiles.patterns=**large
      
      This patch also detected (and corrected) a previous test where a standin got
      added as a largefile (without a traceback).
      25248e2e
  3. Jul 19, 2012
    • Matt Harbison's avatar
      largefiles: fix a traceback when addremove follows a remove (issue3507) · 2446b63c
      Matt Harbison authored
      The problem only occurred if a file was removed with 'hg rm' (as opposed to the
      OS utilities), and then addremove was run before a commit.  Both normal and
      large files were affected.
      
      Ensuring that the file exists prior to an lstat() for size seems like the Right
      Thing.  But oddly enough, the missing file that was causing lstat() to blow up
      was a standin when a largefile was removed, which seems fishy, because a standin
      should never be added as a largefile.  I was then able to get a standin added as
      a largefile (whose name is 'large') with
      
         hg addremove --config largefiles.patterns=**large
      
      which also causes a backtrace.  That will be fixed next.
      2446b63c
    • Matt Harbison's avatar
      largefiles: defer lfdirstate.drop() until after commit (issue3364) · fc4c1556
      Matt Harbison authored
      The example in comment #9 of the bug writeup must be run exactly- it was the
      commit after the rm and prior to the addremove that screwed things up, because
      that commit noticed that the largefile was missing, called drop(), and then the
      original commit function did nothing (due to the file in the '!' state).  The
      addremove command properly put it into the 'R' state, but it remained stuck in
      that state (because commit insisted 'nothing changed').  Without the commit
      prior to addremove, the problem didn't occur.
      
      Maybe this is an indication that lfdirstate needs to take a few more hints from
      the regular dirstate, regardless of what _it_ thinks the state is- similar
      inconsistency is probably still possible with this patch if the original commit
      succeeds but the lfdirstate write fails.
      fc4c1556
    • Matt Harbison's avatar
      largefiles: fix addremove with -R option · a6d9b2d3
      Matt Harbison authored
      If a file was missing, the missing list contained a path relative to the repo.
      When building the matcher from that list, the file name ended up concatenated to
      cwd, causing the command to abort with '<file> not under root'.  This rebuilds
      the missing list with paths relative to cwd.
      a6d9b2d3
    • Thomas Arendsen Hein's avatar
      dispatch: fix traceback when extension was tested with newer versions only · d1b49b02
      Thomas Arendsen Hein authored
      The "worst" extension still is the one tested with the lowest tested version
      below the current version of Mercurial, but if an extension with was only
      tested with newer versions, it is considered a candidate for a bad extension,
      too. In this case extensions which have been tested with higher versions of
      Mercurial are considered better. This allows finding the oldest extension if
      ct can't be calculated correctly and therefore defaults to an empty tuple, and
      it involves less changes to the comparison logic during the current code
      freeze.
      d1b49b02
    • Thomas Arendsen Hein's avatar
      test-extension.t: use fixed version string instead of current tag · 7af38fe1
      Thomas Arendsen Hein authored
      Currently tests break with the current tag being 2.3-rc and tags set by the
      user could affect this test, too.
      7af38fe1
    • Matt Mackall's avatar
      Added tag 2.3-rc for changeset a06e2681dd17 · 436cc9d0
      Matt Mackall authored
      436cc9d0
    • Matt Mackall's avatar
    • Matt Mackall's avatar
      merge with crew · 23b24723
      Matt Mackall authored
      23b24723
  4. Jul 18, 2012
    • Martin Geisler's avatar
      merge with stable · c315842c
      Martin Geisler authored
      c315842c
    • Martin Geisler's avatar
      windows: removed duplicate termwidth definition · 98823bd0
      Martin Geisler authored
      Changeset dbf91976f900 caused this when the "from win32 import *" line
      was replaced with explicit import statements: the wildcard import was
      at the bottom of the file and so windows.termwidth was overwritten by
      win32.termwidth as indented, but the new explicit import statements
      were at the top and so win32.termwidth got lost.
      
      With the switch to ctypes, win32 can always be imported and so the
      fallback termwidth in windows is no longer needed.
      98823bd0
  5. Jul 13, 2012
  6. Jul 12, 2012
    • Pierre-Yves David's avatar
      obsolete: refactor writemarkers to only encode them · 494a970f
      Pierre-Yves David authored
      The function is now able to write the version header as necessary. The function
      now yield bytes to be written to a stream.
      
      This should ease later use of this function for wireprotocol based exchanged.
      
      Prepare the public use of the writemarker by wireprotocol function.
      494a970f
  7. Jul 14, 2012
  8. Jul 06, 2012
    • Simon Heimberg's avatar
      hooks: print out more information when loading a python hook fails · 1b2b727a
      Simon Heimberg authored
      When loading a python hook with file syntax fails, there is no
      information that this happened while loading a hook. When the python
      file does not exist even the file name is not printed. (Only that a
      file is missing.)
      
      This patch adds this information and a test for loading a non existing file and
      a directory not being a python module.
      1b2b727a
  9. Jul 18, 2012
  10. Jul 17, 2012
  11. Jul 16, 2012
    • Pierre-Yves David's avatar
      obsolete: mark unreachable extinct changesets as hidden · 8018f234
      Pierre-Yves David authored
      The repo.hiddenrevs set is updated with all extinct() changesets which aren't
      descendants of either:
      
      - the current working copy,
      - a bookmark,
      - a tag.
      8018f234
    • Pierre-Yves David's avatar
      hidden: move hiddenrevs set on the repository · 62c56c94
      Pierre-Yves David authored
      This set is always accessed through the repo for now. Having this set
      carried by the changelog make it complicated to:
      
      - initialize it, computing hidden set may involve revset call
      - lazy compute it, (1) only the changelog can detect someone access it,
                         (2) only the repo have enought knowledge to compute it.
      
      In later version I expect he changelog to apply filtering itself and the set to
      be carried by changelog again.
      62c56c94
  12. Jul 13, 2012
    • Pierre-Yves David's avatar
      obsolete: do not exchange extinct changesets · 70ebb4bd
      Pierre-Yves David authored
      Extinct changesets are excluded from all exchange operations. This is a silent
      exclusion because the user should not need to be aware of them.
      
      There is no reason to strongly enforce this exclusion except implementation
      simplicity. User should be able to explicitly request an extinct changeset in
      the future.
      70ebb4bd
  13. Jul 16, 2012
    • Pierre-Yves David's avatar
      repo: move visibleheads and visiblebranchmap logic in discovery · 97eff000
      Pierre-Yves David authored
      They were previously inside the mercurial.phases module, but obsolete
      logic will need them to exclude `extinct` changesets from pull and
      push.
      
      The proper and planned way to implement such filtering is still to apply a
      changelog level filtering. But we are far to late in the cycle to implement and
      push such a critical piece of code (changelog filtering). With Matt Mackall
      approval I'm extending this quick and dirty mechanism for obsolete purpose.
      
      Changelog level filtering should come during the next release cycle.
      97eff000
    • Pierre-Yves David's avatar
      localpeer: return only visible heads and branchmap · 4feb55e6
      Pierre-Yves David authored
      Now that we have localpeer, we can apply filtering on heads and branchmap the
      same way it's done for wireprotocol peer.
      4feb55e6
  14. Jul 18, 2012
  15. Jul 08, 2012
    • wujek srujek's avatar
      hgweb: side-by-side comparison functionality · 1ae11926
      wujek srujek authored
      Adds new web command to the core, ``comparison``, which enables colorful
      side-by-side change display, which for some might be much easier to work with
      than the standard line diff output. The idea how to implement comes from the
      SonicHq extension.
      The web interface gets a new link to call the comparison functionality. It lets
      users configure the amount of context lines around change blocks, or to show
      full files - check help (also in this changeset) for details and defaults. The
      setting in hgrc can be overridden by adding ``context=<value>`` to the request
      query string. The comparison creates addressable lines, so as to enable sharing
      links to specific lines, just as standard diff does.
      Incorporates updates to all web related styles.
      
      Known limitations:
      * the column diff is done against the first parent, just as the standard diff
      * this change allows examining diffs for single files only (as I am not sure if
        examining the whole changeset in this way would be helpful)
      * syntax highlighting of the output changes is not performed (enabling the
        highlight extension has no influence on it)
      1ae11926
  16. Jul 06, 2012
  17. Jul 16, 2012
  18. Jul 15, 2012
  19. Jul 16, 2012
  20. Jul 03, 2012
  21. Jul 16, 2012
  22. Jul 13, 2012
Loading