http://blog.gmane.org/gmane.comp.version-control.mercurial.devel hourly 1 1901-01-01T00:00+00:00 http://gmane.org/img/gmane-25t.png http://gmane.org http://comments.gmane.org/gmane.comp.version-control.mercurial.devel/50572 <pre>This set of patches changes the help system so that all help text is formatted using RST. The first patches contain some refactoring. Then a sequence of patches follows which change the helper functions to use RST formatting internally. In the final step, the helper functions are changed to simply return the RST text they produce, instead of printing it themselves. The main help function is then changed to assemble the RST pieces and to format and print the entire help text. </pre> Olav Reinert 2012-05-26T15:43:45 http://comments.gmane.org/gmane.comp.version-control.mercurial.devel/50569 <pre>4 outgoing changesets in mercurial/crew: http://hg.intevation.org/mercurial/crew/rev/e9ae770eff1c changeset: 16782:e9ae770eff1c tag: tip user: Thomas Arendsen Hein &lt;thomas&lt; at &gt;intevation.de&gt; date: Wed May 23 21:34:29 2012 +0200 summary: merge: show renamed on one and deleted on the other side in debug output http://hg.intevation.org/mercurial/crew/rev/98687cdddcb1 changeset: 16781:98687cdddcb1 user: Thomas Arendsen Hein &lt;thomas&lt; at &gt;intevation.de&gt; date: Wed May 23 20:50:16 2012 +0200 summary: merge: warn about file deleted in one branch and renamed in other (issue3074) http://hg.intevation.org/mercurial/crew/rev/9cbc44a6600e changeset: 16780:9cbc44a6600e user: Thomas Arendsen Hein &lt;thomas&lt; at &gt;intevation.de&gt; date: Wed May 23 17:33:19 2012 +0200 summary: tests: do not create repos inside repos in test-rename-merge1.t http://hg.intevation.org/mercurial/crew/rev/ad394c897b16 changeset: 16779:ad394c897b16 user: Thomas Arendsen Hein &lt;thomas&lt; at &gt;inteva</pre> Mercurial Commits 2012-05-26T11:00:06 http://comments.gmane.org/gmane.comp.version-control.mercurial.devel/50567 <pre># HG changeset patch # User Simon King &lt;simon&lt; at &gt;simonking.org.uk&gt; # Date 1337980885 -3600 # Node ID acd9d3574a98a80e9db12b89a6f338d1541f3a1d # Parent 2ac08d8b21aa7b6e0a062afed5a3f357ccef67f9 revset: add pattern matching to 'tag' revset expression The 'tag' revset expression now takes an optional second parameter, which is either 're' or 'glob'. When one of these is supplied, the tag name is treated as a pattern, and any tags which match the pattern will be returned from the expression. Outstanding questions: 1. Is an optional parameter the right way to support this? Would it be better to have a separate expression, or use 're:' and 'glob:' prefixes on the tag name parameter instead? 2. Is it OK to use the python fnmatch module for glob patterns? Mercurial's match module seems much more geared towards filename matching; even the _globre function treats path separators specially. 3. Patterns must match from the start of the tag name. I think this would be the least surprising behaviour, but </pre> Simon King 2012-05-25T21:23:02 http://comments.gmane.org/gmane.comp.version-control.mercurial.devel/50561 <pre>http://bz.selenic.com/show_bug.cgi?id=3471 Priority: normal Bug ID: 3471 CC: mercurial-devel&lt; at &gt;selenic.com Assignee: blacktrash&lt; at &gt;gmx.net Summary: keyword extension: commit --amend not supported Severity: bug Classification: Unclassified OS: All Reporter: blacktrash&lt; at &gt;gmx.net Hardware: All Status: UNCONFIRMED Version: 2.2.1 Component: Mercurial Product: Mercurial Currently commit --amend does not update the keywords. Patch in preparation. Aside: "Mercurial" core seems a too general component for this bug, but I could not find a way to create a new component. Perhaps I'm not entitled to do so. </pre> bugzilla-daemon< at >bz.selenic.com 2012-05-25T11:42:40 http://comments.gmane.org/gmane.comp.version-control.mercurial.devel/50560 <pre>http://bz.selenic.com/show_bug.cgi?id=3470 Priority: normal Bug ID: 3470 CC: mercurial-devel&lt; at &gt;selenic.com Assignee: bugzilla&lt; at &gt;selenic.com Summary: crash in dispatch.py when trying to report an error Severity: bug Classification: Unclassified OS: All Reporter: bos&lt; at &gt;serpentine.com Hardware: All Status: UNCONFIRMED Version: 2.2.1 Component: Mercurial Product: Mercurial Augie's new "identify third-party extensions as sources of tracebacks" code prevents Mercurial from printing a traceback. http://selenic.com/repo/hg/rev/1c9f58a6c8f1 Here's what I get instead: Traceback (most recent call last): File "/home/bryano/hg/hg/hg", line 38, in &lt;module&gt; mercurial.dispatch.run() File "/home/bryano/hg/hg/mercurial/dispatch.py", line 28, in run sys.exit((dispatch(request(sys.argv[1:])) or 0) &amp; 255) File "/home/bryano/hg/hg/mercurial/dispatch.py", line 65, in d</pre> bugzilla-daemon< at >bz.selenic.com 2012-05-24T22:24:37 http://comments.gmane.org/gmane.comp.version-control.mercurial.devel/50553 <pre>this patch series allows users to manage filename normalization policy per repository this is just for the base of discussion, and tested a little: clone, bundle/unbundle, archive, diff, export/import.... simply. basic concepts of this patch series are: (1) management of filename normalization are configured like as EOL extension: - tracked configuration file ".hgnormfn" chooses type of normalization (NFC/NFD/none) for data storing - filenames are checked at commit/update/merge and so on as like case-folding collision detection, according to the configured normalization type this can prevent users on Linux/Windows from adding files: - normalized in the type other than configured one, or - colliding against ones normalized in another type # this feature is not yet implemented in my patches (2) in storage layer and external representation, filenames are normalized in chosen style (= "global style"), for portability</pre> FUJIWARA Katsunori 2012-05-25T15:00:49 http://comments.gmane.org/gmane.comp.version-control.mercurial.devel/50548 <pre># HG changeset patch # User Angel Ezquerra &lt;angel.ezquerra&lt; at &gt;gmail.com&gt; # Date 1337955724 -7200 # Node ID cb06046e10797e569bed05850318068f4a5d535c # Parent 2ac08d8b21aa7b6e0a062afed5a3f357ccef67f9 update: skip bookmarked heads when running a bare "hg update" When running a bare "hg update" without specifying a revision, we used to update to the tip of the current branch, even if it were bookmarked. This is inconvenient when using bookmarks for feature branches, since pulling new bookmarks will make "hg update" update to those bookmarked "feature branches". This patch changes this behavior. "hg update" will look for the tipmost head of the current branch that is not bookmarked. If none is found the old behavior is used (i.e. we will update to the tip of the current branch). This is missing tests and possibly a comment on the update command help. diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py &lt; at &gt;&lt; at &gt; -527,9 +527,18 &lt; at &gt;&lt; at &gt; try: wc = repo[None] </pre> Angel Ezquerra 2012-05-25T14:25:31 http://comments.gmane.org/gmane.comp.version-control.mercurial.devel/50546 <pre># HG changeset patch # User Adrian Buehlmann &lt;adrian&lt; at &gt;cadifra.com&gt; # Date 1337948647 -7200 # Node ID c516ea214b28d738e1c6b8010b8d4202c208b572 # Parent 5d64306f39bb1f7ceab8d482156cd071d75f4d17 dispatch: tolerate non-standard version strings in tuplever() When developing, we may see non-standard version strings of the form 5d64306f39bb+20120525 which caused tuplever() to raise ValueError: invalid literal for int() with base 10: '5d64306f39bb' and shadowing the real traceback. diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py --- a/mercurial/dispatch.py +++ b/mercurial/dispatch.py &lt; at &gt;&lt; at &gt; -252,8 +252,10 &lt; at &gt;&lt; at &gt; return -1 def tuplever(v): - return tuple([int(i) for i in v.split('.')]) - + try: + return tuple([int(i) for i in v.split('.')]) + except ValueError: + return tuple() def aliasargs(fn, givenargs): args = getattr(fn, 'args', []) </pre> Adrian Buehlmann 2012-05-25T12:32:10 http://comments.gmane.org/gmane.comp.version-control.mercurial.devel/50544 <pre>4 outgoing changesets in mercurial/crew: http://hg.intevation.org/mercurial/crew/rev/e9ae770eff1c changeset: 16782:e9ae770eff1c tag: tip user: Thomas Arendsen Hein &lt;thomas&lt; at &gt;intevation.de&gt; date: Wed May 23 21:34:29 2012 +0200 summary: merge: show renamed on one and deleted on the other side in debug output http://hg.intevation.org/mercurial/crew/rev/98687cdddcb1 changeset: 16781:98687cdddcb1 user: Thomas Arendsen Hein &lt;thomas&lt; at &gt;intevation.de&gt; date: Wed May 23 20:50:16 2012 +0200 summary: merge: warn about file deleted in one branch and renamed in other (issue3074) http://hg.intevation.org/mercurial/crew/rev/9cbc44a6600e changeset: 16780:9cbc44a6600e user: Thomas Arendsen Hein &lt;thomas&lt; at &gt;intevation.de&gt; date: Wed May 23 17:33:19 2012 +0200 summary: tests: do not create repos inside repos in test-rename-merge1.t http://hg.intevation.org/mercurial/crew/rev/ad394c897b16 changeset: 16779:ad394c897b16 user: Thomas Arendsen Hein &lt;thomas&lt; at &gt;inteva</pre> Mercurial Commits 2012-05-25T11:00:06 http://comments.gmane.org/gmane.comp.version-control.mercurial.devel/50540 <pre>Hello, I would like to announce that Unity is searching for a Build &amp; Infrastructure Programer to work preferably out of our Copenhagen office (though we might be willing to consider someone remotely). Mercurial experience, good Python skills, and experience working on open-source projects is a big bonus. Please see the job description below and ping me offline if you are interested. Thanks, Na'Tosha </pre> Na'Tosha Bard 2012-05-25T08:35:53 http://comments.gmane.org/gmane.comp.version-control.mercurial.devel/50531 <pre>this patch series achieves safe pattern matching for problematic encoding. this series is posted for just as the base of discussion: not well tested yet. </pre> FUJIWARA Katsunori 2012-05-24T17:04:24 http://comments.gmane.org/gmane.comp.version-control.mercurial.devel/50523 <pre>http://bz.selenic.com/show_bug.cgi?id=3469 Priority: normal Bug ID: 3469 CC: mercurial-devel&lt; at &gt;selenic.com Assignee: bugzilla&lt; at &gt;selenic.com Summary: Fix for bug 2653 broke ability to map svn trunk to branch other than 'default' Severity: feature Classification: Unclassified OS: Other Reporter: lstewart&lt; at &gt;room52.net Hardware: PC Status: UNCONFIRMED Version: 2.2.1 Component: convert Product: Mercurial I use Mercurial to mirror the FreeBSD Subversion repository for local FreeBSD development purposes. FreeBSD's trunk branch is named "head", and the convert extension post bugfix 2653 now forces commits on the "head" branch to be mapped to the "default" branch in the Mercurial repository. For my use case, the new behaviour is a regression in functionality. I realise it is more "Mercurial-y" to use "default" as the equivalent branch name for trunk, </pre> bugzilla-daemon< at >bz.selenic.com 2012-05-24T07:45:01 http://comments.gmane.org/gmane.comp.version-control.mercurial.devel/50522 <pre># HG changeset patch # User Joshua Redstone &lt;joshua.redstone&lt; at &gt;fb.com&gt; # Date 1336812429 25200 # Node ID b3bb1d7360c481b847431fc0d264111b1d93f993 # Parent 2ac08d8b21aa7b6e0a062afed5a3f357ccef67f9 localrepo: Add locking to _branchtags around _writebrancache Read code paths such as via localrepo.branchmap() may end up calling _writebranchcache without having acquire a repo lock, potentially leading to races with other repo mutations. This fix acquires the repo lock if not yet held before calling _writebranchcache. diff -r 2ac08d8b21aa -r b3bb1d7360c4 mercurial/localrepo.py --- a/mercurial/localrepo.pyTue May 22 14:37:20 2012 -0500 +++ b/mercurial/localrepo.pySat May 12 01:47:09 2012 -0700 &lt; at &gt;&lt; at &gt; -481,8 +481,18 &lt; at &gt;&lt; at &gt; if lrev != tiprev: ctxgen = (self[r] for r in xrange(lrev + 1, tiprev + 1)) self._updatebranchcache(partial, ctxgen) - self._writebranchcache(partial, self.changelog.tip(), tiprev) - + # Read code paths (e.g., from branchmap()) do not have the </pre> Joshua Redstone 2012-05-24T14:50:53 http://comments.gmane.org/gmane.comp.version-control.mercurial.devel/50517 <pre># HG changeset patch # User Patrick Mezard &lt;patrick&lt; at &gt;mezard.eu&gt; # Date 1337857506 -7200 # Node ID f5171e8248a20b23f0404a6f41c1c88390060e60 # Parent 2ac08d8b21aa7b6e0a062afed5a3f357ccef67f9 revset: cache alias expansions Caching has no performance effect on the revset aliases which triggered the recent recursive evaluation bug. I wrote it not to feel bad about expanding several times the same complicated expression. diff --git a/mercurial/revset.py b/mercurial/revset.py --- a/mercurial/revset.py +++ b/mercurial/revset.py &lt; at &gt;&lt; at &gt; -1387,7 +1387,7 &lt; at &gt;&lt; at &gt; return args[arg] return tuple(_expandargs(t, args) for t in tree) -def _expandaliases(aliases, tree, expanding): +def _expandaliases(aliases, tree, expanding, cache): """Expand aliases in tree, recursively. 'aliases' is a dictionary mapping user defined aliases to &lt; at &gt;&lt; at &gt; -1402,17 +1402,20 &lt; at &gt;&lt; at &gt; raise error.ParseError(_('infinite expansion of revset alias "%s" ' 'detected') % alias.name) ex</pre> Patrick Mezard 2012-05-24T11:49:49 http://comments.gmane.org/gmane.comp.version-control.mercurial.devel/50515 <pre>4 outgoing changesets in mercurial/crew: http://hg.intevation.org/mercurial/crew/rev/e9ae770eff1c changeset: 16782:e9ae770eff1c tag: tip user: Thomas Arendsen Hein &lt;thomas&lt; at &gt;intevation.de&gt; date: Wed May 23 21:34:29 2012 +0200 summary: merge: show renamed on one and deleted on the other side in debug output http://hg.intevation.org/mercurial/crew/rev/98687cdddcb1 changeset: 16781:98687cdddcb1 user: Thomas Arendsen Hein &lt;thomas&lt; at &gt;intevation.de&gt; date: Wed May 23 20:50:16 2012 +0200 summary: merge: warn about file deleted in one branch and renamed in other (issue3074) http://hg.intevation.org/mercurial/crew/rev/9cbc44a6600e changeset: 16780:9cbc44a6600e user: Thomas Arendsen Hein &lt;thomas&lt; at &gt;intevation.de&gt; date: Wed May 23 17:33:19 2012 +0200 summary: tests: do not create repos inside repos in test-rename-merge1.t http://hg.intevation.org/mercurial/crew/rev/ad394c897b16 changeset: 16779:ad394c897b16 user: Thomas Arendsen Hein &lt;thomas&lt; at &gt;inteva</pre> Mercurial Commits 2012-05-24T11:00:05 http://comments.gmane.org/gmane.comp.version-control.mercurial.devel/50514 <pre># HG changeset patch # User Adrian Buehlmann &lt;adrian&lt; at &gt;cadifra.com&gt; # Date 1337815812 -7200 # Node ID e7a3700ed766935900bda57eb9bfa8cc4ca36381 # Parent 2ac08d8b21aa7b6e0a062afed5a3f357ccef67f9 base85: use Py_ssize_t for string lengths diff --git a/mercurial/base85.c b/mercurial/base85.c --- a/mercurial/base85.c +++ b/mercurial/base85.c &lt; at &gt;&lt; at &gt; -9,6 +9,7 &lt; at &gt;&lt; at &gt; Largely based on git's implementation */ +#define PY_SSIZE_T_CLEAN #include &lt;Python.h&gt; #include "util.h" &lt; at &gt;&lt; at &gt; -33,7 +34,7 &lt; at &gt;&lt; at &gt; const unsigned char *text; PyObject *out; char *dst; -int len, olen, i; +Py_ssize_t len, olen, i; unsigned int acc, val, ch; int pad = 0; &lt; at &gt;&lt; at &gt; -81,7 +82,8 &lt; at &gt;&lt; at &gt; PyObject *out; const char *text; char *dst; -int len, i, j, olen, c, cap; +Py_ssize_t len, i, j, olen, cap; +int c; unsigned int acc; if (!PyArg_ParseTuple(args, "s#", &amp;text, &amp;len)) </pre> Adrian Buehlmann 2012-05-24T10:04:21 http://comments.gmane.org/gmane.comp.version-control.mercurial.devel/50510 <pre>Hi Matt, I just updated the patch I sent yesterday - I thought of another corner case I wasn't handling - that if the set of branches that have nodes stripped and the set of branches of their parents are not the same, though both are of size 1. I also added an additional test case to exercise that scenario. </pre> Joshua Redstone 2012-05-23T21:18:27 http://comments.gmane.org/gmane.comp.version-control.mercurial.devel/50509 <pre># HG changeset patch # User Joshua Redstone &lt;joshua.redstone&lt; at &gt;fb.com&gt; # Date 1337370347 25200 # Node ID cb504dab484a34f21656fc594f0a58f65a653a23 # Parent d0b9ebba41e9a1733294d5fa1b497ada5eda93c8 strip: incrementally update the branchheads cache after a strip This function augments strip to incrementally update the branchheads cache rather than recompute it from scratch. This speeds up the performance of strip and rebase on repos with long history. The performance optimization only happens if the revisions stripped are all on the same branch and the parents of the stripped revisions are also on that same branch. This also fixes a small performance bug in localrepo._updatebranchcache. That function would iterate over new candidate heads in order from oldest to newest, in contrast to the comment that observes that iterating from newest to oldest results in fewer pases over the set of reachable nodes. This adds a few test cases, particularly one that reproduces the extra heads that mpm observed. diff -r d</pre> Joshua Redstone 2012-05-23T21:15:43 http://comments.gmane.org/gmane.comp.version-control.mercurial.devel/50504 <pre>The Buildbot has detected a new failure on builder hg tests while building hg. Full details are available at: http://hgbuildbot.kublai.com/builders/hg%20tests/builds/121 Buildbot URL: http://hgbuildbot.kublai.com/ Buildslave for this Build: l6 Build Reason: scheduler Build Source Stamp: [branch default] e9ae770eff1c5728eb397e0bd413af6b93e78a5f Blamelist: Thomas Arendsen Hein &lt;thomas&lt; at &gt;intevation.de&gt; BUILD FAILED: failed run-tests.py (python2.6) sincerely, -The Buildbot </pre> hgbuildbot< at >kublai.com 2012-05-23T20:58:16 http://comments.gmane.org/gmane.comp.version-control.mercurial.devel/50494 <pre>http://bz.selenic.com/show_bug.cgi?id=3468 Priority: normal Bug ID: 3468 CC: mercurial-devel&lt; at &gt;selenic.com Assignee: bugzilla&lt; at &gt;selenic.com Summary: shell alias: not possible to honor -R Severity: bug Classification: Unclassified OS: Linux Reporter: patrickdepinguin+mercurial&lt; at &gt;gmail.com Hardware: PC Status: UNCONFIRMED Version: earlier Component: Mercurial Product: Mercurial In shell aliases you can use $HG to refer to the hg binary, and $HG_ARGS to refer to the options given to the alias command. However, when you run an alias with -R, as in: hg myalias -R somerepo there is no way for the alias to know about 'somerepo', because it is neither in $HG nor in $HG_ARGS. This is troublesome for aliases that wrap around existing Mercurial commands, like: deliverylog = !args=`echo $HG_ARGS | cut -s -d' ' -f2-`; cmd="$HG log --rev 'sort( user(\"Official</pre> bugzilla-daemon< at >bz.selenic.com 2012-05-23T07:38:27 http://comments.gmane.org/gmane.comp.version-control.mercurial.devel/50484 <pre>Hi, devels. I'm working to achieve safe pattern matching/parsing for problematic encodings (e.g.: cp932), in which strings may contain '\\' as a part of multi-byte characters. I finished to write draft version patch series to do it, but it requires changes as below: (1) add hooks to replace '\' in mbcs by '\x5c' before: - re.compile() invocation from: - grep() in command.py - grep() in fileset.py - grep() in revset.py - re.escape() invocation from: - _globre(), _regex() in match.py - remap() in subrepo.py - re.sub() invocation from remap() in subrepo.py re.compile()/escape()/sub() are invoked from many other places, so they can not be wrapped directly. (2) wrap tokenizer for parser._iter in parser.py to: - convert mbcs to unicode to avoid unexpected escaping by '\' in mbcs - convert token from unicode to local encoding, and - adjust parsed length in unicode to one in local encoding (mismatching of parse</pre> FUJIWARA Katsunori 2012-05-23T12:38:52 Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.comp.version-control.mercurial.devel