largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check original implementation queries whether specified pattern is related or not to largefiles in target context by 'dirstate.__contains__()'. but this can't recognize 'directory pattern' correctly, so this patch uses 'dirstate.dirs()' for it. this patch uses dirstate instead of lfdirstate in 'working' route (second patch hunk for 'hgext/largefiles/reposetup.py'), because 'dirs()' information may be already built for dirstate but not yet for lfdirstate at this point. this prevents lfdirstate from building up and having 'dirs()' information.

largefiles: suppress unexpected warning of 'hg status' for removed files original implementation queries whether specified pattern is related or not to largefiles, to target context. but changectx/workingctx returns False about relationship with files marked as removed. So, 'hg status' with 'file pattern' for removed file shows unexpected warning message in below process: 1. 'tostandin()' returns non-STANDIN filename for removed file, because changectx/workingctx returns False about relationship with it 2. 'match.files()' contains non-STANDIN filename, which is already removed from working directory 3. 'dirstate.walk()' invoked via 'localrepository.status()' treats non-STANDIN filename as bad filename, because there is no entry for it in dirstate: only STANDIN is managed in dirstate 4. 'dirstate.walk()' invokes 'match.bad()', which is defined in 'localrepository.status()' as 'bad()' 5. 'bad()' shows warning message for non-STANDIN, because it is not related to source context: only STANDIN is related to it this patch queries to dirstate instead of changectxt/workingctx, because dirstate returns expected result for removed files. 'match.files()' is used by 'localrepository.status()' only in 'working' case, so this patched code also works correctly in non-'working' case.

rebase: properly calculate descendant set when aborting (issue3332) Checking for descendants of target being public was also wrong.

merge with stable

strip: ignore -n (issue3326) (BC) -n could be confused for --dry-run by foolhardy users, resulting in permanent data loss. As leaving a backup when none was requested is significantly less disastrous, the short option is silently ignored. Old scripts continue to work, users only get lightly burned.

aliases: use empty string for missing position parameters (issue3331)

bookmarks: clone non-divergent bookmarks with @ in them

i18n-ja: synchronized with 2338ab19b236

encoding: tune fast-path of tolocal a bit

eol: remove left-over print statements

eol: document why os.utime doesn't work here I wanted to use os.utime(self.join("eol.cache"), None) as a cleaner way of touching the cache file -- but this fails when the cache doesn't exist.

merge with stable

merge with i18n

i18n-pt_BR: fix format.dotencode help section

i18n-pt_BR: synchronized with 3d26d69ef822

changelog: micro-optimizations to changelog.read()

perf: add a changeset test

convert: deal with empty splicemap path (issue3311)

tests: ignore git's output in test-subrepo-git.t git version 1.7.9.1 makes the testsuite fail with: @@ -482,7 +482,17 @@ Sticky repository, update --clean $ hg update --clean tip - Previous HEAD position was aa84837... f + Warning: you are leaving 2 commits behind, not connected to + any of your branches: + + aa84837 f + 126f2a1 gg + + If you want to keep them by creating a new branch, this may be a good time + to do so with: + + git branch new_branch_name aa84837ccfbdfedcdcdeeedc309d73e6eb069edc + HEAD is now at 32a3438... fff 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg id -n ERROR: test-subrepo-git.t output changed

profile: add undocumented config options for profiler output

perf: add perfchangeset to time changeset parsing

merge with stable

perf: tweak tests for testing index performance improvements

convert: support non annotated tags in git backend Do not blindly filter out non ending ^{} tags. The new logic is: - if both "tag" and "tag^{}" exist, "tag^{}" is what we want - if only "tag" exists, "tag" is fine

icasefs: use case preserved root for 'util.fspath()' invocation (issue3302) path to repo root may contains case sensitive part, even though repo is located in case insensitive filesystem: e.g. repo in FAT32 device mounted on Unix. so, case normalized root causes failure of stat(2). this patch uses case preserved root for 'util.fspath()' invocation to avoid this problem. case preserved root for 'util.fspath()' may decrease efficiency of fspath cache, but 'util.fspath()' is currently called only from dirstate, so this fix has less impact.

merge: accept missing revisions in symlink flag merge (issue3316)

merge with stable

merge: handle linear update to symlink correctly (issue3316) This fixes a regression introduced by fcf66193b186. If no file-level merge is needed, we can update flags directly, otherwise we have a conflict to resolve in filemerge.

filemerge: restore default prompt for binary/symlink lost in 83925d3a4559 This could result in a traceback.

merge with stable

strip: enhance repair.strip to receive a list of nodes (issue3299) Originally, mq.strip called repair.strip a single rev at a time. repair.strip stores in a backup bundle any revision greater than the revision being stripped, strips, then restores the backup with repo.addchangegroup. So, when stripping revisions on more than one topological branch, some could end up being restored from the backup bundle, only to be later removed by a subsequent repair.strip call. But repo.addchangegroup calls hooks for all those restore operations. And 9df9444e96ec changed it to delay all hook calls until the repository lock were released - by mq.strip, after stripping all revisions. Thus, the hooks could be called over revisions already removed from the repository at that point. By generating the revision lists at once inside repo.strip, we avoid calling addchangegroup for temporary restores. Incidentally, this also avoids creating many backup files for a single strip command.

templates/filters: add doctest to the 'person' filter Add a doctest with an hopefuly-comprehensive list of combinations we can expect in real-life situations. This does not cover corner cases, for example when a CR or LF is embedded in the name (allowed by RFC 5322!). Code in tests/test-doctest.py contributed by: Martin Geisler <mg@aragost.com> Thanks! Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

help: strip doctest from dochelp When a dochelp string contains doctest code, the doctest code is not stripped, so the help also displays the doctest. Just stop parsing dochelp at the first hint of a doctest section (starting with >>>). Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

pvec: introduce pvecs

largefiles: fix check-code errors.

largefiles: remove use of underscores that breaks coding convention

largefiles: only update changed largefiles when transplanting

largefiles: move calculation of largefiles for updating to utility function

help: add verb to sentence in phases.txt

localrepo: fix unpushable repos when using bookmarks (issue3317) bookmarks is copied to journal.bookmarks differently from how dirstate is copied to journal.dirstate. The different way is less robust, which can render the repo unpushable by other users if the first pushing user aborts their transaction. The underlying cause is that the copyfile method attempts an unnecessary chmod, which fails if the user is not the owner of the journal.bookmarks file. This patch makes the bookmarks journaling more consistent with the rest of the journaling, and will allow users to update lingering journal.bookmarks files that they're not the owners of.

extdiff: escape filenames with vim/DirDiff and make quoting work with Windows Use vim function fnameescape() on filenames. Use double quotes for arguments so cmd.exe is happy.

posix: disable cygwin's symlink emulation

posix: ignore execution bit in cygwin (issue3301)

hgweb: support multi-level repository indexes by enabling descend and collapse The descend option in hgweb can be used to display all reachable repositories within a directory hierarchy if set to True. However, all reachable repositories, regardless of their depth below the root of the hierarchy, are then listed at the same level - expanded - in the hgweb interface. This patch adds support for showing only each level of a directory hierarchy, with subrepositories being shown alongside their parent repositories only at the appropriate level (because there is no way to navigate to subrepositories from within repositories), and the contents of directories hidden - collapsed - behind a link for each directory. To enable this multi-level navigation, a new option called collapse must be set to True when the descend option is set to True.

mq: no need to delete undo files after strip repair.strip takes care of that

repair: remove undo files after strip

localrepo: refactor retrieving of journal/undo files paths We'd like to remove undo files after stripping

templates/filters: strip quotes from {author|person} RFC5322 (Internet Message Format) [0] says that the 'display name' of an internet address [1] (what Mercurial calls 'person') can be quoted with DQUOTE (ASCII 34: ") if it contains non-atom characters [2]. For example, dot '.' is a non-atom character. Also, DQUOTEs in a quoted string will be escaped using "\" [2][3]. The current {author|person} template+filter just extracts the part before an email address as-is. This can look ugly, especially on the web interface, or when generating output for post-processing... Moreover, as an example, the Mercurial repository has a bunch of incoherent uses of DQUOTES in author names. As per Matt's digging: $ hg log --template "{author|person}\n" | grep '"' | sort | uniq "Andrei Vermel "Aurelien Jacobs "Daniel Santa Cruz "Hidetaka Iwai "Hiroshi Funai" "Mathieu Clabaut "Paul Moore "Peter Arrenbrecht" "Rafael Villar Burke "Shun-ichi GOTO" "Wallace, Eric S" "Yann E. MORIN" Josef "Jeff" Sipek Radoslaw "AstralStorm" Szkodzinski Fix the 'person' filter to remove leading and trailing DQUOTES, and unescape remaining DQUOTES. Given this author: "J. \"random\" DOE" <john@doe.net> before: {author|person} : "J. \"random\" DOE" after: {author|person} : J. "random" DOE For the Mercurial repository, that leaves us with two authors with DQUOTES, in acceptable positions: $ hg log --template "{author|person}\n" | grep '"' | sort | uniq Josef "Jeff" Sipek Radoslaw "AstralStorm" Szkodzinski [0] https://tools.ietf.org/html/rfc5322 [1] https://tools.ietf.org/html/rfc5322#section-3.4 [2] https://tools.ietf.org/html/rfc5322#section-3.2.4 [3] https://tools.ietf.org/html/rfc5322#section-3.2.1 Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

check-code: check for % inside _()

patchbomb: add (optional) note to 0 of 0 prompt

merge with stable

i18n: fix all remaining uses of % inside _()

update: don't translate the abort message twice The string representation of util.Abort() is translated when merge.update() raises the exception. For languages with characters out of the valid ascii range, if we feed them again to i18n.gettext() mercurial dies with: [...] File "/home/javi/src/mercurial/mercurial/hg-mpm/mercurial/commands.py", line 4287, in postincoming ui.warn(_("not updating: %s\n" % str(inst))) File "/home/javi/src/mercurial/mercurial/hg-mpm/mercurial/i18n.py", line 42, in gettext u = u'\n\n'.join([p and t.ugettext(p) or '' for p in paragraphs]) File "/usr/lib/python2.7/gettext.py", line 404, in ugettext return unicode(message) UnicodeDecodeError: 'ascii' codec can't decode byte 0xd0 in position 14: ordinal not in range(128) To reproduce this error, just try to pull a changeset that crosses branches with LANG=ru_RU.UTF-8

merge with stable

rebase: move bookmarks as needed with pull --rebase (issue3285)

merge with stable

bugzilla: correct comment typo

tests: ignore the return code of chmod in test-inherit-mode In freebsd, a newly created directory has the same group as the parent directory by default. That means that the test directory created by test-inherit-mode.t is owned by root's group, so "chmod g+s .hg/store" fails to set the SGID bit and returns 1. If we ignore chmod's return code, the testsuite passes again.

bugzilla: add xmlrpcemail submission for Bugzilla 3.6 email interface Some of the formatting details required for bug submission via email changed between Bugzilla 3.4 and 3.6. Bugzilla 3.4 requires lines of the form '@fieldname = value', while 3.6 wants '@fieldname value'. Also the field @bug_id in 3.4 becomes @id in 3.6. Bugzilla up to and including 4.0 also recognises the 3.4 format. To save surprises in the future, check the Bugzilla version and use the 3.6 format from all major versions >= 4. At some point we will drop support for Bugzilla prior to 3.6 and support the new format only.

bugzilla: allow change comment to mark bugs fixed Add a second regular expression used when scanning change comments. Bugs matched by this new regular expression have the bug comments and optionally hours updated as with the first regular expression, but they are also marked as fixed. The bug status and resolution to set to mark a bug as fixed can be configured. By default status is set to RESOLVED and resolution to FIXED, the default Bugzilla settings. For example, a change comment containing 'Fixes 1234 h1.5' will be added to bug 1234, the bug will have its working time increased by 1.65 hours, and the bug will be marked RESOLVED/FIXED. Change comments may contain both bug update and fix instructions. If the same bug ID occurs in both, the last instruction found takes precedence. The patch adds new bug states 'bug_status' and 'resolution' and actions to update them to the XMLRPC and XMLRPC/email access methods. XMLRPC does not support marking bugs as fixed when used with Bugzilla versions prior to 4.0. When used with an earlier Bugzilla version, a warning is issued and only comment and hours updated.

bugzilla: extract optional hours from commit message and update bug time If an 'hours' group is present in the bug matching regular expression, and that group contains a float value, update the bug working time in Bugzilla with those hours. The patch adds a key 'hours' to the bug state dictionary, and adds support for the key to the XMLRPC and XMLRPC/email access methods. The MySQL access method is not supported; a warning is given.

bugzilla: modify access interface to include new bug states As a first step to allowing comment text to update bug state, rework the Bugzilla access interface to use a dictionary keyed on bug ID. Dictionary entries will contain new state info in future changes.

wix: add phases help text and two more translations (issue 3288)

debugbuilddag: fix starting a dag on a non-default branch

debugrevspec: pretty print output Before: ('func', ('symbol', 'reverse'), ('func', ('symbol', 'sort'), ('list', ('or', ('symbol', '2'), ('symbol', '3')), ('symbol', 'date')))) After: (func ('symbol', 'reverse') (func ('symbol', 'sort') (list (or ('symbol', '2') ('symbol', '3')) ('symbol', 'date')))) v2: - Rebased on stable to avoid having to merge tests output

readme: mention how to run in-place The README describes how to install Mercurial but it does not describe how to run it in place (for developers). This adds a short paragraph to the README describing how to do run Mercurial inplace.

merge with stable

merge with i18n

i18n-pt_BR: synchronized with 6b52963ced73

merge with i18n

i18n-ja: synchronized with 87d37aceb5e3

i18n-pt_BR: synchronized with 60101427d618

Merge with stable

setup.py: don't call splitlines twice on the output of xcodebuild (issue3277)

merge with stable

merge stable heads

merge with stable mercurial/filemerge.py in the default branch does not need the additional unlink calls, because the unlink calls at the end of filemerge.filemerge() are called for internal:dump, too.

filemerge: remove temporary files when using internal:dump as merge-tool

Added signature for changeset 53e2cd303ecf

Added tag 2.1.1 for changeset 53e2cd303ecf

dirstate: filecacheify _ignore (issue3278) This still doesn't handle the case where a command is run with --config ui.ignore=path since we only look for changes in .hgignore.

dirstate: filecacheify _branch The opener is relative to .hg, use it in a subclass of filecache to compute the final path.

dirstate: add filecache support

scmutil: add join method to opener to construct path relative to base Useful when we only have the opener without the base path used when it was constructed.

filecache: refactor path join logic to a function New users of filecache use different names for the function used to compute the runtime path of the cached file. Users should subclass filecache and provide their own version of this function to call the appropriate join function on 'obj' (an instance of the class that its member function was decorated).

merge with stable

subrepo: fix for merge inconsistencies Merging ancestors with children is allowed if they are on different named branches. This did not work for subrepo merges before. To fix this inconsistency, the mergefunc() will now use the simple update path only if both versions are on the same named branch. If not, they get merged into a new changeset, just as if you did the merge from the subrepo's root directly.

bundlerepo: bundle repos should be non-publishing (issue3266) Bundle repo contains both the bundle content and the content of the repository used as a base. This create bugs with phases exchange because the "remote" repository claim to contains changeset it does not. The easiest way to fix this bug is to ensure a bundle repo as non publishing. This way changeset will be seen in the same phase than locally. This patch does not alter in which phase bundle revision are seen. For now they are seen as if an old client had add them on the remote: They inherit their phase from parent whatever the parent is. This is to be fixed in a later patch

bookmarks: restore python 2.4 compatibility Remove py25 'try except finally' clause.

bugzilla: stop XMLRPC requests from requesting gzipped responses Python 2.7 introduced support for gzip encoding in xmlrpclib.Transport. We do our own handling of responses, and don't currently support gzip encoding. So to run successfully under Python 2.7 with a web server configured to gzip encode, stop XMLRPC requests from announcing gzip encoding support.

merge with stable

update: delete bookmarks.current when explicitly updating to a rev (issue3276)

convert: ignore blank lines in mapfiles (issue3286)

update: don't move the active bookmark if a rev is specified with -r

mq: fix qapplied --last and qprev documentation (issue3282) qapplied --last is qprev not qtop. v2: - Replace "previous" with "preceding" as suggested here and there

setup: handle output from Apple's Xcode 4.3 better (issue3277) Apparently, it prints nothing at all if the user installed only the command-line tools. In that case, don't try to parse the empty output -- just assume they have Xcode >= 4.