Skip to content
Snippets Groups Projects
  1. Oct 02, 2018
    • Sushil Khanchi's avatar
      evolve: use stack alias s# in `hg evolve` msgs · cc3a0b13
      Sushil Khanchi authored
      As repository grows revision number lose their usefulness. To
      make it a little better than now, after this patch we will be
      using short stack aliases introduced by the topic extension
      (as displayed by `hg stack`).
      
      These stack aliases s# will be used only when user has enabled
      topic extension and his repo's current active topic is same as
      the revs to be evolved.
      
      For now, this patch doesn't cover `continue` case. I will discuss about this
      with Pierre-Yves David. Maybe we have to store the info in evolvestate that "we
      were using stack aliases".
      cc3a0b13
  2. Oct 01, 2018
    • Sushil Khanchi's avatar
      evolve: extract displayer to _solveone() · dd81d7f4
      Sushil Khanchi authored
      I extracted this displayer method to _solveone() so that it would be
      easy to pass a different template to show evolve msgs. In upcoming
      patches we will be using stacktemplate in some cases where we want
      to include stack alias s# in evolve msgs.
      dd81d7f4
    • Sushil Khanchi's avatar
      utility: add a template alias that will be used in evolve msgs · e1f6f9da
      Sushil Khanchi authored
      This template use stack alias s# instead of rev number in messages
      printed when we run `hg evolve`.
      For example, this template's msgs will look like this:
          move:[s3] add aaa
          atop:[s2] add bbb
          move:[s4] add ccc
      I will be using this template in upcoming patches.
      e1f6f9da
    • Sushil Khanchi's avatar
      topic: add topicidx template keyword · fb22c7a6
      Sushil Khanchi authored
      This keyword will be useful where we want to see the index of
      the changeset in the stack when we run `hg stack`.
      fb22c7a6
  3. Oct 09, 2018
  4. Oct 02, 2018
  5. Sep 26, 2018
  6. Sep 25, 2018
  7. Sep 23, 2018
  8. Sep 22, 2018
  9. Sep 23, 2018
  10. Sep 21, 2018
  11. Sep 22, 2018
    • Pierre-Yves David's avatar
      topic: respect preexisting 'topic' value on workingcommitctx · 865c33c1
      Pierre-Yves David authored
      Mercurial's core changeset: 6c8ceebce309 revealed an issue. If the creator of a
      workingcommitctx explicitly assigned a 'topic', it was silently overridden by
      the current active on. This break import of patch with topic information.
      
      We now respect preexisting topic information.
      865c33c1
  12. Sep 21, 2018
    • Pierre-Yves David's avatar
      topic: add a compatibility to access transaction's names · 23658110
      Pierre-Yves David authored
      The attribute was made private in 4024c363cd33.
      23658110
    • Pierre-Yves David's avatar
      topic: add a compatibility to access transaction's validator · 119fced5
      Pierre-Yves David authored
      The attribute was made private in ebbba3ba3f66.
      119fced5
    • Sushil Khanchi's avatar
      evovle: remove redundancy in evolve output · 4eb38775
      Sushil Khanchi authored
      Copying the discription of this redundancy issue given by Pierre Yves David:
      
      When running `hg evolve` to stabilize orphan changeset output about the
      currently stabilized changeset is issued. For example:
      
      $ hg evolve
        move:[3] a3
        atop:[4] a2
        working directory is now at 7c5649f73d11
      
      This output can become quite repetitive when orphan are stabilized atop
      each other. For example:
      
      $ hg evolve --all
        move:[8] dansk 2!
        atop:[10] dansk!
        merging main-file-1
        move:[9] dansk 3!
        atop:[11] dansk 2!
      
      In this case it would be smoother to issue:
      
      $ hg evolve --all
        move:[8] dansk 2!
        atop:[10] dansk!
        merging main-file-1
        move:[9] dansk 3!
      
      Since we are moving "dansk 3!" atop the changeset we just stabilized.
      
      When adding this be careful that we still want to issue the "atop" message
      in various cases:
      
        1. first changesets in a stack
        2. when the orphan is not stabilized atop previous one
        3. when using hg evolve --continue to resume an evolution
      
      So, I have made the changes which also respect above listed three points.
      And changes in tests/test-evovle*.t reflecting the changed behavior.
      4eb38775
    • Pierre-Yves David's avatar
      amend: handle crash before transaction initialization with --patch · 7f18c7e1
      Pierre-Yves David authored
      The `tr` object can be None.
      7f18c7e1
  13. Sep 18, 2018
  14. Sep 17, 2018
    • Gregory Szorc's avatar
      obsdiscovery: adopt to calling convention change · c4b891fe
      Gregory Szorc authored
      Upstream commits 71d83b315778 and abce899c985f changed the calling
      convention of setdiscovery._takefullsample().
      
      We inspect the signature of the function before calling it so
      we can pass the proper arguments.
      c4b891fe
  15. Sep 14, 2018
Loading