Skip to content
Snippets Groups Projects
  1. Jul 25, 2013
    • Matt Mackall's avatar
      histedit: add checkunfinished support (issue3955) · 11664641
      Matt Mackall authored
      The tests contain a couple corner cases where workarounds are now
      required. Strictly speaking, these are behavior regressions, but of an
      extremely obscure and marginal sort. Commits or updates in the middle
      of a histedit would have almost always been fairly serious user error.
      11664641
  2. Jul 24, 2013
  3. Jul 16, 2013
  4. Jul 15, 2013
    • Martin Geisler's avatar
      histedit: use base for computing renames when folding (issue3729) · f6b047cf
      Martin Geisler authored
      When a file was renamed in the very first changeset being histedited,
      the rename was not detected. Consider a history like this:
      
         0  base: add a.txt
         1  first: rename a.txt to b.txt
         2  last: edit b.txt
      
      When 1 and 2 are edited, copies.pathcopies(first, last) correctly
      returns that nothing was renamed. We must instead use
      copies.pathcopies(first, last) to detect the initial rename.
      f6b047cf
  5. Jun 07, 2013
  6. Jun 05, 2013
  7. May 14, 2013
  8. Apr 18, 2013
  9. Apr 16, 2013
    • Pierre-Yves David's avatar
      histedit: move outgoing processing to its own function · 26b41a90
      Pierre-Yves David authored
      Every piece of code extracted from the main command is a win. We simplify
      changeset determination in the process. Parent ceases being a list before
      becoming a node. We how have a root variable containing a node all the time.
      26b41a90
    • Pierre-Yves David's avatar
      histedit: move all arguments checks to the beginning of the command · 12c06686
      Pierre-Yves David authored
      This changeset move all checks and raises related to arguments
      validation to the top of the file. This gathers all the logic in one
      place and clarifies the code doing actual work. This paves the way for
      splitting this gigantic function in separated functions.
      
      A `goal` variable is introduced in the process. It holds the action to
      be done by this invocation (new, continue or abort).
      
      An invalid invocation is found in the process (the new code is a bit stricter).
      12c06686
    • Pierre-Yves David's avatar
      histedit: allow "-" as a command file · 730614b9
      Pierre-Yves David authored
      When "-" is specified as a command file, we read rules from stdin. Alter a
      single test to demo the behavior, but most of them could benefit from this.
      
      There is minor change in test output resulting from the fact we no
      longer change log messages.
      730614b9
    • Pierre-Yves David's avatar
      histedit: properly handle --continue on empty fold · c5c8613f
      Pierre-Yves David authored
      When all changes from the fold have been dropped, the --continue code was
      confused. This changeset handles this case.
      
      The test for this case existed but was broken.
      c5c8613f
  10. Apr 09, 2013
    • Katsunori FUJIWARA's avatar
      histedit: make "hg histedit" sensitive to branch in URL · 0023a6e4
      Katsunori FUJIWARA authored
      Before this patch, "hg histedit" are not sensitive to the branch
      specified in the URL of the destination repository, even though "hg
      push"/"hg outgoing" are so:
      
      Invocation of "discovery.findcommonoutgoing()" without "onlyheads"
      argument treats revisions on branches other than the one specified in
      the URL as outgoing ones unexpectedly.
      
      This patch specifies list of head revisions, which are already
      detected by "hg.addbranchrevs()" from URL and looked up against local
      repository, as "onlyheads" to "discovery.findcommonoutgoing()" to
      limit calculation of outgoing revisions.
      0023a6e4
  11. Feb 08, 2013
  12. Apr 12, 2013
  13. Feb 10, 2013
  14. Aug 03, 2013
  15. Jan 30, 2013
  16. Jan 16, 2013
    • Pierre-Yves David's avatar
      histedit: proper phase conservation (issue3724) · 35513c59
      Pierre-Yves David authored
      Before this changeset, histedit created all new changesets according
      phases.new-commit option without any regards for the phases of the original
      changesets.
      
      This changeset fix that using the phase of rewritten changeset to decide the
      phase of the resulting changeset. In case of reordering or folding, we keep
      secret item secret as it seems the safer path.
      
      temporary commit creation are not affected. They are head only and stripped at
      the end of the histedit.
      
      As for the resolution of issue3681 (obsolescence cycle prevention), we do not
      handle changesets created by edit command.
      35513c59
    • Pierre-Yves David's avatar
      histedit: record histedit source (issue3681) · 358c23e8
      Pierre-Yves David authored
      Have histedit record the hex of the original changeset as already done by:
      - graft
      - commit --amend
      - rebase
      
      My main motivation for adding this is to prevent the creation of obsolescence cycle
      (see issue3681).
      
      Note that commit created during edit are not affected yet.
      358c23e8
    • Pierre-Yves David's avatar
      histedit: factor most commit creation in a function · b38c1050
      Pierre-Yves David authored
      Later commits add two important items to histedit:
      - Obsolescence cycle prevention
      - Proper phase conservation
      
      Those logics must be applied to all simple operations (pick, edit, mess) and
      will require verbose code.
      
      So we introduce a new function that will provide an entry point for this new.
      logic.
      
      The function build a closure to have a clear distinction between commit
      arguments and data provided to the function to fulfil its logic.
      b38c1050
  17. Dec 12, 2012
  18. Jan 14, 2013
  19. Dec 24, 2012
  20. Dec 31, 2012
    • Pierre-Yves David's avatar
      histedit: allow operation from non-head if obsolete is enabled · 0f5a0a20
      Pierre-Yves David authored
      Obsolescence markers can represent this situation just fine. Rewritten
      revisions are marked as precursors of the ones creates by
      histedit. Unaffected descendants become "unstable".
      
      If obsolescence is not enabled we keep the current behavior of
      aborting. This new behavior only applies when obsolete is
      enabled and is subject to future discussion and changes.
      0f5a0a20
  21. Nov 07, 2012
    • durin42's avatar
      bookmarks: introduce a bmstore to manage bookmark persistence · 7f5dab94
      durin42 authored
      Bookmarks persistence still showed a fair amount of its legacy as a
      monkeypatching extension. This encapsulates all bookmarks
      serialization and parsing in a single class, and offers a single
      location where other bookmarks storage engines can be substituted
      in. As a result, many files no longer import the bookmarks module,
      which strikes me as an encapsulation win.
      
      This doesn't do anything to the current bookmark state yet, but I'm
      hoping put that in the bmstore class as well.
      7f5dab94
  22. Oct 16, 2012
  23. Oct 14, 2012
  24. Oct 12, 2012
  25. Sep 27, 2012
Loading