Wed, 29 Feb 2012 21:09:21 +0900 i18n-ja: synchronized with 87d37aceb5e3 stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 29 Feb 2012 21:09:21 +0900] rev 16212
i18n-ja: synchronized with 87d37aceb5e3
Fri, 24 Feb 2012 19:50:03 -0200 i18n-pt_BR: synchronized with 60101427d618 stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 24 Feb 2012 19:50:03 -0200] rev 16211
i18n-pt_BR: synchronized with 60101427d618
Fri, 02 Mar 2012 10:43:06 -0800 Merge with stable
Brendan Cully <brendan@kublai.com> [Fri, 02 Mar 2012 10:43:06 -0800] rev 16210
Merge with stable
Fri, 02 Mar 2012 10:42:12 -0800 setup.py: don't call splitlines twice on the output of xcodebuild (issue3277) stable
Brendan Cully <brendan@kublai.com> [Fri, 02 Mar 2012 10:42:12 -0800] rev 16209
setup.py: don't call splitlines twice on the output of xcodebuild (issue3277)
Fri, 02 Mar 2012 09:57:09 +0100 merge with stable
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 02 Mar 2012 09:57:09 +0100] rev 16208
merge with stable
Fri, 02 Mar 2012 09:54:45 +0100 merge stable heads stable
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 02 Mar 2012 09:54:45 +0100] rev 16207
merge stable heads
Thu, 01 Mar 2012 17:45:13 +0100 merge with stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 01 Mar 2012 17:45:13 +0100] rev 16206
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.
Thu, 01 Mar 2012 17:35:12 +0100 filemerge: remove temporary files when using internal:dump as merge-tool stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 01 Mar 2012 17:35:12 +0100] rev 16205
filemerge: remove temporary files when using internal:dump as merge-tool
Thu, 01 Mar 2012 16:28:24 -0600 Added signature for changeset 53e2cd303ecf stable
Matt Mackall <mpm@selenic.com> [Thu, 01 Mar 2012 16:28:24 -0600] rev 16204
Added signature for changeset 53e2cd303ecf
Thu, 01 Mar 2012 16:27:59 -0600 Added tag 2.1.1 for changeset 53e2cd303ecf stable
Matt Mackall <mpm@selenic.com> [Thu, 01 Mar 2012 16:27:59 -0600] rev 16203
Added tag 2.1.1 for changeset 53e2cd303ecf
Thu, 01 Mar 2012 17:49:59 +0200 dirstate: filecacheify _ignore (issue3278) stable 2.1.1
Idan Kamara <idankk86@gmail.com> [Thu, 01 Mar 2012 17:49:59 +0200] rev 16202
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.
Thu, 01 Mar 2012 17:42:49 +0200 dirstate: filecacheify _branch stable
Idan Kamara <idankk86@gmail.com> [Thu, 01 Mar 2012 17:42:49 +0200] rev 16201
dirstate: filecacheify _branch The opener is relative to .hg, use it in a subclass of filecache to compute the final path.
Thu, 01 Mar 2012 17:39:58 +0200 dirstate: add filecache support stable
Idan Kamara <idankk86@gmail.com> [Thu, 01 Mar 2012 17:39:58 +0200] rev 16200
dirstate: add filecache support
Thu, 01 Mar 2012 17:39:58 +0200 scmutil: add join method to opener to construct path relative to base stable
Idan Kamara <idankk86@gmail.com> [Thu, 01 Mar 2012 17:39:58 +0200] rev 16199
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.
Thu, 01 Mar 2012 17:39:58 +0200 filecache: refactor path join logic to a function stable
Idan Kamara <idankk86@gmail.com> [Thu, 01 Mar 2012 17:39:58 +0200] rev 16198
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).
Wed, 29 Feb 2012 17:27:24 -0600 merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 29 Feb 2012 17:27:24 -0600] rev 16197
merge with stable
Wed, 29 Feb 2012 14:24:57 +0100 subrepo: fix for merge inconsistencies stable
Friedrich Kastner-Masilko <kastner_masilko@at.festo.com> [Wed, 29 Feb 2012 14:24:57 +0100] rev 16196
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.
Wed, 29 Feb 2012 14:41:11 +0100 bundlerepo: bundle repos should be non-publishing (issue3266) stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 29 Feb 2012 14:41:11 +0100] rev 16195
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
Wed, 29 Feb 2012 09:34:19 +0100 bookmarks: restore python 2.4 compatibility stable
Gilles Moris <gilles.moris@free.fr> [Wed, 29 Feb 2012 09:34:19 +0100] rev 16194
bookmarks: restore python 2.4 compatibility Remove py25 'try except finally' clause.
Wed, 29 Feb 2012 17:43:03 +0000 bugzilla: stop XMLRPC requests from requesting gzipped responses stable
Jim Hague <jim.hague@acm.org> [Wed, 29 Feb 2012 17:43:03 +0000] rev 16193
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.
Tue, 28 Feb 2012 21:17:53 -0600 merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 28 Feb 2012 21:17:53 -0600] rev 16192
merge with stable
Tue, 28 Feb 2012 23:47:46 +0200 update: delete bookmarks.current when explicitly updating to a rev (issue3276) stable
Idan Kamara <idankk86@gmail.com> [Tue, 28 Feb 2012 23:47:46 +0200] rev 16191
update: delete bookmarks.current when explicitly updating to a rev (issue3276)
Tue, 28 Feb 2012 10:06:35 +0100 convert: ignore blank lines in mapfiles (issue3286) stable
Patrick Mezard <patrick@mezard.eu> [Tue, 28 Feb 2012 10:06:35 +0100] rev 16190
convert: ignore blank lines in mapfiles (issue3286)
Tue, 28 Feb 2012 01:07:55 +0200 update: don't move the active bookmark if a rev is specified with -r stable
Idan Kamara <idankk86@gmail.com> [Tue, 28 Feb 2012 01:07:55 +0200] rev 16189
update: don't move the active bookmark if a rev is specified with -r
Mon, 27 Feb 2012 18:23:18 +0100 mq: fix qapplied --last and qprev documentation (issue3282) stable
Patrick Mezard <patrick@mezard.eu> [Mon, 27 Feb 2012 18:23:18 +0100] rev 16188
mq: fix qapplied --last and qprev documentation (issue3282) qapplied --last is qprev not qtop. v2: - Replace "previous" with "preceding" as suggested here and there
Mon, 27 Feb 2012 08:54:26 -0500 setup: handle output from Apple's Xcode 4.3 better (issue3277) stable
Greg Ward <greg@gerg.ca> [Mon, 27 Feb 2012 08:54:26 -0500] rev 16187
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.
Sun, 26 Feb 2012 17:12:15 +0100 graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu> [Sun, 26 Feb 2012 17:12:15 +0100] rev 16186
graphlog: apply file filters --patch/--stat output When passing --patch/--stat, file filters have to be applied to generate the correct diff or stat output: - Without --follow, the static match object can be reused - With --follow, the files displayed at revision X are the ancestors of selected files at parent revision. To do this, we reproduce the ancestry calculations done by --follow, lazily. test-glog.t changes show that --patch output is not satisfying because renames are reported as copies. This can probably be fixed by: - Without --follow: compute files to display, look for renames sources and extend the matcher to include them. - With --follow: detect .path() transitions between parent/child filectx, filter them using the linked changectx .removed() field and extend fcache with them.
Sun, 26 Feb 2012 17:10:57 +0100 context: add followfirst arg to filectx and workingfilectx
Patrick Mezard <patrick@mezard.eu> [Sun, 26 Feb 2012 17:10:57 +0100] rev 16185
context: add followfirst arg to filectx and workingfilectx When _followfirst() revset was introduced it seemed to be the sole user of such an argument, so filectx.ancestors() was duplicated and modified instead. It now appears this argument could be used when computing the set of files to be considered when --patch or --stat are passed along with --follow FILE.
Sun, 26 Feb 2012 17:10:57 +0100 graphlog: fix --removed
Patrick Mezard <patrick@mezard.eu> [Sun, 26 Feb 2012 17:10:57 +0100] rev 16184
graphlog: fix --removed "hg log --removed FILE" does not return changesets where FILE was removed, but ones where FILE was changed and possibly removed. The flag is really here to disable walkchangerevs() fast path, which cannot see file removals by scanning filelogs.
Sun, 26 Feb 2012 17:10:56 +0100 test-glog: rewrite more tests using testlog() function
Patrick Mezard <patrick@mezard.eu> [Sun, 26 Feb 2012 17:10:56 +0100] rev 16183
test-glog: rewrite more tests using testlog() function
(0) -10000 -3000 -1000 -300 -100 -50 -30 +30 +50 +100 +300 +1000 +3000 +10000 +30000 tip