Skip to content
Snippets Groups Projects
  1. May 27, 2016
  2. May 26, 2016
    • Sean Farley's avatar
      histedit: remove unneeded initial parameter · a0efbfbb
      Sean Farley authored
      Now that the autoverb logic no longer acts on an individual rule line,
      we don't need this parameter since we apply our logic just once at the
      time of initialization.
      a0efbfbb
    • Sean Farley's avatar
      histedit: move autoverb logic from torule to ruleeditor · 00d2bf41
      Sean Farley authored
      This is needed for an upcoming change that will automatically rearrange the
      rules based on the commit message. Before this patch, the autoverb logic only
      applied to one rule at a time. This moves that logic one step up so that it can
      iterate over all the rules and rearrange as needed.
      00d2bf41
  3. Jun 04, 2016
    • Pulkit Goyal's avatar
      py3: conditionalize cPickle import by adding in util · b5015791
      Pulkit Goyal authored
      The cPickle is renamed to _pickle in python3 and this C extension is available
       in pickle which was not included in earlier versions. So imports are conditionalized
       to import cPickle in py2 and pickle in py3. Moreover the use of pickle in py2 is
       switched to cPickle as the C extension is faster. The hack is added in util.py and
      the modules import util.pickle
      b5015791
  4. May 07, 2016
  5. May 14, 2016
  6. May 06, 2016
  7. Mar 19, 2016
    • Mateusz Kwapich's avatar
      histedit: add a hint about enabled dropmissing to histedit edit comment · cdbd9c0c
      Mateusz Kwapich authored
      Adds a hint to histedit comment reminding user about enabled dropmissing.
      This will make the enabled dropmissing more visible. The example comment:
      
      # Edit history between b592564a803c and b54649a8a63f
      #
      # Commits are listed from least to most recent
      #
      # You can reorder changesets by reordering the lines
      #
      # Commands:
      #
      #  e, edit = use commit, but stop for amending
      #  m, mess = edit commit message without changing commit content
      #  p, pick = use commit
      #  b, base = checkout changeset and apply further changesets from there
      #  d, drop = remove commit from history
      #  f, fold = use commit, but combine it with the one above
      #  r, roll = like fold, but discard this commit's description
      #
      # Deleting a changeset from the list will DISCARD it from the edited history!
      cdbd9c0c
  8. Mar 15, 2016
    • Jun Wu's avatar
      histedit: do not close stdin · e2b9145e
      Jun Wu authored
      Closing stdin is unexpected by chgserver and is not a good idea generally.
      This patch refactors related code a bit and make sure stdin is not closed.
      It will make chg much happier on test-histedit*.t.
      e2b9145e
  9. Mar 13, 2016
    • Mateusz Kwapich's avatar
      histedit: have dropmissing abort on empty plan · 518a5030
      Mateusz Kwapich authored
      We noticed that many users have the intuition of laving the editor empty when
      they want to abort the operation. The fact that dropmissing allows user to
      delete all edited commits is not intuitive even for users that asked for it.
      
      Let's prevent people from this footgun.
      518a5030
  10. Mar 08, 2016
  11. Mar 02, 2016
    • timeless's avatar
      histedit: reword message when a changeset produces no changes · c100dbd5
      timeless authored
      There are various ways to use histedit such that an item in
      the list of things to perform will not result in a change
      relative to the previous repository state.
      
      When that happens, histedit does not keep the commit/message.
      
      This changes the note to try to explain to the user that it
      will not be present in their history.
      c100dbd5
  12. Feb 29, 2016
  13. Feb 24, 2016
  14. Feb 23, 2016
    • Kostia Balytskyi's avatar
      histedit: make histedit aware of obsolescense not stored in state (issue4800) · eed7d8c0
      Kostia Balytskyi authored
      Before this change, when histedit exited to interactive session (during edit
      command for example), user could introduce obsolescence markers that would not
      be known to histedit. For example, user could've amended one of the commits.
      The fact of this amendment would not be stored in histedit's state file
      and later, when histedit would try to process all the replacements,
      one of the final successors (in histedit's opinion) would turn out to be hidden.
      This behavior is described in issue4800. This commit fixes it.
      eed7d8c0
  15. Feb 16, 2016
  16. Feb 15, 2016
  17. Feb 14, 2016
    • Kostia Balytskyi's avatar
      histedit: break _histedit function into smaller pieces · df206e03
      Kostia Balytskyi authored
      We add _getgoal, _validateargs.
      
      This is a part of bigger effort to refactor histedit. Initial steps are to
      break _histedit function into smaller pieces which will supposedly be more
      understandable. After this is done, I will have a better understanding
      of how histedit works and apply that to fix issue4800.
      df206e03
    • Kostia Balytskyi's avatar
      histedit: break _histedit function into smaller pieces (add _continueaction) · 8fc55388
      Kostia Balytskyi authored
      This is a part of bigger effort to refactor histedit. Initial steps are to
      break _histedit function into smaller pieces which will supposedly be more
      understandable. After this is done, I will have a better understanding
      of how histedit works and apply that to fix issue4800.
      8fc55388
  18. Feb 01, 2016
  19. Feb 04, 2016
  20. Feb 11, 2016
  21. Feb 03, 2016
  22. Feb 01, 2016
  23. Jan 15, 2016
  24. Dec 23, 2015
  25. Dec 22, 2015
  26. Dec 23, 2015
    • timeless's avatar
      histedit: report the unacceptable changeset · bb810c8b
      timeless authored
      bb810c8b
    • timeless's avatar
      histedit: replace @addhisteditaction with @action · d073f4c7
      timeless authored
      @action supports verbs, messages, priority, and internal
      
      messages should be translated.
      internal means the action should not be listed.
      
      geteditcomment will construct the verbs list based on
      @actions (prefering priority over non priority, otherwise
      favoring verbs with short forms over verbs without).
      d073f4c7
    • timeless's avatar
      histedit: prefer edit commit, edit message, use commit · 78d86664
      timeless authored
      Selecting editing commits, rewording commit messages, and
      selecting commits are key actions, we will prefer them more
      generally in a future commit, this pulls them ahead before
      that to make the diffs easier to read.
      
      The remaining commands are left alphabetically sorted
      78d86664
Loading