Skip to content
Snippets Groups Projects
  1. Dec 18, 2015
  2. Dec 14, 2015
  3. Dec 05, 2015
  4. Dec 03, 2015
  5. Nov 12, 2015
  6. Nov 28, 2015
  7. Nov 20, 2015
  8. Nov 18, 2015
  9. Nov 19, 2015
    • Laurent Charignon's avatar
      rebase: remove an unused todo · e97132eb841c
      Laurent Charignon authored
      Since we handled skipping obsolete revs when it is relevant, this todo is no
      longer useful. We replace the comment with two useful comments.
      e97132eb841c
  10. Nov 18, 2015
    • Laurent Charignon's avatar
      rebase: don't rebase obsolete commits with no successor · 5eac7ab59b95
      Laurent Charignon authored
      This patch avoids unnecessary conflicts to resolve during rebase for the users
      of changeset evolution.
      
      This patch modifies rebase to skip obsolete commits with no successor.
      It introduces a new rebase state 'revpruned' for these revisions that are
      being skipped and a new message to inform the user of what is happening.
      This feature is gated behind the config flag experimental.rebaseskipobsolete
      
      When an obsolete commit is skipped, the output is:
      note: not rebasing 7:360bbaa7d3ce "O", it has no successor
      5eac7ab59b95
  11. Nov 19, 2015
  12. Nov 15, 2015
    • liscju's avatar
      rebase: add returning value from pullrebase function · 6979fe2a6d75
      liscju authored
      So far pullrebase function has always returned None value, no matter
      what orig function returned. This behaviour made impossible for
      pull to change returned value from mercurial process (it has always
      ended with 0 value by default). This patch makes pullrebase returning
      with returned value from orig.
      6979fe2a6d75
  13. Nov 08, 2015
    • Matt Harbison's avatar
      rebase: preserve the 'intermediate-source' attribute of grafts · 7ffebbdcb371
      Matt Harbison authored
      Preserving the 'source' attribute of grafts started with a69a77a80900, which
      predates the introduction of 'intermediate-source' in 51930a7180bd by a year and
      a half.  It looks like not preserving this was an oversight.
      
      On a related note, notice how the source value of 32af76 is no longer visible in
      the graph above this test.  Is it reasonable to import the sha1 translation from
      evolve.py:relocate() into scmutil or similar, and use that to fixup these
      attributes as well as the commit message?  (I realize that evolve is still
      experimental, but I don't see a way to do this from the evolve extension.)
      7ffebbdcb371
  14. Oct 26, 2015
  15. Oct 19, 2015
  16. Oct 16, 2015
    • Mads Kiilerich's avatar
      spelling: trivial spell checking · 1aee2ab0f902
      Mads Kiilerich authored
      1aee2ab0f902
    • Katsunori FUJIWARA's avatar
      dirstate: make dirstate.write() callers pass transaction object to it · 5ba0a99ff27f
      Katsunori FUJIWARA authored
      Now, 'dirstate.write(tr)' delays writing in-memory changes out, if a
      transaction is running.
      
      This may cause treating this revision as "the first bad one" at
      bisecting in some cases using external hook process inside transaction
      scope, because some external hooks and editor process are still
      invoked without HG_PENDING and pending changes aren't visible to them.
      
      'dirstate.write()' callers below in localrepo.py explicitly use 'None'
      as 'tr', because they can assume that no transaction is running:
      
        - just before starting transaction
        - at closing transaction, or
        - at unlocking wlock
      5ba0a99ff27f
  17. Oct 15, 2015
  18. Oct 13, 2015
    • Christian Delahousse's avatar
      rebase: properly abort when destination is public (issue4896) · e9b3d523f2e6
      Christian Delahousse authored
      After rebasing a set of changes onto a public changeset and having the first one
      be skipped, if you try to abort, the operation fails. This fix adds a check to
      disallow the target rev into the dstates list within the abort function. This
      list is checked for immutable states before the rest of abort does its thing.
      e9b3d523f2e6
  19. Oct 14, 2015
  20. Oct 13, 2015
    • Ryan McElroy's avatar
      rebase: factor out nothing to rebase return code · 66dc39cd7d06
      Ryan McElroy authored
      A rebase call that results in nothing to rebase might be considered successful
      in some contexts. This factors out the return code from places where hg
      determines that there is nothing to rebase, so an extenion might change this
      return code to be something that would allow scripts to run without seeing this
      as an error.
      66dc39cd7d06
    • Christian Delahousse's avatar
      rebase: added comments · 07db7e95c464
      Christian Delahousse authored
      Added comments describing the state variable and constants used throughout the
      rebase extension
      07db7e95c464
  21. Oct 08, 2015
    • Pierre-Yves David's avatar
      error: get Abort from 'error' instead of 'util' · 56b2bcea2529
      Pierre-Yves David authored
      The home of 'Abort' is 'error' not 'util' however, a lot of code seems to be
      confused about that and gives all the credit to 'util' instead of the
      hardworking 'error'. In a spirit of equity, we break the cycle of injustice and
      give back to 'error' the respect it deserves. And screw that 'util' poser.
      
      For great justice.
      56b2bcea2529
  22. Oct 06, 2015
  23. Sep 30, 2015
  24. Sep 24, 2015
  25. Sep 15, 2015
    • Laurent Charignon's avatar
      rebase: don't rebase obsolete commit whose successor is already rebased · 92409f8dff5d
      Laurent Charignon authored
      This patch avoids unnecessary conflicts to resolve during rebase for the users
      of changeset evolution.
      
      This patch modifies rebase to skip obsolete commits if they are being rebased on
      their successors.
      It introduces a new rebase state 'revprecursor' for these revisions that are
      being skipped and a new message to inform the user of what is happening.
      This feature is gated behind the config flag experimental.rebaseskipobsolete
      
      When an obsolete commit is skipped, the output is:
      not rebasing 14:9ad579b4a5de "I", already in destination as 17:fc37a630c901 "K"
      92409f8dff5d
  26. Sep 17, 2015
Loading