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
b731b379ec
sapling/mercurial
History
Simon Heimberg b731b379ec subrepo: only do clean update when overwrite is set (issue3276) 
Files in a subrepo were overwritten on update. But this should only happen on a
clean update (example: -C is specified).
Use the overwrite parameter introduced for svn subrepos in e3640daa4703 to
decide whether to merge changes (as update) or remove them (as clean).

The new function hg.updaterepo is intruduced to keep all update calls in hg.

test-subrepo.t is extended to test if an untracked file is overwritten
(issue3276). (Update -C is already tested in many places.)
The first two chunks are debugging output which has changed. (Because overwrite
is not always true anymore for subrepos)
All other tests still pass without any change.
2012-10-24 18:45:22 +02:00
..
help help: fix literal block syntax 2012-09-07 00:42:42 +09:00
hgweb hgweb: respond 403 forbidden for ssl required error 2012-09-05 23:59:27 +09:00
httpclient avoid using abbreviations that look like spelling errors 2012-08-27 23:14:27 +02:00
pure declare local constants instead of using magic values and comments 2012-08-27 23:16:22 +02:00
templates hgweb: fix incorrect graph padding calculation (issue3626) 2012-09-17 21:33:16 +02:00
__init__.py Add back links from file revisions to changeset revisions 2005-05-03 13:16:10 -08:00
ancestor.py check-code: flag 0/1 used as constant Boolean expression 2011-06-01 12:38:46 +02:00
archival.py archival: add "extended-timestamp" extra block for zip archives (issue3600) 2012-09-18 19:46:15 +09:00
base85.c base85: cast Py_ssize_t values to int (issue3481) 2012-06-04 16:59:34 +02:00
bdiff.c bdiff: check and cast first parameter value on putbe32() calls 2012-05-15 22:36:47 +02:00
bookmarks.py bookmark: simplify nodemap check introduced in the previous changeset 2012-10-26 09:29:50 +02:00
bundlerepo.py peer: introduce canpush and improve error message 2012-07-13 21:52:28 +02:00
byterange.py fix trivial spelling errors 2012-08-15 22:38:42 +02:00
changegroup.py changegroup: decompress GZ algorithm in larger chunks for better performance 2012-04-29 20:58:50 +02:00
changelog.py changelog: extract description cleaning logic in a dedicated function 2012-10-18 22:04:49 +02:00
cmdutil.py i18n: add "i18n" comment to column positioning messages of "hg log" 2012-10-31 03:59:27 +09:00
commands.py i18n: add "i18n" comment to column positioning messages of "hg summary" 2012-10-31 03:59:28 +09:00
commandserver.py fix wording and not-completely-trivial spelling errors and bad docstrings 2012-08-15 22:39:18 +02:00
config.py grammar: it-handles 2012-08-17 13:58:19 -07:00
context.py context: add a bumped method to changectx 2012-10-19 00:43:44 +02:00
copies.py copies: re-include root directory in directory rename detection (issue3511) 2012-06-27 13:41:04 -05:00
dagparser.py en-us: labeled 2012-08-17 13:58:18 -07:00
dagutil.py cleanup: "raise SomeException()" -> "raise SomeException" 2012-05-12 16:00:58 +02:00
demandimport.py demandimport: determine at load time if __import__ has level argument 2011-08-22 22:50:52 +02:00
diffhelpers.c diffhelpers: use Py_ssize_t in testhunk() 2012-05-12 14:00:51 +02:00
dirstate.py dirstate: handle dangling junctions on windows (issue2579) 2012-10-23 21:25:22 -07:00
discovery.py obsolete: rename anysuccessors into allsuccessors 2012-10-19 00:30:11 +02:00
dispatch.py commands: don't infer repo for commands like update (issue2748) 2012-10-16 11:43:15 -07:00
encoding.py spelling: successfully 2012-08-17 13:58:19 -07:00
error.py wireproto: add out-of-band error class to allow remote repo to report errors 2011-08-02 15:21:10 -04:00
exewrapper.c exewrapper: adapt for legacy HackableMercurial 2012-08-07 11:04:41 +02:00
extensions.py hooks: print out more information when loading a python hook fails 2012-07-06 18:41:25 +02:00
fancyopts.py fancyopts: don't show a traceback on invalid integer values 2012-10-08 15:35:16 +02:00
filelog.py filelog: add file function to open other filelogs 2011-05-10 17:38:58 +02:00
filemerge.py filemerge: use util.shellquote when calling merge (issue3581) 2012-10-26 12:02:58 -07:00
fileset.py fileset: fix generator vs list bug in fast path 2012-08-15 22:50:23 +02:00
formatter.py formatter: improve implementation of data method 2012-09-20 23:30:59 -04:00
graphmod.py graphlog: extract ascii drawing code into graphmod 2012-07-11 17:13:39 +02:00
hbisect.py spelling: recursion 2012-08-17 13:58:18 -07:00
help.py help: indicate help omitting if help document is not fully displayed 2012-10-18 10:31:15 +09:00
hg.py subrepo: only do clean update when overwrite is set (issue3276) 2012-10-24 18:45:22 +02:00
hook.py avoid using abbreviations that look like spelling errors 2012-08-27 23:14:27 +02:00
httpconnection.py httpclient: fix calling convention violation 2012-10-18 23:55:15 -05:00
httppeer.py httprepo: ensure Content-Type header exists when pushing data 2012-07-13 13:21:20 +02:00
i18n.py i18n: use getattr instead of hasattr 2011-07-25 20:46:30 -05:00
ignore.py misc: adding missing file close() calls 2011-11-03 11:24:55 -05:00
keepalive.py keepalive: drop python 2.2 legacy code 2012-10-02 14:27:13 -07:00
localrepo.py localrepo: translate "push includes X changeset" only once 2012-10-23 09:22:46 +02:00
lock.py lock: fixed race condition in trylock/testlock (issue3506) 2012-09-27 14:38:03 -07:00
lsprof.py lsprof: report units correctly 2012-05-30 13:57:41 -07:00
lsprofcalltree.py drop unused imports 2009-05-14 15:35:46 +02:00
mail.py avoid using abbreviations that look like spelling errors 2012-08-27 23:14:27 +02:00
manifest.py avoid using abbreviations that look like spelling errors 2012-08-27 23:14:27 +02:00
match.py fix wording and not-completely-trivial spelling errors and bad docstrings 2012-08-15 22:39:18 +02:00
mdiff.py mdiff: fix diff header generation for files with spaces (issue3357) 2012-04-05 15:39:07 +02:00
merge.py icasefs: make case-folding collision detection as deletion aware (issue3648) 2012-10-31 16:50:22 +09:00
minirst.py spelling: indented 2012-08-17 13:58:18 -07:00
mpatch.c mpatch: use Py_ssize_t for string length 2012-05-20 01:28:31 +02:00
node.py Update license to GPLv2+ 2010-01-19 22:20:08 -06:00
obsolete.py obsolete: add a flag that allows fixing "bumped" changeset 2012-10-19 00:41:53 +02:00
osutil.c osutil: handle deletion race with readdir/stat (issue3463) 2012-05-18 14:34:33 -05:00
parser.py en-us: labeled 2012-08-17 13:58:18 -07:00
parsers.c store: implement fncache basic path encoding in C 2012-09-18 15:42:19 -07:00
patch.py check-code: indent 4 spaces in py files 2012-07-31 03:30:42 +02:00
pathencode.c pathencode: skip encoding if input is already longer than maxstorepathlen 2012-09-30 23:53:56 +02:00
peer.py peer: delete double definition of method peer 2012-07-28 22:36:22 +02:00
phases.py clfilter: introduce a hassecret function 2012-09-03 14:05:19 +02:00
posix.py util: implement a faster os.path.split for posix systems 2012-09-14 12:08:17 -07:00
pushkey.py pushkey: do not exchange obsole markers if feature is disabled 2012-07-28 13:33:06 +02:00
pvec.py fix trivial spelling errors 2012-08-15 22:38:42 +02:00
py3kcompat.py spelling: relies 2012-08-17 13:58:18 -07:00
repair.py repair: use node to track post-strip bookmark target 2012-10-17 15:37:25 -05:00
revlog.py clfilter: split revlog.headrevs C call from python code 2012-09-03 14:19:45 +02:00
revset.py revset: accept @ in unquoted symbols (issue3686) 2012-10-30 18:48:44 -05:00
scmutil.py scmutil: add mustaudit delegation to filtervfs (issue3673) 2012-10-22 12:00:21 -07:00
setdiscovery.py delete some dead comments and docstrings 2012-08-21 02:41:20 +02:00
similar.py cleanup: eradicate long lines 2012-05-12 15:54:54 +02:00
simplemerge.py cleanup: "raise SomeException()" -> "raise SomeException" 2012-05-12 16:00:58 +02:00
sshpeer.py peer: introduce real peer classes 2012-07-13 21:47:06 +02:00
sshserver.py sshserver: avoid a multi-dot attribute lookup in a hot loop 2012-09-14 12:09:44 -07:00
sslutil.py ui: optionally quiesce ssl verification warnings on python 2.5 2012-04-09 14:36:16 -07:00
statichttprepo.py vfs: define "join()" in each classes derived from "abstractvfs" 2012-10-09 01:41:55 +09:00
store.py scmutil: abstract out mustaudit delegation 2012-10-22 11:59:11 -07:00
strutil.py Update license to GPLv2+ 2010-01-19 22:20:08 -06:00
subrepo.py subrepo: only do clean update when overwrite is set (issue3276) 2012-10-24 18:45:22 +02:00
tags.py spelling: supersede 2012-08-17 13:58:19 -07:00
templatefilters.py hgweb: make the escape filter remove null characters (issue2567) 2012-10-15 09:43:34 -07:00
templatekw.py templating: make new-style templating features work with command line lists 2012-09-21 18:54:00 -05:00
templater.py i18n: add "i18n" comment to error messages of template functions 2012-10-31 03:59:27 +09:00
transaction.py spelling: journaling 2012-08-17 13:58:18 -07:00
treediscovery.py util: subclass deque for Python 2.4 backwards compatibility 2012-06-01 17:05:31 -07:00
ui.py fix trivial spelling errors 2012-08-15 22:38:42 +02:00
url.py avoid using abbreviations that look like spelling errors 2012-08-27 23:14:27 +02:00
util.h store: implement fncache basic path encoding in C 2012-09-18 15:42:19 -07:00
util.py util: implement a faster os.path.split for posix systems 2012-09-14 12:08:17 -07:00
verify.py verify: fix all doubled-slash sites (issue3665) 2012-10-24 09:27:47 -07:00
win32.py avoid using abbreviations that look like spelling errors 2012-08-27 23:14:27 +02:00
windows.py util: implement a faster os.path.split for posix systems 2012-09-14 12:08:17 -07:00
wireproto.py wireproto: fix pushkey hook failure and output on remote http repo 2012-10-15 18:37:34 -03:00