facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-11 09:17:30 +03:00
Code Issues Projects Releases Wiki Activity
05ac4a77f5
sapling/mercurial
History
Phil Cohen 0be0108bed rebase: replace --tool :abort with rebase --noconflict 
Summary:
I was thinking about what we need to enable automatic restacking on non-conflicting amends (see the next diff), but I realized the --tool :abort tool I implemented in D8493065 doesn't really work well for this for three reasons:

- It can't handle the case of mergedriver having to run, which is the other reason we'd have to break out of IMM.
- It hard-codes the merge tool. The user might want to specify another tool that doesn't recreate conflicts or solves them differently.
- It'd force callers to detect if IMM will be used (to prevent an on-disk merge hapening by mistake). A flag can implement this much more easily.
- As I learned when writing D8493065, it would require hardcoded logic in every command anyway to support the non-IMM case. (Just raising an abort will leave most commands with an interrupted state.)

So, I think we should replace it with this flag to make auto-restacking work very reliably (we could add it to graft, too). If there was some big demand for --tool :abort we could always add it back in the future.

Reviewed By: quark-zju

Differential Revision: D8701897

fbshipit-source-id: ea3b92d0a224a8ce43edb120b53bec241d92a61d
2018-07-02 11:36:46 -07:00
..
cext hg: disable check-code tests for C code 2018-06-05 19:21:43 -07:00
cffi Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
default.d mergetools.rc: find OSX FileMerge in the new location inside Xcode 4.3 2015-10-16 11:37:34 +02:00
help treestate: implement repack 2018-06-18 10:40:07 -07:00
hgweb Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
httpclient Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
pure Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
rust treestate: fix state handling when upgrading to treestate 2018-06-25 15:24:20 -07:00
templates hgweb: stop using HTML comments in <script> 2017-12-15 12:15:58 +08:00
thirdparty Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
__init__.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
ancestor.py Additional info in function comment for commonancestorheads 2018-06-20 09:35:30 -07:00
archival.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
bdiff.c hg: disable check-code tests for C code 2018-06-05 19:21:43 -07:00
bdiff.h hg: disable check-code tests for C code 2018-06-05 19:21:43 -07:00
bitmanipulation.h hg: disable check-code tests for C code 2018-06-05 19:21:43 -07:00
bookmarks.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
branchmap.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
bundle2.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
bundlerepo.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
byterange.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
changegroup.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
changelog.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
chgserver.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
cmdutil.py record: remove name encoded backups 2018-06-29 15:35:59 -07:00
color.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
commands.py chg: cleanup the new entry point 2018-06-14 18:36:46 -07:00
commandserver.py commandserver: set CLOEXEC on server domain socket 2018-06-20 22:21:12 -07:00
compat.h hg: disable check-code tests for C code 2018-06-05 19:21:43 -07:00
config.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
configitems.py treestate: implement repack 2018-06-18 10:40:07 -07:00
connectionpool.py connectionpool: fix wrapping of cleanup 2018-06-21 23:20:10 -07:00
context.py fsmonitor: store fsmonitor state in treestate 2018-06-14 21:38:33 -07:00
copies.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
crecord.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
dagop.py dagop: handle wdir() in dagrange expressions 2018-06-25 05:19:58 -07:00
dagparser.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
dagutil.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
debugcommands.py debugdirstate: print treestate internal states in verbose mode 2018-06-13 19:03:10 -07:00
destutil.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
dirstate.py dirstate: optimize copied for treestate 2018-06-25 14:04:55 -07:00
dirstateguard.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
discovery.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
dispatch.py ui: remove machine-generated blocked tags 2018-06-29 05:34:00 -07:00
drawdag.py drawdag: support removing files 2018-06-29 11:35:29 -07:00
dummycert.pem ssl: on OS X, use a dummy cert to trick Python/OpenSSL to use system CA certs 2014-09-26 02:19:48 +02:00
encoding.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
error.py merge: add the type of conflict (file or driver) and path(s) to InMemoryMergeConflictsError 2018-07-02 11:36:46 -07:00
exchange.py remotefilelog: don't process manifests when not necessary 2018-06-19 10:20:07 -07:00
exewrapper.c hg: disable check-code tests for C code 2018-06-05 19:21:43 -07:00
extensions.py remove the dispatch entry point code 2018-06-28 13:05:23 -07:00
fancyopts.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
filelog.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
filemerge.py rebase: replace --tool :abort with rebase --noconflict 2018-07-02 11:36:46 -07:00
fileset.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
formatter.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
graphmod.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
hbisect.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
help.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
hg.py clone: close repo during clone 2018-06-29 15:51:39 -07:00
hintutil.py hint: pick the user config file that exists 2018-05-31 20:16:07 -07:00
hook.py ui: remove machine-generated blocked tags 2018-06-29 05:34:00 -07:00
httpconnection.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
httppeer.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
i18n.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
interpreter.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
keepalive.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
localrepo.py localrepo: add localrepo._lockfreeprefix 2018-06-20 12:50:12 -07:00
lock.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
logexchange.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
lsprof.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
lsprofcalltree.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
mail.py py3: make sure the first argument of time.strftime() is str 2017-11-29 08:44:06 +05:30
manifest.py treemanifest: set a hint commit hash for resolving base trees 2018-06-13 11:49:46 -07:00
match.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
mdiff.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
merge.py merge: add the type of conflict (file or driver) and path(s) to InMemoryMergeConflictsError 2018-07-02 11:36:46 -07:00
mergeutil.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
metrics.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
minirst.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
mpatch.c hg: disable check-code tests for C code 2018-06-05 19:21:43 -07:00
mpatch.h hg: disable check-code tests for C code 2018-06-05 19:21:43 -07:00
namespaces.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
node.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
obsolete.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
obsutil.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
parser.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
patch.py stat: add a new "status" style 2018-05-25 01:04:07 -07:00
pathutil.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
peer.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
phases.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
policy.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
posix.py log maxxrss from within mercurial 2018-06-07 11:50:46 -07:00
profiling.py profiling - modify file opening for profiling 2018-06-07 07:50:38 -07:00
progress.py progress: tone down fancyrenderer 2018-06-14 02:42:39 -07:00
pushkey.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
pvec.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
pycompat.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
rcutil.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
registrar.py template: add a way to support command-level template cleanly 2018-06-06 15:43:25 -07:00
repair.py truncate: handle bug in truncate 2018-05-30 18:20:57 -07:00
repository.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
repoview.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
revlog.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
revset.py revset: increase weights of predicates that use filter 2018-06-22 07:40:08 -07:00
revsetlang.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
rewriteutil.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
scmposix.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
scmutil.py fsmonitor: add a race detector 2018-06-25 19:51:40 -07:00
scmwindows.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
server.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
setdiscovery.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
similar.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
simplemerge.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
smartset.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
sparse.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
sshpeer.py ssh: update another spot to write remote stderr to stderr 2018-06-25 19:20:11 -07:00
sshserver.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
sslutil.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
statichttprepo.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
statprof.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
store.py store: workaround long non-fncache file names 2018-06-19 19:19:34 -07:00
streamclone.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
subrepo.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
tagmerge.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
tags.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
templatefilters.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
templatekw.py templatekw: implement nodechanges as a template keyword 2018-06-06 15:43:25 -07:00
templater.py template: improve error handling when template function signature mismatch 2018-06-06 15:43:25 -07:00
transaction.py truncate: handle bug in truncate 2018-05-30 18:20:57 -07:00
treediscovery.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
treestate.py dirstate: optimize copied for treestate 2018-06-25 14:04:55 -07:00
txnutil.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
ui.py ui: remove machine-generated blocked tags 2018-06-29 05:34:00 -07:00
unionrepo.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
upgrade.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
url.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
urllibcompat.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
util.py zstd: use Rust-backed bindings for its support 2018-06-12 13:22:23 -07:00
verify.py codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
vfs.py Back out "vfs: do not unlink files with one hardlink on Windows" 2018-06-19 16:19:51 -07:00
win32.py log maxxrss from within mercurial 2018-06-07 11:50:46 -07:00
windows.py log maxxrss from within mercurial 2018-06-07 11:50:46 -07:00
wireproto.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00
worker.py Upgrade to 18.5b1 2018-05-30 02:23:58 -07:00