Skip to content
Snippets Groups Projects
  1. Sep 28, 2014
    • Pierre-Yves David's avatar
      bookmarks: change bookmark within a transaction · e78a80f8f51e
      Pierre-Yves David authored
      For some time, bookmark can and should be moved in the transaction. This
      changeset migrates the 'hg bookmarks' commands to use a transaction.
      
      Tests regarding rollback and transaction hooks are impacted for
      obvious reasons. Some have to be slightly updated to keep testing the
      same things. Some can just be dropped because they do not make sense
      anymore.
      e78a80f8f51e
  2. May 14, 2014
  3. Aug 17, 2012
  4. Jul 26, 2012
    • durin42's avatar
      strip: move bookmarks to nearest ancestor rather than '.' · ec7b9bec19c9
      durin42 authored
      If you've got this graph:
      
      0-1-2
         \
          3
      
      and 3 is checked out, 2 is bookmarked with "broken", and you do "hg
      strip 2", the bookmark will move to 3, not 1. That's always struck me
      as a bug.
      
      This change makes bookmarks move to the tipmost ancestor of
      the stripped set rather than the currently-checked-out revision, which
      is what I always expected should happen.
      ec7b9bec19c9
  5. Feb 28, 2012
  6. Mar 13, 2011
  7. Feb 24, 2011
  8. Feb 10, 2011
    • Gilles Moris's avatar
      rollback: clarifies the message about the reverted state (issue2628) · 1e497df514e2
      Gilles Moris authored
      Previously, when rolling back a transaction, some users could be confused
      between the level to which the store is rolled back, and the new parents
      of the working directory.
      
        $ hg rollback
        rolling back to revision 4 (undo commit)
      
      With this change:
        $ hg rollback
        repository tip rolled back to tip revision 4 (undo commit)
        working directory now based on revision 2 and 1
      
      So now the user can realize that the store has been rolled back to an older
      tip, but also that the working directory may not on the tip (here we are
      rolling back the merge of the heads 2 and 1)
      1e497df514e2
  9. Feb 16, 2011
  10. Feb 10, 2011
  11. Jan 27, 2011
  12. Oct 09, 2010
  13. Sep 23, 2010
    • Patrick Mezard's avatar
      Merge with stable · 9d45f78c465b
      Patrick Mezard authored
      9d45f78c465b
    • Patrick Mezard's avatar
      bookmarks: fix _bookmarks/lookup() reentrancy issue (issue2016) · 741290486877
      Patrick Mezard authored
      _bookmarks is loaded lazily and calls super.lookup(). Unfortunately, branch and
      tags caches initializations also recurse in lookup() and end up trying to
      access _bookmarks again. Massive confusion ensues.
      
      I considered fixing all branches and tags cache loading to avoid recursing in
      lookup() but it would add complexity to otherwise working code provided lookups
      are performed on nodes or revnums.
      741290486877
  14. Sep 22, 2010
    • Brodie Rao's avatar
      tests: add glob matching for unified tests · 97ffc68f71d3
      Brodie Rao authored
      This adds a " (glob)" marker that works like a simpler version of
      (re): "*" is converted to ".*", and "?" is converted to ".".
      
      Both special characters can be escaped using "\", and the backslash
      itself can be escaped as well.
      
      Other glob-style syntax, like "**", "[chars]", or "[!chars]", isn't
      supported.
      97ffc68f71d3
    • Brodie Rao's avatar
      tests: require regexes in unified tests to be marked with " (re)" · 02990e22150b
      Brodie Rao authored
      Consider this test:
      
        $ hg glog --template '{rev}:{node|short} "{desc}"\n'
        @  2:20c4f79fd7ac "3"
        |
        | o  1:38f24201dcab "2"
        |/
        o  0:2a18120dc1c9 "1"
      
      Because each line beginning with "|" can be compiled as a regular
      expression (equivalent to ".*|"), they will match any output.
      
      Similarly:
      
        $ echo foo
      
      
      The blank output line can be compiled as a regular expression and will
      also match any output.
      
      With this patch, none of the above output lines will be matched as
      regular expressions. A line must end in " (re)" in order to be matched
      as one.
      
      Lines are still matched literally first, so the following will pass:
      
        $ echo 'foo (re)'
        foo (re)
      02990e22150b
  15. Sep 02, 2010
    • Martin Geisler's avatar
      tests: remove unneeded -d flags · 4c94b6d0fb1c
      Martin Geisler authored
      Many tests fixed the commit date of their changesets at '1000000 0' or
      similar. However testing with "Mon Jan 12 13:46:40 1970 +0000" is not
      better than testing with "Thu Jan 01 00:00:00 1970 +0000", which is
      the default run-tests.py installs.
      
      Removing the unnecessary flag removes some clutter and will hopefully
      make it clearer what the tests are really trying to test. Some tests
      did not even change their output when the dates were changed, in which
      case the -d flag was truly irrelevant.
      
      Dates used in sequence (such as '0 0', '1 0', etc...) were left alone
      since they may make the test easier to understand.
      4c94b6d0fb1c
  16. Aug 16, 2010
  17. Aug 14, 2010
  18. May 21, 2010
  19. May 20, 2010
  20. Nov 05, 2008
Loading