facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 08:18:15 +03:00
Code Issues Projects Releases Wiki Activity
88da24240c
sapling/mercurial
History
Siddharth Agarwal 88da24240c filemerge: break overall filemerge into separate premerge and merge steps 
This means that in ms.resolve we must call merge after calling premerge. This
doesn't yet mean that all premerges happen before any merges -- however, this
does get us closer to our goal.

The output differences are because we recompute the merge tool. The only
user-visible difference caused by this patch is that if the tool is missing
we'll print the warning twice. Not a huge deal, though.
2015-10-11 20:47:14 -07:00
..
default.d mergetools: drop incorrect quoting of diffargs variables 2015-01-28 02:28:38 +01:00
help templater: introduce {latesttag()} function to match a pattern (issue4184) 2015-08-23 23:44:58 -04:00
hgweb error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
httpclient global: mass rewrite to use modern exception syntax 2015-06-23 22:20:08 -07:00
pure osutil: remove Python 2.4 errno conversion workaround 2015-06-22 10:11:31 -07:00
templates hgweb: remove obsolete -webkit-border-radius property 2015-10-12 14:46:51 +01:00
__init__.py
ancestor.py ancestor: use absolute_import 2015-08-07 19:45:48 -07:00
archival.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
base85.c base85: fix comparison of an int and a long 2015-08-21 14:29:42 -04:00
bdiff.c bdiff: avoid a memory error on malloc failure 2013-10-30 16:03:42 -05:00
bookmarks.py bookmarks: use recordchange instead of writing if transaction is active 2015-10-08 01:41:30 +09:00
branchmap.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
bundle2.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
bundlerepo.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
byterange.py global: mass rewrite to use modern exception syntax 2015-06-23 22:20:08 -07:00
changegroup.py getsubset: get the unpacker version from the bundler 2015-10-09 14:59:37 -07:00
changelog.py reachableroots: construct and sort baseset in revset module 2015-08-28 11:14:24 +09:00
cmdutil.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
commands.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
commandserver.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
config.py config: use absolute_import 2015-08-08 00:28:53 -07:00
context.py context: don't hex encode all unknown 20 char revision specs (issue4890) 2015-10-09 01:19:37 +02:00
copies.py copies: move debug statement to appropriate place 2015-08-19 15:11:17 -05:00
crecord.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
dagparser.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
dagutil.py dagutil: use absolute_import 2015-08-08 19:04:09 -07:00
demandimport.py demandimport: replace more references to _demandmod instances 2015-10-04 11:17:43 -07:00
destutil.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
diffhelpers.c diffhelpers: fix botched return statement from e48d70075d8a 2015-01-28 13:34:20 -05:00
dirs.c dirs.c: pass C string, not Python string, to _finddir() 2015-05-08 14:13:12 -07:00
dirstate.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
discovery.py discovery: put trivial branch first 2015-10-12 00:45:24 -07:00
dispatch.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -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 global: mass rewrite to use modern exception syntax 2015-06-23 22:20:08 -07:00
error.py error: make lock inheritance contract violations a subclass of RuntimeError 2015-09-25 12:56:05 -07:00
exchange.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
exewrapper.c exewrapper: adapt for legacy HackableMercurial 2012-08-07 11:04:41 +02:00
extensions.py extensions: use absolute_import 2015-08-08 19:13:14 -07:00
fancyopts.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
filelog.py filelog: use absolute_import 2015-08-08 19:11:42 -07:00
filemerge.py filemerge: break overall filemerge into separate premerge and merge steps 2015-10-11 20:47:14 -07:00
fileset.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
formatter.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
graphmod.py graphmod: compute slow revset query once prior to reachableroots (issue4782) 2015-09-08 23:00:44 +09:00
hbisect.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
help.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
hg.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
hook.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
httpconnection.py httpconnection: remove a mutable default argument 2015-09-24 00:54:30 -07:00
httppeer.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
i18n.py i18n: use absolute_import 2015-08-08 19:28:49 -07:00
keepalive.py global: mass rewrite to use modern exception syntax 2015-06-23 22:20:08 -07:00
localrepo.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
lock.py lock: add a way to prevent locks from being inherited 2015-10-06 13:13:31 -07:00
lsprof.py profiling: replace '+' markup of nested lines with indentation 2013-02-08 22:54:48 +01:00
lsprofcalltree.py
mail.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
manifest.c lazymanifest: prevent leak when updating an entry more than once 2015-04-11 11:56:21 -04:00
manifest.py treemanifest: rework lazy-copying code (issue4840) 2015-09-25 22:54:46 -04:00
match.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
mdiff.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
merge.py filemerge: break overall filemerge into separate premerge and merge steps 2015-10-11 20:47:14 -07:00
minirst.py urls: bulk-change primary website URLs 2015-09-30 15:43:49 -05:00
mpatch.c mpatch: rewrite pointer overflow checks 2013-12-11 18:33:42 -06:00
namespaces.py namespaces: use absolute_import 2015-08-08 19:42:58 -07:00
node.py node: use absolute_import 2015-08-08 19:43:24 -07:00
obsolete.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
osutil.c osutil: mark end of string with null char, not 0 2015-03-25 16:21:58 -07:00
parser.py parser: move unescape helper from templater 2015-09-10 23:25:10 +09:00
parsers.c parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888) 2015-10-11 18:30:47 +09:00
patch.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
pathencode.c pathencode: check result of .digest() method in sha1hash 2015-08-18 16:32:41 -04:00
pathutil.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
peer.py peer: use absolute_import 2015-08-08 19:45:45 -07:00
phases.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
posix.py posix: shellquote do not require quoting for "+" (issue4818) 2015-09-04 11:15:02 -04:00
progress.py progress: force a repaint of a printed progress bar after a clear() 2015-09-26 00:10:48 -04:00
pushkey.py pushkey: use absolute_import 2015-08-08 19:57:27 -07:00
pvec.py pvec: replace 'ctx._repo' with 'ctx.repo()' 2015-03-12 23:18:20 -04:00
py3kcompat.py py3kcompat: drop unused export 2014-05-13 15:22:36 -05:00
repair.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
repoview.py repoview: use absolute_import 2015-08-08 19:58:05 -07:00
revlog.py revlog: use existing file handle when reading during _addrevision 2015-09-27 16:08:18 -07:00
revset.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
scmposix.py config: don't read the same config file twice 2014-09-04 21:36:35 +02:00
scmutil.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
scmwindows.py config: don't read the same config file twice 2014-09-04 21:36:35 +02:00
setdiscovery.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
similar.py
simplemerge.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
sshpeer.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
sshserver.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
sslutil.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
statichttprepo.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
store.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
streamclone.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
strutil.py strutil: use absolute_import 2015-08-08 20:01:40 -07:00
subrepo.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
tagmerge.py tagmerge: use absolute_import 2015-08-08 20:10:46 -07:00
tags.py tags: use absolute_import 2015-08-08 20:16:56 -07:00
templatefilters.py templater: port localdate filter to a function 2015-09-01 19:15:16 +09:00
templatekw.py templatekw: add {changes}, {distance} and {tag} to the {latesttag} keyword 2015-08-24 23:30:17 -04:00
templater.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
transaction.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
treediscovery.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
ui.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
unionrepo.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
url.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
util.h util.h: kill no longer needed definitions for Python < 2.6 2015-05-14 09:04:48 +02:00
util.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
verify.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
win32.py win32: use absolute_import 2015-08-08 18:52:59 -07:00
windows.py windows: insert file positioning call between reads and writes 2015-09-27 18:46:53 -07:00
wireproto.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
worker.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00