facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 08:47:12 +03:00
Code Issues Projects Releases Wiki Activity
1ea986ffcd
sapling/mercurial
History
Pierre-Yves David 1ea986ffcd obsstore: have the mergemarkers method return the number of new markers 
The mergemarkers function now returns the number of unknown markers in
the stream that have been added to the obsstore. This is similar to what
`obsstore.add` already does.

The method gains a docstring in the process.
2014-08-21 17:42:50 -07:00
..
help merge with stable 2014-08-27 12:30:28 +02:00
hgweb hgweb: avoid config object race with hgwebdir (issue4326) 2014-08-10 13:53:36 -05:00
httpclient httpclient: apply upstream revision da7579b034a4 to fix SSL problems (issue4038) 2013-09-18 14:45:28 -04:00
pure parsers: inline fields of dirstate values in C version 2014-05-27 14:27:41 -07:00
templates hgweb: replace excanvas.js with a newer version 2014-04-23 20:23:30 +01:00
__init__.py Add back links from file revisions to changeset revisions 2005-05-03 13:16:10 -08:00
ancestor.py ancestors: add a __nonzero__ method 2014-08-15 15:57:50 -07:00
archival.py archive: raise error.Abort if the file pattern matches no files 2013-03-21 22:09:15 +01:00
base85.c base85: cast Py_ssize_t values to int (issue3481) 2012-06-04 16:59:34 +02:00
bdiff.c bdiff: avoid a memory error on malloc failure 2013-10-30 16:03:42 -05:00
bookmarks.py bookmarks: avoid deleting primary bookmarks on rebase 2014-07-08 14:45:55 -05:00
branchmap.py whitespace: nuke triple blank lines in **.py 2014-08-07 14:58:12 -05:00
bundle2.py bundle2: add a `bundle20.nbparts` property 2014-07-02 16:17:54 +02:00
bundlerepo.py incoming: don't request heads that already are common 2014-08-15 03:24:40 +02:00
byterange.py byterange: remove now-unused sys import 2013-02-09 07:44:22 -06:00
changegroup.py phase: add a transaction argument to advanceboundary 2014-08-06 01:54:19 -07:00
changelog.py changelog: ensure changelog._delaybuf is initialized 2014-05-20 13:55:08 -07:00
cmdutil.py merge with stable 2014-08-27 18:35:34 +02:00
commands.py merge with crew 2014-08-30 18:44:59 +02:00
commandserver.py cmdserver: forcibly use L channel to read password input (issue3161) 2014-04-26 18:13:06 +09:00
config.py config: use util.re.compile instead of util.compilere 2014-07-15 14:50:58 -07:00
context.py memctx: allow extensions to determine what filectxfn should do 2014-08-30 05:29:38 -07:00
copies.py copies: guard debug section with ui.debugflag 2014-02-25 20:31:53 +01:00
dagparser.py en-us: labeled 2012-08-17 13:58:18 -07:00
dagutil.py discovery: enforce filtering into revlogbaseddag._internalizeall 2013-11-15 23:27:39 -05:00
demandimport.py demandimport: make it possible to disable by setting HGDEMANDIMPORT=disable 2014-04-08 01:35:13 +02:00
dicthelpers.py dicthelpers.diff: compare against default for missing values 2013-04-10 12:31:07 -07:00
diffhelpers.c diffhelpers: use Py_ssize_t in testhunk() 2012-05-12 14:00:51 +02:00
dirs.c parsers: inline fields of dirstate values in C version 2014-05-27 14:27:41 -07:00
dirstate.py dirstate: delay writing out to ensure timestamp of each entries explicitly 2014-07-22 23:59:30 +09:00
discovery.py discovery: prevent crash on unknown remote heads with old repo (issue4337) 2014-08-14 16:26:41 -07:00
dispatch.py help: always show command help with -h (issue4240) 2014-07-31 14:31:31 -05:00
encoding.py encoding: add 'leftside' argument into 'trim' to switch trimming side 2014-07-06 02:56:41 +09:00
error.py bundle2: fix raising errors during heads checking 2014-04-21 18:59:09 -07:00
exchange.py push: check if local and remote support evolution during discovery 2014-08-20 17:36:54 -07:00
exewrapper.c exewrapper: adapt for legacy HackableMercurial 2012-08-07 11:04:41 +02:00
extensions.py version: show enabled extensions (issue4209) 2014-06-10 13:44:37 +03:00
fancyopts.py fancyopts: restore use of callable() since it was readded in Python 3.2 2014-06-23 09:24:16 -04:00
filelog.py filelog: use super() for calling base functions 2013-05-01 10:39:37 -07:00
filemerge.py filemerge: use non-minimal conflict marker regions (BC) 2014-07-18 21:49:52 -05:00
fileset.py merge with stable 2014-01-01 18:28:40 -05:00
formatter.py formatter: add condwrite method 2012-11-03 14:37:50 -05:00
graphmod.py graphmod: changed code in dagwalker to use lazy implementations 2014-03-14 08:46:46 -07:00
hbisect.py bisect: report "both good and bad" as such, not as "not directly related" 2013-11-10 18:51:21 +01:00
help.py help: provide help of bad alias without executing aliascmd() 2014-08-13 19:38:47 +09:00
hg.py clone: for local clones, copy over filtered branchcaches as well (issue4286) 2014-08-21 16:05:29 -07:00
hook.py hook: restore use of callable() since it was readded in Python 3.2 2014-06-23 09:24:38 -04:00
httpconnection.py httpconnection: properly inject ssl_wrap_socket into httpclient (issue4038) 2013-09-20 09:16:07 -04:00
httppeer.py httppeer: reintroduce _abort that accidentally was removed in fc14a1cf743e 2014-04-23 23:29:55 +02:00
i18n.py i18n: detect UI language without POSIX-style locale variable on Windows (BC) 2014-08-03 19:19:23 +09:00
ignore.py ignore: process hgignore files in deterministic order 2012-12-17 15:57:02 -08:00
keepalive.py check-code: check for spaces around = for named parameters 2013-10-03 14:50:47 +02:00
localrepo.py convert: use None value for missing files instead of overloading IOError 2014-08-26 22:03:32 +02:00
lock.py localrepo: give a sigh of relief when getting lock after waiting for it 2014-02-06 01:55:09 +01:00
lsprof.py profiling: replace '+' markup of nested lines with indentation 2013-02-08 22:54:48 +01:00
lsprofcalltree.py drop unused imports 2009-05-14 15:35:46 +02:00
mail.py python2.4: fix imports of sub-packages of the email package 2013-09-24 15:10:32 -04:00
manifest.py manifestdict: add a new method to intersect with a set of files 2014-07-12 17:57:25 -07:00
match.py match: use util.re.escape instead of re.escape 2014-07-15 15:34:50 -07:00
mdiff.py diff: add nobinary config to suppress git-style binary diffs 2014-06-21 15:56:49 +10:00
merge.py merge: show the scary multiple ancestor hint for merges only, not for updates 2014-08-15 02:39:01 +02:00
minirst.py minirst: explicitly decode substitutions 2014-06-13 14:14:02 -05:00
mpatch.c mpatch: rewrite pointer overflow checks 2013-12-11 18:33:42 -06:00
node.py Update license to GPLv2+ 2010-01-19 22:20:08 -06:00
obsolete.py obsstore: have the mergemarkers method return the number of new markers 2014-08-21 17:42:50 -07:00
osutil.c osutil: tab damage, how i hate thee 2012-12-03 13:17:01 -08:00
parser.py parser: allow passing a lookup function to a tokenizer 2014-03-18 17:17:23 -05:00
parsers.c parsers: remove unused getintat function 2014-07-14 15:42:31 -07:00
patch.py convert: use None value for missing files instead of overloading IOError 2014-08-26 22:03:32 +02:00
pathencode.c pathencode: eliminate signed integer warnings 2014-02-19 13:11:24 -08:00
pathutil.py subrepo: normalize path in the specific way for problematic encodings 2014-05-08 19:03:00 +09:00
peer.py peer: delete double definition of method peer 2012-07-28 22:36:22 +02:00
phases.py phase: extract the phaseroots serialization in a dedicated method 2014-08-07 14:41:00 -07:00
posix.py posix: implement readpipe using non-blocking I/O (issue4336) 2014-08-16 10:28:59 -07:00
pushkey.py pushkey: add an `encode` function 2014-05-29 15:22:58 -07:00
pvec.py pvec: use the correct name for an identifier 2013-04-12 17:20:09 -07:00
py3kcompat.py py3kcompat: drop unused export 2014-05-13 15:22:36 -05:00
repair.py strip: remove -b/--backup codepaths 2014-07-24 15:06:08 -04:00
repoview.py repoview: fix 0L with pack/unpack for 2.4 2014-08-26 13:11:53 +02:00
revlog.py repoview: fix 0L with pack/unpack for 2.4 2014-08-26 13:11:53 +02:00
revset.py revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) 2014-08-11 23:45:08 -04:00
scmposix.py scmutil: split platform-specific bits into their own modules 2013-02-12 11:36:21 -06:00
scmutil.py vfs: add listdir for os.listdir in vfs 2014-06-20 21:18:14 +05:30
scmwindows.py scmutil: fix NameError on windows 2013-02-21 13:16:02 -06:00
setdiscovery.py setdiscovery: document algorithms used 2014-03-06 12:37:28 +01:00
similar.py cleanup: eradicate long lines 2012-05-12 15:54:54 +02:00
simplemerge.py simplemerge: remove dead code 2014-08-07 12:51:45 -04:00
sshpeer.py platform: implement readpipe() 2014-08-15 20:02:18 -07:00
sshserver.py localrepo: move the addchangegroup method in changegroup module 2014-04-01 15:27:53 -07:00
sslutil.py sslutil: backed out changeset 2cb59fd7ebb6 (issue4038) 2013-09-18 14:40:17 -04:00
statichttprepo.py statichttp: respect localrepo _restrictcapabilities 2014-04-07 11:45:50 -07:00
store.py store: drop unused existing list 2014-04-03 12:59:12 -05:00
strutil.py Update license to GPLv2+ 2010-01-19 22:20:08 -06:00
subrepo.py subrepo: ensure "close()" execution at the end of "_initrepo()" 2014-06-20 00:42:35 +09:00
tagmerge.py filemerge: add internal:tagmerge merge tool 2014-06-26 01:20:25 +02:00
tags.py tags: introduce _readtaghist function 2014-06-28 01:42:39 +02:00
templatefilters.py merge with stable 2014-07-14 18:53:03 -05:00
templatekw.py templatekw: add 'subrepos' keyword to show updated subrepositories 2014-07-15 23:34:13 +09:00
templater.py templater: enable alias predicates to be used in "revset()" function 2014-08-23 21:23:02 +09:00
transaction.py cleanup: name unused variables using convention of leading _ 2014-08-15 04:37:46 +02:00
treediscovery.py discovery: stop using nodemap for membership testing 2013-11-15 23:28:43 -05:00
ui.py ui: add brief comment why raw_input() needs dummy ' ' prompt string 2014-08-24 12:35:53 +09:00
unionrepo.py config: set a 'source' in most cases where config don't come from file but code 2014-03-19 02:45:14 +01:00
url.py proxy: remove unneeded _set_hostport for compatibility with Python 2.7.7rc1 2014-05-22 22:05:26 +09:00
util.h util.h: declare dirstateTupleType variable instead of defining it 2014-07-03 19:05:04 +02:00
util.py platform: implement readpipe() 2014-08-15 20:02:18 -07:00
verify.py verify: do not prevent verify repository containing hidden changesets 2014-02-19 22:19:45 +09:00
win32.py win32: backout 6891e5c66508 2014-05-03 10:33:54 +02:00
windows.py platform: implement readpipe() 2014-08-15 20:02:18 -07:00
wireproto.py cleanup: fix some list comprehension redefinitions of existing vars 2014-08-15 04:37:46 +02:00
worker.py cleanup: avoid _ for local unused tmp variables - that is reserved for i18n 2014-08-15 16:20:47 +02:00