facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 00:45:18 +03:00
Code Issues Projects Releases Wiki Activity
fbe932a316
sapling/mercurial
History
Denis Laxalde fbe932a316 mdiff: distinguish diff headers from hunks in unidiff() 
Let unidiff return the list of headers it produces (lines '--- <original>' and
'+++ <new>') apart from diff hunks. In patch.diff(), we combine headers
generated there (not specific to unified format) with those from unidiff().
By returning a list of header lines, we do not append new lines in datetag
inner function of unidiff() so that all header lines are '\n'.join-ed in a
similar way.
2017-03-03 13:51:22 +01:00
..
cffi setup: move cffi stuff to mercurial/cffi 2016-11-09 22:08:30 +00: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 help: fix internals.changegroups 2017-03-01 18:37:34 -08:00
hgweb hgweb: explictly pass basectx in webutil.diffs 2017-01-17 17:25:48 +01:00
httpclient httpclient: update to 54868ef054d2 of httpplus 2016-06-27 11:53:50 -04:00
pure parsers: alias long to int on Python 3 2017-03-08 00:45:19 +05:30
templates hgweb: support Content Security Policy 2017-01-10 23:37:08 -08:00
__init__.py py3: drop unrequired code from __init__.py 2017-03-03 15:30:48 +05:30
ancestor.py py3: convert to next() function 2016-05-16 21:30:53 +00:00
archival.py vfs: use 'vfs' module directly in 'mercurial.archival' 2017-03-02 13:30:28 +01:00
base85.c base85: clean up function definition style 2015-11-11 19:10:45 -05:00
bdiff_module.c bdiff: early pruning of common prefix before doing expensive computations 2016-11-16 19:45:35 +01:00
bdiff.c bdiff: don't check border condition in loop 2016-11-20 16:56:21 -08:00
bdiff.h bdiff: split bdiff into cpy-aware and cpy-agnostic part 2016-07-13 10:46:26 +02:00
bitmanipulation.h internals: move the bitmanipulation routines into its own file 2016-06-06 13:08:13 +02:00
bookmarks.py bookmarks: check HG_PENDING strictly 2017-02-21 01:21:00 +09:00
branchmap.py mercurial: switch to util.timer for all interval timings 2017-02-15 13:17:39 -08:00
bundle2.py bundle2: fix assertion that 'compression' hasn't been set 2017-02-13 11:43:12 -08:00
bundlerepo.py vfs: use 'vfs' module directly in 'mercurial.bundlerepo' 2017-03-02 14:47:03 +01:00
byterange.py pycompat: switch to util.urlreq/util.urlerr for py3 compat 2016-04-06 23:22:12 +00:00
changegroup.py py3: convert the mode argument of os.fdopen to unicodes (2 of 2) 2017-02-13 22:15:28 +05:30
changelog.py changelog: keep track of file end in appender (issue5444) 2016-12-15 11:00:18 -08:00
chgserver.py chg: deduplicate error handling of ui.system() 2017-02-19 01:16:45 +09:00
cmdutil.py vfs: use 'vfs' module directly in 'mercurial.cmdutil' 2017-03-02 13:30:47 +01:00
color.py color: update main documentation 2017-02-21 20:04:55 +01:00
commands.py config: set blockedtag when invoking configuration edit 2017-03-06 03:27:24 -08:00
commandserver.py py3: convert the mode argument of os.fdopen to unicodes (1 of 2) 2017-02-13 20:06:38 +05:30
compat.h compat: define ssize_t as int on 32bit Windows, silences C4142 warning 2016-07-15 23:54:56 +09:00
config.py config: add sanity assert that files are opened as binary 2017-03-03 12:55:11 -05:00
context.py context: remove uses of manifest.matches 2017-03-07 17:52:45 -08:00
copies.py copies: remove use of manifest.matches 2017-03-07 09:56:11 -08:00
crecord.py crecord: log blocked time waiting for curses input 2017-02-15 13:34:06 -08: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
debugcommands.py vfs: use 'vfs' module directly in 'mercurial.debugcommand' 2017-03-02 13:31:07 +01:00
demandimport.py demandimport: do not raise ImportError for unknown item in fromlist 2016-12-19 22:46:00 +09:00
destutil.py scmutil: proxy revrange() through repo to break import cycles 2017-02-19 20:00:18 +09:00
diffhelpers.c diffhelpers: fix botched return statement from e48d70075d8a 2015-01-28 13:34:20 -05:00
dirs.c dirs: use PyVarObject_HEAD_INIT 2016-10-13 13:14:14 +02:00
dirstate.py dirstate: avoid unnecessary load+dump during backup 2017-03-01 18:21:06 -08:00
dirstateguard.py dirstateguard: move to new module so I can break some layering violations 2016-11-21 21:29:32 -05:00
discovery.py discovery: use single quotes in use warning 2016-09-20 23:47:30 +00:00
dispatch.py dispatch: add pagination of two more help cases 2017-03-08 18:32:42 -05: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 py3: make sure encoding.encoding is a bytes variable 2016-12-17 23:55:25 +05:30
error.py shelve: make unshelve be able to abort in any case 2016-07-13 16:16:18 +01:00
exchange.py merge with stable 2017-02-13 09:44:16 -08:00
exewrapper.c exewrapper: add .dll to LoadLibrary() argument 2016-04-27 09:23:39 -07:00
extensions.py extensions: use [0:1] slice on config path instead of [0] 2017-03-03 13:32:10 -05:00
fancyopts.py flags: allow specifying --no-boolean-flag on the command line (BC) 2016-09-13 22:57:57 -04:00
filelog.py revlog: merge hash checking subfunctions 2016-12-13 14:21:36 +00:00
filemerge.py filemerge: tag merge tool for blocked times 2017-03-06 03:19:40 -08:00
fileset.py fileset: drop false function signatures from revs() and status() docs 2017-03-09 00:07:13 +09:00
formatter.py formatter: add support for changeset templating 2017-02-25 17:00:07 +09:00
graphmod.py revset: import set classes directly from smartset module 2017-02-19 18:16:09 +09:00
hbisect.py hbisect: avoid shadowing a variable in a list comprehension 2016-11-10 16:33:23 -05:00
help.py help: avoid mutating passed-in keep list in formattedhelp 2017-03-08 18:31:33 -05:00
hg.py vfs: use 'vfs' module directly in 'mercurial.hg' 2017-03-02 13:27:42 +01:00
hook.py hook: give exthooks tags for blocking time 2017-03-06 03:09:15 -08:00
httpconnection.py largefiles: use context for file closing 2016-10-08 00:59:41 +02:00
httppeer.py py3: convert the mode argument of os.fdopen to unicodes (1 of 2) 2017-02-13 20:06:38 +05:30
i18n.py py3: use pycompat.fsencode() to convert __file__ to bytes 2017-02-20 18:40:42 +05:30
keepalive.py keepalive: honor urllib2 style get_method overrides 2017-02-13 15:12:17 -05:00
localrepo.py vfs: use 'vfs' module directly in 'mercurial.localrepo' 2017-03-02 13:28:17 +01:00
lock.py lock: include Linux pid namespace identifier in prefix 2017-02-10 13:56:31 -08:00
lsprof.py lsprof: use print function 2016-01-02 11:40:53 -08:00
lsprofcalltree.py lsprofcalltree: use print function 2016-01-02 11:45:29 -08:00
mail.py mail: do not print(), use ui.debug() instead 2016-10-20 22:20:31 +09:00
manifest.c manifest: use PyVarObject_HEAD_INIT 2016-10-13 13:17:23 +02:00
manifest.py manifest: add match argument to diff and filesnotin 2017-03-07 09:56:11 -08:00
match.py match: making visitdir() deal with non-recursive entries 2017-02-13 17:03:14 -08:00
mdiff.py mdiff: distinguish diff headers from hunks in unidiff() 2017-03-03 13:51:22 +01:00
merge.py merge: remove uses of manifest.matches 2017-03-07 18:38:20 -08:00
mergeutil.py checkunresolved: move to new package to help avoid import cycles 2016-11-21 21:31:45 -05:00
minirst.py minirst: support passing admonitions into findadmonitions() and parse() 2017-02-15 11:49:12 -08:00
mpatch_module.c mpatch: raise MemoryError instead of mpatchError if lalloc() failed 2016-08-07 10:06:56 +09:00
mpatch.c mpatch: raise MemoryError instead of mpatchError if lalloc() failed 2016-08-07 10:06:56 +09:00
mpatch.h mpatch: raise MemoryError instead of mpatchError if lalloc() failed 2016-08-07 10:06:56 +09:00
namespaces.py namespaces: fix name/node confusion 2016-03-16 23:12:43 +00:00
node.py dirstate: change added/modified placeholder hash length to 20 bytes 2016-11-10 02:19:16 -08:00
obsolete.py obsolete: avoid using revset language to compute the obsolete revset 2017-02-18 00:55:20 -08:00
osutil.c osutil: implement setprocname to set process title for some platforms 2016-11-11 21:11:17 +00:00
parser.py parser: extend buildargsdict() to support variable-length positional args 2017-01-09 15:25:52 +09:00
parsers.c parsers: use buffer to store revlog index 2016-12-06 11:44:49 +00:00
patch.py mdiff: distinguish diff headers from hunks in unidiff() 2017-03-03 13:51:22 +01:00
pathencode.c pathencode: use assert() for PyBytes_Check() 2016-10-13 21:42:11 +02:00
pathutil.py py3: replace os.sep with pycompat.ossep (part 2 of 4) 2016-12-17 20:02:50 +05:30
peer.py py3: convert to next() function 2016-05-16 21:30:53 +00:00
phases.py phases: remove experimental.nativephaseskillswitch 2017-03-01 15:50:01 -08:00
policy.py policy: add cffi policy for PyPy 2016-06-07 15:35:58 +02:00
posix.py merge with stable 2017-01-04 14:52:59 -05:00
profiling.py mercurial: switch to util.timer for all interval timings 2017-02-15 13:17:39 -08:00
progress.py progress: obtain stderr from ui 2016-10-20 22:12:48 +09:00
pushkey.py pushkey: use absolute_import 2015-08-08 19:57:27 -07:00
pvec.py pvec: use absolute_import 2015-12-21 21:32:58 -08:00
pycompat.py py3: factor out bytechr() function 2017-03-08 22:30:12 +09:00
registrar.py registrar: make format strings unicodes and not bytes 2016-10-07 08:32:18 -04:00
repair.py vfs: use 'vfs' module directly in 'mercurial.repair' 2017-03-02 13:29:43 +01:00
repoview.py repoview: convert attribute names to unicodes on Python 3 2017-03-08 00:49:15 +05:30
revlog.py revlog: give EXTSTORED flag value to narrowhg 2017-01-17 11:25:02 -08:00
revset.py revset: prevent using outgoing() and remote() in hgweb session (BC) 2017-01-20 21:33:18 +09:00
revsetlang.py revset: split language services to revsetlang module (API) 2017-02-19 18:19:33 +09:00
scmposix.py hg: allow usage of XDG_CONFIG_HOME/hg/hgrc 2017-02-07 17:33:35 +01:00
scmutil.py vfs: extract 'vfs' class and related code to a new 'vfs' module (API) 2017-03-01 11:00:12 +01:00
scmwindows.py py3: replace os.environ with encoding.environ (part 4 of 5) 2016-12-18 02:06:00 +05:30
server.py chgserver: make it a core module and drop extension flags 2016-10-15 14:30:16 +09:00
setdiscovery.py setdiscovery: use iterbatch interface instead of batch 2016-03-01 17:44:41 -05:00
similar.py similar: compare between actual file contents for exact identity 2017-03-03 02:57:06 +09:00
simplemerge.py vfs: use 'vfs' module directly in 'mercurial.simplemerge' 2017-03-02 13:30:58 +01:00
smartset.py smartset: reorder initialization of baseset in more intuitive way 2017-02-18 17:37:52 +09:00
sshpeer.py sshpeer: set a blockedtag when starting ssh 2017-03-06 03:25:09 -08:00
sshserver.py py3: replace os.environ with encoding.environ (part 2 of 5) 2016-12-18 01:46:39 +05:30
sslutil.py py3: use pycompat.fsencode() to convert __file__ to bytes 2017-02-20 18:40:42 +05:30
statichttprepo.py vfs: use 'vfs' module directly in 'mercurial.statichttprepo' 2017-03-02 14:49:01 +01:00
statprof.py statprof: require input file 2017-01-18 22:45:07 -08:00
store.py py3: factor out bytechr() function 2017-03-08 22:30:12 +09:00
streamclone.py mercurial: switch to util.timer for all interval timings 2017-02-15 13:17:39 -08:00
subrepo.py vfs: use 'vfs' module directly in 'mercurial.subrepo' 2017-03-02 13:30:38 +01:00
tagmerge.py tagmerge: use absolute_import 2015-08-08 20:10:46 -07:00
tags.py scmutil: proxy revrange() through repo to break import cycles 2017-02-19 20:00:18 +09:00
templatefilters.py pycompat: switch to util.urlreq/util.urlerr for py3 compat 2016-04-06 23:22:12 +00:00
templatekw.py templatekw: move defaulttmpl constant from changeset_templater 2017-02-25 16:38:26 +09:00
templater.py templater: port formatnode filter from changeset_templater 2017-02-25 16:26:58 +09:00
transaction.py transaction: open a file with checkambig=True to avoid file stat ambiguity 2016-09-22 21:52:00 +09:00
treediscovery.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
txnutil.py txnutil: factor out the logic to read file in according to HG_PENDING 2017-02-21 01:20:59 +09:00
ui.py py3: factor out bytechr() function 2017-03-08 22:30:12 +09:00
unionrepo.py vfs: use 'vfs' module directly in 'mercurial.unionrepo' 2017-03-02 14:49:50 +01:00
url.py py3: replace pycompat.getenv with encoding.environ.get 2017-01-15 13:17:05 +05:30
util.h parsers: move PyInt aliasing out of util.h 2016-10-09 13:50:53 +02:00
util.py util: add allowhardlinks module variable 2017-03-02 10:12:40 -08:00
verify.py verify: replace _validpath() by matcher 2017-01-23 10:48:55 -08:00
vfs.py vfs: extract 'vfs' class and related code to a new 'vfs' module (API) 2017-03-01 11:00:12 +01:00
win32.py py3: use pycompat.getcwd instead of os.getcwd 2016-12-22 01:54:17 +05:30
windows.py chgserver: extract utility to bind unix domain socket to long path 2016-05-21 16:52:04 +09:00
wireproto.py clonebundle: use 'repo.vfs' instead of 'repo.opener' 2017-03-02 03:23:18 +01:00
worker.py merge with stable 2017-02-28 11:13:25 -08:00