sapling/hgext3rd
Jun Wu 316cae170e absorb: add an interface to edit lines for all involved revisions
Summary:
This feature allows the user to choose what lines exist in what changesets
precisely, for example:

    HG: editing a
    HG: "y" means the line to the right exists in the changeset to the top
    HG:
    HG: /---- 991104c93ef1 commit 1
    HG: |/--- aa7e21df9b0b commit 2
    HG: ||/-- 05b39f5d9141 commit 3
    HG: |||
        yyy : 1
         yy : 2
          y : 3

The feature can be used to "move" lines among changesets, or generally
editing the contents in a new way. So it's not limited in the "absorb"
use-case. We may want to give it another name in the future.

Test Plan: Added a new test case

Reviewers: #mercurial, rmcelroy, ttung

Reviewed By: rmcelroy

Subscribers: rmcelroy, mjpieters

Differential Revision: https://phabricator.intern.facebook.com/D3841494

Signature: t1:3841494:1473769708:1bb2a46c010222438ceaae69ea0dca39e37581d2
2016-09-09 14:06:16 +01:00
..
__init__.py Fix hgext3rd/__init__.py to make sure it is a namespace package 2016-08-22 17:39:02 -07:00
absorb.py absorb: add an interface to edit lines for all involved revisions 2016-09-09 14:06:16 +01:00
arcdiff.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
backups.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
bundle2hooks.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
catnotate.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
chistedit.py chistedit: workaround a Python bug 2016-09-01 20:18:36 +01:00
commitextras.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
dirsync.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
errorredirect.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
extorder.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
extutil.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
fastlog.py check-code fixes 2016-08-25 09:04:43 -07:00
fbamend.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
fbconduit.py Parallel callout to scmquery through conduit 2016-08-12 15:52:50 -07:00
fbhistedit.py fbhistedit: use ui.system instead of util.system 2016-09-10 03:23:12 +01:00
githelp.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
gitlookup.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
gitrevset.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
grepdiff.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
inhibitwarn.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
logginghelper.py logginghelper: return repo name instead of repo root 2016-09-09 08:07:56 -07:00
mergedriver.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
morestatus.py morestatus: rebase takes precedence over update 2016-08-10 22:19:30 +01:00
nointerrupt.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
ownercheck.py ownercheck: new extension to prevent operations on repos not owned 2016-07-26 13:10:15 +01:00
patchpython.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
perftweaks.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
phabdiff.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
phabstatus.py Add sync status and change the conduit call to differential.querydiffhashes 2016-08-05 11:33:36 -07:00
phrevset.py phrevset: do not depend on hgsubversion 2016-07-20 20:09:29 +01:00
pullcreatemarkers.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
pushrebase.py pushrebase: fix for upstream api change 2016-09-05 12:02:23 -07:00
pushvars.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
rage.py rage: filter "FM:" from blackbox.log 2016-08-05 19:17:45 +01:00
reset.py reset: make reset support -r/--rev as this is what people often expect 2016-09-15 08:49:23 -07:00
sampling.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
show.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
simplecache.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
smartlog.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
sparse.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00
sshaskpass.py sshaskpass: disable echo for Password: prompt 2016-09-09 17:24:23 +01:00
statprofext.py Fix statprof for upstream 2016-08-29 15:23:04 -07:00
tweakdefaults.py tweakdefaults: make "bookmarks" use the unfiltered repo 2016-08-11 18:43:06 +01:00
uncommit.py Implement 'hg uncommit' 2016-08-17 13:43:25 -07:00
upgradegeneraldelta.py hgext: move single file extensions to hgext3rd 2016-07-08 13:15:42 +01:00