Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Tue, 16 Nov 2010 21:35:58 +0100] rev 13007
posix: remove is-comparison between integers
Comparing integers by identity relies on a CPython implementation
detail of caching integers between -5 and 256.[1]
[1] <http://docs.python.org/c-api/int.html#PyInt_FromLong>
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Tue, 16 Nov 2010 21:35:58 +0100] rev 13006
httprepo: remove is-comparison with string literal
An identity check between a variable and a string literal was added to
the pushkey implementation in 6bd9778ae749. While CPython will
normally intern strings and thus make the test safe, value identity is
what should be used here.
Martin Geisler <mg@aragost.com> [Wed, 17 Nov 2010 09:06:38 +0100] rev 13005
mq: fix comment to reflect change in efbee27415ab
Kevin Bullock <kbullock@ringworld.org> [Tue, 16 Nov 2010 13:06:04 -0600] rev 13004
mq: clean up unused variable in qrefresh
Removes the unused variable `aa2` that holds the list of deleted files
returned from repo.status().
Martin Geisler <mg@aragost.com> [Tue, 16 Nov 2010 11:10:50 +0100] rev 13003
minirst: better interaction between comments and margins
You can now split a list with a comment:
* foo
.. separator
* bar
and the two list items will no longer be run together, that is the
output is
* foo
* bar
instead of
* foo
* bar
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 16 Nov 2010 10:33:19 +0900] rev 13002
run-tests: fix --debug for .t tests
When --debug is given to the test runner, run() returns (retcode, None).
Do not try to use None output as a string, and return directly, similarly
as other testers.
Matt Mackall <mpm@selenic.com> [Mon, 15 Nov 2010 17:05:54 -0600] rev 13001
merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 15 Nov 2010 17:04:55 -0600] rev 13000
commit: search both parents for missing copy revision (issue2484)
raise a proper abort if we can't find an ancestor
Matt Mackall <mpm@selenic.com> [Mon, 15 Nov 2010 17:00:43 -0600] rev 12999
context: walk both parents for workingctx.ancestors()
Adrian Buehlmann <adrian@cadifra.com> [Thu, 11 Nov 2010 15:51:20 +0100] rev 12998
discovery: list new remote heads in prepush() on --debug
With this patch applied, Mercurial will list the hashes of new remote heads
if push --debug aborts because of new remote heads (option -f/--force not set).
Example:
$ hg push --debug repo1
using http://example.org/repo1
http auth: user johndoe, password not set
sending between command
pushing to http://example.org/repo1
sending capabilities command
capabilities: changegroupsubset stream=1 lookup pushkey unbundle=HG10GZ,HG10BZ,HG10UN branchmap
sending heads command
searching for changes
common changesets up to 609edbc7853f
sending branchmap command
new remote heads on branch 'default' <- new output line
new remote head 5862c07f53a2 <- new output line
abort: push creates new remote heads on branch 'default'!
(did you forget to merge? use push -f to force)
Compare to without --debug (not changed by this patch, including it here
for reference purposes only):
$ hg push repo1
pushing to http://example.org/repo1
searching for changes
abort: push creates new remote heads on branch 'default'!
(did you forget to merge? use push -f to force)
Motivation for this change:
'hg outgoing' may list a whole lot of benign changesets plus an odd changeset
that will trigger the "new remote heads" abort. It can be hard to spot that
single unwanted changeset (it may be an old forgotten experiment, lingering
in the local repo).
"hg log -r 'heads(outgoing())'" might be useful, but that also lists a head
that may be benign on push.
Inside prepush(), we already know which heads are causing troubles on 'hg push'.
Why not make that info available (at least on --debug)?
This would also be helpful for doing remote support, as the supporter can ask
the user to paste the output of 'hg push --debug' on error and then ask further
questions about the heads listed.
Adrian Buehlmann <adrian@cadifra.com> [Thu, 11 Nov 2010 15:42:27 +0100] rev 12997
discovery: remove erroneous comment in prepush()
New named branches *can* be created without -f/--force by specifying
--new-branch
Eric Eisner <ede@mit.edu> [Sun, 14 Nov 2010 18:31:40 -0500] rev 12996
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu> [Sun, 14 Nov 2010 18:31:29 -0500] rev 12995
subrepo: update and merge works with any git branch
Eric Eisner <ede@mit.edu> [Sun, 14 Nov 2010 18:22:33 -0500] rev 12994
subrepo: allow git subrepos to push and merge
(master branch only)
gitsubrepo based on patch from David Soria Parra:
http://bitbucket.org/segv/davids-poor-git-subrepo-attempt/
Eric Eisner <ede@mit.edu> [Sun, 14 Nov 2010 18:20:13 -0500] rev 12993
subrepo: cloning and updating of git subrepos
gitsubrepo based on patch from David Soria Parra:
http://bitbucket.org/segv/davids-poor-git-subrepo-attempt/
Eric Eisner <ede@mit.edu> [Sun, 14 Nov 2010 18:15:26 -0500] rev 12992
subrepo: support for adding a git subrepo
gitsubrepo based on patch from David Soria Parra:
http://bitbucket.org/segv/davids-poor-git-subrepo-attempt/
Matt Mackall <mpm@selenic.com> [Mon, 15 Nov 2010 10:57:49 -0600] rev 12991
merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 15 Nov 2010 10:57:40 -0600] rev 12990
merge with i18n
Matt Mackall <mpm@selenic.com> [Mon, 15 Nov 2010 10:55:54 -0600] rev 12989
Added signature for changeset 4438875ec01b
Matt Mackall <mpm@selenic.com> [Mon, 15 Nov 2010 10:55:48 -0600] rev 12988
Added tag 1.7.1 for changeset 4438875ec01b
Matt Mackall <mpm@selenic.com> [Mon, 15 Nov 2010 10:55:36 -0600] rev 12987
merge with stable
Wagner Bruna <wbruna@yahoo.com> [Sun, 14 Nov 2010 23:32:04 -0200] rev 12986
merge with i18n stable
Wagner Bruna <wbruna@yahoo.com> [Sun, 14 Nov 2010 23:28:44 -0200] rev 12985
i18n-pt_BR: synchronized with 27e4146d9241
Wagner Bruna <wbruna@yahoo.com> [Sun, 14 Nov 2010 23:31:50 -0200] rev 12984
merge with i18n
Martin Geisler <mg@aragost.com> [Fri, 05 Nov 2010 16:10:38 +0100] rev 12983
i18n-da: translate small error messages
Martin Geisler <mg@aragost.com> [Mon, 01 Nov 2010 11:05:14 +0100] rev 12982
i18n-da: synchronize with 15ca4bfecfe3
Martin Geisler <mg@lazybytes.net> [Sat, 13 Nov 2010 15:57:40 +0100] rev 12981
merge with stable
Martin Geisler <mg@lazybytes.net> [Sat, 13 Nov 2010 15:57:12 +0100] rev 12980
eol: mention the hook in the module docstring
Martin Geisler <mg@lazybytes.net> [Sat, 13 Nov 2010 15:46:51 +0100] rev 12979
eol: fix win32text encode/decode filter names
Martin Geisler <mg@lazybytes.net> [Sat, 13 Nov 2010 15:20:37 +0100] rev 12978
test-win32text: use $TESTTMP in output
Martin Geisler <mg@lazybytes.net> [Sat, 13 Nov 2010 15:16:50 +0100] rev 12977
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net> [Sat, 13 Nov 2010 15:12:09 +0100] rev 12976
merge with stable