sapling/mercurial
Augie Fackler a3d0340408 update: check wc.dirty() before setting overwrite=True
merge.update() was missing a few dirtiness checks from workingcontext,
including subrepo cleanliness checks. Using wc.dirty() instead of
one-off checks for various forms of dirtiness will be significantly
safer.
2011-06-17 15:21:02 -05:00
..
help help/config: replace docutils markup 2011-06-17 13:31:23 -03:00
hgweb ui: use I/O descriptors internally 2011-06-08 01:39:20 +03:00
httpclient httpclient: import revision fc731618702a of py-nonblocking-http 2011-05-17 10:28:03 -05:00
pure pure parsers: properly detect corrupt index files 2011-05-24 13:30:10 -05:00
templates paper/coal: use fixed width for diffstat +/- link 2011-06-14 16:38:34 +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 move opener from util to scmutil 2011-04-20 19:54:57 +02:00
base85.c backout of e4cb9628354c 2011-01-27 11:15:08 +01:00
bdiff.c bdiff.c: rename all variables which hold a hash value to "hash" 2011-03-23 02:33:24 +01:00
bookmarks.py bookmarks: recognize the current bookmark when the local encoding isn't UTF-8 2011-06-08 21:25:18 +08:00
bundlerepo.py check-code: flag 0/1 used as constant Boolean expression 2011-06-01 12:38:46 +02:00
byterange.py pylint, pyflakes: remove unused or duplicate imports 2010-04-14 17:58:10 +09:00
changegroup.py check-code: flag 0/1 used as constant Boolean expression 2011-06-01 12:38:46 +02:00
changelog.py hidden: Add a hiddenrevs attributes to changelog. 2011-06-16 01:57:53 +02:00
cmdutil.py cmdutil: return a dummy, closable file object if it cannot be duped 2011-06-15 23:50:33 +03:00
commands.py log: do not display hidden changeset 2011-06-16 01:58:00 +02:00
commandserver.py serve: add --cmdserver option to communicate with hg over a pipe 2011-06-03 17:27:41 +03:00
config.py config: undo change of empty line definition 2011-06-17 15:36:56 -05:00
context.py hidden: Add `hidden` method for context 2011-06-16 01:57:59 +02:00
copies.py check-code: flag 0/1 used as constant Boolean expression 2011-06-01 12:38:46 +02:00
dagparser.py cleanup: use x in (a, b) instead of x == a or x == b 2010-09-23 00:02:31 -05:00
dagutil.py dagutil: fix missing import of i18n._ 2011-06-15 17:04:06 -03:00
demandimport.py demandimport: change default for level from None to -1 2010-12-01 21:46:08 +01:00
diffhelpers.c backout of e4cb9628354c 2011-01-27 11:15:08 +01:00
dirstate.py dirstate: rename forget to drop 2011-05-26 17:15:35 -05:00
discovery.py prepush: show details about new remote heads with --verbose 2011-06-03 13:10:22 +02:00
dispatch.py dispatch: fix for-loop variable name 2011-06-14 20:25:38 +03:00
encoding.py encoding: add an encoding-aware lower function 2011-04-30 10:57:13 -05:00
error.py introduce new RequirementError (issue2649) 2011-02-18 20:25:25 +01:00
extensions.py extensions: make disabled()/disabledext() load prebuilt index if available 2011-06-04 20:19:30 +09:00
fancyopts.py help: show value requirement and multiple occurrence of options 2010-06-06 17:25:00 +09:00
filelog.py filelog: add file function to open other filelogs 2011-05-10 17:38:58 +02:00
filemerge.py rename util.find_exe to findexe 2011-05-08 20:35:46 +02:00
fileset.py hg: add peer method 2011-06-10 11:43:38 -05:00
graphmod.py graphmod: correctly emit nodes with more than 2 predecessors 2011-05-01 15:51:46 +02:00
hbisect.py hbisect: use real Booleans instead of 0/1 2011-05-06 10:02:46 +02:00
help.py help: consolidate topic hooks in help.py 2011-05-13 12:57:27 -05:00
hg.py hg: rename opts argument to peeropts in clone 2011-06-14 16:33:46 +02:00
hook.py rename explain_exit to explainexit 2011-05-06 15:31:09 +02:00
httpconnection.py httprepo: handle large lengths by bypassing the len() operator 2011-05-24 17:30:00 -05:00
httprepo.py http: fix variable name in unexpected response message 2011-06-16 14:33:06 -05:00
i18n.py HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT 2011-01-05 00:18:36 +11:00
ignore.py remove unnecessary list comprehensions 2011-02-03 10:31:17 +01:00
keepalive.py check-code: flag 0/1 used as constant Boolean expression 2011-06-01 12:38:46 +02:00
localrepo.py localrepo: don't attempt to open .hgtags twice if the error isn't ENOENT 2011-06-15 23:15:04 +03:00
lock.py check-code: flag 0/1 used as constant Boolean expression 2011-06-01 12:38:46 +02:00
lsprof.py lsprof: remove #!-line from non-executable script 2010-10-25 23:46:26 +02:00
lsprofcalltree.py drop unused imports 2009-05-14 15:35:46 +02:00
mail.py rename util.find_exe to findexe 2011-05-08 20:35:46 +02:00
manifest.py manifest: use "\0" instead of "\000" 2011-06-16 08:49:26 +02:00
match.py match: make 'listfile:' split on LF and CRLF 2011-05-07 21:12:30 +02:00
mdiff.py mdiff: carriage return (\r) is also ignorable whitespace 2010-10-19 03:55:06 +02:00
merge.py update: check wc.dirty() before setting overwrite=True 2011-06-17 15:21:02 -05:00
minirst.py minirst: read test input from stdin 2011-05-26 10:46:34 +02:00
mpatch.c backout of e4cb9628354c 2011-01-27 11:15:08 +01:00
node.py Update license to GPLv2+ 2010-01-19 22:20:08 -06:00
osutil.c osutil: replace #import with #include, and add a check for it 2011-03-23 23:05:32 +01:00
parser.py revset: report a parse error if a revset is not parsed completely (issue2654) 2011-03-16 23:09:14 +01:00
parsers.c backout of e4cb9628354c 2011-01-27 11:15:08 +01:00
patch.py patch: make filestore store data in memory and fallback to fs 2011-06-17 20:33:02 +02:00
posix.py rename util.is_exec to isexec 2011-05-08 20:45:47 +02:00
pushkey.py bookmarks: move pushkey functions into core 2011-02-10 13:46:27 -06:00
py3kcompat.py py3kcompat: added fake ord implementation for py3k 2010-08-07 16:38:38 -03:00
repair.py remove unused imports and variables 2011-04-30 13:59:14 +02:00
repo.py Make sure bundlerepo doesn't leak temp files (issue2491) 2011-02-12 10:58:11 +01:00
revlog.py check-code: catch misspellings of descendant 2011-06-07 17:02:54 -05:00
revset.py revset: add desc(string) to search in commit messages 2011-06-16 22:47:34 +02:00
scmutil.py scmutil: improve path calculation for install-relative RC files (issue2841) 2011-06-03 15:08:08 -05:00
setdiscovery.py setdiscovery: batch heads and known(ownheads) 2011-06-14 22:58:00 +02:00
similar.py fix coding style 2010-05-02 00:48:33 +02:00
simplemerge.py check-code: catch misspellings of descendant 2011-06-07 17:02:54 -05:00
sshrepo.py sshrepo: fix addchangegroup's signature 2011-06-06 21:02:48 +02:00
sshserver.py ui: use I/O descriptors internally 2011-06-08 01:39:20 +03:00
sslutil.py sslutil: Restore missing imports of socket and httplib to sslutil 2011-06-14 13:31:32 +10:00
statichttprepo.py statichttprepo: use in-place difference for shorter line 2011-06-03 20:08:26 +02:00
store.py store: change names to comply with project coding standards 2011-05-08 23:27:48 +02:00
strutil.py Update license to GPLv2+ 2010-01-19 22:20:08 -06:00
subrepo.py hg: change various repository() users to use peer() where appropriate 2011-06-10 11:43:38 -05:00
tags.py tags: don't allow environment errors to be raised from _writetagscache 2011-06-16 15:26:17 -05:00
templatefilters.py help: consolidate topic hooks in help.py 2011-05-13 12:57:27 -05:00
templatekw.py patch: restore the previous output of 'diff --stat' 2011-05-26 22:51:02 +08:00
templater.py prevent transient leaks of file handle by using new helper functions 2011-05-02 10:11:18 +02:00
transaction.py transaction: use posixfile and unlink from util 2011-02-15 14:41:49 +01:00
treediscovery.py treediscovery: fix regression when run against older repos (issue2793) 2011-05-05 12:53:33 +02:00
ui.py ui: use I/O descriptors internally 2011-06-08 01:39:20 +03:00
url.py url: use new http support if requested by the user 2011-05-06 10:22:08 -05:00
util.h backout of e4cb9628354c 2011-01-27 11:15:08 +01:00
util.py dispatch: write shell alias output to ui out descriptor 2011-06-07 13:39:09 +03:00
verify.py code style: prefer 'is' and 'is not' tests with singletons 2010-11-22 18:15:58 +01:00
win32.py win32.py: add argtypes and restype 2011-05-15 21:33:51 +02:00
windows.py rename util.find_exe to findexe 2011-05-08 20:35:46 +02:00
wireproto.py wireproto: make a number of commands batchable 2011-06-14 22:56:20 +02:00