Adrian Buehlmann <adrian@cadifra.com> [Sun, 21 Nov 2010 11:52:27 +0100] rev 13026
check-code: catch Python 'is' comparing number or string literals
The Python 'is' operator compares object identity, so it should
definitely not be applied to string or number literals, which Python
implementations are free to represent with a temporary object.
This should catch the following kinds of bogus expressions (examples):
x is 'foo' x is not 'foo'
x is "bar" x is not "bar"
x is 42 x is not 42
x is -36 x is not -36
As originally proposed by Martin Geisler, amended with catching
negative numbers.
Christian Ebert <blacktrash@gmx.net> [Mon, 22 Nov 2010 16:05:31 +0100] rev 13025
keyword: s/config/configuration/ in help
Patrick Mezard <pmezard@gmail.com> [Sun, 21 Nov 2010 13:16:59 +0100] rev 13024
Merge with stable
timeless <timeless@gmail.com> [Sun, 21 Nov 2010 05:07:06 -0600] rev 13023
record: quote command in use hg commit message
timeless <timeless@gmail.com> [Sat, 20 Nov 2010 20:41:48 +0200] rev 13022
revert: improve merge advice and favor its error over all
Henrik Stuart <hg@hstuart.dk> [Sat, 20 Nov 2010 09:51:56 +0100] rev 13021
rebase: support --detach when null is common ancestor
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 18 Nov 2010 19:52:58 -0200] rev 13020
templater: fix variable name
'format' was renamed to 'parsed' in 0d50586a9d31
Adrian Buehlmann <adrian@cadifra.com> [Wed, 17 Nov 2010 16:54:30 +0100] rev 13019
test-hardlinks: add testcase for repo copied with 'cp -al'
This patch adds a case to test-hardlinks.t which demonstrates that
hardlinks in the working directory are broken up (using 'hg update').
Motivation for this patch:
'hg help clone' shows copying repositories *and* the working directory
using 'cp -al', creating hardlinks in the *working directory* too (not
just in the store).
Note that we can't use 'cp -al' since for example MacOS X doesn't
support these options on cp. I'm thus using the same trick as in
test-hardlinks-safety.t for creating hardlinks in the working dir.
Patrick Mezard <pmezard@gmail.com> [Thu, 18 Nov 2010 23:15:13 +0100] rev 13018
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Thu, 18 Nov 2010 23:05:10 +0100] rev 13017
subrepo: handle missing subrepo spec file as removed
Otherwise, all commands involving a dirstate walk will abort when trying to
readone of them. Deleting .hgsub basically breaks a repository.
Patrick Mezard <pmezard@gmail.com> [Wed, 17 Nov 2010 21:30:13 +0100] rev 13016
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Wed, 17 Nov 2010 21:25:23 +0100] rev 13015
subrepo: prune empty directories when removing svn subrepo
Patrick Mezard <pmezard@gmail.com> [Wed, 17 Nov 2010 21:24:36 +0100] rev 13014
subrepo: use subprocess directly to avoid python 2.6 bug
Using svn subrepos on MacOSX with native python 2.6.1 results in a lot of
unexpected output caused by:
http://bugs.python.org/issue5099
subprocess.Popen.__del__ causes AttributeError (os module == None)
Avoiding dangling Popen instance solves the issue.
Patrick Mezard <pmezard@gmail.com> [Wed, 17 Nov 2010 21:00:47 +0100] rev 13013
subrepo: fix removing read-only svn files on Windows
Martin Geisler <mg@aragost.com> [Wed, 17 Nov 2010 09:37:57 +0100] rev 13012
check-code: catch 'ls filename --option' case as per 6bdae8ea0b48
Erik Zielke <ez@aragost.com> [Tue, 02 Nov 2010 17:44:19 +0100] rev 13011
minirst: improved support for option lists.
This enables minirst to parse and print option lists which have both
long and short options. Before, we could only parse option lists with
long options.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Tue, 16 Nov 2010 13:29:35 +0100] rev 13010
test-subrepo-git.t: portability fix.
Specifying arguments after file names for 'ls' is a GNU extension.
Erik Zielke <ez@aragost.com> [Tue, 16 Nov 2010 13:29:08 +0100] rev 13009
minirst: modified minirst to also recognize empty comments.
The modifies minirst to also handle empty comments. An empty comment
is a block with a single line containing two dots.
Martin Geisler <mg@aragost.com> [Wed, 17 Nov 2010 09:17:55 +0100] rev 13008
merge with stable
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
Colin Caughie <c.caughie@indigovision.com> [Wed, 10 Nov 2010 20:26:56 +0000] rev 12975
eol: added filter aliases for backwards compatibility with win32text
This makes it possible to switch most win32text configurations (i.e. those
that use cleverencode and cleverdecode) to hgeol simply by disabling one and
enabling the other. Any rules found in repo-specific .hgeol files will be
appended to the configuration in .hgrc.
Colin Caughie <c.caughie@indigovision.com> [Sat, 13 Nov 2010 15:02:02 +0100] rev 12974
eol: exclude .hgtags file from eol translation (issue2493)
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 13 Nov 2010 11:58:51 +0900] rev 12973
merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 11 Nov 2010 02:10:37 +0900] rev 12972
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)
Regression from 99cafcae25d9. That previous commit is not supposed
to affect log calls without --follow, so we step out of this
codepath if follow is not True, and it's enough to fix the
regression.
When --follow is given, we fix the issue by taking into account
changesets that have a rev > maxrev to build the filegraph: even if
those files are not included in the final result, it's still needed
to walk correctly the graph from the end of the filelog to minrev, to
track accurately renames.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 11 Nov 2010 02:05:02 +0900] rev 12971
cmdutil: move range check outside of filerevgen
Simple refactor, no logic change.
Matt Mackall <mpm@selenic.com> [Fri, 12 Nov 2010 01:22:46 -0600] rev 12970
merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 12 Nov 2010 01:21:45 -0600] rev 12969
pushkey: force HTTP POST on push and add tests (issue2489)
Martin Geisler <mg@lazybytes.net> [Thu, 11 Nov 2010 07:23:38 +0100] rev 12968
merge with stable
Adrian Buehlmann <adrian@cadifra.com> [Wed, 10 Nov 2010 17:28:24 +0100] rev 12967
tests: add test-hardlinks.t
partially testing util.opener.__call__
Yuya Nishihara <yuya@tcha.org> [Thu, 11 Nov 2010 01:12:51 +0900] rev 12966
win32: remove try-catch block of GetModuleFileNameEx (issue2480)
According to the API document, GetModuleFileName is the preferred way to
retrieve the filename of the current process. So we shouldn't try
GetModuleFileName'Ex' first.
Previously system_rcpath_win32() happened to return unicode paths due to
GetModuleFileNameEx (issue2480). This problem is fixed as GetModuleFileName
never return unicode.
Richard Hopkins [Tue, 09 Nov 2010 20:25:56 +0000] rev 12965
gpg, commands: fixed util.abort to util.Abort typos
gpg: Fixed util.abort typo after entering wrong password.
commands: Fixed util.abort typo in debugindex.
Martin Geisler <mg@lazybytes.net> [Thu, 11 Nov 2010 00:08:09 +0100] rev 12964
check-code: using and/or/not as a function is bad style
Martin Geisler <mg@aragost.com> [Wed, 10 Nov 2010 15:44:19 +0100] rev 12963
merge with stable
Klaus Koch <kuk42@gmx.net> [Sun, 07 Nov 2010 20:18:57 +0100] rev 12962
bundlerepository: get rid of temporary bundle files (issue2478)
This bug was introduced in 40935b59518b and 6277a9469dff.
Martin Geisler <mg@aragost.com> [Wed, 10 Nov 2010 15:38:00 +0100] rev 12961
bundlerepository: test self.tempfile field, not tempfile module
This error was introduced in 680fe77ab5b8.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Wed, 10 Nov 2010 13:48:23 +0100] rev 12960
test-mq-qnew: handle Mac OS X error strings.
On Mac OS X, opening a file called '42/' results in ENOENT and not
EISDIR if the directory doesn't exist.
timeless <timeless@gmail.com> [Wed, 10 Nov 2010 04:53:11 -0600] rev 12959
help: urls help should include see also for paths
Martin Geisler <mg@aragost.com> [Wed, 10 Nov 2010 14:46:13 +0100] rev 12958
minirst: link to HelpStyleGuide in docstring
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 09 Nov 2010 13:43:35 +0900] rev 12957
util: clarify purpose of MBTextWrapper class
It's easy to get confused and scared of an Unicode monster when
skimming through this code: document that this is really just
about column-counting.
Matt Mackall <mpm@selenic.com> [Mon, 08 Nov 2010 17:29:23 -0600] rev 12956
merge with stable
Erik Zielke <ez@aragost.com> [Mon, 08 Nov 2010 10:56:47 +0100] rev 12955
run-test: fixed wrong parenthesis
Fixed wrong placement of end parenthesis, from b911cb80c671
Matt Mackall <mpm@selenic.com> [Mon, 08 Nov 2010 17:16:29 -0600] rev 12954
merge with crew
Matt Mackall <mpm@selenic.com> [Mon, 08 Nov 2010 17:16:17 -0600] rev 12953
merge with crew
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 09 Nov 2010 01:33:48 +0900] rev 12952
merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 08 Nov 2010 22:45:56 +0900] rev 12951
graphmod: safer code when a changeset has two identical parents
While this situation should never under normal use, some real
life repos sometimes contain such changesets (older hg versions,
broken rebases, etc...)
hgweb was displaying an "Internal error" in this case, and graphlog
displayed a redundant branch all the way to null: it does not cost us
much to just ignore this extra parent when constructing the DAG.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 07 Nov 2010 18:23:48 +0900] rev 12950
revlog: fix descendants() if nullrev is in revs
We were not returning the correct result if nullrev was in revs, as we
are checking parent(currentrev) != nullrev before yielding currentrev
test-convert-hg-startrev was wrong: if we start converting from rev -1 and
onwards, all the descendants of -1 (full repo) should be converted.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 07 Nov 2010 18:16:07 +0900] rev 12949
revlog: if start is nullrev, end is always a descendant
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 07 Nov 2010 22:03:28 +0900] rev 12948
mq: use sets instead of lists for speed
The code eventually converts data through sets to ensure unicity:
do it earlier to allow faster __contains__ lookups and avoid
`del l[l.index(x)]` kind of code.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 07 Nov 2010 18:59:27 +0900] rev 12947
context: add __repr__ methods to workingfilectx and workingctx
Matt Mackall <mpm@selenic.com> [Sun, 07 Nov 2010 19:42:42 -0600] rev 12946
merge with crew
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Nov 2010 01:55:32 +0100] rev 12945
test-import: workaround for missing newline is no longer needed
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Nov 2010 01:44:46 +0100] rev 12944
merge with stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Nov 2010 01:41:42 +0100] rev 12943
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Nov 2010 01:41:41 +0100] rev 12942
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Nov 2010 01:35:41 +0100] rev 12941
tests: use (esc) markup for string-escape
This makes test output less ambiguous.
Failing test output will be escaped and marked up if necessary. A Python
string-escape compatible encoding is used, but not everything is encoded -
especially not \n and \t and '.
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Nov 2010 01:35:40 +0100] rev 12940
tests: (no-eol) markup for command output without trailing LF
Output chunks without a trailing LF will now work but get (no-eol) appended.
This change mostly moves code around so we can handle that an output line
starts with data from previous command, followed by salt and the next command.
Matt Mackall <mpm@selenic.com> [Sun, 07 Nov 2010 16:01:57 -0600] rev 12939
merge with stable
Adrian Buehlmann <adrian@cadifra.com> [Sun, 07 Nov 2010 18:21:29 +0100] rev 12938
opener: check hardlink count reporting (issue1866)
The Linux CIFS kernel driver (even in 2.6.36) suffers from a hardlink
count blindness bug (lstat() returning 1 in st_nlink when it is expected
to return >1), which causes repository corruption if Mercurial running
on Linux pushes or commits to a hardlinked repository stored on a Windows
share, if that share is mounted using the CIFS driver.
This patch works around issue1866 and improves the workaround done in
50523b4407f6 to fix issue761, by teaching the opener to lazily execute a
runtime check (new function checknlink) to see if the hardlink count
reported by nlinks() can be trusted.
Since nlinks() is also known to return varying count values (1 or >1)
depending on whether the file is open or not and depending on what client
and server software combination is being used for accessing and serving
the Windows share, we deliberately open the file before calling nlinks() in
order to have a stable precondition. Trying to depend on the precondition
"file closed" would be fragile, as the file could have been opened very
easily somewhere else in the program.
Adrian Buehlmann <adrian@cadifra.com> [Thu, 04 Nov 2010 09:04:37 +0100] rev 12937
util: refactor opener
- Don't call atomictempfile or nlinks() if the path is malformed
(no basename). Let posixfile() raise IOError directly.
- atomictempfile already breaks up hardlinks, no need to poke
at the file with nlinks() if atomictemp.
- No need to copy the file contents to break hardlinks for 'w'rite
modes (w, wb, w+, w+b). Unlinking and recreating the file is faster.
Patrick Mezard <pmezard@gmail.com> [Sun, 07 Nov 2010 18:15:17 +0100] rev 12936
revset: remove unnecessary debug statement
Patrick Mezard <pmezard@gmail.com> [Sun, 07 Nov 2010 18:14:42 +0100] rev 12935
revset: fix p1, p2 and parents in dirstate case (a5f7f1e9340e)
- Handle 'subset' argument
- Stop returning the null rev from p1 and parents, as in the non-dirstate case
- Order parents as in the non-dirstate case (ascending revs)
Mads Kiilerich <mads@kiilerich.com> [Sat, 06 Nov 2010 00:31:44 +0100] rev 12934
tests: handle .t files without trailing LF
9a2de8dae27b made this simple test-test.t succeed silently:
$ printf ' $ true' > test-test.t
but did not give a usable .err in this case:
$ printf ' $ false' > test-test.t
The missing LF will now be fixed in the test output and it will thus give a
test failure and a solution in the .err file.
Matt Mackall <mpm@selenic.com> [Fri, 05 Nov 2010 15:38:23 -0500] rev 12933
merge with stable
Steve Losh <steve@stevelosh.com> [Fri, 05 Nov 2010 15:54:32 -0400] rev 12932
alias: fall back to normal error handling for ambigious commands (fixes issue2475)
Martin Geisler <mg@aragost.com> [Fri, 05 Nov 2010 15:35:39 +0100] rev 12931
merge with stable
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Fri, 05 Nov 2010 15:13:22 +0100] rev 12930
subrepo: test & fix svn subrepo removal
Kevin Bullock <kbullock@ringworld.org> [Thu, 04 Nov 2010 17:09:00 -0500] rev 12929
revsets: let parents() return parents of working dir
This patch makes the 'set' argument to revset function parents() optional.
Like p1() and p2(), if no argument is given, returns the parent(s) of the
working directory.
Morally equivalent to 'p1()+p2()', as expected.
Kevin Bullock <kbullock@ringworld.org> [Thu, 04 Nov 2010 16:59:03 -0500] rev 12928
revsets: let p1() and p2() return parents of working dir
This patch makes the 'set' argument to revset functions p1() and p2()
optional. If no argument is given, p1() and p2() return the first or second
parent of the working directory.
If the working directory is not an in-progress merge (no 2nd parent), p2()
returns the empty set. For a checkout of the null changeset, both p1() and
p2() return the empty set.
Adrian Buehlmann <adrian@cadifra.com> [Thu, 04 Nov 2010 09:04:37 +0100] rev 12927
util: refactor opener
- Don't call atomictempfile or nlinks() if the path is malformed
(no basename). Let posixfile() raise IOError directly.
- atomictempfile already breaks up hardlinks, no need to poke
at the file with nlinks() if atomictemp.
- No need to copy the file contents to break hardlinks for 'w'rite
modes (w, wb, w+, w+b). Unlinking and recreating the file is faster.
Christian Ebert <blacktrash@gmx.net> [Thu, 04 Nov 2010 22:56:38 +0000] rev 12926
keyword: turn regexes and escaped keywords into a propertycache
Matt Mackall <mpm@selenic.com> [Thu, 04 Nov 2010 16:21:28 -0500] rev 12925
commands: add revset support to most commands
Martin Geisler <mg@aragost.com> [Thu, 04 Nov 2010 18:19:10 +0100] rev 12924
convert: better ReST markup in docstring
Martin Geisler <mg@aragost.com> [Thu, 04 Nov 2010 18:11:10 +0100] rev 12923
convert: split docstring lists for easier translation
Erik Zielke <ez@aragost.com> [Thu, 04 Nov 2010 14:14:47 +0100] rev 12922
convert: use field list instead of option list in help
Use field list instead of option list in convert help, because the
option list format used, with defaults and type of argument is not
supported by docutils.
Martin Geisler <mg@aragost.com> [Thu, 04 Nov 2010 17:52:40 +0100] rev 12921
doc/Makefile: docs now also depend on extensions
After 0d09991f91ee the hg(1) manpage contains a section with help
extracted from the extensions, so we should depend on them too.
Christian Ebert <blacktrash@gmx.net> [Wed, 03 Nov 2010 14:37:41 +0100] rev 12920
keyword: function to look up changectx for expansion
Similarly rename variable in kwtemplater.overwrite().
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Tue, 02 Nov 2010 11:25:52 +0100] rev 12919
localrepo: make heads use the keyword args of the sorted builtin
Steve Borho <steve@borho.org> [Thu, 04 Nov 2010 11:33:57 -0500] rev 12918
import: add another line feed to message join string
Changeset descriptions are not guaranteed to have a trailing carriage
return.
Patrick Mezard <pmezard@gmail.com> [Wed, 03 Nov 2010 22:34:16 +0100] rev 12917
tests: unify test-no-symlinks
Patrick Mezard <pmezard@gmail.com> [Wed, 03 Nov 2010 21:11:07 +0100] rev 12916
patch: remove unused applydiff() sourcefile argument
Patrick Mezard <pmezard@gmail.com> [Wed, 03 Nov 2010 21:11:05 +0100] rev 12915
patch: remove unused gitworkdone variable from iterhunks()
Patrick Mezard <pmezard@gmail.com> [Wed, 03 Nov 2010 21:10:59 +0100] rev 12914
test-import: use printf instead of echo
Steve Borho <steve@borho.org> [Thu, 21 Oct 2010 16:04:34 -0500] rev 12913
import: --no-commit should update .hg/last-message.txt
The patch parser goes through all of that trouble extracting the
commit message from the patch file. It seems such a waste not to
use it.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 02 Nov 2010 09:47:47 +0100] rev 12912
merge with stable after 1.7 release
Matt Mackall <mpm@selenic.com> [Mon, 01 Nov 2010 17:40:17 -0500] rev 12911
Added signature for changeset 333421b9e0f9
Matt Mackall <mpm@selenic.com> [Mon, 01 Nov 2010 17:40:14 -0500] rev 12910
Added tag 1.7 for changeset 333421b9e0f9
Matt Mackall <mpm@selenic.com> [Mon, 01 Nov 2010 14:45:27 -0500] rev 12909
merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 01 Nov 2010 16:04:15 -0200] rev 12908
i18n-pt_BR: synchronized with b19b4c1df066
Matt Mackall <mpm@selenic.com> [Mon, 01 Nov 2010 14:18:42 -0500] rev 12907
dirstate: skip optimization on case-folding FS (issue2440)
Mads Kiilerich <mads@kiilerich.com> [Mon, 01 Nov 2010 01:56:12 +0100] rev 12906
url: fix https client authentication through proxy
There is no tests for this, but the parameter order was obviously wrong.
Matt Mackall <mpm@selenic.com> [Mon, 01 Nov 2010 12:45:45 -0500] rev 12905
merge with i18n
Jens Bäckman <jens.backman@gmail.com> [Mon, 01 Nov 2010 13:42:40 +0100] rev 12904
i18n-sv: synchronize with 13fb555677fe
Chia-Huan Wu <willie.tw@gmail.com> [Sun, 31 Oct 2010 22:29:21 +0100] rev 12903
i18n-zh_TW: synchronize with 15ca4bfecfe3
Yuya Nishihara <yuya@tcha.org> [Mon, 01 Nov 2010 01:31:09 +0900] rev 12902
i18n-ja: strip extra spaces next to punctuation mark at line ending
Wagner Bruna <wbruna@yahoo.com> [Sat, 30 Oct 2010 12:51:15 -0200] rev 12901
i18n-pt_BR: synchronized with 15ca4bfecfe3
Matt Mackall <mpm@selenic.com> [Sat, 30 Oct 2010 12:13:52 -0500] rev 12900
commit: handle missing newline on last commit comment
Patrick Mezard <pmezard@gmail.com> [Mon, 01 Nov 2010 17:26:08 +0100] rev 12899
localrepo: do not modify ctx.remove() list in-place
Martin Geisler <mg@aragost.com> [Mon, 01 Nov 2010 16:22:41 +0100] rev 12898
test-rename: test with absolute paths
Martin Geisler <mg@aragost.com> [Mon, 01 Nov 2010 16:19:06 +0100] rev 12897
test-rename: fix \" -> " in comments
Steve Borho <steve@borho.org> [Sat, 30 Oct 2010 16:58:15 -0500] rev 12896
rebase: improve resolve failure message
Martin Geisler <mg@aragost.com> [Mon, 01 Nov 2010 10:24:07 +0100] rev 12895
run-tests: use regex when searching for $HGPORT in test output
This prevents spurious errors when a changeset hash happens to match
the port number. Before, this invocation gave a test failure:
$ ./run-tests.py test-log.t --port 24427
ERROR: /home/mg/src/mercurial-crew/tests/test-log.t output changed
--- /home/mg/src/mercurial-crew/tests/test-log.t
+++ /home/mg/src/mercurial-crew/tests/test-log.t.err
@@ -626,12 +626,12 @@
$ hg log -b default
changeset: 2:c3a4f03cc9a7
- parent: 0:24427303d56f
+ parent: 0:$HGPORT303d56f
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on default
...
Matt Mackall <mpm@selenic.com> [Sat, 30 Oct 2010 11:32:04 -0500] rev 12894
demandimport: back out 50a4e55aa278 (issue2467)
Matt Mackall <mpm@selenic.com> [Sat, 30 Oct 2010 02:47:35 -0500] rev 12893
debugindex: add --format flag to allow debugging parentdelta
-f 1 shows extra data from revlogv1 (aka revlogng) including flags and size
(based on a patch by Pradeepkumar Gayam <in3xes@gmail.com>)
Kevin Bullock <kbullock@ringworld.org> [Fri, 29 Oct 2010 00:57:34 -0500] rev 12892
pager: make example of setting pager less silly
Mike Sperber <sperber@deinprogramm.de> [Sat, 30 Oct 2010 02:47:34 -0500] rev 12891
convert: Work around p4 instability (issue2465)
The p4 command-line client sometimes fails upon doing "p4 describe"
when trying to produce a patch. (I'm guessing it's a bug in p4.)
However, "hg convert" doesn't even make use of the patch, and it can
be elided by adding "-s" to the p4 command line here.
Matt Mackall <mpm@selenic.com> [Sat, 30 Oct 2010 02:47:34 -0500] rev 12890
revlog: choose best delta for parentdelta (issue2466)
When parentdelta is enabled, we choose the delta that has the minimum
distance to its base. Otherwise, base may be sufficiently far away to
require a full version, resulting in greatly reduced compression.
Matt Mackall <mpm@selenic.com> [Sat, 30 Oct 2010 02:47:34 -0500] rev 12889
revlog: precalculate p1 and p2 revisions
Matt Mackall <mpm@selenic.com> [Sat, 30 Oct 2010 02:47:34 -0500] rev 12888
revlog: extract delta building to a subfunction
Matt Mackall <mpm@selenic.com> [Sat, 30 Oct 2010 02:47:34 -0500] rev 12887
revlog: simplify cachedelta handling
Matt Mackall <mpm@selenic.com> [Sat, 30 Oct 2010 02:47:34 -0500] rev 12886
revlog: fix buildtext local scope
buildtext stores its result in _addrevision scope to avoid repeated builds
cachedelta is already visible
Matt Mackall <mpm@selenic.com> [Sat, 30 Oct 2010 02:47:24 -0500] rev 12885
merge with i18n
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 29 Oct 2010 00:19:39 +0900] rev 12884
i18n-ja: synchronized with 6f6f6a9c2a41
Wagner Bruna <wbruna@yahoo.com> [Thu, 28 Oct 2010 09:52:05 -0200] rev 12883
i18n-pt_BR: synchronized with db2ff771204d
Reviewed formatting fixes from eda77c3e246a.
Martin Geisler <mg@aragost.com> [Thu, 28 Oct 2010 10:02:28 +0200] rev 12882
i18n-da: translate help for bookmarks extension
Martin Geisler <mg@lazybytes.net> [Thu, 28 Oct 2010 09:48:01 +0200] rev 12881
i18n, bookmarks: add comments for translators
Martin Geisler <mg@aragost.com> [Thu, 28 Oct 2010 09:43:56 +0200] rev 12880
i18n-da: synchronize with e1855dee28c1
Martin Geisler <mg@aragost.com> [Fri, 29 Oct 2010 14:06:06 +0200] rev 12879
qnew: distinguish between existing file and directory (issue2464)
Martin Geisler <mg@aragost.com> [Fri, 29 Oct 2010 15:25:21 +0200] rev 12878
qnew: give better feedback when doing 'hg qnew foo/' (issue2464)
Martin Geisler <mg@aragost.com> [Fri, 29 Oct 2010 12:50:08 +0200] rev 12877
opener: do not create "foo" directory when writing to "foo/"
The directories were not cleaned up when the subsequent open failed
and this would confuse things like qnew.
Martin Geisler <mg@aragost.com> [Fri, 29 Oct 2010 14:47:45 +0200] rev 12876
pager: backout 05077896ffe2 (issue2441)
Patrick Mezard <pmezard@gmail.com> [Thu, 28 Oct 2010 22:04:33 +0200] rev 12875
mq: qrename should not touch the dirstate if src is untracked (issue2460)
Patrick Mezard <pmezard@gmail.com> [Thu, 28 Oct 2010 21:25:53 +0200] rev 12874
patch: fix copies when patching over uncommitted changed (issue2459)
Matt Mackall <mpm@selenic.com> [Wed, 27 Oct 2010 16:54:46 -0500] rev 12873
merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 26 Oct 2010 21:31:35 -0200] rev 12872
i18n-pt_BR: synchronized with 830be2c57626
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 26 Oct 2010 19:12:45 -0200] rev 12871
i18n-pt_BR: msgmerge with 830be2c57626
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 26 Oct 2010 18:47:45 -0200] rev 12870
merge with i18n
Martin Geisler <mg@lazybytes.net> [Tue, 26 Oct 2010 10:54:32 +0200] rev 12869
i18n-da: remove extra newline in translation
Martin Geisler <mg@lazybytes.net> [Tue, 26 Oct 2010 00:21:57 +0200] rev 12868
i18n-da: synchronize with 6137c5bba4d0
Matt Mackall <mpm@selenic.com> [Wed, 27 Oct 2010 15:35:23 -0500] rev 12867
minirst: use colwidth to match title lengths (issue2455)
Matt Mackall <mpm@selenic.com> [Wed, 27 Oct 2010 15:35:21 -0500] rev 12866
encoding: default ambiguous character to narrow
The current implementation of colwidth was treating 'A'mbiguous
characters as wide, which was incorrect in a non-East Asian context.
As per http://unicode.org/reports/tr11/#Recommendations, we should
instead default to 'narrow' if we don't know better. As character
width is dependent on the particular font used and we have no idea
what fonts are in use, this recommendation applies.
This introduces HGENCODINGAMBIGUOUS to get the old behavior back.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Tue, 26 Oct 2010 12:18:39 +0200] rev 12865
*: kill all unnecessary shebangs.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Tue, 26 Oct 2010 12:18:37 +0200] rev 12864
*: add executable bit to a few files that were missing it.
Gilles Moris <gilles.moris@free.fr> [Wed, 20 Oct 2010 15:32:35 +0200] rev 12863
log: do case insensitive search for --user option
timeless <timeless@gmail.com> [Tue, 26 Oct 2010 14:41:58 +0300] rev 12862
url: show realm/user when asking for username/password
timeless <timeless@gmail.com> [Tue, 26 Oct 2010 14:41:58 +0300] rev 12861
rebase: abort message should appear even with --quiet
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 27 Oct 2010 12:13:49 -0200] rev 12860
help: correct tip about deleting a subrepository
The extra detail is not necessary, and wrong for Mercurial
subrepositories, so remove it (suggested by Patrick Mézard).
Wagner Bruna <wbruna@yahoo.com> [Wed, 27 Oct 2010 12:12:51 -0200] rev 12859
revset: fix missing dot in docstring
Wagner Bruna <wbruna@yahoo.com> [Wed, 27 Oct 2010 12:03:08 -0200] rev 12858
help: fix typo in merge-tools topic
Martin Geisler <mg@lazybytes.net> [Wed, 27 Oct 2010 12:05:37 +0200] rev 12857
README: add small introduction
Martin Geisler <mg@lazybytes.net> [Wed, 27 Oct 2010 12:04:58 +0200] rev 12856
README: remove trailing blank line
Wagner Bruna <wbruna@yahoo.com> [Tue, 26 Oct 2010 23:51:01 -0200] rev 12855
i18n: translate revset predicate docstrings
Wagner Bruna <wbruna@yahoo.com> [Tue, 26 Oct 2010 23:07:14 -0200] rev 12854
i18n: extract docstrings from revset module
Mads Kiilerich <mads@kiilerich.com> [Wed, 27 Oct 2010 03:21:36 +0200] rev 12853
test-win32text.t: stabilize test output
The test sometimes failed because f4.bat wasn't dirty. I'm not sure whether it
should or shouldn't be dirty, but the extension is broken and deprecated and we
just want to see the deprecation warning, so now we just avoid showing the
dirtyness.
Mads Kiilerich <mads@kiilerich.com> [Wed, 27 Oct 2010 00:28:40 +0200] rev 12852
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
timeless <timeless@gmail.com> [Tue, 26 Oct 2010 14:41:58 +0300] rev 12851
bookmarks: improve English for diffbookmarks
Martin Geisler <mg@lazybytes.net> [Tue, 26 Oct 2010 18:01:35 +0200] rev 12850
mq: expand 'repo' -> 'repository' in error message
Martin Geisler <mg@lazybytes.net> [Tue, 26 Oct 2010 17:59:21 +0200] rev 12849
mq: mark strings that should not be translated
timeless <timeless@gmail.com> [Tue, 26 Oct 2010 14:41:58 +0300] rev 12848
qrestore: trying to improve the English
Kevin Bullock <kbullock@ringworld.org> [Wed, 20 Oct 2010 17:38:21 -0500] rev 12847
pull: silence spurious 'requesting all changes' message
When issuing `hg pull -r REV` in a repo with no common ancestor with the
remote repo, the message 'requesting all changes' is printed, even though only
the changese that are ancestors of REV are actually requested. This can be
confusing for users (see
http://www.selenic.com/pipermail/mercurial/2010-October/035508.html).
This silences the message if (and only if) the '-r' option was passed.
Pradeepkumar Gayam <in3xes@gmail.com> [Tue, 26 Oct 2010 02:38:14 +0530] rev 12846
templates: fix inconsistency in 'help' link
Yuya Nishihara <yuya@tcha.org> [Mon, 25 Oct 2010 01:11:52 +0900] rev 12845
test-patchbomb: add test for progress support (1ed2dc9d4368)
Christian Ebert <blacktrash@gmx.net> [Sun, 24 Oct 2010 15:11:41 +0100] rev 12844
keyword: fix regressions introduced in d87f3ff904ba
- dirstate of overwritten files must be forced to normal
with kwexpand/kwshrink, not commit.
- recorded files must be weeded before overwriting.
- add test cases.
Martin Geisler <mg@lazybytes.net> [Mon, 25 Oct 2010 23:55:43 +0200] rev 12843
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net> [Mon, 25 Oct 2010 23:46:26 +0200] rev 12842
lsprof: remove #!-line from non-executable script
It triggered an rpmlint error, reported by Neal Becker.
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 20:10:18 +0200] rev 12841
doc/Makefile: do not include hg.1.gendoc.txt in MANIFEST
It is an intermediate file used to produce the hg.1 and .hg.1.html
files and is not useful for people who download the tarball. It will
be regenerated automatically by the Makefile if users want to rebuild
the documentation.
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 20:02:46 +0200] rev 12840
doc/Makefile: cleanup clean target
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 18:33:57 +0200] rev 12839
patchbomb: fix stray backslash in docstring
While both '\ ' and '\\ ' parse the same in Python, the difference
trips up hggettext so that it cannot find the docstring in the source
file and thus cannot write the right line number to i18n/hg.pot.
While the line number is not essential, it can be used to lookup the
original message.
Steve Borho <steve@borho.org> [Mon, 25 Oct 2010 14:34:49 -0500] rev 12838
help: improve wording of internal:merge and internal:fail
Steve Borho <steve@borho.org> [Mon, 25 Oct 2010 11:29:32 -0500] rev 12837
win32text: give deprecation warning
Users need to migrate to the EOL extension for various reasons.
Instructions for disabling the warning will be added to the
extension's wiki page.
Matt Mackall <mpm@selenic.com> [Mon, 25 Oct 2010 13:07:27 -0500] rev 12836
merge with i18n
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 16:27:27 +0200] rev 12835
i18n-da: synchronize with b814f67d41c0
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 16:24:07 +0200] rev 12834
i18n: merge with main
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 15:04:05 +0200] rev 12833
i18n-da: synchronized with 3d6ba8c2b1b8
Jens Bäckman <jens.backman@gmail.com> [Thu, 21 Oct 2010 16:57:17 +0200] rev 12832
synchronized with 3d6ba8c2b1b8
Matt Mackall <mpm@selenic.com> [Mon, 25 Oct 2010 13:06:37 -0500] rev 12831
traceback: point to BugTracker on the wiki
Steve Borho <steve@borho.org> [Mon, 25 Oct 2010 10:07:54 -0500] rev 12830
wix: add subrepos help text
Matt Mackall <mpm@selenic.com> [Sun, 24 Oct 2010 16:02:10 -0500] rev 12829
version: replace email address with url to reduce private mail
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Oct 2010 19:28:44 +0200] rev 12828
Add subrepos help topic
Edited by:
Martin Geisler <mg@lazybytes.net>
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Oct 2010 18:39:02 +0200] rev 12827
hgrc: document [subpaths] section
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Oct 2010 18:37:59 +0200] rev 12826
merge-tools.txt: 6 comes after 5
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Oct 2010 12:56:38 +0200] rev 12825
Test applying context diffs
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Oct 2010 12:55:29 +0200] rev 12824
merge-tools.txt: fix typos, simplify, renumber from 1.
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Oct 2010 12:52:37 +0200] rev 12823
hggettext: handle i18nfunctions declaration for docstrings translations
Patrick Mezard <pmezard@gmail.com> [Sat, 23 Oct 2010 19:22:42 +0200] rev 12822
Fix and unify transplant and bookmarks revsets doc registration
Patrick Mezard <pmezard@gmail.com> [Sat, 23 Oct 2010 19:21:51 +0200] rev 12821
revsets: generate predicate help dynamically
Patrick Mezard <pmezard@gmail.com> [Sat, 23 Oct 2010 19:21:49 +0200] rev 12820
help: add topic rewriting hooks
They are useful when updating help topics dynamically from extensions.
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 17:30:08 +0200] rev 12819
minirst: ignore comments
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 17:45:49 +0200] rev 12818
help: add "revset" alias for "revsets" help topic
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 16:54:45 +0200] rev 12817
Makefile: var for documentation files
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 16:53:25 +0200] rev 12816
Makefile: remove underscore in var name
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 14:59:19 +0200] rev 12815
revset: add translator comments to i18n strings
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 00:18:10 +0200] rev 12814
gendoc: do not strip 'hg ' from synopsis
This was an old left-over from when the synopsis line was used as a
header. We now have the command name by itself as the header and the
synopsis as a literal block immediately after..
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 00:11:39 +0200] rev 12813
gendoc: support multi-line synopses
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 00:01:09 +0200] rev 12812
gendoc: re-add indentation to global option table
The indentation was lost in bdc1cf692447.
Patrick Mezard <pmezard@gmail.com> [Fri, 22 Oct 2010 22:58:17 +0200] rev 12811
test-transplant: test transplanted() revset
Steve Borho <steve@borho.org> [Fri, 22 Oct 2010 11:58:43 -0500] rev 12810
backout: add --tool argument for specifying merge tool
Mads Kiilerich <mads@kiilerich.com> [Fri, 22 Oct 2010 17:08:15 +0200] rev 12809
help: improve merge-tools topic, describe --tool and clarify details
This doesn't make it simpler, but it makes it more correct.
With help from erikz, mg and abuehl.
Mads Kiilerich <mads@kiilerich.com> [Fri, 22 Oct 2010 17:05:51 +0200] rev 12808
help: use Windows cmd compatible quoting in revset help
Martin Geisler <mg@lazybytes.net> [Fri, 22 Oct 2010 16:34:38 +0200] rev 12807
color: give hint to translators about untranslated keywords
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 21 Oct 2010 11:45:02 -0200] rev 12806
i18n: extract comments marked for translator hints
Comments marked with "i18n:", like:
# i18n: do not translate the field names
msg = _("Valid entries for the format field are topic, bar, number.")
will become available for translators in the .po files:
#. i18n: do not translate the field names
msgid "Valid entries for the format field are topic, bar, number."
msgstr ""
L. David Baron <dbaron@dbaron.org> [Thu, 21 Oct 2010 09:58:22 -0700] rev 12805
setup/hg: handle hg being a symlink when appending relative libdir to sys.path
Resolve symbolic links in the path to hg so that an hg that works when
invoked directly will also work when invoked via a symlink to it.
Martin Geisler <mg@lazybytes.net> [Thu, 21 Oct 2010 21:34:30 +0200] rev 12804
merge-tools: fixed typos
Spotted by Patrick Mézard.
Martin Geisler <mg@lazybytes.net> [Thu, 21 Oct 2010 21:26:32 +0200] rev 12803
commands: mark tip:0 as literal text
If left unquoted, this is seen as a link to '0' using protocol 'tip'
because of some over-eager link-finding magic in Docutils.
Georg Brandl <georg@python.org> [Thu, 21 Oct 2010 17:02:08 +0200] rev 12802
eol: add missing word in module docstring
Steve Borho <steve@borho.org> [Thu, 21 Oct 2010 10:13:03 -0500] rev 12801
demandimport: backout fe31f834a9ff
Using a keyword argument here breaks zipimporter for at least some
versions of Python2.6 on Windows.
Martin Geisler <mg@lazybytes.net> [Thu, 21 Oct 2010 11:23:26 +0200] rev 12800
dispatch: backout 0c605364373c
The parenthesis may need translation too: Laurens Holst pointed out
that Japanese uses full-width parentheses: () (U+FF08 U+FF09).
Martin Geisler <mg@lazybytes.net> [Thu, 21 Oct 2010 10:54:37 +0200] rev 12799
subrepo: svnsubrepo._wcrev should return str after 3d6ba8c2b1b8
Matt Mackall <mpm@selenic.com> [Thu, 21 Oct 2010 03:28:51 -0500] rev 12798
subrepo: fix status check on SVN subrepos (issue2445)
Mads Kiilerich <mads@kiilerich.com> [Thu, 21 Oct 2010 03:18:52 +0200] rev 12797
hgweb: let HTTPS serve use more compatible and less secure encryption
PROTOCOL_SSLv3 on the server side doesn't work everywhere. Sometimes the client
reports "EOF occurred in violation of protocol" (for example on Mac and Solaris).
The more compatible PROTOCOL_SSLv23 is now used instead. It works but is less
"secure" for some OpenSSL versions as it can fall back to weak encryption.
Azhagu Selvan SP <tamizhgeek@gmail.com> [Wed, 20 Oct 2010 18:15:47 +0530] rev 12796
mercurial.el: fix hg-outgoing path when 'default-push' is not defined
hg-outgoing path is set as 'default-push' which prevents it from working in
repos which only have 'default' defined.
Fix provided by Kyujin Shim at
http://alexott.net/en/writings/emacs-vcs/EmacsMercurial.html
Matt Mackall <mpm@selenic.com> [Wed, 20 Oct 2010 17:06:42 -0500] rev 12795
merge default into stable for 1.7 freeze
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 20 Oct 2010 23:48:33 +0200] rev 12794
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 20 Oct 2010 23:39:48 +0200] rev 12793
patchbomb: hide passwords potentially embedded in urls
Steve Borho <steve@borho.org> [Wed, 20 Oct 2010 16:45:08 -0500] rev 12792
wix: add vim syntax file for Mercurial unit tests
Steve Borho <steve@borho.org> [Wed, 20 Oct 2010 16:41:17 -0500] rev 12791
wix: add new help page templates
Steve Borho <steve@borho.org> [Wed, 20 Oct 2010 16:27:24 -0500] rev 12790
wix: add new merge-tools.txt help text
Steve Borho <steve@borho.org> [Wed, 20 Oct 2010 15:36:42 -0500] rev 12789
Merge with mpm
Steve Borho <steve@borho.org> [Tue, 19 Oct 2010 22:33:52 -0500] rev 12788
merge: implement --tool arguments using new ui.forcemerge configurable
ui.forcemerge is set before calling into merge or resolve commands, then unset
to prevent ui pollution for further operations.
ui.forcemerge takes precedence over HGMERGE, but mimics HGMERGE behavior if the
given --tool is not found by the merge-tools machinery. This makes it possible
to do: hg resolve --tool="python mymerge.py" FILE
With this approach, HGMERGE and ui.merge are not harmed by --tool
Matt Mackall <mpm@selenic.com> [Wed, 20 Oct 2010 15:09:38 -0500] rev 12787
tests: fix up changed output